Commit bf4afc53b77a for kernel
commit bf4afc53b77aeaa48b5409da5c8da6bb4eff7f43
Author: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat Feb 21 16:37:42 2026 -0800
Convert 'alloc_obj' family to use the new default GFP_KERNEL argument
This was done entirely with mindless brute force, using
git grep -l '\<k[vmz]*alloc_objs*(.*, GFP_KERNEL)' |
xargs sed -i 's/\(alloc_objs*(.*\), GFP_KERNEL)/\1)/'
to convert the new alloc_obj() users that had a simple GFP_KERNEL
argument to just drop that argument.
Note that due to the extreme simplicity of the scripting, any slightly
more complex cases spread over multiple lines would not be triggered:
they definitely exist, but this covers the vast bulk of the cases, and
the resulting diff is also then easier to check automatically.
For the same reason the 'flex' versions will be done as a separate
conversion.
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
diff --git a/arch/alpha/kernel/core_marvel.c b/arch/alpha/kernel/core_marvel.c
index b5b547732398..92e3312e786e 100644
--- a/arch/alpha/kernel/core_marvel.c
+++ b/arch/alpha/kernel/core_marvel.c
@@ -861,7 +861,7 @@ marvel_agp_setup(alpha_agp_info *agp)
if (!alpha_agpgart_size)
return -ENOMEM;
- aper = kmalloc_obj(*aper, GFP_KERNEL);
+ aper = kmalloc_obj(*aper);
if (aper == NULL) return -ENOMEM;
aper->arena = agp->hose->sg_pci;
@@ -1059,7 +1059,7 @@ marvel_agp_info(void)
/*
* Allocate the info structure.
*/
- agp = kmalloc_obj(*agp, GFP_KERNEL);
+ agp = kmalloc_obj(*agp);
if (!agp)
return NULL;
diff --git a/arch/alpha/kernel/core_titan.c b/arch/alpha/kernel/core_titan.c
index ddaef7b75ba7..6b6b9e6d631f 100644
--- a/arch/alpha/kernel/core_titan.c
+++ b/arch/alpha/kernel/core_titan.c
@@ -594,7 +594,7 @@ titan_agp_setup(alpha_agp_info *agp)
if (!alpha_agpgart_size)
return -ENOMEM;
- aper = kmalloc_obj(struct titan_agp_aperture, GFP_KERNEL);
+ aper = kmalloc_obj(struct titan_agp_aperture);
if (aper == NULL)
return -ENOMEM;
@@ -760,7 +760,7 @@ titan_agp_info(void)
/*
* Allocate the info structure.
*/
- agp = kmalloc_obj(*agp, GFP_KERNEL);
+ agp = kmalloc_obj(*agp);
if (!agp)
return NULL;
diff --git a/arch/alpha/kernel/module.c b/arch/alpha/kernel/module.c
index 6fbc2d179e93..548d1591cfa9 100644
--- a/arch/alpha/kernel/module.c
+++ b/arch/alpha/kernel/module.c
@@ -46,7 +46,7 @@ process_reloc_for_got(Elf64_Rela *rela,
goto found_entry;
}
- g = kmalloc_obj(*g, GFP_KERNEL);
+ g = kmalloc_obj(*g);
g->next = chains[r_sym].next;
g->r_addend = r_addend;
g->got_offset = *poffset;
@@ -93,7 +93,7 @@ module_frob_arch_sections(Elf64_Ehdr *hdr, Elf64_Shdr *sechdrs,
}
nsyms = symtab->sh_size / sizeof(Elf64_Sym);
- chains = kzalloc_objs(struct got_entry, nsyms, GFP_KERNEL);
+ chains = kzalloc_objs(struct got_entry, nsyms);
if (!chains) {
printk(KERN_ERR
"module %s: no memory for symbol chain buffer\n",
diff --git a/arch/alpha/kernel/pci.c b/arch/alpha/kernel/pci.c
index 93eb07018e6b..51a8a4c4572a 100644
--- a/arch/alpha/kernel/pci.c
+++ b/arch/alpha/kernel/pci.c
@@ -220,7 +220,7 @@ static void pdev_save_srm_config(struct pci_dev *dev)
printed = 1;
}
- tmp = kmalloc_obj(*tmp, GFP_KERNEL);
+ tmp = kmalloc_obj(*tmp);
if (!tmp) {
printk(KERN_ERR "%s: kmalloc() failed!\n", __func__);
return;
diff --git a/arch/alpha/kernel/setup.c b/arch/alpha/kernel/setup.c
index ea4e7243c0e9..4cbcfb1852d5 100644
--- a/arch/alpha/kernel/setup.c
+++ b/arch/alpha/kernel/setup.c
@@ -392,7 +392,7 @@ register_cpus(void)
int i;
for_each_possible_cpu(i) {
- struct cpu *p = kzalloc_obj(*p, GFP_KERNEL);
+ struct cpu *p = kzalloc_obj(*p);
if (!p)
return -ENOMEM;
register_cpu(p, i);
diff --git a/arch/arc/kernel/unwind.c b/arch/arc/kernel/unwind.c
index dcdc8bd916db..6fdc751f906e 100644
--- a/arch/arc/kernel/unwind.c
+++ b/arch/arc/kernel/unwind.c
@@ -366,7 +366,7 @@ void *unwind_add_table(struct module *module, const void *table_start,
if (table_size <= 0)
return NULL;
- table = kmalloc_obj(*table, GFP_KERNEL);
+ table = kmalloc_obj(*table);
if (!table)
return NULL;
diff --git a/arch/arc/net/bpf_jit_core.c b/arch/arc/net/bpf_jit_core.c
index 5695da795536..1421eeced0f5 100644
--- a/arch/arc/net/bpf_jit_core.c
+++ b/arch/arc/net/bpf_jit_core.c
@@ -1140,7 +1140,7 @@ static int jit_prepare_final_mem_alloc(struct jit_context *ctx)
}
if (ctx->need_extra_pass) {
- ctx->jit_data = kzalloc_obj(*ctx->jit_data, GFP_KERNEL);
+ ctx->jit_data = kzalloc_obj(*ctx->jit_data);
if (!ctx->jit_data)
return -ENOMEM;
}
diff --git a/arch/arm/common/locomo.c b/arch/arm/common/locomo.c
index 4820b1094dfa..55e360452828 100644
--- a/arch/arm/common/locomo.c
+++ b/arch/arm/common/locomo.c
@@ -222,7 +222,7 @@ locomo_init_one_child(struct locomo *lchip, struct locomo_dev_info *info)
struct locomo_dev *dev;
int ret;
- dev = kzalloc_obj(struct locomo_dev, GFP_KERNEL);
+ dev = kzalloc_obj(struct locomo_dev);
if (!dev) {
ret = -ENOMEM;
goto out;
@@ -277,7 +277,7 @@ static int locomo_suspend(struct platform_device *dev, pm_message_t state)
struct locomo_save_data *save;
unsigned long flags;
- save = kmalloc_obj(struct locomo_save_data, GFP_KERNEL);
+ save = kmalloc_obj(struct locomo_save_data);
if (!save)
return -ENOMEM;
@@ -360,7 +360,7 @@ __locomo_probe(struct device *me, struct resource *mem, int irq)
unsigned long r;
int i, ret = -ENODEV;
- lchip = kzalloc_obj(struct locomo, GFP_KERNEL);
+ lchip = kzalloc_obj(struct locomo);
if (!lchip)
return -ENOMEM;
diff --git a/arch/arm/common/sa1111.c b/arch/arm/common/sa1111.c
index 8bd217789439..449c8bb86453 100644
--- a/arch/arm/common/sa1111.c
+++ b/arch/arm/common/sa1111.c
@@ -737,7 +737,7 @@ sa1111_init_one_child(struct sa1111 *sachip, struct resource *parent,
unsigned i;
int ret;
- dev = kzalloc_obj(struct sa1111_dev, GFP_KERNEL);
+ dev = kzalloc_obj(struct sa1111_dev);
if (!dev) {
ret = -ENOMEM;
goto err_alloc;
@@ -969,7 +969,7 @@ static int sa1111_suspend_noirq(struct device *dev)
unsigned int val;
void __iomem *base;
- save = kmalloc_obj(struct sa1111_save_data, GFP_KERNEL);
+ save = kmalloc_obj(struct sa1111_save_data);
if (!save)
return -ENOMEM;
sachip->saved_state = save;
diff --git a/arch/arm/common/scoop.c b/arch/arm/common/scoop.c
index 10e8e9716bd3..90474994757c 100644
--- a/arch/arm/common/scoop.c
+++ b/arch/arm/common/scoop.c
@@ -185,7 +185,7 @@ static int scoop_probe(struct platform_device *pdev)
if (!mem)
return -EINVAL;
- devptr = kzalloc_obj(struct scoop_dev, GFP_KERNEL);
+ devptr = kzalloc_obj(struct scoop_dev);
if (!devptr)
return -ENOMEM;
diff --git a/arch/arm/kernel/smp.c b/arch/arm/kernel/smp.c
index 504f22b420a8..4e8e89a26ca3 100644
--- a/arch/arm/kernel/smp.c
+++ b/arch/arm/kernel/smp.c
@@ -108,7 +108,7 @@ static unsigned long get_arch_pgd(pgd_t *pgd)
static int secondary_biglittle_prepare(unsigned int cpu)
{
if (!cpu_vtable[cpu])
- cpu_vtable[cpu] = kzalloc_obj(*cpu_vtable[cpu], GFP_KERNEL);
+ cpu_vtable[cpu] = kzalloc_obj(*cpu_vtable[cpu]);
return cpu_vtable[cpu] ? 0 : -ENOMEM;
}
diff --git a/arch/arm/kernel/sys_oabi-compat.c b/arch/arm/kernel/sys_oabi-compat.c
index fe73d759d078..3d7f7fcf2d87 100644
--- a/arch/arm/kernel/sys_oabi-compat.c
+++ b/arch/arm/kernel/sys_oabi-compat.c
@@ -349,7 +349,7 @@ asmlinkage long sys_oabi_semtimedop(int semid,
return -E2BIG;
if (nsops < 1 || nsops > SEMOPM)
return -EINVAL;
- sops = kvmalloc_objs(*sops, nsops, GFP_KERNEL);
+ sops = kvmalloc_objs(*sops, nsops);
if (!sops)
return -ENOMEM;
err = 0;
diff --git a/arch/arm/kernel/unwind.c b/arch/arm/kernel/unwind.c
index 2b40c22234a9..c91cb0e1585e 100644
--- a/arch/arm/kernel/unwind.c
+++ b/arch/arm/kernel/unwind.c
@@ -574,7 +574,7 @@ struct unwind_table *unwind_table_add(unsigned long start, unsigned long size,
unsigned long text_size)
{
unsigned long flags;
- struct unwind_table *tab = kmalloc_obj(*tab, GFP_KERNEL);
+ struct unwind_table *tab = kmalloc_obj(*tab);
pr_debug("%s(%08lx, %08lx, %08lx, %08lx)\n", __func__, start, size,
text_addr, text_size);
diff --git a/arch/arm/kernel/vdso.c b/arch/arm/kernel/vdso.c
index 884f1899dfba..e306d0c5a21c 100644
--- a/arch/arm/kernel/vdso.c
+++ b/arch/arm/kernel/vdso.c
@@ -179,7 +179,7 @@ static int __init vdso_init(void)
text_pages = (vdso_end - vdso_start) >> PAGE_SHIFT;
/* Allocate the VDSO text pagelist */
- vdso_text_pagelist = kzalloc_objs(struct page *, text_pages, GFP_KERNEL);
+ vdso_text_pagelist = kzalloc_objs(struct page *, text_pages);
if (vdso_text_pagelist == NULL)
return -ENOMEM;
diff --git a/arch/arm/mach-footbridge/dc21285.c b/arch/arm/mach-footbridge/dc21285.c
index 765a97a30b8a..e1b336624883 100644
--- a/arch/arm/mach-footbridge/dc21285.c
+++ b/arch/arm/mach-footbridge/dc21285.c
@@ -262,7 +262,7 @@ int __init dc21285_setup(int nr, struct pci_sys_data *sys)
{
struct resource *res;
- res = kzalloc_objs(struct resource, 2, GFP_KERNEL);
+ res = kzalloc_objs(struct resource, 2);
if (!res) {
printk("out of memory for root bus resources");
return 0;
diff --git a/arch/arm/mach-footbridge/ebsa285.c b/arch/arm/mach-footbridge/ebsa285.c
index d75fc4b541f1..1cb7d674bc81 100644
--- a/arch/arm/mach-footbridge/ebsa285.c
+++ b/arch/arm/mach-footbridge/ebsa285.c
@@ -84,7 +84,7 @@ static int __init ebsa285_leds_init(void)
for (i = 0; i < ARRAY_SIZE(ebsa285_leds); i++) {
struct ebsa285_led *led;
- led = kzalloc_obj(*led, GFP_KERNEL);
+ led = kzalloc_obj(*led);
if (!led)
break;
diff --git a/arch/arm/mach-footbridge/netwinder-hw.c b/arch/arm/mach-footbridge/netwinder-hw.c
index ae5cf7f1f74a..c024eefd4978 100644
--- a/arch/arm/mach-footbridge/netwinder-hw.c
+++ b/arch/arm/mach-footbridge/netwinder-hw.c
@@ -727,7 +727,7 @@ static int __init netwinder_leds_init(void)
for (i = 0; i < ARRAY_SIZE(netwinder_leds); i++) {
struct netwinder_led *led;
- led = kzalloc_obj(*led, GFP_KERNEL);
+ led = kzalloc_obj(*led);
if (!led)
break;
diff --git a/arch/arm/mach-imx/mmdc.c b/arch/arm/mach-imx/mmdc.c
index d1d1ef3aa927..b71467c48b87 100644
--- a/arch/arm/mach-imx/mmdc.c
+++ b/arch/arm/mach-imx/mmdc.c
@@ -477,7 +477,7 @@ static int imx_mmdc_perf_init(struct platform_device *pdev, void __iomem *mmdc_b
char *name;
int ret;
- pmu_mmdc = kzalloc_obj(*pmu_mmdc, GFP_KERNEL);
+ pmu_mmdc = kzalloc_obj(*pmu_mmdc);
if (!pmu_mmdc) {
pr_err("failed to allocate PMU device!\n");
return -ENOMEM;
diff --git a/arch/arm/mach-mvebu/board-v7.c b/arch/arm/mach-mvebu/board-v7.c
index f7f142d6e49e..a0740ab0dca9 100644
--- a/arch/arm/mach-mvebu/board-v7.c
+++ b/arch/arm/mach-mvebu/board-v7.c
@@ -127,7 +127,7 @@ static void __init i2c_quirk(void)
for_each_compatible_node(np, NULL, "marvell,mv78230-i2c") {
struct property *new_compat;
- new_compat = kzalloc_obj(*new_compat, GFP_KERNEL);
+ new_compat = kzalloc_obj(*new_compat);
new_compat->name = kstrdup("compatible", GFP_KERNEL);
new_compat->length = sizeof("marvell,mv78230-a0-i2c");
diff --git a/arch/arm/mach-mvebu/coherency.c b/arch/arm/mach-mvebu/coherency.c
index 4af0df12f654..fa2c1e1aeb96 100644
--- a/arch/arm/mach-mvebu/coherency.c
+++ b/arch/arm/mach-mvebu/coherency.c
@@ -190,7 +190,7 @@ static void __init armada_375_380_coherency_init(struct device_node *np)
for_each_compatible_node(cache_dn, NULL, "arm,pl310-cache") {
struct property *p;
- p = kzalloc_obj(*p, GFP_KERNEL);
+ p = kzalloc_obj(*p);
p->name = kstrdup("arm,io-coherent", GFP_KERNEL);
of_add_property(cache_dn, p);
}
diff --git a/arch/arm/mach-mvebu/mvebu-soc-id.c b/arch/arm/mach-mvebu/mvebu-soc-id.c
index ea4159a5b567..850ed3ea3cc4 100644
--- a/arch/arm/mach-mvebu/mvebu-soc-id.c
+++ b/arch/arm/mach-mvebu/mvebu-soc-id.c
@@ -154,7 +154,7 @@ static int __init mvebu_soc_device(void)
if (!is_id_valid)
return 0;
- soc_dev_attr = kzalloc_obj(*soc_dev_attr, GFP_KERNEL);
+ soc_dev_attr = kzalloc_obj(*soc_dev_attr);
if (!soc_dev_attr)
return -ENOMEM;
diff --git a/arch/arm/mach-mxs/mach-mxs.c b/arch/arm/mach-mxs/mach-mxs.c
index 24dd8a0c6567..f639d5004351 100644
--- a/arch/arm/mach-mxs/mach-mxs.c
+++ b/arch/arm/mach-mxs/mach-mxs.c
@@ -387,7 +387,7 @@ static void __init mxs_machine_init(void)
const u32 *ocotp = mxs_get_ocotp();
int ret;
- soc_dev_attr = kzalloc_obj(*soc_dev_attr, GFP_KERNEL);
+ soc_dev_attr = kzalloc_obj(*soc_dev_attr);
if (!soc_dev_attr)
return;
diff --git a/arch/arm/mach-omap1/dma.c b/arch/arm/mach-omap1/dma.c
index 491254010c0c..e5d102887c22 100644
--- a/arch/arm/mach-omap1/dma.c
+++ b/arch/arm/mach-omap1/dma.c
@@ -319,7 +319,7 @@ static int __init omap1_system_dma_init(void)
goto exit_iounmap;
}
- d = kzalloc_obj(*d, GFP_KERNEL);
+ d = kzalloc_obj(*d);
if (!d) {
ret = -ENOMEM;
goto exit_iounmap;
diff --git a/arch/arm/mach-omap1/timer.c b/arch/arm/mach-omap1/timer.c
index 09dab51d5728..399e6d840986 100644
--- a/arch/arm/mach-omap1/timer.c
+++ b/arch/arm/mach-omap1/timer.c
@@ -125,7 +125,7 @@ static int __init omap1_dm_timer_init(void)
goto err_free_pdev;
}
- pdata = kzalloc_obj(*pdata, GFP_KERNEL);
+ pdata = kzalloc_obj(*pdata);
if (!pdata) {
ret = -ENOMEM;
goto err_free_pdata;
diff --git a/arch/arm/mach-omap2/clkt2xxx_virt_prcm_set.c b/arch/arm/mach-omap2/clkt2xxx_virt_prcm_set.c
index 0b9d4c7b6711..2b04e422b46c 100644
--- a/arch/arm/mach-omap2/clkt2xxx_virt_prcm_set.c
+++ b/arch/arm/mach-omap2/clkt2xxx_virt_prcm_set.c
@@ -237,7 +237,7 @@ void omap2xxx_clkt_vps_init(void)
omap2xxx_clkt_vps_late_init();
omap2xxx_clkt_vps_check_bootloader_rates();
- hw = kzalloc_obj(*hw, GFP_KERNEL);
+ hw = kzalloc_obj(*hw);
if (!hw)
return;
init.name = "virt_prcm_set";
diff --git a/arch/arm/mach-omap2/id.c b/arch/arm/mach-omap2/id.c
index fd9e4146db35..43f5944850e6 100644
--- a/arch/arm/mach-omap2/id.c
+++ b/arch/arm/mach-omap2/id.c
@@ -787,7 +787,7 @@ void __init omap_soc_device_init(void)
struct soc_device *soc_dev;
struct soc_device_attribute *soc_dev_attr;
- soc_dev_attr = kzalloc_obj(*soc_dev_attr, GFP_KERNEL);
+ soc_dev_attr = kzalloc_obj(*soc_dev_attr);
if (!soc_dev_attr)
return;
diff --git a/arch/arm/mach-omap2/omap-iommu.c b/arch/arm/mach-omap2/omap-iommu.c
index debc3f0d0184..3b48fb20afe4 100644
--- a/arch/arm/mach-omap2/omap-iommu.c
+++ b/arch/arm/mach-omap2/omap-iommu.c
@@ -99,7 +99,7 @@ static struct powerdomain *_get_pwrdm(struct device *dev)
return NULL;
}
- entry = kmalloc_obj(*entry, GFP_KERNEL);
+ entry = kmalloc_obj(*entry);
if (entry) {
entry->dev = dev;
entry->pwrdm = pwrdm;
diff --git a/arch/arm/mach-omap2/omap_device.c b/arch/arm/mach-omap2/omap_device.c
index ab8adccbd7dd..79db4c49ffc9 100644
--- a/arch/arm/mach-omap2/omap_device.c
+++ b/arch/arm/mach-omap2/omap_device.c
@@ -156,7 +156,7 @@ static int omap_device_build_from_dt(struct platform_device *pdev)
!omap_hwmod_parse_module_range(NULL, node, &res))
return -ENODEV;
- hwmods = kzalloc_objs(struct omap_hwmod *, oh_cnt, GFP_KERNEL);
+ hwmods = kzalloc_objs(struct omap_hwmod *, oh_cnt);
if (!hwmods) {
ret = -ENOMEM;
goto odbfd_exit;
@@ -309,7 +309,7 @@ static struct omap_device *omap_device_alloc(struct platform_device *pdev,
int i;
struct omap_hwmod **hwmods;
- od = kzalloc_obj(struct omap_device, GFP_KERNEL);
+ od = kzalloc_obj(struct omap_device);
if (!od)
goto oda_exit1;
diff --git a/arch/arm/mach-omap2/omap_hwmod.c b/arch/arm/mach-omap2/omap_hwmod.c
index 3591ca1f59c6..974107ff18b4 100644
--- a/arch/arm/mach-omap2/omap_hwmod.c
+++ b/arch/arm/mach-omap2/omap_hwmod.c
@@ -3392,7 +3392,7 @@ static int omap_hwmod_allocate_module(struct device *dev, struct omap_hwmod *oh,
void __iomem *regs = NULL;
unsigned long flags;
- sysc = kzalloc_obj(*sysc, GFP_KERNEL);
+ sysc = kzalloc_obj(*sysc);
if (!sysc)
return -ENOMEM;
@@ -3422,7 +3422,7 @@ static int omap_hwmod_allocate_module(struct device *dev, struct omap_hwmod *oh,
}
if (list_empty(&oh->slave_ports)) {
- oi = kzalloc_obj(*oi, GFP_KERNEL);
+ oi = kzalloc_obj(*oi);
if (!oi)
goto out_free_class;
@@ -3525,7 +3525,7 @@ int omap_hwmod_init_module(struct device *dev,
oh = _lookup(data->name);
if (!oh) {
- oh = kzalloc_obj(*oh, GFP_KERNEL);
+ oh = kzalloc_obj(*oh);
if (!oh)
return -ENOMEM;
@@ -3536,7 +3536,7 @@ int omap_hwmod_init_module(struct device *dev,
/* Unused, can be handled by PRM driver handling resets */
oh->prcm.omap4.flags = HWMOD_OMAP4_NO_CONTEXT_LOSS_BIT;
- oh->class = kzalloc_obj(*oh->class, GFP_KERNEL);
+ oh->class = kzalloc_obj(*oh->class);
if (!oh->class) {
kfree(oh);
return -ENOMEM;
diff --git a/arch/arm/mach-omap2/pm33xx-core.c b/arch/arm/mach-omap2/pm33xx-core.c
index e3f47fb2d4ef..865b5251ef67 100644
--- a/arch/arm/mach-omap2/pm33xx-core.c
+++ b/arch/arm/mach-omap2/pm33xx-core.c
@@ -410,7 +410,7 @@ static int __init amx3_idle_init(struct device_node *cpu_node, int cpu)
state_count++;
}
- idle_states = kzalloc_objs(*idle_states, state_count, GFP_KERNEL);
+ idle_states = kzalloc_objs(*idle_states, state_count);
if (!idle_states)
return -ENOMEM;
diff --git a/arch/arm/mach-omap2/sr_device.c b/arch/arm/mach-omap2/sr_device.c
index 9d1a14771590..758d90e0340b 100644
--- a/arch/arm/mach-omap2/sr_device.c
+++ b/arch/arm/mach-omap2/sr_device.c
@@ -39,7 +39,7 @@ static void __init sr_set_nvalues(struct omap_volt_data *volt_data,
while (volt_data[count].volt_nominal)
count++;
- nvalue_table = kzalloc_objs(*nvalue_table, count, GFP_KERNEL);
+ nvalue_table = kzalloc_objs(*nvalue_table, count);
if (!nvalue_table)
return;
diff --git a/arch/arm/mach-orion5x/pci.c b/arch/arm/mach-orion5x/pci.c
index 2ee1ff7335db..06f5320036b1 100644
--- a/arch/arm/mach-orion5x/pci.c
+++ b/arch/arm/mach-orion5x/pci.c
@@ -169,7 +169,7 @@ static int __init pcie_setup(struct pci_sys_data *sys)
/*
* Request resources.
*/
- res = kzalloc_obj(struct resource, GFP_KERNEL);
+ res = kzalloc_obj(struct resource);
if (!res)
panic("pcie_setup unable to alloc resources");
@@ -490,7 +490,7 @@ static int __init pci_setup(struct pci_sys_data *sys)
/*
* Request resources
*/
- res = kzalloc_obj(struct resource, GFP_KERNEL);
+ res = kzalloc_obj(struct resource);
if (!res)
panic("pci_setup unable to alloc resources");
diff --git a/arch/arm/mach-rpc/ecard.c b/arch/arm/mach-rpc/ecard.c
index 9f0edac1697c..972465840548 100644
--- a/arch/arm/mach-rpc/ecard.c
+++ b/arch/arm/mach-rpc/ecard.c
@@ -692,7 +692,7 @@ static struct expansion_card *__init ecard_alloc_card(int type, int slot)
unsigned long base;
int i;
- ec = kzalloc_obj(ecard_t, GFP_KERNEL);
+ ec = kzalloc_obj(ecard_t);
if (!ec) {
ec = ERR_PTR(-ENOMEM);
goto nomem;
diff --git a/arch/arm/mach-sa1100/clock.c b/arch/arm/mach-sa1100/clock.c
index e4c7a0b78783..eafeb38502af 100644
--- a/arch/arm/mach-sa1100/clock.c
+++ b/arch/arm/mach-sa1100/clock.c
@@ -107,7 +107,7 @@ int __init sa11xx_clk_init(void)
clk_hw_register_clkdev(hw, "OSTIMER0", NULL);
- hw = kzalloc_obj(*hw, GFP_KERNEL);
+ hw = kzalloc_obj(*hw);
if (!hw)
return -ENOMEM;
hw->init = &clk_mpll_init_data;
@@ -129,7 +129,7 @@ int __init sa11xx_clk_init(void)
FAlnMsk(TUCR_TSEL), 0, &tucr_lock);
clk_set_rate(hw->clk, 3686400);
- hw = kzalloc_obj(*hw, GFP_KERNEL);
+ hw = kzalloc_obj(*hw);
if (!hw)
return -ENOMEM;
hw->init = &clk_gpio27_init_data;
diff --git a/arch/arm/mach-sa1100/generic.c b/arch/arm/mach-sa1100/generic.c
index 078667b52b8a..99ff55e8131d 100644
--- a/arch/arm/mach-sa1100/generic.c
+++ b/arch/arm/mach-sa1100/generic.c
@@ -321,7 +321,7 @@ int __init sa11x0_register_fixed_regulator(int n,
{
struct regulator_init_data *id;
- cfg->init_data = id = kzalloc_obj(*cfg->init_data, GFP_KERNEL);
+ cfg->init_data = id = kzalloc_obj(*cfg->init_data);
if (!cfg->init_data)
return -ENOMEM;
diff --git a/arch/arm/mach-sa1100/neponset.c b/arch/arm/mach-sa1100/neponset.c
index f8960373fa06..9e8a3284a6cf 100644
--- a/arch/arm/mach-sa1100/neponset.c
+++ b/arch/arm/mach-sa1100/neponset.c
@@ -276,7 +276,7 @@ static int neponset_probe(struct platform_device *dev)
goto err_alloc;
}
- d = kzalloc_obj(*d, GFP_KERNEL);
+ d = kzalloc_obj(*d);
if (!d) {
ret = -ENOMEM;
goto err_alloc;
diff --git a/arch/arm/mach-shmobile/regulator-quirk-rcar-gen2.c b/arch/arm/mach-shmobile/regulator-quirk-rcar-gen2.c
index c6659131f21b..4277ba5b3ae0 100644
--- a/arch/arm/mach-shmobile/regulator-quirk-rcar-gen2.c
+++ b/arch/arm/mach-shmobile/regulator-quirk-rcar-gen2.c
@@ -164,7 +164,7 @@ static int __init rcar_gen2_regulator_quirk(void)
if (ret) /* Skip invalid entry and continue */
continue;
- quirk = kzalloc_obj(*quirk, GFP_KERNEL);
+ quirk = kzalloc_obj(*quirk);
if (!quirk) {
ret = -ENOMEM;
of_node_put(np);
diff --git a/arch/arm/mach-versatile/spc.c b/arch/arm/mach-versatile/spc.c
index d77ed8ce5f32..7c3191aa3e12 100644
--- a/arch/arm/mach-versatile/spc.c
+++ b/arch/arm/mach-versatile/spc.c
@@ -395,7 +395,7 @@ static int ve_spc_populate_opps(uint32_t cluster)
uint32_t data = 0, off, ret, idx;
struct ve_spc_opp *opps;
- opps = kzalloc_objs(*opps, MAX_OPPS, GFP_KERNEL);
+ opps = kzalloc_objs(*opps, MAX_OPPS);
if (!opps)
return -ENOMEM;
@@ -442,7 +442,7 @@ static int ve_init_opp_table(struct device *cpu_dev)
int __init ve_spc_init(void __iomem *baseaddr, u32 a15_clusid, int irq)
{
int ret;
- info = kzalloc_obj(*info, GFP_KERNEL);
+ info = kzalloc_obj(*info);
if (!info)
return -ENOMEM;
@@ -525,7 +525,7 @@ static struct clk *ve_spc_clk_register(struct device *cpu_dev)
struct clk_init_data init;
struct clk_spc *spc;
- spc = kzalloc_obj(*spc, GFP_KERNEL);
+ spc = kzalloc_obj(*spc);
if (!spc)
return ERR_PTR(-ENOMEM);
diff --git a/arch/arm/mach-versatile/versatile.c b/arch/arm/mach-versatile/versatile.c
index 53d02ce2ad43..581c97dc4ed2 100644
--- a/arch/arm/mach-versatile/versatile.c
+++ b/arch/arm/mach-versatile/versatile.c
@@ -142,7 +142,7 @@ static void __init versatile_dt_pci_init(void)
goto out_put_node;
}
- newprop = kzalloc_obj(*newprop, GFP_KERNEL);
+ newprop = kzalloc_obj(*newprop);
if (!newprop)
goto out_put_node;
diff --git a/arch/arm/mach-zynq/common.c b/arch/arm/mach-zynq/common.c
index ddb06d5ca55d..f181a287d53d 100644
--- a/arch/arm/mach-zynq/common.c
+++ b/arch/arm/mach-zynq/common.c
@@ -108,7 +108,7 @@ static void __init zynq_init_machine(void)
struct soc_device *soc_dev;
struct device *parent = NULL;
- soc_dev_attr = kzalloc_obj(*soc_dev_attr, GFP_KERNEL);
+ soc_dev_attr = kzalloc_obj(*soc_dev_attr);
if (!soc_dev_attr)
goto out;
diff --git a/arch/arm/mm/cache-l2x0-pmu.c b/arch/arm/mm/cache-l2x0-pmu.c
index 3d62bd48086b..3d9caf7464bf 100644
--- a/arch/arm/mm/cache-l2x0-pmu.c
+++ b/arch/arm/mm/cache-l2x0-pmu.c
@@ -507,7 +507,7 @@ static __init int l2x0_pmu_init(void)
if (!l2x0_base)
return 0;
- l2x0_pmu = kzalloc_obj(*l2x0_pmu, GFP_KERNEL);
+ l2x0_pmu = kzalloc_obj(*l2x0_pmu);
if (!l2x0_pmu) {
pr_warn("Unable to allocate L2x0 PMU\n");
return -ENOMEM;
diff --git a/arch/arm/mm/cache-uniphier.c b/arch/arm/mm/cache-uniphier.c
index c601532f7a77..06e99ea1a221 100644
--- a/arch/arm/mm/cache-uniphier.c
+++ b/arch/arm/mm/cache-uniphier.c
@@ -342,7 +342,7 @@ static int __init __uniphier_cache_init(struct device_node *np,
return -EINVAL;
}
- data = kzalloc_obj(*data, GFP_KERNEL);
+ data = kzalloc_obj(*data);
if (!data)
return -ENOMEM;
diff --git a/arch/arm/mm/dma-mapping.c b/arch/arm/mm/dma-mapping.c
index 7aca3e747ad5..f304037d1c34 100644
--- a/arch/arm/mm/dma-mapping.c
+++ b/arch/arm/mm/dma-mapping.c
@@ -1504,7 +1504,7 @@ arm_iommu_create_mapping(struct device *dev, dma_addr_t base, u64 size)
bitmap_size = PAGE_SIZE;
}
- mapping = kzalloc_obj(struct dma_iommu_mapping, GFP_KERNEL);
+ mapping = kzalloc_obj(struct dma_iommu_mapping);
if (!mapping)
goto err;
diff --git a/arch/arm/xen/enlighten.c b/arch/arm/xen/enlighten.c
index 9c3e6145b810..4feed2c2498d 100644
--- a/arch/arm/xen/enlighten.c
+++ b/arch/arm/xen/enlighten.c
@@ -339,7 +339,7 @@ int __init arch_xen_unpopulated_init(struct resource **res)
return -EINVAL;
}
- regs = kzalloc_objs(*regs, nr_reg, GFP_KERNEL);
+ regs = kzalloc_objs(*regs, nr_reg);
if (!regs) {
of_node_put(np);
return -ENOMEM;
@@ -383,7 +383,7 @@ int __init arch_xen_unpopulated_init(struct resource **res)
start = regs[i - 1].end + 1;
end = regs[i].start - 1;
- tmp_res = kzalloc_obj(*tmp_res, GFP_KERNEL);
+ tmp_res = kzalloc_obj(*tmp_res);
if (!tmp_res) {
rc = -ENOMEM;
goto err;
diff --git a/arch/arm64/kvm/mmu.c b/arch/arm64/kvm/mmu.c
index f6d8b294525d..070a01e53fcb 100644
--- a/arch/arm64/kvm/mmu.c
+++ b/arch/arm64/kvm/mmu.c
@@ -487,7 +487,7 @@ static int share_pfn_hyp(u64 pfn)
goto unlock;
}
- this = kzalloc_obj(*this, GFP_KERNEL);
+ this = kzalloc_obj(*this);
if (!this) {
ret = -ENOMEM;
goto unlock;
@@ -2329,7 +2329,7 @@ int __init kvm_mmu_init(u32 hyp_va_bits)
goto out;
}
- hyp_pgtable = kzalloc_obj(*hyp_pgtable, GFP_KERNEL);
+ hyp_pgtable = kzalloc_obj(*hyp_pgtable);
if (!hyp_pgtable) {
kvm_err("Hyp mode page-table not allocated\n");
err = -ENOMEM;
diff --git a/arch/arm64/kvm/pmu-emul.c b/arch/arm64/kvm/pmu-emul.c
index 3a7b6e78a949..93cc9bbb5cec 100644
--- a/arch/arm64/kvm/pmu-emul.c
+++ b/arch/arm64/kvm/pmu-emul.c
@@ -797,7 +797,7 @@ void kvm_host_pmu_init(struct arm_pmu *pmu)
guard(mutex)(&arm_pmus_lock);
- entry = kmalloc_obj(*entry, GFP_KERNEL);
+ entry = kmalloc_obj(*entry);
if (!entry)
return;
diff --git a/arch/arm64/kvm/vgic/vgic-debug.c b/arch/arm64/kvm/vgic/vgic-debug.c
index fa1de8784617..8046f9e9719b 100644
--- a/arch/arm64/kvm/vgic/vgic-debug.c
+++ b/arch/arm64/kvm/vgic/vgic-debug.c
@@ -104,7 +104,7 @@ static void *vgic_debug_start(struct seq_file *s, loff_t *pos)
struct kvm *kvm = s->private;
struct vgic_state_iter *iter;
- iter = kmalloc_obj(*iter, GFP_KERNEL);
+ iter = kmalloc_obj(*iter);
if (!iter)
return ERR_PTR(-ENOMEM);
@@ -375,7 +375,7 @@ static void *vgic_its_debug_start(struct seq_file *s, loff_t *pos)
if (!dev)
return NULL;
- iter = kmalloc_obj(*iter, GFP_KERNEL);
+ iter = kmalloc_obj(*iter);
if (!iter)
return ERR_PTR(-ENOMEM);
diff --git a/arch/arm64/kvm/vgic/vgic-init.c b/arch/arm64/kvm/vgic/vgic-init.c
index 6eb273100ade..9b3091ad868c 100644
--- a/arch/arm64/kvm/vgic/vgic-init.c
+++ b/arch/arm64/kvm/vgic/vgic-init.c
@@ -654,7 +654,7 @@ static struct gic_kvm_info *gic_kvm_info;
void __init vgic_set_kvm_info(const struct gic_kvm_info *info)
{
BUG_ON(gic_kvm_info != NULL);
- gic_kvm_info = kmalloc_obj(*gic_kvm_info, GFP_KERNEL);
+ gic_kvm_info = kmalloc_obj(*gic_kvm_info);
if (gic_kvm_info)
*gic_kvm_info = *info;
}
diff --git a/arch/arm64/net/bpf_jit_comp.c b/arch/arm64/net/bpf_jit_comp.c
index da036853ee8a..356d33c7a4ae 100644
--- a/arch/arm64/net/bpf_jit_comp.c
+++ b/arch/arm64/net/bpf_jit_comp.c
@@ -2040,7 +2040,7 @@ struct bpf_prog *bpf_int_jit_compile(struct bpf_prog *prog)
jit_data = prog->aux->jit_data;
if (!jit_data) {
- jit_data = kzalloc_obj(*jit_data, GFP_KERNEL);
+ jit_data = kzalloc_obj(*jit_data);
if (!jit_data) {
prog = orig_prog;
goto out;
@@ -2078,7 +2078,7 @@ struct bpf_prog *bpf_int_jit_compile(struct bpf_prog *prog)
memset(&ctx, 0, sizeof(ctx));
ctx.prog = prog;
- ctx.offset = kvzalloc_objs(int, prog->len + 1, GFP_KERNEL);
+ ctx.offset = kvzalloc_objs(int, prog->len + 1);
if (ctx.offset == NULL) {
prog = orig_prog;
goto out_off;
diff --git a/arch/csky/kernel/vdso.c b/arch/csky/kernel/vdso.c
index 0f49ce6919e6..6886c0b3f60b 100644
--- a/arch/csky/kernel/vdso.c
+++ b/arch/csky/kernel/vdso.c
@@ -20,7 +20,7 @@ static int __init vdso_init(void)
vdso_pages = (vdso_end - vdso_start) >> PAGE_SHIFT;
vdso_pagelist =
- kzalloc_objs(struct page *, vdso_pages, GFP_KERNEL);
+ kzalloc_objs(struct page *, vdso_pages);
if (unlikely(vdso_pagelist == NULL)) {
pr_err("vdso: pagelist allocation failed\n");
return -ENOMEM;
diff --git a/arch/loongarch/kvm/intc/eiointc.c b/arch/loongarch/kvm/intc/eiointc.c
index fe4173b4a102..d2acb4d09e73 100644
--- a/arch/loongarch/kvm/intc/eiointc.c
+++ b/arch/loongarch/kvm/intc/eiointc.c
@@ -622,7 +622,7 @@ static int kvm_eiointc_create(struct kvm_device *dev, u32 type)
if (kvm->arch.eiointc)
return -EINVAL;
- s = kzalloc_obj(struct loongarch_eiointc, GFP_KERNEL);
+ s = kzalloc_obj(struct loongarch_eiointc);
if (!s)
return -ENOMEM;
diff --git a/arch/loongarch/kvm/intc/ipi.c b/arch/loongarch/kvm/intc/ipi.c
index 6e87cefbb3e2..1f6ebbd0af5c 100644
--- a/arch/loongarch/kvm/intc/ipi.c
+++ b/arch/loongarch/kvm/intc/ipi.c
@@ -409,7 +409,7 @@ static int kvm_ipi_create(struct kvm_device *dev, u32 type)
return -EINVAL;
}
- s = kzalloc_obj(struct loongarch_ipi, GFP_KERNEL);
+ s = kzalloc_obj(struct loongarch_ipi);
if (!s)
return -ENOMEM;
diff --git a/arch/loongarch/kvm/intc/pch_pic.c b/arch/loongarch/kvm/intc/pch_pic.c
index 1fead3f36f4d..dd7e7f8d53db 100644
--- a/arch/loongarch/kvm/intc/pch_pic.c
+++ b/arch/loongarch/kvm/intc/pch_pic.c
@@ -402,7 +402,7 @@ static int kvm_setup_default_irq_routing(struct kvm *kvm)
u32 nr = KVM_IRQCHIP_NUM_PINS;
struct kvm_irq_routing_entry *entries;
- entries = kzalloc_objs(*entries, nr, GFP_KERNEL);
+ entries = kzalloc_objs(*entries, nr);
if (!entries)
return -ENOMEM;
@@ -432,7 +432,7 @@ static int kvm_pch_pic_create(struct kvm_device *dev, u32 type)
if (ret)
return -ENOMEM;
- s = kzalloc_obj(struct loongarch_pch_pic, GFP_KERNEL);
+ s = kzalloc_obj(struct loongarch_pch_pic);
if (!s)
return -ENOMEM;
diff --git a/arch/loongarch/kvm/main.c b/arch/loongarch/kvm/main.c
index c86f9f5fedb5..2c593ac7892f 100644
--- a/arch/loongarch/kvm/main.c
+++ b/arch/loongarch/kvm/main.c
@@ -358,7 +358,7 @@ static int kvm_loongarch_env_init(void)
return -ENOMEM;
}
- kvm_loongarch_ops = kzalloc_obj(*kvm_loongarch_ops, GFP_KERNEL);
+ kvm_loongarch_ops = kzalloc_obj(*kvm_loongarch_ops);
if (!kvm_loongarch_ops) {
free_percpu(vmcs);
vmcs = NULL;
diff --git a/arch/loongarch/kvm/vcpu.c b/arch/loongarch/kvm/vcpu.c
index 483ed31f2008..09e137f2f841 100644
--- a/arch/loongarch/kvm/vcpu.c
+++ b/arch/loongarch/kvm/vcpu.c
@@ -1547,7 +1547,7 @@ int kvm_arch_vcpu_create(struct kvm_vcpu *vcpu)
vcpu->arch.handle_exit = kvm_handle_exit;
vcpu->arch.guest_eentry = (unsigned long)kvm_loongarch_ops->exc_entry;
- vcpu->arch.csr = kzalloc_obj(struct loongarch_csrs, GFP_KERNEL);
+ vcpu->arch.csr = kzalloc_obj(struct loongarch_csrs);
if (!vcpu->arch.csr)
return -ENOMEM;
diff --git a/arch/loongarch/net/bpf_jit.c b/arch/loongarch/net/bpf_jit.c
index 07f876834b24..3bd89f55960d 100644
--- a/arch/loongarch/net/bpf_jit.c
+++ b/arch/loongarch/net/bpf_jit.c
@@ -1943,7 +1943,7 @@ struct bpf_prog *bpf_int_jit_compile(struct bpf_prog *prog)
jit_data = prog->aux->jit_data;
if (!jit_data) {
- jit_data = kzalloc_obj(*jit_data, GFP_KERNEL);
+ jit_data = kzalloc_obj(*jit_data);
if (!jit_data) {
prog = orig_prog;
goto out;
diff --git a/arch/loongarch/pci/acpi.c b/arch/loongarch/pci/acpi.c
index 324a19d88ca1..0dde3ddcd544 100644
--- a/arch/loongarch/pci/acpi.c
+++ b/arch/loongarch/pci/acpi.c
@@ -101,7 +101,7 @@ static struct pci_config_window *arch_pci_ecam_create(struct device *dev,
if (busr->start > busr->end)
return ERR_PTR(-EINVAL);
- cfg = kzalloc_obj(*cfg, GFP_KERNEL);
+ cfg = kzalloc_obj(*cfg);
if (!cfg)
return ERR_PTR(-ENOMEM);
@@ -199,13 +199,13 @@ struct pci_bus *pci_acpi_scan_root(struct acpi_pci_root *root)
int domain = root->segment;
int busnum = root->secondary.start;
- info = kzalloc_obj(*info, GFP_KERNEL);
+ info = kzalloc_obj(*info);
if (!info) {
pr_warn("pci_bus %04x:%02x: ignored (out of memory)\n", domain, busnum);
return NULL;
}
- root_ops = kzalloc_obj(*root_ops, GFP_KERNEL);
+ root_ops = kzalloc_obj(*root_ops);
if (!root_ops) {
kfree(info);
return NULL;
diff --git a/arch/m68k/amiga/chipram.c b/arch/m68k/amiga/chipram.c
index 388cb652e51e..19a7bfefb5d7 100644
--- a/arch/m68k/amiga/chipram.c
+++ b/arch/m68k/amiga/chipram.c
@@ -47,7 +47,7 @@ void *amiga_chip_alloc(unsigned long size, const char *name)
struct resource *res;
void *p;
- res = kzalloc_obj(struct resource, GFP_KERNEL);
+ res = kzalloc_obj(struct resource);
if (!res)
return NULL;
diff --git a/arch/m68k/atari/stram.c b/arch/m68k/atari/stram.c
index 958c12a29884..82b31321f61c 100644
--- a/arch/m68k/atari/stram.c
+++ b/arch/m68k/atari/stram.c
@@ -161,7 +161,7 @@ void *atari_stram_alloc(unsigned long size, const char *owner)
/* round up */
size = PAGE_ALIGN(size);
- res = kzalloc_obj(struct resource, GFP_KERNEL);
+ res = kzalloc_obj(struct resource);
if (!res)
return NULL;
diff --git a/arch/m68k/emu/nfblock.c b/arch/m68k/emu/nfblock.c
index 921a96ea83df..93536cf2a38e 100644
--- a/arch/m68k/emu/nfblock.c
+++ b/arch/m68k/emu/nfblock.c
@@ -112,7 +112,7 @@ static int __init nfhd_init_one(int id, u32 blocks, u32 bsize)
return -EINVAL;
}
- dev = kmalloc_obj(struct nfhd_device, GFP_KERNEL);
+ dev = kmalloc_obj(struct nfhd_device);
if (!dev)
goto out;
diff --git a/arch/m68k/mm/kmap.c b/arch/m68k/mm/kmap.c
index 0ef6e6894a96..6167999402b1 100644
--- a/arch/m68k/mm/kmap.c
+++ b/arch/m68k/mm/kmap.c
@@ -110,7 +110,7 @@ static struct vm_struct *get_io_area(unsigned long size)
unsigned long addr;
struct vm_struct **p, *tmp, *area;
- area = kmalloc_obj(*area, GFP_KERNEL);
+ area = kmalloc_obj(*area);
if (!area)
return NULL;
addr = KMAP_START;
diff --git a/arch/mips/alchemy/common/clock.c b/arch/mips/alchemy/common/clock.c
index 7ed84f26ac40..62a7304ff35f 100644
--- a/arch/mips/alchemy/common/clock.c
+++ b/arch/mips/alchemy/common/clock.c
@@ -154,7 +154,7 @@ static struct clk __init *alchemy_clk_setup_cpu(const char *parent_name,
struct clk_hw *h;
struct clk *clk;
- h = kzalloc_obj(*h, GFP_KERNEL);
+ h = kzalloc_obj(*h);
if (!h)
return ERR_PTR(-ENOMEM);
@@ -249,7 +249,7 @@ static struct clk __init *alchemy_clk_setup_aux(const char *parent_name,
struct clk *c;
struct alchemy_auxpll_clk *a;
- a = kzalloc_obj(*a, GFP_KERNEL);
+ a = kzalloc_obj(*a);
if (!a)
return ERR_PTR(-ENOMEM);
@@ -775,7 +775,7 @@ static int __init alchemy_clk_init_fgens(int ctype)
}
id.flags = CLK_SET_RATE_PARENT | CLK_GET_RATE_NOCACHE;
- a = kzalloc_objs(*a, 6, GFP_KERNEL);
+ a = kzalloc_objs(*a, 6);
if (!a)
return -ENOMEM;
@@ -996,7 +996,7 @@ static int __init alchemy_clk_setup_imux(int ctype)
return -ENODEV;
}
- a = kzalloc_objs(*a, 6, GFP_KERNEL);
+ a = kzalloc_objs(*a, 6);
if (!a)
return -ENOMEM;
diff --git a/arch/mips/alchemy/common/dbdma.c b/arch/mips/alchemy/common/dbdma.c
index eb420a6f2f9f..b441d6f3f5ae 100644
--- a/arch/mips/alchemy/common/dbdma.c
+++ b/arch/mips/alchemy/common/dbdma.c
@@ -1057,7 +1057,7 @@ static int __init dbdma_setup(unsigned int irq, dbdev_tab_t *idtable)
{
int ret;
- dbdev_tab = kzalloc_objs(dbdev_tab_t, DBDEV_TAB_SIZE, GFP_KERNEL);
+ dbdev_tab = kzalloc_objs(dbdev_tab_t, DBDEV_TAB_SIZE);
if (!dbdev_tab)
return -ENOMEM;
diff --git a/arch/mips/alchemy/common/platform.c b/arch/mips/alchemy/common/platform.c
index 931cf459facb..02bf02164752 100644
--- a/arch/mips/alchemy/common/platform.c
+++ b/arch/mips/alchemy/common/platform.c
@@ -202,10 +202,10 @@ static unsigned long alchemy_ehci_data[][2] __initdata = {
static int __init _new_usbres(struct resource **r, struct platform_device **d)
{
- *r = kzalloc_objs(struct resource, 2, GFP_KERNEL);
+ *r = kzalloc_objs(struct resource, 2);
if (!*r)
return -ENOMEM;
- *d = kzalloc_obj(struct platform_device, GFP_KERNEL);
+ *d = kzalloc_obj(struct platform_device);
if (!*d) {
kfree(*r);
return -ENOMEM;
diff --git a/arch/mips/alchemy/devboards/platform.c b/arch/mips/alchemy/devboards/platform.c
index 40e804a898ec..46262c823fcb 100644
--- a/arch/mips/alchemy/devboards/platform.c
+++ b/arch/mips/alchemy/devboards/platform.c
@@ -87,7 +87,7 @@ int __init db1x_register_pcmcia_socket(phys_addr_t pcmcia_attr_start,
if (stschg_irq)
cnt++;
- sr = kzalloc_objs(struct resource, cnt, GFP_KERNEL);
+ sr = kzalloc_objs(struct resource, cnt);
if (!sr)
return -ENOMEM;
@@ -162,15 +162,15 @@ int __init db1x_register_norflash(unsigned long size, int width,
return -EINVAL;
ret = -ENOMEM;
- parts = kzalloc_objs(struct mtd_partition, 5, GFP_KERNEL);
+ parts = kzalloc_objs(struct mtd_partition, 5);
if (!parts)
goto out;
- res = kzalloc_obj(struct resource, GFP_KERNEL);
+ res = kzalloc_obj(struct resource);
if (!res)
goto out1;
- pfd = kzalloc_obj(struct physmap_flash_data, GFP_KERNEL);
+ pfd = kzalloc_obj(struct physmap_flash_data);
if (!pfd)
goto out2;
diff --git a/arch/mips/bcm47xx/setup.c b/arch/mips/bcm47xx/setup.c
index d9e569af0d86..5b0504e3771c 100644
--- a/arch/mips/bcm47xx/setup.c
+++ b/arch/mips/bcm47xx/setup.c
@@ -187,7 +187,7 @@ static struct device * __init bcm47xx_setup_device(void)
struct device *dev;
int err;
- dev = kzalloc_obj(*dev, GFP_KERNEL);
+ dev = kzalloc_obj(*dev);
if (!dev)
return NULL;
diff --git a/arch/mips/cavium-octeon/octeon-irq.c b/arch/mips/cavium-octeon/octeon-irq.c
index 2a91e678fc1a..900cda918a9a 100644
--- a/arch/mips/cavium-octeon/octeon-irq.c
+++ b/arch/mips/cavium-octeon/octeon-irq.c
@@ -100,7 +100,7 @@ static int octeon_irq_set_ciu_mapping(int irq, int line, int bit, int gpio_line,
{
struct octeon_ciu_chip_data *cd;
- cd = kzalloc_obj(*cd, GFP_KERNEL);
+ cd = kzalloc_obj(*cd);
if (!cd)
return -ENOMEM;
@@ -1462,7 +1462,7 @@ static int __init octeon_irq_init_ciu(
struct irq_domain *ciu_domain = NULL;
struct octeon_irq_ciu_domain_data *dd;
- dd = kzalloc_obj(*dd, GFP_KERNEL);
+ dd = kzalloc_obj(*dd);
if (!dd)
return -ENOMEM;
@@ -1633,7 +1633,7 @@ static int __init octeon_irq_init_gpio(
return -EINVAL;
}
- gpiod = kzalloc_obj(*gpiod, GFP_KERNEL);
+ gpiod = kzalloc_obj(*gpiod);
if (gpiod) {
/* gpio domain host_data is the base hwirq number. */
gpiod->base_hwirq = base_hwirq;
@@ -2223,7 +2223,7 @@ static int octeon_irq_cib_map(struct irq_domain *d,
return -EINVAL;
}
- cd = kzalloc_obj(*cd, GFP_KERNEL);
+ cd = kzalloc_obj(*cd);
if (!cd)
return -ENOMEM;
@@ -2304,7 +2304,7 @@ static int __init octeon_irq_init_cib(struct device_node *ciu_node,
return -EINVAL;
}
- host_data = kzalloc_obj(*host_data, GFP_KERNEL);
+ host_data = kzalloc_obj(*host_data);
if (!host_data)
return -ENOMEM;
raw_spin_lock_init(&host_data->lock);
diff --git a/arch/mips/kernel/module.c b/arch/mips/kernel/module.c
index 9ef50013c818..37dea772fd78 100644
--- a/arch/mips/kernel/module.c
+++ b/arch/mips/kernel/module.c
@@ -72,7 +72,7 @@ static int apply_r_mips_hi16(struct module *me, u32 *location, Elf_Addr v,
* the carry we need to add. Save the information, and let LO16 do the
* actual relocation.
*/
- n = kmalloc_obj(*n, GFP_KERNEL);
+ n = kmalloc_obj(*n);
if (!n)
return -ENOMEM;
diff --git a/arch/mips/kernel/smp-cps.c b/arch/mips/kernel/smp-cps.c
index ef5dca1313b2..70a846c5ddba 100644
--- a/arch/mips/kernel/smp-cps.c
+++ b/arch/mips/kernel/smp-cps.c
@@ -352,7 +352,7 @@ static void __init cps_prepare_cpus(unsigned int max_cpus)
for (cl = 0; cl < nclusters; cl++) {
/* Allocate core boot configuration structs */
ncores = mips_cps_numcores(cl);
- core_bootcfg = kzalloc_objs(*core_bootcfg, ncores, GFP_KERNEL);
+ core_bootcfg = kzalloc_objs(*core_bootcfg, ncores);
if (!core_bootcfg)
goto err_out;
mips_cps_cluster_bootcfg[cl].core_config = core_bootcfg;
diff --git a/arch/mips/kernel/vpe.c b/arch/mips/kernel/vpe.c
index fdbb5c4de834..b05ee21a1d67 100644
--- a/arch/mips/kernel/vpe.c
+++ b/arch/mips/kernel/vpe.c
@@ -94,7 +94,7 @@ struct vpe *alloc_vpe(int minor)
{
struct vpe *v;
- v = kzalloc_obj(struct vpe, GFP_KERNEL);
+ v = kzalloc_obj(struct vpe);
if (v == NULL)
goto out;
@@ -115,7 +115,7 @@ struct tc *alloc_tc(int index)
{
struct tc *tc;
- tc = kzalloc_obj(struct tc, GFP_KERNEL);
+ tc = kzalloc_obj(struct tc);
if (tc == NULL)
goto out;
@@ -318,7 +318,7 @@ static int apply_r_mips_hi16(struct module *me, uint32_t *location,
* the carry we need to add. Save the information, and let LO16 do the
* actual relocation.
*/
- n = kmalloc_obj(*n, GFP_KERNEL);
+ n = kmalloc_obj(*n);
if (!n)
return -ENOMEM;
diff --git a/arch/mips/lantiq/falcon/sysctrl.c b/arch/mips/lantiq/falcon/sysctrl.c
index ee0e634f6fe1..139a65c42a78 100644
--- a/arch/mips/lantiq/falcon/sysctrl.c
+++ b/arch/mips/lantiq/falcon/sysctrl.c
@@ -161,7 +161,7 @@ static void falcon_gpe_enable(void)
static inline void clkdev_add_sys(const char *dev, unsigned int module,
unsigned int bits)
{
- struct clk *clk = kzalloc_obj(struct clk, GFP_KERNEL);
+ struct clk *clk = kzalloc_obj(struct clk);
if (!clk)
return;
diff --git a/arch/mips/lantiq/xway/gptu.c b/arch/mips/lantiq/xway/gptu.c
index f8f3f5383a34..cbf0639cb3d6 100644
--- a/arch/mips/lantiq/xway/gptu.c
+++ b/arch/mips/lantiq/xway/gptu.c
@@ -121,7 +121,7 @@ static void gptu_disable(struct clk *clk)
static inline void clkdev_add_gptu(struct device *dev, const char *con,
unsigned int timer)
{
- struct clk *clk = kzalloc_obj(struct clk, GFP_KERNEL);
+ struct clk *clk = kzalloc_obj(struct clk);
if (!clk)
return;
diff --git a/arch/mips/lantiq/xway/sysctrl.c b/arch/mips/lantiq/xway/sysctrl.c
index b7be6c710a15..dd187726e3b2 100644
--- a/arch/mips/lantiq/xway/sysctrl.c
+++ b/arch/mips/lantiq/xway/sysctrl.c
@@ -331,7 +331,7 @@ static int clkout_enable(struct clk *clk)
static void clkdev_add_pmu(const char *dev, const char *con, bool deactivate,
unsigned int module, unsigned int bits)
{
- struct clk *clk = kzalloc_obj(struct clk, GFP_KERNEL);
+ struct clk *clk = kzalloc_obj(struct clk);
if (!clk)
return;
@@ -356,7 +356,7 @@ static void clkdev_add_pmu(const char *dev, const char *con, bool deactivate,
static void clkdev_add_cgu(const char *dev, const char *con,
unsigned int bits)
{
- struct clk *clk = kzalloc_obj(struct clk, GFP_KERNEL);
+ struct clk *clk = kzalloc_obj(struct clk);
if (!clk)
return;
@@ -374,8 +374,8 @@ static unsigned long valid_pci_rates[] = {CLOCK_33M, CLOCK_62_5M, 0};
static void clkdev_add_pci(void)
{
- struct clk *clk = kzalloc_obj(struct clk, GFP_KERNEL);
- struct clk *clk_ext = kzalloc_obj(struct clk, GFP_KERNEL);
+ struct clk *clk = kzalloc_obj(struct clk);
+ struct clk *clk_ext = kzalloc_obj(struct clk);
/* main pci clock */
if (clk) {
@@ -423,7 +423,7 @@ static void clkdev_add_clkout(void)
continue;
sprintf(name, "clkout%d", i);
- clk = kzalloc_obj(struct clk, GFP_KERNEL);
+ clk = kzalloc_obj(struct clk);
if (!clk) {
kfree(name);
continue;
diff --git a/arch/mips/pci/pci-alchemy.c b/arch/mips/pci/pci-alchemy.c
index d5b4f0e6bee3..19175171905e 100644
--- a/arch/mips/pci/pci-alchemy.c
+++ b/arch/mips/pci/pci-alchemy.c
@@ -380,7 +380,7 @@ static int alchemy_pci_probe(struct platform_device *pdev)
goto out;
}
- ctx = kzalloc_obj(*ctx, GFP_KERNEL);
+ ctx = kzalloc_obj(*ctx);
if (!ctx) {
dev_err(&pdev->dev, "no memory for pcictl context\n");
ret = -ENOMEM;
diff --git a/arch/mips/pci/pci-xtalk-bridge.c b/arch/mips/pci/pci-xtalk-bridge.c
index c78f99eebe1a..cf115abb54e0 100644
--- a/arch/mips/pci/pci-xtalk-bridge.c
+++ b/arch/mips/pci/pci-xtalk-bridge.c
@@ -341,7 +341,7 @@ static int bridge_domain_alloc(struct irq_domain *domain, unsigned int virq,
if (nr_irqs > 1 || !info)
return -EINVAL;
- data = kzalloc_obj(*data, GFP_KERNEL);
+ data = kzalloc_obj(*data);
if (!data)
return -ENOMEM;
diff --git a/arch/mips/ralink/mt7620.c b/arch/mips/ralink/mt7620.c
index c493fe67802c..c5f1ebce006f 100644
--- a/arch/mips/ralink/mt7620.c
+++ b/arch/mips/ralink/mt7620.c
@@ -198,7 +198,7 @@ static int __init mt7620_soc_dev_init(void)
struct soc_device *soc_dev;
struct soc_device_attribute *soc_dev_attr;
- soc_dev_attr = kzalloc_obj(*soc_dev_attr, GFP_KERNEL);
+ soc_dev_attr = kzalloc_obj(*soc_dev_attr);
if (!soc_dev_attr)
return -ENOMEM;
diff --git a/arch/mips/ralink/mt7621.c b/arch/mips/ralink/mt7621.c
index ca70966da6f7..a4bdda8541c0 100644
--- a/arch/mips/ralink/mt7621.c
+++ b/arch/mips/ralink/mt7621.c
@@ -144,7 +144,7 @@ static int __init mt7621_soc_dev_init(void)
struct soc_device *soc_dev;
struct soc_device_attribute *soc_dev_attr;
- soc_dev_attr = kzalloc_obj(*soc_dev_attr, GFP_KERNEL);
+ soc_dev_attr = kzalloc_obj(*soc_dev_attr);
if (!soc_dev_attr)
return -ENOMEM;
diff --git a/arch/mips/ralink/rt288x.c b/arch/mips/ralink/rt288x.c
index d60fd84e4b9c..19bb81eba57a 100644
--- a/arch/mips/ralink/rt288x.c
+++ b/arch/mips/ralink/rt288x.c
@@ -68,7 +68,7 @@ static int __init rt2880_soc_dev_init(void)
struct soc_device *soc_dev;
struct soc_device_attribute *soc_dev_attr;
- soc_dev_attr = kzalloc_obj(*soc_dev_attr, GFP_KERNEL);
+ soc_dev_attr = kzalloc_obj(*soc_dev_attr);
if (!soc_dev_attr)
return -ENOMEM;
diff --git a/arch/mips/ralink/rt305x.c b/arch/mips/ralink/rt305x.c
index 6abd2a56ba27..ed4159135ed9 100644
--- a/arch/mips/ralink/rt305x.c
+++ b/arch/mips/ralink/rt305x.c
@@ -171,7 +171,7 @@ static int __init rt305x_soc_dev_init(void)
struct soc_device *soc_dev;
struct soc_device_attribute *soc_dev_attr;
- soc_dev_attr = kzalloc_obj(*soc_dev_attr, GFP_KERNEL);
+ soc_dev_attr = kzalloc_obj(*soc_dev_attr);
if (!soc_dev_attr)
return -ENOMEM;
diff --git a/arch/mips/ralink/rt3883.c b/arch/mips/ralink/rt3883.c
index 60605941b4b2..98aee412f532 100644
--- a/arch/mips/ralink/rt3883.c
+++ b/arch/mips/ralink/rt3883.c
@@ -68,7 +68,7 @@ static int __init rt3883_soc_dev_init(void)
struct soc_device *soc_dev;
struct soc_device_attribute *soc_dev_attr;
- soc_dev_attr = kzalloc_obj(*soc_dev_attr, GFP_KERNEL);
+ soc_dev_attr = kzalloc_obj(*soc_dev_attr);
if (!soc_dev_attr)
return -ENOMEM;
diff --git a/arch/mips/sgi-ip22/ip22-gio.c b/arch/mips/sgi-ip22/ip22-gio.c
index 08604e5836bc..9eec8842ffb7 100644
--- a/arch/mips/sgi-ip22/ip22-gio.c
+++ b/arch/mips/sgi-ip22/ip22-gio.c
@@ -361,7 +361,7 @@ static void ip22_check_gio(int slotno, unsigned long addr, int irq)
}
printk(KERN_INFO "GIO: slot %d : %s (id %x)\n",
slotno, name, id);
- gio_dev = kzalloc_obj(*gio_dev, GFP_KERNEL);
+ gio_dev = kzalloc_obj(*gio_dev);
if (!gio_dev)
return;
gio_dev->name = name;
diff --git a/arch/mips/sgi-ip27/ip27-irq.c b/arch/mips/sgi-ip27/ip27-irq.c
index fb3e9bfa6abf..7e5aa04c6695 100644
--- a/arch/mips/sgi-ip27/ip27-irq.c
+++ b/arch/mips/sgi-ip27/ip27-irq.c
@@ -129,7 +129,7 @@ static int hub_domain_alloc(struct irq_domain *domain, unsigned int virq,
if (nr_irqs > 1 || !info)
return -EINVAL;
- hd = kzalloc_obj(*hd, GFP_KERNEL);
+ hd = kzalloc_obj(*hd);
if (!hd)
return -ENOMEM;
diff --git a/arch/mips/sgi-ip27/ip27-xtalk.c b/arch/mips/sgi-ip27/ip27-xtalk.c
index 5504c3234d5a..10834880c261 100644
--- a/arch/mips/sgi-ip27/ip27-xtalk.c
+++ b/arch/mips/sgi-ip27/ip27-xtalk.c
@@ -34,7 +34,7 @@ static void bridge_platform_create(nasid_t nasid, int widget, int masterwid)
offset = NODE_OFFSET(nasid);
- wd = kzalloc_obj(*wd, GFP_KERNEL);
+ wd = kzalloc_obj(*wd);
if (!wd) {
pr_warn("xtalk:n%d/%x bridge create out of memory\n", nasid, widget);
return;
@@ -69,7 +69,7 @@ static void bridge_platform_create(nasid_t nasid, int widget, int masterwid)
/* platform_device_add_data() duplicates the data */
kfree(wd);
- bd = kzalloc_obj(*bd, GFP_KERNEL);
+ bd = kzalloc_obj(*bd);
if (!bd) {
pr_warn("xtalk:n%d/%x bridge create out of memory\n", nasid, widget);
goto err_unregister_pdev_wd;
diff --git a/arch/mips/sgi-ip30/ip30-irq.c b/arch/mips/sgi-ip30/ip30-irq.c
index 1ffa97c578fa..4b21b7b6ffe1 100644
--- a/arch/mips/sgi-ip30/ip30-irq.c
+++ b/arch/mips/sgi-ip30/ip30-irq.c
@@ -209,7 +209,7 @@ static int heart_domain_alloc(struct irq_domain *domain, unsigned int virq,
if (nr_irqs > 1 || !info)
return -EINVAL;
- hd = kzalloc_obj(*hd, GFP_KERNEL);
+ hd = kzalloc_obj(*hd);
if (!hd)
return -ENOMEM;
diff --git a/arch/mips/sgi-ip30/ip30-xtalk.c b/arch/mips/sgi-ip30/ip30-xtalk.c
index e5525f1b617e..1e14d59a5787 100644
--- a/arch/mips/sgi-ip30/ip30-xtalk.c
+++ b/arch/mips/sgi-ip30/ip30-xtalk.c
@@ -44,7 +44,7 @@ static void bridge_platform_create(int widget, int masterwid)
struct platform_device *pdev_bd;
struct resource w1_res;
- wd = kzalloc_obj(*wd, GFP_KERNEL);
+ wd = kzalloc_obj(*wd);
if (!wd) {
pr_warn("xtalk:%x bridge create out of memory\n", widget);
return;
@@ -79,7 +79,7 @@ static void bridge_platform_create(int widget, int masterwid)
/* platform_device_add_data() duplicates the data */
kfree(wd);
- bd = kzalloc_obj(*bd, GFP_KERNEL);
+ bd = kzalloc_obj(*bd);
if (!bd) {
pr_warn("xtalk:%x bridge create out of memory\n", widget);
goto err_unregister_pdev_wd;
diff --git a/arch/mips/txx9/generic/pci.c b/arch/mips/txx9/generic/pci.c
index 1976c06ee667..a52082878e8c 100644
--- a/arch/mips/txx9/generic/pci.c
+++ b/arch/mips/txx9/generic/pci.c
@@ -120,7 +120,7 @@ txx9_alloc_pci_controller(struct pci_controller *pcic,
int min_size = 0x10000;
if (!pcic) {
- new = kzalloc_obj(*new, GFP_KERNEL);
+ new = kzalloc_obj(*new);
if (!new)
return NULL;
new->r_mem[0].name = "PCI mem";
diff --git a/arch/mips/txx9/generic/setup.c b/arch/mips/txx9/generic/setup.c
index 5cf490edea5a..6c5025806914 100644
--- a/arch/mips/txx9/generic/setup.c
+++ b/arch/mips/txx9/generic/setup.c
@@ -648,7 +648,7 @@ void __init txx9_iocled_init(unsigned long baseaddr,
if (!deftriggers)
deftriggers = default_triggers;
- iocled = kzalloc_obj(*iocled, GFP_KERNEL);
+ iocled = kzalloc_obj(*iocled);
if (!iocled)
return;
iocled->mmioaddr = ioremap(baseaddr, 1);
@@ -822,7 +822,7 @@ void __init txx9_sramc_init(struct resource *r)
err = subsys_system_register(&txx9_sramc_subsys, NULL);
if (err)
return;
- dev = kzalloc_obj(*dev, GFP_KERNEL);
+ dev = kzalloc_obj(*dev);
if (!dev)
return;
size = resource_size(r);
diff --git a/arch/nios2/platform/platform.c b/arch/nios2/platform/platform.c
index 567e41095a40..7948f063f55d 100644
--- a/arch/nios2/platform/platform.c
+++ b/arch/nios2/platform/platform.c
@@ -28,7 +28,7 @@ static int __init nios2_soc_device_init(void)
struct soc_device_attribute *soc_dev_attr;
const char *machine;
- soc_dev_attr = kzalloc_obj(*soc_dev_attr, GFP_KERNEL);
+ soc_dev_attr = kzalloc_obj(*soc_dev_attr);
if (soc_dev_attr) {
machine = of_flat_dt_get_machine_name();
if (machine)
diff --git a/arch/parisc/kernel/drivers.c b/arch/parisc/kernel/drivers.c
index 0a5868035ff0..bc47bbe3026e 100644
--- a/arch/parisc/kernel/drivers.c
+++ b/arch/parisc/kernel/drivers.c
@@ -418,7 +418,7 @@ static void setup_bus_id(struct parisc_device *padev)
static struct parisc_device * __init create_tree_node(char id,
struct device *parent)
{
- struct parisc_device *dev = kzalloc_obj(*dev, GFP_KERNEL);
+ struct parisc_device *dev = kzalloc_obj(*dev);
if (!dev)
return NULL;
diff --git a/arch/parisc/kernel/inventory.c b/arch/parisc/kernel/inventory.c
index af827d32bcca..103f58dac948 100644
--- a/arch/parisc/kernel/inventory.c
+++ b/arch/parisc/kernel/inventory.c
@@ -193,7 +193,7 @@ pat_query_module(ulong pcell_loc, ulong mod_index)
long status; /* PDC return value status */
struct parisc_device *dev;
- pa_pdc_cell = kmalloc_obj(*pa_pdc_cell, GFP_KERNEL);
+ pa_pdc_cell = kmalloc_obj(*pa_pdc_cell);
if (!pa_pdc_cell)
panic("couldn't allocate memory for PDC_PAT_CELL!");
@@ -536,7 +536,7 @@ add_system_map_addresses(struct parisc_device *dev, int num_addrs,
long status;
struct pdc_system_map_addr_info addr_result;
- dev->addr = kmalloc_objs(*dev->addr, num_addrs, GFP_KERNEL);
+ dev->addr = kmalloc_objs(*dev->addr, num_addrs);
if(!dev->addr) {
printk(KERN_ERR "%s %s(): memory allocation failure\n",
__FILE__, __func__);
diff --git a/arch/parisc/kernel/processor.c b/arch/parisc/kernel/processor.c
index 742e831de73c..d09be22babdb 100644
--- a/arch/parisc/kernel/processor.c
+++ b/arch/parisc/kernel/processor.c
@@ -110,7 +110,7 @@ static int __init processor_probe(struct parisc_device *dev)
unsigned long bytecnt;
pdc_pat_cell_mod_maddr_block_t *pa_pdc_cell;
- pa_pdc_cell = kmalloc_obj(*pa_pdc_cell, GFP_KERNEL);
+ pa_pdc_cell = kmalloc_obj(*pa_pdc_cell);
if (!pa_pdc_cell)
panic("couldn't allocate memory for PDC_PAT_CELL!");
diff --git a/arch/parisc/kernel/vdso.c b/arch/parisc/kernel/vdso.c
index a91a6a67d680..54c18574424a 100644
--- a/arch/parisc/kernel/vdso.c
+++ b/arch/parisc/kernel/vdso.c
@@ -102,7 +102,7 @@ static struct page ** __init vdso_setup_pages(void *start, void *end)
struct page **pagelist;
int i;
- pagelist = kzalloc_objs(struct page *, pages + 1, GFP_KERNEL);
+ pagelist = kzalloc_objs(struct page *, pages + 1);
if (!pagelist)
panic("%s: Cannot allocate page list for VDSO", __func__);
for (i = 0; i < pages; i++)
diff --git a/arch/parisc/net/bpf_jit_core.c b/arch/parisc/net/bpf_jit_core.c
index af852116adf8..a5eb6b51e27a 100644
--- a/arch/parisc/net/bpf_jit_core.c
+++ b/arch/parisc/net/bpf_jit_core.c
@@ -63,7 +63,7 @@ struct bpf_prog *bpf_int_jit_compile(struct bpf_prog *prog)
jit_data = prog->aux->jit_data;
if (!jit_data) {
- jit_data = kzalloc_obj(*jit_data, GFP_KERNEL);
+ jit_data = kzalloc_obj(*jit_data);
if (!jit_data) {
prog = orig_prog;
goto out;
@@ -80,7 +80,7 @@ struct bpf_prog *bpf_int_jit_compile(struct bpf_prog *prog)
}
ctx->prog = prog;
- ctx->offset = kzalloc_objs(int, prog->len, GFP_KERNEL);
+ ctx->offset = kzalloc_objs(int, prog->len);
if (!ctx->offset) {
prog = orig_prog;
goto out_offset;
diff --git a/arch/powerpc/kernel/cacheinfo.c b/arch/powerpc/kernel/cacheinfo.c
index 1298c868f9b6..90d51d9b3ed2 100644
--- a/arch/powerpc/kernel/cacheinfo.c
+++ b/arch/powerpc/kernel/cacheinfo.c
@@ -157,7 +157,7 @@ static struct cache *new_cache(int type, int level,
{
struct cache *cache;
- cache = kzalloc_obj(*cache, GFP_KERNEL);
+ cache = kzalloc_obj(*cache);
if (cache)
cache_init(cache, type, level, ofnode, group_id);
@@ -540,7 +540,7 @@ static struct cache_dir *cacheinfo_create_cache_dir(unsigned int cpu_id)
if (!kobj)
goto err;
- cache_dir = kzalloc_obj(*cache_dir, GFP_KERNEL);
+ cache_dir = kzalloc_obj(*cache_dir);
if (!cache_dir)
goto err;
@@ -788,7 +788,7 @@ static void cacheinfo_create_index_dir(struct cache *cache, int index,
struct cache_index_dir *index_dir;
int rc;
- index_dir = kzalloc_obj(*index_dir, GFP_KERNEL);
+ index_dir = kzalloc_obj(*index_dir);
if (!index_dir)
return;
diff --git a/arch/powerpc/kernel/nvram_64.c b/arch/powerpc/kernel/nvram_64.c
index 0c0d3c30432b..42b29324287c 100644
--- a/arch/powerpc/kernel/nvram_64.c
+++ b/arch/powerpc/kernel/nvram_64.c
@@ -890,7 +890,7 @@ loff_t __init nvram_create_partition(const char *name, int sig,
return -ENOSPC;
/* Create our OS partition */
- new_part = kzalloc_obj(*new_part, GFP_KERNEL);
+ new_part = kzalloc_obj(*new_part);
if (!new_part) {
pr_err("%s: kmalloc failed\n", __func__);
return -ENOMEM;
@@ -1030,7 +1030,7 @@ int __init nvram_scan_partitions(void)
"detected: 0-length partition\n");
goto out;
}
- tmp_part = kmalloc_obj(*tmp_part, GFP_KERNEL);
+ tmp_part = kmalloc_obj(*tmp_part);
err = -ENOMEM;
if (!tmp_part) {
printk(KERN_ERR "nvram_scan_partitions: kmalloc failed\n");
diff --git a/arch/powerpc/kernel/pci-common.c b/arch/powerpc/kernel/pci-common.c
index 7845c9c7f136..a7a2fb605971 100644
--- a/arch/powerpc/kernel/pci-common.c
+++ b/arch/powerpc/kernel/pci-common.c
@@ -125,7 +125,7 @@ struct pci_controller *pcibios_alloc_controller(struct device_node *dev)
{
struct pci_controller *phb;
- phb = kzalloc_obj(struct pci_controller, GFP_KERNEL);
+ phb = kzalloc_obj(struct pci_controller);
if (phb == NULL)
return NULL;
@@ -432,7 +432,7 @@ static int pci_read_irq_line(struct pci_dev *pci_dev)
struct pci_intx_virq *vi, *vitmp;
/* Preallocate vi as rewind is complex if this fails after mapping */
- vi = kzalloc_obj(struct pci_intx_virq, GFP_KERNEL);
+ vi = kzalloc_obj(struct pci_intx_virq);
if (!vi)
return -1;
@@ -1368,7 +1368,7 @@ static void __init pcibios_reserve_legacy_regions(struct pci_bus *bus)
if (!(hose->io_resource.flags & IORESOURCE_IO))
goto no_io;
offset = (unsigned long)hose->io_base_virt - _IO_BASE;
- res = kzalloc_obj(struct resource, GFP_KERNEL);
+ res = kzalloc_obj(struct resource);
BUG_ON(res == NULL);
res->name = "Legacy IO";
res->flags = IORESOURCE_IO;
@@ -1396,7 +1396,7 @@ static void __init pcibios_reserve_legacy_regions(struct pci_bus *bus)
}
if (i >= 3)
return;
- res = kzalloc_obj(struct resource, GFP_KERNEL);
+ res = kzalloc_obj(struct resource);
BUG_ON(res == NULL);
res->name = "Legacy VGA memory";
res->flags = IORESOURCE_MEM;
diff --git a/arch/powerpc/kernel/pci_dn.c b/arch/powerpc/kernel/pci_dn.c
index 25310680fcc5..a7b664befed2 100644
--- a/arch/powerpc/kernel/pci_dn.c
+++ b/arch/powerpc/kernel/pci_dn.c
@@ -130,7 +130,7 @@ static struct eeh_dev *eeh_dev_init(struct pci_dn *pdn)
struct eeh_dev *edev;
/* Allocate EEH device */
- edev = kzalloc_obj(*edev, GFP_KERNEL);
+ edev = kzalloc_obj(*edev);
if (!edev)
return NULL;
@@ -154,7 +154,7 @@ static struct pci_dn *add_one_sriov_vf_pdn(struct pci_dn *parent,
if (!parent)
return NULL;
- pdn = kzalloc_obj(*pdn, GFP_KERNEL);
+ pdn = kzalloc_obj(*pdn);
if (!pdn)
return NULL;
@@ -290,7 +290,7 @@ struct pci_dn *pci_add_device_node_info(struct pci_controller *hose,
struct eeh_dev *edev;
#endif
- pdn = kzalloc_obj(*pdn, GFP_KERNEL);
+ pdn = kzalloc_obj(*pdn);
if (pdn == NULL)
return NULL;
dn->data = pdn;
diff --git a/arch/powerpc/kernel/secvar-sysfs.c b/arch/powerpc/kernel/secvar-sysfs.c
index 6b2a7ab69d78..395399bbab2c 100644
--- a/arch/powerpc/kernel/secvar-sysfs.c
+++ b/arch/powerpc/kernel/secvar-sysfs.c
@@ -151,7 +151,7 @@ static __init int add_var(const char *name)
struct kobject *kobj;
int rc;
- kobj = kzalloc_obj(*kobj, GFP_KERNEL);
+ kobj = kzalloc_obj(*kobj);
if (!kobj)
return -ENOMEM;
diff --git a/arch/powerpc/kernel/smp-tbsync.c b/arch/powerpc/kernel/smp-tbsync.c
index 5f26c0352538..e6377ff08be9 100644
--- a/arch/powerpc/kernel/smp-tbsync.c
+++ b/arch/powerpc/kernel/smp-tbsync.c
@@ -117,7 +117,7 @@ void smp_generic_give_timebase(void)
pr_debug("Software timebase sync\n");
/* if this fails then this kernel won't work anyway... */
- tbsync = kzalloc_obj(*tbsync, GFP_KERNEL);
+ tbsync = kzalloc_obj(*tbsync);
mb();
running = 1;
diff --git a/arch/powerpc/kernel/smp.c b/arch/powerpc/kernel/smp.c
index 288763d59adb..3467f86fd78f 100644
--- a/arch/powerpc/kernel/smp.c
+++ b/arch/powerpc/kernel/smp.c
@@ -1172,7 +1172,7 @@ void __init smp_prepare_cpus(unsigned int max_cpus)
* Assumption: if boot_cpuid doesn't have a chip-id, then no
* other CPUs, will also not have chip-id.
*/
- chip_id_lookup_table = kzalloc_objs(int, idx, GFP_KERNEL);
+ chip_id_lookup_table = kzalloc_objs(int, idx);
if (chip_id_lookup_table)
memset(chip_id_lookup_table, -1, sizeof(int) * idx);
}
diff --git a/arch/powerpc/kernel/vdso.c b/arch/powerpc/kernel/vdso.c
index 2729631d9d07..d3ef251048c9 100644
--- a/arch/powerpc/kernel/vdso.c
+++ b/arch/powerpc/kernel/vdso.c
@@ -245,7 +245,7 @@ static struct page ** __init vdso_setup_pages(void *start, void *end)
struct page **pagelist;
int pages = (end - start) >> PAGE_SHIFT;
- pagelist = kzalloc_objs(struct page *, pages + 1, GFP_KERNEL);
+ pagelist = kzalloc_objs(struct page *, pages + 1);
if (!pagelist)
panic("%s: Cannot allocate page list for VDSO", __func__);
diff --git a/arch/powerpc/kvm/book3s_64_mmu_hv.c b/arch/powerpc/kvm/book3s_64_mmu_hv.c
index 347847aec315..2ccb3d138f46 100644
--- a/arch/powerpc/kvm/book3s_64_mmu_hv.c
+++ b/arch/powerpc/kvm/book3s_64_mmu_hv.c
@@ -1494,7 +1494,7 @@ int kvm_vm_ioctl_resize_hpt_prepare(struct kvm *kvm,
/* start new resize */
- resize = kzalloc_obj(*resize, GFP_KERNEL);
+ resize = kzalloc_obj(*resize);
if (!resize) {
ret = -ENOMEM;
goto out;
@@ -1943,7 +1943,7 @@ int kvm_vm_ioctl_get_htab_fd(struct kvm *kvm, struct kvm_get_htab_fd *ghf)
/* reject flags we don't recognize */
if (ghf->flags & ~(KVM_GET_HTAB_BOLTED_ONLY | KVM_GET_HTAB_WRITE))
return -EINVAL;
- ctx = kzalloc_obj(*ctx, GFP_KERNEL);
+ ctx = kzalloc_obj(*ctx);
if (!ctx)
return -ENOMEM;
kvm_get_kvm(kvm);
@@ -1985,7 +1985,7 @@ static int debugfs_htab_open(struct inode *inode, struct file *file)
struct kvm *kvm = inode->i_private;
struct debugfs_htab_state *p;
- p = kzalloc_obj(*p, GFP_KERNEL);
+ p = kzalloc_obj(*p);
if (!p)
return -ENOMEM;
diff --git a/arch/powerpc/kvm/book3s_64_mmu_radix.c b/arch/powerpc/kvm/book3s_64_mmu_radix.c
index 82af0508993c..933fc7cb9afc 100644
--- a/arch/powerpc/kvm/book3s_64_mmu_radix.c
+++ b/arch/powerpc/kvm/book3s_64_mmu_radix.c
@@ -1256,7 +1256,7 @@ static int debugfs_radix_open(struct inode *inode, struct file *file)
struct kvm *kvm = inode->i_private;
struct debugfs_radix_state *p;
- p = kzalloc_obj(*p, GFP_KERNEL);
+ p = kzalloc_obj(*p);
if (!p)
return -ENOMEM;
diff --git a/arch/powerpc/kvm/book3s_64_vio.c b/arch/powerpc/kvm/book3s_64_vio.c
index 70c73864aab8..c5f3f5b29d89 100644
--- a/arch/powerpc/kvm/book3s_64_vio.c
+++ b/arch/powerpc/kvm/book3s_64_vio.c
@@ -178,7 +178,7 @@ long kvm_spapr_tce_attach_iommu_group(struct kvm *kvm, int tablefd,
}
rcu_read_unlock();
- stit = kzalloc_obj(*stit, GFP_KERNEL);
+ stit = kzalloc_obj(*stit);
if (!stit) {
iommu_tce_table_put(tbl);
return -ENOMEM;
diff --git a/arch/powerpc/kvm/book3s_hv.c b/arch/powerpc/kvm/book3s_hv.c
index e6f6a58c5e36..08e5816fdd61 100644
--- a/arch/powerpc/kvm/book3s_hv.c
+++ b/arch/powerpc/kvm/book3s_hv.c
@@ -2790,7 +2790,7 @@ static struct kvmppc_vcore *kvmppc_vcore_create(struct kvm *kvm, int id)
{
struct kvmppc_vcore *vcore;
- vcore = kzalloc_obj(struct kvmppc_vcore, GFP_KERNEL);
+ vcore = kzalloc_obj(struct kvmppc_vcore);
if (vcore == NULL)
return NULL;
@@ -2842,7 +2842,7 @@ static int debugfs_timings_open(struct inode *inode, struct file *file)
struct kvm_vcpu *vcpu = inode->i_private;
struct debugfs_timings_state *p;
- p = kzalloc_obj(*p, GFP_KERNEL);
+ p = kzalloc_obj(*p);
if (!p)
return -ENOMEM;
@@ -5637,7 +5637,7 @@ void kvmppc_alloc_host_rm_ops(void)
if (kvmppc_host_rm_ops_hv != NULL)
return;
- ops = kzalloc_obj(struct kvmppc_host_rm_ops, GFP_KERNEL);
+ ops = kzalloc_obj(struct kvmppc_host_rm_ops);
if (!ops)
return;
@@ -5960,7 +5960,7 @@ void kvmppc_free_pimap(struct kvm *kvm)
static struct kvmppc_passthru_irqmap *kvmppc_alloc_pimap(void)
{
- return kzalloc_obj(struct kvmppc_passthru_irqmap, GFP_KERNEL);
+ return kzalloc_obj(struct kvmppc_passthru_irqmap);
}
static int kvmppc_set_passthru_irq(struct kvm *kvm, int host_irq, int guest_gsi)
diff --git a/arch/powerpc/kvm/book3s_hv_nested.c b/arch/powerpc/kvm/book3s_hv_nested.c
index 9bbac7fe2046..22e616662255 100644
--- a/arch/powerpc/kvm/book3s_hv_nested.c
+++ b/arch/powerpc/kvm/book3s_hv_nested.c
@@ -726,7 +726,7 @@ static struct kvm_nested_guest *kvmhv_alloc_nested(struct kvm *kvm, unsigned int
struct kvm_nested_guest *gp;
long shadow_lpid;
- gp = kzalloc_obj(*gp, GFP_KERNEL);
+ gp = kzalloc_obj(*gp);
if (!gp)
return NULL;
gp->l1_host = kvm;
@@ -1671,7 +1671,7 @@ static long int __kvmhv_nested_page_fault(struct kvm_vcpu *vcpu,
/* 4. Insert the pte into our shadow_pgtable */
- n_rmap = kzalloc_obj(*n_rmap, GFP_KERNEL);
+ n_rmap = kzalloc_obj(*n_rmap);
if (!n_rmap)
return RESUME_GUEST; /* Let the guest try again */
n_rmap->rmap = (n_gpa & RMAP_NESTED_GPA_MASK) |
diff --git a/arch/powerpc/kvm/book3s_hv_uvmem.c b/arch/powerpc/kvm/book3s_hv_uvmem.c
index f960294dfc79..5fbb95d90e99 100644
--- a/arch/powerpc/kvm/book3s_hv_uvmem.c
+++ b/arch/powerpc/kvm/book3s_hv_uvmem.c
@@ -249,7 +249,7 @@ int kvmppc_uvmem_slot_init(struct kvm *kvm, const struct kvm_memory_slot *slot)
{
struct kvmppc_uvmem_slot *p;
- p = kzalloc_obj(*p, GFP_KERNEL);
+ p = kzalloc_obj(*p);
if (!p)
return -ENOMEM;
p->pfns = vcalloc(slot->npages, sizeof(*p->pfns));
@@ -711,7 +711,7 @@ static struct page *kvmppc_uvmem_get_page(unsigned long gpa, struct kvm *kvm)
bitmap_set(kvmppc_uvmem_bitmap, bit, 1);
spin_unlock(&kvmppc_uvmem_bitmap_lock);
- pvt = kzalloc_obj(*pvt, GFP_KERNEL);
+ pvt = kzalloc_obj(*pvt);
if (!pvt)
goto out_clear;
diff --git a/arch/powerpc/kvm/book3s_rtas.c b/arch/powerpc/kvm/book3s_rtas.c
index d6f8f33cc98b..0507715d0fdd 100644
--- a/arch/powerpc/kvm/book3s_rtas.c
+++ b/arch/powerpc/kvm/book3s_rtas.c
@@ -183,7 +183,7 @@ static int rtas_token_define(struct kvm *kvm, char *name, u64 token)
if (!found)
return -ENOENT;
- d = kzalloc_obj(*d, GFP_KERNEL);
+ d = kzalloc_obj(*d);
if (!d)
return -ENOMEM;
diff --git a/arch/powerpc/kvm/book3s_xics.c b/arch/powerpc/kvm/book3s_xics.c
index 3ba148b1d22f..74a44fa702b0 100644
--- a/arch/powerpc/kvm/book3s_xics.c
+++ b/arch/powerpc/kvm/book3s_xics.c
@@ -1037,7 +1037,7 @@ static struct kvmppc_ics *kvmppc_xics_create_ics(struct kvm *kvm,
goto out;
/* Create the ICS */
- ics = kzalloc_obj(struct kvmppc_ics, GFP_KERNEL);
+ ics = kzalloc_obj(struct kvmppc_ics);
if (!ics)
goto out;
@@ -1069,7 +1069,7 @@ static int kvmppc_xics_create_icp(struct kvm_vcpu *vcpu, unsigned long server_nu
if (kvmppc_xics_find_server(vcpu->kvm, server_num))
return -EEXIST;
- icp = kzalloc_obj(struct kvmppc_icp, GFP_KERNEL);
+ icp = kzalloc_obj(struct kvmppc_icp);
if (!icp)
return -ENOMEM;
@@ -1388,7 +1388,7 @@ static struct kvmppc_xics *kvmppc_xics_get_device(struct kvm *kvm)
struct kvmppc_xics *xics = *kvm_xics_device;
if (!xics) {
- xics = kzalloc_obj(*xics, GFP_KERNEL);
+ xics = kzalloc_obj(*xics);
*kvm_xics_device = xics;
} else {
memset(xics, 0, sizeof(*xics));
diff --git a/arch/powerpc/kvm/book3s_xive.c b/arch/powerpc/kvm/book3s_xive.c
index ae69a1e1dd17..1d67237783b7 100644
--- a/arch/powerpc/kvm/book3s_xive.c
+++ b/arch/powerpc/kvm/book3s_xive.c
@@ -1924,7 +1924,7 @@ int kvmppc_xive_connect_vcpu(struct kvm_device *dev,
if (r)
goto bail;
- xc = kzalloc_obj(*xc, GFP_KERNEL);
+ xc = kzalloc_obj(*xc);
if (!xc) {
r = -ENOMEM;
goto bail;
@@ -2276,7 +2276,7 @@ struct kvmppc_xive_src_block *kvmppc_xive_create_src_block(
goto out;
/* Create the ICS */
- sb = kzalloc_obj(*sb, GFP_KERNEL);
+ sb = kzalloc_obj(*sb);
if (!sb)
goto out;
@@ -2719,7 +2719,7 @@ struct kvmppc_xive *kvmppc_xive_get_device(struct kvm *kvm, u32 type)
struct kvmppc_xive *xive = *kvm_xive_device;
if (!xive) {
- xive = kzalloc_obj(*xive, GFP_KERNEL);
+ xive = kzalloc_obj(*xive);
*kvm_xive_device = xive;
} else {
memset(xive, 0, sizeof(*xive));
diff --git a/arch/powerpc/kvm/book3s_xive_native.c b/arch/powerpc/kvm/book3s_xive_native.c
index 179bd6094d62..728b5606dd14 100644
--- a/arch/powerpc/kvm/book3s_xive_native.c
+++ b/arch/powerpc/kvm/book3s_xive_native.c
@@ -145,7 +145,7 @@ int kvmppc_xive_native_connect_vcpu(struct kvm_device *dev,
if (rc)
goto bail;
- xc = kzalloc_obj(*xc, GFP_KERNEL);
+ xc = kzalloc_obj(*xc);
if (!xc) {
rc = -ENOMEM;
goto bail;
diff --git a/arch/powerpc/kvm/e500.c b/arch/powerpc/kvm/e500.c
index 891c936af1df..c58a5a5fb64c 100644
--- a/arch/powerpc/kvm/e500.c
+++ b/arch/powerpc/kvm/e500.c
@@ -119,7 +119,7 @@ static inline void local_sid_destroy_all(void)
static void *kvmppc_e500_id_table_alloc(struct kvmppc_vcpu_e500 *vcpu_e500)
{
- vcpu_e500->idt = kzalloc_obj(struct vcpu_id_table, GFP_KERNEL);
+ vcpu_e500->idt = kzalloc_obj(struct vcpu_id_table);
return vcpu_e500->idt;
}
diff --git a/arch/powerpc/kvm/e500_mmu.c b/arch/powerpc/kvm/e500_mmu.c
index ecbd7c4cd93d..13bcadccb2b7 100644
--- a/arch/powerpc/kvm/e500_mmu.c
+++ b/arch/powerpc/kvm/e500_mmu.c
@@ -772,7 +772,7 @@ int kvm_vcpu_ioctl_config_tlb(struct kvm_vcpu *vcpu,
num_pages = DIV_ROUND_UP(cfg->array + array_len - 1, PAGE_SIZE) -
cfg->array / PAGE_SIZE;
- pages = kmalloc_objs(*pages, num_pages, GFP_KERNEL);
+ pages = kmalloc_objs(*pages, num_pages);
if (!pages)
return -ENOMEM;
@@ -792,13 +792,13 @@ int kvm_vcpu_ioctl_config_tlb(struct kvm_vcpu *vcpu,
goto put_pages;
}
- privs[0] = kzalloc_objs(*privs[0], params.tlb_sizes[0], GFP_KERNEL);
+ privs[0] = kzalloc_objs(*privs[0], params.tlb_sizes[0]);
if (!privs[0]) {
ret = -ENOMEM;
goto put_pages;
}
- privs[1] = kzalloc_objs(*privs[1], params.tlb_sizes[1], GFP_KERNEL);
+ privs[1] = kzalloc_objs(*privs[1], params.tlb_sizes[1]);
if (!privs[1]) {
ret = -ENOMEM;
goto free_privs_first;
diff --git a/arch/powerpc/kvm/mpic.c b/arch/powerpc/kvm/mpic.c
index a8ee6204cc08..3070f36d9fb8 100644
--- a/arch/powerpc/kvm/mpic.c
+++ b/arch/powerpc/kvm/mpic.c
@@ -1642,7 +1642,7 @@ static int mpic_set_default_irq_routing(struct openpic *opp)
struct kvm_irq_routing_entry *routing;
/* Create a nop default map, so that dereferencing it still works */
- routing = kzalloc_obj(*routing, GFP_KERNEL);
+ routing = kzalloc_obj(*routing);
if (!routing)
return -ENOMEM;
@@ -1661,7 +1661,7 @@ static int mpic_create(struct kvm_device *dev, u32 type)
if (dev->kvm->arch.mpic)
return -EINVAL;
- opp = kzalloc_obj(struct openpic, GFP_KERNEL);
+ opp = kzalloc_obj(struct openpic);
if (!opp)
return -ENOMEM;
diff --git a/arch/powerpc/mm/book3s64/iommu_api.c b/arch/powerpc/mm/book3s64/iommu_api.c
index f9aa4e08b5bb..60d00c9e7f19 100644
--- a/arch/powerpc/mm/book3s64/iommu_api.c
+++ b/arch/powerpc/mm/book3s64/iommu_api.c
@@ -70,7 +70,7 @@ static long mm_iommu_do_alloc(struct mm_struct *mm, unsigned long ua,
locked_entries = entries;
}
- mem = kzalloc_obj(*mem, GFP_KERNEL);
+ mem = kzalloc_obj(*mem);
if (!mem) {
ret = -ENOMEM;
goto unlock_exit;
diff --git a/arch/powerpc/mm/book3s64/subpage_prot.c b/arch/powerpc/mm/book3s64/subpage_prot.c
index 240880a38965..37d47282c368 100644
--- a/arch/powerpc/mm/book3s64/subpage_prot.c
+++ b/arch/powerpc/mm/book3s64/subpage_prot.c
@@ -221,7 +221,7 @@ SYSCALL_DEFINE3(subpage_prot, unsigned long, addr,
* Allocate subpage prot table if not already done.
* Do this with mmap_lock held
*/
- spt = kzalloc_obj(struct subpage_prot_table, GFP_KERNEL);
+ spt = kzalloc_obj(struct subpage_prot_table);
if (!spt) {
err = -ENOMEM;
goto out;
diff --git a/arch/powerpc/mm/drmem.c b/arch/powerpc/mm/drmem.c
index 45c1d47ec458..f168ff5a2b30 100644
--- a/arch/powerpc/mm/drmem.c
+++ b/arch/powerpc/mm/drmem.c
@@ -41,7 +41,7 @@ static struct property *clone_property(struct property *prop, u32 prop_sz)
{
struct property *new_prop;
- new_prop = kzalloc_obj(*new_prop, GFP_KERNEL);
+ new_prop = kzalloc_obj(*new_prop);
if (!new_prop)
return NULL;
@@ -430,7 +430,7 @@ static void __init init_drmem_v1_lmbs(const __be32 *prop)
if (drmem_info->n_lmbs == 0)
return;
- drmem_info->lmbs = kzalloc_objs(*lmb, drmem_info->n_lmbs, GFP_KERNEL);
+ drmem_info->lmbs = kzalloc_objs(*lmb, drmem_info->n_lmbs);
if (!drmem_info->lmbs)
return;
@@ -457,7 +457,7 @@ static void __init init_drmem_v2_lmbs(const __be32 *prop)
drmem_info->n_lmbs += dr_cell.seq_lmbs;
}
- drmem_info->lmbs = kzalloc_objs(*lmb, drmem_info->n_lmbs, GFP_KERNEL);
+ drmem_info->lmbs = kzalloc_objs(*lmb, drmem_info->n_lmbs);
if (!drmem_info->lmbs)
return;
diff --git a/arch/powerpc/mm/mem.c b/arch/powerpc/mm/mem.c
index bab22aabbb9b..a985fc96b953 100644
--- a/arch/powerpc/mm/mem.c
+++ b/arch/powerpc/mm/mem.c
@@ -318,7 +318,7 @@ static int __init add_system_ram_resources(void)
for_each_mem_range(i, &start, &end) {
struct resource *res;
- res = kzalloc_obj(struct resource, GFP_KERNEL);
+ res = kzalloc_obj(struct resource);
WARN_ON(!res);
if (res) {
diff --git a/arch/powerpc/net/bpf_jit_comp.c b/arch/powerpc/net/bpf_jit_comp.c
index baf5b6e69647..52162e4a7f84 100644
--- a/arch/powerpc/net/bpf_jit_comp.c
+++ b/arch/powerpc/net/bpf_jit_comp.c
@@ -165,7 +165,7 @@ struct bpf_prog *bpf_int_jit_compile(struct bpf_prog *fp)
jit_data = fp->aux->jit_data;
if (!jit_data) {
- jit_data = kzalloc_obj(*jit_data, GFP_KERNEL);
+ jit_data = kzalloc_obj(*jit_data);
if (!jit_data) {
fp = org_fp;
goto out;
diff --git a/arch/powerpc/perf/hv-24x7.c b/arch/powerpc/perf/hv-24x7.c
index 210d16c76b40..8a8d8c2b8930 100644
--- a/arch/powerpc/perf/hv-24x7.c
+++ b/arch/powerpc/perf/hv-24x7.c
@@ -451,7 +451,7 @@ static ssize_t coresperchip_show(struct device *dev,
static struct attribute *device_str_attr_create_(char *name, char *str)
{
- struct dev_ext_attribute *attr = kzalloc_obj(*attr, GFP_KERNEL);
+ struct dev_ext_attribute *attr = kzalloc_obj(*attr);
if (!attr)
return NULL;
@@ -647,7 +647,7 @@ static int event_uniq_add(struct rb_root *root, const char *name, int nl,
}
}
- data = kmalloc_obj(*data, GFP_KERNEL);
+ data = kmalloc_obj(*data);
if (!data)
return -ENOMEM;
@@ -905,13 +905,13 @@ static int create_events_from_catalog(struct attribute ***events_,
pr_warn("event buffer ended before listed # of events were parsed (got %zu, wanted %zu, junk %zu)\n",
event_idx_last, event_entry_count, junk_events);
- events = kmalloc_objs(*events, attr_max + 1, GFP_KERNEL);
+ events = kmalloc_objs(*events, attr_max + 1);
if (!events) {
ret = -ENOMEM;
goto e_event_data;
}
- event_descs = kmalloc_objs(*event_descs, event_idx + 1, GFP_KERNEL);
+ event_descs = kmalloc_objs(*event_descs, event_idx + 1);
if (!event_descs) {
ret = -ENOMEM;
goto e_event_attrs;
diff --git a/arch/powerpc/perf/hv-gpci.c b/arch/powerpc/perf/hv-gpci.c
index 11e774857030..5cac2cf3bd1e 100644
--- a/arch/powerpc/perf/hv-gpci.c
+++ b/arch/powerpc/perf/hv-gpci.c
@@ -910,7 +910,7 @@ static struct device_attribute *sysinfo_device_attr_create(int
* attribute array, only for valid return types.
*/
if (!ret || ret == H_AUTHORITY || ret == H_PARAMETER) {
- attr = kzalloc_obj(*attr, GFP_KERNEL);
+ attr = kzalloc_obj(*attr);
if (!attr)
return NULL;
diff --git a/arch/powerpc/perf/imc-pmu.c b/arch/powerpc/perf/imc-pmu.c
index c4b2c0a19f58..e3cb23906fcd 100644
--- a/arch/powerpc/perf/imc-pmu.c
+++ b/arch/powerpc/perf/imc-pmu.c
@@ -136,7 +136,7 @@ static struct attribute *device_str_attr_create(const char *name, const char *st
{
struct perf_pmu_events_attr *attr;
- attr = kzalloc_obj(*attr, GFP_KERNEL);
+ attr = kzalloc_obj(*attr);
if (!attr)
return NULL;
sysfs_attr_init(&attr->attr.attr);
@@ -257,7 +257,7 @@ static int update_events_in_group(struct device_node *node, struct imc_pmu *pmu)
of_property_read_u32(node, "reg", &base_reg);
/* Allocate memory for the events */
- pmu->events = kzalloc_objs(struct imc_events, ct, GFP_KERNEL);
+ pmu->events = kzalloc_objs(struct imc_events, ct);
if (!pmu->events) {
of_node_put(pmu_events);
return -ENOMEM;
@@ -274,7 +274,7 @@ static int update_events_in_group(struct device_node *node, struct imc_pmu *pmu)
of_node_put(pmu_events);
/* Allocate memory for attribute group */
- attr_group = kzalloc_obj(*attr_group, GFP_KERNEL);
+ attr_group = kzalloc_obj(*attr_group);
if (!attr_group) {
imc_free_events(pmu->events, ct);
return -ENOMEM;
@@ -288,7 +288,7 @@ static int update_events_in_group(struct device_node *node, struct imc_pmu *pmu)
* So allocate three times the "ct" (this includes event, event_scale and
* event_unit).
*/
- attrs = kzalloc_objs(struct attribute *, ((ct * 3) + 1), GFP_KERNEL);
+ attrs = kzalloc_objs(struct attribute *, ((ct * 3) + 1));
if (!attrs) {
kfree(attr_group);
imc_free_events(pmu->events, ct);
diff --git a/arch/powerpc/perf/vpa-dtl.c b/arch/powerpc/perf/vpa-dtl.c
index ab19101a8928..3e3d65b6c796 100644
--- a/arch/powerpc/perf/vpa-dtl.c
+++ b/arch/powerpc/perf/vpa-dtl.c
@@ -523,7 +523,7 @@ static void *vpa_dtl_setup_aux(struct perf_event *event, void **pages,
if (!buf)
return NULL;
- pglist = kzalloc_objs(*pglist, nr_pages, GFP_KERNEL);
+ pglist = kzalloc_objs(*pglist, nr_pages);
if (!pglist)
return NULL;
diff --git a/arch/powerpc/platforms/44x/hsta_msi.c b/arch/powerpc/platforms/44x/hsta_msi.c
index a6b1c004888e..0f61bd446ce2 100644
--- a/arch/powerpc/platforms/44x/hsta_msi.c
+++ b/arch/powerpc/platforms/44x/hsta_msi.c
@@ -151,7 +151,7 @@ static int hsta_msi_probe(struct platform_device *pdev)
if (ret)
goto out;
- ppc4xx_hsta_msi.irq_map = kmalloc_objs(int, irq_count, GFP_KERNEL);
+ ppc4xx_hsta_msi.irq_map = kmalloc_objs(int, irq_count);
if (!ppc4xx_hsta_msi.irq_map) {
ret = -ENOMEM;
goto out1;
diff --git a/arch/powerpc/platforms/44x/pci.c b/arch/powerpc/platforms/44x/pci.c
index 6ac53865b872..e454b48fa9db 100644
--- a/arch/powerpc/platforms/44x/pci.c
+++ b/arch/powerpc/platforms/44x/pci.c
@@ -1339,7 +1339,7 @@ static int __init ppc4xx_pciex_check_core_init(struct device_node *np)
count = ppc4xx_pciex_hwops->core_init(np);
if (count > 0) {
ppc4xx_pciex_ports =
- kzalloc_objs(struct ppc4xx_pciex_port, count, GFP_KERNEL);
+ kzalloc_objs(struct ppc4xx_pciex_port, count);
if (ppc4xx_pciex_ports) {
ppc4xx_pciex_port_count = count;
return 0;
diff --git a/arch/powerpc/platforms/44x/uic.c b/arch/powerpc/platforms/44x/uic.c
index a484474df432..cf4fc5263c89 100644
--- a/arch/powerpc/platforms/44x/uic.c
+++ b/arch/powerpc/platforms/44x/uic.c
@@ -233,7 +233,7 @@ static struct uic * __init uic_init_one(struct device_node *node)
BUG_ON(! of_device_is_compatible(node, "ibm,uic"));
- uic = kzalloc_obj(*uic, GFP_KERNEL);
+ uic = kzalloc_obj(*uic);
if (! uic)
return NULL; /* FIXME: panic? */
diff --git a/arch/powerpc/platforms/83xx/mcu_mpc8349emitx.c b/arch/powerpc/platforms/83xx/mcu_mpc8349emitx.c
index d8cdd077a554..9b693594a5f7 100644
--- a/arch/powerpc/platforms/83xx/mcu_mpc8349emitx.c
+++ b/arch/powerpc/platforms/83xx/mcu_mpc8349emitx.c
@@ -146,7 +146,7 @@ static int mcu_probe(struct i2c_client *client)
struct mcu *mcu;
int ret;
- mcu = kzalloc_obj(*mcu, GFP_KERNEL);
+ mcu = kzalloc_obj(*mcu);
if (!mcu)
return -ENOMEM;
diff --git a/arch/powerpc/platforms/book3s/vas-api.c b/arch/powerpc/platforms/book3s/vas-api.c
index 6f6c9d776dd7..ea4ffa63f043 100644
--- a/arch/powerpc/platforms/book3s/vas-api.c
+++ b/arch/powerpc/platforms/book3s/vas-api.c
@@ -266,7 +266,7 @@ static int coproc_open(struct inode *inode, struct file *fp)
{
struct coproc_instance *cp_inst;
- cp_inst = kzalloc_obj(*cp_inst, GFP_KERNEL);
+ cp_inst = kzalloc_obj(*cp_inst);
if (!cp_inst)
return -ENOMEM;
diff --git a/arch/powerpc/platforms/cell/spu_base.c b/arch/powerpc/platforms/cell/spu_base.c
index 2c536040ae0a..0ec7b3bdda56 100644
--- a/arch/powerpc/platforms/cell/spu_base.c
+++ b/arch/powerpc/platforms/cell/spu_base.c
@@ -558,7 +558,7 @@ static int __init create_spu(void *data)
unsigned long flags;
ret = -ENOMEM;
- spu = kzalloc_obj(*spu, GFP_KERNEL);
+ spu = kzalloc_obj(*spu);
if (!spu)
goto out;
diff --git a/arch/powerpc/platforms/cell/spufs/context.c b/arch/powerpc/platforms/cell/spufs/context.c
index ade2a5e041a3..44377dfff1f8 100644
--- a/arch/powerpc/platforms/cell/spufs/context.c
+++ b/arch/powerpc/platforms/cell/spufs/context.c
@@ -26,7 +26,7 @@ struct spu_context *alloc_spu_context(struct spu_gang *gang)
{
struct spu_context *ctx;
- ctx = kzalloc_obj(*ctx, GFP_KERNEL);
+ ctx = kzalloc_obj(*ctx);
if (!ctx)
goto out;
/* Binding to physical processor deferred
diff --git a/arch/powerpc/platforms/cell/spufs/file.c b/arch/powerpc/platforms/cell/spufs/file.c
index 60d9b9154997..d4665daa34c2 100644
--- a/arch/powerpc/platforms/cell/spufs/file.c
+++ b/arch/powerpc/platforms/cell/spufs/file.c
@@ -47,7 +47,7 @@ static int spufs_attr_open(struct inode *inode, struct file *file,
{
struct spufs_attr *attr;
- attr = kmalloc_obj(*attr, GFP_KERNEL);
+ attr = kmalloc_obj(*attr);
if (!attr)
return -ENOMEM;
diff --git a/arch/powerpc/platforms/cell/spufs/gang.c b/arch/powerpc/platforms/cell/spufs/gang.c
index 6ab8122bc833..572c4bf8e512 100644
--- a/arch/powerpc/platforms/cell/spufs/gang.c
+++ b/arch/powerpc/platforms/cell/spufs/gang.c
@@ -16,7 +16,7 @@ struct spu_gang *alloc_spu_gang(void)
{
struct spu_gang *gang;
- gang = kzalloc_obj(*gang, GFP_KERNEL);
+ gang = kzalloc_obj(*gang);
if (!gang)
goto out;
diff --git a/arch/powerpc/platforms/cell/spufs/inode.c b/arch/powerpc/platforms/cell/spufs/inode.c
index 419ce7fee040..2b54afb31529 100644
--- a/arch/powerpc/platforms/cell/spufs/inode.c
+++ b/arch/powerpc/platforms/cell/spufs/inode.c
@@ -727,11 +727,11 @@ static int spufs_init_fs_context(struct fs_context *fc)
struct spufs_fs_context *ctx;
struct spufs_sb_info *sbi;
- ctx = kzalloc_obj(struct spufs_fs_context, GFP_KERNEL);
+ ctx = kzalloc_obj(struct spufs_fs_context);
if (!ctx)
goto nomem;
- sbi = kzalloc_obj(struct spufs_sb_info, GFP_KERNEL);
+ sbi = kzalloc_obj(struct spufs_sb_info);
if (!sbi)
goto nomem_ctx;
diff --git a/arch/powerpc/platforms/cell/spufs/sched.c b/arch/powerpc/platforms/cell/spufs/sched.c
index f61fa34b62f1..c52af883e01c 100644
--- a/arch/powerpc/platforms/cell/spufs/sched.c
+++ b/arch/powerpc/platforms/cell/spufs/sched.c
@@ -1082,7 +1082,7 @@ int __init spu_sched_init(void)
struct proc_dir_entry *entry;
int err = -ENOMEM, i;
- spu_prio = kzalloc_obj(struct spu_prio_array, GFP_KERNEL);
+ spu_prio = kzalloc_obj(struct spu_prio_array);
if (!spu_prio)
goto out;
diff --git a/arch/powerpc/platforms/pasemi/gpio_mdio.c b/arch/powerpc/platforms/pasemi/gpio_mdio.c
index fd31677b38e2..9b7bc8efe8f7 100644
--- a/arch/powerpc/platforms/pasemi/gpio_mdio.c
+++ b/arch/powerpc/platforms/pasemi/gpio_mdio.c
@@ -214,7 +214,7 @@ static int gpio_mdio_probe(struct platform_device *ofdev)
int err;
err = -ENOMEM;
- priv = kzalloc_obj(struct gpio_priv, GFP_KERNEL);
+ priv = kzalloc_obj(struct gpio_priv);
if (!priv)
goto out;
diff --git a/arch/powerpc/platforms/powermac/low_i2c.c b/arch/powerpc/platforms/powermac/low_i2c.c
index ec4b03fbfab2..73b7f4e8c047 100644
--- a/arch/powerpc/platforms/powermac/low_i2c.c
+++ b/arch/powerpc/platforms/powermac/low_i2c.c
@@ -489,7 +489,7 @@ static struct pmac_i2c_host_kw *__init kw_i2c_host_init(struct device_node *np)
const u32 *psteps, *prate, *addrp;
u32 steps;
- host = kzalloc_obj(*host, GFP_KERNEL);
+ host = kzalloc_obj(*host);
if (host == NULL) {
printk(KERN_ERR "low_i2c: Can't allocate host for %pOF\n",
np);
@@ -569,7 +569,7 @@ static void __init kw_i2c_add(struct pmac_i2c_host_kw *host,
{
struct pmac_i2c_bus *bus;
- bus = kzalloc_obj(struct pmac_i2c_bus, GFP_KERNEL);
+ bus = kzalloc_obj(struct pmac_i2c_bus);
if (bus == NULL)
return;
@@ -1254,7 +1254,7 @@ static void* pmac_i2c_do_begin(struct pmf_function *func, struct pmf_args *args)
* near OOM that need to be resolved, the allocator itself should
* probably make GFP_NOIO implicit during suspend
*/
- inst = kzalloc_obj(struct pmac_i2c_pf_inst, GFP_KERNEL);
+ inst = kzalloc_obj(struct pmac_i2c_pf_inst);
if (inst == NULL) {
pmac_i2c_close(bus);
return NULL;
diff --git a/arch/powerpc/platforms/powermac/pfunc_core.c b/arch/powerpc/platforms/powermac/pfunc_core.c
index d1e2e557de15..c76b9d501d3a 100644
--- a/arch/powerpc/platforms/powermac/pfunc_core.c
+++ b/arch/powerpc/platforms/powermac/pfunc_core.c
@@ -644,7 +644,7 @@ static int pmf_add_function_prop(struct pmf_device *dev, void *driverdata,
while (length >= 12) {
/* Allocate a structure */
- func = kzalloc_obj(*func, GFP_KERNEL);
+ func = kzalloc_obj(*func);
if (func == NULL)
goto bail;
kref_init(&func->ref);
@@ -720,7 +720,7 @@ int pmf_register_driver(struct device_node *np,
return -EBUSY;
}
- dev = kzalloc_obj(*dev, GFP_KERNEL);
+ dev = kzalloc_obj(*dev);
if (dev == NULL) {
DBG("pmf: no memory !\n");
return -ENOMEM;
diff --git a/arch/powerpc/platforms/powernv/ocxl.c b/arch/powerpc/platforms/powernv/ocxl.c
index 5ae7e3960364..6192caaf85e6 100644
--- a/arch/powerpc/platforms/powernv/ocxl.c
+++ b/arch/powerpc/platforms/powernv/ocxl.c
@@ -149,7 +149,7 @@ static struct npu_link *find_link(struct pci_dev *dev)
}
/* link doesn't exist yet. Allocate one */
- link = kzalloc_obj(struct npu_link, GFP_KERNEL);
+ link = kzalloc_obj(struct npu_link);
if (!link)
return NULL;
link->domain = pci_domain_nr(dev->bus);
@@ -439,7 +439,7 @@ int pnv_ocxl_spa_setup(struct pci_dev *dev, void *spa_mem, int PE_mask,
u32 bdfn;
int rc;
- data = kzalloc_obj(*data, GFP_KERNEL);
+ data = kzalloc_obj(*data);
if (!data)
return -ENOMEM;
diff --git a/arch/powerpc/platforms/powernv/opal-core.c b/arch/powerpc/platforms/powernv/opal-core.c
index 4f1533bcaa10..e76e462f55f6 100644
--- a/arch/powerpc/platforms/powernv/opal-core.c
+++ b/arch/powerpc/platforms/powernv/opal-core.c
@@ -81,7 +81,7 @@ bool kernel_initiated;
static struct opalcore * __init get_new_element(void)
{
- return kzalloc_obj(struct opalcore, GFP_KERNEL);
+ return kzalloc_obj(struct opalcore);
}
static inline int is_opalcore_usable(void)
@@ -497,7 +497,7 @@ static void __init opalcore_config_init(void)
opalc_cpu_metadata = __va(addr);
/* Allocate memory for config buffer */
- oc_conf = kzalloc_obj(struct opalcore_config, GFP_KERNEL);
+ oc_conf = kzalloc_obj(struct opalcore_config);
if (oc_conf == NULL)
goto error_out;
diff --git a/arch/powerpc/platforms/powernv/opal-dump.c b/arch/powerpc/platforms/powernv/opal-dump.c
index a832afb4cbf5..2e4bffa74163 100644
--- a/arch/powerpc/platforms/powernv/opal-dump.c
+++ b/arch/powerpc/platforms/powernv/opal-dump.c
@@ -329,7 +329,7 @@ static void create_dump_obj(uint32_t id, size_t size, uint32_t type)
struct dump_obj *dump;
int rc;
- dump = kzalloc_obj(*dump, GFP_KERNEL);
+ dump = kzalloc_obj(*dump);
if (!dump)
return;
diff --git a/arch/powerpc/platforms/powernv/opal-elog.c b/arch/powerpc/platforms/powernv/opal-elog.c
index 39e9eb162ed7..2b8331922ab9 100644
--- a/arch/powerpc/platforms/powernv/opal-elog.c
+++ b/arch/powerpc/platforms/powernv/opal-elog.c
@@ -190,7 +190,7 @@ static void create_elog_obj(uint64_t id, size_t size, uint64_t type)
struct elog_obj *elog;
int rc;
- elog = kzalloc_obj(*elog, GFP_KERNEL);
+ elog = kzalloc_obj(*elog);
if (!elog)
return;
diff --git a/arch/powerpc/platforms/powernv/opal-imc.c b/arch/powerpc/platforms/powernv/opal-imc.c
index c57525c1fecd..ed2842bea1cb 100644
--- a/arch/powerpc/platforms/powernv/opal-imc.c
+++ b/arch/powerpc/platforms/powernv/opal-imc.c
@@ -146,7 +146,7 @@ static struct imc_pmu *imc_pmu_create(struct device_node *parent, int pmu_index,
return NULL;
/* memory for pmu */
- pmu_ptr = kzalloc_obj(*pmu_ptr, GFP_KERNEL);
+ pmu_ptr = kzalloc_obj(*pmu_ptr);
if (!pmu_ptr)
return NULL;
diff --git a/arch/powerpc/platforms/powernv/opal-irqchip.c b/arch/powerpc/platforms/powernv/opal-irqchip.c
index 7cf5cae6ef42..fc0a1eae59c5 100644
--- a/arch/powerpc/platforms/powernv/opal-irqchip.c
+++ b/arch/powerpc/platforms/powernv/opal-irqchip.c
@@ -221,7 +221,7 @@ int __init opal_event_init(void)
opal_irq_count, old_style ? "old" : "new");
/* Allocate an IRQ resources array */
- opal_irqs = kzalloc_objs(struct resource, opal_irq_count, GFP_KERNEL);
+ opal_irqs = kzalloc_objs(struct resource, opal_irq_count);
if (WARN_ON(!opal_irqs)) {
rc = -ENOMEM;
goto out;
diff --git a/arch/powerpc/platforms/powernv/opal-lpc.c b/arch/powerpc/platforms/powernv/opal-lpc.c
index c41ca500669d..2bb326b58ff8 100644
--- a/arch/powerpc/platforms/powernv/opal-lpc.c
+++ b/arch/powerpc/platforms/powernv/opal-lpc.c
@@ -355,7 +355,7 @@ static int opal_lpc_debugfs_create_type(struct dentry *folder,
enum OpalLPCAddressType type)
{
struct lpc_debugfs_entry *entry;
- entry = kzalloc_obj(*entry, GFP_KERNEL);
+ entry = kzalloc_obj(*entry);
if (!entry)
return -ENOMEM;
entry->lpc_type = type;
diff --git a/arch/powerpc/platforms/powernv/opal-powercap.c b/arch/powerpc/platforms/powernv/opal-powercap.c
index d530ac77b0e2..0e297d70647f 100644
--- a/arch/powerpc/platforms/powernv/opal-powercap.c
+++ b/arch/powerpc/platforms/powernv/opal-powercap.c
@@ -150,7 +150,7 @@ void __init opal_powercap_init(void)
return;
}
- pcaps = kzalloc_objs(*pcaps, of_get_child_count(powercap), GFP_KERNEL);
+ pcaps = kzalloc_objs(*pcaps, of_get_child_count(powercap));
if (!pcaps)
goto out_put_powercap;
diff --git a/arch/powerpc/platforms/powernv/opal-sensor-groups.c b/arch/powerpc/platforms/powernv/opal-sensor-groups.c
index c91e48d773ff..2a3474246908 100644
--- a/arch/powerpc/platforms/powernv/opal-sensor-groups.c
+++ b/arch/powerpc/platforms/powernv/opal-sensor-groups.c
@@ -168,7 +168,7 @@ void __init opal_sensor_groups_init(void)
return;
}
- sgs = kzalloc_objs(*sgs, of_get_child_count(sg), GFP_KERNEL);
+ sgs = kzalloc_objs(*sgs, of_get_child_count(sg));
if (!sgs)
goto out_sg_put;
diff --git a/arch/powerpc/platforms/powernv/opal-sysparam.c b/arch/powerpc/platforms/powernv/opal-sysparam.c
index 358d1b8a3e86..7fe6433517ca 100644
--- a/arch/powerpc/platforms/powernv/opal-sysparam.c
+++ b/arch/powerpc/platforms/powernv/opal-sysparam.c
@@ -222,7 +222,7 @@ void __init opal_sys_param_init(void)
goto out_free_perm;
}
- attr = kzalloc_objs(*attr, count, GFP_KERNEL);
+ attr = kzalloc_objs(*attr, count);
if (!attr) {
pr_err("SYSPARAM: Failed to allocate memory for parameter "
"attributes\n");
diff --git a/arch/powerpc/platforms/powernv/opal-xscom.c b/arch/powerpc/platforms/powernv/opal-xscom.c
index bd788d62af5f..2ad5787a922f 100644
--- a/arch/powerpc/platforms/powernv/opal-xscom.c
+++ b/arch/powerpc/platforms/powernv/opal-xscom.c
@@ -158,7 +158,7 @@ static int scom_debug_init_one(struct dentry *root, struct device_node *dn,
struct scom_debug_entry *ent;
struct dentry *dir;
- ent = kzalloc_obj(*ent, GFP_KERNEL);
+ ent = kzalloc_obj(*ent);
if (!ent)
return -ENOMEM;
diff --git a/arch/powerpc/platforms/powernv/opal.c b/arch/powerpc/platforms/powernv/opal.c
index b1b1d3496739..1946dbdc9fa1 100644
--- a/arch/powerpc/platforms/powernv/opal.c
+++ b/arch/powerpc/platforms/powernv/opal.c
@@ -801,7 +801,7 @@ static int opal_add_one_export(struct kobject *parent, const char *export_name,
if (rc)
goto out;
- attr = kzalloc_obj(*attr, GFP_KERNEL);
+ attr = kzalloc_obj(*attr);
if (!attr) {
rc = -ENOMEM;
goto out;
diff --git a/arch/powerpc/platforms/powernv/pci-ioda.c b/arch/powerpc/platforms/powernv/pci-ioda.c
index d77ff328eb37..885392f4cd94 100644
--- a/arch/powerpc/platforms/powernv/pci-ioda.c
+++ b/arch/powerpc/platforms/powernv/pci-ioda.c
@@ -2522,7 +2522,7 @@ static void __init pnv_pci_init_ioda_phb(struct device_node *np,
phb_id = be64_to_cpup(prop64);
pr_debug(" PHB-ID : 0x%016llx\n", phb_id);
- phb = kzalloc_obj(*phb, GFP_KERNEL);
+ phb = kzalloc_obj(*phb);
if (!phb)
panic("%s: Failed to allocate %zu bytes\n", __func__,
sizeof(*phb));
diff --git a/arch/powerpc/platforms/powernv/pci-sriov.c b/arch/powerpc/platforms/powernv/pci-sriov.c
index f1a8fcfdb2ba..7105a573aec4 100644
--- a/arch/powerpc/platforms/powernv/pci-sriov.c
+++ b/arch/powerpc/platforms/powernv/pci-sriov.c
@@ -149,7 +149,7 @@ static void pnv_pci_ioda_fixup_iov_resources(struct pci_dev *pdev)
struct pnv_iov_data *iov;
int mul;
- iov = kzalloc_obj(*iov, GFP_KERNEL);
+ iov = kzalloc_obj(*iov);
if (!iov)
goto disable_iov;
pdev->dev.archdata.iov_data = iov;
diff --git a/arch/powerpc/platforms/powernv/rng.c b/arch/powerpc/platforms/powernv/rng.c
index 6034f2cdcaf2..7a4c38cd6a82 100644
--- a/arch/powerpc/platforms/powernv/rng.c
+++ b/arch/powerpc/platforms/powernv/rng.c
@@ -120,7 +120,7 @@ static __init int rng_create(struct device_node *dn)
struct resource res;
unsigned long val;
- rng = kzalloc_obj(*rng, GFP_KERNEL);
+ rng = kzalloc_obj(*rng);
if (!rng)
return -ENOMEM;
diff --git a/arch/powerpc/platforms/powernv/vas-window.c b/arch/powerpc/platforms/powernv/vas-window.c
index 06748e0d5c32..9f093176b8db 100644
--- a/arch/powerpc/platforms/powernv/vas-window.c
+++ b/arch/powerpc/platforms/powernv/vas-window.c
@@ -543,7 +543,7 @@ static struct pnv_vas_window *vas_window_alloc(struct vas_instance *vinst)
if (winid < 0)
return ERR_PTR(winid);
- window = kzalloc_obj(*window, GFP_KERNEL);
+ window = kzalloc_obj(*window);
if (!window)
goto out_free;
diff --git a/arch/powerpc/platforms/powernv/vas.c b/arch/powerpc/platforms/powernv/vas.c
index ca3553003b7c..815684c2b56e 100644
--- a/arch/powerpc/platforms/powernv/vas.c
+++ b/arch/powerpc/platforms/powernv/vas.c
@@ -74,7 +74,7 @@ static int init_vas_instance(struct platform_device *pdev)
return -ENODEV;
}
- vinst = kzalloc_obj(*vinst, GFP_KERNEL);
+ vinst = kzalloc_obj(*vinst);
if (!vinst)
return -ENOMEM;
diff --git a/arch/powerpc/platforms/ps3/device-init.c b/arch/powerpc/platforms/ps3/device-init.c
index 74e7fb0adcdb..37c1a52e4f7e 100644
--- a/arch/powerpc/platforms/ps3/device-init.c
+++ b/arch/powerpc/platforms/ps3/device-init.c
@@ -31,7 +31,7 @@ static int __init ps3_register_lpm_devices(void)
pr_debug(" -> %s:%d\n", __func__, __LINE__);
- dev = kzalloc_obj(*dev, GFP_KERNEL);
+ dev = kzalloc_obj(*dev);
if (!dev)
return -ENOMEM;
@@ -126,7 +126,7 @@ static int __init ps3_setup_gelic_device(
BUG_ON(repo->bus_type != PS3_BUS_TYPE_SB);
BUG_ON(repo->dev_type != PS3_DEV_TYPE_SB_GELIC);
- p = kzalloc_obj(struct layout, GFP_KERNEL);
+ p = kzalloc_obj(struct layout);
if (!p) {
result = -ENOMEM;
@@ -197,7 +197,7 @@ static int __init ps3_setup_uhc_device(
BUG_ON(repo->bus_type != PS3_BUS_TYPE_SB);
BUG_ON(repo->dev_type != PS3_DEV_TYPE_SB_USB);
- p = kzalloc_obj(struct layout, GFP_KERNEL);
+ p = kzalloc_obj(struct layout);
if (!p) {
result = -ENOMEM;
@@ -294,7 +294,7 @@ static int __init ps3_setup_vuart_device(enum ps3_match_id match_id,
pr_debug(" -> %s:%d: match_id %u, port %u\n", __func__, __LINE__,
match_id, port_number);
- p = kzalloc_obj(struct layout, GFP_KERNEL);
+ p = kzalloc_obj(struct layout);
if (!p)
return -ENOMEM;
@@ -447,7 +447,7 @@ static int __init ps3_register_sound_devices(void)
pr_debug(" -> %s:%d\n", __func__, __LINE__);
- p = kzalloc_obj(*p, GFP_KERNEL);
+ p = kzalloc_obj(*p);
if (!p)
return -ENOMEM;
@@ -481,7 +481,7 @@ static int __init ps3_register_graphics_devices(void)
pr_debug(" -> %s:%d\n", __func__, __LINE__);
- p = kzalloc_obj(struct layout, GFP_KERNEL);
+ p = kzalloc_obj(struct layout);
if (!p)
return -ENOMEM;
@@ -516,7 +516,7 @@ static int __init ps3_register_ramdisk_device(void)
pr_debug(" -> %s:%d\n", __func__, __LINE__);
- p = kzalloc_obj(struct layout, GFP_KERNEL);
+ p = kzalloc_obj(struct layout);
if (!p)
return -ENOMEM;
@@ -783,7 +783,7 @@ static int ps3_probe_thread(void *data)
pr_debug(" -> %s:%u: kthread started\n", __func__, __LINE__);
- local = kzalloc_obj(*local, GFP_KERNEL);
+ local = kzalloc_obj(*local);
if (!local)
return -ENOMEM;
diff --git a/arch/powerpc/platforms/ps3/spu.c b/arch/powerpc/platforms/ps3/spu.c
index cd4ff2032cb0..10ab256b675c 100644
--- a/arch/powerpc/platforms/ps3/spu.c
+++ b/arch/powerpc/platforms/ps3/spu.c
@@ -336,7 +336,7 @@ static int __init ps3_create_spu(struct spu *spu, void *data)
pr_debug("%s:%d spu_%d\n", __func__, __LINE__, spu->number);
- spu->pdata = kzalloc_obj(struct spu_pdata, GFP_KERNEL);
+ spu->pdata = kzalloc_obj(struct spu_pdata);
if (!spu->pdata) {
result = -ENOMEM;
diff --git a/arch/powerpc/platforms/pseries/dlpar.c b/arch/powerpc/platforms/pseries/dlpar.c
index ea5e97f1f054..a7c451c2507d 100644
--- a/arch/powerpc/platforms/pseries/dlpar.c
+++ b/arch/powerpc/platforms/pseries/dlpar.c
@@ -53,7 +53,7 @@ static struct property *dlpar_parse_cc_property(struct cc_workarea *ccwa)
char *name;
char *value;
- prop = kzalloc_obj(*prop, GFP_KERNEL);
+ prop = kzalloc_obj(*prop);
if (!prop)
return NULL;
@@ -80,7 +80,7 @@ static struct device_node *dlpar_parse_cc_node(struct cc_workarea *ccwa)
struct device_node *dn;
const char *name;
- dn = kzalloc_obj(*dn, GFP_KERNEL);
+ dn = kzalloc_obj(*dn);
if (!dn)
return NULL;
diff --git a/arch/powerpc/platforms/pseries/hotplug-memory.c b/arch/powerpc/platforms/pseries/hotplug-memory.c
index a040d34c4e40..b2f14db59034 100644
--- a/arch/powerpc/platforms/pseries/hotplug-memory.c
+++ b/arch/powerpc/platforms/pseries/hotplug-memory.c
@@ -33,7 +33,7 @@ static struct property *dlpar_clone_property(struct property *prop,
{
struct property *new_prop;
- new_prop = kzalloc_obj(*new_prop, GFP_KERNEL);
+ new_prop = kzalloc_obj(*new_prop);
if (!new_prop)
return NULL;
diff --git a/arch/powerpc/platforms/pseries/iommu.c b/arch/powerpc/platforms/pseries/iommu.c
index 27de08d8fa15..3e1f915fe4f6 100644
--- a/arch/powerpc/platforms/pseries/iommu.c
+++ b/arch/powerpc/platforms/pseries/iommu.c
@@ -1000,7 +1000,7 @@ static void copy_property(struct device_node *pdn, const char *from, const char
if (!src)
return;
- dst = kzalloc_obj(*dst, GFP_KERNEL);
+ dst = kzalloc_obj(*dst);
if (!dst)
return;
@@ -1089,7 +1089,7 @@ static struct dma_win *ddw_list_new_entry(struct device_node *pdn,
{
struct dma_win *window;
- window = kzalloc_obj(*window, GFP_KERNEL);
+ window = kzalloc_obj(*window);
if (!window)
return NULL;
@@ -1409,12 +1409,12 @@ static struct property *ddw_property_create(const char *propname, u32 liobn, u64
struct dynamic_dma_window_prop *ddwprop;
struct property *win64;
- win64 = kzalloc_obj(*win64, GFP_KERNEL);
+ win64 = kzalloc_obj(*win64);
if (!win64)
return NULL;
win64->name = kstrdup(propname, GFP_KERNEL);
- ddwprop = kzalloc_obj(*ddwprop, GFP_KERNEL);
+ ddwprop = kzalloc_obj(*ddwprop);
win64->value = ddwprop;
win64->length = sizeof(*ddwprop);
if (!win64->name || !win64->value) {
@@ -1760,7 +1760,7 @@ static bool enable_ddw(struct pci_dev *dev, struct device_node *pdn, u64 dma_mas
if (default_win_removed || limited_addr_enabled)
reset_dma_window(dev, pdn);
- fpdn = kzalloc_obj(*fpdn, GFP_KERNEL);
+ fpdn = kzalloc_obj(*fpdn);
if (!fpdn)
goto out_unlock;
fpdn->pdn = pdn;
@@ -2235,7 +2235,7 @@ static long spapr_tce_create_table(struct iommu_table_group *table_group, int nu
__remove_dma_window(pdn, ddw_avail, create.liobn);
out_failed:
- fpdn = kzalloc_obj(*fpdn, GFP_KERNEL);
+ fpdn = kzalloc_obj(*fpdn);
if (!fpdn)
goto out_unlock;
fpdn->pdn = pdn;
@@ -2322,7 +2322,7 @@ static long spapr_tce_unset_window(struct iommu_table_group *table_group, int nu
goto out_unlock;
out_failed:
- fpdn = kzalloc_obj(*fpdn, GFP_KERNEL);
+ fpdn = kzalloc_obj(*fpdn);
if (!fpdn)
goto out_unlock;
fpdn->pdn = pdn;
diff --git a/arch/powerpc/platforms/pseries/lparcfg.c b/arch/powerpc/platforms/pseries/lparcfg.c
index bf6f9789167f..8821c378bfff 100644
--- a/arch/powerpc/platforms/pseries/lparcfg.c
+++ b/arch/powerpc/platforms/pseries/lparcfg.c
@@ -146,7 +146,7 @@ static void show_gpci_data(struct seq_file *m)
unsigned int affinity_score;
long ret;
- buf = kmalloc_obj(*buf, GFP_KERNEL);
+ buf = kmalloc_obj(*buf);
if (buf == NULL)
return;
diff --git a/arch/powerpc/platforms/pseries/mobility.c b/arch/powerpc/platforms/pseries/mobility.c
index 892f59c41d83..b5c2abd12432 100644
--- a/arch/powerpc/platforms/pseries/mobility.c
+++ b/arch/powerpc/platforms/pseries/mobility.c
@@ -146,7 +146,7 @@ static int update_dt_property(struct device_node *dn, struct property **prop,
new_prop->value = new_data;
new_prop->length += vd;
} else {
- new_prop = kzalloc_obj(*new_prop, GFP_KERNEL);
+ new_prop = kzalloc_obj(*new_prop);
if (!new_prop)
return -ENOMEM;
diff --git a/arch/powerpc/platforms/pseries/msi.c b/arch/powerpc/platforms/pseries/msi.c
index 3bc617a96671..64ffc6476ad6 100644
--- a/arch/powerpc/platforms/pseries/msi.c
+++ b/arch/powerpc/platforms/pseries/msi.c
@@ -441,7 +441,7 @@ static int pseries_msi_ops_prepare(struct irq_domain *domain, struct device *dev
int ret;
struct pseries_msi_device *pseries_dev __free(kfree)
- = kmalloc_obj(*pseries_dev, GFP_KERNEL);
+ = kmalloc_obj(*pseries_dev);
if (!pseries_dev)
return -ENOMEM;
diff --git a/arch/powerpc/platforms/pseries/papr-sysparm.c b/arch/powerpc/platforms/pseries/papr-sysparm.c
index 7974750ab868..fdff151ed8bb 100644
--- a/arch/powerpc/platforms/pseries/papr-sysparm.c
+++ b/arch/powerpc/platforms/pseries/papr-sysparm.c
@@ -19,7 +19,7 @@
struct papr_sysparm_buf *papr_sysparm_buf_alloc(void)
{
- struct papr_sysparm_buf *buf = kzalloc_obj(*buf, GFP_KERNEL);
+ struct papr_sysparm_buf *buf = kzalloc_obj(*buf);
return buf;
}
diff --git a/arch/powerpc/platforms/pseries/papr_platform_attributes.c b/arch/powerpc/platforms/pseries/papr_platform_attributes.c
index a7821279661a..38b417c158ba 100644
--- a/arch/powerpc/platforms/pseries/papr_platform_attributes.c
+++ b/arch/powerpc/platforms/pseries/papr_platform_attributes.c
@@ -295,7 +295,7 @@ static int __init papr_init(void)
goto out_free_esi_buf;
}
- papr_groups = kzalloc_objs(*papr_groups, num_attrs, GFP_KERNEL);
+ papr_groups = kzalloc_objs(*papr_groups, num_attrs);
if (!papr_groups)
goto out_free_esi_buf;
diff --git a/arch/powerpc/platforms/pseries/papr_scm.c b/arch/powerpc/platforms/pseries/papr_scm.c
index 5d41c0223f10..63eca4ebb5e5 100644
--- a/arch/powerpc/platforms/pseries/papr_scm.c
+++ b/arch/powerpc/platforms/pseries/papr_scm.c
@@ -445,7 +445,7 @@ static void papr_scm_pmu_register(struct papr_scm_priv *p)
struct nvdimm_pmu *nd_pmu;
int rc, nodeid;
- nd_pmu = kzalloc_obj(*nd_pmu, GFP_KERNEL);
+ nd_pmu = kzalloc_obj(*nd_pmu);
if (!nd_pmu) {
rc = -ENOMEM;
goto pmu_err_print;
@@ -1398,7 +1398,7 @@ static int papr_scm_probe(struct platform_device *pdev)
*/
update_numa_distance(dn);
- p = kzalloc_obj(*p, GFP_KERNEL);
+ p = kzalloc_obj(*p);
if (!p)
return -ENOMEM;
diff --git a/arch/powerpc/platforms/pseries/pci.c b/arch/powerpc/platforms/pseries/pci.c
index 8ce3f591a2b4..84e4ffe957a8 100644
--- a/arch/powerpc/platforms/pseries/pci.c
+++ b/arch/powerpc/platforms/pseries/pci.c
@@ -141,7 +141,7 @@ static int pseries_pci_sriov_enable(struct pci_dev *pdev, u16 num_vfs)
}
pdn = pci_get_pdn(pdev);
- pdn->pe_num_map = kmalloc_objs(*pdn->pe_num_map, num_vfs, GFP_KERNEL);
+ pdn->pe_num_map = kmalloc_objs(*pdn->pe_num_map, num_vfs);
if (!pdn->pe_num_map)
return -ENOMEM;
diff --git a/arch/powerpc/platforms/pseries/reconfig.c b/arch/powerpc/platforms/pseries/reconfig.c
index 38f4312f5210..7faebcffc9df 100644
--- a/arch/powerpc/platforms/pseries/reconfig.c
+++ b/arch/powerpc/platforms/pseries/reconfig.c
@@ -25,7 +25,7 @@ static int pSeries_reconfig_add_node(const char *path, struct property *proplist
struct device_node *np;
int err = -ENOMEM;
- np = kzalloc_obj(*np, GFP_KERNEL);
+ np = kzalloc_obj(*np);
if (!np)
goto out_err;
@@ -168,7 +168,7 @@ static char * parse_next_property(char *buf, char *end, char **name, int *length
static struct property *new_property(const char *name, const int length,
const unsigned char *value, struct property *last)
{
- struct property *new = kzalloc_obj(*new, GFP_KERNEL);
+ struct property *new = kzalloc_obj(*new);
if (!new)
return NULL;
diff --git a/arch/powerpc/platforms/pseries/vas-sysfs.c b/arch/powerpc/platforms/pseries/vas-sysfs.c
index 44ed41dd4b5f..4f6fbbb672ae 100644
--- a/arch/powerpc/platforms/pseries/vas-sysfs.c
+++ b/arch/powerpc/platforms/pseries/vas-sysfs.c
@@ -202,7 +202,7 @@ int sysfs_add_vas_caps(struct vas_cop_feat_caps *caps)
int ret = 0;
char *name;
- centry = kzalloc_obj(*centry, GFP_KERNEL);
+ centry = kzalloc_obj(*centry);
if (!centry)
return -ENOMEM;
diff --git a/arch/powerpc/platforms/pseries/vas.c b/arch/powerpc/platforms/pseries/vas.c
index d8890b62197b..ceb0a8788c0a 100644
--- a/arch/powerpc/platforms/pseries/vas.c
+++ b/arch/powerpc/platforms/pseries/vas.c
@@ -324,7 +324,7 @@ static struct vas_window *vas_allocate_window(int vas_id, u64 flags,
struct pseries_vas_window *txwin;
int rc;
- txwin = kzalloc_obj(*txwin, GFP_KERNEL);
+ txwin = kzalloc_obj(*txwin);
if (!txwin)
return ERR_PTR(-ENOMEM);
@@ -1087,7 +1087,7 @@ static int __init pseries_vas_init(void)
return -ENOTSUPP;
}
- hv_caps = kmalloc_obj(*hv_caps, GFP_KERNEL);
+ hv_caps = kmalloc_obj(*hv_caps);
if (!hv_caps)
return -ENOMEM;
/*
diff --git a/arch/powerpc/platforms/pseries/vio.c b/arch/powerpc/platforms/pseries/vio.c
index 4cb192cd5aa9..08e2add48adb 100644
--- a/arch/powerpc/platforms/pseries/vio.c
+++ b/arch/powerpc/platforms/pseries/vio.c
@@ -744,7 +744,7 @@ static int vio_cmo_bus_probe(struct vio_dev *viodev)
viodev->cmo.desired = VIO_CMO_MIN_ENT;
size = VIO_CMO_MIN_ENT;
- dev_ent = kmalloc_obj(struct vio_cmo_dev_entry, GFP_KERNEL);
+ dev_ent = kmalloc_obj(struct vio_cmo_dev_entry);
if (!dev_ent)
return -ENOMEM;
@@ -1164,7 +1164,7 @@ static struct iommu_table *vio_build_iommu_table(struct vio_dev *dev)
if (!dma_window)
return NULL;
- tbl = kzalloc_obj(*tbl, GFP_KERNEL);
+ tbl = kzalloc_obj(*tbl);
if (tbl == NULL)
return NULL;
@@ -1375,7 +1375,7 @@ struct vio_dev *vio_register_device_node(struct device_node *of_node)
}
/* allocate a vio_dev for this node */
- viodev = kzalloc_obj(struct vio_dev, GFP_KERNEL);
+ viodev = kzalloc_obj(struct vio_dev);
if (viodev == NULL) {
pr_warn("%s: allocation failure for VIO device.\n", __func__);
return NULL;
diff --git a/arch/powerpc/sysdev/ehv_pic.c b/arch/powerpc/sysdev/ehv_pic.c
index c4c61216b96a..02411b0cf46f 100644
--- a/arch/powerpc/sysdev/ehv_pic.c
+++ b/arch/powerpc/sysdev/ehv_pic.c
@@ -263,7 +263,7 @@ void __init ehv_pic_init(void)
return;
}
- ehv_pic = kzalloc_obj(struct ehv_pic, GFP_KERNEL);
+ ehv_pic = kzalloc_obj(struct ehv_pic);
if (!ehv_pic) {
of_node_put(np);
return;
diff --git a/arch/powerpc/sysdev/fsl_gtm.c b/arch/powerpc/sysdev/fsl_gtm.c
index fabf39586eba..87fe47f41a39 100644
--- a/arch/powerpc/sysdev/fsl_gtm.c
+++ b/arch/powerpc/sysdev/fsl_gtm.c
@@ -382,7 +382,7 @@ static int __init fsl_gtm_init(void)
const u32 *clock;
int size;
- gtm = kzalloc_obj(*gtm, GFP_KERNEL);
+ gtm = kzalloc_obj(*gtm);
if (!gtm) {
pr_err("%pOF: unable to allocate memory\n",
np);
diff --git a/arch/powerpc/sysdev/fsl_lbc.c b/arch/powerpc/sysdev/fsl_lbc.c
index 01ddc6ac8277..839cf5adc7d9 100644
--- a/arch/powerpc/sysdev/fsl_lbc.c
+++ b/arch/powerpc/sysdev/fsl_lbc.c
@@ -283,7 +283,7 @@ static int fsl_lbc_ctrl_probe(struct platform_device *dev)
return -EFAULT;
}
- fsl_lbc_ctrl_dev = kzalloc_obj(*fsl_lbc_ctrl_dev, GFP_KERNEL);
+ fsl_lbc_ctrl_dev = kzalloc_obj(*fsl_lbc_ctrl_dev);
if (!fsl_lbc_ctrl_dev)
return -ENOMEM;
@@ -363,7 +363,7 @@ static int fsl_lbc_syscore_suspend(void *data)
if (!lbc)
goto out;
- ctrl->saved_regs = kmalloc_obj(struct fsl_lbc_regs, GFP_KERNEL);
+ ctrl->saved_regs = kmalloc_obj(struct fsl_lbc_regs);
if (!ctrl->saved_regs)
return -ENOMEM;
diff --git a/arch/powerpc/sysdev/fsl_mpic_timer_wakeup.c b/arch/powerpc/sysdev/fsl_mpic_timer_wakeup.c
index 43d6fba2bd42..f9e64f54dc14 100644
--- a/arch/powerpc/sysdev/fsl_mpic_timer_wakeup.c
+++ b/arch/powerpc/sysdev/fsl_mpic_timer_wakeup.c
@@ -111,7 +111,7 @@ static int __init fsl_wakeup_sys_init(void)
struct device *dev_root;
int ret = -EINVAL;
- fsl_wakeup = kzalloc_obj(struct fsl_mpic_timer_wakeup, GFP_KERNEL);
+ fsl_wakeup = kzalloc_obj(struct fsl_mpic_timer_wakeup);
if (!fsl_wakeup)
return -ENOMEM;
diff --git a/arch/powerpc/sysdev/fsl_msi.c b/arch/powerpc/sysdev/fsl_msi.c
index 525ea894c14a..5dbc78713193 100644
--- a/arch/powerpc/sysdev/fsl_msi.c
+++ b/arch/powerpc/sysdev/fsl_msi.c
@@ -361,7 +361,7 @@ static int fsl_msi_setup_hwirq(struct fsl_msi *msi, struct platform_device *dev,
return 0;
}
- cascade_data = kzalloc_obj(struct fsl_msi_cascade_data, GFP_KERNEL);
+ cascade_data = kzalloc_obj(struct fsl_msi_cascade_data);
if (!cascade_data) {
dev_err(&dev->dev, "No memory for MSI cascade data\n");
return -ENOMEM;
@@ -405,7 +405,7 @@ static int fsl_of_msi_probe(struct platform_device *dev)
printk(KERN_DEBUG "Setting up Freescale MSI support\n");
- msi = kzalloc_obj(struct fsl_msi, GFP_KERNEL);
+ msi = kzalloc_obj(struct fsl_msi);
if (!msi) {
dev_err(&dev->dev, "No memory for MSI structure\n");
return -ENOMEM;
diff --git a/arch/powerpc/sysdev/fsl_pci.c b/arch/powerpc/sysdev/fsl_pci.c
index 0952b5ff8a16..600f83cea1cd 100644
--- a/arch/powerpc/sysdev/fsl_pci.c
+++ b/arch/powerpc/sysdev/fsl_pci.c
@@ -767,7 +767,7 @@ static int __init mpc83xx_pcie_setup(struct pci_controller *hose,
u32 cfg_bar;
int ret = -ENOMEM;
- pcie = kzalloc_obj(*pcie, GFP_KERNEL);
+ pcie = kzalloc_obj(*pcie);
if (!pcie)
return ret;
diff --git a/arch/powerpc/sysdev/fsl_rio.c b/arch/powerpc/sysdev/fsl_rio.c
index 249b876daaee..eb55dabb4748 100644
--- a/arch/powerpc/sysdev/fsl_rio.c
+++ b/arch/powerpc/sysdev/fsl_rio.c
@@ -470,7 +470,7 @@ static int fsl_rio_setup(struct platform_device *dev)
goto err_rio_regs;
}
- ops = kzalloc_obj(struct rio_ops, GFP_KERNEL);
+ ops = kzalloc_obj(struct rio_ops);
if (!ops) {
rc = -ENOMEM;
goto err_ops;
@@ -517,7 +517,7 @@ static int fsl_rio_setup(struct platform_device *dev)
rc = -ENODEV;
goto err_dbell;
}
- dbell = kzalloc_obj(struct fsl_rio_dbell, GFP_KERNEL);
+ dbell = kzalloc_obj(struct fsl_rio_dbell);
if (!(dbell)) {
dev_err(&dev->dev, "Can't alloc memory for 'fsl_rio_dbell'\n");
rc = -ENOMEM;
@@ -543,7 +543,7 @@ static int fsl_rio_setup(struct platform_device *dev)
rc = -ENODEV;
goto err_pw;
}
- pw = kzalloc_obj(struct fsl_rio_pw, GFP_KERNEL);
+ pw = kzalloc_obj(struct fsl_rio_pw);
if (!(pw)) {
dev_err(&dev->dev, "Can't alloc memory for 'fsl_rio_pw'\n");
rc = -ENOMEM;
@@ -580,7 +580,7 @@ static int fsl_rio_setup(struct platform_device *dev)
dev_info(&dev->dev, "%pOF: LAW %pR\n",
np, &res);
- port = kzalloc_obj(struct rio_mport, GFP_KERNEL);
+ port = kzalloc_obj(struct rio_mport);
if (!port)
continue;
@@ -593,7 +593,7 @@ static int fsl_rio_setup(struct platform_device *dev)
i = *port_index - 1;
port->index = (unsigned char)i;
- priv = kzalloc_obj(struct rio_priv, GFP_KERNEL);
+ priv = kzalloc_obj(struct rio_priv);
if (!priv) {
dev_err(&dev->dev, "Can't alloc memory for 'priv'\n");
kfree(port);
diff --git a/arch/powerpc/sysdev/fsl_rmu.c b/arch/powerpc/sysdev/fsl_rmu.c
index c0e358cf7822..4f2afd021e3c 100644
--- a/arch/powerpc/sysdev/fsl_rmu.c
+++ b/arch/powerpc/sysdev/fsl_rmu.c
@@ -1079,7 +1079,7 @@ int fsl_rio_setup_rmu(struct rio_mport *mport, struct device_node *node)
return -EINVAL;
}
- rmu = kzalloc_obj(struct fsl_rmu, GFP_KERNEL);
+ rmu = kzalloc_obj(struct fsl_rmu);
if (!rmu)
return -ENOMEM;
diff --git a/arch/powerpc/sysdev/ipic.c b/arch/powerpc/sysdev/ipic.c
index 2351604cc24a..77e6f23c5f52 100644
--- a/arch/powerpc/sysdev/ipic.c
+++ b/arch/powerpc/sysdev/ipic.c
@@ -707,7 +707,7 @@ struct ipic * __init ipic_init(struct device_node *node, unsigned int flags)
if (ret)
return NULL;
- ipic = kzalloc_obj(*ipic, GFP_KERNEL);
+ ipic = kzalloc_obj(*ipic);
if (ipic == NULL)
return NULL;
diff --git a/arch/powerpc/sysdev/mpic.c b/arch/powerpc/sysdev/mpic.c
index cb4cdd853cc8..eba277134224 100644
--- a/arch/powerpc/sysdev/mpic.c
+++ b/arch/powerpc/sysdev/mpic.c
@@ -547,7 +547,7 @@ static void __init mpic_scan_ht_pics(struct mpic *mpic)
printk(KERN_INFO "mpic: Setting up HT PICs workarounds for U3/U4\n");
/* Allocate fixups array */
- mpic->fixups = kzalloc_objs(*mpic->fixups, 128, GFP_KERNEL);
+ mpic->fixups = kzalloc_objs(*mpic->fixups, 128);
BUG_ON(mpic->fixups == NULL);
/* Init spinlock */
@@ -1273,7 +1273,7 @@ struct mpic * __init mpic_alloc(struct device_node *node,
mpic_tm_chip.flags |= IRQCHIP_SKIP_SET_WAKE;
}
- mpic = kzalloc_obj(struct mpic, GFP_KERNEL);
+ mpic = kzalloc_obj(struct mpic);
if (mpic == NULL)
goto err_of_node_put;
diff --git a/arch/powerpc/sysdev/mpic_msgr.c b/arch/powerpc/sysdev/mpic_msgr.c
index 8b1c02f5b1b3..e9af4fa940b1 100644
--- a/arch/powerpc/sysdev/mpic_msgr.c
+++ b/arch/powerpc/sysdev/mpic_msgr.c
@@ -227,7 +227,7 @@ static int mpic_msgr_probe(struct platform_device *dev)
struct mpic_msgr *msgr;
unsigned int reg_number;
- msgr = kzalloc_obj(struct mpic_msgr, GFP_KERNEL);
+ msgr = kzalloc_obj(struct mpic_msgr);
if (!msgr) {
dev_err(&dev->dev, "No memory for message register\n");
return -ENOMEM;
diff --git a/arch/powerpc/sysdev/mpic_timer.c b/arch/powerpc/sysdev/mpic_timer.c
index 7b237b6f7151..10acf9988016 100644
--- a/arch/powerpc/sysdev/mpic_timer.c
+++ b/arch/powerpc/sysdev/mpic_timer.c
@@ -464,7 +464,7 @@ static void __init timer_group_init(struct device_node *np)
unsigned int i = 0;
int ret;
- priv = kzalloc_obj(struct timer_group_priv, GFP_KERNEL);
+ priv = kzalloc_obj(struct timer_group_priv);
if (!priv) {
pr_err("%pOF: cannot allocate memory for group.\n", np);
return;
diff --git a/arch/powerpc/sysdev/of_rtc.c b/arch/powerpc/sysdev/of_rtc.c
index 6c2ba4c44b11..ab0d6be0fc97 100644
--- a/arch/powerpc/sysdev/of_rtc.c
+++ b/arch/powerpc/sysdev/of_rtc.c
@@ -33,7 +33,7 @@ void __init of_instantiate_rtc(void)
of_rtc_table[i].compatible) {
struct resource *res;
- res = kmalloc_obj(*res, GFP_KERNEL);
+ res = kmalloc_obj(*res);
if (!res) {
printk(KERN_ERR "OF RTC: Out of memory "
"allocating resource structure for %pOF\n",
diff --git a/arch/powerpc/sysdev/xics/ics-native.c b/arch/powerpc/sysdev/xics/ics-native.c
index 50634a0ae478..0b0d07db6998 100644
--- a/arch/powerpc/sysdev/xics/ics-native.c
+++ b/arch/powerpc/sysdev/xics/ics-native.c
@@ -186,7 +186,7 @@ static int __init ics_native_add_one(struct device_node *np)
u32 ranges[2];
int rc, count;
- ics = kzalloc_obj(struct ics_native, GFP_KERNEL);
+ ics = kzalloc_obj(struct ics_native);
if (!ics)
return -ENOMEM;
ics->node = of_node_get(np);
diff --git a/arch/powerpc/sysdev/xive/common.c b/arch/powerpc/sysdev/xive/common.c
index f0fbee162f47..e1a4f8a97393 100644
--- a/arch/powerpc/sysdev/xive/common.c
+++ b/arch/powerpc/sysdev/xive/common.c
@@ -1016,7 +1016,7 @@ static struct xive_irq_data *xive_irq_alloc_data(unsigned int virq, irq_hw_numbe
struct xive_irq_data *xd;
int rc;
- xd = kzalloc_obj(struct xive_irq_data, GFP_KERNEL);
+ xd = kzalloc_obj(struct xive_irq_data);
if (!xd)
return ERR_PTR(-ENOMEM);
rc = xive_ops->populate_irq_data(hw, xd);
diff --git a/arch/powerpc/sysdev/xive/spapr.c b/arch/powerpc/sysdev/xive/spapr.c
index dca293f07303..61f8a8acf81f 100644
--- a/arch/powerpc/sysdev/xive/spapr.c
+++ b/arch/powerpc/sysdev/xive/spapr.c
@@ -52,7 +52,7 @@ static int __init xive_irq_bitmap_add(int base, int count)
{
struct xive_irq_bitmap *xibm;
- xibm = kzalloc_obj(*xibm, GFP_KERNEL);
+ xibm = kzalloc_obj(*xibm);
if (!xibm)
return -ENOMEM;
diff --git a/arch/riscv/kernel/hibernate.c b/arch/riscv/kernel/hibernate.c
index 0e31c02cb554..982843828adb 100644
--- a/arch/riscv/kernel/hibernate.c
+++ b/arch/riscv/kernel/hibernate.c
@@ -415,7 +415,7 @@ int hibernate_resume_nonboot_cpu_disable(void)
static int __init riscv_hibernate_init(void)
{
- hibernate_cpu_context = kzalloc_obj(*hibernate_cpu_context, GFP_KERNEL);
+ hibernate_cpu_context = kzalloc_obj(*hibernate_cpu_context);
if (WARN_ON(!hibernate_cpu_context))
return -ENOMEM;
diff --git a/arch/riscv/kernel/module.c b/arch/riscv/kernel/module.c
index addc7dac2424..cc2f980700f3 100644
--- a/arch/riscv/kernel/module.c
+++ b/arch/riscv/kernel/module.c
@@ -663,7 +663,7 @@ static int add_relocation_to_accumulate(struct module *me, int type,
struct used_bucket *bucket;
unsigned long hash;
- entry = kmalloc_obj(*entry, GFP_KERNEL);
+ entry = kmalloc_obj(*entry);
if (!entry)
return -ENOMEM;
@@ -697,7 +697,7 @@ static int add_relocation_to_accumulate(struct module *me, int type,
* relocation_entry.
*/
if (!found) {
- rel_head = kmalloc_obj(*rel_head, GFP_KERNEL);
+ rel_head = kmalloc_obj(*rel_head);
if (!rel_head) {
kfree(entry);
@@ -709,7 +709,7 @@ static int add_relocation_to_accumulate(struct module *me, int type,
INIT_HLIST_NODE(&rel_head->node);
if (!current_head->first) {
bucket =
- kmalloc_obj(struct used_bucket, GFP_KERNEL);
+ kmalloc_obj(struct used_bucket);
if (!bucket) {
kfree(entry);
diff --git a/arch/riscv/kernel/tests/kprobes/test-kprobes.c b/arch/riscv/kernel/tests/kprobes/test-kprobes.c
index c0526c0c7527..027424a3ff7b 100644
--- a/arch/riscv/kernel/tests/kprobes/test-kprobes.c
+++ b/arch/riscv/kernel/tests/kprobes/test-kprobes.c
@@ -20,7 +20,7 @@ static void test_kprobe_riscv(struct kunit *test)
while (test_kprobes_addresses[num_kprobe])
num_kprobe++;
- kp = kzalloc_objs(*kp, num_kprobe, GFP_KERNEL);
+ kp = kzalloc_objs(*kp, num_kprobe);
KUNIT_EXPECT_TRUE(test, kp);
if (!kp)
return;
diff --git a/arch/riscv/kernel/unaligned_access_speed.c b/arch/riscv/kernel/unaligned_access_speed.c
index 63ed6e6b24eb..b36a6a56f404 100644
--- a/arch/riscv/kernel/unaligned_access_speed.c
+++ b/arch/riscv/kernel/unaligned_access_speed.c
@@ -139,7 +139,7 @@ static void __init check_unaligned_access_speed_all_cpus(void)
{
unsigned int cpu;
unsigned int cpu_count = num_possible_cpus();
- struct page **bufs = kzalloc_objs(*bufs, cpu_count, GFP_KERNEL);
+ struct page **bufs = kzalloc_objs(*bufs, cpu_count);
if (!bufs) {
pr_warn("Allocation failure, not measuring misaligned performance\n");
diff --git a/arch/riscv/kvm/aia_aplic.c b/arch/riscv/kvm/aia_aplic.c
index 25d9c2a3a85a..d1e50bf5c351 100644
--- a/arch/riscv/kvm/aia_aplic.c
+++ b/arch/riscv/kvm/aia_aplic.c
@@ -580,7 +580,7 @@ int kvm_riscv_aia_aplic_init(struct kvm *kvm)
return 0;
/* Allocate APLIC global state */
- aplic = kzalloc_obj(*aplic, GFP_KERNEL);
+ aplic = kzalloc_obj(*aplic);
if (!aplic)
return -ENOMEM;
kvm->arch.aia.aplic_state = aplic;
@@ -588,7 +588,7 @@ int kvm_riscv_aia_aplic_init(struct kvm *kvm)
/* Setup APLIC IRQs */
aplic->nr_irqs = kvm->arch.aia.nr_sources + 1;
aplic->nr_words = DIV_ROUND_UP(aplic->nr_irqs, 32);
- aplic->irqs = kzalloc_objs(*aplic->irqs, aplic->nr_irqs, GFP_KERNEL);
+ aplic->irqs = kzalloc_objs(*aplic->irqs, aplic->nr_irqs);
if (!aplic->irqs) {
ret = -ENOMEM;
goto fail_free_aplic;
diff --git a/arch/riscv/kvm/aia_imsic.c b/arch/riscv/kvm/aia_imsic.c
index aafa19629524..06752fa24798 100644
--- a/arch/riscv/kvm/aia_imsic.c
+++ b/arch/riscv/kvm/aia_imsic.c
@@ -1095,7 +1095,7 @@ int kvm_riscv_vcpu_aia_imsic_init(struct kvm_vcpu *vcpu)
return -EINVAL;
/* Allocate IMSIC context */
- imsic = kzalloc_obj(*imsic, GFP_KERNEL);
+ imsic = kzalloc_obj(*imsic);
if (!imsic)
return -ENOMEM;
vcpu->arch.aia_context.imsic_state = imsic;
diff --git a/arch/riscv/kvm/vm.c b/arch/riscv/kvm/vm.c
index ca3da58dc968..7cbd2340c190 100644
--- a/arch/riscv/kvm/vm.c
+++ b/arch/riscv/kvm/vm.c
@@ -95,7 +95,7 @@ int kvm_riscv_setup_default_irq_routing(struct kvm *kvm, u32 lines)
struct kvm_irq_routing_entry *ents;
int i, rc;
- ents = kzalloc_objs(*ents, lines, GFP_KERNEL);
+ ents = kzalloc_objs(*ents, lines);
if (!ents)
return -ENOMEM;
diff --git a/arch/riscv/net/bpf_jit_comp64.c b/arch/riscv/net/bpf_jit_comp64.c
index 4d1c2639a64f..2f1109dbf105 100644
--- a/arch/riscv/net/bpf_jit_comp64.c
+++ b/arch/riscv/net/bpf_jit_comp64.c
@@ -1195,7 +1195,7 @@ static int __arch_prepare_bpf_trampoline(struct bpf_tramp_image *im,
}
if (fmod_ret->nr_links) {
- branches_off = kzalloc_objs(int, fmod_ret->nr_links, GFP_KERNEL);
+ branches_off = kzalloc_objs(int, fmod_ret->nr_links);
if (!branches_off)
return -ENOMEM;
diff --git a/arch/riscv/net/bpf_jit_core.c b/arch/riscv/net/bpf_jit_core.c
index af48c94e300a..b3581e926436 100644
--- a/arch/riscv/net/bpf_jit_core.c
+++ b/arch/riscv/net/bpf_jit_core.c
@@ -63,7 +63,7 @@ struct bpf_prog *bpf_int_jit_compile(struct bpf_prog *prog)
jit_data = prog->aux->jit_data;
if (!jit_data) {
- jit_data = kzalloc_obj(*jit_data, GFP_KERNEL);
+ jit_data = kzalloc_obj(*jit_data);
if (!jit_data) {
prog = orig_prog;
goto out;
@@ -82,7 +82,7 @@ struct bpf_prog *bpf_int_jit_compile(struct bpf_prog *prog)
ctx->arena_vm_start = bpf_arena_get_kern_vm_start(prog->aux->arena);
ctx->user_vm_start = bpf_arena_get_user_vm_start(prog->aux->arena);
ctx->prog = prog;
- ctx->offset = kzalloc_objs(int, prog->len, GFP_KERNEL);
+ ctx->offset = kzalloc_objs(int, prog->len);
if (!ctx->offset) {
prog = orig_prog;
goto out_offset;
diff --git a/arch/s390/appldata/appldata_base.c b/arch/s390/appldata/appldata_base.c
index 0d6725fd881e..edbedbb2a773 100644
--- a/arch/s390/appldata/appldata_base.c
+++ b/arch/s390/appldata/appldata_base.c
@@ -140,7 +140,7 @@ int appldata_diag(char record_nr, u16 function, unsigned long buffer,
struct appldata_product_id *id;
int rc;
- parm_list = kmalloc_obj(*parm_list, GFP_KERNEL);
+ parm_list = kmalloc_obj(*parm_list);
id = kmemdup(&appldata_id, sizeof(appldata_id), GFP_KERNEL);
rc = -ENOMEM;
if (parm_list && id) {
@@ -350,7 +350,7 @@ int appldata_register_ops(struct appldata_ops *ops)
if (ops->size > APPLDATA_MAX_REC_SIZE)
return -EINVAL;
- ops->ctl_table = kzalloc_objs(struct ctl_table, 1, GFP_KERNEL);
+ ops->ctl_table = kzalloc_objs(struct ctl_table, 1);
if (!ops->ctl_table)
return -ENOMEM;
diff --git a/arch/s390/appldata/appldata_mem.c b/arch/s390/appldata/appldata_mem.c
index e24369ec3134..659af5545a38 100644
--- a/arch/s390/appldata/appldata_mem.c
+++ b/arch/s390/appldata/appldata_mem.c
@@ -130,7 +130,7 @@ static int __init appldata_mem_init(void)
{
int ret;
- ops.data = kzalloc_obj(struct appldata_mem_data, GFP_KERNEL);
+ ops.data = kzalloc_obj(struct appldata_mem_data);
if (!ops.data)
return -ENOMEM;
diff --git a/arch/s390/appldata/appldata_net_sum.c b/arch/s390/appldata/appldata_net_sum.c
index 3a0574f33664..972f6d592c32 100644
--- a/arch/s390/appldata/appldata_net_sum.c
+++ b/arch/s390/appldata/appldata_net_sum.c
@@ -132,7 +132,7 @@ static int __init appldata_net_init(void)
{
int ret;
- ops.data = kzalloc_obj(struct appldata_net_sum_data, GFP_KERNEL);
+ ops.data = kzalloc_obj(struct appldata_net_sum_data);
if (!ops.data)
return -ENOMEM;
diff --git a/arch/s390/hypfs/hypfs_dbfs.c b/arch/s390/hypfs/hypfs_dbfs.c
index 8002bdc692d6..25a59c048857 100644
--- a/arch/s390/hypfs/hypfs_dbfs.c
+++ b/arch/s390/hypfs/hypfs_dbfs.c
@@ -16,7 +16,7 @@ static struct hypfs_dbfs_data *hypfs_dbfs_data_alloc(struct hypfs_dbfs_file *f)
{
struct hypfs_dbfs_data *data;
- data = kmalloc_obj(*data, GFP_KERNEL);
+ data = kmalloc_obj(*data);
if (!data)
return NULL;
data->dbfs_file = f;
diff --git a/arch/s390/hypfs/hypfs_diag0c.c b/arch/s390/hypfs/hypfs_diag0c.c
index 5e27dc7a7569..8f726e6558a8 100644
--- a/arch/s390/hypfs/hypfs_diag0c.c
+++ b/arch/s390/hypfs/hypfs_diag0c.c
@@ -35,7 +35,7 @@ static void *diag0c_store(unsigned int *count)
cpus_read_lock();
cpu_count = num_online_cpus();
- cpu_vec = kmalloc_objs(*cpu_vec, num_possible_cpus(), GFP_KERNEL);
+ cpu_vec = kmalloc_objs(*cpu_vec, num_possible_cpus());
if (!cpu_vec)
goto fail_unlock_cpus;
/* Note: Diag 0c needs 8 byte alignment and real storage */
diff --git a/arch/s390/hypfs/hypfs_sprp.c b/arch/s390/hypfs/hypfs_sprp.c
index 2e8847048dc1..08042d3a9d56 100644
--- a/arch/s390/hypfs/hypfs_sprp.c
+++ b/arch/s390/hypfs/hypfs_sprp.c
@@ -74,7 +74,7 @@ static int __hypfs_sprp_ioctl(void __user *user_area)
rc = -ENOMEM;
data = (void *)get_zeroed_page(GFP_KERNEL);
- diag304 = kzalloc_obj(*diag304, GFP_KERNEL);
+ diag304 = kzalloc_obj(*diag304);
if (!data || !diag304)
goto out;
diff --git a/arch/s390/hypfs/inode.c b/arch/s390/hypfs/inode.c
index 0f4a9113ec1a..559b011e6880 100644
--- a/arch/s390/hypfs/inode.c
+++ b/arch/s390/hypfs/inode.c
@@ -292,7 +292,7 @@ static int hypfs_init_fs_context(struct fs_context *fc)
{
struct hypfs_sb_info *sbi;
- sbi = kzalloc_obj(struct hypfs_sb_info, GFP_KERNEL);
+ sbi = kzalloc_obj(struct hypfs_sb_info);
if (!sbi)
return -ENOMEM;
diff --git a/arch/s390/include/asm/idals.h b/arch/s390/include/asm/idals.h
index 94de4ddf503f..06e1ec2afd5a 100644
--- a/arch/s390/include/asm/idals.h
+++ b/arch/s390/include/asm/idals.h
@@ -195,7 +195,7 @@ static inline struct idal_buffer **idal_buffer_array_alloc(size_t size, int page
int i;
count = (size + CCW_MAX_BYTE_COUNT - 1) / CCW_MAX_BYTE_COUNT;
- ibs = kmalloc_objs(*ibs, count + 1, GFP_KERNEL);
+ ibs = kmalloc_objs(*ibs, count + 1);
for (i = 0; i < count; i++) {
/* Determine size for the current idal buffer */
ib_size = min(size, CCW_MAX_BYTE_COUNT);
diff --git a/arch/s390/kernel/cert_store.c b/arch/s390/kernel/cert_store.c
index 8e3964c33ebb..dc1992a675de 100644
--- a/arch/s390/kernel/cert_store.c
+++ b/arch/s390/kernel/cert_store.c
@@ -322,7 +322,7 @@ static int invalidate_keyring_keys(struct key *keyring)
keyring_payload_len = key_type_keyring.read(keyring, NULL, 0);
num_keys = keyring_payload_len / sizeof(key_serial_t);
- key_array = kzalloc_objs(key_serial_t, num_keys, GFP_KERNEL);
+ key_array = kzalloc_objs(key_serial_t, num_keys);
if (!key_array)
return -ENOMEM;
diff --git a/arch/s390/kernel/debug.c b/arch/s390/kernel/debug.c
index a917b4c899ef..31430e9bcfdd 100644
--- a/arch/s390/kernel/debug.c
+++ b/arch/s390/kernel/debug.c
@@ -181,7 +181,7 @@ static debug_entry_t ***debug_areas_alloc(int pages_per_area, int nr_areas)
debug_entry_t ***areas;
int i, j;
- areas = kmalloc_objs(debug_entry_t **, nr_areas, GFP_KERNEL);
+ areas = kmalloc_objs(debug_entry_t **, nr_areas);
if (!areas)
goto fail_malloc_areas;
for (i = 0; i < nr_areas; i++) {
@@ -224,13 +224,13 @@ static debug_info_t *debug_info_alloc(const char *name, int pages_per_area,
debug_info_t *rc;
/* alloc everything */
- rc = kmalloc_obj(debug_info_t, GFP_KERNEL);
+ rc = kmalloc_obj(debug_info_t);
if (!rc)
goto fail_malloc_rc;
- rc->active_entries = kzalloc_objs(int, nr_areas, GFP_KERNEL);
+ rc->active_entries = kzalloc_objs(int, nr_areas);
if (!rc->active_entries)
goto fail_malloc_active_entries;
- rc->active_pages = kzalloc_objs(int, nr_areas, GFP_KERNEL);
+ rc->active_pages = kzalloc_objs(int, nr_areas);
if (!rc->active_pages)
goto fail_malloc_active_pages;
if ((mode == ALL_AREAS) && (pages_per_area != 0)) {
@@ -630,7 +630,7 @@ static file_private_info_t *debug_file_private_alloc(debug_info_t *debug_info,
if (!debug_info_snapshot)
return NULL;
- p_info = kmalloc_obj(file_private_info_t, GFP_KERNEL);
+ p_info = kmalloc_obj(file_private_info_t);
if (!p_info) {
debug_info_free(debug_info_snapshot);
return NULL;
diff --git a/arch/s390/kernel/guarded_storage.c b/arch/s390/kernel/guarded_storage.c
index 4d4101f19e3c..cab8ac25a010 100644
--- a/arch/s390/kernel/guarded_storage.c
+++ b/arch/s390/kernel/guarded_storage.c
@@ -24,7 +24,7 @@ static int gs_enable(void)
struct gs_cb *gs_cb;
if (!current->thread.gs_cb) {
- gs_cb = kzalloc_obj(*gs_cb, GFP_KERNEL);
+ gs_cb = kzalloc_obj(*gs_cb);
if (!gs_cb)
return -ENOMEM;
gs_cb->gsd = 25;
@@ -55,7 +55,7 @@ static int gs_set_bc_cb(struct gs_cb __user *u_gs_cb)
gs_cb = current->thread.gs_bc_cb;
if (!gs_cb) {
- gs_cb = kzalloc_obj(*gs_cb, GFP_KERNEL);
+ gs_cb = kzalloc_obj(*gs_cb);
if (!gs_cb)
return -ENOMEM;
current->thread.gs_bc_cb = gs_cb;
diff --git a/arch/s390/kernel/os_info.c b/arch/s390/kernel/os_info.c
index 37ab1c671b4d..4a30c10ae63b 100644
--- a/arch/s390/kernel/os_info.c
+++ b/arch/s390/kernel/os_info.c
@@ -154,7 +154,7 @@ static void os_info_old_init(void)
goto fail;
if (addr == 0 || addr % PAGE_SIZE)
goto fail;
- os_info_old = kzalloc_obj(*os_info_old, GFP_KERNEL);
+ os_info_old = kzalloc_obj(*os_info_old);
if (!os_info_old)
goto fail;
if (copy_oldmem_kernel(os_info_old, addr, sizeof(*os_info_old)))
diff --git a/arch/s390/kernel/perf_cpum_cf.c b/arch/s390/kernel/perf_cpum_cf.c
index 0c4074e717d4..7aa655664ecc 100644
--- a/arch/s390/kernel/perf_cpum_cf.c
+++ b/arch/s390/kernel/perf_cpum_cf.c
@@ -252,7 +252,7 @@ static int cpum_cf_alloc_cpu(int cpu)
cpuhw = p->cpucf;
if (!cpuhw) {
- cpuhw = kzalloc_obj(*cpuhw, GFP_KERNEL);
+ cpuhw = kzalloc_obj(*cpuhw);
if (cpuhw) {
p->cpucf = cpuhw;
refcount_set(&cpuhw->refcnt, 1);
@@ -1616,7 +1616,7 @@ static long cfset_ioctl_start(unsigned long arg, struct file *file)
if (!start.counter_sets)
return -EINVAL; /* No counter set at all? */
- preq = kzalloc_obj(*preq, GFP_KERNEL);
+ preq = kzalloc_obj(*preq);
if (!preq)
return -ENOMEM;
cpumask_clear(&preq->mask);
diff --git a/arch/s390/kernel/perf_cpum_cf_events.c b/arch/s390/kernel/perf_cpum_cf_events.c
index eb067beb5c51..ad8c32f0aaed 100644
--- a/arch/s390/kernel/perf_cpum_cf_events.c
+++ b/arch/s390/kernel/perf_cpum_cf_events.c
@@ -976,7 +976,7 @@ static __init struct attribute **merge_attr(struct attribute **a,
j++;
j++;
- new = kmalloc_objs(struct attribute *, j, GFP_KERNEL);
+ new = kmalloc_objs(struct attribute *, j);
if (!new)
return NULL;
j = 0;
diff --git a/arch/s390/kernel/perf_cpum_sf.c b/arch/s390/kernel/perf_cpum_sf.c
index d0adeabfce0c..c92c29de725e 100644
--- a/arch/s390/kernel/perf_cpum_sf.c
+++ b/arch/s390/kernel/perf_cpum_sf.c
@@ -1609,7 +1609,7 @@ static void *aux_buffer_setup(struct perf_event *event, void **pages,
}
/* Allocate aux_buffer struct for the event */
- aux = kzalloc_obj(struct aux_buffer, GFP_KERNEL);
+ aux = kzalloc_obj(struct aux_buffer);
if (!aux)
goto no_aux;
sfb = &aux->sfb;
diff --git a/arch/s390/kernel/perf_pai.c b/arch/s390/kernel/perf_pai.c
index 4c2ce0a2a8e4..8fd3e47307a3 100644
--- a/arch/s390/kernel/perf_pai.c
+++ b/arch/s390/kernel/perf_pai.c
@@ -252,7 +252,7 @@ static int pai_alloc_cpu(struct perf_event *event, int cpu)
cpump = mp->mapptr;
if (!cpump) { /* Paicrypt_map allocated? */
rc = -ENOMEM;
- cpump = kzalloc_obj(*cpump, GFP_KERNEL);
+ cpump = kzalloc_obj(*cpump);
if (!cpump)
goto undo;
/* Allocate memory for counter page and counter extraction.
@@ -315,7 +315,7 @@ static int pai_alloc(struct perf_event *event)
struct cpumask *maskptr;
int cpu, rc = -ENOMEM;
- maskptr = kzalloc_obj(*maskptr, GFP_KERNEL);
+ maskptr = kzalloc_obj(*maskptr);
if (!maskptr)
goto out;
@@ -1070,7 +1070,7 @@ static struct attribute * __init attr_event_init_one(int num,
{
struct perf_pmu_events_attr *pa;
- pa = kzalloc_obj(*pa, GFP_KERNEL);
+ pa = kzalloc_obj(*pa);
if (!pa)
return NULL;
diff --git a/arch/s390/kernel/ptrace.c b/arch/s390/kernel/ptrace.c
index 3a08f8f6c865..125ca4c4e30c 100644
--- a/arch/s390/kernel/ptrace.c
+++ b/arch/s390/kernel/ptrace.c
@@ -749,7 +749,7 @@ static int s390_gs_cb_set(struct task_struct *target,
if (!cpu_has_gs())
return -ENODEV;
if (!target->thread.gs_cb) {
- data = kzalloc_obj(*data, GFP_KERNEL);
+ data = kzalloc_obj(*data);
if (!data)
return -ENOMEM;
}
@@ -800,7 +800,7 @@ static int s390_gs_bc_set(struct task_struct *target,
if (!cpu_has_gs())
return -ENODEV;
if (!data) {
- data = kzalloc_obj(*data, GFP_KERNEL);
+ data = kzalloc_obj(*data);
if (!data)
return -ENOMEM;
target->thread.gs_bc_cb = data;
@@ -861,7 +861,7 @@ static int s390_runtime_instr_set(struct task_struct *target,
return -ENODEV;
if (!target->thread.ri_cb) {
- data = kzalloc_obj(*data, GFP_KERNEL);
+ data = kzalloc_obj(*data);
if (!data)
return -ENOMEM;
}
diff --git a/arch/s390/kernel/runtime_instr.c b/arch/s390/kernel/runtime_instr.c
index 0331ee7af39d..928bff8fcd4a 100644
--- a/arch/s390/kernel/runtime_instr.c
+++ b/arch/s390/kernel/runtime_instr.c
@@ -83,7 +83,7 @@ SYSCALL_DEFINE2(s390_runtime_instr, int, command, int, signum)
return -EINVAL;
if (!current->thread.ri_cb) {
- cb = kzalloc_obj(*cb, GFP_KERNEL);
+ cb = kzalloc_obj(*cb);
if (!cb)
return -ENOMEM;
} else {
diff --git a/arch/s390/kernel/smp.c b/arch/s390/kernel/smp.c
index 615b76a7f2a0..50bb499cf3e5 100644
--- a/arch/s390/kernel/smp.c
+++ b/arch/s390/kernel/smp.c
@@ -1145,7 +1145,7 @@ int __ref smp_rescan_cpus(bool early)
struct sclp_core_info *info;
int nr;
- info = kzalloc_obj(*info, GFP_KERNEL);
+ info = kzalloc_obj(*info);
if (!info)
return -ENOMEM;
smp_get_core_info(info, 0);
diff --git a/arch/s390/kernel/vdso.c b/arch/s390/kernel/vdso.c
index 1838a4696747..0fe616c49fcc 100644
--- a/arch/s390/kernel/vdso.c
+++ b/arch/s390/kernel/vdso.c
@@ -132,7 +132,7 @@ static struct page ** __init vdso_setup_pages(void *start, void *end)
struct page **pagelist;
int i;
- pagelist = kzalloc_objs(struct page *, pages + 1, GFP_KERNEL);
+ pagelist = kzalloc_objs(struct page *, pages + 1);
if (!pagelist)
panic("%s: Cannot allocate page list for VDSO", __func__);
for (i = 0; i < pages; i++)
diff --git a/arch/s390/kvm/pci.c b/arch/s390/kvm/pci.c
index 2ac911e388bd..fc80495027ba 100644
--- a/arch/s390/kvm/pci.c
+++ b/arch/s390/kvm/pci.c
@@ -54,7 +54,7 @@ static int zpci_setup_aipb(u8 nisc)
struct page *page;
int size, rc;
- zpci_aipb = kzalloc_obj(union zpci_sic_iib, GFP_KERNEL);
+ zpci_aipb = kzalloc_obj(union zpci_sic_iib);
if (!zpci_aipb)
return -ENOMEM;
@@ -404,7 +404,7 @@ static int kvm_s390_pci_dev_open(struct zpci_dev *zdev)
{
struct kvm_zdev *kzdev;
- kzdev = kzalloc_obj(struct kvm_zdev, GFP_KERNEL);
+ kzdev = kzalloc_obj(struct kvm_zdev);
if (!kzdev)
return -ENOMEM;
@@ -666,7 +666,7 @@ int __init kvm_s390_pci_init(void)
if (!kvm_s390_pci_interp_allowed())
return 0;
- aift = kzalloc_obj(struct zpci_aift, GFP_KERNEL);
+ aift = kzalloc_obj(struct zpci_aift);
if (!aift)
return -ENOMEM;
diff --git a/arch/s390/kvm/pv.c b/arch/s390/kvm/pv.c
index fd34a2f46ce3..c2dafd812a3b 100644
--- a/arch/s390/kvm/pv.c
+++ b/arch/s390/kvm/pv.c
@@ -466,7 +466,7 @@ int kvm_s390_pv_set_aside(struct kvm *kvm, u16 *rc, u16 *rrc)
if (kvm->arch.gmap->asce.dt == TABLE_TYPE_SEGMENT)
return -EINVAL;
- priv = kzalloc_obj(*priv, GFP_KERNEL);
+ priv = kzalloc_obj(*priv);
if (!priv)
return -ENOMEM;
diff --git a/arch/s390/mm/extmem.c b/arch/s390/mm/extmem.c
index db1ef34ad03e..1c3a1eed4381 100644
--- a/arch/s390/mm/extmem.c
+++ b/arch/s390/mm/extmem.c
@@ -317,7 +317,7 @@ __segment_load (char *name, int do_nonshared, unsigned long *addr, unsigned long
goto out_free;
}
- seg->res = kzalloc_obj(struct resource, GFP_KERNEL);
+ seg->res = kzalloc_obj(struct resource);
if (seg->res == NULL) {
rc = -ENOMEM;
goto out_free;
diff --git a/arch/s390/net/bpf_jit_comp.c b/arch/s390/net/bpf_jit_comp.c
index 582afb486093..bf92964246eb 100644
--- a/arch/s390/net/bpf_jit_comp.c
+++ b/arch/s390/net/bpf_jit_comp.c
@@ -2323,7 +2323,7 @@ struct bpf_prog *bpf_int_jit_compile(struct bpf_prog *fp)
jit_data = fp->aux->jit_data;
if (!jit_data) {
- jit_data = kzalloc_obj(*jit_data, GFP_KERNEL);
+ jit_data = kzalloc_obj(*jit_data);
if (!jit_data) {
fp = orig_fp;
goto out;
diff --git a/arch/s390/pci/pci.c b/arch/s390/pci/pci.c
index b75065130639..0ae82e529c21 100644
--- a/arch/s390/pci/pci.c
+++ b/arch/s390/pci/pci.c
@@ -523,7 +523,7 @@ static struct resource *__alloc_res(struct zpci_dev *zdev, unsigned long start,
{
struct resource *r;
- r = kzalloc_obj(*r, GFP_KERNEL);
+ r = kzalloc_obj(*r);
if (!r)
return NULL;
@@ -824,7 +824,7 @@ struct zpci_dev *zpci_create_device(u32 fid, u32 fh, enum zpci_state state)
struct zpci_dev *zdev;
int rc;
- zdev = kzalloc_obj(*zdev, GFP_KERNEL);
+ zdev = kzalloc_obj(*zdev);
if (!zdev)
return ERR_PTR(-ENOMEM);
diff --git a/arch/s390/pci/pci_bus.c b/arch/s390/pci/pci_bus.c
index 3eba87a036b1..36a4807285fa 100644
--- a/arch/s390/pci/pci_bus.c
+++ b/arch/s390/pci/pci_bus.c
@@ -315,7 +315,7 @@ static struct zpci_bus *zpci_bus_alloc(int topo, bool topo_is_tid)
{
struct zpci_bus *zbus;
- zbus = kzalloc_obj(*zbus, GFP_KERNEL);
+ zbus = kzalloc_obj(*zbus);
if (!zbus)
return NULL;
diff --git a/arch/s390/pci/pci_irq.c b/arch/s390/pci/pci_irq.c
index 441356767437..9c9ed3d8d959 100644
--- a/arch/s390/pci/pci_irq.c
+++ b/arch/s390/pci/pci_irq.c
@@ -563,7 +563,7 @@ static int __init zpci_directed_irq_init(void)
iib.diib.disb_addr = virt_to_phys(zpci_sbv->vector);
zpci_set_irq_ctrl(SIC_IRQ_MODE_DIRECT, 0, &iib);
- zpci_ibv = kzalloc_objs(*zpci_ibv, num_possible_cpus(), GFP_KERNEL);
+ zpci_ibv = kzalloc_objs(*zpci_ibv, num_possible_cpus());
if (!zpci_ibv)
return -ENOMEM;
@@ -589,7 +589,7 @@ static int __init zpci_directed_irq_init(void)
static int __init zpci_floating_irq_init(void)
{
- zpci_ibv = kzalloc_objs(*zpci_ibv, ZPCI_NR_DEVICES, GFP_KERNEL);
+ zpci_ibv = kzalloc_objs(*zpci_ibv, ZPCI_NR_DEVICES);
if (!zpci_ibv)
return -ENOMEM;
diff --git a/arch/sh/drivers/dma/dmabrg.c b/arch/sh/drivers/dma/dmabrg.c
index 72f90f0c799e..3778c6a363ec 100644
--- a/arch/sh/drivers/dma/dmabrg.c
+++ b/arch/sh/drivers/dma/dmabrg.c
@@ -153,7 +153,7 @@ static int __init dmabrg_init(void)
unsigned long or;
int ret;
- dmabrg_handlers = kzalloc_objs(struct dmabrg_handler, 10, GFP_KERNEL);
+ dmabrg_handlers = kzalloc_objs(struct dmabrg_handler, 10);
if (!dmabrg_handlers)
return -ENOMEM;
diff --git a/arch/sh/drivers/heartbeat.c b/arch/sh/drivers/heartbeat.c
index aae320cef692..e55ef3c16a0f 100644
--- a/arch/sh/drivers/heartbeat.c
+++ b/arch/sh/drivers/heartbeat.c
@@ -91,7 +91,7 @@ static int heartbeat_drv_probe(struct platform_device *pdev)
if (pdev->dev.platform_data) {
hd = pdev->dev.platform_data;
} else {
- hd = kzalloc_obj(struct heartbeat_data, GFP_KERNEL);
+ hd = kzalloc_obj(struct heartbeat_data);
if (unlikely(!hd))
return -ENOMEM;
}
diff --git a/arch/sh/drivers/push-switch.c b/arch/sh/drivers/push-switch.c
index 492315fc96fd..a39e2edd4dcb 100644
--- a/arch/sh/drivers/push-switch.c
+++ b/arch/sh/drivers/push-switch.c
@@ -46,7 +46,7 @@ static int switch_drv_probe(struct platform_device *pdev)
struct push_switch *psw;
int ret, irq;
- psw = kzalloc_obj(struct push_switch, GFP_KERNEL);
+ psw = kzalloc_obj(struct push_switch);
if (unlikely(!psw))
return -ENOMEM;
diff --git a/arch/sh/kernel/cpu/sh4/sq.c b/arch/sh/kernel/cpu/sh4/sq.c
index 2a465c440168..908a8e09113b 100644
--- a/arch/sh/kernel/cpu/sh4/sq.c
+++ b/arch/sh/kernel/cpu/sh4/sq.c
@@ -342,7 +342,7 @@ static int sq_dev_add(struct device *dev, struct subsys_interface *sif)
struct kobject *kobj;
int error;
- sq_kobject[cpu] = kzalloc_obj(struct kobject, GFP_KERNEL);
+ sq_kobject[cpu] = kzalloc_obj(struct kobject);
if (unlikely(!sq_kobject[cpu]))
return -ENOMEM;
diff --git a/arch/sh/kernel/dwarf.c b/arch/sh/kernel/dwarf.c
index 46df80942418..edcf3b172284 100644
--- a/arch/sh/kernel/dwarf.c
+++ b/arch/sh/kernel/dwarf.c
@@ -741,7 +741,7 @@ static int dwarf_parse_cie(void *entry, void *p, unsigned long len,
unsigned long flags;
int count;
- cie = kzalloc_obj(*cie, GFP_KERNEL);
+ cie = kzalloc_obj(*cie);
if (!cie)
return -ENOMEM;
@@ -874,7 +874,7 @@ static int dwarf_parse_fde(void *entry, u32 entry_type,
int count;
void *p = start;
- fde = kzalloc_obj(*fde, GFP_KERNEL);
+ fde = kzalloc_obj(*fde);
if (!fde)
return -ENOMEM;
diff --git a/arch/sparc/kernel/central.c b/arch/sparc/kernel/central.c
index 904c4223230f..16b45d172fb0 100644
--- a/arch/sparc/kernel/central.c
+++ b/arch/sparc/kernel/central.c
@@ -63,7 +63,7 @@ static int clock_board_calc_nslots(struct clock_board *p)
static int clock_board_probe(struct platform_device *op)
{
- struct clock_board *p = kzalloc_obj(*p, GFP_KERNEL);
+ struct clock_board *p = kzalloc_obj(*p);
int err = -ENOMEM;
if (!p) {
@@ -159,7 +159,7 @@ static struct platform_driver clock_board_driver = {
static int fhc_probe(struct platform_device *op)
{
- struct fhc *p = kzalloc_obj(*p, GFP_KERNEL);
+ struct fhc *p = kzalloc_obj(*p);
int err = -ENOMEM;
u32 reg;
diff --git a/arch/sparc/kernel/chmc.c b/arch/sparc/kernel/chmc.c
index 663b2d7ff7bc..d935177b6953 100644
--- a/arch/sparc/kernel/chmc.c
+++ b/arch/sparc/kernel/chmc.c
@@ -417,7 +417,7 @@ static int jbusmc_probe(struct platform_device *op)
num_mem_regs = len / sizeof(*mem_regs);
err = -ENOMEM;
- p = kzalloc_obj(*p, GFP_KERNEL);
+ p = kzalloc_obj(*p);
if (!p) {
printk(KERN_ERR PFX "Cannot allocate struct jbusmc.\n");
goto out;
@@ -718,7 +718,7 @@ static int chmc_probe(struct platform_device *op)
}
err = -ENOMEM;
- p = kzalloc_obj(*p, GFP_KERNEL);
+ p = kzalloc_obj(*p);
if (!p) {
printk(KERN_ERR PFX "Could not allocate struct chmc.\n");
goto out;
diff --git a/arch/sparc/kernel/ds.c b/arch/sparc/kernel/ds.c
index df3fa6d96074..b34db8125bba 100644
--- a/arch/sparc/kernel/ds.c
+++ b/arch/sparc/kernel/ds.c
@@ -1175,7 +1175,7 @@ static int ds_probe(struct vio_dev *vdev, const struct vio_device_id *id)
if (ds_version_printed++ == 0)
printk(KERN_INFO "%s", version);
- dp = kzalloc_obj(*dp, GFP_KERNEL);
+ dp = kzalloc_obj(*dp);
err = -ENOMEM;
if (!dp)
goto out_err;
diff --git a/arch/sparc/kernel/ioport.c b/arch/sparc/kernel/ioport.c
index 82d248e6b822..cbc0680a4642 100644
--- a/arch/sparc/kernel/ioport.c
+++ b/arch/sparc/kernel/ioport.c
@@ -238,7 +238,7 @@ unsigned long sparc_dma_alloc_resource(struct device *dev, size_t len)
{
struct resource *res;
- res = kzalloc_obj(*res, GFP_KERNEL);
+ res = kzalloc_obj(*res);
if (!res)
return 0;
res->name = dev->of_node->full_name;
diff --git a/arch/sparc/kernel/ldc.c b/arch/sparc/kernel/ldc.c
index 4fd357d5fc29..826fe8ed0289 100644
--- a/arch/sparc/kernel/ldc.c
+++ b/arch/sparc/kernel/ldc.c
@@ -1171,7 +1171,7 @@ struct ldc_channel *ldc_alloc(unsigned long id,
mssbuf = NULL;
- lp = kzalloc_obj(*lp, GFP_KERNEL);
+ lp = kzalloc_obj(*lp);
err = -ENOMEM;
if (!lp)
goto out_err;
diff --git a/arch/sparc/kernel/leon_pci_grpci2.c b/arch/sparc/kernel/leon_pci_grpci2.c
index c6d5cec12b67..c1cbdf88146c 100644
--- a/arch/sparc/kernel/leon_pci_grpci2.c
+++ b/arch/sparc/kernel/leon_pci_grpci2.c
@@ -721,7 +721,7 @@ static int grpci2_of_probe(struct platform_device *ofdev)
goto err1;
}
- priv = grpci2priv = kzalloc_obj(struct grpci2_priv, GFP_KERNEL);
+ priv = grpci2priv = kzalloc_obj(struct grpci2_priv);
if (grpci2priv == NULL) {
err = -ENOMEM;
goto err1;
diff --git a/arch/sparc/kernel/of_device_32.c b/arch/sparc/kernel/of_device_32.c
index 51e90a093ee0..b62b1d0291a4 100644
--- a/arch/sparc/kernel/of_device_32.c
+++ b/arch/sparc/kernel/of_device_32.c
@@ -340,7 +340,7 @@ static void __init build_device_resources(struct platform_device *op,
static struct platform_device * __init scan_one_device(struct device_node *dp,
struct device *parent)
{
- struct platform_device *op = kzalloc_obj(*op, GFP_KERNEL);
+ struct platform_device *op = kzalloc_obj(*op);
const struct linux_prom_irqs *intr;
struct dev_archdata *sd;
int len, i;
diff --git a/arch/sparc/kernel/of_device_64.c b/arch/sparc/kernel/of_device_64.c
index c30ad34525bd..0b87eb629a62 100644
--- a/arch/sparc/kernel/of_device_64.c
+++ b/arch/sparc/kernel/of_device_64.c
@@ -633,7 +633,7 @@ static unsigned int __init build_one_device_irq(struct platform_device *op,
static struct platform_device * __init scan_one_device(struct device_node *dp,
struct device *parent)
{
- struct platform_device *op = kzalloc_obj(*op, GFP_KERNEL);
+ struct platform_device *op = kzalloc_obj(*op);
const unsigned int *irq;
struct dev_archdata *sd;
int len, i;
diff --git a/arch/sparc/kernel/pci.c b/arch/sparc/kernel/pci.c
index 432f83cf61aa..7e41574634b3 100644
--- a/arch/sparc/kernel/pci.c
+++ b/arch/sparc/kernel/pci.c
@@ -650,7 +650,7 @@ static void pci_claim_legacy_resources(struct pci_dev *dev)
if ((dev->class >> 8) != PCI_CLASS_DISPLAY_VGA)
return;
- p = kzalloc_obj(*p, GFP_KERNEL);
+ p = kzalloc_obj(*p);
if (!p)
return;
diff --git a/arch/sparc/kernel/pci_common.c b/arch/sparc/kernel/pci_common.c
index 588cfc595b84..0eafcb2d88ce 100644
--- a/arch/sparc/kernel/pci_common.c
+++ b/arch/sparc/kernel/pci_common.c
@@ -336,7 +336,7 @@ static void pci_register_iommu_region(struct pci_pbm_info *pbm)
NULL);
if (vdma) {
- struct resource *rp = kzalloc_obj(*rp, GFP_KERNEL);
+ struct resource *rp = kzalloc_obj(*rp);
if (!rp) {
pr_info("%s: Cannot allocate IOMMU resource.\n",
diff --git a/arch/sparc/kernel/pci_fire.c b/arch/sparc/kernel/pci_fire.c
index b72cf5acbdba..c35a8e3c1eae 100644
--- a/arch/sparc/kernel/pci_fire.c
+++ b/arch/sparc/kernel/pci_fire.c
@@ -468,13 +468,13 @@ static int fire_probe(struct platform_device *op)
portid = of_getintprop_default(dp, "portid", 0xff);
err = -ENOMEM;
- pbm = kzalloc_obj(*pbm, GFP_KERNEL);
+ pbm = kzalloc_obj(*pbm);
if (!pbm) {
printk(KERN_ERR PFX "Cannot allocate pci_pbminfo.\n");
goto out_err;
}
- iommu = kzalloc_obj(struct iommu, GFP_KERNEL);
+ iommu = kzalloc_obj(struct iommu);
if (!iommu) {
printk(KERN_ERR PFX "Cannot allocate PBM iommu.\n");
goto out_free_controller;
diff --git a/arch/sparc/kernel/pci_psycho.c b/arch/sparc/kernel/pci_psycho.c
index 9880b341a631..199ab73f84af 100644
--- a/arch/sparc/kernel/pci_psycho.c
+++ b/arch/sparc/kernel/pci_psycho.c
@@ -519,7 +519,7 @@ static int psycho_probe(struct platform_device *op)
upa_portid = of_getintprop_default(dp, "upa-portid", 0xff);
err = -ENOMEM;
- pbm = kzalloc_obj(*pbm, GFP_KERNEL);
+ pbm = kzalloc_obj(*pbm);
if (!pbm) {
printk(KERN_ERR PFX "Cannot allocate pci_pbm_info.\n");
goto out_err;
@@ -529,7 +529,7 @@ static int psycho_probe(struct platform_device *op)
if (pbm->sibling) {
iommu = pbm->sibling->iommu;
} else {
- iommu = kzalloc_obj(struct iommu, GFP_KERNEL);
+ iommu = kzalloc_obj(struct iommu);
if (!iommu) {
printk(KERN_ERR PFX "Cannot allocate PBM iommu.\n");
goto out_free_controller;
diff --git a/arch/sparc/kernel/pci_sabre.c b/arch/sparc/kernel/pci_sabre.c
index 3b4116f23862..1109d5b344eb 100644
--- a/arch/sparc/kernel/pci_sabre.c
+++ b/arch/sparc/kernel/pci_sabre.c
@@ -482,13 +482,13 @@ static int sabre_probe(struct platform_device *op)
}
err = -ENOMEM;
- pbm = kzalloc_obj(*pbm, GFP_KERNEL);
+ pbm = kzalloc_obj(*pbm);
if (!pbm) {
printk(KERN_ERR PFX "Cannot allocate pci_pbm_info.\n");
goto out_err;
}
- iommu = kzalloc_obj(*iommu, GFP_KERNEL);
+ iommu = kzalloc_obj(*iommu);
if (!iommu) {
printk(KERN_ERR PFX "Cannot allocate PBM iommu.\n");
goto out_free_controller;
diff --git a/arch/sparc/kernel/pci_schizo.c b/arch/sparc/kernel/pci_schizo.c
index 519a80a639d6..4348ca2c4a3f 100644
--- a/arch/sparc/kernel/pci_schizo.c
+++ b/arch/sparc/kernel/pci_schizo.c
@@ -1426,7 +1426,7 @@ static int __schizo_init(struct platform_device *op, unsigned long chip_type)
portid = of_getintprop_default(dp, "portid", 0xff);
err = -ENOMEM;
- pbm = kzalloc_obj(*pbm, GFP_KERNEL);
+ pbm = kzalloc_obj(*pbm);
if (!pbm) {
printk(KERN_ERR PFX "Cannot allocate pci_pbm_info.\n");
goto out_err;
@@ -1434,7 +1434,7 @@ static int __schizo_init(struct platform_device *op, unsigned long chip_type)
pbm->sibling = schizo_find_sibling(portid, chip_type);
- iommu = kzalloc_obj(struct iommu, GFP_KERNEL);
+ iommu = kzalloc_obj(struct iommu);
if (!iommu) {
printk(KERN_ERR PFX "Cannot allocate PBM A iommu.\n");
goto out_free_pbm;
diff --git a/arch/sparc/kernel/pci_sun4v.c b/arch/sparc/kernel/pci_sun4v.c
index 4e842fb48602..440284cc804e 100644
--- a/arch/sparc/kernel/pci_sun4v.c
+++ b/arch/sparc/kernel/pci_sun4v.c
@@ -754,7 +754,7 @@ static int pci_sun4v_atu_alloc_iotsb(struct pci_pbm_info *pbm)
unsigned long order;
unsigned long err;
- iotsb = kzalloc_obj(*iotsb, GFP_KERNEL);
+ iotsb = kzalloc_obj(*iotsb);
if (!iotsb) {
err = -ENOMEM;
goto out_err;
@@ -1292,13 +1292,13 @@ static int pci_sun4v_probe(struct platform_device *op)
iommu_batch_initialized = 1;
}
- pbm = kzalloc_obj(*pbm, GFP_KERNEL);
+ pbm = kzalloc_obj(*pbm);
if (!pbm) {
printk(KERN_ERR PFX "Could not allocate pci_pbm_info\n");
goto out_err;
}
- iommu = kzalloc_obj(struct iommu, GFP_KERNEL);
+ iommu = kzalloc_obj(struct iommu);
if (!iommu) {
printk(KERN_ERR PFX "Could not allocate pbm iommu\n");
goto out_free_controller;
@@ -1307,7 +1307,7 @@ static int pci_sun4v_probe(struct platform_device *op)
pbm->iommu = iommu;
iommu->atu = NULL;
if (hv_atu) {
- atu = kzalloc_obj(*atu, GFP_KERNEL);
+ atu = kzalloc_obj(*atu);
if (!atu)
pr_err(PFX "Could not allocate atu\n");
else
diff --git a/arch/sparc/kernel/setup_32.c b/arch/sparc/kernel/setup_32.c
index 46a7b53737d4..1b0db16cd37b 100644
--- a/arch/sparc/kernel/setup_32.c
+++ b/arch/sparc/kernel/setup_32.c
@@ -388,7 +388,7 @@ static int __init topology_init(void)
err = 0;
for_each_online_cpu(i) {
- struct cpu *p = kzalloc_obj(*p, GFP_KERNEL);
+ struct cpu *p = kzalloc_obj(*p);
if (!p)
err = -ENOMEM;
else
diff --git a/arch/sparc/kernel/starfire.c b/arch/sparc/kernel/starfire.c
index 7736dc34f6ad..d8ee9a69ae31 100644
--- a/arch/sparc/kernel/starfire.c
+++ b/arch/sparc/kernel/starfire.c
@@ -50,7 +50,7 @@ void starfire_hookup(int upaid)
struct starfire_irqinfo *p;
unsigned long treg_base, hwmid, i;
- p = kmalloc_obj(*p, GFP_KERNEL);
+ p = kmalloc_obj(*p);
if (!p) {
prom_printf("starfire_hookup: No memory, this is insane.\n");
prom_halt();
diff --git a/arch/sparc/kernel/vio.c b/arch/sparc/kernel/vio.c
index 0d21a8e567da..8b4f55047716 100644
--- a/arch/sparc/kernel/vio.c
+++ b/arch/sparc/kernel/vio.c
@@ -325,7 +325,7 @@ static struct vio_dev *vio_create_one(struct mdesc_handle *hp, u64 mp,
return NULL;
}
- vdev = kzalloc_obj(*vdev, GFP_KERNEL);
+ vdev = kzalloc_obj(*vdev);
if (!vdev) {
printk(KERN_ERR "VIO: Could not allocate vio_dev\n");
return NULL;
diff --git a/arch/sparc/mm/init_64.c b/arch/sparc/mm/init_64.c
index 2c4986e95713..f46394c46a76 100644
--- a/arch/sparc/mm/init_64.c
+++ b/arch/sparc/mm/init_64.c
@@ -3070,7 +3070,7 @@ static int __init report_memory(void)
kernel_lds_init();
for (i = 0; i < pavail_ents; i++) {
- res = kzalloc_obj(struct resource, GFP_KERNEL);
+ res = kzalloc_obj(struct resource);
if (!res) {
pr_warn("Failed to allocate source.\n");
diff --git a/arch/sparc/mm/iommu.c b/arch/sparc/mm/iommu.c
index 3ca7cc2b9bfb..df0eb99a4175 100644
--- a/arch/sparc/mm/iommu.c
+++ b/arch/sparc/mm/iommu.c
@@ -64,7 +64,7 @@ static void __init sbus_iommu_init(struct platform_device *op)
unsigned long base;
unsigned long tmp;
- iommu = kmalloc_obj(struct iommu_struct, GFP_KERNEL);
+ iommu = kmalloc_obj(struct iommu_struct);
if (!iommu) {
prom_printf("Unable to allocate iommu structure\n");
prom_halt();
diff --git a/arch/sparc/net/bpf_jit_comp_64.c b/arch/sparc/net/bpf_jit_comp_64.c
index 884b201259d6..b23d1c645ae5 100644
--- a/arch/sparc/net/bpf_jit_comp_64.c
+++ b/arch/sparc/net/bpf_jit_comp_64.c
@@ -1505,7 +1505,7 @@ struct bpf_prog *bpf_int_jit_compile(struct bpf_prog *prog)
jit_data = prog->aux->jit_data;
if (!jit_data) {
- jit_data = kzalloc_obj(*jit_data, GFP_KERNEL);
+ jit_data = kzalloc_obj(*jit_data);
if (!jit_data) {
prog = orig_prog;
goto out;
diff --git a/arch/sparc/vdso/vma.c b/arch/sparc/vdso/vma.c
index bba84959c69d..c454689ce5fa 100644
--- a/arch/sparc/vdso/vma.c
+++ b/arch/sparc/vdso/vma.c
@@ -266,7 +266,7 @@ static int __init init_vdso_image(const struct vdso_image *image,
if (WARN_ON(image->size % PAGE_SIZE != 0))
goto oom;
- cpp = kzalloc_objs(struct page *, cnpages, GFP_KERNEL);
+ cpp = kzalloc_objs(struct page *, cnpages);
vdso_mapping->pages = cpp;
if (!cpp)
@@ -288,7 +288,7 @@ static int __init init_vdso_image(const struct vdso_image *image,
dnpages = (sizeof(struct vvar_data) / PAGE_SIZE) + 1;
if (WARN_ON(dnpages != 1))
goto oom;
- dpp = kzalloc_objs(struct page *, dnpages, GFP_KERNEL);
+ dpp = kzalloc_objs(struct page *, dnpages);
vvar_mapping.pages = dpp;
if (!dpp)
diff --git a/arch/um/drivers/hostaudio_kern.c b/arch/um/drivers/hostaudio_kern.c
index 6983a35a9ead..7ce98f148eb3 100644
--- a/arch/um/drivers/hostaudio_kern.c
+++ b/arch/um/drivers/hostaudio_kern.c
@@ -186,7 +186,7 @@ static int hostaudio_open(struct inode *inode, struct file *file)
kernel_param_unlock(THIS_MODULE);
#endif
- state = kmalloc_obj(struct hostaudio_state, GFP_KERNEL);
+ state = kmalloc_obj(struct hostaudio_state);
if (state == NULL)
return -ENOMEM;
@@ -247,7 +247,7 @@ static int hostmixer_open_mixdev(struct inode *inode, struct file *file)
printk(KERN_DEBUG "hostmixer: open called (host: %s)\n", mixer);
#endif
- state = kmalloc_obj(struct hostmixer_state, GFP_KERNEL);
+ state = kmalloc_obj(struct hostmixer_state);
if (state == NULL)
return -ENOMEM;
diff --git a/arch/um/drivers/line.c b/arch/um/drivers/line.c
index 62545319d0eb..c851a592809c 100644
--- a/arch/um/drivers/line.c
+++ b/arch/um/drivers/line.c
@@ -672,7 +672,7 @@ void register_winch_irq(int fd, int tty_fd, int pid, struct tty_port *port,
{
struct winch *winch;
- winch = kmalloc_obj(*winch, GFP_KERNEL);
+ winch = kmalloc_obj(*winch);
if (winch == NULL) {
printk(KERN_ERR "register_winch_irq - kmalloc failed\n");
goto cleanup;
diff --git a/arch/um/drivers/port_kern.c b/arch/um/drivers/port_kern.c
index c51d6ca4de70..7b3ff4af1db6 100644
--- a/arch/um/drivers/port_kern.c
+++ b/arch/um/drivers/port_kern.c
@@ -170,7 +170,7 @@ void *port_data(int port_num)
if (port->port == port_num)
goto found;
}
- port = kmalloc_obj(struct port_list, GFP_KERNEL);
+ port = kmalloc_obj(struct port_list);
if (port == NULL) {
printk(KERN_ERR "Allocation of port list failed\n");
goto out;
@@ -202,7 +202,7 @@ void *port_data(int port_num)
list_add(&port->list, &ports);
found:
- dev = kmalloc_obj(struct port_dev, GFP_KERNEL);
+ dev = kmalloc_obj(struct port_dev);
if (dev == NULL) {
printk(KERN_ERR "Allocation of port device entry failed\n");
goto out;
diff --git a/arch/um/drivers/vector_kern.c b/arch/um/drivers/vector_kern.c
index 8882ad7c983a..5434c87542e5 100644
--- a/arch/um/drivers/vector_kern.c
+++ b/arch/um/drivers/vector_kern.c
@@ -515,7 +515,7 @@ static struct vector_queue *create_queue(
struct iovec *iov;
struct mmsghdr *mmsg_vector;
- result = kmalloc_obj(struct vector_queue, GFP_KERNEL);
+ result = kmalloc_obj(struct vector_queue);
if (result == NULL)
return NULL;
result->max_depth = max_size;
@@ -1583,7 +1583,7 @@ static void vector_eth_configure(
struct vector_private *vp;
int err;
- device = kzalloc_obj(*device, GFP_KERNEL);
+ device = kzalloc_obj(*device);
if (device == NULL) {
pr_err("Failed to allocate struct vector_device for vec%d\n", n);
return;
diff --git a/arch/um/drivers/vector_transports.c b/arch/um/drivers/vector_transports.c
index da5d2083ed49..ddd127ee9678 100644
--- a/arch/um/drivers/vector_transports.c
+++ b/arch/um/drivers/vector_transports.c
@@ -245,7 +245,7 @@ static int build_gre_transport_data(struct vector_private *vp)
int temp_rx;
int temp_tx;
- vp->transport_data = kmalloc_obj(struct uml_gre_data, GFP_KERNEL);
+ vp->transport_data = kmalloc_obj(struct uml_gre_data);
if (vp->transport_data == NULL)
return -ENOMEM;
td = vp->transport_data;
@@ -307,7 +307,7 @@ static int build_l2tpv3_transport_data(struct vector_private *vp)
unsigned long temp_rx;
unsigned long temp_tx;
- vp->transport_data = kmalloc_obj(struct uml_l2tpv3_data, GFP_KERNEL);
+ vp->transport_data = kmalloc_obj(struct uml_l2tpv3_data);
if (vp->transport_data == NULL)
return -ENOMEM;
diff --git a/arch/um/drivers/vfio_kern.c b/arch/um/drivers/vfio_kern.c
index 5f349be2fce7..7b6492174da0 100644
--- a/arch/um/drivers/vfio_kern.c
+++ b/arch/um/drivers/vfio_kern.c
@@ -107,7 +107,7 @@ static int uml_vfio_open_group(int group_id)
}
}
- group = kzalloc_obj(*group, GFP_KERNEL);
+ group = kzalloc_obj(*group);
if (!group)
return -ENOMEM;
@@ -599,7 +599,7 @@ static struct uml_vfio_device *uml_vfio_add_device(const char *device)
if (uml_vfio_find_device(device))
return ERR_PTR(-EEXIST);
- dev = kzalloc_obj(*dev, GFP_KERNEL);
+ dev = kzalloc_obj(*dev);
if (!dev)
return ERR_PTR(-ENOMEM);
diff --git a/arch/um/drivers/virtio_pcidev.c b/arch/um/drivers/virtio_pcidev.c
index 5db9a4461766..2bf5a645db45 100644
--- a/arch/um/drivers/virtio_pcidev.c
+++ b/arch/um/drivers/virtio_pcidev.c
@@ -537,7 +537,7 @@ static int virtio_pcidev_virtio_probe(struct virtio_device *vdev)
struct virtio_pcidev_device *dev;
int err;
- dev = kzalloc_obj(*dev, GFP_KERNEL);
+ dev = kzalloc_obj(*dev);
if (!dev)
return -ENOMEM;
diff --git a/arch/um/drivers/virtio_uml.c b/arch/um/drivers/virtio_uml.c
index ac269e6148fc..7425a8548141 100644
--- a/arch/um/drivers/virtio_uml.c
+++ b/arch/um/drivers/virtio_uml.c
@@ -965,7 +965,7 @@ static struct virtqueue *vu_setup_vq(struct virtio_device *vdev,
int num = MAX_SUPPORTED_QUEUE_SIZE;
int rc;
- info = kzalloc_obj(*info, GFP_KERNEL);
+ info = kzalloc_obj(*info);
if (!info) {
rc = -ENOMEM;
goto error_kzalloc;
@@ -1217,7 +1217,7 @@ static int virtio_uml_probe(struct platform_device *pdev)
return PTR_ERR(pdata);
}
- vu_dev = kzalloc_obj(*vu_dev, GFP_KERNEL);
+ vu_dev = kzalloc_obj(*vu_dev);
if (!vu_dev)
return -ENOMEM;
diff --git a/arch/um/drivers/xterm_kern.c b/arch/um/drivers/xterm_kern.c
index 7740d9a3b090..d630cb19e14a 100644
--- a/arch/um/drivers/xterm_kern.c
+++ b/arch/um/drivers/xterm_kern.c
@@ -45,7 +45,7 @@ int xterm_fd(int socket, int *pid_out)
struct xterm_wait *data;
int err, ret;
- data = kmalloc_obj(*data, GFP_KERNEL);
+ data = kmalloc_obj(*data);
if (data == NULL) {
printk(KERN_ERR "xterm_fd : failed to allocate xterm_wait\n");
return -ENOMEM;
diff --git a/arch/x86/coco/sev/core.c b/arch/x86/coco/sev/core.c
index 7bf44927519d..907981b94c40 100644
--- a/arch/x86/coco/sev/core.c
+++ b/arch/x86/coco/sev/core.c
@@ -1542,7 +1542,7 @@ static struct aesgcm_ctx *snp_init_crypto(u8 *key, size_t keylen)
{
struct aesgcm_ctx *ctx;
- ctx = kzalloc_obj(*ctx, GFP_KERNEL);
+ ctx = kzalloc_obj(*ctx);
if (!ctx)
return NULL;
@@ -1590,7 +1590,7 @@ struct snp_msg_desc *snp_msg_alloc(void)
BUILD_BUG_ON(sizeof(struct snp_guest_msg) > PAGE_SIZE);
- mdesc = kzalloc_obj(struct snp_msg_desc, GFP_KERNEL);
+ mdesc = kzalloc_obj(struct snp_msg_desc);
if (!mdesc)
return ERR_PTR(-ENOMEM);
@@ -1945,7 +1945,7 @@ static int __init snp_get_tsc_info(void)
struct snp_guest_req req = {};
int rc = -ENOMEM;
- tsc_req = kzalloc_obj(*tsc_req, GFP_KERNEL);
+ tsc_req = kzalloc_obj(*tsc_req);
if (!tsc_req)
return rc;
diff --git a/arch/x86/events/amd/iommu.c b/arch/x86/events/amd/iommu.c
index 17e383c20271..07b110e8418a 100644
--- a/arch/x86/events/amd/iommu.c
+++ b/arch/x86/events/amd/iommu.c
@@ -387,7 +387,7 @@ static __init int _init_events_attrs(void)
while (amd_iommu_v2_event_descs[i].attr.attr.name)
i++;
- attrs = kzalloc_objs(*attrs, i + 1, GFP_KERNEL);
+ attrs = kzalloc_objs(*attrs, i + 1);
if (!attrs)
return -ENOMEM;
@@ -422,7 +422,7 @@ static __init int init_one_iommu(unsigned int idx)
struct perf_amd_iommu *perf_iommu;
int ret;
- perf_iommu = kzalloc_obj(struct perf_amd_iommu, GFP_KERNEL);
+ perf_iommu = kzalloc_obj(struct perf_amd_iommu);
if (!perf_iommu)
return -ENOMEM;
diff --git a/arch/x86/events/amd/uncore.c b/arch/x86/events/amd/uncore.c
index c0ed0dfbaeaa..dd956cfcadef 100644
--- a/arch/x86/events/amd/uncore.c
+++ b/arch/x86/events/amd/uncore.c
@@ -726,7 +726,7 @@ int amd_uncore_df_ctx_init(struct amd_uncore *uncore, unsigned int cpu)
goto done;
/* No grouping, single instance for a system */
- uncore->pmus = kzalloc_obj(*uncore->pmus, GFP_KERNEL);
+ uncore->pmus = kzalloc_obj(*uncore->pmus);
if (!uncore->pmus)
goto done;
@@ -860,7 +860,7 @@ int amd_uncore_l3_ctx_init(struct amd_uncore *uncore, unsigned int cpu)
goto done;
/* No grouping, single instance for a system */
- uncore->pmus = kzalloc_obj(*uncore->pmus, GFP_KERNEL);
+ uncore->pmus = kzalloc_obj(*uncore->pmus);
if (!uncore->pmus)
goto done;
diff --git a/arch/x86/events/core.c b/arch/x86/events/core.c
index 52f7ad5adeb1..03ce1bc7ef2e 100644
--- a/arch/x86/events/core.c
+++ b/arch/x86/events/core.c
@@ -2389,7 +2389,7 @@ static struct cpu_hw_events *allocate_fake_cpuc(struct pmu *event_pmu)
struct cpu_hw_events *cpuc;
int cpu;
- cpuc = kzalloc_obj(*cpuc, GFP_KERNEL);
+ cpuc = kzalloc_obj(*cpuc);
if (!cpuc)
return ERR_PTR(-ENOMEM);
cpuc->is_fake = 1;
diff --git a/arch/x86/events/intel/uncore.c b/arch/x86/events/intel/uncore.c
index 9095f1eeff6e..3e68d60f8c14 100644
--- a/arch/x86/events/intel/uncore.c
+++ b/arch/x86/events/intel/uncore.c
@@ -107,7 +107,7 @@ struct pci2phy_map *__find_pci2phy_map(int segment)
if (!alloc) {
raw_spin_unlock(&pci2phy_map_lock);
- alloc = kmalloc_obj(struct pci2phy_map, GFP_KERNEL);
+ alloc = kmalloc_obj(struct pci2phy_map);
raw_spin_lock(&pci2phy_map_lock);
if (!alloc)
@@ -990,7 +990,7 @@ static int __init uncore_type_init(struct intel_uncore_type *type)
size_t size;
int i, j;
- pmus = kzalloc_objs(*pmus, type->num_boxes, GFP_KERNEL);
+ pmus = kzalloc_objs(*pmus, type->num_boxes);
if (!pmus)
return -ENOMEM;
diff --git a/arch/x86/events/intel/uncore_discovery.c b/arch/x86/events/intel/uncore_discovery.c
index f8d1328d8346..c8bf3983accf 100644
--- a/arch/x86/events/intel/uncore_discovery.c
+++ b/arch/x86/events/intel/uncore_discovery.c
@@ -68,7 +68,7 @@ add_uncore_discovery_type(struct uncore_unit_discovery *unit)
return NULL;
}
- type = kzalloc_obj(struct intel_uncore_discovery_type, GFP_KERNEL);
+ type = kzalloc_obj(struct intel_uncore_discovery_type);
if (!type)
return NULL;
@@ -215,7 +215,7 @@ uncore_insert_box_info(struct uncore_unit_discovery *unit,
return;
}
- node = kzalloc_obj(*node, GFP_KERNEL);
+ node = kzalloc_obj(*node);
if (!node)
return;
@@ -755,7 +755,7 @@ intel_uncore_generic_init_uncores(enum uncore_access_type type_id, int num_extra
if (type->access_type != type_id)
continue;
- uncore = kzalloc_obj(struct intel_uncore_type, GFP_KERNEL);
+ uncore = kzalloc_obj(struct intel_uncore_type);
if (!uncore)
break;
diff --git a/arch/x86/events/intel/uncore_snbep.c b/arch/x86/events/intel/uncore_snbep.c
index 94682b067e35..069e6b788280 100644
--- a/arch/x86/events/intel/uncore_snbep.c
+++ b/arch/x86/events/intel/uncore_snbep.c
@@ -3748,7 +3748,7 @@ static int pmu_alloc_topology(struct intel_uncore_type *type, int topology_type)
if (!type->num_boxes)
return -EPERM;
- topology = kzalloc_objs(*topology, uncore_max_dies(), GFP_KERNEL);
+ topology = kzalloc_objs(*topology, uncore_max_dies());
if (!topology)
goto err;
@@ -3883,11 +3883,11 @@ pmu_set_mapping(struct intel_uncore_type *type, struct attribute_group *ag,
goto clear_topology;
/* One more for NULL. */
- attrs = kzalloc_objs(*attrs, (uncore_max_dies() + 1), GFP_KERNEL);
+ attrs = kzalloc_objs(*attrs, (uncore_max_dies() + 1));
if (!attrs)
goto clear_topology;
- eas = kzalloc_objs(*eas, uncore_max_dies(), GFP_KERNEL);
+ eas = kzalloc_objs(*eas, uncore_max_dies());
if (!eas)
goto clear_attrs;
@@ -6412,7 +6412,7 @@ static void spr_update_device_location(int type_id)
} else
return;
- root = kzalloc_obj(struct rb_root, GFP_KERNEL);
+ root = kzalloc_obj(struct rb_root);
if (!root) {
type->num_boxes = 0;
return;
@@ -6425,7 +6425,7 @@ static void spr_update_device_location(int type_id)
if (die < 0)
continue;
- unit = kzalloc_obj(*unit, GFP_KERNEL);
+ unit = kzalloc_obj(*unit);
if (!unit)
continue;
unit->die = die;
diff --git a/arch/x86/events/rapl.c b/arch/x86/events/rapl.c
index 27b3fd6e663c..efee5ce03e54 100644
--- a/arch/x86/events/rapl.c
+++ b/arch/x86/events/rapl.c
@@ -704,7 +704,7 @@ static int __init init_rapl_pmu(struct rapl_pmus *rapl_pmus)
int idx;
for (idx = 0; idx < rapl_pmus->nr_rapl_pmu; idx++) {
- rapl_pmu = kzalloc_obj(*rapl_pmu, GFP_KERNEL);
+ rapl_pmu = kzalloc_obj(*rapl_pmu);
if (!rapl_pmu)
goto free;
diff --git a/arch/x86/hyperv/ivm.c b/arch/x86/hyperv/ivm.c
index 07f125668852..2ce4dfe53472 100644
--- a/arch/x86/hyperv/ivm.c
+++ b/arch/x86/hyperv/ivm.c
@@ -531,7 +531,7 @@ static int hv_list_enc_add(const u64 *pfn_list, int count)
raw_spin_unlock_irqrestore(&hv_list_enc_lock, flags);
/* No adjacent region found -- create a new one */
- ent = kzalloc_obj(struct hv_enc_pfn_region, GFP_KERNEL);
+ ent = kzalloc_obj(struct hv_enc_pfn_region);
if (!ent)
return -ENOMEM;
@@ -598,7 +598,7 @@ static int hv_list_enc_remove(const u64 *pfn_list, int count)
unlock_split:
raw_spin_unlock_irqrestore(&hv_list_enc_lock, flags);
- ent = kzalloc_obj(struct hv_enc_pfn_region, GFP_KERNEL);
+ ent = kzalloc_obj(struct hv_enc_pfn_region);
if (!ent)
return -ENOMEM;
diff --git a/arch/x86/kernel/alternative.c b/arch/x86/kernel/alternative.c
index 0ffc7de200b1..a888ae0f01fb 100644
--- a/arch/x86/kernel/alternative.c
+++ b/arch/x86/kernel/alternative.c
@@ -2160,7 +2160,7 @@ void __init_or_module alternatives_smp_module_add(struct module *mod,
/* Don't bother remembering, we'll never have to undo it. */
goto smp_unlock;
- smp = kzalloc_obj(*smp, GFP_KERNEL);
+ smp = kzalloc_obj(*smp);
if (NULL == smp)
/* we'll run the (safe but slow) SMP code then ... */
goto unlock;
diff --git a/arch/x86/kernel/amd_node.c b/arch/x86/kernel/amd_node.c
index 2091cb1089a2..0be01725a2a4 100644
--- a/arch/x86/kernel/amd_node.c
+++ b/arch/x86/kernel/amd_node.c
@@ -282,7 +282,7 @@ static int __init amd_smn_init(void)
return -ENODEV;
num_nodes = amd_num_nodes();
- amd_roots = kzalloc_objs(*amd_roots, num_nodes, GFP_KERNEL);
+ amd_roots = kzalloc_objs(*amd_roots, num_nodes);
if (!amd_roots)
return -ENOMEM;
diff --git a/arch/x86/kernel/apic/io_apic.c b/arch/x86/kernel/apic/io_apic.c
index aa3675ba08bb..352ed5558cbc 100644
--- a/arch/x86/kernel/apic/io_apic.c
+++ b/arch/x86/kernel/apic/io_apic.c
@@ -2876,7 +2876,7 @@ int mp_irqdomain_alloc(struct irq_domain *domain, unsigned int virq,
if (irq_resolve_mapping(domain, (irq_hw_number_t)pin))
return -EEXIST;
- data = kzalloc_obj(*data, GFP_KERNEL);
+ data = kzalloc_obj(*data);
if (!data)
return -ENOMEM;
diff --git a/arch/x86/kernel/apm_32.c b/arch/x86/kernel/apm_32.c
index 13efc166bd3f..a57c026fb58a 100644
--- a/arch/x86/kernel/apm_32.c
+++ b/arch/x86/kernel/apm_32.c
@@ -1576,7 +1576,7 @@ static int do_open(struct inode *inode, struct file *filp)
{
struct apm_user *as;
- as = kmalloc_obj(*as, GFP_KERNEL);
+ as = kmalloc_obj(*as);
if (as == NULL)
return -ENOMEM;
diff --git a/arch/x86/kernel/cpu/amd_cache_disable.c b/arch/x86/kernel/cpu/amd_cache_disable.c
index 13985d2f8b1d..9ab460bc11a2 100644
--- a/arch/x86/kernel/cpu/amd_cache_disable.c
+++ b/arch/x86/kernel/cpu/amd_cache_disable.c
@@ -255,7 +255,7 @@ static void init_amd_l3_attrs(void)
if (amd_nb_has_feature(AMD_NB_L3_PARTITIONING))
n += 1;
- amd_l3_attrs = kzalloc_objs(*amd_l3_attrs, n, GFP_KERNEL);
+ amd_l3_attrs = kzalloc_objs(*amd_l3_attrs, n);
if (!amd_l3_attrs)
return;
diff --git a/arch/x86/kernel/cpu/mce/amd.c b/arch/x86/kernel/cpu/mce/amd.c
index 4e7a6101e7ed..da13c1e37f87 100644
--- a/arch/x86/kernel/cpu/mce/amd.c
+++ b/arch/x86/kernel/cpu/mce/amd.c
@@ -1088,7 +1088,7 @@ static int allocate_threshold_blocks(unsigned int cpu, struct threshold_bank *tb
(high & MASK_LOCKED_HI))
goto recurse;
- b = kzalloc_obj(struct threshold_block, GFP_KERNEL);
+ b = kzalloc_obj(struct threshold_block);
if (!b)
return -ENOMEM;
@@ -1147,7 +1147,7 @@ static int threshold_create_bank(struct threshold_bank **bp, unsigned int cpu,
if (!dev)
return -ENODEV;
- b = kzalloc_obj(struct threshold_bank, GFP_KERNEL);
+ b = kzalloc_obj(struct threshold_bank);
if (!b) {
err = -ENOMEM;
goto out;
@@ -1250,7 +1250,7 @@ void mce_threshold_create_device(unsigned int cpu)
return;
numbanks = this_cpu_read(mce_num_banks);
- bp = kzalloc_objs(*bp, numbanks, GFP_KERNEL);
+ bp = kzalloc_objs(*bp, numbanks);
if (!bp)
return;
diff --git a/arch/x86/kernel/cpu/mce/core.c b/arch/x86/kernel/cpu/mce/core.c
index dd6a06ab5270..8dd424ac5de8 100644
--- a/arch/x86/kernel/cpu/mce/core.c
+++ b/arch/x86/kernel/cpu/mce/core.c
@@ -2692,7 +2692,7 @@ static int mce_device_create(unsigned int cpu)
if (dev)
return 0;
- dev = kzalloc_obj(*dev, GFP_KERNEL);
+ dev = kzalloc_obj(*dev);
if (!dev)
return -ENOMEM;
dev->id = cpu;
diff --git a/arch/x86/kernel/cpu/microcode/amd.c b/arch/x86/kernel/cpu/microcode/amd.c
index e58a73ae431b..e533881284a1 100644
--- a/arch/x86/kernel/cpu/microcode/amd.c
+++ b/arch/x86/kernel/cpu/microcode/amd.c
@@ -1086,7 +1086,7 @@ static int verify_and_add_patch(u8 family, u8 *fw, unsigned int leftover,
if (ret)
return ret;
- patch = kzalloc_obj(*patch, GFP_KERNEL);
+ patch = kzalloc_obj(*patch);
if (!patch) {
pr_err("Patch allocation failure.\n");
return -EINVAL;
diff --git a/arch/x86/kernel/cpu/mtrr/generic.c b/arch/x86/kernel/cpu/mtrr/generic.c
index d7db12c06950..3a8317060732 100644
--- a/arch/x86/kernel/cpu/mtrr/generic.c
+++ b/arch/x86/kernel/cpu/mtrr/generic.c
@@ -410,7 +410,7 @@ void __init mtrr_copy_map(void)
mutex_lock(&mtrr_mutex);
- cache_map = kzalloc_objs(*cache_map, new_size, GFP_KERNEL);
+ cache_map = kzalloc_objs(*cache_map, new_size);
if (cache_map) {
memmove(cache_map, init_cache_map,
cache_map_n * sizeof(*cache_map));
diff --git a/arch/x86/kernel/cpu/mtrr/legacy.c b/arch/x86/kernel/cpu/mtrr/legacy.c
index ee7bc7b5ce96..ca1209cdea5f 100644
--- a/arch/x86/kernel/cpu/mtrr/legacy.c
+++ b/arch/x86/kernel/cpu/mtrr/legacy.c
@@ -80,7 +80,7 @@ static struct syscore mtrr_syscore = {
void mtrr_register_syscore(void)
{
- mtrr_value = kzalloc_objs(*mtrr_value, num_var_ranges, GFP_KERNEL);
+ mtrr_value = kzalloc_objs(*mtrr_value, num_var_ranges);
/*
* The CPU has no MTRR and seems to not support SMP. They have
diff --git a/arch/x86/kernel/cpu/sgx/driver.c b/arch/x86/kernel/cpu/sgx/driver.c
index 74fb59d96730..473619741bc4 100644
--- a/arch/x86/kernel/cpu/sgx/driver.c
+++ b/arch/x86/kernel/cpu/sgx/driver.c
@@ -19,7 +19,7 @@ static int __sgx_open(struct inode *inode, struct file *file)
struct sgx_encl *encl;
int ret;
- encl = kzalloc_obj(*encl, GFP_KERNEL);
+ encl = kzalloc_obj(*encl);
if (!encl)
return -ENOMEM;
diff --git a/arch/x86/kernel/cpu/sgx/encl.c b/arch/x86/kernel/cpu/sgx/encl.c
index 8b6c400c4008..ac60ebde5d9b 100644
--- a/arch/x86/kernel/cpu/sgx/encl.c
+++ b/arch/x86/kernel/cpu/sgx/encl.c
@@ -854,7 +854,7 @@ int sgx_encl_mm_add(struct sgx_encl *encl, struct mm_struct *mm)
if (sgx_encl_find_mm(encl, mm))
return 0;
- encl_mm = kzalloc_obj(*encl_mm, GFP_KERNEL);
+ encl_mm = kzalloc_obj(*encl_mm);
if (!encl_mm)
return -ENOMEM;
@@ -1163,7 +1163,7 @@ struct sgx_encl_page *sgx_encl_page_alloc(struct sgx_encl *encl,
struct sgx_encl_page *encl_page;
unsigned long prot;
- encl_page = kzalloc_obj(*encl_page, GFP_KERNEL);
+ encl_page = kzalloc_obj(*encl_page);
if (!encl_page)
return ERR_PTR(-ENOMEM);
diff --git a/arch/x86/kernel/cpu/sgx/ioctl.c b/arch/x86/kernel/cpu/sgx/ioctl.c
index ef6674067d80..c236a8ac78a8 100644
--- a/arch/x86/kernel/cpu/sgx/ioctl.c
+++ b/arch/x86/kernel/cpu/sgx/ioctl.c
@@ -27,7 +27,7 @@ struct sgx_va_page *sgx_encl_grow(struct sgx_encl *encl, bool reclaim)
(SGX_ENCL_PAGE_VA_OFFSET_MASK >> 3) + 1);
if (!(encl->page_cnt % SGX_VA_SLOT_COUNT)) {
- va_page = kzalloc_obj(*va_page, GFP_KERNEL);
+ va_page = kzalloc_obj(*va_page);
if (!va_page)
return ERR_PTR(-ENOMEM);
diff --git a/arch/x86/kernel/cpu/sgx/virt.c b/arch/x86/kernel/cpu/sgx/virt.c
index c7be8d0ea869..db6806c40483 100644
--- a/arch/x86/kernel/cpu/sgx/virt.c
+++ b/arch/x86/kernel/cpu/sgx/virt.c
@@ -264,7 +264,7 @@ static int __sgx_vepc_open(struct inode *inode, struct file *file)
{
struct sgx_vepc *vepc;
- vepc = kzalloc_obj(struct sgx_vepc, GFP_KERNEL);
+ vepc = kzalloc_obj(struct sgx_vepc);
if (!vepc)
return -ENOMEM;
mutex_init(&vepc->lock);
diff --git a/arch/x86/kernel/hpet.c b/arch/x86/kernel/hpet.c
index 43884229c421..610590e83445 100644
--- a/arch/x86/kernel/hpet.c
+++ b/arch/x86/kernel/hpet.c
@@ -544,7 +544,7 @@ static struct irq_domain *hpet_create_irq_domain(int hpet_id)
if (x86_vector_domain == NULL)
return NULL;
- domain_info = kzalloc_obj(*domain_info, GFP_KERNEL);
+ domain_info = kzalloc_obj(*domain_info);
if (!domain_info)
return NULL;
@@ -1038,7 +1038,7 @@ int __init hpet_enable(void)
if (IS_ENABLED(CONFIG_HPET_EMULATE_RTC) && channels < 2)
goto out_nohpet;
- hc = kzalloc_objs(*hc, channels, GFP_KERNEL);
+ hc = kzalloc_objs(*hc, channels);
if (!hc) {
pr_warn("Disabling HPET.\n");
goto out_nohpet;
diff --git a/arch/x86/kernel/ioport.c b/arch/x86/kernel/ioport.c
index 30ab130329dc..2b9de8e1a090 100644
--- a/arch/x86/kernel/ioport.c
+++ b/arch/x86/kernel/ioport.c
@@ -90,7 +90,7 @@ long ksys_ioperm(unsigned long from, unsigned long num, int turn_on)
/* No point to allocate a bitmap just to clear permissions */
if (!turn_on)
return 0;
- iobm = kmalloc_obj(*iobm, GFP_KERNEL);
+ iobm = kmalloc_obj(*iobm);
if (!iobm)
return -ENOMEM;
diff --git a/arch/x86/kernel/kdebugfs.c b/arch/x86/kernel/kdebugfs.c
index 4d7bf56524d8..e14ace32009f 100644
--- a/arch/x86/kernel/kdebugfs.c
+++ b/arch/x86/kernel/kdebugfs.c
@@ -102,7 +102,7 @@ static int __init create_setup_data_nodes(struct dentry *parent)
pa_data = boot_params.hdr.setup_data;
while (pa_data) {
- node = kmalloc_obj(*node, GFP_KERNEL);
+ node = kmalloc_obj(*node);
if (!node) {
error = -ENOMEM;
goto err_dir;
diff --git a/arch/x86/kernel/kexec-bzimage64.c b/arch/x86/kernel/kexec-bzimage64.c
index b7ba1ec486f9..5630c7dca1f3 100644
--- a/arch/x86/kernel/kexec-bzimage64.c
+++ b/arch/x86/kernel/kexec-bzimage64.c
@@ -682,7 +682,7 @@ static void *bzImage64_load(struct kimage *image, char *kernel,
goto out_free_params;
/* Allocate loader specific data */
- ldata = kzalloc_obj(struct bzimage64_data, GFP_KERNEL);
+ ldata = kzalloc_obj(struct bzimage64_data);
if (!ldata) {
ret = -ENOMEM;
goto out_free_params;
diff --git a/arch/x86/kernel/ksysfs.c b/arch/x86/kernel/ksysfs.c
index c5614b59be4a..1a6e1f89f294 100644
--- a/arch/x86/kernel/ksysfs.c
+++ b/arch/x86/kernel/ksysfs.c
@@ -344,7 +344,7 @@ static int __init create_setup_data_nodes(struct kobject *parent)
if (ret)
goto out_setup_data_kobj;
- kobjp = kmalloc_objs(*kobjp, nr, GFP_KERNEL);
+ kobjp = kmalloc_objs(*kobjp, nr);
if (!kobjp) {
ret = -ENOMEM;
goto out_setup_data_kobj;
diff --git a/arch/x86/kernel/uprobes.c b/arch/x86/kernel/uprobes.c
index 61d37f5a5ff9..ebb1baf1eb1d 100644
--- a/arch/x86/kernel/uprobes.c
+++ b/arch/x86/kernel/uprobes.c
@@ -696,7 +696,7 @@ static struct uprobe_trampoline *create_uprobe_trampoline(unsigned long vaddr)
if (IS_ERR_VALUE(vaddr))
return NULL;
- tramp = kzalloc_obj(*tramp, GFP_KERNEL);
+ tramp = kzalloc_obj(*tramp);
if (unlikely(!tramp))
return NULL;
diff --git a/arch/x86/kernel/vm86_32.c b/arch/x86/kernel/vm86_32.c
index 3bb70763af9c..b4c1cabc7a4b 100644
--- a/arch/x86/kernel/vm86_32.c
+++ b/arch/x86/kernel/vm86_32.c
@@ -232,7 +232,7 @@ static long do_sys_vm86(struct vm86plus_struct __user *user_vm86, bool plus)
}
if (!vm86) {
- if (!(vm86 = kzalloc_obj(*vm86, GFP_KERNEL)))
+ if (!(vm86 = kzalloc_obj(*vm86)))
return -ENOMEM;
tsk->thread.vm86 = vm86;
}
diff --git a/arch/x86/kvm/svm/nested.c b/arch/x86/kvm/svm/nested.c
index 999fd3373dba..53ab6ce3cc26 100644
--- a/arch/x86/kvm/svm/nested.c
+++ b/arch/x86/kvm/svm/nested.c
@@ -1781,7 +1781,7 @@ static int svm_get_nested_state(struct kvm_vcpu *vcpu,
if (clear_user(user_vmcb, KVM_STATE_NESTED_SVM_VMCB_SIZE))
return -EFAULT;
- ctl = kzalloc_obj(*ctl, GFP_KERNEL);
+ ctl = kzalloc_obj(*ctl);
if (!ctl)
return -ENOMEM;
diff --git a/arch/x86/kvm/vmx/tdx.c b/arch/x86/kvm/vmx/tdx.c
index adbb3060ae2f..8517d5fbf79c 100644
--- a/arch/x86/kvm/vmx/tdx.c
+++ b/arch/x86/kvm/vmx/tdx.c
@@ -2743,7 +2743,7 @@ static int tdx_td_init(struct kvm *kvm, struct kvm_tdx_cmd *cmd)
goto out;
}
- td_params = kzalloc_obj(struct td_params, GFP_KERNEL);
+ td_params = kzalloc_obj(struct td_params);
if (!td_params) {
ret = -ENOMEM;
goto out;
diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c
index 4344847f7119..3fb64905d190 100644
--- a/arch/x86/kvm/x86.c
+++ b/arch/x86/kvm/x86.c
@@ -6208,7 +6208,7 @@ long kvm_arch_vcpu_ioctl(struct file *filp,
r = -EINVAL;
if (!lapic_in_kernel(vcpu))
goto out;
- u.lapic = kzalloc_obj(struct kvm_lapic_state, GFP_KERNEL);
+ u.lapic = kzalloc_obj(struct kvm_lapic_state);
r = -ENOMEM;
if (!u.lapic)
@@ -6410,7 +6410,7 @@ long kvm_arch_vcpu_ioctl(struct file *filp,
if (vcpu->arch.guest_fpu.uabi_size > sizeof(struct kvm_xsave))
break;
- u.xsave = kzalloc_obj(struct kvm_xsave, GFP_KERNEL);
+ u.xsave = kzalloc_obj(struct kvm_xsave);
r = -ENOMEM;
if (!u.xsave)
break;
@@ -6459,7 +6459,7 @@ long kvm_arch_vcpu_ioctl(struct file *filp,
}
case KVM_GET_XCRS: {
- u.xcrs = kzalloc_obj(struct kvm_xcrs, GFP_KERNEL);
+ u.xcrs = kzalloc_obj(struct kvm_xcrs);
r = -ENOMEM;
if (!u.xcrs)
break;
@@ -6619,7 +6619,7 @@ long kvm_arch_vcpu_ioctl(struct file *filp,
vcpu->arch.guest_state_protected)
goto out;
- u.sregs2 = kzalloc_obj(struct kvm_sregs2, GFP_KERNEL);
+ u.sregs2 = kzalloc_obj(struct kvm_sregs2);
r = -ENOMEM;
if (!u.sregs2)
goto out;
diff --git a/arch/x86/kvm/xen.c b/arch/x86/kvm/xen.c
index 1838a49eee76..91fd3673c09a 100644
--- a/arch/x86/kvm/xen.c
+++ b/arch/x86/kvm/xen.c
@@ -1514,7 +1514,7 @@ static bool kvm_xen_schedop_poll(struct kvm_vcpu *vcpu, bool longmode,
return true;
}
- ports = kmalloc_objs(*ports, sched_poll.nr_ports, GFP_KERNEL);
+ ports = kmalloc_objs(*ports, sched_poll.nr_ports);
if (!ports) {
*r = -ENOMEM;
return true;
@@ -2115,7 +2115,7 @@ static int kvm_xen_eventfd_assign(struct kvm *kvm,
struct evtchnfd *evtchnfd;
int ret = -EINVAL;
- evtchnfd = kzalloc_obj(struct evtchnfd, GFP_KERNEL);
+ evtchnfd = kzalloc_obj(struct evtchnfd);
if (!evtchnfd)
return -ENOMEM;
@@ -2213,7 +2213,7 @@ static int kvm_xen_eventfd_reset(struct kvm *kvm)
idr_for_each_entry(&kvm->arch.xen.evtchn_ports, evtchnfd, i)
n++;
- all_evtchnfds = kmalloc_objs(struct evtchnfd *, n, GFP_KERNEL);
+ all_evtchnfds = kmalloc_objs(struct evtchnfd *, n);
if (!all_evtchnfds) {
mutex_unlock(&kvm->arch.xen.xen_lock);
return -ENOMEM;
diff --git a/arch/x86/mm/mmio-mod.c b/arch/x86/mm/mmio-mod.c
index 63294d590346..265ad1a0ae0a 100644
--- a/arch/x86/mm/mmio-mod.c
+++ b/arch/x86/mm/mmio-mod.c
@@ -220,7 +220,7 @@ static void ioremap_trace_core(resource_size_t offset, unsigned long size,
void __iomem *addr)
{
static atomic_t next_id;
- struct remap_trace *trace = kmalloc_obj(*trace, GFP_KERNEL);
+ struct remap_trace *trace = kmalloc_obj(*trace);
/* These are page-unaligned. */
struct mmiotrace_map map = {
.phys = offset,
diff --git a/arch/x86/mm/pat/memtype.c b/arch/x86/mm/pat/memtype.c
index fdf6ed96cbd0..cf94fb561310 100644
--- a/arch/x86/mm/pat/memtype.c
+++ b/arch/x86/mm/pat/memtype.c
@@ -574,7 +574,7 @@ int memtype_reserve(u64 start, u64 end, enum page_cache_mode req_type,
return -EINVAL;
}
- entry_new = kzalloc_obj(struct memtype, GFP_KERNEL);
+ entry_new = kzalloc_obj(struct memtype);
if (!entry_new)
return -ENOMEM;
@@ -966,7 +966,7 @@ static struct memtype *memtype_get_idx(loff_t pos)
struct memtype *entry_print;
int ret;
- entry_print = kzalloc_obj(struct memtype, GFP_KERNEL);
+ entry_print = kzalloc_obj(struct memtype);
if (!entry_print)
return NULL;
diff --git a/arch/x86/net/bpf_jit_comp.c b/arch/x86/net/bpf_jit_comp.c
index 0a0127c9e2e2..8f10080e6fe3 100644
--- a/arch/x86/net/bpf_jit_comp.c
+++ b/arch/x86/net/bpf_jit_comp.c
@@ -3758,7 +3758,7 @@ struct bpf_prog *bpf_int_jit_compile(struct bpf_prog *prog)
jit_data = prog->aux->jit_data;
if (!jit_data) {
- jit_data = kzalloc_obj(*jit_data, GFP_KERNEL);
+ jit_data = kzalloc_obj(*jit_data);
if (!jit_data) {
prog = orig_prog;
goto out;
@@ -3794,7 +3794,7 @@ struct bpf_prog *bpf_int_jit_compile(struct bpf_prog *prog)
padding = true;
goto skip_init_addrs;
}
- addrs = kvmalloc_objs(*addrs, prog->len + 1, GFP_KERNEL);
+ addrs = kvmalloc_objs(*addrs, prog->len + 1);
if (!addrs) {
prog = orig_prog;
goto out_addrs;
diff --git a/arch/x86/net/bpf_jit_comp32.c b/arch/x86/net/bpf_jit_comp32.c
index e6f3475bb773..dda423025c3d 100644
--- a/arch/x86/net/bpf_jit_comp32.c
+++ b/arch/x86/net/bpf_jit_comp32.c
@@ -2545,7 +2545,7 @@ struct bpf_prog *bpf_int_jit_compile(struct bpf_prog *prog)
prog = tmp;
}
- addrs = kmalloc_objs(*addrs, prog->len, GFP_KERNEL);
+ addrs = kmalloc_objs(*addrs, prog->len);
if (!addrs) {
prog = orig_prog;
goto out;
diff --git a/arch/x86/pci/acpi.c b/arch/x86/pci/acpi.c
index d0e1cd677eba..7cd5388edc75 100644
--- a/arch/x86/pci/acpi.c
+++ b/arch/x86/pci/acpi.c
@@ -562,7 +562,7 @@ struct pci_bus *pci_acpi_scan_root(struct acpi_pci_root *root)
} else {
struct pci_root_info *info;
- info = kzalloc_obj(*info, GFP_KERNEL);
+ info = kzalloc_obj(*info);
if (!info)
dev_err(&root->device->dev,
"pci_bus %04x:%02x: ignored (out of memory)\n",
diff --git a/arch/x86/pci/bus_numa.c b/arch/x86/pci/bus_numa.c
index 53037dba4c97..0e165149d0e9 100644
--- a/arch/x86/pci/bus_numa.c
+++ b/arch/x86/pci/bus_numa.c
@@ -72,7 +72,7 @@ struct pci_root_info __init *alloc_pci_root_info(int bus_min, int bus_max,
{
struct pci_root_info *info;
- info = kzalloc_obj(*info, GFP_KERNEL);
+ info = kzalloc_obj(*info);
if (!info)
return info;
@@ -132,7 +132,7 @@ void update_res(struct pci_root_info *info, resource_size_t start,
addit:
/* need to add that */
- root_res = kzalloc_obj(*root_res, GFP_KERNEL);
+ root_res = kzalloc_obj(*root_res);
if (!root_res)
return;
diff --git a/arch/x86/pci/common.c b/arch/x86/pci/common.c
index 12d4e522d863..63105b29fbf5 100644
--- a/arch/x86/pci/common.c
+++ b/arch/x86/pci/common.c
@@ -461,7 +461,7 @@ void pcibios_scan_root(int busnum)
struct pci_sysdata *sd;
LIST_HEAD(resources);
- sd = kzalloc_obj(*sd, GFP_KERNEL);
+ sd = kzalloc_obj(*sd);
if (!sd) {
printk(KERN_ERR "PCI: OOM, skipping PCI bus %02x\n", busnum);
return;
diff --git a/arch/x86/pci/fixup.c b/arch/x86/pci/fixup.c
index 3c92893ba725..b301c6c8df75 100644
--- a/arch/x86/pci/fixup.c
+++ b/arch/x86/pci/fixup.c
@@ -771,7 +771,7 @@ static void pci_amd_enable_64bit_bar(struct pci_dev *dev)
if (i == 8)
return;
- res = kzalloc_obj(*res, GFP_KERNEL);
+ res = kzalloc_obj(*res);
if (!res)
return;
diff --git a/arch/x86/pci/i386.c b/arch/x86/pci/i386.c
index 5e99b12300c9..c4ec39ad276b 100644
--- a/arch/x86/pci/i386.c
+++ b/arch/x86/pci/i386.c
@@ -81,7 +81,7 @@ pcibios_save_fw_addr(struct pci_dev *dev, int idx, resource_size_t fw_addr)
map = pcibios_fwaddrmap_lookup(dev);
if (!map) {
spin_unlock_irqrestore(&pcibios_fwaddrmap_lock, flags);
- map = kzalloc_obj(*map, GFP_KERNEL);
+ map = kzalloc_obj(*map);
if (!map)
return;
diff --git a/arch/x86/pci/mmconfig-shared.c b/arch/x86/pci/mmconfig-shared.c
index 14098363b841..acdb8dcaeb52 100644
--- a/arch/x86/pci/mmconfig-shared.c
+++ b/arch/x86/pci/mmconfig-shared.c
@@ -77,7 +77,7 @@ static struct pci_mmcfg_region *pci_mmconfig_alloc(int segment, int start,
if (addr == 0)
return NULL;
- new = kzalloc_obj(*new, GFP_KERNEL);
+ new = kzalloc_obj(*new);
if (!new)
return NULL;
diff --git a/arch/x86/pci/xen.c b/arch/x86/pci/xen.c
index 4f356d67cc31..6818515a501b 100644
--- a/arch/x86/pci/xen.c
+++ b/arch/x86/pci/xen.c
@@ -173,7 +173,7 @@ static int xen_setup_msi_irqs(struct pci_dev *dev, int nvec, int type)
if (type == PCI_CAP_ID_MSI && nvec > 1)
return 1;
- v = kzalloc_objs(int, max(1, nvec), GFP_KERNEL);
+ v = kzalloc_objs(int, max(1, nvec));
if (!v)
return -ENOMEM;
diff --git a/arch/x86/platform/efi/runtime-map.c b/arch/x86/platform/efi/runtime-map.c
index 77699893b5bb..053ff161eb9a 100644
--- a/arch/x86/platform/efi/runtime-map.c
+++ b/arch/x86/platform/efi/runtime-map.c
@@ -114,7 +114,7 @@ add_sysfs_runtime_map_entry(struct kobject *kobj, int nr,
return ERR_PTR(-ENOMEM);
}
- entry = kzalloc_obj(*entry, GFP_KERNEL);
+ entry = kzalloc_obj(*entry);
if (!entry) {
kset_unregister(map_kset);
map_kset = NULL;
@@ -166,7 +166,7 @@ static int __init efi_runtime_map_init(void)
if (!efi_enabled(EFI_MEMMAP) || !efi_kobj)
return 0;
- map_entries = kzalloc_objs(entry, efi.memmap.nr_map, GFP_KERNEL);
+ map_entries = kzalloc_objs(entry, efi.memmap.nr_map);
if (!map_entries) {
ret = -ENOMEM;
goto out;
diff --git a/arch/x86/platform/geode/geode-common.c b/arch/x86/platform/geode/geode-common.c
index f3c9eff2d374..05189c5f7d2a 100644
--- a/arch/x86/platform/geode/geode-common.c
+++ b/arch/x86/platform/geode/geode-common.c
@@ -113,7 +113,7 @@ int __init geode_create_leds(const char *label, const struct geode_led *leds,
return -EINVAL;
}
- swnodes = kzalloc_objs(*swnodes, n_leds, GFP_KERNEL);
+ swnodes = kzalloc_objs(*swnodes, n_leds);
if (!swnodes)
return -ENOMEM;
@@ -121,7 +121,7 @@ int __init geode_create_leds(const char *label, const struct geode_led *leds,
* Each LED is represented by 3 properties: "gpios",
* "linux,default-trigger", and am empty terminator.
*/
- props = kzalloc_objs(*props, n_leds * 3, GFP_KERNEL);
+ props = kzalloc_objs(*props, n_leds * 3);
if (!props) {
err = -ENOMEM;
goto err_free_swnodes;
diff --git a/arch/x86/power/cpu.c b/arch/x86/power/cpu.c
index 5a7d96bbd6d8..702f30eaf9c4 100644
--- a/arch/x86/power/cpu.c
+++ b/arch/x86/power/cpu.c
@@ -394,7 +394,7 @@ static int msr_build_context(const u32 *msr_id, const int num)
total_num = saved_msrs->num + num;
- msr_array = kmalloc_objs(struct saved_msr, total_num, GFP_KERNEL);
+ msr_array = kmalloc_objs(struct saved_msr, total_num);
if (!msr_array) {
pr_err("x86/pm: Can not allocate memory to save/restore MSRs during suspend.\n");
return -ENOMEM;
diff --git a/arch/x86/virt/svm/sev.c b/arch/x86/virt/svm/sev.c
index 5a31ced2788c..a4f3a364fb65 100644
--- a/arch/x86/virt/svm/sev.c
+++ b/arch/x86/virt/svm/sev.c
@@ -313,7 +313,7 @@ static bool __init alloc_rmp_segment_desc(u64 segment_pa, u64 segment_size, u64
return false;
}
- desc = kzalloc_obj(*desc, GFP_KERNEL);
+ desc = kzalloc_obj(*desc);
if (!desc) {
memunmap(rmp_segment);
return false;
diff --git a/arch/x86/virt/vmx/tdx/tdx.c b/arch/x86/virt/vmx/tdx/tdx.c
index 047cb2063202..8b8e165a2001 100644
--- a/arch/x86/virt/vmx/tdx/tdx.c
+++ b/arch/x86/virt/vmx/tdx/tdx.c
@@ -194,7 +194,7 @@ static int add_tdx_memblock(struct list_head *tmb_list, unsigned long start_pfn,
{
struct tdx_memblock *tmb;
- tmb = kmalloc_obj(*tmb, GFP_KERNEL);
+ tmb = kmalloc_obj(*tmb);
if (!tmb)
return -ENOMEM;
diff --git a/arch/x86/xen/grant-table.c b/arch/x86/xen/grant-table.c
index d8149572b4f7..5f4060b5a40d 100644
--- a/arch/x86/xen/grant-table.c
+++ b/arch/x86/xen/grant-table.c
@@ -101,7 +101,7 @@ static int gnttab_apply(pte_t *pte, unsigned long addr, void *data)
static int arch_gnttab_valloc(struct gnttab_vm_area *area, unsigned nr_frames)
{
- area->ptes = kmalloc_objs(*area->ptes, nr_frames, GFP_KERNEL);
+ area->ptes = kmalloc_objs(*area->ptes, nr_frames);
if (area->ptes == NULL)
return -ENOMEM;
area->area = get_vm_area(PAGE_SIZE * nr_frames, VM_IOREMAP);
diff --git a/arch/x86/xen/smp_pv.c b/arch/x86/xen/smp_pv.c
index 82894426cb99..db9b8e222b38 100644
--- a/arch/x86/xen/smp_pv.c
+++ b/arch/x86/xen/smp_pv.c
@@ -230,7 +230,7 @@ cpu_initialize_context(unsigned int cpu, struct task_struct *idle)
if (cpumask_test_and_set_cpu(cpu, xen_cpu_initialized_map))
return 0;
- ctxt = kzalloc_obj(*ctxt, GFP_KERNEL);
+ ctxt = kzalloc_obj(*ctxt);
if (ctxt == NULL) {
cpumask_clear_cpu(cpu, xen_cpu_initialized_map);
return -ENOMEM;
diff --git a/arch/xtensa/kernel/ptrace.c b/arch/xtensa/kernel/ptrace.c
index b5de377dc96f..b80d54b2ea34 100644
--- a/arch/xtensa/kernel/ptrace.c
+++ b/arch/xtensa/kernel/ptrace.c
@@ -123,7 +123,7 @@ static int tie_get(struct task_struct *target,
int ret;
struct pt_regs *regs = task_pt_regs(target);
struct thread_info *ti = task_thread_info(target);
- elf_xtregs_t *newregs = kzalloc_obj(elf_xtregs_t, GFP_KERNEL);
+ elf_xtregs_t *newregs = kzalloc_obj(elf_xtregs_t);
if (!newregs)
return -ENOMEM;
@@ -156,7 +156,7 @@ static int tie_set(struct task_struct *target,
int ret;
struct pt_regs *regs = task_pt_regs(target);
struct thread_info *ti = task_thread_info(target);
- elf_xtregs_t *newregs = kzalloc_obj(elf_xtregs_t, GFP_KERNEL);
+ elf_xtregs_t *newregs = kzalloc_obj(elf_xtregs_t);
if (!newregs)
return -ENOMEM;
diff --git a/arch/xtensa/platforms/iss/simdisk.c b/arch/xtensa/platforms/iss/simdisk.c
index 3e54f6377c81..7c7a2aa749f8 100644
--- a/arch/xtensa/platforms/iss/simdisk.c
+++ b/arch/xtensa/platforms/iss/simdisk.c
@@ -320,7 +320,7 @@ static int __init simdisk_init(void)
if (simdisk_count > MAX_SIMDISK_COUNT)
simdisk_count = MAX_SIMDISK_COUNT;
- sddev = kmalloc_objs(*sddev, simdisk_count, GFP_KERNEL);
+ sddev = kmalloc_objs(*sddev, simdisk_count);
if (sddev == NULL)
goto out_unregister;
diff --git a/block/bio-integrity.c b/block/bio-integrity.c
index dc2e771f11ae..20f5d301d32d 100644
--- a/block/bio-integrity.c
+++ b/block/bio-integrity.c
@@ -322,7 +322,7 @@ int bio_integrity_map_user(struct bio *bio, struct iov_iter *iter)
if (nr_vecs > BIO_MAX_VECS)
return -E2BIG;
if (nr_vecs > UIO_FASTIOV) {
- bvec = kzalloc_objs(*bvec, nr_vecs, GFP_KERNEL);
+ bvec = kzalloc_objs(*bvec, nr_vecs);
if (!bvec)
return -ENOMEM;
pages = NULL;
diff --git a/block/bio.c b/block/bio.c
index c8e14c330a35..d80d5d26804e 100644
--- a/block/bio.c
+++ b/block/bio.c
@@ -84,7 +84,7 @@ static DEFINE_XARRAY(bio_slabs);
static struct bio_slab *create_bio_slab(unsigned int size)
{
- struct bio_slab *bslab = kzalloc_obj(*bslab, GFP_KERNEL);
+ struct bio_slab *bslab = kzalloc_obj(*bslab);
if (!bslab)
return NULL;
diff --git a/block/blk-cgroup.c b/block/blk-cgroup.c
index de609a3e0228..b70096497d38 100644
--- a/block/blk-cgroup.c
+++ b/block/blk-cgroup.c
@@ -1417,7 +1417,7 @@ blkcg_css_alloc(struct cgroup_subsys_state *parent_css)
if (!parent_css) {
blkcg = &blkcg_root;
} else {
- blkcg = kzalloc_obj(*blkcg, GFP_KERNEL);
+ blkcg = kzalloc_obj(*blkcg);
if (!blkcg)
goto unlock;
}
diff --git a/block/blk-crypto-profile.c b/block/blk-crypto-profile.c
index 58032fd7faff..970880d9adf4 100644
--- a/block/blk-crypto-profile.c
+++ b/block/blk-crypto-profile.c
@@ -93,7 +93,7 @@ int blk_crypto_profile_init(struct blk_crypto_profile *profile,
/* Initialize keyslot management data. */
- profile->slots = kvzalloc_objs(profile->slots[0], num_slots, GFP_KERNEL);
+ profile->slots = kvzalloc_objs(profile->slots[0], num_slots);
if (!profile->slots)
goto err_destroy;
diff --git a/block/blk-crypto-sysfs.c b/block/blk-crypto-sysfs.c
index e6c76d672829..ea7a0b85a46f 100644
--- a/block/blk-crypto-sysfs.c
+++ b/block/blk-crypto-sysfs.c
@@ -170,7 +170,7 @@ int blk_crypto_sysfs_register(struct gendisk *disk)
if (!q->crypto_profile)
return 0;
- obj = kzalloc_obj(*obj, GFP_KERNEL);
+ obj = kzalloc_obj(*obj);
if (!obj)
return -ENOMEM;
obj->profile = q->crypto_profile;
diff --git a/block/blk-iocost.c b/block/blk-iocost.c
index 32faf0a56bd3..d145db61e5c3 100644
--- a/block/blk-iocost.c
+++ b/block/blk-iocost.c
@@ -2882,7 +2882,7 @@ static int blk_iocost_init(struct gendisk *disk)
struct ioc *ioc;
int i, cpu, ret;
- ioc = kzalloc_obj(*ioc, GFP_KERNEL);
+ ioc = kzalloc_obj(*ioc);
if (!ioc)
return -ENOMEM;
diff --git a/block/blk-iolatency.c b/block/blk-iolatency.c
index 609a71476bff..53e8dd2dfa8a 100644
--- a/block/blk-iolatency.c
+++ b/block/blk-iolatency.c
@@ -760,7 +760,7 @@ static int blk_iolatency_init(struct gendisk *disk)
struct blk_iolatency *blkiolat;
int ret;
- blkiolat = kzalloc_obj(*blkiolat, GFP_KERNEL);
+ blkiolat = kzalloc_obj(*blkiolat);
if (!blkiolat)
return -ENOMEM;
diff --git a/block/blk-mq-sched.c b/block/blk-mq-sched.c
index 0d085a53f0d7..0a00f5a76f5a 100644
--- a/block/blk-mq-sched.c
+++ b/block/blk-mq-sched.c
@@ -489,7 +489,7 @@ int blk_mq_alloc_sched_ctx_batch(struct xarray *elv_tbl,
lockdep_assert_held_write(&set->update_nr_hwq_lock);
list_for_each_entry(q, &set->tag_list, tag_set_list) {
- ctx = kzalloc_obj(struct elv_change_ctx, GFP_KERNEL);
+ ctx = kzalloc_obj(struct elv_change_ctx);
if (!ctx)
return -ENOMEM;
diff --git a/block/blk-mq.c b/block/blk-mq.c
index e0bbe087766f..9af8c3dec3f6 100644
--- a/block/blk-mq.c
+++ b/block/blk-mq.c
@@ -4362,7 +4362,7 @@ static int blk_mq_alloc_ctxs(struct request_queue *q)
struct blk_mq_ctxs *ctxs;
int cpu;
- ctxs = kzalloc_obj(*ctxs, GFP_KERNEL);
+ ctxs = kzalloc_obj(*ctxs);
if (!ctxs)
return -ENOMEM;
@@ -4879,7 +4879,7 @@ int blk_mq_alloc_tag_set(struct blk_mq_tag_set *set)
set->nr_hw_queues = nr_cpu_ids;
if (set->flags & BLK_MQ_F_BLOCKING) {
- set->srcu = kmalloc_obj(*set->srcu, GFP_KERNEL);
+ set->srcu = kmalloc_obj(*set->srcu);
if (!set->srcu)
return -ENOMEM;
ret = init_srcu_struct(set->srcu);
diff --git a/block/blk-stat.c b/block/blk-stat.c
index 2eaa5e27cdb8..de126e1ea5ac 100644
--- a/block/blk-stat.c
+++ b/block/blk-stat.c
@@ -103,11 +103,11 @@ blk_stat_alloc_callback(void (*timer_fn)(struct blk_stat_callback *),
{
struct blk_stat_callback *cb;
- cb = kmalloc_obj(*cb, GFP_KERNEL);
+ cb = kmalloc_obj(*cb);
if (!cb)
return NULL;
- cb->stat = kmalloc_objs(struct blk_rq_stat, buckets, GFP_KERNEL);
+ cb->stat = kmalloc_objs(struct blk_rq_stat, buckets);
if (!cb->stat) {
kfree(cb);
return NULL;
@@ -206,7 +206,7 @@ struct blk_queue_stats *blk_alloc_queue_stats(void)
{
struct blk_queue_stats *stats;
- stats = kmalloc_obj(*stats, GFP_KERNEL);
+ stats = kmalloc_obj(*stats);
if (!stats)
return NULL;
diff --git a/block/blk-wbt.c b/block/blk-wbt.c
index 91115508179b..33006edfccd4 100644
--- a/block/blk-wbt.c
+++ b/block/blk-wbt.c
@@ -713,7 +713,7 @@ static int wbt_data_dir(const struct request *rq)
static struct rq_wb *wbt_alloc(void)
{
- struct rq_wb *rwb = kzalloc_obj(*rwb, GFP_KERNEL);
+ struct rq_wb *rwb = kzalloc_obj(*rwb);
if (!rwb)
return NULL;
diff --git a/block/bsg-lib.c b/block/bsg-lib.c
index ca08c6b7fb9c..20cd0ef3c394 100644
--- a/block/bsg-lib.c
+++ b/block/bsg-lib.c
@@ -368,7 +368,7 @@ struct request_queue *bsg_setup_queue(struct device *dev, const char *name,
struct request_queue *q;
int ret = -ENOMEM;
- bset = kzalloc_obj(*bset, GFP_KERNEL);
+ bset = kzalloc_obj(*bset);
if (!bset)
return ERR_PTR(-ENOMEM);
diff --git a/block/bsg.c b/block/bsg.c
index 5f87ea8d5f64..e0af6206ed28 100644
--- a/block/bsg.c
+++ b/block/bsg.c
@@ -192,7 +192,7 @@ struct bsg_device *bsg_register_queue(struct request_queue *q,
struct bsg_device *bd;
int ret;
- bd = kzalloc_obj(*bd, GFP_KERNEL);
+ bd = kzalloc_obj(*bd);
if (!bd)
return ERR_PTR(-ENOMEM);
bd->max_queue = BSG_DEFAULT_CMDS;
diff --git a/block/disk-events.c b/block/disk-events.c
index 04d44d05ed53..9f9f9f8a2d6b 100644
--- a/block/disk-events.c
+++ b/block/disk-events.c
@@ -436,7 +436,7 @@ int disk_alloc_events(struct gendisk *disk)
if (!disk->fops->check_events || !disk->events)
return 0;
- ev = kzalloc_obj(*ev, GFP_KERNEL);
+ ev = kzalloc_obj(*ev);
if (!ev) {
pr_warn("%s: failed to initialize events\n", disk->disk_name);
return -ENOMEM;
diff --git a/block/fops.c b/block/fops.c
index 57a53e0d1016..bb6642b45937 100644
--- a/block/fops.c
+++ b/block/fops.c
@@ -65,7 +65,7 @@ static ssize_t __blkdev_direct_IO_simple(struct kiocb *iocb,
if (nr_pages <= DIO_INLINE_BIO_VECS)
vecs = inline_vecs;
else {
- vecs = kmalloc_objs(struct bio_vec, nr_pages, GFP_KERNEL);
+ vecs = kmalloc_objs(struct bio_vec, nr_pages);
if (!vecs)
return -ENOMEM;
}
diff --git a/block/genhd.c b/block/genhd.c
index 15866ccf5c33..7d6854fd28e9 100644
--- a/block/genhd.c
+++ b/block/genhd.c
@@ -264,7 +264,7 @@ int __register_blkdev(unsigned int major, const char *name,
goto out;
}
- p = kmalloc_obj(struct blk_major_name, GFP_KERNEL);
+ p = kmalloc_obj(struct blk_major_name);
if (p == NULL) {
ret = -ENOMEM;
goto out;
@@ -914,7 +914,7 @@ static void *disk_seqf_start(struct seq_file *seqf, loff_t *pos)
struct class_dev_iter *iter;
struct device *dev;
- iter = kmalloc_obj(*iter, GFP_KERNEL);
+ iter = kmalloc_obj(*iter);
if (!iter)
return ERR_PTR(-ENOMEM);
diff --git a/block/holder.c b/block/holder.c
index 1e7b88815323..267beb3dc7a7 100644
--- a/block/holder.c
+++ b/block/holder.c
@@ -92,7 +92,7 @@ int bd_link_disk_holder(struct block_device *bdev, struct gendisk *disk)
goto out_unlock;
}
- holder = kzalloc_obj(*holder, GFP_KERNEL);
+ holder = kzalloc_obj(*holder);
if (!holder) {
ret = -ENOMEM;
goto out_unlock;
diff --git a/block/partitions/aix.c b/block/partitions/aix.c
index 97c8fa2a866f..a886cefbefbb 100644
--- a/block/partitions/aix.c
+++ b/block/partitions/aix.c
@@ -199,7 +199,7 @@ int aix_partition(struct parsed_partitions *state)
numlvs = be16_to_cpu(p->numlvs);
put_dev_sector(sect);
}
- lvip = kzalloc_objs(struct lv_info, state->limit, GFP_KERNEL);
+ lvip = kzalloc_objs(struct lv_info, state->limit);
if (!lvip)
return 0;
if (numlvs && (d = read_part_sector(state, vgda_sector + 1, §))) {
diff --git a/block/partitions/cmdline.c b/block/partitions/cmdline.c
index 5d604a64842e..a2b1870c3fd4 100644
--- a/block/partitions/cmdline.c
+++ b/block/partitions/cmdline.c
@@ -46,7 +46,7 @@ static int parse_subpart(struct cmdline_subpart **subpart, char *partdef)
*subpart = NULL;
- new_subpart = kzalloc_obj(struct cmdline_subpart, GFP_KERNEL);
+ new_subpart = kzalloc_obj(struct cmdline_subpart);
if (!new_subpart)
return -ENOMEM;
@@ -122,7 +122,7 @@ static int parse_parts(struct cmdline_parts **parts, char *bdevdef)
*parts = NULL;
- newparts = kzalloc_obj(struct cmdline_parts, GFP_KERNEL);
+ newparts = kzalloc_obj(struct cmdline_parts);
if (!newparts)
return -ENOMEM;
diff --git a/block/partitions/core.c b/block/partitions/core.c
index 189ab5650351..740228750aaf 100644
--- a/block/partitions/core.c
+++ b/block/partitions/core.c
@@ -94,7 +94,7 @@ static struct parsed_partitions *allocate_partitions(struct gendisk *hd)
struct parsed_partitions *state;
int nr = DISK_MAX_PARTS;
- state = kzalloc_obj(*state, GFP_KERNEL);
+ state = kzalloc_obj(*state);
if (!state)
return NULL;
diff --git a/block/partitions/efi.c b/block/partitions/efi.c
index ff145c6306e0..75474fb3848e 100644
--- a/block/partitions/efi.c
+++ b/block/partitions/efi.c
@@ -595,7 +595,7 @@ static int find_valid_gpt(struct parsed_partitions *state, gpt_header **gpt,
lastlba = last_lba(state->disk);
if (!force_gpt) {
/* This will be added to the EFI Spec. per Intel after v1.02. */
- legacymbr = kzalloc_obj(*legacymbr, GFP_KERNEL);
+ legacymbr = kzalloc_obj(*legacymbr);
if (!legacymbr)
goto fail;
diff --git a/block/partitions/ibm.c b/block/partitions/ibm.c
index b81b7a690787..9311ad5fb95d 100644
--- a/block/partitions/ibm.c
+++ b/block/partitions/ibm.c
@@ -347,13 +347,13 @@ int ibm_partition(struct parsed_partitions *state)
nr_sectors = bdev_nr_sectors(bdev);
if (nr_sectors == 0)
goto out_symbol;
- info = kmalloc_obj(dasd_information2_t, GFP_KERNEL);
+ info = kmalloc_obj(dasd_information2_t);
if (info == NULL)
goto out_symbol;
- geo = kmalloc_obj(struct hd_geometry, GFP_KERNEL);
+ geo = kmalloc_obj(struct hd_geometry);
if (geo == NULL)
goto out_nogeo;
- label = kmalloc_obj(union label_t, GFP_KERNEL);
+ label = kmalloc_obj(union label_t);
if (label == NULL)
goto out_nolab;
/* set start if not filled by getgeo function e.g. virtblk */
diff --git a/block/partitions/ldm.c b/block/partitions/ldm.c
index 27ffddd74e11..776b4ad95091 100644
--- a/block/partitions/ldm.c
+++ b/block/partitions/ldm.c
@@ -273,8 +273,8 @@ static bool ldm_validate_privheads(struct parsed_partitions *state,
BUG_ON (!state || !ph1);
- ph[1] = kmalloc_obj(*ph[1], GFP_KERNEL);
- ph[2] = kmalloc_obj(*ph[2], GFP_KERNEL);
+ ph[1] = kmalloc_obj(*ph[1]);
+ ph[2] = kmalloc_obj(*ph[2]);
if (!ph[1] || !ph[2]) {
ldm_crit ("Out of memory.");
goto out;
@@ -362,7 +362,7 @@ static bool ldm_validate_tocblocks(struct parsed_partitions *state,
BUG_ON(!state || !ldb);
ph = &ldb->ph;
tb[0] = &ldb->toc;
- tb[1] = kmalloc_objs(*tb[1], 3, GFP_KERNEL);
+ tb[1] = kmalloc_objs(*tb[1], 3);
if (!tb[1]) {
ldm_crit("Out of memory.");
goto err;
@@ -1158,7 +1158,7 @@ static bool ldm_ldmdb_add (u8 *data, int len, struct ldmdb *ldb)
BUG_ON (!data || !ldb);
- vb = kmalloc_obj(*vb, GFP_KERNEL);
+ vb = kmalloc_obj(*vb);
if (!vb) {
ldm_crit ("Out of memory.");
return false;
@@ -1438,7 +1438,7 @@ int ldm_partition(struct parsed_partitions *state)
if (!ldm_validate_partition_table(state))
return 0;
- ldb = kmalloc_obj(*ldb, GFP_KERNEL);
+ ldb = kmalloc_obj(*ldb);
if (!ldb) {
ldm_crit ("Out of memory.");
goto out;
diff --git a/block/sed-opal.c b/block/sed-opal.c
index fbe0fe4dce8a..3ded1ca723ca 100644
--- a/block/sed-opal.c
+++ b/block/sed-opal.c
@@ -2512,7 +2512,7 @@ struct opal_dev *init_opal_dev(void *data, sec_send_recv *send_recv)
{
struct opal_dev *dev;
- dev = kmalloc_obj(*dev, GFP_KERNEL);
+ dev = kmalloc_obj(*dev);
if (!dev)
return NULL;
@@ -2719,7 +2719,7 @@ static int opal_save(struct opal_dev *dev, struct opal_lock_unlock *lk_unlk)
{
struct opal_suspend_data *suspend;
- suspend = kzalloc_obj(*suspend, GFP_KERNEL);
+ suspend = kzalloc_obj(*suspend);
if (!suspend)
return -ENOMEM;
diff --git a/certs/blacklist.c b/certs/blacklist.c
index 725c2f18fa31..fa561c12eabf 100644
--- a/certs/blacklist.c
+++ b/certs/blacklist.c
@@ -328,7 +328,7 @@ static int __init blacklist_init(void)
if (register_key_type(&key_type_blacklist) < 0)
panic("Can't allocate system blacklist key type\n");
- restriction = kzalloc_obj(*restriction, GFP_KERNEL);
+ restriction = kzalloc_obj(*restriction);
if (!restriction)
panic("Can't allocate blacklist keyring restriction\n");
restriction->check = restrict_link_for_blacklist;
diff --git a/certs/system_keyring.c b/certs/system_keyring.c
index afe67e2a47ed..e0761436ec7f 100644
--- a/certs/system_keyring.c
+++ b/certs/system_keyring.c
@@ -140,7 +140,7 @@ static __init struct key_restriction *get_builtin_and_secondary_restriction(void
{
struct key_restriction *restriction;
- restriction = kzalloc_obj(struct key_restriction, GFP_KERNEL);
+ restriction = kzalloc_obj(struct key_restriction);
if (!restriction)
panic("Can't allocate secondary trusted keyring restriction\n");
diff --git a/crypto/af_alg.c b/crypto/af_alg.c
index d6f14649bd13..0bb609fbec7d 100644
--- a/crypto/af_alg.c
+++ b/crypto/af_alg.c
@@ -70,7 +70,7 @@ int af_alg_register_type(const struct af_alg_type *type)
goto unlock;
}
- node = kmalloc_obj(*node, GFP_KERNEL);
+ node = kmalloc_obj(*node);
err = -ENOMEM;
if (!node)
goto unlock;
diff --git a/crypto/algboss.c b/crypto/algboss.c
index 09ceeb0db431..8b936cae6608 100644
--- a/crypto/algboss.c
+++ b/crypto/algboss.c
@@ -84,7 +84,7 @@ static int cryptomgr_schedule_probe(struct crypto_larval *larval)
if (!try_module_get(THIS_MODULE))
goto err;
- param = kzalloc_obj(*param, GFP_KERNEL);
+ param = kzalloc_obj(*param);
if (!param)
goto err_put_module;
@@ -195,7 +195,7 @@ static int cryptomgr_schedule_test(struct crypto_alg *alg)
if (!try_module_get(THIS_MODULE))
goto err;
- param = kzalloc_obj(*param, GFP_KERNEL);
+ param = kzalloc_obj(*param);
if (!param)
goto err_put_module;
diff --git a/crypto/algif_rng.c b/crypto/algif_rng.c
index 8578b9d1c569..a9fb492e929a 100644
--- a/crypto/algif_rng.c
+++ b/crypto/algif_rng.c
@@ -202,7 +202,7 @@ static void *rng_bind(const char *name, u32 type, u32 mask)
struct rng_parent_ctx *pctx;
struct crypto_rng *rng;
- pctx = kzalloc_obj(*pctx, GFP_KERNEL);
+ pctx = kzalloc_obj(*pctx);
if (!pctx)
return ERR_PTR(-ENOMEM);
diff --git a/crypto/api.c b/crypto/api.c
index b0b69ca789f3..74e17d5049c9 100644
--- a/crypto/api.c
+++ b/crypto/api.c
@@ -105,7 +105,7 @@ struct crypto_larval *crypto_larval_alloc(const char *name, u32 type, u32 mask)
{
struct crypto_larval *larval;
- larval = kzalloc_obj(*larval, GFP_KERNEL);
+ larval = kzalloc_obj(*larval);
if (!larval)
return ERR_PTR(-ENOMEM);
diff --git a/crypto/asymmetric_keys/asymmetric_type.c b/crypto/asymmetric_keys/asymmetric_type.c
index 33c9e68ab28d..16a7ae16593c 100644
--- a/crypto/asymmetric_keys/asymmetric_type.c
+++ b/crypto/asymmetric_keys/asymmetric_type.c
@@ -486,7 +486,7 @@ static struct key_restriction *asymmetric_restriction_alloc(
struct key *key)
{
struct key_restriction *keyres =
- kzalloc_obj(struct key_restriction, GFP_KERNEL);
+ kzalloc_obj(struct key_restriction);
if (!keyres)
return ERR_PTR(-ENOMEM);
diff --git a/crypto/asymmetric_keys/pkcs7_parser.c b/crypto/asymmetric_keys/pkcs7_parser.c
index ab400d62c587..6e3ffdac83ac 100644
--- a/crypto/asymmetric_keys/pkcs7_parser.c
+++ b/crypto/asymmetric_keys/pkcs7_parser.c
@@ -133,16 +133,16 @@ struct pkcs7_message *pkcs7_parse_message(const void *data, size_t datalen)
struct pkcs7_message *msg = ERR_PTR(-ENOMEM);
int ret;
- ctx = kzalloc_obj(struct pkcs7_parse_context, GFP_KERNEL);
+ ctx = kzalloc_obj(struct pkcs7_parse_context);
if (!ctx)
goto out_no_ctx;
- ctx->msg = kzalloc_obj(struct pkcs7_message, GFP_KERNEL);
+ ctx->msg = kzalloc_obj(struct pkcs7_message);
if (!ctx->msg)
goto out_no_msg;
- ctx->sinfo = kzalloc_obj(struct pkcs7_signed_info, GFP_KERNEL);
+ ctx->sinfo = kzalloc_obj(struct pkcs7_signed_info);
if (!ctx->sinfo)
goto out_no_sinfo;
- ctx->sinfo->sig = kzalloc_obj(struct public_key_signature, GFP_KERNEL);
+ ctx->sinfo->sig = kzalloc_obj(struct public_key_signature);
if (!ctx->sinfo->sig)
goto out_no_sig;
@@ -728,10 +728,10 @@ int pkcs7_note_signed_info(void *context, size_t hdrlen,
sinfo->index = ++ctx->sinfo_index;
*ctx->ppsinfo = sinfo;
ctx->ppsinfo = &sinfo->next;
- ctx->sinfo = kzalloc_obj(struct pkcs7_signed_info, GFP_KERNEL);
+ ctx->sinfo = kzalloc_obj(struct pkcs7_signed_info);
if (!ctx->sinfo)
return -ENOMEM;
- ctx->sinfo->sig = kzalloc_obj(struct public_key_signature, GFP_KERNEL);
+ ctx->sinfo->sig = kzalloc_obj(struct public_key_signature);
if (!ctx->sinfo->sig)
return -ENOMEM;
return 0;
diff --git a/crypto/asymmetric_keys/pkcs8_parser.c b/crypto/asymmetric_keys/pkcs8_parser.c
index c7f04dbadbd1..9dd1c181789a 100644
--- a/crypto/asymmetric_keys/pkcs8_parser.c
+++ b/crypto/asymmetric_keys/pkcs8_parser.c
@@ -103,7 +103,7 @@ static struct public_key *pkcs8_parse(const void *data, size_t datalen)
memset(&ctx, 0, sizeof(ctx));
ret = -ENOMEM;
- ctx.pub = kzalloc_obj(struct public_key, GFP_KERNEL);
+ ctx.pub = kzalloc_obj(struct public_key);
if (!ctx.pub)
goto error;
diff --git a/crypto/asymmetric_keys/x509_cert_parser.c b/crypto/asymmetric_keys/x509_cert_parser.c
index ba446683358a..37e4fb9da106 100644
--- a/crypto/asymmetric_keys/x509_cert_parser.c
+++ b/crypto/asymmetric_keys/x509_cert_parser.c
@@ -65,16 +65,16 @@ struct x509_certificate *x509_cert_parse(const void *data, size_t datalen)
struct asymmetric_key_id *kid;
long ret;
- cert = kzalloc_obj(struct x509_certificate, GFP_KERNEL);
+ cert = kzalloc_obj(struct x509_certificate);
if (!cert)
return ERR_PTR(-ENOMEM);
- cert->pub = kzalloc_obj(struct public_key, GFP_KERNEL);
+ cert->pub = kzalloc_obj(struct public_key);
if (!cert->pub)
return ERR_PTR(-ENOMEM);
- cert->sig = kzalloc_obj(struct public_key_signature, GFP_KERNEL);
+ cert->sig = kzalloc_obj(struct public_key_signature);
if (!cert->sig)
return ERR_PTR(-ENOMEM);
- ctx = kzalloc_obj(struct x509_parse_context, GFP_KERNEL);
+ ctx = kzalloc_obj(struct x509_parse_context);
if (!ctx)
return ERR_PTR(-ENOMEM);
diff --git a/crypto/asymmetric_keys/x509_public_key.c b/crypto/asymmetric_keys/x509_public_key.c
index 9a936e255397..25cf8ac7f257 100644
--- a/crypto/asymmetric_keys/x509_public_key.c
+++ b/crypto/asymmetric_keys/x509_public_key.c
@@ -210,7 +210,7 @@ static int x509_key_preparse(struct key_preparsed_payload *prep)
p = bin2hex(p, q, srlen);
*p = 0;
- kids = kmalloc_obj(struct asymmetric_key_ids, GFP_KERNEL);
+ kids = kmalloc_obj(struct asymmetric_key_ids);
if (!kids)
return -ENOMEM;
kids->id[0] = cert->id;
diff --git a/crypto/drbg.c b/crypto/drbg.c
index 8a915da08fa9..1ed209e5d5dd 100644
--- a/crypto/drbg.c
+++ b/crypto/drbg.c
@@ -1522,7 +1522,7 @@ static int drbg_init_sym_kernel(struct drbg_state *drbg)
unsigned int alignmask;
char ctr_name[CRYPTO_MAX_ALG_NAME];
- aeskey = kzalloc_obj(*aeskey, GFP_KERNEL);
+ aeskey = kzalloc_obj(*aeskey);
if (!aeskey)
return -ENOMEM;
drbg->priv_data = aeskey;
@@ -1761,7 +1761,7 @@ static inline int __init drbg_healthcheck_sanity(void)
drbg_convert_tfm_core("drbg_nopr_hmac_sha512", &coreref, &pr);
#endif
- drbg = kzalloc_obj(struct drbg_state, GFP_KERNEL);
+ drbg = kzalloc_obj(struct drbg_state);
if (!drbg)
return -ENOMEM;
diff --git a/crypto/ecc.c b/crypto/ecc.c
index 3d07383a26f4..08150b14e17e 100644
--- a/crypto/ecc.c
+++ b/crypto/ecc.c
@@ -98,7 +98,7 @@ struct ecc_point *ecc_alloc_point(unsigned int ndigits)
if (!ndigits)
return NULL;
- p = kmalloc_obj(*p, GFP_KERNEL);
+ p = kmalloc_obj(*p);
if (!p)
return NULL;
diff --git a/crypto/gcm.c b/crypto/gcm.c
index 154138dbf19a..e1e878d37410 100644
--- a/crypto/gcm.c
+++ b/crypto/gcm.c
@@ -1098,7 +1098,7 @@ static int __init crypto_gcm_module_init(void)
{
int err;
- gcm_zeroes = kzalloc_obj(*gcm_zeroes, GFP_KERNEL);
+ gcm_zeroes = kzalloc_obj(*gcm_zeroes);
if (!gcm_zeroes)
return -ENOMEM;
diff --git a/crypto/simd.c b/crypto/simd.c
index e343bda70fc8..f71c4a334c7d 100644
--- a/crypto/simd.c
+++ b/crypto/simd.c
@@ -145,7 +145,7 @@ struct simd_skcipher_alg *simd_skcipher_create_compat(struct skcipher_alg *ialg,
struct skcipher_alg *alg;
int err;
- salg = kzalloc_obj(*salg, GFP_KERNEL);
+ salg = kzalloc_obj(*salg);
if (!salg) {
salg = ERR_PTR(-ENOMEM);
goto out;
@@ -370,7 +370,7 @@ static struct simd_aead_alg *simd_aead_create_compat(struct aead_alg *ialg,
struct aead_alg *alg;
int err;
- salg = kzalloc_obj(*salg, GFP_KERNEL);
+ salg = kzalloc_obj(*salg);
if (!salg) {
salg = ERR_PTR(-ENOMEM);
goto out;
diff --git a/crypto/tcrypt.c b/crypto/tcrypt.c
index 4217d3d1ca41..aded37546137 100644
--- a/crypto/tcrypt.c
+++ b/crypto/tcrypt.c
@@ -180,7 +180,7 @@ static int test_mb_aead_jiffies(struct test_mb_aead_data *data, int enc,
int ret = 0;
int *rc;
- rc = kzalloc_objs(*rc, num_mb, GFP_KERNEL);
+ rc = kzalloc_objs(*rc, num_mb);
if (!rc)
return -ENOMEM;
@@ -207,7 +207,7 @@ static int test_mb_aead_cycles(struct test_mb_aead_data *data, int enc,
int i;
int *rc;
- rc = kzalloc_objs(*rc, num_mb, GFP_KERNEL);
+ rc = kzalloc_objs(*rc, num_mb);
if (!rc)
return -ENOMEM;
@@ -270,7 +270,7 @@ static void test_mb_aead_speed(const char *algo, int enc, int secs,
else
e = "decryption";
- data = kzalloc_objs(*data, num_mb, GFP_KERNEL);
+ data = kzalloc_objs(*data, num_mb);
if (!data)
goto out_free_iv;
@@ -997,7 +997,7 @@ static int test_mb_acipher_jiffies(struct test_mb_skcipher_data *data, int enc,
int ret = 0;
int *rc;
- rc = kzalloc_objs(*rc, num_mb, GFP_KERNEL);
+ rc = kzalloc_objs(*rc, num_mb);
if (!rc)
return -ENOMEM;
@@ -1024,7 +1024,7 @@ static int test_mb_acipher_cycles(struct test_mb_skcipher_data *data, int enc,
int i;
int *rc;
- rc = kzalloc_objs(*rc, num_mb, GFP_KERNEL);
+ rc = kzalloc_objs(*rc, num_mb);
if (!rc)
return -ENOMEM;
@@ -1075,7 +1075,7 @@ static void test_mb_skcipher_speed(const char *algo, int enc, int secs,
else
e = "decryption";
- data = kzalloc_objs(*data, num_mb, GFP_KERNEL);
+ data = kzalloc_objs(*data, num_mb);
if (!data)
return;
diff --git a/crypto/testmgr.c b/crypto/testmgr.c
index c13aa351898d..49b607f65f63 100644
--- a/crypto/testmgr.c
+++ b/crypto/testmgr.c
@@ -739,7 +739,7 @@ static struct cipher_test_sglists *alloc_cipher_test_sglists(void)
{
struct cipher_test_sglists *tsgls;
- tsgls = kmalloc_obj(*tsgls, GFP_KERNEL);
+ tsgls = kmalloc_obj(*tsgls);
if (!tsgls)
return NULL;
@@ -1796,7 +1796,7 @@ static int test_hash_vs_generic_impl(const char *generic_driver,
return err;
}
- cfg = kzalloc_obj(*cfg, GFP_KERNEL);
+ cfg = kzalloc_obj(*cfg);
if (!cfg) {
err = -ENOMEM;
goto out;
@@ -1941,7 +1941,7 @@ static int __alg_test_hash(const struct hash_testvec *vecs,
if (err)
goto out;
- tsgl = kmalloc_obj(*tsgl, GFP_KERNEL);
+ tsgl = kmalloc_obj(*tsgl);
if (!tsgl || init_test_sglist(tsgl) != 0) {
pr_err("alg: hash: failed to allocate test buffers for %s\n",
driver);
@@ -2598,7 +2598,7 @@ static int test_aead_slow(const struct alg_test_desc *test_desc,
if (noslowtests)
return 0;
- ctx = kzalloc_obj(*ctx, GFP_KERNEL);
+ ctx = kzalloc_obj(*ctx);
if (!ctx)
return -ENOMEM;
init_rnd_state(&ctx->rng);
@@ -3106,7 +3106,7 @@ static int test_skcipher_vs_generic_impl(const char *generic_driver,
return err;
}
- cfg = kzalloc_obj(*cfg, GFP_KERNEL);
+ cfg = kzalloc_obj(*cfg);
if (!cfg) {
err = -ENOMEM;
goto out;
diff --git a/drivers/accel/amdxdna/aie2_ctx.c b/drivers/accel/amdxdna/aie2_ctx.c
index d4869f2fef02..4503c7c77a3e 100644
--- a/drivers/accel/amdxdna/aie2_ctx.c
+++ b/drivers/accel/amdxdna/aie2_ctx.c
@@ -464,7 +464,7 @@ static int aie2_alloc_resource(struct amdxdna_hwctx *hwctx)
return aie2_create_context(xdna->dev_handle, hwctx);
}
- xrs_req = kzalloc_obj(*xrs_req, GFP_KERNEL);
+ xrs_req = kzalloc_obj(*xrs_req);
if (!xrs_req)
return -ENOMEM;
@@ -559,7 +559,7 @@ int aie2_hwctx_init(struct amdxdna_hwctx *hwctx)
struct amdxdna_gem_obj *heap;
int i, ret;
- priv = kzalloc_obj(*hwctx->priv, GFP_KERNEL);
+ priv = kzalloc_obj(*hwctx->priv);
if (!priv)
return -ENOMEM;
hwctx->priv = priv;
diff --git a/drivers/accel/amdxdna/aie2_pci.c b/drivers/accel/amdxdna/aie2_pci.c
index 47346684bb75..2a51b2658bfc 100644
--- a/drivers/accel/amdxdna/aie2_pci.c
+++ b/drivers/accel/amdxdna/aie2_pci.c
@@ -653,7 +653,7 @@ static int aie2_get_aie_metadata(struct amdxdna_client *client,
int ret = 0;
ndev = xdna->dev_handle;
- meta = kzalloc_obj(*meta, GFP_KERNEL);
+ meta = kzalloc_obj(*meta);
if (!meta)
return -ENOMEM;
@@ -748,7 +748,7 @@ static int aie2_get_clock_metadata(struct amdxdna_client *client,
int ret = 0;
ndev = xdna->dev_handle;
- clock = kzalloc_obj(*clock, GFP_KERNEL);
+ clock = kzalloc_obj(*clock);
if (!clock)
return -ENOMEM;
@@ -775,7 +775,7 @@ static int aie2_hwctx_status_cb(struct amdxdna_hwctx *hwctx, void *arg)
if (!array_args->num_element)
return -EINVAL;
- tmp = kzalloc_obj(*tmp, GFP_KERNEL);
+ tmp = kzalloc_obj(*tmp);
if (!tmp)
return -ENOMEM;
diff --git a/drivers/accel/amdxdna/aie2_solver.c b/drivers/accel/amdxdna/aie2_solver.c
index 6154ef9f9e9d..f5d88d707551 100644
--- a/drivers/accel/amdxdna/aie2_solver.c
+++ b/drivers/accel/amdxdna/aie2_solver.c
@@ -197,7 +197,7 @@ static int get_free_partition(struct solver_state *xrs,
if (i == snode->cols_len)
return -ENODEV;
- pt_node = kzalloc_obj(*pt_node, GFP_KERNEL);
+ pt_node = kzalloc_obj(*pt_node);
if (!pt_node)
return -ENOMEM;
diff --git a/drivers/accel/amdxdna/amdxdna_ctx.c b/drivers/accel/amdxdna/amdxdna_ctx.c
index edbac9f4054c..29722ae34133 100644
--- a/drivers/accel/amdxdna/amdxdna_ctx.c
+++ b/drivers/accel/amdxdna/amdxdna_ctx.c
@@ -50,7 +50,7 @@ static struct dma_fence *amdxdna_fence_create(struct amdxdna_hwctx *hwctx)
{
struct amdxdna_fence *fence;
- fence = kzalloc_obj(*fence, GFP_KERNEL);
+ fence = kzalloc_obj(*fence);
if (!fence)
return NULL;
@@ -161,7 +161,7 @@ int amdxdna_drm_create_hwctx_ioctl(struct drm_device *dev, void *data, struct dr
if (args->ext || args->ext_flags)
return -EINVAL;
- hwctx = kzalloc_obj(*hwctx, GFP_KERNEL);
+ hwctx = kzalloc_obj(*hwctx);
if (!hwctx)
return -ENOMEM;
diff --git a/drivers/accel/amdxdna/amdxdna_gem.c b/drivers/accel/amdxdna/amdxdna_gem.c
index d862d5fe5385..a561674bac97 100644
--- a/drivers/accel/amdxdna/amdxdna_gem.c
+++ b/drivers/accel/amdxdna/amdxdna_gem.c
@@ -205,7 +205,7 @@ static int amdxdna_hmm_register(struct amdxdna_gem_obj *abo,
if (!xdna->dev_info->ops->hmm_invalidate)
return 0;
- mapp = kzalloc_obj(*mapp, GFP_KERNEL);
+ mapp = kzalloc_obj(*mapp);
if (!mapp)
return -ENOMEM;
@@ -499,7 +499,7 @@ amdxdna_gem_create_obj(struct drm_device *dev, size_t size)
{
struct amdxdna_gem_obj *abo;
- abo = kzalloc_obj(*abo, GFP_KERNEL);
+ abo = kzalloc_obj(*abo);
if (!abo)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/accel/amdxdna/amdxdna_mailbox.c b/drivers/accel/amdxdna/amdxdna_mailbox.c
index 04d1d30184ca..235a94047530 100644
--- a/drivers/accel/amdxdna/amdxdna_mailbox.c
+++ b/drivers/accel/amdxdna/amdxdna_mailbox.c
@@ -475,7 +475,7 @@ xdna_mailbox_create_channel(struct mailbox *mb,
return NULL;
}
- mb_chann = kzalloc_obj(*mb_chann, GFP_KERNEL);
+ mb_chann = kzalloc_obj(*mb_chann);
if (!mb_chann)
return NULL;
diff --git a/drivers/accel/amdxdna/amdxdna_pci_drv.c b/drivers/accel/amdxdna/amdxdna_pci_drv.c
index 86f46f59b9dc..4ada45d06fcf 100644
--- a/drivers/accel/amdxdna/amdxdna_pci_drv.c
+++ b/drivers/accel/amdxdna/amdxdna_pci_drv.c
@@ -63,7 +63,7 @@ static int amdxdna_drm_open(struct drm_device *ddev, struct drm_file *filp)
struct amdxdna_client *client;
int ret;
- client = kzalloc_obj(*client, GFP_KERNEL);
+ client = kzalloc_obj(*client);
if (!client)
return -ENOMEM;
diff --git a/drivers/accel/amdxdna/amdxdna_ubuf.c b/drivers/accel/amdxdna/amdxdna_ubuf.c
index 44db2cef40cb..b509f10b155c 100644
--- a/drivers/accel/amdxdna/amdxdna_ubuf.c
+++ b/drivers/accel/amdxdna/amdxdna_ubuf.c
@@ -27,7 +27,7 @@ static struct sg_table *amdxdna_ubuf_map(struct dma_buf_attachment *attach,
struct sg_table *sg;
int ret;
- sg = kzalloc_obj(*sg, GFP_KERNEL);
+ sg = kzalloc_obj(*sg);
if (!sg)
return ERR_PTR(-ENOMEM);
@@ -147,7 +147,7 @@ struct dma_buf *amdxdna_get_ubuf(struct drm_device *dev,
if (!can_do_mlock())
return ERR_PTR(-EPERM);
- ubuf = kzalloc_obj(*ubuf, GFP_KERNEL);
+ ubuf = kzalloc_obj(*ubuf);
if (!ubuf)
return ERR_PTR(-ENOMEM);
@@ -155,7 +155,7 @@ struct dma_buf *amdxdna_get_ubuf(struct drm_device *dev,
ubuf->mm = current->mm;
mmgrab(ubuf->mm);
- va_ent = kvzalloc_objs(*va_ent, num_entries, GFP_KERNEL);
+ va_ent = kvzalloc_objs(*va_ent, num_entries);
if (!va_ent) {
ret = -ENOMEM;
goto free_ubuf;
@@ -189,7 +189,7 @@ struct dma_buf *amdxdna_get_ubuf(struct drm_device *dev,
goto sub_pin_cnt;
}
- ubuf->pages = kvmalloc_objs(*ubuf->pages, ubuf->nr_pages, GFP_KERNEL);
+ ubuf->pages = kvmalloc_objs(*ubuf->pages, ubuf->nr_pages);
if (!ubuf->pages) {
ret = -ENOMEM;
goto sub_pin_cnt;
diff --git a/drivers/accel/ethosu/ethosu_gem.c b/drivers/accel/ethosu/ethosu_gem.c
index 7a5405db5a6c..cbd74e3adb9f 100644
--- a/drivers/accel/ethosu/ethosu_gem.c
+++ b/drivers/accel/ethosu/ethosu_gem.c
@@ -50,7 +50,7 @@ struct drm_gem_object *ethosu_gem_create_object(struct drm_device *ddev, size_t
{
struct ethosu_gem_object *obj;
- obj = kzalloc_obj(*obj, GFP_KERNEL);
+ obj = kzalloc_obj(*obj);
if (!obj)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/accel/ethosu/ethosu_job.c b/drivers/accel/ethosu/ethosu_job.c
index 91d1b996852e..8598a3634340 100644
--- a/drivers/accel/ethosu/ethosu_job.c
+++ b/drivers/accel/ethosu/ethosu_job.c
@@ -375,7 +375,7 @@ static int ethosu_ioctl_submit_job(struct drm_device *dev, struct drm_file *file
if (edev->npu_info.sram_size < job->sram_size)
return -EINVAL;
- ejob = kzalloc_obj(*ejob, GFP_KERNEL);
+ ejob = kzalloc_obj(*ejob);
if (!ejob)
return -ENOMEM;
@@ -384,7 +384,7 @@ static int ethosu_ioctl_submit_job(struct drm_device *dev, struct drm_file *file
ejob->dev = edev;
ejob->sram_size = job->sram_size;
- ejob->done_fence = kzalloc_obj(*ejob->done_fence, GFP_KERNEL);
+ ejob->done_fence = kzalloc_obj(*ejob->done_fence);
if (!ejob->done_fence) {
ret = -ENOMEM;
goto out_cleanup_job;
@@ -476,7 +476,7 @@ int ethosu_ioctl_submit(struct drm_device *dev, void *data, struct drm_file *fil
}
struct drm_ethosu_job __free(kvfree) *jobs =
- kvmalloc_objs(*jobs, args->job_count, GFP_KERNEL);
+ kvmalloc_objs(*jobs, args->job_count);
if (!jobs)
return -ENOMEM;
diff --git a/drivers/accel/habanalabs/common/command_buffer.c b/drivers/accel/habanalabs/common/command_buffer.c
index b27323afd12d..e929db8bc023 100644
--- a/drivers/accel/habanalabs/common/command_buffer.c
+++ b/drivers/accel/habanalabs/common/command_buffer.c
@@ -119,7 +119,7 @@ static struct hl_cb *hl_cb_alloc(struct hl_device *hdev, u32 cb_size,
cb = kzalloc_obj(*cb, GFP_ATOMIC);
if (!cb)
- cb = kzalloc_obj(*cb, GFP_KERNEL);
+ cb = kzalloc_obj(*cb);
if (!cb)
return NULL;
diff --git a/drivers/accel/habanalabs/common/command_submission.c b/drivers/accel/habanalabs/common/command_submission.c
index f990d16f6c2f..6c896eb816de 100644
--- a/drivers/accel/habanalabs/common/command_submission.c
+++ b/drivers/accel/habanalabs/common/command_submission.c
@@ -909,7 +909,7 @@ static int allocate_cs(struct hl_device *hdev, struct hl_ctx *ctx,
cs = kzalloc_obj(*cs, GFP_ATOMIC);
if (!cs)
- cs = kzalloc_obj(*cs, GFP_KERNEL);
+ cs = kzalloc_obj(*cs);
if (!cs) {
atomic64_inc(&ctx->cs_counters.out_of_mem_drop_cnt);
@@ -938,7 +938,7 @@ static int allocate_cs(struct hl_device *hdev, struct hl_ctx *ctx,
cs_cmpl = kzalloc_obj(*cs_cmpl, GFP_ATOMIC);
if (!cs_cmpl)
- cs_cmpl = kzalloc_obj(*cs_cmpl, GFP_KERNEL);
+ cs_cmpl = kzalloc_obj(*cs_cmpl);
if (!cs_cmpl) {
atomic64_inc(&ctx->cs_counters.out_of_mem_drop_cnt);
@@ -1304,7 +1304,7 @@ struct hl_cs_job *hl_cs_allocate_job(struct hl_device *hdev,
job = kzalloc_obj(*job, GFP_ATOMIC);
if (!job)
- job = kzalloc_obj(*job, GFP_KERNEL);
+ job = kzalloc_obj(*job);
if (!job)
return NULL;
@@ -2039,7 +2039,7 @@ static int cs_ioctl_reserve_signals(struct hl_fpriv *hpriv,
prop = &hdev->kernel_queues[q_idx].sync_stream_prop;
- handle = kzalloc_obj(*handle, GFP_KERNEL);
+ handle = kzalloc_obj(*handle);
if (!handle) {
rc = -ENOMEM;
goto out;
@@ -3052,7 +3052,7 @@ static int hl_multi_cs_wait_ioctl(struct hl_fpriv *hpriv, void *data)
}
/* allocate array for the fences */
- fence_arr = kmalloc_objs(struct hl_fence *, seq_arr_len, GFP_KERNEL);
+ fence_arr = kmalloc_objs(struct hl_fence *, seq_arr_len);
if (!fence_arr) {
rc = -ENOMEM;
goto free_seq_arr;
@@ -3411,7 +3411,7 @@ static int _hl_interrupt_wait_ioctl(struct hl_device *hdev, struct hl_ctx *ctx,
goto put_cq_cb;
}
- pend = kzalloc_obj(*pend, GFP_KERNEL);
+ pend = kzalloc_obj(*pend);
if (!pend) {
rc = -ENOMEM;
goto put_cq_cb;
@@ -3520,7 +3520,7 @@ static int _hl_interrupt_wait_ioctl_user_addr(struct hl_device *hdev, struct hl_
hl_ctx_get(ctx);
- pend = kzalloc_obj(*pend, GFP_KERNEL);
+ pend = kzalloc_obj(*pend);
if (!pend) {
hl_ctx_put(ctx);
return -ENOMEM;
diff --git a/drivers/accel/habanalabs/common/context.c b/drivers/accel/habanalabs/common/context.c
index 4d69a3f48616..276c97aba992 100644
--- a/drivers/accel/habanalabs/common/context.c
+++ b/drivers/accel/habanalabs/common/context.c
@@ -155,7 +155,7 @@ int hl_ctx_create(struct hl_device *hdev, struct hl_fpriv *hpriv)
struct hl_ctx *ctx;
int rc;
- ctx = kzalloc_obj(*ctx, GFP_KERNEL);
+ ctx = kzalloc_obj(*ctx);
if (!ctx) {
rc = -ENOMEM;
goto out_err;
diff --git a/drivers/accel/habanalabs/common/decoder.c b/drivers/accel/habanalabs/common/decoder.c
index 602e53f963ca..e4802f30c08a 100644
--- a/drivers/accel/habanalabs/common/decoder.c
+++ b/drivers/accel/habanalabs/common/decoder.c
@@ -98,7 +98,7 @@ int hl_dec_init(struct hl_device *hdev)
if (!prop->max_dec)
return 0;
- hdev->dec = kzalloc_objs(struct hl_dec, prop->max_dec, GFP_KERNEL);
+ hdev->dec = kzalloc_objs(struct hl_dec, prop->max_dec);
if (!hdev->dec)
return -ENOMEM;
diff --git a/drivers/accel/habanalabs/common/device.c b/drivers/accel/habanalabs/common/device.c
index 20ddf6617e02..d4c3473fb64f 100644
--- a/drivers/accel/habanalabs/common/device.c
+++ b/drivers/accel/habanalabs/common/device.c
@@ -722,7 +722,7 @@ static int device_init_cdev(struct hl_device *hdev, const struct class *class,
cdev_init(cdev, fops);
cdev->owner = THIS_MODULE;
- *dev = kzalloc_obj(**dev, GFP_KERNEL);
+ *dev = kzalloc_obj(**dev);
if (!*dev)
return -ENOMEM;
@@ -945,7 +945,7 @@ static int device_early_init(struct hl_device *hdev)
goto free_ts_free_wq;
}
- hdev->hl_chip_info = kzalloc_obj(struct hwmon_chip_info, GFP_KERNEL);
+ hdev->hl_chip_info = kzalloc_obj(struct hwmon_chip_info);
if (!hdev->hl_chip_info) {
rc = -ENOMEM;
goto free_prefetch_wq;
@@ -1851,7 +1851,7 @@ int hl_device_reset(struct hl_device *hdev, u32 flags)
}
/* Allocate the kernel context */
- hdev->kernel_ctx = kzalloc_obj(*hdev->kernel_ctx, GFP_KERNEL);
+ hdev->kernel_ctx = kzalloc_obj(*hdev->kernel_ctx);
if (!hdev->kernel_ctx) {
rc = -ENOMEM;
hl_mmu_fini(hdev);
@@ -2275,7 +2275,7 @@ int hl_device_init(struct hl_device *hdev)
}
/* Allocate the kernel context */
- hdev->kernel_ctx = kzalloc_obj(*hdev->kernel_ctx, GFP_KERNEL);
+ hdev->kernel_ctx = kzalloc_obj(*hdev->kernel_ctx);
if (!hdev->kernel_ctx) {
rc = -ENOMEM;
goto mmu_fini;
diff --git a/drivers/accel/habanalabs/common/firmware_if.c b/drivers/accel/habanalabs/common/firmware_if.c
index f6a2c48ad74e..c8f1e252241d 100644
--- a/drivers/accel/habanalabs/common/firmware_if.c
+++ b/drivers/accel/habanalabs/common/firmware_if.c
@@ -2681,7 +2681,7 @@ static int hl_fw_dynamic_send_msg(struct hl_device *hdev,
struct lkd_msg_comms *msg;
int rc;
- msg = kzalloc_obj(*msg, GFP_KERNEL);
+ msg = kzalloc_obj(*msg);
if (!msg)
return -ENOMEM;
diff --git a/drivers/accel/habanalabs/common/habanalabs_drv.c b/drivers/accel/habanalabs/common/habanalabs_drv.c
index 63b4a91e291c..483e1ad9fc41 100644
--- a/drivers/accel/habanalabs/common/habanalabs_drv.c
+++ b/drivers/accel/habanalabs/common/habanalabs_drv.c
@@ -181,7 +181,7 @@ int hl_device_open(struct drm_device *ddev, struct drm_file *file_priv)
struct hl_fpriv *hpriv;
int rc;
- hpriv = kzalloc_obj(*hpriv, GFP_KERNEL);
+ hpriv = kzalloc_obj(*hpriv);
if (!hpriv)
return -ENOMEM;
@@ -291,7 +291,7 @@ int hl_device_open_ctrl(struct inode *inode, struct file *filp)
return -ENXIO;
}
- hpriv = kzalloc_obj(*hpriv, GFP_KERNEL);
+ hpriv = kzalloc_obj(*hpriv);
if (!hpriv)
return -ENOMEM;
diff --git a/drivers/accel/habanalabs/common/habanalabs_ioctl.c b/drivers/accel/habanalabs/common/habanalabs_ioctl.c
index ace0aaa7b836..fef542afe035 100644
--- a/drivers/accel/habanalabs/common/habanalabs_ioctl.c
+++ b/drivers/accel/habanalabs/common/habanalabs_ioctl.c
@@ -201,7 +201,7 @@ static int debug_coresight(struct hl_device *hdev, struct hl_ctx *ctx, struct hl
void *input = NULL, *output = NULL;
int rc;
- params = kzalloc_obj(*params, GFP_KERNEL);
+ params = kzalloc_obj(*params);
if (!params)
return -ENOMEM;
@@ -682,11 +682,11 @@ static int sec_attest_info(struct hl_fpriv *hpriv, struct hl_info_args *args)
if ((!max_size) || (!out))
return -EINVAL;
- sec_attest_info = kmalloc_obj(*sec_attest_info, GFP_KERNEL);
+ sec_attest_info = kmalloc_obj(*sec_attest_info);
if (!sec_attest_info)
return -ENOMEM;
- info = kzalloc_obj(*info, GFP_KERNEL);
+ info = kzalloc_obj(*info);
if (!info) {
rc = -ENOMEM;
goto free_sec_attest_info;
@@ -731,11 +731,11 @@ static int dev_info_signed(struct hl_fpriv *hpriv, struct hl_info_args *args)
if ((!max_size) || (!out))
return -EINVAL;
- dev_info_signed = kzalloc_obj(*dev_info_signed, GFP_KERNEL);
+ dev_info_signed = kzalloc_obj(*dev_info_signed);
if (!dev_info_signed)
return -ENOMEM;
- info = kzalloc_obj(*info, GFP_KERNEL);
+ info = kzalloc_obj(*info);
if (!info) {
rc = -ENOMEM;
goto free_dev_info_signed;
diff --git a/drivers/accel/habanalabs/common/hldio.c b/drivers/accel/habanalabs/common/hldio.c
index 2cef50bbfa9b..c33c817a962a 100644
--- a/drivers/accel/habanalabs/common/hldio.c
+++ b/drivers/accel/habanalabs/common/hldio.c
@@ -308,7 +308,7 @@ int hl_dio_ssd2hl(struct hl_device *hdev, struct hl_ctx *ctx, int fd,
dev_dbg(hdev->dev, "SSD2HL fd=%d va=%#llx len=%#lx\n", fd, device_va, len_bytes);
- io = kzalloc_obj(*io, GFP_KERNEL);
+ io = kzalloc_obj(*io);
if (!io) {
rc = -ENOMEM;
goto out;
diff --git a/drivers/accel/habanalabs/common/hwmon.c b/drivers/accel/habanalabs/common/hwmon.c
index a8b00a80fa10..3c0f405a5148 100644
--- a/drivers/accel/habanalabs/common/hwmon.c
+++ b/drivers/accel/habanalabs/common/hwmon.c
@@ -203,7 +203,7 @@ int hl_build_hwmon_channel_info(struct hl_device *hdev, struct cpucp_sensor *sen
}
for (i = 0 ; i < num_active_sensor_types ; i++) {
- channels_info[i] = kzalloc_obj(*channels_info[i], GFP_KERNEL);
+ channels_info[i] = kzalloc_obj(*channels_info[i]);
if (!channels_info[i]) {
rc = -ENOMEM;
goto channel_info_err;
diff --git a/drivers/accel/habanalabs/common/memory.c b/drivers/accel/habanalabs/common/memory.c
index 8700e341ff94..361cff577381 100644
--- a/drivers/accel/habanalabs/common/memory.c
+++ b/drivers/accel/habanalabs/common/memory.c
@@ -125,7 +125,7 @@ static int alloc_device_memory(struct hl_ctx *ctx, struct hl_mem_in *args,
}
}
- phys_pg_pack = kzalloc_obj(*phys_pg_pack, GFP_KERNEL);
+ phys_pg_pack = kzalloc_obj(*phys_pg_pack);
if (!phys_pg_pack) {
rc = -ENOMEM;
goto pages_pack_err;
@@ -228,7 +228,7 @@ static int dma_map_host_va(struct hl_device *hdev, u64 addr, u64 size,
struct hl_userptr *userptr;
int rc;
- userptr = kzalloc_obj(*userptr, GFP_KERNEL);
+ userptr = kzalloc_obj(*userptr);
if (!userptr) {
rc = -ENOMEM;
goto userptr_err;
@@ -501,7 +501,7 @@ static int add_va_block_locked(struct hl_device *hdev,
res = va_block;
}
- va_block = kmalloc_obj(*va_block, GFP_KERNEL);
+ va_block = kmalloc_obj(*va_block);
if (!va_block)
return -ENOMEM;
@@ -850,7 +850,7 @@ static int init_phys_pg_pack_from_userptr(struct hl_ctx *ctx,
dma_addr_t dma_addr;
int rc, i, j;
- phys_pg_pack = kzalloc_obj(*phys_pg_pack, GFP_KERNEL);
+ phys_pg_pack = kzalloc_obj(*phys_pg_pack);
if (!phys_pg_pack)
return -ENOMEM;
@@ -1152,7 +1152,7 @@ static int map_device_va(struct hl_ctx *ctx, struct hl_mem_in *args, u64 *device
goto shared_err;
}
- hnode = kzalloc_obj(*hnode, GFP_KERNEL);
+ hnode = kzalloc_obj(*hnode);
if (!hnode) {
rc = -ENOMEM;
goto hnode_err;
@@ -1482,7 +1482,7 @@ int hl_hw_block_mmap(struct hl_fpriv *hpriv, struct vm_area_struct *vma)
return -EINVAL;
}
- lnode = kzalloc_obj(*lnode, GFP_KERNEL);
+ lnode = kzalloc_obj(*lnode);
if (!lnode)
return -ENOMEM;
@@ -1553,7 +1553,7 @@ static struct sg_table *alloc_sgt_from_device_pages(struct hl_device *hdev, u64
return ERR_PTR(-EINVAL);
}
- sgt = kzalloc_obj(*sgt, GFP_KERNEL);
+ sgt = kzalloc_obj(*sgt);
if (!sgt)
return ERR_PTR(-ENOMEM);
@@ -2046,7 +2046,7 @@ static int export_dmabuf_from_addr(struct hl_ctx *ctx, u64 addr, u64 size, u64 o
return -EINVAL;
}
- hl_dmabuf = kzalloc_obj(*hl_dmabuf, GFP_KERNEL);
+ hl_dmabuf = kzalloc_obj(*hl_dmabuf);
if (!hl_dmabuf)
return -ENOMEM;
@@ -2323,7 +2323,7 @@ static int get_user_memory(struct hl_device *hdev, u64 addr, u64 size,
return -EFAULT;
}
- userptr->pages = kvmalloc_objs(struct page *, npages, GFP_KERNEL);
+ userptr->pages = kvmalloc_objs(struct page *, npages);
if (!userptr->pages)
return -ENOMEM;
@@ -2395,7 +2395,7 @@ int hl_pin_host_memory(struct hl_device *hdev, u64 addr, u64 size,
}
userptr->pid = current->pid;
- userptr->sgt = kzalloc_obj(*userptr->sgt, GFP_KERNEL);
+ userptr->sgt = kzalloc_obj(*userptr->sgt);
if (!userptr->sgt)
return -ENOMEM;
@@ -2611,7 +2611,7 @@ static int vm_ctx_init_with_ranges(struct hl_ctx *ctx,
for (i = 0 ; i < HL_VA_RANGE_TYPE_MAX ; i++) {
ctx->va_range[i] =
- kzalloc_obj(struct hl_va_range, GFP_KERNEL);
+ kzalloc_obj(struct hl_va_range);
if (!ctx->va_range[i]) {
rc = -ENOMEM;
goto free_va_range;
diff --git a/drivers/accel/habanalabs/common/mmu/mmu.c b/drivers/accel/habanalabs/common/mmu/mmu.c
index 8a661408af20..1f8f7cf2d3fb 100644
--- a/drivers/accel/habanalabs/common/mmu/mmu.c
+++ b/drivers/accel/habanalabs/common/mmu/mmu.c
@@ -697,7 +697,7 @@ int hl_mmu_prefetch_cache_range(struct hl_ctx *ctx, u32 flags, u32 asid, u64 va,
{
struct hl_prefetch_work *handle_prefetch_work;
- handle_prefetch_work = kmalloc_obj(*handle_prefetch_work, GFP_KERNEL);
+ handle_prefetch_work = kmalloc_obj(*handle_prefetch_work);
if (!handle_prefetch_work)
return -ENOMEM;
@@ -1072,7 +1072,7 @@ struct pgt_info *hl_mmu_hr_alloc_hop(struct hl_ctx *ctx, struct hl_mmu_hr_priv *
void *virt_addr;
int i, retry = 1;
- pgt_info = kmalloc_obj(*pgt_info, GFP_KERNEL);
+ pgt_info = kmalloc_obj(*pgt_info);
if (!pgt_info)
return NULL;
@@ -1326,7 +1326,7 @@ u64 hl_mmu_dr_alloc_hop(struct hl_ctx *ctx)
struct pgt_info *pgt_info;
u64 phys_addr, shadow_addr;
- pgt_info = kmalloc_obj(*pgt_info, GFP_KERNEL);
+ pgt_info = kmalloc_obj(*pgt_info);
if (!pgt_info)
return ULLONG_MAX;
diff --git a/drivers/accel/habanalabs/common/state_dump.c b/drivers/accel/habanalabs/common/state_dump.c
index ec25d55d89e2..1c70a363a328 100644
--- a/drivers/accel/habanalabs/common/state_dump.c
+++ b/drivers/accel/habanalabs/common/state_dump.c
@@ -400,7 +400,7 @@ static int hl_state_dump_print_syncs(struct hl_device *hdev,
u32 index;
int rc = 0;
- map = kzalloc_obj(*map, GFP_KERNEL);
+ map = kzalloc_obj(*map);
if (!map)
return -ENOMEM;
diff --git a/drivers/accel/habanalabs/gaudi/gaudi.c b/drivers/accel/habanalabs/gaudi/gaudi.c
index e7dce0d57692..76fdf3b77b87 100644
--- a/drivers/accel/habanalabs/gaudi/gaudi.c
+++ b/drivers/accel/habanalabs/gaudi/gaudi.c
@@ -1852,7 +1852,7 @@ static int gaudi_sw_init(struct hl_device *hdev)
int rc;
/* Allocate device structure */
- gaudi = kzalloc_obj(*gaudi, GFP_KERNEL);
+ gaudi = kzalloc_obj(*gaudi);
if (!gaudi)
return -ENOMEM;
@@ -4905,7 +4905,7 @@ static int gaudi_pin_memory_before_cs(struct hl_device *hdev,
parser->job_userptr_list, &userptr))
goto already_pinned;
- userptr = kzalloc_obj(*userptr, GFP_KERNEL);
+ userptr = kzalloc_obj(*userptr);
if (!userptr)
return -ENOMEM;
@@ -8842,7 +8842,7 @@ static int gaudi_add_sync_to_engine_map_entry(
reg_value -= lower_32_bits(CFG_BASE);
/* create a new hash entry */
- entry = kzalloc_obj(*entry, GFP_KERNEL);
+ entry = kzalloc_obj(*entry);
if (!entry)
return -ENOMEM;
entry->engine_type = engine_type;
diff --git a/drivers/accel/habanalabs/gaudi2/gaudi2.c b/drivers/accel/habanalabs/gaudi2/gaudi2.c
index e6690698cde4..91f46719931c 100644
--- a/drivers/accel/habanalabs/gaudi2/gaudi2.c
+++ b/drivers/accel/habanalabs/gaudi2/gaudi2.c
@@ -4057,7 +4057,7 @@ static int gaudi2_sw_init(struct hl_device *hdev)
int i, rc;
/* Allocate device structure */
- gaudi2 = kzalloc_obj(*gaudi2, GFP_KERNEL);
+ gaudi2 = kzalloc_obj(*gaudi2);
if (!gaudi2)
return -ENOMEM;
diff --git a/drivers/accel/habanalabs/goya/goya.c b/drivers/accel/habanalabs/goya/goya.c
index fb37a2339f12..f94a331f4c32 100644
--- a/drivers/accel/habanalabs/goya/goya.c
+++ b/drivers/accel/habanalabs/goya/goya.c
@@ -969,7 +969,7 @@ static int goya_sw_init(struct hl_device *hdev)
int rc;
/* Allocate device structure */
- goya = kzalloc_obj(*goya, GFP_KERNEL);
+ goya = kzalloc_obj(*goya);
if (!goya)
return -ENOMEM;
@@ -1030,7 +1030,7 @@ static int goya_sw_init(struct hl_device *hdev)
hdev->asic_funcs->set_pci_memory_regions(hdev);
- goya->goya_work = kmalloc_obj(struct goya_work_freq, GFP_KERNEL);
+ goya->goya_work = kmalloc_obj(struct goya_work_freq);
if (!goya->goya_work) {
rc = -ENOMEM;
goto free_cpu_accessible_dma_pool;
@@ -3335,7 +3335,7 @@ static int goya_pin_memory_before_cs(struct hl_device *hdev,
parser->job_userptr_list, &userptr))
goto already_pinned;
- userptr = kzalloc_obj(*userptr, GFP_KERNEL);
+ userptr = kzalloc_obj(*userptr);
if (!userptr)
return -ENOMEM;
diff --git a/drivers/accel/ivpu/ivpu_drv.c b/drivers/accel/ivpu/ivpu_drv.c
index ab910d201e68..5900a40c7a78 100644
--- a/drivers/accel/ivpu/ivpu_drv.c
+++ b/drivers/accel/ivpu/ivpu_drv.c
@@ -237,7 +237,7 @@ static int ivpu_open(struct drm_device *dev, struct drm_file *file)
if (!drm_dev_enter(dev, &idx))
return -ENODEV;
- file_priv = kzalloc_obj(*file_priv, GFP_KERNEL);
+ file_priv = kzalloc_obj(*file_priv);
if (!file_priv) {
ret = -ENOMEM;
goto err_dev_exit;
diff --git a/drivers/accel/ivpu/ivpu_gem_userptr.c b/drivers/accel/ivpu/ivpu_gem_userptr.c
index 7dcd127471bb..7cbf3a4cdc73 100644
--- a/drivers/accel/ivpu/ivpu_gem_userptr.c
+++ b/drivers/accel/ivpu/ivpu_gem_userptr.c
@@ -77,7 +77,7 @@ ivpu_create_userptr_dmabuf(struct ivpu_device *vdev, void __user *user_ptr,
if (!(flags & DRM_IVPU_BO_READ_ONLY))
gup_flags |= FOLL_WRITE;
- pages = kvmalloc_objs(*pages, nr_pages, GFP_KERNEL);
+ pages = kvmalloc_objs(*pages, nr_pages);
if (!pages)
return ERR_PTR(-ENOMEM);
@@ -94,7 +94,7 @@ ivpu_create_userptr_dmabuf(struct ivpu_device *vdev, void __user *user_ptr,
goto unpin_pages;
}
- sgt = kmalloc_obj(*sgt, GFP_KERNEL);
+ sgt = kmalloc_obj(*sgt);
if (!sgt) {
ret = -ENOMEM;
goto unpin_pages;
diff --git a/drivers/accel/ivpu/ivpu_job.c b/drivers/accel/ivpu/ivpu_job.c
index cb478d946ae9..124f018667a9 100644
--- a/drivers/accel/ivpu/ivpu_job.c
+++ b/drivers/accel/ivpu/ivpu_job.c
@@ -98,7 +98,7 @@ static struct ivpu_cmdq *ivpu_cmdq_alloc(struct ivpu_file_priv *file_priv)
struct ivpu_device *vdev = file_priv->vdev;
struct ivpu_cmdq *cmdq;
- cmdq = kzalloc_obj(*cmdq, GFP_KERNEL);
+ cmdq = kzalloc_obj(*cmdq);
if (!cmdq)
return NULL;
@@ -491,7 +491,7 @@ static struct dma_fence *ivpu_fence_create(struct ivpu_device *vdev)
{
struct ivpu_fence *fence;
- fence = kzalloc_obj(*fence, GFP_KERNEL);
+ fence = kzalloc_obj(*fence);
if (!fence)
return NULL;
diff --git a/drivers/accel/ivpu/ivpu_ms.c b/drivers/accel/ivpu/ivpu_ms.c
index f3468c9533ca..be43851f5f32 100644
--- a/drivers/accel/ivpu/ivpu_ms.c
+++ b/drivers/accel/ivpu/ivpu_ms.c
@@ -59,7 +59,7 @@ int ivpu_ms_start_ioctl(struct drm_device *dev, void *data, struct drm_file *fil
goto unlock;
}
- ms = kzalloc_obj(*ms, GFP_KERNEL);
+ ms = kzalloc_obj(*ms);
if (!ms) {
ret = -ENOMEM;
goto unlock;
diff --git a/drivers/accel/qaic/qaic_control.c b/drivers/accel/qaic/qaic_control.c
index 517cd3a9cab2..f698d5dfd326 100644
--- a/drivers/accel/qaic/qaic_control.c
+++ b/drivers/accel/qaic/qaic_control.c
@@ -443,7 +443,7 @@ static int find_and_map_user_pages(struct qaic_device *qdev,
goto put_pages;
}
- sgt = kmalloc_obj(*sgt, GFP_KERNEL);
+ sgt = kmalloc_obj(*sgt);
if (!sgt) {
ret = -ENOMEM;
goto put_pages;
@@ -582,7 +582,7 @@ static int encode_dma(struct qaic_device *qdev, void *trans, struct wrapper_list
QAIC_MANAGE_WIRE_MSG_LENGTH)
return -ENOMEM;
- xfer = kmalloc_obj(*xfer, GFP_KERNEL);
+ xfer = kmalloc_obj(*xfer);
if (!xfer)
return -ENOMEM;
@@ -1166,7 +1166,7 @@ static struct wrapper_list *alloc_wrapper_list(void)
{
struct wrapper_list *wrappers;
- wrappers = kmalloc_obj(*wrappers, GFP_KERNEL);
+ wrappers = kmalloc_obj(*wrappers);
if (!wrappers)
return NULL;
INIT_LIST_HEAD(&wrappers->list);
diff --git a/drivers/accel/qaic/qaic_data.c b/drivers/accel/qaic/qaic_data.c
index 6405f849ad5f..95300c2f7d8a 100644
--- a/drivers/accel/qaic/qaic_data.c
+++ b/drivers/accel/qaic/qaic_data.c
@@ -213,7 +213,7 @@ static int clone_range_of_sgt_for_slice(struct qaic_device *qdev, struct sg_tabl
goto out;
}
- sgt = kzalloc_obj(*sgt, GFP_KERNEL);
+ sgt = kzalloc_obj(*sgt);
if (!sgt) {
ret = -ENOMEM;
goto out;
@@ -399,13 +399,13 @@ static int qaic_map_one_slice(struct qaic_device *qdev, struct qaic_bo *bo,
if (ret)
goto out;
- slice = kmalloc_obj(*slice, GFP_KERNEL);
+ slice = kmalloc_obj(*slice);
if (!slice) {
ret = -ENOMEM;
goto free_sgt;
}
- slice->reqs = kvzalloc_objs(*slice->reqs, sgt->nents, GFP_KERNEL);
+ slice->reqs = kvzalloc_objs(*slice->reqs, sgt->nents);
if (!slice->reqs) {
ret = -ENOMEM;
goto free_slice;
@@ -507,7 +507,7 @@ static int create_sgt(struct qaic_device *qdev, struct sg_table **sgt_out, u64 s
i++;
}
- sgt = kmalloc_obj(*sgt, GFP_KERNEL);
+ sgt = kmalloc_obj(*sgt);
if (!sgt) {
ret = -ENOMEM;
goto free_partial_alloc;
@@ -653,7 +653,7 @@ static struct sg_table *qaic_get_sg_table(struct drm_gem_object *obj)
sgt_in = bo->sgt;
- sgt = kmalloc_obj(*sgt, GFP_KERNEL);
+ sgt = kmalloc_obj(*sgt);
if (!sgt)
return ERR_PTR(-ENOMEM);
@@ -697,7 +697,7 @@ static struct qaic_bo *qaic_alloc_init_bo(void)
{
struct qaic_bo *bo;
- bo = kzalloc_obj(*bo, GFP_KERNEL);
+ bo = kzalloc_obj(*bo);
if (!bo)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/accel/qaic/qaic_drv.c b/drivers/accel/qaic/qaic_drv.c
index 7127364068ae..63fb8c7b4abc 100644
--- a/drivers/accel/qaic/qaic_drv.c
+++ b/drivers/accel/qaic/qaic_drv.c
@@ -152,7 +152,7 @@ static int qaic_open(struct drm_device *dev, struct drm_file *file)
goto dev_unlock;
}
- usr = kmalloc_obj(*usr, GFP_KERNEL);
+ usr = kmalloc_obj(*usr);
if (!usr) {
ret = -ENOMEM;
goto dev_unlock;
diff --git a/drivers/accel/qaic/qaic_ras.c b/drivers/accel/qaic/qaic_ras.c
index b488e6ef66c5..cc0b75461e1a 100644
--- a/drivers/accel/qaic/qaic_ras.c
+++ b/drivers/accel/qaic/qaic_ras.c
@@ -556,7 +556,7 @@ static int qaic_ras_mhi_probe(struct mhi_device *mhi_dev, const struct mhi_devic
if (ret)
return ret;
- resp = kzalloc_obj(*resp, GFP_KERNEL);
+ resp = kzalloc_obj(*resp);
if (!resp) {
mhi_unprepare_from_transfer(mhi_dev);
return -ENOMEM;
diff --git a/drivers/accel/qaic/qaic_ssr.c b/drivers/accel/qaic/qaic_ssr.c
index 77ac30498ad0..e3daeaad057d 100644
--- a/drivers/accel/qaic/qaic_ssr.c
+++ b/drivers/accel/qaic/qaic_ssr.c
@@ -260,7 +260,7 @@ static int send_xfer_done(struct qaic_device *qdev, void *resp, u32 dbc_id)
struct ssr_debug_transfer_done *xfer_done;
int ret;
- xfer_done = kmalloc_obj(*xfer_done, GFP_KERNEL);
+ xfer_done = kmalloc_obj(*xfer_done);
if (!xfer_done) {
ret = -ENOMEM;
goto out;
@@ -450,7 +450,7 @@ static struct ssr_dump_info *alloc_dump_info(struct qaic_device *qdev,
}
/* Allocate SSR crashdump book keeping structure */
- dump_info = kzalloc_obj(*dump_info, GFP_KERNEL);
+ dump_info = kzalloc_obj(*dump_info);
if (!dump_info) {
ret = -ENOMEM;
goto out;
@@ -491,7 +491,7 @@ static int dbg_xfer_info_rsp(struct qaic_device *qdev, struct dma_bridge_chan *d
struct ssr_crashdump *ssr_crash = NULL;
int ret = 0, ret2;
- debug_rsp = kmalloc_obj(*debug_rsp, GFP_KERNEL);
+ debug_rsp = kmalloc_obj(*debug_rsp);
if (!debug_rsp)
return -ENOMEM;
@@ -641,7 +641,7 @@ static void ssr_worker(struct work_struct *work)
break;
}
- event_rsp = kmalloc_obj(*event_rsp, GFP_KERNEL);
+ event_rsp = kmalloc_obj(*event_rsp);
if (!event_rsp)
break;
diff --git a/drivers/accel/qaic/qaic_timesync.c b/drivers/accel/qaic/qaic_timesync.c
index b2400d6b2f4f..939462b9958d 100644
--- a/drivers/accel/qaic/qaic_timesync.c
+++ b/drivers/accel/qaic/qaic_timesync.c
@@ -185,7 +185,7 @@ static int qaic_timesync_probe(struct mhi_device *mhi_dev, const struct mhi_devi
struct timer_list *timer;
int ret;
- mqtsdev = kzalloc_obj(*mqtsdev, GFP_KERNEL);
+ mqtsdev = kzalloc_obj(*mqtsdev);
if (!mqtsdev) {
ret = -ENOMEM;
goto out;
@@ -196,7 +196,7 @@ static int qaic_timesync_probe(struct mhi_device *mhi_dev, const struct mhi_devi
mqtsdev->qdev = qdev;
mqtsdev->dev = &qdev->pdev->dev;
- mqtsdev->sync_msg = kzalloc_obj(*mqtsdev->sync_msg, GFP_KERNEL);
+ mqtsdev->sync_msg = kzalloc_obj(*mqtsdev->sync_msg);
if (!mqtsdev->sync_msg) {
ret = -ENOMEM;
goto free_mqts_dev;
@@ -275,7 +275,7 @@ static void qaic_boot_timesync_worker(struct work_struct *work)
switch (data.hdr.msg_type) {
case QAIC_TS_CMD_TO_HOST:
- req = kzalloc_obj(*req, GFP_KERNEL);
+ req = kzalloc_obj(*req);
if (!req)
break;
@@ -304,7 +304,7 @@ static int qaic_boot_timesync_queue_resp(struct mhi_device *mhi_dev, struct qaic
struct qts_resp *resp;
int ret;
- resp = kzalloc_obj(*resp, GFP_KERNEL);
+ resp = kzalloc_obj(*resp);
if (!resp)
return -ENOMEM;
diff --git a/drivers/accel/rocket/rocket_drv.c b/drivers/accel/rocket/rocket_drv.c
index f09c3800ab31..8bbbce594883 100644
--- a/drivers/accel/rocket/rocket_drv.c
+++ b/drivers/accel/rocket/rocket_drv.c
@@ -38,7 +38,7 @@ rocket_iommu_domain_destroy(struct kref *kref)
static struct rocket_iommu_domain*
rocket_iommu_domain_create(struct device *dev)
{
- struct rocket_iommu_domain *domain = kmalloc_obj(*domain, GFP_KERNEL);
+ struct rocket_iommu_domain *domain = kmalloc_obj(*domain);
void *err;
if (!domain)
@@ -79,7 +79,7 @@ rocket_open(struct drm_device *dev, struct drm_file *file)
if (!try_module_get(THIS_MODULE))
return -EINVAL;
- rocket_priv = kzalloc_obj(*rocket_priv, GFP_KERNEL);
+ rocket_priv = kzalloc_obj(*rocket_priv);
if (!rocket_priv) {
ret = -ENOMEM;
goto err_put_mod;
diff --git a/drivers/accel/rocket/rocket_gem.c b/drivers/accel/rocket/rocket_gem.c
index 3808dfc97916..b6a385d2edfc 100644
--- a/drivers/accel/rocket/rocket_gem.c
+++ b/drivers/accel/rocket/rocket_gem.c
@@ -48,7 +48,7 @@ struct drm_gem_object *rocket_gem_create_object(struct drm_device *dev, size_t s
{
struct rocket_gem_object *obj;
- obj = kzalloc_obj(*obj, GFP_KERNEL);
+ obj = kzalloc_obj(*obj);
if (!obj)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/accel/rocket/rocket_job.c b/drivers/accel/rocket/rocket_job.c
index 518dd5779016..755971c13caf 100644
--- a/drivers/accel/rocket/rocket_job.c
+++ b/drivers/accel/rocket/rocket_job.c
@@ -45,7 +45,7 @@ static struct dma_fence *rocket_fence_create(struct rocket_core *core)
{
struct dma_fence *fence;
- fence = kzalloc_obj(*fence, GFP_KERNEL);
+ fence = kzalloc_obj(*fence);
if (!fence)
return ERR_PTR(-ENOMEM);
@@ -71,7 +71,7 @@ rocket_copy_tasks(struct drm_device *dev,
if (!rjob->task_count)
return 0;
- rjob->tasks = kvmalloc_objs(*rjob->tasks, job->task_count, GFP_KERNEL);
+ rjob->tasks = kvmalloc_objs(*rjob->tasks, job->task_count);
if (!rjob->tasks) {
drm_dbg(dev, "Failed to allocate task array\n");
return -ENOMEM;
@@ -543,7 +543,7 @@ static int rocket_ioctl_submit_job(struct drm_device *dev, struct drm_file *file
if (job->task_count == 0)
return -EINVAL;
- rjob = kzalloc_obj(*rjob, GFP_KERNEL);
+ rjob = kzalloc_obj(*rjob);
if (!rjob)
return -ENOMEM;
@@ -610,7 +610,7 @@ int rocket_ioctl_submit(struct drm_device *dev, void *data, struct drm_file *fil
return -EINVAL;
}
- jobs = kvmalloc_objs(*jobs, args->job_count, GFP_KERNEL);
+ jobs = kvmalloc_objs(*jobs, args->job_count);
if (!jobs) {
drm_dbg(dev, "Failed to allocate incoming job array\n");
return -ENOMEM;
diff --git a/drivers/accessibility/speakup/spk_ttyio.c b/drivers/accessibility/speakup/spk_ttyio.c
index a9aab12a7836..6bff78e3d872 100644
--- a/drivers/accessibility/speakup/spk_ttyio.c
+++ b/drivers/accessibility/speakup/spk_ttyio.c
@@ -55,7 +55,7 @@ static int spk_ttyio_ldisc_open(struct tty_struct *tty)
if (!tty->ops->write)
return -EOPNOTSUPP;
- ldisc_data = kmalloc_obj(*ldisc_data, GFP_KERNEL);
+ ldisc_data = kmalloc_obj(*ldisc_data);
if (!ldisc_data)
return -ENOMEM;
diff --git a/drivers/acpi/ac.c b/drivers/acpi/ac.c
index 94049a15f7b9..c5d77c3cb4bc 100644
--- a/drivers/acpi/ac.c
+++ b/drivers/acpi/ac.c
@@ -208,7 +208,7 @@ static int acpi_ac_probe(struct platform_device *pdev)
struct acpi_ac *ac;
int result;
- ac = kzalloc_obj(struct acpi_ac, GFP_KERNEL);
+ ac = kzalloc_obj(struct acpi_ac);
if (!ac)
return -ENOMEM;
diff --git a/drivers/acpi/acpi_apd.c b/drivers/acpi/acpi_apd.c
index d9cd3f97aa00..bed0791c17fc 100644
--- a/drivers/acpi/acpi_apd.c
+++ b/drivers/acpi/acpi_apd.c
@@ -202,7 +202,7 @@ static int acpi_apd_create_device(struct acpi_device *adev,
return IS_ERR_OR_NULL(pdev) ? PTR_ERR(pdev) : 1;
}
- pdata = kzalloc_obj(*pdata, GFP_KERNEL);
+ pdata = kzalloc_obj(*pdata);
if (!pdata)
return -ENOMEM;
diff --git a/drivers/acpi/acpi_configfs.c b/drivers/acpi/acpi_configfs.c
index c20bedff2c04..12ffec795803 100644
--- a/drivers/acpi/acpi_configfs.c
+++ b/drivers/acpi/acpi_configfs.c
@@ -210,7 +210,7 @@ static struct config_item *acpi_table_make_item(struct config_group *group,
{
struct acpi_table *table;
- table = kzalloc_obj(*table, GFP_KERNEL);
+ table = kzalloc_obj(*table);
if (!table)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/acpi/acpi_ipmi.c b/drivers/acpi/acpi_ipmi.c
index 5ec5a841afce..8f1aeae8b72e 100644
--- a/drivers/acpi/acpi_ipmi.c
+++ b/drivers/acpi/acpi_ipmi.c
@@ -117,7 +117,7 @@ ipmi_dev_alloc(int iface, struct device *dev, acpi_handle handle)
int err;
struct ipmi_user *user;
- ipmi_device = kzalloc_obj(*ipmi_device, GFP_KERNEL);
+ ipmi_device = kzalloc_obj(*ipmi_device);
if (!ipmi_device)
return NULL;
@@ -197,7 +197,7 @@ static struct acpi_ipmi_msg *ipmi_msg_alloc(void)
if (!ipmi)
return NULL;
- ipmi_msg = kzalloc_obj(struct acpi_ipmi_msg, GFP_KERNEL);
+ ipmi_msg = kzalloc_obj(struct acpi_ipmi_msg);
if (!ipmi_msg) {
acpi_ipmi_dev_put(ipmi);
return NULL;
diff --git a/drivers/acpi/acpi_lpat.c b/drivers/acpi/acpi_lpat.c
index b238f9f371dd..6141c9070eca 100644
--- a/drivers/acpi/acpi_lpat.c
+++ b/drivers/acpi/acpi_lpat.c
@@ -104,7 +104,7 @@ struct acpi_lpat_conversion_table *acpi_lpat_get_conversion_table(acpi_handle
(obj_p->package.count % 2) || (obj_p->package.count < 4))
goto out;
- lpat = kzalloc_objs(int, obj_p->package.count, GFP_KERNEL);
+ lpat = kzalloc_objs(int, obj_p->package.count);
if (!lpat)
goto out;
@@ -117,7 +117,7 @@ struct acpi_lpat_conversion_table *acpi_lpat_get_conversion_table(acpi_handle
lpat[i] = (s64)obj_e->integer.value;
}
- lpat_table = kzalloc_obj(*lpat_table, GFP_KERNEL);
+ lpat_table = kzalloc_obj(*lpat_table);
if (!lpat_table) {
kfree(lpat);
goto out;
diff --git a/drivers/acpi/acpi_memhotplug.c b/drivers/acpi/acpi_memhotplug.c
index f12a9766696b..02a472fa85fc 100644
--- a/drivers/acpi/acpi_memhotplug.c
+++ b/drivers/acpi/acpi_memhotplug.c
@@ -80,7 +80,7 @@ acpi_memory_get_resource(struct acpi_resource *resource, void *context)
}
}
- new = kzalloc_obj(struct acpi_memory_info, GFP_KERNEL);
+ new = kzalloc_obj(struct acpi_memory_info);
if (!new)
return AE_ERROR;
@@ -290,7 +290,7 @@ static int acpi_memory_device_add(struct acpi_device *device,
if (!device)
return -EINVAL;
- mem_device = kzalloc_obj(struct acpi_memory_device, GFP_KERNEL);
+ mem_device = kzalloc_obj(struct acpi_memory_device);
if (!mem_device)
return -ENOMEM;
diff --git a/drivers/acpi/acpi_mrrm.c b/drivers/acpi/acpi_mrrm.c
index df771e49333f..e99cbda83452 100644
--- a/drivers/acpi/acpi_mrrm.c
+++ b/drivers/acpi/acpi_mrrm.c
@@ -161,7 +161,7 @@ static __init int add_boot_memory_ranges(void)
if (!pkobj)
return -ENOMEM;
- kobjs = kzalloc_objs(*kobjs, mrrm_mem_entry_num, GFP_KERNEL);
+ kobjs = kzalloc_objs(*kobjs, mrrm_mem_entry_num);
if (!kobjs) {
kobject_put(pkobj);
return -ENOMEM;
diff --git a/drivers/acpi/acpi_pcc.c b/drivers/acpi/acpi_pcc.c
index 6914071d640b..438c67189511 100644
--- a/drivers/acpi/acpi_pcc.c
+++ b/drivers/acpi/acpi_pcc.c
@@ -54,7 +54,7 @@ acpi_pcc_address_space_setup(acpi_handle region_handle, u32 function,
struct pcc_mbox_chan *pcc_chan;
acpi_status ret;
- data = kzalloc_obj(*data, GFP_KERNEL);
+ data = kzalloc_obj(*data);
if (!data)
return AE_NO_MEMORY;
diff --git a/drivers/acpi/acpi_platform.c b/drivers/acpi/acpi_platform.c
index 3ea6d941aabd..64199b19ceff 100644
--- a/drivers/acpi/acpi_platform.c
+++ b/drivers/acpi/acpi_platform.c
@@ -145,7 +145,7 @@ struct platform_device *acpi_create_platform_device(struct acpi_device *adev,
if (count > 0) {
struct resource_entry *rentry;
- resources = kzalloc_objs(*resources, count, GFP_KERNEL);
+ resources = kzalloc_objs(*resources, count);
if (!resources) {
acpi_dev_free_resource_list(&resource_list);
return ERR_PTR(-ENOMEM);
diff --git a/drivers/acpi/acpi_processor.c b/drivers/acpi/acpi_processor.c
index 02a80803962c..b34a48068a8d 100644
--- a/drivers/acpi/acpi_processor.c
+++ b/drivers/acpi/acpi_processor.c
@@ -428,7 +428,7 @@ static int acpi_processor_add(struct acpi_device *device,
if (!acpi_device_is_enabled(device))
return -ENODEV;
- pr = kzalloc_obj(struct acpi_processor, GFP_KERNEL);
+ pr = kzalloc_obj(struct acpi_processor);
if (!pr)
return -ENOMEM;
diff --git a/drivers/acpi/acpi_video.c b/drivers/acpi/acpi_video.c
index a2e07d946ce3..5f4751478752 100644
--- a/drivers/acpi/acpi_video.c
+++ b/drivers/acpi/acpi_video.c
@@ -825,7 +825,7 @@ int acpi_video_get_levels(struct acpi_device *device,
goto out;
}
- br = kzalloc_obj(*br, GFP_KERNEL);
+ br = kzalloc_obj(*br);
if (!br) {
result = -ENOMEM;
goto out;
@@ -1141,7 +1141,7 @@ static int acpi_video_bus_get_one_device(struct acpi_device *device, void *arg)
if (acpi_get_local_u64_address(device->handle, &device_id))
goto exit;
- data = kzalloc_obj(struct acpi_video_device, GFP_KERNEL);
+ data = kzalloc_obj(struct acpi_video_device);
if (!data) {
dev_dbg(&device->dev, "Cannot attach\n");
return -ENOMEM;
@@ -2003,7 +2003,7 @@ static int acpi_video_bus_probe(struct platform_device *pdev)
return -ENODEV;
}
- video = kzalloc_obj(struct acpi_video_bus, GFP_KERNEL);
+ video = kzalloc_obj(struct acpi_video_bus);
if (!video)
return -ENOMEM;
diff --git a/drivers/acpi/acpi_watchdog.c b/drivers/acpi/acpi_watchdog.c
index 7e22fc35ed6d..c04f242a6aa2 100644
--- a/drivers/acpi/acpi_watchdog.c
+++ b/drivers/acpi/acpi_watchdog.c
@@ -166,7 +166,7 @@ void __init acpi_watchdog_init(void)
}
}
- resources = kzalloc_objs(*resources, nresources, GFP_KERNEL);
+ resources = kzalloc_objs(*resources, nresources);
if (!resources)
goto fail_free_resource_list;
diff --git a/drivers/acpi/apei/apei-base.c b/drivers/acpi/apei/apei-base.c
index 95b8483b9e98..7a06d30bd40e 100644
--- a/drivers/acpi/apei/apei-base.c
+++ b/drivers/acpi/apei/apei-base.c
@@ -316,7 +316,7 @@ static int apei_res_add(struct list_head *res_list,
if (res_ins)
list_add(&res_ins->list, res_list);
else {
- res_ins = kmalloc_obj(*res_ins, GFP_KERNEL);
+ res_ins = kmalloc_obj(*res_ins);
if (!res_ins)
return -ENOMEM;
res_ins->start = start;
@@ -345,7 +345,7 @@ static int apei_res_sub(struct list_head *res_list1,
break;
} else if (res1->end > res2->end &&
res1->start < res2->start) {
- res = kmalloc_obj(*res, GFP_KERNEL);
+ res = kmalloc_obj(*res);
if (!res)
return -ENOMEM;
res->start = res2->end;
diff --git a/drivers/acpi/apei/ghes.c b/drivers/acpi/apei/ghes.c
index 442561637f88..8acd2742bb27 100644
--- a/drivers/acpi/apei/ghes.c
+++ b/drivers/acpi/apei/ghes.c
@@ -272,7 +272,7 @@ static struct ghes *ghes_new(struct acpi_hest_generic *generic)
unsigned int error_block_length;
int rc;
- ghes = kzalloc_obj(*ghes, GFP_KERNEL);
+ ghes = kzalloc_obj(*ghes);
if (!ghes)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/acpi/arm64/ffh.c b/drivers/acpi/arm64/ffh.c
index d850af765ba1..04380bab193d 100644
--- a/drivers/acpi/arm64/ffh.c
+++ b/drivers/acpi/arm64/ffh.c
@@ -33,7 +33,7 @@ int acpi_ffh_address_space_arch_setup(void *handler_ctxt, void **region_ctxt)
return -EOPNOTSUPP;
}
- ffh_ctxt = kzalloc_obj(*ffh_ctxt, GFP_KERNEL);
+ ffh_ctxt = kzalloc_obj(*ffh_ctxt);
if (!ffh_ctxt)
return -ENOMEM;
diff --git a/drivers/acpi/arm64/iort.c b/drivers/acpi/arm64/iort.c
index 8e74b4eaf9bd..af7a9b2fd5bc 100644
--- a/drivers/acpi/arm64/iort.c
+++ b/drivers/acpi/arm64/iort.c
@@ -165,7 +165,7 @@ int iort_register_domain_token(int trans_id, phys_addr_t base,
{
struct iort_its_msi_chip *its_msi_chip;
- its_msi_chip = kzalloc_obj(*its_msi_chip, GFP_KERNEL);
+ its_msi_chip = kzalloc_obj(*its_msi_chip);
if (!its_msi_chip)
return -ENOMEM;
@@ -938,7 +938,7 @@ static struct iommu_iort_rmr_data *iort_rmr_alloc(
u32 *sids_copy;
u64 addr = rmr_desc->base_address, size = rmr_desc->length;
- rmr_data = kmalloc_obj(*rmr_data, GFP_KERNEL);
+ rmr_data = kmalloc_obj(*rmr_data);
if (!rmr_data)
return NULL;
@@ -1942,7 +1942,7 @@ static int __init iort_add_platform_device(struct acpi_iort_node *node,
count = ops->dev_count_resources(node);
- r = kzalloc_objs(*r, count, GFP_KERNEL);
+ r = kzalloc_objs(*r, count);
if (!r) {
ret = -ENOMEM;
goto dev_put;
diff --git a/drivers/acpi/button.c b/drivers/acpi/button.c
index b9929b6ef62d..97b05246efab 100644
--- a/drivers/acpi/button.c
+++ b/drivers/acpi/button.c
@@ -544,7 +544,7 @@ static int acpi_button_probe(struct platform_device *pdev)
lid_init_state == ACPI_BUTTON_LID_INIT_DISABLED)
return -ENODEV;
- button = kzalloc_obj(struct acpi_button, GFP_KERNEL);
+ button = kzalloc_obj(struct acpi_button);
if (!button)
return -ENOMEM;
diff --git a/drivers/acpi/container.c b/drivers/acpi/container.c
index 055ad5f4782d..f138a433554a 100644
--- a/drivers/acpi/container.c
+++ b/drivers/acpi/container.c
@@ -52,7 +52,7 @@ static int container_device_attach(struct acpi_device *adev,
if (adev->flags.is_dock_station)
return 0;
- cdev = kzalloc_obj(*cdev, GFP_KERNEL);
+ cdev = kzalloc_obj(*cdev);
if (!cdev)
return -ENOMEM;
diff --git a/drivers/acpi/cppc_acpi.c b/drivers/acpi/cppc_acpi.c
index d2e13252fce6..5c2116171789 100644
--- a/drivers/acpi/cppc_acpi.c
+++ b/drivers/acpi/cppc_acpi.c
@@ -712,7 +712,7 @@ int acpi_cppc_processor_probe(struct acpi_processor *pr)
out_obj = (union acpi_object *) output.pointer;
- cpc_ptr = kzalloc_obj(struct cpc_desc, GFP_KERNEL);
+ cpc_ptr = kzalloc_obj(struct cpc_desc);
if (!cpc_ptr) {
ret = -ENOMEM;
goto out_buf_free;
diff --git a/drivers/acpi/dock.c b/drivers/acpi/dock.c
index e2239d4bb9df..d7f3a8912e6a 100644
--- a/drivers/acpi/dock.c
+++ b/drivers/acpi/dock.c
@@ -73,7 +73,7 @@ static int add_dock_dependent_device(struct dock_station *ds,
{
struct dock_dependent_device *dd;
- dd = kzalloc_obj(*dd, GFP_KERNEL);
+ dd = kzalloc_obj(*dd);
if (!dd)
return -ENOMEM;
diff --git a/drivers/acpi/ec.c b/drivers/acpi/ec.c
index 8da0971f2238..5f63ed120a2c 100644
--- a/drivers/acpi/ec.c
+++ b/drivers/acpi/ec.c
@@ -1100,7 +1100,7 @@ int acpi_ec_add_query_handler(struct acpi_ec *ec, u8 query_bit,
if (!handle && !func)
return -EINVAL;
- handler = kzalloc_obj(*handler, GFP_KERNEL);
+ handler = kzalloc_obj(*handler);
if (!handler)
return -ENOMEM;
@@ -1177,7 +1177,7 @@ static struct acpi_ec_query *acpi_ec_create_query(struct acpi_ec *ec, u8 *pval)
struct acpi_ec_query *q;
struct transaction *t;
- q = kzalloc_obj(struct acpi_ec_query, GFP_KERNEL);
+ q = kzalloc_obj(struct acpi_ec_query);
if (!q)
return NULL;
@@ -1422,7 +1422,7 @@ static void acpi_ec_free(struct acpi_ec *ec)
static struct acpi_ec *acpi_ec_alloc(void)
{
- struct acpi_ec *ec = kzalloc_obj(struct acpi_ec, GFP_KERNEL);
+ struct acpi_ec *ec = kzalloc_obj(struct acpi_ec);
if (!ec)
return NULL;
diff --git a/drivers/acpi/glue.c b/drivers/acpi/glue.c
index e96def7db715..b1776809279d 100644
--- a/drivers/acpi/glue.c
+++ b/drivers/acpi/glue.c
@@ -246,7 +246,7 @@ int acpi_bind_one(struct device *dev, struct acpi_device *acpi_dev)
acpi_dev_get(acpi_dev);
get_device(dev);
- physical_node = kzalloc_obj(*physical_node, GFP_KERNEL);
+ physical_node = kzalloc_obj(*physical_node);
if (!physical_node) {
retval = -ENOMEM;
goto err;
diff --git a/drivers/acpi/ioapic.c b/drivers/acpi/ioapic.c
index 5a432899875b..533ddd75922b 100644
--- a/drivers/acpi/ioapic.c
+++ b/drivers/acpi/ioapic.c
@@ -120,7 +120,7 @@ static acpi_status handle_ioapic_add(acpi_handle handle, u32 lvl,
goto exit;
}
- ioapic = kzalloc_obj(*ioapic, GFP_KERNEL);
+ ioapic = kzalloc_obj(*ioapic);
if (!ioapic) {
pr_err("cannot allocate memory for new IOAPIC\n");
goto exit;
diff --git a/drivers/acpi/mipi-disco-img.c b/drivers/acpi/mipi-disco-img.c
index 6351a66c555d..328093ed7136 100644
--- a/drivers/acpi/mipi-disco-img.c
+++ b/drivers/acpi/mipi-disco-img.c
@@ -111,7 +111,7 @@ static struct crs_csi2 *acpi_mipi_add_crs_csi2(acpi_handle handle,
{
struct crs_csi2 *csi2;
- csi2 = kzalloc_obj(*csi2, GFP_KERNEL);
+ csi2 = kzalloc_obj(*csi2);
if (!csi2)
return NULL;
diff --git a/drivers/acpi/nfit/core.c b/drivers/acpi/nfit/core.c
index b59dcbff25c1..d13264fb9e02 100644
--- a/drivers/acpi/nfit/core.c
+++ b/drivers/acpi/nfit/core.c
@@ -2271,9 +2271,9 @@ static int acpi_nfit_init_interleave_set(struct acpi_nfit_desc *acpi_desc,
{
u16 nr = ndr_desc->num_mappings;
struct nfit_set_info2 *info2 __free(kfree) =
- kzalloc_objs(*info2, nr, GFP_KERNEL);
+ kzalloc_objs(*info2, nr);
struct nfit_set_info *info __free(kfree) =
- kzalloc_objs(*info, nr, GFP_KERNEL);
+ kzalloc_objs(*info, nr);
struct device *dev = acpi_desc->dev;
struct nd_interleave_set *nd_set;
int i;
diff --git a/drivers/acpi/numa/hmat.c b/drivers/acpi/numa/hmat.c
index 3f68ba64537d..9792dc394756 100644
--- a/drivers/acpi/numa/hmat.c
+++ b/drivers/acpi/numa/hmat.c
@@ -202,7 +202,7 @@ static __init void alloc_memory_initiator(unsigned int cpu_pxm)
if (initiator)
return;
- initiator = kzalloc_obj(*initiator, GFP_KERNEL);
+ initiator = kzalloc_obj(*initiator);
if (!initiator)
return;
@@ -217,7 +217,7 @@ static __init struct memory_target *alloc_target(unsigned int mem_pxm)
target = find_mem_target(mem_pxm);
if (!target) {
- target = kzalloc_obj(*target, GFP_KERNEL);
+ target = kzalloc_obj(*target);
if (!target)
return NULL;
target->memory_pxm = mem_pxm;
@@ -371,7 +371,7 @@ static __init void hmat_add_locality(struct acpi_hmat_locality *hmat_loc)
{
struct memory_locality *loc;
- loc = kzalloc_obj(*loc, GFP_KERNEL);
+ loc = kzalloc_obj(*loc);
if (!loc) {
pr_notice_once("Failed to allocate HMAT locality\n");
return;
@@ -502,7 +502,7 @@ static __init int hmat_parse_cache(union acpi_subtable_headers *header,
if (!target)
return 0;
- tcache = kzalloc_obj(*tcache, GFP_KERNEL);
+ tcache = kzalloc_obj(*tcache);
if (!tcache) {
pr_notice_once("Failed to allocate HMAT cache info\n");
return 0;
diff --git a/drivers/acpi/nvs.c b/drivers/acpi/nvs.c
index 354783ede8f1..6eaad7dd0241 100644
--- a/drivers/acpi/nvs.c
+++ b/drivers/acpi/nvs.c
@@ -39,7 +39,7 @@ int acpi_nvs_register(__u64 start, __u64 size)
{
struct nvs_region *region;
- region = kmalloc_obj(*region, GFP_KERNEL);
+ region = kmalloc_obj(*region);
if (!region)
return -ENOMEM;
region->phys_start = start;
@@ -102,7 +102,7 @@ static int suspend_nvs_register(unsigned long start, unsigned long size)
while (size > 0) {
unsigned int nr_bytes;
- entry = kzalloc_obj(struct nvs_page, GFP_KERNEL);
+ entry = kzalloc_obj(struct nvs_page);
if (!entry)
goto Error;
diff --git a/drivers/acpi/osl.c b/drivers/acpi/osl.c
index 0fa12dd40840..5b777316b9ac 100644
--- a/drivers/acpi/osl.c
+++ b/drivers/acpi/osl.c
@@ -344,7 +344,7 @@ void __iomem __ref
goto out;
}
- map = kzalloc_obj(*map, GFP_KERNEL);
+ map = kzalloc_obj(*map);
if (!map) {
mutex_unlock(&acpi_ioremap_lock);
return NULL;
@@ -1197,7 +1197,7 @@ acpi_status acpi_hotplug_schedule(struct acpi_device *adev, u32 src)
"Scheduling hotplug event %u for deferred handling\n",
src);
- hpw = kmalloc_obj(*hpw, GFP_KERNEL);
+ hpw = kmalloc_obj(*hpw);
if (!hpw)
return AE_NO_MEMORY;
diff --git a/drivers/acpi/pci_irq.c b/drivers/acpi/pci_irq.c
index 5a4169db5ea6..8558f0ef64e3 100644
--- a/drivers/acpi/pci_irq.c
+++ b/drivers/acpi/pci_irq.c
@@ -147,7 +147,7 @@ static int acpi_pci_irq_check_entry(acpi_handle handle, struct pci_dev *dev,
prt->pin + 1 != pin)
return -ENODEV;
- entry = kzalloc_obj(struct acpi_prt_entry, GFP_KERNEL);
+ entry = kzalloc_obj(struct acpi_prt_entry);
if (!entry)
return -ENOMEM;
diff --git a/drivers/acpi/pci_link.c b/drivers/acpi/pci_link.c
index e3b03237fa57..45bdfd06bd21 100644
--- a/drivers/acpi/pci_link.c
+++ b/drivers/acpi/pci_link.c
@@ -720,7 +720,7 @@ static int acpi_pci_link_add(struct acpi_device *device,
int result;
int i;
- link = kzalloc_obj(struct acpi_pci_link, GFP_KERNEL);
+ link = kzalloc_obj(struct acpi_pci_link);
if (!link)
return -ENOMEM;
diff --git a/drivers/acpi/pci_mcfg.c b/drivers/acpi/pci_mcfg.c
index 99a50e9c12dd..0782a5d839bf 100644
--- a/drivers/acpi/pci_mcfg.c
+++ b/drivers/acpi/pci_mcfg.c
@@ -304,7 +304,7 @@ static __init int pci_mcfg_parse(struct acpi_table_header *header)
mcfg = (struct acpi_table_mcfg *)header;
mptr = (struct acpi_mcfg_allocation *) &mcfg[1];
- arr = kzalloc_objs(*arr, n, GFP_KERNEL);
+ arr = kzalloc_objs(*arr, n);
if (!arr)
return -ENOMEM;
diff --git a/drivers/acpi/pci_root.c b/drivers/acpi/pci_root.c
index bd2525fcda8e..4a882e939525 100644
--- a/drivers/acpi/pci_root.c
+++ b/drivers/acpi/pci_root.c
@@ -648,7 +648,7 @@ static int acpi_pci_root_add(struct acpi_device *device,
bool hotadd = system_state == SYSTEM_RUNNING;
const char *acpi_hid;
- root = kzalloc_obj(struct acpi_pci_root, GFP_KERNEL);
+ root = kzalloc_obj(struct acpi_pci_root);
if (!root)
return -ENOMEM;
diff --git a/drivers/acpi/pci_slot.c b/drivers/acpi/pci_slot.c
index 031d00a4a75f..33a123074071 100644
--- a/drivers/acpi/pci_slot.c
+++ b/drivers/acpi/pci_slot.c
@@ -104,7 +104,7 @@ register_slot(acpi_handle handle, u32 lvl, void *context, void **rv)
return AE_OK;
}
- slot = kmalloc_obj(*slot, GFP_KERNEL);
+ slot = kmalloc_obj(*slot);
if (!slot)
return AE_OK;
diff --git a/drivers/acpi/power.c b/drivers/acpi/power.c
index e377446b5cce..4611159ee734 100644
--- a/drivers/acpi/power.c
+++ b/drivers/acpi/power.c
@@ -104,7 +104,7 @@ static int acpi_power_resources_list_add(acpi_handle handle,
if (!resource || !list)
return -EINVAL;
- entry = kzalloc_obj(*entry, GFP_KERNEL);
+ entry = kzalloc_obj(*entry);
if (!entry)
return -ENOMEM;
@@ -265,7 +265,7 @@ acpi_power_resource_add_dependent(struct acpi_power_resource *resource,
goto unlock;
}
- dep = kzalloc_obj(*dep, GFP_KERNEL);
+ dep = kzalloc_obj(*dep);
if (!dep) {
ret = -ENOMEM;
goto unlock;
@@ -945,7 +945,7 @@ struct acpi_device *acpi_add_power_resource(acpi_handle handle)
if (device)
return device;
- resource = kzalloc_obj(*resource, GFP_KERNEL);
+ resource = kzalloc_obj(*resource);
if (!resource)
return NULL;
diff --git a/drivers/acpi/prmt.c b/drivers/acpi/prmt.c
index 5d4b0f7904d6..7f5851371e5f 100644
--- a/drivers/acpi/prmt.c
+++ b/drivers/acpi/prmt.c
@@ -135,7 +135,7 @@ acpi_parse_prmt(union acpi_subtable_headers *header, const unsigned long end)
goto parse_prmt_out4;
memmove(tm->mmio_info, temp_mmio, mmio_range_size);
} else {
- tm->mmio_info = kmalloc_obj(*tm->mmio_info, GFP_KERNEL);
+ tm->mmio_info = kmalloc_obj(*tm->mmio_info);
if (!tm->mmio_info)
goto parse_prmt_out2;
diff --git a/drivers/acpi/processor_idle.c b/drivers/acpi/processor_idle.c
index aa7020d71b55..f6c72e3a2be1 100644
--- a/drivers/acpi/processor_idle.c
+++ b/drivers/acpi/processor_idle.c
@@ -910,7 +910,7 @@ static int acpi_processor_evaluate_lpi(acpi_handle handle,
goto end;
}
- lpi_state = kzalloc_objs(*lpi_state, pkg_count, GFP_KERNEL);
+ lpi_state = kzalloc_objs(*lpi_state, pkg_count);
if (!lpi_state) {
ret = -ENOMEM;
goto end;
@@ -1417,7 +1417,7 @@ void acpi_processor_power_init(struct acpi_processor *pr)
if (!pr->flags.power)
return;
- dev = kzalloc_obj(*dev, GFP_KERNEL);
+ dev = kzalloc_obj(*dev);
if (!dev)
return;
diff --git a/drivers/acpi/processor_pdc.c b/drivers/acpi/processor_pdc.c
index e174d144f1d9..a46bd9876b11 100644
--- a/drivers/acpi/processor_pdc.c
+++ b/drivers/acpi/processor_pdc.c
@@ -32,11 +32,11 @@ static struct acpi_object_list *acpi_processor_alloc_pdc(void)
u32 *buf;
/* allocate and initialize pdc. It will be used later. */
- obj_list = kmalloc_obj(struct acpi_object_list, GFP_KERNEL);
+ obj_list = kmalloc_obj(struct acpi_object_list);
if (!obj_list)
goto out;
- obj = kmalloc_obj(union acpi_object, GFP_KERNEL);
+ obj = kmalloc_obj(union acpi_object);
if (!obj) {
kfree(obj_list);
goto out;
diff --git a/drivers/acpi/property.c b/drivers/acpi/property.c
index 710dccae595b..8ee5a1f0eb48 100644
--- a/drivers/acpi/property.c
+++ b/drivers/acpi/property.c
@@ -89,7 +89,7 @@ static bool acpi_nondev_subnode_extract(union acpi_object *desc,
if (acpi_graph_ignore_port(handle))
return false;
- dn = kzalloc_obj(*dn, GFP_KERNEL);
+ dn = kzalloc_obj(*dn);
if (!dn)
return false;
@@ -383,7 +383,7 @@ acpi_data_add_props(struct acpi_device_data *data, const guid_t *guid,
{
struct acpi_device_properties *props;
- props = kzalloc_obj(*props, GFP_KERNEL);
+ props = kzalloc_obj(*props);
if (props) {
INIT_LIST_HEAD(&props->list);
props->guid = guid;
diff --git a/drivers/acpi/riscv/irq.c b/drivers/acpi/riscv/irq.c
index f3cef56ff59e..c1f759fb5758 100644
--- a/drivers/acpi/riscv/irq.c
+++ b/drivers/acpi/riscv/irq.c
@@ -136,7 +136,7 @@ static int __init riscv_acpi_register_ext_intc(u32 gsi_base, u32 nr_irqs, u32 nr
{
struct riscv_ext_intc_list *ext_intc_element, *node, *prev;
- ext_intc_element = kzalloc_obj(*ext_intc_element, GFP_KERNEL);
+ ext_intc_element = kzalloc_obj(*ext_intc_element);
if (!ext_intc_element)
return -ENOMEM;
diff --git a/drivers/acpi/sbs.c b/drivers/acpi/sbs.c
index bcbd02d665d5..bbd3938f7b52 100644
--- a/drivers/acpi/sbs.c
+++ b/drivers/acpi/sbs.c
@@ -636,7 +636,7 @@ static int acpi_sbs_probe(struct platform_device *pdev)
int result = 0;
int id;
- sbs = kzalloc_obj(struct acpi_sbs, GFP_KERNEL);
+ sbs = kzalloc_obj(struct acpi_sbs);
if (!sbs) {
result = -ENOMEM;
goto end;
diff --git a/drivers/acpi/sbshc.c b/drivers/acpi/sbshc.c
index 969c1da7a015..36850831910b 100644
--- a/drivers/acpi/sbshc.c
+++ b/drivers/acpi/sbshc.c
@@ -254,7 +254,7 @@ static int acpi_smbus_hc_probe(struct platform_device *pdev)
strscpy(acpi_device_name(device), ACPI_SMB_HC_DEVICE_NAME);
strscpy(acpi_device_class(device), ACPI_SMB_HC_CLASS);
- hc = kzalloc_obj(struct acpi_smb_hc, GFP_KERNEL);
+ hc = kzalloc_obj(struct acpi_smb_hc);
if (!hc)
return -ENOMEM;
mutex_init(&hc->lock);
diff --git a/drivers/acpi/scan.c b/drivers/acpi/scan.c
index 490242bf161b..a6f453d4785b 100644
--- a/drivers/acpi/scan.c
+++ b/drivers/acpi/scan.c
@@ -1330,7 +1330,7 @@ static void acpi_add_id(struct acpi_device_pnp *pnp, const char *dev_id)
{
struct acpi_hardware_id *id;
- id = kmalloc_obj(*id, GFP_KERNEL);
+ id = kmalloc_obj(*id);
if (!id)
return;
@@ -1568,7 +1568,7 @@ int acpi_dma_get_range(struct device *dev, const struct bus_dma_region **map)
ret = acpi_dev_get_dma_resources(adev, &list);
if (ret > 0) {
- r = kzalloc_objs(*r, ret + 1, GFP_KERNEL);
+ r = kzalloc_objs(*r, ret + 1);
if (!r) {
ret = -ENOMEM;
goto out;
@@ -1863,7 +1863,7 @@ static int acpi_add_single_object(struct acpi_device **child,
bool release_dep_lock = false;
int result;
- device = kzalloc_obj(struct acpi_device, GFP_KERNEL);
+ device = kzalloc_obj(struct acpi_device);
if (!device)
return -ENOMEM;
@@ -2028,7 +2028,7 @@ int acpi_scan_add_dep(acpi_handle handle, struct acpi_handle_list *dep_devices)
if (skip)
continue;
- dep = kzalloc_obj(*dep, GFP_KERNEL);
+ dep = kzalloc_obj(*dep);
if (!dep)
continue;
@@ -2225,7 +2225,7 @@ static void acpi_default_enumeration(struct acpi_device *device)
* other device objects have been processed and PCI has claimed
* BARs in case there are resource conflicts.
*/
- sd = kmalloc_obj(*sd, GFP_KERNEL);
+ sd = kmalloc_obj(*sd);
if (sd) {
sd->adev = device;
list_add_tail(&sd->node, &acpi_scan_system_dev_list);
@@ -2899,7 +2899,7 @@ void acpi_scan_table_notify(void)
if (!acpi_scan_initialized)
return;
- work = kmalloc_obj(*work, GFP_KERNEL);
+ work = kmalloc_obj(*work);
if (!work)
return;
diff --git a/drivers/acpi/sysfs.c b/drivers/acpi/sysfs.c
index 44ea37f998e6..a625de3c3c8b 100644
--- a/drivers/acpi/sysfs.c
+++ b/drivers/acpi/sysfs.c
@@ -385,7 +385,7 @@ acpi_status acpi_sysfs_table_handler(u32 event, void *table, void *context)
switch (event) {
case ACPI_TABLE_EVENT_INSTALL:
- table_attr = kzalloc_obj(*table_attr, GFP_KERNEL);
+ table_attr = kzalloc_obj(*table_attr);
if (!table_attr)
return AE_NO_MEMORY;
@@ -491,7 +491,7 @@ static int acpi_table_data_init(struct acpi_table_header *th)
for (i = 0; i < NUM_ACPI_DATA_OBJS; i++) {
if (ACPI_COMPARE_NAMESEG(th->signature, acpi_data_objs[i].name)) {
- data_attr = kzalloc_obj(*data_attr, GFP_KERNEL);
+ data_attr = kzalloc_obj(*data_attr);
if (!data_attr)
return -ENOMEM;
sysfs_attr_init(&data_attr->attr.attr);
@@ -532,7 +532,7 @@ static int acpi_tables_sysfs_init(void)
if (ACPI_FAILURE(status))
continue;
- table_attr = kzalloc_obj(*table_attr, GFP_KERNEL);
+ table_attr = kzalloc_obj(*table_attr);
if (!table_attr)
return -ENOMEM;
@@ -864,11 +864,11 @@ void acpi_irq_stats_init(void)
num_gpes = acpi_current_gpe_count;
num_counters = num_gpes + ACPI_NUM_FIXED_EVENTS + NUM_COUNTERS_EXTRA;
- all_attrs = kzalloc_objs(*all_attrs, num_counters + 1, GFP_KERNEL);
+ all_attrs = kzalloc_objs(*all_attrs, num_counters + 1);
if (all_attrs == NULL)
return;
- all_counters = kzalloc_objs(*all_counters, num_counters, GFP_KERNEL);
+ all_counters = kzalloc_objs(*all_counters, num_counters);
if (all_counters == NULL)
goto fail;
@@ -876,7 +876,7 @@ void acpi_irq_stats_init(void)
if (ACPI_FAILURE(status))
goto fail;
- counter_attrs = kzalloc_objs(*counter_attrs, num_counters, GFP_KERNEL);
+ counter_attrs = kzalloc_objs(*counter_attrs, num_counters);
if (counter_attrs == NULL)
goto fail;
diff --git a/drivers/acpi/thermal.c b/drivers/acpi/thermal.c
index b2a1e1773840..64356b004a57 100644
--- a/drivers/acpi/thermal.c
+++ b/drivers/acpi/thermal.c
@@ -792,7 +792,7 @@ static int acpi_thermal_probe(struct platform_device *pdev)
if (!device)
return -EINVAL;
- tz = kzalloc_obj(struct acpi_thermal, GFP_KERNEL);
+ tz = kzalloc_obj(struct acpi_thermal);
if (!tz)
return -ENOMEM;
diff --git a/drivers/acpi/utils.c b/drivers/acpi/utils.c
index 67b9a17e33ec..6ab27e4826d1 100644
--- a/drivers/acpi/utils.c
+++ b/drivers/acpi/utils.c
@@ -365,7 +365,7 @@ bool acpi_evaluate_reference(acpi_handle handle, acpi_string pathname,
goto err;
list->count = package->package.count;
- list->handles = kzalloc_objs(*list->handles, list->count, GFP_KERNEL);
+ list->handles = kzalloc_objs(*list->handles, list->count);
if (!list->handles)
goto err_clear;
diff --git a/drivers/acpi/viot.c b/drivers/acpi/viot.c
index 26fe65dd4a6c..c05fcc060e63 100644
--- a/drivers/acpi/viot.c
+++ b/drivers/acpi/viot.c
@@ -142,7 +142,7 @@ static struct viot_iommu * __init viot_get_iommu(unsigned int offset)
if (viot_check_bounds(hdr))
return NULL;
- viommu = kzalloc_obj(*viommu, GFP_KERNEL);
+ viommu = kzalloc_obj(*viommu);
if (!viommu)
return NULL;
@@ -193,7 +193,7 @@ static int __init viot_parse_node(const struct acpi_viot_header *hdr)
hdr->type == ACPI_VIOT_NODE_VIRTIO_IOMMU_MMIO)
return 0;
- ep = kzalloc_obj(*ep, GFP_KERNEL);
+ ep = kzalloc_obj(*ep);
if (!ep)
return -ENOMEM;
diff --git a/drivers/acpi/wakeup.c b/drivers/acpi/wakeup.c
index f82e6f3127b6..0cbee0f06f0d 100644
--- a/drivers/acpi/wakeup.c
+++ b/drivers/acpi/wakeup.c
@@ -120,7 +120,7 @@ int acpi_register_wakeup_handler(int wake_irq, bool (*wakeup)(void *context),
if (!acpi_sci_irq_valid() || wake_irq != acpi_sci_irq)
return 0;
- handler = kmalloc_obj(*handler, GFP_KERNEL);
+ handler = kmalloc_obj(*handler);
if (!handler)
return -ENOMEM;
diff --git a/drivers/acpi/x86/lpss.c b/drivers/acpi/x86/lpss.c
index 3dfb8c2400f5..0171eef00484 100644
--- a/drivers/acpi/x86/lpss.c
+++ b/drivers/acpi/x86/lpss.c
@@ -623,7 +623,7 @@ static int acpi_lpss_create_device(struct acpi_device *adev,
if (!dev_desc)
return -EINVAL;
- pdata = kzalloc_obj(*pdata, GFP_KERNEL);
+ pdata = kzalloc_obj(*pdata);
if (!pdata)
return -ENOMEM;
diff --git a/drivers/amba/bus.c b/drivers/amba/bus.c
index 9d3d4607c5f2..6d479caf89cb 100644
--- a/drivers/amba/bus.c
+++ b/drivers/amba/bus.c
@@ -611,7 +611,7 @@ struct amba_device *amba_device_alloc(const char *name, resource_size_t base,
{
struct amba_device *dev;
- dev = kzalloc_obj(*dev, GFP_KERNEL);
+ dev = kzalloc_obj(*dev);
if (dev) {
amba_device_initialize(dev, name);
dev->res.start = base;
diff --git a/drivers/android/binder.c b/drivers/android/binder.c
index 3cb7798873bb..0dccb4526a7c 100644
--- a/drivers/android/binder.c
+++ b/drivers/android/binder.c
@@ -795,7 +795,7 @@ static struct binder_node *binder_new_node(struct binder_proc *proc,
struct flat_binder_object *fp)
{
struct binder_node *node;
- struct binder_node *new_node = kzalloc_obj(*node, GFP_KERNEL);
+ struct binder_node *new_node = kzalloc_obj(*node);
if (!new_node)
return NULL;
@@ -1469,7 +1469,7 @@ static int binder_inc_ref_for_node(struct binder_proc *proc,
ref = binder_get_ref_for_node_olocked(proc, node, NULL);
if (!ref) {
binder_proc_unlock(proc);
- new_ref = kzalloc_obj(*ref, GFP_KERNEL);
+ new_ref = kzalloc_obj(*ref);
if (!new_ref)
return -ENOMEM;
binder_proc_lock(proc);
@@ -2009,7 +2009,7 @@ static void binder_deferred_fd_close(int fd)
{
struct binder_task_work_cb *twcb;
- twcb = kzalloc_obj(*twcb, GFP_KERNEL);
+ twcb = kzalloc_obj(*twcb);
if (!twcb)
return;
init_task_work(&twcb->twork, binder_do_fd_close);
@@ -2386,7 +2386,7 @@ static int binder_translate_fd(u32 fd, binder_size_t fd_offset,
* of the fd in the target needs to be done from a
* target thread.
*/
- fixup = kzalloc_obj(*fixup, GFP_KERNEL);
+ fixup = kzalloc_obj(*fixup);
if (!fixup) {
ret = -ENOMEM;
goto err_alloc;
@@ -2579,7 +2579,7 @@ static void binder_cleanup_deferred_txn_lists(struct list_head *sgc_head,
static int binder_defer_copy(struct list_head *sgc_head, binder_size_t offset,
const void __user *sender_uaddr, size_t length)
{
- struct binder_sg_copy *bc = kzalloc_obj(*bc, GFP_KERNEL);
+ struct binder_sg_copy *bc = kzalloc_obj(*bc);
if (!bc)
return -ENOMEM;
@@ -2622,7 +2622,7 @@ static int binder_defer_copy(struct list_head *sgc_head, binder_size_t offset,
static int binder_add_fixup(struct list_head *pf_head, binder_size_t offset,
binder_uintptr_t fixup, size_t skip_size)
{
- struct binder_ptr_fixup *pf = kzalloc_obj(*pf, GFP_KERNEL);
+ struct binder_ptr_fixup *pf = kzalloc_obj(*pf);
struct binder_ptr_fixup *tmppf;
if (!pf)
@@ -3101,7 +3101,7 @@ static void binder_transaction(struct binder_proc *proc,
binder_set_extended_error(&thread->ee, t_debug_id, BR_OK, 0);
binder_inner_proc_unlock(proc);
- t = kzalloc_obj(*t, GFP_KERNEL);
+ t = kzalloc_obj(*t);
if (!t) {
binder_txn_error("%d:%d cannot allocate transaction\n",
thread->pid, proc->pid);
@@ -3320,7 +3320,7 @@ static void binder_transaction(struct binder_proc *proc,
e->to_thread = target_thread->pid;
e->to_proc = target_proc->pid;
- tcomplete = kzalloc_obj(*tcomplete, GFP_KERNEL);
+ tcomplete = kzalloc_obj(*tcomplete);
if (tcomplete == NULL) {
binder_txn_error("%d:%d cannot allocate work for transaction\n",
thread->pid, proc->pid);
@@ -3926,7 +3926,7 @@ binder_request_freeze_notification(struct binder_proc *proc,
struct binder_ref_freeze *freeze;
struct binder_ref *ref;
- freeze = kzalloc_obj(*freeze, GFP_KERNEL);
+ freeze = kzalloc_obj(*freeze);
if (!freeze)
return -ENOMEM;
binder_proc_lock(proc);
@@ -4394,7 +4394,7 @@ static int binder_thread_write(struct binder_proc *proc,
* Allocate memory for death notification
* before taking lock
*/
- death = kzalloc_obj(*death, GFP_KERNEL);
+ death = kzalloc_obj(*death);
if (death == NULL) {
WARN_ON(thread->return_error.cmd !=
BR_OK);
@@ -5293,7 +5293,7 @@ static struct binder_thread *binder_get_thread(struct binder_proc *proc)
thread = binder_get_thread_ilocked(proc, NULL);
binder_inner_proc_unlock(proc);
if (!thread) {
- new_thread = kzalloc_obj(*thread, GFP_KERNEL);
+ new_thread = kzalloc_obj(*thread);
if (new_thread == NULL)
return NULL;
binder_inner_proc_lock(proc);
@@ -6060,7 +6060,7 @@ static int binder_open(struct inode *nodp, struct file *filp)
binder_debug(BINDER_DEBUG_OPEN_CLOSE, "%s: %d:%d\n", __func__,
current->tgid, current->pid);
- proc = kzalloc_obj(*proc, GFP_KERNEL);
+ proc = kzalloc_obj(*proc);
if (proc == NULL)
return -ENOMEM;
@@ -7064,7 +7064,7 @@ static int __init init_binder_device(const char *name)
int ret;
struct binder_device *binder_device;
- binder_device = kzalloc_obj(*binder_device, GFP_KERNEL);
+ binder_device = kzalloc_obj(*binder_device);
if (!binder_device)
return -ENOMEM;
diff --git a/drivers/android/binder/rust_binderfs.c b/drivers/android/binder/rust_binderfs.c
index 2b640f6eddc2..ade1c4d92499 100644
--- a/drivers/android/binder/rust_binderfs.c
+++ b/drivers/android/binder/rust_binderfs.c
@@ -145,7 +145,7 @@ static int binderfs_binder_device_create(struct inode *ref_inode,
mutex_unlock(&binderfs_minors_mutex);
ret = -ENOMEM;
- device = kzalloc_obj(*device, GFP_KERNEL);
+ device = kzalloc_obj(*device);
if (!device)
goto err;
@@ -387,7 +387,7 @@ static int binderfs_binder_ctl_create(struct super_block *sb)
bool use_reserve = true;
#endif
- device = kzalloc_obj(*device, GFP_KERNEL);
+ device = kzalloc_obj(*device);
if (!device)
return -ENOMEM;
@@ -642,7 +642,7 @@ static int binderfs_fill_super(struct super_block *sb, struct fs_context *fc)
sb->s_op = &binderfs_super_ops;
sb->s_time_gran = 1;
- sb->s_fs_info = kzalloc_obj(struct binderfs_info, GFP_KERNEL);
+ sb->s_fs_info = kzalloc_obj(struct binderfs_info);
if (!sb->s_fs_info)
return -ENOMEM;
info = sb->s_fs_info;
@@ -721,7 +721,7 @@ static int binderfs_init_fs_context(struct fs_context *fc)
{
struct binderfs_mount_opts *ctx;
- ctx = kzalloc_obj(struct binderfs_mount_opts, GFP_KERNEL);
+ ctx = kzalloc_obj(struct binderfs_mount_opts);
if (!ctx)
return -ENOMEM;
diff --git a/drivers/android/binder_alloc.c b/drivers/android/binder_alloc.c
index aab88f2347eb..4dd3415d8fdb 100644
--- a/drivers/android/binder_alloc.c
+++ b/drivers/android/binder_alloc.c
@@ -289,7 +289,7 @@ static struct page *binder_page_alloc(struct binder_alloc *alloc,
return NULL;
/* allocate and install shrinker metadata under page->private */
- mdata = kzalloc_obj(*mdata, GFP_KERNEL);
+ mdata = kzalloc_obj(*mdata);
if (!mdata) {
__free_page(page);
return NULL;
@@ -672,7 +672,7 @@ struct binder_buffer *binder_alloc_new_buf(struct binder_alloc *alloc,
}
/* Preallocate the next buffer */
- next = kzalloc_obj(*next, GFP_KERNEL);
+ next = kzalloc_obj(*next);
if (!next)
return ERR_PTR(-ENOMEM);
@@ -924,7 +924,7 @@ int binder_alloc_mmap_handler(struct binder_alloc *alloc,
goto err_alloc_pages_failed;
}
- buffer = kzalloc_obj(*buffer, GFP_KERNEL);
+ buffer = kzalloc_obj(*buffer);
if (!buffer) {
ret = -ENOMEM;
failure_string = "alloc buffer struct";
diff --git a/drivers/android/binderfs.c b/drivers/android/binderfs.c
index 73a7c3b54f21..361d69f756f5 100644
--- a/drivers/android/binderfs.c
+++ b/drivers/android/binderfs.c
@@ -145,7 +145,7 @@ static int binderfs_binder_device_create(struct inode *ref_inode,
mutex_unlock(&binderfs_minors_mutex);
ret = -ENOMEM;
- device = kzalloc_obj(*device, GFP_KERNEL);
+ device = kzalloc_obj(*device);
if (!device)
goto err;
@@ -396,7 +396,7 @@ static int binderfs_binder_ctl_create(struct super_block *sb)
bool use_reserve = true;
#endif
- device = kzalloc_obj(*device, GFP_KERNEL);
+ device = kzalloc_obj(*device);
if (!device)
return -ENOMEM;
@@ -638,7 +638,7 @@ static int binderfs_fill_super(struct super_block *sb, struct fs_context *fc)
sb->s_op = &binderfs_super_ops;
sb->s_time_gran = 1;
- sb->s_fs_info = kzalloc_obj(struct binderfs_info, GFP_KERNEL);
+ sb->s_fs_info = kzalloc_obj(struct binderfs_info);
if (!sb->s_fs_info)
return -ENOMEM;
info = sb->s_fs_info;
@@ -717,7 +717,7 @@ static int binderfs_init_fs_context(struct fs_context *fc)
{
struct binderfs_mount_opts *ctx;
- ctx = kzalloc_obj(struct binderfs_mount_opts, GFP_KERNEL);
+ ctx = kzalloc_obj(struct binderfs_mount_opts);
if (!ctx)
return -ENOMEM;
diff --git a/drivers/ata/libata-acpi.c b/drivers/ata/libata-acpi.c
index a618313dea03..4433f626246b 100644
--- a/drivers/ata/libata-acpi.c
+++ b/drivers/ata/libata-acpi.c
@@ -194,7 +194,7 @@ void ata_acpi_bind_port(struct ata_port *ap)
if (!adev || adev->hp)
return;
- context = kzalloc_obj(*context, GFP_KERNEL);
+ context = kzalloc_obj(*context);
if (!context)
return;
@@ -236,7 +236,7 @@ void ata_acpi_bind_dev(struct ata_device *dev)
if (!adev || adev->hp)
return;
- context = kzalloc_obj(*context, GFP_KERNEL);
+ context = kzalloc_obj(*context);
if (!context)
return;
diff --git a/drivers/ata/libata-core.c b/drivers/ata/libata-core.c
index 02dde2517122..8ef2619c129c 100644
--- a/drivers/ata/libata-core.c
+++ b/drivers/ata/libata-core.c
@@ -2557,7 +2557,7 @@ static int ata_dev_init_cdl_resources(struct ata_device *dev)
unsigned int err_mask;
if (!cdl) {
- cdl = kzalloc_obj(*cdl, GFP_KERNEL);
+ cdl = kzalloc_obj(*cdl);
if (!cdl)
return -ENOMEM;
dev->cdl = cdl;
@@ -5638,7 +5638,7 @@ struct ata_port *ata_port_alloc(struct ata_host *host)
struct ata_port *ap;
int id;
- ap = kzalloc_obj(*ap, GFP_KERNEL);
+ ap = kzalloc_obj(*ap);
if (!ap)
return NULL;
@@ -6714,7 +6714,7 @@ static void __init ata_parse_force_param(void)
if (*p == ',')
size++;
- ata_force_tbl = kzalloc_objs(ata_force_tbl[0], size, GFP_KERNEL);
+ ata_force_tbl = kzalloc_objs(ata_force_tbl[0], size);
if (!ata_force_tbl) {
printk(KERN_WARNING "ata: failed to extend force table, "
"libata.force ignored\n");
diff --git a/drivers/ata/libata-sata.c b/drivers/ata/libata-sata.c
index 04a0ad66958e..b9d635088f5f 100644
--- a/drivers/ata/libata-sata.c
+++ b/drivers/ata/libata-sata.c
@@ -849,7 +849,7 @@ int ata_slave_link_init(struct ata_port *ap)
WARN_ON(ap->slave_link);
WARN_ON(ap->flags & ATA_FLAG_PMP);
- link = kzalloc_obj(*link, GFP_KERNEL);
+ link = kzalloc_obj(*link);
if (!link)
return -ENOMEM;
diff --git a/drivers/ata/libata-transport.c b/drivers/ata/libata-transport.c
index 85340ef98be3..2099d94c4f68 100644
--- a/drivers/ata/libata-transport.c
+++ b/drivers/ata/libata-transport.c
@@ -758,7 +758,7 @@ struct scsi_transport_template *ata_attach_transport(void)
struct ata_internal *i;
int count;
- i = kzalloc_obj(struct ata_internal, GFP_KERNEL);
+ i = kzalloc_obj(struct ata_internal);
if (!i)
return NULL;
diff --git a/drivers/ata/libata-zpodd.c b/drivers/ata/libata-zpodd.c
index e550327e7bd9..414e7c63bd85 100644
--- a/drivers/ata/libata-zpodd.c
+++ b/drivers/ata/libata-zpodd.c
@@ -274,7 +274,7 @@ void zpodd_init(struct ata_device *dev)
if (mech_type == ODD_MECH_TYPE_UNSUPPORTED)
return;
- zpodd = kzalloc_obj(struct zpodd, GFP_KERNEL);
+ zpodd = kzalloc_obj(struct zpodd);
if (!zpodd)
return;
diff --git a/drivers/ata/pata_parport/pata_parport.c b/drivers/ata/pata_parport/pata_parport.c
index 93ca62cc6390..a5b959891cb7 100644
--- a/drivers/ata/pata_parport/pata_parport.c
+++ b/drivers/ata/pata_parport/pata_parport.c
@@ -511,7 +511,7 @@ static struct pi_adapter *pi_init_one(struct parport *parport,
if (id < 0)
return NULL;
- pi = kzalloc_obj(struct pi_adapter, GFP_KERNEL);
+ pi = kzalloc_obj(struct pi_adapter);
if (!pi) {
ida_free(&pata_parport_bus_dev_ids, id);
return NULL;
diff --git a/drivers/ata/sata_dwc_460ex.c b/drivers/ata/sata_dwc_460ex.c
index e4fe47c8fa75..64cb544903d8 100644
--- a/drivers/ata/sata_dwc_460ex.c
+++ b/drivers/ata/sata_dwc_460ex.c
@@ -850,7 +850,7 @@ static int sata_dwc_port_start(struct ata_port *ap)
}
/* Allocate Port Struct */
- hsdevp = kzalloc_obj(*hsdevp, GFP_KERNEL);
+ hsdevp = kzalloc_obj(*hsdevp);
if (!hsdevp) {
err = -ENOMEM;
goto CLEANUP;
diff --git a/drivers/ata/sata_fsl.c b/drivers/ata/sata_fsl.c
index 703febbe0c03..be829fcc584d 100644
--- a/drivers/ata/sata_fsl.c
+++ b/drivers/ata/sata_fsl.c
@@ -706,7 +706,7 @@ static int sata_fsl_port_start(struct ata_port *ap)
void __iomem *hcr_base = host_priv->hcr_base;
u32 temp;
- pp = kzalloc_obj(*pp, GFP_KERNEL);
+ pp = kzalloc_obj(*pp);
if (!pp)
return -ENOMEM;
@@ -1451,7 +1451,7 @@ static int sata_fsl_probe(struct platform_device *ofdev)
dev_dbg(&ofdev->dev, "@reset i/o = 0x%x\n",
ioread32(csr_base + TRANSCFG));
- host_priv = kzalloc_obj(struct sata_fsl_host_priv, GFP_KERNEL);
+ host_priv = kzalloc_obj(struct sata_fsl_host_priv);
if (!host_priv)
goto error_exit_with_cleanup;
diff --git a/drivers/atm/adummy.c b/drivers/atm/adummy.c
index c85bca1af835..c8d00537d236 100644
--- a/drivers/atm/adummy.c
+++ b/drivers/atm/adummy.c
@@ -148,7 +148,7 @@ static int __init adummy_init(void)
printk(KERN_ERR "adummy: version %s\n", DRV_VERSION);
- adummy_dev = kzalloc_obj(struct adummy_dev, GFP_KERNEL);
+ adummy_dev = kzalloc_obj(struct adummy_dev);
if (!adummy_dev) {
printk(KERN_ERR DEV_LABEL ": kzalloc() failed\n");
err = -ENOMEM;
diff --git a/drivers/atm/atmtcp.c b/drivers/atm/atmtcp.c
index da7226b1aa66..96719851ae2a 100644
--- a/drivers/atm/atmtcp.c
+++ b/drivers/atm/atmtcp.c
@@ -375,7 +375,7 @@ static int atmtcp_create(int itf,int persist,struct atm_dev **result)
struct atmtcp_dev_data *dev_data;
struct atm_dev *dev;
- dev_data = kmalloc_obj(*dev_data, GFP_KERNEL);
+ dev_data = kmalloc_obj(*dev_data);
if (!dev_data)
return -ENOMEM;
diff --git a/drivers/atm/eni.c b/drivers/atm/eni.c
index b00ddead5390..d155f9dab44c 100644
--- a/drivers/atm/eni.c
+++ b/drivers/atm/eni.c
@@ -1925,7 +1925,7 @@ static int eni_open(struct atm_vcc *vcc)
DPRINTK(DEV_LABEL "(itf %d): open %d.%d\n",vcc->dev->number,vcc->vpi,
vcc->vci);
if (!test_bit(ATM_VF_PARTIAL,&vcc->flags)) {
- eni_vcc = kmalloc_obj(struct eni_vcc, GFP_KERNEL);
+ eni_vcc = kmalloc_obj(struct eni_vcc);
if (!eni_vcc) return -ENOMEM;
vcc->dev_data = eni_vcc;
eni_vcc->tx = NULL; /* for eni_close after open_rx */
@@ -2229,7 +2229,7 @@ static int eni_init_one(struct pci_dev *pci_dev,
goto err_disable;
rc = -ENOMEM;
- eni_dev = kmalloc_obj(struct eni_dev, GFP_KERNEL);
+ eni_dev = kmalloc_obj(struct eni_dev);
if (!eni_dev)
goto err_disable;
diff --git a/drivers/atm/fore200e.c b/drivers/atm/fore200e.c
index 0a3e9abd72f2..2423eed506c1 100644
--- a/drivers/atm/fore200e.c
+++ b/drivers/atm/fore200e.c
@@ -1676,7 +1676,7 @@ fore200e_getstats(struct fore200e* fore200e)
u32 stats_dma_addr;
if (fore200e->stats == NULL) {
- fore200e->stats = kzalloc_obj(struct stats, GFP_KERNEL);
+ fore200e->stats = kzalloc_obj(struct stats);
if (fore200e->stats == NULL)
return -ENOMEM;
}
@@ -1955,7 +1955,7 @@ static int fore200e_irq_request(struct fore200e *fore200e)
static int fore200e_get_esi(struct fore200e *fore200e)
{
- struct prom_data* prom = kzalloc_obj(struct prom_data, GFP_KERNEL);
+ struct prom_data* prom = kzalloc_obj(struct prom_data);
int ok, i;
if (!prom)
@@ -2000,7 +2000,7 @@ static int fore200e_alloc_rx_buf(struct fore200e *fore200e)
DPRINTK(2, "rx buffers %d / %d are being allocated\n", scheme, magn);
/* allocate the array of receive buffers */
- buffer = bsq->buffer = kzalloc_objs(struct buffer, nbr, GFP_KERNEL);
+ buffer = bsq->buffer = kzalloc_objs(struct buffer, nbr);
if (buffer == NULL)
return -ENOMEM;
@@ -2528,7 +2528,7 @@ static int fore200e_sba_probe(struct platform_device *op)
static int index = 0;
int err;
- fore200e = kzalloc_obj(struct fore200e, GFP_KERNEL);
+ fore200e = kzalloc_obj(struct fore200e);
if (!fore200e)
return -ENOMEM;
@@ -2596,7 +2596,7 @@ static int fore200e_pca_detect(struct pci_dev *pci_dev,
goto out;
}
- fore200e = kzalloc_obj(struct fore200e, GFP_KERNEL);
+ fore200e = kzalloc_obj(struct fore200e);
if (fore200e == NULL) {
err = -ENOMEM;
goto out_disable;
diff --git a/drivers/atm/he.c b/drivers/atm/he.c
index d2e41a7aaa3a..8108ef0c089a 100644
--- a/drivers/atm/he.c
+++ b/drivers/atm/he.c
@@ -372,7 +372,7 @@ static int he_init_one(struct pci_dev *pci_dev,
}
pci_set_drvdata(pci_dev, atm_dev);
- he_dev = kzalloc_obj(struct he_dev, GFP_KERNEL);
+ he_dev = kzalloc_obj(struct he_dev);
if (!he_dev) {
err = -ENOMEM;
goto init_one_failure;
diff --git a/drivers/atm/idt77105.c b/drivers/atm/idt77105.c
index 7ac597f9c673..4bbcca7f77c8 100644
--- a/drivers/atm/idt77105.c
+++ b/drivers/atm/idt77105.c
@@ -262,7 +262,7 @@ static int idt77105_start(struct atm_dev *dev)
{
unsigned long flags;
- if (!(dev->phy_data = kmalloc_obj(struct idt77105_priv, GFP_KERNEL)))
+ if (!(dev->phy_data = kmalloc_obj(struct idt77105_priv)))
return -ENOMEM;
PRIV(dev)->dev = dev;
spin_lock_irqsave(&idt77105_priv_lock, flags);
diff --git a/drivers/atm/idt77252.c b/drivers/atm/idt77252.c
index d984d0766301..7f8aaf5e6e43 100644
--- a/drivers/atm/idt77252.c
+++ b/drivers/atm/idt77252.c
@@ -638,7 +638,7 @@ alloc_scq(struct idt77252_dev *card, int class)
{
struct scq_info *scq;
- scq = kzalloc_obj(struct scq_info, GFP_KERNEL);
+ scq = kzalloc_obj(struct scq_info);
if (!scq)
return NULL;
scq->base = dma_alloc_coherent(&card->pcidev->dev, SCQ_SIZE,
@@ -2116,7 +2116,7 @@ idt77252_init_est(struct vc_map *vc, int pcr)
{
struct rate_estimator *est;
- est = kzalloc_obj(struct rate_estimator, GFP_KERNEL);
+ est = kzalloc_obj(struct rate_estimator);
if (!est)
return NULL;
est->maxcps = pcr < 0 ? -pcr : pcr;
@@ -2424,7 +2424,7 @@ idt77252_open(struct atm_vcc *vcc)
index = VPCI2VC(card, vpi, vci);
if (!card->vcs[index]) {
- card->vcs[index] = kzalloc_obj(struct vc_map, GFP_KERNEL);
+ card->vcs[index] = kzalloc_obj(struct vc_map);
if (!card->vcs[index]) {
printk("%s: can't alloc vc in open()\n", card->name);
mutex_unlock(&card->mutex);
@@ -2855,7 +2855,7 @@ open_card_oam(struct idt77252_dev *card)
for (vci = 3; vci < 5; vci++) {
index = VPCI2VC(card, vpi, vci);
- vc = kzalloc_obj(struct vc_map, GFP_KERNEL);
+ vc = kzalloc_obj(struct vc_map);
if (!vc) {
printk("%s: can't alloc vc\n", card->name);
return -ENOMEM;
@@ -2923,7 +2923,7 @@ open_card_ubr0(struct idt77252_dev *card)
{
struct vc_map *vc;
- vc = kzalloc_obj(struct vc_map, GFP_KERNEL);
+ vc = kzalloc_obj(struct vc_map);
if (!vc) {
printk("%s: can't alloc vc\n", card->name);
return -ENOMEM;
@@ -3621,7 +3621,7 @@ static int idt77252_init_one(struct pci_dev *pcidev,
goto err_out_disable_pdev;
}
- card = kzalloc_obj(struct idt77252_dev, GFP_KERNEL);
+ card = kzalloc_obj(struct idt77252_dev);
if (!card) {
printk("idt77252-%d: can't allocate private data\n", index);
err = -ENOMEM;
diff --git a/drivers/atm/iphase.c b/drivers/atm/iphase.c
index 727b5d044115..b90761dcd87f 100644
--- a/drivers/atm/iphase.c
+++ b/drivers/atm/iphase.c
@@ -2709,7 +2709,7 @@ static int ia_open(struct atm_vcc *vcc)
vcc->dev->number, vcc->vpi, vcc->vci);)
/* Device dependent initialization */
- ia_vcc = kmalloc_obj(*ia_vcc, GFP_KERNEL);
+ ia_vcc = kmalloc_obj(*ia_vcc);
if (!ia_vcc) return -ENOMEM;
vcc->dev_data = ia_vcc;
@@ -2795,7 +2795,7 @@ static int ia_ioctl(struct atm_dev *dev, unsigned int cmd, void __user *arg)
rfredn_t *rfL;
if (!capable(CAP_NET_ADMIN)) return -EPERM;
- regs_local = kmalloc_obj(*regs_local, GFP_KERNEL);
+ regs_local = kmalloc_obj(*regs_local);
if (!regs_local) return -ENOMEM;
ffL = ®s_local->ffredn;
rfL = ®s_local->rfredn;
@@ -3165,7 +3165,7 @@ static int ia_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
IADEV *iadev;
int ret;
- iadev = kzalloc_obj(*iadev, GFP_KERNEL);
+ iadev = kzalloc_obj(*iadev);
if (!iadev) {
ret = -ENOMEM;
goto err_out;
diff --git a/drivers/atm/lanai.c b/drivers/atm/lanai.c
index 682089aedbe4..d6af999a9ebb 100644
--- a/drivers/atm/lanai.c
+++ b/drivers/atm/lanai.c
@@ -1464,7 +1464,7 @@ static inline void vcc_table_deallocate(const struct lanai_dev *lanai)
static inline struct lanai_vcc *new_lanai_vcc(void)
{
struct lanai_vcc *lvcc;
- lvcc = kzalloc_obj(*lvcc, GFP_KERNEL);
+ lvcc = kzalloc_obj(*lvcc);
if (likely(lvcc != NULL)) {
skb_queue_head_init(&lvcc->tx.backlog);
#ifdef DEBUG
@@ -2555,7 +2555,7 @@ static int lanai_init_one(struct pci_dev *pci,
struct atm_dev *atmdev;
int result;
- lanai = kzalloc_obj(*lanai, GFP_KERNEL);
+ lanai = kzalloc_obj(*lanai);
if (lanai == NULL) {
printk(KERN_ERR DEV_LABEL
": couldn't allocate dev_data structure!\n");
diff --git a/drivers/atm/nicstar.c b/drivers/atm/nicstar.c
index 67486f363c2c..24e51343df15 100644
--- a/drivers/atm/nicstar.c
+++ b/drivers/atm/nicstar.c
@@ -373,7 +373,7 @@ static int ns_init_card(int i, struct pci_dev *pcidev)
return error;
}
- card = kmalloc_obj(*card, GFP_KERNEL);
+ card = kmalloc_obj(*card);
if (!card) {
printk
("nicstar%d: can't allocate memory for device structure.\n",
@@ -867,7 +867,7 @@ static scq_info *get_scq(ns_dev *card, int size, u32 scd)
if (size != VBR_SCQSIZE && size != CBR_SCQSIZE)
return NULL;
- scq = kmalloc_obj(*scq, GFP_KERNEL);
+ scq = kmalloc_obj(*scq);
if (!scq)
return NULL;
scq->org = dma_alloc_coherent(&card->pcidev->dev,
@@ -876,7 +876,7 @@ static scq_info *get_scq(ns_dev *card, int size, u32 scd)
kfree(scq);
return NULL;
}
- scq->skb = kzalloc_objs(*scq->skb, size / NS_SCQE_SIZE, GFP_KERNEL);
+ scq->skb = kzalloc_objs(*scq->skb, size / NS_SCQE_SIZE);
if (!scq->skb) {
dma_free_coherent(&card->pcidev->dev,
2 * size, scq->org, scq->dma);
diff --git a/drivers/atm/solos-pci.c b/drivers/atm/solos-pci.c
index 1c86cd84ce69..24c764664c24 100644
--- a/drivers/atm/solos-pci.c
+++ b/drivers/atm/solos-pci.c
@@ -1196,7 +1196,7 @@ static int fpga_probe(struct pci_dev *dev, const struct pci_device_id *id)
uint32_t data32;
struct solos_card *card;
- card = kzalloc_obj(*card, GFP_KERNEL);
+ card = kzalloc_obj(*card);
if (!card)
return -ENOMEM;
diff --git a/drivers/atm/suni.c b/drivers/atm/suni.c
index 0eb3ad488d1e..bb588c98216d 100644
--- a/drivers/atm/suni.c
+++ b/drivers/atm/suni.c
@@ -367,7 +367,7 @@ int suni_init(struct atm_dev *dev)
{
unsigned char mri;
- if (!(dev->phy_data = kmalloc_obj(struct suni_priv, GFP_KERNEL)))
+ if (!(dev->phy_data = kmalloc_obj(struct suni_priv)))
return -ENOMEM;
PRIV(dev)->dev = dev;
diff --git a/drivers/auxdisplay/hd44780.c b/drivers/auxdisplay/hd44780.c
index aee1f5a60c0d..b046513987b5 100644
--- a/drivers/auxdisplay/hd44780.c
+++ b/drivers/auxdisplay/hd44780.c
@@ -226,7 +226,7 @@ static int hd44780_probe(struct platform_device *pdev)
if (!lcd)
return -ENOMEM;
- hd = kzalloc_obj(*hd, GFP_KERNEL);
+ hd = kzalloc_obj(*hd);
if (!hd)
goto fail2;
diff --git a/drivers/auxdisplay/line-display.c b/drivers/auxdisplay/line-display.c
index d3860953b0de..81b4aac65807 100644
--- a/drivers/auxdisplay/line-display.c
+++ b/drivers/auxdisplay/line-display.c
@@ -56,7 +56,7 @@ static int create_attachment(struct device *dev, struct linedisp *linedisp, bool
{
struct linedisp_attachment *attachment;
- attachment = kzalloc_obj(*attachment, GFP_KERNEL);
+ attachment = kzalloc_obj(*attachment);
if (!attachment)
return -ENOMEM;
@@ -390,7 +390,7 @@ static int linedisp_init_map(struct linedisp *linedisp)
if (err < 0)
return err;
- map = kmalloc_obj(*map, GFP_KERNEL);
+ map = kmalloc_obj(*map);
if (!map)
return -ENOMEM;
diff --git a/drivers/auxdisplay/panel.c b/drivers/auxdisplay/panel.c
index 8aad34f96068..d8854cf15268 100644
--- a/drivers/auxdisplay/panel.c
+++ b/drivers/auxdisplay/panel.c
@@ -1428,7 +1428,7 @@ static struct logical_input *panel_bind_key(const char *name, const char *press,
{
struct logical_input *key;
- key = kzalloc_obj(*key, GFP_KERNEL);
+ key = kzalloc_obj(*key);
if (!key)
return NULL;
diff --git a/drivers/base/arch_topology.c b/drivers/base/arch_topology.c
index 0a2a19d50b54..8c5e47c28d9a 100644
--- a/drivers/base/arch_topology.c
+++ b/drivers/base/arch_topology.c
@@ -892,7 +892,7 @@ __weak int __init parse_acpi_topology(void)
hetero_id = find_acpi_cpu_topology_hetero_id(cpu);
entry = xa_load(&hetero_cpu, hetero_id);
if (!entry) {
- entry = kzalloc_obj(*entry, GFP_KERNEL);
+ entry = kzalloc_obj(*entry);
WARN_ON_ONCE(!entry);
if (entry) {
diff --git a/drivers/base/attribute_container.c b/drivers/base/attribute_container.c
index 2264c3647247..4ad26b8dd6a5 100644
--- a/drivers/base/attribute_container.c
+++ b/drivers/base/attribute_container.c
@@ -153,7 +153,7 @@ attribute_container_add_device(struct device *dev,
if (!cont->match(cont, dev))
continue;
- ic = kzalloc_obj(*ic, GFP_KERNEL);
+ ic = kzalloc_obj(*ic);
if (!ic) {
dev_err(dev, "failed to allocate class container\n");
continue;
diff --git a/drivers/base/auxiliary.c b/drivers/base/auxiliary.c
index 8e7bae67f3c0..9fd3820d1f8a 100644
--- a/drivers/base/auxiliary.c
+++ b/drivers/base/auxiliary.c
@@ -420,7 +420,7 @@ struct auxiliary_device *auxiliary_device_create(struct device *dev,
struct auxiliary_device *auxdev;
int ret;
- auxdev = kzalloc_obj(*auxdev, GFP_KERNEL);
+ auxdev = kzalloc_obj(*auxdev);
if (!auxdev)
return NULL;
diff --git a/drivers/base/auxiliary_sysfs.c b/drivers/base/auxiliary_sysfs.c
index e432fa6b4ce9..dea7f46f7dd0 100644
--- a/drivers/base/auxiliary_sysfs.c
+++ b/drivers/base/auxiliary_sysfs.c
@@ -63,7 +63,7 @@ int auxiliary_device_sysfs_irq_add(struct auxiliary_device *auxdev, int irq)
if (ret)
return ret;
- info = kzalloc_obj(*info, GFP_KERNEL);
+ info = kzalloc_obj(*info);
if (!info)
return -ENOMEM;
diff --git a/drivers/base/bus.c b/drivers/base/bus.c
index 5745f51f5901..bb61d8adbab1 100644
--- a/drivers/base/bus.c
+++ b/drivers/base/bus.c
@@ -696,7 +696,7 @@ int bus_add_driver(struct device_driver *drv)
*/
pr_debug("bus: '%s': add driver %s\n", sp->bus->name, drv->name);
- priv = kzalloc_obj(*priv, GFP_KERNEL);
+ priv = kzalloc_obj(*priv);
if (!priv) {
error = -ENOMEM;
goto out_put_bus;
@@ -897,7 +897,7 @@ int bus_register(const struct bus_type *bus)
struct kobject *bus_kobj;
struct lock_class_key *key;
- priv = kzalloc_obj(struct subsys_private, GFP_KERNEL);
+ priv = kzalloc_obj(struct subsys_private);
if (!priv)
return -ENOMEM;
@@ -1263,7 +1263,7 @@ static int subsys_register(const struct bus_type *subsys,
goto err_sp;
}
- dev = kzalloc_obj(struct device, GFP_KERNEL);
+ dev = kzalloc_obj(struct device);
if (!dev) {
err = -ENOMEM;
goto err_dev;
diff --git a/drivers/base/class.c b/drivers/base/class.c
index 2650dead5af1..827fc7adacc7 100644
--- a/drivers/base/class.c
+++ b/drivers/base/class.c
@@ -194,7 +194,7 @@ int class_register(const struct class *cls)
return -EINVAL;
}
- cp = kzalloc_obj(*cp, GFP_KERNEL);
+ cp = kzalloc_obj(*cp);
if (!cp)
return -ENOMEM;
klist_init(&cp->klist_devices, klist_class_dev_get, klist_class_dev_put);
@@ -268,7 +268,7 @@ struct class *class_create(const char *name)
struct class *cls;
int retval;
- cls = kzalloc_obj(*cls, GFP_KERNEL);
+ cls = kzalloc_obj(*cls);
if (!cls) {
retval = -ENOMEM;
goto error;
@@ -573,7 +573,7 @@ struct class_compat *class_compat_register(const char *name)
{
struct class_compat *cls;
- cls = kmalloc_obj(struct class_compat, GFP_KERNEL);
+ cls = kmalloc_obj(struct class_compat);
if (!cls)
return NULL;
cls->kobj = kobject_create_and_add(name, &class_kset->kobj);
diff --git a/drivers/base/component.c b/drivers/base/component.c
index fef563aa13e5..655d68deb590 100644
--- a/drivers/base/component.c
+++ b/drivers/base/component.c
@@ -363,7 +363,7 @@ static int component_match_realloc(struct component_match *match, size_t num)
if (match->alloc == num)
return 0;
- new = kmalloc_objs(*new, num, GFP_KERNEL);
+ new = kmalloc_objs(*new, num);
if (!new)
return -ENOMEM;
@@ -521,7 +521,7 @@ int component_master_add_with_match(struct device *parent,
if (ret)
return ret;
- adev = kzalloc_obj(*adev, GFP_KERNEL);
+ adev = kzalloc_obj(*adev);
if (!adev)
return -ENOMEM;
@@ -732,7 +732,7 @@ static int __component_add(struct device *dev, const struct component_ops *ops,
struct component *component;
int ret;
- component = kzalloc_obj(*component, GFP_KERNEL);
+ component = kzalloc_obj(*component);
if (!component)
return -ENOMEM;
diff --git a/drivers/base/core.c b/drivers/base/core.c
index a8ea302c504c..791f9e444df8 100644
--- a/drivers/base/core.c
+++ b/drivers/base/core.c
@@ -76,7 +76,7 @@ static int __fwnode_link_add(struct fwnode_handle *con,
return 0;
}
- link = kzalloc_obj(*link, GFP_KERNEL);
+ link = kzalloc_obj(*link);
if (!link)
return -ENOMEM;
@@ -844,7 +844,7 @@ struct device_link *device_link_add(struct device *consumer,
goto out;
}
- link = kzalloc_obj(*link, GFP_KERNEL);
+ link = kzalloc_obj(*link);
if (!link)
goto out;
@@ -2748,7 +2748,7 @@ static ssize_t uevent_show(struct device *dev, struct device_attribute *attr,
if (!kset->uevent_ops->filter(&dev->kobj))
goto out;
- env = kzalloc_obj(struct kobj_uevent_env, GFP_KERNEL);
+ env = kzalloc_obj(struct kobj_uevent_env);
if (!env)
return -ENOMEM;
@@ -3220,7 +3220,7 @@ static struct kobject *class_dir_create_and_add(struct subsys_private *sp,
struct class_dir *dir;
int retval;
- dir = kzalloc_obj(*dir, GFP_KERNEL);
+ dir = kzalloc_obj(*dir);
if (!dir)
return ERR_PTR(-ENOMEM);
@@ -3531,7 +3531,7 @@ static void device_remove_sys_dev_entry(struct device *dev)
static int device_private_init(struct device *dev)
{
- dev->p = kzalloc_obj(*dev->p, GFP_KERNEL);
+ dev->p = kzalloc_obj(*dev->p);
if (!dev->p)
return -ENOMEM;
dev->p->device = dev;
@@ -4278,7 +4278,7 @@ struct device *__root_device_register(const char *name, struct module *owner)
struct root_device *root;
int err = -ENOMEM;
- root = kzalloc_obj(struct root_device, GFP_KERNEL);
+ root = kzalloc_obj(struct root_device);
if (!root)
return ERR_PTR(err);
@@ -4350,7 +4350,7 @@ device_create_groups_vargs(const struct class *class, struct device *parent,
if (IS_ERR_OR_NULL(class))
goto error;
- dev = kzalloc_obj(*dev, GFP_KERNEL);
+ dev = kzalloc_obj(*dev);
if (!dev) {
retval = -ENOMEM;
goto error;
diff --git a/drivers/base/cpu.c b/drivers/base/cpu.c
index 517609371f4c..875abdc9942e 100644
--- a/drivers/base/cpu.c
+++ b/drivers/base/cpu.c
@@ -466,7 +466,7 @@ __cpu_device_create(struct device *parent, void *drvdata,
struct device *dev = NULL;
int retval = -ENOMEM;
- dev = kzalloc_obj(*dev, GFP_KERNEL);
+ dev = kzalloc_obj(*dev);
if (!dev)
goto error;
diff --git a/drivers/base/faux.c b/drivers/base/faux.c
index 33dd8efdd541..fb3e42f21362 100644
--- a/drivers/base/faux.c
+++ b/drivers/base/faux.c
@@ -133,7 +133,7 @@ struct faux_device *faux_device_create_with_groups(const char *name,
struct device *dev;
int ret;
- faux_obj = kzalloc_obj(*faux_obj, GFP_KERNEL);
+ faux_obj = kzalloc_obj(*faux_obj);
if (!faux_obj)
return NULL;
@@ -234,7 +234,7 @@ int __init faux_bus_init(void)
{
int ret;
- faux_bus_root = kzalloc_obj(*faux_bus_root, GFP_KERNEL);
+ faux_bus_root = kzalloc_obj(*faux_bus_root);
if (!faux_bus_root)
return -ENOMEM;
diff --git a/drivers/base/firmware_loader/main.c b/drivers/base/firmware_loader/main.c
index 49eabc50c66d..a11b30dda23b 100644
--- a/drivers/base/firmware_loader/main.c
+++ b/drivers/base/firmware_loader/main.c
@@ -747,7 +747,7 @@ _request_firmware_prepare(struct firmware **firmware_p, const char *name,
struct fw_priv *fw_priv;
int ret;
- *firmware_p = firmware = kzalloc_obj(*firmware, GFP_KERNEL);
+ *firmware_p = firmware = kzalloc_obj(*firmware);
if (!firmware) {
dev_err(device, "%s: kmalloc(struct firmware) failed\n",
__func__);
diff --git a/drivers/base/firmware_loader/sysfs.c b/drivers/base/firmware_loader/sysfs.c
index d921570026cc..29a10d2ad537 100644
--- a/drivers/base/firmware_loader/sysfs.c
+++ b/drivers/base/firmware_loader/sysfs.c
@@ -405,7 +405,7 @@ fw_create_instance(struct firmware *firmware, const char *fw_name,
struct fw_sysfs *fw_sysfs;
struct device *f_dev;
- fw_sysfs = kzalloc_obj(*fw_sysfs, GFP_KERNEL);
+ fw_sysfs = kzalloc_obj(*fw_sysfs);
if (!fw_sysfs) {
fw_sysfs = ERR_PTR(-ENOMEM);
goto exit;
diff --git a/drivers/base/firmware_loader/sysfs_upload.c b/drivers/base/firmware_loader/sysfs_upload.c
index fdc928b8cd1d..f59a7856934c 100644
--- a/drivers/base/firmware_loader/sysfs_upload.c
+++ b/drivers/base/firmware_loader/sysfs_upload.c
@@ -315,13 +315,13 @@ firmware_upload_register(struct module *module, struct device *parent,
if (!try_module_get(module))
return ERR_PTR(-EFAULT);
- fw_upload = kzalloc_obj(*fw_upload, GFP_KERNEL);
+ fw_upload = kzalloc_obj(*fw_upload);
if (!fw_upload) {
ret = -ENOMEM;
goto exit_module_put;
}
- fw_upload_priv = kzalloc_obj(*fw_upload_priv, GFP_KERNEL);
+ fw_upload_priv = kzalloc_obj(*fw_upload_priv);
if (!fw_upload_priv) {
ret = -ENOMEM;
goto free_fw_upload;
diff --git a/drivers/base/isa.c b/drivers/base/isa.c
index ca2765ef9ab9..fd076cc63cb6 100644
--- a/drivers/base/isa.c
+++ b/drivers/base/isa.c
@@ -125,7 +125,7 @@ int isa_register_driver(struct isa_driver *isa_driver, unsigned int ndev)
for (id = 0; id < ndev; id++) {
struct isa_dev *isa_dev;
- isa_dev = kzalloc_obj(*isa_dev, GFP_KERNEL);
+ isa_dev = kzalloc_obj(*isa_dev);
if (!isa_dev) {
error = -ENOMEM;
break;
diff --git a/drivers/base/map.c b/drivers/base/map.c
index f5c01efe6b55..bde415f93d67 100644
--- a/drivers/base/map.c
+++ b/drivers/base/map.c
@@ -41,7 +41,7 @@ int kobj_map(struct kobj_map *domain, dev_t dev, unsigned long range,
if (n > 255)
n = 255;
- p = kmalloc_objs(struct probe, n, GFP_KERNEL);
+ p = kmalloc_objs(struct probe, n);
if (p == NULL)
return -ENOMEM;
@@ -134,8 +134,8 @@ struct kobject *kobj_lookup(struct kobj_map *domain, dev_t dev, int *index)
struct kobj_map *kobj_map_init(kobj_probe_t *base_probe, struct mutex *lock)
{
- struct kobj_map *p = kmalloc_obj(struct kobj_map, GFP_KERNEL);
- struct probe *base = kzalloc_obj(*base, GFP_KERNEL);
+ struct kobj_map *p = kmalloc_obj(struct kobj_map);
+ struct probe *base = kzalloc_obj(*base);
int i;
if ((p == NULL) || (base == NULL)) {
diff --git a/drivers/base/memory.c b/drivers/base/memory.c
index ea915e6a4781..a3091924918b 100644
--- a/drivers/base/memory.c
+++ b/drivers/base/memory.c
@@ -800,7 +800,7 @@ static int add_memory_block(unsigned long block_id, int nid, unsigned long state
put_device(&mem->dev);
return -EEXIST;
}
- mem = kzalloc_obj(*mem, GFP_KERNEL);
+ mem = kzalloc_obj(*mem);
if (!mem)
return -ENOMEM;
@@ -1078,7 +1078,7 @@ static int memory_group_register(struct memory_group group)
if (!node_possible(group.nid))
return -EINVAL;
- new_group = kzalloc_obj(group, GFP_KERNEL);
+ new_group = kzalloc_obj(group);
if (!new_group)
return -ENOMEM;
*new_group = group;
diff --git a/drivers/base/node.c b/drivers/base/node.c
index 2b65b5eba708..d7647d077b66 100644
--- a/drivers/base/node.c
+++ b/drivers/base/node.c
@@ -158,7 +158,7 @@ static struct node_access_nodes *node_init_node_access(struct node *node,
if (access_node->access == access)
return access_node;
- access_node = kzalloc_obj(*access_node, GFP_KERNEL);
+ access_node = kzalloc_obj(*access_node);
if (!access_node)
return NULL;
@@ -340,7 +340,7 @@ static void node_init_cache_dev(struct node *node)
{
struct device *dev;
- dev = kzalloc_obj(*dev, GFP_KERNEL);
+ dev = kzalloc_obj(*dev);
if (!dev)
return;
@@ -389,7 +389,7 @@ void node_add_cache(unsigned int nid, struct node_cache_attrs *cache_attrs)
if (!node->cache_dev)
return;
- info = kzalloc_obj(*info, GFP_KERNEL);
+ info = kzalloc_obj(*info);
if (!info)
return;
@@ -875,7 +875,7 @@ int register_node(int nid)
int cpu;
struct node *node;
- node = kzalloc_obj(struct node, GFP_KERNEL);
+ node = kzalloc_obj(struct node);
if (!node)
return -ENOMEM;
diff --git a/drivers/base/power/clock_ops.c b/drivers/base/power/clock_ops.c
index 0ac1e6757ec5..59bb37e8244c 100644
--- a/drivers/base/power/clock_ops.c
+++ b/drivers/base/power/clock_ops.c
@@ -201,7 +201,7 @@ static int __pm_clk_add(struct device *dev, const char *con_id,
if (!psd)
return -EINVAL;
- ce = kzalloc_obj(*ce, GFP_KERNEL);
+ ce = kzalloc_obj(*ce);
if (!ce)
return -ENOMEM;
@@ -282,7 +282,7 @@ int of_pm_clk_add_clks(struct device *dev)
if (count <= 0)
return -ENODEV;
- clks = kzalloc_objs(*clks, count, GFP_KERNEL);
+ clks = kzalloc_objs(*clks, count);
if (!clks)
return -ENOMEM;
diff --git a/drivers/base/power/common.c b/drivers/base/power/common.c
index 5902658ee94f..9bef9248a705 100644
--- a/drivers/base/power/common.c
+++ b/drivers/base/power/common.c
@@ -27,7 +27,7 @@ int dev_pm_get_subsys_data(struct device *dev)
{
struct pm_subsys_data *psd;
- psd = kzalloc_obj(*psd, GFP_KERNEL);
+ psd = kzalloc_obj(*psd);
if (!psd)
return -ENOMEM;
@@ -222,7 +222,7 @@ int dev_pm_domain_attach_list(struct device *dev,
if (num_pds <= 0)
return 0;
- pds = kzalloc_obj(*pds, GFP_KERNEL);
+ pds = kzalloc_obj(*pds);
if (!pds)
return -ENOMEM;
diff --git a/drivers/base/power/qos.c b/drivers/base/power/qos.c
index 31acf7ef5d87..9b69827cb0d0 100644
--- a/drivers/base/power/qos.c
+++ b/drivers/base/power/qos.c
@@ -198,11 +198,11 @@ static int dev_pm_qos_constraints_allocate(struct device *dev)
struct pm_qos_constraints *c;
struct blocking_notifier_head *n;
- qos = kzalloc_obj(*qos, GFP_KERNEL);
+ qos = kzalloc_obj(*qos);
if (!qos)
return -ENOMEM;
- n = kzalloc_objs(*n, 3, GFP_KERNEL);
+ n = kzalloc_objs(*n, 3);
if (!n) {
kfree(qos);
return -ENOMEM;
@@ -704,7 +704,7 @@ int dev_pm_qos_expose_latency_limit(struct device *dev, s32 value)
if (!device_is_registered(dev) || value < 0)
return -EINVAL;
- req = kzalloc_obj(*req, GFP_KERNEL);
+ req = kzalloc_obj(*req);
if (!req)
return -ENOMEM;
@@ -780,7 +780,7 @@ int dev_pm_qos_expose_flags(struct device *dev, s32 val)
if (!device_is_registered(dev))
return -EINVAL;
- req = kzalloc_obj(*req, GFP_KERNEL);
+ req = kzalloc_obj(*req);
if (!req)
return -ENOMEM;
@@ -919,7 +919,7 @@ int dev_pm_qos_update_user_latency_tolerance(struct device *dev, s32 val)
ret = -EINVAL;
goto out;
}
- req = kzalloc_obj(*req, GFP_KERNEL);
+ req = kzalloc_obj(*req);
if (!req) {
ret = -ENOMEM;
goto out;
diff --git a/drivers/base/power/wakeirq.c b/drivers/base/power/wakeirq.c
index 19abc6a8eaa3..ad23f0fa5d1a 100644
--- a/drivers/base/power/wakeirq.c
+++ b/drivers/base/power/wakeirq.c
@@ -55,7 +55,7 @@ int dev_pm_set_wake_irq(struct device *dev, int irq)
if (irq < 0)
return -EINVAL;
- wirq = kzalloc_obj(*wirq, GFP_KERNEL);
+ wirq = kzalloc_obj(*wirq);
if (!wirq)
return -ENOMEM;
@@ -179,7 +179,7 @@ static int __dev_pm_set_dedicated_wake_irq(struct device *dev, int irq, unsigned
if (irq < 0)
return -EINVAL;
- wirq = kzalloc_obj(*wirq, GFP_KERNEL);
+ wirq = kzalloc_obj(*wirq);
if (!wirq)
return -ENOMEM;
diff --git a/drivers/base/power/wakeup.c b/drivers/base/power/wakeup.c
index a3714a9e4e46..b8e48a023bf0 100644
--- a/drivers/base/power/wakeup.c
+++ b/drivers/base/power/wakeup.c
@@ -83,7 +83,7 @@ static struct wakeup_source *wakeup_source_create(const char *name)
const char *ws_name;
int id;
- ws = kzalloc_obj(*ws, GFP_KERNEL);
+ ws = kzalloc_obj(*ws);
if (!ws)
goto err_ws;
diff --git a/drivers/base/power/wakeup_stats.c b/drivers/base/power/wakeup_stats.c
index af888678156f..308f8bde9aa3 100644
--- a/drivers/base/power/wakeup_stats.c
+++ b/drivers/base/power/wakeup_stats.c
@@ -141,7 +141,7 @@ static struct device *wakeup_source_device_create(struct device *parent,
struct device *dev = NULL;
int retval;
- dev = kzalloc_obj(*dev, GFP_KERNEL);
+ dev = kzalloc_obj(*dev);
if (!dev) {
retval = -ENOMEM;
goto error;
diff --git a/drivers/base/regmap/regcache.c b/drivers/base/regmap/regcache.c
index 750a4c4b755e..a35f2b20298b 100644
--- a/drivers/base/regmap/regcache.c
+++ b/drivers/base/regmap/regcache.c
@@ -66,7 +66,7 @@ static int regcache_hw_init(struct regmap *map)
}
map->num_reg_defaults = count;
- map->reg_defaults = kmalloc_objs(struct reg_default, count, GFP_KERNEL);
+ map->reg_defaults = kmalloc_objs(struct reg_default, count);
if (!map->reg_defaults)
return -ENOMEM;
diff --git a/drivers/base/regmap/regmap-debugfs.c b/drivers/base/regmap/regmap-debugfs.c
index 611ab7bbdeda..5a46ce5fee72 100644
--- a/drivers/base/regmap/regmap-debugfs.c
+++ b/drivers/base/regmap/regmap-debugfs.c
@@ -130,7 +130,7 @@ static unsigned int regmap_debugfs_get_dump_start(struct regmap *map,
/* No cache entry? Start a new one */
if (!c) {
- c = kzalloc_obj(*c, GFP_KERNEL);
+ c = kzalloc_obj(*c);
if (!c) {
regmap_debugfs_free_dump_cache(map);
mutex_unlock(&map->cache_lock);
@@ -555,7 +555,7 @@ void regmap_debugfs_init(struct regmap *map)
/* If we don't have the debugfs root yet, postpone init */
if (!regmap_debugfs_root) {
struct regmap_debugfs_node *node;
- node = kzalloc_obj(*node, GFP_KERNEL);
+ node = kzalloc_obj(*node);
if (!node)
return;
node->map = map;
diff --git a/drivers/base/regmap/regmap-irq.c b/drivers/base/regmap/regmap-irq.c
index d3e9c6fef37d..07234d415b51 100644
--- a/drivers/base/regmap/regmap-irq.c
+++ b/drivers/base/regmap/regmap-irq.c
@@ -706,7 +706,7 @@ int regmap_add_irq_chip_fwnode(struct fwnode_handle *fwnode,
}
}
- d = kzalloc_obj(*d, GFP_KERNEL);
+ d = kzalloc_obj(*d);
if (!d)
return -ENOMEM;
diff --git a/drivers/base/regmap/regmap-kunit.c b/drivers/base/regmap/regmap-kunit.c
index e22bc2a0ea27..2999d9c185d5 100644
--- a/drivers/base/regmap/regmap-kunit.c
+++ b/drivers/base/regmap/regmap-kunit.c
@@ -211,7 +211,7 @@ static struct regmap *gen_regmap(struct kunit *test,
get_random_bytes(buf, size);
- *data = kzalloc_obj(**data, GFP_KERNEL);
+ *data = kzalloc_obj(**data);
if (!(*data))
goto out_free;
(*data)->vals = buf;
@@ -1759,7 +1759,7 @@ static struct regmap *gen_raw_regmap(struct kunit *test,
get_random_bytes(buf, size);
- *data = kzalloc_obj(**data, GFP_KERNEL);
+ *data = kzalloc_obj(**data);
if (!(*data))
goto out_free;
(*data)->vals = (void *)buf;
diff --git a/drivers/base/regmap/regmap-mmio.c b/drivers/base/regmap/regmap-mmio.c
index 983ffe7f035a..1de2278fa572 100644
--- a/drivers/base/regmap/regmap-mmio.c
+++ b/drivers/base/regmap/regmap-mmio.c
@@ -430,7 +430,7 @@ static struct regmap_mmio_context *regmap_mmio_gen_context(struct device *dev,
if (config->use_relaxed_mmio && config->io_port)
return ERR_PTR(-EINVAL);
- ctx = kzalloc_obj(*ctx, GFP_KERNEL);
+ ctx = kzalloc_obj(*ctx);
if (!ctx)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/base/regmap/regmap-ram.c b/drivers/base/regmap/regmap-ram.c
index 300745d400ee..0272d53fead1 100644
--- a/drivers/base/regmap/regmap-ram.c
+++ b/drivers/base/regmap/regmap-ram.c
@@ -66,11 +66,11 @@ struct regmap *__regmap_init_ram(struct device *dev,
return ERR_PTR(-EINVAL);
}
- data->read = kzalloc_objs(bool, config->max_register + 1, GFP_KERNEL);
+ data->read = kzalloc_objs(bool, config->max_register + 1);
if (!data->read)
return ERR_PTR(-ENOMEM);
- data->written = kzalloc_objs(bool, config->max_register + 1, GFP_KERNEL);
+ data->written = kzalloc_objs(bool, config->max_register + 1);
if (!data->written)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/base/regmap/regmap-raw-ram.c b/drivers/base/regmap/regmap-raw-ram.c
index 6a87df7269c6..60d6e95cdd1b 100644
--- a/drivers/base/regmap/regmap-raw-ram.c
+++ b/drivers/base/regmap/regmap-raw-ram.c
@@ -123,11 +123,11 @@ struct regmap *__regmap_init_raw_ram(struct device *dev,
return ERR_PTR(-EINVAL);
}
- data->read = kzalloc_objs(bool, config->max_register + 1, GFP_KERNEL);
+ data->read = kzalloc_objs(bool, config->max_register + 1);
if (!data->read)
return ERR_PTR(-ENOMEM);
- data->written = kzalloc_objs(bool, config->max_register + 1, GFP_KERNEL);
+ data->written = kzalloc_objs(bool, config->max_register + 1);
if (!data->written)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/base/regmap/regmap-spi-avmm.c b/drivers/base/regmap/regmap-spi-avmm.c
index d5cfa8eeffdc..692108cbc152 100644
--- a/drivers/base/regmap/regmap-spi-avmm.c
+++ b/drivers/base/regmap/regmap-spi-avmm.c
@@ -630,7 +630,7 @@ spi_avmm_bridge_ctx_gen(struct spi_device *spi)
return ERR_PTR(-EINVAL);
}
- br = kzalloc_obj(*br, GFP_KERNEL);
+ br = kzalloc_obj(*br);
if (!br)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/base/regmap/regmap-spi.c b/drivers/base/regmap/regmap-spi.c
index 56cad7763f56..b9fec387997e 100644
--- a/drivers/base/regmap/regmap-spi.c
+++ b/drivers/base/regmap/regmap-spi.c
@@ -81,7 +81,7 @@ static struct regmap_async *regmap_spi_async_alloc(void)
{
struct regmap_async_spi *async_spi;
- async_spi = kzalloc_obj(*async_spi, GFP_KERNEL);
+ async_spi = kzalloc_obj(*async_spi);
if (!async_spi)
return NULL;
diff --git a/drivers/base/regmap/regmap.c b/drivers/base/regmap/regmap.c
index 443dc31f69d3..607c1246d994 100644
--- a/drivers/base/regmap/regmap.c
+++ b/drivers/base/regmap/regmap.c
@@ -689,7 +689,7 @@ struct regmap *__regmap_init(struct device *dev,
if (!config)
goto err;
- map = kzalloc_obj(*map, GFP_KERNEL);
+ map = kzalloc_obj(*map);
if (map == NULL) {
ret = -ENOMEM;
goto err;
@@ -1117,7 +1117,7 @@ struct regmap *__regmap_init(struct device *dev,
}
}
- new = kzalloc_obj(*new, GFP_KERNEL);
+ new = kzalloc_obj(*new);
if (new == NULL) {
ret = -ENOMEM;
goto err_range;
@@ -1274,7 +1274,7 @@ int regmap_field_bulk_alloc(struct regmap *regmap,
struct regmap_field *rf;
int i;
- rf = kzalloc_objs(*rf, num_fields, GFP_KERNEL);
+ rf = kzalloc_objs(*rf, num_fields);
if (!rf)
return -ENOMEM;
@@ -1384,7 +1384,7 @@ EXPORT_SYMBOL_GPL(devm_regmap_field_free);
struct regmap_field *regmap_field_alloc(struct regmap *regmap,
struct reg_field reg_field)
{
- struct regmap_field *rm_field = kzalloc_obj(*rm_field, GFP_KERNEL);
+ struct regmap_field *rm_field = kzalloc_obj(*rm_field);
if (!rm_field)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/base/soc.c b/drivers/base/soc.c
index 89326dbbf172..c8d3db9daa2f 100644
--- a/drivers/base/soc.c
+++ b/drivers/base/soc.c
@@ -140,13 +140,13 @@ struct soc_device *soc_device_register(struct soc_device_attribute *soc_dev_attr
return NULL;
}
- soc_dev = kzalloc_obj(*soc_dev, GFP_KERNEL);
+ soc_dev = kzalloc_obj(*soc_dev);
if (!soc_dev) {
ret = -ENOMEM;
goto out1;
}
- soc_attr_groups = kzalloc_objs(*soc_attr_groups, 3, GFP_KERNEL);
+ soc_attr_groups = kzalloc_objs(*soc_attr_groups, 3);
if (!soc_attr_groups) {
ret = -ENOMEM;
goto out2;
diff --git a/drivers/base/swnode.c b/drivers/base/swnode.c
index 6fcb0c4f13ff..51320837f3a9 100644
--- a/drivers/base/swnode.c
+++ b/drivers/base/swnode.c
@@ -332,7 +332,7 @@ property_entries_dup(const struct property_entry *properties)
while (properties[n].name)
n++;
- p = kzalloc_objs(*p, n + 1, GFP_KERNEL);
+ p = kzalloc_objs(*p, n + 1);
if (!p)
return ERR_PTR(-ENOMEM);
@@ -758,7 +758,7 @@ static struct software_node *software_node_alloc(const struct property_entry *pr
if (IS_ERR(props))
return ERR_CAST(props);
- node = kzalloc_obj(*node, GFP_KERNEL);
+ node = kzalloc_obj(*node);
if (!node) {
property_entries_free(props);
return ERR_PTR(-ENOMEM);
@@ -805,7 +805,7 @@ swnode_register(const struct software_node *node, struct swnode *parent,
struct swnode *swnode;
int ret;
- swnode = kzalloc_obj(*swnode, GFP_KERNEL);
+ swnode = kzalloc_obj(*swnode);
if (!swnode)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/bcma/driver_pci_host.c b/drivers/bcma/driver_pci_host.c
index 2acf87f8de9a..f121be2ed813 100644
--- a/drivers/bcma/driver_pci_host.c
+++ b/drivers/bcma/driver_pci_host.c
@@ -399,7 +399,7 @@ void bcma_core_pci_hostmode_init(struct bcma_drv_pci *pc)
return;
}
- pc_host = kzalloc_obj(*pc_host, GFP_KERNEL);
+ pc_host = kzalloc_obj(*pc_host);
if (!pc_host) {
bcma_err(bus, "can not allocate memory");
return;
diff --git a/drivers/bcma/host_pci.c b/drivers/bcma/host_pci.c
index 55a4ad2c704a..3dc2985063f1 100644
--- a/drivers/bcma/host_pci.c
+++ b/drivers/bcma/host_pci.c
@@ -165,7 +165,7 @@ static int bcma_host_pci_probe(struct pci_dev *dev,
u32 val;
/* Alloc */
- bus = kzalloc_obj(*bus, GFP_KERNEL);
+ bus = kzalloc_obj(*bus);
if (!bus)
goto out;
diff --git a/drivers/bcma/scan.c b/drivers/bcma/scan.c
index 5e77d570767c..84742408a59c 100644
--- a/drivers/bcma/scan.c
+++ b/drivers/bcma/scan.c
@@ -479,7 +479,7 @@ int bcma_bus_scan(struct bcma_bus *bus)
while (eromptr < eromend) {
struct bcma_device *other_core;
- struct bcma_device *core = kzalloc_obj(*core, GFP_KERNEL);
+ struct bcma_device *core = kzalloc_obj(*core);
if (!core) {
err = -ENOMEM;
goto out;
diff --git a/drivers/block/aoe/aoecmd.c b/drivers/block/aoe/aoecmd.c
index 9897dc9ae678..a4744a30a8af 100644
--- a/drivers/block/aoe/aoecmd.c
+++ b/drivers/block/aoe/aoecmd.c
@@ -1699,17 +1699,17 @@ aoecmd_init(void)
ncpus = num_online_cpus();
- iocq = kzalloc_objs(struct iocq_ktio, ncpus, GFP_KERNEL);
+ iocq = kzalloc_objs(struct iocq_ktio, ncpus);
if (!iocq)
return -ENOMEM;
- kts = kzalloc_objs(struct ktstate, ncpus, GFP_KERNEL);
+ kts = kzalloc_objs(struct ktstate, ncpus);
if (!kts) {
ret = -ENOMEM;
goto kts_fail;
}
- ktiowq = kzalloc_objs(wait_queue_head_t, ncpus, GFP_KERNEL);
+ ktiowq = kzalloc_objs(wait_queue_head_t, ncpus);
if (!ktiowq) {
ret = -ENOMEM;
goto ktiowq_fail;
diff --git a/drivers/block/brd.c b/drivers/block/brd.c
index fe9b3b70f22d..00cc8122068f 100644
--- a/drivers/block/brd.c
+++ b/drivers/block/brd.c
@@ -272,7 +272,7 @@ static struct brd_device *brd_find_or_alloc_device(int i)
}
}
- brd = kzalloc_obj(*brd, GFP_KERNEL);
+ brd = kzalloc_obj(*brd);
if (!brd) {
mutex_unlock(&brd_devices_mutex);
return ERR_PTR(-ENOMEM);
diff --git a/drivers/block/drbd/drbd_bitmap.c b/drivers/block/drbd/drbd_bitmap.c
index 2735ddb58b91..65ea6ec66bfd 100644
--- a/drivers/block/drbd/drbd_bitmap.c
+++ b/drivers/block/drbd/drbd_bitmap.c
@@ -434,7 +434,7 @@ int drbd_bm_init(struct drbd_device *device)
{
struct drbd_bitmap *b = device->bitmap;
WARN_ON(b != NULL);
- b = kzalloc_obj(struct drbd_bitmap, GFP_KERNEL);
+ b = kzalloc_obj(struct drbd_bitmap);
if (!b)
return -ENOMEM;
spin_lock_init(&b->bm_lock);
diff --git a/drivers/block/drbd/drbd_main.c b/drivers/block/drbd/drbd_main.c
index 64c545f5788c..b8f0eddf7e87 100644
--- a/drivers/block/drbd/drbd_main.c
+++ b/drivers/block/drbd/drbd_main.c
@@ -2510,7 +2510,7 @@ struct drbd_resource *drbd_create_resource(const char *name)
{
struct drbd_resource *resource;
- resource = kzalloc_obj(struct drbd_resource, GFP_KERNEL);
+ resource = kzalloc_obj(struct drbd_resource);
if (!resource)
goto fail;
resource->name = kstrdup(name, GFP_KERNEL);
@@ -2543,7 +2543,7 @@ struct drbd_connection *conn_create(const char *name, struct res_opts *res_opts)
struct drbd_resource *resource;
struct drbd_connection *connection;
- connection = kzalloc_obj(struct drbd_connection, GFP_KERNEL);
+ connection = kzalloc_obj(struct drbd_connection);
if (!connection)
return NULL;
@@ -2552,7 +2552,7 @@ struct drbd_connection *conn_create(const char *name, struct res_opts *res_opts)
if (drbd_alloc_socket(&connection->meta))
goto fail;
- connection->current_epoch = kzalloc_obj(struct drbd_epoch, GFP_KERNEL);
+ connection->current_epoch = kzalloc_obj(struct drbd_epoch);
if (!connection->current_epoch)
goto fail;
@@ -2666,7 +2666,7 @@ enum drbd_ret_code drbd_create_device(struct drbd_config_context *adm_ctx, unsig
return ERR_MINOR_OR_VOLUME_EXISTS;
/* GFP_KERNEL, we are outside of all write-out paths */
- device = kzalloc_obj(struct drbd_device, GFP_KERNEL);
+ device = kzalloc_obj(struct drbd_device);
if (!device)
return ERR_NOMEM;
kref_init(&device->kref);
@@ -2725,7 +2725,7 @@ enum drbd_ret_code drbd_create_device(struct drbd_config_context *adm_ctx, unsig
INIT_LIST_HEAD(&device->peer_devices);
INIT_LIST_HEAD(&device->pending_bitmap_io);
for_each_connection(connection, resource) {
- peer_device = kzalloc_obj(struct drbd_peer_device, GFP_KERNEL);
+ peer_device = kzalloc_obj(struct drbd_peer_device);
if (!peer_device)
goto out_idr_remove_from_resource;
peer_device->connection = connection;
diff --git a/drivers/block/drbd/drbd_nl.c b/drivers/block/drbd/drbd_nl.c
index fbeb8061e549..e201f0087a0f 100644
--- a/drivers/block/drbd/drbd_nl.c
+++ b/drivers/block/drbd/drbd_nl.c
@@ -1536,7 +1536,7 @@ int drbd_adm_disk_opts(struct sk_buff *skb, struct genl_info *info)
goto out;
}
- new_disk_conf = kmalloc_obj(struct disk_conf, GFP_KERNEL);
+ new_disk_conf = kmalloc_obj(struct disk_conf);
if (!new_disk_conf) {
retcode = ERR_NOMEM;
goto fail;
@@ -1785,14 +1785,14 @@ int drbd_adm_attach(struct sk_buff *skb, struct genl_info *info)
atomic_set(&device->rs_pending_cnt, 0);
/* allocation not in the IO path, drbdsetup context */
- nbc = kzalloc_obj(struct drbd_backing_dev, GFP_KERNEL);
+ nbc = kzalloc_obj(struct drbd_backing_dev);
if (!nbc) {
retcode = ERR_NOMEM;
goto fail;
}
spin_lock_init(&nbc->md.uuid_lock);
- new_disk_conf = kzalloc_obj(struct disk_conf, GFP_KERNEL);
+ new_disk_conf = kzalloc_obj(struct disk_conf);
if (!new_disk_conf) {
retcode = ERR_NOMEM;
goto fail;
@@ -2390,7 +2390,7 @@ int drbd_adm_net_opts(struct sk_buff *skb, struct genl_info *info)
connection = adm_ctx.connection;
mutex_lock(&adm_ctx.resource->adm_mutex);
- new_net_conf = kzalloc_obj(struct net_conf, GFP_KERNEL);
+ new_net_conf = kzalloc_obj(struct net_conf);
if (!new_net_conf) {
retcode = ERR_NOMEM;
goto out;
@@ -2570,7 +2570,7 @@ int drbd_adm_connect(struct sk_buff *skb, struct genl_info *info)
}
/* allocation not in the IO path, drbdsetup / netlink process context */
- new_net_conf = kzalloc_obj(*new_net_conf, GFP_KERNEL);
+ new_net_conf = kzalloc_obj(*new_net_conf);
if (!new_net_conf) {
retcode = ERR_NOMEM;
goto fail;
@@ -2840,7 +2840,7 @@ int drbd_adm_resize(struct sk_buff *skb, struct genl_info *info)
u_size = rcu_dereference(device->ldev->disk_conf)->disk_size;
rcu_read_unlock();
if (u_size != (sector_t)rs.resize_size) {
- new_disk_conf = kmalloc_obj(struct disk_conf, GFP_KERNEL);
+ new_disk_conf = kmalloc_obj(struct disk_conf);
if (!new_disk_conf) {
retcode = ERR_NOMEM;
goto fail_ldev;
diff --git a/drivers/block/drbd/drbd_receiver.c b/drivers/block/drbd/drbd_receiver.c
index 2545f949ce45..c2dd784bc14b 100644
--- a/drivers/block/drbd/drbd_receiver.c
+++ b/drivers/block/drbd/drbd_receiver.c
@@ -3547,7 +3547,7 @@ static int receive_protocol(struct drbd_connection *connection, struct packet_in
}
}
- new_net_conf = kmalloc_obj(struct net_conf, GFP_KERNEL);
+ new_net_conf = kmalloc_obj(struct net_conf);
if (!new_net_conf)
goto disconnect;
@@ -3708,7 +3708,7 @@ static int receive_SyncParam(struct drbd_connection *connection, struct packet_i
mutex_lock(&connection->resource->conf_update);
old_net_conf = peer_device->connection->net_conf;
if (get_ldev(device)) {
- new_disk_conf = kzalloc_obj(struct disk_conf, GFP_KERNEL);
+ new_disk_conf = kzalloc_obj(struct disk_conf);
if (!new_disk_conf) {
put_ldev(device);
mutex_unlock(&connection->resource->conf_update);
@@ -3794,7 +3794,7 @@ static int receive_SyncParam(struct drbd_connection *connection, struct packet_i
}
if (verify_tfm || csums_tfm) {
- new_net_conf = kzalloc_obj(struct net_conf, GFP_KERNEL);
+ new_net_conf = kzalloc_obj(struct net_conf);
if (!new_net_conf)
goto disconnect;
diff --git a/drivers/block/loop.c b/drivers/block/loop.c
index 949bb4adc4bf..0000913f7efc 100644
--- a/drivers/block/loop.c
+++ b/drivers/block/loop.c
@@ -2009,7 +2009,7 @@ static int loop_add(int i)
int err;
err = -ENOMEM;
- lo = kzalloc_obj(*lo, GFP_KERNEL);
+ lo = kzalloc_obj(*lo);
if (!lo)
goto out;
lo->worker_tree = RB_ROOT;
diff --git a/drivers/block/nbd.c b/drivers/block/nbd.c
index d4993d7355dc..fe63f3c55d0d 100644
--- a/drivers/block/nbd.c
+++ b/drivers/block/nbd.c
@@ -1274,7 +1274,7 @@ static int nbd_add_socket(struct nbd_device *nbd, unsigned long arg,
goto put_socket;
}
- nsock = kzalloc_obj(*nsock, GFP_KERNEL);
+ nsock = kzalloc_obj(*nsock);
if (!nsock) {
err = -ENOMEM;
goto put_socket;
@@ -1322,7 +1322,7 @@ static int nbd_reconnect_socket(struct nbd_device *nbd, unsigned long arg)
if (!sock)
return err;
- args = kzalloc_obj(*args, GFP_KERNEL);
+ args = kzalloc_obj(*args);
if (!args) {
sockfd_put(sock);
return -ENOMEM;
@@ -1510,7 +1510,7 @@ static int nbd_start_device(struct nbd_device *nbd)
for (i = 0; i < num_connections; i++) {
struct recv_thread_args *args;
- args = kzalloc_obj(*args, GFP_KERNEL);
+ args = kzalloc_obj(*args);
if (!args) {
sock_shutdown(nbd);
/*
@@ -1916,7 +1916,7 @@ static struct nbd_device *nbd_dev_add(int index, unsigned int refs)
struct gendisk *disk;
int err = -ENOMEM;
- nbd = kzalloc_obj(struct nbd_device, GFP_KERNEL);
+ nbd = kzalloc_obj(struct nbd_device);
if (!nbd)
goto out;
diff --git a/drivers/block/null_blk/main.c b/drivers/block/null_blk/main.c
index 6eab18d814e5..f8c0fd57e041 100644
--- a/drivers/block/null_blk/main.c
+++ b/drivers/block/null_blk/main.c
@@ -778,7 +778,7 @@ static struct nullb_device *null_alloc_dev(void)
{
struct nullb_device *dev;
- dev = kzalloc_obj(*dev, GFP_KERNEL);
+ dev = kzalloc_obj(*dev);
if (!dev)
return NULL;
@@ -1818,7 +1818,7 @@ static int setup_queues(struct nullb *nullb)
if (g_poll_queues)
nqueues += g_poll_queues;
- nullb->queues = kzalloc_objs(struct nullb_queue, nqueues, GFP_KERNEL);
+ nullb->queues = kzalloc_objs(struct nullb_queue, nqueues);
if (!nullb->queues)
return -ENOMEM;
diff --git a/drivers/block/ps3disk.c b/drivers/block/ps3disk.c
index 4d4b6bcbfa5f..700dd0552cd7 100644
--- a/drivers/block/ps3disk.c
+++ b/drivers/block/ps3disk.c
@@ -416,7 +416,7 @@ static int ps3disk_probe(struct ps3_system_bus_device *_dev)
__set_bit(devidx, &ps3disk_mask);
mutex_unlock(&ps3disk_mask_mutex);
- priv = kzalloc_obj(*priv, GFP_KERNEL);
+ priv = kzalloc_obj(*priv);
if (!priv) {
error = -ENOMEM;
goto fail;
diff --git a/drivers/block/ps3vram.c b/drivers/block/ps3vram.c
index 01c743c092be..7844424f7b17 100644
--- a/drivers/block/ps3vram.c
+++ b/drivers/block/ps3vram.c
@@ -612,7 +612,7 @@ static int ps3vram_probe(struct ps3_system_bus_device *dev)
reports_size, xdr_lpar;
char *rest;
- priv = kzalloc_obj(*priv, GFP_KERNEL);
+ priv = kzalloc_obj(*priv);
if (!priv) {
error = -ENOMEM;
goto fail;
diff --git a/drivers/block/rbd.c b/drivers/block/rbd.c
index c9cf07416fa5..e7da06200c1e 100644
--- a/drivers/block/rbd.c
+++ b/drivers/block/rbd.c
@@ -707,7 +707,7 @@ static struct rbd_client *rbd_client_create(struct ceph_options *ceph_opts)
int ret = -ENOMEM;
dout("%s:\n", __func__);
- rbdc = kmalloc_obj(struct rbd_client, GFP_KERNEL);
+ rbdc = kmalloc_obj(struct rbd_client);
if (!rbdc)
goto out_opt;
@@ -5289,7 +5289,7 @@ static struct rbd_spec *rbd_spec_alloc(void)
{
struct rbd_spec *spec;
- spec = kzalloc_obj(*spec, GFP_KERNEL);
+ spec = kzalloc_obj(*spec);
if (!spec)
return NULL;
@@ -5352,7 +5352,7 @@ static struct rbd_device *__rbd_dev_create(struct rbd_spec *spec)
{
struct rbd_device *rbd_dev;
- rbd_dev = kzalloc_obj(*rbd_dev, GFP_KERNEL);
+ rbd_dev = kzalloc_obj(*rbd_dev);
if (!rbd_dev)
return NULL;
@@ -6509,7 +6509,7 @@ static int rbd_add_parse_args(const char *buf,
/* Initialize all rbd options to the defaults */
- pctx.opts = kzalloc_obj(*pctx.opts, GFP_KERNEL);
+ pctx.opts = kzalloc_obj(*pctx.opts);
if (!pctx.opts)
goto out_mem;
diff --git a/drivers/block/rnbd/rnbd-clt-sysfs.c b/drivers/block/rnbd/rnbd-clt-sysfs.c
index 6ca1221693ff..eb485e4c12e2 100644
--- a/drivers/block/rnbd/rnbd-clt-sysfs.c
+++ b/drivers/block/rnbd/rnbd-clt-sysfs.c
@@ -591,7 +591,7 @@ static ssize_t rnbd_clt_map_device_store(struct kobject *kobj,
opt.dest_port = &port_nr;
opt.access_mode = &access_mode;
opt.nr_poll_queues = &nr_poll_queues;
- addrs = kzalloc_objs(*addrs, ARRAY_SIZE(paths) * 2, GFP_KERNEL);
+ addrs = kzalloc_objs(*addrs, ARRAY_SIZE(paths) * 2);
if (!addrs)
return -ENOMEM;
diff --git a/drivers/block/rnbd/rnbd-clt.c b/drivers/block/rnbd/rnbd-clt.c
index 59896090d856..c60dafbe79e8 100644
--- a/drivers/block/rnbd/rnbd-clt.c
+++ b/drivers/block/rnbd/rnbd-clt.c
@@ -324,7 +324,7 @@ static struct rnbd_iu *rnbd_get_iu(struct rnbd_clt_session *sess,
struct rnbd_iu *iu;
struct rtrs_permit *permit;
- iu = kzalloc_obj(*iu, GFP_KERNEL);
+ iu = kzalloc_obj(*iu);
if (!iu)
return NULL;
@@ -541,7 +541,7 @@ static int send_msg_open(struct rnbd_clt_dev *dev, enum wait_type wait)
};
int err, errno;
- rsp = kzalloc_obj(*rsp, GFP_KERNEL);
+ rsp = kzalloc_obj(*rsp);
if (!rsp)
return -ENOMEM;
@@ -587,7 +587,7 @@ static int send_msg_sess_info(struct rnbd_clt_session *sess, enum wait_type wait
};
int err, errno;
- rsp = kzalloc_obj(*rsp, GFP_KERNEL);
+ rsp = kzalloc_obj(*rsp);
if (!rsp)
return -ENOMEM;
@@ -1564,7 +1564,7 @@ struct rnbd_clt_dev *rnbd_clt_map_device(const char *sessname,
goto put_dev;
}
- rsp = kzalloc_obj(*rsp, GFP_KERNEL);
+ rsp = kzalloc_obj(*rsp);
if (!rsp) {
ret = -ENOMEM;
goto del_dev;
diff --git a/drivers/block/rnbd/rnbd-srv.c b/drivers/block/rnbd/rnbd-srv.c
index d644e59529ca..10e8c438bb43 100644
--- a/drivers/block/rnbd/rnbd-srv.c
+++ b/drivers/block/rnbd/rnbd-srv.c
@@ -128,7 +128,7 @@ static int process_rdma(struct rnbd_srv_session *srv_sess,
trace_process_rdma(srv_sess, msg, id, datalen, usrlen);
- priv = kmalloc_obj(*priv, GFP_KERNEL);
+ priv = kmalloc_obj(*priv);
if (!priv)
return -ENOMEM;
@@ -287,7 +287,7 @@ static int create_sess(struct rtrs_srv_sess *rtrs)
return err;
}
- srv_sess = kzalloc_obj(*srv_sess, GFP_KERNEL);
+ srv_sess = kzalloc_obj(*srv_sess);
if (!srv_sess)
return -ENOMEM;
@@ -422,7 +422,7 @@ static struct rnbd_srv_sess_dev
struct rnbd_srv_sess_dev *sess_dev;
int error;
- sess_dev = kzalloc_obj(*sess_dev, GFP_KERNEL);
+ sess_dev = kzalloc_obj(*sess_dev);
if (!sess_dev)
return ERR_PTR(-ENOMEM);
@@ -441,7 +441,7 @@ static struct rnbd_srv_dev *rnbd_srv_init_srv_dev(struct block_device *bdev)
{
struct rnbd_srv_dev *dev;
- dev = kzalloc_obj(*dev, GFP_KERNEL);
+ dev = kzalloc_obj(*dev);
if (!dev)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/block/sunvdc.c b/drivers/block/sunvdc.c
index 7cf8f8899892..020bd9f1a7b6 100644
--- a/drivers/block/sunvdc.c
+++ b/drivers/block/sunvdc.c
@@ -992,7 +992,7 @@ static int vdc_port_probe(struct vio_dev *vdev, const struct vio_device_id *id)
goto err_out_release_mdesc;
}
- port = kzalloc_obj(*port, GFP_KERNEL);
+ port = kzalloc_obj(*port);
if (!port) {
err = -ENOMEM;
goto err_out_release_mdesc;
diff --git a/drivers/block/swim.c b/drivers/block/swim.c
index 3b015a9c752f..0ccc12a72388 100644
--- a/drivers/block/swim.c
+++ b/drivers/block/swim.c
@@ -896,7 +896,7 @@ static int swim_probe(struct platform_device *dev)
/* set platform driver data */
- swd = kzalloc_obj(struct swim_priv, GFP_KERNEL);
+ swd = kzalloc_obj(struct swim_priv);
if (!swd) {
ret = -ENOMEM;
goto out_release_io;
diff --git a/drivers/block/virtio_blk.c b/drivers/block/virtio_blk.c
index 1ee1ebe693bf..b1c9a27fe00f 100644
--- a/drivers/block/virtio_blk.c
+++ b/drivers/block/virtio_blk.c
@@ -991,12 +991,12 @@ static int init_vq(struct virtio_blk *vblk)
vblk->io_queues[HCTX_TYPE_READ],
vblk->io_queues[HCTX_TYPE_POLL]);
- vblk->vqs = kmalloc_objs(*vblk->vqs, num_vqs, GFP_KERNEL);
+ vblk->vqs = kmalloc_objs(*vblk->vqs, num_vqs);
if (!vblk->vqs)
return -ENOMEM;
- vqs_info = kzalloc_objs(*vqs_info, num_vqs, GFP_KERNEL);
- vqs = kmalloc_objs(*vqs, num_vqs, GFP_KERNEL);
+ vqs_info = kzalloc_objs(*vqs_info, num_vqs);
+ vqs = kmalloc_objs(*vqs, num_vqs);
if (!vqs_info || !vqs) {
err = -ENOMEM;
goto out;
@@ -1455,7 +1455,7 @@ static int virtblk_probe(struct virtio_device *vdev)
goto out;
index = err;
- vdev->priv = vblk = kmalloc_obj(*vblk, GFP_KERNEL);
+ vdev->priv = vblk = kmalloc_obj(*vblk);
if (!vblk) {
err = -ENOMEM;
goto out_free_index;
diff --git a/drivers/block/xen-blkback/xenbus.c b/drivers/block/xen-blkback/xenbus.c
index 448417097837..adfd61af86ee 100644
--- a/drivers/block/xen-blkback/xenbus.c
+++ b/drivers/block/xen-blkback/xenbus.c
@@ -628,7 +628,7 @@ static int xen_blkbk_probe(struct xenbus_device *dev,
const struct xenbus_device_id *id)
{
int err;
- struct backend_info *be = kzalloc_obj(struct backend_info, GFP_KERNEL);
+ struct backend_info *be = kzalloc_obj(struct backend_info);
/* match the pr_debug in xen_blkbk_remove */
pr_debug("%s %p %d\n", __func__, dev, dev->otherend_id);
@@ -1009,7 +1009,7 @@ static int read_per_ring_refs(struct xen_blkif_ring *ring, const char *dir)
err = -ENOMEM;
for (i = 0; i < nr_grefs * XEN_BLKIF_REQS_PER_PAGE; i++) {
- req = kzalloc_obj(*req, GFP_KERNEL);
+ req = kzalloc_obj(*req);
if (!req)
goto fail;
list_add_tail(&req->free_list, &ring->pending_free);
diff --git a/drivers/block/xen-blkfront.c b/drivers/block/xen-blkfront.c
index e8aec3857dd5..777a5ae0cd33 100644
--- a/drivers/block/xen-blkfront.c
+++ b/drivers/block/xen-blkfront.c
@@ -1980,7 +1980,7 @@ static int blkfront_probe(struct xenbus_device *dev,
}
kfree(type);
}
- info = kzalloc_obj(*info, GFP_KERNEL);
+ info = kzalloc_obj(*info);
if (!info) {
xenbus_dev_fatal(dev, -ENOMEM, "allocating info structure");
return -ENOMEM;
diff --git a/drivers/block/zram/backend_deflate.c b/drivers/block/zram/backend_deflate.c
index 7dee3aacb2d8..f92a52a720d1 100644
--- a/drivers/block/zram/backend_deflate.c
+++ b/drivers/block/zram/backend_deflate.c
@@ -54,7 +54,7 @@ static int deflate_create(struct zcomp_params *params, struct zcomp_ctx *ctx)
size_t sz;
int ret;
- zctx = kzalloc_obj(*zctx, GFP_KERNEL);
+ zctx = kzalloc_obj(*zctx);
if (!zctx)
return -ENOMEM;
diff --git a/drivers/block/zram/backend_lz4.c b/drivers/block/zram/backend_lz4.c
index 3416fec9e982..04e186614760 100644
--- a/drivers/block/zram/backend_lz4.c
+++ b/drivers/block/zram/backend_lz4.c
@@ -41,7 +41,7 @@ static int lz4_create(struct zcomp_params *params, struct zcomp_ctx *ctx)
{
struct lz4_ctx *zctx;
- zctx = kzalloc_obj(*zctx, GFP_KERNEL);
+ zctx = kzalloc_obj(*zctx);
if (!zctx)
return -ENOMEM;
@@ -51,11 +51,11 @@ static int lz4_create(struct zcomp_params *params, struct zcomp_ctx *ctx)
if (!zctx->mem)
goto error;
} else {
- zctx->dstrm = kzalloc_obj(*zctx->dstrm, GFP_KERNEL);
+ zctx->dstrm = kzalloc_obj(*zctx->dstrm);
if (!zctx->dstrm)
goto error;
- zctx->cstrm = kzalloc_obj(*zctx->cstrm, GFP_KERNEL);
+ zctx->cstrm = kzalloc_obj(*zctx->cstrm);
if (!zctx->cstrm)
goto error;
}
diff --git a/drivers/block/zram/backend_lz4hc.c b/drivers/block/zram/backend_lz4hc.c
index fd94df9193d3..f6a336acfe20 100644
--- a/drivers/block/zram/backend_lz4hc.c
+++ b/drivers/block/zram/backend_lz4hc.c
@@ -41,7 +41,7 @@ static int lz4hc_create(struct zcomp_params *params, struct zcomp_ctx *ctx)
{
struct lz4hc_ctx *zctx;
- zctx = kzalloc_obj(*zctx, GFP_KERNEL);
+ zctx = kzalloc_obj(*zctx);
if (!zctx)
return -ENOMEM;
@@ -51,11 +51,11 @@ static int lz4hc_create(struct zcomp_params *params, struct zcomp_ctx *ctx)
if (!zctx->mem)
goto error;
} else {
- zctx->dstrm = kzalloc_obj(*zctx->dstrm, GFP_KERNEL);
+ zctx->dstrm = kzalloc_obj(*zctx->dstrm);
if (!zctx->dstrm)
goto error;
- zctx->cstrm = kzalloc_obj(*zctx->cstrm, GFP_KERNEL);
+ zctx->cstrm = kzalloc_obj(*zctx->cstrm);
if (!zctx->cstrm)
goto error;
}
diff --git a/drivers/block/zram/backend_zstd.c b/drivers/block/zram/backend_zstd.c
index d9303269b90d..d00b548056dc 100644
--- a/drivers/block/zram/backend_zstd.c
+++ b/drivers/block/zram/backend_zstd.c
@@ -53,7 +53,7 @@ static int zstd_setup_params(struct zcomp_params *params)
zstd_compression_parameters prm;
struct zstd_params *zp;
- zp = kzalloc_obj(*zp, GFP_KERNEL);
+ zp = kzalloc_obj(*zp);
if (!zp)
return -ENOMEM;
@@ -122,7 +122,7 @@ static int zstd_create(struct zcomp_params *params, struct zcomp_ctx *ctx)
zstd_parameters prm;
size_t sz;
- zctx = kzalloc_obj(*zctx, GFP_KERNEL);
+ zctx = kzalloc_obj(*zctx);
if (!zctx)
return -ENOMEM;
diff --git a/drivers/block/zram/zcomp.c b/drivers/block/zram/zcomp.c
index b53fb5fbc041..a771a8ecc540 100644
--- a/drivers/block/zram/zcomp.c
+++ b/drivers/block/zram/zcomp.c
@@ -238,7 +238,7 @@ struct zcomp *zcomp_create(const char *alg, struct zcomp_params *params)
*/
BUILD_BUG_ON(ARRAY_SIZE(backends) <= 1);
- comp = kzalloc_obj(struct zcomp, GFP_KERNEL);
+ comp = kzalloc_obj(struct zcomp);
if (!comp)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/block/zram/zram_drv.c b/drivers/block/zram/zram_drv.c
index 3cc82b88b07e..bca33403fc8b 100644
--- a/drivers/block/zram/zram_drv.c
+++ b/drivers/block/zram/zram_drv.c
@@ -250,7 +250,7 @@ static struct zram_pp_ctl *init_pp_ctl(void)
struct zram_pp_ctl *ctl;
u32 idx;
- ctl = kmalloc_obj(*ctl, GFP_KERNEL);
+ ctl = kmalloc_obj(*ctl);
if (!ctl)
return NULL;
@@ -855,7 +855,7 @@ static struct zram_wb_ctl *init_wb_ctl(struct zram *zram)
struct zram_wb_ctl *wb_ctl;
int i;
- wb_ctl = kmalloc_obj(*wb_ctl, GFP_KERNEL);
+ wb_ctl = kmalloc_obj(*wb_ctl);
if (!wb_ctl)
return NULL;
@@ -3079,7 +3079,7 @@ static int zram_add(void)
struct zram *zram;
int ret, device_id;
- zram = kzalloc_obj(struct zram, GFP_KERNEL);
+ zram = kzalloc_obj(struct zram);
if (!zram)
return -ENOMEM;
diff --git a/drivers/bluetooth/bpa10x.c b/drivers/bluetooth/bpa10x.c
index af7cd7b217ca..2ae38a321c4b 100644
--- a/drivers/bluetooth/bpa10x.c
+++ b/drivers/bluetooth/bpa10x.c
@@ -284,7 +284,7 @@ static int bpa10x_send_frame(struct hci_dev *hdev, struct sk_buff *skb)
switch (hci_skb_pkt_type(skb)) {
case HCI_COMMAND_PKT:
- dr = kmalloc_obj(*dr, GFP_KERNEL);
+ dr = kmalloc_obj(*dr);
if (!dr) {
usb_free_urb(urb);
return -ENOMEM;
diff --git a/drivers/bluetooth/btintel.c b/drivers/bluetooth/btintel.c
index b810c748f4d5..246b6205c5e0 100644
--- a/drivers/bluetooth/btintel.c
+++ b/drivers/bluetooth/btintel.c
@@ -871,7 +871,7 @@ struct regmap *btintel_regmap_init(struct hci_dev *hdev, u16 opcode_read,
bt_dev_info(hdev, "regmap: Init R%x-W%x region", opcode_read,
opcode_write);
- ctx = kzalloc_obj(*ctx, GFP_KERNEL);
+ ctx = kzalloc_obj(*ctx);
if (!ctx)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/bluetooth/btintel_pcie.c b/drivers/bluetooth/btintel_pcie.c
index 54a3705e9063..37b744e35bc4 100644
--- a/drivers/bluetooth/btintel_pcie.c
+++ b/drivers/bluetooth/btintel_pcie.c
@@ -1665,7 +1665,7 @@ static int btintel_pcie_setup_txq_bufs(struct btintel_pcie_data *data,
struct data_buf *buf;
/* Allocate the same number of buffers as the descriptor */
- txq->bufs = kmalloc_objs(*buf, txq->count, GFP_KERNEL);
+ txq->bufs = kmalloc_objs(*buf, txq->count);
if (!txq->bufs)
return -ENOMEM;
@@ -1709,7 +1709,7 @@ static int btintel_pcie_setup_rxq_bufs(struct btintel_pcie_data *data,
struct data_buf *buf;
/* Allocate the same number of buffers as the descriptor */
- rxq->bufs = kmalloc_objs(*buf, rxq->count, GFP_KERNEL);
+ rxq->bufs = kmalloc_objs(*buf, rxq->count);
if (!rxq->bufs)
return -ENOMEM;
diff --git a/drivers/bluetooth/btmrvl_debugfs.c b/drivers/bluetooth/btmrvl_debugfs.c
index 3ffb54501b11..9b3e768c09f4 100644
--- a/drivers/bluetooth/btmrvl_debugfs.c
+++ b/drivers/bluetooth/btmrvl_debugfs.c
@@ -144,7 +144,7 @@ void btmrvl_debugfs_init(struct hci_dev *hdev)
if (!hdev->debugfs)
return;
- dbg = kzalloc_obj(*dbg, GFP_KERNEL);
+ dbg = kzalloc_obj(*dbg);
priv->debugfs_data = dbg;
if (!dbg) {
diff --git a/drivers/bluetooth/btmrvl_main.c b/drivers/bluetooth/btmrvl_main.c
index 78be98c029bf..d6f0ad0b4b6e 100644
--- a/drivers/bluetooth/btmrvl_main.c
+++ b/drivers/bluetooth/btmrvl_main.c
@@ -710,13 +710,13 @@ struct btmrvl_private *btmrvl_add_card(void *card)
{
struct btmrvl_private *priv;
- priv = kzalloc_obj(*priv, GFP_KERNEL);
+ priv = kzalloc_obj(*priv);
if (!priv) {
BT_ERR("Can not allocate priv");
goto err_priv;
}
- priv->adapter = kzalloc_obj(*priv->adapter, GFP_KERNEL);
+ priv->adapter = kzalloc_obj(*priv->adapter);
if (!priv->adapter) {
BT_ERR("Allocate buffer for btmrvl_adapter failed!");
goto err_adapter;
diff --git a/drivers/bluetooth/btmtk.c b/drivers/bluetooth/btmtk.c
index 9e75e06607b4..fa7533578f85 100644
--- a/drivers/bluetooth/btmtk.c
+++ b/drivers/bluetooth/btmtk.c
@@ -537,7 +537,7 @@ static int btmtk_usb_submit_wmt_recv_urb(struct hci_dev *hdev)
if (!urb)
return -ENOMEM;
- dr = kmalloc_obj(*dr, GFP_KERNEL);
+ dr = kmalloc_obj(*dr);
if (!dr) {
usb_free_urb(urb);
return -ENOMEM;
diff --git a/drivers/bluetooth/btrsi.c b/drivers/bluetooth/btrsi.c
index 9710655472fe..c68dd2fba01c 100644
--- a/drivers/bluetooth/btrsi.c
+++ b/drivers/bluetooth/btrsi.c
@@ -112,7 +112,7 @@ static int rsi_hci_attach(void *priv, struct rsi_proto_ops *ops)
struct hci_dev *hdev;
int err = 0;
- h_adapter = kzalloc_obj(*h_adapter, GFP_KERNEL);
+ h_adapter = kzalloc_obj(*h_adapter);
if (!h_adapter)
return -ENOMEM;
diff --git a/drivers/bluetooth/btrtl.c b/drivers/bluetooth/btrtl.c
index d8a29e8ff524..62f9d4df3a4f 100644
--- a/drivers/bluetooth/btrtl.c
+++ b/drivers/bluetooth/btrtl.c
@@ -524,7 +524,7 @@ static int btrtl_parse_section(struct hci_dev *hdev,
break;
}
- subsec = kzalloc_obj(*subsec, GFP_KERNEL);
+ subsec = kzalloc_obj(*subsec);
if (!subsec)
return -ENOMEM;
subsec->opcode = opcode;
@@ -828,7 +828,7 @@ static int rtl_download_firmware(struct hci_dev *hdev,
struct sk_buff *skb;
struct hci_rp_read_local_version *rp;
- dl_cmd = kmalloc_obj(*dl_cmd, GFP_KERNEL);
+ dl_cmd = kmalloc_obj(*dl_cmd);
if (!dl_cmd)
return -ENOMEM;
@@ -1077,7 +1077,7 @@ struct btrtl_device_info *btrtl_initialize(struct hci_dev *hdev,
u8 key_id;
u8 reg_val[2];
- btrtl_dev = kzalloc_obj(*btrtl_dev, GFP_KERNEL);
+ btrtl_dev = kzalloc_obj(*btrtl_dev);
if (!btrtl_dev) {
ret = -ENOMEM;
goto err_alloc;
diff --git a/drivers/bluetooth/btusb.c b/drivers/bluetooth/btusb.c
index 21fd5e7914f6..a1c5eb993e47 100644
--- a/drivers/bluetooth/btusb.c
+++ b/drivers/bluetooth/btusb.c
@@ -2071,7 +2071,7 @@ static struct urb *alloc_ctrl_urb(struct hci_dev *hdev, struct sk_buff *skb)
if (!urb)
return ERR_PTR(-ENOMEM);
- dr = kmalloc_obj(*dr, GFP_KERNEL);
+ dr = kmalloc_obj(*dr);
if (!dr) {
usb_free_urb(urb);
return ERR_PTR(-ENOMEM);
@@ -4059,7 +4059,7 @@ static int btusb_probe(struct usb_interface *intf,
return -ENODEV;
}
- data = kzalloc_obj(*data, GFP_KERNEL);
+ data = kzalloc_obj(*data);
if (!data)
return -ENOMEM;
diff --git a/drivers/bluetooth/hci_ag6xx.c b/drivers/bluetooth/hci_ag6xx.c
index 1ee31387c0be..3729d956782d 100644
--- a/drivers/bluetooth/hci_ag6xx.c
+++ b/drivers/bluetooth/hci_ag6xx.c
@@ -36,7 +36,7 @@ static int ag6xx_open(struct hci_uart *hu)
BT_DBG("hu %p", hu);
- ag6xx = kzalloc_obj(*ag6xx, GFP_KERNEL);
+ ag6xx = kzalloc_obj(*ag6xx);
if (!ag6xx)
return -ENOMEM;
diff --git a/drivers/bluetooth/hci_aml.c b/drivers/bluetooth/hci_aml.c
index 0d874aaca316..959d9e67b669 100644
--- a/drivers/bluetooth/hci_aml.c
+++ b/drivers/bluetooth/hci_aml.c
@@ -541,7 +541,7 @@ static int aml_open(struct hci_uart *hu)
return -EOPNOTSUPP;
}
- aml_data = kzalloc_obj(*aml_data, GFP_KERNEL);
+ aml_data = kzalloc_obj(*aml_data);
if (!aml_data)
return -ENOMEM;
diff --git a/drivers/bluetooth/hci_ath.c b/drivers/bluetooth/hci_ath.c
index f8d794ea81ef..fa679ad0acdf 100644
--- a/drivers/bluetooth/hci_ath.c
+++ b/drivers/bluetooth/hci_ath.c
@@ -101,7 +101,7 @@ static int ath_open(struct hci_uart *hu)
if (!hci_uart_has_flow_control(hu))
return -EOPNOTSUPP;
- ath = kzalloc_obj(*ath, GFP_KERNEL);
+ ath = kzalloc_obj(*ath);
if (!ath)
return -ENOMEM;
diff --git a/drivers/bluetooth/hci_bcm.c b/drivers/bluetooth/hci_bcm.c
index 97068809a713..1a4fc3882fd2 100644
--- a/drivers/bluetooth/hci_bcm.c
+++ b/drivers/bluetooth/hci_bcm.c
@@ -448,7 +448,7 @@ static int bcm_open(struct hci_uart *hu)
if (!hci_uart_has_flow_control(hu))
return -EOPNOTSUPP;
- bcm = kzalloc_obj(*bcm, GFP_KERNEL);
+ bcm = kzalloc_obj(*bcm);
if (!bcm)
return -ENOMEM;
diff --git a/drivers/bluetooth/hci_bcsp.c b/drivers/bluetooth/hci_bcsp.c
index 09416cc468d4..b386f91d8b46 100644
--- a/drivers/bluetooth/hci_bcsp.c
+++ b/drivers/bluetooth/hci_bcsp.c
@@ -716,7 +716,7 @@ static int bcsp_open(struct hci_uart *hu)
BT_DBG("hu %p", hu);
- bcsp = kzalloc_obj(*bcsp, GFP_KERNEL);
+ bcsp = kzalloc_obj(*bcsp);
if (!bcsp)
return -ENOMEM;
diff --git a/drivers/bluetooth/hci_h4.c b/drivers/bluetooth/hci_h4.c
index 2ee2eef954e0..07cc2a79a77b 100644
--- a/drivers/bluetooth/hci_h4.c
+++ b/drivers/bluetooth/hci_h4.c
@@ -44,7 +44,7 @@ static int h4_open(struct hci_uart *hu)
BT_DBG("hu %p", hu);
- h4 = kzalloc_obj(*h4, GFP_KERNEL);
+ h4 = kzalloc_obj(*h4);
if (!h4)
return -ENOMEM;
diff --git a/drivers/bluetooth/hci_h5.c b/drivers/bluetooth/hci_h5.c
index c31403acb9df..cfdf75dc2847 100644
--- a/drivers/bluetooth/hci_h5.c
+++ b/drivers/bluetooth/hci_h5.c
@@ -222,7 +222,7 @@ static int h5_open(struct hci_uart *hu)
if (hu->serdev) {
h5 = serdev_device_get_drvdata(hu->serdev);
} else {
- h5 = kzalloc_obj(*h5, GFP_KERNEL);
+ h5 = kzalloc_obj(*h5);
if (!h5)
return -ENOMEM;
}
@@ -1069,7 +1069,7 @@ static int h5_btrtl_resume(struct h5 *h5)
if (test_bit(H5_WAKEUP_DISABLE, &h5->flags)) {
struct h5_btrtl_reprobe *reprobe;
- reprobe = kzalloc_obj(*reprobe, GFP_KERNEL);
+ reprobe = kzalloc_obj(*reprobe);
if (!reprobe)
return -ENOMEM;
diff --git a/drivers/bluetooth/hci_intel.c b/drivers/bluetooth/hci_intel.c
index 989e87f24273..c31105b91e47 100644
--- a/drivers/bluetooth/hci_intel.c
+++ b/drivers/bluetooth/hci_intel.c
@@ -384,7 +384,7 @@ static int intel_open(struct hci_uart *hu)
if (!hci_uart_has_flow_control(hu))
return -EOPNOTSUPP;
- intel = kzalloc_obj(*intel, GFP_KERNEL);
+ intel = kzalloc_obj(*intel);
if (!intel)
return -ENOMEM;
diff --git a/drivers/bluetooth/hci_ldisc.c b/drivers/bluetooth/hci_ldisc.c
index 7638bf6d6b09..71c1997a0f73 100644
--- a/drivers/bluetooth/hci_ldisc.c
+++ b/drivers/bluetooth/hci_ldisc.c
@@ -491,7 +491,7 @@ static int hci_uart_tty_open(struct tty_struct *tty)
if (tty->ops->write == NULL)
return -EOPNOTSUPP;
- hu = kzalloc_obj(*hu, GFP_KERNEL);
+ hu = kzalloc_obj(*hu);
if (!hu) {
BT_ERR("Can't allocate control structure");
return -ENFILE;
diff --git a/drivers/bluetooth/hci_ll.c b/drivers/bluetooth/hci_ll.c
index 9c3b24d90462..91acf24f1ef5 100644
--- a/drivers/bluetooth/hci_ll.c
+++ b/drivers/bluetooth/hci_ll.c
@@ -114,7 +114,7 @@ static int ll_open(struct hci_uart *hu)
BT_DBG("hu %p", hu);
- ll = kzalloc_obj(*ll, GFP_KERNEL);
+ ll = kzalloc_obj(*ll);
if (!ll)
return -ENOMEM;
diff --git a/drivers/bluetooth/hci_mrvl.c b/drivers/bluetooth/hci_mrvl.c
index 8e8a283e4cb9..516b8f74c434 100644
--- a/drivers/bluetooth/hci_mrvl.c
+++ b/drivers/bluetooth/hci_mrvl.c
@@ -64,7 +64,7 @@ static int mrvl_open(struct hci_uart *hu)
if (!hci_uart_has_flow_control(hu))
return -EOPNOTSUPP;
- mrvl = kzalloc_obj(*mrvl, GFP_KERNEL);
+ mrvl = kzalloc_obj(*mrvl);
if (!mrvl)
return -ENOMEM;
diff --git a/drivers/bluetooth/hci_qca.c b/drivers/bluetooth/hci_qca.c
index cac861991b52..5b02e7c3f56d 100644
--- a/drivers/bluetooth/hci_qca.c
+++ b/drivers/bluetooth/hci_qca.c
@@ -585,7 +585,7 @@ static int qca_open(struct hci_uart *hu)
if (!hci_uart_has_flow_control(hu))
return -EOPNOTSUPP;
- qca = kzalloc_obj(*qca, GFP_KERNEL);
+ qca = kzalloc_obj(*qca);
if (!qca)
return -ENOMEM;
diff --git a/drivers/bluetooth/hci_vhci.c b/drivers/bluetooth/hci_vhci.c
index 6e653bb8efcc..2762eacf7f20 100644
--- a/drivers/bluetooth/hci_vhci.c
+++ b/drivers/bluetooth/hci_vhci.c
@@ -640,7 +640,7 @@ static int vhci_open(struct inode *inode, struct file *file)
{
struct vhci_data *data;
- data = kzalloc_obj(*data, GFP_KERNEL);
+ data = kzalloc_obj(*data);
if (!data)
return -ENOMEM;
diff --git a/drivers/bluetooth/virtio_bt.c b/drivers/bluetooth/virtio_bt.c
index bc33d2755ced..76d61af8a275 100644
--- a/drivers/bluetooth/virtio_bt.c
+++ b/drivers/bluetooth/virtio_bt.c
@@ -275,7 +275,7 @@ static int virtbt_probe(struct virtio_device *vdev)
return -EINVAL;
}
- vbt = kzalloc_obj(*vbt, GFP_KERNEL);
+ vbt = kzalloc_obj(*vbt);
if (!vbt)
return -ENOMEM;
diff --git a/drivers/bus/arm-cci.c b/drivers/bus/arm-cci.c
index bc7698cbf5e1..7f2baf057128 100644
--- a/drivers/bus/arm-cci.c
+++ b/drivers/bus/arm-cci.c
@@ -451,7 +451,7 @@ static int cci_probe_ports(struct device_node *np)
nb_cci_ports = cci_config->nb_ace + cci_config->nb_ace_lite;
- ports = kzalloc_objs(*ports, nb_cci_ports, GFP_KERNEL);
+ ports = kzalloc_objs(*ports, nb_cci_ports);
if (!ports)
return -ENOMEM;
diff --git a/drivers/bus/fsl-mc/fsl-mc-bus.c b/drivers/bus/fsl-mc/fsl-mc-bus.c
index 3e12cde4443b..c117745cf206 100644
--- a/drivers/bus/fsl-mc/fsl-mc-bus.c
+++ b/drivers/bus/fsl-mc/fsl-mc-bus.c
@@ -672,7 +672,7 @@ static int fsl_mc_device_get_mmio_regions(struct fsl_mc_device *mc_dev,
return -EINVAL;
}
- regions = kmalloc_objs(regions[0], obj_desc->region_count, GFP_KERNEL);
+ regions = kmalloc_objs(regions[0], obj_desc->region_count);
if (!regions)
return -ENOMEM;
@@ -787,7 +787,7 @@ int fsl_mc_device_add(struct fsl_mc_obj_desc *obj_desc,
/*
* Allocate an MC bus device object:
*/
- mc_bus = kzalloc_obj(*mc_bus, GFP_KERNEL);
+ mc_bus = kzalloc_obj(*mc_bus);
if (!mc_bus)
return -ENOMEM;
@@ -797,7 +797,7 @@ int fsl_mc_device_add(struct fsl_mc_obj_desc *obj_desc,
/*
* Allocate a regular fsl_mc_device object:
*/
- mc_dev = kzalloc_obj(*mc_dev, GFP_KERNEL);
+ mc_dev = kzalloc_obj(*mc_dev);
if (!mc_dev)
return -ENOMEM;
}
diff --git a/drivers/bus/fsl-mc/fsl-mc-uapi.c b/drivers/bus/fsl-mc/fsl-mc-uapi.c
index db20ea5ade01..aaa14f17aef4 100644
--- a/drivers/bus/fsl-mc/fsl-mc-uapi.c
+++ b/drivers/bus/fsl-mc/fsl-mc-uapi.c
@@ -483,7 +483,7 @@ static int fsl_mc_uapi_dev_open(struct inode *inode, struct file *filep)
struct fsl_mc_bus *mc_bus;
int error;
- priv_data = kzalloc_obj(*priv_data, GFP_KERNEL);
+ priv_data = kzalloc_obj(*priv_data);
if (!priv_data)
return -ENOMEM;
diff --git a/drivers/bus/mhi/ep/main.c b/drivers/bus/mhi/ep/main.c
index 48f76438a138..a27261914bd1 100644
--- a/drivers/bus/mhi/ep/main.c
+++ b/drivers/bus/mhi/ep/main.c
@@ -1275,7 +1275,7 @@ static struct mhi_ep_device *mhi_ep_alloc_device(struct mhi_ep_cntrl *mhi_cntrl,
struct mhi_ep_device *mhi_dev;
struct device *dev;
- mhi_dev = kzalloc_obj(*mhi_dev, GFP_KERNEL);
+ mhi_dev = kzalloc_obj(*mhi_dev);
if (!mhi_dev)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/bus/mhi/host/boot.c b/drivers/bus/mhi/host/boot.c
index b295992476e4..7845fc7fe6c2 100644
--- a/drivers/bus/mhi/host/boot.c
+++ b/drivers/bus/mhi/host/boot.c
@@ -333,12 +333,12 @@ static int mhi_alloc_bhi_buffer(struct mhi_controller *mhi_cntrl,
struct image_info *img_info;
struct mhi_buf *mhi_buf;
- img_info = kzalloc_obj(*img_info, GFP_KERNEL);
+ img_info = kzalloc_obj(*img_info);
if (!img_info)
return -ENOMEM;
/* Allocate memory for entry */
- img_info->mhi_buf = kzalloc_obj(*img_info->mhi_buf, GFP_KERNEL);
+ img_info->mhi_buf = kzalloc_obj(*img_info->mhi_buf);
if (!img_info->mhi_buf)
goto error_alloc_mhi_buf;
@@ -375,7 +375,7 @@ int mhi_alloc_bhie_table(struct mhi_controller *mhi_cntrl,
struct image_info *img_info;
struct mhi_buf *mhi_buf;
- img_info = kzalloc_obj(*img_info, GFP_KERNEL);
+ img_info = kzalloc_obj(*img_info);
if (!img_info)
return -ENOMEM;
diff --git a/drivers/bus/mhi/host/init.c b/drivers/bus/mhi/host/init.c
index fa62f8219510..790b36286813 100644
--- a/drivers/bus/mhi/host/init.c
+++ b/drivers/bus/mhi/host/init.c
@@ -313,7 +313,7 @@ static int mhi_init_dev_ctxt(struct mhi_controller *mhi_cntrl)
atomic_set(&mhi_cntrl->dev_wake, 0);
atomic_set(&mhi_cntrl->pending_pkts, 0);
- mhi_ctxt = kzalloc_obj(*mhi_ctxt, GFP_KERNEL);
+ mhi_ctxt = kzalloc_obj(*mhi_ctxt);
if (!mhi_ctxt)
return -ENOMEM;
@@ -1095,7 +1095,7 @@ struct mhi_controller *mhi_alloc_controller(void)
{
struct mhi_controller *mhi_cntrl;
- mhi_cntrl = kzalloc_obj(*mhi_cntrl, GFP_KERNEL);
+ mhi_cntrl = kzalloc_obj(*mhi_cntrl);
return mhi_cntrl;
}
@@ -1232,7 +1232,7 @@ struct mhi_device *mhi_alloc_device(struct mhi_controller *mhi_cntrl)
struct mhi_device *mhi_dev;
struct device *dev;
- mhi_dev = kzalloc_obj(*mhi_dev, GFP_KERNEL);
+ mhi_dev = kzalloc_obj(*mhi_dev);
if (!mhi_dev)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/bus/mips_cdmm.c b/drivers/bus/mips_cdmm.c
index 7d43ecc9d2fa..9804921dfe3d 100644
--- a/drivers/bus/mips_cdmm.c
+++ b/drivers/bus/mips_cdmm.c
@@ -541,7 +541,7 @@ static void mips_cdmm_bus_discover(struct mips_cdmm_bus *bus)
(drb + size + 1) * CDMM_DRB_SIZE - 1,
type, rev);
- dev = kzalloc_obj(*dev, GFP_KERNEL);
+ dev = kzalloc_obj(*dev);
if (!dev)
break;
diff --git a/drivers/bus/moxtet.c b/drivers/bus/moxtet.c
index e7caa6b63318..0d68c1a9f493 100644
--- a/drivers/bus/moxtet.c
+++ b/drivers/bus/moxtet.c
@@ -145,7 +145,7 @@ moxtet_alloc_device(struct moxtet *moxtet)
if (!get_device(moxtet->dev))
return NULL;
- dev = kzalloc_obj(*dev, GFP_KERNEL);
+ dev = kzalloc_obj(*dev);
if (!dev) {
put_device(moxtet->dev);
return NULL;
diff --git a/drivers/bus/omap_l3_smx.c b/drivers/bus/omap_l3_smx.c
index 63b64da191b1..ee260c1fc087 100644
--- a/drivers/bus/omap_l3_smx.c
+++ b/drivers/bus/omap_l3_smx.c
@@ -215,7 +215,7 @@ static int omap3_l3_probe(struct platform_device *pdev)
struct resource *res;
int ret;
- l3 = kzalloc_obj(*l3, GFP_KERNEL);
+ l3 = kzalloc_obj(*l3);
if (!l3)
return -ENOMEM;
diff --git a/drivers/bus/stm32_firewall.c b/drivers/bus/stm32_firewall.c
index aa282083c8cd..7e7afe8007db 100644
--- a/drivers/bus/stm32_firewall.c
+++ b/drivers/bus/stm32_firewall.c
@@ -260,7 +260,7 @@ int stm32_firewall_populate_bus(struct stm32_firewall_controller *firewall_contr
return -EINVAL;
}
- firewalls = kzalloc_objs(*firewalls, len, GFP_KERNEL);
+ firewalls = kzalloc_objs(*firewalls, len);
if (!firewalls) {
of_node_put(child);
return -ENOMEM;
diff --git a/drivers/bus/sunxi-rsb.c b/drivers/bus/sunxi-rsb.c
index df9c0a0adfbb..b4f2c64ac181 100644
--- a/drivers/bus/sunxi-rsb.c
+++ b/drivers/bus/sunxi-rsb.c
@@ -205,7 +205,7 @@ static struct sunxi_rsb_device *sunxi_rsb_device_create(struct sunxi_rsb *rsb,
int err;
struct sunxi_rsb_device *rdev;
- rdev = kzalloc_obj(*rdev, GFP_KERNEL);
+ rdev = kzalloc_obj(*rdev);
if (!rdev)
return ERR_PTR(-ENOMEM);
@@ -477,7 +477,7 @@ static struct sunxi_rsb_ctx *regmap_sunxi_rsb_init_ctx(struct sunxi_rsb_device *
return ERR_PTR(-EINVAL);
}
- ctx = kzalloc_obj(*ctx, GFP_KERNEL);
+ ctx = kzalloc_obj(*ctx);
if (!ctx)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/bus/ti-sysc.c b/drivers/bus/ti-sysc.c
index 931948d05a03..a5b9507de37c 100644
--- a/drivers/bus/ti-sysc.c
+++ b/drivers/bus/ti-sysc.c
@@ -354,7 +354,7 @@ static int sysc_add_named_clock_from_child(struct sysc *ddata,
* limit for clk_get(). If cl ever needs to be freed, it should be done
* with clkdev_drop().
*/
- cl = kzalloc_obj(*cl, GFP_KERNEL);
+ cl = kzalloc_obj(*cl);
if (!cl)
return -ENOMEM;
@@ -2470,7 +2470,7 @@ static void sysc_add_restored(struct sysc *ddata)
{
struct sysc_module *restored_module;
- restored_module = kzalloc_obj(*restored_module, GFP_KERNEL);
+ restored_module = kzalloc_obj(*restored_module);
if (!restored_module)
return;
@@ -2953,7 +2953,7 @@ static int sysc_add_disabled(unsigned long base)
{
struct sysc_address *disabled_module;
- disabled_module = kzalloc_obj(*disabled_module, GFP_KERNEL);
+ disabled_module = kzalloc_obj(*disabled_module);
if (!disabled_module)
return -ENOMEM;
@@ -2984,7 +2984,7 @@ static int sysc_init_static_data(struct sysc *ddata)
if (sysc_soc)
return 0;
- sysc_soc = kzalloc_obj(*sysc_soc, GFP_KERNEL);
+ sysc_soc = kzalloc_obj(*sysc_soc);
if (!sysc_soc)
return -ENOMEM;
diff --git a/drivers/cdrom/cdrom.c b/drivers/cdrom/cdrom.c
index fe0f633bc655..fc049612d6dc 100644
--- a/drivers/cdrom/cdrom.c
+++ b/drivers/cdrom/cdrom.c
@@ -1318,7 +1318,7 @@ static int cdrom_slot_status(struct cdrom_device_info *cdi, int slot)
if (cdi->sanyo_slot)
return CDS_NO_INFO;
- info = kmalloc_obj(*info, GFP_KERNEL);
+ info = kmalloc_obj(*info);
if (!info)
return -ENOMEM;
@@ -1347,7 +1347,7 @@ int cdrom_number_of_slots(struct cdrom_device_info *cdi)
/* cdrom_read_mech_status requires a valid value for capacity: */
cdi->capacity = 0;
- info = kmalloc_obj(*info, GFP_KERNEL);
+ info = kmalloc_obj(*info);
if (!info)
return -ENOMEM;
@@ -1406,7 +1406,7 @@ static int cdrom_select_disc(struct cdrom_device_info *cdi, int slot)
return cdrom_load_unload(cdi, -1);
}
- info = kmalloc_obj(*info, GFP_KERNEL);
+ info = kmalloc_obj(*info);
if (!info)
return -ENOMEM;
@@ -2311,7 +2311,7 @@ static int cdrom_ioctl_media_changed(struct cdrom_device_info *cdi,
/* Prevent arg from speculatively bypassing the length check */
arg = array_index_nospec(arg, cdi->capacity);
- info = kmalloc_obj(*info, GFP_KERNEL);
+ info = kmalloc_obj(*info);
if (!info)
return -ENOMEM;
diff --git a/drivers/cdrom/gdrom.c b/drivers/cdrom/gdrom.c
index 1a59241cbd23..4ba4dd06cbf4 100644
--- a/drivers/cdrom/gdrom.c
+++ b/drivers/cdrom/gdrom.c
@@ -227,7 +227,7 @@ static char gdrom_execute_diagnostic(void)
static int gdrom_preparedisk_cmd(void)
{
struct packet_command *spin_command;
- spin_command = kzalloc_obj(struct packet_command, GFP_KERNEL);
+ spin_command = kzalloc_obj(struct packet_command);
if (!spin_command)
return -ENOMEM;
spin_command->cmd[0] = 0x70;
@@ -261,7 +261,7 @@ static int gdrom_readtoc_cmd(struct gdromtoc *toc, int session)
struct packet_command *toc_command;
int err = 0;
- toc_command = kzalloc_obj(struct packet_command, GFP_KERNEL);
+ toc_command = kzalloc_obj(struct packet_command);
if (!toc_command)
return -ENOMEM;
tocsize = sizeof(struct gdromtoc);
@@ -415,7 +415,7 @@ static int gdrom_getsense(short *bufstring)
int sense_key;
int err = -EIO;
- sense_command = kzalloc_obj(struct packet_command, GFP_KERNEL);
+ sense_command = kzalloc_obj(struct packet_command);
if (!sense_command)
return -ENOMEM;
sense_command->cmd[0] = 0x13;
@@ -574,7 +574,7 @@ static blk_status_t gdrom_readdisk_dma(struct request *req)
struct packet_command *read_command;
unsigned long timeout;
- read_command = kzalloc_obj(struct packet_command, GFP_KERNEL);
+ read_command = kzalloc_obj(struct packet_command);
if (!read_command)
return BLK_STS_RESOURCE;
@@ -656,7 +656,7 @@ static int gdrom_outputversion(void)
int err = -ENOMEM;
/* query device ID */
- id = kzalloc_obj(struct gdrom_id, GFP_KERNEL);
+ id = kzalloc_obj(struct gdrom_id);
if (!id)
return err;
gdrom_identifydevice(id);
@@ -769,7 +769,7 @@ static int probe_gdrom(struct platform_device *devptr)
pr_info("Registered with major number %d\n",
gdrom_major);
/* Specify basic properties of drive */
- gd.cd_info = kzalloc_obj(struct cdrom_device_info, GFP_KERNEL);
+ gd.cd_info = kzalloc_obj(struct cdrom_device_info);
if (!gd.cd_info) {
err = -ENOMEM;
goto probe_fail_no_mem;
@@ -803,7 +803,7 @@ static int probe_gdrom(struct platform_device *devptr)
if (err)
goto probe_fail_free_irqs;
- gd.toc = kzalloc_obj(struct gdromtoc, GFP_KERNEL);
+ gd.toc = kzalloc_obj(struct gdromtoc);
if (!gd.toc) {
err = -ENOMEM;
goto probe_fail_free_irqs;
diff --git a/drivers/cdx/cdx.c b/drivers/cdx/cdx.c
index 236403a269b6..9196dc50a48d 100644
--- a/drivers/cdx/cdx.c
+++ b/drivers/cdx/cdx.c
@@ -789,7 +789,7 @@ int cdx_device_add(struct cdx_dev_params *dev_params)
struct cdx_device *cdx_dev;
int ret, i;
- cdx_dev = kzalloc_obj(*cdx_dev, GFP_KERNEL);
+ cdx_dev = kzalloc_obj(*cdx_dev);
if (!cdx_dev)
return -ENOMEM;
@@ -876,7 +876,7 @@ struct device *cdx_bus_add(struct cdx_controller *cdx, u8 bus_num)
struct cdx_device *cdx_dev;
int ret;
- cdx_dev = kzalloc_obj(*cdx_dev, GFP_KERNEL);
+ cdx_dev = kzalloc_obj(*cdx_dev);
if (!cdx_dev)
return NULL;
diff --git a/drivers/cdx/controller/cdx_controller.c b/drivers/cdx/controller/cdx_controller.c
index abd8f9cdb0b5..280bb7490c0f 100644
--- a/drivers/cdx/controller/cdx_controller.c
+++ b/drivers/cdx/controller/cdx_controller.c
@@ -168,7 +168,7 @@ static int xlnx_cdx_probe(struct platform_device *pdev)
struct cdx_mcdi *cdx_mcdi;
int ret;
- cdx_mcdi = kzalloc_obj(*cdx_mcdi, GFP_KERNEL);
+ cdx_mcdi = kzalloc_obj(*cdx_mcdi);
if (!cdx_mcdi)
return -ENOMEM;
@@ -181,7 +181,7 @@ static int xlnx_cdx_probe(struct platform_device *pdev)
goto mcdi_init_fail;
}
- cdx = kzalloc_obj(*cdx, GFP_KERNEL);
+ cdx = kzalloc_obj(*cdx);
if (!cdx) {
ret = -ENOMEM;
goto cdx_alloc_fail;
diff --git a/drivers/cdx/controller/mcdi.c b/drivers/cdx/controller/mcdi.c
index 4b3d8f1ef964..34a07d6f41a0 100644
--- a/drivers/cdx/controller/mcdi.c
+++ b/drivers/cdx/controller/mcdi.c
@@ -118,7 +118,7 @@ int cdx_mcdi_init(struct cdx_mcdi *cdx)
struct cdx_mcdi_iface *mcdi;
int rc = -ENOMEM;
- cdx->mcdi = kzalloc_obj(*cdx->mcdi, GFP_KERNEL);
+ cdx->mcdi = kzalloc_obj(*cdx->mcdi);
if (!cdx->mcdi)
goto fail;
@@ -456,11 +456,11 @@ static int cdx_mcdi_rpc_sync(struct cdx_mcdi *cdx, unsigned int cmd,
if (outlen_actual)
*outlen_actual = 0;
- wait_data = kmalloc_obj(*wait_data, GFP_KERNEL);
+ wait_data = kmalloc_obj(*wait_data);
if (!wait_data)
return -ENOMEM;
- cmd_item = kmalloc_obj(*cmd_item, GFP_KERNEL);
+ cmd_item = kmalloc_obj(*cmd_item);
if (!cmd_item) {
kfree(wait_data);
return -ENOMEM;
diff --git a/drivers/char/agp/amd-k7-agp.c b/drivers/char/agp/amd-k7-agp.c
index 7cf521d36e3b..898ff30ffd46 100644
--- a/drivers/char/agp/amd-k7-agp.c
+++ b/drivers/char/agp/amd-k7-agp.c
@@ -85,12 +85,12 @@ static int amd_create_gatt_pages(int nr_tables)
int retval = 0;
int i;
- tables = kzalloc_objs(struct amd_page_map *, nr_tables + 1, GFP_KERNEL);
+ tables = kzalloc_objs(struct amd_page_map *, nr_tables + 1);
if (tables == NULL)
return -ENOMEM;
for (i = 0; i < nr_tables; i++) {
- entry = kzalloc_obj(struct amd_page_map, GFP_KERNEL);
+ entry = kzalloc_obj(struct amd_page_map);
tables[i] = entry;
if (entry == NULL) {
retval = -ENOMEM;
diff --git a/drivers/char/agp/ati-agp.c b/drivers/char/agp/ati-agp.c
index 65afee75d8e3..485b02fc9b18 100644
--- a/drivers/char/agp/ati-agp.c
+++ b/drivers/char/agp/ati-agp.c
@@ -112,12 +112,12 @@ static int ati_create_gatt_pages(int nr_tables)
int retval = 0;
int i;
- tables = kzalloc_objs(struct ati_page_map *, nr_tables + 1, GFP_KERNEL);
+ tables = kzalloc_objs(struct ati_page_map *, nr_tables + 1);
if (tables == NULL)
return -ENOMEM;
for (i = 0; i < nr_tables; i++) {
- entry = kzalloc_obj(struct ati_page_map, GFP_KERNEL);
+ entry = kzalloc_obj(struct ati_page_map);
tables[i] = entry;
if (entry == NULL) {
retval = -ENOMEM;
diff --git a/drivers/char/agp/backend.c b/drivers/char/agp/backend.c
index 90554f4f2146..4d920ca534a4 100644
--- a/drivers/char/agp/backend.c
+++ b/drivers/char/agp/backend.c
@@ -238,7 +238,7 @@ struct agp_bridge_data *agp_alloc_bridge(void)
{
struct agp_bridge_data *bridge;
- bridge = kzalloc_obj(*bridge, GFP_KERNEL);
+ bridge = kzalloc_obj(*bridge);
if (!bridge)
return NULL;
diff --git a/drivers/char/agp/generic.c b/drivers/char/agp/generic.c
index 66ba14eac583..41752ed2b075 100644
--- a/drivers/char/agp/generic.c
+++ b/drivers/char/agp/generic.c
@@ -101,7 +101,7 @@ static struct agp_memory *agp_create_user_memory(unsigned long num_agp_pages)
if (INT_MAX/sizeof(struct page *) < num_agp_pages)
return NULL;
- new = kzalloc_obj(struct agp_memory, GFP_KERNEL);
+ new = kzalloc_obj(struct agp_memory);
if (new == NULL)
return NULL;
@@ -127,7 +127,7 @@ struct agp_memory *agp_create_memory(int scratch_pages)
{
struct agp_memory *new;
- new = kzalloc_obj(struct agp_memory, GFP_KERNEL);
+ new = kzalloc_obj(struct agp_memory);
if (new == NULL)
return NULL;
diff --git a/drivers/char/agp/isoch.c b/drivers/char/agp/isoch.c
index b7deecb40922..698182609b92 100644
--- a/drivers/char/agp/isoch.c
+++ b/drivers/char/agp/isoch.c
@@ -92,7 +92,7 @@ static int agp_3_5_isochronous_node_enable(struct agp_bridge_data *bridge,
* We'll work with an array of isoch_data's (one for each
* device in dev_list) throughout this function.
*/
- master = kmalloc_objs(*master, ndevs, GFP_KERNEL);
+ master = kmalloc_objs(*master, ndevs);
if (master == NULL) {
ret = -ENOMEM;
goto get_out;
@@ -333,7 +333,7 @@ int agp_3_5_enable(struct agp_bridge_data *bridge)
* Allocate a head for our AGP 3.5 device list
* (multiple AGP v3 devices are allowed behind a single bridge).
*/
- if ((dev_list = kmalloc_obj(*dev_list, GFP_KERNEL)) == NULL) {
+ if ((dev_list = kmalloc_obj(*dev_list)) == NULL) {
ret = -ENOMEM;
goto get_out;
}
@@ -362,7 +362,7 @@ int agp_3_5_enable(struct agp_bridge_data *bridge)
case 0x0300: /* Display controller */
case 0x0400: /* Multimedia controller */
- if ((cur = kmalloc_obj(*cur, GFP_KERNEL)) == NULL) {
+ if ((cur = kmalloc_obj(*cur)) == NULL) {
ret = -ENOMEM;
goto free_and_exit;
}
diff --git a/drivers/char/agp/sworks-agp.c b/drivers/char/agp/sworks-agp.c
index 03f21b90d368..a6d8988538ec 100644
--- a/drivers/char/agp/sworks-agp.c
+++ b/drivers/char/agp/sworks-agp.c
@@ -102,7 +102,7 @@ static int serverworks_create_gatt_pages(int nr_tables)
return -ENOMEM;
for (i = 0; i < nr_tables; i++) {
- entry = kzalloc_obj(struct serverworks_page_map, GFP_KERNEL);
+ entry = kzalloc_obj(struct serverworks_page_map);
if (entry == NULL) {
retval = -ENOMEM;
break;
diff --git a/drivers/char/apm-emulation.c b/drivers/char/apm-emulation.c
index 54e921eac4d3..389874f44967 100644
--- a/drivers/char/apm-emulation.c
+++ b/drivers/char/apm-emulation.c
@@ -343,7 +343,7 @@ static int apm_open(struct inode * inode, struct file * filp)
{
struct apm_user *as;
- as = kzalloc_obj(*as, GFP_KERNEL);
+ as = kzalloc_obj(*as);
if (as) {
/*
* XXX - this is a tiny bit broken, when we consider BSD
diff --git a/drivers/char/bsr.c b/drivers/char/bsr.c
index 57d236398a81..98e9327bf65d 100644
--- a/drivers/char/bsr.c
+++ b/drivers/char/bsr.c
@@ -186,7 +186,7 @@ static int bsr_add_node(struct device_node *bn)
num_bsr_devs = bsr_bytes_len / sizeof(u32);
for (i = 0 ; i < num_bsr_devs; i++) {
- struct bsr_dev *cur = kzalloc_obj(struct bsr_dev, GFP_KERNEL);
+ struct bsr_dev *cur = kzalloc_obj(struct bsr_dev);
struct resource res;
int result;
diff --git a/drivers/char/hw_random/amd-rng.c b/drivers/char/hw_random/amd-rng.c
index bc228e26929e..332d594bdf70 100644
--- a/drivers/char/hw_random/amd-rng.c
+++ b/drivers/char/hw_random/amd-rng.c
@@ -154,7 +154,7 @@ static int __init amd_rng_mod_init(void)
goto put_dev;
}
- priv = kzalloc_obj(*priv, GFP_KERNEL);
+ priv = kzalloc_obj(*priv);
if (!priv) {
err = -ENOMEM;
goto put_dev;
diff --git a/drivers/char/hw_random/geode-rng.c b/drivers/char/hw_random/geode-rng.c
index 45e2696fad23..1b21d58e1768 100644
--- a/drivers/char/hw_random/geode-rng.c
+++ b/drivers/char/hw_random/geode-rng.c
@@ -107,7 +107,7 @@ static int __init geode_rng_init(void)
return err;
found:
- priv = kzalloc_obj(*priv, GFP_KERNEL);
+ priv = kzalloc_obj(*priv);
if (!priv) {
err = -ENOMEM;
goto put_dev;
diff --git a/drivers/char/hw_random/intel-rng.c b/drivers/char/hw_random/intel-rng.c
index e18041c2610d..d24e747203c1 100644
--- a/drivers/char/hw_random/intel-rng.c
+++ b/drivers/char/hw_random/intel-rng.c
@@ -346,7 +346,7 @@ static int __init intel_rng_mod_init(void)
goto fwh_done;
}
- intel_rng_hw = kmalloc_obj(*intel_rng_hw, GFP_KERNEL);
+ intel_rng_hw = kmalloc_obj(*intel_rng_hw);
if (!intel_rng_hw) {
pci_dev_put(dev);
goto out;
diff --git a/drivers/char/hw_random/virtio-rng.c b/drivers/char/hw_random/virtio-rng.c
index ba35f83d5c31..0ce02d7e5048 100644
--- a/drivers/char/hw_random/virtio-rng.c
+++ b/drivers/char/hw_random/virtio-rng.c
@@ -134,7 +134,7 @@ static int probe_common(struct virtio_device *vdev)
int err, index;
struct virtrng_info *vi = NULL;
- vi = kzalloc_obj(struct virtrng_info, GFP_KERNEL);
+ vi = kzalloc_obj(struct virtrng_info);
if (!vi)
return -ENOMEM;
diff --git a/drivers/char/ipmi/ipmi_devintf.c b/drivers/char/ipmi/ipmi_devintf.c
index c8a4f261bd58..38d0f1bc10b0 100644
--- a/drivers/char/ipmi/ipmi_devintf.c
+++ b/drivers/char/ipmi/ipmi_devintf.c
@@ -90,7 +90,7 @@ static int ipmi_open(struct inode *inode, struct file *file)
int rv;
struct ipmi_file_private *priv;
- priv = kmalloc_obj(*priv, GFP_KERNEL);
+ priv = kmalloc_obj(*priv);
if (!priv)
return -ENOMEM;
@@ -813,7 +813,7 @@ static void ipmi_new_smi(int if_num, struct device *device)
dev_t dev = MKDEV(ipmi_major, if_num);
struct ipmi_reg_list *entry;
- entry = kmalloc_obj(*entry, GFP_KERNEL);
+ entry = kmalloc_obj(*entry);
if (!entry) {
pr_err("ipmi_devintf: Unable to create the ipmi class device link\n");
return;
diff --git a/drivers/char/ipmi/ipmi_dmi.c b/drivers/char/ipmi/ipmi_dmi.c
index 2462d2557331..505e32911c34 100644
--- a/drivers/char/ipmi/ipmi_dmi.c
+++ b/drivers/char/ipmi/ipmi_dmi.c
@@ -74,7 +74,7 @@ static void __init dmi_add_platform_ipmi(unsigned long base_addr,
p.slave_addr = slave_addr;
p.addr_source = SI_SMBIOS;
- info = kmalloc_obj(*info, GFP_KERNEL);
+ info = kmalloc_obj(*info);
if (!info) {
pr_warn("Could not allocate dmi info\n");
} else {
diff --git a/drivers/char/ipmi/ipmi_msghandler.c b/drivers/char/ipmi/ipmi_msghandler.c
index b4f05d15d2df..c530966c4e07 100644
--- a/drivers/char/ipmi/ipmi_msghandler.c
+++ b/drivers/char/ipmi/ipmi_msghandler.c
@@ -761,11 +761,11 @@ int ipmi_smi_watcher_register(struct ipmi_smi_watcher *watcher)
list_for_each_entry(intf, &ipmi_interfaces, link)
count++;
if (count > 0) {
- interfaces = kmalloc_objs(*interfaces, count, GFP_KERNEL);
+ interfaces = kmalloc_objs(*interfaces, count);
if (!interfaces) {
rv = -ENOMEM;
} else {
- devices = kmalloc_objs(*devices, count, GFP_KERNEL);
+ devices = kmalloc_objs(*devices, count);
if (!devices) {
kfree(interfaces);
interfaces = NULL;
@@ -1684,7 +1684,7 @@ int ipmi_register_for_cmd(struct ipmi_user *user,
if (!user)
return -ENODEV;
- rcvr = kmalloc_obj(*rcvr, GFP_KERNEL);
+ rcvr = kmalloc_obj(*rcvr);
if (!rcvr) {
rv = -ENOMEM;
goto out_release;
@@ -3144,7 +3144,7 @@ static int __ipmi_bmc_register(struct ipmi_smi *intf,
bmc->id.product_id,
bmc->id.device_id);
} else {
- bmc = kzalloc_obj(*bmc, GFP_KERNEL);
+ bmc = kzalloc_obj(*bmc);
if (!bmc) {
rv = -ENOMEM;
goto out;
@@ -3580,7 +3580,7 @@ int ipmi_add_smi(struct module *owner,
if (rv)
return rv;
- intf = kzalloc_obj(*intf, GFP_KERNEL);
+ intf = kzalloc_obj(*intf);
if (!intf)
return -ENOMEM;
diff --git a/drivers/char/ipmi/ipmi_si_intf.c b/drivers/char/ipmi/ipmi_si_intf.c
index c6137eb56548..6bdf624c37ce 100644
--- a/drivers/char/ipmi/ipmi_si_intf.c
+++ b/drivers/char/ipmi/ipmi_si_intf.c
@@ -1914,7 +1914,7 @@ int ipmi_si_add_smi(struct si_sm_io *io)
}
}
- new_smi = kzalloc_obj(*new_smi, GFP_KERNEL);
+ new_smi = kzalloc_obj(*new_smi);
if (!new_smi)
return -ENOMEM;
spin_lock_init(&new_smi->si_lock);
diff --git a/drivers/char/ipmi/ipmi_ssif.c b/drivers/char/ipmi/ipmi_ssif.c
index 579cf30cd52f..37a5cb5c53f1 100644
--- a/drivers/char/ipmi/ipmi_ssif.c
+++ b/drivers/char/ipmi/ipmi_ssif.c
@@ -1602,7 +1602,7 @@ static int ssif_add_infos(struct i2c_client *client)
{
struct ssif_addr_info *info;
- info = kzalloc_obj(*info, GFP_KERNEL);
+ info = kzalloc_obj(*info);
if (!info)
return -ENOMEM;
info->addr_src = SI_ACPI;
@@ -1667,7 +1667,7 @@ static int ssif_probe(struct i2c_client *client)
return -ENOMEM;
}
- ssif_info = kzalloc_obj(*ssif_info, GFP_KERNEL);
+ ssif_info = kzalloc_obj(*ssif_info);
if (!ssif_info) {
kfree(resp);
mutex_unlock(&ssif_infos_mutex);
@@ -1948,7 +1948,7 @@ static int new_ssif_client(int addr, char *adapter_name,
goto out_unlock;
}
- addr_info = kzalloc_obj(*addr_info, GFP_KERNEL);
+ addr_info = kzalloc_obj(*addr_info);
if (!addr_info) {
rv = -ENOMEM;
goto out_unlock;
diff --git a/drivers/char/ipmi/kcs_bmc_serio.c b/drivers/char/ipmi/kcs_bmc_serio.c
index 4c3a70dc7425..1a95d6f258ea 100644
--- a/drivers/char/ipmi/kcs_bmc_serio.c
+++ b/drivers/char/ipmi/kcs_bmc_serio.c
@@ -77,7 +77,7 @@ static int kcs_bmc_serio_add_device(struct kcs_bmc_device *kcs_bmc)
return -ENOMEM;
/* Use kzalloc() as the allocation is cleaned up with kfree() via serio_unregister_port() */
- port = kzalloc_obj(*port, GFP_KERNEL);
+ port = kzalloc_obj(*port);
if (!port)
return -ENOMEM;
diff --git a/drivers/char/powernv-op-panel.c b/drivers/char/powernv-op-panel.c
index 7405d645ff62..63175b765c90 100644
--- a/drivers/char/powernv-op-panel.c
+++ b/drivers/char/powernv-op-panel.c
@@ -167,7 +167,7 @@ static int oppanel_probe(struct platform_device *pdev)
if (!oppanel_data)
return -ENOMEM;
- oppanel_lines = kzalloc_objs(oppanel_line_t, num_lines, GFP_KERNEL);
+ oppanel_lines = kzalloc_objs(oppanel_line_t, num_lines);
if (!oppanel_lines) {
rc = -ENOMEM;
goto free_oppanel_data;
diff --git a/drivers/char/ppdev.c b/drivers/char/ppdev.c
index 2468040d745f..6da817b9849f 100644
--- a/drivers/char/ppdev.c
+++ b/drivers/char/ppdev.c
@@ -689,7 +689,7 @@ static int pp_open(struct inode *inode, struct file *file)
if (minor >= PARPORT_MAX)
return -ENXIO;
- pp = kmalloc_obj(struct pp_struct, GFP_KERNEL);
+ pp = kmalloc_obj(struct pp_struct);
if (!pp)
return -ENOMEM;
diff --git a/drivers/char/ps3flash.c b/drivers/char/ps3flash.c
index 5892d2b1cb72..c73f443077a4 100644
--- a/drivers/char/ps3flash.c
+++ b/drivers/char/ps3flash.c
@@ -361,7 +361,7 @@ static int ps3flash_probe(struct ps3_system_bus_device *_dev)
ps3flash_dev = dev;
- priv = kzalloc_obj(*priv, GFP_KERNEL);
+ priv = kzalloc_obj(*priv);
if (!priv) {
error = -ENOMEM;
goto fail;
diff --git a/drivers/char/random.c b/drivers/char/random.c
index 91dc486b9ffa..dcd002e1b890 100644
--- a/drivers/char/random.c
+++ b/drivers/char/random.c
@@ -1248,7 +1248,7 @@ void __cold rand_initialize_disk(struct gendisk *disk)
* If kzalloc returns null, we just won't use that entropy
* source.
*/
- state = kzalloc_obj(struct timer_rand_state, GFP_KERNEL);
+ state = kzalloc_obj(struct timer_rand_state);
if (state) {
state->last_time = INITIAL_JIFFIES;
disk->random = state;
diff --git a/drivers/char/tlclk.c b/drivers/char/tlclk.c
index 8f3dd530f56c..677d230a226c 100644
--- a/drivers/char/tlclk.c
+++ b/drivers/char/tlclk.c
@@ -776,7 +776,7 @@ static int __init tlclk_init(void)
telclk_interrupt = (inb(TLCLK_REG7) & 0x0f);
- alarm_events = kzalloc_obj(struct tlclk_alarms, GFP_KERNEL);
+ alarm_events = kzalloc_obj(struct tlclk_alarms);
if (!alarm_events) {
ret = -ENOMEM;
goto out1;
diff --git a/drivers/char/tpm/tpm-chip.c b/drivers/char/tpm/tpm-chip.c
index 986990723db2..0719577e584d 100644
--- a/drivers/char/tpm/tpm-chip.c
+++ b/drivers/char/tpm/tpm-chip.c
@@ -295,7 +295,7 @@ struct tpm_chip *tpm_chip_alloc(struct device *pdev,
struct tpm_chip *chip;
int rc;
- chip = kzalloc_obj(*chip, GFP_KERNEL);
+ chip = kzalloc_obj(*chip);
if (chip == NULL)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/char/tpm/tpm-dev.c b/drivers/char/tpm/tpm-dev.c
index bd197be15923..2779a8738c59 100644
--- a/drivers/char/tpm/tpm-dev.c
+++ b/drivers/char/tpm/tpm-dev.c
@@ -30,7 +30,7 @@ static int tpm_open(struct inode *inode, struct file *file)
return -EBUSY;
}
- priv = kzalloc_obj(*priv, GFP_KERNEL);
+ priv = kzalloc_obj(*priv);
if (priv == NULL)
goto out;
diff --git a/drivers/char/tpm/tpm2-sessions.c b/drivers/char/tpm/tpm2-sessions.c
index c00817faf88e..3b1cf1ca0420 100644
--- a/drivers/char/tpm/tpm2-sessions.c
+++ b/drivers/char/tpm/tpm2-sessions.c
@@ -991,7 +991,7 @@ int tpm2_start_auth_session(struct tpm_chip *chip)
return 0;
}
- auth = kzalloc_obj(*auth, GFP_KERNEL);
+ auth = kzalloc_obj(*auth);
if (!auth)
return -ENOMEM;
diff --git a/drivers/char/tpm/tpm_crb_ffa.c b/drivers/char/tpm/tpm_crb_ffa.c
index 1bc1c6c2f257..99f1c1e5644b 100644
--- a/drivers/char/tpm/tpm_crb_ffa.c
+++ b/drivers/char/tpm/tpm_crb_ffa.c
@@ -346,7 +346,7 @@ static int tpm_crb_ffa_probe(struct ffa_device *ffa_dev)
return -EINVAL;
}
- p = kzalloc_obj(*tpm_crb_ffa, GFP_KERNEL);
+ p = kzalloc_obj(*tpm_crb_ffa);
if (!p)
return -ENOMEM;
tpm_crb_ffa = p;
diff --git a/drivers/char/tpm/tpm_ibmvtpm.c b/drivers/char/tpm/tpm_ibmvtpm.c
index 2bd4e1dce322..6fb4d30eb6f6 100644
--- a/drivers/char/tpm/tpm_ibmvtpm.c
+++ b/drivers/char/tpm/tpm_ibmvtpm.c
@@ -611,7 +611,7 @@ static int tpm_ibmvtpm_probe(struct vio_dev *vio_dev,
if (IS_ERR(chip))
return PTR_ERR(chip);
- ibmvtpm = kzalloc_obj(struct ibmvtpm_dev, GFP_KERNEL);
+ ibmvtpm = kzalloc_obj(struct ibmvtpm_dev);
if (!ibmvtpm) {
dev_err(dev, "kzalloc for ibmvtpm failed\n");
goto cleanup;
diff --git a/drivers/char/tpm/tpm_vtpm_proxy.c b/drivers/char/tpm/tpm_vtpm_proxy.c
index b84d745a9797..7bb0f4d4a2ed 100644
--- a/drivers/char/tpm/tpm_vtpm_proxy.c
+++ b/drivers/char/tpm/tpm_vtpm_proxy.c
@@ -491,7 +491,7 @@ static struct proxy_dev *vtpm_proxy_create_proxy_dev(void)
struct tpm_chip *chip;
int err;
- proxy_dev = kzalloc_obj(*proxy_dev, GFP_KERNEL);
+ proxy_dev = kzalloc_obj(*proxy_dev);
if (proxy_dev == NULL)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/char/tpm/tpmrm-dev.c b/drivers/char/tpm/tpmrm-dev.c
index cace5bc7369a..f48d4d9e179c 100644
--- a/drivers/char/tpm/tpmrm-dev.c
+++ b/drivers/char/tpm/tpmrm-dev.c
@@ -17,7 +17,7 @@ static int tpmrm_open(struct inode *inode, struct file *file)
int rc;
chip = container_of(inode->i_cdev, struct tpm_chip, cdevs);
- priv = kzalloc_obj(*priv, GFP_KERNEL);
+ priv = kzalloc_obj(*priv);
if (priv == NULL)
return -ENOMEM;
diff --git a/drivers/char/tpm/xen-tpmfront.c b/drivers/char/tpm/xen-tpmfront.c
index c1a4a5531b0a..3c0cce57c4ae 100644
--- a/drivers/char/tpm/xen-tpmfront.c
+++ b/drivers/char/tpm/xen-tpmfront.c
@@ -338,7 +338,7 @@ static int tpmfront_probe(struct xenbus_device *dev,
struct tpm_private *priv;
int rv;
- priv = kzalloc_obj(*priv, GFP_KERNEL);
+ priv = kzalloc_obj(*priv);
if (!priv) {
xenbus_dev_fatal(dev, -ENOMEM, "allocating priv structure");
return -ENOMEM;
diff --git a/drivers/char/virtio_console.c b/drivers/char/virtio_console.c
index 2c1c864a9de9..a341073d5c3a 100644
--- a/drivers/char/virtio_console.c
+++ b/drivers/char/virtio_console.c
@@ -1325,7 +1325,7 @@ static int add_port(struct ports_device *portdev, u32 id)
dev_t devt;
int err;
- port = kmalloc_obj(*port, GFP_KERNEL);
+ port = kmalloc_obj(*port);
if (!port) {
err = -ENOMEM;
goto fail;
@@ -1809,9 +1809,9 @@ static int init_vqs(struct ports_device *portdev)
nr_ports = portdev->max_nr_ports;
nr_queues = use_multiport(portdev) ? (nr_ports + 1) * 2 : 2;
- vqs = kmalloc_objs(struct virtqueue *, nr_queues, GFP_KERNEL);
- vqs_info = kzalloc_objs(*vqs_info, nr_queues, GFP_KERNEL);
- portdev->in_vqs = kmalloc_objs(struct virtqueue *, nr_ports, GFP_KERNEL);
+ vqs = kmalloc_objs(struct virtqueue *, nr_queues);
+ vqs_info = kzalloc_objs(*vqs_info, nr_queues);
+ portdev->in_vqs = kmalloc_objs(struct virtqueue *, nr_ports);
portdev->out_vqs = kmalloc_objs(struct virtqueue *, nr_ports,
GFP_KERNEL);
if (!vqs || !vqs_info || !portdev->in_vqs || !portdev->out_vqs) {
@@ -1964,7 +1964,7 @@ static int virtcons_probe(struct virtio_device *vdev)
return -EINVAL;
}
- portdev = kmalloc_obj(*portdev, GFP_KERNEL);
+ portdev = kmalloc_obj(*portdev);
if (!portdev) {
err = -ENOMEM;
goto fail;
diff --git a/drivers/char/xillybus/xillybus_class.c b/drivers/char/xillybus/xillybus_class.c
index 4bc5a2152abb..5e8f03b77064 100644
--- a/drivers/char/xillybus/xillybus_class.c
+++ b/drivers/char/xillybus/xillybus_class.c
@@ -57,7 +57,7 @@ int xillybus_init_chrdev(struct device *dev,
size_t namelen;
struct xilly_unit *unit, *u;
- unit = kzalloc_obj(*unit, GFP_KERNEL);
+ unit = kzalloc_obj(*unit);
if (!unit)
return -ENOMEM;
diff --git a/drivers/char/xillybus/xillybus_core.c b/drivers/char/xillybus/xillybus_core.c
index 86dccc6009f8..952ef149aba1 100644
--- a/drivers/char/xillybus/xillybus_core.c
+++ b/drivers/char/xillybus/xillybus_core.c
@@ -319,7 +319,7 @@ static int xilly_map_single(struct xilly_endpoint *ep,
dma_addr_t addr;
struct xilly_mapping *this;
- this = kzalloc_obj(*this, GFP_KERNEL);
+ this = kzalloc_obj(*this);
if (!this)
return -ENOMEM;
diff --git a/drivers/char/xillybus/xillyusb.c b/drivers/char/xillybus/xillyusb.c
index 568e82b73823..34e7ad3bcab3 100644
--- a/drivers/char/xillybus/xillyusb.c
+++ b/drivers/char/xillybus/xillyusb.c
@@ -495,7 +495,7 @@ static struct xillyusb_endpoint
struct xillyusb_endpoint *ep;
- ep = kzalloc_obj(*ep, GFP_KERNEL);
+ ep = kzalloc_obj(*ep);
if (!ep)
return NULL;
@@ -522,7 +522,7 @@ static struct xillyusb_endpoint
struct xillybuffer *xb;
unsigned long addr;
- xb = kzalloc_obj(*xb, GFP_KERNEL);
+ xb = kzalloc_obj(*xb);
if (!xb) {
endpoint_dealloc(ep);
@@ -1336,7 +1336,7 @@ static int xillyusb_open(struct inode *inode, struct file *filp)
}
if (filp->f_mode & FMODE_READ) {
- in_fifo = kzalloc_obj(*in_fifo, GFP_KERNEL);
+ in_fifo = kzalloc_obj(*in_fifo);
if (!in_fifo) {
rc = -ENOMEM;
@@ -1943,7 +1943,7 @@ static int setup_channels(struct xillyusb_dev *xdev,
struct xillyusb_channel *chan, *new_channels;
int i;
- chan = kzalloc_objs(*chan, num_channels, GFP_KERNEL);
+ chan = kzalloc_objs(*chan, num_channels);
if (!chan)
return -ENOMEM;
@@ -2149,7 +2149,7 @@ static int xillyusb_probe(struct usb_interface *interface,
struct xillyusb_dev *xdev;
int rc;
- xdev = kzalloc_obj(*xdev, GFP_KERNEL);
+ xdev = kzalloc_obj(*xdev);
if (!xdev)
return -ENOMEM;
diff --git a/drivers/clk/aspeed/clk-aspeed.c b/drivers/clk/aspeed/clk-aspeed.c
index c8449e49ea08..0614fca4feb1 100644
--- a/drivers/clk/aspeed/clk-aspeed.c
+++ b/drivers/clk/aspeed/clk-aspeed.c
@@ -354,7 +354,7 @@ static struct clk_hw *aspeed_clk_hw_register_gate(struct device *dev,
struct clk_hw *hw;
int ret;
- gate = kzalloc_obj(*gate, GFP_KERNEL);
+ gate = kzalloc_obj(*gate);
if (!gate)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/clk/aspeed/clk-ast2600.c b/drivers/clk/aspeed/clk-ast2600.c
index e24b536e68ce..bc9a5b81009d 100644
--- a/drivers/clk/aspeed/clk-ast2600.c
+++ b/drivers/clk/aspeed/clk-ast2600.c
@@ -431,7 +431,7 @@ static struct clk_hw *aspeed_g6_clk_hw_register_gate(struct device *dev,
struct clk_hw *hw;
int ret;
- gate = kzalloc_obj(*gate, GFP_KERNEL);
+ gate = kzalloc_obj(*gate);
if (!gate)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/clk/aspeed/clk-ast2700.c b/drivers/clk/aspeed/clk-ast2700.c
index df491bae39b7..8b7b382f6f3e 100644
--- a/drivers/clk/aspeed/clk-ast2700.c
+++ b/drivers/clk/aspeed/clk-ast2700.c
@@ -820,7 +820,7 @@ static struct clk_hw *ast2700_clk_hw_register_gate(struct device *dev, const cha
struct clk_hw *hw;
int ret = -EINVAL;
- gate = kzalloc_obj(*gate, GFP_KERNEL);
+ gate = kzalloc_obj(*gate);
if (!gate)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/clk/at91/clk-audio-pll.c b/drivers/clk/at91/clk-audio-pll.c
index 9133c0ec7f08..732037bfbda8 100644
--- a/drivers/clk/at91/clk-audio-pll.c
+++ b/drivers/clk/at91/clk-audio-pll.c
@@ -460,7 +460,7 @@ at91_clk_register_audio_pll_frac(struct regmap *regmap, const char *name,
struct clk_init_data init = {};
int ret;
- frac_ck = kzalloc_obj(*frac_ck, GFP_KERNEL);
+ frac_ck = kzalloc_obj(*frac_ck);
if (!frac_ck)
return ERR_PTR(-ENOMEM);
@@ -490,7 +490,7 @@ at91_clk_register_audio_pll_pad(struct regmap *regmap, const char *name,
struct clk_init_data init;
int ret;
- apad_ck = kzalloc_obj(*apad_ck, GFP_KERNEL);
+ apad_ck = kzalloc_obj(*apad_ck);
if (!apad_ck)
return ERR_PTR(-ENOMEM);
@@ -521,7 +521,7 @@ at91_clk_register_audio_pll_pmc(struct regmap *regmap, const char *name,
struct clk_init_data init;
int ret;
- apmc_ck = kzalloc_obj(*apmc_ck, GFP_KERNEL);
+ apmc_ck = kzalloc_obj(*apmc_ck);
if (!apmc_ck)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/clk/at91/clk-generated.c b/drivers/clk/at91/clk-generated.c
index 0427f112829b..5d3a62433187 100644
--- a/drivers/clk/at91/clk-generated.c
+++ b/drivers/clk/at91/clk-generated.c
@@ -332,7 +332,7 @@ at91_clk_register_generated(struct regmap *regmap, spinlock_t *lock,
if (!(parent_names || parent_hws))
return ERR_PTR(-ENOMEM);
- gck = kzalloc_obj(*gck, GFP_KERNEL);
+ gck = kzalloc_obj(*gck);
if (!gck)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/clk/at91/clk-h32mx.c b/drivers/clk/at91/clk-h32mx.c
index a56e65eb2333..12bd112d3c50 100644
--- a/drivers/clk/at91/clk-h32mx.c
+++ b/drivers/clk/at91/clk-h32mx.c
@@ -100,7 +100,7 @@ at91_clk_register_h32mx(struct regmap *regmap, const char *name,
struct clk_init_data init;
int ret;
- h32mxclk = kzalloc_obj(*h32mxclk, GFP_KERNEL);
+ h32mxclk = kzalloc_obj(*h32mxclk);
if (!h32mxclk)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/clk/at91/clk-i2s-mux.c b/drivers/clk/at91/clk-i2s-mux.c
index 309a8d6136d5..a762c56dcadd 100644
--- a/drivers/clk/at91/clk-i2s-mux.c
+++ b/drivers/clk/at91/clk-i2s-mux.c
@@ -57,7 +57,7 @@ at91_clk_i2s_mux_register(struct regmap *regmap, const char *name,
struct clk_i2s_mux *i2s_ck;
int ret;
- i2s_ck = kzalloc_obj(*i2s_ck, GFP_KERNEL);
+ i2s_ck = kzalloc_obj(*i2s_ck);
if (!i2s_ck)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/clk/at91/clk-main.c b/drivers/clk/at91/clk-main.c
index 51b0421d01e3..ab515239adcf 100644
--- a/drivers/clk/at91/clk-main.c
+++ b/drivers/clk/at91/clk-main.c
@@ -163,7 +163,7 @@ at91_clk_register_main_osc(struct regmap *regmap,
if (!name || !(parent_name || parent_data))
return ERR_PTR(-EINVAL);
- osc = kzalloc_obj(*osc, GFP_KERNEL);
+ osc = kzalloc_obj(*osc);
if (!osc)
return ERR_PTR(-ENOMEM);
@@ -306,7 +306,7 @@ at91_clk_register_main_rc_osc(struct regmap *regmap,
if (!name || !frequency)
return ERR_PTR(-EINVAL);
- osc = kzalloc_obj(*osc, GFP_KERNEL);
+ osc = kzalloc_obj(*osc);
if (!osc)
return ERR_PTR(-ENOMEM);
@@ -415,7 +415,7 @@ at91_clk_register_rm9200_main(struct regmap *regmap,
if (!(parent_name || parent_hw))
return ERR_PTR(-EINVAL);
- clkmain = kzalloc_obj(*clkmain, GFP_KERNEL);
+ clkmain = kzalloc_obj(*clkmain);
if (!clkmain)
return ERR_PTR(-ENOMEM);
@@ -567,7 +567,7 @@ at91_clk_register_sam9x5_main(struct regmap *regmap,
if (!(parent_hws || parent_names) || !num_parents)
return ERR_PTR(-EINVAL);
- clkmain = kzalloc_obj(*clkmain, GFP_KERNEL);
+ clkmain = kzalloc_obj(*clkmain);
if (!clkmain)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/clk/at91/clk-master.c b/drivers/clk/at91/clk-master.c
index 5e4f5fcc0645..05001e7700ca 100644
--- a/drivers/clk/at91/clk-master.c
+++ b/drivers/clk/at91/clk-master.c
@@ -488,7 +488,7 @@ at91_clk_register_master_internal(struct regmap *regmap,
if (!name || !num_parents || !(parent_names || parent_hws) || !lock)
return ERR_PTR(-EINVAL);
- master = kzalloc_obj(*master, GFP_KERNEL);
+ master = kzalloc_obj(*master);
if (!master)
return ERR_PTR(-ENOMEM);
@@ -831,7 +831,7 @@ at91_clk_sama7g5_register_master(struct regmap *regmap,
!lock || id > MASTER_MAX_ID)
return ERR_PTR(-EINVAL);
- master = kzalloc_obj(*master, GFP_KERNEL);
+ master = kzalloc_obj(*master);
if (!master)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/clk/at91/clk-peripheral.c b/drivers/clk/at91/clk-peripheral.c
index dda4217aaf85..4946ea0cdbba 100644
--- a/drivers/clk/at91/clk-peripheral.c
+++ b/drivers/clk/at91/clk-peripheral.c
@@ -109,7 +109,7 @@ at91_clk_register_peripheral(struct regmap *regmap, const char *name,
if (!name || !(parent_name || parent_hw) || id > PERIPHERAL_ID_MAX)
return ERR_PTR(-EINVAL);
- periph = kzalloc_obj(*periph, GFP_KERNEL);
+ periph = kzalloc_obj(*periph);
if (!periph)
return ERR_PTR(-ENOMEM);
@@ -471,7 +471,7 @@ at91_clk_register_sam9x5_peripheral(struct regmap *regmap, spinlock_t *lock,
if (!name || !(parent_name || parent_hw))
return ERR_PTR(-EINVAL);
- periph = kzalloc_obj(*periph, GFP_KERNEL);
+ periph = kzalloc_obj(*periph);
if (!periph)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/clk/at91/clk-pll.c b/drivers/clk/at91/clk-pll.c
index 083e7524ff8f..b89f60cf0241 100644
--- a/drivers/clk/at91/clk-pll.c
+++ b/drivers/clk/at91/clk-pll.c
@@ -326,7 +326,7 @@ at91_clk_register_pll(struct regmap *regmap, const char *name,
if (id > PLL_MAX_ID)
return ERR_PTR(-EINVAL);
- pll = kzalloc_obj(*pll, GFP_KERNEL);
+ pll = kzalloc_obj(*pll);
if (!pll)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/clk/at91/clk-plldiv.c b/drivers/clk/at91/clk-plldiv.c
index 27feb5207b40..5f93aead03fa 100644
--- a/drivers/clk/at91/clk-plldiv.c
+++ b/drivers/clk/at91/clk-plldiv.c
@@ -91,7 +91,7 @@ at91_clk_register_plldiv(struct regmap *regmap, const char *name,
struct clk_init_data init;
int ret;
- plldiv = kzalloc_obj(*plldiv, GFP_KERNEL);
+ plldiv = kzalloc_obj(*plldiv);
if (!plldiv)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/clk/at91/clk-programmable.c b/drivers/clk/at91/clk-programmable.c
index a87e63f4c3f8..bfd8b03b035c 100644
--- a/drivers/clk/at91/clk-programmable.c
+++ b/drivers/clk/at91/clk-programmable.c
@@ -227,7 +227,7 @@ at91_clk_register_programmable(struct regmap *regmap,
if (id > PROG_ID_MAX || !(parent_names || parent_hws))
return ERR_PTR(-EINVAL);
- prog = kzalloc_obj(*prog, GFP_KERNEL);
+ prog = kzalloc_obj(*prog);
if (!prog)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/clk/at91/clk-sam9x60-pll.c b/drivers/clk/at91/clk-sam9x60-pll.c
index 5f5cecbcf207..9d9b5adecf0d 100644
--- a/drivers/clk/at91/clk-sam9x60-pll.c
+++ b/drivers/clk/at91/clk-sam9x60-pll.c
@@ -652,7 +652,7 @@ sam9x60_clk_register_frac_pll(struct regmap *regmap, spinlock_t *lock,
if (id > PLL_MAX_ID || !lock || !parent_hw)
return ERR_PTR(-EINVAL);
- frac = kzalloc_obj(*frac, GFP_KERNEL);
+ frac = kzalloc_obj(*frac);
if (!frac)
return ERR_PTR(-ENOMEM);
@@ -744,7 +744,7 @@ sam9x60_clk_register_div_pll(struct regmap *regmap, spinlock_t *lock,
if (safe_div >= PLL_DIV_MAX)
safe_div = PLL_DIV_MAX - 1;
- div = kzalloc_obj(*div, GFP_KERNEL);
+ div = kzalloc_obj(*div);
if (!div)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/clk/at91/clk-slow.c b/drivers/clk/at91/clk-slow.c
index e39db89e2a37..f0cad50e490b 100644
--- a/drivers/clk/at91/clk-slow.c
+++ b/drivers/clk/at91/clk-slow.c
@@ -52,7 +52,7 @@ at91_clk_register_sam9260_slow(struct regmap *regmap,
if (!parent_names || !num_parents)
return ERR_PTR(-EINVAL);
- slowck = kzalloc_obj(*slowck, GFP_KERNEL);
+ slowck = kzalloc_obj(*slowck);
if (!slowck)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/clk/at91/clk-smd.c b/drivers/clk/at91/clk-smd.c
index 3c07dcd3cc2c..77f2b8fe6cab 100644
--- a/drivers/clk/at91/clk-smd.c
+++ b/drivers/clk/at91/clk-smd.c
@@ -118,7 +118,7 @@ at91sam9x5_clk_register_smd(struct regmap *regmap, const char *name,
struct clk_init_data init;
int ret;
- smd = kzalloc_obj(*smd, GFP_KERNEL);
+ smd = kzalloc_obj(*smd);
if (!smd)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/clk/at91/clk-system.c b/drivers/clk/at91/clk-system.c
index c3de1dabf283..93e1e8cebce8 100644
--- a/drivers/clk/at91/clk-system.c
+++ b/drivers/clk/at91/clk-system.c
@@ -116,7 +116,7 @@ at91_clk_register_system(struct regmap *regmap, const char *name,
if (!(parent_name || parent_hw) || id > SYSTEM_MAX_ID)
return ERR_PTR(-EINVAL);
- sys = kzalloc_obj(*sys, GFP_KERNEL);
+ sys = kzalloc_obj(*sys);
if (!sys)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/clk/at91/clk-usb.c b/drivers/clk/at91/clk-usb.c
index e5107d0cf383..b4dc86193e09 100644
--- a/drivers/clk/at91/clk-usb.c
+++ b/drivers/clk/at91/clk-usb.c
@@ -229,7 +229,7 @@ _at91sam9x5_clk_register_usb(struct regmap *regmap, const char *name,
struct clk_init_data init;
int ret;
- usb = kzalloc_obj(*usb, GFP_KERNEL);
+ usb = kzalloc_obj(*usb);
if (!usb)
return ERR_PTR(-ENOMEM);
@@ -280,7 +280,7 @@ at91sam9n12_clk_register_usb(struct regmap *regmap, const char *name,
struct clk_init_data init;
int ret;
- usb = kzalloc_obj(*usb, GFP_KERNEL);
+ usb = kzalloc_obj(*usb);
if (!usb)
return ERR_PTR(-ENOMEM);
@@ -399,7 +399,7 @@ at91rm9200_clk_register_usb(struct regmap *regmap, const char *name,
struct clk_init_data init;
int ret;
- usb = kzalloc_obj(*usb, GFP_KERNEL);
+ usb = kzalloc_obj(*usb);
if (!usb)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/clk/at91/clk-utmi.c b/drivers/clk/at91/clk-utmi.c
index f318c11bbc44..40b335b0195c 100644
--- a/drivers/clk/at91/clk-utmi.c
+++ b/drivers/clk/at91/clk-utmi.c
@@ -155,7 +155,7 @@ at91_clk_register_utmi_internal(struct regmap *regmap_pmc,
if (!(parent_name || parent_hw))
return ERR_PTR(-EINVAL);
- utmi = kzalloc_obj(*utmi, GFP_KERNEL);
+ utmi = kzalloc_obj(*utmi);
if (!utmi)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/clk/at91/dt-compat.c b/drivers/clk/at91/dt-compat.c
index dddcfcf453a1..5d543e807843 100644
--- a/drivers/clk/at91/dt-compat.c
+++ b/drivers/clk/at91/dt-compat.c
@@ -369,7 +369,7 @@ of_at91_clk_master_get_characteristics(struct device_node *np)
{
struct clk_master_characteristics *characteristics;
- characteristics = kzalloc_obj(*characteristics, GFP_KERNEL);
+ characteristics = kzalloc_obj(*characteristics);
if (!characteristics)
return NULL;
@@ -568,11 +568,11 @@ of_at91_clk_pll_get_characteristics(struct device_node *np)
return NULL;
num_output /= num_cells;
- characteristics = kzalloc_obj(*characteristics, GFP_KERNEL);
+ characteristics = kzalloc_obj(*characteristics);
if (!characteristics)
return NULL;
- output = kzalloc_objs(*output, num_output, GFP_KERNEL);
+ output = kzalloc_objs(*output, num_output);
if (!output)
goto out_free_characteristics;
diff --git a/drivers/clk/at91/sckc.c b/drivers/clk/at91/sckc.c
index 8ce851dc3e3f..61fcb3d1ee40 100644
--- a/drivers/clk/at91/sckc.c
+++ b/drivers/clk/at91/sckc.c
@@ -132,7 +132,7 @@ at91_clk_register_slow_osc(void __iomem *sckcr,
if (!sckcr || !name || !parent_data)
return ERR_PTR(-EINVAL);
- osc = kzalloc_obj(*osc, GFP_KERNEL);
+ osc = kzalloc_obj(*osc);
if (!osc)
return ERR_PTR(-ENOMEM);
@@ -239,7 +239,7 @@ at91_clk_register_slow_rc_osc(void __iomem *sckcr,
if (!sckcr || !name)
return ERR_PTR(-EINVAL);
- osc = kzalloc_obj(*osc, GFP_KERNEL);
+ osc = kzalloc_obj(*osc);
if (!osc)
return ERR_PTR(-ENOMEM);
@@ -332,7 +332,7 @@ at91_clk_register_sam9x5_slow(void __iomem *sckcr,
if (!sckcr || !name || !parent_hws || !num_parents)
return ERR_PTR(-EINVAL);
- slowck = kzalloc_obj(*slowck, GFP_KERNEL);
+ slowck = kzalloc_obj(*slowck);
if (!slowck)
return ERR_PTR(-ENOMEM);
@@ -611,7 +611,7 @@ static void __init of_sama5d4_sckc_setup(struct device_node *np)
goto unregister_slow_rc;
parent_data.fw_name = xtal_name;
- osc = kzalloc_obj(*osc, GFP_KERNEL);
+ osc = kzalloc_obj(*osc);
if (!osc)
goto unregister_slow_rc;
diff --git a/drivers/clk/axis/clk-artpec6.c b/drivers/clk/axis/clk-artpec6.c
index 792f00b7c94e..a6f1499629dd 100644
--- a/drivers/clk/axis/clk-artpec6.c
+++ b/drivers/clk/axis/clk-artpec6.c
@@ -49,7 +49,7 @@ static void of_artpec6_clkctrl_setup(struct device_node *np)
sys_refclk_name = of_clk_get_parent_name(np, i);
- clkdata = kzalloc_obj(*clkdata, GFP_KERNEL);
+ clkdata = kzalloc_obj(*clkdata);
if (!clkdata)
return;
diff --git a/drivers/clk/axs10x/pll_clock.c b/drivers/clk/axs10x/pll_clock.c
index 594455f0918a..5ab1c220c62d 100644
--- a/drivers/clk/axs10x/pll_clock.c
+++ b/drivers/clk/axs10x/pll_clock.c
@@ -265,7 +265,7 @@ static void __init of_axs10x_pll_clk_setup(struct device_node *node)
struct clk_init_data init = { };
int ret;
- pll_clk = kzalloc_obj(*pll_clk, GFP_KERNEL);
+ pll_clk = kzalloc_obj(*pll_clk);
if (!pll_clk)
return;
diff --git a/drivers/clk/baikal-t1/ccu-div.c b/drivers/clk/baikal-t1/ccu-div.c
index c9dd59b1c551..cc48e580e159 100644
--- a/drivers/clk/baikal-t1/ccu-div.c
+++ b/drivers/clk/baikal-t1/ccu-div.c
@@ -447,7 +447,7 @@ static void ccu_div_var_debug_init(struct clk_hw *hw, struct dentry *dentry)
num += !!(div->flags & CLK_SET_RATE_GATE) +
!!(div->features & CCU_DIV_RESET_DOMAIN);
- bits = kzalloc_objs(*bits, num, GFP_KERNEL);
+ bits = kzalloc_objs(*bits, num);
if (!bits)
return;
@@ -489,7 +489,7 @@ static void ccu_div_gate_debug_init(struct clk_hw *hw, struct dentry *dentry)
struct ccu_div *div = to_ccu_div(hw);
struct ccu_div_dbgfs_bit *bit;
- bit = kmalloc_obj(*bit, GFP_KERNEL);
+ bit = kmalloc_obj(*bit);
if (!bit)
return;
@@ -507,7 +507,7 @@ static void ccu_div_buf_debug_init(struct clk_hw *hw, struct dentry *dentry)
struct ccu_div *div = to_ccu_div(hw);
struct ccu_div_dbgfs_bit *bit;
- bit = kmalloc_obj(*bit, GFP_KERNEL);
+ bit = kmalloc_obj(*bit);
if (!bit)
return;
@@ -585,7 +585,7 @@ struct ccu_div *ccu_div_hw_register(const struct ccu_div_init_data *div_init)
if (!div_init)
return ERR_PTR(-EINVAL);
- div = kzalloc_obj(*div, GFP_KERNEL);
+ div = kzalloc_obj(*div);
if (!div)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/clk/baikal-t1/ccu-pll.c b/drivers/clk/baikal-t1/ccu-pll.c
index 02b3390cf87f..da7fbebb39ab 100644
--- a/drivers/clk/baikal-t1/ccu-pll.c
+++ b/drivers/clk/baikal-t1/ccu-pll.c
@@ -445,7 +445,7 @@ static void ccu_pll_debug_init(struct clk_hw *hw, struct dentry *dentry)
struct ccu_pll_dbgfs_fld *flds;
int idx;
- bits = kzalloc_objs(*bits, CCU_PLL_DBGFS_BIT_NUM, GFP_KERNEL);
+ bits = kzalloc_objs(*bits, CCU_PLL_DBGFS_BIT_NUM);
if (!bits)
return;
@@ -458,7 +458,7 @@ static void ccu_pll_debug_init(struct clk_hw *hw, struct dentry *dentry)
&ccu_pll_dbgfs_bit_fops);
}
- flds = kzalloc_objs(*flds, CCU_PLL_DBGFS_FLD_NUM, GFP_KERNEL);
+ flds = kzalloc_objs(*flds, CCU_PLL_DBGFS_FLD_NUM);
if (!flds)
return;
@@ -508,7 +508,7 @@ struct ccu_pll *ccu_pll_hw_register(const struct ccu_pll_init_data *pll_init)
if (!pll_init)
return ERR_PTR(-EINVAL);
- pll = kzalloc_obj(*pll, GFP_KERNEL);
+ pll = kzalloc_obj(*pll);
if (!pll)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/clk/baikal-t1/ccu-rst.c b/drivers/clk/baikal-t1/ccu-rst.c
index 18a60273a174..969e5de381a8 100644
--- a/drivers/clk/baikal-t1/ccu-rst.c
+++ b/drivers/clk/baikal-t1/ccu-rst.c
@@ -172,7 +172,7 @@ struct ccu_rst *ccu_rst_hw_register(const struct ccu_rst_init_data *rst_init)
if (!rst_init)
return ERR_PTR(-EINVAL);
- rst = kzalloc_obj(*rst, GFP_KERNEL);
+ rst = kzalloc_obj(*rst);
if (!rst)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/clk/baikal-t1/clk-ccu-div.c b/drivers/clk/baikal-t1/clk-ccu-div.c
index addccc4014f9..d32072e4dd49 100644
--- a/drivers/clk/baikal-t1/clk-ccu-div.c
+++ b/drivers/clk/baikal-t1/clk-ccu-div.c
@@ -271,7 +271,7 @@ static struct ccu_div_data *ccu_div_create_data(struct device_node *np)
struct ccu_div_data *data;
int ret;
- data = kzalloc_obj(*data, GFP_KERNEL);
+ data = kzalloc_obj(*data);
if (!data)
return ERR_PTR(-ENOMEM);
@@ -289,7 +289,7 @@ static struct ccu_div_data *ccu_div_create_data(struct device_node *np)
goto err_kfree_data;
}
- data->divs = kzalloc_objs(*data->divs, data->divs_num, GFP_KERNEL);
+ data->divs = kzalloc_objs(*data->divs, data->divs_num);
if (!data->divs) {
ret = -ENOMEM;
goto err_kfree_data;
diff --git a/drivers/clk/baikal-t1/clk-ccu-pll.c b/drivers/clk/baikal-t1/clk-ccu-pll.c
index ace46b60497e..e5e4a6ea6f78 100644
--- a/drivers/clk/baikal-t1/clk-ccu-pll.c
+++ b/drivers/clk/baikal-t1/clk-ccu-pll.c
@@ -100,7 +100,7 @@ static struct ccu_pll_data *ccu_pll_create_data(struct device_node *np)
{
struct ccu_pll_data *data;
- data = kzalloc_obj(*data, GFP_KERNEL);
+ data = kzalloc_obj(*data);
if (!data)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/clk/bcm/clk-bcm2835.c b/drivers/clk/bcm/clk-bcm2835.c
index 971131677b5a..118df86d717c 100644
--- a/drivers/clk/bcm/clk-bcm2835.c
+++ b/drivers/clk/bcm/clk-bcm2835.c
@@ -1357,7 +1357,7 @@ static struct clk_hw *bcm2835_register_pll(struct bcm2835_cprman *cprman,
init.ops = &bcm2835_pll_clk_ops;
init.flags = pll_data->flags | CLK_IGNORE_UNUSED;
- pll = kzalloc_obj(*pll, GFP_KERNEL);
+ pll = kzalloc_obj(*pll);
if (!pll)
return NULL;
diff --git a/drivers/clk/bcm/clk-bcm53573-ilp.c b/drivers/clk/bcm/clk-bcm53573-ilp.c
index e12a5384b95f..fb4f3b756282 100644
--- a/drivers/clk/bcm/clk-bcm53573-ilp.c
+++ b/drivers/clk/bcm/clk-bcm53573-ilp.c
@@ -102,7 +102,7 @@ static void bcm53573_ilp_init(struct device_node *np)
const char *parent_name;
int err;
- ilp = kzalloc_obj(*ilp, GFP_KERNEL);
+ ilp = kzalloc_obj(*ilp);
if (!ilp)
return;
diff --git a/drivers/clk/bcm/clk-iproc-armpll.c b/drivers/clk/bcm/clk-iproc-armpll.c
index e08e828666ea..8485428fe49c 100644
--- a/drivers/clk/bcm/clk-iproc-armpll.c
+++ b/drivers/clk/bcm/clk-iproc-armpll.c
@@ -238,7 +238,7 @@ void __init iproc_armpll_setup(struct device_node *node)
struct clk_init_data init;
const char *parent_name;
- pll = kzalloc_obj(*pll, GFP_KERNEL);
+ pll = kzalloc_obj(*pll);
if (WARN_ON(!pll))
return;
diff --git a/drivers/clk/bcm/clk-iproc-asiu.c b/drivers/clk/bcm/clk-iproc-asiu.c
index 258c6b2921bd..eea99037a4ed 100644
--- a/drivers/clk/bcm/clk-iproc-asiu.c
+++ b/drivers/clk/bcm/clk-iproc-asiu.c
@@ -188,7 +188,7 @@ void __init iproc_asiu_setup(struct device_node *node,
if (WARN_ON(!gate || !div))
return;
- asiu = kzalloc_obj(*asiu, GFP_KERNEL);
+ asiu = kzalloc_obj(*asiu);
if (WARN_ON(!asiu))
return;
@@ -198,7 +198,7 @@ void __init iproc_asiu_setup(struct device_node *node,
goto err_clks;
asiu->clk_data->num = num_clks;
- asiu->clks = kzalloc_objs(*asiu->clks, num_clks, GFP_KERNEL);
+ asiu->clks = kzalloc_objs(*asiu->clks, num_clks);
if (WARN_ON(!asiu->clks))
goto err_asiu_clks;
diff --git a/drivers/clk/bcm/clk-iproc-pll.c b/drivers/clk/bcm/clk-iproc-pll.c
index 3eab95a59b50..a40c85f833f2 100644
--- a/drivers/clk/bcm/clk-iproc-pll.c
+++ b/drivers/clk/bcm/clk-iproc-pll.c
@@ -731,7 +731,7 @@ void iproc_pll_clk_setup(struct device_node *node,
if (WARN_ON(!pll_ctrl) || WARN_ON(!clk_ctrl))
return;
- pll = kzalloc_obj(*pll, GFP_KERNEL);
+ pll = kzalloc_obj(*pll);
if (WARN_ON(!pll))
return;
@@ -740,7 +740,7 @@ void iproc_pll_clk_setup(struct device_node *node,
goto err_clk_data;
clk_data->num = num_clks;
- iclk_array = kzalloc_objs(struct iproc_clk, num_clks, GFP_KERNEL);
+ iclk_array = kzalloc_objs(struct iproc_clk, num_clks);
if (WARN_ON(!iclk_array))
goto err_clks;
diff --git a/drivers/clk/berlin/berlin2-avpll.c b/drivers/clk/berlin/berlin2-avpll.c
index 4c5881baf027..c801d42397bf 100644
--- a/drivers/clk/berlin/berlin2-avpll.c
+++ b/drivers/clk/berlin/berlin2-avpll.c
@@ -184,7 +184,7 @@ int __init berlin2_avpll_vco_register(void __iomem *base,
struct berlin2_avpll_vco *vco;
struct clk_init_data init;
- vco = kzalloc_obj(*vco, GFP_KERNEL);
+ vco = kzalloc_obj(*vco);
if (!vco)
return -ENOMEM;
@@ -360,7 +360,7 @@ int __init berlin2_avpll_channel_register(void __iomem *base,
struct berlin2_avpll_channel *ch;
struct clk_init_data init;
- ch = kzalloc_obj(*ch, GFP_KERNEL);
+ ch = kzalloc_obj(*ch);
if (!ch)
return -ENOMEM;
diff --git a/drivers/clk/berlin/berlin2-div.c b/drivers/clk/berlin/berlin2-div.c
index 6498823133c0..8d2123f0bea2 100644
--- a/drivers/clk/berlin/berlin2-div.c
+++ b/drivers/clk/berlin/berlin2-div.c
@@ -236,7 +236,7 @@ berlin2_div_register(const struct berlin2_div_map *map,
const struct clk_ops *gate_ops = &berlin2_div_gate_ops;
struct berlin2_div *div;
- div = kzalloc_obj(*div, GFP_KERNEL);
+ div = kzalloc_obj(*div);
if (!div)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/clk/berlin/berlin2-pll.c b/drivers/clk/berlin/berlin2-pll.c
index 6557b275a718..d0ec3d0bcf3e 100644
--- a/drivers/clk/berlin/berlin2-pll.c
+++ b/drivers/clk/berlin/berlin2-pll.c
@@ -81,7 +81,7 @@ berlin2_pll_register(const struct berlin2_pll_map *map,
struct clk_init_data init;
struct berlin2_pll *pll;
- pll = kzalloc_obj(*pll, GFP_KERNEL);
+ pll = kzalloc_obj(*pll);
if (!pll)
return -ENOMEM;
diff --git a/drivers/clk/clk-bm1880.c b/drivers/clk/clk-bm1880.c
index 47c64f16e129..46251008c83f 100644
--- a/drivers/clk/clk-bm1880.c
+++ b/drivers/clk/clk-bm1880.c
@@ -764,7 +764,7 @@ static struct clk_hw *bm1880_clk_register_composite(struct bm1880_composite_cloc
int ret;
if (clks->mux_shift >= 0) {
- mux = kzalloc_obj(*mux, GFP_KERNEL);
+ mux = kzalloc_obj(*mux);
if (!mux)
return ERR_PTR(-ENOMEM);
@@ -784,7 +784,7 @@ static struct clk_hw *bm1880_clk_register_composite(struct bm1880_composite_cloc
}
if (clks->gate_shift >= 0) {
- gate = kzalloc_obj(*gate, GFP_KERNEL);
+ gate = kzalloc_obj(*gate);
if (!gate) {
ret = -ENOMEM;
goto err_out;
@@ -799,7 +799,7 @@ static struct clk_hw *bm1880_clk_register_composite(struct bm1880_composite_cloc
}
if (clks->div_shift >= 0) {
- div_hws = kzalloc_obj(*div_hws, GFP_KERNEL);
+ div_hws = kzalloc_obj(*div_hws);
if (!div_hws) {
ret = -ENOMEM;
goto err_out;
diff --git a/drivers/clk/clk-bulk.c b/drivers/clk/clk-bulk.c
index 1039cf038850..d85dae4bdf89 100644
--- a/drivers/clk/clk-bulk.c
+++ b/drivers/clk/clk-bulk.c
@@ -54,7 +54,7 @@ static int __must_check of_clk_bulk_get_all(struct device_node *np,
if (!num_clks)
return 0;
- clk_bulk = kmalloc_objs(*clk_bulk, num_clks, GFP_KERNEL);
+ clk_bulk = kmalloc_objs(*clk_bulk, num_clks);
if (!clk_bulk)
return -ENOMEM;
diff --git a/drivers/clk/clk-composite.c b/drivers/clk/clk-composite.c
index 20e45856e8d6..44d010bccfb1 100644
--- a/drivers/clk/clk-composite.c
+++ b/drivers/clk/clk-composite.c
@@ -248,7 +248,7 @@ static struct clk_hw *__clk_hw_register_composite(struct device *dev,
struct clk_ops *clk_composite_ops;
int ret;
- composite = kzalloc_obj(*composite, GFP_KERNEL);
+ composite = kzalloc_obj(*composite);
if (!composite)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/clk/clk-divider.c b/drivers/clk/clk-divider.c
index e91bcdb092db..45e7ebde4a8b 100644
--- a/drivers/clk/clk-divider.c
+++ b/drivers/clk/clk-divider.c
@@ -538,7 +538,7 @@ struct clk_hw *__clk_hw_register_divider(struct device *dev,
}
/* allocate the divider */
- div = kzalloc_obj(*div, GFP_KERNEL);
+ div = kzalloc_obj(*div);
if (!div)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/clk/clk-eyeq.c b/drivers/clk/clk-eyeq.c
index a41f8706df18..ec0c953e4428 100644
--- a/drivers/clk/clk-eyeq.c
+++ b/drivers/clk/clk-eyeq.c
@@ -335,7 +335,7 @@ static int eqc_auxdev_create(struct device *dev, void __iomem *base,
struct auxiliary_device *adev;
int ret;
- adev = kzalloc_obj(*adev, GFP_KERNEL);
+ adev = kzalloc_obj(*adev);
if (!adev)
return -ENOMEM;
diff --git a/drivers/clk/clk-fixed-factor.c b/drivers/clk/clk-fixed-factor.c
index 40cfb6af38bb..850e8b95f352 100644
--- a/drivers/clk/clk-fixed-factor.c
+++ b/drivers/clk/clk-fixed-factor.c
@@ -110,7 +110,7 @@ __clk_hw_register_fixed_factor(struct device *dev, struct device_node *np,
fix = devres_alloc(devm_clk_hw_register_fixed_factor_release,
sizeof(*fix), GFP_KERNEL);
else
- fix = kmalloc_obj(*fix, GFP_KERNEL);
+ fix = kmalloc_obj(*fix);
if (!fix)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/clk/clk-fixed-rate.c b/drivers/clk/clk-fixed-rate.c
index ef48ee88df46..5dcb1bccf2b4 100644
--- a/drivers/clk/clk-fixed-rate.c
+++ b/drivers/clk/clk-fixed-rate.c
@@ -78,7 +78,7 @@ struct clk_hw *__clk_hw_register_fixed_rate(struct device *dev,
fixed = devres_alloc(devm_clk_hw_register_fixed_rate_release,
sizeof(*fixed), GFP_KERNEL);
else
- fixed = kzalloc_obj(*fixed, GFP_KERNEL);
+ fixed = kzalloc_obj(*fixed);
if (!fixed)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/clk/clk-fractional-divider.c b/drivers/clk/clk-fractional-divider.c
index 065ceb9b3a49..1c5fdcb68a50 100644
--- a/drivers/clk/clk-fractional-divider.c
+++ b/drivers/clk/clk-fractional-divider.c
@@ -275,7 +275,7 @@ struct clk_hw *clk_hw_register_fractional_divider(struct device *dev,
struct clk_hw *hw;
int ret;
- fd = kzalloc_obj(*fd, GFP_KERNEL);
+ fd = kzalloc_obj(*fd);
if (!fd)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/clk/clk-gate.c b/drivers/clk/clk-gate.c
index 0c5cbb3f3e75..44f5e0c53786 100644
--- a/drivers/clk/clk-gate.c
+++ b/drivers/clk/clk-gate.c
@@ -145,7 +145,7 @@ struct clk_hw *__clk_hw_register_gate(struct device *dev,
}
/* allocate the gate */
- gate = kzalloc_obj(*gate, GFP_KERNEL);
+ gate = kzalloc_obj(*gate);
if (!gate)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/clk/clk-gemini.c b/drivers/clk/clk-gemini.c
index 877db2e6efd1..e51de3498d2c 100644
--- a/drivers/clk/clk-gemini.c
+++ b/drivers/clk/clk-gemini.c
@@ -197,7 +197,7 @@ static struct clk_hw *gemini_pci_clk_setup(const char *name,
struct clk_init_data init;
int ret;
- pciclk = kzalloc_obj(*pciclk, GFP_KERNEL);
+ pciclk = kzalloc_obj(*pciclk);
if (!pciclk)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/clk/clk-highbank.c b/drivers/clk/clk-highbank.c
index 2642314b4735..e9b177811dfc 100644
--- a/drivers/clk/clk-highbank.c
+++ b/drivers/clk/clk-highbank.c
@@ -277,7 +277,7 @@ static void __init hb_clk_init(struct device_node *node, const struct clk_ops *o
if (WARN_ON(rc))
return;
- hb_clk = kzalloc_obj(*hb_clk, GFP_KERNEL);
+ hb_clk = kzalloc_obj(*hb_clk);
if (WARN_ON(!hb_clk))
return;
diff --git a/drivers/clk/clk-hsdk-pll.c b/drivers/clk/clk-hsdk-pll.c
index 0ea108366136..0e257cce588e 100644
--- a/drivers/clk/clk-hsdk-pll.c
+++ b/drivers/clk/clk-hsdk-pll.c
@@ -357,7 +357,7 @@ static void __init of_hsdk_pll_clk_setup(struct device_node *node)
struct hsdk_pll_clk *pll_clk;
struct clk_init_data init = { };
- pll_clk = kzalloc_obj(*pll_clk, GFP_KERNEL);
+ pll_clk = kzalloc_obj(*pll_clk);
if (!pll_clk)
return;
diff --git a/drivers/clk/clk-k210.c b/drivers/clk/clk-k210.c
index ffcb4e1b3488..6e27f5334cf8 100644
--- a/drivers/clk/clk-k210.c
+++ b/drivers/clk/clk-k210.c
@@ -893,7 +893,7 @@ static void __init k210_clk_init(struct device_node *np)
struct k210_sysclk *ksc;
int i, ret;
- ksc = kzalloc_obj(*ksc, GFP_KERNEL);
+ ksc = kzalloc_obj(*ksc);
if (!ksc)
return;
diff --git a/drivers/clk/clk-milbeaut.c b/drivers/clk/clk-milbeaut.c
index 6a27411c9f9f..60224187b336 100644
--- a/drivers/clk/clk-milbeaut.c
+++ b/drivers/clk/clk-milbeaut.c
@@ -333,7 +333,7 @@ static struct clk_hw *m10v_clk_hw_register_mux(struct device *dev,
struct clk_init_data init;
int ret;
- mux = kzalloc_obj(*mux, GFP_KERNEL);
+ mux = kzalloc_obj(*mux);
if (!mux)
return ERR_PTR(-ENOMEM);
@@ -464,7 +464,7 @@ static struct clk_hw *m10v_clk_hw_register_divider(struct device *dev,
struct clk_init_data init;
int ret;
- div = kzalloc_obj(*div, GFP_KERNEL);
+ div = kzalloc_obj(*div);
if (!div)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/clk/clk-mux.c b/drivers/clk/clk-mux.c
index ee4a7065817f..1d5b6b68711e 100644
--- a/drivers/clk/clk-mux.c
+++ b/drivers/clk/clk-mux.c
@@ -169,7 +169,7 @@ struct clk_hw *__clk_hw_register_mux(struct device *dev, struct device_node *np,
}
/* allocate the mux */
- mux = kzalloc_obj(*mux, GFP_KERNEL);
+ mux = kzalloc_obj(*mux);
if (!mux)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/clk/clk-nomadik.c b/drivers/clk/clk-nomadik.c
index d165ef6f320d..da6b89759a14 100644
--- a/drivers/clk/clk-nomadik.c
+++ b/drivers/clk/clk-nomadik.c
@@ -270,7 +270,7 @@ pll_clk_register(struct device *dev, const char *name,
return ERR_PTR(-EINVAL);
}
- pll = kzalloc_obj(*pll, GFP_KERNEL);
+ pll = kzalloc_obj(*pll);
if (!pll)
return ERR_PTR(-ENOMEM);
@@ -357,7 +357,7 @@ src_clk_register(struct device *dev, const char *name,
struct clk_src *sclk;
struct clk_init_data init;
- sclk = kzalloc_obj(*sclk, GFP_KERNEL);
+ sclk = kzalloc_obj(*sclk);
if (!sclk)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/clk/clk-npcm7xx.c b/drivers/clk/clk-npcm7xx.c
index e02f3f1d5ea7..2cd1ae4f152d 100644
--- a/drivers/clk/clk-npcm7xx.c
+++ b/drivers/clk/clk-npcm7xx.c
@@ -74,7 +74,7 @@ npcm7xx_clk_register_pll(void __iomem *pllcon, const char *name,
struct clk_hw *hw;
int ret;
- pll = kzalloc_obj(*pll, GFP_KERNEL);
+ pll = kzalloc_obj(*pll);
if (!pll)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/clk/clk-qoriq.c b/drivers/clk/clk-qoriq.c
index c1e0b0a80da7..f05631e55310 100644
--- a/drivers/clk/clk-qoriq.c
+++ b/drivers/clk/clk-qoriq.c
@@ -976,7 +976,7 @@ static struct clk * __init create_one_cmux(struct clockgen *cg, int idx)
u64 max_rate, pct80_rate;
u32 clksel;
- hwc = kzalloc_obj(*hwc, GFP_KERNEL);
+ hwc = kzalloc_obj(*hwc);
if (!hwc)
return NULL;
@@ -1020,7 +1020,7 @@ static struct clk * __init create_one_hwaccel(struct clockgen *cg, int idx)
{
struct mux_hwclock *hwc;
- hwc = kzalloc_obj(*hwc, GFP_KERNEL);
+ hwc = kzalloc_obj(*hwc);
if (!hwc)
return NULL;
@@ -1319,11 +1319,11 @@ static void __init legacy_pll_init(struct device_node *np, int idx)
count = of_property_count_strings(np, "clock-output-names");
BUILD_BUG_ON(ARRAY_SIZE(pll->div) < 4);
- subclks = kzalloc_objs(struct clk *, 4, GFP_KERNEL);
+ subclks = kzalloc_objs(struct clk *, 4);
if (!subclks)
return;
- onecell_data = kmalloc_obj(*onecell_data, GFP_KERNEL);
+ onecell_data = kmalloc_obj(*onecell_data);
if (!onecell_data)
goto err_clks;
diff --git a/drivers/clk/clk-stm32f4.c b/drivers/clk/clk-stm32f4.c
index 4e518b92797b..090e7f136e6e 100644
--- a/drivers/clk/clk-stm32f4.c
+++ b/drivers/clk/clk-stm32f4.c
@@ -489,7 +489,7 @@ static struct clk *clk_register_apb_mul(struct device *dev, const char *name,
struct clk_init_data init;
struct clk *clk;
- am = kzalloc_obj(*am, GFP_KERNEL);
+ am = kzalloc_obj(*am);
if (!am)
return ERR_PTR(-ENOMEM);
@@ -815,7 +815,7 @@ static struct clk_hw *clk_register_pll_div(const char *name,
int ret;
/* allocate the divider */
- pll_div = kzalloc_obj(*pll_div, GFP_KERNEL);
+ pll_div = kzalloc_obj(*pll_div);
if (!pll_div)
return ERR_PTR(-ENOMEM);
@@ -937,7 +937,7 @@ static struct clk_hw *stm32f4_rcc_register_pll(const char *pllsrc,
const struct stm32f4_vco_data *vco;
- pll = kzalloc_obj(*pll, GFP_KERNEL);
+ pll = kzalloc_obj(*pll);
if (!pll)
return ERR_PTR(-ENOMEM);
@@ -1107,7 +1107,7 @@ static struct clk_hw *clk_register_rgate(struct device *dev, const char *name,
struct clk_hw *hw;
int ret;
- rgate = kzalloc_obj(*rgate, GFP_KERNEL);
+ rgate = kzalloc_obj(*rgate);
if (!rgate)
return ERR_PTR(-ENOMEM);
@@ -1202,13 +1202,13 @@ static struct clk_hw *stm32_register_cclk(struct device *dev, const char *name,
struct clk_gate *gate;
struct clk_mux *mux;
- gate = kzalloc_obj(*gate, GFP_KERNEL);
+ gate = kzalloc_obj(*gate);
if (!gate) {
hw = ERR_PTR(-EINVAL);
goto fail;
}
- mux = kzalloc_obj(*mux, GFP_KERNEL);
+ mux = kzalloc_obj(*mux);
if (!mux) {
kfree(gate);
hw = ERR_PTR(-EINVAL);
@@ -1776,7 +1776,7 @@ static struct clk_hw *stm32_register_aux_clk(const char *name,
const struct clk_ops *mux_ops = NULL, *gate_ops = NULL;
if (offset_gate != NO_GATE) {
- gate = kzalloc_obj(*gate, GFP_KERNEL);
+ gate = kzalloc_obj(*gate);
if (!gate) {
hw = ERR_PTR(-EINVAL);
goto fail;
@@ -1791,7 +1791,7 @@ static struct clk_hw *stm32_register_aux_clk(const char *name,
}
if (offset_mux != NO_MUX) {
- mux = kzalloc_obj(*mux, GFP_KERNEL);
+ mux = kzalloc_obj(*mux);
if (!mux) {
hw = ERR_PTR(-EINVAL);
goto fail;
diff --git a/drivers/clk/clk-stm32h7.c b/drivers/clk/clk-stm32h7.c
index 66fd934070b7..6909bb95dc5e 100644
--- a/drivers/clk/clk-stm32h7.c
+++ b/drivers/clk/clk-stm32h7.c
@@ -222,7 +222,7 @@ static struct clk_hw *clk_register_ready_gate(struct device *dev,
struct clk_hw *hw;
int ret;
- rgate = kzalloc_obj(*rgate, GFP_KERNEL);
+ rgate = kzalloc_obj(*rgate);
if (!rgate)
return ERR_PTR(-ENOMEM);
@@ -297,7 +297,7 @@ static struct clk_mux *_get_cmux(void __iomem *reg, u8 shift, u8 width,
{
struct clk_mux *mux;
- mux = kzalloc_obj(*mux, GFP_KERNEL);
+ mux = kzalloc_obj(*mux);
if (!mux)
return ERR_PTR(-ENOMEM);
@@ -315,7 +315,7 @@ static struct clk_divider *_get_cdiv(void __iomem *reg, u8 shift, u8 width,
{
struct clk_divider *div;
- div = kzalloc_obj(*div, GFP_KERNEL);
+ div = kzalloc_obj(*div);
if (!div)
return ERR_PTR(-ENOMEM);
@@ -334,7 +334,7 @@ static struct clk_gate *_get_cgate(void __iomem *reg, u8 bit_idx, u32 flags,
{
struct clk_gate *gate;
- gate = kzalloc_obj(*gate, GFP_KERNEL);
+ gate = kzalloc_obj(*gate);
if (!gate)
return ERR_PTR(-ENOMEM);
@@ -467,7 +467,7 @@ static struct clk_hw *clk_register_stm32_timer_ker(struct device *dev,
struct clk_hw *hw;
int err;
- element = kzalloc_obj(*element, GFP_KERNEL);
+ element = kzalloc_obj(*element);
if (!element)
return ERR_PTR(-ENOMEM);
@@ -792,7 +792,7 @@ static struct clk_hw *clk_register_stm32_pll(struct device *dev,
struct stm32_fractional_divider *div = NULL;
struct stm32_ready_gate *rgate;
- pll = kzalloc_obj(*pll, GFP_KERNEL);
+ pll = kzalloc_obj(*pll);
if (!pll)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/clk/clk-vt8500.c b/drivers/clk/clk-vt8500.c
index 6065141750af..3e62cb853d5e 100644
--- a/drivers/clk/clk-vt8500.c
+++ b/drivers/clk/clk-vt8500.c
@@ -235,7 +235,7 @@ static __init void vtwm_device_clk_init(struct device_node *node)
if (!pmc_base)
vtwm_set_pmc_base();
- dev_clk = kzalloc_obj(*dev_clk, GFP_KERNEL);
+ dev_clk = kzalloc_obj(*dev_clk);
if (WARN_ON(!dev_clk))
return;
@@ -698,7 +698,7 @@ static __init void vtwm_pll_clk_init(struct device_node *node, int pll_type)
if (WARN_ON(rc))
return;
- pll_clk = kzalloc_obj(*pll_clk, GFP_KERNEL);
+ pll_clk = kzalloc_obj(*pll_clk);
if (WARN_ON(!pll_clk))
return;
diff --git a/drivers/clk/clk-xgene.c b/drivers/clk/clk-xgene.c
index ebf47b1f5433..ba3b1057e4f0 100644
--- a/drivers/clk/clk-xgene.c
+++ b/drivers/clk/clk-xgene.c
@@ -131,7 +131,7 @@ static struct clk *xgene_register_clk_pll(struct device *dev,
struct clk_init_data init;
/* allocate the APM clock structure */
- apmclk = kzalloc_obj(*apmclk, GFP_KERNEL);
+ apmclk = kzalloc_obj(*apmclk);
if (!apmclk)
return ERR_PTR(-ENOMEM);
@@ -352,7 +352,7 @@ xgene_register_clk_pmd(struct device *dev,
struct clk_init_data init;
struct clk *clk;
- fd = kzalloc_obj(*fd, GFP_KERNEL);
+ fd = kzalloc_obj(*fd);
if (!fd)
return ERR_PTR(-ENOMEM);
@@ -638,7 +638,7 @@ static struct clk *xgene_register_clk(struct device *dev,
int rc;
/* allocate the APM clock structure */
- apmclk = kzalloc_obj(*apmclk, GFP_KERNEL);
+ apmclk = kzalloc_obj(*apmclk);
if (!apmclk)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/clk/clk.c b/drivers/clk/clk.c
index 5789cd93bfc2..47093cda9df3 100644
--- a/drivers/clk/clk.c
+++ b/drivers/clk/clk.c
@@ -4121,7 +4121,7 @@ static struct clk *alloc_clk(struct clk_core *core, const char *dev_id,
{
struct clk *clk;
- clk = kzalloc_obj(*clk, GFP_KERNEL);
+ clk = kzalloc_obj(*clk);
if (!clk)
return ERR_PTR(-ENOMEM);
@@ -4238,7 +4238,7 @@ static int clk_core_populate_parent_map(struct clk_core *core,
* Avoid unnecessary string look-ups of clk_core's possible parents by
* having a cache of names/clk_hw pointers to clk_core pointers.
*/
- parents = kzalloc_objs(*parents, num_parents, GFP_KERNEL);
+ parents = kzalloc_objs(*parents, num_parents);
core->parents = parents;
if (!parents)
return -ENOMEM;
@@ -4328,7 +4328,7 @@ __clk_register(struct device *dev, struct device_node *np, struct clk_hw *hw)
*/
hw->init = NULL;
- core = kzalloc_obj(*core, GFP_KERNEL);
+ core = kzalloc_obj(*core);
if (!core) {
ret = -ENOMEM;
goto fail_out;
@@ -4813,7 +4813,7 @@ int clk_notifier_register(struct clk *clk, struct notifier_block *nb)
goto found;
/* if clk wasn't in the notifier list, allocate new clk_notifier */
- cn = kzalloc_obj(*cn, GFP_KERNEL);
+ cn = kzalloc_obj(*cn);
if (!cn)
goto out;
@@ -5009,7 +5009,7 @@ int of_clk_add_provider(struct device_node *np,
if (!np)
return 0;
- cp = kzalloc_obj(*cp, GFP_KERNEL);
+ cp = kzalloc_obj(*cp);
if (!cp)
return -ENOMEM;
@@ -5051,7 +5051,7 @@ int of_clk_add_hw_provider(struct device_node *np,
if (!np)
return 0;
- cp = kzalloc_obj(*cp, GFP_KERNEL);
+ cp = kzalloc_obj(*cp);
if (!cp)
return -ENOMEM;
@@ -5548,7 +5548,7 @@ void __init of_clk_init(const struct of_device_id *matches)
if (!of_device_is_available(np))
continue;
- parent = kzalloc_obj(*parent, GFP_KERNEL);
+ parent = kzalloc_obj(*parent);
if (!parent) {
list_for_each_entry_safe(clk_provider, next,
&clk_provider_list, node) {
diff --git a/drivers/clk/clkdev.c b/drivers/clk/clkdev.c
index 4d1dbd9fb807..abaa0f9e0083 100644
--- a/drivers/clk/clkdev.c
+++ b/drivers/clk/clkdev.c
@@ -164,7 +164,7 @@ vclkdev_alloc(struct clk_hw *hw, const char *con_id, const char *dev_fmt,
size_t max_size;
ssize_t res;
- cla = kzalloc_obj(*cla, GFP_KERNEL);
+ cla = kzalloc_obj(*cla);
if (!cla)
return NULL;
diff --git a/drivers/clk/davinci/pll.c b/drivers/clk/davinci/pll.c
index eda3c3a45c52..f73b0ac5d8a0 100644
--- a/drivers/clk/davinci/pll.c
+++ b/drivers/clk/davinci/pll.c
@@ -243,14 +243,14 @@ static struct clk *davinci_pll_div_register(struct device *dev,
struct clk *clk;
int ret;
- gate = kzalloc_obj(*gate, GFP_KERNEL);
+ gate = kzalloc_obj(*gate);
if (!gate)
return ERR_PTR(-ENOMEM);
gate->reg = reg;
gate->bit_idx = DIV_ENABLE_SHIFT;
- divider = kzalloc_obj(*divider, GFP_KERNEL);
+ divider = kzalloc_obj(*divider);
if (!divider) {
ret = -ENOMEM;
goto err_free_gate;
@@ -433,7 +433,7 @@ struct clk *davinci_pll_clk_register(struct device *dev,
info->unlock_mask, 0);
}
- pllout = kzalloc_obj(*pllout, GFP_KERNEL);
+ pllout = kzalloc_obj(*pllout);
if (!pllout) {
ret = -ENOMEM;
goto err_unregister_prediv;
@@ -489,7 +489,7 @@ struct clk *davinci_pll_clk_register(struct device *dev,
parent_name = postdiv_name;
}
- pllen = kzalloc_obj(*pllen, GFP_KERNEL);
+ pllen = kzalloc_obj(*pllen);
if (!pllen) {
ret = -ENOMEM;
goto err_unregister_postdiv;
@@ -579,7 +579,7 @@ davinci_pll_obsclk_register(struct device *dev,
u32 oscdiv;
int ret;
- mux = kzalloc_obj(*mux, GFP_KERNEL);
+ mux = kzalloc_obj(*mux);
if (!mux)
return ERR_PTR(-ENOMEM);
@@ -587,7 +587,7 @@ davinci_pll_obsclk_register(struct device *dev,
mux->table = info->table;
mux->mask = info->ocsrc_mask;
- gate = kzalloc_obj(*gate, GFP_KERNEL);
+ gate = kzalloc_obj(*gate);
if (!gate) {
ret = -ENOMEM;
goto err_free_mux;
@@ -596,7 +596,7 @@ davinci_pll_obsclk_register(struct device *dev,
gate->reg = base + CKEN;
gate->bit_idx = CKEN_OBSCLK_SHIFT;
- divider = kzalloc_obj(*divider, GFP_KERNEL);
+ divider = kzalloc_obj(*divider);
if (!divider) {
ret = -ENOMEM;
goto err_free_gate;
@@ -690,14 +690,14 @@ davinci_pll_sysclk_register(struct device *dev,
else
reg = PLLDIV4 + 4 * (info->id - 4);
- gate = kzalloc_obj(*gate, GFP_KERNEL);
+ gate = kzalloc_obj(*gate);
if (!gate)
return ERR_PTR(-ENOMEM);
gate->reg = base + reg;
gate->bit_idx = DIV_ENABLE_SHIFT;
- divider = kzalloc_obj(*divider, GFP_KERNEL);
+ divider = kzalloc_obj(*divider);
if (!divider) {
ret = -ENOMEM;
goto err_free_gate;
@@ -776,13 +776,13 @@ int of_davinci_pll_init(struct device *dev, struct device_node *node,
int n_clks = max_sysclk_id + 1;
int i;
- clk_data = kzalloc_obj(*clk_data, GFP_KERNEL);
+ clk_data = kzalloc_obj(*clk_data);
if (!clk_data) {
of_node_put(child);
return -ENOMEM;
}
- clks = kmalloc_objs(*clks, n_clks, GFP_KERNEL);
+ clks = kmalloc_objs(*clks, n_clks);
if (!clks) {
kfree(clk_data);
of_node_put(child);
@@ -942,7 +942,7 @@ static void davinci_pll_debug_init(struct clk_hw *hw, struct dentry *dentry)
struct davinci_pll_clk *pll = to_davinci_pll_clk(hw);
struct debugfs_regset32 *regset;
- regset = kzalloc_obj(*regset, GFP_KERNEL);
+ regset = kzalloc_obj(*regset);
if (!regset)
return;
diff --git a/drivers/clk/davinci/psc.c b/drivers/clk/davinci/psc.c
index 5a593f20ce81..ff603520d56f 100644
--- a/drivers/clk/davinci/psc.c
+++ b/drivers/clk/davinci/psc.c
@@ -239,7 +239,7 @@ davinci_lpsc_clk_register(struct device *dev, const char *name,
int ret;
bool is_on;
- lpsc = kzalloc_obj(*lpsc, GFP_KERNEL);
+ lpsc = kzalloc_obj(*lpsc);
if (!lpsc)
return ERR_PTR(-ENOMEM);
@@ -372,11 +372,11 @@ __davinci_psc_register_clocks(struct device *dev,
struct regmap *regmap;
int i, ret;
- psc = kzalloc_obj(*psc, GFP_KERNEL);
+ psc = kzalloc_obj(*psc);
if (!psc)
return ERR_PTR(-ENOMEM);
- clks = kmalloc_objs(*clks, num_clks, GFP_KERNEL);
+ clks = kmalloc_objs(*clks, num_clks);
if (!clks) {
ret = -ENOMEM;
goto err_free_psc;
@@ -392,7 +392,7 @@ __davinci_psc_register_clocks(struct device *dev,
for (i = 0; i < num_clks; i++)
clks[i] = ERR_PTR(-ENOENT);
- pm_domains = kzalloc_objs(*pm_domains, num_clks, GFP_KERNEL);
+ pm_domains = kzalloc_objs(*pm_domains, num_clks);
if (!pm_domains) {
ret = -ENOMEM;
goto err_free_clks;
diff --git a/drivers/clk/hisilicon/clk-hi3620.c b/drivers/clk/hisilicon/clk-hi3620.c
index 069ea7b56c09..8dcad74e679a 100644
--- a/drivers/clk/hisilicon/clk-hi3620.c
+++ b/drivers/clk/hisilicon/clk-hi3620.c
@@ -414,7 +414,7 @@ static struct clk *hisi_register_clk_mmc(struct hisi_mmc_clock *mmc_clk,
struct clk *clk;
struct clk_init_data init;
- mclk = kzalloc_obj(*mclk, GFP_KERNEL);
+ mclk = kzalloc_obj(*mclk);
if (!mclk)
return ERR_PTR(-ENOMEM);
@@ -461,11 +461,11 @@ static void __init hi3620_mmc_clk_init(struct device_node *node)
return;
}
- clk_data = kzalloc_obj(*clk_data, GFP_KERNEL);
+ clk_data = kzalloc_obj(*clk_data);
if (WARN_ON(!clk_data))
return;
- clk_data->clks = kzalloc_objs(*clk_data->clks, num, GFP_KERNEL);
+ clk_data->clks = kzalloc_objs(*clk_data->clks, num);
if (!clk_data->clks) {
kfree(clk_data);
return;
diff --git a/drivers/clk/hisilicon/clk-hix5hd2.c b/drivers/clk/hisilicon/clk-hix5hd2.c
index 31a9ab1758f1..57db6fab43aa 100644
--- a/drivers/clk/hisilicon/clk-hix5hd2.c
+++ b/drivers/clk/hisilicon/clk-hix5hd2.c
@@ -261,7 +261,7 @@ hix5hd2_clk_register_complex(struct hix5hd2_complex_clock *clks, int nums,
struct clk *clk;
struct clk_init_data init;
- p_clk = kzalloc_obj(*p_clk, GFP_KERNEL);
+ p_clk = kzalloc_obj(*p_clk);
if (!p_clk)
return;
diff --git a/drivers/clk/hisilicon/clk.c b/drivers/clk/hisilicon/clk.c
index 8b37a6310289..fae65127cd4a 100644
--- a/drivers/clk/hisilicon/clk.c
+++ b/drivers/clk/hisilicon/clk.c
@@ -68,12 +68,12 @@ struct hisi_clock_data *hisi_clk_init(struct device_node *np,
goto err;
}
- clk_data = kzalloc_obj(*clk_data, GFP_KERNEL);
+ clk_data = kzalloc_obj(*clk_data);
if (!clk_data)
goto err;
clk_data->base = base;
- clk_table = kzalloc_objs(*clk_table, nr_clks, GFP_KERNEL);
+ clk_table = kzalloc_objs(*clk_table, nr_clks);
if (!clk_table)
goto err_data;
diff --git a/drivers/clk/hisilicon/clkdivider-hi6220.c b/drivers/clk/hisilicon/clkdivider-hi6220.c
index c59c2c38812b..1787ecefe601 100644
--- a/drivers/clk/hisilicon/clkdivider-hi6220.c
+++ b/drivers/clk/hisilicon/clkdivider-hi6220.c
@@ -109,7 +109,7 @@ struct clk *hi6220_register_clkdiv(struct device *dev, const char *name,
int i;
/* allocate the divider */
- div = kzalloc_obj(*div, GFP_KERNEL);
+ div = kzalloc_obj(*div);
if (!div)
return ERR_PTR(-ENOMEM);
@@ -117,7 +117,7 @@ struct clk *hi6220_register_clkdiv(struct device *dev, const char *name,
max_div = div_mask(width) + 1;
min_div = 1;
- table = kzalloc_objs(*table, max_div + 1, GFP_KERNEL);
+ table = kzalloc_objs(*table, max_div + 1);
if (!table) {
kfree(div);
return ERR_PTR(-ENOMEM);
diff --git a/drivers/clk/hisilicon/clkgate-separated.c b/drivers/clk/hisilicon/clkgate-separated.c
index cb4fd20f7639..199303157ebd 100644
--- a/drivers/clk/hisilicon/clkgate-separated.c
+++ b/drivers/clk/hisilicon/clkgate-separated.c
@@ -90,7 +90,7 @@ struct clk *hisi_register_clkgate_sep(struct device *dev, const char *name,
struct clk *clk;
struct clk_init_data init;
- sclk = kzalloc_obj(*sclk, GFP_KERNEL);
+ sclk = kzalloc_obj(*sclk);
if (!sclk)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/clk/imx/clk-busy.c b/drivers/clk/imx/clk-busy.c
index a6886a73aa24..b8b6e7c7e1fe 100644
--- a/drivers/clk/imx/clk-busy.c
+++ b/drivers/clk/imx/clk-busy.c
@@ -82,7 +82,7 @@ struct clk_hw *imx_clk_hw_busy_divider(const char *name, const char *parent_name
struct clk_init_data init;
int ret;
- busy = kzalloc_obj(*busy, GFP_KERNEL);
+ busy = kzalloc_obj(*busy);
if (!busy)
return ERR_PTR(-ENOMEM);
@@ -162,7 +162,7 @@ struct clk_hw *imx_clk_hw_busy_mux(const char *name, void __iomem *reg, u8 shift
struct clk_init_data init;
int ret;
- busy = kzalloc_obj(*busy, GFP_KERNEL);
+ busy = kzalloc_obj(*busy);
if (!busy)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/clk/imx/clk-composite-7ulp.c b/drivers/clk/imx/clk-composite-7ulp.c
index 59c2b392db44..689e3479d14d 100644
--- a/drivers/clk/imx/clk-composite-7ulp.c
+++ b/drivers/clk/imx/clk-composite-7ulp.c
@@ -99,7 +99,7 @@ static struct clk_hw *imx_ulp_clk_hw_composite(const char *name,
}
if (mux_present) {
- mux = kzalloc_obj(*mux, GFP_KERNEL);
+ mux = kzalloc_obj(*mux);
if (!mux)
return ERR_PTR(-ENOMEM);
mux_hw = &mux->hw;
@@ -111,7 +111,7 @@ static struct clk_hw *imx_ulp_clk_hw_composite(const char *name,
}
if (rate_present) {
- fd = kzalloc_obj(*fd, GFP_KERNEL);
+ fd = kzalloc_obj(*fd);
if (!fd) {
kfree(mux);
return ERR_PTR(-ENOMEM);
@@ -128,7 +128,7 @@ static struct clk_hw *imx_ulp_clk_hw_composite(const char *name,
}
if (gate_present) {
- gate = kzalloc_obj(*gate, GFP_KERNEL);
+ gate = kzalloc_obj(*gate);
if (!gate) {
kfree(mux);
kfree(fd);
diff --git a/drivers/clk/imx/clk-composite-8m.c b/drivers/clk/imx/clk-composite-8m.c
index e5ccb6810822..e63e0cb4b203 100644
--- a/drivers/clk/imx/clk-composite-8m.c
+++ b/drivers/clk/imx/clk-composite-8m.c
@@ -231,7 +231,7 @@ struct clk_hw *__imx8m_clk_hw_composite(const char *name,
const struct clk_ops *mux_ops;
const struct clk_ops *gate_ops;
- mux = kzalloc_obj(*mux, GFP_KERNEL);
+ mux = kzalloc_obj(*mux);
if (!mux)
return ERR_CAST(hw);
@@ -241,7 +241,7 @@ struct clk_hw *__imx8m_clk_hw_composite(const char *name,
mux->mask = PCG_PCS_MASK;
mux->lock = &imx_ccm_lock;
- div = kzalloc_obj(*div, GFP_KERNEL);
+ div = kzalloc_obj(*div);
if (!div)
goto free_mux;
@@ -270,7 +270,7 @@ struct clk_hw *__imx8m_clk_hw_composite(const char *name,
div->flags = CLK_DIVIDER_ROUND_CLOSEST;
/* skip registering the gate ops if M4 is enabled */
- gate = kzalloc_obj(*gate, GFP_KERNEL);
+ gate = kzalloc_obj(*gate);
if (!gate)
goto free_div;
diff --git a/drivers/clk/imx/clk-composite-93.c b/drivers/clk/imx/clk-composite-93.c
index db006eba18f8..ef20ceb2d255 100644
--- a/drivers/clk/imx/clk-composite-93.c
+++ b/drivers/clk/imx/clk-composite-93.c
@@ -193,7 +193,7 @@ struct clk_hw *imx93_clk_composite_flags(const char *name, const char * const *p
bool clk_ro = false;
u32 authen;
- mux = kzalloc_obj(*mux, GFP_KERNEL);
+ mux = kzalloc_obj(*mux);
if (!mux)
goto fail;
@@ -203,7 +203,7 @@ struct clk_hw *imx93_clk_composite_flags(const char *name, const char * const *p
mux->mask = CCM_MUX_MASK;
mux->lock = &imx_ccm_lock;
- div = kzalloc_obj(*div, GFP_KERNEL);
+ div = kzalloc_obj(*div);
if (!div)
goto fail;
@@ -223,7 +223,7 @@ struct clk_hw *imx93_clk_composite_flags(const char *name, const char * const *p
mux_hw, &clk_mux_ro_ops, div_hw,
&clk_divider_ro_ops, NULL, NULL, flags);
} else {
- gate = kzalloc_obj(*gate, GFP_KERNEL);
+ gate = kzalloc_obj(*gate);
if (!gate)
goto fail;
diff --git a/drivers/clk/imx/clk-cpu.c b/drivers/clk/imx/clk-cpu.c
index e63296483504..f53dbaacddcc 100644
--- a/drivers/clk/imx/clk-cpu.c
+++ b/drivers/clk/imx/clk-cpu.c
@@ -81,7 +81,7 @@ struct clk_hw *imx_clk_hw_cpu(const char *name, const char *parent_name,
struct clk_init_data init;
int ret;
- cpu = kzalloc_obj(*cpu, GFP_KERNEL);
+ cpu = kzalloc_obj(*cpu);
if (!cpu)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/clk/imx/clk-divider-gate.c b/drivers/clk/imx/clk-divider-gate.c
index 51042ba556d0..957d132c4607 100644
--- a/drivers/clk/imx/clk-divider-gate.c
+++ b/drivers/clk/imx/clk-divider-gate.c
@@ -185,7 +185,7 @@ struct clk_hw *imx_clk_hw_divider_gate(const char *name, const char *parent_name
u32 val;
int ret;
- div_gate = kzalloc_obj(*div_gate, GFP_KERNEL);
+ div_gate = kzalloc_obj(*div_gate);
if (!div_gate)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/clk/imx/clk-fixup-div.c b/drivers/clk/imx/clk-fixup-div.c
index a90609aec218..3866319af54e 100644
--- a/drivers/clk/imx/clk-fixup-div.c
+++ b/drivers/clk/imx/clk-fixup-div.c
@@ -97,7 +97,7 @@ struct clk_hw *imx_clk_hw_fixup_divider(const char *name, const char *parent,
if (!fixup)
return ERR_PTR(-EINVAL);
- fixup_div = kzalloc_obj(*fixup_div, GFP_KERNEL);
+ fixup_div = kzalloc_obj(*fixup_div);
if (!fixup_div)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/clk/imx/clk-fixup-mux.c b/drivers/clk/imx/clk-fixup-mux.c
index b1c887fc99c4..7188cdad79d3 100644
--- a/drivers/clk/imx/clk-fixup-mux.c
+++ b/drivers/clk/imx/clk-fixup-mux.c
@@ -77,7 +77,7 @@ struct clk_hw *imx_clk_hw_fixup_mux(const char *name, void __iomem *reg,
if (!fixup)
return ERR_PTR(-EINVAL);
- fixup_mux = kzalloc_obj(*fixup_mux, GFP_KERNEL);
+ fixup_mux = kzalloc_obj(*fixup_mux);
if (!fixup_mux)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/clk/imx/clk-frac-pll.c b/drivers/clk/imx/clk-frac-pll.c
index fba0c0f449df..cd4e26bac19c 100644
--- a/drivers/clk/imx/clk-frac-pll.c
+++ b/drivers/clk/imx/clk-frac-pll.c
@@ -213,7 +213,7 @@ struct clk_hw *imx_clk_hw_frac_pll(const char *name,
struct clk_hw *hw;
int ret;
- pll = kzalloc_obj(*pll, GFP_KERNEL);
+ pll = kzalloc_obj(*pll);
if (!pll)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/clk/imx/clk-fracn-gppll.c b/drivers/clk/imx/clk-fracn-gppll.c
index 3cd1fd106aac..89ed7749bf47 100644
--- a/drivers/clk/imx/clk-fracn-gppll.c
+++ b/drivers/clk/imx/clk-fracn-gppll.c
@@ -366,7 +366,7 @@ static struct clk_hw *_imx_clk_fracn_gppll(const char *name, const char *parent_
struct clk_init_data init;
int ret;
- pll = kzalloc_obj(*pll, GFP_KERNEL);
+ pll = kzalloc_obj(*pll);
if (!pll)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/clk/imx/clk-gate-93.c b/drivers/clk/imx/clk-gate-93.c
index 0422e17a8233..7acbcfec9610 100644
--- a/drivers/clk/imx/clk-gate-93.c
+++ b/drivers/clk/imx/clk-gate-93.c
@@ -164,7 +164,7 @@ struct clk_hw *imx93_clk_gate(struct device *dev, const char *name, const char *
int ret;
u32 authen;
- gate = kzalloc_obj(struct imx93_clk_gate, GFP_KERNEL);
+ gate = kzalloc_obj(struct imx93_clk_gate);
if (!gate)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/clk/imx/clk-gate-exclusive.c b/drivers/clk/imx/clk-gate-exclusive.c
index 2f0db88cbbcf..504cfeef28a0 100644
--- a/drivers/clk/imx/clk-gate-exclusive.c
+++ b/drivers/clk/imx/clk-gate-exclusive.c
@@ -67,7 +67,7 @@ struct clk_hw *imx_clk_hw_gate_exclusive(const char *name, const char *parent,
if (exclusive_mask == 0)
return ERR_PTR(-EINVAL);
- exgate = kzalloc_obj(*exgate, GFP_KERNEL);
+ exgate = kzalloc_obj(*exgate);
if (!exgate)
return ERR_PTR(-ENOMEM);
gate = &exgate->gate;
diff --git a/drivers/clk/imx/clk-gate2.c b/drivers/clk/imx/clk-gate2.c
index d57c146a66cf..f07cf82dd9c9 100644
--- a/drivers/clk/imx/clk-gate2.c
+++ b/drivers/clk/imx/clk-gate2.c
@@ -144,7 +144,7 @@ struct clk_hw *clk_hw_register_gate2(struct device *dev, const char *name,
struct clk_init_data init;
int ret;
- gate = kzalloc_obj(struct clk_gate2, GFP_KERNEL);
+ gate = kzalloc_obj(struct clk_gate2);
if (!gate)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/clk/imx/clk-gpr-mux.c b/drivers/clk/imx/clk-gpr-mux.c
index 01f7142e7a98..27b9a6e26997 100644
--- a/drivers/clk/imx/clk-gpr-mux.c
+++ b/drivers/clk/imx/clk-gpr-mux.c
@@ -87,7 +87,7 @@ struct clk_hw *imx_clk_gpr_mux(const char *name, const char *compatible,
return ERR_CAST(regmap);
}
- priv = kzalloc_obj(*priv, GFP_KERNEL);
+ priv = kzalloc_obj(*priv);
if (!priv)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/clk/imx/clk-lpcg-scu.c b/drivers/clk/imx/clk-lpcg-scu.c
index 9e1247bb1edd..03bbfbe9bff3 100644
--- a/drivers/clk/imx/clk-lpcg-scu.c
+++ b/drivers/clk/imx/clk-lpcg-scu.c
@@ -119,7 +119,7 @@ struct clk_hw *__imx_clk_lpcg_scu(struct device *dev, const char *name,
struct clk_hw *hw;
int ret;
- clk = kzalloc_obj(*clk, GFP_KERNEL);
+ clk = kzalloc_obj(*clk);
if (!clk)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/clk/imx/clk-pfd.c b/drivers/clk/imx/clk-pfd.c
index 5222e5ee37d1..e7a5d80c5008 100644
--- a/drivers/clk/imx/clk-pfd.c
+++ b/drivers/clk/imx/clk-pfd.c
@@ -132,7 +132,7 @@ struct clk_hw *imx_clk_hw_pfd(const char *name, const char *parent_name,
struct clk_init_data init;
int ret;
- pfd = kzalloc_obj(*pfd, GFP_KERNEL);
+ pfd = kzalloc_obj(*pfd);
if (!pfd)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/clk/imx/clk-pfdv2.c b/drivers/clk/imx/clk-pfdv2.c
index ce37a151c745..0f92b92e2229 100644
--- a/drivers/clk/imx/clk-pfdv2.c
+++ b/drivers/clk/imx/clk-pfdv2.c
@@ -210,7 +210,7 @@ struct clk_hw *imx_clk_hw_pfdv2(enum imx_pfdv2_type type, const char *name,
WARN_ON(idx > 3);
- pfd = kzalloc_obj(*pfd, GFP_KERNEL);
+ pfd = kzalloc_obj(*pfd);
if (!pfd)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/clk/imx/clk-pll14xx.c b/drivers/clk/imx/clk-pll14xx.c
index 33974d762e4d..7552aaafc339 100644
--- a/drivers/clk/imx/clk-pll14xx.c
+++ b/drivers/clk/imx/clk-pll14xx.c
@@ -504,7 +504,7 @@ struct clk_hw *imx_dev_clk_hw_pll14xx(struct device *dev, const char *name,
int ret;
u32 val;
- pll = kzalloc_obj(*pll, GFP_KERNEL);
+ pll = kzalloc_obj(*pll);
if (!pll)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/clk/imx/clk-pllv1.c b/drivers/clk/imx/clk-pllv1.c
index 502f29d44f52..da5531e57da2 100644
--- a/drivers/clk/imx/clk-pllv1.c
+++ b/drivers/clk/imx/clk-pllv1.c
@@ -119,7 +119,7 @@ struct clk_hw *imx_clk_hw_pllv1(enum imx_pllv1_type type, const char *name,
struct clk_init_data init;
int ret;
- pll = kmalloc_obj(*pll, GFP_KERNEL);
+ pll = kmalloc_obj(*pll);
if (!pll)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/clk/imx/clk-pllv2.c b/drivers/clk/imx/clk-pllv2.c
index 1faa289b8e69..43396388030e 100644
--- a/drivers/clk/imx/clk-pllv2.c
+++ b/drivers/clk/imx/clk-pllv2.c
@@ -254,7 +254,7 @@ struct clk_hw *imx_clk_hw_pllv2(const char *name, const char *parent,
struct clk_init_data init;
int ret;
- pll = kzalloc_obj(*pll, GFP_KERNEL);
+ pll = kzalloc_obj(*pll);
if (!pll)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/clk/imx/clk-pllv3.c b/drivers/clk/imx/clk-pllv3.c
index 78d40dad7b4a..a0ad6f4aae8f 100644
--- a/drivers/clk/imx/clk-pllv3.c
+++ b/drivers/clk/imx/clk-pllv3.c
@@ -426,7 +426,7 @@ struct clk_hw *imx_clk_hw_pllv3(enum imx_pllv3_type type, const char *name,
struct clk_init_data init;
int ret;
- pll = kzalloc_obj(*pll, GFP_KERNEL);
+ pll = kzalloc_obj(*pll);
if (!pll)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/clk/imx/clk-pllv4.c b/drivers/clk/imx/clk-pllv4.c
index d7a4e9ed55b3..8fa2f7111ce9 100644
--- a/drivers/clk/imx/clk-pllv4.c
+++ b/drivers/clk/imx/clk-pllv4.c
@@ -251,7 +251,7 @@ struct clk_hw *imx_clk_hw_pllv4(enum imx_pllv4_type type, const char *name,
struct clk_init_data init;
int ret;
- pll = kzalloc_obj(*pll, GFP_KERNEL);
+ pll = kzalloc_obj(*pll);
if (!pll)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/clk/imx/clk-scu.c b/drivers/clk/imx/clk-scu.c
index 9ec9fe99c391..33e637ad3579 100644
--- a/drivers/clk/imx/clk-scu.c
+++ b/drivers/clk/imx/clk-scu.c
@@ -457,7 +457,7 @@ struct clk_hw *__imx_clk_scu(struct device *dev, const char *name,
struct clk_hw *hw;
int ret;
- clk = kzalloc_obj(*clk, GFP_KERNEL);
+ clk = kzalloc_obj(*clk);
if (!clk)
return ERR_PTR(-ENOMEM);
@@ -856,7 +856,7 @@ struct clk_hw *__imx_clk_gpr_scu(const char *name, const char * const *parent_na
if (rsrc_id >= IMX_SC_R_LAST || gpr_id >= IMX_SC_C_LAST)
return ERR_PTR(-EINVAL);
- clk_node = kzalloc_obj(*clk_node, GFP_KERNEL);
+ clk_node = kzalloc_obj(*clk_node);
if (!clk_node)
return ERR_PTR(-ENOMEM);
@@ -870,7 +870,7 @@ struct clk_hw *__imx_clk_gpr_scu(const char *name, const char * const *parent_na
return NULL;
}
- clk = kzalloc_obj(*clk, GFP_KERNEL);
+ clk = kzalloc_obj(*clk);
if (!clk) {
kfree(clk_node);
return ERR_PTR(-ENOMEM);
diff --git a/drivers/clk/imx/clk-sscg-pll.c b/drivers/clk/imx/clk-sscg-pll.c
index 4017b194e085..7f104ecfa80f 100644
--- a/drivers/clk/imx/clk-sscg-pll.c
+++ b/drivers/clk/imx/clk-sscg-pll.c
@@ -509,7 +509,7 @@ struct clk_hw *imx_clk_hw_sscg_pll(const char *name,
struct clk_hw *hw;
int ret;
- pll = kzalloc_obj(*pll, GFP_KERNEL);
+ pll = kzalloc_obj(*pll);
if (!pll)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/clk/imx/clk.c b/drivers/clk/imx/clk.c
index c9c8397e9149..f38506830ccf 100644
--- a/drivers/clk/imx/clk.c
+++ b/drivers/clk/imx/clk.c
@@ -189,7 +189,7 @@ void imx_register_uart_clocks(void)
if (!of_stdout)
return;
- imx_uart_clocks = kzalloc_objs(struct clk *, num, GFP_KERNEL);
+ imx_uart_clocks = kzalloc_objs(struct clk *, num);
if (!imx_uart_clocks)
return;
diff --git a/drivers/clk/ingenic/cgu.c b/drivers/clk/ingenic/cgu.c
index 69055ef880eb..1a73ceb1a758 100644
--- a/drivers/clk/ingenic/cgu.c
+++ b/drivers/clk/ingenic/cgu.c
@@ -676,7 +676,7 @@ static int ingenic_register_clock(struct ingenic_cgu *cgu, unsigned idx)
goto out;
}
- ingenic_clk = kzalloc_obj(*ingenic_clk, GFP_KERNEL);
+ ingenic_clk = kzalloc_obj(*ingenic_clk);
if (!ingenic_clk) {
err = -ENOMEM;
goto out;
@@ -790,7 +790,7 @@ ingenic_cgu_new(const struct ingenic_cgu_clk_info *clock_info,
{
struct ingenic_cgu *cgu;
- cgu = kzalloc_obj(*cgu, GFP_KERNEL);
+ cgu = kzalloc_obj(*cgu);
if (!cgu)
goto err_out;
diff --git a/drivers/clk/ingenic/tcu.c b/drivers/clk/ingenic/tcu.c
index 6ae7c2f66824..6a096ba4d40c 100644
--- a/drivers/clk/ingenic/tcu.c
+++ b/drivers/clk/ingenic/tcu.c
@@ -273,7 +273,7 @@ static int __init ingenic_tcu_register_clock(struct ingenic_tcu *tcu,
struct ingenic_tcu_clk *tcu_clk;
int err;
- tcu_clk = kzalloc_obj(*tcu_clk, GFP_KERNEL);
+ tcu_clk = kzalloc_obj(*tcu_clk);
if (!tcu_clk)
return -ENOMEM;
@@ -344,7 +344,7 @@ static int __init ingenic_tcu_probe(struct device_node *np)
if (IS_ERR(map))
return PTR_ERR(map);
- tcu = kzalloc_obj(*tcu, GFP_KERNEL);
+ tcu = kzalloc_obj(*tcu);
if (!tcu)
return -ENOMEM;
diff --git a/drivers/clk/keystone/gate.c b/drivers/clk/keystone/gate.c
index dff8ed64df85..03e854f10fd9 100644
--- a/drivers/clk/keystone/gate.c
+++ b/drivers/clk/keystone/gate.c
@@ -168,7 +168,7 @@ static struct clk *clk_register_psc(struct device *dev,
struct clk_psc *psc;
struct clk *clk;
- psc = kzalloc_obj(*psc, GFP_KERNEL);
+ psc = kzalloc_obj(*psc);
if (!psc)
return ERR_PTR(-ENOMEM);
@@ -202,7 +202,7 @@ static void __init of_psc_clk_init(struct device_node *node, spinlock_t *lock)
struct clk *clk;
int i;
- data = kzalloc_obj(*data, GFP_KERNEL);
+ data = kzalloc_obj(*data);
if (!data) {
pr_err("%s: Out of memory\n", __func__);
return;
diff --git a/drivers/clk/keystone/pll.c b/drivers/clk/keystone/pll.c
index 9cdf1ecad45c..ed197ee0cc88 100644
--- a/drivers/clk/keystone/pll.c
+++ b/drivers/clk/keystone/pll.c
@@ -126,7 +126,7 @@ static struct clk *clk_register_pll(struct device *dev,
struct clk_pll *pll;
struct clk *clk;
- pll = kzalloc_obj(*pll, GFP_KERNEL);
+ pll = kzalloc_obj(*pll);
if (!pll)
return ERR_PTR(-ENOMEM);
@@ -162,7 +162,7 @@ static void __init _of_pll_clk_init(struct device_node *node, bool pllctrl)
struct clk *clk;
int i;
- pll_data = kzalloc_obj(*pll_data, GFP_KERNEL);
+ pll_data = kzalloc_obj(*pll_data);
if (!pll_data) {
pr_err("%s: Out of memory\n", __func__);
return;
diff --git a/drivers/clk/mediatek/clk-apmixed.c b/drivers/clk/mediatek/clk-apmixed.c
index 43c72621f4c9..16e8a325b5bf 100644
--- a/drivers/clk/mediatek/clk-apmixed.c
+++ b/drivers/clk/mediatek/clk-apmixed.c
@@ -77,7 +77,7 @@ struct clk_hw *mtk_clk_register_ref2usb_tx(const char *name,
struct clk_init_data init = {};
int ret;
- tx = kzalloc_obj(*tx, GFP_KERNEL);
+ tx = kzalloc_obj(*tx);
if (!tx)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/clk/mediatek/clk-cpumux.c b/drivers/clk/mediatek/clk-cpumux.c
index abcc1c41a6f9..412558b95127 100644
--- a/drivers/clk/mediatek/clk-cpumux.c
+++ b/drivers/clk/mediatek/clk-cpumux.c
@@ -66,7 +66,7 @@ mtk_clk_register_cpumux(struct device *dev, const struct mtk_composite *mux,
int ret;
struct clk_init_data init;
- cpumux = kzalloc_obj(*cpumux, GFP_KERNEL);
+ cpumux = kzalloc_obj(*cpumux);
if (!cpumux)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/clk/mediatek/clk-gate.c b/drivers/clk/mediatek/clk-gate.c
index 3689ec69da5d..bd2fcd489a3f 100644
--- a/drivers/clk/mediatek/clk-gate.c
+++ b/drivers/clk/mediatek/clk-gate.c
@@ -212,7 +212,7 @@ static struct clk_hw *mtk_clk_register_gate(struct device *dev,
int ret;
struct clk_init_data init = {};
- cg = kzalloc_obj(*cg, GFP_KERNEL);
+ cg = kzalloc_obj(*cg);
if (!cg)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/clk/mediatek/clk-mtk.c b/drivers/clk/mediatek/clk-mtk.c
index de093f9665af..ab038ffb90df 100644
--- a/drivers/clk/mediatek/clk-mtk.c
+++ b/drivers/clk/mediatek/clk-mtk.c
@@ -230,7 +230,7 @@ static struct clk_hw *mtk_clk_register_composite(struct device *dev,
int ret;
if (mc->mux_shift >= 0) {
- mux = kzalloc_obj(*mux, GFP_KERNEL);
+ mux = kzalloc_obj(*mux);
if (!mux)
return ERR_PTR(-ENOMEM);
@@ -251,7 +251,7 @@ static struct clk_hw *mtk_clk_register_composite(struct device *dev,
}
if (mc->gate_shift >= 0) {
- gate = kzalloc_obj(*gate, GFP_KERNEL);
+ gate = kzalloc_obj(*gate);
if (!gate) {
ret = -ENOMEM;
goto err_out;
@@ -267,7 +267,7 @@ static struct clk_hw *mtk_clk_register_composite(struct device *dev,
}
if (mc->divider_shift >= 0) {
- div = kzalloc_obj(*div, GFP_KERNEL);
+ div = kzalloc_obj(*div);
if (!div) {
ret = -ENOMEM;
goto err_out;
diff --git a/drivers/clk/mediatek/clk-mux.c b/drivers/clk/mediatek/clk-mux.c
index 0cc6de7ab29b..5f4b07e7c757 100644
--- a/drivers/clk/mediatek/clk-mux.c
+++ b/drivers/clk/mediatek/clk-mux.c
@@ -281,7 +281,7 @@ static struct clk_hw *mtk_clk_register_mux(struct device *dev,
struct clk_init_data init = {};
int ret;
- clk_mux = kzalloc_obj(*clk_mux, GFP_KERNEL);
+ clk_mux = kzalloc_obj(*clk_mux);
if (!clk_mux)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/clk/mediatek/clk-pll.c b/drivers/clk/mediatek/clk-pll.c
index ff414d9b560a..e97064868908 100644
--- a/drivers/clk/mediatek/clk-pll.c
+++ b/drivers/clk/mediatek/clk-pll.c
@@ -385,7 +385,7 @@ struct clk_hw *mtk_clk_register_pll(struct device *dev,
struct clk_hw *hw;
const struct clk_ops *pll_ops = data->ops ? data->ops : &mtk_pll_ops;
- pll = kzalloc_obj(*pll, GFP_KERNEL);
+ pll = kzalloc_obj(*pll);
if (!pll)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/clk/mediatek/clk-pllfh.c b/drivers/clk/mediatek/clk-pllfh.c
index 6b9f43ddd57f..aa95cd9197b3 100644
--- a/drivers/clk/mediatek/clk-pllfh.c
+++ b/drivers/clk/mediatek/clk-pllfh.c
@@ -157,7 +157,7 @@ mtk_clk_register_pllfh(struct device *dev, const struct mtk_pll_data *pll_data,
struct mtk_fh *fh;
int ret;
- fh = kzalloc_obj(*fh, GFP_KERNEL);
+ fh = kzalloc_obj(*fh);
if (!fh)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/clk/meson/meson8b.c b/drivers/clk/meson/meson8b.c
index d56be70ab02f..bc029c6ab622 100644
--- a/drivers/clk/meson/meson8b.c
+++ b/drivers/clk/meson/meson8b.c
@@ -3646,7 +3646,7 @@ static void __init meson8b_clkc_init_common(struct device_node *np,
return;
}
- rstc = kzalloc_obj(*rstc, GFP_KERNEL);
+ rstc = kzalloc_obj(*rstc);
if (!rstc)
return;
diff --git a/drivers/clk/mmp/clk-apbc.c b/drivers/clk/mmp/clk-apbc.c
index 1d6fd5e5d6c0..84532ce8fd09 100644
--- a/drivers/clk/mmp/clk-apbc.c
+++ b/drivers/clk/mmp/clk-apbc.c
@@ -124,7 +124,7 @@ struct clk *mmp_clk_register_apbc(const char *name, const char *parent_name,
struct clk *clk;
struct clk_init_data init;
- apbc = kzalloc_obj(*apbc, GFP_KERNEL);
+ apbc = kzalloc_obj(*apbc);
if (!apbc)
return NULL;
diff --git a/drivers/clk/mmp/clk-apmu.c b/drivers/clk/mmp/clk-apmu.c
index e457436c522c..30bbac1deca1 100644
--- a/drivers/clk/mmp/clk-apmu.c
+++ b/drivers/clk/mmp/clk-apmu.c
@@ -69,7 +69,7 @@ struct clk *mmp_clk_register_apmu(const char *name, const char *parent_name,
struct clk *clk;
struct clk_init_data init;
- apmu = kzalloc_obj(*apmu, GFP_KERNEL);
+ apmu = kzalloc_obj(*apmu);
if (!apmu)
return NULL;
diff --git a/drivers/clk/mmp/clk-frac.c b/drivers/clk/mmp/clk-frac.c
index 4307698741c6..13bfc4c99f3a 100644
--- a/drivers/clk/mmp/clk-frac.c
+++ b/drivers/clk/mmp/clk-frac.c
@@ -180,7 +180,7 @@ struct clk *mmp_clk_register_factor(const char *name, const char *parent_name,
return ERR_PTR(-EINVAL);
}
- factor = kzalloc_obj(*factor, GFP_KERNEL);
+ factor = kzalloc_obj(*factor);
if (!factor)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/clk/mmp/clk-gate.c b/drivers/clk/mmp/clk-gate.c
index 59f4070be33c..cc2f841ae9d9 100644
--- a/drivers/clk/mmp/clk-gate.c
+++ b/drivers/clk/mmp/clk-gate.c
@@ -99,7 +99,7 @@ struct clk *mmp_clk_register_gate(struct device *dev, const char *name,
struct clk_init_data init;
/* allocate the gate */
- gate = kzalloc_obj(*gate, GFP_KERNEL);
+ gate = kzalloc_obj(*gate);
if (!gate)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/clk/mmp/clk-mix.c b/drivers/clk/mmp/clk-mix.c
index 14aa90342664..b1c9899c71af 100644
--- a/drivers/clk/mmp/clk-mix.c
+++ b/drivers/clk/mmp/clk-mix.c
@@ -448,7 +448,7 @@ struct clk *mmp_clk_register_mix(struct device *dev,
struct clk *clk;
struct clk_init_data init;
- mix = kzalloc_obj(*mix, GFP_KERNEL);
+ mix = kzalloc_obj(*mix);
if (!mix)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/clk/mmp/clk-of-mmp2.c b/drivers/clk/mmp/clk-of-mmp2.c
index 2067b4bb261d..77e9244b53e5 100644
--- a/drivers/clk/mmp/clk-of-mmp2.c
+++ b/drivers/clk/mmp/clk-of-mmp2.c
@@ -462,7 +462,7 @@ static void mmp2_clk_reset_init(struct device_node *np,
int i, nr_resets;
nr_resets = ARRAY_SIZE(apbc_gate_clks);
- cells = kzalloc_objs(*cells, nr_resets, GFP_KERNEL);
+ cells = kzalloc_objs(*cells, nr_resets);
if (!cells)
return;
@@ -516,7 +516,7 @@ static void __init mmp2_clk_init(struct device_node *np)
{
struct mmp2_clk_unit *pxa_unit;
- pxa_unit = kzalloc_obj(*pxa_unit, GFP_KERNEL);
+ pxa_unit = kzalloc_obj(*pxa_unit);
if (!pxa_unit)
return;
diff --git a/drivers/clk/mmp/clk-of-pxa168.c b/drivers/clk/mmp/clk-of-pxa168.c
index f5b8a6749829..e3d6f4b407ed 100644
--- a/drivers/clk/mmp/clk-of-pxa168.c
+++ b/drivers/clk/mmp/clk-of-pxa168.c
@@ -282,7 +282,7 @@ static void pxa168_clk_reset_init(struct device_node *np,
int i, nr_resets;
nr_resets = ARRAY_SIZE(apbc_gate_clks);
- cells = kzalloc_objs(*cells, nr_resets, GFP_KERNEL);
+ cells = kzalloc_objs(*cells, nr_resets);
if (!cells)
return;
@@ -301,7 +301,7 @@ static void __init pxa168_clk_init(struct device_node *np)
{
struct pxa168_clk_unit *pxa_unit;
- pxa_unit = kzalloc_obj(*pxa_unit, GFP_KERNEL);
+ pxa_unit = kzalloc_obj(*pxa_unit);
if (!pxa_unit)
return;
diff --git a/drivers/clk/mmp/clk-of-pxa1928.c b/drivers/clk/mmp/clk-of-pxa1928.c
index 24fc9054a667..3bc9866a2191 100644
--- a/drivers/clk/mmp/clk-of-pxa1928.c
+++ b/drivers/clk/mmp/clk-of-pxa1928.c
@@ -187,7 +187,7 @@ static void pxa1928_clk_reset_init(struct device_node *np,
int i, base, nr_resets;
nr_resets = ARRAY_SIZE(apbc_gate_clks);
- cells = kzalloc_objs(*cells, nr_resets, GFP_KERNEL);
+ cells = kzalloc_objs(*cells, nr_resets);
if (!cells)
return;
@@ -208,7 +208,7 @@ static void __init pxa1928_mpmu_clk_init(struct device_node *np)
{
struct pxa1928_clk_unit *pxa_unit;
- pxa_unit = kzalloc_obj(*pxa_unit, GFP_KERNEL);
+ pxa_unit = kzalloc_obj(*pxa_unit);
if (!pxa_unit)
return;
@@ -227,7 +227,7 @@ static void __init pxa1928_apmu_clk_init(struct device_node *np)
{
struct pxa1928_clk_unit *pxa_unit;
- pxa_unit = kzalloc_obj(*pxa_unit, GFP_KERNEL);
+ pxa_unit = kzalloc_obj(*pxa_unit);
if (!pxa_unit)
return;
@@ -248,7 +248,7 @@ static void __init pxa1928_apbc_clk_init(struct device_node *np)
{
struct pxa1928_clk_unit *pxa_unit;
- pxa_unit = kzalloc_obj(*pxa_unit, GFP_KERNEL);
+ pxa_unit = kzalloc_obj(*pxa_unit);
if (!pxa_unit)
return;
diff --git a/drivers/clk/mmp/clk-of-pxa910.c b/drivers/clk/mmp/clk-of-pxa910.c
index 43c40b949326..d90bcc9a8ae7 100644
--- a/drivers/clk/mmp/clk-of-pxa910.c
+++ b/drivers/clk/mmp/clk-of-pxa910.c
@@ -239,7 +239,7 @@ static void pxa910_clk_reset_init(struct device_node *np,
nr_resets_apbc = ARRAY_SIZE(apbc_gate_clks);
nr_resets_apbcp = ARRAY_SIZE(apbcp_gate_clks);
nr_resets = nr_resets_apbc + nr_resets_apbcp;
- cells = kzalloc_objs(*cells, nr_resets, GFP_KERNEL);
+ cells = kzalloc_objs(*cells, nr_resets);
if (!cells)
return;
@@ -270,7 +270,7 @@ static void __init pxa910_clk_init(struct device_node *np)
{
struct pxa910_clk_unit *pxa_unit;
- pxa_unit = kzalloc_obj(*pxa_unit, GFP_KERNEL);
+ pxa_unit = kzalloc_obj(*pxa_unit);
if (!pxa_unit)
return;
diff --git a/drivers/clk/mmp/clk-pll.c b/drivers/clk/mmp/clk-pll.c
index bf2d691fcc92..430f5e3c8540 100644
--- a/drivers/clk/mmp/clk-pll.c
+++ b/drivers/clk/mmp/clk-pll.c
@@ -108,7 +108,7 @@ static struct clk *mmp_clk_register_pll(char *name,
struct clk *clk;
struct clk_init_data init;
- pll = kzalloc_obj(*pll, GFP_KERNEL);
+ pll = kzalloc_obj(*pll);
if (!pll)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/clk/mmp/clk.c b/drivers/clk/mmp/clk.c
index c31c3a9f4f57..48b746bef833 100644
--- a/drivers/clk/mmp/clk.c
+++ b/drivers/clk/mmp/clk.c
@@ -12,7 +12,7 @@ void mmp_clk_init(struct device_node *np, struct mmp_clk_unit *unit,
{
struct clk **clk_table;
- clk_table = kzalloc_objs(struct clk *, nr_clks, GFP_KERNEL);
+ clk_table = kzalloc_objs(struct clk *, nr_clks);
if (!clk_table)
return;
diff --git a/drivers/clk/mmp/pwr-island.c b/drivers/clk/mmp/pwr-island.c
index 1253e383aa44..1f57917133da 100644
--- a/drivers/clk/mmp/pwr-island.c
+++ b/drivers/clk/mmp/pwr-island.c
@@ -95,7 +95,7 @@ struct generic_pm_domain *mmp_pm_domain_register(const char *name,
{
struct mmp_pm_domain *pm_domain;
- pm_domain = kzalloc_obj(*pm_domain, GFP_KERNEL);
+ pm_domain = kzalloc_obj(*pm_domain);
if (!pm_domain)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/clk/mmp/reset.c b/drivers/clk/mmp/reset.c
index c7068976a378..1e4e105ef6ff 100644
--- a/drivers/clk/mmp/reset.c
+++ b/drivers/clk/mmp/reset.c
@@ -85,7 +85,7 @@ void mmp_clk_reset_register(struct device_node *np,
{
struct mmp_clk_reset_unit *unit;
- unit = kzalloc_obj(*unit, GFP_KERNEL);
+ unit = kzalloc_obj(*unit);
if (!unit)
return;
diff --git a/drivers/clk/mvebu/clk-corediv.c b/drivers/clk/mvebu/clk-corediv.c
index 487542d61662..ae48293b0c41 100644
--- a/drivers/clk/mvebu/clk-corediv.c
+++ b/drivers/clk/mvebu/clk-corediv.c
@@ -270,11 +270,11 @@ mvebu_corediv_clk_init(struct device_node *node,
clk_data.clk_num = soc_desc->ndescs;
/* clks holds the clock array */
- clks = kzalloc_objs(struct clk *, clk_data.clk_num, GFP_KERNEL);
+ clks = kzalloc_objs(struct clk *, clk_data.clk_num);
if (WARN_ON(!clks))
goto err_unmap;
/* corediv holds the clock specific array */
- corediv = kzalloc_objs(struct clk_corediv, clk_data.clk_num, GFP_KERNEL);
+ corediv = kzalloc_objs(struct clk_corediv, clk_data.clk_num);
if (WARN_ON(!corediv))
goto err_free_clks;
diff --git a/drivers/clk/mvebu/clk-cpu.c b/drivers/clk/mvebu/clk-cpu.c
index 8c74edbcce9a..26d52ecaac50 100644
--- a/drivers/clk/mvebu/clk-cpu.c
+++ b/drivers/clk/mvebu/clk-cpu.c
@@ -183,11 +183,11 @@ static void __init of_cpu_clk_setup(struct device_node *node)
pr_warn("%s: pmu-dfs base register not set, dynamic frequency scaling not available\n",
__func__);
- cpuclk = kzalloc_objs(*cpuclk, ncpus, GFP_KERNEL);
+ cpuclk = kzalloc_objs(*cpuclk, ncpus);
if (WARN_ON(!cpuclk))
goto cpuclk_out;
- clks = kzalloc_objs(*clks, ncpus, GFP_KERNEL);
+ clks = kzalloc_objs(*clks, ncpus);
if (WARN_ON(!clks))
goto clks_out;
diff --git a/drivers/clk/mvebu/common.c b/drivers/clk/mvebu/common.c
index 41c5cd7739b2..4f4457fa5d97 100644
--- a/drivers/clk/mvebu/common.c
+++ b/drivers/clk/mvebu/common.c
@@ -258,7 +258,7 @@ void __init mvebu_clk_gating_setup(struct device_node *np,
clk_put(clk);
}
- ctrl = kzalloc_obj(*ctrl, GFP_KERNEL);
+ ctrl = kzalloc_obj(*ctrl);
if (WARN_ON(!ctrl))
goto ctrl_out;
@@ -272,7 +272,7 @@ void __init mvebu_clk_gating_setup(struct device_node *np,
n++;
ctrl->num_gates = n;
- ctrl->gates = kzalloc_objs(*ctrl->gates, ctrl->num_gates, GFP_KERNEL);
+ ctrl->gates = kzalloc_objs(*ctrl->gates, ctrl->num_gates);
if (WARN_ON(!ctrl->gates))
goto gates_out;
diff --git a/drivers/clk/mvebu/cp110-system-controller.c b/drivers/clk/mvebu/cp110-system-controller.c
index c6b5b2205f2e..fa95eb7197af 100644
--- a/drivers/clk/mvebu/cp110-system-controller.c
+++ b/drivers/clk/mvebu/cp110-system-controller.c
@@ -180,7 +180,7 @@ static struct clk_hw *cp110_register_gate(const char *name,
struct clk_init_data init;
int ret;
- gate = kzalloc_obj(*gate, GFP_KERNEL);
+ gate = kzalloc_obj(*gate);
if (!gate)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/clk/mvebu/kirkwood.c b/drivers/clk/mvebu/kirkwood.c
index 967f0be794ab..ed061d82fb65 100644
--- a/drivers/clk/mvebu/kirkwood.c
+++ b/drivers/clk/mvebu/kirkwood.c
@@ -297,7 +297,7 @@ static void __init kirkwood_clk_muxing_setup(struct device_node *np,
if (WARN_ON(!base))
return;
- ctrl = kzalloc_obj(*ctrl, GFP_KERNEL);
+ ctrl = kzalloc_obj(*ctrl);
if (WARN_ON(!ctrl))
goto ctrl_out;
@@ -309,7 +309,7 @@ static void __init kirkwood_clk_muxing_setup(struct device_node *np,
n++;
ctrl->num_muxes = n;
- ctrl->muxes = kzalloc_objs(struct clk *, ctrl->num_muxes, GFP_KERNEL);
+ ctrl->muxes = kzalloc_objs(struct clk *, ctrl->num_muxes);
if (WARN_ON(!ctrl->muxes))
goto muxes_out;
diff --git a/drivers/clk/mxs/clk-div.c b/drivers/clk/mxs/clk-div.c
index 47c5c2fe8e5e..fe7224162b3c 100644
--- a/drivers/clk/mxs/clk-div.c
+++ b/drivers/clk/mxs/clk-div.c
@@ -74,7 +74,7 @@ struct clk *mxs_clk_div(const char *name, const char *parent_name,
struct clk *clk;
struct clk_init_data init;
- div = kzalloc_obj(*div, GFP_KERNEL);
+ div = kzalloc_obj(*div);
if (!div)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/clk/mxs/clk-frac.c b/drivers/clk/mxs/clk-frac.c
index 7de0c20baabb..52eb82fde322 100644
--- a/drivers/clk/mxs/clk-frac.c
+++ b/drivers/clk/mxs/clk-frac.c
@@ -116,7 +116,7 @@ struct clk *mxs_clk_frac(const char *name, const char *parent_name,
struct clk *clk;
struct clk_init_data init;
- frac = kzalloc_obj(*frac, GFP_KERNEL);
+ frac = kzalloc_obj(*frac);
if (!frac)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/clk/mxs/clk-pll.c b/drivers/clk/mxs/clk-pll.c
index f67bfe743479..581868e0693c 100644
--- a/drivers/clk/mxs/clk-pll.c
+++ b/drivers/clk/mxs/clk-pll.c
@@ -86,7 +86,7 @@ struct clk *mxs_clk_pll(const char *name, const char *parent_name,
struct clk *clk;
struct clk_init_data init;
- pll = kzalloc_obj(*pll, GFP_KERNEL);
+ pll = kzalloc_obj(*pll);
if (!pll)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/clk/mxs/clk-ref.c b/drivers/clk/mxs/clk-ref.c
index e6674fb58add..9667d4d3c2a8 100644
--- a/drivers/clk/mxs/clk-ref.c
+++ b/drivers/clk/mxs/clk-ref.c
@@ -117,7 +117,7 @@ struct clk *mxs_clk_ref(const char *name, const char *parent_name,
struct clk *clk;
struct clk_init_data init;
- ref = kzalloc_obj(*ref, GFP_KERNEL);
+ ref = kzalloc_obj(*ref);
if (!ref)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/clk/nxp/clk-lpc18xx-ccu.c b/drivers/clk/nxp/clk-lpc18xx-ccu.c
index 8bb5a44c9b59..dcb6d0c0b41a 100644
--- a/drivers/clk/nxp/clk-lpc18xx-ccu.c
+++ b/drivers/clk/nxp/clk-lpc18xx-ccu.c
@@ -208,7 +208,7 @@ static void lpc18xx_ccu_register_branch_gate_div(struct lpc18xx_clk_branch *bran
struct clk_hw *div_hw = NULL;
if (branch->flags & CCU_BRANCH_HAVE_DIV2) {
- div = kzalloc_obj(*div, GFP_KERNEL);
+ div = kzalloc_obj(*div);
if (!div)
return;
@@ -274,7 +274,7 @@ static void __init lpc18xx_ccu_init(struct device_node *np)
return;
}
- clk_data = kzalloc_obj(*clk_data, GFP_KERNEL);
+ clk_data = kzalloc_obj(*clk_data);
if (!clk_data) {
iounmap(reg_base);
return;
diff --git a/drivers/clk/pistachio/clk-pll.c b/drivers/clk/pistachio/clk-pll.c
index dd4fe9a114a7..5b268a985a9c 100644
--- a/drivers/clk/pistachio/clk-pll.c
+++ b/drivers/clk/pistachio/clk-pll.c
@@ -457,7 +457,7 @@ static struct clk *pll_register(const char *name, const char *parent_name,
struct clk_init_data init;
struct clk *clk;
- pll = kzalloc_obj(*pll, GFP_KERNEL);
+ pll = kzalloc_obj(*pll);
if (!pll)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/clk/pistachio/clk.c b/drivers/clk/pistachio/clk.c
index 80f60f2ce7de..80c722c77a1b 100644
--- a/drivers/clk/pistachio/clk.c
+++ b/drivers/clk/pistachio/clk.c
@@ -17,11 +17,11 @@ pistachio_clk_alloc_provider(struct device_node *node, unsigned int num_clks)
{
struct pistachio_clk_provider *p;
- p = kzalloc_obj(*p, GFP_KERNEL);
+ p = kzalloc_obj(*p);
if (!p)
return p;
- p->clk_data.clks = kzalloc_objs(struct clk *, num_clks, GFP_KERNEL);
+ p->clk_data.clks = kzalloc_objs(struct clk *, num_clks);
if (!p->clk_data.clks)
goto free_provider;
p->clk_data.clk_num = num_clks;
diff --git a/drivers/clk/pxa/clk-pxa.c b/drivers/clk/pxa/clk-pxa.c
index 1c5dedaefec8..d153ce76c64b 100644
--- a/drivers/clk/pxa/clk-pxa.c
+++ b/drivers/clk/pxa/clk-pxa.c
@@ -104,7 +104,7 @@ int __init clk_pxa_cken_init(const struct desc_clk_cken *clks,
struct clk *clk;
for (i = 0; i < nb_clks; i++) {
- pxa_clk = kzalloc_obj(*pxa_clk, GFP_KERNEL);
+ pxa_clk = kzalloc_obj(*pxa_clk);
if (!pxa_clk)
return -ENOMEM;
pxa_clk->is_in_low_power = clks[i].is_in_low_power;
diff --git a/drivers/clk/qcom/clk-rcg2.c b/drivers/clk/qcom/clk-rcg2.c
index 0977b61f242e..fc696b66ccda 100644
--- a/drivers/clk/qcom/clk-rcg2.c
+++ b/drivers/clk/qcom/clk-rcg2.c
@@ -1650,7 +1650,7 @@ static int clk_rcg2_dfs_populate_freq_table(struct clk_rcg2 *rcg)
int i;
/* Allocate space for 1 extra since table is NULL terminated */
- freq_tbl = kzalloc_objs(*freq_tbl, MAX_PERF_LEVEL + 1, GFP_KERNEL);
+ freq_tbl = kzalloc_objs(*freq_tbl, MAX_PERF_LEVEL + 1);
if (!freq_tbl)
return -ENOMEM;
rcg->freq_tbl = freq_tbl;
diff --git a/drivers/clk/ralink/clk-mt7621.c b/drivers/clk/ralink/clk-mt7621.c
index 3079d7ce0e57..aa7902bd5e0e 100644
--- a/drivers/clk/ralink/clk-mt7621.c
+++ b/drivers/clk/ralink/clk-mt7621.c
@@ -354,7 +354,7 @@ static void __init mt7621_clk_init(struct device_node *node)
struct clk_hw_onecell_data *clk_data;
int ret, i, count;
- priv = kzalloc_obj(*priv, GFP_KERNEL);
+ priv = kzalloc_obj(*priv);
if (!priv)
return;
diff --git a/drivers/clk/ralink/clk-mtmips.c b/drivers/clk/ralink/clk-mtmips.c
index c6ee73a8fa22..46a8eb023c38 100644
--- a/drivers/clk/ralink/clk-mtmips.c
+++ b/drivers/clk/ralink/clk-mtmips.c
@@ -916,7 +916,7 @@ static void __init mtmips_clk_init(struct device_node *node)
struct clk_hw_onecell_data *clk_data;
int ret, i, count;
- priv = kzalloc_obj(*priv, GFP_KERNEL);
+ priv = kzalloc_obj(*priv);
if (!priv)
return;
diff --git a/drivers/clk/renesas/clk-mstp.c b/drivers/clk/renesas/clk-mstp.c
index 79414c2c2e9c..c8c0a603d974 100644
--- a/drivers/clk/renesas/clk-mstp.c
+++ b/drivers/clk/renesas/clk-mstp.c
@@ -150,7 +150,7 @@ static struct clk * __init cpg_mstp_clock_register(const char *name,
struct mstp_clock *clock;
struct clk *clk;
- clock = kzalloc_obj(*clock, GFP_KERNEL);
+ clock = kzalloc_obj(*clock);
if (!clock)
return ERR_PTR(-ENOMEM);
@@ -316,7 +316,7 @@ void __init cpg_mstp_add_clk_domain(struct device_node *np)
return;
}
- pd = kzalloc_obj(*pd, GFP_KERNEL);
+ pd = kzalloc_obj(*pd);
if (!pd)
return;
diff --git a/drivers/clk/renesas/clk-r8a73a4.c b/drivers/clk/renesas/clk-r8a73a4.c
index 708506671a78..7f47644396e6 100644
--- a/drivers/clk/renesas/clk-r8a73a4.c
+++ b/drivers/clk/renesas/clk-r8a73a4.c
@@ -196,8 +196,8 @@ static void __init r8a73a4_cpg_clocks_init(struct device_node *np)
return;
}
- cpg = kzalloc_obj(*cpg, GFP_KERNEL);
- clks = kzalloc_objs(*clks, num_clks, GFP_KERNEL);
+ cpg = kzalloc_obj(*cpg);
+ clks = kzalloc_objs(*clks, num_clks);
if (cpg == NULL || clks == NULL) {
/* We're leaking memory on purpose, there's no point in cleaning
* up as the system won't boot anyway.
diff --git a/drivers/clk/renesas/clk-r8a7740.c b/drivers/clk/renesas/clk-r8a7740.c
index f4c4ef44cff9..635d59ead499 100644
--- a/drivers/clk/renesas/clk-r8a7740.c
+++ b/drivers/clk/renesas/clk-r8a7740.c
@@ -155,8 +155,8 @@ static void __init r8a7740_cpg_clocks_init(struct device_node *np)
return;
}
- cpg = kzalloc_obj(*cpg, GFP_KERNEL);
- clks = kzalloc_objs(*clks, num_clks, GFP_KERNEL);
+ cpg = kzalloc_obj(*cpg);
+ clks = kzalloc_objs(*clks, num_clks);
if (cpg == NULL || clks == NULL) {
/* We're leaking memory on purpose, there's no point in cleaning
* up as the system won't boot anyway.
diff --git a/drivers/clk/renesas/clk-r8a7778.c b/drivers/clk/renesas/clk-r8a7778.c
index 2f664c7efba5..9120f86fcc2a 100644
--- a/drivers/clk/renesas/clk-r8a7778.c
+++ b/drivers/clk/renesas/clk-r8a7778.c
@@ -92,8 +92,8 @@ static void __init r8a7778_cpg_clocks_init(struct device_node *np)
return;
}
- data = kzalloc_obj(*data, GFP_KERNEL);
- clks = kzalloc_objs(*clks, num_clks, GFP_KERNEL);
+ data = kzalloc_obj(*data);
+ clks = kzalloc_objs(*clks, num_clks);
if (data == NULL || clks == NULL) {
/* We're leaking memory on purpose, there's no point in cleaning
* up as the system won't boot anyway.
diff --git a/drivers/clk/renesas/clk-r8a7779.c b/drivers/clk/renesas/clk-r8a7779.c
index 9243848863f2..f2d6cbaf6329 100644
--- a/drivers/clk/renesas/clk-r8a7779.c
+++ b/drivers/clk/renesas/clk-r8a7779.c
@@ -128,8 +128,8 @@ static void __init r8a7779_cpg_clocks_init(struct device_node *np)
return;
}
- data = kzalloc_obj(*data, GFP_KERNEL);
- clks = kzalloc_objs(*clks, CPG_NUM_CLOCKS, GFP_KERNEL);
+ data = kzalloc_obj(*data);
+ clks = kzalloc_objs(*clks, CPG_NUM_CLOCKS);
if (data == NULL || clks == NULL) {
/* We're leaking memory on purpose, there's no point in cleaning
* up as the system won't boot anyway.
diff --git a/drivers/clk/renesas/clk-rz.c b/drivers/clk/renesas/clk-rz.c
index 0a89be1fce79..5347c067e256 100644
--- a/drivers/clk/renesas/clk-rz.c
+++ b/drivers/clk/renesas/clk-rz.c
@@ -91,8 +91,8 @@ static void __init rz_cpg_clocks_init(struct device_node *np)
if (WARN(num_clks <= 0, "can't count CPG clocks\n"))
return;
- data = kzalloc_obj(*data, GFP_KERNEL);
- clks = kzalloc_objs(*clks, num_clks, GFP_KERNEL);
+ data = kzalloc_obj(*data);
+ clks = kzalloc_objs(*clks, num_clks);
BUG_ON(!data || !clks);
data->clks = clks;
diff --git a/drivers/clk/renesas/clk-sh73a0.c b/drivers/clk/renesas/clk-sh73a0.c
index a3bbd8a0ac4d..efae041ac6e8 100644
--- a/drivers/clk/renesas/clk-sh73a0.c
+++ b/drivers/clk/renesas/clk-sh73a0.c
@@ -170,8 +170,8 @@ static void __init sh73a0_cpg_clocks_init(struct device_node *np)
return;
}
- cpg = kzalloc_obj(*cpg, GFP_KERNEL);
- clks = kzalloc_objs(*clks, num_clks, GFP_KERNEL);
+ cpg = kzalloc_obj(*cpg);
+ clks = kzalloc_objs(*clks, num_clks);
if (cpg == NULL || clks == NULL) {
/* We're leaking memory on purpose, there's no point in cleaning
* up as the system won't boot anyway.
diff --git a/drivers/clk/renesas/r9a06g032-clocks.c b/drivers/clk/renesas/r9a06g032-clocks.c
index 58255bf6da83..7407a4183a6c 100644
--- a/drivers/clk/renesas/r9a06g032-clocks.c
+++ b/drivers/clk/renesas/r9a06g032-clocks.c
@@ -891,7 +891,7 @@ r9a06g032_register_gate(struct r9a06g032_priv *clocks,
struct r9a06g032_clk_gate *g;
struct clk_init_data init = {};
- g = kzalloc_obj(*g, GFP_KERNEL);
+ g = kzalloc_obj(*g);
if (!g)
return NULL;
@@ -1063,7 +1063,7 @@ r9a06g032_register_div(struct r9a06g032_priv *clocks,
struct clk_init_data init = {};
unsigned int i;
- div = kzalloc_obj(*div, GFP_KERNEL);
+ div = kzalloc_obj(*div);
if (!div)
return NULL;
@@ -1149,7 +1149,7 @@ r9a06g032_register_bitsel(struct r9a06g032_priv *clocks,
const char *names[2];
/* allocate the gate */
- g = kzalloc_obj(*g, GFP_KERNEL);
+ g = kzalloc_obj(*g);
if (!g)
return NULL;
@@ -1239,7 +1239,7 @@ r9a06g032_register_dualgate(struct r9a06g032_priv *clocks,
struct clk_init_data init = {};
/* allocate the gate */
- g = kzalloc_obj(*g, GFP_KERNEL);
+ g = kzalloc_obj(*g);
if (!g)
return NULL;
g->clocks = clocks;
diff --git a/drivers/clk/renesas/rcar-cpg-lib.c b/drivers/clk/renesas/rcar-cpg-lib.c
index f4279af8787f..fc73aa685281 100644
--- a/drivers/clk/renesas/rcar-cpg-lib.c
+++ b/drivers/clk/renesas/rcar-cpg-lib.c
@@ -94,7 +94,7 @@ struct clk * __init cpg_sdh_clk_register(const char *name,
struct cpg_simple_notifier *csn;
struct clk *clk;
- csn = kzalloc_obj(*csn, GFP_KERNEL);
+ csn = kzalloc_obj(*csn);
if (!csn)
return ERR_PTR(-ENOMEM);
@@ -144,7 +144,7 @@ struct clk * __init cpg_rpc_clk_register(const char *name,
struct rpc_clock *rpc;
struct clk *clk;
- rpc = kzalloc_obj(*rpc, GFP_KERNEL);
+ rpc = kzalloc_obj(*rpc);
if (!rpc)
return ERR_PTR(-ENOMEM);
@@ -185,7 +185,7 @@ struct clk * __init cpg_rpcd2_clk_register(const char *name,
struct rpcd2_clock *rpcd2;
struct clk *clk;
- rpcd2 = kzalloc_obj(*rpcd2, GFP_KERNEL);
+ rpcd2 = kzalloc_obj(*rpcd2);
if (!rpcd2)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/clk/renesas/rcar-gen2-cpg.c b/drivers/clk/renesas/rcar-gen2-cpg.c
index 69618ec0b638..484b27edf863 100644
--- a/drivers/clk/renesas/rcar-gen2-cpg.c
+++ b/drivers/clk/renesas/rcar-gen2-cpg.c
@@ -141,7 +141,7 @@ static struct clk * __init cpg_z_clk_register(const char *name,
struct cpg_z_clk *zclk;
struct clk *clk;
- zclk = kzalloc_obj(*zclk, GFP_KERNEL);
+ zclk = kzalloc_obj(*zclk);
if (!zclk)
return ERR_PTR(-ENOMEM);
@@ -169,14 +169,14 @@ static struct clk * __init cpg_rcan_clk_register(const char *name,
struct clk_gate *gate;
struct clk *clk;
- fixed = kzalloc_obj(*fixed, GFP_KERNEL);
+ fixed = kzalloc_obj(*fixed);
if (!fixed)
return ERR_PTR(-ENOMEM);
fixed->mult = 1;
fixed->div = 6;
- gate = kzalloc_obj(*gate, GFP_KERNEL);
+ gate = kzalloc_obj(*gate);
if (!gate) {
kfree(fixed);
return ERR_PTR(-ENOMEM);
@@ -213,7 +213,7 @@ static struct clk * __init cpg_adsp_clk_register(const char *name,
struct clk_gate *gate;
struct clk *clk;
- div = kzalloc_obj(*div, GFP_KERNEL);
+ div = kzalloc_obj(*div);
if (!div)
return ERR_PTR(-ENOMEM);
@@ -222,7 +222,7 @@ static struct clk * __init cpg_adsp_clk_register(const char *name,
div->table = cpg_adsp_div_table;
div->lock = &cpg_lock;
- gate = kzalloc_obj(*gate, GFP_KERNEL);
+ gate = kzalloc_obj(*gate);
if (!gate) {
kfree(div);
return ERR_PTR(-ENOMEM);
diff --git a/drivers/clk/renesas/rcar-gen3-cpg.c b/drivers/clk/renesas/rcar-gen3-cpg.c
index 605854200b04..e5b503332217 100644
--- a/drivers/clk/renesas/rcar-gen3-cpg.c
+++ b/drivers/clk/renesas/rcar-gen3-cpg.c
@@ -123,7 +123,7 @@ static struct clk * __init cpg_pll_clk_register(const char *name,
struct clk_init_data init = {};
struct clk *clk;
- pll_clk = kzalloc_obj(*pll_clk, GFP_KERNEL);
+ pll_clk = kzalloc_obj(*pll_clk);
if (!pll_clk)
return ERR_PTR(-ENOMEM);
@@ -271,7 +271,7 @@ static struct clk * __init __cpg_z_clk_register(const char *name,
struct cpg_z_clk *zclk;
struct clk *clk;
- zclk = kzalloc_obj(*zclk, GFP_KERNEL);
+ zclk = kzalloc_obj(*zclk);
if (!zclk)
return ERR_PTR(-ENOMEM);
@@ -410,7 +410,7 @@ struct clk * __init rcar_gen3_cpg_clk_register(struct device *dev,
if (cpg_quirks & RCKCR_CKSEL) {
struct cpg_simple_notifier *csn;
- csn = kzalloc_obj(*csn, GFP_KERNEL);
+ csn = kzalloc_obj(*csn);
if (!csn)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/clk/renesas/rcar-gen4-cpg.c b/drivers/clk/renesas/rcar-gen4-cpg.c
index 7168939ddb65..96922789e02a 100644
--- a/drivers/clk/renesas/rcar-gen4-cpg.c
+++ b/drivers/clk/renesas/rcar-gen4-cpg.c
@@ -234,7 +234,7 @@ static struct clk * __init cpg_pll_clk_register(const char *name,
struct cpg_pll_clk *pll_clk;
struct clk *clk;
- pll_clk = kzalloc_obj(*pll_clk, GFP_KERNEL);
+ pll_clk = kzalloc_obj(*pll_clk);
if (!pll_clk)
return ERR_PTR(-ENOMEM);
@@ -374,7 +374,7 @@ static struct clk * __init cpg_z_clk_register(const char *name,
struct cpg_z_clk *zclk;
struct clk *clk;
- zclk = kzalloc_obj(*zclk, GFP_KERNEL);
+ zclk = kzalloc_obj(*zclk);
if (!zclk)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/clk/renesas/renesas-cpg-mssr.c b/drivers/clk/renesas/renesas-cpg-mssr.c
index 48105ee90c83..52932ba777f4 100644
--- a/drivers/clk/renesas/renesas-cpg-mssr.c
+++ b/drivers/clk/renesas/renesas-cpg-mssr.c
@@ -512,7 +512,7 @@ static void __init cpg_mssr_register_mod_clk(const struct mssr_mod_clk *mod,
goto fail;
}
- clock = kzalloc_obj(*clock, GFP_KERNEL);
+ clock = kzalloc_obj(*clock);
if (!clock) {
clk = ERR_PTR(-ENOMEM);
goto fail;
diff --git a/drivers/clk/rockchip/clk-cpu.c b/drivers/clk/rockchip/clk-cpu.c
index 456b23e6be42..6205af9ba88a 100644
--- a/drivers/clk/rockchip/clk-cpu.c
+++ b/drivers/clk/rockchip/clk-cpu.c
@@ -313,7 +313,7 @@ struct clk *rockchip_clk_register_cpuclk(const char *name,
return ERR_PTR(-EINVAL);
}
- cpuclk = kzalloc_obj(*cpuclk, GFP_KERNEL);
+ cpuclk = kzalloc_obj(*cpuclk);
if (!cpuclk)
return ERR_PTR(-ENOMEM);
@@ -479,7 +479,7 @@ struct clk *rockchip_clk_register_cpuclk_multi_pll(const char *name,
int ret;
if (num_parents > 1) {
- mux = kzalloc_obj(*mux, GFP_KERNEL);
+ mux = kzalloc_obj(*mux);
if (!mux)
return ERR_PTR(-ENOMEM);
@@ -493,7 +493,7 @@ struct clk *rockchip_clk_register_cpuclk_multi_pll(const char *name,
}
if (div_width > 0) {
- div = kzalloc_obj(*div, GFP_KERNEL);
+ div = kzalloc_obj(*div);
if (!div) {
ret = -ENOMEM;
goto free_mux;
@@ -521,7 +521,7 @@ struct clk *rockchip_clk_register_cpuclk_multi_pll(const char *name,
goto free_div;
}
- cpuclk = kzalloc_obj(*cpuclk, GFP_KERNEL);
+ cpuclk = kzalloc_obj(*cpuclk);
if (!cpuclk) {
ret = -ENOMEM;
goto unregister_clk;
diff --git a/drivers/clk/rockchip/clk-ddr.c b/drivers/clk/rockchip/clk-ddr.c
index 96985682b98c..81ae8a4ee30e 100644
--- a/drivers/clk/rockchip/clk-ddr.c
+++ b/drivers/clk/rockchip/clk-ddr.c
@@ -100,7 +100,7 @@ struct clk *rockchip_clk_register_ddrclk(const char *name, int flags,
struct clk_init_data init;
struct clk *clk;
- ddrclk = kzalloc_obj(*ddrclk, GFP_KERNEL);
+ ddrclk = kzalloc_obj(*ddrclk);
if (!ddrclk)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/clk/rockchip/clk-gate-grf.c b/drivers/clk/rockchip/clk-gate-grf.c
index b3df39f9b317..88e409e91a63 100644
--- a/drivers/clk/rockchip/clk-gate-grf.c
+++ b/drivers/clk/rockchip/clk-gate-grf.c
@@ -81,7 +81,7 @@ struct clk *rockchip_clk_register_gate_grf(const char *name,
return ERR_PTR(-EOPNOTSUPP);
}
- gate = kzalloc_obj(*gate, GFP_KERNEL);
+ gate = kzalloc_obj(*gate);
if (!gate)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/clk/rockchip/clk-half-divider.c b/drivers/clk/rockchip/clk-half-divider.c
index ac77911fa058..bafe3e998954 100644
--- a/drivers/clk/rockchip/clk-half-divider.c
+++ b/drivers/clk/rockchip/clk-half-divider.c
@@ -176,7 +176,7 @@ struct clk *rockchip_clk_register_halfdiv(const char *name,
*gate_ops = NULL;
if (num_parents > 1) {
- mux = kzalloc_obj(*mux, GFP_KERNEL);
+ mux = kzalloc_obj(*mux);
if (!mux)
return ERR_PTR(-ENOMEM);
@@ -190,7 +190,7 @@ struct clk *rockchip_clk_register_halfdiv(const char *name,
}
if (gate_offset >= 0) {
- gate = kzalloc_obj(*gate, GFP_KERNEL);
+ gate = kzalloc_obj(*gate);
if (!gate)
goto err_gate;
@@ -202,7 +202,7 @@ struct clk *rockchip_clk_register_halfdiv(const char *name,
}
if (div_width > 0) {
- div = kzalloc_obj(*div, GFP_KERNEL);
+ div = kzalloc_obj(*div);
if (!div)
goto err_div;
diff --git a/drivers/clk/rockchip/clk-inverter.c b/drivers/clk/rockchip/clk-inverter.c
index 53c17047077c..bf9072ed9fd4 100644
--- a/drivers/clk/rockchip/clk-inverter.c
+++ b/drivers/clk/rockchip/clk-inverter.c
@@ -79,7 +79,7 @@ struct clk *rockchip_clk_register_inverter(const char *name,
struct rockchip_inv_clock *inv_clock;
struct clk *clk;
- inv_clock = kmalloc_obj(*inv_clock, GFP_KERNEL);
+ inv_clock = kmalloc_obj(*inv_clock);
if (!inv_clock)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/clk/rockchip/clk-mmc-phase.c b/drivers/clk/rockchip/clk-mmc-phase.c
index c8bb8a217eaa..4efd22953f3e 100644
--- a/drivers/clk/rockchip/clk-mmc-phase.c
+++ b/drivers/clk/rockchip/clk-mmc-phase.c
@@ -210,7 +210,7 @@ struct clk *rockchip_clk_register_mmc(const char *name,
struct clk *clk;
int ret;
- mmc_clock = kmalloc_obj(*mmc_clock, GFP_KERNEL);
+ mmc_clock = kmalloc_obj(*mmc_clock);
if (!mmc_clock)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/clk/rockchip/clk-muxgrf.c b/drivers/clk/rockchip/clk-muxgrf.c
index 7545df0adabe..ccbb1379501a 100644
--- a/drivers/clk/rockchip/clk-muxgrf.c
+++ b/drivers/clk/rockchip/clk-muxgrf.c
@@ -67,7 +67,7 @@ struct clk *rockchip_clk_register_muxgrf(const char *name,
return ERR_PTR(-ENOTSUPP);
}
- muxgrf_clock = kmalloc_obj(*muxgrf_clock, GFP_KERNEL);
+ muxgrf_clock = kmalloc_obj(*muxgrf_clock);
if (!muxgrf_clock)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/clk/rockchip/clk-pll.c b/drivers/clk/rockchip/clk-pll.c
index 865151d88b9f..6b853800cb6b 100644
--- a/drivers/clk/rockchip/clk-pll.c
+++ b/drivers/clk/rockchip/clk-pll.c
@@ -1076,7 +1076,7 @@ struct clk *rockchip_clk_register_pll(struct rockchip_clk_provider *ctx,
/* name the actual pll */
snprintf(pll_name, sizeof(pll_name), "pll_%s", name);
- pll = kzalloc_obj(*pll, GFP_KERNEL);
+ pll = kzalloc_obj(*pll);
if (!pll)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/clk/rockchip/clk-rk3576.c b/drivers/clk/rockchip/clk-rk3576.c
index 59285a784cd0..2557358e0b9d 100644
--- a/drivers/clk/rockchip/clk-rk3576.c
+++ b/drivers/clk/rockchip/clk-rk3576.c
@@ -1769,7 +1769,7 @@ static void __init rk3576_clk_init(struct device_node *np)
goto err_unmap;
}
- pmu0_grf_e = kzalloc_obj(*pmu0_grf_e, GFP_KERNEL);
+ pmu0_grf_e = kzalloc_obj(*pmu0_grf_e);
if (!pmu0_grf_e)
goto err_unmap;
@@ -1777,7 +1777,7 @@ static void __init rk3576_clk_init(struct device_node *np)
pmu0_grf_e->type = grf_type_pmu0;
hash_add(ctx->aux_grf_table, &pmu0_grf_e->node, grf_type_pmu0);
- ioc_grf_e = kzalloc_obj(*ioc_grf_e, GFP_KERNEL);
+ ioc_grf_e = kzalloc_obj(*ioc_grf_e);
if (!ioc_grf_e)
goto err_free_pmu0;
diff --git a/drivers/clk/rockchip/clk.c b/drivers/clk/rockchip/clk.c
index ec9517d7c2b7..e8b3b0b9a4f8 100644
--- a/drivers/clk/rockchip/clk.c
+++ b/drivers/clk/rockchip/clk.c
@@ -55,7 +55,7 @@ static struct clk *rockchip_clk_register_branch(const char *name,
int ret;
if (num_parents > 1) {
- mux = kzalloc_obj(*mux, GFP_KERNEL);
+ mux = kzalloc_obj(*mux);
if (!mux)
return ERR_PTR(-ENOMEM);
@@ -70,7 +70,7 @@ static struct clk *rockchip_clk_register_branch(const char *name,
}
if (gate_offset >= 0) {
- gate = kzalloc_obj(*gate, GFP_KERNEL);
+ gate = kzalloc_obj(*gate);
if (!gate) {
ret = -ENOMEM;
goto err_gate;
@@ -84,7 +84,7 @@ static struct clk *rockchip_clk_register_branch(const char *name,
}
if (div_width > 0) {
- div = kzalloc_obj(*div, GFP_KERNEL);
+ div = kzalloc_obj(*div);
if (!div) {
ret = -ENOMEM;
goto err_div;
@@ -221,7 +221,7 @@ static struct clk *rockchip_clk_register_frac_branch(
return ERR_PTR(-EINVAL);
}
- frac = kzalloc_obj(*frac, GFP_KERNEL);
+ frac = kzalloc_obj(*frac);
if (!frac)
return ERR_PTR(-ENOMEM);
@@ -323,7 +323,7 @@ static struct clk *rockchip_clk_register_factor_branch(const char *name,
div);
}
- gate = kzalloc_obj(*gate, GFP_KERNEL);
+ gate = kzalloc_obj(*gate);
if (!gate)
return ERR_PTR(-ENOMEM);
@@ -332,7 +332,7 @@ static struct clk *rockchip_clk_register_factor_branch(const char *name,
gate->bit_idx = gate_shift;
gate->lock = lock;
- fix = kzalloc_obj(*fix, GFP_KERNEL);
+ fix = kzalloc_obj(*fix);
if (!fix) {
kfree(gate);
return ERR_PTR(-ENOMEM);
@@ -365,11 +365,11 @@ static struct rockchip_clk_provider *rockchip_clk_init_base(
default_clk_val = ERR_PTR(has_late_clocks ? -EPROBE_DEFER : -ENOENT);
- ctx = kzalloc_obj(struct rockchip_clk_provider, GFP_KERNEL);
+ ctx = kzalloc_obj(struct rockchip_clk_provider);
if (!ctx)
return ERR_PTR(-ENOMEM);
- clk_table = kzalloc_objs(struct clk *, nr_clks, GFP_KERNEL);
+ clk_table = kzalloc_objs(struct clk *, nr_clks);
if (!clk_table)
goto err_free;
diff --git a/drivers/clk/rockchip/softrst.c b/drivers/clk/rockchip/softrst.c
index 01caa91e7ce3..115f317a99a2 100644
--- a/drivers/clk/rockchip/softrst.c
+++ b/drivers/clk/rockchip/softrst.c
@@ -96,7 +96,7 @@ void rockchip_register_softrst_lut(struct device_node *np,
struct rockchip_softrst *softrst;
int ret;
- softrst = kzalloc_obj(*softrst, GFP_KERNEL);
+ softrst = kzalloc_obj(*softrst);
if (!softrst)
return;
diff --git a/drivers/clk/samsung/clk-cpu.c b/drivers/clk/samsung/clk-cpu.c
index d8729dceabb0..ffc33e5decf5 100644
--- a/drivers/clk/samsung/clk-cpu.c
+++ b/drivers/clk/samsung/clk-cpu.c
@@ -660,7 +660,7 @@ static int __init exynos_register_cpu_clock(struct samsung_clk_provider *ctx,
return -EINVAL;
}
- cpuclk = kzalloc_obj(*cpuclk, GFP_KERNEL);
+ cpuclk = kzalloc_obj(*cpuclk);
if (!cpuclk)
return -ENOMEM;
diff --git a/drivers/clk/samsung/clk-pll.c b/drivers/clk/samsung/clk-pll.c
index 1bd8def3973e..026ac556fa2e 100644
--- a/drivers/clk/samsung/clk-pll.c
+++ b/drivers/clk/samsung/clk-pll.c
@@ -1435,7 +1435,7 @@ static void __init _samsung_clk_register_pll(struct samsung_clk_provider *ctx,
struct clk_init_data init;
int ret, len;
- pll = kzalloc_obj(*pll, GFP_KERNEL);
+ pll = kzalloc_obj(*pll);
if (!pll) {
pr_err("%s: could not allocate pll clk %s\n",
__func__, pll_clk->name);
diff --git a/drivers/clk/samsung/clk.c b/drivers/clk/samsung/clk.c
index 39580d82077b..fbb64b082188 100644
--- a/drivers/clk/samsung/clk.c
+++ b/drivers/clk/samsung/clk.c
@@ -55,7 +55,7 @@ struct samsung_clk_reg_dump *samsung_clk_alloc_reg_dump(
struct samsung_clk_reg_dump *rd;
unsigned int i;
- rd = kzalloc_objs(*rd, nr_rdump, GFP_KERNEL);
+ rd = kzalloc_objs(*rd, nr_rdump);
if (!rd)
return NULL;
@@ -301,7 +301,7 @@ struct clk_hw *samsung_register_auto_gate(struct device *dev,
int ret = -EINVAL;
/* allocate the gate */
- gate = kzalloc_obj(*gate, GFP_KERNEL);
+ gate = kzalloc_obj(*gate);
if (!gate)
return ERR_PTR(-ENOMEM);
@@ -431,7 +431,7 @@ void samsung_clk_extended_sleep_init(void __iomem *reg_base,
{
struct samsung_clock_reg_cache *reg_cache;
- reg_cache = kzalloc_obj(struct samsung_clock_reg_cache, GFP_KERNEL);
+ reg_cache = kzalloc_obj(struct samsung_clock_reg_cache);
if (!reg_cache)
panic("could not allocate register reg_cache.\n");
reg_cache->rdump = samsung_clk_alloc_reg_dump(rdump, nr_rdump);
diff --git a/drivers/clk/socfpga/clk-gate-a10.c b/drivers/clk/socfpga/clk-gate-a10.c
index c6505046b63b..dd8d1713aaff 100644
--- a/drivers/clk/socfpga/clk-gate-a10.c
+++ b/drivers/clk/socfpga/clk-gate-a10.c
@@ -52,7 +52,7 @@ static void __init __socfpga_gate_init(struct device_node *node,
struct clk_init_data init;
int rc;
- socfpga_clk = kzalloc_obj(*socfpga_clk, GFP_KERNEL);
+ socfpga_clk = kzalloc_obj(*socfpga_clk);
if (WARN_ON(!socfpga_clk))
return;
diff --git a/drivers/clk/socfpga/clk-gate-s10.c b/drivers/clk/socfpga/clk-gate-s10.c
index 913c31d94319..24f56a9edc44 100644
--- a/drivers/clk/socfpga/clk-gate-s10.c
+++ b/drivers/clk/socfpga/clk-gate-s10.c
@@ -132,7 +132,7 @@ struct clk_hw *s10_register_gate(const struct stratix10_gate_clock *clks, void _
const char *parent_name = clks->parent_name;
int ret;
- socfpga_clk = kzalloc_obj(*socfpga_clk, GFP_KERNEL);
+ socfpga_clk = kzalloc_obj(*socfpga_clk);
if (!socfpga_clk)
return NULL;
@@ -190,7 +190,7 @@ struct clk_hw *agilex_register_gate(const struct stratix10_gate_clock *clks, voi
const char *parent_name = clks->parent_name;
int ret;
- socfpga_clk = kzalloc_obj(*socfpga_clk, GFP_KERNEL);
+ socfpga_clk = kzalloc_obj(*socfpga_clk);
if (!socfpga_clk)
return NULL;
@@ -247,7 +247,7 @@ struct clk_hw *agilex5_register_gate(const struct agilex5_gate_clock *clks, void
struct clk_init_data init;
int ret;
- socfpga_clk = kzalloc_obj(*socfpga_clk, GFP_KERNEL);
+ socfpga_clk = kzalloc_obj(*socfpga_clk);
if (!socfpga_clk)
return NULL;
diff --git a/drivers/clk/socfpga/clk-gate.c b/drivers/clk/socfpga/clk-gate.c
index 52dd6e2f19f9..ced8e0988406 100644
--- a/drivers/clk/socfpga/clk-gate.c
+++ b/drivers/clk/socfpga/clk-gate.c
@@ -147,7 +147,7 @@ void __init socfpga_gate_init(struct device_node *node)
struct clk_ops *ops;
int rc;
- socfpga_clk = kzalloc_obj(*socfpga_clk, GFP_KERNEL);
+ socfpga_clk = kzalloc_obj(*socfpga_clk);
if (WARN_ON(!socfpga_clk))
return;
diff --git a/drivers/clk/socfpga/clk-periph-a10.c b/drivers/clk/socfpga/clk-periph-a10.c
index 7f61ce1793b2..4eb5787f0dea 100644
--- a/drivers/clk/socfpga/clk-periph-a10.c
+++ b/drivers/clk/socfpga/clk-periph-a10.c
@@ -72,7 +72,7 @@ static void __init __socfpga_periph_init(struct device_node *node,
of_property_read_u32(node, "reg", ®);
- periph_clk = kzalloc_obj(*periph_clk, GFP_KERNEL);
+ periph_clk = kzalloc_obj(*periph_clk);
if (WARN_ON(!periph_clk))
return;
diff --git a/drivers/clk/socfpga/clk-periph-s10.c b/drivers/clk/socfpga/clk-periph-s10.c
index f43ffd4dfa82..5195b9476da1 100644
--- a/drivers/clk/socfpga/clk-periph-s10.c
+++ b/drivers/clk/socfpga/clk-periph-s10.c
@@ -108,7 +108,7 @@ struct clk_hw *s10_register_periph(const struct stratix10_perip_c_clock *clks,
const char *parent_name = clks->parent_name;
int ret;
- periph_clk = kzalloc_obj(*periph_clk, GFP_KERNEL);
+ periph_clk = kzalloc_obj(*periph_clk);
if (WARN_ON(!periph_clk))
return NULL;
@@ -144,7 +144,7 @@ struct clk_hw *n5x_register_periph(const struct n5x_perip_c_clock *clks,
const char *parent_name = clks->parent_name;
int ret;
- periph_clk = kzalloc_obj(*periph_clk, GFP_KERNEL);
+ periph_clk = kzalloc_obj(*periph_clk);
if (WARN_ON(!periph_clk))
return NULL;
@@ -179,7 +179,7 @@ struct clk_hw *s10_register_cnt_periph(const struct stratix10_perip_cnt_clock *c
const char *parent_name = clks->parent_name;
int ret;
- periph_clk = kzalloc_obj(*periph_clk, GFP_KERNEL);
+ periph_clk = kzalloc_obj(*periph_clk);
if (WARN_ON(!periph_clk))
return NULL;
@@ -224,7 +224,7 @@ struct clk_hw *agilex5_register_cnt_periph(const struct agilex5_perip_cnt_clock
const char *name = clks->name;
int ret;
- periph_clk = kzalloc_obj(*periph_clk, GFP_KERNEL);
+ periph_clk = kzalloc_obj(*periph_clk);
if (WARN_ON(!periph_clk))
return NULL;
diff --git a/drivers/clk/socfpga/clk-periph.c b/drivers/clk/socfpga/clk-periph.c
index 2719af1502c1..3821db6777e7 100644
--- a/drivers/clk/socfpga/clk-periph.c
+++ b/drivers/clk/socfpga/clk-periph.c
@@ -62,7 +62,7 @@ static void __init __socfpga_periph_init(struct device_node *node,
of_property_read_u32(node, "reg", ®);
- periph_clk = kzalloc_obj(*periph_clk, GFP_KERNEL);
+ periph_clk = kzalloc_obj(*periph_clk);
if (WARN_ON(!periph_clk))
return;
diff --git a/drivers/clk/socfpga/clk-pll-a10.c b/drivers/clk/socfpga/clk-pll-a10.c
index 633c30b70d25..c56f276e8d51 100644
--- a/drivers/clk/socfpga/clk-pll-a10.c
+++ b/drivers/clk/socfpga/clk-pll-a10.c
@@ -78,7 +78,7 @@ static void __init __socfpga_pll_init(struct device_node *node,
of_property_read_u32(node, "reg", ®);
- pll_clk = kzalloc_obj(*pll_clk, GFP_KERNEL);
+ pll_clk = kzalloc_obj(*pll_clk);
if (WARN_ON(!pll_clk))
return;
diff --git a/drivers/clk/socfpga/clk-pll-s10.c b/drivers/clk/socfpga/clk-pll-s10.c
index 3c8302a7ec5b..ee236e87da33 100644
--- a/drivers/clk/socfpga/clk-pll-s10.c
+++ b/drivers/clk/socfpga/clk-pll-s10.c
@@ -196,7 +196,7 @@ struct clk_hw *s10_register_pll(const struct stratix10_pll_clock *clks,
const char *name = clks->name;
int ret;
- pll_clk = kzalloc_obj(*pll_clk, GFP_KERNEL);
+ pll_clk = kzalloc_obj(*pll_clk);
if (WARN_ON(!pll_clk))
return NULL;
@@ -236,7 +236,7 @@ struct clk_hw *agilex_register_pll(const struct stratix10_pll_clock *clks,
const char *name = clks->name;
int ret;
- pll_clk = kzalloc_obj(*pll_clk, GFP_KERNEL);
+ pll_clk = kzalloc_obj(*pll_clk);
if (WARN_ON(!pll_clk))
return NULL;
@@ -275,7 +275,7 @@ struct clk_hw *n5x_register_pll(const struct stratix10_pll_clock *clks,
const char *name = clks->name;
int ret;
- pll_clk = kzalloc_obj(*pll_clk, GFP_KERNEL);
+ pll_clk = kzalloc_obj(*pll_clk);
if (WARN_ON(!pll_clk))
return NULL;
@@ -314,7 +314,7 @@ struct clk_hw *agilex5_register_pll(const struct agilex5_pll_clock *clks,
const char *name = clks->name;
int ret;
- pll_clk = kzalloc_obj(*pll_clk, GFP_KERNEL);
+ pll_clk = kzalloc_obj(*pll_clk);
if (WARN_ON(!pll_clk))
return NULL;
diff --git a/drivers/clk/socfpga/clk-pll.c b/drivers/clk/socfpga/clk-pll.c
index 877c7f1a4216..f85adb16d414 100644
--- a/drivers/clk/socfpga/clk-pll.c
+++ b/drivers/clk/socfpga/clk-pll.c
@@ -84,7 +84,7 @@ static void __init __socfpga_pll_init(struct device_node *node,
of_property_read_u32(node, "reg", ®);
- pll_clk = kzalloc_obj(*pll_clk, GFP_KERNEL);
+ pll_clk = kzalloc_obj(*pll_clk);
if (WARN_ON(!pll_clk))
return;
diff --git a/drivers/clk/spacemit/ccu_common.c b/drivers/clk/spacemit/ccu_common.c
index cbe11eb49f0b..8696bb9cba2d 100644
--- a/drivers/clk/spacemit/ccu_common.c
+++ b/drivers/clk/spacemit/ccu_common.c
@@ -91,7 +91,7 @@ static int spacemit_ccu_reset_register(struct device *dev,
if (!reset_name)
return 0;
- cadev = kzalloc_obj(*cadev, GFP_KERNEL);
+ cadev = kzalloc_obj(*cadev);
if (!cadev)
return -ENOMEM;
diff --git a/drivers/clk/spear/clk-aux-synth.c b/drivers/clk/spear/clk-aux-synth.c
index 6358c9d87f4d..61a8c3d4c1e4 100644
--- a/drivers/clk/spear/clk-aux-synth.c
+++ b/drivers/clk/spear/clk-aux-synth.c
@@ -147,7 +147,7 @@ struct clk *clk_register_aux(const char *aux_name, const char *gate_name,
return ERR_PTR(-EINVAL);
}
- aux = kzalloc_obj(*aux, GFP_KERNEL);
+ aux = kzalloc_obj(*aux);
if (!aux)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/clk/spear/clk-frac-synth.c b/drivers/clk/spear/clk-frac-synth.c
index 37457eb1df1d..3549f1cfdae1 100644
--- a/drivers/clk/spear/clk-frac-synth.c
+++ b/drivers/clk/spear/clk-frac-synth.c
@@ -134,7 +134,7 @@ struct clk *clk_register_frac(const char *name, const char *parent_name,
return ERR_PTR(-EINVAL);
}
- frac = kzalloc_obj(*frac, GFP_KERNEL);
+ frac = kzalloc_obj(*frac);
if (!frac)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/clk/spear/clk-gpt-synth.c b/drivers/clk/spear/clk-gpt-synth.c
index dfc8c01d8a41..1a431d7ec20c 100644
--- a/drivers/clk/spear/clk-gpt-synth.c
+++ b/drivers/clk/spear/clk-gpt-synth.c
@@ -123,7 +123,7 @@ struct clk *clk_register_gpt(const char *name, const char *parent_name, unsigned
return ERR_PTR(-EINVAL);
}
- gpt = kzalloc_obj(*gpt, GFP_KERNEL);
+ gpt = kzalloc_obj(*gpt);
if (!gpt)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/clk/spear/clk-vco-pll.c b/drivers/clk/spear/clk-vco-pll.c
index 8b1fab349a1c..601e123f5c4b 100644
--- a/drivers/clk/spear/clk-vco-pll.c
+++ b/drivers/clk/spear/clk-vco-pll.c
@@ -293,11 +293,11 @@ struct clk *clk_register_vco_pll(const char *vco_name, const char *pll_name,
return ERR_PTR(-EINVAL);
}
- vco = kzalloc_obj(*vco, GFP_KERNEL);
+ vco = kzalloc_obj(*vco);
if (!vco)
return ERR_PTR(-ENOMEM);
- pll = kzalloc_obj(*pll, GFP_KERNEL);
+ pll = kzalloc_obj(*pll);
if (!pll)
goto free_vco;
diff --git a/drivers/clk/sprd/pll.c b/drivers/clk/sprd/pll.c
index 3c70a32e993f..bc2db19aec0e 100644
--- a/drivers/clk/sprd/pll.c
+++ b/drivers/clk/sprd/pll.c
@@ -155,7 +155,7 @@ static int _sprd_pll_set_rate(const struct sprd_pll *pll,
unsigned long kint, nint;
u64 tmp, refin, fvco = rate;
- cfg = kzalloc_objs(*cfg, regs_num, GFP_KERNEL);
+ cfg = kzalloc_objs(*cfg, regs_num);
if (!cfg)
return -ENOMEM;
diff --git a/drivers/clk/st/clk-flexgen.c b/drivers/clk/st/clk-flexgen.c
index ea14dec68fef..6362ffb73b0b 100644
--- a/drivers/clk/st/clk-flexgen.c
+++ b/drivers/clk/st/clk-flexgen.c
@@ -213,7 +213,7 @@ static struct clk *clk_register_flexgen(const char *name,
u32 xbar_shift;
void __iomem *xbar_reg, *fdiv_reg;
- fgxbar = kzalloc_obj(struct flexgen, GFP_KERNEL);
+ fgxbar = kzalloc_obj(struct flexgen);
if (!fgxbar)
return ERR_PTR(-ENOMEM);
@@ -596,7 +596,7 @@ static void __init st_of_flexgen_setup(struct device_node *np)
clk_mode = data->mode;
}
- clk_data = kzalloc_obj(*clk_data, GFP_KERNEL);
+ clk_data = kzalloc_obj(*clk_data);
if (!clk_data)
goto err;
@@ -617,7 +617,7 @@ static void __init st_of_flexgen_setup(struct device_node *np)
if (!clk_data->clks)
goto err;
- rlock = kzalloc_obj(spinlock_t, GFP_KERNEL);
+ rlock = kzalloc_obj(spinlock_t);
if (!rlock)
goto err;
diff --git a/drivers/clk/st/clkgen-fsyn.c b/drivers/clk/st/clkgen-fsyn.c
index 74dd344eba4f..3fcc1da20c04 100644
--- a/drivers/clk/st/clkgen-fsyn.c
+++ b/drivers/clk/st/clkgen-fsyn.c
@@ -454,7 +454,7 @@ static struct clk * __init st_clk_register_quadfs_pll(
if (WARN_ON(!name || !parent_name))
return ERR_PTR(-EINVAL);
- pll = kzalloc_obj(*pll, GFP_KERNEL);
+ pll = kzalloc_obj(*pll);
if (!pll)
return ERR_PTR(-ENOMEM);
@@ -894,7 +894,7 @@ static struct clk * __init st_clk_register_quadfs_fsynth(
if (WARN_ON(!name || !parent_name))
return ERR_PTR(-EINVAL);
- fs = kzalloc_obj(*fs, GFP_KERNEL);
+ fs = kzalloc_obj(*fs);
if (!fs)
return ERR_PTR(-ENOMEM);
@@ -926,12 +926,12 @@ static void __init st_of_create_quadfs_fsynths(
struct clk_onecell_data *clk_data;
int fschan;
- clk_data = kzalloc_obj(*clk_data, GFP_KERNEL);
+ clk_data = kzalloc_obj(*clk_data);
if (!clk_data)
return;
clk_data->clk_num = QUADFS_MAX_CHAN;
- clk_data->clks = kzalloc_objs(struct clk *, QUADFS_MAX_CHAN, GFP_KERNEL);
+ clk_data->clks = kzalloc_objs(struct clk *, QUADFS_MAX_CHAN);
if (!clk_data->clks) {
kfree(clk_data);
@@ -1012,7 +1012,7 @@ static void __init st_of_quadfs_setup(struct device_node *np,
if (!pll_name)
return;
- lock = kzalloc_obj(*lock, GFP_KERNEL);
+ lock = kzalloc_obj(*lock);
if (!lock)
goto err_exit;
diff --git a/drivers/clk/st/clkgen-pll.c b/drivers/clk/st/clkgen-pll.c
index 9a6b0df5aabc..38d1d2e357f3 100644
--- a/drivers/clk/st/clkgen-pll.c
+++ b/drivers/clk/st/clkgen-pll.c
@@ -656,7 +656,7 @@ static struct clk * __init clkgen_pll_register(const char *parent_name,
struct clk *clk;
struct clk_init_data init;
- pll = kzalloc_obj(*pll, GFP_KERNEL);
+ pll = kzalloc_obj(*pll);
if (!pll)
return ERR_PTR(-ENOMEM);
@@ -716,7 +716,7 @@ static struct clk * __init clkgen_odf_register(const char *parent_name,
flags = pll_flags | CLK_GET_RATE_NOCACHE | CLK_SET_RATE_PARENT;
- gate = kzalloc_obj(*gate, GFP_KERNEL);
+ gate = kzalloc_obj(*gate);
if (!gate)
return ERR_PTR(-ENOMEM);
@@ -725,7 +725,7 @@ static struct clk * __init clkgen_odf_register(const char *parent_name,
gate->bit_idx = pll_data->odf_gate[odf].shift;
gate->lock = odf_lock;
- div = kzalloc_obj(*div, GFP_KERNEL);
+ div = kzalloc_obj(*div);
if (!div) {
kfree(gate);
return ERR_PTR(-ENOMEM);
@@ -783,7 +783,7 @@ static void __init clkgen_c32_pll_setup(struct device_node *np,
num_odfs = datac->data->num_odfs;
- clk_data = kzalloc_obj(*clk_data, GFP_KERNEL);
+ clk_data = kzalloc_obj(*clk_data);
if (!clk_data)
return;
diff --git a/drivers/clk/starfive/clk-starfive-jh7110-sys.c b/drivers/clk/starfive/clk-starfive-jh7110-sys.c
index d8a1e45fc6bd..03c17cd2032f 100644
--- a/drivers/clk/starfive/clk-starfive-jh7110-sys.c
+++ b/drivers/clk/starfive/clk-starfive-jh7110-sys.c
@@ -347,7 +347,7 @@ int jh7110_reset_controller_register(struct jh71x0_clk_priv *priv,
struct auxiliary_device *adev;
int ret;
- rdev = kzalloc_obj(*rdev, GFP_KERNEL);
+ rdev = kzalloc_obj(*rdev);
if (!rdev)
return -ENOMEM;
diff --git a/drivers/clk/stm32/reset-stm32.c b/drivers/clk/stm32/reset-stm32.c
index 6c4a3a1bfa38..fc237fccae68 100644
--- a/drivers/clk/stm32/reset-stm32.c
+++ b/drivers/clk/stm32/reset-stm32.c
@@ -130,7 +130,7 @@ int stm32_rcc_reset_init(struct device *dev, struct clk_stm32_reset_data *data,
{
struct stm32_reset_data *reset_data;
- reset_data = kzalloc_obj(*reset_data, GFP_KERNEL);
+ reset_data = kzalloc_obj(*reset_data);
if (!reset_data)
return -ENOMEM;
diff --git a/drivers/clk/sunxi-ng/ccu_common.c b/drivers/clk/sunxi-ng/ccu_common.c
index eff61cb0d8a5..1c083b4d0b7e 100644
--- a/drivers/clk/sunxi-ng/ccu_common.c
+++ b/drivers/clk/sunxi-ng/ccu_common.c
@@ -242,7 +242,7 @@ void of_sunxi_ccu_probe(struct device_node *node, void __iomem *reg,
struct sunxi_ccu *ccu;
int ret;
- ccu = kzalloc_obj(*ccu, GFP_KERNEL);
+ ccu = kzalloc_obj(*ccu);
if (!ccu)
return;
diff --git a/drivers/clk/sunxi/clk-a10-hosc.c b/drivers/clk/sunxi/clk-a10-hosc.c
index 3a0d899c395a..29eb5a024ac2 100644
--- a/drivers/clk/sunxi/clk-a10-hosc.c
+++ b/drivers/clk/sunxi/clk-a10-hosc.c
@@ -26,10 +26,10 @@ static void __init sun4i_osc_clk_setup(struct device_node *node)
return;
/* allocate fixed-rate and gate clock structs */
- fixed = kzalloc_obj(struct clk_fixed_rate, GFP_KERNEL);
+ fixed = kzalloc_obj(struct clk_fixed_rate);
if (!fixed)
return;
- gate = kzalloc_obj(struct clk_gate, GFP_KERNEL);
+ gate = kzalloc_obj(struct clk_gate);
if (!gate)
goto err_free_fixed;
diff --git a/drivers/clk/sunxi/clk-a10-mod1.c b/drivers/clk/sunxi/clk-a10-mod1.c
index 45dfe0b2e8d1..3e267e293ae5 100644
--- a/drivers/clk/sunxi/clk-a10-mod1.c
+++ b/drivers/clk/sunxi/clk-a10-mod1.c
@@ -32,11 +32,11 @@ static void __init sun4i_mod1_clk_setup(struct device_node *node)
if (IS_ERR(reg))
return;
- mux = kzalloc_obj(*mux, GFP_KERNEL);
+ mux = kzalloc_obj(*mux);
if (!mux)
goto err_unmap;
- gate = kzalloc_obj(*gate, GFP_KERNEL);
+ gate = kzalloc_obj(*gate);
if (!gate)
goto err_free_mux;
diff --git a/drivers/clk/sunxi/clk-a10-pll2.c b/drivers/clk/sunxi/clk-a10-pll2.c
index 046e23831fc2..96ebe72429b6 100644
--- a/drivers/clk/sunxi/clk-a10-pll2.c
+++ b/drivers/clk/sunxi/clk-a10-pll2.c
@@ -50,11 +50,11 @@ static void __init sun4i_pll2_setup(struct device_node *node,
if (IS_ERR(reg))
return;
- clk_data = kzalloc_obj(*clk_data, GFP_KERNEL);
+ clk_data = kzalloc_obj(*clk_data);
if (!clk_data)
goto err_unmap;
- clks = kzalloc_objs(struct clk *, SUN4I_PLL2_OUTPUTS, GFP_KERNEL);
+ clks = kzalloc_objs(struct clk *, SUN4I_PLL2_OUTPUTS);
if (!clks)
goto err_free_data;
@@ -71,7 +71,7 @@ static void __init sun4i_pll2_setup(struct device_node *node,
}
/* Setup the gate part of the PLL2 */
- gate = kzalloc_obj(struct clk_gate, GFP_KERNEL);
+ gate = kzalloc_obj(struct clk_gate);
if (!gate)
goto err_unregister_prediv;
@@ -80,7 +80,7 @@ static void __init sun4i_pll2_setup(struct device_node *node,
gate->lock = &sun4i_a10_pll2_lock;
/* Setup the multiplier part of the PLL2 */
- mult = kzalloc_obj(struct clk_multiplier, GFP_KERNEL);
+ mult = kzalloc_obj(struct clk_multiplier);
if (!mult)
goto err_free_gate;
diff --git a/drivers/clk/sunxi/clk-a10-ve.c b/drivers/clk/sunxi/clk-a10-ve.c
index d353d0d1200a..75a5019565d8 100644
--- a/drivers/clk/sunxi/clk-a10-ve.c
+++ b/drivers/clk/sunxi/clk-a10-ve.c
@@ -97,11 +97,11 @@ static void __init sun4i_ve_clk_setup(struct device_node *node)
if (IS_ERR(reg))
return;
- div = kzalloc_obj(*div, GFP_KERNEL);
+ div = kzalloc_obj(*div);
if (!div)
goto err_unmap;
- gate = kzalloc_obj(*gate, GFP_KERNEL);
+ gate = kzalloc_obj(*gate);
if (!gate)
goto err_free_div;
@@ -129,7 +129,7 @@ static void __init sun4i_ve_clk_setup(struct device_node *node)
if (err)
goto err_unregister_clk;
- reset_data = kzalloc_obj(*reset_data, GFP_KERNEL);
+ reset_data = kzalloc_obj(*reset_data);
if (!reset_data)
goto err_del_provider;
diff --git a/drivers/clk/sunxi/clk-a20-gmac.c b/drivers/clk/sunxi/clk-a20-gmac.c
index 3ef842034fa2..2a81536b645c 100644
--- a/drivers/clk/sunxi/clk-a20-gmac.c
+++ b/drivers/clk/sunxi/clk-a20-gmac.c
@@ -63,11 +63,11 @@ static void __init sun7i_a20_gmac_clk_setup(struct device_node *node)
return;
/* allocate mux and gate clock structs */
- mux = kzalloc_obj(struct clk_mux, GFP_KERNEL);
+ mux = kzalloc_obj(struct clk_mux);
if (!mux)
return;
- gate = kzalloc_obj(struct clk_gate, GFP_KERNEL);
+ gate = kzalloc_obj(struct clk_gate);
if (!gate)
goto free_mux;
diff --git a/drivers/clk/sunxi/clk-factors.c b/drivers/clk/sunxi/clk-factors.c
index 0b4a25305e93..149187f189d6 100644
--- a/drivers/clk/sunxi/clk-factors.c
+++ b/drivers/clk/sunxi/clk-factors.c
@@ -200,7 +200,7 @@ static struct clk *__sunxi_factors_register(struct device_node *node,
else
of_property_read_string(node, "clock-output-names", &clk_name);
- factors = kzalloc_obj(struct clk_factors, GFP_KERNEL);
+ factors = kzalloc_obj(struct clk_factors);
if (!factors)
goto err_factors;
@@ -213,7 +213,7 @@ static struct clk *__sunxi_factors_register(struct device_node *node,
/* Add a gate if this factor clock can be gated */
if (data->enable) {
- gate = kzalloc_obj(struct clk_gate, GFP_KERNEL);
+ gate = kzalloc_obj(struct clk_gate);
if (!gate)
goto err_gate;
@@ -228,7 +228,7 @@ static struct clk *__sunxi_factors_register(struct device_node *node,
/* Add a mux if this factor clock can be muxed */
if (data->mux) {
- mux = kzalloc_obj(struct clk_mux, GFP_KERNEL);
+ mux = kzalloc_obj(struct clk_mux);
if (!mux)
goto err_mux;
diff --git a/drivers/clk/sunxi/clk-mod0.c b/drivers/clk/sunxi/clk-mod0.c
index dcfaa8a936c4..b409a8d70962 100644
--- a/drivers/clk/sunxi/clk-mod0.c
+++ b/drivers/clk/sunxi/clk-mod0.c
@@ -300,11 +300,11 @@ static void __init sunxi_mmc_setup(struct device_node *node,
return;
}
- clk_data = kmalloc_obj(*clk_data, GFP_KERNEL);
+ clk_data = kmalloc_obj(*clk_data);
if (!clk_data)
return;
- clk_data->clks = kzalloc_objs(*clk_data->clks, 3, GFP_KERNEL);
+ clk_data->clks = kzalloc_objs(*clk_data->clks, 3);
if (!clk_data->clks)
goto err_free_data;
@@ -323,7 +323,7 @@ static void __init sunxi_mmc_setup(struct device_node *node,
};
struct mmc_phase *phase;
- phase = kmalloc_obj(*phase, GFP_KERNEL);
+ phase = kmalloc_obj(*phase);
if (!phase)
continue;
diff --git a/drivers/clk/sunxi/clk-simple-gates.c b/drivers/clk/sunxi/clk-simple-gates.c
index 3852972a8600..99e83ada7af6 100644
--- a/drivers/clk/sunxi/clk-simple-gates.c
+++ b/drivers/clk/sunxi/clk-simple-gates.c
@@ -34,14 +34,14 @@ static void __init sunxi_simple_gates_setup(struct device_node *node,
clk_parent = of_clk_get_parent_name(node, 0);
- clk_data = kmalloc_obj(struct clk_onecell_data, GFP_KERNEL);
+ clk_data = kmalloc_obj(struct clk_onecell_data);
if (!clk_data)
goto err_unmap;
number = of_property_count_u32_elems(node, "clock-indices");
of_property_read_u32_index(node, "clock-indices", number - 1, &number);
- clk_data->clks = kzalloc_objs(struct clk *, number + 1, GFP_KERNEL);
+ clk_data->clks = kzalloc_objs(struct clk *, number + 1);
if (!clk_data->clks)
goto err_free_data;
diff --git a/drivers/clk/sunxi/clk-sun4i-display.c b/drivers/clk/sunxi/clk-sun4i-display.c
index a4e00d516b68..e17325e741e1 100644
--- a/drivers/clk/sunxi/clk-sun4i-display.c
+++ b/drivers/clk/sunxi/clk-sun4i-display.c
@@ -126,7 +126,7 @@ static void __init sun4i_a10_display_init(struct device_node *node,
goto unmap;
}
- mux = kzalloc_obj(*mux, GFP_KERNEL);
+ mux = kzalloc_obj(*mux);
if (!mux)
goto unmap;
@@ -135,7 +135,7 @@ static void __init sun4i_a10_display_init(struct device_node *node,
mux->mask = (1 << data->width_mux) - 1;
mux->lock = &sun4i_a10_display_lock;
- gate = kzalloc_obj(*gate, GFP_KERNEL);
+ gate = kzalloc_obj(*gate);
if (!gate)
goto free_mux;
@@ -144,7 +144,7 @@ static void __init sun4i_a10_display_init(struct device_node *node,
gate->lock = &sun4i_a10_display_lock;
if (data->has_div) {
- div = kzalloc_obj(*div, GFP_KERNEL);
+ div = kzalloc_obj(*div);
if (!div)
goto free_gate;
@@ -175,7 +175,7 @@ static void __init sun4i_a10_display_init(struct device_node *node,
if (!data->num_rst)
return;
- reset_data = kzalloc_obj(*reset_data, GFP_KERNEL);
+ reset_data = kzalloc_obj(*reset_data);
if (!reset_data)
goto free_of_clk;
diff --git a/drivers/clk/sunxi/clk-sun4i-pll3.c b/drivers/clk/sunxi/clk-sun4i-pll3.c
index 2977e71ea35a..1b8b1959dc19 100644
--- a/drivers/clk/sunxi/clk-sun4i-pll3.c
+++ b/drivers/clk/sunxi/clk-sun4i-pll3.c
@@ -37,7 +37,7 @@ static void __init sun4i_a10_pll3_setup(struct device_node *node)
return;
}
- gate = kzalloc_obj(*gate, GFP_KERNEL);
+ gate = kzalloc_obj(*gate);
if (!gate)
goto err_unmap;
@@ -45,7 +45,7 @@ static void __init sun4i_a10_pll3_setup(struct device_node *node)
gate->bit_idx = SUN4I_A10_PLL3_GATE_BIT;
gate->lock = &sun4i_a10_pll3_lock;
- mult = kzalloc_obj(*mult, GFP_KERNEL);
+ mult = kzalloc_obj(*mult);
if (!mult)
goto err_free_gate;
diff --git a/drivers/clk/sunxi/clk-sun4i-tcon-ch1.c b/drivers/clk/sunxi/clk-sun4i-tcon-ch1.c
index 6e4c9db335e6..b61eba112a7f 100644
--- a/drivers/clk/sunxi/clk-sun4i-tcon-ch1.c
+++ b/drivers/clk/sunxi/clk-sun4i-tcon-ch1.c
@@ -246,7 +246,7 @@ static void __init tcon_ch1_setup(struct device_node *node)
goto err_unmap;
}
- tclk = kzalloc_obj(*tclk, GFP_KERNEL);
+ tclk = kzalloc_obj(*tclk);
if (!tclk)
goto err_unmap;
diff --git a/drivers/clk/sunxi/clk-sun8i-bus-gates.c b/drivers/clk/sunxi/clk-sun8i-bus-gates.c
index c212200d49f4..df0f055bae5c 100644
--- a/drivers/clk/sunxi/clk-sun8i-bus-gates.c
+++ b/drivers/clk/sunxi/clk-sun8i-bus-gates.c
@@ -44,14 +44,14 @@ static void __init sun8i_h3_bus_gates_init(struct device_node *node)
parents[i] = of_clk_get_parent_name(node, idx);
}
- clk_data = kmalloc_obj(struct clk_onecell_data, GFP_KERNEL);
+ clk_data = kmalloc_obj(struct clk_onecell_data);
if (!clk_data)
goto err_unmap;
number = of_property_count_u32_elems(node, "clock-indices");
of_property_read_u32_index(node, "clock-indices", number - 1, &number);
- clk_data->clks = kzalloc_objs(struct clk *, number + 1, GFP_KERNEL);
+ clk_data->clks = kzalloc_objs(struct clk *, number + 1);
if (!clk_data->clks)
goto err_free_data;
diff --git a/drivers/clk/sunxi/clk-sun8i-mbus.c b/drivers/clk/sunxi/clk-sun8i-mbus.c
index 9156830f04a6..fe7a0693b15d 100644
--- a/drivers/clk/sunxi/clk-sun8i-mbus.c
+++ b/drivers/clk/sunxi/clk-sun8i-mbus.c
@@ -44,15 +44,15 @@ static void __init sun8i_a23_mbus_setup(struct device_node *node)
goto err_free_parents;
}
- div = kzalloc_obj(*div, GFP_KERNEL);
+ div = kzalloc_obj(*div);
if (!div)
goto err_unmap;
- mux = kzalloc_obj(*mux, GFP_KERNEL);
+ mux = kzalloc_obj(*mux);
if (!mux)
goto err_free_div;
- gate = kzalloc_obj(*gate, GFP_KERNEL);
+ gate = kzalloc_obj(*gate);
if (!gate)
goto err_free_mux;
diff --git a/drivers/clk/sunxi/clk-sun9i-cpus.c b/drivers/clk/sunxi/clk-sun9i-cpus.c
index f49f4df71bc2..516a94f28750 100644
--- a/drivers/clk/sunxi/clk-sun9i-cpus.c
+++ b/drivers/clk/sunxi/clk-sun9i-cpus.c
@@ -191,7 +191,7 @@ static void sun9i_a80_cpus_setup(struct device_node *node)
struct clk *clk;
int ret;
- cpus = kzalloc_obj(*cpus, GFP_KERNEL);
+ cpus = kzalloc_obj(*cpus);
if (!cpus)
return;
@@ -204,7 +204,7 @@ static void sun9i_a80_cpus_setup(struct device_node *node)
/* we have a mux, we will have >1 parents */
ret = of_clk_parent_fill(node, parents, SUN9I_CPUS_MAX_PARENTS);
- mux = kzalloc_obj(*mux, GFP_KERNEL);
+ mux = kzalloc_obj(*mux);
if (!mux)
goto err_unmap;
diff --git a/drivers/clk/sunxi/clk-sunxi.c b/drivers/clk/sunxi/clk-sunxi.c
index 1451ebec1ac6..c6557c1de33f 100644
--- a/drivers/clk/sunxi/clk-sunxi.c
+++ b/drivers/clk/sunxi/clk-sunxi.c
@@ -991,11 +991,11 @@ static struct clk ** __init sunxi_divs_clk_setup(struct device_node *node,
return NULL;
}
- clk_data = kmalloc_obj(struct clk_onecell_data, GFP_KERNEL);
+ clk_data = kmalloc_obj(struct clk_onecell_data);
if (!clk_data)
goto out_unmap;
- clks = kzalloc_objs(*clks, ndivs, GFP_KERNEL);
+ clks = kzalloc_objs(*clks, ndivs);
if (!clks)
goto free_clkdata;
@@ -1022,7 +1022,7 @@ static struct clk ** __init sunxi_divs_clk_setup(struct device_node *node,
/* If this leaf clock can be gated, create a gate */
if (data->div[i].gate) {
- gate = kzalloc_obj(*gate, GFP_KERNEL);
+ gate = kzalloc_obj(*gate);
if (!gate)
goto free_clks;
@@ -1035,7 +1035,7 @@ static struct clk ** __init sunxi_divs_clk_setup(struct device_node *node,
/* Leaves can be fixed or configurable divisors */
if (data->div[i].fixed) {
- fix_factor = kzalloc_obj(*fix_factor, GFP_KERNEL);
+ fix_factor = kzalloc_obj(*fix_factor);
if (!fix_factor)
goto free_gate;
@@ -1045,7 +1045,7 @@ static struct clk ** __init sunxi_divs_clk_setup(struct device_node *node,
rate_hw = &fix_factor->hw;
rate_ops = &clk_fixed_factor_ops;
} else {
- divider = kzalloc_obj(*divider, GFP_KERNEL);
+ divider = kzalloc_obj(*divider);
if (!divider)
goto free_gate;
diff --git a/drivers/clk/sunxi/clk-usb.c b/drivers/clk/sunxi/clk-usb.c
index f993884c58d6..903d22c002cc 100644
--- a/drivers/clk/sunxi/clk-usb.c
+++ b/drivers/clk/sunxi/clk-usb.c
@@ -113,11 +113,11 @@ static void __init sunxi_usb_clk_setup(struct device_node *node,
qty = find_last_bit((unsigned long *)&data->clk_mask,
SUNXI_USB_MAX_SIZE);
- clk_data = kmalloc_obj(struct clk_onecell_data, GFP_KERNEL);
+ clk_data = kmalloc_obj(struct clk_onecell_data);
if (!clk_data)
return;
- clk_data->clks = kzalloc_objs(struct clk *, qty + 1, GFP_KERNEL);
+ clk_data->clks = kzalloc_objs(struct clk *, qty + 1);
if (!clk_data->clks) {
kfree(clk_data);
return;
@@ -144,7 +144,7 @@ static void __init sunxi_usb_clk_setup(struct device_node *node,
if (data->reset_mask == 0)
return;
- reset_data = kzalloc_obj(*reset_data, GFP_KERNEL);
+ reset_data = kzalloc_obj(*reset_data);
if (!reset_data)
return;
diff --git a/drivers/clk/tegra/clk-audio-sync.c b/drivers/clk/tegra/clk-audio-sync.c
index 41db1d5978e3..0bbfcf46bedd 100644
--- a/drivers/clk/tegra/clk-audio-sync.c
+++ b/drivers/clk/tegra/clk-audio-sync.c
@@ -50,7 +50,7 @@ struct clk *tegra_clk_register_sync_source(const char *name,
struct clk_init_data init;
struct clk *clk;
- sync = kzalloc_obj(*sync, GFP_KERNEL);
+ sync = kzalloc_obj(*sync);
if (!sync) {
pr_err("%s: could not allocate sync source clk\n", __func__);
return ERR_PTR(-ENOMEM);
diff --git a/drivers/clk/tegra/clk-bpmp.c b/drivers/clk/tegra/clk-bpmp.c
index 064d9ee431e5..f6d2b934228b 100644
--- a/drivers/clk/tegra/clk-bpmp.c
+++ b/drivers/clk/tegra/clk-bpmp.c
@@ -434,7 +434,7 @@ static int tegra_bpmp_probe_clocks(struct tegra_bpmp *bpmp,
dev_dbg(bpmp->dev, "maximum clock ID: %u\n", max_id);
- clocks = kzalloc_objs(*clocks, max_id + 1, GFP_KERNEL);
+ clocks = kzalloc_objs(*clocks, max_id + 1);
if (!clocks)
return -ENOMEM;
diff --git a/drivers/clk/tegra/clk-divider.c b/drivers/clk/tegra/clk-divider.c
index 62fd39a849b1..27f43c3da156 100644
--- a/drivers/clk/tegra/clk-divider.c
+++ b/drivers/clk/tegra/clk-divider.c
@@ -148,7 +148,7 @@ struct clk *tegra_clk_register_divider(const char *name,
struct clk *clk;
struct clk_init_data init;
- divider = kzalloc_obj(*divider, GFP_KERNEL);
+ divider = kzalloc_obj(*divider);
if (!divider) {
pr_err("%s: could not allocate fractional divider clk\n",
__func__);
diff --git a/drivers/clk/tegra/clk-periph-fixed.c b/drivers/clk/tegra/clk-periph-fixed.c
index 363a0e0aed3d..bb33e32cad4a 100644
--- a/drivers/clk/tegra/clk-periph-fixed.c
+++ b/drivers/clk/tegra/clk-periph-fixed.c
@@ -84,7 +84,7 @@ struct clk *tegra_clk_register_periph_fixed(const char *name,
if (!regs)
return ERR_PTR(-EINVAL);
- fixed = kzalloc_obj(*fixed, GFP_KERNEL);
+ fixed = kzalloc_obj(*fixed);
if (!fixed)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/clk/tegra/clk-periph-gate.c b/drivers/clk/tegra/clk-periph-gate.c
index 1892a5b78fc7..fa39d6487515 100644
--- a/drivers/clk/tegra/clk-periph-gate.c
+++ b/drivers/clk/tegra/clk-periph-gate.c
@@ -146,7 +146,7 @@ struct clk *tegra_clk_register_periph_gate(const char *name,
if (!pregs)
return ERR_PTR(-EINVAL);
- gate = kzalloc_obj(*gate, GFP_KERNEL);
+ gate = kzalloc_obj(*gate);
if (!gate) {
pr_err("%s: could not allocate periph gate clk\n", __func__);
return ERR_PTR(-ENOMEM);
diff --git a/drivers/clk/tegra/clk-pll-out.c b/drivers/clk/tegra/clk-pll-out.c
index cf10c7bea32d..2299545fc386 100644
--- a/drivers/clk/tegra/clk-pll-out.c
+++ b/drivers/clk/tegra/clk-pll-out.c
@@ -93,7 +93,7 @@ struct clk *tegra_clk_register_pll_out(const char *name,
struct clk *clk;
struct clk_init_data init;
- pll_out = kzalloc_obj(*pll_out, GFP_KERNEL);
+ pll_out = kzalloc_obj(*pll_out);
if (!pll_out)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/clk/tegra/clk-pll.c b/drivers/clk/tegra/clk-pll.c
index 3031725e2a9d..d86003b6d94f 100644
--- a/drivers/clk/tegra/clk-pll.c
+++ b/drivers/clk/tegra/clk-pll.c
@@ -1882,7 +1882,7 @@ static struct tegra_clk_pll *_tegra_init_pll(void __iomem *clk_base,
{
struct tegra_clk_pll *pll;
- pll = kzalloc_obj(*pll, GFP_KERNEL);
+ pll = kzalloc_obj(*pll);
if (!pll)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/clk/tegra/clk-sdmmc-mux.c b/drivers/clk/tegra/clk-sdmmc-mux.c
index 524469ff0805..14b5439a100a 100644
--- a/drivers/clk/tegra/clk-sdmmc-mux.c
+++ b/drivers/clk/tegra/clk-sdmmc-mux.c
@@ -250,7 +250,7 @@ struct clk *tegra_clk_register_sdmmc_mux_div(const char *name,
if (!bank)
return ERR_PTR(-EINVAL);
- sdmmc_mux = kzalloc_obj(*sdmmc_mux, GFP_KERNEL);
+ sdmmc_mux = kzalloc_obj(*sdmmc_mux);
if (!sdmmc_mux)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/clk/tegra/clk-super.c b/drivers/clk/tegra/clk-super.c
index 3882efd05427..370445e3d5ac 100644
--- a/drivers/clk/tegra/clk-super.c
+++ b/drivers/clk/tegra/clk-super.c
@@ -207,7 +207,7 @@ struct clk *tegra_clk_register_super_mux(const char *name,
struct clk *clk;
struct clk_init_data init;
- super = kzalloc_obj(*super, GFP_KERNEL);
+ super = kzalloc_obj(*super);
if (!super)
return ERR_PTR(-ENOMEM);
@@ -243,7 +243,7 @@ struct clk *tegra_clk_register_super_clk(const char *name,
struct clk *clk;
struct clk_init_data init;
- super = kzalloc_obj(*super, GFP_KERNEL);
+ super = kzalloc_obj(*super);
if (!super)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/clk/tegra/clk-tegra-super-cclk.c b/drivers/clk/tegra/clk-tegra-super-cclk.c
index 0f4ec781024c..e7aeb67606b1 100644
--- a/drivers/clk/tegra/clk-tegra-super-cclk.c
+++ b/drivers/clk/tegra/clk-tegra-super-cclk.c
@@ -142,7 +142,7 @@ struct clk *tegra_clk_register_super_cclk(const char *name,
if (WARN_ON(cclk_super))
return ERR_PTR(-EBUSY);
- super = kzalloc_obj(*super, GFP_KERNEL);
+ super = kzalloc_obj(*super);
if (!super)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/clk/tegra/clk-tegra124-emc.c b/drivers/clk/tegra/clk-tegra124-emc.c
index c92fc64c79dc..f3b2c96fdcfc 100644
--- a/drivers/clk/tegra/clk-tegra124-emc.c
+++ b/drivers/clk/tegra/clk-tegra124-emc.c
@@ -492,7 +492,7 @@ struct clk *tegra124_clk_register_emc(void __iomem *base, struct device_node *np
struct clk *clk;
int err;
- tegra = kzalloc_objs(*tegra, 1, GFP_KERNEL);
+ tegra = kzalloc_objs(*tegra, 1);
if (!tegra)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/clk/tegra/clk-tegra20-emc.c b/drivers/clk/tegra/clk-tegra20-emc.c
index 20efe7827d27..44465726a8a6 100644
--- a/drivers/clk/tegra/clk-tegra20-emc.c
+++ b/drivers/clk/tegra/clk-tegra20-emc.c
@@ -249,7 +249,7 @@ struct clk *tegra20_clk_register_emc(void __iomem *ioaddr, bool low_jitter)
struct clk_init_data init;
struct clk *clk;
- emc = kzalloc_obj(*emc, GFP_KERNEL);
+ emc = kzalloc_obj(*emc);
if (!emc)
return NULL;
diff --git a/drivers/clk/tegra/clk-tegra210-emc.c b/drivers/clk/tegra/clk-tegra210-emc.c
index 9e88cd587183..9f140d94bef7 100644
--- a/drivers/clk/tegra/clk-tegra210-emc.c
+++ b/drivers/clk/tegra/clk-tegra210-emc.c
@@ -278,7 +278,7 @@ struct clk *tegra210_clk_register_emc(struct device_node *np,
struct clk_init_data init;
struct clk *clk;
- emc = kzalloc_obj(*emc, GFP_KERNEL);
+ emc = kzalloc_obj(*emc);
if (!emc)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/clk/tegra/clk-tegra210.c b/drivers/clk/tegra/clk-tegra210.c
index ad21a735723e..0c86cff719e3 100644
--- a/drivers/clk/tegra/clk-tegra210.c
+++ b/drivers/clk/tegra/clk-tegra210.c
@@ -3705,7 +3705,7 @@ static void tegra210_mbist_clk_init(void)
if (!num_clks)
continue;
- clk_data = kmalloc_objs(*clk_data, num_clks, GFP_KERNEL);
+ clk_data = kmalloc_objs(*clk_data, num_clks);
if (WARN_ON(!clk_data))
return;
diff --git a/drivers/clk/tegra/clk.c b/drivers/clk/tegra/clk.c
index 7f11d1795d79..e6c787261cb6 100644
--- a/drivers/clk/tegra/clk.c
+++ b/drivers/clk/tegra/clk.c
@@ -234,7 +234,7 @@ struct clk ** __init tegra_clk_init(void __iomem *regs, int num, int banks)
periph_banks = banks;
- clks = kzalloc_objs(struct clk *, num, GFP_KERNEL);
+ clks = kzalloc_objs(struct clk *, num);
if (!clks) {
kfree(periph_clk_enb_refcnt);
return NULL;
diff --git a/drivers/clk/ti/apll.c b/drivers/clk/ti/apll.c
index 5ec7cfd5e669..31bf097f8aba 100644
--- a/drivers/clk/ti/apll.c
+++ b/drivers/clk/ti/apll.c
@@ -183,9 +183,9 @@ static void __init of_dra7_apll_setup(struct device_node *node)
const char **parent_names = NULL;
int ret;
- ad = kzalloc_obj(*ad, GFP_KERNEL);
- clk_hw = kzalloc_obj(*clk_hw, GFP_KERNEL);
- init = kzalloc_obj(*init, GFP_KERNEL);
+ ad = kzalloc_obj(*ad);
+ clk_hw = kzalloc_obj(*clk_hw);
+ init = kzalloc_obj(*init);
if (!ad || !clk_hw || !init)
goto cleanup;
@@ -347,9 +347,9 @@ static void __init of_omap2_apll_setup(struct device_node *node)
u32 val;
int ret;
- ad = kzalloc_obj(*ad, GFP_KERNEL);
- clk_hw = kzalloc_obj(*clk_hw, GFP_KERNEL);
- init = kzalloc_obj(*init, GFP_KERNEL);
+ ad = kzalloc_obj(*ad);
+ clk_hw = kzalloc_obj(*clk_hw);
+ init = kzalloc_obj(*init);
if (!ad || !clk_hw || !init)
goto cleanup;
diff --git a/drivers/clk/ti/autoidle.c b/drivers/clk/ti/autoidle.c
index 62b136861f95..610f225a8295 100644
--- a/drivers/clk/ti/autoidle.c
+++ b/drivers/clk/ti/autoidle.c
@@ -191,7 +191,7 @@ int __init of_ti_clk_autoidle_setup(struct device_node *node)
if (of_property_read_u32(node, "ti,autoidle-shift", &shift))
return 0;
- clk = kzalloc_obj(*clk, GFP_KERNEL);
+ clk = kzalloc_obj(*clk);
if (!clk)
return -ENOMEM;
diff --git a/drivers/clk/ti/clk-dra7-atl.c b/drivers/clk/ti/clk-dra7-atl.c
index fd41aa9fbab1..fb41f55d44e7 100644
--- a/drivers/clk/ti/clk-dra7-atl.c
+++ b/drivers/clk/ti/clk-dra7-atl.c
@@ -170,7 +170,7 @@ static void __init of_dra7_atl_clock_setup(struct device_node *node)
const char *name;
struct clk *clk;
- clk_hw = kzalloc_obj(*clk_hw, GFP_KERNEL);
+ clk_hw = kzalloc_obj(*clk_hw);
if (!clk_hw) {
pr_err("%s: could not allocate dra7_atl_desc\n", __func__);
return;
diff --git a/drivers/clk/ti/clk.c b/drivers/clk/ti/clk.c
index 23ab4f380956..efdb6ab4a5be 100644
--- a/drivers/clk/ti/clk.c
+++ b/drivers/clk/ti/clk.c
@@ -268,7 +268,7 @@ int __init ti_clk_retry_init(struct device_node *node, void *user,
struct clk_init_item *retry;
pr_debug("%pOFn: adding to retry list...\n", node);
- retry = kzalloc_obj(*retry, GFP_KERNEL);
+ retry = kzalloc_obj(*retry);
if (!retry)
return -ENOMEM;
@@ -411,7 +411,7 @@ int __init omap2_clk_provider_init(struct device_node *parent, int index,
/* add clocks node info */
clocks_node_ptr[index] = clocks;
- io = kzalloc_obj(*io, GFP_KERNEL);
+ io = kzalloc_obj(*io);
if (!io)
return -ENOMEM;
@@ -576,7 +576,7 @@ int ti_clk_add_alias(struct clk *clk, const char *con)
if (IS_ERR(clk))
return PTR_ERR(clk);
- cl = kzalloc_obj(*cl, GFP_KERNEL);
+ cl = kzalloc_obj(*cl);
if (!cl)
return -ENOMEM;
diff --git a/drivers/clk/ti/clkctrl.c b/drivers/clk/ti/clkctrl.c
index 06a39d981733..f779906cc8ef 100644
--- a/drivers/clk/ti/clkctrl.c
+++ b/drivers/clk/ti/clkctrl.c
@@ -297,7 +297,7 @@ _ti_clkctrl_clk_register(struct omap_clkctrl_provider *provider,
ti_clk_get_features()->flags &
TI_CLK_CLKCTRL_COMPAT);
- clkctrl_clk = kzalloc_obj(*clkctrl_clk, GFP_KERNEL);
+ clkctrl_clk = kzalloc_obj(*clkctrl_clk);
if (!init.name || !clkctrl_clk) {
ret = -ENOMEM;
goto cleanup;
@@ -337,7 +337,7 @@ _ti_clkctrl_setup_gate(struct omap_clkctrl_provider *provider,
{
struct clk_hw_omap *clk_hw;
- clk_hw = kzalloc_obj(*clk_hw, GFP_KERNEL);
+ clk_hw = kzalloc_obj(*clk_hw);
if (!clk_hw)
return;
@@ -360,7 +360,7 @@ _ti_clkctrl_setup_mux(struct omap_clkctrl_provider *provider,
int num_parents = 0;
const char * const *pname;
- mux = kzalloc_obj(*mux, GFP_KERNEL);
+ mux = kzalloc_obj(*mux);
if (!mux)
return;
@@ -395,7 +395,7 @@ _ti_clkctrl_setup_div(struct omap_clkctrl_provider *provider,
const struct omap_clkctrl_div_data *div_data = data->data;
u8 div_flags = 0;
- div = kzalloc_obj(*div, GFP_KERNEL);
+ div = kzalloc_obj(*div);
if (!div)
return;
@@ -579,7 +579,7 @@ static void __init _ti_omap4_clkctrl_setup(struct device_node *node)
return;
}
- provider = kzalloc_obj(*provider, GFP_KERNEL);
+ provider = kzalloc_obj(*provider);
if (!provider)
return;
@@ -650,7 +650,7 @@ static void __init _ti_omap4_clkctrl_setup(struct device_node *node)
continue;
}
- hw = kzalloc_obj(*hw, GFP_KERNEL);
+ hw = kzalloc_obj(*hw);
if (!hw)
return;
@@ -683,7 +683,7 @@ static void __init _ti_omap4_clkctrl_setup(struct device_node *node)
if (!init.name)
goto cleanup;
- clkctrl_clk = kzalloc_obj(*clkctrl_clk, GFP_KERNEL);
+ clkctrl_clk = kzalloc_obj(*clkctrl_clk);
if (!clkctrl_clk)
goto cleanup;
diff --git a/drivers/clk/ti/composite.c b/drivers/clk/ti/composite.c
index 0403995cd8ac..c379bbdae25a 100644
--- a/drivers/clk/ti/composite.c
+++ b/drivers/clk/ti/composite.c
@@ -211,7 +211,7 @@ static void __init of_ti_composite_clk_setup(struct device_node *node)
return;
}
- cclk = kzalloc_obj(*cclk, GFP_KERNEL);
+ cclk = kzalloc_obj(*cclk);
if (!cclk)
return;
@@ -253,7 +253,7 @@ int __init ti_clk_add_component(struct device_node *node, struct clk_hw *hw,
of_clk_parent_fill(node, parent_names, num_parents);
- clk = kzalloc_obj(*clk, GFP_KERNEL);
+ clk = kzalloc_obj(*clk);
if (!clk) {
kfree(parent_names);
return -ENOMEM;
diff --git a/drivers/clk/ti/divider.c b/drivers/clk/ti/divider.c
index af2776f13413..af923b8cb0ed 100644
--- a/drivers/clk/ti/divider.c
+++ b/drivers/clk/ti/divider.c
@@ -357,7 +357,7 @@ int ti_clk_parse_divider_data(int *div_table, int num_dividers, int max_div,
num_dividers = i;
- tmp = kzalloc_objs(*tmp, valid_div + 1, GFP_KERNEL);
+ tmp = kzalloc_objs(*tmp, valid_div + 1);
if (!tmp)
return -ENOMEM;
@@ -413,7 +413,7 @@ static int __init ti_clk_get_div_table(struct device_node *node,
return -EINVAL;
}
- table = kzalloc_objs(*table, valid_div + 1, GFP_KERNEL);
+ table = kzalloc_objs(*table, valid_div + 1);
if (!table)
return -ENOMEM;
@@ -517,7 +517,7 @@ static void __init of_ti_divider_clk_setup(struct device_node *node)
u32 flags = 0;
struct clk_omap_divider *div;
- div = kzalloc_obj(*div, GFP_KERNEL);
+ div = kzalloc_obj(*div);
if (!div)
return;
@@ -542,7 +542,7 @@ static void __init of_ti_composite_divider_clk_setup(struct device_node *node)
struct clk_omap_divider *div;
u32 tmp;
- div = kzalloc_obj(*div, GFP_KERNEL);
+ div = kzalloc_obj(*div);
if (!div)
return;
diff --git a/drivers/clk/ti/dpll.c b/drivers/clk/ti/dpll.c
index bce9af95d7aa..e01272cd628d 100644
--- a/drivers/clk/ti/dpll.c
+++ b/drivers/clk/ti/dpll.c
@@ -222,7 +222,7 @@ static void _register_dpll_x2(struct device_node *node,
return;
}
- clk_hw = kzalloc_obj(*clk_hw, GFP_KERNEL);
+ clk_hw = kzalloc_obj(*clk_hw);
if (!clk_hw)
return;
@@ -281,8 +281,8 @@ static void __init of_ti_dpll_setup(struct device_node *node,
u32 min_div;
dd = kmemdup(ddt, sizeof(*dd), GFP_KERNEL);
- clk_hw = kzalloc_obj(*clk_hw, GFP_KERNEL);
- init = kzalloc_obj(*init, GFP_KERNEL);
+ clk_hw = kzalloc_obj(*clk_hw);
+ init = kzalloc_obj(*init);
if (!dd || !clk_hw || !init)
goto cleanup;
diff --git a/drivers/clk/ti/fapll.c b/drivers/clk/ti/fapll.c
index 22be4570b038..e54b1df3436e 100644
--- a/drivers/clk/ti/fapll.c
+++ b/drivers/clk/ti/fapll.c
@@ -499,7 +499,7 @@ static struct clk * __init ti_fapll_synth_setup(struct fapll_data *fd,
struct fapll_synth *synth;
struct clk *clk = ERR_PTR(-ENOMEM);
- init = kzalloc_obj(*init, GFP_KERNEL);
+ init = kzalloc_obj(*init);
if (!init)
return ERR_PTR(-ENOMEM);
@@ -508,7 +508,7 @@ static struct clk * __init ti_fapll_synth_setup(struct fapll_data *fd,
init->parent_names = &parent;
init->num_parents = 1;
- synth = kzalloc_obj(*synth, GFP_KERNEL);
+ synth = kzalloc_obj(*synth);
if (!synth)
goto free;
@@ -544,7 +544,7 @@ static void __init ti_fapll_setup(struct device_node *node)
const char *name;
int i;
- fd = kzalloc_obj(*fd, GFP_KERNEL);
+ fd = kzalloc_obj(*fd);
if (!fd)
return;
@@ -554,7 +554,7 @@ static void __init ti_fapll_setup(struct device_node *node)
if (!fd->outputs.clks)
goto free;
- init = kzalloc_obj(*init, GFP_KERNEL);
+ init = kzalloc_obj(*init);
if (!init)
goto free;
diff --git a/drivers/clk/ti/gate.c b/drivers/clk/ti/gate.c
index 73986d78492a..74741227013b 100644
--- a/drivers/clk/ti/gate.c
+++ b/drivers/clk/ti/gate.c
@@ -95,7 +95,7 @@ static struct clk *_register_gate(struct device_node *node, const char *name,
struct clk_hw_omap *clk_hw;
struct clk *clk;
- clk_hw = kzalloc_obj(*clk_hw, GFP_KERNEL);
+ clk_hw = kzalloc_obj(*clk_hw);
if (!clk_hw)
return ERR_PTR(-ENOMEM);
@@ -169,7 +169,7 @@ _of_ti_composite_gate_clk_setup(struct device_node *node,
{
struct clk_hw_omap *gate;
- gate = kzalloc_obj(*gate, GFP_KERNEL);
+ gate = kzalloc_obj(*gate);
if (!gate)
return;
diff --git a/drivers/clk/ti/interface.c b/drivers/clk/ti/interface.c
index 999e230d7414..039c8075eca4 100644
--- a/drivers/clk/ti/interface.c
+++ b/drivers/clk/ti/interface.c
@@ -34,7 +34,7 @@ static struct clk *_register_interface(struct device_node *node,
struct clk_hw_omap *clk_hw;
struct clk *clk;
- clk_hw = kzalloc_obj(*clk_hw, GFP_KERNEL);
+ clk_hw = kzalloc_obj(*clk_hw);
if (!clk_hw)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/clk/ti/mux.c b/drivers/clk/ti/mux.c
index 3911e43a6716..d6a0ccfd81db 100644
--- a/drivers/clk/ti/mux.c
+++ b/drivers/clk/ti/mux.c
@@ -129,7 +129,7 @@ static struct clk *_register_mux(struct device_node *node, const char *name,
struct clk_init_data init;
/* allocate the mux */
- mux = kzalloc_obj(*mux, GFP_KERNEL);
+ mux = kzalloc_obj(*mux);
if (!mux)
return ERR_PTR(-ENOMEM);
@@ -227,7 +227,7 @@ struct clk_hw *ti_clk_build_component_mux(struct ti_clk_mux *setup)
if (!setup)
return NULL;
- mux = kzalloc_obj(*mux, GFP_KERNEL);
+ mux = kzalloc_obj(*mux);
if (!mux)
return ERR_PTR(-ENOMEM);
@@ -253,7 +253,7 @@ static void __init of_ti_composite_mux_clk_setup(struct device_node *node)
struct clk_omap_mux *mux;
unsigned int num_parents;
- mux = kzalloc_obj(*mux, GFP_KERNEL);
+ mux = kzalloc_obj(*mux);
if (!mux)
return;
diff --git a/drivers/clk/ux500/clk-prcc.c b/drivers/clk/ux500/clk-prcc.c
index 5639474557fe..dce235df2576 100644
--- a/drivers/clk/ux500/clk-prcc.c
+++ b/drivers/clk/ux500/clk-prcc.c
@@ -106,7 +106,7 @@ static struct clk *clk_reg_prcc(const char *name,
return ERR_PTR(-EINVAL);
}
- clk = kzalloc_obj(*clk, GFP_KERNEL);
+ clk = kzalloc_obj(*clk);
if (!clk)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/clk/ux500/clk-prcmu.c b/drivers/clk/ux500/clk-prcmu.c
index 95efbc4f84a7..ddc86551bf57 100644
--- a/drivers/clk/ux500/clk-prcmu.c
+++ b/drivers/clk/ux500/clk-prcmu.c
@@ -209,7 +209,7 @@ static struct clk_hw *clk_reg_prcmu(const char *name,
return ERR_PTR(-EINVAL);
}
- clk = kzalloc_obj(*clk, GFP_KERNEL);
+ clk = kzalloc_obj(*clk);
if (!clk)
return ERR_PTR(-ENOMEM);
@@ -376,7 +376,7 @@ struct clk_hw *clk_reg_prcmu_clkout(const char *name,
return ERR_PTR(-EINVAL);
}
- clk = kzalloc_obj(*clk, GFP_KERNEL);
+ clk = kzalloc_obj(*clk);
if (!clk)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/clk/ux500/u8500_of_clk.c b/drivers/clk/ux500/u8500_of_clk.c
index 42c1df2382ee..6f78808387b1 100644
--- a/drivers/clk/ux500/u8500_of_clk.c
+++ b/drivers/clk/ux500/u8500_of_clk.c
@@ -137,7 +137,7 @@ static void u8500_clk_init(struct device_node *np)
* base addresses properly and pass to the reset controller init
* function later on.
*/
- rstc = kzalloc_obj(*rstc, GFP_KERNEL);
+ rstc = kzalloc_obj(*rstc);
if (!rstc)
return;
diff --git a/drivers/clk/versatile/clk-icst.c b/drivers/clk/versatile/clk-icst.c
index d95d66cd5b6a..6bd3db54dd22 100644
--- a/drivers/clk/versatile/clk-icst.c
+++ b/drivers/clk/versatile/clk-icst.c
@@ -363,7 +363,7 @@ struct clk *icst_clk_setup(struct device *dev,
struct clk_init_data init;
struct icst_params *pclone;
- icst = kzalloc_obj(*icst, GFP_KERNEL);
+ icst = kzalloc_obj(*icst);
if (!icst)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/clk/versatile/clk-sp810.c b/drivers/clk/versatile/clk-sp810.c
index 5f83760b68d4..b0e69686f7a9 100644
--- a/drivers/clk/versatile/clk-sp810.c
+++ b/drivers/clk/versatile/clk-sp810.c
@@ -82,7 +82,7 @@ static struct clk *clk_sp810_timerclken_of_get(struct of_phandle_args *clkspec,
static void __init clk_sp810_of_setup(struct device_node *node)
{
- struct clk_sp810 *sp810 = kzalloc_obj(*sp810, GFP_KERNEL);
+ struct clk_sp810 *sp810 = kzalloc_obj(*sp810);
const char *parent_names[2];
int num = ARRAY_SIZE(parent_names);
char name[12];
diff --git a/drivers/clk/visconti/pll.c b/drivers/clk/visconti/pll.c
index 7494a24134de..fadf81ff932f 100644
--- a/drivers/clk/visconti/pll.c
+++ b/drivers/clk/visconti/pll.c
@@ -255,7 +255,7 @@ static struct clk_hw *visconti_register_pll(struct visconti_pll_provider *ctx,
size_t len;
int ret;
- pll = kzalloc_obj(*pll, GFP_KERNEL);
+ pll = kzalloc_obj(*pll);
if (!pll)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/clk/zynq/clkc.c b/drivers/clk/zynq/clkc.c
index 4a5f2b6267c0..6a22cbbc1235 100644
--- a/drivers/clk/zynq/clkc.c
+++ b/drivers/clk/zynq/clkc.c
@@ -112,10 +112,10 @@ static void __init zynq_clk_register_fclk(enum zynq_clk fclk,
spinlock_t *fclk_gate_lock;
void __iomem *fclk_gate_reg = fclk_ctrl_reg + 8;
- fclk_lock = kmalloc_obj(*fclk_lock, GFP_KERNEL);
+ fclk_lock = kmalloc_obj(*fclk_lock);
if (!fclk_lock)
goto err;
- fclk_gate_lock = kmalloc_obj(*fclk_gate_lock, GFP_KERNEL);
+ fclk_gate_lock = kmalloc_obj(*fclk_gate_lock);
if (!fclk_gate_lock)
goto err_fclk_gate_lock;
spin_lock_init(fclk_lock);
@@ -180,7 +180,7 @@ static void __init zynq_clk_register_periph_clk(enum zynq_clk clk0,
char *div_name;
spinlock_t *lock;
- lock = kmalloc_obj(*lock, GFP_KERNEL);
+ lock = kmalloc_obj(*lock);
if (!lock)
goto err;
spin_lock_init(lock);
diff --git a/drivers/clk/zynq/pll.c b/drivers/clk/zynq/pll.c
index 0c411ad86575..44c609378364 100644
--- a/drivers/clk/zynq/pll.c
+++ b/drivers/clk/zynq/pll.c
@@ -200,7 +200,7 @@ struct clk *clk_register_zynq_pll(const char *name, const char *parent,
.flags = 0
};
- pll = kmalloc_obj(*pll, GFP_KERNEL);
+ pll = kmalloc_obj(*pll);
if (!pll)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/clk/zynqmp/clk-gate-zynqmp.c b/drivers/clk/zynqmp/clk-gate-zynqmp.c
index 2e36f14d0a52..db10eb69f3fe 100644
--- a/drivers/clk/zynqmp/clk-gate-zynqmp.c
+++ b/drivers/clk/zynqmp/clk-gate-zynqmp.c
@@ -115,7 +115,7 @@ struct clk_hw *zynqmp_clk_register_gate(const char *name, u32 clk_id,
struct clk_init_data init;
/* allocate the gate */
- gate = kzalloc_obj(*gate, GFP_KERNEL);
+ gate = kzalloc_obj(*gate);
if (!gate)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/clk/zynqmp/clk-mux-zynqmp.c b/drivers/clk/zynqmp/clk-mux-zynqmp.c
index f8d67adfd258..e37bd3516974 100644
--- a/drivers/clk/zynqmp/clk-mux-zynqmp.c
+++ b/drivers/clk/zynqmp/clk-mux-zynqmp.c
@@ -138,7 +138,7 @@ struct clk_hw *zynqmp_clk_register_mux(const char *name, u32 clk_id,
struct clk_init_data init;
int ret;
- mux = kzalloc_obj(*mux, GFP_KERNEL);
+ mux = kzalloc_obj(*mux);
if (!mux)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/clk/zynqmp/clkc.c b/drivers/clk/zynqmp/clkc.c
index c71401b3aa1f..3911700d4ca7 100644
--- a/drivers/clk/zynqmp/clkc.c
+++ b/drivers/clk/zynqmp/clkc.c
@@ -763,7 +763,7 @@ static int zynqmp_clk_setup(struct device_node *np)
if (!zynqmp_data)
return -ENOMEM;
- clock = kzalloc_objs(*clock, clock_max_idx, GFP_KERNEL);
+ clock = kzalloc_objs(*clock, clock_max_idx);
if (!clock) {
kfree(zynqmp_data);
return -ENOMEM;
diff --git a/drivers/clk/zynqmp/divider.c b/drivers/clk/zynqmp/divider.c
index 3c147ba7dbcc..4075f6ecf076 100644
--- a/drivers/clk/zynqmp/divider.c
+++ b/drivers/clk/zynqmp/divider.c
@@ -284,7 +284,7 @@ struct clk_hw *zynqmp_clk_register_divider(const char *name,
int ret;
/* allocate the divider */
- div = kzalloc_obj(*div, GFP_KERNEL);
+ div = kzalloc_obj(*div);
if (!div)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/clk/zynqmp/pll.c b/drivers/clk/zynqmp/pll.c
index 1cd5e0493e98..6463787cf57b 100644
--- a/drivers/clk/zynqmp/pll.c
+++ b/drivers/clk/zynqmp/pll.c
@@ -326,7 +326,7 @@ struct clk_hw *zynqmp_clk_register_pll(const char *name, u32 clk_id,
init.parent_names = parents;
init.num_parents = 1;
- pll = kzalloc_obj(*pll, GFP_KERNEL);
+ pll = kzalloc_obj(*pll);
if (!pll)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/clocksource/bcm2835_timer.c b/drivers/clocksource/bcm2835_timer.c
index ff0e21edd9c1..d7662301bf0e 100644
--- a/drivers/clocksource/bcm2835_timer.c
+++ b/drivers/clocksource/bcm2835_timer.c
@@ -98,7 +98,7 @@ static int __init bcm2835_timer_init(struct device_node *node)
goto err_iounmap;
}
- timer = kzalloc_obj(*timer, GFP_KERNEL);
+ timer = kzalloc_obj(*timer);
if (!timer) {
ret = -ENOMEM;
goto err_iounmap;
diff --git a/drivers/clocksource/clps711x-timer.c b/drivers/clocksource/clps711x-timer.c
index 75c17eeef689..bb0a44adaf28 100644
--- a/drivers/clocksource/clps711x-timer.c
+++ b/drivers/clocksource/clps711x-timer.c
@@ -54,7 +54,7 @@ static int __init _clps711x_clkevt_init(struct clk *clock, void __iomem *base,
struct clock_event_device *clkevt;
unsigned long rate;
- clkevt = kzalloc_obj(*clkevt, GFP_KERNEL);
+ clkevt = kzalloc_obj(*clkevt);
if (!clkevt)
return -ENOMEM;
diff --git a/drivers/clocksource/dw_apb_timer.c b/drivers/clocksource/dw_apb_timer.c
index 043793728e23..b719b2483e87 100644
--- a/drivers/clocksource/dw_apb_timer.c
+++ b/drivers/clocksource/dw_apb_timer.c
@@ -340,7 +340,7 @@ struct dw_apb_clocksource *
dw_apb_clocksource_init(unsigned rating, const char *name, void __iomem *base,
unsigned long freq)
{
- struct dw_apb_clocksource *dw_cs = kzalloc_obj(*dw_cs, GFP_KERNEL);
+ struct dw_apb_clocksource *dw_cs = kzalloc_obj(*dw_cs);
if (!dw_cs)
return NULL;
diff --git a/drivers/clocksource/ingenic-sysost.c b/drivers/clocksource/ingenic-sysost.c
index 22caa69197a2..d967972c1fdc 100644
--- a/drivers/clocksource/ingenic-sysost.c
+++ b/drivers/clocksource/ingenic-sysost.c
@@ -279,7 +279,7 @@ static int __init ingenic_ost_register_clock(struct ingenic_ost *ost,
struct ingenic_ost_clk *ost_clk;
int val, err;
- ost_clk = kzalloc_obj(*ost_clk, GFP_KERNEL);
+ ost_clk = kzalloc_obj(*ost_clk);
if (!ost_clk)
return -ENOMEM;
@@ -432,7 +432,7 @@ static int __init ingenic_ost_probe(struct device_node *np)
unsigned int i;
int ret;
- ost = kzalloc_obj(*ost, GFP_KERNEL);
+ ost = kzalloc_obj(*ost);
if (!ost)
return -ENOMEM;
diff --git a/drivers/clocksource/mmio.c b/drivers/clocksource/mmio.c
index 286513486542..cd5fbf49ac29 100644
--- a/drivers/clocksource/mmio.c
+++ b/drivers/clocksource/mmio.c
@@ -55,7 +55,7 @@ int __init clocksource_mmio_init(void __iomem *base, const char *name,
if (bits > 64 || bits < 16)
return -EINVAL;
- cs = kzalloc_obj(struct clocksource_mmio, GFP_KERNEL);
+ cs = kzalloc_obj(struct clocksource_mmio);
if (!cs)
return -ENOMEM;
diff --git a/drivers/clocksource/mps2-timer.c b/drivers/clocksource/mps2-timer.c
index 53c484d29195..ebca55d8cfed 100644
--- a/drivers/clocksource/mps2-timer.c
+++ b/drivers/clocksource/mps2-timer.c
@@ -136,7 +136,7 @@ static int __init mps2_clockevent_init(struct device_node *np)
goto out_iounmap;
}
- ce = kzalloc_obj(*ce, GFP_KERNEL);
+ ce = kzalloc_obj(*ce);
if (!ce) {
ret = -ENOMEM;
goto out_iounmap;
diff --git a/drivers/clocksource/renesas-ostm.c b/drivers/clocksource/renesas-ostm.c
index 36132692bae5..9404ccb1bda9 100644
--- a/drivers/clocksource/renesas-ostm.c
+++ b/drivers/clocksource/renesas-ostm.c
@@ -165,7 +165,7 @@ static int __init ostm_init(struct device_node *np)
struct timer_of *to;
int ret;
- to = kzalloc_obj(*to, GFP_KERNEL);
+ to = kzalloc_obj(*to);
if (!to)
return -ENOMEM;
diff --git a/drivers/clocksource/sh_cmt.c b/drivers/clocksource/sh_cmt.c
index fd8cdabef9bc..66d00514600a 100644
--- a/drivers/clocksource/sh_cmt.c
+++ b/drivers/clocksource/sh_cmt.c
@@ -1139,7 +1139,7 @@ static int sh_cmt_probe(struct platform_device *pdev)
goto out;
}
- cmt = kzalloc_obj(*cmt, GFP_KERNEL);
+ cmt = kzalloc_obj(*cmt);
if (cmt == NULL)
return -ENOMEM;
diff --git a/drivers/clocksource/sh_mtu2.c b/drivers/clocksource/sh_mtu2.c
index 333548989ed5..eb9ecc9fd840 100644
--- a/drivers/clocksource/sh_mtu2.c
+++ b/drivers/clocksource/sh_mtu2.c
@@ -462,7 +462,7 @@ static int sh_mtu2_probe(struct platform_device *pdev)
goto out;
}
- mtu = kzalloc_obj(*mtu, GFP_KERNEL);
+ mtu = kzalloc_obj(*mtu);
if (mtu == NULL)
return -ENOMEM;
diff --git a/drivers/clocksource/sh_tmu.c b/drivers/clocksource/sh_tmu.c
index 365739e1fbad..ba2074536a82 100644
--- a/drivers/clocksource/sh_tmu.c
+++ b/drivers/clocksource/sh_tmu.c
@@ -593,7 +593,7 @@ static int sh_tmu_probe(struct platform_device *pdev)
goto out;
}
- tmu = kzalloc_obj(*tmu, GFP_KERNEL);
+ tmu = kzalloc_obj(*tmu);
if (tmu == NULL)
return -ENOMEM;
diff --git a/drivers/clocksource/timer-atmel-pit.c b/drivers/clocksource/timer-atmel-pit.c
index 253c3e4d0296..888b06731e54 100644
--- a/drivers/clocksource/timer-atmel-pit.c
+++ b/drivers/clocksource/timer-atmel-pit.c
@@ -170,7 +170,7 @@ static int __init at91sam926x_pit_dt_init(struct device_node *node)
int ret;
struct pit_data *data;
- data = kzalloc_obj(*data, GFP_KERNEL);
+ data = kzalloc_obj(*data);
if (!data)
return -ENOMEM;
diff --git a/drivers/clocksource/timer-cadence-ttc.c b/drivers/clocksource/timer-cadence-ttc.c
index 836141e51118..3c50d6892849 100644
--- a/drivers/clocksource/timer-cadence-ttc.c
+++ b/drivers/clocksource/timer-cadence-ttc.c
@@ -334,7 +334,7 @@ static int __init ttc_setup_clocksource(struct clk *clk, void __iomem *base,
struct ttc_timer_clocksource *ttccs;
int err;
- ttccs = kzalloc_obj(*ttccs, GFP_KERNEL);
+ ttccs = kzalloc_obj(*ttccs);
if (!ttccs)
return -ENOMEM;
@@ -417,7 +417,7 @@ static int __init ttc_setup_clockevent(struct clk *clk,
struct ttc_timer_clockevent *ttcce;
int err;
- ttcce = kzalloc_obj(*ttcce, GFP_KERNEL);
+ ttcce = kzalloc_obj(*ttcce);
if (!ttcce)
return -ENOMEM;
diff --git a/drivers/clocksource/timer-davinci.c b/drivers/clocksource/timer-davinci.c
index 9bf1728a87dc..16ee0687ef31 100644
--- a/drivers/clocksource/timer-davinci.c
+++ b/drivers/clocksource/timer-davinci.c
@@ -271,7 +271,7 @@ int __init davinci_timer_register(struct clk *clk,
davinci_timer_init(base);
tick_rate = clk_get_rate(clk);
- clockevent = kzalloc_obj(*clockevent, GFP_KERNEL);
+ clockevent = kzalloc_obj(*clockevent);
if (!clockevent) {
rv = -ENOMEM;
goto exit_iounmap_base;
diff --git a/drivers/clocksource/timer-ep93xx.c b/drivers/clocksource/timer-ep93xx.c
index 04eeda15d997..1b719282c07f 100644
--- a/drivers/clocksource/timer-ep93xx.c
+++ b/drivers/clocksource/timer-ep93xx.c
@@ -141,7 +141,7 @@ static int __init ep93xx_timer_of_init(struct device_node *np)
struct ep93xx_tcu *tcu;
int ret;
- tcu = kzalloc_obj(*tcu, GFP_KERNEL);
+ tcu = kzalloc_obj(*tcu);
if (!tcu)
return -ENOMEM;
diff --git a/drivers/clocksource/timer-fsl-ftm.c b/drivers/clocksource/timer-fsl-ftm.c
index df82307e690c..4eed6cb46132 100644
--- a/drivers/clocksource/timer-fsl-ftm.c
+++ b/drivers/clocksource/timer-fsl-ftm.c
@@ -300,7 +300,7 @@ static int __init ftm_timer_init(struct device_node *np)
unsigned long freq;
int ret, irq;
- priv = kzalloc_obj(*priv, GFP_KERNEL);
+ priv = kzalloc_obj(*priv);
if (!priv)
return -ENOMEM;
diff --git a/drivers/clocksource/timer-fttmr010.c b/drivers/clocksource/timer-fttmr010.c
index e0f7d5976518..308f94bfbaed 100644
--- a/drivers/clocksource/timer-fttmr010.c
+++ b/drivers/clocksource/timer-fttmr010.c
@@ -295,7 +295,7 @@ static int __init fttmr010_common_init(struct device_node *np,
return ret;
}
- fttmr010 = kzalloc_obj(*fttmr010, GFP_KERNEL);
+ fttmr010 = kzalloc_obj(*fttmr010);
if (!fttmr010) {
ret = -ENOMEM;
goto out_disable_clock;
diff --git a/drivers/clocksource/timer-goldfish.c b/drivers/clocksource/timer-goldfish.c
index 60982561e8b6..3fe12c7ee7b7 100644
--- a/drivers/clocksource/timer-goldfish.c
+++ b/drivers/clocksource/timer-goldfish.c
@@ -102,7 +102,7 @@ int __init goldfish_timer_init(int irq, void __iomem *base)
struct goldfish_timer *timerdrv;
int ret;
- timerdrv = kzalloc_obj(*timerdrv, GFP_KERNEL);
+ timerdrv = kzalloc_obj(*timerdrv);
if (!timerdrv)
return -ENOMEM;
diff --git a/drivers/clocksource/timer-gxp.c b/drivers/clocksource/timer-gxp.c
index 7442e9bdd0d5..1becc943339d 100644
--- a/drivers/clocksource/timer-gxp.c
+++ b/drivers/clocksource/timer-gxp.c
@@ -76,7 +76,7 @@ static int __init gxp_timer_init(struct device_node *node)
u32 freq;
int ret, irq;
- gxp_timer = kzalloc_obj(*gxp_timer, GFP_KERNEL);
+ gxp_timer = kzalloc_obj(*gxp_timer);
if (!gxp_timer) {
ret = -ENOMEM;
pr_err("Can't allocate gxp_timer");
diff --git a/drivers/clocksource/timer-imx-gpt.c b/drivers/clocksource/timer-imx-gpt.c
index ad310be44cb6..8335bd7f8c6c 100644
--- a/drivers/clocksource/timer-imx-gpt.c
+++ b/drivers/clocksource/timer-imx-gpt.c
@@ -428,7 +428,7 @@ static int __init mxc_timer_init_dt(struct device_node *np, enum imx_gpt_type t
if (initialized)
return 0;
- imxtm = kzalloc_obj(*imxtm, GFP_KERNEL);
+ imxtm = kzalloc_obj(*imxtm);
if (!imxtm)
return -ENOMEM;
diff --git a/drivers/clocksource/timer-imx-sysctr.c b/drivers/clocksource/timer-imx-sysctr.c
index 5eb3b3c6d0ad..dfbd77950e02 100644
--- a/drivers/clocksource/timer-imx-sysctr.c
+++ b/drivers/clocksource/timer-imx-sysctr.c
@@ -139,7 +139,7 @@ static int __init __sysctr_timer_init(struct device_node *np)
void __iomem *base;
int ret;
- priv = kzalloc_obj(struct sysctr_private, GFP_KERNEL);
+ priv = kzalloc_obj(struct sysctr_private);
if (!priv)
return -ENOMEM;
diff --git a/drivers/clocksource/timer-ixp4xx.c b/drivers/clocksource/timer-ixp4xx.c
index 42f679b1165b..4238a004fdef 100644
--- a/drivers/clocksource/timer-ixp4xx.c
+++ b/drivers/clocksource/timer-ixp4xx.c
@@ -166,7 +166,7 @@ static __init int ixp4xx_timer_register(void __iomem *base,
struct ixp4xx_timer *tmr;
int ret;
- tmr = kzalloc_obj(*tmr, GFP_KERNEL);
+ tmr = kzalloc_obj(*tmr);
if (!tmr)
return -ENOMEM;
tmr->base = base;
diff --git a/drivers/clocksource/timer-microchip-pit64b.c b/drivers/clocksource/timer-microchip-pit64b.c
index d54a1c91781f..7439bff42233 100644
--- a/drivers/clocksource/timer-microchip-pit64b.c
+++ b/drivers/clocksource/timer-microchip-pit64b.c
@@ -350,7 +350,7 @@ static int __init mchp_pit64b_init_clksrc(struct mchp_pit64b_timer *timer,
struct mchp_pit64b_clksrc *cs;
int ret;
- cs = kzalloc_obj(*cs, GFP_KERNEL);
+ cs = kzalloc_obj(*cs);
if (!cs)
return -ENOMEM;
@@ -397,7 +397,7 @@ static int __init mchp_pit64b_init_clkevt(struct mchp_pit64b_timer *timer,
struct mchp_pit64b_clkevt *ce;
int ret;
- ce = kzalloc_obj(*ce, GFP_KERNEL);
+ ce = kzalloc_obj(*ce);
if (!ce)
return -ENOMEM;
diff --git a/drivers/clocksource/timer-msc313e.c b/drivers/clocksource/timer-msc313e.c
index 33822f0bc339..e4b9e3f161bb 100644
--- a/drivers/clocksource/timer-msc313e.c
+++ b/drivers/clocksource/timer-msc313e.c
@@ -171,7 +171,7 @@ static int __init msc313e_clkevt_init(struct device_node *np)
int ret;
struct timer_of *to;
- to = kzalloc_obj(*to, GFP_KERNEL);
+ to = kzalloc_obj(*to);
if (!to)
return -ENOMEM;
diff --git a/drivers/clocksource/timer-nxp-pit.c b/drivers/clocksource/timer-nxp-pit.c
index 9109dedab08c..bc5157e2ba57 100644
--- a/drivers/clocksource/timer-nxp-pit.c
+++ b/drivers/clocksource/timer-nxp-pit.c
@@ -276,7 +276,7 @@ static int pit_timer_init(struct device_node *np)
unsigned long clk_rate;
int irq, ret;
- pit = kzalloc_obj(*pit, GFP_KERNEL);
+ pit = kzalloc_obj(*pit);
if (!pit)
return -ENOMEM;
diff --git a/drivers/clocksource/timer-rockchip.c b/drivers/clocksource/timer-rockchip.c
index c866127ee1e5..540a16667145 100644
--- a/drivers/clocksource/timer-rockchip.c
+++ b/drivers/clocksource/timer-rockchip.c
@@ -207,7 +207,7 @@ static int __init rk_clkevt_init(struct device_node *np)
struct clock_event_device *ce;
int ret = -EINVAL;
- rk_clkevt = kzalloc_obj(struct rk_clkevt, GFP_KERNEL);
+ rk_clkevt = kzalloc_obj(struct rk_clkevt);
if (!rk_clkevt) {
ret = -ENOMEM;
goto out;
@@ -254,7 +254,7 @@ static int __init rk_clksrc_init(struct device_node *np)
{
int ret = -EINVAL;
- rk_clksrc = kzalloc_obj(struct rk_timer, GFP_KERNEL);
+ rk_clksrc = kzalloc_obj(struct rk_timer);
if (!rk_clksrc) {
ret = -ENOMEM;
goto out;
diff --git a/drivers/clocksource/timer-stm32.c b/drivers/clocksource/timer-stm32.c
index 4a0f06a419d7..fee65914f99a 100644
--- a/drivers/clocksource/timer-stm32.c
+++ b/drivers/clocksource/timer-stm32.c
@@ -291,7 +291,7 @@ static int __init stm32_timer_init(struct device_node *node)
struct timer_of *to;
int ret;
- to = kzalloc_obj(*to, GFP_KERNEL);
+ to = kzalloc_obj(*to);
if (!to)
return -ENOMEM;
@@ -302,7 +302,7 @@ static int __init stm32_timer_init(struct device_node *node)
if (ret)
goto err;
- to->private_data = kzalloc_obj(struct stm32_timer_private, GFP_KERNEL);
+ to->private_data = kzalloc_obj(struct stm32_timer_private);
if (!to->private_data) {
ret = -ENOMEM;
goto deinit;
diff --git a/drivers/clocksource/timer-ti-dm-systimer.c b/drivers/clocksource/timer-ti-dm-systimer.c
index 3bffd7198a38..eb0dfe4b9b7c 100644
--- a/drivers/clocksource/timer-ti-dm-systimer.c
+++ b/drivers/clocksource/timer-ti-dm-systimer.c
@@ -600,7 +600,7 @@ static int __init dmtimer_clockevent_init(struct device_node *np)
struct dmtimer_clockevent *clkevt;
int error;
- clkevt = kzalloc_obj(*clkevt, GFP_KERNEL);
+ clkevt = kzalloc_obj(*clkevt);
if (!clkevt)
return -ENOMEM;
@@ -757,7 +757,7 @@ static int __init dmtimer_clocksource_init(struct device_node *np)
struct clocksource *dev;
int error;
- clksrc = kzalloc_obj(*clksrc, GFP_KERNEL);
+ clksrc = kzalloc_obj(*clksrc);
if (!clksrc)
return -ENOMEM;
diff --git a/drivers/clocksource/timer-zevio.c b/drivers/clocksource/timer-zevio.c
index db1ba9b2c2c9..9a67b84b3e4c 100644
--- a/drivers/clocksource/timer-zevio.c
+++ b/drivers/clocksource/timer-zevio.c
@@ -119,7 +119,7 @@ static int __init zevio_timer_add(struct device_node *node)
struct resource res;
int irqnr, ret;
- timer = kzalloc_obj(*timer, GFP_KERNEL);
+ timer = kzalloc_obj(*timer);
if (!timer)
return -ENOMEM;
diff --git a/drivers/comedi/comedi_buf.c b/drivers/comedi/comedi_buf.c
index 7215d4b9152b..ed372619bf54 100644
--- a/drivers/comedi/comedi_buf.c
+++ b/drivers/comedi/comedi_buf.c
@@ -70,7 +70,7 @@ comedi_buf_map_alloc(struct comedi_device *dev, enum dma_data_direction dma_dir,
struct comedi_buf_page *buf;
unsigned int i;
- bm = kzalloc_obj(*bm, GFP_KERNEL);
+ bm = kzalloc_obj(*bm);
if (!bm)
return NULL;
diff --git a/drivers/comedi/comedi_fops.c b/drivers/comedi/comedi_fops.c
index 627680057812..48a8a607a84c 100644
--- a/drivers/comedi/comedi_fops.c
+++ b/drivers/comedi/comedi_fops.c
@@ -1058,7 +1058,7 @@ static int do_subdinfo_ioctl(struct comedi_device *dev,
struct comedi_subdevice *s;
lockdep_assert_held(&dev->mutex);
- tmp = kzalloc_objs(*tmp, dev->n_subdevices, GFP_KERNEL);
+ tmp = kzalloc_objs(*tmp, dev->n_subdevices);
if (!tmp)
return -ENOMEM;
@@ -2969,7 +2969,7 @@ static int comedi_open(struct inode *inode, struct file *file)
return -ENODEV;
}
- cfp = kzalloc_obj(*cfp, GFP_KERNEL);
+ cfp = kzalloc_obj(*cfp);
if (!cfp) {
comedi_dev_put(dev);
return -ENOMEM;
@@ -3322,7 +3322,7 @@ static int compat_insnlist(struct file *file, unsigned long arg)
rc = check_insnlist_len(dev, insnlist32.n_insns);
if (rc)
return rc;
- insns = kzalloc_objs(*insns, insnlist32.n_insns, GFP_KERNEL);
+ insns = kzalloc_objs(*insns, insnlist32.n_insns);
if (!insns)
return -ENOMEM;
@@ -3505,7 +3505,7 @@ struct comedi_device *comedi_alloc_board_minor(struct device *hardware_device)
struct device *csdev;
unsigned int i;
- dev = kzalloc_obj(*dev, GFP_KERNEL);
+ dev = kzalloc_obj(*dev);
if (!dev)
return ERR_PTR(-ENOMEM);
comedi_device_init(dev);
diff --git a/drivers/comedi/drivers.c b/drivers/comedi/drivers.c
index b0e39a04f0b3..db225a3bf012 100644
--- a/drivers/comedi/drivers.c
+++ b/drivers/comedi/drivers.c
@@ -101,7 +101,7 @@ int comedi_alloc_subdevices(struct comedi_device *dev, int num_subdevices)
if (num_subdevices < 1)
return -EINVAL;
- s = kzalloc_objs(*s, num_subdevices, GFP_KERNEL);
+ s = kzalloc_objs(*s, num_subdevices);
if (!s)
return -ENOMEM;
dev->subdevices = s;
@@ -733,7 +733,7 @@ static int __comedi_device_postconfig_async(struct comedi_device *dev,
dev_warn(dev->class_dev,
"async subdevices should have a cancel() function\n");
- async = kzalloc_obj(*async, GFP_KERNEL);
+ async = kzalloc_obj(*async);
if (!async)
return -ENOMEM;
diff --git a/drivers/comedi/drivers/addi_apci_2032.c b/drivers/comedi/drivers/addi_apci_2032.c
index b81837cd4ad5..d0f52d5ece8f 100644
--- a/drivers/comedi/drivers/addi_apci_2032.c
+++ b/drivers/comedi/drivers/addi_apci_2032.c
@@ -274,7 +274,7 @@ static int apci2032_auto_attach(struct comedi_device *dev,
struct apci2032_int_private *subpriv;
dev->read_subdev = s;
- subpriv = kzalloc_obj(*subpriv, GFP_KERNEL);
+ subpriv = kzalloc_obj(*subpriv);
if (!subpriv)
return -ENOMEM;
spin_lock_init(&subpriv->spinlock);
diff --git a/drivers/comedi/drivers/comedi_8254.c b/drivers/comedi/drivers/comedi_8254.c
index a748b452d76d..a297dd650dab 100644
--- a/drivers/comedi/drivers/comedi_8254.c
+++ b/drivers/comedi/drivers/comedi_8254.c
@@ -633,7 +633,7 @@ static struct comedi_8254 *__i8254_init(comedi_8254_iocb_fn *iocb,
if (!iocb)
return ERR_PTR(-EINVAL);
- i8254 = kzalloc_obj(*i8254, GFP_KERNEL);
+ i8254 = kzalloc_obj(*i8254);
if (!i8254)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/comedi/drivers/comedi_bond.c b/drivers/comedi/drivers/comedi_bond.c
index 1b530c819fc0..8e10ecab4f0d 100644
--- a/drivers/comedi/drivers/comedi_bond.c
+++ b/drivers/comedi/drivers/comedi_bond.c
@@ -223,7 +223,7 @@ static int do_dev_config(struct comedi_device *dev, struct comedi_devconfig *it)
nchans, minor, sdev);
return -EINVAL;
}
- bdev = kmalloc_obj(*bdev, GFP_KERNEL);
+ bdev = kmalloc_obj(*bdev);
if (!bdev)
return -ENOMEM;
diff --git a/drivers/comedi/drivers/comedi_isadma.c b/drivers/comedi/drivers/comedi_isadma.c
index 259678bfd1f3..04ce3eb9ae4f 100644
--- a/drivers/comedi/drivers/comedi_isadma.c
+++ b/drivers/comedi/drivers/comedi_isadma.c
@@ -161,11 +161,11 @@ struct comedi_isadma *comedi_isadma_alloc(struct comedi_device *dev,
if (n_desc < 1 || n_desc > 2)
goto no_dma;
- dma = kzalloc_obj(*dma, GFP_KERNEL);
+ dma = kzalloc_obj(*dma);
if (!dma)
goto no_dma;
- desc = kzalloc_objs(*desc, n_desc, GFP_KERNEL);
+ desc = kzalloc_objs(*desc, n_desc);
if (!desc)
goto no_dma;
dma->desc = desc;
diff --git a/drivers/comedi/drivers/dt9812.c b/drivers/comedi/drivers/dt9812.c
index cace17d6e70e..2541f75aff60 100644
--- a/drivers/comedi/drivers/dt9812.c
+++ b/drivers/comedi/drivers/dt9812.c
@@ -329,7 +329,7 @@ static int dt9812_write_multiple_registers(struct comedi_device *dev,
int i, count;
int ret;
- cmd = kzalloc_obj(*cmd, GFP_KERNEL);
+ cmd = kzalloc_obj(*cmd);
if (!cmd)
return -ENOMEM;
@@ -358,7 +358,7 @@ static int dt9812_rmw_multiple_registers(struct comedi_device *dev,
int i, count;
int ret;
- cmd = kzalloc_obj(*cmd, GFP_KERNEL);
+ cmd = kzalloc_obj(*cmd);
if (!cmd)
return -ENOMEM;
diff --git a/drivers/comedi/drivers/mite.c b/drivers/comedi/drivers/mite.c
index 3a16f4b6a292..e93150d6dc57 100644
--- a/drivers/comedi/drivers/mite.c
+++ b/drivers/comedi/drivers/mite.c
@@ -749,7 +749,7 @@ struct mite_ring *mite_alloc_ring(struct mite *mite)
{
struct mite_ring *ring;
- ring = kmalloc_obj(*ring, GFP_KERNEL);
+ ring = kmalloc_obj(*ring);
if (!ring)
return NULL;
ring->hw_dev = get_device(&mite->pcidev->dev);
@@ -879,7 +879,7 @@ struct mite *mite_attach(struct comedi_device *dev, bool use_win1)
unsigned int i;
int ret;
- mite = kzalloc_obj(*mite, GFP_KERNEL);
+ mite = kzalloc_obj(*mite);
if (!mite)
return NULL;
diff --git a/drivers/comedi/drivers/ni_tio.c b/drivers/comedi/drivers/ni_tio.c
index 56b5995e2c58..d6e7e2006981 100644
--- a/drivers/comedi/drivers/ni_tio.c
+++ b/drivers/comedi/drivers/ni_tio.c
@@ -1778,7 +1778,7 @@ ni_gpct_device_construct(struct comedi_device *dev,
if (num_counters == 0 || counters_per_chip == 0)
return NULL;
- counter_dev = kzalloc_obj(*counter_dev, GFP_KERNEL);
+ counter_dev = kzalloc_obj(*counter_dev);
if (!counter_dev)
return NULL;
@@ -1793,7 +1793,7 @@ ni_gpct_device_construct(struct comedi_device *dev,
counter_dev->num_counters = num_counters;
counter_dev->num_chips = DIV_ROUND_UP(num_counters, counters_per_chip);
- counter_dev->counters = kzalloc_objs(*counter, num_counters, GFP_KERNEL);
+ counter_dev->counters = kzalloc_objs(*counter, num_counters);
counter_dev->regs = kzalloc_objs(*counter_dev->regs,
counter_dev->num_chips, GFP_KERNEL);
if (!counter_dev->regs || !counter_dev->counters) {
diff --git a/drivers/comedi/drivers/usbduxsigma.c b/drivers/comedi/drivers/usbduxsigma.c
index bcf9116c4bd7..361b76d106ae 100644
--- a/drivers/comedi/drivers/usbduxsigma.c
+++ b/drivers/comedi/drivers/usbduxsigma.c
@@ -1336,8 +1336,8 @@ static int usbduxsigma_alloc_usb_buffers(struct comedi_device *dev)
devpriv->dux_commands = kzalloc(SIZEOFDUXBUFFER, GFP_KERNEL);
devpriv->in_buf = kzalloc(SIZEINBUF, GFP_KERNEL);
devpriv->insn_buf = kzalloc(SIZEINSNBUF, GFP_KERNEL);
- devpriv->ai_urbs = kzalloc_objs(urb, devpriv->n_ai_urbs, GFP_KERNEL);
- devpriv->ao_urbs = kzalloc_objs(urb, devpriv->n_ao_urbs, GFP_KERNEL);
+ devpriv->ai_urbs = kzalloc_objs(urb, devpriv->n_ai_urbs);
+ devpriv->ao_urbs = kzalloc_objs(urb, devpriv->n_ao_urbs);
if (!devpriv->dux_commands || !devpriv->in_buf || !devpriv->insn_buf ||
!devpriv->ai_urbs || !devpriv->ao_urbs)
return -ENOMEM;
diff --git a/drivers/connector/cn_queue.c b/drivers/connector/cn_queue.c
index 3ef917ebc49b..2573b3000633 100644
--- a/drivers/connector/cn_queue.c
+++ b/drivers/connector/cn_queue.c
@@ -25,7 +25,7 @@ cn_queue_alloc_callback_entry(struct cn_queue_dev *dev, const char *name,
{
struct cn_callback_entry *cbq;
- cbq = kzalloc_obj(*cbq, GFP_KERNEL);
+ cbq = kzalloc_obj(*cbq);
if (!cbq) {
pr_err("Failed to create new callback queue.\n");
return NULL;
@@ -113,7 +113,7 @@ struct cn_queue_dev *cn_queue_alloc_dev(const char *name, struct sock *nls)
{
struct cn_queue_dev *dev;
- dev = kzalloc_obj(*dev, GFP_KERNEL);
+ dev = kzalloc_obj(*dev);
if (!dev)
return NULL;
diff --git a/drivers/counter/counter-chrdev.c b/drivers/counter/counter-chrdev.c
index 0a4af153e049..61451ba74ca1 100644
--- a/drivers/counter/counter-chrdev.c
+++ b/drivers/counter/counter-chrdev.c
@@ -152,7 +152,7 @@ static int counter_set_event_node(struct counter_device *const counter,
/* If event is not already in the list */
if (&event_node->l == &counter->next_events_list) {
/* Allocate new event node */
- event_node = kmalloc_obj(*event_node, GFP_KERNEL);
+ event_node = kmalloc_obj(*event_node);
if (!event_node)
return -ENOMEM;
@@ -172,7 +172,7 @@ static int counter_set_event_node(struct counter_device *const counter,
}
/* Allocate component node */
- comp_node = kmalloc_obj(*comp_node, GFP_KERNEL);
+ comp_node = kmalloc_obj(*comp_node);
if (!comp_node) {
err = -ENOMEM;
goto exit_free_event_node;
diff --git a/drivers/cpufreq/acpi-cpufreq.c b/drivers/cpufreq/acpi-cpufreq.c
index 8576c8290ea5..3b95a3609cde 100644
--- a/drivers/cpufreq/acpi-cpufreq.c
+++ b/drivers/cpufreq/acpi-cpufreq.c
@@ -700,7 +700,7 @@ static int acpi_cpufreq_cpu_init(struct cpufreq_policy *policy)
return blacklisted;
#endif
- data = kzalloc_obj(*data, GFP_KERNEL);
+ data = kzalloc_obj(*data);
if (!data)
return -ENOMEM;
diff --git a/drivers/cpufreq/amd-pstate.c b/drivers/cpufreq/amd-pstate.c
index dec47f7ce192..5aa9fcd80cf5 100644
--- a/drivers/cpufreq/amd-pstate.c
+++ b/drivers/cpufreq/amd-pstate.c
@@ -993,7 +993,7 @@ static int amd_pstate_cpu_init(struct cpufreq_policy *policy)
if (!dev)
return -ENODEV;
- cpudata = kzalloc_obj(*cpudata, GFP_KERNEL);
+ cpudata = kzalloc_obj(*cpudata);
if (!cpudata)
return -ENOMEM;
@@ -1478,7 +1478,7 @@ static int amd_pstate_epp_cpu_init(struct cpufreq_policy *policy)
if (!dev)
return -ENODEV;
- cpudata = kzalloc_obj(*cpudata, GFP_KERNEL);
+ cpudata = kzalloc_obj(*cpudata);
if (!cpudata)
return -ENOMEM;
diff --git a/drivers/cpufreq/apple-soc-cpufreq.c b/drivers/cpufreq/apple-soc-cpufreq.c
index bf6061e2089a..9396034167e5 100644
--- a/drivers/cpufreq/apple-soc-cpufreq.c
+++ b/drivers/cpufreq/apple-soc-cpufreq.c
@@ -276,7 +276,7 @@ static int apple_soc_cpufreq_init(struct cpufreq_policy *policy)
goto out_free_opp;
}
- priv = kzalloc_obj(*priv, GFP_KERNEL);
+ priv = kzalloc_obj(*priv);
if (!priv) {
ret = -ENOMEM;
goto out_free_opp;
diff --git a/drivers/cpufreq/armada-8k-cpufreq.c b/drivers/cpufreq/armada-8k-cpufreq.c
index c7d4a15f10bc..9d55398f3797 100644
--- a/drivers/cpufreq/armada-8k-cpufreq.c
+++ b/drivers/cpufreq/armada-8k-cpufreq.c
@@ -143,7 +143,7 @@ static int __init armada_8k_cpufreq_init(void)
of_node_put(node);
nb_cpus = num_possible_cpus();
- freq_tables = kzalloc_objs(*freq_tables, nb_cpus, GFP_KERNEL);
+ freq_tables = kzalloc_objs(*freq_tables, nb_cpus);
if (!freq_tables)
return -ENOMEM;
cpumask_copy(&cpus, cpu_possible_mask);
diff --git a/drivers/cpufreq/bmips-cpufreq.c b/drivers/cpufreq/bmips-cpufreq.c
index f8c91796b498..a8e35bc75fb2 100644
--- a/drivers/cpufreq/bmips-cpufreq.c
+++ b/drivers/cpufreq/bmips-cpufreq.c
@@ -71,7 +71,7 @@ bmips_cpufreq_get_freq_table(const struct cpufreq_policy *policy)
cpu_freq = htp_freq_to_cpu_freq(priv->clk_mult);
- table = kmalloc_objs(*table, priv->max_freqs + 1, GFP_KERNEL);
+ table = kmalloc_objs(*table, priv->max_freqs + 1);
if (!table)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/cpufreq/cppc_cpufreq.c b/drivers/cpufreq/cppc_cpufreq.c
index 7abfd2753946..011f35cb47b9 100644
--- a/drivers/cpufreq/cppc_cpufreq.c
+++ b/drivers/cpufreq/cppc_cpufreq.c
@@ -575,7 +575,7 @@ static struct cppc_cpudata *cppc_cpufreq_get_cpu_data(unsigned int cpu)
struct cppc_cpudata *cpu_data;
int ret;
- cpu_data = kzalloc_obj(struct cppc_cpudata, GFP_KERNEL);
+ cpu_data = kzalloc_obj(struct cppc_cpudata);
if (!cpu_data)
goto out;
diff --git a/drivers/cpufreq/cpufreq.c b/drivers/cpufreq/cpufreq.c
index 98035c9fbc17..277884d91913 100644
--- a/drivers/cpufreq/cpufreq.c
+++ b/drivers/cpufreq/cpufreq.c
@@ -1263,7 +1263,7 @@ static struct cpufreq_policy *cpufreq_policy_alloc(unsigned int cpu)
if (!dev)
return NULL;
- policy = kzalloc_obj(*policy, GFP_KERNEL);
+ policy = kzalloc_obj(*policy);
if (!policy)
return NULL;
diff --git a/drivers/cpufreq/cpufreq_conservative.c b/drivers/cpufreq/cpufreq_conservative.c
index f0c16e615a46..e0e847764511 100644
--- a/drivers/cpufreq/cpufreq_conservative.c
+++ b/drivers/cpufreq/cpufreq_conservative.c
@@ -273,7 +273,7 @@ static struct policy_dbs_info *cs_alloc(void)
{
struct cs_policy_dbs_info *dbs_info;
- dbs_info = kzalloc_obj(*dbs_info, GFP_KERNEL);
+ dbs_info = kzalloc_obj(*dbs_info);
return dbs_info ? &dbs_info->policy_dbs : NULL;
}
@@ -286,7 +286,7 @@ static int cs_init(struct dbs_data *dbs_data)
{
struct cs_dbs_tuners *tuners;
- tuners = kzalloc_obj(*tuners, GFP_KERNEL);
+ tuners = kzalloc_obj(*tuners);
if (!tuners)
return -ENOMEM;
diff --git a/drivers/cpufreq/cpufreq_governor.c b/drivers/cpufreq/cpufreq_governor.c
index 1dbb3b10ee83..36eb7aee4bcd 100644
--- a/drivers/cpufreq/cpufreq_governor.c
+++ b/drivers/cpufreq/cpufreq_governor.c
@@ -429,7 +429,7 @@ int cpufreq_dbs_governor_init(struct cpufreq_policy *policy)
goto out;
}
- dbs_data = kzalloc_obj(*dbs_data, GFP_KERNEL);
+ dbs_data = kzalloc_obj(*dbs_data);
if (!dbs_data) {
ret = -ENOMEM;
goto free_policy_dbs_info;
diff --git a/drivers/cpufreq/cpufreq_ondemand.c b/drivers/cpufreq/cpufreq_ondemand.c
index ecb5021f46bd..9942dbb38dae 100644
--- a/drivers/cpufreq/cpufreq_ondemand.c
+++ b/drivers/cpufreq/cpufreq_ondemand.c
@@ -322,7 +322,7 @@ static struct policy_dbs_info *od_alloc(void)
{
struct od_policy_dbs_info *dbs_info;
- dbs_info = kzalloc_obj(*dbs_info, GFP_KERNEL);
+ dbs_info = kzalloc_obj(*dbs_info);
return dbs_info ? &dbs_info->policy_dbs : NULL;
}
@@ -335,7 +335,7 @@ static int od_init(struct dbs_data *dbs_data)
{
struct od_dbs_tuners *tuners;
- tuners = kzalloc_obj(*tuners, GFP_KERNEL);
+ tuners = kzalloc_obj(*tuners);
if (!tuners)
return -ENOMEM;
diff --git a/drivers/cpufreq/cpufreq_stats.c b/drivers/cpufreq/cpufreq_stats.c
index 407b8fcf0723..670a10c3ecfa 100644
--- a/drivers/cpufreq/cpufreq_stats.c
+++ b/drivers/cpufreq/cpufreq_stats.c
@@ -222,7 +222,7 @@ void cpufreq_stats_create_table(struct cpufreq_policy *policy)
if (policy->stats)
return;
- stats = kzalloc_obj(*stats, GFP_KERNEL);
+ stats = kzalloc_obj(*stats);
if (!stats)
return;
diff --git a/drivers/cpufreq/cpufreq_userspace.c b/drivers/cpufreq/cpufreq_userspace.c
index c8e941b4ec03..d738d31995f9 100644
--- a/drivers/cpufreq/cpufreq_userspace.c
+++ b/drivers/cpufreq/cpufreq_userspace.c
@@ -58,7 +58,7 @@ static int cpufreq_userspace_policy_init(struct cpufreq_policy *policy)
{
struct userspace_policy *userspace;
- userspace = kzalloc_obj(*userspace, GFP_KERNEL);
+ userspace = kzalloc_obj(*userspace);
if (!userspace)
return -ENOMEM;
diff --git a/drivers/cpufreq/e_powersaver.c b/drivers/cpufreq/e_powersaver.c
index e079f1fed352..05209d9e9d27 100644
--- a/drivers/cpufreq/e_powersaver.c
+++ b/drivers/cpufreq/e_powersaver.c
@@ -55,7 +55,7 @@ static struct acpi_processor_performance *eps_acpi_cpu_perf;
/* Minimum necessary to get acpi_processor_get_bios_limit() working */
static int eps_acpi_init(void)
{
- eps_acpi_cpu_perf = kzalloc_obj(*eps_acpi_cpu_perf, GFP_KERNEL);
+ eps_acpi_cpu_perf = kzalloc_obj(*eps_acpi_cpu_perf);
if (!eps_acpi_cpu_perf)
return -ENOMEM;
diff --git a/drivers/cpufreq/gx-suspmod.c b/drivers/cpufreq/gx-suspmod.c
index ceadf0654838..d269a4f26f98 100644
--- a/drivers/cpufreq/gx-suspmod.c
+++ b/drivers/cpufreq/gx-suspmod.c
@@ -458,7 +458,7 @@ static int __init cpufreq_gx_init(void)
pr_debug("geode suspend modulation available.\n");
- params = kzalloc_obj(*params, GFP_KERNEL);
+ params = kzalloc_obj(*params);
if (params == NULL)
return -ENOMEM;
diff --git a/drivers/cpufreq/intel_pstate.c b/drivers/cpufreq/intel_pstate.c
index 00232f178630..a48af3540c74 100644
--- a/drivers/cpufreq/intel_pstate.c
+++ b/drivers/cpufreq/intel_pstate.c
@@ -2745,7 +2745,7 @@ static int intel_pstate_init_cpu(unsigned int cpunum)
cpu = all_cpu_data[cpunum];
if (!cpu) {
- cpu = kzalloc_obj(*cpu, GFP_KERNEL);
+ cpu = kzalloc_obj(*cpu);
if (!cpu)
return -ENOMEM;
@@ -3301,7 +3301,7 @@ static int intel_cpufreq_cpu_init(struct cpufreq_policy *policy)
/* This reflects the intel_pstate_get_cpu_pstates() setting. */
policy->cur = policy->cpuinfo.min_freq;
- req = kzalloc_objs(*req, 2, GFP_KERNEL);
+ req = kzalloc_objs(*req, 2);
if (!req) {
ret = -ENOMEM;
goto pstate_exit;
diff --git a/drivers/cpufreq/powernow-k7.c b/drivers/cpufreq/powernow-k7.c
index 77847b52d613..6b7caf4ae20d 100644
--- a/drivers/cpufreq/powernow-k7.c
+++ b/drivers/cpufreq/powernow-k7.c
@@ -304,7 +304,7 @@ static int powernow_acpi_init(void)
goto err0;
}
- acpi_processor_perf = kzalloc_obj(*acpi_processor_perf, GFP_KERNEL);
+ acpi_processor_perf = kzalloc_obj(*acpi_processor_perf);
if (!acpi_processor_perf) {
retval = -ENOMEM;
goto err0;
diff --git a/drivers/cpufreq/powernow-k8.c b/drivers/cpufreq/powernow-k8.c
index b7c9676c96ef..4d77eef53fe0 100644
--- a/drivers/cpufreq/powernow-k8.c
+++ b/drivers/cpufreq/powernow-k8.c
@@ -1029,7 +1029,7 @@ static int powernowk8_cpu_init(struct cpufreq_policy *pol)
if (rc)
return -ENODEV;
- data = kzalloc_obj(*data, GFP_KERNEL);
+ data = kzalloc_obj(*data);
if (!data)
return -ENOMEM;
diff --git a/drivers/cpufreq/powernv-cpufreq.c b/drivers/cpufreq/powernv-cpufreq.c
index 7ab29fd8e4e5..4a6f4d9043e9 100644
--- a/drivers/cpufreq/powernv-cpufreq.c
+++ b/drivers/cpufreq/powernv-cpufreq.c
@@ -323,7 +323,7 @@ static int init_powernv_pstates(void)
powernv_freqs[i].frequency = freq * 1000; /* kHz */
powernv_freqs[i].driver_data = id & 0xFF;
- revmap_data = kmalloc_obj(*revmap_data, GFP_KERNEL);
+ revmap_data = kmalloc_obj(*revmap_data);
if (!revmap_data) {
rc = -ENOMEM;
goto out;
@@ -857,7 +857,7 @@ static int powernv_cpufreq_cpu_init(struct cpufreq_policy *policy)
return 0;
/* Initialise Gpstate ramp-down timer only on POWER8 */
- gpstates = kzalloc_obj(*gpstates, GFP_KERNEL);
+ gpstates = kzalloc_obj(*gpstates);
if (!gpstates)
return -ENOMEM;
@@ -1053,7 +1053,7 @@ static int init_chip_info(void)
return -ENOMEM;
/* Allocate a chip cpu mask large enough to fit mask for all chips */
- chip_cpu_mask = kzalloc_objs(cpumask_t, MAX_NR_CHIPS, GFP_KERNEL);
+ chip_cpu_mask = kzalloc_objs(cpumask_t, MAX_NR_CHIPS);
if (!chip_cpu_mask) {
ret = -ENOMEM;
goto free_and_return;
@@ -1069,7 +1069,7 @@ static int init_chip_info(void)
cpumask_set_cpu(cpu, &chip_cpu_mask[nr_chips-1]);
}
- chips = kzalloc_objs(struct chip, nr_chips, GFP_KERNEL);
+ chips = kzalloc_objs(struct chip, nr_chips);
if (!chips) {
ret = -ENOMEM;
goto out_free_chip_cpu_mask;
diff --git a/drivers/cpufreq/pxa3xx-cpufreq.c b/drivers/cpufreq/pxa3xx-cpufreq.c
index 839a55bee151..50ff3b6a6900 100644
--- a/drivers/cpufreq/pxa3xx-cpufreq.c
+++ b/drivers/cpufreq/pxa3xx-cpufreq.c
@@ -110,7 +110,7 @@ static int setup_freqs_table(struct cpufreq_policy *policy,
struct cpufreq_frequency_table *table;
int i;
- table = kzalloc_objs(*table, num + 1, GFP_KERNEL);
+ table = kzalloc_objs(*table, num + 1);
if (table == NULL)
return -ENOMEM;
diff --git a/drivers/cpufreq/qcom-cpufreq-hw.c b/drivers/cpufreq/qcom-cpufreq-hw.c
index 3dbf432efaeb..ea9a20d27b8f 100644
--- a/drivers/cpufreq/qcom-cpufreq-hw.c
+++ b/drivers/cpufreq/qcom-cpufreq-hw.c
@@ -211,7 +211,7 @@ static int qcom_cpufreq_hw_read_lut(struct device *cpu_dev,
struct qcom_cpufreq_data *drv_data = policy->driver_data;
const struct qcom_cpufreq_soc_data *soc_data = qcom_cpufreq.soc_data;
- table = kzalloc_objs(*table, LUT_MAX_ENTRIES + 1, GFP_KERNEL);
+ table = kzalloc_objs(*table, LUT_MAX_ENTRIES + 1);
if (!table)
return -ENOMEM;
diff --git a/drivers/cpufreq/qoriq-cpufreq.c b/drivers/cpufreq/qoriq-cpufreq.c
index df560851ffa8..42edb41ad459 100644
--- a/drivers/cpufreq/qoriq-cpufreq.c
+++ b/drivers/cpufreq/qoriq-cpufreq.c
@@ -168,7 +168,7 @@ static int qoriq_cpufreq_cpu_init(struct cpufreq_policy *policy)
if (!np)
return -ENODEV;
- data = kzalloc_obj(*data, GFP_KERNEL);
+ data = kzalloc_obj(*data);
if (!data)
goto err_np;
@@ -181,11 +181,11 @@ static int qoriq_cpufreq_cpu_init(struct cpufreq_policy *policy)
hwclk = __clk_get_hw(policy->clk);
count = clk_hw_get_num_parents(hwclk);
- data->pclk = kzalloc_objs(struct clk *, count, GFP_KERNEL);
+ data->pclk = kzalloc_objs(struct clk *, count);
if (!data->pclk)
goto err_nomem2;
- table = kzalloc_objs(*table, count + 1, GFP_KERNEL);
+ table = kzalloc_objs(*table, count + 1);
if (!table)
goto err_pclk;
diff --git a/drivers/cpufreq/scmi-cpufreq.c b/drivers/cpufreq/scmi-cpufreq.c
index 9c0a903f4fb0..4edb4f7a8aa9 100644
--- a/drivers/cpufreq/scmi-cpufreq.c
+++ b/drivers/cpufreq/scmi-cpufreq.c
@@ -214,7 +214,7 @@ static int scmi_cpufreq_init(struct cpufreq_policy *policy)
if (domain < 0)
return domain;
- priv = kzalloc_obj(*priv, GFP_KERNEL);
+ priv = kzalloc_obj(*priv);
if (!priv)
return -ENOMEM;
diff --git a/drivers/cpufreq/scpi-cpufreq.c b/drivers/cpufreq/scpi-cpufreq.c
index 1799e40596b7..09e29b2a6d8e 100644
--- a/drivers/cpufreq/scpi-cpufreq.c
+++ b/drivers/cpufreq/scpi-cpufreq.c
@@ -128,7 +128,7 @@ static int scpi_cpufreq_init(struct cpufreq_policy *policy)
goto out_free_opp;
}
- priv = kzalloc_obj(*priv, GFP_KERNEL);
+ priv = kzalloc_obj(*priv);
if (!priv) {
ret = -ENOMEM;
goto out_free_opp;
diff --git a/drivers/cpufreq/spear-cpufreq.c b/drivers/cpufreq/spear-cpufreq.c
index 9a52d8030449..81a0780b2ebf 100644
--- a/drivers/cpufreq/spear-cpufreq.c
+++ b/drivers/cpufreq/spear-cpufreq.c
@@ -191,7 +191,7 @@ static int spear_cpufreq_probe(struct platform_device *pdev)
goto out_put_node;
}
- freq_tbl = kzalloc_objs(*freq_tbl, cnt + 1, GFP_KERNEL);
+ freq_tbl = kzalloc_objs(*freq_tbl, cnt + 1);
if (!freq_tbl) {
ret = -ENOMEM;
goto out_put_node;
diff --git a/drivers/cpufreq/sun50i-cpufreq-nvmem.c b/drivers/cpufreq/sun50i-cpufreq-nvmem.c
index f4e5a09103d2..9261d148a165 100644
--- a/drivers/cpufreq/sun50i-cpufreq-nvmem.c
+++ b/drivers/cpufreq/sun50i-cpufreq-nvmem.c
@@ -244,7 +244,7 @@ static int sun50i_cpufreq_nvmem_probe(struct platform_device *pdev)
int speed;
int ret;
- opp_tokens = kzalloc_objs(*opp_tokens, num_possible_cpus(), GFP_KERNEL);
+ opp_tokens = kzalloc_objs(*opp_tokens, num_possible_cpus());
if (!opp_tokens)
return -ENOMEM;
diff --git a/drivers/cpufreq/tegra186-cpufreq.c b/drivers/cpufreq/tegra186-cpufreq.c
index 5c2f134f8033..4fa6894f6371 100644
--- a/drivers/cpufreq/tegra186-cpufreq.c
+++ b/drivers/cpufreq/tegra186-cpufreq.c
@@ -135,7 +135,7 @@ static int tegra_cpufreq_init_cpufreq_table(struct cpufreq_policy *policy,
dev_pm_opp_disable(cpu_dev, rate);
}
- freq_table = kzalloc_objs(*freq_table, (max_opps + 1), GFP_KERNEL);
+ freq_table = kzalloc_objs(*freq_table, (max_opps + 1));
if (!freq_table)
return -ENOMEM;
diff --git a/drivers/cpufreq/tegra194-cpufreq.c b/drivers/cpufreq/tegra194-cpufreq.c
index 22f51dc2fa67..7a41cfc71a46 100644
--- a/drivers/cpufreq/tegra194-cpufreq.c
+++ b/drivers/cpufreq/tegra194-cpufreq.c
@@ -463,7 +463,7 @@ static int tegra_cpufreq_init_cpufreq_table(struct cpufreq_policy *policy,
return ret;
}
- freq_table = kzalloc_objs(*freq_table, (max_opps + 1), GFP_KERNEL);
+ freq_table = kzalloc_objs(*freq_table, (max_opps + 1));
if (!freq_table)
return -ENOMEM;
diff --git a/drivers/cpufreq/vexpress-spc-cpufreq.c b/drivers/cpufreq/vexpress-spc-cpufreq.c
index 894f801b1b41..8e4e29138464 100644
--- a/drivers/cpufreq/vexpress-spc-cpufreq.c
+++ b/drivers/cpufreq/vexpress-spc-cpufreq.c
@@ -252,7 +252,7 @@ static int merge_cluster_tables(void)
for (i = 0; i < MAX_CLUSTERS; i++)
count += get_table_count(freq_table[i]);
- table = kzalloc_objs(*table, count, GFP_KERNEL);
+ table = kzalloc_objs(*table, count);
if (!table)
return -ENOMEM;
diff --git a/drivers/cpufreq/virtual-cpufreq.c b/drivers/cpufreq/virtual-cpufreq.c
index 92da4d5606e1..4159f31349b1 100644
--- a/drivers/cpufreq/virtual-cpufreq.c
+++ b/drivers/cpufreq/virtual-cpufreq.c
@@ -171,7 +171,7 @@ static int virt_cpufreq_get_freq_info(struct cpufreq_policy *policy)
return 0;
}
- table = kzalloc_objs(*table, num_perftbl_entries + 1, GFP_KERNEL);
+ table = kzalloc_objs(*table, num_perftbl_entries + 1);
if (!table)
return -ENOMEM;
diff --git a/drivers/cpuidle/coupled.c b/drivers/cpuidle/coupled.c
index e22df988bb07..fb91a9e0e3c2 100644
--- a/drivers/cpuidle/coupled.c
+++ b/drivers/cpuidle/coupled.c
@@ -651,7 +651,7 @@ int cpuidle_coupled_register_device(struct cpuidle_device *dev)
}
/* No existing coupled info found, create a new one */
- coupled = kzalloc_obj(struct cpuidle_coupled, GFP_KERNEL);
+ coupled = kzalloc_obj(struct cpuidle_coupled);
if (!coupled)
return -ENOMEM;
diff --git a/drivers/cpuidle/cpuidle-psci-domain.c b/drivers/cpuidle/cpuidle-psci-domain.c
index a53ad31f9b3d..b9e4ad7d43a3 100644
--- a/drivers/cpuidle/cpuidle-psci-domain.c
+++ b/drivers/cpuidle/cpuidle-psci-domain.c
@@ -55,7 +55,7 @@ static int psci_pd_init(struct device_node *np, bool use_osi)
if (!pd)
goto out;
- pd_provider = kzalloc_obj(*pd_provider, GFP_KERNEL);
+ pd_provider = kzalloc_obj(*pd_provider);
if (!pd_provider)
goto free_pd;
diff --git a/drivers/cpuidle/cpuidle-riscv-sbi.c b/drivers/cpuidle/cpuidle-riscv-sbi.c
index 875c4697b953..a13e90bb43bd 100644
--- a/drivers/cpuidle/cpuidle-riscv-sbi.c
+++ b/drivers/cpuidle/cpuidle-riscv-sbi.c
@@ -380,7 +380,7 @@ static int sbi_pd_init(struct device_node *np)
if (!pd)
goto out;
- pd_provider = kzalloc_obj(*pd_provider, GFP_KERNEL);
+ pd_provider = kzalloc_obj(*pd_provider);
if (!pd_provider)
goto free_pd;
diff --git a/drivers/cpuidle/dt_idle_genpd.c b/drivers/cpuidle/dt_idle_genpd.c
index 6b1f6d4686a7..d292975cc468 100644
--- a/drivers/cpuidle/dt_idle_genpd.c
+++ b/drivers/cpuidle/dt_idle_genpd.c
@@ -95,7 +95,7 @@ struct generic_pm_domain *dt_idle_pd_alloc(struct device_node *np,
struct genpd_power_state *states = NULL;
int ret, state_count = 0;
- pd = kzalloc_obj(*pd, GFP_KERNEL);
+ pd = kzalloc_obj(*pd);
if (!pd)
goto out;
diff --git a/drivers/cpuidle/sysfs.c b/drivers/cpuidle/sysfs.c
index abee6f73a6e1..b81d22479234 100644
--- a/drivers/cpuidle/sysfs.c
+++ b/drivers/cpuidle/sysfs.c
@@ -482,7 +482,7 @@ static int cpuidle_add_state_sysfs(struct cpuidle_device *device)
/* state statistics */
for (i = 0; i < drv->state_count; i++) {
- kobj = kzalloc_obj(struct cpuidle_state_kobj, GFP_KERNEL);
+ kobj = kzalloc_obj(struct cpuidle_state_kobj);
if (!kobj) {
ret = -ENOMEM;
goto error_state;
@@ -618,7 +618,7 @@ static int cpuidle_add_driver_sysfs(struct cpuidle_device *dev)
struct cpuidle_driver *drv = cpuidle_get_cpu_driver(dev);
int ret;
- kdrv = kzalloc_obj(*kdrv, GFP_KERNEL);
+ kdrv = kzalloc_obj(*kdrv);
if (!kdrv)
return -ENOMEM;
@@ -712,7 +712,7 @@ int cpuidle_add_sysfs(struct cpuidle_device *dev)
if (!cpu_dev)
return -ENODEV;
- kdev = kzalloc_obj(*kdev, GFP_KERNEL);
+ kdev = kzalloc_obj(*kdev);
if (!kdev)
return -ENOMEM;
kdev->dev = dev;
diff --git a/drivers/crypto/amcc/crypto4xx_core.c b/drivers/crypto/amcc/crypto4xx_core.c
index 772509993079..c61f4473c0fa 100644
--- a/drivers/crypto/amcc/crypto4xx_core.c
+++ b/drivers/crypto/amcc/crypto4xx_core.c
@@ -974,7 +974,7 @@ static int crypto4xx_register_alg(struct crypto4xx_device *sec_dev,
int rc = 0;
for (i = 0; i < array_size; i++) {
- alg = kzalloc_obj(struct crypto4xx_alg, GFP_KERNEL);
+ alg = kzalloc_obj(struct crypto4xx_alg);
if (!alg)
return -ENOMEM;
diff --git a/drivers/crypto/amcc/crypto4xx_trng.c b/drivers/crypto/amcc/crypto4xx_trng.c
index 6738cdbaded9..cfd66b779ce1 100644
--- a/drivers/crypto/amcc/crypto4xx_trng.c
+++ b/drivers/crypto/amcc/crypto4xx_trng.c
@@ -87,7 +87,7 @@ void ppc4xx_trng_probe(struct crypto4xx_core_device *core_dev)
if (!dev->trng_base)
goto err_out;
- rng = kzalloc_obj(*rng, GFP_KERNEL);
+ rng = kzalloc_obj(*rng);
if (!rng)
goto err_out;
diff --git a/drivers/crypto/atmel-ecc.c b/drivers/crypto/atmel-ecc.c
index d19694400693..b6a77c8d439c 100644
--- a/drivers/crypto/atmel-ecc.c
+++ b/drivers/crypto/atmel-ecc.c
@@ -99,7 +99,7 @@ static int atmel_ecdh_set_secret(struct crypto_kpp *tfm, const void *buf,
return crypto_kpp_set_secret(ctx->fallback, buf, len);
}
- cmd = kmalloc_obj(*cmd, GFP_KERNEL);
+ cmd = kmalloc_obj(*cmd);
if (!cmd)
return -ENOMEM;
diff --git a/drivers/crypto/atmel-i2c.c b/drivers/crypto/atmel-i2c.c
index 27dd37997872..da3cd986b1eb 100644
--- a/drivers/crypto/atmel-i2c.c
+++ b/drivers/crypto/atmel-i2c.c
@@ -321,7 +321,7 @@ static int device_sanity_check(struct i2c_client *client)
struct atmel_i2c_cmd *cmd;
int ret;
- cmd = kmalloc_obj(*cmd, GFP_KERNEL);
+ cmd = kmalloc_obj(*cmd);
if (!cmd)
return -ENOMEM;
diff --git a/drivers/crypto/atmel-sha.c b/drivers/crypto/atmel-sha.c
index a925c7afbbdb..1f1341a16c42 100644
--- a/drivers/crypto/atmel-sha.c
+++ b/drivers/crypto/atmel-sha.c
@@ -2207,7 +2207,7 @@ struct atmel_sha_authenc_ctx *atmel_sha_authenc_spawn(unsigned long mode)
tctx->start = atmel_sha_authenc_start;
tctx->flags = mode;
- auth = kzalloc_obj(*auth, GFP_KERNEL);
+ auth = kzalloc_obj(*auth);
if (!auth) {
err = -ENOMEM;
goto err_free_ahash;
diff --git a/drivers/crypto/caam/caamalg_qi2.c b/drivers/crypto/caam/caamalg_qi2.c
index 810917475c4f..167372936ca7 100644
--- a/drivers/crypto/caam/caamalg_qi2.c
+++ b/drivers/crypto/caam/caamalg_qi2.c
@@ -3224,14 +3224,14 @@ static int hash_digest_key(struct caam_hash_ctx *ctx, u32 *keylen, u8 *key,
int ret = -ENOMEM;
struct dpaa2_fl_entry *in_fle, *out_fle;
- req_ctx = kzalloc_obj(*req_ctx, GFP_KERNEL);
+ req_ctx = kzalloc_obj(*req_ctx);
if (!req_ctx)
return -ENOMEM;
in_fle = &req_ctx->fd_flt[1];
out_fle = &req_ctx->fd_flt[0];
- flc = kzalloc_obj(*flc, GFP_KERNEL);
+ flc = kzalloc_obj(*flc);
if (!flc)
goto err_flc;
@@ -4635,7 +4635,7 @@ static struct caam_hash_alg *caam_hash_alloc(struct device *dev,
struct ahash_alg *halg;
struct crypto_alg *alg;
- t_alg = kzalloc_obj(*t_alg, GFP_KERNEL);
+ t_alg = kzalloc_obj(*t_alg);
if (!t_alg)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/crypto/caam/caamhash.c b/drivers/crypto/caam/caamhash.c
index cee9034aa87b..628c43a7efc4 100644
--- a/drivers/crypto/caam/caamhash.c
+++ b/drivers/crypto/caam/caamhash.c
@@ -1904,7 +1904,7 @@ caam_hash_alloc(struct caam_hash_template *template,
struct ahash_alg *halg;
struct crypto_alg *alg;
- t_alg = kzalloc_obj(*t_alg, GFP_KERNEL);
+ t_alg = kzalloc_obj(*t_alg);
if (!t_alg)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/crypto/caam/qi.c b/drivers/crypto/caam/qi.c
index a4e1984053da..c4bfe8e4aa2c 100644
--- a/drivers/crypto/caam/qi.c
+++ b/drivers/crypto/caam/qi.c
@@ -619,7 +619,7 @@ static int alloc_rsp_fq_cpu(struct device *qidev, unsigned int cpu)
struct qman_fq *fq;
int ret;
- fq = kzalloc_obj(*fq, GFP_KERNEL);
+ fq = kzalloc_obj(*fq);
if (!fq)
return -ENOMEM;
diff --git a/drivers/crypto/cavium/cpt/cptvf_main.c b/drivers/crypto/cavium/cpt/cptvf_main.c
index 41084767c577..2c9a2af38876 100644
--- a/drivers/crypto/cavium/cpt/cptvf_main.c
+++ b/drivers/crypto/cavium/cpt/cptvf_main.c
@@ -35,7 +35,7 @@ static int init_worker_threads(struct cpt_vf *cptvf)
struct cptvf_wqe_info *cwqe_info;
int i;
- cwqe_info = kzalloc_obj(*cwqe_info, GFP_KERNEL);
+ cwqe_info = kzalloc_obj(*cwqe_info);
if (!cwqe_info)
return -ENOMEM;
@@ -111,7 +111,7 @@ static int alloc_pending_queues(struct pending_qinfo *pqinfo, u32 qlen,
pqinfo->qlen = qlen;
for_each_pending_queue(pqinfo, queue, i) {
- queue->head = kzalloc_objs(*queue->head, qlen, GFP_KERNEL);
+ queue->head = kzalloc_objs(*queue->head, qlen);
if (!queue->head) {
ret = -ENOMEM;
goto pending_qfail;
@@ -225,7 +225,7 @@ static int alloc_command_queues(struct cpt_vf *cptvf,
queue = &cqinfo->queue[i];
INIT_HLIST_HEAD(&cqinfo->queue[i].chead);
do {
- curr = kzalloc_obj(*curr, GFP_KERNEL);
+ curr = kzalloc_obj(*curr);
if (!curr)
goto cmd_qfail;
diff --git a/drivers/crypto/cavium/nitrox/nitrox_isr.c b/drivers/crypto/cavium/nitrox/nitrox_isr.c
index 5ffb1aa90cba..cf09f7451f6f 100644
--- a/drivers/crypto/cavium/nitrox/nitrox_isr.c
+++ b/drivers/crypto/cavium/nitrox/nitrox_isr.c
@@ -320,7 +320,7 @@ int nitrox_register_interrupts(struct nitrox_device *ndev)
}
ndev->num_vecs = nr_vecs;
- ndev->qvec = kzalloc_objs(*qvec, nr_vecs, GFP_KERNEL);
+ ndev->qvec = kzalloc_objs(*qvec, nr_vecs);
if (!ndev->qvec) {
pci_free_irq_vectors(pdev);
return -ENOMEM;
@@ -424,7 +424,7 @@ int nitrox_sriov_register_interupts(struct nitrox_device *ndev)
return ret;
}
- qvec = kzalloc_objs(*qvec, NR_NON_RING_VECTORS, GFP_KERNEL);
+ qvec = kzalloc_objs(*qvec, NR_NON_RING_VECTORS);
if (!qvec) {
pci_disable_msix(pdev);
return -ENOMEM;
diff --git a/drivers/crypto/cavium/nitrox/nitrox_lib.c b/drivers/crypto/cavium/nitrox/nitrox_lib.c
index 31eb8c874257..d35303857476 100644
--- a/drivers/crypto/cavium/nitrox/nitrox_lib.c
+++ b/drivers/crypto/cavium/nitrox/nitrox_lib.c
@@ -219,7 +219,7 @@ void *crypto_alloc_context(struct nitrox_device *ndev)
void *vaddr;
dma_addr_t dma;
- chdr = kmalloc_obj(*chdr, GFP_KERNEL);
+ chdr = kmalloc_obj(*chdr);
if (!chdr)
return NULL;
diff --git a/drivers/crypto/cavium/nitrox/nitrox_main.c b/drivers/crypto/cavium/nitrox/nitrox_main.c
index d0e1e34a7b8b..8664d97261fe 100644
--- a/drivers/crypto/cavium/nitrox/nitrox_main.c
+++ b/drivers/crypto/cavium/nitrox/nitrox_main.c
@@ -441,7 +441,7 @@ static int nitrox_probe(struct pci_dev *pdev,
goto flr_fail;
pci_set_master(pdev);
- ndev = kzalloc_obj(*ndev, GFP_KERNEL);
+ ndev = kzalloc_obj(*ndev);
if (!ndev) {
err = -ENOMEM;
goto ndev_fail;
diff --git a/drivers/crypto/ccp/ccp-crypto-aes-cmac.c b/drivers/crypto/ccp/ccp-crypto-aes-cmac.c
index 240bcfa26c62..ead7566d78da 100644
--- a/drivers/crypto/ccp/ccp-crypto-aes-cmac.c
+++ b/drivers/crypto/ccp/ccp-crypto-aes-cmac.c
@@ -354,7 +354,7 @@ int ccp_register_aes_cmac_algs(struct list_head *head)
struct crypto_alg *base;
int ret;
- ccp_alg = kzalloc_obj(*ccp_alg, GFP_KERNEL);
+ ccp_alg = kzalloc_obj(*ccp_alg);
if (!ccp_alg)
return -ENOMEM;
diff --git a/drivers/crypto/ccp/ccp-crypto-aes-galois.c b/drivers/crypto/ccp/ccp-crypto-aes-galois.c
index db5c498f379b..6c8d1b87d60d 100644
--- a/drivers/crypto/ccp/ccp-crypto-aes-galois.c
+++ b/drivers/crypto/ccp/ccp-crypto-aes-galois.c
@@ -212,7 +212,7 @@ static int ccp_register_aes_aead(struct list_head *head,
struct aead_alg *alg;
int ret;
- ccp_aead = kzalloc_obj(*ccp_aead, GFP_KERNEL);
+ ccp_aead = kzalloc_obj(*ccp_aead);
if (!ccp_aead)
return -ENOMEM;
diff --git a/drivers/crypto/ccp/ccp-crypto-aes-xts.c b/drivers/crypto/ccp/ccp-crypto-aes-xts.c
index 5cd8c2d270c3..c7e26ce71156 100644
--- a/drivers/crypto/ccp/ccp-crypto-aes-xts.c
+++ b/drivers/crypto/ccp/ccp-crypto-aes-xts.c
@@ -231,7 +231,7 @@ static int ccp_register_aes_xts_alg(struct list_head *head,
struct skcipher_alg *alg;
int ret;
- ccp_alg = kzalloc_obj(*ccp_alg, GFP_KERNEL);
+ ccp_alg = kzalloc_obj(*ccp_alg);
if (!ccp_alg)
return -ENOMEM;
diff --git a/drivers/crypto/ccp/ccp-crypto-aes.c b/drivers/crypto/ccp/ccp-crypto-aes.c
index 97ce93434953..01d298350b92 100644
--- a/drivers/crypto/ccp/ccp-crypto-aes.c
+++ b/drivers/crypto/ccp/ccp-crypto-aes.c
@@ -294,7 +294,7 @@ static int ccp_register_aes_alg(struct list_head *head,
struct skcipher_alg *alg;
int ret;
- ccp_alg = kzalloc_obj(*ccp_alg, GFP_KERNEL);
+ ccp_alg = kzalloc_obj(*ccp_alg);
if (!ccp_alg)
return -ENOMEM;
diff --git a/drivers/crypto/ccp/ccp-crypto-des3.c b/drivers/crypto/ccp/ccp-crypto-des3.c
index 8c0f903c3330..c20b5a6a340a 100644
--- a/drivers/crypto/ccp/ccp-crypto-des3.c
+++ b/drivers/crypto/ccp/ccp-crypto-des3.c
@@ -182,7 +182,7 @@ static int ccp_register_des3_alg(struct list_head *head,
struct skcipher_alg *alg;
int ret;
- ccp_alg = kzalloc_obj(*ccp_alg, GFP_KERNEL);
+ ccp_alg = kzalloc_obj(*ccp_alg);
if (!ccp_alg)
return -ENOMEM;
diff --git a/drivers/crypto/ccp/ccp-crypto-rsa.c b/drivers/crypto/ccp/ccp-crypto-rsa.c
index 80d9ddc1f644..090adacaaf93 100644
--- a/drivers/crypto/ccp/ccp-crypto-rsa.c
+++ b/drivers/crypto/ccp/ccp-crypto-rsa.c
@@ -249,7 +249,7 @@ static int ccp_register_rsa_alg(struct list_head *head,
struct akcipher_alg *alg;
int ret;
- ccp_alg = kzalloc_obj(*ccp_alg, GFP_KERNEL);
+ ccp_alg = kzalloc_obj(*ccp_alg);
if (!ccp_alg)
return -ENOMEM;
diff --git a/drivers/crypto/ccp/ccp-crypto-sha.c b/drivers/crypto/ccp/ccp-crypto-sha.c
index 91d0d8ea182b..286b2d716236 100644
--- a/drivers/crypto/ccp/ccp-crypto-sha.c
+++ b/drivers/crypto/ccp/ccp-crypto-sha.c
@@ -418,7 +418,7 @@ static int ccp_register_hmac_alg(struct list_head *head,
struct crypto_alg *base;
int ret;
- ccp_alg = kzalloc_obj(*ccp_alg, GFP_KERNEL);
+ ccp_alg = kzalloc_obj(*ccp_alg);
if (!ccp_alg)
return -ENOMEM;
@@ -462,7 +462,7 @@ static int ccp_register_sha_alg(struct list_head *head,
struct crypto_alg *base;
int ret;
- ccp_alg = kzalloc_obj(*ccp_alg, GFP_KERNEL);
+ ccp_alg = kzalloc_obj(*ccp_alg);
if (!ccp_alg)
return -ENOMEM;
diff --git a/drivers/crypto/ccp/ccp-ops.c b/drivers/crypto/ccp/ccp-ops.c
index 0170edef5b43..f35803c37ab4 100644
--- a/drivers/crypto/ccp/ccp-ops.c
+++ b/drivers/crypto/ccp/ccp-ops.c
@@ -642,7 +642,7 @@ ccp_run_aes_gcm_cmd(struct ccp_cmd_queue *cmd_q, struct ccp_cmd *cmd)
struct ccp_data dst;
struct ccp_data aad;
struct ccp_op op;
- } *wa __free(kfree) = kzalloc_obj(*wa, GFP_KERNEL);
+ } *wa __free(kfree) = kzalloc_obj(*wa);
unsigned int dm_offset;
unsigned int authsize;
unsigned int jobid;
diff --git a/drivers/crypto/ccp/hsti.c b/drivers/crypto/ccp/hsti.c
index 404829c41a13..df09e0322304 100644
--- a/drivers/crypto/ccp/hsti.c
+++ b/drivers/crypto/ccp/hsti.c
@@ -87,7 +87,7 @@ static int psp_populate_hsti(struct psp_device *psp)
return 0;
/* Allocate command-response buffer */
- req = kzalloc_obj(*req, GFP_KERNEL);
+ req = kzalloc_obj(*req);
if (!req)
return -ENOMEM;
diff --git a/drivers/crypto/ccp/sev-dev-tio.c b/drivers/crypto/ccp/sev-dev-tio.c
index d51bb67460b0..c84e23982b43 100644
--- a/drivers/crypto/ccp/sev-dev-tio.c
+++ b/drivers/crypto/ccp/sev-dev-tio.c
@@ -330,7 +330,7 @@ static struct sla_buffer_hdr *sla_buffer_map(struct sla_addr_t sla)
if (WARN_ON_ONCE(!npages))
return NULL;
- struct page **pp = kmalloc_objs(pp[0], npages, GFP_KERNEL);
+ struct page **pp = kmalloc_objs(pp[0], npages);
if (!pp)
return NULL;
diff --git a/drivers/crypto/ccp/sev-dev-tsm.c b/drivers/crypto/ccp/sev-dev-tsm.c
index a3e7a9bca95b..adc9542ae806 100644
--- a/drivers/crypto/ccp/sev-dev-tsm.c
+++ b/drivers/crypto/ccp/sev-dev-tsm.c
@@ -207,7 +207,7 @@ static int stream_alloc(struct pci_dev *pdev, struct pci_ide **ide,
static struct pci_tsm *tio_pf0_probe(struct pci_dev *pdev, struct sev_device *sev)
{
- struct tio_dsm *dsm __free(kfree) = kzalloc_obj(*dsm, GFP_KERNEL);
+ struct tio_dsm *dsm __free(kfree) = kzalloc_obj(*dsm);
int rc;
if (!dsm)
@@ -341,7 +341,7 @@ static struct pci_tsm_ops sev_tsm_ops = {
void sev_tsm_init_locked(struct sev_device *sev, void *tio_status_page)
{
- struct sev_tio_status *t = kzalloc_obj(*t, GFP_KERNEL);
+ struct sev_tio_status *t = kzalloc_obj(*t);
struct tsm_dev *tsmdev;
int ret;
diff --git a/drivers/crypto/ccp/sev-dev.c b/drivers/crypto/ccp/sev-dev.c
index 4dc642ecde76..096f993974d1 100644
--- a/drivers/crypto/ccp/sev-dev.c
+++ b/drivers/crypto/ccp/sev-dev.c
@@ -1144,7 +1144,7 @@ struct page *snp_alloc_hv_fixed_pages(unsigned int num_2mb_pages)
if (!page)
return NULL;
- entry = kzalloc_obj(*entry, GFP_KERNEL);
+ entry = kzalloc_obj(*entry);
if (!entry) {
__free_pages(page, order);
return NULL;
@@ -2658,7 +2658,7 @@ static int sev_misc_init(struct sev_device *sev)
if (!misc_dev) {
struct miscdevice *misc;
- misc_dev = kzalloc_obj(*misc_dev, GFP_KERNEL);
+ misc_dev = kzalloc_obj(*misc_dev);
if (!misc_dev)
return -ENOMEM;
diff --git a/drivers/crypto/ccp/sfs.c b/drivers/crypto/ccp/sfs.c
index c98900672ea8..a4777839790b 100644
--- a/drivers/crypto/ccp/sfs.c
+++ b/drivers/crypto/ccp/sfs.c
@@ -223,7 +223,7 @@ static int sfs_misc_init(struct sfs_device *sfs)
if (!misc_dev) {
struct miscdevice *misc;
- misc_dev = kzalloc_obj(*misc_dev, GFP_KERNEL);
+ misc_dev = kzalloc_obj(*misc_dev);
if (!misc_dev)
return -ENOMEM;
diff --git a/drivers/crypto/ccp/tee-dev.c b/drivers/crypto/ccp/tee-dev.c
index 50716472586a..3e3645980e89 100644
--- a/drivers/crypto/ccp/tee-dev.c
+++ b/drivers/crypto/ccp/tee-dev.c
@@ -67,7 +67,7 @@ struct tee_init_ring_cmd *tee_alloc_cmd_buffer(struct psp_tee_device *tee)
{
struct tee_init_ring_cmd *cmd;
- cmd = kzalloc_obj(*cmd, GFP_KERNEL);
+ cmd = kzalloc_obj(*cmd);
if (!cmd)
return NULL;
diff --git a/drivers/crypto/ccree/cc_request_mgr.c b/drivers/crypto/ccree/cc_request_mgr.c
index 31fc0d37db21..aa0220212406 100644
--- a/drivers/crypto/ccree/cc_request_mgr.c
+++ b/drivers/crypto/ccree/cc_request_mgr.c
@@ -116,7 +116,7 @@ int cc_req_mgr_init(struct cc_drvdata *drvdata)
struct device *dev = drvdata_to_dev(drvdata);
int rc = 0;
- req_mgr_h = kzalloc_obj(*req_mgr_h, GFP_KERNEL);
+ req_mgr_h = kzalloc_obj(*req_mgr_h);
if (!req_mgr_h) {
rc = -ENOMEM;
goto req_mgr_init_err;
diff --git a/drivers/crypto/chelsio/chcr_core.c b/drivers/crypto/chelsio/chcr_core.c
index a1a0034780c5..2609a8c3c18b 100644
--- a/drivers/crypto/chelsio/chcr_core.c
+++ b/drivers/crypto/chelsio/chcr_core.c
@@ -189,7 +189,7 @@ static void *chcr_uld_add(const struct cxgb4_lld_info *lld)
return ERR_PTR(-EOPNOTSUPP);
/* Create the device and add it in the device list */
- u_ctx = kzalloc_obj(*u_ctx, GFP_KERNEL);
+ u_ctx = kzalloc_obj(*u_ctx);
if (!u_ctx) {
u_ctx = ERR_PTR(-ENOMEM);
goto out;
diff --git a/drivers/crypto/hifn_795x.c b/drivers/crypto/hifn_795x.c
index 19f0bf3f3f92..a897541f897b 100644
--- a/drivers/crypto/hifn_795x.c
+++ b/drivers/crypto/hifn_795x.c
@@ -2248,7 +2248,7 @@ static int hifn_alg_alloc(struct hifn_device *dev, const struct hifn_alg_templat
struct hifn_crypto_alg *alg;
int err;
- alg = kzalloc_obj(*alg, GFP_KERNEL);
+ alg = kzalloc_obj(*alg);
if (!alg)
return -ENOMEM;
diff --git a/drivers/crypto/hisilicon/debugfs.c b/drivers/crypto/hisilicon/debugfs.c
index b7c5c4ade11f..32e9f8350289 100644
--- a/drivers/crypto/hisilicon/debugfs.c
+++ b/drivers/crypto/hisilicon/debugfs.c
@@ -838,7 +838,7 @@ static struct dfx_diff_registers *dfx_regs_init(struct hisi_qm *qm,
u32 j, base_offset;
int i;
- diff_regs = kzalloc_objs(*diff_regs, reg_len, GFP_KERNEL);
+ diff_regs = kzalloc_objs(*diff_regs, reg_len);
if (!diff_regs)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/crypto/hisilicon/qm.c b/drivers/crypto/hisilicon/qm.c
index 07421f53a7ee..d00a79070bac 100644
--- a/drivers/crypto/hisilicon/qm.c
+++ b/drivers/crypto/hisilicon/qm.c
@@ -2722,7 +2722,7 @@ static int qm_hw_err_isolate(struct hisi_qm *qm)
if (qm->uacce->is_vf || isolate->is_isolate || !isolate->err_threshold)
return 0;
- hw_err = kzalloc_obj(*hw_err, GFP_KERNEL);
+ hw_err = kzalloc_obj(*hw_err);
if (!hw_err)
return -ENOMEM;
@@ -3747,7 +3747,7 @@ static int hisi_qm_sort_devices(int node, struct list_head *head,
if (dev_node < 0)
dev_node = 0;
- res = kzalloc_obj(*res, GFP_KERNEL);
+ res = kzalloc_obj(*res);
if (!res)
return -ENOMEM;
@@ -5767,7 +5767,7 @@ static int hisi_qp_alloc_memory(struct hisi_qm *qm)
size_t qp_dma_size;
int i, ret;
- qm->qp_array = kzalloc_objs(struct hisi_qp, qm->qp_num, GFP_KERNEL);
+ qm->qp_array = kzalloc_objs(struct hisi_qp, qm->qp_num);
if (!qm->qp_array)
return -ENOMEM;
diff --git a/drivers/crypto/hisilicon/sec2/sec_crypto.c b/drivers/crypto/hisilicon/sec2/sec_crypto.c
index c8b71945f9f8..3373f9be2e42 100644
--- a/drivers/crypto/hisilicon/sec2/sec_crypto.c
+++ b/drivers/crypto/hisilicon/sec2/sec_crypto.c
@@ -569,11 +569,11 @@ static int sec_alloc_qp_ctx_resource(struct sec_ctx *ctx, struct sec_qp_ctx *qp_
struct device *dev = ctx->dev;
int ret = -ENOMEM;
- qp_ctx->req_list = kzalloc_objs(struct sec_req *, q_depth, GFP_KERNEL);
+ qp_ctx->req_list = kzalloc_objs(struct sec_req *, q_depth);
if (!qp_ctx->req_list)
return ret;
- qp_ctx->res = kzalloc_objs(struct sec_alg_res, q_depth, GFP_KERNEL);
+ qp_ctx->res = kzalloc_objs(struct sec_alg_res, q_depth);
if (!qp_ctx->res)
goto err_free_req_list;
qp_ctx->res->depth = q_depth;
diff --git a/drivers/crypto/hisilicon/sec2/sec_main.c b/drivers/crypto/hisilicon/sec2/sec_main.c
index a4db14adc6da..efda8646fc60 100644
--- a/drivers/crypto/hisilicon/sec2/sec_main.c
+++ b/drivers/crypto/hisilicon/sec2/sec_main.c
@@ -420,7 +420,7 @@ struct hisi_qp **sec_create_qps(void)
u8 *type;
int ret;
- qps = kzalloc_objs(struct hisi_qp *, ctx_num, GFP_KERNEL);
+ qps = kzalloc_objs(struct hisi_qp *, ctx_num);
if (!qps)
return NULL;
diff --git a/drivers/crypto/hisilicon/sgl.c b/drivers/crypto/hisilicon/sgl.c
index ab20665cbfbc..1b26077970d4 100644
--- a/drivers/crypto/hisilicon/sgl.c
+++ b/drivers/crypto/hisilicon/sgl.c
@@ -83,7 +83,7 @@ struct hisi_acc_sgl_pool *hisi_acc_create_sgl_pool(struct device *dev,
(remain_sgl > 0 && block_num > HISI_ACC_MEM_BLOCK_NR - 1))
return ERR_PTR(-EINVAL);
- pool = kzalloc_obj(*pool, GFP_KERNEL);
+ pool = kzalloc_obj(*pool);
if (!pool)
return ERR_PTR(-ENOMEM);
block = pool->mem_block;
diff --git a/drivers/crypto/inside-secure/eip93/eip93-aead.c b/drivers/crypto/inside-secure/eip93/eip93-aead.c
index 8d72644fdc74..1a08aed5de13 100644
--- a/drivers/crypto/inside-secure/eip93/eip93-aead.c
+++ b/drivers/crypto/inside-secure/eip93/eip93-aead.c
@@ -70,7 +70,7 @@ static int eip93_aead_cra_init(struct crypto_tfm *tfm)
ctx->type = tmpl->type;
ctx->set_assoc = true;
- ctx->sa_record = kzalloc_obj(*ctx->sa_record, GFP_KERNEL);
+ ctx->sa_record = kzalloc_obj(*ctx->sa_record);
if (!ctx->sa_record)
return -ENOMEM;
diff --git a/drivers/crypto/inside-secure/eip93/eip93-cipher.c b/drivers/crypto/inside-secure/eip93/eip93-cipher.c
index 74f4abeba646..0713c71ab458 100644
--- a/drivers/crypto/inside-secure/eip93/eip93-cipher.c
+++ b/drivers/crypto/inside-secure/eip93/eip93-cipher.c
@@ -61,7 +61,7 @@ static int eip93_skcipher_cra_init(struct crypto_tfm *tfm)
ctx->eip93 = tmpl->eip93;
ctx->type = tmpl->type;
- ctx->sa_record = kzalloc_obj(*ctx->sa_record, GFP_KERNEL);
+ ctx->sa_record = kzalloc_obj(*ctx->sa_record);
if (!ctx->sa_record)
return -ENOMEM;
diff --git a/drivers/crypto/inside-secure/eip93/eip93-common.c b/drivers/crypto/inside-secure/eip93/eip93-common.c
index b19afd311c84..f4ad6beff15e 100644
--- a/drivers/crypto/inside-secure/eip93/eip93-common.c
+++ b/drivers/crypto/inside-secure/eip93/eip93-common.c
@@ -152,7 +152,7 @@ static int eip93_make_sg_copy(struct scatterlist *src, struct scatterlist **dst,
{
void *pages;
- *dst = kmalloc_obj(**dst, GFP_KERNEL);
+ *dst = kmalloc_obj(**dst);
if (!*dst)
return -ENOMEM;
diff --git a/drivers/crypto/inside-secure/safexcel.c b/drivers/crypto/inside-secure/safexcel.c
index 077da171fdf2..660f45ab8647 100644
--- a/drivers/crypto/inside-secure/safexcel.c
+++ b/drivers/crypto/inside-secure/safexcel.c
@@ -1889,7 +1889,7 @@ static int safexcel_pci_probe(struct pci_dev *pdev,
ent->vendor, ent->device, ent->subvendor,
ent->subdevice, ent->driver_data);
- priv = kzalloc_obj(*priv, GFP_KERNEL);
+ priv = kzalloc_obj(*priv);
if (!priv)
return -ENOMEM;
diff --git a/drivers/crypto/inside-secure/safexcel_hash.c b/drivers/crypto/inside-secure/safexcel_hash.c
index f84def61ceb0..3402e570d045 100644
--- a/drivers/crypto/inside-secure/safexcel_hash.c
+++ b/drivers/crypto/inside-secure/safexcel_hash.c
@@ -2008,7 +2008,7 @@ static int safexcel_xcbcmac_cra_init(struct crypto_tfm *tfm)
struct safexcel_ahash_ctx *ctx = crypto_tfm_ctx(tfm);
safexcel_ahash_cra_init(tfm);
- ctx->aes = kmalloc_obj(*ctx->aes, GFP_KERNEL);
+ ctx->aes = kmalloc_obj(*ctx->aes);
return ctx->aes == NULL ? -ENOMEM : 0;
}
diff --git a/drivers/crypto/intel/iaa/iaa_crypto_main.c b/drivers/crypto/intel/iaa/iaa_crypto_main.c
index bcd2bfcc19af..547abf453d4a 100644
--- a/drivers/crypto/intel/iaa/iaa_crypto_main.c
+++ b/drivers/crypto/intel/iaa/iaa_crypto_main.c
@@ -335,7 +335,7 @@ int add_iaa_compression_mode(const char *name,
goto out;
}
- mode = kzalloc_obj(*mode, GFP_KERNEL);
+ mode = kzalloc_obj(*mode);
if (!mode)
goto out;
@@ -422,7 +422,7 @@ static int init_device_compression_mode(struct iaa_device *iaa_device,
struct iaa_device_compression_mode *device_mode;
int ret = -ENOMEM;
- device_mode = kzalloc_obj(*device_mode, GFP_KERNEL);
+ device_mode = kzalloc_obj(*device_mode);
if (!device_mode)
return -ENOMEM;
@@ -503,7 +503,7 @@ static struct iaa_device *iaa_device_alloc(void)
{
struct iaa_device *iaa_device;
- iaa_device = kzalloc_obj(*iaa_device, GFP_KERNEL);
+ iaa_device = kzalloc_obj(*iaa_device);
if (!iaa_device)
return NULL;
@@ -561,7 +561,7 @@ static int add_iaa_wq(struct iaa_device *iaa_device, struct idxd_wq *wq,
struct device *dev = &pdev->dev;
struct iaa_wq *iaa_wq;
- iaa_wq = kzalloc_obj(*iaa_wq, GFP_KERNEL);
+ iaa_wq = kzalloc_obj(*iaa_wq);
if (!iaa_wq)
return -ENOMEM;
@@ -718,7 +718,7 @@ static int alloc_wq_table(int max_wqs)
for (cpu = 0; cpu < nr_cpus; cpu++) {
entry = per_cpu_ptr(wq_table, cpu);
- entry->wqs = kzalloc_objs(*entry->wqs, max_wqs, GFP_KERNEL);
+ entry->wqs = kzalloc_objs(*entry->wqs, max_wqs);
if (!entry->wqs) {
free_wq_table();
return -ENOMEM;
diff --git a/drivers/crypto/intel/keembay/ocs-hcu.c b/drivers/crypto/intel/keembay/ocs-hcu.c
index 2c9e523361df..87711068d747 100644
--- a/drivers/crypto/intel/keembay/ocs-hcu.c
+++ b/drivers/crypto/intel/keembay/ocs-hcu.c
@@ -491,7 +491,7 @@ struct ocs_hcu_dma_list *ocs_hcu_dma_list_alloc(struct ocs_hcu_dev *hcu_dev,
{
struct ocs_hcu_dma_list *dma_list;
- dma_list = kmalloc_obj(*dma_list, GFP_KERNEL);
+ dma_list = kmalloc_obj(*dma_list);
if (!dma_list)
return NULL;
diff --git a/drivers/crypto/intel/qat/qat_common/adf_accel_engine.c b/drivers/crypto/intel/qat/qat_common/adf_accel_engine.c
index 935f4f9d8a7c..f9f1018a2823 100644
--- a/drivers/crypto/intel/qat/qat_common/adf_accel_engine.c
+++ b/drivers/crypto/intel/qat/qat_common/adf_accel_engine.c
@@ -178,7 +178,7 @@ int adf_ae_init(struct adf_accel_dev *accel_dev)
if (!hw_device->fw_name)
return 0;
- loader_data = kzalloc_obj(*loader_data, GFP_KERNEL);
+ loader_data = kzalloc_obj(*loader_data);
if (!loader_data)
return -ENOMEM;
diff --git a/drivers/crypto/intel/qat/qat_common/adf_aer.c b/drivers/crypto/intel/qat/qat_common/adf_aer.c
index a65e88d28f53..ed01fb9ad74e 100644
--- a/drivers/crypto/intel/qat/qat_common/adf_aer.c
+++ b/drivers/crypto/intel/qat/qat_common/adf_aer.c
@@ -160,7 +160,7 @@ static int adf_dev_aer_schedule_reset(struct adf_accel_dev *accel_dev,
return 0;
set_bit(ADF_STATUS_RESTARTING, &accel_dev->status);
- reset_data = kzalloc_obj(*reset_data, GFP_KERNEL);
+ reset_data = kzalloc_obj(*reset_data);
if (!reset_data)
return -ENOMEM;
reset_data->accel_dev = accel_dev;
diff --git a/drivers/crypto/intel/qat/qat_common/adf_cfg.c b/drivers/crypto/intel/qat/qat_common/adf_cfg.c
index c348d290fc51..c202209f17d5 100644
--- a/drivers/crypto/intel/qat/qat_common/adf_cfg.c
+++ b/drivers/crypto/intel/qat/qat_common/adf_cfg.c
@@ -68,7 +68,7 @@ int adf_cfg_dev_add(struct adf_accel_dev *accel_dev)
{
struct adf_cfg_device_data *dev_cfg_data;
- dev_cfg_data = kzalloc_obj(*dev_cfg_data, GFP_KERNEL);
+ dev_cfg_data = kzalloc_obj(*dev_cfg_data);
if (!dev_cfg_data)
return -ENOMEM;
INIT_LIST_HEAD(&dev_cfg_data->sec_list);
@@ -289,7 +289,7 @@ int adf_cfg_add_key_value_param(struct adf_accel_dev *accel_dev,
if (!section)
return -EFAULT;
- key_val = kzalloc_obj(*key_val, GFP_KERNEL);
+ key_val = kzalloc_obj(*key_val);
if (!key_val)
return -ENOMEM;
@@ -356,7 +356,7 @@ int adf_cfg_section_add(struct adf_accel_dev *accel_dev, const char *name)
if (sec)
return 0;
- sec = kzalloc_obj(*sec, GFP_KERNEL);
+ sec = kzalloc_obj(*sec);
if (!sec)
return -ENOMEM;
diff --git a/drivers/crypto/intel/qat/qat_common/adf_dev_mgr.c b/drivers/crypto/intel/qat/qat_common/adf_dev_mgr.c
index 2068fe29a24c..e050de16ab5d 100644
--- a/drivers/crypto/intel/qat/qat_common/adf_dev_mgr.c
+++ b/drivers/crypto/intel/qat/qat_common/adf_dev_mgr.c
@@ -172,7 +172,7 @@ int adf_devmgr_add_dev(struct adf_accel_dev *accel_dev,
goto unlock;
}
num_devices++;
- map = kzalloc_obj(*map, GFP_KERNEL);
+ map = kzalloc_obj(*map);
if (!map) {
ret = -ENOMEM;
goto unlock;
@@ -204,7 +204,7 @@ int adf_devmgr_add_dev(struct adf_accel_dev *accel_dev,
goto unlock;
}
- map = kzalloc_obj(*map, GFP_KERNEL);
+ map = kzalloc_obj(*map);
if (!map) {
ret = -ENOMEM;
goto unlock;
diff --git a/drivers/crypto/intel/qat/qat_common/adf_gen4_vf_mig.c b/drivers/crypto/intel/qat/qat_common/adf_gen4_vf_mig.c
index 622da38ce385..bf2bae78a40d 100644
--- a/drivers/crypto/intel/qat/qat_common/adf_gen4_vf_mig.c
+++ b/drivers/crypto/intel/qat/qat_common/adf_gen4_vf_mig.c
@@ -59,7 +59,7 @@ static int adf_gen4_vfmig_open_device(struct qat_mig_dev *mdev)
vf_info = &accel_dev->pf.vf_info[mdev->vf_id];
- vfmig = kzalloc_obj(*vfmig, GFP_KERNEL);
+ vfmig = kzalloc_obj(*vfmig);
if (!vfmig)
return -ENOMEM;
diff --git a/drivers/crypto/intel/qat/qat_common/adf_heartbeat.c b/drivers/crypto/intel/qat/qat_common/adf_heartbeat.c
index 95a9efceda6d..0cdb4241f04b 100644
--- a/drivers/crypto/intel/qat/qat_common/adf_heartbeat.c
+++ b/drivers/crypto/intel/qat/qat_common/adf_heartbeat.c
@@ -281,7 +281,7 @@ int adf_heartbeat_init(struct adf_accel_dev *accel_dev)
{
struct adf_heartbeat *hb;
- hb = kzalloc_obj(*hb, GFP_KERNEL);
+ hb = kzalloc_obj(*hb);
if (!hb)
goto err_ret;
diff --git a/drivers/crypto/intel/qat/qat_common/adf_mstate_mgr.c b/drivers/crypto/intel/qat/qat_common/adf_mstate_mgr.c
index 1fbade552370..f9017e03ec0f 100644
--- a/drivers/crypto/intel/qat/qat_common/adf_mstate_mgr.c
+++ b/drivers/crypto/intel/qat/qat_common/adf_mstate_mgr.c
@@ -37,7 +37,7 @@ struct adf_mstate_mgr *adf_mstate_mgr_new(u8 *buf, u32 size)
{
struct adf_mstate_mgr *mgr;
- mgr = kzalloc_obj(*mgr, GFP_KERNEL);
+ mgr = kzalloc_obj(*mgr);
if (!mgr)
return NULL;
diff --git a/drivers/crypto/intel/qat/qat_common/adf_rl.c b/drivers/crypto/intel/qat/qat_common/adf_rl.c
index 2e037df286cc..997ef448a4df 100644
--- a/drivers/crypto/intel/qat/qat_common/adf_rl.c
+++ b/drivers/crypto/intel/qat/qat_common/adf_rl.c
@@ -622,7 +622,7 @@ static int add_new_sla_entry(struct adf_accel_dev *accel_dev,
struct rl_sla *sla;
int ret = 0;
- sla = kzalloc_obj(*sla, GFP_KERNEL);
+ sla = kzalloc_obj(*sla);
if (!sla) {
ret = -ENOMEM;
goto ret_err;
@@ -1065,7 +1065,7 @@ int adf_rl_init(struct adf_accel_dev *accel_dev)
goto err_ret;
}
- rl = kzalloc_obj(*rl, GFP_KERNEL);
+ rl = kzalloc_obj(*rl);
if (!rl) {
ret = -ENOMEM;
goto err_ret;
diff --git a/drivers/crypto/intel/qat/qat_common/adf_timer.c b/drivers/crypto/intel/qat/qat_common/adf_timer.c
index 3f5267c98ff3..cee965f9368d 100644
--- a/drivers/crypto/intel/qat/qat_common/adf_timer.c
+++ b/drivers/crypto/intel/qat/qat_common/adf_timer.c
@@ -40,7 +40,7 @@ int adf_timer_start(struct adf_accel_dev *accel_dev)
{
struct adf_timer *timer_ctx;
- timer_ctx = kzalloc_obj(*timer_ctx, GFP_KERNEL);
+ timer_ctx = kzalloc_obj(*timer_ctx);
if (!timer_ctx)
return -ENOMEM;
diff --git a/drivers/crypto/intel/qat/qat_common/adf_transport_debug.c b/drivers/crypto/intel/qat/qat_common/adf_transport_debug.c
index a27f1d76998e..a8f853516a3f 100644
--- a/drivers/crypto/intel/qat/qat_common/adf_transport_debug.c
+++ b/drivers/crypto/intel/qat/qat_common/adf_transport_debug.c
@@ -99,7 +99,7 @@ int adf_ring_debugfs_add(struct adf_etr_ring_data *ring, const char *name)
struct adf_etr_ring_debug_entry *ring_debug;
char entry_name[16];
- ring_debug = kzalloc_obj(*ring_debug, GFP_KERNEL);
+ ring_debug = kzalloc_obj(*ring_debug);
if (!ring_debug)
return -ENOMEM;
diff --git a/drivers/crypto/intel/qat/qat_common/qat_hal.c b/drivers/crypto/intel/qat/qat_common/qat_hal.c
index 86523a70b3a9..7a6ba6f22e3e 100644
--- a/drivers/crypto/intel/qat/qat_common/qat_hal.c
+++ b/drivers/crypto/intel/qat/qat_common/qat_hal.c
@@ -832,17 +832,17 @@ int qat_hal_init(struct adf_accel_dev *accel_dev)
struct icp_qat_fw_loader_handle *handle;
int ret = 0;
- handle = kzalloc_obj(*handle, GFP_KERNEL);
+ handle = kzalloc_obj(*handle);
if (!handle)
return -ENOMEM;
- handle->hal_handle = kzalloc_obj(*handle->hal_handle, GFP_KERNEL);
+ handle->hal_handle = kzalloc_obj(*handle->hal_handle);
if (!handle->hal_handle) {
ret = -ENOMEM;
goto out_hal_handle;
}
- handle->chip_info = kzalloc_obj(*handle->chip_info, GFP_KERNEL);
+ handle->chip_info = kzalloc_obj(*handle->chip_info);
if (!handle->chip_info) {
ret = -ENOMEM;
goto out_chip_info;
diff --git a/drivers/crypto/intel/qat/qat_common/qat_mig_dev.c b/drivers/crypto/intel/qat/qat_common/qat_mig_dev.c
index 4fb4b0cac64e..3869ada0190d 100644
--- a/drivers/crypto/intel/qat/qat_common/qat_mig_dev.c
+++ b/drivers/crypto/intel/qat/qat_common/qat_mig_dev.c
@@ -24,7 +24,7 @@ struct qat_mig_dev *qat_vfmig_create(struct pci_dev *pdev, int vf_id)
!ops->load_state || !ops->save_setup || !ops->load_setup)
return ERR_PTR(-EINVAL);
- mdev = kmalloc_obj(*mdev, GFP_KERNEL);
+ mdev = kmalloc_obj(*mdev);
if (!mdev)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/crypto/intel/qat/qat_common/qat_uclo.c b/drivers/crypto/intel/qat/qat_common/qat_uclo.c
index be0cfd9dd09a..30f83f06d185 100644
--- a/drivers/crypto/intel/qat/qat_common/qat_uclo.c
+++ b/drivers/crypto/intel/qat/qat_common/qat_uclo.c
@@ -42,10 +42,10 @@ static int qat_uclo_init_ae_data(struct icp_qat_uclo_objhandle *obj_handle,
} else {
ae_slice->ctx_mask_assigned = 0;
}
- ae_slice->region = kzalloc_obj(*ae_slice->region, GFP_KERNEL);
+ ae_slice->region = kzalloc_obj(*ae_slice->region);
if (!ae_slice->region)
return -ENOMEM;
- ae_slice->page = kzalloc_obj(*ae_slice->page, GFP_KERNEL);
+ ae_slice->page = kzalloc_obj(*ae_slice->page);
if (!ae_slice->page)
goto out_err;
page = ae_slice->page;
@@ -258,7 +258,7 @@ static int qat_uclo_create_batch_init_list(struct icp_qat_fw_loader_handle
init_header = *init_tab_base;
if (!init_header) {
- init_header = kzalloc_obj(*init_header, GFP_KERNEL);
+ init_header = kzalloc_obj(*init_header);
if (!init_header)
return -ENOMEM;
init_header->size = 1;
@@ -270,7 +270,7 @@ static int qat_uclo_create_batch_init_list(struct icp_qat_fw_loader_handle
tail_old = tail_old->next;
tail = tail_old;
for (i = 0; i < init_mem->val_attr_num; i++) {
- mem_init = kzalloc_obj(*mem_init, GFP_KERNEL);
+ mem_init = kzalloc_obj(*mem_init);
if (!mem_init)
goto out_err;
mem_init->ae = ae;
@@ -501,7 +501,7 @@ qat_uclo_map_chunk(char *buf, struct icp_qat_uof_filehdr *file_hdr,
if (file_chunk->checksum != qat_uclo_calc_str_checksum(
chunk, file_chunk->size))
break;
- obj_hdr = kzalloc_obj(*obj_hdr, GFP_KERNEL);
+ obj_hdr = kzalloc_obj(*obj_hdr);
if (!obj_hdr)
break;
obj_hdr->file_buff = chunk;
@@ -634,7 +634,7 @@ static int qat_uclo_map_uimage(struct icp_qat_uclo_objhandle *obj_handle,
if (qat_uclo_check_image_compat(encap_uof_obj, image))
goto out_err;
ae_uimage[j].page =
- kzalloc_obj(struct icp_qat_uclo_encap_page, GFP_KERNEL);
+ kzalloc_obj(struct icp_qat_uclo_encap_page);
if (!ae_uimage[j].page)
goto out_err;
qat_uclo_map_image_page(encap_uof_obj, image,
@@ -1719,7 +1719,7 @@ static int qat_uclo_map_suof_obj(struct icp_qat_fw_loader_handle *handle,
{
struct icp_qat_suof_handle *suof_handle;
- suof_handle = kzalloc_obj(*suof_handle, GFP_KERNEL);
+ suof_handle = kzalloc_obj(*suof_handle);
if (!suof_handle)
return -ENOMEM;
handle->sobj_handle = suof_handle;
@@ -1763,7 +1763,7 @@ static int qat_uclo_map_uof_obj(struct icp_qat_fw_loader_handle *handle,
struct icp_qat_uof_filehdr *filehdr;
struct icp_qat_uclo_objhandle *objhdl;
- objhdl = kzalloc_obj(*objhdl, GFP_KERNEL);
+ objhdl = kzalloc_obj(*objhdl);
if (!objhdl)
return -ENOMEM;
objhdl->obj_buf = kmemdup(addr_ptr, mem_size, GFP_KERNEL);
@@ -2003,7 +2003,7 @@ static int qat_uclo_map_mof_obj(struct icp_qat_fw_loader_handle *handle,
if (qat_uclo_check_mof_format(mof_ptr))
return -EINVAL;
- mobj_handle = kzalloc_obj(*mobj_handle, GFP_KERNEL);
+ mobj_handle = kzalloc_obj(*mobj_handle);
if (!mobj_handle)
return -ENOMEM;
diff --git a/drivers/crypto/marvell/octeontx/otx_cptpf_ucode.c b/drivers/crypto/marvell/octeontx/otx_cptpf_ucode.c
index b35c57a868e7..09e6a8474d1a 100644
--- a/drivers/crypto/marvell/octeontx/otx_cptpf_ucode.c
+++ b/drivers/crypto/marvell/octeontx/otx_cptpf_ucode.c
@@ -318,7 +318,7 @@ static int process_tar_file(struct device *dev,
return -EINVAL;
}
- tar_info = kzalloc_obj(struct tar_ucode_info_t, GFP_KERNEL);
+ tar_info = kzalloc_obj(struct tar_ucode_info_t);
if (!tar_info)
return -ENOMEM;
@@ -412,7 +412,7 @@ static struct tar_arch_info_t *load_tar_archive(struct device *dev,
size_t tar_size;
int ret;
- tar_arch = kzalloc_obj(struct tar_arch_info_t, GFP_KERNEL);
+ tar_arch = kzalloc_obj(struct tar_arch_info_t);
if (!tar_arch)
return NULL;
diff --git a/drivers/crypto/marvell/octeontx/otx_cptvf_main.c b/drivers/crypto/marvell/octeontx/otx_cptvf_main.c
index 32f6616a60eb..587609db6c69 100644
--- a/drivers/crypto/marvell/octeontx/otx_cptvf_main.c
+++ b/drivers/crypto/marvell/octeontx/otx_cptvf_main.c
@@ -31,7 +31,7 @@ static int init_worker_threads(struct otx_cptvf *cptvf)
struct otx_cptvf_wqe_info *cwqe_info;
int i;
- cwqe_info = kzalloc_obj(*cwqe_info, GFP_KERNEL);
+ cwqe_info = kzalloc_obj(*cwqe_info);
if (!cwqe_info)
return -ENOMEM;
@@ -100,7 +100,7 @@ static int alloc_pending_queues(struct otx_cpt_pending_qinfo *pqinfo, u32 qlen,
pqinfo->num_queues = num_queues;
for_each_pending_queue(pqinfo, queue, i) {
- queue->head = kzalloc_objs(*queue->head, qlen, GFP_KERNEL);
+ queue->head = kzalloc_objs(*queue->head, qlen);
if (!queue->head) {
ret = -ENOMEM;
goto pending_qfail;
@@ -212,7 +212,7 @@ static int alloc_command_queues(struct otx_cptvf *cptvf,
queue = &cqinfo->queue[i];
INIT_LIST_HEAD(&queue->chead);
do {
- curr = kzalloc_obj(*curr, GFP_KERNEL);
+ curr = kzalloc_obj(*curr);
if (!curr)
goto cmd_qfail;
diff --git a/drivers/crypto/marvell/octeontx2/otx2_cptpf_ucode.c b/drivers/crypto/marvell/octeontx2/otx2_cptpf_ucode.c
index 97d948fbc4b3..9b0887d7e62c 100644
--- a/drivers/crypto/marvell/octeontx2/otx2_cptpf_ucode.c
+++ b/drivers/crypto/marvell/octeontx2/otx2_cptpf_ucode.c
@@ -372,7 +372,7 @@ static int load_fw(struct device *dev, struct fw_info_t *fw_info,
int ucode_type, ucode_size;
int ret;
- uc_info = kzalloc_obj(*uc_info, GFP_KERNEL);
+ uc_info = kzalloc_obj(*uc_info);
if (!uc_info)
return -ENOMEM;
diff --git a/drivers/crypto/marvell/octeontx2/otx2_cptvf_main.c b/drivers/crypto/marvell/octeontx2/otx2_cptvf_main.c
index bec0a4cd2662..858f851c9c8a 100644
--- a/drivers/crypto/marvell/octeontx2/otx2_cptvf_main.c
+++ b/drivers/crypto/marvell/octeontx2/otx2_cptvf_main.c
@@ -150,7 +150,7 @@ static int init_tasklet_work(struct otx2_cptlfs_info *lfs)
int i, ret = 0;
for (i = 0; i < lfs->lfs_num; i++) {
- wqe = kzalloc_obj(struct otx2_cptlf_wqe, GFP_KERNEL);
+ wqe = kzalloc_obj(struct otx2_cptlf_wqe);
if (!wqe) {
ret = -ENOMEM;
goto cleanup_tasklet;
diff --git a/drivers/crypto/nx/nx-842.c b/drivers/crypto/nx/nx-842.c
index f388027b1256..b61f2545e165 100644
--- a/drivers/crypto/nx/nx-842.c
+++ b/drivers/crypto/nx/nx-842.c
@@ -105,7 +105,7 @@ void *nx842_crypto_alloc_ctx(struct nx842_driver *driver)
{
struct nx842_crypto_ctx *ctx;
- ctx = kzalloc_obj(*ctx, GFP_KERNEL);
+ ctx = kzalloc_obj(*ctx);
if (!ctx)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/crypto/nx/nx-common-powernv.c b/drivers/crypto/nx/nx-common-powernv.c
index a9253e34a0e5..d6185740ff93 100644
--- a/drivers/crypto/nx/nx-common-powernv.c
+++ b/drivers/crypto/nx/nx-common-powernv.c
@@ -810,7 +810,7 @@ static int __init vas_cfg_coproc_info(struct device_node *dn, int chip_id,
return ret;
}
- coproc = kzalloc_obj(*coproc, GFP_KERNEL);
+ coproc = kzalloc_obj(*coproc);
if (!coproc)
return -ENOMEM;
@@ -968,7 +968,7 @@ static int __init nx842_powernv_probe(struct device_node *dn)
return -EINVAL;
}
- coproc = kzalloc_obj(*coproc, GFP_KERNEL);
+ coproc = kzalloc_obj(*coproc);
if (!coproc)
return -ENOMEM;
diff --git a/drivers/crypto/nx/nx-common-pseries.c b/drivers/crypto/nx/nx-common-pseries.c
index ecf84448b797..a6e65c3d2873 100644
--- a/drivers/crypto/nx/nx-common-pseries.c
+++ b/drivers/crypto/nx/nx-common-pseries.c
@@ -1148,7 +1148,7 @@ static void __init nxcop_get_capabilities(void)
u64 feat;
int rc;
- hv_caps = kmalloc_obj(*hv_caps, GFP_KERNEL);
+ hv_caps = kmalloc_obj(*hv_caps);
if (!hv_caps)
return;
/*
@@ -1167,7 +1167,7 @@ static void __init nxcop_get_capabilities(void)
/*
* NX-GZIP feature available
*/
- hv_nxc = kmalloc_obj(*hv_nxc, GFP_KERNEL);
+ hv_nxc = kmalloc_obj(*hv_nxc);
if (!hv_nxc)
return;
/*
@@ -1217,7 +1217,7 @@ static int __init nx842_pseries_init(void)
of_node_put(np);
RCU_INIT_POINTER(devdata, NULL);
- new_devdata = kzalloc_obj(*new_devdata, GFP_KERNEL);
+ new_devdata = kzalloc_obj(*new_devdata);
if (!new_devdata)
return -ENOMEM;
diff --git a/drivers/crypto/omap-crypto.c b/drivers/crypto/omap-crypto.c
index 441f0e5eb458..7bd6869c2b21 100644
--- a/drivers/crypto/omap-crypto.c
+++ b/drivers/crypto/omap-crypto.c
@@ -21,7 +21,7 @@ static int omap_crypto_copy_sg_lists(int total, int bs,
struct scatterlist *tmp;
if (!(flags & OMAP_CRYPTO_FORCE_SINGLE_ENTRY)) {
- new_sg = kmalloc_objs(*new_sg, n, GFP_KERNEL);
+ new_sg = kmalloc_objs(*new_sg, n);
if (!new_sg)
return -ENOMEM;
diff --git a/drivers/crypto/omap-sham.c b/drivers/crypto/omap-sham.c
index 48f6ba92ee93..6a3c7f9277cf 100644
--- a/drivers/crypto/omap-sham.c
+++ b/drivers/crypto/omap-sham.c
@@ -636,7 +636,7 @@ static int omap_sham_copy_sg_lists(struct omap_sham_reqctx *ctx,
if (ctx->bufcnt)
n++;
- ctx->sg = kmalloc_objs(*sg, n, GFP_KERNEL);
+ ctx->sg = kmalloc_objs(*sg, n);
if (!ctx->sg)
return -ENOMEM;
diff --git a/drivers/crypto/qce/aead.c b/drivers/crypto/qce/aead.c
index ffc31a1d72c5..846e1d42775d 100644
--- a/drivers/crypto/qce/aead.c
+++ b/drivers/crypto/qce/aead.c
@@ -762,7 +762,7 @@ static int qce_aead_register_one(const struct qce_aead_def *def, struct qce_devi
struct aead_alg *alg;
int ret;
- tmpl = kzalloc_obj(*tmpl, GFP_KERNEL);
+ tmpl = kzalloc_obj(*tmpl);
if (!tmpl)
return -ENOMEM;
diff --git a/drivers/crypto/qce/sha.c b/drivers/crypto/qce/sha.c
index f09d0d7da518..402e4e64347d 100644
--- a/drivers/crypto/qce/sha.c
+++ b/drivers/crypto/qce/sha.c
@@ -457,7 +457,7 @@ static int qce_ahash_register_one(const struct qce_ahash_def *def,
struct crypto_alg *base;
int ret;
- tmpl = kzalloc_obj(*tmpl, GFP_KERNEL);
+ tmpl = kzalloc_obj(*tmpl);
if (!tmpl)
return -ENOMEM;
diff --git a/drivers/crypto/qce/skcipher.c b/drivers/crypto/qce/skcipher.c
index 1571ede06b86..4ad3a1702010 100644
--- a/drivers/crypto/qce/skcipher.c
+++ b/drivers/crypto/qce/skcipher.c
@@ -440,7 +440,7 @@ static int qce_skcipher_register_one(const struct qce_skcipher_def *def,
struct skcipher_alg *alg;
int ret;
- tmpl = kzalloc_obj(*tmpl, GFP_KERNEL);
+ tmpl = kzalloc_obj(*tmpl);
if (!tmpl)
return -ENOMEM;
diff --git a/drivers/crypto/s5p-sss.c b/drivers/crypto/s5p-sss.c
index ea13b0fd4d89..eece1ff6c62f 100644
--- a/drivers/crypto/s5p-sss.c
+++ b/drivers/crypto/s5p-sss.c
@@ -1056,7 +1056,7 @@ static int s5p_hash_copy_sg_lists(struct s5p_hash_reqctx *ctx,
if (ctx->bufcnt)
n++;
- ctx->sg = kmalloc_objs(*sg, n, GFP_KERNEL);
+ ctx->sg = kmalloc_objs(*sg, n);
if (!ctx->sg) {
ctx->error = true;
return -ENOMEM;
diff --git a/drivers/crypto/tegra/tegra-se-main.c b/drivers/crypto/tegra/tegra-se-main.c
index caca5e365f8b..eb71113ed146 100644
--- a/drivers/crypto/tegra/tegra-se-main.c
+++ b/drivers/crypto/tegra/tegra-se-main.c
@@ -47,7 +47,7 @@ tegra_se_cmdbuf_pin(struct device *dev, struct host1x_bo *bo, enum dma_data_dire
struct host1x_bo_mapping *map;
int err;
- map = kzalloc_obj(*map, GFP_KERNEL);
+ map = kzalloc_obj(*map);
if (!map)
return ERR_PTR(-ENOMEM);
@@ -56,7 +56,7 @@ tegra_se_cmdbuf_pin(struct device *dev, struct host1x_bo *bo, enum dma_data_dire
map->direction = direction;
map->dev = dev;
- map->sgt = kzalloc_obj(*map->sgt, GFP_KERNEL);
+ map->sgt = kzalloc_obj(*map->sgt);
if (!map->sgt) {
err = -ENOMEM;
goto free;
@@ -123,7 +123,7 @@ static struct tegra_se_cmdbuf *tegra_se_host1x_bo_alloc(struct tegra_se *se, ssi
struct tegra_se_cmdbuf *cmdbuf;
struct device *dev = se->dev->parent;
- cmdbuf = kzalloc_obj(*cmdbuf, GFP_KERNEL);
+ cmdbuf = kzalloc_obj(*cmdbuf);
if (!cmdbuf)
return NULL;
diff --git a/drivers/crypto/virtio/virtio_crypto_akcipher_algs.c b/drivers/crypto/virtio/virtio_crypto_akcipher_algs.c
index 01077166b2f1..d8d452cac391 100644
--- a/drivers/crypto/virtio/virtio_crypto_akcipher_algs.c
+++ b/drivers/crypto/virtio/virtio_crypto_akcipher_algs.c
@@ -112,7 +112,7 @@ static int virtio_crypto_alg_akcipher_init_session(struct virtio_crypto_akcipher
if (!pkey)
return -ENOMEM;
- vc_ctrl_req = kzalloc_obj(*vc_ctrl_req, GFP_KERNEL);
+ vc_ctrl_req = kzalloc_obj(*vc_ctrl_req);
if (!vc_ctrl_req) {
err = -ENOMEM;
goto out;
@@ -169,7 +169,7 @@ static int virtio_crypto_alg_akcipher_close_session(struct virtio_crypto_akciphe
if (!ctx->session_valid)
return 0;
- vc_ctrl_req = kzalloc_obj(*vc_ctrl_req, GFP_KERNEL);
+ vc_ctrl_req = kzalloc_obj(*vc_ctrl_req);
if (!vc_ctrl_req)
return -ENOMEM;
diff --git a/drivers/crypto/virtio/virtio_crypto_core.c b/drivers/crypto/virtio/virtio_crypto_core.c
index ae100e315185..a3cdcf67886b 100644
--- a/drivers/crypto/virtio/virtio_crypto_core.c
+++ b/drivers/crypto/virtio/virtio_crypto_core.c
@@ -115,10 +115,10 @@ static int virtcrypto_find_vqs(struct virtio_crypto *vi)
total_vqs = vi->max_data_queues + 1;
/* Allocate space for find_vqs parameters */
- vqs = kzalloc_objs(*vqs, total_vqs, GFP_KERNEL);
+ vqs = kzalloc_objs(*vqs, total_vqs);
if (!vqs)
goto err_vq;
- vqs_info = kzalloc_objs(*vqs_info, total_vqs, GFP_KERNEL);
+ vqs_info = kzalloc_objs(*vqs_info, total_vqs);
if (!vqs_info)
goto err_vqs_info;
diff --git a/drivers/crypto/virtio/virtio_crypto_skcipher_algs.c b/drivers/crypto/virtio/virtio_crypto_skcipher_algs.c
index b25b7982c942..e82fc16cab25 100644
--- a/drivers/crypto/virtio/virtio_crypto_skcipher_algs.c
+++ b/drivers/crypto/virtio/virtio_crypto_skcipher_algs.c
@@ -131,7 +131,7 @@ static int virtio_crypto_alg_skcipher_init_session(
if (!cipher_key)
return -ENOMEM;
- vc_ctrl_req = kzalloc_obj(*vc_ctrl_req, GFP_KERNEL);
+ vc_ctrl_req = kzalloc_obj(*vc_ctrl_req);
if (!vc_ctrl_req) {
err = -ENOMEM;
goto out;
@@ -200,7 +200,7 @@ static int virtio_crypto_alg_skcipher_close_session(
struct virtio_crypto_inhdr *ctrl_status;
struct virtio_crypto_ctrl_request *vc_ctrl_req;
- vc_ctrl_req = kzalloc_obj(*vc_ctrl_req, GFP_KERNEL);
+ vc_ctrl_req = kzalloc_obj(*vc_ctrl_req);
if (!vc_ctrl_req)
return -ENOMEM;
diff --git a/drivers/cxl/acpi.c b/drivers/cxl/acpi.c
index 11320e88eb09..127537628817 100644
--- a/drivers/cxl/acpi.c
+++ b/drivers/cxl/acpi.c
@@ -336,7 +336,7 @@ static void del_cxl_resource(struct resource *res)
static struct resource *alloc_cxl_resource(resource_size_t base,
resource_size_t n, int id)
{
- struct resource *res __free(kfree) = kzalloc_obj(*res, GFP_KERNEL);
+ struct resource *res __free(kfree) = kzalloc_obj(*res);
if (!res)
return NULL;
@@ -825,7 +825,7 @@ static int add_cxl_resources(struct resource *cxl_res)
struct resource *res, *new, *next;
for (res = cxl_res->child; res; res = next) {
- new = kzalloc_obj(*new, GFP_KERNEL);
+ new = kzalloc_obj(*new);
if (!new)
return -ENOMEM;
new->name = res->name;
diff --git a/drivers/cxl/core/cdat.c b/drivers/cxl/core/cdat.c
index a024083bae2d..5c9f07262513 100644
--- a/drivers/cxl/core/cdat.c
+++ b/drivers/cxl/core/cdat.c
@@ -69,7 +69,7 @@ static int cdat_dsmas_handler(union acpi_subtable_headers *header, void *arg,
/* Skip common header */
dsmas = (struct acpi_cdat_dsmas *)(hdr + 1);
- dent = kzalloc_obj(*dent, GFP_KERNEL);
+ dent = kzalloc_obj(*dent);
if (!dent)
return -ENOMEM;
@@ -669,7 +669,7 @@ static int cxl_endpoint_gather_bandwidth(struct cxl_region *cxlr,
perf_ctx = xa_load(usp_xa, index);
if (!perf_ctx) {
struct cxl_perf_ctx *c __free(kfree) =
- kzalloc_obj(*perf_ctx, GFP_KERNEL);
+ kzalloc_obj(*perf_ctx);
if (!c)
return -ENOMEM;
@@ -756,7 +756,7 @@ static struct xarray *cxl_switch_gather_bandwidth(struct cxl_region *cxlr,
bool *gp_is_root)
{
struct xarray *res_xa __free(free_perf_xa) =
- kzalloc_obj(*res_xa, GFP_KERNEL);
+ kzalloc_obj(*res_xa);
struct access_coordinate coords[ACCESS_COORDINATE_MAX];
struct cxl_perf_ctx *ctx, *us_ctx;
unsigned long index, us_index;
@@ -795,7 +795,7 @@ static struct xarray *cxl_switch_gather_bandwidth(struct cxl_region *cxlr,
us_ctx = xa_load(res_xa, us_index);
if (!us_ctx) {
struct cxl_perf_ctx *n __free(kfree) =
- kzalloc_obj(*n, GFP_KERNEL);
+ kzalloc_obj(*n);
if (!n)
return ERR_PTR(-ENOMEM);
@@ -862,7 +862,7 @@ static struct xarray *cxl_switch_gather_bandwidth(struct cxl_region *cxlr,
static struct xarray *cxl_rp_gather_bandwidth(struct xarray *xa)
{
struct xarray *hb_xa __free(free_perf_xa) =
- kzalloc_obj(*hb_xa, GFP_KERNEL);
+ kzalloc_obj(*hb_xa);
struct cxl_perf_ctx *ctx;
unsigned long index;
@@ -879,7 +879,7 @@ static struct xarray *cxl_rp_gather_bandwidth(struct xarray *xa)
hb_ctx = xa_load(hb_xa, hb_index);
if (!hb_ctx) {
struct cxl_perf_ctx *n __free(kfree) =
- kzalloc_obj(*n, GFP_KERNEL);
+ kzalloc_obj(*n);
if (!n)
return ERR_PTR(-ENOMEM);
@@ -906,7 +906,7 @@ static struct xarray *cxl_rp_gather_bandwidth(struct xarray *xa)
static struct xarray *cxl_hb_gather_bandwidth(struct xarray *xa)
{
struct xarray *mw_xa __free(free_perf_xa) =
- kzalloc_obj(*mw_xa, GFP_KERNEL);
+ kzalloc_obj(*mw_xa);
struct cxl_perf_ctx *ctx;
unsigned long index;
@@ -928,7 +928,7 @@ static struct xarray *cxl_hb_gather_bandwidth(struct xarray *xa)
mw_ctx = xa_load(mw_xa, mw_index);
if (!mw_ctx) {
struct cxl_perf_ctx *n __free(kfree) =
- kzalloc_obj(*n, GFP_KERNEL);
+ kzalloc_obj(*n);
if (!n)
return ERR_PTR(-ENOMEM);
@@ -987,7 +987,7 @@ void cxl_region_shared_upstream_bandwidth_update(struct cxl_region *cxlr)
lockdep_assert_held(&cxl_rwsem.dpa);
struct xarray *usp_xa __free(free_perf_xa) =
- kzalloc_obj(*usp_xa, GFP_KERNEL);
+ kzalloc_obj(*usp_xa);
if (!usp_xa)
return;
diff --git a/drivers/cxl/core/edac.c b/drivers/cxl/core/edac.c
index 7f5457adb26c..b321971fef58 100644
--- a/drivers/cxl/core/edac.c
+++ b/drivers/cxl/core/edac.c
@@ -2009,7 +2009,7 @@ static void err_rec_free(void *_cxlmd)
static int devm_cxl_memdev_setup_err_rec(struct cxl_memdev *cxlmd)
{
- struct cxl_mem_err_rec *array_rec = kzalloc_obj(*array_rec, GFP_KERNEL);
+ struct cxl_mem_err_rec *array_rec = kzalloc_obj(*array_rec);
if (!array_rec)
return -ENOMEM;
diff --git a/drivers/cxl/core/features.c b/drivers/cxl/core/features.c
index 2007d8ebe1c4..75c5534ce205 100644
--- a/drivers/cxl/core/features.c
+++ b/drivers/cxl/core/features.c
@@ -204,7 +204,7 @@ int devm_cxl_setup_features(struct cxl_dev_state *cxlds)
return -ENODEV;
struct cxl_features_state *cxlfs __free(kfree) =
- kzalloc_obj(*cxlfs, GFP_KERNEL);
+ kzalloc_obj(*cxlfs);
if (!cxlfs)
return -ENOMEM;
diff --git a/drivers/cxl/core/memdev.c b/drivers/cxl/core/memdev.c
index a81df0de4889..d0159fb19b0f 100644
--- a/drivers/cxl/core/memdev.c
+++ b/drivers/cxl/core/memdev.c
@@ -665,7 +665,7 @@ static struct cxl_memdev *cxl_memdev_alloc(struct cxl_dev_state *cxlds,
struct cdev *cdev;
int rc;
- cxlmd = kzalloc_obj(*cxlmd, GFP_KERNEL);
+ cxlmd = kzalloc_obj(*cxlmd);
if (!cxlmd)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/cxl/core/pmem.c b/drivers/cxl/core/pmem.c
index be7538e58b9c..3c6e76721522 100644
--- a/drivers/cxl/core/pmem.c
+++ b/drivers/cxl/core/pmem.c
@@ -83,7 +83,7 @@ static struct cxl_nvdimm_bridge *cxl_nvdimm_bridge_alloc(struct cxl_port *port)
struct device *dev;
int rc;
- cxl_nvb = kzalloc_obj(*cxl_nvb, GFP_KERNEL);
+ cxl_nvb = kzalloc_obj(*cxl_nvb);
if (!cxl_nvb)
return ERR_PTR(-ENOMEM);
@@ -198,7 +198,7 @@ static struct cxl_nvdimm *cxl_nvdimm_alloc(struct cxl_nvdimm_bridge *cxl_nvb,
struct cxl_nvdimm *cxl_nvd;
struct device *dev;
- cxl_nvd = kzalloc_obj(*cxl_nvd, GFP_KERNEL);
+ cxl_nvd = kzalloc_obj(*cxl_nvd);
if (!cxl_nvd)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/cxl/core/pmu.c b/drivers/cxl/core/pmu.c
index 8eb175c3ff22..57e9a99f3639 100644
--- a/drivers/cxl/core/pmu.c
+++ b/drivers/cxl/core/pmu.c
@@ -33,7 +33,7 @@ int devm_cxl_pmu_add(struct device *parent, struct cxl_pmu_regs *regs,
struct device *dev;
int rc;
- pmu = kzalloc_obj(*pmu, GFP_KERNEL);
+ pmu = kzalloc_obj(*pmu);
if (!pmu)
return -ENOMEM;
diff --git a/drivers/cxl/core/port.c b/drivers/cxl/core/port.c
index 491c7485db60..d6433c544e3c 100644
--- a/drivers/cxl/core/port.c
+++ b/drivers/cxl/core/port.c
@@ -688,11 +688,11 @@ static struct cxl_port *cxl_port_alloc(struct device *uport_dev,
/* No parent_dport, root cxl_port */
if (!parent_dport) {
- cxl_root = kzalloc_obj(*cxl_root, GFP_KERNEL);
+ cxl_root = kzalloc_obj(*cxl_root);
if (!cxl_root)
return ERR_PTR(-ENOMEM);
} else {
- _port = kzalloc_obj(*port, GFP_KERNEL);
+ _port = kzalloc_obj(*port);
if (!_port)
return ERR_PTR(-ENOMEM);
}
@@ -1184,7 +1184,7 @@ __devm_cxl_add_dport(struct cxl_port *port, struct device *dport_dev,
CXL_TARGET_STRLEN)
return ERR_PTR(-EINVAL);
- dport = kzalloc_obj(*dport, GFP_KERNEL);
+ dport = kzalloc_obj(*dport);
if (!dport)
return ERR_PTR(-ENOMEM);
@@ -1350,7 +1350,7 @@ static int cxl_add_ep(struct cxl_dport *dport, struct device *ep_dev)
struct cxl_ep *ep;
int rc;
- ep = kzalloc_obj(*ep, GFP_KERNEL);
+ ep = kzalloc_obj(*ep);
if (!ep)
return -ENOMEM;
@@ -2101,7 +2101,7 @@ struct cxl_endpoint_decoder *cxl_endpoint_decoder_alloc(struct cxl_port *port)
if (!is_cxl_endpoint(port))
return ERR_PTR(-EINVAL);
- cxled = kzalloc_obj(*cxled, GFP_KERNEL);
+ cxled = kzalloc_obj(*cxled);
if (!cxled)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/cxl/core/region.c b/drivers/cxl/core/region.c
index 288448cff91b..e7fedfe8f1b6 100644
--- a/drivers/cxl/core/region.c
+++ b/drivers/cxl/core/region.c
@@ -998,7 +998,7 @@ alloc_region_ref(struct cxl_port *port, struct cxl_region *cxlr,
return ERR_PTR(-EBUSY);
}
- cxl_rr = kzalloc_obj(*cxl_rr, GFP_KERNEL);
+ cxl_rr = kzalloc_obj(*cxl_rr);
if (!cxl_rr)
return ERR_PTR(-ENOMEM);
cxl_rr->port = port;
@@ -2474,7 +2474,7 @@ static struct cxl_region *cxl_region_alloc(struct cxl_root_decoder *cxlrd, int i
struct cxl_region *cxlr;
struct device *dev;
- cxlr = kzalloc_obj(*cxlr, GFP_KERNEL);
+ cxlr = kzalloc_obj(*cxlr);
if (!cxlr) {
memregion_free(id);
return ERR_PTR(-ENOMEM);
@@ -3552,7 +3552,7 @@ static struct cxl_dax_region *cxl_dax_region_alloc(struct cxl_region *cxlr)
if (p->state != CXL_CONFIG_COMMIT)
return ERR_PTR(-ENXIO);
- cxlr_dax = kzalloc_obj(*cxlr_dax, GFP_KERNEL);
+ cxlr_dax = kzalloc_obj(*cxlr_dax);
if (!cxlr_dax)
return ERR_PTR(-ENOMEM);
@@ -3835,7 +3835,7 @@ static int __construct_region(struct cxl_region *cxlr,
set_bit(CXL_REGION_F_AUTO, &cxlr->flags);
cxlr->hpa_range = *hpa_range;
- res = kmalloc_obj(*res, GFP_KERNEL);
+ res = kmalloc_obj(*res);
if (!res)
return -ENOMEM;
diff --git a/drivers/cxl/pmem.c b/drivers/cxl/pmem.c
index ead92ca37a4e..46d37ffef95e 100644
--- a/drivers/cxl/pmem.c
+++ b/drivers/cxl/pmem.c
@@ -426,7 +426,7 @@ static int cxl_pmem_region_probe(struct device *dev)
set_bit(ND_REGION_CXL, &ndr_desc.flags);
set_bit(ND_REGION_PERSIST_MEMCTRL, &ndr_desc.flags);
- info = kmalloc_objs(*info, cxlr_pmem->nr_mappings, GFP_KERNEL);
+ info = kmalloc_objs(*info, cxlr_pmem->nr_mappings);
if (!info)
return -ENOMEM;
diff --git a/drivers/dax/bus.c b/drivers/dax/bus.c
index 3faaaa7a507b..c94c09622516 100644
--- a/drivers/dax/bus.c
+++ b/drivers/dax/bus.c
@@ -110,7 +110,7 @@ static ssize_t do_id_store(struct device_driver *drv, const char *buf,
dax_id = __dax_match_id(dax_drv, buf);
if (!dax_id) {
if (action == ID_ADD) {
- dax_id = kzalloc_obj(*dax_id, GFP_KERNEL);
+ dax_id = kzalloc_obj(*dax_id);
if (dax_id) {
strscpy(dax_id->dev_name, buf, DAX_NAME_LEN);
list_add(&dax_id->list, &dax_drv->ids);
@@ -650,7 +650,7 @@ struct dax_region *alloc_dax_region(struct device *parent, int region_id,
|| !IS_ALIGNED(range_len(range), align))
return NULL;
- dax_region = kzalloc_obj(*dax_region, GFP_KERNEL);
+ dax_region = kzalloc_obj(*dax_region);
if (!dax_region)
return NULL;
@@ -807,7 +807,7 @@ static int devm_register_dax_mapping(struct dev_dax *dev_dax, int range_id)
"region disabled\n"))
return -ENXIO;
- mapping = kzalloc_obj(*mapping, GFP_KERNEL);
+ mapping = kzalloc_obj(*mapping);
if (!mapping)
return -ENOMEM;
mapping->range_id = range_id;
@@ -1427,7 +1427,7 @@ static struct dev_dax *__devm_create_dev_dax(struct dev_dax_data *data)
struct device *dev;
int rc;
- dev_dax = kzalloc_obj(*dev_dax, GFP_KERNEL);
+ dev_dax = kzalloc_obj(*dev_dax);
if (!dev_dax)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/devfreq/devfreq-event.c b/drivers/devfreq/devfreq-event.c
index 36bb954e27ca..179de3cf6d6c 100644
--- a/drivers/devfreq/devfreq-event.c
+++ b/drivers/devfreq/devfreq-event.c
@@ -313,7 +313,7 @@ struct devfreq_event_dev *devfreq_event_add_edev(struct device *dev,
if (!desc->ops->set_event || !desc->ops->get_event)
return ERR_PTR(-EINVAL);
- edev = kzalloc_obj(struct devfreq_event_dev, GFP_KERNEL);
+ edev = kzalloc_obj(struct devfreq_event_dev);
if (!edev)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/devfreq/devfreq.c b/drivers/devfreq/devfreq.c
index 5c094c884aba..c0a74091b904 100644
--- a/drivers/devfreq/devfreq.c
+++ b/drivers/devfreq/devfreq.c
@@ -821,7 +821,7 @@ struct devfreq *devfreq_add_device(struct device *dev,
goto err_out;
}
- devfreq = kzalloc_obj(struct devfreq, GFP_KERNEL);
+ devfreq = kzalloc_obj(struct devfreq);
if (!devfreq) {
err = -ENOMEM;
goto err_out;
diff --git a/drivers/devfreq/governor_passive.c b/drivers/devfreq/governor_passive.c
index c0271cc76bd9..d7feecd900f1 100644
--- a/drivers/devfreq/governor_passive.c
+++ b/drivers/devfreq/governor_passive.c
@@ -310,7 +310,7 @@ static int cpufreq_passive_register_notifier(struct devfreq *devfreq)
continue;
}
- parent_cpu_data = kzalloc_obj(*parent_cpu_data, GFP_KERNEL);
+ parent_cpu_data = kzalloc_obj(*parent_cpu_data);
if (!parent_cpu_data) {
ret = -ENOMEM;
goto err_put_policy;
diff --git a/drivers/dibs/dibs_loopback.c b/drivers/dibs/dibs_loopback.c
index 95ddc7712a89..ec3b48cb0e87 100644
--- a/drivers/dibs/dibs_loopback.c
+++ b/drivers/dibs/dibs_loopback.c
@@ -64,7 +64,7 @@ static int dibs_lo_register_dmb(struct dibs_dev *dibs, struct dibs_dmb *dmb,
if (sba_idx == DIBS_LO_MAX_DMBS)
return -ENOSPC;
- dmb_node = kzalloc_obj(*dmb_node, GFP_KERNEL);
+ dmb_node = kzalloc_obj(*dmb_node);
if (!dmb_node) {
rc = -ENOMEM;
goto err_bit;
@@ -303,7 +303,7 @@ static int dibs_lo_dev_probe(void)
struct dibs_dev *dibs;
int ret;
- ldev = kzalloc_obj(*ldev, GFP_KERNEL);
+ ldev = kzalloc_obj(*ldev);
if (!ldev)
return -ENOMEM;
diff --git a/drivers/dibs/dibs_main.c b/drivers/dibs/dibs_main.c
index b763c4ab1a4e..f1816361b74d 100644
--- a/drivers/dibs/dibs_main.c
+++ b/drivers/dibs/dibs_main.c
@@ -133,7 +133,7 @@ struct dibs_dev *dibs_dev_alloc(void)
{
struct dibs_dev *dibs;
- dibs = kzalloc_obj(*dibs, GFP_KERNEL);
+ dibs = kzalloc_obj(*dibs);
if (!dibs)
return dibs;
dibs->dev.release = dibs_dev_release;
diff --git a/drivers/dio/dio.c b/drivers/dio/dio.c
index 86500b6c4c53..419b3c13d491 100644
--- a/drivers/dio/dio.c
+++ b/drivers/dio/dio.c
@@ -221,7 +221,7 @@ static int __init dio_init(void)
}
/* Found a board, allocate it an entry in the list */
- dev = kzalloc_obj(struct dio_dev, GFP_KERNEL);
+ dev = kzalloc_obj(struct dio_dev);
if (!dev) {
if (scode >= DIOII_SCBASE)
iounmap(va);
diff --git a/drivers/dma-buf/dma-buf-mapping.c b/drivers/dma-buf/dma-buf-mapping.c
index d9374f2ff0ca..794acff2546a 100644
--- a/drivers/dma-buf/dma-buf-mapping.c
+++ b/drivers/dma-buf/dma-buf-mapping.c
@@ -108,7 +108,7 @@ struct sg_table *dma_buf_phys_vec_to_sgt(struct dma_buf_attachment *attach,
/* This function is supposed to work on MMIO memory only */
return ERR_PTR(-EINVAL);
- dma = kzalloc_obj(*dma, GFP_KERNEL);
+ dma = kzalloc_obj(*dma);
if (!dma)
return ERR_PTR(-ENOMEM);
@@ -119,7 +119,7 @@ struct sg_table *dma_buf_phys_vec_to_sgt(struct dma_buf_attachment *attach,
*/
break;
case PCI_P2PDMA_MAP_THRU_HOST_BRIDGE:
- dma->state = kzalloc_obj(*dma->state, GFP_KERNEL);
+ dma->state = kzalloc_obj(*dma->state);
if (!dma->state) {
ret = -ENOMEM;
goto err_free_dma;
diff --git a/drivers/dma-buf/dma-buf.c b/drivers/dma-buf/dma-buf.c
index 71d5e7e42653..11711874a325 100644
--- a/drivers/dma-buf/dma-buf.c
+++ b/drivers/dma-buf/dma-buf.c
@@ -866,7 +866,7 @@ static int dma_buf_wrap_sg_table(struct sg_table **sg_table)
* sg_table without copying the page_link and give only the copy back to
* the importer.
*/
- to = kzalloc_obj(*to, GFP_KERNEL);
+ to = kzalloc_obj(*to);
if (!to)
return -ENOMEM;
@@ -1020,7 +1020,7 @@ dma_buf_dynamic_attach(struct dma_buf *dmabuf, struct device *dev,
if (WARN_ON(importer_ops && !importer_ops->move_notify))
return ERR_PTR(-EINVAL);
- attach = kzalloc_obj(*attach, GFP_KERNEL);
+ attach = kzalloc_obj(*attach);
if (!attach)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/dma-buf/dma-fence-unwrap.c b/drivers/dma-buf/dma-fence-unwrap.c
index dc2525b2a03f..07fe9bf45aea 100644
--- a/drivers/dma-buf/dma-fence-unwrap.c
+++ b/drivers/dma-buf/dma-fence-unwrap.c
@@ -155,7 +155,7 @@ struct dma_fence *__dma_fence_unwrap_merge(unsigned int num_fences,
dma_fence_put(unsignaled);
- array = kmalloc_objs(*array, count, GFP_KERNEL);
+ array = kmalloc_objs(*array, count);
if (!array)
return NULL;
diff --git a/drivers/dma-buf/dma-fence.c b/drivers/dma-buf/dma-fence.c
index 97f0f150e49a..35afcfcac591 100644
--- a/drivers/dma-buf/dma-fence.c
+++ b/drivers/dma-buf/dma-fence.c
@@ -156,7 +156,7 @@ struct dma_fence *dma_fence_allocate_private_stub(ktime_t timestamp)
{
struct dma_fence *fence;
- fence = kzalloc_obj(*fence, GFP_KERNEL);
+ fence = kzalloc_obj(*fence);
if (fence == NULL)
return NULL;
@@ -905,7 +905,7 @@ dma_fence_wait_any_timeout(struct dma_fence **fences, uint32_t count,
return 0;
}
- cb = kzalloc_objs(struct default_wait_cb, count, GFP_KERNEL);
+ cb = kzalloc_objs(struct default_wait_cb, count);
if (cb == NULL) {
ret = -ENOMEM;
goto err_free_cb;
diff --git a/drivers/dma-buf/dma-heap.c b/drivers/dma-buf/dma-heap.c
index e0b9eb871c35..ac5f8685a649 100644
--- a/drivers/dma-buf/dma-heap.c
+++ b/drivers/dma-buf/dma-heap.c
@@ -244,7 +244,7 @@ struct dma_heap *dma_heap_add(const struct dma_heap_export_info *exp_info)
return ERR_PTR(-EINVAL);
}
- heap = kzalloc_obj(*heap, GFP_KERNEL);
+ heap = kzalloc_obj(*heap);
if (!heap)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/dma-buf/heaps/cma_heap.c b/drivers/dma-buf/heaps/cma_heap.c
index 06ed40c9d528..bd3370b9a3f6 100644
--- a/drivers/dma-buf/heaps/cma_heap.c
+++ b/drivers/dma-buf/heaps/cma_heap.c
@@ -74,7 +74,7 @@ static int cma_heap_attach(struct dma_buf *dmabuf,
struct dma_heap_attachment *a;
int ret;
- a = kzalloc_obj(*a, GFP_KERNEL);
+ a = kzalloc_obj(*a);
if (!a)
return -ENOMEM;
@@ -308,7 +308,7 @@ static struct dma_buf *cma_heap_allocate(struct dma_heap *heap,
int ret = -ENOMEM;
pgoff_t pg;
- buffer = kzalloc_obj(*buffer, GFP_KERNEL);
+ buffer = kzalloc_obj(*buffer);
if (!buffer)
return ERR_PTR(-ENOMEM);
@@ -346,7 +346,7 @@ static struct dma_buf *cma_heap_allocate(struct dma_heap *heap,
memset(page_address(cma_pages), 0, size);
}
- buffer->pages = kmalloc_objs(*buffer->pages, pagecount, GFP_KERNEL);
+ buffer->pages = kmalloc_objs(*buffer->pages, pagecount);
if (!buffer->pages) {
ret = -ENOMEM;
goto free_cma;
@@ -391,7 +391,7 @@ static int __init __add_cma_heap(struct cma *cma, const char *name)
struct dma_heap_export_info exp_info;
struct cma_heap *cma_heap;
- cma_heap = kzalloc_obj(*cma_heap, GFP_KERNEL);
+ cma_heap = kzalloc_obj(*cma_heap);
if (!cma_heap)
return -ENOMEM;
cma_heap->cma = cma;
diff --git a/drivers/dma-buf/heaps/system_heap.c b/drivers/dma-buf/heaps/system_heap.c
index 27ba8e55d909..b3650d8fd651 100644
--- a/drivers/dma-buf/heaps/system_heap.c
+++ b/drivers/dma-buf/heaps/system_heap.c
@@ -77,7 +77,7 @@ static int system_heap_attach(struct dma_buf *dmabuf,
struct dma_heap_attachment *a;
int ret;
- a = kzalloc_obj(*a, GFP_KERNEL);
+ a = kzalloc_obj(*a);
if (!a)
return -ENOMEM;
@@ -354,7 +354,7 @@ static struct dma_buf *system_heap_allocate(struct dma_heap *heap,
struct page *page, *tmp_page;
int i, ret = -ENOMEM;
- buffer = kzalloc_obj(*buffer, GFP_KERNEL);
+ buffer = kzalloc_obj(*buffer);
if (!buffer)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/dma-buf/st-dma-fence-chain.c b/drivers/dma-buf/st-dma-fence-chain.c
index 4ae7a6257e57..821023dd34df 100644
--- a/drivers/dma-buf/st-dma-fence-chain.c
+++ b/drivers/dma-buf/st-dma-fence-chain.c
@@ -450,7 +450,7 @@ static int find_race(void *arg)
if (err)
return err;
- threads = kmalloc_objs(*threads, ncpus, GFP_KERNEL);
+ threads = kmalloc_objs(*threads, ncpus);
if (!threads) {
err = -ENOMEM;
goto err;
diff --git a/drivers/dma-buf/st-dma-fence-unwrap.c b/drivers/dma-buf/st-dma-fence-unwrap.c
index 56802a39874e..9c74195f47fd 100644
--- a/drivers/dma-buf/st-dma-fence-unwrap.c
+++ b/drivers/dma-buf/st-dma-fence-unwrap.c
@@ -32,7 +32,7 @@ static struct dma_fence *__mock_fence(u64 context, u64 seqno)
{
struct mock_fence *f;
- f = kmalloc_obj(*f, GFP_KERNEL);
+ f = kmalloc_obj(*f);
if (!f)
return NULL;
@@ -54,7 +54,7 @@ static struct dma_fence *mock_array(unsigned int num_fences, ...)
va_list valist;
int i;
- fences = kzalloc_objs(*fences, num_fences, GFP_KERNEL);
+ fences = kzalloc_objs(*fences, num_fences);
if (!fences)
goto error_put;
diff --git a/drivers/dma-buf/st-dma-resv.c b/drivers/dma-buf/st-dma-resv.c
index fad024820f85..ad4dfb49dcd9 100644
--- a/drivers/dma-buf/st-dma-resv.c
+++ b/drivers/dma-buf/st-dma-resv.c
@@ -27,7 +27,7 @@ static struct dma_fence *alloc_fence(void)
{
struct dma_fence *f;
- f = kmalloc_obj(*f, GFP_KERNEL);
+ f = kmalloc_obj(*f);
if (!f)
return NULL;
diff --git a/drivers/dma-buf/sw_sync.c b/drivers/dma-buf/sw_sync.c
index d04f479edaee..963a72324d16 100644
--- a/drivers/dma-buf/sw_sync.c
+++ b/drivers/dma-buf/sw_sync.c
@@ -101,7 +101,7 @@ static struct sync_timeline *sync_timeline_create(const char *name)
{
struct sync_timeline *obj;
- obj = kzalloc_obj(*obj, GFP_KERNEL);
+ obj = kzalloc_obj(*obj);
if (!obj)
return NULL;
@@ -252,7 +252,7 @@ static struct sync_pt *sync_pt_create(struct sync_timeline *obj,
{
struct sync_pt *pt;
- pt = kzalloc_obj(*pt, GFP_KERNEL);
+ pt = kzalloc_obj(*pt);
if (!pt)
return NULL;
diff --git a/drivers/dma-buf/sync_file.c b/drivers/dma-buf/sync_file.c
index ad2c3e9e23bc..2166bbdf7e4a 100644
--- a/drivers/dma-buf/sync_file.c
+++ b/drivers/dma-buf/sync_file.c
@@ -24,7 +24,7 @@ static struct sync_file *sync_file_alloc(void)
{
struct sync_file *sync_file;
- sync_file = kzalloc_obj(*sync_file, GFP_KERNEL);
+ sync_file = kzalloc_obj(*sync_file);
if (!sync_file)
return NULL;
diff --git a/drivers/dma-buf/udmabuf.c b/drivers/dma-buf/udmabuf.c
index 816ee45f4f99..7173dad6ead5 100644
--- a/drivers/dma-buf/udmabuf.c
+++ b/drivers/dma-buf/udmabuf.c
@@ -115,7 +115,7 @@ static int vmap_udmabuf(struct dma_buf *buf, struct iosys_map *map)
dma_resv_assert_held(buf->resv);
- pages = kvmalloc_objs(*pages, ubuf->pagecount, GFP_KERNEL);
+ pages = kvmalloc_objs(*pages, ubuf->pagecount);
if (!pages)
return -ENOMEM;
@@ -150,7 +150,7 @@ static struct sg_table *get_sg_table(struct device *dev, struct dma_buf *buf,
unsigned int i = 0;
int ret;
- sg = kzalloc_obj(*sg, GFP_KERNEL);
+ sg = kzalloc_obj(*sg);
if (!sg)
return ERR_PTR(-ENOMEM);
@@ -207,11 +207,11 @@ static void unpin_all_folios(struct udmabuf *ubuf)
static __always_inline int init_udmabuf(struct udmabuf *ubuf, pgoff_t pgcnt)
{
- ubuf->folios = kvmalloc_objs(*ubuf->folios, pgcnt, GFP_KERNEL);
+ ubuf->folios = kvmalloc_objs(*ubuf->folios, pgcnt);
if (!ubuf->folios)
return -ENOMEM;
- ubuf->offsets = kvzalloc_objs(*ubuf->offsets, pgcnt, GFP_KERNEL);
+ ubuf->offsets = kvzalloc_objs(*ubuf->offsets, pgcnt);
if (!ubuf->offsets)
return -ENOMEM;
diff --git a/drivers/dma/acpi-dma.c b/drivers/dma/acpi-dma.c
index d7a033822045..be73021ecbd6 100644
--- a/drivers/dma/acpi-dma.c
+++ b/drivers/dma/acpi-dma.c
@@ -189,7 +189,7 @@ int acpi_dma_controller_register(struct device *dev,
if (!adev)
return -EINVAL;
- adma = kzalloc_obj(*adma, GFP_KERNEL);
+ adma = kzalloc_obj(*adma);
if (!adma)
return -ENOMEM;
diff --git a/drivers/dma/amba-pl08x.c b/drivers/dma/amba-pl08x.c
index fb9dad69c314..a960d0467bfc 100644
--- a/drivers/dma/amba-pl08x.c
+++ b/drivers/dma/amba-pl08x.c
@@ -2372,7 +2372,7 @@ static int pl08x_dma_init_virtual_channels(struct pl08x_driver_data *pl08x,
* to cope with that situation.
*/
for (i = 0; i < channels; i++) {
- chan = kzalloc_obj(*chan, GFP_KERNEL);
+ chan = kzalloc_obj(*chan);
if (!chan)
return -ENOMEM;
@@ -2390,7 +2390,7 @@ static int pl08x_dma_init_virtual_channels(struct pl08x_driver_data *pl08x,
chan->signal = i;
pl08x_dma_slave_init(chan);
} else {
- chan->cd = kzalloc_obj(*chan->cd, GFP_KERNEL);
+ chan->cd = kzalloc_obj(*chan->cd);
if (!chan->cd) {
kfree(chan);
return -ENOMEM;
@@ -2709,7 +2709,7 @@ static int pl08x_probe(struct amba_device *adev, const struct amba_id *id)
goto out_no_pl08x;
/* Create the driver state holder */
- pl08x = kzalloc_obj(*pl08x, GFP_KERNEL);
+ pl08x = kzalloc_obj(*pl08x);
if (!pl08x) {
ret = -ENOMEM;
goto out_no_pl08x;
diff --git a/drivers/dma/at_hdmac.c b/drivers/dma/at_hdmac.c
index 935e3264ccec..e5b30a57c477 100644
--- a/drivers/dma/at_hdmac.c
+++ b/drivers/dma/at_hdmac.c
@@ -1818,7 +1818,7 @@ static struct dma_chan *at_dma_xlate(struct of_phandle_args *dma_spec,
dma_cap_zero(mask);
dma_cap_set(DMA_SLAVE, mask);
- atslave = kmalloc_obj(*atslave, GFP_KERNEL);
+ atslave = kmalloc_obj(*atslave);
if (!atslave) {
put_device(&dmac_pdev->dev);
return NULL;
diff --git a/drivers/dma/bestcomm/bestcomm.c b/drivers/dma/bestcomm/bestcomm.c
index e1b259c781ca..432b43520ddc 100644
--- a/drivers/dma/bestcomm/bestcomm.c
+++ b/drivers/dma/bestcomm/bestcomm.c
@@ -393,7 +393,7 @@ static int mpc52xx_bcom_probe(struct platform_device *op)
}
/* Get a clean struct */
- bcom_eng = kzalloc_obj(struct bcom_engine, GFP_KERNEL);
+ bcom_eng = kzalloc_obj(struct bcom_engine);
if (!bcom_eng) {
rv = -ENOMEM;
goto error_sramclean;
diff --git a/drivers/dma/bestcomm/sram.c b/drivers/dma/bestcomm/sram.c
index c34639c30986..09ef5142c26c 100644
--- a/drivers/dma/bestcomm/sram.c
+++ b/drivers/dma/bestcomm/sram.c
@@ -48,7 +48,7 @@ int bcom_sram_init(struct device_node *sram_node, char *owner)
return -EBUSY;
}
- bcom_sram = kmalloc_obj(struct bcom_sram, GFP_KERNEL);
+ bcom_sram = kmalloc_obj(struct bcom_sram);
if (!bcom_sram) {
printk(KERN_ERR "%s: bcom_sram_init: "
"Couldn't allocate internal state !\n", owner);
diff --git a/drivers/dma/dmaengine.c b/drivers/dma/dmaengine.c
index b43a7b3a6a8d..27a8980b03dd 100644
--- a/drivers/dma/dmaengine.c
+++ b/drivers/dma/dmaengine.c
@@ -1075,7 +1075,7 @@ static int __dma_async_device_channel_register(struct dma_device *device,
chan->local = alloc_percpu(typeof(*chan->local));
if (!chan->local)
return -ENOMEM;
- chan->dev = kzalloc_obj(*chan->dev, GFP_KERNEL);
+ chan->dev = kzalloc_obj(*chan->dev);
if (!chan->dev) {
rc = -ENOMEM;
goto err_free_local;
diff --git a/drivers/dma/dmatest.c b/drivers/dma/dmatest.c
index 1a18b8985afc..df38681a1ff4 100644
--- a/drivers/dma/dmatest.c
+++ b/drivers/dma/dmatest.c
@@ -677,11 +677,11 @@ static int dmatest_func(void *data)
set_user_nice(current, 10);
- srcs = kzalloc_objs(dma_addr_t, src->cnt, GFP_KERNEL);
+ srcs = kzalloc_objs(dma_addr_t, src->cnt);
if (!srcs)
goto err_dst;
- dma_pq = kzalloc_objs(dma_addr_t, dst->cnt, GFP_KERNEL);
+ dma_pq = kzalloc_objs(dma_addr_t, dst->cnt);
if (!dma_pq)
goto err_srcs_array;
@@ -987,7 +987,7 @@ static int dmatest_add_threads(struct dmatest_info *info,
return -EINVAL;
for (i = 0; i < params->threads_per_chan; i++) {
- thread = kzalloc_obj(struct dmatest_thread, GFP_KERNEL);
+ thread = kzalloc_obj(struct dmatest_thread);
if (!thread) {
pr_warn("No memory for %s-%s%u\n",
dma_chan_name(chan), op, i);
@@ -1025,7 +1025,7 @@ static int dmatest_add_channel(struct dmatest_info *info,
unsigned int thread_count = 0;
int cnt;
- dtc = kmalloc_obj(struct dmatest_chan, GFP_KERNEL);
+ dtc = kmalloc_obj(struct dmatest_chan);
if (!dtc) {
pr_warn("No memory for %s\n", dma_chan_name(chan));
return -ENOMEM;
diff --git a/drivers/dma/dw-edma/dw-edma-pcie.c b/drivers/dma/dw-edma/dw-edma-pcie.c
index df599b563124..83230acaa597 100644
--- a/drivers/dma/dw-edma/dw-edma-pcie.c
+++ b/drivers/dma/dw-edma/dw-edma-pcie.c
@@ -167,7 +167,7 @@ static int dw_edma_pcie_probe(struct pci_dev *pdev,
int i, mask;
struct dw_edma_pcie_data *vsec_data __free(kfree) =
- kmalloc_obj(*vsec_data, GFP_KERNEL);
+ kmalloc_obj(*vsec_data);
if (!vsec_data)
return -ENOMEM;
diff --git a/drivers/dma/dw/rzn1-dmamux.c b/drivers/dma/dw/rzn1-dmamux.c
index b0b4ccae2c77..fb495ee6edfc 100644
--- a/drivers/dma/dw/rzn1-dmamux.c
+++ b/drivers/dma/dw/rzn1-dmamux.c
@@ -53,7 +53,7 @@ static void *rzn1_dmamux_route_allocate(struct of_phandle_args *dma_spec,
goto put_device;
}
- map = kzalloc_obj(*map, GFP_KERNEL);
+ map = kzalloc_obj(*map);
if (!map) {
ret = -ENOMEM;
goto put_device;
diff --git a/drivers/dma/ep93xx_dma.c b/drivers/dma/ep93xx_dma.c
index 375f608c8266..8eceb96d058c 100644
--- a/drivers/dma/ep93xx_dma.c
+++ b/drivers/dma/ep93xx_dma.c
@@ -966,7 +966,7 @@ static int ep93xx_dma_alloc_chan_resources(struct dma_chan *chan)
for (i = 0; i < DMA_MAX_CHAN_DESCRIPTORS; i++) {
struct ep93xx_dma_desc *desc;
- desc = kzalloc_obj(*desc, GFP_KERNEL);
+ desc = kzalloc_obj(*desc);
if (!desc) {
dev_warn(chan2dev(edmac), "not enough descriptors\n");
break;
diff --git a/drivers/dma/fsl-dpaa2-qdma/dpaa2-qdma.c b/drivers/dma/fsl-dpaa2-qdma/dpaa2-qdma.c
index 206e6bdaf99d..bf771251264d 100644
--- a/drivers/dma/fsl-dpaa2-qdma/dpaa2-qdma.c
+++ b/drivers/dma/fsl-dpaa2-qdma/dpaa2-qdma.c
@@ -353,7 +353,7 @@ static int __cold dpaa2_qdma_setup(struct fsl_mc_device *ls_dev)
}
priv->num_pairs = min(priv->dpdmai_attr.num_of_priorities, prio_def);
- ppriv = kzalloc_objs(*ppriv, priv->num_pairs, GFP_KERNEL);
+ ppriv = kzalloc_objs(*ppriv, priv->num_pairs);
if (!ppriv) {
err = -ENOMEM;
goto exit;
@@ -659,7 +659,7 @@ static int dpaa2_qdma_probe(struct fsl_mc_device *dpdmai_dev)
struct dpaa2_qdma_priv *priv;
int err;
- priv = kzalloc_obj(*priv, GFP_KERNEL);
+ priv = kzalloc_obj(*priv);
if (!priv)
return -ENOMEM;
dev_set_drvdata(dev, priv);
@@ -707,7 +707,7 @@ static int dpaa2_qdma_probe(struct fsl_mc_device *dpdmai_dev)
goto err_enable;
}
- dpaa2_qdma = kzalloc_obj(*dpaa2_qdma, GFP_KERNEL);
+ dpaa2_qdma = kzalloc_obj(*dpaa2_qdma);
if (!dpaa2_qdma) {
err = -ENOMEM;
goto err_eng;
diff --git a/drivers/dma/fsl-qdma.c b/drivers/dma/fsl-qdma.c
index db863bf7b0e6..0bbff9df362f 100644
--- a/drivers/dma/fsl-qdma.c
+++ b/drivers/dma/fsl-qdma.c
@@ -406,7 +406,7 @@ static int fsl_qdma_pre_request_enqueue_desc(struct fsl_qdma_queue *queue)
struct fsl_qdma_comp *comp_temp, *_comp_temp;
for (i = 0; i < queue->n_cq + FSL_COMMAND_QUEUE_OVERFLLOW; i++) {
- comp_temp = kzalloc_obj(*comp_temp, GFP_KERNEL);
+ comp_temp = kzalloc_obj(*comp_temp);
if (!comp_temp)
goto err_alloc;
comp_temp->virt_addr =
diff --git a/drivers/dma/fsl_raid.c b/drivers/dma/fsl_raid.c
index 5ba9a14bb78a..99945845d8b5 100644
--- a/drivers/dma/fsl_raid.c
+++ b/drivers/dma/fsl_raid.c
@@ -579,7 +579,7 @@ static int fsl_re_alloc_chan_resources(struct dma_chan *chan)
re_chan = container_of(chan, struct fsl_re_chan, chan);
for (i = 0; i < FSL_RE_MIN_DESCS; i++) {
- desc = kzalloc_obj(*desc, GFP_KERNEL);
+ desc = kzalloc_obj(*desc);
if (!desc)
break;
diff --git a/drivers/dma/fsldma.c b/drivers/dma/fsldma.c
index 1525b6fe54b4..22d62d958abd 100644
--- a/drivers/dma/fsldma.c
+++ b/drivers/dma/fsldma.c
@@ -1111,7 +1111,7 @@ static int fsl_dma_chan_probe(struct fsldma_device *fdev,
int err;
/* alloc channel */
- chan = kzalloc_obj(*chan, GFP_KERNEL);
+ chan = kzalloc_obj(*chan);
if (!chan) {
err = -ENOMEM;
goto out_return;
@@ -1218,7 +1218,7 @@ static int fsldma_of_probe(struct platform_device *op)
unsigned int i;
int err;
- fdev = kzalloc_obj(*fdev, GFP_KERNEL);
+ fdev = kzalloc_obj(*fdev);
if (!fdev) {
err = -ENOMEM;
goto out_return;
diff --git a/drivers/dma/idxd/cdev.c b/drivers/dma/idxd/cdev.c
index 49fcc429d262..c37d233535f9 100644
--- a/drivers/dma/idxd/cdev.c
+++ b/drivers/dma/idxd/cdev.c
@@ -232,7 +232,7 @@ static int idxd_cdev_open(struct inode *inode, struct file *filp)
dev_dbg(dev, "%s called: %d\n", __func__, idxd_wq_refcount(wq));
- ctx = kzalloc_obj(*ctx, GFP_KERNEL);
+ ctx = kzalloc_obj(*ctx);
if (!ctx)
return -ENOMEM;
@@ -538,7 +538,7 @@ int idxd_wq_add_cdev(struct idxd_wq *wq)
struct idxd_cdev_context *cdev_ctx;
int rc, minor;
- idxd_cdev = kzalloc_obj(*idxd_cdev, GFP_KERNEL);
+ idxd_cdev = kzalloc_obj(*idxd_cdev);
if (!idxd_cdev)
return -ENOMEM;
diff --git a/drivers/dma/idxd/irq.c b/drivers/dma/idxd/irq.c
index 976d8aaa4517..7782f8c51c32 100644
--- a/drivers/dma/idxd/irq.c
+++ b/drivers/dma/idxd/irq.c
@@ -567,7 +567,7 @@ bool idxd_queue_int_handle_resubmit(struct idxd_desc *desc)
struct idxd_device *idxd = wq->idxd;
struct idxd_resubmit *irw;
- irw = kzalloc_obj(*irw, GFP_KERNEL);
+ irw = kzalloc_obj(*irw);
if (!irw)
return false;
diff --git a/drivers/dma/idxd/perfmon.c b/drivers/dma/idxd/perfmon.c
index 3283841d3ddc..f854bd31a4f5 100644
--- a/drivers/dma/idxd/perfmon.c
+++ b/drivers/dma/idxd/perfmon.c
@@ -128,7 +128,7 @@ static int perfmon_validate_group(struct idxd_pmu *pmu,
struct idxd_pmu *fake_pmu;
int i, ret = 0, n, idx;
- fake_pmu = kzalloc_obj(*fake_pmu, GFP_KERNEL);
+ fake_pmu = kzalloc_obj(*fake_pmu);
if (!fake_pmu)
return -ENOMEM;
@@ -484,7 +484,7 @@ int perfmon_pmu_init(struct idxd_device *idxd)
if (idxd->perfmon_offset == 0)
return -ENODEV;
- idxd_pmu = kzalloc_obj(*idxd_pmu, GFP_KERNEL);
+ idxd_pmu = kzalloc_obj(*idxd_pmu);
if (!idxd_pmu)
return -ENOMEM;
diff --git a/drivers/dma/imx-dma.c b/drivers/dma/imx-dma.c
index d20c14f297a7..81c6276436f8 100644
--- a/drivers/dma/imx-dma.c
+++ b/drivers/dma/imx-dma.c
@@ -746,7 +746,7 @@ static int imxdma_alloc_chan_resources(struct dma_chan *chan)
while (imxdmac->descs_allocated < IMXDMA_MAX_CHAN_DESCRIPTORS) {
struct imxdma_desc *desc;
- desc = kzalloc_obj(*desc, GFP_KERNEL);
+ desc = kzalloc_obj(*desc);
if (!desc)
break;
dma_async_tx_descriptor_init(&desc->desc, chan);
diff --git a/drivers/dma/imx-sdma.c b/drivers/dma/imx-sdma.c
index 4093fba9cc23..4c8196d78001 100644
--- a/drivers/dma/imx-sdma.c
+++ b/drivers/dma/imx-sdma.c
@@ -2288,7 +2288,7 @@ static int sdma_probe(struct platform_device *pdev)
sdma->irq = irq;
- sdma->script_addrs = kzalloc_obj(*sdma->script_addrs, GFP_KERNEL);
+ sdma->script_addrs = kzalloc_obj(*sdma->script_addrs);
if (!sdma->script_addrs) {
ret = -ENOMEM;
goto err_irq;
diff --git a/drivers/dma/ioat/init.c b/drivers/dma/ioat/init.c
index a4e539e48444..737496391109 100644
--- a/drivers/dma/ioat/init.c
+++ b/drivers/dma/ioat/init.c
@@ -574,7 +574,7 @@ static void ioat_enumerate_channels(struct ioatdma_device *ioat_dma)
dev_dbg(dev, "%s: xfercap = %d\n", __func__, 1 << xfercap_log);
for (i = 0; i < chancnt; i++) {
- ioat_chan = kzalloc_obj(*ioat_chan, GFP_KERNEL);
+ ioat_chan = kzalloc_obj(*ioat_chan);
if (!ioat_chan)
break;
@@ -1332,7 +1332,7 @@ static void release_ioatdma(struct dma_device *device)
static struct ioatdma_device *
alloc_ioatdma(struct pci_dev *pdev, void __iomem *iobase)
{
- struct ioatdma_device *d = kzalloc_obj(*d, GFP_KERNEL);
+ struct ioatdma_device *d = kzalloc_obj(*d);
if (!d)
return NULL;
diff --git a/drivers/dma/mpc512x_dma.c b/drivers/dma/mpc512x_dma.c
index 37550b42c30e..0adc8e01057e 100644
--- a/drivers/dma/mpc512x_dma.c
+++ b/drivers/dma/mpc512x_dma.c
@@ -503,7 +503,7 @@ static int mpc_dma_alloc_chan_resources(struct dma_chan *chan)
/* Alloc descriptors for this channel */
for (i = 0; i < MPC_DMA_DESCRIPTORS; i++) {
- mdesc = kzalloc_obj(struct mpc_dma_desc, GFP_KERNEL);
+ mdesc = kzalloc_obj(struct mpc_dma_desc);
if (!mdesc) {
dev_notice(mdma->dma.dev,
"Memory allocation error. Allocated only %u descriptors\n", i);
diff --git a/drivers/dma/mv_xor.c b/drivers/dma/mv_xor.c
index f4f65ef44234..25ed61f1b089 100644
--- a/drivers/dma/mv_xor.c
+++ b/drivers/dma/mv_xor.c
@@ -443,7 +443,7 @@ static int mv_xor_alloc_chan_resources(struct dma_chan *chan)
/* Allocate descriptor slots */
idx = mv_chan->slots_allocated;
while (idx < num_descs_in_pool) {
- slot = kzalloc_obj(*slot, GFP_KERNEL);
+ slot = kzalloc_obj(*slot);
if (!slot) {
dev_info(mv_chan_to_devp(mv_chan),
"channel only initialized %d descriptor slots",
diff --git a/drivers/dma/of-dma.c b/drivers/dma/of-dma.c
index d27c74f1669b..53d11063a4f2 100644
--- a/drivers/dma/of-dma.c
+++ b/drivers/dma/of-dma.c
@@ -127,7 +127,7 @@ int of_dma_controller_register(struct device_node *np,
return -EINVAL;
}
- ofdma = kzalloc_obj(*ofdma, GFP_KERNEL);
+ ofdma = kzalloc_obj(*ofdma);
if (!ofdma)
return -ENOMEM;
@@ -194,7 +194,7 @@ int of_dma_router_register(struct device_node *np,
return -EINVAL;
}
- ofdma = kzalloc_obj(*ofdma, GFP_KERNEL);
+ ofdma = kzalloc_obj(*ofdma);
if (!ofdma)
return -ENOMEM;
diff --git a/drivers/dma/pch_dma.c b/drivers/dma/pch_dma.c
index 69560dd8c365..e9fbfd5a3d51 100644
--- a/drivers/dma/pch_dma.c
+++ b/drivers/dma/pch_dma.c
@@ -806,7 +806,7 @@ static int pch_dma_probe(struct pci_dev *pdev,
int i;
nr_channels = id->driver_data;
- pd = kzalloc_obj(*pd, GFP_KERNEL);
+ pd = kzalloc_obj(*pd);
if (!pd)
return -ENOMEM;
diff --git a/drivers/dma/pl330.c b/drivers/dma/pl330.c
index 996c259107e3..25ba84b18704 100644
--- a/drivers/dma/pl330.c
+++ b/drivers/dma/pl330.c
@@ -1887,7 +1887,7 @@ static int dmac_alloc_threads(struct pl330_dmac *pl330)
int i;
/* Allocate 1 Manager and 'chans' Channel threads */
- pl330->channels = kzalloc_objs(*thrd, 1 + chans, GFP_KERNEL);
+ pl330->channels = kzalloc_objs(*thrd, 1 + chans);
if (!pl330->channels)
return -ENOMEM;
@@ -3092,7 +3092,7 @@ pl330_probe(struct amba_device *adev, const struct amba_id *id)
pl330->num_peripherals = num_chan;
- pl330->peripherals = kzalloc_objs(*pch, num_chan, GFP_KERNEL);
+ pl330->peripherals = kzalloc_objs(*pch, num_chan);
if (!pl330->peripherals) {
ret = -ENOMEM;
goto probe_err2;
diff --git a/drivers/dma/plx_dma.c b/drivers/dma/plx_dma.c
index 1958fa8f96e4..33354fc35a43 100644
--- a/drivers/dma/plx_dma.c
+++ b/drivers/dma/plx_dma.c
@@ -384,7 +384,7 @@ static int plx_dma_alloc_desc(struct plx_dma_dev *plxdev)
return -ENOMEM;
for (i = 0; i < PLX_DMA_RING_COUNT; i++) {
- desc = kzalloc_obj(*desc, GFP_KERNEL);
+ desc = kzalloc_obj(*desc);
if (!desc)
goto free_and_exit;
@@ -501,7 +501,7 @@ static int plx_dma_create(struct pci_dev *pdev)
struct dma_chan *chan;
int rc;
- plxdev = kzalloc_obj(*plxdev, GFP_KERNEL);
+ plxdev = kzalloc_obj(*plxdev);
if (!plxdev)
return -ENOMEM;
diff --git a/drivers/dma/ppc4xx/adma.c b/drivers/dma/ppc4xx/adma.c
index 7c08e80dcc4c..279a431ccae3 100644
--- a/drivers/dma/ppc4xx/adma.c
+++ b/drivers/dma/ppc4xx/adma.c
@@ -1781,7 +1781,7 @@ static int ppc440spe_adma_alloc_chan_resources(struct dma_chan *chan)
db_sz = sizeof(struct xor_cb);
for (; i < (ppc440spe_chan->device->pool_size / db_sz); i++) {
- slot = kzalloc_obj(struct ppc440spe_adma_desc_slot, GFP_KERNEL);
+ slot = kzalloc_obj(struct ppc440spe_adma_desc_slot);
if (!slot) {
printk(KERN_INFO "SPE ADMA Channel only initialized"
" %d descriptor slots", i--);
@@ -4063,7 +4063,7 @@ static int ppc440spe_adma_probe(struct platform_device *ofdev)
}
/* create a device */
- adev = kzalloc_obj(*adev, GFP_KERNEL);
+ adev = kzalloc_obj(*adev);
if (!adev) {
initcode = PPC_ADMA_INIT_ALLOC;
ret = -ENOMEM;
@@ -4123,7 +4123,7 @@ static int ppc440spe_adma_probe(struct platform_device *ofdev)
platform_set_drvdata(ofdev, adev);
/* create a channel */
- chan = kzalloc_obj(*chan, GFP_KERNEL);
+ chan = kzalloc_obj(*chan);
if (!chan) {
initcode = PPC_ADMA_INIT_CHANNEL;
ret = -ENOMEM;
@@ -4160,7 +4160,7 @@ static int ppc440spe_adma_probe(struct platform_device *ofdev)
PAGE_SIZE, DMA_BIDIRECTIONAL);
}
- ref = kmalloc_obj(*ref, GFP_KERNEL);
+ ref = kmalloc_obj(*ref);
if (ref) {
ref->chan = &chan->common;
INIT_LIST_HEAD(&ref->node);
diff --git a/drivers/dma/pxa_dma.c b/drivers/dma/pxa_dma.c
index a48ba9fc9f49..fa2ee0b3e09f 100644
--- a/drivers/dma/pxa_dma.c
+++ b/drivers/dma/pxa_dma.c
@@ -342,7 +342,7 @@ static void pxad_init_debugfs(struct pxad_device *pdev)
struct dentry *chandir;
pdev->dbgfs_chan =
- kmalloc_objs(struct dentry *, pdev->nr_chans, GFP_KERNEL);
+ kmalloc_objs(struct dentry *, pdev->nr_chans);
if (!pdev->dbgfs_chan)
return;
diff --git a/drivers/dma/sa11x0-dma.c b/drivers/dma/sa11x0-dma.c
index bcbdaf75db15..a6fa431530e3 100644
--- a/drivers/dma/sa11x0-dma.c
+++ b/drivers/dma/sa11x0-dma.c
@@ -848,7 +848,7 @@ static int sa11x0_dma_init_dmadev(struct dma_device *dmadev,
for (i = 0; i < ARRAY_SIZE(chan_desc); i++) {
struct sa11x0_dma_chan *c;
- c = kzalloc_obj(*c, GFP_KERNEL);
+ c = kzalloc_obj(*c);
if (!c) {
dev_err(dev, "no memory for channel %u\n", i);
return -ENOMEM;
@@ -907,7 +907,7 @@ static int sa11x0_dma_probe(struct platform_device *pdev)
if (!res)
return -ENXIO;
- d = kzalloc_obj(*d, GFP_KERNEL);
+ d = kzalloc_obj(*d);
if (!d) {
ret = -ENOMEM;
goto err_alloc;
diff --git a/drivers/dma/sh/rz-dmac.c b/drivers/dma/sh/rz-dmac.c
index 7f9b45c4553d..d84ca551b2bf 100644
--- a/drivers/dma/sh/rz-dmac.c
+++ b/drivers/dma/sh/rz-dmac.c
@@ -443,7 +443,7 @@ static int rz_dmac_alloc_chan_resources(struct dma_chan *chan)
while (channel->descs_allocated < RZ_DMAC_MAX_CHAN_DESCRIPTORS) {
struct rz_dmac_desc *desc;
- desc = kzalloc_obj(*desc, GFP_KERNEL);
+ desc = kzalloc_obj(*desc);
if (!desc)
break;
diff --git a/drivers/dma/sh/shdma-base.c b/drivers/dma/sh/shdma-base.c
index 59eab919a3e3..89a78e685b1d 100644
--- a/drivers/dma/sh/shdma-base.c
+++ b/drivers/dma/sh/shdma-base.c
@@ -740,7 +740,7 @@ static struct dma_async_tx_descriptor *shdma_prep_dma_cyclic(
* Allocate the sg list dynamically as it would consume too much stack
* space.
*/
- sgl = kmalloc_objs(*sgl, sg_len, GFP_KERNEL);
+ sgl = kmalloc_objs(*sgl, sg_len);
if (!sgl)
return NULL;
@@ -1012,7 +1012,7 @@ int shdma_init(struct device *dev, struct shdma_dev *sdev,
!sdev->ops->desc_completed)
return -EINVAL;
- sdev->schan = kzalloc_objs(*sdev->schan, chan_num, GFP_KERNEL);
+ sdev->schan = kzalloc_objs(*sdev->schan, chan_num);
if (!sdev->schan)
return -ENOMEM;
diff --git a/drivers/dma/stm32/stm32-dmamux.c b/drivers/dma/stm32/stm32-dmamux.c
index 4abd5ba32969..57318715d9f3 100644
--- a/drivers/dma/stm32/stm32-dmamux.c
+++ b/drivers/dma/stm32/stm32-dmamux.c
@@ -104,7 +104,7 @@ static void *stm32_dmamux_route_allocate(struct of_phandle_args *dma_spec,
goto err_put_pdev;
}
- mux = kzalloc_obj(*mux, GFP_KERNEL);
+ mux = kzalloc_obj(*mux);
if (!mux) {
ret = -ENOMEM;
goto err_put_pdev;
diff --git a/drivers/dma/ti/dma-crossbar.c b/drivers/dma/ti/dma-crossbar.c
index cf1ceab10f14..f6d75ee94e8d 100644
--- a/drivers/dma/ti/dma-crossbar.c
+++ b/drivers/dma/ti/dma-crossbar.c
@@ -103,7 +103,7 @@ static void *ti_am335x_xbar_route_allocate(struct of_phandle_args *dma_spec,
goto out_put_pdev;
}
- map = kzalloc_obj(*map, GFP_KERNEL);
+ map = kzalloc_obj(*map);
if (!map) {
of_node_put(dma_spec->np);
map = ERR_PTR(-ENOMEM);
@@ -260,7 +260,7 @@ static void *ti_dra7_xbar_route_allocate(struct of_phandle_args *dma_spec,
goto out_put_pdev;
}
- map = kzalloc_obj(*map, GFP_KERNEL);
+ map = kzalloc_obj(*map);
if (!map) {
of_node_put(dma_spec->np);
map = ERR_PTR(-ENOMEM);
@@ -393,7 +393,7 @@ static int ti_dra7_xbar_probe(struct platform_device *pdev)
if (!nelm)
return -EINVAL;
- rsv_events = kzalloc_objs(*rsv_events, nelm, GFP_KERNEL);
+ rsv_events = kzalloc_objs(*rsv_events, nelm);
if (!rsv_events)
return -ENOMEM;
diff --git a/drivers/dma/ti/k3-udma.c b/drivers/dma/ti/k3-udma.c
index b547b19bc9d8..c964ebfcf3b6 100644
--- a/drivers/dma/ti/k3-udma.c
+++ b/drivers/dma/ti/k3-udma.c
@@ -4686,7 +4686,7 @@ static int udma_setup_resources(struct udma_dev *ud)
irq_res.sets += rm_res->sets;
}
- irq_res.desc = kzalloc_objs(*irq_res.desc, irq_res.sets, GFP_KERNEL);
+ irq_res.desc = kzalloc_objs(*irq_res.desc, irq_res.sets);
if (!irq_res.desc)
return -ENOMEM;
rm_res = tisci_rm->rm_ranges[RM_RANGE_TCHAN];
@@ -4878,7 +4878,7 @@ static int bcdma_setup_resources(struct udma_dev *ud)
}
}
- irq_res.desc = kzalloc_objs(*irq_res.desc, irq_res.sets, GFP_KERNEL);
+ irq_res.desc = kzalloc_objs(*irq_res.desc, irq_res.sets);
if (!irq_res.desc)
return -ENOMEM;
if (ud->bchan_cnt) {
@@ -5080,7 +5080,7 @@ static int pktdma_setup_resources(struct udma_dev *ud)
irq_res.sets += rm_res->sets;
}
- irq_res.desc = kzalloc_objs(*irq_res.desc, irq_res.sets, GFP_KERNEL);
+ irq_res.desc = kzalloc_objs(*irq_res.desc, irq_res.sets);
if (!irq_res.desc)
return -ENOMEM;
rm_res = tisci_rm->rm_ranges[RM_RANGE_TFLOW];
diff --git a/drivers/dma/ti/omap-dma.c b/drivers/dma/ti/omap-dma.c
index 70591c2bf92a..55ece7fd0d99 100644
--- a/drivers/dma/ti/omap-dma.c
+++ b/drivers/dma/ti/omap-dma.c
@@ -1503,7 +1503,7 @@ static int omap_dma_chan_init(struct omap_dmadev *od)
{
struct omap_chan *c;
- c = kzalloc_obj(*c, GFP_KERNEL);
+ c = kzalloc_obj(*c);
if (!c)
return -ENOMEM;
diff --git a/drivers/dma/timb_dma.c b/drivers/dma/timb_dma.c
index 968f8cf19ec0..6f5a214954a5 100644
--- a/drivers/dma/timb_dma.c
+++ b/drivers/dma/timb_dma.c
@@ -325,7 +325,7 @@ static struct timb_dma_desc *td_alloc_init_desc(struct timb_dma_chan *td_chan)
struct timb_dma_desc *td_desc;
int err;
- td_desc = kzalloc_obj(struct timb_dma_desc, GFP_KERNEL);
+ td_desc = kzalloc_obj(struct timb_dma_desc);
if (!td_desc)
goto out;
diff --git a/drivers/dpll/dpll_core.c b/drivers/dpll/dpll_core.c
index cd41fbedd9fe..3f54754cdec4 100644
--- a/drivers/dpll/dpll_core.c
+++ b/drivers/dpll/dpll_core.c
@@ -205,7 +205,7 @@ dpll_xa_ref_pin_add(struct xarray *xa_pins, struct dpll_pin *pin,
}
if (!ref_exists) {
- ref = kzalloc_obj(*ref, GFP_KERNEL);
+ ref = kzalloc_obj(*ref);
if (!ref)
return -ENOMEM;
ref->pin = pin;
@@ -218,7 +218,7 @@ dpll_xa_ref_pin_add(struct xarray *xa_pins, struct dpll_pin *pin,
refcount_set(&ref->refcount, 1);
}
- reg = kzalloc_obj(*reg, GFP_KERNEL);
+ reg = kzalloc_obj(*reg);
if (!reg) {
if (!ref_exists) {
xa_erase(xa_pins, pin->pin_idx);
@@ -286,7 +286,7 @@ dpll_xa_ref_dpll_add(struct xarray *xa_dplls, struct dpll_device *dpll,
}
if (!ref_exists) {
- ref = kzalloc_obj(*ref, GFP_KERNEL);
+ ref = kzalloc_obj(*ref);
if (!ref)
return -ENOMEM;
ref->dpll = dpll;
@@ -299,7 +299,7 @@ dpll_xa_ref_dpll_add(struct xarray *xa_dplls, struct dpll_device *dpll,
refcount_set(&ref->refcount, 1);
}
- reg = kzalloc_obj(*reg, GFP_KERNEL);
+ reg = kzalloc_obj(*reg);
if (!reg) {
if (!ref_exists) {
xa_erase(xa_dplls, dpll->id);
@@ -360,7 +360,7 @@ dpll_device_alloc(const u64 clock_id, u32 device_idx, struct module *module)
struct dpll_device *dpll;
int ret;
- dpll = kzalloc_obj(*dpll, GFP_KERNEL);
+ dpll = kzalloc_obj(*dpll);
if (!dpll)
return ERR_PTR(-ENOMEM);
refcount_set(&dpll->refcount, 1);
@@ -490,7 +490,7 @@ int dpll_device_register(struct dpll_device *dpll, enum dpll_type type,
return -EEXIST;
}
- reg = kzalloc_obj(*reg, GFP_KERNEL);
+ reg = kzalloc_obj(*reg);
if (!reg) {
mutex_unlock(&dpll_lock);
return -ENOMEM;
@@ -644,7 +644,7 @@ dpll_pin_alloc(u64 clock_id, u32 pin_idx, struct module *module,
} else if (pin_idx > INT_MAX) {
return ERR_PTR(-EINVAL);
}
- pin = kzalloc_obj(*pin, GFP_KERNEL);
+ pin = kzalloc_obj(*pin);
if (!pin) {
ret = -ENOMEM;
goto err_pin_alloc;
diff --git a/drivers/dpll/zl3073x/dpll.c b/drivers/dpll/zl3073x/dpll.c
index e532fedf0d36..d33175d192c8 100644
--- a/drivers/dpll/zl3073x/dpll.c
+++ b/drivers/dpll/zl3073x/dpll.c
@@ -1372,7 +1372,7 @@ zl3073x_dpll_pin_alloc(struct zl3073x_dpll *zldpll, enum dpll_pin_direction dir,
{
struct zl3073x_dpll_pin *pin;
- pin = kzalloc_obj(*pin, GFP_KERNEL);
+ pin = kzalloc_obj(*pin);
if (!pin)
return ERR_PTR(-ENOMEM);
@@ -1944,7 +1944,7 @@ zl3073x_dpll_alloc(struct zl3073x_dev *zldev, u8 ch)
{
struct zl3073x_dpll *zldpll;
- zldpll = kzalloc_obj(*zldpll, GFP_KERNEL);
+ zldpll = kzalloc_obj(*zldpll);
if (!zldpll)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/dpll/zl3073x/fw.c b/drivers/dpll/zl3073x/fw.c
index 56b4eeadf4e3..3acbb33ed7b8 100644
--- a/drivers/dpll/zl3073x/fw.c
+++ b/drivers/dpll/zl3073x/fw.c
@@ -129,7 +129,7 @@ zl3073x_fw_component_alloc(size_t size)
{
struct zl3073x_fw_component *comp;
- comp = kzalloc_obj(*comp, GFP_KERNEL);
+ comp = kzalloc_obj(*comp);
if (!comp)
return NULL;
@@ -313,7 +313,7 @@ struct zl3073x_fw *zl3073x_fw_load(struct zl3073x_dev *zldev, const char *data,
ssize_t rc;
/* Allocate firmware structure */
- fw = kzalloc_obj(*fw, GFP_KERNEL);
+ fw = kzalloc_obj(*fw);
if (!fw)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/dpll/zl3073x/prop.c b/drivers/dpll/zl3073x/prop.c
index 36b843f17156..ac9d41d0f978 100644
--- a/drivers/dpll/zl3073x/prop.c
+++ b/drivers/dpll/zl3073x/prop.c
@@ -198,7 +198,7 @@ struct zl3073x_pin_props *zl3073x_pin_props_get(struct zl3073x_dev *zldev,
const char *type;
u32 curr_freq;
- props = kzalloc_obj(*props, GFP_KERNEL);
+ props = kzalloc_obj(*props);
if (!props)
return ERR_PTR(-ENOMEM);
@@ -289,7 +289,7 @@ struct zl3073x_pin_props *zl3073x_pin_props_get(struct zl3073x_dev *zldev,
skip_fwnode_props:
/* Allocate frequency ranges list - extra slot for current frequency */
- ranges = kzalloc_objs(*ranges, num_freqs + 1, GFP_KERNEL);
+ ranges = kzalloc_objs(*ranges, num_freqs + 1);
if (!ranges) {
rc = -ENOMEM;
goto err_alloc_ranges;
diff --git a/drivers/edac/amd64_edac.c b/drivers/edac/amd64_edac.c
index 183357b9f99a..8908ab881c85 100644
--- a/drivers/edac/amd64_edac.c
+++ b/drivers/edac/amd64_edac.c
@@ -3485,7 +3485,7 @@ static int dct_hw_info_get(struct amd64_pvt *pvt)
static int umc_hw_info_get(struct amd64_pvt *pvt)
{
- pvt->umc = kzalloc_objs(struct amd64_umc, pvt->max_mcs, GFP_KERNEL);
+ pvt->umc = kzalloc_objs(struct amd64_umc, pvt->max_mcs);
if (!pvt->umc)
return -ENOMEM;
@@ -3716,7 +3716,7 @@ static int gpu_hw_info_get(struct amd64_pvt *pvt)
if (ret)
return ret;
- pvt->umc = kzalloc_objs(struct amd64_umc, pvt->max_mcs, GFP_KERNEL);
+ pvt->umc = kzalloc_objs(struct amd64_umc, pvt->max_mcs);
if (!pvt->umc)
return -ENOMEM;
@@ -3916,7 +3916,7 @@ static int per_family_init(struct amd64_pvt *pvt)
scnprintf(pvt->ctl_name, sizeof(pvt->ctl_name), "F%02Xh_M%02Xh",
pvt->fam, pvt->model);
- pvt->csels = kzalloc_objs(*pvt->csels, pvt->max_mcs, GFP_KERNEL);
+ pvt->csels = kzalloc_objs(*pvt->csels, pvt->max_mcs);
if (!pvt->csels)
return -ENOMEM;
@@ -4000,13 +4000,13 @@ static int probe_one_instance(unsigned int nid)
int ret;
ret = -ENOMEM;
- s = kzalloc_obj(struct ecc_settings, GFP_KERNEL);
+ s = kzalloc_obj(struct ecc_settings);
if (!s)
goto err_out;
ecc_stngs[nid] = s;
- pvt = kzalloc_obj(struct amd64_pvt, GFP_KERNEL);
+ pvt = kzalloc_obj(struct amd64_pvt);
if (!pvt)
goto err_settings;
@@ -4146,7 +4146,7 @@ static int __init amd64_edac_init(void)
opstate_init();
err = -ENOMEM;
- ecc_stngs = kzalloc_objs(ecc_stngs[0], amd_nb_num(), GFP_KERNEL);
+ ecc_stngs = kzalloc_objs(ecc_stngs[0], amd_nb_num());
if (!ecc_stngs)
goto err_free;
diff --git a/drivers/edac/edac_device.c b/drivers/edac/edac_device.c
index 6bb6e4d435a4..4ff421b518ce 100644
--- a/drivers/edac/edac_device.c
+++ b/drivers/edac/edac_device.c
@@ -67,7 +67,7 @@ edac_device_alloc_ctl_info(unsigned pvt_sz, char *dev_name, unsigned nr_instance
edac_dbg(4, "instances=%d blocks=%d\n", nr_instances, nr_blocks);
- dev_ctl = kzalloc_obj(struct edac_device_ctl_info, GFP_KERNEL);
+ dev_ctl = kzalloc_obj(struct edac_device_ctl_info);
if (!dev_ctl)
return NULL;
@@ -644,7 +644,7 @@ int edac_dev_register(struct device *parent, char *name,
}
}
- ctx = kzalloc_obj(*ctx, GFP_KERNEL);
+ ctx = kzalloc_obj(*ctx);
if (!ctx)
return -ENOMEM;
@@ -654,7 +654,7 @@ int edac_dev_register(struct device *parent, char *name,
goto ctx_free;
if (scrub_cnt) {
- ctx->scrub = kzalloc_objs(*ctx->scrub, scrub_cnt, GFP_KERNEL);
+ ctx->scrub = kzalloc_objs(*ctx->scrub, scrub_cnt);
if (!ctx->scrub)
goto groups_free;
}
diff --git a/drivers/edac/edac_mc.c b/drivers/edac/edac_mc.c
index 2d74438837f4..47bd26f5086a 100644
--- a/drivers/edac/edac_mc.c
+++ b/drivers/edac/edac_mc.c
@@ -216,14 +216,14 @@ static int edac_mc_alloc_csrows(struct mem_ctl_info *mci)
/*
* Allocate and fill the csrow/channels structs
*/
- mci->csrows = kzalloc_objs(*mci->csrows, tot_csrows, GFP_KERNEL);
+ mci->csrows = kzalloc_objs(*mci->csrows, tot_csrows);
if (!mci->csrows)
return -ENOMEM;
for (row = 0; row < tot_csrows; row++) {
struct csrow_info *csr;
- csr = kzalloc_obj(**mci->csrows, GFP_KERNEL);
+ csr = kzalloc_obj(**mci->csrows);
if (!csr)
return -ENOMEM;
@@ -239,7 +239,7 @@ static int edac_mc_alloc_csrows(struct mem_ctl_info *mci)
for (chn = 0; chn < tot_channels; chn++) {
struct rank_info *chan;
- chan = kzalloc_obj(**csr->channels, GFP_KERNEL);
+ chan = kzalloc_obj(**csr->channels);
if (!chan)
return -ENOMEM;
@@ -262,7 +262,7 @@ static int edac_mc_alloc_dimms(struct mem_ctl_info *mci)
/*
* Allocate and fill the dimm structs
*/
- mci->dimms = kzalloc_objs(*mci->dimms, mci->tot_dimms, GFP_KERNEL);
+ mci->dimms = kzalloc_objs(*mci->dimms, mci->tot_dimms);
if (!mci->dimms)
return -ENOMEM;
@@ -276,7 +276,7 @@ static int edac_mc_alloc_dimms(struct mem_ctl_info *mci)
chan = mci->csrows[row]->channels[chn];
- dimm = kzalloc_obj(**mci->dimms, GFP_KERNEL);
+ dimm = kzalloc_obj(**mci->dimms);
if (!dimm)
return -ENOMEM;
mci->dimms[idx] = dimm;
@@ -362,11 +362,11 @@ struct mem_ctl_info *edac_mc_alloc(unsigned int mc_num,
per_rank = true;
}
- mci = kzalloc_obj(struct mem_ctl_info, GFP_KERNEL);
+ mci = kzalloc_obj(struct mem_ctl_info);
if (!mci)
return NULL;
- mci->layers = kzalloc_objs(struct edac_mc_layer, n_layers, GFP_KERNEL);
+ mci->layers = kzalloc_objs(struct edac_mc_layer, n_layers);
if (!mci->layers)
goto error;
diff --git a/drivers/edac/edac_mc_sysfs.c b/drivers/edac/edac_mc_sysfs.c
index 629158cd505c..c2ed6c696e54 100644
--- a/drivers/edac/edac_mc_sysfs.c
+++ b/drivers/edac/edac_mc_sysfs.c
@@ -648,7 +648,7 @@ int __init edac_mc_sysfs_init(void)
{
int err;
- mci_pdev = kzalloc_obj(*mci_pdev, GFP_KERNEL);
+ mci_pdev = kzalloc_obj(*mci_pdev);
if (!mci_pdev)
return -ENOMEM;
diff --git a/drivers/edac/edac_pci.c b/drivers/edac/edac_pci.c
index c1c9dc6ffa2f..327994a95073 100644
--- a/drivers/edac/edac_pci.c
+++ b/drivers/edac/edac_pci.c
@@ -32,7 +32,7 @@ struct edac_pci_ctl_info *edac_pci_alloc_ctl_info(unsigned int sz_pvt,
edac_dbg(1, "\n");
- pci = kzalloc_obj(struct edac_pci_ctl_info, GFP_KERNEL);
+ pci = kzalloc_obj(struct edac_pci_ctl_info);
if (!pci)
return NULL;
diff --git a/drivers/edac/edac_pci_sysfs.c b/drivers/edac/edac_pci_sysfs.c
index f1b0f3ba7f72..446fef0a9399 100644
--- a/drivers/edac/edac_pci_sysfs.c
+++ b/drivers/edac/edac_pci_sysfs.c
@@ -361,7 +361,7 @@ static int edac_pci_main_kobj_setup(void)
goto decrement_count_fail;
}
- edac_pci_top_main_kobj = kzalloc_obj(struct kobject, GFP_KERNEL);
+ edac_pci_top_main_kobj = kzalloc_obj(struct kobject);
if (!edac_pci_top_main_kobj) {
edac_dbg(1, "Failed to allocate\n");
err = -ENOMEM;
diff --git a/drivers/edac/i7core_edac.c b/drivers/edac/i7core_edac.c
index dd1a5e575230..5a8cd90b39a7 100644
--- a/drivers/edac/i7core_edac.c
+++ b/drivers/edac/i7core_edac.c
@@ -455,7 +455,7 @@ static struct i7core_dev *alloc_i7core_dev(u8 socket,
{
struct i7core_dev *i7core_dev;
- i7core_dev = kzalloc_obj(*i7core_dev, GFP_KERNEL);
+ i7core_dev = kzalloc_obj(*i7core_dev);
if (!i7core_dev)
return NULL;
@@ -1159,7 +1159,7 @@ static int i7core_create_sysfs_devices(struct mem_ctl_info *mci)
struct i7core_pvt *pvt = mci->pvt_info;
int rc;
- pvt->addrmatch_dev = kzalloc_obj(*pvt->addrmatch_dev, GFP_KERNEL);
+ pvt->addrmatch_dev = kzalloc_obj(*pvt->addrmatch_dev);
if (!pvt->addrmatch_dev)
return -ENOMEM;
diff --git a/drivers/edac/igen6_edac.c b/drivers/edac/igen6_edac.c
index fa1cabfe6909..fcb8ab44cba5 100644
--- a/drivers/edac/igen6_edac.c
+++ b/drivers/edac/igen6_edac.c
@@ -1549,7 +1549,7 @@ static int igen6_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
edac_dbg(2, "\n");
- igen6_pvt = kzalloc_obj(*igen6_pvt, GFP_KERNEL);
+ igen6_pvt = kzalloc_obj(*igen6_pvt);
if (!igen6_pvt)
return -ENOMEM;
diff --git a/drivers/edac/imh_base.c b/drivers/edac/imh_base.c
index a37be2372764..722573a2729a 100644
--- a/drivers/edac/imh_base.c
+++ b/drivers/edac/imh_base.c
@@ -171,7 +171,7 @@ static int __get_ddr_munits(struct res_config *cfg, struct skx_dev *d,
d->imc[lmc].lmc = lmc;
/* Create the imc device instance. */
- dev = kzalloc_obj(*dev, GFP_KERNEL);
+ dev = kzalloc_obj(*dev);
if (!dev)
return -ENOMEM;
diff --git a/drivers/edac/sb_edac.c b/drivers/edac/sb_edac.c
index 79fc3ace6a10..fc434739b3c3 100644
--- a/drivers/edac/sb_edac.c
+++ b/drivers/edac/sb_edac.c
@@ -771,7 +771,7 @@ static struct sbridge_dev *alloc_sbridge_dev(int seg, u8 bus, enum domain dom,
{
struct sbridge_dev *sbridge_dev;
- sbridge_dev = kzalloc_obj(*sbridge_dev, GFP_KERNEL);
+ sbridge_dev = kzalloc_obj(*sbridge_dev);
if (!sbridge_dev)
return NULL;
diff --git a/drivers/edac/versalnet_edac.c b/drivers/edac/versalnet_edac.c
index 3cc885fa384c..2cbc13d9bd00 100644
--- a/drivers/edac/versalnet_edac.c
+++ b/drivers/edac/versalnet_edac.c
@@ -559,7 +559,7 @@ static int setup_mcdi(struct mc_priv *mc_priv)
struct cdx_mcdi *amd_mcdi;
int ret, i;
- amd_mcdi = kzalloc_obj(*amd_mcdi, GFP_KERNEL);
+ amd_mcdi = kzalloc_obj(*amd_mcdi);
if (!amd_mcdi)
return -ENOMEM;
@@ -812,7 +812,7 @@ static int init_versalnet(struct mc_priv *priv, struct platform_device *pdev)
priv->mci[i] = mci;
priv->dwidth = dt;
- dev = kzalloc_obj(*dev, GFP_KERNEL);
+ dev = kzalloc_obj(*dev);
dev->release = versal_edac_release;
name = kmalloc(32, GFP_KERNEL);
sprintf(name, "versal-net-ddrmc5-edac-%d", i);
diff --git a/drivers/eisa/eisa-bus.c b/drivers/eisa/eisa-bus.c
index ffabe1bf4c13..79ab44fe26aa 100644
--- a/drivers/eisa/eisa-bus.c
+++ b/drivers/eisa/eisa-bus.c
@@ -317,7 +317,7 @@ static int __init eisa_probe(struct eisa_root_device *root)
/* First try to get hold of slot 0. If there is no device
* here, simply fail, unless root->force_probe is set. */
- edev = kzalloc_obj(*edev, GFP_KERNEL);
+ edev = kzalloc_obj(*edev);
if (!edev)
return -ENOMEM;
@@ -350,7 +350,7 @@ static int __init eisa_probe(struct eisa_root_device *root)
force_probe:
for (c = 0, i = 1; i <= root->slots; i++) {
- edev = kzalloc_obj(*edev, GFP_KERNEL);
+ edev = kzalloc_obj(*edev);
if (!edev) {
dev_err(root->dev, "EISA: Out of memory for slot %d\n",
i);
diff --git a/drivers/extcon/extcon.c b/drivers/extcon/extcon.c
index 8fc412ad3cf2..b5d32236da68 100644
--- a/drivers/extcon/extcon.c
+++ b/drivers/extcon/extcon.c
@@ -1060,7 +1060,7 @@ struct extcon_dev *extcon_dev_allocate(const unsigned int *supported_cable)
if (!supported_cable)
return ERR_PTR(-EINVAL);
- edev = kzalloc_obj(*edev, GFP_KERNEL);
+ edev = kzalloc_obj(*edev);
if (!edev)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/firewire/core-cdev.c b/drivers/firewire/core-cdev.c
index 6d1a59e33d2e..c9b67bc720be 100644
--- a/drivers/firewire/core-cdev.c
+++ b/drivers/firewire/core-cdev.c
@@ -291,7 +291,7 @@ static int fw_device_op_open(struct inode *inode, struct file *file)
return -ENODEV;
}
- client = kzalloc_obj(*client, GFP_KERNEL);
+ client = kzalloc_obj(*client);
if (client == NULL) {
fw_device_put(device);
return -ENOMEM;
@@ -412,7 +412,7 @@ static void queue_bus_reset_event(struct client *client)
struct client_resource *resource;
unsigned long index;
- e = kzalloc_obj(*e, GFP_KERNEL);
+ e = kzalloc_obj(*e);
if (e == NULL)
return;
@@ -837,7 +837,7 @@ static int ioctl_allocate(struct client *client, union ioctl_arg *arg)
struct fw_address_region region;
int ret;
- r = kmalloc_obj(*r, GFP_KERNEL);
+ r = kmalloc_obj(*r);
if (r == NULL)
return -ENOMEM;
@@ -1006,7 +1006,7 @@ static void iso_mc_callback(struct fw_iso_context *context,
struct client *client = data;
struct iso_interrupt_mc_event *e;
- e = kmalloc_obj(*e, GFP_KERNEL);
+ e = kmalloc_obj(*e);
if (e == NULL)
return;
@@ -1409,9 +1409,9 @@ static int init_iso_resource(struct client *client,
request->bandwidth > BANDWIDTH_AVAILABLE_INITIAL)
return -EINVAL;
- r = kmalloc_obj(*r, GFP_KERNEL);
- e1 = kmalloc_obj(*e1, GFP_KERNEL);
- e2 = kmalloc_obj(*e2, GFP_KERNEL);
+ r = kmalloc_obj(*r);
+ e1 = kmalloc_obj(*e1);
+ e2 = kmalloc_obj(*e2);
if (r == NULL || e1 == NULL || e2 == NULL) {
ret = -ENOMEM;
goto fail;
diff --git a/drivers/firewire/core-device.c b/drivers/firewire/core-device.c
index 3281f6c6bedb..c0f17da27a22 100644
--- a/drivers/firewire/core-device.c
+++ b/drivers/firewire/core-device.c
@@ -849,7 +849,7 @@ static void create_units(struct fw_device *device)
* Get the address of the unit directory and try to
* match the drivers id_tables against it.
*/
- unit = kzalloc_obj(*unit, GFP_KERNEL);
+ unit = kzalloc_obj(*unit);
if (unit == NULL)
continue;
diff --git a/drivers/firewire/net.c b/drivers/firewire/net.c
index b9f01e871fe3..f1a2bee39bf1 100644
--- a/drivers/firewire/net.c
+++ b/drivers/firewire/net.c
@@ -1402,7 +1402,7 @@ static int fwnet_add_peer(struct fwnet_device *dev,
{
struct fwnet_peer *peer;
- peer = kmalloc_obj(*peer, GFP_KERNEL);
+ peer = kmalloc_obj(*peer);
if (!peer)
return -ENOMEM;
diff --git a/drivers/firewire/nosy.c b/drivers/firewire/nosy.c
index 547d560f353f..900b7d904b41 100644
--- a/drivers/firewire/nosy.c
+++ b/drivers/firewire/nosy.c
@@ -281,7 +281,7 @@ nosy_open(struct inode *inode, struct file *file)
if (lynx == NULL)
return -ENODEV;
- client = kmalloc_obj(*client, GFP_KERNEL);
+ client = kmalloc_obj(*client);
if (client == NULL)
goto fail;
@@ -545,7 +545,7 @@ add_card(struct pci_dev *dev, const struct pci_device_id *unused)
}
pci_set_master(dev);
- lynx = kzalloc_obj(*lynx, GFP_KERNEL);
+ lynx = kzalloc_obj(*lynx);
if (lynx == NULL) {
dev_err(&dev->dev, "Failed to allocate control structure\n");
ret = -ENOMEM;
diff --git a/drivers/firewire/sbp2.c b/drivers/firewire/sbp2.c
index 89e0873501f5..021b8f698e34 100644
--- a/drivers/firewire/sbp2.c
+++ b/drivers/firewire/sbp2.c
@@ -966,7 +966,7 @@ static int sbp2_add_logical_unit(struct sbp2_target *tgt, int lun_entry)
{
struct sbp2_logical_unit *lu;
- lu = kmalloc_obj(*lu, GFP_KERNEL);
+ lu = kmalloc_obj(*lu);
if (!lu)
return -ENOMEM;
diff --git a/drivers/firmware/arm_ffa/bus.c b/drivers/firmware/arm_ffa/bus.c
index fbd9af875a69..9576862d89c4 100644
--- a/drivers/firmware/arm_ffa/bus.c
+++ b/drivers/firmware/arm_ffa/bus.c
@@ -203,7 +203,7 @@ ffa_device_register(const struct ffa_partition_info *part_info,
if (id < 0)
return NULL;
- ffa_dev = kzalloc_obj(*ffa_dev, GFP_KERNEL);
+ ffa_dev = kzalloc_obj(*ffa_dev);
if (!ffa_dev) {
ida_free(&ffa_bus_id, id);
return NULL;
diff --git a/drivers/firmware/arm_ffa/driver.c b/drivers/firmware/arm_ffa/driver.c
index 8962212ad218..12a625387d6e 100644
--- a/drivers/firmware/arm_ffa/driver.c
+++ b/drivers/firmware/arm_ffa/driver.c
@@ -410,7 +410,7 @@ ffa_partition_probe(const uuid_t *uuid, struct ffa_partition_info **buffer)
if (count <= 0)
return count;
- pbuf = kzalloc_objs(*pbuf, count, GFP_KERNEL);
+ pbuf = kzalloc_objs(*pbuf, count);
if (!pbuf)
return -ENOMEM;
@@ -1376,7 +1376,7 @@ static int __ffa_notify_request(struct ffa_device *dev, bool is_per_vcpu,
if (notify_id >= FFA_MAX_NOTIFICATIONS)
return -EINVAL;
- cb_info = kzalloc_obj(*cb_info, GFP_KERNEL);
+ cb_info = kzalloc_obj(*cb_info);
if (!cb_info)
return -ENOMEM;
@@ -1647,7 +1647,7 @@ static int ffa_xa_add_partition_info(struct ffa_device *dev)
}
}
- info = kzalloc_obj(*info, GFP_KERNEL);
+ info = kzalloc_obj(*info);
if (!info)
return ret;
@@ -1655,7 +1655,7 @@ static int ffa_xa_add_partition_info(struct ffa_device *dev)
info->dev = dev;
if (!phead) {
- phead = kzalloc_obj(*phead, GFP_KERNEL);
+ phead = kzalloc_obj(*phead);
if (!phead)
goto free_out;
@@ -2039,7 +2039,7 @@ static int __init ffa_init(void)
if (ret)
return ret;
- drv_info = kzalloc_obj(*drv_info, GFP_KERNEL);
+ drv_info = kzalloc_obj(*drv_info);
if (!drv_info)
return -ENOMEM;
diff --git a/drivers/firmware/arm_scmi/bus.c b/drivers/firmware/arm_scmi/bus.c
index 49a168c5ff85..793be9eabaed 100644
--- a/drivers/firmware/arm_scmi/bus.c
+++ b/drivers/firmware/arm_scmi/bus.c
@@ -90,7 +90,7 @@ static int scmi_protocol_device_request(const struct scmi_device_id *id_table)
* No duplicate found for requested id_table, so let's create a new
* requested device entry for this new valid request.
*/
- rdev = kzalloc_obj(*rdev, GFP_KERNEL);
+ rdev = kzalloc_obj(*rdev);
if (!rdev) {
ret = -ENOMEM;
goto out;
@@ -103,7 +103,7 @@ static int scmi_protocol_device_request(const struct scmi_device_id *id_table)
* there.
*/
if (!phead) {
- phead = kzalloc_obj(*phead, GFP_KERNEL);
+ phead = kzalloc_obj(*phead);
if (!phead) {
kfree(rdev);
ret = -ENOMEM;
@@ -445,7 +445,7 @@ __scmi_device_create(struct device_node *np, struct device *parent,
return NULL;
}
- scmi_dev = kzalloc_obj(*scmi_dev, GFP_KERNEL);
+ scmi_dev = kzalloc_obj(*scmi_dev);
if (!scmi_dev)
return NULL;
diff --git a/drivers/firmware/arm_scmi/notify.c b/drivers/firmware/arm_scmi/notify.c
index d2a6390cbc5c..9168794adae4 100644
--- a/drivers/firmware/arm_scmi/notify.c
+++ b/drivers/firmware/arm_scmi/notify.c
@@ -897,7 +897,7 @@ scmi_allocate_event_handler(struct scmi_notify_instance *ni, u32 evt_key)
{
struct scmi_event_handler *hndl;
- hndl = kzalloc_obj(*hndl, GFP_KERNEL);
+ hndl = kzalloc_obj(*hndl);
if (!hndl)
return NULL;
hndl->key = evt_key;
diff --git a/drivers/firmware/arm_scmi/raw_mode.c b/drivers/firmware/arm_scmi/raw_mode.c
index 99a4a70cf117..1f6e51670208 100644
--- a/drivers/firmware/arm_scmi/raw_mode.c
+++ b/drivers/firmware/arm_scmi/raw_mode.c
@@ -908,7 +908,7 @@ static int scmi_dbg_raw_mode_open(struct inode *inode, struct file *filp)
return -ENODEV;
raw = inode->i_private;
- rd = kzalloc_obj(*rd, GFP_KERNEL);
+ rd = kzalloc_obj(*rd);
if (!rd)
return -ENOMEM;
diff --git a/drivers/firmware/arm_scpi.c b/drivers/firmware/arm_scpi.c
index 70a1697a1e6b..00e74449ce09 100644
--- a/drivers/firmware/arm_scpi.c
+++ b/drivers/firmware/arm_scpi.c
@@ -633,14 +633,14 @@ static struct scpi_dvfs_info *scpi_dvfs_get_info(u8 domain)
if (!buf.opp_count)
return ERR_PTR(-ENOENT);
- info = kmalloc_obj(*info, GFP_KERNEL);
+ info = kmalloc_obj(*info);
if (!info)
return ERR_PTR(-ENOMEM);
info->count = buf.opp_count;
info->latency = le16_to_cpu(buf.latency) * 1000; /* uS to nS */
- info->opps = kzalloc_objs(*opp, info->count, GFP_KERNEL);
+ info->opps = kzalloc_objs(*opp, info->count);
if (!info->opps) {
kfree(info);
return ERR_PTR(-ENOMEM);
diff --git a/drivers/firmware/arm_sdei.c b/drivers/firmware/arm_sdei.c
index c8d737e754e6..f39ed7ba3a38 100644
--- a/drivers/firmware/arm_sdei.c
+++ b/drivers/firmware/arm_sdei.c
@@ -205,7 +205,7 @@ static struct sdei_event *sdei_event_create(u32 event_num,
lockdep_assert_held(&sdei_events_lock);
- event = kzalloc_obj(*event, GFP_KERNEL);
+ event = kzalloc_obj(*event);
if (!event) {
err = -ENOMEM;
goto fail;
@@ -227,7 +227,7 @@ static struct sdei_event *sdei_event_create(u32 event_num,
event->type = result;
if (event->type == SDEI_EVENT_TYPE_SHARED) {
- reg = kzalloc_obj(*reg, GFP_KERNEL);
+ reg = kzalloc_obj(*reg);
if (!reg) {
err = -ENOMEM;
goto fail;
diff --git a/drivers/firmware/cirrus/cs_dsp.c b/drivers/firmware/cirrus/cs_dsp.c
index 148d31eea977..b4f1c01e3b5b 100644
--- a/drivers/firmware/cirrus/cs_dsp.c
+++ b/drivers/firmware/cirrus/cs_dsp.c
@@ -1059,7 +1059,7 @@ static int cs_dsp_create_control(struct cs_dsp *dsp,
}
}
- ctl = kzalloc_obj(*ctl, GFP_KERNEL);
+ ctl = kzalloc_obj(*ctl);
if (!ctl)
return -ENOMEM;
@@ -1781,7 +1781,7 @@ static struct cs_dsp_alg_region *cs_dsp_create_region(struct cs_dsp *dsp,
{
struct cs_dsp_alg_region_list_item *item;
- item = kzalloc_obj(*item, GFP_KERNEL);
+ item = kzalloc_obj(*item);
if (!item)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/firmware/dmi-id.c b/drivers/firmware/dmi-id.c
index dddddfbc479d..477a37e2ef80 100644
--- a/drivers/firmware/dmi-id.c
+++ b/drivers/firmware/dmi-id.c
@@ -237,7 +237,7 @@ static int __init dmi_id_init(void)
if (ret)
return ret;
- dmi_dev = kzalloc_obj(*dmi_dev, GFP_KERNEL);
+ dmi_dev = kzalloc_obj(*dmi_dev);
if (!dmi_dev) {
ret = -ENOMEM;
goto fail_class_unregister;
diff --git a/drivers/firmware/dmi-sysfs.c b/drivers/firmware/dmi-sysfs.c
index 4424ad075aff..cda53d037715 100644
--- a/drivers/firmware/dmi-sysfs.c
+++ b/drivers/firmware/dmi-sysfs.c
@@ -451,7 +451,7 @@ static int dmi_system_event_log(struct dmi_sysfs_entry *entry)
{
int ret;
- entry->child = kzalloc_obj(*entry->child, GFP_KERNEL);
+ entry->child = kzalloc_obj(*entry->child);
if (!entry->child)
return -ENOMEM;
ret = kobject_init_and_add(entry->child,
@@ -586,7 +586,7 @@ static void __init dmi_sysfs_register_handle(const struct dmi_header *dh,
return;
/* Allocate and register a new entry into the entries set */
- entry = kzalloc_obj(*entry, GFP_KERNEL);
+ entry = kzalloc_obj(*entry);
if (!entry) {
*ret = -ENOMEM;
return;
diff --git a/drivers/firmware/edd.c b/drivers/firmware/edd.c
index 631fbd3ea60c..f980c5b56858 100644
--- a/drivers/firmware/edd.c
+++ b/drivers/firmware/edd.c
@@ -740,7 +740,7 @@ edd_init(void)
return -ENOMEM;
for (i = 0; i < edd_num_devices(); i++) {
- edev = kzalloc_obj(*edev, GFP_KERNEL);
+ edev = kzalloc_obj(*edev);
if (!edev) {
rc = -ENOMEM;
goto out;
diff --git a/drivers/firmware/efi/arm-runtime.c b/drivers/firmware/efi/arm-runtime.c
index 35b69e629d6d..3167cab62014 100644
--- a/drivers/firmware/efi/arm-runtime.c
+++ b/drivers/firmware/efi/arm-runtime.c
@@ -113,7 +113,7 @@ static int __init arm_enable_runtime_services(void)
if (!(md->attribute & EFI_MEMORY_SP))
continue;
- res = kzalloc_obj(*res, GFP_KERNEL);
+ res = kzalloc_obj(*res);
if (WARN_ON(!res))
break;
diff --git a/drivers/firmware/efi/capsule-loader.c b/drivers/firmware/efi/capsule-loader.c
index 609637f88acc..2c628a127091 100644
--- a/drivers/firmware/efi/capsule-loader.c
+++ b/drivers/firmware/efi/capsule-loader.c
@@ -282,7 +282,7 @@ static int efi_capsule_open(struct inode *inode, struct file *file)
{
struct capsule_info *cap_info;
- cap_info = kzalloc_obj(*cap_info, GFP_KERNEL);
+ cap_info = kzalloc_obj(*cap_info);
if (!cap_info)
return -ENOMEM;
@@ -292,7 +292,7 @@ static int efi_capsule_open(struct inode *inode, struct file *file)
return -ENOMEM;
}
- cap_info->phys = kzalloc_obj(phys_addr_t, GFP_KERNEL);
+ cap_info->phys = kzalloc_obj(phys_addr_t);
if (!cap_info->phys) {
kfree(cap_info->pages);
kfree(cap_info);
diff --git a/drivers/firmware/efi/capsule.c b/drivers/firmware/efi/capsule.c
index dbbff6ade4e3..dd62526380d2 100644
--- a/drivers/firmware/efi/capsule.c
+++ b/drivers/firmware/efi/capsule.c
@@ -230,7 +230,7 @@ int efi_capsule_update(efi_capsule_header_t *capsule, phys_addr_t *pages)
count = DIV_ROUND_UP(imagesize, PAGE_SIZE);
sg_count = sg_pages_num(count);
- sg_pages = kzalloc_objs(*sg_pages, sg_count, GFP_KERNEL);
+ sg_pages = kzalloc_objs(*sg_pages, sg_count);
if (!sg_pages)
return -ENOMEM;
diff --git a/drivers/firmware/efi/efibc.c b/drivers/firmware/efi/efibc.c
index 99268c14e01e..345a10aa7086 100644
--- a/drivers/firmware/efi/efibc.c
+++ b/drivers/firmware/efi/efibc.c
@@ -47,7 +47,7 @@ static int efibc_reboot_notifier_call(struct notifier_block *notifier,
if (ret || !data)
return NOTIFY_DONE;
- wdata = kmalloc_objs(efi_char16_t, MAX_DATA_LEN, GFP_KERNEL);
+ wdata = kmalloc_objs(efi_char16_t, MAX_DATA_LEN);
if (!wdata)
return NOTIFY_DONE;
diff --git a/drivers/firmware/efi/embedded-firmware.c b/drivers/firmware/efi/embedded-firmware.c
index e750ef2b57e8..82744b6a5582 100644
--- a/drivers/firmware/efi/embedded-firmware.c
+++ b/drivers/firmware/efi/embedded-firmware.c
@@ -64,7 +64,7 @@ static int __init efi_check_md_for_embedded_firmware(
pr_info("Found EFI embedded fw '%s'\n", desc->name);
- fw = kmalloc_obj(*fw, GFP_KERNEL);
+ fw = kmalloc_obj(*fw);
if (!fw) {
memunmap(map);
return -ENOMEM;
diff --git a/drivers/firmware/efi/esrt.c b/drivers/firmware/efi/esrt.c
index 74f38a2df8d7..df148f7331f4 100644
--- a/drivers/firmware/efi/esrt.c
+++ b/drivers/firmware/efi/esrt.c
@@ -164,7 +164,7 @@ static int esre_create_sysfs_entry(void *esre, int entry_num)
{
struct esre_entry *entry;
- entry = kzalloc_obj(*entry, GFP_KERNEL);
+ entry = kzalloc_obj(*entry);
if (!entry)
return -ENOMEM;
diff --git a/drivers/firmware/efi/mokvar-table.c b/drivers/firmware/efi/mokvar-table.c
index 78afd0fa2919..4ff0c2926097 100644
--- a/drivers/firmware/efi/mokvar-table.c
+++ b/drivers/firmware/efi/mokvar-table.c
@@ -329,7 +329,7 @@ static int __init efi_mokvar_sysfs_init(void)
}
while (efi_mokvar_entry_next(&mokvar_entry)) {
- mokvar_sysfs = kzalloc_obj(*mokvar_sysfs, GFP_KERNEL);
+ mokvar_sysfs = kzalloc_obj(*mokvar_sysfs);
if (!mokvar_sysfs) {
err = -ENOMEM;
break;
diff --git a/drivers/firmware/efi/riscv-runtime.c b/drivers/firmware/efi/riscv-runtime.c
index ee799399da62..60cdf7bf141f 100644
--- a/drivers/firmware/efi/riscv-runtime.c
+++ b/drivers/firmware/efi/riscv-runtime.c
@@ -83,7 +83,7 @@ static int __init riscv_enable_runtime_services(void)
if (!(md->attribute & EFI_MEMORY_SP))
continue;
- res = kzalloc_obj(*res, GFP_KERNEL);
+ res = kzalloc_obj(*res);
if (WARN_ON(!res))
break;
diff --git a/drivers/firmware/google/gsmi.c b/drivers/firmware/google/gsmi.c
index a142ce5c7288..e21e7408cc6d 100644
--- a/drivers/firmware/google/gsmi.c
+++ b/drivers/firmware/google/gsmi.c
@@ -153,7 +153,7 @@ static struct gsmi_buf *gsmi_buf_alloc(void)
{
struct gsmi_buf *smibuf;
- smibuf = kzalloc_obj(*smibuf, GFP_KERNEL);
+ smibuf = kzalloc_obj(*smibuf);
if (!smibuf) {
printk(KERN_ERR "gsmi: out of memory\n");
return NULL;
diff --git a/drivers/firmware/google/vpd.c b/drivers/firmware/google/vpd.c
index 721dfa756c45..54349e579b0d 100644
--- a/drivers/firmware/google/vpd.c
+++ b/drivers/firmware/google/vpd.c
@@ -107,7 +107,7 @@ static int vpd_section_attrib_add(const u8 *key, u32 key_len,
if (vpd_section_check_key_name(key, key_len) != VPD_OK)
return VPD_OK;
- info = kzalloc_obj(*info, GFP_KERNEL);
+ info = kzalloc_obj(*info);
if (!info)
return -ENOMEM;
diff --git a/drivers/firmware/iscsi_ibft.c b/drivers/firmware/iscsi_ibft.c
index 1af5a9ef4474..e457b6049e83 100644
--- a/drivers/firmware/iscsi_ibft.c
+++ b/drivers/firmware/iscsi_ibft.c
@@ -634,7 +634,7 @@ static int __init ibft_create_kobject(struct acpi_table_ibft *header,
struct pci_dev *pci_dev;
int rc = 0;
- ibft_kobj = kzalloc_obj(*ibft_kobj, GFP_KERNEL);
+ ibft_kobj = kzalloc_obj(*ibft_kobj);
if (!ibft_kobj)
return -ENOMEM;
@@ -773,7 +773,7 @@ static int __init ibft_register_kobjects(struct acpi_table_ibft *header)
if (rc)
return rc;
- ibft_kobj = kzalloc_obj(*ibft_kobj, GFP_KERNEL);
+ ibft_kobj = kzalloc_obj(*ibft_kobj);
if (!ibft_kobj)
return -ENOMEM;
diff --git a/drivers/firmware/microchip/mpfs-auto-update.c b/drivers/firmware/microchip/mpfs-auto-update.c
index 5fa85af40c33..46b19d803446 100644
--- a/drivers/firmware/microchip/mpfs-auto-update.c
+++ b/drivers/firmware/microchip/mpfs-auto-update.c
@@ -162,9 +162,9 @@ static int mpfs_auto_update_verify_image(struct fw_upload *fw_uploader)
u32 *response_msg __free(kfree) =
kzalloc(AUTO_UPDATE_FEATURE_RESP_SIZE * sizeof(*response_msg), GFP_KERNEL);
struct mpfs_mss_response *response __free(kfree) =
- kzalloc_obj(struct mpfs_mss_response, GFP_KERNEL);
+ kzalloc_obj(struct mpfs_mss_response);
struct mpfs_mss_msg *message __free(kfree) =
- kzalloc_obj(struct mpfs_mss_msg, GFP_KERNEL);
+ kzalloc_obj(struct mpfs_mss_msg);
int ret;
if (!response_msg || !response || !message)
@@ -364,9 +364,9 @@ static int mpfs_auto_update_available(struct mpfs_auto_update_priv *priv)
u32 *response_msg __free(kfree) =
kzalloc(AUTO_UPDATE_FEATURE_RESP_SIZE * sizeof(*response_msg), GFP_KERNEL);
struct mpfs_mss_response *response __free(kfree) =
- kzalloc_obj(struct mpfs_mss_response, GFP_KERNEL);
+ kzalloc_obj(struct mpfs_mss_response);
struct mpfs_mss_msg *message __free(kfree) =
- kzalloc_obj(struct mpfs_mss_msg, GFP_KERNEL);
+ kzalloc_obj(struct mpfs_mss_msg);
int ret;
if (!response_msg || !response || !message)
diff --git a/drivers/firmware/psci/psci_checker.c b/drivers/firmware/psci/psci_checker.c
index 2aaf3519cdfb..e67ba9891082 100644
--- a/drivers/firmware/psci/psci_checker.c
+++ b/drivers/firmware/psci/psci_checker.c
@@ -155,7 +155,7 @@ static int alloc_init_cpu_groups(cpumask_var_t **pcpu_groups)
if (!alloc_cpumask_var(&tmp, GFP_KERNEL))
return -ENOMEM;
- cpu_groups = kzalloc_objs(*cpu_groups, nb_available_cpus, GFP_KERNEL);
+ cpu_groups = kzalloc_objs(*cpu_groups, nb_available_cpus);
if (!cpu_groups) {
free_cpumask_var(tmp);
return -ENOMEM;
@@ -369,7 +369,7 @@ static int suspend_tests(void)
struct task_struct **threads;
int nb_threads = 0;
- threads = kmalloc_objs(*threads, nb_available_cpus, GFP_KERNEL);
+ threads = kmalloc_objs(*threads, nb_available_cpus);
if (!threads)
return -ENOMEM;
diff --git a/drivers/firmware/qcom/qcom_qseecom.c b/drivers/firmware/qcom/qcom_qseecom.c
index 7eed43fc8174..320ec2a77524 100644
--- a/drivers/firmware/qcom/qcom_qseecom.c
+++ b/drivers/firmware/qcom/qcom_qseecom.c
@@ -50,7 +50,7 @@ static int qseecom_client_register(struct platform_device *qseecom_dev,
dev_info(&qseecom_dev->dev, "setting up client for %s\n", desc->app_name);
/* Allocate and set-up the client device */
- client = kzalloc_obj(*client, GFP_KERNEL);
+ client = kzalloc_obj(*client);
if (!client)
return -ENOMEM;
diff --git a/drivers/firmware/qemu_fw_cfg.c b/drivers/firmware/qemu_fw_cfg.c
index 50224b95d22b..87a5421bc7d5 100644
--- a/drivers/firmware/qemu_fw_cfg.c
+++ b/drivers/firmware/qemu_fw_cfg.c
@@ -94,7 +94,7 @@ static ssize_t fw_cfg_dma_transfer(void *address, u32 length, u32 control)
struct fw_cfg_dma_access *d = NULL;
ssize_t ret = length;
- d = kmalloc_obj(*d, GFP_KERNEL);
+ d = kmalloc_obj(*d);
if (!d) {
ret = -ENOMEM;
goto end;
@@ -325,7 +325,7 @@ static ssize_t fw_cfg_write_vmcoreinfo(const struct fw_cfg_file *f)
static struct fw_cfg_vmcoreinfo *data;
ssize_t ret;
- data = kmalloc_obj(struct fw_cfg_vmcoreinfo, GFP_KERNEL);
+ data = kmalloc_obj(struct fw_cfg_vmcoreinfo);
if (!data)
return -ENOMEM;
@@ -530,7 +530,7 @@ static int fw_cfg_build_symlink(struct kset *dir,
dir = to_kset(ko);
} else {
/* create new subdirectory kset */
- subdir = kzalloc_obj(struct kset, GFP_KERNEL);
+ subdir = kzalloc_obj(struct kset);
if (!subdir) {
ret = -ENOMEM;
break;
@@ -593,7 +593,7 @@ static int fw_cfg_register_file(const struct fw_cfg_file *f)
#endif
/* allocate new entry */
- entry = kzalloc_obj(*entry, GFP_KERNEL);
+ entry = kzalloc_obj(*entry);
if (!entry)
return -ENOMEM;
diff --git a/drivers/firmware/raspberrypi.c b/drivers/firmware/raspberrypi.c
index 3b45bb74d312..0aa322e9a2e7 100644
--- a/drivers/firmware/raspberrypi.c
+++ b/drivers/firmware/raspberrypi.c
@@ -282,7 +282,7 @@ static int rpi_firmware_probe(struct platform_device *pdev)
* Memory will be freed by rpi_firmware_delete() once all users have
* released their firmware handles. Don't use devm_kzalloc() here.
*/
- fw = kzalloc_obj(*fw, GFP_KERNEL);
+ fw = kzalloc_obj(*fw);
if (!fw)
return -ENOMEM;
diff --git a/drivers/firmware/smccc/soc_id.c b/drivers/firmware/smccc/soc_id.c
index 95f9163058bb..2f7475e66b3c 100644
--- a/drivers/firmware/smccc/soc_id.c
+++ b/drivers/firmware/smccc/soc_id.c
@@ -137,7 +137,7 @@ static int __init smccc_soc_init(void)
return -EINVAL;
}
- soc_dev_attr = kzalloc_obj(*soc_dev_attr, GFP_KERNEL);
+ soc_dev_attr = kzalloc_obj(*soc_dev_attr);
if (!soc_dev_attr)
return -ENOMEM;
diff --git a/drivers/firmware/stratix10-svc.c b/drivers/firmware/stratix10-svc.c
index aefb28933990..6f5c298582ab 100644
--- a/drivers/firmware/stratix10-svc.c
+++ b/drivers/firmware/stratix10-svc.c
@@ -535,11 +535,11 @@ static int svc_normal_to_secure_thread(void *data)
unsigned long a0, a1, a2, a3, a4, a5, a6, a7;
int ret_fifo = 0;
- pdata = kmalloc_obj(*pdata, GFP_KERNEL);
+ pdata = kmalloc_obj(*pdata);
if (!pdata)
return -ENOMEM;
- cbdata = kmalloc_obj(*cbdata, GFP_KERNEL);
+ cbdata = kmalloc_obj(*cbdata);
if (!cbdata) {
kfree(pdata);
return -ENOMEM;
@@ -1119,7 +1119,7 @@ int stratix10_svc_add_async_client(struct stratix10_svc_chan *chan,
return 0;
}
- achan = kzalloc_obj(*achan, GFP_KERNEL);
+ achan = kzalloc_obj(*achan);
if (!achan)
return -ENOMEM;
@@ -1692,7 +1692,7 @@ int stratix10_svc_send(struct stratix10_svc_chan *chan, void *msg)
int ret = 0;
unsigned int cpu = 0;
- p_data = kzalloc_obj(*p_data, GFP_KERNEL);
+ p_data = kzalloc_obj(*p_data);
if (!p_data)
return -ENOMEM;
diff --git a/drivers/firmware/thead,th1520-aon.c b/drivers/firmware/thead,th1520-aon.c
index 7dc871060c38..a35fd5e2a07f 100644
--- a/drivers/firmware/thead,th1520-aon.c
+++ b/drivers/firmware/thead,th1520-aon.c
@@ -205,7 +205,7 @@ struct th1520_aon_chan *th1520_aon_init(struct device *dev)
struct mbox_client *cl;
int ret;
- aon_chan = kzalloc_obj(*aon_chan, GFP_KERNEL);
+ aon_chan = kzalloc_obj(*aon_chan);
if (!aon_chan)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/fpga/dfl-afu-dma-region.c b/drivers/fpga/dfl-afu-dma-region.c
index c71a93d8aee3..87652d58d03f 100644
--- a/drivers/fpga/dfl-afu-dma-region.c
+++ b/drivers/fpga/dfl-afu-dma-region.c
@@ -42,7 +42,7 @@ static int afu_dma_pin_pages(struct dfl_feature_dev_data *fdata,
if (ret)
return ret;
- region->pages = kzalloc_objs(struct page *, npages, GFP_KERNEL);
+ region->pages = kzalloc_objs(struct page *, npages);
if (!region->pages) {
ret = -ENOMEM;
goto unlock_vm;
diff --git a/drivers/fpga/dfl-pci.c b/drivers/fpga/dfl-pci.c
index 3e560e5d7241..e25205c6d8f0 100644
--- a/drivers/fpga/dfl-pci.c
+++ b/drivers/fpga/dfl-pci.c
@@ -139,7 +139,7 @@ static int *cci_pci_create_irq_table(struct pci_dev *pcidev, unsigned int nvec)
unsigned int i;
int *table;
- table = kzalloc_objs(int, nvec, GFP_KERNEL);
+ table = kzalloc_objs(int, nvec);
if (!table)
return table;
diff --git a/drivers/fpga/dfl.c b/drivers/fpga/dfl.c
index d26003d3c931..138fefd7f7f8 100644
--- a/drivers/fpga/dfl.c
+++ b/drivers/fpga/dfl.c
@@ -347,7 +347,7 @@ dfl_dev_add(struct dfl_feature_dev_data *fdata,
struct dfl_device *ddev;
int id, i, ret;
- ddev = kzalloc_obj(*ddev, GFP_KERNEL);
+ ddev = kzalloc_obj(*ddev);
if (!ddev)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/fpga/fpga-bridge.c b/drivers/fpga/fpga-bridge.c
index c709aa3ef04c..ca68c38aa4a1 100644
--- a/drivers/fpga/fpga-bridge.c
+++ b/drivers/fpga/fpga-bridge.c
@@ -346,7 +346,7 @@ __fpga_bridge_register(struct device *parent, const char *name,
return ERR_PTR(-EINVAL);
}
- bridge = kzalloc_obj(*bridge, GFP_KERNEL);
+ bridge = kzalloc_obj(*bridge);
if (!bridge)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/fpga/fpga-mgr.c b/drivers/fpga/fpga-mgr.c
index 215303dd6a64..2672070ced02 100644
--- a/drivers/fpga/fpga-mgr.c
+++ b/drivers/fpga/fpga-mgr.c
@@ -486,7 +486,7 @@ static int fpga_mgr_buf_load(struct fpga_manager *mgr,
*/
nr_pages = DIV_ROUND_UP((unsigned long)buf + count, PAGE_SIZE) -
(unsigned long)buf / PAGE_SIZE;
- pages = kmalloc_objs(struct page *, nr_pages, GFP_KERNEL);
+ pages = kmalloc_objs(struct page *, nr_pages);
if (!pages)
return -ENOMEM;
@@ -801,7 +801,7 @@ __fpga_mgr_register_full(struct device *parent, const struct fpga_manager_info *
return ERR_PTR(-EINVAL);
}
- mgr = kzalloc_obj(*mgr, GFP_KERNEL);
+ mgr = kzalloc_obj(*mgr);
if (!mgr)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/fpga/fpga-region.c b/drivers/fpga/fpga-region.c
index 43dbdacfd87e..662e8e4203ca 100644
--- a/drivers/fpga/fpga-region.c
+++ b/drivers/fpga/fpga-region.c
@@ -201,7 +201,7 @@ __fpga_region_register_full(struct device *parent, const struct fpga_region_info
return ERR_PTR(-EINVAL);
}
- region = kzalloc_obj(*region, GFP_KERNEL);
+ region = kzalloc_obj(*region);
if (!region)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/fsi/fsi-core.c b/drivers/fsi/fsi-core.c
index abc3cf7f4ae4..91b60b1fb86a 100644
--- a/drivers/fsi/fsi-core.c
+++ b/drivers/fsi/fsi-core.c
@@ -211,7 +211,7 @@ static struct fsi_device *fsi_create_device(struct fsi_slave *slave)
{
struct fsi_device *dev;
- dev = kzalloc_obj(*dev, GFP_KERNEL);
+ dev = kzalloc_obj(*dev);
if (!dev)
return NULL;
@@ -1083,7 +1083,7 @@ static int fsi_slave_init(struct fsi_master *master, int link, uint8_t id)
/* We can communicate with a slave; create the slave device and
* register.
*/
- slave = kzalloc_obj(*slave, GFP_KERNEL);
+ slave = kzalloc_obj(*slave);
if (!slave)
return -ENOMEM;
diff --git a/drivers/fsi/fsi-master-aspeed.c b/drivers/fsi/fsi-master-aspeed.c
index 2589f04c8d5b..aa1380cdff33 100644
--- a/drivers/fsi/fsi-master-aspeed.c
+++ b/drivers/fsi/fsi-master-aspeed.c
@@ -546,7 +546,7 @@ static int fsi_master_aspeed_probe(struct platform_device *pdev)
return rc;
}
- aspeed = kzalloc_obj(*aspeed, GFP_KERNEL);
+ aspeed = kzalloc_obj(*aspeed);
if (!aspeed)
return -ENOMEM;
diff --git a/drivers/fsi/fsi-master-ast-cf.c b/drivers/fsi/fsi-master-ast-cf.c
index 3b83ebeaf7c1..c3ac76bf7e97 100644
--- a/drivers/fsi/fsi-master-ast-cf.c
+++ b/drivers/fsi/fsi-master-ast-cf.c
@@ -1220,7 +1220,7 @@ static int fsi_master_acf_probe(struct platform_device *pdev)
uint32_t cf_mem_align;
int rc;
- master = kzalloc_obj(*master, GFP_KERNEL);
+ master = kzalloc_obj(*master);
if (!master)
return -ENOMEM;
diff --git a/drivers/fsi/fsi-master-gpio.c b/drivers/fsi/fsi-master-gpio.c
index 8c78ab1051d0..0884e143b30e 100644
--- a/drivers/fsi/fsi-master-gpio.c
+++ b/drivers/fsi/fsi-master-gpio.c
@@ -774,7 +774,7 @@ static int fsi_master_gpio_probe(struct platform_device *pdev)
struct gpio_desc *gpio;
int rc;
- master = kzalloc_obj(*master, GFP_KERNEL);
+ master = kzalloc_obj(*master);
if (!master)
return -ENOMEM;
diff --git a/drivers/fsi/fsi-master-hub.c b/drivers/fsi/fsi-master-hub.c
index 6cee9f1a1d3a..e5ac9025762e 100644
--- a/drivers/fsi/fsi-master-hub.c
+++ b/drivers/fsi/fsi-master-hub.c
@@ -215,7 +215,7 @@ static int hub_master_probe(struct fsi_device *fsi_dev)
return rc;
}
- hub = kzalloc_obj(*hub, GFP_KERNEL);
+ hub = kzalloc_obj(*hub);
if (!hub) {
rc = -ENOMEM;
goto err_release;
diff --git a/drivers/fsi/fsi-master-i2cr.c b/drivers/fsi/fsi-master-i2cr.c
index 055e850a8115..d36a4328ad73 100644
--- a/drivers/fsi/fsi-master-i2cr.c
+++ b/drivers/fsi/fsi-master-i2cr.c
@@ -261,7 +261,7 @@ static int i2cr_probe(struct i2c_client *client)
struct fsi_master_i2cr *i2cr;
int ret;
- i2cr = kzalloc_obj(*i2cr, GFP_KERNEL);
+ i2cr = kzalloc_obj(*i2cr);
if (!i2cr)
return -ENOMEM;
diff --git a/drivers/fsi/fsi-occ.c b/drivers/fsi/fsi-occ.c
index 0ef1eccff91a..416d176f0936 100644
--- a/drivers/fsi/fsi-occ.c
+++ b/drivers/fsi/fsi-occ.c
@@ -79,7 +79,7 @@ static DEFINE_IDA(occ_ida);
static int occ_open(struct inode *inode, struct file *file)
{
- struct occ_client *client = kzalloc_obj(*client, GFP_KERNEL);
+ struct occ_client *client = kzalloc_obj(*client);
struct miscdevice *mdev = file->private_data;
struct occ *occ = to_occ(mdev);
diff --git a/drivers/fsi/fsi-sbefifo.c b/drivers/fsi/fsi-sbefifo.c
index 5e62212f5ae4..619b8e1b26fd 100644
--- a/drivers/fsi/fsi-sbefifo.c
+++ b/drivers/fsi/fsi-sbefifo.c
@@ -792,7 +792,7 @@ static int sbefifo_user_open(struct inode *inode, struct file *file)
struct sbefifo *sbefifo = container_of(inode->i_cdev, struct sbefifo, cdev);
struct sbefifo_user *user;
- user = kzalloc_obj(struct sbefifo_user, GFP_KERNEL);
+ user = kzalloc_obj(struct sbefifo_user);
if (!user)
return -ENOMEM;
@@ -1033,7 +1033,7 @@ static int sbefifo_probe(struct fsi_device *fsi_dev)
dev_dbg(dev, "Found sbefifo device\n");
- sbefifo = kzalloc_obj(*sbefifo, GFP_KERNEL);
+ sbefifo = kzalloc_obj(*sbefifo);
if (!sbefifo)
return -ENOMEM;
diff --git a/drivers/fsi/fsi-scom.c b/drivers/fsi/fsi-scom.c
index bbdbc75ae192..bb4d3700c934 100644
--- a/drivers/fsi/fsi-scom.c
+++ b/drivers/fsi/fsi-scom.c
@@ -533,7 +533,7 @@ static int scom_probe(struct fsi_device *fsi_dev)
struct scom_device *scom;
int rc, didx;
- scom = kzalloc_obj(*scom, GFP_KERNEL);
+ scom = kzalloc_obj(*scom);
if (!scom)
return -ENOMEM;
fsi_set_drvdata(fsi_dev, scom);
diff --git a/drivers/fwctl/mlx5/main.c b/drivers/fwctl/mlx5/main.c
index c4262abfd77a..e86ab703c767 100644
--- a/drivers/fwctl/mlx5/main.c
+++ b/drivers/fwctl/mlx5/main.c
@@ -167,7 +167,7 @@ static void *mlx5ctl_info(struct fwctl_uctx *uctx, size_t *length)
container_of(uctx, struct mlx5ctl_uctx, uctx);
struct fwctl_info_mlx5 *info;
- info = kzalloc_obj(*info, GFP_KERNEL);
+ info = kzalloc_obj(*info);
if (!info)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/fwctl/pds/main.c b/drivers/fwctl/pds/main.c
index 8c622267782f..08872ee8422f 100644
--- a/drivers/fwctl/pds/main.c
+++ b/drivers/fwctl/pds/main.c
@@ -58,7 +58,7 @@ static void *pdsfc_info(struct fwctl_uctx *uctx, size_t *length)
struct pdsfc_uctx *pdsfc_uctx = container_of(uctx, struct pdsfc_uctx, uctx);
struct fwctl_info_pds *info;
- info = kzalloc_obj(*info, GFP_KERNEL);
+ info = kzalloc_obj(*info);
if (!info)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/gnss/core.c b/drivers/gnss/core.c
index fb17b7811025..006f5533e97b 100644
--- a/drivers/gnss/core.c
+++ b/drivers/gnss/core.c
@@ -227,7 +227,7 @@ struct gnss_device *gnss_allocate_device(struct device *parent)
int id;
int ret;
- gdev = kzalloc_obj(*gdev, GFP_KERNEL);
+ gdev = kzalloc_obj(*gdev);
if (!gdev)
return NULL;
diff --git a/drivers/gnss/usb.c b/drivers/gnss/usb.c
index 919ea2ab4572..0d9dde02397c 100644
--- a/drivers/gnss/usb.c
+++ b/drivers/gnss/usb.c
@@ -131,7 +131,7 @@ static int gnss_usb_probe(struct usb_interface *intf, const struct usb_device_id
if (ret)
return ret;
- gusb = kzalloc_obj(*gusb, GFP_KERNEL);
+ gusb = kzalloc_obj(*gusb);
if (!gusb)
return -ENOMEM;
diff --git a/drivers/gpib/cb7210/cb7210.c b/drivers/gpib/cb7210/cb7210.c
index e8ea37ff4fbf..6dd8637c5964 100644
--- a/drivers/gpib/cb7210/cb7210.c
+++ b/drivers/gpib/cb7210/cb7210.c
@@ -856,7 +856,7 @@ static int cb7210_allocate_private(struct gpib_board *board)
{
struct cb7210_priv *priv;
- board->private_data = kzalloc_obj(struct cb7210_priv, GFP_KERNEL);
+ board->private_data = kzalloc_obj(struct cb7210_priv);
if (!board->private_data)
return -ENOMEM;
priv = board->private_data;
@@ -1188,7 +1188,7 @@ static int cb_gpib_probe(struct pcmcia_device *link)
int ret;
/* Allocate space for private device-specific data */
- info = kzalloc_obj(*info, GFP_KERNEL);
+ info = kzalloc_obj(*info);
if (!info)
return -ENOMEM;
diff --git a/drivers/gpib/cec/cec_gpib.c b/drivers/gpib/cec/cec_gpib.c
index 45db380aeebe..c13bc302d9e9 100644
--- a/drivers/gpib/cec/cec_gpib.c
+++ b/drivers/gpib/cec/cec_gpib.c
@@ -220,7 +220,7 @@ static int cec_allocate_private(struct gpib_board *board)
{
struct cec_priv *priv;
- board->private_data = kzalloc_obj(struct cec_priv, GFP_KERNEL);
+ board->private_data = kzalloc_obj(struct cec_priv);
if (!board->private_data)
return -ENOMEM;
priv = board->private_data;
diff --git a/drivers/gpib/common/gpib_os.c b/drivers/gpib/common/gpib_os.c
index 08da67543bac..06d19e9f97f6 100644
--- a/drivers/gpib/common/gpib_os.c
+++ b/drivers/gpib/common/gpib_os.c
@@ -199,7 +199,7 @@ int push_status_byte(struct gpib_board *board, struct gpib_status_queue *device,
return retval;
}
- status = kmalloc_obj(*status, GFP_KERNEL);
+ status = kmalloc_obj(*status);
if (!status)
return -ENOMEM;
@@ -513,7 +513,7 @@ static int init_gpib_file_private(struct gpib_file_private *priv)
{
memset(priv, 0, sizeof(*priv));
atomic_set(&priv->holding_mutex, 0);
- priv->descriptors[0] = kmalloc_obj(struct gpib_descriptor, GFP_KERNEL);
+ priv->descriptors[0] = kmalloc_obj(struct gpib_descriptor);
if (!priv->descriptors[0]) {
pr_err("gpib: failed to allocate default board descriptor\n");
return -ENOMEM;
@@ -537,7 +537,7 @@ int ibopen(struct inode *inode, struct file *filep)
board = &board_array[minor];
- filep->private_data = kmalloc_obj(struct gpib_file_private, GFP_KERNEL);
+ filep->private_data = kmalloc_obj(struct gpib_file_private);
if (!filep->private_data)
return -ENOMEM;
@@ -2042,7 +2042,7 @@ int gpib_register_driver(struct gpib_interface *interface, struct module *provid
{
struct gpib_interface_list *entry;
- entry = kmalloc_obj(*entry, GFP_KERNEL);
+ entry = kmalloc_obj(*entry);
if (!entry)
return -ENOMEM;
diff --git a/drivers/gpib/eastwood/fluke_gpib.c b/drivers/gpib/eastwood/fluke_gpib.c
index ae4d99dcae04..2069c771ecef 100644
--- a/drivers/gpib/eastwood/fluke_gpib.c
+++ b/drivers/gpib/eastwood/fluke_gpib.c
@@ -853,7 +853,7 @@ static int fluke_allocate_private(struct gpib_board *board)
{
struct fluke_priv *priv;
- board->private_data = kzalloc_obj(struct fluke_priv, GFP_KERNEL);
+ board->private_data = kzalloc_obj(struct fluke_priv);
if (!board->private_data)
return -ENOMEM;
priv = board->private_data;
diff --git a/drivers/gpib/fmh_gpib/fmh_gpib.c b/drivers/gpib/fmh_gpib/fmh_gpib.c
index 0858cf5ab557..fcafdc02ea2e 100644
--- a/drivers/gpib/fmh_gpib/fmh_gpib.c
+++ b/drivers/gpib/fmh_gpib/fmh_gpib.c
@@ -1250,7 +1250,7 @@ static int fmh_gpib_allocate_private(struct gpib_board *board)
{
struct fmh_priv *priv;
- board->private_data = kzalloc_obj(struct fmh_priv, GFP_KERNEL);
+ board->private_data = kzalloc_obj(struct fmh_priv);
if (!board->private_data)
return -ENOMEM;
priv = board->private_data;
diff --git a/drivers/gpib/gpio/gpib_bitbang.c b/drivers/gpib/gpio/gpib_bitbang.c
index a3b63fd33bd8..0e227980b493 100644
--- a/drivers/gpib/gpio/gpib_bitbang.c
+++ b/drivers/gpib/gpio/gpib_bitbang.c
@@ -1066,7 +1066,7 @@ static int bb_line_status(const struct gpib_board *board)
static int allocate_private(struct gpib_board *board)
{
- board->private_data = kzalloc_obj(struct bb_priv, GFP_KERNEL);
+ board->private_data = kzalloc_obj(struct bb_priv);
if (!board->private_data)
return -ENOMEM;
return 0;
diff --git a/drivers/gpib/hp_82335/hp82335.c b/drivers/gpib/hp_82335/hp82335.c
index d5e158c4dd72..b7544b3c15c6 100644
--- a/drivers/gpib/hp_82335/hp82335.c
+++ b/drivers/gpib/hp_82335/hp82335.c
@@ -210,7 +210,7 @@ static struct gpib_interface hp82335_interface = {
static int hp82335_allocate_private(struct gpib_board *board)
{
- board->private_data = kzalloc_obj(struct hp82335_priv, GFP_KERNEL);
+ board->private_data = kzalloc_obj(struct hp82335_priv);
if (!board->private_data)
return -ENOMEM;
return 0;
diff --git a/drivers/gpib/hp_82341/hp_82341.c b/drivers/gpib/hp_82341/hp_82341.c
index 6755982d8a2a..46175ba2ac36 100644
--- a/drivers/gpib/hp_82341/hp_82341.c
+++ b/drivers/gpib/hp_82341/hp_82341.c
@@ -462,7 +462,7 @@ static struct gpib_interface hp_82341_interface = {
static int hp_82341_allocate_private(struct gpib_board *board)
{
- board->private_data = kzalloc_obj(struct hp_82341_priv, GFP_KERNEL);
+ board->private_data = kzalloc_obj(struct hp_82341_priv);
if (!board->private_data)
return -ENOMEM;
return 0;
diff --git a/drivers/gpib/ines/ines_gpib.c b/drivers/gpib/ines/ines_gpib.c
index 7fbe3beb1d67..c000f647fbb5 100644
--- a/drivers/gpib/ines/ines_gpib.c
+++ b/drivers/gpib/ines/ines_gpib.c
@@ -657,7 +657,7 @@ static int ines_allocate_private(struct gpib_board *board)
{
struct ines_priv *priv;
- board->private_data = kzalloc_obj(struct ines_priv, GFP_KERNEL);
+ board->private_data = kzalloc_obj(struct ines_priv);
if (!board->private_data)
return -ENOMEM;
priv = board->private_data;
@@ -1061,7 +1061,7 @@ static int ines_gpib_probe(struct pcmcia_device *link)
// int ret, i;
/* Allocate space for private device-specific data */
- info = kzalloc_obj(*info, GFP_KERNEL);
+ info = kzalloc_obj(*info);
if (!info)
return -ENOMEM;
diff --git a/drivers/gpib/lpvo_usb_gpib/lpvo_usb_gpib.c b/drivers/gpib/lpvo_usb_gpib/lpvo_usb_gpib.c
index 5c189e6f22dc..6fc4e3452b88 100644
--- a/drivers/gpib/lpvo_usb_gpib/lpvo_usb_gpib.c
+++ b/drivers/gpib/lpvo_usb_gpib/lpvo_usb_gpib.c
@@ -440,7 +440,7 @@ static int usb_gpib_attach(struct gpib_board *board, const struct gpib_board_con
return -EIO;
}
- board->private_data = kzalloc_obj(struct usb_gpib_priv, GFP_KERNEL);
+ board->private_data = kzalloc_obj(struct usb_gpib_priv);
if (!board->private_data)
return -ENOMEM;
@@ -1864,7 +1864,7 @@ static int skel_probe(struct usb_interface *interface,
mutex_init(&minors_lock); /* required for handling minor numbers table */
/* allocate memory for our device state and initialize it */
- dev = kzalloc_obj(*dev, GFP_KERNEL);
+ dev = kzalloc_obj(*dev);
if (!dev)
return -ENOMEM;
diff --git a/drivers/gpib/ni_usb/ni_usb_gpib.c b/drivers/gpib/ni_usb/ni_usb_gpib.c
index e9d7dd6e2fa7..a24cd6521362 100644
--- a/drivers/gpib/ni_usb/ni_usb_gpib.c
+++ b/drivers/gpib/ni_usb/ni_usb_gpib.c
@@ -1659,7 +1659,7 @@ static int ni_usb_allocate_private(struct gpib_board *board)
{
struct ni_usb_priv *ni_priv;
- board->private_data = kzalloc_obj(struct ni_usb_priv, GFP_KERNEL);
+ board->private_data = kzalloc_obj(struct ni_usb_priv);
if (!board->private_data)
return -ENOMEM;
ni_priv = board->private_data;
@@ -1793,7 +1793,7 @@ static int ni_usb_init(struct gpib_board *board)
unsigned int ibsta;
int writes_len;
- writes = kmalloc_objs(*writes, NUM_INIT_WRITES, GFP_KERNEL);
+ writes = kmalloc_objs(*writes, NUM_INIT_WRITES);
if (!writes)
return -ENOMEM;
diff --git a/drivers/gpib/pc2/pc2_gpib.c b/drivers/gpib/pc2/pc2_gpib.c
index 2c0b464025b5..d7260181925f 100644
--- a/drivers/gpib/pc2/pc2_gpib.c
+++ b/drivers/gpib/pc2/pc2_gpib.c
@@ -237,7 +237,7 @@ static int allocate_private(struct gpib_board *board)
{
struct pc2_priv *priv;
- board->private_data = kzalloc_obj(struct pc2_priv, GFP_KERNEL);
+ board->private_data = kzalloc_obj(struct pc2_priv);
if (!board->private_data)
return -ENOMEM;
priv = board->private_data;
diff --git a/drivers/gpib/tnt4882/mite.c b/drivers/gpib/tnt4882/mite.c
index 8906f5c41494..c75c45cdf03f 100644
--- a/drivers/gpib/tnt4882/mite.c
+++ b/drivers/gpib/tnt4882/mite.c
@@ -57,7 +57,7 @@ void mite_init(void)
for (pcidev = pci_get_device(PCI_VENDOR_ID_NATINST, PCI_ANY_ID, NULL);
pcidev;
pcidev = pci_get_device(PCI_VENDOR_ID_NATINST, PCI_ANY_ID, pcidev)) {
- mite = kzalloc_obj(*mite, GFP_KERNEL);
+ mite = kzalloc_obj(*mite);
if (!mite)
return;
diff --git a/drivers/gpib/tnt4882/tnt4882_gpib.c b/drivers/gpib/tnt4882/tnt4882_gpib.c
index 8d593d3489ad..51a920e1d9a4 100644
--- a/drivers/gpib/tnt4882/tnt4882_gpib.c
+++ b/drivers/gpib/tnt4882/tnt4882_gpib.c
@@ -843,7 +843,7 @@ static int tnt4882_allocate_private(struct gpib_board *board)
{
struct tnt4882_priv *tnt_priv;
- board->private_data = kzalloc_obj(struct tnt4882_priv, GFP_KERNEL);
+ board->private_data = kzalloc_obj(struct tnt4882_priv);
if (!board->private_data)
return -ENOMEM;
tnt_priv = board->private_data;
@@ -1567,7 +1567,7 @@ static int ni_gpib_probe(struct pcmcia_device *link)
//struct struct gpib_board *dev;
/* Allocate space for private device-specific data */
- info = kzalloc_obj(*info, GFP_KERNEL);
+ info = kzalloc_obj(*info);
if (!info)
return -ENOMEM;
diff --git a/drivers/gpio/gpio-aggregator.c b/drivers/gpio/gpio-aggregator.c
index 19857285f28c..0f015a122dec 100644
--- a/drivers/gpio/gpio-aggregator.c
+++ b/drivers/gpio/gpio-aggregator.c
@@ -159,7 +159,7 @@ gpio_aggregator_line_alloc(struct gpio_aggregator *parent, unsigned int idx,
{
struct gpio_aggregator_line *line;
- line = kzalloc_obj(*line, GFP_KERNEL);
+ line = kzalloc_obj(*line);
if (!line)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/gpio/gpio-reg.c b/drivers/gpio/gpio-reg.c
index 1daa05bbf35b..296c210b228c 100644
--- a/drivers/gpio/gpio-reg.c
+++ b/drivers/gpio/gpio-reg.c
@@ -150,7 +150,7 @@ struct gpio_chip *gpio_reg_init(struct device *dev, void __iomem *reg,
if (dev)
r = devm_kzalloc(dev, sizeof(*r), GFP_KERNEL);
else
- r = kzalloc_obj(*r, GFP_KERNEL);
+ r = kzalloc_obj(*r);
if (!r)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/gpio/gpio-regmap.c b/drivers/gpio/gpio-regmap.c
index 5891983810af..9ae4a41a2427 100644
--- a/drivers/gpio/gpio-regmap.c
+++ b/drivers/gpio/gpio-regmap.c
@@ -259,7 +259,7 @@ struct gpio_regmap *gpio_regmap_register(const struct gpio_regmap_config *config
if (config->reg_dir_out_base && config->reg_dir_in_base)
return ERR_PTR(-EINVAL);
- gpio = kzalloc_obj(*gpio, GFP_KERNEL);
+ gpio = kzalloc_obj(*gpio);
if (!gpio)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/gpio/gpio-sim.c b/drivers/gpio/gpio-sim.c
index 5299500e7617..8dc164939ec3 100644
--- a/drivers/gpio/gpio-sim.c
+++ b/drivers/gpio/gpio-sim.c
@@ -813,7 +813,7 @@ static int gpio_sim_add_hogs(struct gpio_sim_device *dev)
return 0;
/* Allocate one more for the sentinel. */
- dev->hogs = kzalloc_objs(*dev->hogs, num_hogs + 1, GFP_KERNEL);
+ dev->hogs = kzalloc_objs(*dev->hogs, num_hogs + 1);
if (!dev->hogs)
return -ENOMEM;
@@ -1406,7 +1406,7 @@ gpio_sim_line_config_make_hog_item(struct config_group *group, const char *name)
guard(mutex)(&dev->lock);
- hog = kzalloc_obj(*hog, GFP_KERNEL);
+ hog = kzalloc_obj(*hog);
if (!hog)
return ERR_PTR(-ENOMEM);
@@ -1467,7 +1467,7 @@ gpio_sim_bank_config_make_line_group(struct config_group *group,
if (gpio_sim_device_is_live(dev))
return ERR_PTR(-EBUSY);
- line = kzalloc_obj(*line, GFP_KERNEL);
+ line = kzalloc_obj(*line);
if (!line)
return ERR_PTR(-ENOMEM);
@@ -1521,7 +1521,7 @@ gpio_sim_device_config_make_bank_group(struct config_group *group,
if (gpio_sim_device_is_live(dev))
return ERR_PTR(-EBUSY);
- bank = kzalloc_obj(*bank, GFP_KERNEL);
+ bank = kzalloc_obj(*bank);
if (!bank)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/gpio/gpio-virtuser.c b/drivers/gpio/gpio-virtuser.c
index 5b8cb4e65e56..3d998939120e 100644
--- a/drivers/gpio/gpio-virtuser.c
+++ b/drivers/gpio/gpio-virtuser.c
@@ -1605,7 +1605,7 @@ gpio_virtuser_make_lookup_entry_group(struct config_group *group,
return ERR_PTR(-EBUSY);
struct gpio_virtuser_lookup_entry *entry __free(kfree) =
- kzalloc_obj(*entry, GFP_KERNEL);
+ kzalloc_obj(*entry);
if (!entry)
return ERR_PTR(-ENOMEM);
@@ -1661,7 +1661,7 @@ gpio_virtuser_make_lookup_group(struct config_group *group, const char *name)
return ERR_PTR(-EBUSY);
struct gpio_virtuser_lookup *lookup __free(kfree) =
- kzalloc_obj(*lookup, GFP_KERNEL);
+ kzalloc_obj(*lookup);
if (!lookup)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/gpio/gpiolib-acpi-core.c b/drivers/gpio/gpiolib-acpi-core.c
index df60f6eac137..ced6375d1bad 100644
--- a/drivers/gpio/gpiolib-acpi-core.c
+++ b/drivers/gpio/gpiolib-acpi-core.c
@@ -403,7 +403,7 @@ static acpi_status acpi_gpiochip_alloc_event(struct acpi_resource *ares,
goto fail_unlock_irq;
}
- event = kzalloc_obj(*event, GFP_KERNEL);
+ event = kzalloc_obj(*event);
if (!event)
goto fail_unlock_irq;
@@ -1144,7 +1144,7 @@ acpi_gpio_adr_space_handler(u32 function, acpi_physical_address address,
goto out;
}
- conn = kzalloc_obj(*conn, GFP_KERNEL);
+ conn = kzalloc_obj(*conn);
if (!conn) {
gpiochip_free_own_desc(desc);
mutex_unlock(&achip->conn_lock);
@@ -1302,7 +1302,7 @@ void acpi_gpiochip_add(struct gpio_chip *chip)
if (!adev)
return;
- acpi_gpio = kzalloc_obj(*acpi_gpio, GFP_KERNEL);
+ acpi_gpio = kzalloc_obj(*acpi_gpio);
if (!acpi_gpio) {
dev_err(chip->parent,
"Failed to allocate memory for ACPI GPIO chip\n");
diff --git a/drivers/gpio/gpiolib-cdev.c b/drivers/gpio/gpiolib-cdev.c
index f50b067e1de3..fdc2a6539786 100644
--- a/drivers/gpio/gpiolib-cdev.c
+++ b/drivers/gpio/gpiolib-cdev.c
@@ -318,7 +318,7 @@ static int linehandle_create(struct gpio_device *gdev, void __user *ip)
if (ret)
return ret;
- lh = kzalloc_obj(*lh, GFP_KERNEL);
+ lh = kzalloc_obj(*lh);
if (!lh)
return -ENOMEM;
lh->gdev = gpio_device_get(gdev);
@@ -1280,7 +1280,7 @@ static long linereq_get_values(struct linereq *lr, void __user *ip)
if (num_get != 1) {
/* build compacted desc array */
- descs = kmalloc_objs(*descs, num_get, GFP_KERNEL);
+ descs = kmalloc_objs(*descs, num_get);
if (!descs)
return -ENOMEM;
for (didx = 0, i = 0; i < lr->num_lines; i++) {
@@ -1355,7 +1355,7 @@ static long linereq_set_values(struct linereq *lr, void __user *ip)
if (num_set != 1) {
/* build compacted desc array */
- descs = kmalloc_objs(*descs, num_set, GFP_KERNEL);
+ descs = kmalloc_objs(*descs, num_set);
if (!descs)
return -ENOMEM;
for (didx = 0, i = 0; i < lr->num_lines; i++) {
@@ -2054,7 +2054,7 @@ static int lineevent_create(struct gpio_device *gdev, void __user *ip)
(lflags & GPIOHANDLE_REQUEST_BIAS_PULL_UP)))
return -EINVAL;
- le = kzalloc_obj(*le, GFP_KERNEL);
+ le = kzalloc_obj(*le);
if (!le)
return -ENOMEM;
le->gdev = gpio_device_get(gdev);
diff --git a/drivers/gpio/gpiolib-shared.c b/drivers/gpio/gpiolib-shared.c
index bb53f803b2e3..48de8cf141db 100644
--- a/drivers/gpio/gpiolib-shared.c
+++ b/drivers/gpio/gpiolib-shared.c
@@ -228,7 +228,7 @@ static int gpio_shared_of_traverse(struct device_node *curr)
entry = gpio_shared_find_entry(fwnode, offset);
if (!entry) {
- entry = kzalloc_obj(*entry, GFP_KERNEL);
+ entry = kzalloc_obj(*entry);
if (!entry)
return -ENOMEM;
@@ -627,7 +627,7 @@ gpiod_shared_desc_create(struct gpio_shared_entry *entry)
lockdep_assert_held(&entry->lock);
- shared_desc = kzalloc_obj(*shared_desc, GFP_KERNEL);
+ shared_desc = kzalloc_obj(*shared_desc);
if (!shared_desc)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/gpio/gpiolib-sysfs.c b/drivers/gpio/gpiolib-sysfs.c
index 99e0cf963b19..270e8060e761 100644
--- a/drivers/gpio/gpiolib-sysfs.c
+++ b/drivers/gpio/gpiolib-sysfs.c
@@ -761,7 +761,7 @@ int gpiod_export(struct gpio_desc *desc, bool direction_may_change)
goto err_clear_bit;
}
- desc_data = kzalloc_obj(*desc_data, GFP_KERNEL);
+ desc_data = kzalloc_obj(*desc_data);
if (!desc_data) {
status = -ENOMEM;
goto err_clear_bit;
@@ -1014,7 +1014,7 @@ int gpiochip_sysfs_register(struct gpio_device *gdev)
else
parent = &gdev->dev;
- data = kmalloc_obj(*data, GFP_KERNEL);
+ data = kmalloc_obj(*data);
if (!data)
return -ENOMEM;
diff --git a/drivers/gpio/gpiolib.c b/drivers/gpio/gpiolib.c
index 654505cd21da..da0029628f2f 100644
--- a/drivers/gpio/gpiolib.c
+++ b/drivers/gpio/gpiolib.c
@@ -2332,7 +2332,7 @@ int gpiochip_add_pingroup_range(struct gpio_chip *gc,
struct gpio_device *gdev = gc->gpiodev;
int ret;
- pin_range = kzalloc_obj(*pin_range, GFP_KERNEL);
+ pin_range = kzalloc_obj(*pin_range);
if (!pin_range)
return -ENOMEM;
@@ -2393,7 +2393,7 @@ int gpiochip_add_pin_range_with_pins(struct gpio_chip *gc,
struct gpio_device *gdev = gc->gpiodev;
int ret;
- pin_range = kzalloc_obj(*pin_range, GFP_KERNEL);
+ pin_range = kzalloc_obj(*pin_range);
if (!pin_range)
return -ENOMEM;
@@ -5369,7 +5369,7 @@ static void *gpiolib_seq_start(struct seq_file *s, loff_t *pos)
s->private = NULL;
- priv = kzalloc_obj(*priv, GFP_KERNEL);
+ priv = kzalloc_obj(*priv);
if (!priv)
return NULL;
diff --git a/drivers/gpu/drm/amd/amdgpu/aldebaran.c b/drivers/gpu/drm/amd/amdgpu/aldebaran.c
index 5d8d9c73434a..938fb0b2368d 100644
--- a/drivers/gpu/drm/amd/amdgpu/aldebaran.c
+++ b/drivers/gpu/drm/amd/amdgpu/aldebaran.c
@@ -447,7 +447,7 @@ int aldebaran_reset_init(struct amdgpu_device *adev)
{
struct amdgpu_reset_control *reset_ctl;
- reset_ctl = kzalloc_obj(*reset_ctl, GFP_KERNEL);
+ reset_ctl = kzalloc_obj(*reset_ctl);
if (!reset_ctl)
return -ENOMEM;
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_aca.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_aca.c
index 1c7597c19249..afe5ca81beec 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_aca.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_aca.c
@@ -52,7 +52,7 @@ static int aca_banks_add_bank(struct aca_banks *banks, struct aca_bank *bank)
if (!bank)
return -EINVAL;
- node = kvzalloc_obj(*node, GFP_KERNEL);
+ node = kvzalloc_obj(*node);
if (!node)
return -ENOMEM;
@@ -230,7 +230,7 @@ static struct aca_bank_error *new_bank_error(struct aca_error *aerr, struct aca_
{
struct aca_bank_error *bank_error;
- bank_error = kvzalloc_obj(*bank_error, GFP_KERNEL);
+ bank_error = kvzalloc_obj(*bank_error);
if (!bank_error)
return NULL;
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_acp.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_acp.c
index c544f0dbb93f..b08752c57a7e 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_acp.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_acp.c
@@ -246,7 +246,7 @@ static int acp_hw_init(struct amdgpu_ip_block *ip_block)
return -EINVAL;
acp_base = adev->rmmio_base;
- adev->acp.acp_genpd = kzalloc_obj(struct acp_pm_domain, GFP_KERNEL);
+ adev->acp.acp_genpd = kzalloc_obj(struct acp_pm_domain);
if (!adev->acp.acp_genpd)
return -ENOMEM;
@@ -267,7 +267,7 @@ static int acp_hw_init(struct amdgpu_ip_block *ip_block)
goto failure;
}
- adev->acp.acp_res = kzalloc_objs(struct resource, 3, GFP_KERNEL);
+ adev->acp.acp_res = kzalloc_objs(struct resource, 3);
if (!adev->acp.acp_res) {
r = -ENOMEM;
goto failure;
@@ -333,7 +333,7 @@ static int acp_hw_init(struct amdgpu_ip_block *ip_block)
goto failure;
}
- adev->acp.acp_res = kzalloc_objs(struct resource, 5, GFP_KERNEL);
+ adev->acp.acp_res = kzalloc_objs(struct resource, 5);
if (!adev->acp.acp_res) {
r = -ENOMEM;
goto failure;
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_acpi.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_acpi.c
index 742fc381149e..516ab9cf88fc 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_acpi.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_acpi.c
@@ -897,7 +897,7 @@ static struct amdgpu_numa_info *amdgpu_acpi_get_numa_info(uint32_t pxm)
if (!numa_info) {
struct sysinfo info;
- numa_info = kzalloc_obj(*numa_info, GFP_KERNEL);
+ numa_info = kzalloc_obj(*numa_info);
if (!numa_info)
return NULL;
@@ -1016,7 +1016,7 @@ static int amdgpu_acpi_dev_init(struct amdgpu_acpi_dev_info **dev_info,
int ret = -ENOENT;
*dev_info = NULL;
- tmp = kzalloc_obj(struct amdgpu_acpi_dev_info, GFP_KERNEL);
+ tmp = kzalloc_obj(struct amdgpu_acpi_dev_info);
if (!tmp)
return -ENOMEM;
@@ -1166,7 +1166,7 @@ int amdgpu_acpi_enumerate_xcc(void)
break;
}
- xcc_info = kzalloc_obj(struct amdgpu_acpi_xcc_info, GFP_KERNEL);
+ xcc_info = kzalloc_obj(struct amdgpu_acpi_xcc_info);
if (!xcc_info)
return -ENOMEM;
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c
index 16baf713be78..40c22438b1d2 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c
@@ -829,11 +829,11 @@ int amdgpu_amdkfd_unmap_hiq(struct amdgpu_device *adev, u32 doorbell_off,
if (!kiq_ring->sched.ready || amdgpu_in_reset(adev))
return 0;
- ring_funcs = kzalloc_obj(*ring_funcs, GFP_KERNEL);
+ ring_funcs = kzalloc_obj(*ring_funcs);
if (!ring_funcs)
return -ENOMEM;
- ring = kzalloc_obj(*ring, GFP_KERNEL);
+ ring = kzalloc_obj(*ring);
if (!ring) {
r = -ENOMEM;
goto free_ring_funcs;
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_arcturus.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_arcturus.c
index c74e3866ffb8..a1d93f217844 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_arcturus.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_arcturus.c
@@ -199,7 +199,7 @@ int kgd_arcturus_hqd_sdma_dump(struct amdgpu_device *adev,
#undef HQD_N_REGS
#define HQD_N_REGS (19+6+7+10)
- *dump = kmalloc_objs(**dump, HQD_N_REGS, GFP_KERNEL);
+ *dump = kmalloc_objs(**dump, HQD_N_REGS);
if (*dump == NULL)
return -ENOMEM;
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_fence.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_fence.c
index fff60109cf9c..6a364357522b 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_fence.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_fence.c
@@ -67,7 +67,7 @@ struct amdgpu_amdkfd_fence *amdgpu_amdkfd_fence_create(u64 context,
{
struct amdgpu_amdkfd_fence *fence;
- fence = kzalloc_obj(*fence, GFP_KERNEL);
+ fence = kzalloc_obj(*fence);
if (fence == NULL)
return NULL;
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gc_9_4_3.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gc_9_4_3.c
index a2e00dd114a6..f35947be3763 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gc_9_4_3.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gc_9_4_3.c
@@ -141,7 +141,7 @@ static int kgd_gfx_v9_4_3_hqd_sdma_dump(struct amdgpu_device *adev,
(*dump)[i++][1] = RREG32(addr); \
} while (0)
- *dump = kmalloc_objs(**dump, HQD_N_REGS, GFP_KERNEL);
+ *dump = kmalloc_objs(**dump, HQD_N_REGS);
if (*dump == NULL)
return -ENOMEM;
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v10.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v10.c
index 70d63690dccd..88acf75f0edd 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v10.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v10.c
@@ -352,7 +352,7 @@ static int kgd_hqd_dump(struct amdgpu_device *adev,
(*dump)[i++][1] = RREG32_SOC15_IP(GC, addr); \
} while (0)
- *dump = kmalloc_objs(**dump, HQD_N_REGS, GFP_KERNEL);
+ *dump = kmalloc_objs(**dump, HQD_N_REGS);
if (*dump == NULL)
return -ENOMEM;
@@ -449,7 +449,7 @@ static int kgd_hqd_sdma_dump(struct amdgpu_device *adev,
#undef HQD_N_REGS
#define HQD_N_REGS (19+6+7+10)
- *dump = kmalloc_objs(**dump, HQD_N_REGS, GFP_KERNEL);
+ *dump = kmalloc_objs(**dump, HQD_N_REGS);
if (*dump == NULL)
return -ENOMEM;
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v10_3.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v10_3.c
index 41564319441e..e31afee42979 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v10_3.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v10_3.c
@@ -338,7 +338,7 @@ static int hqd_dump_v10_3(struct amdgpu_device *adev,
(*dump)[i++][1] = RREG32_SOC15_IP(GC, addr); \
} while (0)
- *dump = kmalloc_objs(**dump, HQD_N_REGS, GFP_KERNEL);
+ *dump = kmalloc_objs(**dump, HQD_N_REGS);
if (*dump == NULL)
return -ENOMEM;
@@ -435,7 +435,7 @@ static int hqd_sdma_dump_v10_3(struct amdgpu_device *adev,
#undef HQD_N_REGS
#define HQD_N_REGS (19+6+7+12)
- *dump = kmalloc_objs(**dump, HQD_N_REGS, GFP_KERNEL);
+ *dump = kmalloc_objs(**dump, HQD_N_REGS);
if (*dump == NULL)
return -ENOMEM;
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v11.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v11.c
index 50c57914c90c..8aa068a4d3e3 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v11.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v11.c
@@ -323,7 +323,7 @@ static int hqd_dump_v11(struct amdgpu_device *adev,
(*dump)[i++][1] = RREG32(addr); \
} while (0)
- *dump = kmalloc_objs(**dump, HQD_N_REGS, GFP_KERNEL);
+ *dump = kmalloc_objs(**dump, HQD_N_REGS);
if (*dump == NULL)
return -ENOMEM;
@@ -420,7 +420,7 @@ static int hqd_sdma_dump_v11(struct amdgpu_device *adev,
#undef HQD_N_REGS
#define HQD_N_REGS (7+11+1+12+12)
- *dump = kmalloc_objs(**dump, HQD_N_REGS, GFP_KERNEL);
+ *dump = kmalloc_objs(**dump, HQD_N_REGS);
if (*dump == NULL)
return -ENOMEM;
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v12.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v12.c
index 4e43ad423713..bf0bd7688ee4 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v12.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v12.c
@@ -115,7 +115,7 @@ static int hqd_dump_v12(struct amdgpu_device *adev,
(*dump)[i++][1] = RREG32(addr); \
} while (0)
- *dump = kmalloc_objs(**dump, HQD_N_REGS, GFP_KERNEL);
+ *dump = kmalloc_objs(**dump, HQD_N_REGS);
if (*dump == NULL)
return -ENOMEM;
@@ -146,7 +146,7 @@ static int hqd_sdma_dump_v12(struct amdgpu_device *adev,
#undef HQD_N_REGS
#define HQD_N_REGS (last_reg - first_reg + 1)
- *dump = kmalloc_objs(**dump, HQD_N_REGS, GFP_KERNEL);
+ *dump = kmalloc_objs(**dump, HQD_N_REGS);
if (*dump == NULL)
return -ENOMEM;
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v7.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v7.c
index ba7e901322b3..2f62e5e306e8 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v7.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v7.c
@@ -214,7 +214,7 @@ static int kgd_hqd_dump(struct amdgpu_device *adev,
(*dump)[i++][1] = RREG32(addr); \
} while (0)
- *dump = kmalloc_objs(**dump, HQD_N_REGS, GFP_KERNEL);
+ *dump = kmalloc_objs(**dump, HQD_N_REGS);
if (*dump == NULL)
return -ENOMEM;
@@ -301,7 +301,7 @@ static int kgd_hqd_sdma_dump(struct amdgpu_device *adev,
#undef HQD_N_REGS
#define HQD_N_REGS (19+4)
- *dump = kmalloc_objs(**dump, HQD_N_REGS, GFP_KERNEL);
+ *dump = kmalloc_objs(**dump, HQD_N_REGS);
if (*dump == NULL)
return -ENOMEM;
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v8.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v8.c
index 9f51fd11c5ae..dc74fa26cf02 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v8.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v8.c
@@ -238,7 +238,7 @@ static int kgd_hqd_dump(struct amdgpu_device *adev,
(*dump)[i++][1] = RREG32(addr); \
} while (0)
- *dump = kmalloc_objs(**dump, HQD_N_REGS, GFP_KERNEL);
+ *dump = kmalloc_objs(**dump, HQD_N_REGS);
if (*dump == NULL)
return -ENOMEM;
@@ -324,7 +324,7 @@ static int kgd_hqd_sdma_dump(struct amdgpu_device *adev,
#undef HQD_N_REGS
#define HQD_N_REGS (19+4+2+3+7)
- *dump = kmalloc_objs(**dump, HQD_N_REGS, GFP_KERNEL);
+ *dump = kmalloc_objs(**dump, HQD_N_REGS);
if (*dump == NULL)
return -ENOMEM;
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v9.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v9.c
index cc2073cf43f4..2e116c06d5be 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v9.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v9.c
@@ -363,7 +363,7 @@ int kgd_gfx_v9_hqd_dump(struct amdgpu_device *adev,
(*dump)[i++][1] = RREG32(addr); \
} while (0)
- *dump = kmalloc_objs(**dump, HQD_N_REGS, GFP_KERNEL);
+ *dump = kmalloc_objs(**dump, HQD_N_REGS);
if (*dump == NULL)
return -ENOMEM;
@@ -460,7 +460,7 @@ static int kgd_hqd_sdma_dump(struct amdgpu_device *adev,
#undef HQD_N_REGS
#define HQD_N_REGS (19+6+7+10)
- *dump = kmalloc_objs(**dump, HQD_N_REGS, GFP_KERNEL);
+ *dump = kmalloc_objs(**dump, HQD_N_REGS);
if (*dump == NULL)
return -ENOMEM;
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c
index fd7bfe418099..06c1913d5a3f 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c
@@ -540,7 +540,7 @@ static uint64_t get_pte_flags(struct amdgpu_device *adev, struct amdgpu_vm *vm,
*/
static struct sg_table *create_sg_table(uint64_t addr, uint32_t size)
{
- struct sg_table *sg = kmalloc_obj(*sg, GFP_KERNEL);
+ struct sg_table *sg = kmalloc_obj(*sg);
if (!sg)
return NULL;
@@ -573,7 +573,7 @@ kfd_mem_dmamap_userptr(struct kgd_mem *mem,
if (WARN_ON(ttm->num_pages != src_ttm->num_pages))
return -EINVAL;
- ttm->sg = kmalloc_obj(*ttm->sg, GFP_KERNEL);
+ ttm->sg = kmalloc_obj(*ttm->sg);
if (unlikely(!ttm->sg))
return -ENOMEM;
@@ -1409,7 +1409,7 @@ static int init_kfd_vm(struct amdgpu_vm *vm, void **process_info,
process = container_of(process_info, struct kfd_process, kgd_process_info);
if (!*process_info) {
- info = kzalloc_obj(*info, GFP_KERNEL);
+ info = kzalloc_obj(*info);
if (!info)
return -ENOMEM;
@@ -1773,7 +1773,7 @@ int amdgpu_amdkfd_gpuvm_alloc_memory_of_gpu(
if (flags & KFD_IOC_ALLOC_MEM_FLAGS_UNCACHED)
alloc_flags |= AMDGPU_GEM_CREATE_UNCACHED;
- *mem = kzalloc_obj(struct kgd_mem, GFP_KERNEL);
+ *mem = kzalloc_obj(struct kgd_mem);
if (!*mem) {
ret = -ENOMEM;
goto err;
@@ -2374,7 +2374,7 @@ static int import_obj_create(struct amdgpu_device *adev,
/* Only VRAM and GTT BOs are supported */
return -EINVAL;
- *mem = kzalloc_obj(struct kgd_mem, GFP_KERNEL);
+ *mem = kzalloc_obj(struct kgd_mem);
if (!*mem)
return -ENOMEM;
@@ -3129,7 +3129,7 @@ int amdgpu_amdkfd_add_gws_to_process(void *info, void *gws, struct kgd_mem **mem
if (!info || !gws)
return -EINVAL;
- *mem = kzalloc_obj(struct kgd_mem, GFP_KERNEL);
+ *mem = kzalloc_obj(struct kgd_mem);
if (!*mem)
return -ENOMEM;
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_atombios.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_atombios.c
index 59ddc14cbb7d..9f38b7dd1011 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_atombios.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_atombios.c
@@ -1897,7 +1897,7 @@ void amdgpu_atombios_fini(struct amdgpu_device *adev)
int amdgpu_atombios_init(struct amdgpu_device *adev)
{
struct card_info *atom_card_info =
- kzalloc_obj(struct card_info, GFP_KERNEL);
+ kzalloc_obj(struct card_info);
if (!atom_card_info)
return -ENOMEM;
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_connectors.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_connectors.c
index 198ad026222d..fa008b858e39 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_connectors.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_connectors.c
@@ -1652,7 +1652,7 @@ amdgpu_connector_add(struct amdgpu_device *adev,
}
}
- amdgpu_connector = kzalloc_obj(struct amdgpu_connector, GFP_KERNEL);
+ amdgpu_connector = kzalloc_obj(struct amdgpu_connector);
if (!amdgpu_connector)
return;
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c
index c9345783ac26..2b2636e65279 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c
@@ -523,7 +523,7 @@ static int amdgpu_cs_p2_syncobj_out(struct amdgpu_cs_parser *p,
if (p->post_deps)
return -EINVAL;
- p->post_deps = kmalloc_objs(*p->post_deps, num_deps, GFP_KERNEL);
+ p->post_deps = kmalloc_objs(*p->post_deps, num_deps);
p->num_post_deps = 0;
if (!p->post_deps)
@@ -556,7 +556,7 @@ static int amdgpu_cs_p2_syncobj_timeline_signal(struct amdgpu_cs_parser *p,
if (p->post_deps)
return -EINVAL;
- p->post_deps = kmalloc_objs(*p->post_deps, num_deps, GFP_KERNEL);
+ p->post_deps = kmalloc_objs(*p->post_deps, num_deps);
p->num_post_deps = 0;
if (!p->post_deps)
@@ -1689,7 +1689,7 @@ static int amdgpu_cs_wait_any_fence(struct amdgpu_device *adev,
long r;
/* Prepare the fence array */
- array = kzalloc_objs(struct dma_fence *, fence_count, GFP_KERNEL);
+ array = kzalloc_objs(struct dma_fence *, fence_count);
if (array == NULL)
return -ENOMEM;
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ctx.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_ctx.c
index 1eb2e89fcdeb..c0f501a61198 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ctx.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ctx.c
@@ -482,7 +482,7 @@ static int amdgpu_ctx_alloc(struct amdgpu_device *adev,
struct amdgpu_ctx *ctx;
int r;
- ctx = kmalloc_obj(*ctx, GFP_KERNEL);
+ ctx = kmalloc_obj(*ctx);
if (!ctx)
return -ENOMEM;
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c
index 56a13637bb8c..f7467af2e102 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c
@@ -206,7 +206,7 @@ static int amdgpu_debugfs_regs2_open(struct inode *inode, struct file *file)
{
struct amdgpu_debugfs_regs2_data *rd;
- rd = kzalloc_obj(*rd, GFP_KERNEL);
+ rd = kzalloc_obj(*rd);
if (!rd)
return -ENOMEM;
rd->adev = file_inode(file)->i_private;
@@ -371,7 +371,7 @@ static int amdgpu_debugfs_gprwave_open(struct inode *inode, struct file *file)
{
struct amdgpu_debugfs_gprwave_data *rd;
- rd = kzalloc_obj(*rd, GFP_KERNEL);
+ rd = kzalloc_obj(*rd);
if (!rd)
return -ENOMEM;
rd->adev = file_inode(file)->i_private;
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
index c57cbf497eba..d9789e0b5201 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
@@ -2596,7 +2596,7 @@ static int amdgpu_device_parse_gpu_info_fw(struct amdgpu_device *adev)
static void amdgpu_uid_init(struct amdgpu_device *adev)
{
/* Initialize the UID for the device */
- adev->uid_info = kzalloc_obj(struct amdgpu_uid, GFP_KERNEL);
+ adev->uid_info = kzalloc_obj(struct amdgpu_uid);
if (!adev->uid_info) {
dev_warn(adev->dev, "Failed to allocate memory for UID\n");
return;
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c
index c51eedd96fb0..6d1f5cae1a65 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c
@@ -1149,7 +1149,7 @@ static int amdgpu_discovery_sysfs_ips(struct amdgpu_device *adev,
* block if not yet registered.
*/
if (!ip_hw_id) {
- ip_hw_id = kzalloc_obj(*ip_hw_id, GFP_KERNEL);
+ ip_hw_id = kzalloc_obj(*ip_hw_id);
if (!ip_hw_id)
return -ENOMEM;
ip_hw_id->hw_id = ii;
@@ -1255,7 +1255,7 @@ static int amdgpu_discovery_sysfs_recurse(struct amdgpu_device *adev)
* amdgpu_discovery_reg_base_init().
*/
- ip_die_entry = kzalloc_obj(*ip_die_entry, GFP_KERNEL);
+ ip_die_entry = kzalloc_obj(*ip_die_entry);
if (!ip_die_entry)
return -ENOMEM;
@@ -1287,7 +1287,7 @@ static int amdgpu_discovery_sysfs_init(struct amdgpu_device *adev)
if (!discovery_bin)
return -EINVAL;
- ip_top = kzalloc_obj(*ip_top, GFP_KERNEL);
+ ip_top = kzalloc_obj(*ip_top);
if (!ip_top)
return -ENOMEM;
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_display.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_display.c
index eb94a0b97b94..bef9dce2e7ea 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_display.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_display.c
@@ -204,7 +204,7 @@ int amdgpu_display_crtc_page_flip_target(struct drm_crtc *crtc,
u64 tiling_flags;
int i, r;
- work = kzalloc_obj(*work, GFP_KERNEL);
+ work = kzalloc_obj(*work);
if (work == NULL)
return -ENOMEM;
@@ -1323,7 +1323,7 @@ amdgpu_display_user_framebuffer_create(struct drm_device *dev,
return ERR_PTR(-EINVAL);
}
- amdgpu_fb = kzalloc_obj(*amdgpu_fb, GFP_KERNEL);
+ amdgpu_fb = kzalloc_obj(*amdgpu_fb);
if (amdgpu_fb == NULL) {
drm_gem_object_put(obj);
return ERR_PTR(-ENOMEM);
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_eviction_fence.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_eviction_fence.c
index 432de34d177f..3b588c7740ec 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_eviction_fence.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_eviction_fence.c
@@ -161,7 +161,7 @@ amdgpu_eviction_fence_create(struct amdgpu_eviction_fence_mgr *evf_mgr)
{
struct amdgpu_eviction_fence *ev_fence;
- ev_fence = kzalloc_obj(*ev_fence, GFP_KERNEL);
+ ev_fence = kzalloc_obj(*ev_fence);
if (!ev_fence)
return NULL;
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_fru_eeprom.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_fru_eeprom.c
index cb33a04d94c9..514bd302365f 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_fru_eeprom.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_fru_eeprom.c
@@ -130,7 +130,7 @@ int amdgpu_fru_get_product_info(struct amdgpu_device *adev)
return 0;
if (!adev->fru_info) {
- adev->fru_info = kzalloc_obj(*adev->fru_info, GFP_KERNEL);
+ adev->fru_info = kzalloc_obj(*adev->fru_info);
if (!adev->fru_info)
return -ENOMEM;
}
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_gart.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_gart.c
index 07e43b446e44..e2d32c29668a 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_gart.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_gart.c
@@ -153,7 +153,7 @@ int amdgpu_gart_table_ram_alloc(struct amdgpu_device *adev)
dev_info(adev->dev, "%s dma_addr:%pad\n", __func__, &dma_addr);
/* Create SG table */
- sg = kmalloc_obj(*sg, GFP_KERNEL);
+ sg = kmalloc_obj(*sg);
if (!sg) {
ret = -ENOMEM;
goto error;
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c
index 27b77a82b174..a6107109a2b8 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c
@@ -1183,7 +1183,7 @@ int amdgpu_gem_list_handles_ioctl(struct drm_device *dev, void *data,
return 0;
}
- bo_entries = kvzalloc_objs(*bo_entries, num_bos, GFP_KERNEL);
+ bo_entries = kvzalloc_objs(*bo_entries, num_bos);
if (!bo_entries)
return -ENOMEM;
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_hmm.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_hmm.c
index 4cc345f77db0..f72990ac046e 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_hmm.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_hmm.c
@@ -265,7 +265,7 @@ struct amdgpu_hmm_range *amdgpu_hmm_range_alloc(struct amdgpu_bo *bo)
{
struct amdgpu_hmm_range *range;
- range = kzalloc_obj(*range, GFP_KERNEL);
+ range = kzalloc_obj(*range);
if (!range)
return NULL;
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_i2c.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_i2c.c
index 9dc4a5f426eb..c576e103a783 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_i2c.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_i2c.c
@@ -168,7 +168,7 @@ struct amdgpu_i2c_chan *amdgpu_i2c_create(struct drm_device *dev,
if (rec->mm_i2c && (amdgpu_hw_i2c == 0))
return NULL;
- i2c = kzalloc_obj(struct amdgpu_i2c_chan, GFP_KERNEL);
+ i2c = kzalloc_obj(struct amdgpu_i2c_chan);
if (i2c == NULL)
return NULL;
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ids.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_ids.c
index 52bad6d28915..64c519cd7395 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ids.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ids.c
@@ -119,7 +119,7 @@ void amdgpu_pasid_free_delayed(struct dma_resv *resv,
return;
}
- cb = kmalloc_obj(*cb, GFP_KERNEL);
+ cb = kmalloc_obj(*cb);
if (!cb) {
/* Last resort when we are OOM */
dma_fence_wait(fence, false);
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_irq.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_irq.c
index d51ce25474f5..49eedfbfb5e8 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_irq.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_irq.c
@@ -448,7 +448,7 @@ int amdgpu_irq_add_id(struct amdgpu_device *adev,
if (source->num_types && !source->enabled_types) {
atomic_t *types;
- types = kzalloc_objs(atomic_t, source->num_types, GFP_KERNEL);
+ types = kzalloc_objs(atomic_t, source->num_types);
if (!types)
return -ENOMEM;
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_job.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_job.c
index 8865b4802963..bee7fcf006a2 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_job.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_job.c
@@ -202,14 +202,14 @@ int amdgpu_job_alloc(struct amdgpu_device *adev, struct amdgpu_vm *vm,
if (!*job)
return -ENOMEM;
- af = kzalloc_obj(struct amdgpu_fence, GFP_KERNEL);
+ af = kzalloc_obj(struct amdgpu_fence);
if (!af) {
r = -ENOMEM;
goto err_job;
}
(*job)->hw_fence = af;
- af = kzalloc_obj(struct amdgpu_fence, GFP_KERNEL);
+ af = kzalloc_obj(struct amdgpu_fence);
if (!af) {
r = -ENOMEM;
goto err_fence;
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c
index a5b72ed77162..77e2133de5cf 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c
@@ -942,7 +942,7 @@ int amdgpu_info_ioctl(struct drm_device *dev, void *data, struct drm_file *filp)
uint64_t vm_size;
uint32_t pcie_gen_mask, pcie_width_mask;
- dev_info = kzalloc_obj(*dev_info, GFP_KERNEL);
+ dev_info = kzalloc_obj(*dev_info);
if (!dev_info)
return -ENOMEM;
@@ -1329,7 +1329,7 @@ int amdgpu_info_ioctl(struct drm_device *dev, void *data, struct drm_file *filp)
return -EINVAL;
}
- caps = kzalloc_obj(*caps, GFP_KERNEL);
+ caps = kzalloc_obj(*caps);
if (!caps)
return -ENOMEM;
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_mca.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_mca.c
index 6b52dbdb7e54..823ba17e32af 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_mca.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_mca.c
@@ -169,7 +169,7 @@ static int amdgpu_mca_bank_set_add_entry(struct mca_bank_set *mca_set, struct mc
if (!entry)
return -EINVAL;
- node = kvzalloc_obj(*node, GFP_KERNEL);
+ node = kvzalloc_obj(*node);
if (!node)
return -ENOMEM;
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_pmu.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_pmu.c
index 0cfe3a91db84..ad5d2fcd03d7 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_pmu.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_pmu.c
@@ -446,7 +446,7 @@ static int amdgpu_pmu_alloc_pmu_attrs(
struct amdgpu_pmu_event_attribute **evt_attr,
struct amdgpu_pmu_config *config)
{
- *fmt_attr = kzalloc_objs(**fmt_attr, config->num_formats, GFP_KERNEL);
+ *fmt_attr = kzalloc_objs(**fmt_attr, config->num_formats);
if (!(*fmt_attr))
return -ENOMEM;
@@ -458,7 +458,7 @@ static int amdgpu_pmu_alloc_pmu_attrs(
if (!fmt_attr_group->attrs)
goto err_fmt_attr_grp;
- *evt_attr = kzalloc_objs(**evt_attr, config->num_events, GFP_KERNEL);
+ *evt_attr = kzalloc_objs(**evt_attr, config->num_events);
if (!(*evt_attr))
goto err_evt_attr;
@@ -599,7 +599,7 @@ static struct amdgpu_pmu_entry *create_pmu_entry(struct amdgpu_device *adev,
{
struct amdgpu_pmu_entry *pmu_entry;
- pmu_entry = kzalloc_obj(struct amdgpu_pmu_entry, GFP_KERNEL);
+ pmu_entry = kzalloc_obj(struct amdgpu_pmu_entry);
if (!pmu_entry)
return pmu_entry;
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_preempt_mgr.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_preempt_mgr.c
index 5420362b4261..b1dc33301d83 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_preempt_mgr.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_preempt_mgr.c
@@ -61,7 +61,7 @@ static int amdgpu_preempt_mgr_new(struct ttm_resource_manager *man,
const struct ttm_place *place,
struct ttm_resource **res)
{
- *res = kzalloc_obj(**res, GFP_KERNEL);
+ *res = kzalloc_obj(**res);
if (!*res)
return -ENOMEM;
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c
index 01ce996bfacd..27b67da9fdac 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c
@@ -457,7 +457,7 @@ static int psp_sw_init(struct amdgpu_ip_block *ip_block)
struct psp_memory_training_context *mem_training_ctx = &psp->mem_train_ctx;
struct psp_runtime_scpm_entry scpm_entry;
- psp->cmd = kzalloc_obj(struct psp_gfx_cmd_resp, GFP_KERNEL);
+ psp->cmd = kzalloc_obj(struct psp_gfx_cmd_resp);
if (!psp->cmd) {
dev_err(adev->dev, "Failed to allocate memory to command buffer!\n");
return -ENOMEM;
@@ -4384,7 +4384,7 @@ static int psp_read_spirom_debugfs_open(struct inode *inode, struct file *filp)
return -EBUSY;
}
- bo_triplet = kzalloc_obj(struct spirom_bo, GFP_KERNEL);
+ bo_triplet = kzalloc_obj(struct spirom_bo);
if (!bo_triplet) {
mutex_unlock(&adev->psp.mutex);
return -ENOMEM;
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c
index c363953c2a74..eb3e62eb7b20 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c
@@ -891,7 +891,7 @@ int amdgpu_ras_feature_enable(struct amdgpu_device *adev,
if (head->block == AMDGPU_RAS_BLOCK__GFX &&
!amdgpu_sriov_vf(adev) &&
!amdgpu_ras_intr_triggered()) {
- info = kzalloc_obj(union ta_ras_cmd_input, GFP_KERNEL);
+ info = kzalloc_obj(union ta_ras_cmd_input);
if (!info)
return -ENOMEM;
@@ -1904,7 +1904,7 @@ static ssize_t amdgpu_ras_sysfs_badpages_read(struct file *f,
memset(buf, 0, count);
bps_count = end - start;
- bps = kmalloc_objs(*bps, bps_count, GFP_KERNEL);
+ bps = kmalloc_objs(*bps, bps_count);
if (!bps)
return 0;
@@ -2811,7 +2811,7 @@ static int amdgpu_uniras_badpages_read(struct amdgpu_device *adev,
if (!bps || !count)
return -EINVAL;
- output = kmalloc_obj(*output, GFP_KERNEL);
+ output = kmalloc_obj(*output);
if (!output)
return -ENOMEM;
@@ -2991,7 +2991,7 @@ static int amdgpu_ras_realloc_eh_data_space(struct amdgpu_device *adev,
unsigned int old_space = data->count + data->space_left;
unsigned int new_space = old_space + pages;
unsigned int align_space = ALIGN(new_space, 512);
- void *bps = kmalloc_objs(*data->bps, align_space, GFP_KERNEL);
+ void *bps = kmalloc_objs(*data->bps, align_space);
if (!bps) {
return -ENOMEM;
@@ -3375,7 +3375,7 @@ static int amdgpu_ras_load_bad_pages(struct amdgpu_device *adev)
if (control->ras_num_recs == 0 || amdgpu_bad_page_threshold == 0)
return 0;
- bps = kzalloc_objs(*bps, control->ras_num_recs, GFP_KERNEL);
+ bps = kzalloc_objs(*bps, control->ras_num_recs);
if (!bps)
return -ENOMEM;
@@ -3863,7 +3863,7 @@ int amdgpu_ras_recovery_init(struct amdgpu_device *adev, bool init_bp_info)
return 0;
data = &con->eh_data;
- *data = kzalloc_obj(**data, GFP_KERNEL);
+ *data = kzalloc_obj(**data);
if (!*data) {
ret = -ENOMEM;
goto out;
@@ -4499,7 +4499,7 @@ int amdgpu_ras_block_late_init(struct amdgpu_device *adev,
/* Those are the cached values at init.
*/
- query_info = kzalloc_obj(*query_info, GFP_KERNEL);
+ query_info = kzalloc_obj(*query_info);
if (!query_info)
return -ENOMEM;
memcpy(&query_info->head, ras_block, sizeof(struct ras_common_if));
@@ -5188,7 +5188,7 @@ int amdgpu_ras_register_ras_block(struct amdgpu_device *adev,
if (!adev || !ras_block_obj)
return -EINVAL;
- ras_node = kzalloc_obj(*ras_node, GFP_KERNEL);
+ ras_node = kzalloc_obj(*ras_node);
if (!ras_node)
return -ENOMEM;
@@ -5389,7 +5389,7 @@ static struct ras_err_node *amdgpu_ras_error_node_new(void)
{
struct ras_err_node *err_node;
- err_node = kvzalloc_obj(*err_node, GFP_KERNEL);
+ err_node = kvzalloc_obj(*err_node);
if (!err_node)
return NULL;
@@ -5682,7 +5682,7 @@ int amdgpu_ras_add_critical_region(struct amdgpu_device *adev,
/* Record new critical amdgpu bo */
list_for_each_entry(block, &vres->blocks, link) {
- region = kzalloc_obj(*region, GFP_KERNEL);
+ region = kzalloc_obj(*region);
if (!region) {
ret = -ENOMEM;
goto out;
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_reset.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_reset.c
index d3413d1b9fb0..7a2fcb7ded1d 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_reset.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_reset.c
@@ -276,7 +276,7 @@ struct amdgpu_reset_domain *amdgpu_reset_create_reset_domain(enum amdgpu_reset_d
{
struct amdgpu_reset_domain *reset_domain;
- reset_domain = kvzalloc_obj(struct amdgpu_reset_domain, GFP_KERNEL);
+ reset_domain = kvzalloc_obj(struct amdgpu_reset_domain);
if (!reset_domain) {
DRM_ERROR("Failed to allocate amdgpu_reset_domain!");
return NULL;
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c
index ac71b2d7e139..4638a686a84e 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c
@@ -507,13 +507,13 @@ static ssize_t amdgpu_ras_cper_debugfs_read(struct file *f, char __user *buf,
const uint8_t ring_header_size = 12;
struct amdgpu_ring *ring = file_inode(f)->i_private;
struct ras_cmd_cper_snapshot_req *snapshot_req __free(kfree) =
- kzalloc_obj(struct ras_cmd_cper_snapshot_req, GFP_KERNEL);
+ kzalloc_obj(struct ras_cmd_cper_snapshot_req);
struct ras_cmd_cper_snapshot_rsp *snapshot_rsp __free(kfree) =
- kzalloc_obj(struct ras_cmd_cper_snapshot_rsp, GFP_KERNEL);
+ kzalloc_obj(struct ras_cmd_cper_snapshot_rsp);
struct ras_cmd_cper_record_req *record_req __free(kfree) =
- kzalloc_obj(struct ras_cmd_cper_record_req, GFP_KERNEL);
+ kzalloc_obj(struct ras_cmd_cper_record_req);
struct ras_cmd_cper_record_rsp *record_rsp __free(kfree) =
- kzalloc_obj(struct ras_cmd_cper_record_rsp, GFP_KERNEL);
+ kzalloc_obj(struct ras_cmd_cper_record_rsp);
uint8_t *ring_header __free(kfree) =
kzalloc(ring_header_size, GFP_KERNEL);
uint32_t total_cper_num;
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
index dd412186c4f0..d319c37e0d4e 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
@@ -1122,7 +1122,7 @@ int amdgpu_ttm_mmio_remap_alloc_sgt(struct amdgpu_device *adev,
phys = adev->rmmio_remap.bus_addr + cur.start;
/* Build a single-entry sg_table mapped as I/O (no struct page backing). */
- *sgt = kzalloc_obj(**sgt, GFP_KERNEL);
+ *sgt = kzalloc_obj(**sgt);
if (!*sgt)
return -ENOMEM;
r = sg_alloc_table(*sgt, 1, GFP_KERNEL);
@@ -1172,7 +1172,7 @@ static struct ttm_tt *amdgpu_ttm_tt_create(struct ttm_buffer_object *bo,
struct amdgpu_ttm_tt *gtt;
enum ttm_caching caching;
- gtt = kzalloc_obj(struct amdgpu_ttm_tt, GFP_KERNEL);
+ gtt = kzalloc_obj(struct amdgpu_ttm_tt);
if (!gtt)
return NULL;
@@ -1213,7 +1213,7 @@ static int amdgpu_ttm_tt_populate(struct ttm_device *bdev,
/* user pages are bound by amdgpu_ttm_tt_pin_userptr() */
if (gtt->userptr) {
- ttm->sg = kzalloc_obj(struct sg_table, GFP_KERNEL);
+ ttm->sg = kzalloc_obj(struct sg_table);
if (!ttm->sg)
return -ENOMEM;
return 0;
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_userq.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_userq.c
index 97352c56e7a2..9d67b770bcc2 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_userq.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_userq.c
@@ -217,7 +217,7 @@ static int amdgpu_userq_buffer_va_list_add(struct amdgpu_usermode_queue *queue,
struct amdgpu_userq_va_cursor *va_cursor;
struct userq_va_list;
- va_cursor = kzalloc_obj(*va_cursor, GFP_KERNEL);
+ va_cursor = kzalloc_obj(*va_cursor);
if (!va_cursor)
return -ENOMEM;
@@ -781,7 +781,7 @@ amdgpu_userq_create(struct drm_file *filp, union drm_amdgpu_userq *args)
goto unlock;
}
- queue = kzalloc_obj(struct amdgpu_usermode_queue, GFP_KERNEL);
+ queue = kzalloc_obj(struct amdgpu_usermode_queue);
if (!queue) {
drm_file_err(uq_mgr->file, "Failed to allocate memory for queue\n");
r = -ENOMEM;
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_userq_fence.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_userq_fence.c
index 38693bb7f8d4..8013260e29dc 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_userq_fence.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_userq_fence.c
@@ -82,7 +82,7 @@ int amdgpu_userq_fence_driver_alloc(struct amdgpu_device *adev,
unsigned long flags;
int r;
- fence_drv = kzalloc_obj(*fence_drv, GFP_KERNEL);
+ fence_drv = kzalloc_obj(*fence_drv);
if (!fence_drv)
return -ENOMEM;
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_virt.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_virt.c
index 50b75c562281..522d5bd76269 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_virt.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_virt.c
@@ -294,15 +294,15 @@ static int amdgpu_virt_init_ras_err_handler_data(struct amdgpu_device *adev)
void *bps = NULL;
struct amdgpu_bo **bps_bo = NULL;
- *data = kmalloc_obj(struct amdgpu_virt_ras_err_handler_data, GFP_KERNEL);
+ *data = kmalloc_obj(struct amdgpu_virt_ras_err_handler_data);
if (!*data)
goto data_failure;
- bps = kmalloc_objs(*(*data)->bps, align_space, GFP_KERNEL);
+ bps = kmalloc_objs(*(*data)->bps, align_space);
if (!bps)
goto bps_failure;
- bps_bo = kmalloc_objs(*(*data)->bps_bo, align_space, GFP_KERNEL);
+ bps_bo = kmalloc_objs(*(*data)->bps_bo, align_space);
if (!bps_bo)
goto bps_bo_failure;
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_vkms.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_vkms.c
index 8931279cdea6..2c19b65de840 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vkms.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vkms.c
@@ -411,7 +411,7 @@ static struct drm_plane *amdgpu_vkms_plane_init(struct drm_device *dev,
struct drm_plane *plane;
int ret;
- plane = kzalloc_obj(*plane, GFP_KERNEL);
+ plane = kzalloc_obj(*plane);
if (!plane)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c
index d946c39c4acb..f2beb980e3c3 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c
@@ -1118,7 +1118,7 @@ int amdgpu_vm_update_range(struct amdgpu_device *adev, struct amdgpu_vm *vm,
if (!drm_dev_enter(adev_to_drm(adev), &idx))
return -ENODEV;
- tlb_cb = kmalloc_obj(*tlb_cb, GFP_KERNEL);
+ tlb_cb = kmalloc_obj(*tlb_cb);
if (!tlb_cb) {
drm_dev_exit(idx);
return -ENOMEM;
@@ -1471,7 +1471,7 @@ static void amdgpu_vm_add_prt_cb(struct amdgpu_device *adev,
if (!adev->gmc.gmc_funcs->set_prt)
return;
- cb = kmalloc_obj(struct amdgpu_prt_cb, GFP_KERNEL);
+ cb = kmalloc_obj(struct amdgpu_prt_cb);
if (!cb) {
/* Last resort when we are OOM */
if (fence)
@@ -1737,7 +1737,7 @@ struct amdgpu_bo_va *amdgpu_vm_bo_add(struct amdgpu_device *adev,
amdgpu_vm_assert_locked(vm);
- bo_va = kzalloc_obj(struct amdgpu_bo_va, GFP_KERNEL);
+ bo_va = kzalloc_obj(struct amdgpu_bo_va);
if (bo_va == NULL) {
return NULL;
}
@@ -1866,7 +1866,7 @@ int amdgpu_vm_bo_map(struct amdgpu_device *adev,
return -EINVAL;
}
- mapping = kmalloc_obj(*mapping, GFP_KERNEL);
+ mapping = kmalloc_obj(*mapping);
if (!mapping)
return -ENOMEM;
@@ -1913,7 +1913,7 @@ int amdgpu_vm_bo_replace_map(struct amdgpu_device *adev,
return r;
/* Allocate all the needed memory */
- mapping = kmalloc_obj(*mapping, GFP_KERNEL);
+ mapping = kmalloc_obj(*mapping);
if (!mapping)
return -ENOMEM;
@@ -2033,12 +2033,12 @@ int amdgpu_vm_bo_clear_mappings(struct amdgpu_device *adev,
eaddr = saddr + (size - 1) / AMDGPU_GPU_PAGE_SIZE;
/* Allocate all the needed memory */
- before = kzalloc_obj(*before, GFP_KERNEL);
+ before = kzalloc_obj(*before);
if (!before)
return -ENOMEM;
INIT_LIST_HEAD(&before->list);
- after = kzalloc_obj(*after, GFP_KERNEL);
+ after = kzalloc_obj(*after);
if (!after) {
kfree(before);
return -ENOMEM;
@@ -2533,7 +2533,7 @@ amdgpu_vm_get_task_info_pasid(struct amdgpu_device *adev, u32 pasid)
static int amdgpu_vm_create_task_info(struct amdgpu_vm *vm)
{
- vm->task_info = kzalloc_obj(struct amdgpu_task_info, GFP_KERNEL);
+ vm->task_info = kzalloc_obj(struct amdgpu_task_info);
if (!vm->task_info)
return -ENOMEM;
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm_tlb_fence.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm_tlb_fence.c
index b3e47efeef62..82b8badde453 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm_tlb_fence.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm_tlb_fence.c
@@ -80,7 +80,7 @@ void amdgpu_vm_tlb_fence_create(struct amdgpu_device *adev, struct amdgpu_vm *vm
{
struct amdgpu_tlb_fence *f;
- f = kmalloc_obj(*f, GFP_KERNEL);
+ f = kmalloc_obj(*f);
if (!f) {
/*
* We can't fail since the PDEs and PTEs are already updated, so
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.c
index 6252246dcd68..6c9b3e21e15c 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.c
@@ -340,7 +340,7 @@ int amdgpu_vram_mgr_reserve_range(struct amdgpu_vram_mgr *mgr,
{
struct amdgpu_vram_reservation *rsv;
- rsv = kzalloc_obj(*rsv, GFP_KERNEL);
+ rsv = kzalloc_obj(*rsv);
if (!rsv)
return -ENOMEM;
@@ -478,7 +478,7 @@ static int amdgpu_vram_mgr_new(struct ttm_resource_manager *man,
tbo->page_alignment);
}
- vres = kzalloc_obj(*vres, GFP_KERNEL);
+ vres = kzalloc_obj(*vres);
if (!vres)
return -ENOMEM;
@@ -684,7 +684,7 @@ int amdgpu_vram_mgr_alloc_sgt(struct amdgpu_device *adev,
int num_entries = 0;
int i, r;
- *sgt = kmalloc_obj(**sgt, GFP_KERNEL);
+ *sgt = kmalloc_obj(**sgt);
if (!*sgt)
return -ENOMEM;
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_xcp.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_xcp.c
index df5b70c9f911..cc5f4e01e38f 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_xcp.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_xcp.c
@@ -334,7 +334,7 @@ int amdgpu_xcp_mgr_init(struct amdgpu_device *adev, int init_mode,
if (!xcp_funcs || !xcp_funcs->get_ip_details)
return -EINVAL;
- xcp_mgr = kzalloc_obj(*xcp_mgr, GFP_KERNEL);
+ xcp_mgr = kzalloc_obj(*xcp_mgr);
if (!xcp_mgr)
return -ENOMEM;
@@ -907,7 +907,7 @@ static void amdgpu_xcp_cfg_sysfs_init(struct amdgpu_device *adev)
if (!adev->xcp_mgr)
return;
- xcp_cfg = kzalloc_obj(*xcp_cfg, GFP_KERNEL);
+ xcp_cfg = kzalloc_obj(*xcp_cfg);
if (!xcp_cfg)
return;
xcp_cfg->xcp_mgr = adev->xcp_mgr;
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_xgmi.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_xgmi.c
index fe06ab35ba76..11e56df1d91b 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_xgmi.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_xgmi.c
@@ -690,7 +690,7 @@ struct amdgpu_hive_info *amdgpu_get_xgmi_hive(struct amdgpu_device *adev)
goto pro_end;
}
- hive = kzalloc_obj(*hive, GFP_KERNEL);
+ hive = kzalloc_obj(*hive);
if (!hive) {
dev_err(adev->dev, "XGMI: allocation failed\n");
ret = -ENOMEM;
diff --git a/drivers/gpu/drm/amd/amdgpu/atom.c b/drivers/gpu/drm/amd/amdgpu/atom.c
index 51fa402e8b64..e4ce3029d3fb 100644
--- a/drivers/gpu/drm/amd/amdgpu/atom.c
+++ b/drivers/gpu/drm/amd/amdgpu/atom.c
@@ -1524,7 +1524,7 @@ struct atom_context *amdgpu_atom_parse(struct card_info *card, void *bios)
{
int base;
struct atom_context *ctx =
- kzalloc_obj(struct atom_context, GFP_KERNEL);
+ kzalloc_obj(struct atom_context);
struct _ATOM_ROM_HEADER *atom_rom_header;
struct _ATOM_MASTER_DATA_TABLE *master_table;
struct _ATOM_FIRMWARE_INFO *atom_fw_info;
diff --git a/drivers/gpu/drm/amd/amdgpu/atombios_encoders.c b/drivers/gpu/drm/amd/amdgpu/atombios_encoders.c
index 8e0841d3ca75..afb788d61011 100644
--- a/drivers/gpu/drm/amd/amdgpu/atombios_encoders.c
+++ b/drivers/gpu/drm/amd/amdgpu/atombios_encoders.c
@@ -191,7 +191,7 @@ void amdgpu_atombios_encoder_init_backlight(struct amdgpu_encoder *amdgpu_encode
goto register_acpi_backlight;
}
- pdata = kmalloc_obj(struct amdgpu_backlight_privdata, GFP_KERNEL);
+ pdata = kmalloc_obj(struct amdgpu_backlight_privdata);
if (!pdata) {
DRM_ERROR("Memory allocation failed\n");
goto error;
@@ -1980,7 +1980,7 @@ amdgpu_atombios_encoder_get_lcd_info(struct amdgpu_encoder *encoder)
lvds_info =
(union lvds_info *)(mode_info->atom_context->bios + data_offset);
lvds =
- kzalloc_obj(struct amdgpu_encoder_atom_dig, GFP_KERNEL);
+ kzalloc_obj(struct amdgpu_encoder_atom_dig);
if (!lvds)
return NULL;
diff --git a/drivers/gpu/drm/amd/amdgpu/dce_v10_0.c b/drivers/gpu/drm/amd/amdgpu/dce_v10_0.c
index de1ccfe584d7..0bbc29ec5a3a 100644
--- a/drivers/gpu/drm/amd/amdgpu/dce_v10_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/dce_v10_0.c
@@ -3517,7 +3517,7 @@ static void dce_v10_0_encoder_add(struct amdgpu_device *adev,
}
/* add a new one */
- amdgpu_encoder = kzalloc_obj(struct amdgpu_encoder, GFP_KERNEL);
+ amdgpu_encoder = kzalloc_obj(struct amdgpu_encoder);
if (!amdgpu_encoder)
return;
diff --git a/drivers/gpu/drm/amd/amdgpu/dce_v6_0.c b/drivers/gpu/drm/amd/amdgpu/dce_v6_0.c
index 723a71c8bd38..103642f156ed 100644
--- a/drivers/gpu/drm/amd/amdgpu/dce_v6_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/dce_v6_0.c
@@ -3414,7 +3414,7 @@ static void dce_v6_0_encoder_add(struct amdgpu_device *adev,
}
/* add a new one */
- amdgpu_encoder = kzalloc_obj(struct amdgpu_encoder, GFP_KERNEL);
+ amdgpu_encoder = kzalloc_obj(struct amdgpu_encoder);
if (!amdgpu_encoder)
return;
diff --git a/drivers/gpu/drm/amd/amdgpu/dce_v8_0.c b/drivers/gpu/drm/amd/amdgpu/dce_v8_0.c
index 0a4a8f0084b1..e016cbdf28e4 100644
--- a/drivers/gpu/drm/amd/amdgpu/dce_v8_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/dce_v8_0.c
@@ -3425,7 +3425,7 @@ static void dce_v8_0_encoder_add(struct amdgpu_device *adev,
}
/* add a new one */
- amdgpu_encoder = kzalloc_obj(struct amdgpu_encoder, GFP_KERNEL);
+ amdgpu_encoder = kzalloc_obj(struct amdgpu_encoder);
if (!amdgpu_encoder)
return;
diff --git a/drivers/gpu/drm/amd/amdgpu/isp_v4_1_0.c b/drivers/gpu/drm/amd/amdgpu/isp_v4_1_0.c
index f5785d9c6212..3a2473655b6d 100644
--- a/drivers/gpu/drm/amd/amdgpu/isp_v4_1_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/isp_v4_1_0.c
@@ -50,7 +50,7 @@ static int isp_v4_1_0_hw_init(struct amdgpu_isp *isp)
isp_base = adev->rmmio_base;
- isp->isp_cell = kzalloc_objs(struct mfd_cell, 3, GFP_KERNEL);
+ isp->isp_cell = kzalloc_objs(struct mfd_cell, 3);
if (!isp->isp_cell) {
r = -ENOMEM;
drm_err(&adev->ddev,
@@ -59,7 +59,7 @@ static int isp_v4_1_0_hw_init(struct amdgpu_isp *isp)
}
num_res = MAX_ISP410_MEM_RES + MAX_ISP410_INT_SRC;
- isp->isp_res = kzalloc_objs(struct resource, num_res, GFP_KERNEL);
+ isp->isp_res = kzalloc_objs(struct resource, num_res);
if (!isp->isp_res) {
r = -ENOMEM;
drm_err(&adev->ddev,
@@ -67,7 +67,7 @@ static int isp_v4_1_0_hw_init(struct amdgpu_isp *isp)
goto failure;
}
- isp->isp_pdata = kzalloc_obj(*isp->isp_pdata, GFP_KERNEL);
+ isp->isp_pdata = kzalloc_obj(*isp->isp_pdata);
if (!isp->isp_pdata) {
r = -ENOMEM;
drm_err(&adev->ddev,
@@ -106,7 +106,7 @@ static int isp_v4_1_0_hw_init(struct amdgpu_isp *isp)
isp->isp_cell[0].pdata_size = sizeof(struct isp_platform_data);
/* initialize isp i2c platform data */
- isp->isp_i2c_res = kzalloc_objs(struct resource, 1, GFP_KERNEL);
+ isp->isp_i2c_res = kzalloc_objs(struct resource, 1);
if (!isp->isp_i2c_res) {
r = -ENOMEM;
drm_err(&adev->ddev,
@@ -126,7 +126,7 @@ static int isp_v4_1_0_hw_init(struct amdgpu_isp *isp)
isp->isp_cell[1].pdata_size = sizeof(struct isp_platform_data);
/* initialize isp gpiochip platform data */
- isp->isp_gpio_res = kzalloc_objs(struct resource, 1, GFP_KERNEL);
+ isp->isp_gpio_res = kzalloc_objs(struct resource, 1);
if (!isp->isp_gpio_res) {
r = -ENOMEM;
drm_err(&adev->ddev,
diff --git a/drivers/gpu/drm/amd/amdgpu/isp_v4_1_1.c b/drivers/gpu/drm/amd/amdgpu/isp_v4_1_1.c
index e757087d51d2..b3590b33cab9 100644
--- a/drivers/gpu/drm/amd/amdgpu/isp_v4_1_1.c
+++ b/drivers/gpu/drm/amd/amdgpu/isp_v4_1_1.c
@@ -259,7 +259,7 @@ static int isp_v4_1_1_hw_init(struct amdgpu_isp *isp)
return -EINVAL;
}
- isp->isp_cell = kzalloc_objs(struct mfd_cell, 3, GFP_KERNEL);
+ isp->isp_cell = kzalloc_objs(struct mfd_cell, 3);
if (!isp->isp_cell) {
r = -ENOMEM;
drm_err(&adev->ddev, "isp mfd cell alloc failed (%d)\n", r);
@@ -268,14 +268,14 @@ static int isp_v4_1_1_hw_init(struct amdgpu_isp *isp)
num_res = MAX_ISP411_MEM_RES + MAX_ISP411_INT_SRC;
- isp->isp_res = kzalloc_objs(struct resource, num_res, GFP_KERNEL);
+ isp->isp_res = kzalloc_objs(struct resource, num_res);
if (!isp->isp_res) {
r = -ENOMEM;
drm_err(&adev->ddev, "isp mfd resource alloc failed (%d)\n", r);
goto failure;
}
- isp->isp_pdata = kzalloc_obj(*isp->isp_pdata, GFP_KERNEL);
+ isp->isp_pdata = kzalloc_obj(*isp->isp_pdata);
if (!isp->isp_pdata) {
r = -ENOMEM;
drm_err(&adev->ddev, "isp platform data alloc failed (%d)\n", r);
@@ -317,7 +317,7 @@ static int isp_v4_1_1_hw_init(struct amdgpu_isp *isp)
isp->isp_cell[0].pdata_size = sizeof(struct isp_platform_data);
/* initialize isp i2c platform data */
- isp->isp_i2c_res = kzalloc_objs(struct resource, 1, GFP_KERNEL);
+ isp->isp_i2c_res = kzalloc_objs(struct resource, 1);
if (!isp->isp_i2c_res) {
r = -ENOMEM;
drm_err(&adev->ddev, "isp mfd res alloc failed (%d)\n", r);
@@ -336,7 +336,7 @@ static int isp_v4_1_1_hw_init(struct amdgpu_isp *isp)
isp->isp_cell[1].pdata_size = sizeof(struct isp_platform_data);
/* initialize isp gpiochip platform data */
- isp->isp_gpio_res = kzalloc_objs(struct resource, 1, GFP_KERNEL);
+ isp->isp_gpio_res = kzalloc_objs(struct resource, 1);
if (!isp->isp_gpio_res) {
r = -ENOMEM;
drm_err(&adev->ddev, "isp gpio resource alloc failed (%d)\n", r);
diff --git a/drivers/gpu/drm/amd/amdgpu/mes_userqueue.c b/drivers/gpu/drm/amd/amdgpu/mes_userqueue.c
index 9e9a8e354c06..8c74894254f7 100644
--- a/drivers/gpu/drm/amd/amdgpu/mes_userqueue.c
+++ b/drivers/gpu/drm/amd/amdgpu/mes_userqueue.c
@@ -283,7 +283,7 @@ static int mes_userq_mqd_create(struct amdgpu_usermode_queue *queue,
int r;
/* Structure to initialize MQD for userqueue using generic MQD init function */
- userq_props = kzalloc_obj(struct amdgpu_mqd_prop, GFP_KERNEL);
+ userq_props = kzalloc_obj(struct amdgpu_mqd_prop);
if (!userq_props) {
DRM_ERROR("Failed to allocate memory for userq_props\n");
return -ENOMEM;
diff --git a/drivers/gpu/drm/amd/amdgpu/sienna_cichlid.c b/drivers/gpu/drm/amd/amdgpu/sienna_cichlid.c
index 4de461fa9cdd..cb58032109e2 100644
--- a/drivers/gpu/drm/amd/amdgpu/sienna_cichlid.c
+++ b/drivers/gpu/drm/amd/amdgpu/sienna_cichlid.c
@@ -273,7 +273,7 @@ int sienna_cichlid_reset_init(struct amdgpu_device *adev)
{
struct amdgpu_reset_control *reset_ctl;
- reset_ctl = kzalloc_obj(*reset_ctl, GFP_KERNEL);
+ reset_ctl = kzalloc_obj(*reset_ctl);
if (!reset_ctl)
return -ENOMEM;
diff --git a/drivers/gpu/drm/amd/amdgpu/smu_v13_0_10.c b/drivers/gpu/drm/amd/amdgpu/smu_v13_0_10.c
index e91e70844e49..11a574e8d3d7 100644
--- a/drivers/gpu/drm/amd/amdgpu/smu_v13_0_10.c
+++ b/drivers/gpu/drm/amd/amdgpu/smu_v13_0_10.c
@@ -270,7 +270,7 @@ int smu_v13_0_10_reset_init(struct amdgpu_device *adev)
{
struct amdgpu_reset_control *reset_ctl;
- reset_ctl = kzalloc_obj(*reset_ctl, GFP_KERNEL);
+ reset_ctl = kzalloc_obj(*reset_ctl);
if (!reset_ctl)
return -ENOMEM;
diff --git a/drivers/gpu/drm/amd/amdgpu/umc_v12_0.c b/drivers/gpu/drm/amd/amdgpu/umc_v12_0.c
index 25af2707b5ca..1f80045775f5 100644
--- a/drivers/gpu/drm/amd/amdgpu/umc_v12_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/umc_v12_0.c
@@ -567,7 +567,7 @@ static int umc_v12_0_update_ecc_status(struct amdgpu_device *adev,
if (ret)
return ret;
- ecc_err = kzalloc_obj(*ecc_err, GFP_KERNEL);
+ ecc_err = kzalloc_obj(*ecc_err);
if (!ecc_err)
return -ENOMEM;
diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_chardev.c b/drivers/gpu/drm/amd/amdkfd/kfd_chardev.c
index f8c9ccbc4851..b188f099077e 100644
--- a/drivers/gpu/drm/amd/amdkfd/kfd_chardev.c
+++ b/drivers/gpu/drm/amd/amdkfd/kfd_chardev.c
@@ -2468,7 +2468,7 @@ static int criu_restore_bos(struct kfd_process *p,
/* Prevent MMU notifications until stage-4 IOCTL (CRIU_RESUME) is received */
amdgpu_amdkfd_block_mmu_notifications(p->kgd_process_info);
- bo_buckets = kvmalloc_objs(*bo_buckets, args->num_bos, GFP_KERNEL);
+ bo_buckets = kvmalloc_objs(*bo_buckets, args->num_bos);
if (!bo_buckets)
return -ENOMEM;
@@ -2486,7 +2486,7 @@ static int criu_restore_bos(struct kfd_process *p,
goto exit;
}
- bo_privs = kvmalloc_objs(*bo_privs, args->num_bos, GFP_KERNEL);
+ bo_privs = kvmalloc_objs(*bo_privs, args->num_bos);
if (!bo_privs) {
ret = -ENOMEM;
goto exit;
diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_debugfs.c b/drivers/gpu/drm/amd/amdkfd/kfd_debugfs.c
index 46ea876629bc..7d4e07452cdb 100644
--- a/drivers/gpu/drm/amd/amdkfd/kfd_debugfs.c
+++ b/drivers/gpu/drm/amd/amdkfd/kfd_debugfs.c
@@ -146,7 +146,7 @@ void kfd_debugfs_add_process(struct kfd_process *p)
char name[MAX_DEBUGFS_FILENAME_LEN];
struct debugfs_proc_entry *entry;
- entry = kzalloc_obj(*entry, GFP_KERNEL);
+ entry = kzalloc_obj(*entry);
if (!entry)
return;
diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_device.c b/drivers/gpu/drm/amd/amdkfd/kfd_device.c
index d03c3398695b..8ff97bf7d95a 100644
--- a/drivers/gpu/drm/amd/amdkfd/kfd_device.c
+++ b/drivers/gpu/drm/amd/amdkfd/kfd_device.c
@@ -478,7 +478,7 @@ struct kfd_dev *kgd2kfd_probe(struct amdgpu_device *adev, bool vf)
return NULL;
}
- kfd = kzalloc_obj(*kfd, GFP_KERNEL);
+ kfd = kzalloc_obj(*kfd);
if (!kfd)
return NULL;
@@ -864,7 +864,7 @@ bool kgd2kfd_device_init(struct kfd_dev *kfd,
/* Allocate the KFD nodes */
for (i = 0, xcp_idx = 0; i < kfd->num_nodes; i++) {
- node = kzalloc_obj(struct kfd_node, GFP_KERNEL);
+ node = kzalloc_obj(struct kfd_node);
if (!node)
goto node_alloc_error;
@@ -1328,7 +1328,7 @@ int kfd_gtt_sa_allocate(struct kfd_node *node, unsigned int size,
if (size > kfd->gtt_sa_num_of_chunks * kfd->gtt_sa_chunk_size)
return -ENOMEM;
- *mem_obj = kzalloc_obj(struct kfd_mem_obj, GFP_KERNEL);
+ *mem_obj = kzalloc_obj(struct kfd_mem_obj);
if (!(*mem_obj))
return -ENOMEM;
diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.c b/drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.c
index 7707496761ea..3ddf06c755b5 100644
--- a/drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.c
+++ b/drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.c
@@ -1401,7 +1401,7 @@ static int register_process(struct device_queue_manager *dqm,
uint64_t pd_base;
int retval;
- n = kzalloc_obj(*n, GFP_KERNEL);
+ n = kzalloc_obj(*n);
if (!n)
return -ENOMEM;
@@ -2921,7 +2921,7 @@ struct device_queue_manager *device_queue_manager_init(struct kfd_node *dev)
pr_debug("Loading device queue manager\n");
- dqm = kzalloc_obj(*dqm, GFP_KERNEL);
+ dqm = kzalloc_obj(*dqm);
if (!dqm)
return NULL;
diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_events.c b/drivers/gpu/drm/amd/amdkfd/kfd_events.c
index 950717576e20..a2fdf0d451ef 100644
--- a/drivers/gpu/drm/amd/amdkfd/kfd_events.c
+++ b/drivers/gpu/drm/amd/amdkfd/kfd_events.c
@@ -67,7 +67,7 @@ static struct kfd_signal_page *allocate_signal_page(struct kfd_process *p)
void *backing_store;
struct kfd_signal_page *page;
- page = kzalloc_obj(*page, GFP_KERNEL);
+ page = kzalloc_obj(*page);
if (!page)
return NULL;
@@ -337,7 +337,7 @@ static int kfd_event_page_set(struct kfd_process *p, void *kernel_address,
return -EINVAL;
}
- page = kzalloc_obj(*page, GFP_KERNEL);
+ page = kzalloc_obj(*page);
if (!page)
return -ENOMEM;
@@ -405,7 +405,7 @@ int kfd_event_create(struct file *devkfd, struct kfd_process *p,
uint64_t *event_page_offset, uint32_t *event_slot_index)
{
int ret = 0;
- struct kfd_event *ev = kzalloc_obj(*ev, GFP_KERNEL);
+ struct kfd_event *ev = kzalloc_obj(*ev);
if (!ev)
return -ENOMEM;
@@ -458,11 +458,11 @@ int kfd_criu_restore_event(struct file *devkfd,
struct kfd_event *ev = NULL;
int ret = 0;
- ev_priv = kmalloc_obj(*ev_priv, GFP_KERNEL);
+ ev_priv = kmalloc_obj(*ev_priv);
if (!ev_priv)
return -ENOMEM;
- ev = kzalloc_obj(*ev, GFP_KERNEL);
+ ev = kzalloc_obj(*ev);
if (!ev) {
ret = -ENOMEM;
goto exit;
diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_kernel_queue.c b/drivers/gpu/drm/amd/amdkfd/kfd_kernel_queue.c
index 9e28dda09285..3ffa081daaec 100644
--- a/drivers/gpu/drm/amd/amdkfd/kfd_kernel_queue.c
+++ b/drivers/gpu/drm/amd/amdkfd/kfd_kernel_queue.c
@@ -309,7 +309,7 @@ struct kernel_queue *kernel_queue_init(struct kfd_node *dev,
{
struct kernel_queue *kq;
- kq = kzalloc_obj(*kq, GFP_KERNEL);
+ kq = kzalloc_obj(*kq);
if (!kq)
return NULL;
diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager.c b/drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager.c
index 93f389ba8cc9..723b725d20b8 100644
--- a/drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager.c
+++ b/drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager.c
@@ -51,7 +51,7 @@ struct kfd_mem_obj *allocate_hiq_mqd(struct mqd_manager *mm, struct queue_proper
struct kfd_mem_obj *mqd_mem_obj;
struct kfd_node *dev = mm->dev;
- mqd_mem_obj = kzalloc_obj(struct kfd_mem_obj, GFP_KERNEL);
+ mqd_mem_obj = kzalloc_obj(struct kfd_mem_obj);
if (!mqd_mem_obj)
return NULL;
@@ -69,7 +69,7 @@ struct kfd_mem_obj *allocate_sdma_mqd(struct mqd_manager *mm,
struct kfd_node *dev = mm->dev;
uint64_t offset;
- mqd_mem_obj = kzalloc_obj(struct kfd_mem_obj, GFP_KERNEL);
+ mqd_mem_obj = kzalloc_obj(struct kfd_mem_obj);
if (!mqd_mem_obj)
return NULL;
diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_cik.c b/drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_cik.c
index 575aebee8ad1..562d475cf4c9 100644
--- a/drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_cik.c
+++ b/drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_cik.c
@@ -389,7 +389,7 @@ struct mqd_manager *mqd_manager_init_cik(enum KFD_MQD_TYPE type,
if (WARN_ON(type >= KFD_MQD_TYPE_MAX))
return NULL;
- mqd = kzalloc_obj(*mqd, GFP_KERNEL);
+ mqd = kzalloc_obj(*mqd);
if (!mqd)
return NULL;
diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_v10.c b/drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_v10.c
index daf5e487d87e..d6067316d7f4 100644
--- a/drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_v10.c
+++ b/drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_v10.c
@@ -451,7 +451,7 @@ struct mqd_manager *mqd_manager_init_v10(enum KFD_MQD_TYPE type,
if (WARN_ON(type >= KFD_MQD_TYPE_MAX))
return NULL;
- mqd = kzalloc_obj(*mqd, GFP_KERNEL);
+ mqd = kzalloc_obj(*mqd);
if (!mqd)
return NULL;
diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_v11.c b/drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_v11.c
index fd258bbc37b4..e3a7acb0ccbc 100644
--- a/drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_v11.c
+++ b/drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_v11.c
@@ -465,7 +465,7 @@ struct mqd_manager *mqd_manager_init_v11(enum KFD_MQD_TYPE type,
if (WARN_ON(type >= KFD_MQD_TYPE_MAX))
return NULL;
- mqd = kzalloc_obj(*mqd, GFP_KERNEL);
+ mqd = kzalloc_obj(*mqd);
if (!mqd)
return NULL;
diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_v12.c b/drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_v12.c
index e826a4149ff0..0b97376fc6f9 100644
--- a/drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_v12.c
+++ b/drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_v12.c
@@ -385,7 +385,7 @@ struct mqd_manager *mqd_manager_init_v12(enum KFD_MQD_TYPE type,
if (WARN_ON(type >= KFD_MQD_TYPE_MAX))
return NULL;
- mqd = kzalloc_obj(*mqd, GFP_KERNEL);
+ mqd = kzalloc_obj(*mqd);
if (!mqd)
return NULL;
diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_v12_1.c b/drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_v12_1.c
index 6fa17465d3fa..eef6bdce4be3 100644
--- a/drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_v12_1.c
+++ b/drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_v12_1.c
@@ -646,7 +646,7 @@ struct mqd_manager *mqd_manager_init_v12_1(enum KFD_MQD_TYPE type,
if (WARN_ON(type >= KFD_MQD_TYPE_MAX))
return NULL;
- mqd = kzalloc_obj(*mqd, GFP_KERNEL);
+ mqd = kzalloc_obj(*mqd);
if (!mqd)
return NULL;
diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_v9.c b/drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_v9.c
index 5d3b500a4146..d5c234f30e8d 100644
--- a/drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_v9.c
+++ b/drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_v9.c
@@ -147,7 +147,7 @@ static struct kfd_mem_obj *allocate_mqd(struct mqd_manager *mm,
* amdgpu memory functions to do so.
*/
if (node->kfd->cwsr_enabled && (q->type == KFD_QUEUE_TYPE_COMPUTE)) {
- mqd_mem_obj = kzalloc_obj(struct kfd_mem_obj, GFP_KERNEL);
+ mqd_mem_obj = kzalloc_obj(struct kfd_mem_obj);
if (!mqd_mem_obj)
return NULL;
retval = amdgpu_amdkfd_alloc_kernel_mem(node->adev,
@@ -960,7 +960,7 @@ struct mqd_manager *mqd_manager_init_v9(enum KFD_MQD_TYPE type,
if (WARN_ON(type >= KFD_MQD_TYPE_MAX))
return NULL;
- mqd = kzalloc_obj(*mqd, GFP_KERNEL);
+ mqd = kzalloc_obj(*mqd);
if (!mqd)
return NULL;
diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_vi.c b/drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_vi.c
index 27875d88a5ea..69c1b8a690b8 100644
--- a/drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_vi.c
+++ b/drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_vi.c
@@ -446,7 +446,7 @@ struct mqd_manager *mqd_manager_init_vi(enum KFD_MQD_TYPE type,
if (WARN_ON(type >= KFD_MQD_TYPE_MAX))
return NULL;
- mqd = kzalloc_obj(*mqd, GFP_KERNEL);
+ mqd = kzalloc_obj(*mqd);
if (!mqd)
return NULL;
diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_priv.h b/drivers/gpu/drm/amd/amdkfd/kfd_priv.h
index a5f479af3607..e5b56412931b 100644
--- a/drivers/gpu/drm/amd/amdkfd/kfd_priv.h
+++ b/drivers/gpu/drm/amd/amdkfd/kfd_priv.h
@@ -91,7 +91,7 @@
/* Macro for allocating structures */
#define kfd_alloc_struct(ptr_to_struct) \
- ((typeof(ptr_to_struct)) kzalloc_obj(*ptr_to_struct, GFP_KERNEL))
+ ((typeof(ptr_to_struct)) kzalloc_obj(*ptr_to_struct))
#define KFD_MAX_NUM_OF_PROCESSES 512
#define KFD_MAX_NUM_OF_QUEUES_PER_PROCESS 1024
diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_process.c b/drivers/gpu/drm/amd/amdkfd/kfd_process.c
index ff64bde0acd2..8283098b2388 100644
--- a/drivers/gpu/drm/amd/amdkfd/kfd_process.c
+++ b/drivers/gpu/drm/amd/amdkfd/kfd_process.c
@@ -153,7 +153,7 @@ static void kfd_sdma_activity_worker(struct work_struct *work)
(q->properties.type != KFD_QUEUE_TYPE_SDMA_XGMI))
continue;
- sdma_q = kzalloc_obj(struct temp_sdma_queue_list, GFP_KERNEL);
+ sdma_q = kzalloc_obj(struct temp_sdma_queue_list);
if (!sdma_q) {
dqm_unlock(dqm);
goto cleanup;
@@ -1593,7 +1593,7 @@ struct kfd_process *create_process(const struct task_struct *thread, bool primar
struct mmu_notifier *mn;
int err = -ENOMEM;
- process = kzalloc_obj(*process, GFP_KERNEL);
+ process = kzalloc_obj(*process);
if (!process)
goto err_alloc_process;
@@ -1709,7 +1709,7 @@ struct kfd_process_device *kfd_create_process_device_data(struct kfd_node *dev,
if (WARN_ON_ONCE(p->n_pdds >= MAX_GPU_INSTANCE))
return NULL;
- pdd = kzalloc_obj(*pdd, GFP_KERNEL);
+ pdd = kzalloc_obj(*pdd);
if (!pdd)
return NULL;
diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_process_queue_manager.c b/drivers/gpu/drm/amd/amdkfd/kfd_process_queue_manager.c
index dac1f9604d8e..8ea31699d38b 100644
--- a/drivers/gpu/drm/amd/amdkfd/kfd_process_queue_manager.c
+++ b/drivers/gpu/drm/amd/amdkfd/kfd_process_queue_manager.c
@@ -383,7 +383,7 @@ int pqm_create_queue(struct process_queue_manager *pqm,
memset(pdd->proc_ctx_cpu_ptr, 0, AMDGPU_MES_PROC_CTX_SIZE);
}
- pqn = kzalloc_obj(*pqn, GFP_KERNEL);
+ pqn = kzalloc_obj(*pqn);
if (!pqn) {
retval = -ENOMEM;
goto err_allocate_pqn;
@@ -991,7 +991,7 @@ int kfd_criu_restore_queue(struct kfd_process *p,
if (*priv_data_offset + sizeof(*q_data) > max_priv_data_size)
return -EINVAL;
- q_data = kmalloc_obj(*q_data, GFP_KERNEL);
+ q_data = kmalloc_obj(*q_data);
if (!q_data)
return -ENOMEM;
diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_queue.c b/drivers/gpu/drm/amd/amdkfd/kfd_queue.c
index 1285c70a1c3b..bbe869ceae3f 100644
--- a/drivers/gpu/drm/amd/amdkfd/kfd_queue.c
+++ b/drivers/gpu/drm/amd/amdkfd/kfd_queue.c
@@ -70,7 +70,7 @@ int init_queue(struct queue **q, const struct queue_properties *properties)
{
struct queue *tmp_q;
- tmp_q = kzalloc_obj(*tmp_q, GFP_KERNEL);
+ tmp_q = kzalloc_obj(*tmp_q);
if (!tmp_q)
return -ENOMEM;
diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_smi_events.c b/drivers/gpu/drm/amd/amdkfd/kfd_smi_events.c
index 242e58fea05e..15975c23a88e 100644
--- a/drivers/gpu/drm/amd/amdkfd/kfd_smi_events.c
+++ b/drivers/gpu/drm/amd/amdkfd/kfd_smi_events.c
@@ -370,7 +370,7 @@ int kfd_smi_event_open(struct kfd_node *dev, uint32_t *fd)
struct kfd_smi_client *client;
int ret;
- client = kzalloc_obj(struct kfd_smi_client, GFP_KERNEL);
+ client = kzalloc_obj(struct kfd_smi_client);
if (!client)
return -ENOMEM;
INIT_LIST_HEAD(&client->list);
diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_svm.c b/drivers/gpu/drm/amd/amdkfd/kfd_svm.c
index e168a74190e3..080242f9981b 100644
--- a/drivers/gpu/drm/amd/amdkfd/kfd_svm.c
+++ b/drivers/gpu/drm/amd/amdkfd/kfd_svm.c
@@ -168,7 +168,7 @@ svm_range_dma_map_dev(struct amdgpu_device *adev, struct svm_range *prange,
int i, r;
if (!addr) {
- addr = kvzalloc_objs(*addr, prange->npages, GFP_KERNEL);
+ addr = kvzalloc_objs(*addr, prange->npages);
if (!addr)
return -ENOMEM;
prange->dma_addr[gpuidx] = addr;
@@ -329,7 +329,7 @@ svm_range *svm_range_new(struct svm_range_list *svms, uint64_t start,
struct svm_range *prange;
struct kfd_process *p;
- prange = kzalloc_obj(*prange, GFP_KERNEL);
+ prange = kzalloc_obj(*prange);
if (!prange)
return NULL;
@@ -539,7 +539,7 @@ static struct svm_range_bo *svm_range_bo_new(void)
{
struct svm_range_bo *svm_bo;
- svm_bo = kzalloc_obj(*svm_bo, GFP_KERNEL);
+ svm_bo = kzalloc_obj(*svm_bo);
if (!svm_bo)
return NULL;
@@ -1674,7 +1674,7 @@ static int svm_range_validate_and_map(struct mm_struct *mm,
int32_t idx;
int r = 0;
- ctx = kzalloc_obj(struct svm_validate_context, GFP_KERNEL);
+ ctx = kzalloc_obj(struct svm_validate_context);
if (!ctx)
return -ENOMEM;
ctx->process = container_of(prange->svms, struct kfd_process, svms);
diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_topology.c b/drivers/gpu/drm/amd/amdkfd/kfd_topology.c
index 8aa86502fceb..995f2c2528a9 100644
--- a/drivers/gpu/drm/amd/amdkfd/kfd_topology.c
+++ b/drivers/gpu/drm/amd/amdkfd/kfd_topology.c
@@ -711,7 +711,7 @@ static int kfd_build_sysfs_node_entry(struct kfd_topology_device *dev,
i = 0;
list_for_each_entry(mem, &dev->mem_props, list) {
- mem->kobj = kzalloc_obj(struct kobject, GFP_KERNEL);
+ mem->kobj = kzalloc_obj(struct kobject);
if (!mem->kobj)
return -ENOMEM;
ret = kobject_init_and_add(mem->kobj, &mem_type,
@@ -732,7 +732,7 @@ static int kfd_build_sysfs_node_entry(struct kfd_topology_device *dev,
i = 0;
list_for_each_entry(cache, &dev->cache_props, list) {
- cache->kobj = kzalloc_obj(struct kobject, GFP_KERNEL);
+ cache->kobj = kzalloc_obj(struct kobject);
if (!cache->kobj)
return -ENOMEM;
ret = kobject_init_and_add(cache->kobj, &cache_type,
@@ -753,7 +753,7 @@ static int kfd_build_sysfs_node_entry(struct kfd_topology_device *dev,
i = 0;
list_for_each_entry(iolink, &dev->io_link_props, list) {
- iolink->kobj = kzalloc_obj(struct kobject, GFP_KERNEL);
+ iolink->kobj = kzalloc_obj(struct kobject);
if (!iolink->kobj)
return -ENOMEM;
ret = kobject_init_and_add(iolink->kobj, &iolink_type,
@@ -774,7 +774,7 @@ static int kfd_build_sysfs_node_entry(struct kfd_topology_device *dev,
i = 0;
list_for_each_entry(p2plink, &dev->p2p_link_props, list) {
- p2plink->kobj = kzalloc_obj(struct kobject, GFP_KERNEL);
+ p2plink->kobj = kzalloc_obj(struct kobject);
if (!p2plink->kobj)
return -ENOMEM;
ret = kobject_init_and_add(p2plink->kobj, &iolink_type,
@@ -1381,7 +1381,7 @@ static int kfd_build_p2p_node_entry(struct kfd_topology_device *dev,
{
int ret;
- p2plink->kobj = kzalloc_obj(struct kobject, GFP_KERNEL);
+ p2plink->kobj = kzalloc_obj(struct kobject);
if (!p2plink->kobj)
return -ENOMEM;
diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
index 10bc1d252b1f..988f42998010 100644
--- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
+++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
@@ -1724,7 +1724,7 @@ dm_allocate_gpu_mem(
AMDGPU_GEM_DOMAIN_GTT : AMDGPU_GEM_DOMAIN_VRAM;
int ret;
- da = kzalloc_obj(struct dal_allocation, GFP_KERNEL);
+ da = kzalloc_obj(struct dal_allocation);
if (!da)
return NULL;
@@ -2526,7 +2526,7 @@ static int dm_dmub_sw_init(struct amdgpu_device *adev)
}
- adev->dm.dmub_srv = kzalloc_obj(*adev->dm.dmub_srv, GFP_KERNEL);
+ adev->dm.dmub_srv = kzalloc_obj(*adev->dm.dmub_srv);
dmub_srv = adev->dm.dmub_srv;
if (!dmub_srv) {
@@ -2607,7 +2607,7 @@ static int dm_dmub_sw_init(struct amdgpu_device *adev)
memory_params.region_info = ®ion_info;
memory_params.window_memory_type = window_memory_type;
- adev->dm.dmub_fb_info = kzalloc_obj(*adev->dm.dmub_fb_info, GFP_KERNEL);
+ adev->dm.dmub_fb_info = kzalloc_obj(*adev->dm.dmub_fb_info);
fb_info = adev->dm.dmub_fb_info;
if (!fb_info) {
@@ -3363,7 +3363,7 @@ static void dm_gpureset_commit_state(struct dc_state *dc_state,
} *bundle __free(kfree);
int k, m;
- bundle = kzalloc_obj(*bundle, GFP_KERNEL);
+ bundle = kzalloc_obj(*bundle);
if (!bundle) {
drm_err(dm->ddev, "Failed to allocate update bundle\n");
@@ -3931,7 +3931,7 @@ void amdgpu_dm_update_connector_after_detect(
if (!aconnector->timing_requested) {
aconnector->timing_requested =
- kzalloc_obj(struct dc_crtc_timing, GFP_KERNEL);
+ kzalloc_obj(struct dc_crtc_timing);
if (!aconnector->timing_requested)
drm_err(dev,
"failed to create aconnector->requested_timing\n");
@@ -4882,7 +4882,7 @@ dm_atomic_duplicate_state(struct drm_private_obj *obj)
{
struct dm_atomic_state *old_state, *new_state;
- new_state = kzalloc_obj(*new_state, GFP_KERNEL);
+ new_state = kzalloc_obj(*new_state);
if (!new_state)
return NULL;
@@ -4939,7 +4939,7 @@ static int amdgpu_dm_mode_config_init(struct amdgpu_device *adev)
/* indicates support for immediate flip */
adev_to_drm(adev)->mode_config.async_page_flip = true;
- state = kzalloc_obj(*state, GFP_KERNEL);
+ state = kzalloc_obj(*state);
if (!state)
return -ENOMEM;
@@ -5367,7 +5367,7 @@ static int initialize_plane(struct amdgpu_display_manager *dm,
unsigned long possible_crtcs;
int ret = 0;
- plane = kzalloc_obj(struct drm_plane, GFP_KERNEL);
+ plane = kzalloc_obj(struct drm_plane);
if (!plane) {
drm_err(adev_to_drm(dm->adev), "KMS: Failed to allocate plane\n");
return -ENOMEM;
@@ -5626,11 +5626,11 @@ static int amdgpu_dm_initialize_drm_device(struct amdgpu_device *adev)
continue;
}
- aconnector = kzalloc_obj(*aconnector, GFP_KERNEL);
+ aconnector = kzalloc_obj(*aconnector);
if (!aconnector)
goto fail;
- aencoder = kzalloc_obj(*aencoder, GFP_KERNEL);
+ aencoder = kzalloc_obj(*aencoder);
if (!aencoder)
goto fail;
@@ -7824,7 +7824,7 @@ void amdgpu_dm_connector_funcs_reset(struct drm_connector *connector)
kfree(state);
- state = kzalloc_obj(*state, GFP_KERNEL);
+ state = kzalloc_obj(*state);
if (state) {
state->scaling = RMX_OFF;
@@ -9099,7 +9099,7 @@ static int amdgpu_dm_i2c_xfer(struct i2c_adapter *i2c_adap,
if (!ddc_service->ddc_pin)
return result;
- cmd.payloads = kzalloc_objs(struct i2c_payload, num, GFP_KERNEL);
+ cmd.payloads = kzalloc_objs(struct i2c_payload, num);
if (!cmd.payloads)
return result;
@@ -9148,7 +9148,7 @@ create_i2c(struct ddc_service *ddc_service, bool oem)
struct amdgpu_device *adev = ddc_service->ctx->driver_context;
struct amdgpu_i2c_adapter *i2c;
- i2c = kzalloc_obj(struct amdgpu_i2c_adapter, GFP_KERNEL);
+ i2c = kzalloc_obj(struct amdgpu_i2c_adapter);
if (!i2c)
return NULL;
i2c->base.owner = THIS_MODULE;
@@ -9949,7 +9949,7 @@ static void amdgpu_dm_commit_planes(struct drm_atomic_state *state,
struct dc_stream_update stream_update;
} *bundle;
- bundle = kzalloc_obj(*bundle, GFP_KERNEL);
+ bundle = kzalloc_obj(*bundle);
if (!bundle) {
drm_err(dev, "Failed to allocate update bundle\n");
@@ -10624,7 +10624,7 @@ static void dm_set_writeback(struct amdgpu_display_manager *dm,
struct amdgpu_framebuffer *afb;
int i = 0;
- wb_info = kzalloc_obj(*wb_info, GFP_KERNEL);
+ wb_info = kzalloc_obj(*wb_info);
if (!wb_info) {
drm_err(adev_to_drm(adev), "Failed to allocate wb_info\n");
return;
diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_color.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_color.c
index 76405a351111..2ba98f384685 100644
--- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_color.c
+++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_color.c
@@ -1227,7 +1227,7 @@ int amdgpu_dm_check_crtc_color_mgmt(struct dm_crtc_state *crtc,
crtc->cm_is_degamma_srgb = false;
if (check_only) {
- out_tf = kvzalloc_obj(*out_tf, GFP_KERNEL);
+ out_tf = kvzalloc_obj(*out_tf);
if (!out_tf)
return -ENOMEM;
} else {
diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_colorop.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_colorop.c
index 2f072167bcc5..f25c0ede7199 100644
--- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_colorop.c
+++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_colorop.c
@@ -66,7 +66,7 @@ int amdgpu_dm_initialize_default_pipeline(struct drm_plane *plane, struct drm_pr
memset(ops, 0, sizeof(ops));
/* 1D curve - DEGAM TF */
- ops[i] = kzalloc_obj(*ops[0], GFP_KERNEL);
+ ops[i] = kzalloc_obj(*ops[0]);
if (!ops[i]) {
ret = -ENOMEM;
goto cleanup;
@@ -83,7 +83,7 @@ int amdgpu_dm_initialize_default_pipeline(struct drm_plane *plane, struct drm_pr
i++;
/* Multiplier */
- ops[i] = kzalloc_obj(struct drm_colorop, GFP_KERNEL);
+ ops[i] = kzalloc_obj(struct drm_colorop);
if (!ops[i]) {
ret = -ENOMEM;
goto cleanup;
@@ -98,7 +98,7 @@ int amdgpu_dm_initialize_default_pipeline(struct drm_plane *plane, struct drm_pr
i++;
/* 3x4 matrix */
- ops[i] = kzalloc_obj(struct drm_colorop, GFP_KERNEL);
+ ops[i] = kzalloc_obj(struct drm_colorop);
if (!ops[i]) {
ret = -ENOMEM;
goto cleanup;
@@ -114,7 +114,7 @@ int amdgpu_dm_initialize_default_pipeline(struct drm_plane *plane, struct drm_pr
if (adev->dm.dc->caps.color.dpp.hw_3d_lut) {
/* 1D curve - SHAPER TF */
- ops[i] = kzalloc_obj(*ops[0], GFP_KERNEL);
+ ops[i] = kzalloc_obj(*ops[0]);
if (!ops[i]) {
ret = -ENOMEM;
goto cleanup;
@@ -131,7 +131,7 @@ int amdgpu_dm_initialize_default_pipeline(struct drm_plane *plane, struct drm_pr
i++;
/* 1D LUT - SHAPER LUT */
- ops[i] = kzalloc_obj(*ops[0], GFP_KERNEL);
+ ops[i] = kzalloc_obj(*ops[0]);
if (!ops[i]) {
ret = -ENOMEM;
goto cleanup;
@@ -148,7 +148,7 @@ int amdgpu_dm_initialize_default_pipeline(struct drm_plane *plane, struct drm_pr
i++;
/* 3D LUT */
- ops[i] = kzalloc_obj(*ops[0], GFP_KERNEL);
+ ops[i] = kzalloc_obj(*ops[0]);
if (!ops[i]) {
ret = -ENOMEM;
goto cleanup;
@@ -166,7 +166,7 @@ int amdgpu_dm_initialize_default_pipeline(struct drm_plane *plane, struct drm_pr
}
/* 1D curve - BLND TF */
- ops[i] = kzalloc_obj(*ops[0], GFP_KERNEL);
+ ops[i] = kzalloc_obj(*ops[0]);
if (!ops[i]) {
ret = -ENOMEM;
goto cleanup;
@@ -183,7 +183,7 @@ int amdgpu_dm_initialize_default_pipeline(struct drm_plane *plane, struct drm_pr
i++;
/* 1D LUT - BLND LUT */
- ops[i] = kzalloc_obj(struct drm_colorop, GFP_KERNEL);
+ ops[i] = kzalloc_obj(struct drm_colorop);
if (!ops[i]) {
ret = -ENOMEM;
goto cleanup;
diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_crtc.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_crtc.c
index 49f68ddcfec8..130190e8a1b2 100644
--- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_crtc.c
+++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_crtc.c
@@ -231,7 +231,7 @@ struct idle_workqueue *idle_create_workqueue(struct amdgpu_device *adev)
{
struct idle_workqueue *idle_work;
- idle_work = kzalloc_obj(*idle_work, GFP_KERNEL);
+ idle_work = kzalloc_obj(*idle_work);
if (ZERO_OR_NULL_PTR(idle_work))
return NULL;
@@ -447,7 +447,7 @@ static struct drm_crtc_state *amdgpu_dm_crtc_duplicate_state(struct drm_crtc *cr
if (WARN_ON(!crtc->state))
return NULL;
- state = kzalloc_obj(*state, GFP_KERNEL);
+ state = kzalloc_obj(*state);
if (!state)
return NULL;
@@ -487,7 +487,7 @@ static void amdgpu_dm_crtc_reset_state(struct drm_crtc *crtc)
if (crtc->state)
amdgpu_dm_crtc_destroy_state(crtc, crtc->state);
- state = kzalloc_obj(*state, GFP_KERNEL);
+ state = kzalloc_obj(*state);
if (WARN_ON(!state))
return;
@@ -728,14 +728,14 @@ int amdgpu_dm_crtc_init(struct amdgpu_display_manager *dm,
bool has_degamma;
int res = -ENOMEM;
- cursor_plane = kzalloc_obj(*cursor_plane, GFP_KERNEL);
+ cursor_plane = kzalloc_obj(*cursor_plane);
if (!cursor_plane)
goto fail;
cursor_plane->type = DRM_PLANE_TYPE_CURSOR;
res = amdgpu_dm_plane_init(dm, cursor_plane, 0, NULL);
- acrtc = kzalloc_obj(struct amdgpu_crtc, GFP_KERNEL);
+ acrtc = kzalloc_obj(struct amdgpu_crtc);
if (!acrtc)
goto fail;
diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_debugfs.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_debugfs.c
index b43ec19848fd..24bc2a86904b 100644
--- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_debugfs.c
+++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_debugfs.c
@@ -4301,7 +4301,7 @@ static ssize_t dcc_en_bits_read(
int *dcc_en_bits;
int i, r;
- dcc_en_bits = kzalloc_objs(int, num_pipes, GFP_KERNEL);
+ dcc_en_bits = kzalloc_objs(int, num_pipes);
if (!dcc_en_bits)
return -ENOMEM;
diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_hdcp.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_hdcp.c
index 3b26797c9d03..eb73bbf8f411 100644
--- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_hdcp.c
+++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_hdcp.c
@@ -746,7 +746,7 @@ struct hdcp_workqueue *hdcp_create_workqueue(struct amdgpu_device *adev,
struct hdcp_workqueue *hdcp_work;
int i = 0;
- hdcp_work = kzalloc_objs(*hdcp_work, max_caps, GFP_KERNEL);
+ hdcp_work = kzalloc_objs(*hdcp_work, max_caps);
if (ZERO_OR_NULL_PTR(hdcp_work))
return NULL;
diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c
index d26003d2a2cc..a09761f9882d 100644
--- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c
+++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c
@@ -617,7 +617,7 @@ bool dm_helpers_submit_i2c(
return false;
}
- msgs = kzalloc_objs(struct i2c_msg, num, GFP_KERNEL);
+ msgs = kzalloc_objs(struct i2c_msg, num);
if (!msgs)
return false;
diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_irq.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_irq.c
index dfb80689d889..e49803a90eda 100644
--- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_irq.c
+++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_irq.c
@@ -313,7 +313,7 @@ void *amdgpu_dm_irq_register_interrupt(struct amdgpu_device *adev,
if (false == validate_irq_registration_params(int_params, ih))
return DAL_INVALID_IRQ_HANDLER_IDX;
- handler_data = kzalloc_obj(*handler_data, GFP_KERNEL);
+ handler_data = kzalloc_obj(*handler_data);
if (!handler_data) {
DRM_ERROR("DM_IRQ: failed to allocate irq handler!\n");
return DAL_INVALID_IRQ_HANDLER_IDX;
diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c
index 781163d6b23b..7be50e8c0636 100644
--- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c
+++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c
@@ -640,7 +640,7 @@ dm_dp_add_mst_connector(struct drm_dp_mst_topology_mgr *mgr,
struct drm_connector *connector;
int i;
- aconnector = kzalloc_obj(*aconnector, GFP_KERNEL);
+ aconnector = kzalloc_obj(*aconnector);
if (!aconnector)
return NULL;
diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_plane.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_plane.c
index c50583a05ce3..70587e5a8d46 100644
--- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_plane.c
+++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_plane.c
@@ -1470,7 +1470,7 @@ static void amdgpu_dm_plane_drm_plane_reset(struct drm_plane *plane)
if (plane->state)
plane->funcs->atomic_destroy_state(plane, plane->state);
- amdgpu_state = kzalloc_obj(*amdgpu_state, GFP_KERNEL);
+ amdgpu_state = kzalloc_obj(*amdgpu_state);
WARN_ON(amdgpu_state == NULL);
if (!amdgpu_state)
@@ -1488,7 +1488,7 @@ static struct drm_plane_state *amdgpu_dm_plane_drm_plane_duplicate_state(struct
struct dm_plane_state *dm_plane_state, *old_dm_plane_state;
old_dm_plane_state = to_dm_plane_state(plane->state);
- dm_plane_state = kzalloc_obj(*dm_plane_state, GFP_KERNEL);
+ dm_plane_state = kzalloc_obj(*dm_plane_state);
if (!dm_plane_state)
return NULL;
diff --git a/drivers/gpu/drm/amd/display/dc/basics/dce_calcs.c b/drivers/gpu/drm/amd/display/dc/basics/dce_calcs.c
index dbc4c2e0e514..9ae1399549c3 100644
--- a/drivers/gpu/drm/amd/display/dc/basics/dce_calcs.c
+++ b/drivers/gpu/drm/amd/display/dc/basics/dce_calcs.c
@@ -120,11 +120,11 @@ static void calculate_bandwidth(
int32_t number_of_displays_enabled_with_margin = 0;
int32_t number_of_aligned_displays_with_no_margin = 0;
- yclk = kzalloc_objs(*yclk, 3, GFP_KERNEL);
+ yclk = kzalloc_objs(*yclk, 3);
if (!yclk)
return;
- sclk = kzalloc_objs(*sclk, 8, GFP_KERNEL);
+ sclk = kzalloc_objs(*sclk, 8);
if (!sclk)
goto free_yclk;
@@ -2051,11 +2051,11 @@ void bw_calcs_init(struct bw_calcs_dceip *bw_dceip,
enum bw_calcs_version version = bw_calcs_version_from_asic_id(asic_id);
- dceip = kzalloc_obj(*dceip, GFP_KERNEL);
+ dceip = kzalloc_obj(*dceip);
if (!dceip)
return;
- vbios = kzalloc_obj(*vbios, GFP_KERNEL);
+ vbios = kzalloc_obj(*vbios);
if (!vbios) {
kfree(dceip);
return;
diff --git a/drivers/gpu/drm/amd/display/dc/basics/vector.c b/drivers/gpu/drm/amd/display/dc/basics/vector.c
index 8f6b780b7778..a8b750ff8573 100644
--- a/drivers/gpu/drm/amd/display/dc/basics/vector.c
+++ b/drivers/gpu/drm/amd/display/dc/basics/vector.c
@@ -94,7 +94,7 @@ struct vector *dal_vector_presized_create(
void *initial_value,
uint32_t struct_size)
{
- struct vector *vector = kzalloc_obj(struct vector, GFP_KERNEL);
+ struct vector *vector = kzalloc_obj(struct vector);
if (vector == NULL)
return NULL;
@@ -113,7 +113,7 @@ struct vector *dal_vector_create(
uint32_t capacity,
uint32_t struct_size)
{
- struct vector *vector = kzalloc_obj(struct vector, GFP_KERNEL);
+ struct vector *vector = kzalloc_obj(struct vector);
if (vector == NULL)
return NULL;
diff --git a/drivers/gpu/drm/amd/display/dc/bios/bios_parser.c b/drivers/gpu/drm/amd/display/dc/bios/bios_parser.c
index 65993314c5cd..73e3c45eeeba 100644
--- a/drivers/gpu/drm/amd/display/dc/bios/bios_parser.c
+++ b/drivers/gpu/drm/amd/display/dc/bios/bios_parser.c
@@ -98,7 +98,7 @@ struct dc_bios *bios_parser_create(
{
struct bios_parser *bp;
- bp = kzalloc_obj(struct bios_parser, GFP_KERNEL);
+ bp = kzalloc_obj(struct bios_parser);
if (!bp)
return NULL;
@@ -2667,7 +2667,7 @@ static struct integrated_info *bios_parser_create_integrated_info(
struct bios_parser *bp = BP_FROM_DCB(dcb);
struct integrated_info *info;
- info = kzalloc_obj(struct integrated_info, GFP_KERNEL);
+ info = kzalloc_obj(struct integrated_info);
if (info == NULL) {
ASSERT_CRITICAL(0);
diff --git a/drivers/gpu/drm/amd/display/dc/bios/bios_parser2.c b/drivers/gpu/drm/amd/display/dc/bios/bios_parser2.c
index 9da95c59a68b..94fddf22f5a9 100644
--- a/drivers/gpu/drm/amd/display/dc/bios/bios_parser2.c
+++ b/drivers/gpu/drm/amd/display/dc/bios/bios_parser2.c
@@ -3207,7 +3207,7 @@ static struct integrated_info *bios_parser_create_integrated_info(
struct bios_parser *bp = BP_FROM_DCB(dcb);
struct integrated_info *info;
- info = kzalloc_obj(struct integrated_info, GFP_KERNEL);
+ info = kzalloc_obj(struct integrated_info);
if (info == NULL) {
ASSERT_CRITICAL(0);
@@ -3793,7 +3793,7 @@ struct dc_bios *firmware_parser_create(
{
struct bios_parser *bp;
- bp = kzalloc_obj(struct bios_parser, GFP_KERNEL);
+ bp = kzalloc_obj(struct bios_parser);
if (!bp)
return NULL;
diff --git a/drivers/gpu/drm/amd/display/dc/core/dc.c b/drivers/gpu/drm/amd/display/dc/core/dc.c
index e05a6a9d66ff..1481915d4d71 100644
--- a/drivers/gpu/drm/amd/display/dc/core/dc.c
+++ b/drivers/gpu/drm/amd/display/dc/core/dc.c
@@ -284,7 +284,7 @@ static bool create_links(
}
for (i = 0; i < num_virtual_links; i++) {
- struct dc_link *link = kzalloc_obj(*link, GFP_KERNEL);
+ struct dc_link *link = kzalloc_obj(*link);
struct encoder_init_data enc_init = {0};
if (link == NULL) {
@@ -304,7 +304,7 @@ static bool create_links(
link->link_id.enum_id = ENUM_ID_1;
link->psr_settings.psr_version = DC_PSR_VERSION_UNSUPPORTED;
link->replay_settings.config.replay_version = DC_REPLAY_VERSION_UNSUPPORTED;
- link->link_enc = kzalloc_obj(*link->link_enc, GFP_KERNEL);
+ link->link_enc = kzalloc_obj(*link->link_enc);
if (!link->link_enc) {
BREAK_TO_DEBUGGER();
@@ -409,7 +409,7 @@ static void destroy_link_encoders(struct dc *dc)
static struct dc_perf_trace *dc_perf_trace_create(void)
{
- return kzalloc_obj(struct dc_perf_trace, GFP_KERNEL);
+ return kzalloc_obj(struct dc_perf_trace);
}
static void dc_perf_trace_destroy(struct dc_perf_trace **perf_trace)
@@ -1005,7 +1005,7 @@ static bool dc_construct_ctx(struct dc *dc,
{
struct dc_context *dc_ctx;
- dc_ctx = kzalloc_obj(*dc_ctx, GFP_KERNEL);
+ dc_ctx = kzalloc_obj(*dc_ctx);
if (!dc_ctx)
return false;
@@ -1023,7 +1023,7 @@ static bool dc_construct_ctx(struct dc *dc,
dc_ctx->clk_reg_offsets = init_params->clk_reg_offsets;
/* Create logger */
- dc_ctx->logger = kmalloc_obj(*dc_ctx->logger, GFP_KERNEL);
+ dc_ctx->logger = kmalloc_obj(*dc_ctx->logger);
if (!dc_ctx->logger) {
kfree(dc_ctx);
@@ -1063,7 +1063,7 @@ static bool dc_construct(struct dc *dc,
dc->config = init_params->flags;
// Allocate memory for the vm_helper
- dc->vm_helper = kzalloc_obj(struct vm_helper, GFP_KERNEL);
+ dc->vm_helper = kzalloc_obj(struct vm_helper);
if (!dc->vm_helper) {
dm_error("%s: failed to create dc->vm_helper\n", __func__);
goto fail;
@@ -1071,7 +1071,7 @@ static bool dc_construct(struct dc *dc,
memcpy(&dc->bb_overrides, &init_params->bb_overrides, sizeof(dc->bb_overrides));
- dc_dceip = kzalloc_obj(*dc_dceip, GFP_KERNEL);
+ dc_dceip = kzalloc_obj(*dc_dceip);
if (!dc_dceip) {
dm_error("%s: failed to create dceip\n", __func__);
goto fail;
@@ -1079,14 +1079,14 @@ static bool dc_construct(struct dc *dc,
dc->bw_dceip = dc_dceip;
- dc_vbios = kzalloc_obj(*dc_vbios, GFP_KERNEL);
+ dc_vbios = kzalloc_obj(*dc_vbios);
if (!dc_vbios) {
dm_error("%s: failed to create vbios\n", __func__);
goto fail;
}
dc->bw_vbios = dc_vbios;
- dcn_soc = kzalloc_obj(*dcn_soc, GFP_KERNEL);
+ dcn_soc = kzalloc_obj(*dcn_soc);
if (!dcn_soc) {
dm_error("%s: failed to create dcn_soc\n", __func__);
goto fail;
@@ -1094,7 +1094,7 @@ static bool dc_construct(struct dc *dc,
dc->dcn_soc = dcn_soc;
- dcn_ip = kzalloc_obj(*dcn_ip, GFP_KERNEL);
+ dcn_ip = kzalloc_obj(*dcn_ip);
if (!dcn_ip) {
dm_error("%s: failed to create dcn_ip\n", __func__);
goto fail;
@@ -1496,7 +1496,7 @@ static void disable_vbios_mode_if_required(
struct dc *dc_create(const struct dc_init_data *init_params)
{
- struct dc *dc = kzalloc_obj(*dc, GFP_KERNEL);
+ struct dc *dc = kzalloc_obj(*dc);
unsigned int full_pipe_count;
if (!dc)
diff --git a/drivers/gpu/drm/amd/display/dc/core/dc_sink.c b/drivers/gpu/drm/amd/display/dc/core/dc_sink.c
index 0bcd7445fe97..e5ac7056a187 100644
--- a/drivers/gpu/drm/amd/display/dc/core/dc_sink.c
+++ b/drivers/gpu/drm/amd/display/dc/core/dc_sink.c
@@ -76,7 +76,7 @@ void dc_sink_release(struct dc_sink *sink)
struct dc_sink *dc_sink_create(const struct dc_sink_init_data *init_params)
{
- struct dc_sink *sink = kzalloc_obj(*sink, GFP_KERNEL);
+ struct dc_sink *sink = kzalloc_obj(*sink);
if (NULL == sink)
goto alloc_fail;
diff --git a/drivers/gpu/drm/amd/display/dc/core/dc_state.c b/drivers/gpu/drm/amd/display/dc/core/dc_state.c
index c85b8915bbd3..a40e5c44143f 100644
--- a/drivers/gpu/drm/amd/display/dc/core/dc_state.c
+++ b/drivers/gpu/drm/amd/display/dc/core/dc_state.c
@@ -195,7 +195,7 @@ struct dc_state *dc_state_create(struct dc *dc, struct dc_state_create_params *p
{
struct dc_state *state;
- state = kvzalloc_obj(struct dc_state, GFP_KERNEL);
+ state = kvzalloc_obj(struct dc_state);
if (!state)
return NULL;
@@ -251,7 +251,7 @@ struct dc_state *dc_state_create_copy(struct dc_state *src_state)
{
struct dc_state *new_state;
- new_state = kvmalloc_obj(struct dc_state, GFP_KERNEL);
+ new_state = kvmalloc_obj(struct dc_state);
if (!new_state)
return NULL;
diff --git a/drivers/gpu/drm/amd/display/dc/core/dc_stream.c b/drivers/gpu/drm/amd/display/dc/core/dc_stream.c
index def02e26cb1f..246893d80f1f 100644
--- a/drivers/gpu/drm/amd/display/dc/core/dc_stream.c
+++ b/drivers/gpu/drm/amd/display/dc/core/dc_stream.c
@@ -170,7 +170,7 @@ struct dc_stream_state *dc_create_stream_for_sink(
if (sink == NULL)
goto fail;
- stream = kzalloc_obj(struct dc_stream_state, GFP_KERNEL);
+ stream = kzalloc_obj(struct dc_stream_state);
if (stream == NULL)
goto fail;
diff --git a/drivers/gpu/drm/amd/display/dc/core/dc_surface.c b/drivers/gpu/drm/amd/display/dc/core/dc_surface.c
index 11c237720bd2..d4c40b44d909 100644
--- a/drivers/gpu/drm/amd/display/dc/core/dc_surface.c
+++ b/drivers/gpu/drm/amd/display/dc/core/dc_surface.c
@@ -195,7 +195,7 @@ void dc_gamma_release(struct dc_gamma **gamma)
struct dc_gamma *dc_create_gamma(void)
{
- struct dc_gamma *gamma = kvzalloc_obj(*gamma, GFP_KERNEL);
+ struct dc_gamma *gamma = kvzalloc_obj(*gamma);
if (gamma == NULL)
goto alloc_fail;
@@ -225,7 +225,7 @@ void dc_transfer_func_release(struct dc_transfer_func *tf)
struct dc_transfer_func *dc_create_transfer_func(void)
{
- struct dc_transfer_func *tf = kvzalloc_obj(*tf, GFP_KERNEL);
+ struct dc_transfer_func *tf = kvzalloc_obj(*tf);
if (tf == NULL)
goto alloc_fail;
@@ -247,7 +247,7 @@ static void dc_3dlut_func_free(struct kref *kref)
struct dc_3dlut *dc_create_3dlut_func(void)
{
- struct dc_3dlut *lut = kvzalloc_obj(*lut, GFP_KERNEL);
+ struct dc_3dlut *lut = kvzalloc_obj(*lut);
if (lut == NULL)
goto alloc_fail;
diff --git a/drivers/gpu/drm/amd/display/dc/dc_dmub_srv.c b/drivers/gpu/drm/amd/display/dc/dc_dmub_srv.c
index 9b70c4e96ffe..b15360bcdacf 100644
--- a/drivers/gpu/drm/amd/display/dc/dc_dmub_srv.c
+++ b/drivers/gpu/drm/amd/display/dc/dc_dmub_srv.c
@@ -60,7 +60,7 @@ static void dc_dmub_srv_handle_failure(struct dc_dmub_srv *dc_dmub_srv)
struct dc_dmub_srv *dc_dmub_srv_create(struct dc *dc, struct dmub_srv *dmub)
{
struct dc_dmub_srv *dc_srv =
- kzalloc_obj(struct dc_dmub_srv, GFP_KERNEL);
+ kzalloc_obj(struct dc_dmub_srv);
if (dc_srv == NULL) {
BREAK_TO_DEBUGGER();
diff --git a/drivers/gpu/drm/amd/display/dc/dccg/dcn20/dcn20_dccg.c b/drivers/gpu/drm/amd/display/dc/dccg/dcn20/dcn20_dccg.c
index 7c578d10cbca..13ba7f5ce13e 100644
--- a/drivers/gpu/drm/amd/display/dc/dccg/dcn20/dcn20_dccg.c
+++ b/drivers/gpu/drm/amd/display/dc/dccg/dcn20/dcn20_dccg.c
@@ -200,7 +200,7 @@ struct dccg *dccg2_create(
const struct dccg_shift *dccg_shift,
const struct dccg_mask *dccg_mask)
{
- struct dcn_dccg *dccg_dcn = kzalloc_obj(*dccg_dcn, GFP_KERNEL);
+ struct dcn_dccg *dccg_dcn = kzalloc_obj(*dccg_dcn);
struct dccg *base;
if (dccg_dcn == NULL) {
diff --git a/drivers/gpu/drm/amd/display/dc/dccg/dcn201/dcn201_dccg.c b/drivers/gpu/drm/amd/display/dc/dccg/dcn201/dcn201_dccg.c
index b147456a8cd4..5b9ba9a811ea 100644
--- a/drivers/gpu/drm/amd/display/dc/dccg/dcn201/dcn201_dccg.c
+++ b/drivers/gpu/drm/amd/display/dc/dccg/dcn201/dcn201_dccg.c
@@ -70,7 +70,7 @@ struct dccg *dccg201_create(
const struct dccg_shift *dccg_shift,
const struct dccg_mask *dccg_mask)
{
- struct dcn_dccg *dccg_dcn = kzalloc_obj(*dccg_dcn, GFP_KERNEL);
+ struct dcn_dccg *dccg_dcn = kzalloc_obj(*dccg_dcn);
struct dccg *base;
if (dccg_dcn == NULL) {
diff --git a/drivers/gpu/drm/amd/display/dc/dccg/dcn21/dcn21_dccg.c b/drivers/gpu/drm/amd/display/dc/dccg/dcn21/dcn21_dccg.c
index f14abe712f2d..75c69348027e 100644
--- a/drivers/gpu/drm/amd/display/dc/dccg/dcn21/dcn21_dccg.c
+++ b/drivers/gpu/drm/amd/display/dc/dccg/dcn21/dcn21_dccg.c
@@ -116,7 +116,7 @@ struct dccg *dccg21_create(
const struct dccg_shift *dccg_shift,
const struct dccg_mask *dccg_mask)
{
- struct dcn_dccg *dccg_dcn = kzalloc_obj(*dccg_dcn, GFP_KERNEL);
+ struct dcn_dccg *dccg_dcn = kzalloc_obj(*dccg_dcn);
struct dccg *base;
if (dccg_dcn == NULL) {
diff --git a/drivers/gpu/drm/amd/display/dc/dccg/dcn30/dcn30_dccg.c b/drivers/gpu/drm/amd/display/dc/dccg/dcn30/dcn30_dccg.c
index f264cf2285ce..ca947d710ad1 100644
--- a/drivers/gpu/drm/amd/display/dc/dccg/dcn30/dcn30_dccg.c
+++ b/drivers/gpu/drm/amd/display/dc/dccg/dcn30/dcn30_dccg.c
@@ -62,7 +62,7 @@ struct dccg *dccg3_create(
const struct dccg_shift *dccg_shift,
const struct dccg_mask *dccg_mask)
{
- struct dcn_dccg *dccg_dcn = kzalloc_obj(*dccg_dcn, GFP_KERNEL);
+ struct dcn_dccg *dccg_dcn = kzalloc_obj(*dccg_dcn);
struct dccg *base;
if (dccg_dcn == NULL) {
@@ -87,7 +87,7 @@ struct dccg *dccg30_create(
const struct dccg_shift *dccg_shift,
const struct dccg_mask *dccg_mask)
{
- struct dcn_dccg *dccg_dcn = kzalloc_obj(*dccg_dcn, GFP_KERNEL);
+ struct dcn_dccg *dccg_dcn = kzalloc_obj(*dccg_dcn);
struct dccg *base;
if (dccg_dcn == NULL) {
diff --git a/drivers/gpu/drm/amd/display/dc/dccg/dcn301/dcn301_dccg.c b/drivers/gpu/drm/amd/display/dc/dccg/dcn301/dcn301_dccg.c
index 93ff864def88..837f4e3d1a60 100644
--- a/drivers/gpu/drm/amd/display/dc/dccg/dcn301/dcn301_dccg.c
+++ b/drivers/gpu/drm/amd/display/dc/dccg/dcn301/dcn301_dccg.c
@@ -61,7 +61,7 @@ struct dccg *dccg301_create(
const struct dccg_shift *dccg_shift,
const struct dccg_mask *dccg_mask)
{
- struct dcn_dccg *dccg_dcn = kzalloc_obj(*dccg_dcn, GFP_KERNEL);
+ struct dcn_dccg *dccg_dcn = kzalloc_obj(*dccg_dcn);
struct dccg *base;
if (dccg_dcn == NULL) {
diff --git a/drivers/gpu/drm/amd/display/dc/dccg/dcn31/dcn31_dccg.c b/drivers/gpu/drm/amd/display/dc/dccg/dcn31/dcn31_dccg.c
index 5ab0325f3615..7f58acfe1177 100644
--- a/drivers/gpu/drm/amd/display/dc/dccg/dcn31/dcn31_dccg.c
+++ b/drivers/gpu/drm/amd/display/dc/dccg/dcn31/dcn31_dccg.c
@@ -863,7 +863,7 @@ struct dccg *dccg31_create(
const struct dccg_shift *dccg_shift,
const struct dccg_mask *dccg_mask)
{
- struct dcn_dccg *dccg_dcn = kzalloc_obj(*dccg_dcn, GFP_KERNEL);
+ struct dcn_dccg *dccg_dcn = kzalloc_obj(*dccg_dcn);
struct dccg *base;
if (dccg_dcn == NULL) {
diff --git a/drivers/gpu/drm/amd/display/dc/dccg/dcn314/dcn314_dccg.c b/drivers/gpu/drm/amd/display/dc/dccg/dcn314/dcn314_dccg.c
index 5193883bfb41..ac6a909187c0 100644
--- a/drivers/gpu/drm/amd/display/dc/dccg/dcn314/dcn314_dccg.c
+++ b/drivers/gpu/drm/amd/display/dc/dccg/dcn314/dcn314_dccg.c
@@ -392,7 +392,7 @@ struct dccg *dccg314_create(
const struct dccg_shift *dccg_shift,
const struct dccg_mask *dccg_mask)
{
- struct dcn_dccg *dccg_dcn = kzalloc_obj(*dccg_dcn, GFP_KERNEL);
+ struct dcn_dccg *dccg_dcn = kzalloc_obj(*dccg_dcn);
struct dccg *base;
if (dccg_dcn == NULL) {
diff --git a/drivers/gpu/drm/amd/display/dc/dccg/dcn32/dcn32_dccg.c b/drivers/gpu/drm/amd/display/dc/dccg/dcn32/dcn32_dccg.c
index be44bc057bee..e817cd7c2b6a 100644
--- a/drivers/gpu/drm/amd/display/dc/dccg/dcn32/dcn32_dccg.c
+++ b/drivers/gpu/drm/amd/display/dc/dccg/dcn32/dcn32_dccg.c
@@ -360,7 +360,7 @@ struct dccg *dccg32_create(
const struct dccg_shift *dccg_shift,
const struct dccg_mask *dccg_mask)
{
- struct dcn_dccg *dccg_dcn = kzalloc_obj(*dccg_dcn, GFP_KERNEL);
+ struct dcn_dccg *dccg_dcn = kzalloc_obj(*dccg_dcn);
struct dccg *base;
if (dccg_dcn == NULL) {
diff --git a/drivers/gpu/drm/amd/display/dc/dccg/dcn35/dcn35_dccg.c b/drivers/gpu/drm/amd/display/dc/dccg/dcn35/dcn35_dccg.c
index 34414be7efb6..0b7908fbb115 100644
--- a/drivers/gpu/drm/amd/display/dc/dccg/dcn35/dcn35_dccg.c
+++ b/drivers/gpu/drm/amd/display/dc/dccg/dcn35/dcn35_dccg.c
@@ -2461,7 +2461,7 @@ struct dccg *dccg35_create(
const struct dccg_shift *dccg_shift,
const struct dccg_mask *dccg_mask)
{
- struct dcn_dccg *dccg_dcn = kzalloc_obj(*dccg_dcn, GFP_KERNEL);
+ struct dcn_dccg *dccg_dcn = kzalloc_obj(*dccg_dcn);
struct dccg *base;
if (dccg_dcn == NULL) {
diff --git a/drivers/gpu/drm/amd/display/dc/dccg/dcn401/dcn401_dccg.c b/drivers/gpu/drm/amd/display/dc/dccg/dcn401/dcn401_dccg.c
index 9554d24b882b..a37f94dec6f2 100644
--- a/drivers/gpu/drm/amd/display/dc/dccg/dcn401/dcn401_dccg.c
+++ b/drivers/gpu/drm/amd/display/dc/dccg/dcn401/dcn401_dccg.c
@@ -892,7 +892,7 @@ struct dccg *dccg401_create(
const struct dccg_shift *dccg_shift,
const struct dccg_mask *dccg_mask)
{
- struct dcn_dccg *dccg_dcn = kzalloc_obj(*dccg_dcn, GFP_KERNEL);
+ struct dcn_dccg *dccg_dcn = kzalloc_obj(*dccg_dcn);
struct dccg *base;
if (dccg_dcn == NULL) {
diff --git a/drivers/gpu/drm/amd/display/dc/dce/dce_abm.c b/drivers/gpu/drm/amd/display/dc/dce/dce_abm.c
index 71bb5794a513..41169b42534c 100644
--- a/drivers/gpu/drm/amd/display/dc/dce/dce_abm.c
+++ b/drivers/gpu/drm/amd/display/dc/dce/dce_abm.c
@@ -283,7 +283,7 @@ struct abm *dce_abm_create(
const struct dce_abm_shift *abm_shift,
const struct dce_abm_mask *abm_mask)
{
- struct dce_abm *abm_dce = kzalloc_obj(*abm_dce, GFP_KERNEL);
+ struct dce_abm *abm_dce = kzalloc_obj(*abm_dce);
if (abm_dce == NULL) {
BREAK_TO_DEBUGGER();
diff --git a/drivers/gpu/drm/amd/display/dc/dce/dce_audio.c b/drivers/gpu/drm/amd/display/dc/dce/dce_audio.c
index ba30394b828f..d18490cd0f1e 100644
--- a/drivers/gpu/drm/amd/display/dc/dce/dce_audio.c
+++ b/drivers/gpu/drm/amd/display/dc/dce/dce_audio.c
@@ -1331,7 +1331,7 @@ struct audio *dce_audio_create(
const struct dce_audio_mask *masks
)
{
- struct dce_audio *audio = kzalloc_obj(*audio, GFP_KERNEL);
+ struct dce_audio *audio = kzalloc_obj(*audio);
if (audio == NULL) {
ASSERT_CRITICAL(audio);
@@ -1357,7 +1357,7 @@ struct audio *dce60_audio_create(
const struct dce_audio_mask *masks
)
{
- struct dce_audio *audio = kzalloc_obj(*audio, GFP_KERNEL);
+ struct dce_audio *audio = kzalloc_obj(*audio);
if (audio == NULL) {
ASSERT_CRITICAL(audio);
diff --git a/drivers/gpu/drm/amd/display/dc/dce/dce_clk_mgr.c b/drivers/gpu/drm/amd/display/dc/dce/dce_clk_mgr.c
index 405758106101..dca025b5ff1f 100644
--- a/drivers/gpu/drm/amd/display/dc/dce/dce_clk_mgr.c
+++ b/drivers/gpu/drm/amd/display/dc/dce/dce_clk_mgr.c
@@ -848,7 +848,7 @@ struct clk_mgr *dce_clk_mgr_create(
const struct clk_mgr_shift *clk_shift,
const struct clk_mgr_mask *clk_mask)
{
- struct dce_clk_mgr *clk_mgr_dce = kzalloc_obj(*clk_mgr_dce, GFP_KERNEL);
+ struct dce_clk_mgr *clk_mgr_dce = kzalloc_obj(*clk_mgr_dce);
if (clk_mgr_dce == NULL) {
BREAK_TO_DEBUGGER();
@@ -871,7 +871,7 @@ struct clk_mgr *dce110_clk_mgr_create(
const struct clk_mgr_shift *clk_shift,
const struct clk_mgr_mask *clk_mask)
{
- struct dce_clk_mgr *clk_mgr_dce = kzalloc_obj(*clk_mgr_dce, GFP_KERNEL);
+ struct dce_clk_mgr *clk_mgr_dce = kzalloc_obj(*clk_mgr_dce);
if (clk_mgr_dce == NULL) {
BREAK_TO_DEBUGGER();
@@ -896,7 +896,7 @@ struct clk_mgr *dce112_clk_mgr_create(
const struct clk_mgr_shift *clk_shift,
const struct clk_mgr_mask *clk_mask)
{
- struct dce_clk_mgr *clk_mgr_dce = kzalloc_obj(*clk_mgr_dce, GFP_KERNEL);
+ struct dce_clk_mgr *clk_mgr_dce = kzalloc_obj(*clk_mgr_dce);
if (clk_mgr_dce == NULL) {
BREAK_TO_DEBUGGER();
@@ -917,7 +917,7 @@ struct clk_mgr *dce112_clk_mgr_create(
struct clk_mgr *dce120_clk_mgr_create(struct dc_context *ctx)
{
- struct dce_clk_mgr *clk_mgr_dce = kzalloc_obj(*clk_mgr_dce, GFP_KERNEL);
+ struct dce_clk_mgr *clk_mgr_dce = kzalloc_obj(*clk_mgr_dce);
if (clk_mgr_dce == NULL) {
BREAK_TO_DEBUGGER();
@@ -939,7 +939,7 @@ struct clk_mgr *dce120_clk_mgr_create(struct dc_context *ctx)
struct clk_mgr *dce121_clk_mgr_create(struct dc_context *ctx)
{
- struct dce_clk_mgr *clk_mgr_dce = kzalloc_obj(*clk_mgr_dce, GFP_KERNEL);
+ struct dce_clk_mgr *clk_mgr_dce = kzalloc_obj(*clk_mgr_dce);
if (clk_mgr_dce == NULL) {
BREAK_TO_DEBUGGER();
diff --git a/drivers/gpu/drm/amd/display/dc/dce/dce_dmcu.c b/drivers/gpu/drm/amd/display/dc/dce/dce_dmcu.c
index dd33218dcbab..e871b72e43ef 100644
--- a/drivers/gpu/drm/amd/display/dc/dce/dce_dmcu.c
+++ b/drivers/gpu/drm/amd/display/dc/dce/dce_dmcu.c
@@ -1105,7 +1105,7 @@ struct dmcu *dce_dmcu_create(
const struct dce_dmcu_shift *dmcu_shift,
const struct dce_dmcu_mask *dmcu_mask)
{
- struct dce_dmcu *dmcu_dce = kzalloc_obj(*dmcu_dce, GFP_KERNEL);
+ struct dce_dmcu *dmcu_dce = kzalloc_obj(*dmcu_dce);
if (dmcu_dce == NULL) {
BREAK_TO_DEBUGGER();
@@ -1126,7 +1126,7 @@ struct dmcu *dcn10_dmcu_create(
const struct dce_dmcu_shift *dmcu_shift,
const struct dce_dmcu_mask *dmcu_mask)
{
- struct dce_dmcu *dmcu_dce = kzalloc_obj(*dmcu_dce, GFP_KERNEL);
+ struct dce_dmcu *dmcu_dce = kzalloc_obj(*dmcu_dce);
if (dmcu_dce == NULL) {
BREAK_TO_DEBUGGER();
@@ -1147,7 +1147,7 @@ struct dmcu *dcn20_dmcu_create(
const struct dce_dmcu_shift *dmcu_shift,
const struct dce_dmcu_mask *dmcu_mask)
{
- struct dce_dmcu *dmcu_dce = kzalloc_obj(*dmcu_dce, GFP_KERNEL);
+ struct dce_dmcu *dmcu_dce = kzalloc_obj(*dmcu_dce);
if (dmcu_dce == NULL) {
BREAK_TO_DEBUGGER();
@@ -1168,7 +1168,7 @@ struct dmcu *dcn21_dmcu_create(
const struct dce_dmcu_shift *dmcu_shift,
const struct dce_dmcu_mask *dmcu_mask)
{
- struct dce_dmcu *dmcu_dce = kzalloc_obj(*dmcu_dce, GFP_KERNEL);
+ struct dce_dmcu *dmcu_dce = kzalloc_obj(*dmcu_dce);
if (dmcu_dce == NULL) {
BREAK_TO_DEBUGGER();
diff --git a/drivers/gpu/drm/amd/display/dc/dce/dmub_abm.c b/drivers/gpu/drm/amd/display/dc/dce/dmub_abm.c
index 11ba6e59f5b5..b686d89b79b2 100644
--- a/drivers/gpu/drm/amd/display/dc/dce/dmub_abm.c
+++ b/drivers/gpu/drm/amd/display/dc/dce/dmub_abm.c
@@ -222,7 +222,7 @@ struct abm *dmub_abm_create(
const struct dce_abm_mask *abm_mask)
{
if (ctx->dc->caps.dmcub_support) {
- struct dce_abm *abm_dce = kzalloc_obj(*abm_dce, GFP_KERNEL);
+ struct dce_abm *abm_dce = kzalloc_obj(*abm_dce);
if (abm_dce == NULL) {
BREAK_TO_DEBUGGER();
diff --git a/drivers/gpu/drm/amd/display/dc/dce/dmub_psr.c b/drivers/gpu/drm/amd/display/dc/dce/dmub_psr.c
index 4527e35a0666..f94fd007af23 100644
--- a/drivers/gpu/drm/amd/display/dc/dce/dmub_psr.c
+++ b/drivers/gpu/drm/amd/display/dc/dce/dmub_psr.c
@@ -488,7 +488,7 @@ static void dmub_psr_construct(struct dmub_psr *psr, struct dc_context *ctx)
*/
struct dmub_psr *dmub_psr_create(struct dc_context *ctx)
{
- struct dmub_psr *psr = kzalloc_obj(struct dmub_psr, GFP_KERNEL);
+ struct dmub_psr *psr = kzalloc_obj(struct dmub_psr);
if (psr == NULL) {
BREAK_TO_DEBUGGER();
diff --git a/drivers/gpu/drm/amd/display/dc/dce/dmub_replay.c b/drivers/gpu/drm/amd/display/dc/dce/dmub_replay.c
index c590c9274f21..28a218149b8b 100644
--- a/drivers/gpu/drm/amd/display/dc/dce/dmub_replay.c
+++ b/drivers/gpu/drm/amd/display/dc/dce/dmub_replay.c
@@ -438,7 +438,7 @@ static void dmub_replay_construct(struct dmub_replay *replay, struct dc_context
*/
struct dmub_replay *dmub_replay_create(struct dc_context *ctx)
{
- struct dmub_replay *replay = kzalloc_obj(struct dmub_replay, GFP_KERNEL);
+ struct dmub_replay *replay = kzalloc_obj(struct dmub_replay);
if (replay == NULL) {
BREAK_TO_DEBUGGER();
diff --git a/drivers/gpu/drm/amd/display/dc/dce110/dce110_compressor.c b/drivers/gpu/drm/amd/display/dc/dce110/dce110_compressor.c
index 68849d518e76..9be578ff8c88 100644
--- a/drivers/gpu/drm/amd/display/dc/dce110/dce110_compressor.c
+++ b/drivers/gpu/drm/amd/display/dc/dce110/dce110_compressor.c
@@ -394,7 +394,7 @@ void dce110_compressor_set_fbc_invalidation_triggers(
struct compressor *dce110_compressor_create(struct dc_context *ctx)
{
struct dce110_compressor *cp110 =
- kzalloc_obj(struct dce110_compressor, GFP_KERNEL);
+ kzalloc_obj(struct dce110_compressor);
if (!cp110)
return NULL;
diff --git a/drivers/gpu/drm/amd/display/dc/dce112/dce112_compressor.c b/drivers/gpu/drm/amd/display/dc/dce112/dce112_compressor.c
index 24effd7d3ea3..187f45a7f5e1 100644
--- a/drivers/gpu/drm/amd/display/dc/dce112/dce112_compressor.c
+++ b/drivers/gpu/drm/amd/display/dc/dce112/dce112_compressor.c
@@ -831,7 +831,7 @@ void dce112_compressor_construct(struct dce112_compressor *compressor,
struct compressor *dce112_compressor_create(struct dc_context *ctx)
{
struct dce112_compressor *cp110 =
- kzalloc_obj(struct dce112_compressor, GFP_KERNEL);
+ kzalloc_obj(struct dce112_compressor);
if (!cp110)
return NULL;
diff --git a/drivers/gpu/drm/amd/display/dc/dio/virtual/virtual_stream_encoder.c b/drivers/gpu/drm/amd/display/dc/dio/virtual/virtual_stream_encoder.c
index f30eeda44842..a9c8857476ac 100644
--- a/drivers/gpu/drm/amd/display/dc/dio/virtual/virtual_stream_encoder.c
+++ b/drivers/gpu/drm/amd/display/dc/dio/virtual/virtual_stream_encoder.c
@@ -159,7 +159,7 @@ bool virtual_stream_encoder_construct(
struct stream_encoder *virtual_stream_encoder_create(
struct dc_context *ctx, struct dc_bios *bp)
{
- struct stream_encoder *enc = kzalloc_obj(*enc, GFP_KERNEL);
+ struct stream_encoder *enc = kzalloc_obj(*enc);
if (!enc)
return NULL;
diff --git a/drivers/gpu/drm/amd/display/dc/dwb/dcn30/dcn30_dwb_cm.c b/drivers/gpu/drm/amd/display/dc/dwb/dcn30/dcn30_dwb_cm.c
index c4b1a337ac92..37adf0e6a166 100644
--- a/drivers/gpu/drm/amd/display/dc/dwb/dcn30/dcn30_dwb_cm.c
+++ b/drivers/gpu/drm/amd/display/dc/dwb/dcn30/dcn30_dwb_cm.c
@@ -280,7 +280,7 @@ bool dwb3_ogam_set_input_transfer_func(
if (in_transfer_func_dwb_ogam == NULL)
return result;
- dwb_ogam_lut = kzalloc_obj(*dwb_ogam_lut, GFP_KERNEL);
+ dwb_ogam_lut = kzalloc_obj(*dwb_ogam_lut);
if (dwb_ogam_lut) {
cm_helper_translate_curve_to_hw_format(dwbc->ctx,
diff --git a/drivers/gpu/drm/amd/display/dc/gpio/gpio_base.c b/drivers/gpu/drm/amd/display/dc/gpio/gpio_base.c
index 4e3a5b3513d8..95532b7ee884 100644
--- a/drivers/gpu/drm/amd/display/dc/gpio/gpio_base.c
+++ b/drivers/gpu/drm/amd/display/dc/gpio/gpio_base.c
@@ -270,7 +270,7 @@ struct gpio *dal_gpio_create(
uint32_t en,
enum gpio_pin_output_state output_state)
{
- struct gpio *gpio = kzalloc_obj(struct gpio, GFP_KERNEL);
+ struct gpio *gpio = kzalloc_obj(struct gpio);
if (!gpio) {
ASSERT_CRITICAL(false);
diff --git a/drivers/gpu/drm/amd/display/dc/gpio/gpio_service.c b/drivers/gpu/drm/amd/display/dc/gpio/gpio_service.c
index fd7be0a35d0f..a2c46350e44e 100644
--- a/drivers/gpu/drm/amd/display/dc/gpio/gpio_service.c
+++ b/drivers/gpu/drm/amd/display/dc/gpio/gpio_service.c
@@ -58,7 +58,7 @@ struct gpio_service *dal_gpio_service_create(
struct gpio_service *service;
int32_t index_of_id;
- service = kzalloc_obj(struct gpio_service, GFP_KERNEL);
+ service = kzalloc_obj(struct gpio_service);
if (!service) {
BREAK_TO_DEBUGGER();
@@ -498,7 +498,7 @@ struct ddc *dal_gpio_create_ddc(
if (!service->translate.funcs->offset_to_id(offset, mask, &id, &en))
return NULL;
- ddc = kzalloc_obj(struct ddc, GFP_KERNEL);
+ ddc = kzalloc_obj(struct ddc);
if (!ddc) {
BREAK_TO_DEBUGGER();
diff --git a/drivers/gpu/drm/amd/display/dc/gpio/hw_ddc.c b/drivers/gpu/drm/amd/display/dc/gpio/hw_ddc.c
index 05fa4119bf55..86d60986d669 100644
--- a/drivers/gpu/drm/amd/display/dc/gpio/hw_ddc.c
+++ b/drivers/gpu/drm/amd/display/dc/gpio/hw_ddc.c
@@ -233,7 +233,7 @@ void dal_hw_ddc_init(
*hw_ddc = NULL;
}
- *hw_ddc = kzalloc_obj(struct hw_ddc, GFP_KERNEL);
+ *hw_ddc = kzalloc_obj(struct hw_ddc);
if (!*hw_ddc) {
ASSERT_CRITICAL(false);
return;
diff --git a/drivers/gpu/drm/amd/display/dc/gpio/hw_generic.c b/drivers/gpu/drm/amd/display/dc/gpio/hw_generic.c
index 61bbcade18cb..7f137cb96895 100644
--- a/drivers/gpu/drm/amd/display/dc/gpio/hw_generic.c
+++ b/drivers/gpu/drm/amd/display/dc/gpio/hw_generic.c
@@ -111,7 +111,7 @@ void dal_hw_generic_init(
*hw_generic = NULL;
}
- *hw_generic = kzalloc_obj(struct hw_generic, GFP_KERNEL);
+ *hw_generic = kzalloc_obj(struct hw_generic);
if (!*hw_generic) {
ASSERT_CRITICAL(false);
return;
diff --git a/drivers/gpu/drm/amd/display/dc/gpio/hw_hpd.c b/drivers/gpu/drm/amd/display/dc/gpio/hw_hpd.c
index ee7d794a8c60..79e107904e21 100644
--- a/drivers/gpu/drm/amd/display/dc/gpio/hw_hpd.c
+++ b/drivers/gpu/drm/amd/display/dc/gpio/hw_hpd.c
@@ -132,7 +132,7 @@ void dal_hw_hpd_init(
*hw_hpd = NULL;
}
- *hw_hpd = kzalloc_obj(struct hw_hpd, GFP_KERNEL);
+ *hw_hpd = kzalloc_obj(struct hw_hpd);
if (!*hw_hpd) {
ASSERT_CRITICAL(false);
return;
diff --git a/drivers/gpu/drm/amd/display/dc/hwss/dcn10/dcn10_hwseq.c b/drivers/gpu/drm/amd/display/dc/hwss/dcn10/dcn10_hwseq.c
index 7083c57da007..a2d28be480e8 100644
--- a/drivers/gpu/drm/amd/display/dc/hwss/dcn10/dcn10_hwseq.c
+++ b/drivers/gpu/drm/amd/display/dc/hwss/dcn10/dcn10_hwseq.c
@@ -2399,7 +2399,7 @@ static int dcn10_align_pixel_clocks(struct dc *dc, int group_size,
DC_LOGGER_INIT(dc_ctx->logger);
- hw_crtc_timing = kzalloc_objs(*hw_crtc_timing, MAX_PIPES, GFP_KERNEL);
+ hw_crtc_timing = kzalloc_objs(*hw_crtc_timing, MAX_PIPES);
if (!hw_crtc_timing)
return master;
diff --git a/drivers/gpu/drm/amd/display/dc/irq/dce110/irq_service_dce110.c b/drivers/gpu/drm/amd/display/dc/irq/dce110/irq_service_dce110.c
index 002210b6bb62..676df39079fc 100644
--- a/drivers/gpu/drm/amd/display/dc/irq/dce110/irq_service_dce110.c
+++ b/drivers/gpu/drm/amd/display/dc/irq/dce110/irq_service_dce110.c
@@ -419,7 +419,7 @@ static void dce110_irq_construct(struct irq_service *irq_service,
struct irq_service *
dal_irq_service_dce110_create(struct irq_service_init_data *init_data)
{
- struct irq_service *irq_service = kzalloc_obj(*irq_service, GFP_KERNEL);
+ struct irq_service *irq_service = kzalloc_obj(*irq_service);
if (!irq_service)
return NULL;
diff --git a/drivers/gpu/drm/amd/display/dc/irq/dce120/irq_service_dce120.c b/drivers/gpu/drm/amd/display/dc/irq/dce120/irq_service_dce120.c
index 47714407252d..b473dae2abbb 100644
--- a/drivers/gpu/drm/amd/display/dc/irq/dce120/irq_service_dce120.c
+++ b/drivers/gpu/drm/amd/display/dc/irq/dce120/irq_service_dce120.c
@@ -257,7 +257,7 @@ static void dce120_irq_construct(
struct irq_service *dal_irq_service_dce120_create(
struct irq_service_init_data *init_data)
{
- struct irq_service *irq_service = kzalloc_obj(*irq_service, GFP_KERNEL);
+ struct irq_service *irq_service = kzalloc_obj(*irq_service);
if (!irq_service)
return NULL;
diff --git a/drivers/gpu/drm/amd/display/dc/irq/dce60/irq_service_dce60.c b/drivers/gpu/drm/amd/display/dc/irq/dce60/irq_service_dce60.c
index 47a2a53979db..68692a126f60 100644
--- a/drivers/gpu/drm/amd/display/dc/irq/dce60/irq_service_dce60.c
+++ b/drivers/gpu/drm/amd/display/dc/irq/dce60/irq_service_dce60.c
@@ -355,7 +355,7 @@ static void dce60_irq_construct(
struct irq_service *dal_irq_service_dce60_create(
struct irq_service_init_data *init_data)
{
- struct irq_service *irq_service = kzalloc_obj(*irq_service, GFP_KERNEL);
+ struct irq_service *irq_service = kzalloc_obj(*irq_service);
if (!irq_service)
return NULL;
diff --git a/drivers/gpu/drm/amd/display/dc/irq/dce80/irq_service_dce80.c b/drivers/gpu/drm/amd/display/dc/irq/dce80/irq_service_dce80.c
index bad0e02713f8..b5c5f42cf8f2 100644
--- a/drivers/gpu/drm/amd/display/dc/irq/dce80/irq_service_dce80.c
+++ b/drivers/gpu/drm/amd/display/dc/irq/dce80/irq_service_dce80.c
@@ -267,7 +267,7 @@ static void dce80_irq_construct(
struct irq_service *dal_irq_service_dce80_create(
struct irq_service_init_data *init_data)
{
- struct irq_service *irq_service = kzalloc_obj(*irq_service, GFP_KERNEL);
+ struct irq_service *irq_service = kzalloc_obj(*irq_service);
if (!irq_service)
return NULL;
diff --git a/drivers/gpu/drm/amd/display/dc/irq/dcn10/irq_service_dcn10.c b/drivers/gpu/drm/amd/display/dc/irq/dcn10/irq_service_dcn10.c
index 51f3a5042788..ca2e13702fbb 100644
--- a/drivers/gpu/drm/amd/display/dc/irq/dcn10/irq_service_dcn10.c
+++ b/drivers/gpu/drm/amd/display/dc/irq/dcn10/irq_service_dcn10.c
@@ -369,7 +369,7 @@ static void dcn10_irq_construct(
struct irq_service *dal_irq_service_dcn10_create(
struct irq_service_init_data *init_data)
{
- struct irq_service *irq_service = kzalloc_obj(*irq_service, GFP_KERNEL);
+ struct irq_service *irq_service = kzalloc_obj(*irq_service);
if (!irq_service)
return NULL;
diff --git a/drivers/gpu/drm/amd/display/dc/irq/dcn20/irq_service_dcn20.c b/drivers/gpu/drm/amd/display/dc/irq/dcn20/irq_service_dcn20.c
index cd09fa6e6706..1c4c51abc259 100644
--- a/drivers/gpu/drm/amd/display/dc/irq/dcn20/irq_service_dcn20.c
+++ b/drivers/gpu/drm/amd/display/dc/irq/dcn20/irq_service_dcn20.c
@@ -374,7 +374,7 @@ static void dcn20_irq_construct(
struct irq_service *dal_irq_service_dcn20_create(
struct irq_service_init_data *init_data)
{
- struct irq_service *irq_service = kzalloc_obj(*irq_service, GFP_KERNEL);
+ struct irq_service *irq_service = kzalloc_obj(*irq_service);
if (!irq_service)
return NULL;
diff --git a/drivers/gpu/drm/amd/display/dc/irq/dcn201/irq_service_dcn201.c b/drivers/gpu/drm/amd/display/dc/irq/dcn201/irq_service_dcn201.c
index 7ca085b418e3..04b5d748e03a 100644
--- a/drivers/gpu/drm/amd/display/dc/irq/dcn201/irq_service_dcn201.c
+++ b/drivers/gpu/drm/amd/display/dc/irq/dcn201/irq_service_dcn201.c
@@ -328,7 +328,7 @@ static void dcn201_irq_construct(
struct irq_service *dal_irq_service_dcn201_create(
struct irq_service_init_data *init_data)
{
- struct irq_service *irq_service = kzalloc_obj(*irq_service, GFP_KERNEL);
+ struct irq_service *irq_service = kzalloc_obj(*irq_service);
if (!irq_service)
return NULL;
diff --git a/drivers/gpu/drm/amd/display/dc/irq/dcn21/irq_service_dcn21.c b/drivers/gpu/drm/amd/display/dc/irq/dcn21/irq_service_dcn21.c
index 67fbcce3409f..9e0881472e38 100644
--- a/drivers/gpu/drm/amd/display/dc/irq/dcn21/irq_service_dcn21.c
+++ b/drivers/gpu/drm/amd/display/dc/irq/dcn21/irq_service_dcn21.c
@@ -402,7 +402,7 @@ static void dcn21_irq_construct(
struct irq_service *dal_irq_service_dcn21_create(
struct irq_service_init_data *init_data)
{
- struct irq_service *irq_service = kzalloc_obj(*irq_service, GFP_KERNEL);
+ struct irq_service *irq_service = kzalloc_obj(*irq_service);
if (!irq_service)
return NULL;
diff --git a/drivers/gpu/drm/amd/display/dc/irq/dcn30/irq_service_dcn30.c b/drivers/gpu/drm/amd/display/dc/irq/dcn30/irq_service_dcn30.c
index 10a16dc17487..92bcd35723ca 100644
--- a/drivers/gpu/drm/amd/display/dc/irq/dcn30/irq_service_dcn30.c
+++ b/drivers/gpu/drm/amd/display/dc/irq/dcn30/irq_service_dcn30.c
@@ -411,7 +411,7 @@ static void dcn30_irq_construct(
struct irq_service *dal_irq_service_dcn30_create(
struct irq_service_init_data *init_data)
{
- struct irq_service *irq_service = kzalloc_obj(*irq_service, GFP_KERNEL);
+ struct irq_service *irq_service = kzalloc_obj(*irq_service);
if (!irq_service)
return NULL;
diff --git a/drivers/gpu/drm/amd/display/dc/irq/dcn302/irq_service_dcn302.c b/drivers/gpu/drm/amd/display/dc/irq/dcn302/irq_service_dcn302.c
index 55c863790402..16685d066c1a 100644
--- a/drivers/gpu/drm/amd/display/dc/irq/dcn302/irq_service_dcn302.c
+++ b/drivers/gpu/drm/amd/display/dc/irq/dcn302/irq_service_dcn302.c
@@ -377,7 +377,7 @@ static void dcn302_irq_construct(struct irq_service *irq_service, struct irq_ser
struct irq_service *dal_irq_service_dcn302_create(struct irq_service_init_data *init_data)
{
- struct irq_service *irq_service = kzalloc_obj(*irq_service, GFP_KERNEL);
+ struct irq_service *irq_service = kzalloc_obj(*irq_service);
if (!irq_service)
return NULL;
diff --git a/drivers/gpu/drm/amd/display/dc/irq/dcn303/irq_service_dcn303.c b/drivers/gpu/drm/amd/display/dc/irq/dcn303/irq_service_dcn303.c
index 2ce7c829a445..01d83e1922d6 100644
--- a/drivers/gpu/drm/amd/display/dc/irq/dcn303/irq_service_dcn303.c
+++ b/drivers/gpu/drm/amd/display/dc/irq/dcn303/irq_service_dcn303.c
@@ -273,7 +273,7 @@ static void dcn303_irq_construct(struct irq_service *irq_service, struct irq_ser
struct irq_service *dal_irq_service_dcn303_create(struct irq_service_init_data *init_data)
{
- struct irq_service *irq_service = kzalloc_obj(*irq_service, GFP_KERNEL);
+ struct irq_service *irq_service = kzalloc_obj(*irq_service);
if (!irq_service)
return NULL;
diff --git a/drivers/gpu/drm/amd/display/dc/irq/dcn31/irq_service_dcn31.c b/drivers/gpu/drm/amd/display/dc/irq/dcn31/irq_service_dcn31.c
index 710cda204bee..2114c5669e6e 100644
--- a/drivers/gpu/drm/amd/display/dc/irq/dcn31/irq_service_dcn31.c
+++ b/drivers/gpu/drm/amd/display/dc/irq/dcn31/irq_service_dcn31.c
@@ -393,7 +393,7 @@ static void dcn31_irq_construct(
struct irq_service *dal_irq_service_dcn31_create(
struct irq_service_init_data *init_data)
{
- struct irq_service *irq_service = kzalloc_obj(*irq_service, GFP_KERNEL);
+ struct irq_service *irq_service = kzalloc_obj(*irq_service);
if (!irq_service)
return NULL;
diff --git a/drivers/gpu/drm/amd/display/dc/irq/dcn314/irq_service_dcn314.c b/drivers/gpu/drm/amd/display/dc/irq/dcn314/irq_service_dcn314.c
index 8cb120a3ceb7..16f158e0fb60 100644
--- a/drivers/gpu/drm/amd/display/dc/irq/dcn314/irq_service_dcn314.c
+++ b/drivers/gpu/drm/amd/display/dc/irq/dcn314/irq_service_dcn314.c
@@ -395,7 +395,7 @@ static void dcn314_irq_construct(
struct irq_service *dal_irq_service_dcn314_create(
struct irq_service_init_data *init_data)
{
- struct irq_service *irq_service = kzalloc_obj(*irq_service, GFP_KERNEL);
+ struct irq_service *irq_service = kzalloc_obj(*irq_service);
if (!irq_service)
return NULL;
diff --git a/drivers/gpu/drm/amd/display/dc/irq/dcn315/irq_service_dcn315.c b/drivers/gpu/drm/amd/display/dc/irq/dcn315/irq_service_dcn315.c
index f3a0f8f176d8..8ee03c006ad6 100644
--- a/drivers/gpu/drm/amd/display/dc/irq/dcn315/irq_service_dcn315.c
+++ b/drivers/gpu/drm/amd/display/dc/irq/dcn315/irq_service_dcn315.c
@@ -400,7 +400,7 @@ static void dcn315_irq_construct(
struct irq_service *dal_irq_service_dcn315_create(
struct irq_service_init_data *init_data)
{
- struct irq_service *irq_service = kzalloc_obj(*irq_service, GFP_KERNEL);
+ struct irq_service *irq_service = kzalloc_obj(*irq_service);
if (!irq_service)
return NULL;
diff --git a/drivers/gpu/drm/amd/display/dc/irq/dcn32/irq_service_dcn32.c b/drivers/gpu/drm/amd/display/dc/irq/dcn32/irq_service_dcn32.c
index 80b388ac3511..07e6f7dd6b99 100644
--- a/drivers/gpu/drm/amd/display/dc/irq/dcn32/irq_service_dcn32.c
+++ b/drivers/gpu/drm/amd/display/dc/irq/dcn32/irq_service_dcn32.c
@@ -425,7 +425,7 @@ static void dcn32_irq_construct(
struct irq_service *dal_irq_service_dcn32_create(
struct irq_service_init_data *init_data)
{
- struct irq_service *irq_service = kzalloc_obj(*irq_service, GFP_KERNEL);
+ struct irq_service *irq_service = kzalloc_obj(*irq_service);
if (!irq_service)
return NULL;
diff --git a/drivers/gpu/drm/amd/display/dc/irq/dcn35/irq_service_dcn35.c b/drivers/gpu/drm/amd/display/dc/irq/dcn35/irq_service_dcn35.c
index 44b3c3b0c657..3d28a5007f53 100644
--- a/drivers/gpu/drm/amd/display/dc/irq/dcn35/irq_service_dcn35.c
+++ b/drivers/gpu/drm/amd/display/dc/irq/dcn35/irq_service_dcn35.c
@@ -389,7 +389,7 @@ static void dcn35_irq_construct(
struct irq_service *dal_irq_service_dcn35_create(
struct irq_service_init_data *init_data)
{
- struct irq_service *irq_service = kzalloc_obj(*irq_service, GFP_KERNEL);
+ struct irq_service *irq_service = kzalloc_obj(*irq_service);
if (!irq_service)
return NULL;
diff --git a/drivers/gpu/drm/amd/display/dc/irq/dcn351/irq_service_dcn351.c b/drivers/gpu/drm/amd/display/dc/irq/dcn351/irq_service_dcn351.c
index e4600282cf18..f716c2590876 100644
--- a/drivers/gpu/drm/amd/display/dc/irq/dcn351/irq_service_dcn351.c
+++ b/drivers/gpu/drm/amd/display/dc/irq/dcn351/irq_service_dcn351.c
@@ -371,7 +371,7 @@ static void dcn351_irq_construct(
struct irq_service *dal_irq_service_dcn351_create(
struct irq_service_init_data *init_data)
{
- struct irq_service *irq_service = kzalloc_obj(*irq_service, GFP_KERNEL);
+ struct irq_service *irq_service = kzalloc_obj(*irq_service);
if (!irq_service)
return NULL;
diff --git a/drivers/gpu/drm/amd/display/dc/irq/dcn36/irq_service_dcn36.c b/drivers/gpu/drm/amd/display/dc/irq/dcn36/irq_service_dcn36.c
index e81077f764df..e718004901cf 100644
--- a/drivers/gpu/drm/amd/display/dc/irq/dcn36/irq_service_dcn36.c
+++ b/drivers/gpu/drm/amd/display/dc/irq/dcn36/irq_service_dcn36.c
@@ -370,7 +370,7 @@ static void dcn36_irq_construct(
struct irq_service *dal_irq_service_dcn36_create(
struct irq_service_init_data *init_data)
{
- struct irq_service *irq_service = kzalloc_obj(*irq_service, GFP_KERNEL);
+ struct irq_service *irq_service = kzalloc_obj(*irq_service);
if (!irq_service)
return NULL;
diff --git a/drivers/gpu/drm/amd/display/dc/irq/dcn401/irq_service_dcn401.c b/drivers/gpu/drm/amd/display/dc/irq/dcn401/irq_service_dcn401.c
index 97c80aa30e8b..2cde50b2ae22 100644
--- a/drivers/gpu/drm/amd/display/dc/irq/dcn401/irq_service_dcn401.c
+++ b/drivers/gpu/drm/amd/display/dc/irq/dcn401/irq_service_dcn401.c
@@ -403,7 +403,7 @@ static void dcn401_irq_construct(
struct irq_service *dal_irq_service_dcn401_create(
struct irq_service_init_data *init_data)
{
- struct irq_service *irq_service = kzalloc_obj(*irq_service, GFP_KERNEL);
+ struct irq_service *irq_service = kzalloc_obj(*irq_service);
if (!irq_service)
return NULL;
diff --git a/drivers/gpu/drm/amd/display/dc/link/link_factory.c b/drivers/gpu/drm/amd/display/dc/link/link_factory.c
index e1cf56cdc8c0..21815ad01a29 100644
--- a/drivers/gpu/drm/amd/display/dc/link/link_factory.c
+++ b/drivers/gpu/drm/amd/display/dc/link/link_factory.c
@@ -302,7 +302,7 @@ static void construct_link_service(struct link_service *link_srv)
struct link_service *link_create_link_service(void)
{
- struct link_service *link_srv = kzalloc_obj(*link_srv, GFP_KERNEL);
+ struct link_service *link_srv = kzalloc_obj(*link_srv);
if (link_srv == NULL)
goto fail;
@@ -897,7 +897,7 @@ static bool link_construct(struct dc_link *link,
struct dc_link *link_create(const struct link_init_data *init_params)
{
- struct dc_link *link = kzalloc_obj(*link, GFP_KERNEL);
+ struct dc_link *link = kzalloc_obj(*link);
if (NULL == link)
goto alloc_fail;
diff --git a/drivers/gpu/drm/amd/display/dc/link/protocols/link_ddc.c b/drivers/gpu/drm/amd/display/dc/link/protocols/link_ddc.c
index 1a7c73263615..a66217e54a09 100644
--- a/drivers/gpu/drm/amd/display/dc/link/protocols/link_ddc.c
+++ b/drivers/gpu/drm/amd/display/dc/link/protocols/link_ddc.c
@@ -156,7 +156,7 @@ struct ddc_service *link_create_ddc_service(
{
struct ddc_service *ddc_service;
- ddc_service = kzalloc_obj(struct ddc_service, GFP_KERNEL);
+ ddc_service = kzalloc_obj(struct ddc_service);
if (!ddc_service)
return NULL;
diff --git a/drivers/gpu/drm/amd/display/dc/pg/dcn35/dcn35_pg_cntl.c b/drivers/gpu/drm/amd/display/dc/pg/dcn35/dcn35_pg_cntl.c
index 0df983c70ba3..f5bf5940e748 100644
--- a/drivers/gpu/drm/amd/display/dc/pg/dcn35/dcn35_pg_cntl.c
+++ b/drivers/gpu/drm/amd/display/dc/pg/dcn35/dcn35_pg_cntl.c
@@ -542,7 +542,7 @@ struct pg_cntl *pg_cntl35_create(
const struct pg_cntl_shift *pg_cntl_shift,
const struct pg_cntl_mask *pg_cntl_mask)
{
- struct dcn_pg_cntl *pg_cntl_dcn = kzalloc_obj(*pg_cntl_dcn, GFP_KERNEL);
+ struct dcn_pg_cntl *pg_cntl_dcn = kzalloc_obj(*pg_cntl_dcn);
struct pg_cntl *base;
if (pg_cntl_dcn == NULL) {
diff --git a/drivers/gpu/drm/amd/display/dc/resource/dce100/dce100_resource.c b/drivers/gpu/drm/amd/display/dc/resource/dce100/dce100_resource.c
index e562c71fb432..8e0b38762c96 100644
--- a/drivers/gpu/drm/amd/display/dc/resource/dce100/dce100_resource.c
+++ b/drivers/gpu/drm/amd/display/dc/resource/dce100/dce100_resource.c
@@ -472,7 +472,7 @@ static struct timing_generator *dce100_timing_generator_create(
const struct dce110_timing_generator_offsets *offsets)
{
struct dce110_timing_generator *tg110 =
- kzalloc_obj(struct dce110_timing_generator, GFP_KERNEL);
+ kzalloc_obj(struct dce110_timing_generator);
if (!tg110)
return NULL;
@@ -486,7 +486,7 @@ static struct stream_encoder *dce100_stream_encoder_create(
struct dc_context *ctx)
{
struct dce110_stream_encoder *enc110 =
- kzalloc_obj(struct dce110_stream_encoder, GFP_KERNEL);
+ kzalloc_obj(struct dce110_stream_encoder);
if (!enc110)
return NULL;
@@ -520,7 +520,7 @@ static const struct dce_hwseq_mask hwseq_mask = {
static struct dce_hwseq *dce100_hwseq_create(
struct dc_context *ctx)
{
- struct dce_hwseq *hws = kzalloc_obj(struct dce_hwseq, GFP_KERNEL);
+ struct dce_hwseq *hws = kzalloc_obj(struct dce_hwseq);
if (hws) {
hws->ctx = ctx;
@@ -597,7 +597,7 @@ static struct transform *dce100_transform_create(
uint32_t inst)
{
struct dce_transform *transform =
- kzalloc_obj(struct dce_transform, GFP_KERNEL);
+ kzalloc_obj(struct dce_transform);
if (!transform)
return NULL;
@@ -610,7 +610,7 @@ static struct transform *dce100_transform_create(
static struct input_pixel_processor *dce100_ipp_create(
struct dc_context *ctx, uint32_t inst)
{
- struct dce_ipp *ipp = kzalloc_obj(struct dce_ipp, GFP_KERNEL);
+ struct dce_ipp *ipp = kzalloc_obj(struct dce_ipp);
if (!ipp) {
BREAK_TO_DEBUGGER();
@@ -634,7 +634,7 @@ static struct link_encoder *dce100_link_encoder_create(
const struct encoder_init_data *enc_init_data)
{
struct dce110_link_encoder *enc110 =
- kzalloc_obj(struct dce110_link_encoder, GFP_KERNEL);
+ kzalloc_obj(struct dce110_link_encoder);
int link_regs_id;
if (!enc110)
@@ -669,7 +669,7 @@ static struct link_encoder *dce100_link_encoder_create(
static struct panel_cntl *dce100_panel_cntl_create(const struct panel_cntl_init_data *init_data)
{
struct dce_panel_cntl *panel_cntl =
- kzalloc_obj(struct dce_panel_cntl, GFP_KERNEL);
+ kzalloc_obj(struct dce_panel_cntl);
if (!panel_cntl)
return NULL;
@@ -688,7 +688,7 @@ static struct output_pixel_processor *dce100_opp_create(
uint32_t inst)
{
struct dce110_opp *opp =
- kzalloc_obj(struct dce110_opp, GFP_KERNEL);
+ kzalloc_obj(struct dce110_opp);
if (!opp)
return NULL;
@@ -703,7 +703,7 @@ static struct dce_aux *dce100_aux_engine_create(
uint32_t inst)
{
struct aux_engine_dce110 *aux_engine =
- kzalloc_obj(struct aux_engine_dce110, GFP_KERNEL);
+ kzalloc_obj(struct aux_engine_dce110);
if (!aux_engine)
return NULL;
@@ -741,7 +741,7 @@ static struct dce_i2c_hw *dce100_i2c_hw_create(
uint32_t inst)
{
struct dce_i2c_hw *dce_i2c_hw =
- kzalloc_obj(struct dce_i2c_hw, GFP_KERNEL);
+ kzalloc_obj(struct dce_i2c_hw);
if (!dce_i2c_hw)
return NULL;
@@ -759,7 +759,7 @@ static struct clock_source *dce100_clock_source_create(
bool dp_clk_src)
{
struct dce110_clk_src *clk_src =
- kzalloc_obj(struct dce110_clk_src, GFP_KERNEL);
+ kzalloc_obj(struct dce110_clk_src);
if (!clk_src)
return NULL;
@@ -1215,7 +1215,7 @@ struct resource_pool *dce100_create_resource_pool(
struct dc *dc)
{
struct dce110_resource_pool *pool =
- kzalloc_obj(struct dce110_resource_pool, GFP_KERNEL);
+ kzalloc_obj(struct dce110_resource_pool);
if (!pool)
return NULL;
diff --git a/drivers/gpu/drm/amd/display/dc/resource/dce110/dce110_resource.c b/drivers/gpu/drm/amd/display/dc/resource/dce110/dce110_resource.c
index 68964e8ce10b..0a28d3573549 100644
--- a/drivers/gpu/drm/amd/display/dc/resource/dce110/dce110_resource.c
+++ b/drivers/gpu/drm/amd/display/dc/resource/dce110/dce110_resource.c
@@ -516,7 +516,7 @@ static struct timing_generator *dce110_timing_generator_create(
const struct dce110_timing_generator_offsets *offsets)
{
struct dce110_timing_generator *tg110 =
- kzalloc_obj(struct dce110_timing_generator, GFP_KERNEL);
+ kzalloc_obj(struct dce110_timing_generator);
if (!tg110)
return NULL;
@@ -530,7 +530,7 @@ static struct stream_encoder *dce110_stream_encoder_create(
struct dc_context *ctx)
{
struct dce110_stream_encoder *enc110 =
- kzalloc_obj(struct dce110_stream_encoder, GFP_KERNEL);
+ kzalloc_obj(struct dce110_stream_encoder);
if (!enc110)
return NULL;
@@ -563,7 +563,7 @@ static const struct dce_hwseq_mask hwseq_mask = {
static struct dce_hwseq *dce110_hwseq_create(
struct dc_context *ctx)
{
- struct dce_hwseq *hws = kzalloc_obj(struct dce_hwseq, GFP_KERNEL);
+ struct dce_hwseq *hws = kzalloc_obj(struct dce_hwseq);
if (hws) {
hws->ctx = ctx;
@@ -632,7 +632,7 @@ static struct transform *dce110_transform_create(
uint32_t inst)
{
struct dce_transform *transform =
- kzalloc_obj(struct dce_transform, GFP_KERNEL);
+ kzalloc_obj(struct dce_transform);
if (!transform)
return NULL;
@@ -645,7 +645,7 @@ static struct transform *dce110_transform_create(
static struct input_pixel_processor *dce110_ipp_create(
struct dc_context *ctx, uint32_t inst)
{
- struct dce_ipp *ipp = kzalloc_obj(struct dce_ipp, GFP_KERNEL);
+ struct dce_ipp *ipp = kzalloc_obj(struct dce_ipp);
if (!ipp) {
BREAK_TO_DEBUGGER();
@@ -669,7 +669,7 @@ static struct link_encoder *dce110_link_encoder_create(
const struct encoder_init_data *enc_init_data)
{
struct dce110_link_encoder *enc110 =
- kzalloc_obj(struct dce110_link_encoder, GFP_KERNEL);
+ kzalloc_obj(struct dce110_link_encoder);
int link_regs_id;
if (!enc110 || enc_init_data->hpd_source >= ARRAY_SIZE(link_enc_hpd_regs))
@@ -690,7 +690,7 @@ static struct link_encoder *dce110_link_encoder_create(
static struct panel_cntl *dce110_panel_cntl_create(const struct panel_cntl_init_data *init_data)
{
struct dce_panel_cntl *panel_cntl =
- kzalloc_obj(struct dce_panel_cntl, GFP_KERNEL);
+ kzalloc_obj(struct dce_panel_cntl);
if (!panel_cntl)
return NULL;
@@ -709,7 +709,7 @@ static struct output_pixel_processor *dce110_opp_create(
uint32_t inst)
{
struct dce110_opp *opp =
- kzalloc_obj(struct dce110_opp, GFP_KERNEL);
+ kzalloc_obj(struct dce110_opp);
if (!opp)
return NULL;
@@ -724,7 +724,7 @@ static struct dce_aux *dce110_aux_engine_create(
uint32_t inst)
{
struct aux_engine_dce110 *aux_engine =
- kzalloc_obj(struct aux_engine_dce110, GFP_KERNEL);
+ kzalloc_obj(struct aux_engine_dce110);
if (!aux_engine)
return NULL;
@@ -762,7 +762,7 @@ static struct dce_i2c_hw *dce110_i2c_hw_create(
uint32_t inst)
{
struct dce_i2c_hw *dce_i2c_hw =
- kzalloc_obj(struct dce_i2c_hw, GFP_KERNEL);
+ kzalloc_obj(struct dce_i2c_hw);
if (!dce_i2c_hw)
return NULL;
@@ -780,7 +780,7 @@ static struct clock_source *dce110_clock_source_create(
bool dp_clk_src)
{
struct dce110_clk_src *clk_src =
- kzalloc_obj(struct dce110_clk_src, GFP_KERNEL);
+ kzalloc_obj(struct dce110_clk_src);
if (!clk_src)
return NULL;
@@ -1254,8 +1254,8 @@ static bool underlay_create(struct dc_context *ctx, struct resource_pool *pool)
GFP_KERNEL);
struct dce_transform *dce110_xfmv = kzalloc_obj(*dce110_xfmv,
GFP_KERNEL);
- struct dce_mem_input *dce110_miv = kzalloc_obj(*dce110_miv, GFP_KERNEL);
- struct dce110_opp *dce110_oppv = kzalloc_obj(*dce110_oppv, GFP_KERNEL);
+ struct dce_mem_input *dce110_miv = kzalloc_obj(*dce110_miv);
+ struct dce110_opp *dce110_oppv = kzalloc_obj(*dce110_oppv);
if (!dce110_tgv || !dce110_xfmv || !dce110_miv || !dce110_oppv) {
kfree(dce110_tgv);
@@ -1543,7 +1543,7 @@ struct resource_pool *dce110_create_resource_pool(
struct hw_asic_id asic_id)
{
struct dce110_resource_pool *pool =
- kzalloc_obj(struct dce110_resource_pool, GFP_KERNEL);
+ kzalloc_obj(struct dce110_resource_pool);
if (!pool)
return NULL;
diff --git a/drivers/gpu/drm/amd/display/dc/resource/dce112/dce112_resource.c b/drivers/gpu/drm/amd/display/dc/resource/dce112/dce112_resource.c
index 9c3f6e96f0ae..678ee1a73ac6 100644
--- a/drivers/gpu/drm/amd/display/dc/resource/dce112/dce112_resource.c
+++ b/drivers/gpu/drm/amd/display/dc/resource/dce112/dce112_resource.c
@@ -497,7 +497,7 @@ static struct timing_generator *dce112_timing_generator_create(
const struct dce110_timing_generator_offsets *offsets)
{
struct dce110_timing_generator *tg110 =
- kzalloc_obj(struct dce110_timing_generator, GFP_KERNEL);
+ kzalloc_obj(struct dce110_timing_generator);
if (!tg110)
return NULL;
@@ -511,7 +511,7 @@ static struct stream_encoder *dce112_stream_encoder_create(
struct dc_context *ctx)
{
struct dce110_stream_encoder *enc110 =
- kzalloc_obj(struct dce110_stream_encoder, GFP_KERNEL);
+ kzalloc_obj(struct dce110_stream_encoder);
if (!enc110)
return NULL;
@@ -540,7 +540,7 @@ static const struct dce_hwseq_mask hwseq_mask = {
static struct dce_hwseq *dce112_hwseq_create(
struct dc_context *ctx)
{
- struct dce_hwseq *hws = kzalloc_obj(struct dce_hwseq, GFP_KERNEL);
+ struct dce_hwseq *hws = kzalloc_obj(struct dce_hwseq);
if (hws) {
hws->ctx = ctx;
@@ -603,7 +603,7 @@ static struct transform *dce112_transform_create(
uint32_t inst)
{
struct dce_transform *transform =
- kzalloc_obj(struct dce_transform, GFP_KERNEL);
+ kzalloc_obj(struct dce_transform);
if (!transform)
return NULL;
@@ -630,7 +630,7 @@ static struct link_encoder *dce112_link_encoder_create(
const struct encoder_init_data *enc_init_data)
{
struct dce110_link_encoder *enc110 =
- kzalloc_obj(struct dce110_link_encoder, GFP_KERNEL);
+ kzalloc_obj(struct dce110_link_encoder);
int link_regs_id;
if (!enc110 || enc_init_data->hpd_source >= ARRAY_SIZE(link_enc_hpd_regs))
@@ -651,7 +651,7 @@ static struct link_encoder *dce112_link_encoder_create(
static struct panel_cntl *dce112_panel_cntl_create(const struct panel_cntl_init_data *init_data)
{
struct dce_panel_cntl *panel_cntl =
- kzalloc_obj(struct dce_panel_cntl, GFP_KERNEL);
+ kzalloc_obj(struct dce_panel_cntl);
if (!panel_cntl)
return NULL;
@@ -668,7 +668,7 @@ static struct panel_cntl *dce112_panel_cntl_create(const struct panel_cntl_init_
static struct input_pixel_processor *dce112_ipp_create(
struct dc_context *ctx, uint32_t inst)
{
- struct dce_ipp *ipp = kzalloc_obj(struct dce_ipp, GFP_KERNEL);
+ struct dce_ipp *ipp = kzalloc_obj(struct dce_ipp);
if (!ipp) {
BREAK_TO_DEBUGGER();
@@ -685,7 +685,7 @@ static struct output_pixel_processor *dce112_opp_create(
uint32_t inst)
{
struct dce110_opp *opp =
- kzalloc_obj(struct dce110_opp, GFP_KERNEL);
+ kzalloc_obj(struct dce110_opp);
if (!opp)
return NULL;
@@ -700,7 +700,7 @@ static struct dce_aux *dce112_aux_engine_create(
uint32_t inst)
{
struct aux_engine_dce110 *aux_engine =
- kzalloc_obj(struct aux_engine_dce110, GFP_KERNEL);
+ kzalloc_obj(struct aux_engine_dce110);
if (!aux_engine)
return NULL;
@@ -738,7 +738,7 @@ static struct dce_i2c_hw *dce112_i2c_hw_create(
uint32_t inst)
{
struct dce_i2c_hw *dce_i2c_hw =
- kzalloc_obj(struct dce_i2c_hw, GFP_KERNEL);
+ kzalloc_obj(struct dce_i2c_hw);
if (!dce_i2c_hw)
return NULL;
@@ -756,7 +756,7 @@ static struct clock_source *dce112_clock_source_create(
bool dp_clk_src)
{
struct dce110_clk_src *clk_src =
- kzalloc_obj(struct dce110_clk_src, GFP_KERNEL);
+ kzalloc_obj(struct dce110_clk_src);
if (!clk_src)
return NULL;
@@ -1423,7 +1423,7 @@ struct resource_pool *dce112_create_resource_pool(
struct dc *dc)
{
struct dce110_resource_pool *pool =
- kzalloc_obj(struct dce110_resource_pool, GFP_KERNEL);
+ kzalloc_obj(struct dce110_resource_pool);
if (!pool)
return NULL;
diff --git a/drivers/gpu/drm/amd/display/dc/resource/dce120/dce120_resource.c b/drivers/gpu/drm/amd/display/dc/resource/dce120/dce120_resource.c
index 48f8a418f324..c0c2f4da5cd2 100644
--- a/drivers/gpu/drm/amd/display/dc/resource/dce120/dce120_resource.c
+++ b/drivers/gpu/drm/amd/display/dc/resource/dce120/dce120_resource.c
@@ -428,7 +428,7 @@ static struct output_pixel_processor *dce120_opp_create(
uint32_t inst)
{
struct dce110_opp *opp =
- kzalloc_obj(struct dce110_opp, GFP_KERNEL);
+ kzalloc_obj(struct dce110_opp);
if (!opp)
return NULL;
@@ -442,7 +442,7 @@ static struct dce_aux *dce120_aux_engine_create(
uint32_t inst)
{
struct aux_engine_dce110 *aux_engine =
- kzalloc_obj(struct aux_engine_dce110, GFP_KERNEL);
+ kzalloc_obj(struct aux_engine_dce110);
if (!aux_engine)
return NULL;
@@ -480,7 +480,7 @@ static struct dce_i2c_hw *dce120_i2c_hw_create(
uint32_t inst)
{
struct dce_i2c_hw *dce_i2c_hw =
- kzalloc_obj(struct dce_i2c_hw, GFP_KERNEL);
+ kzalloc_obj(struct dce_i2c_hw);
if (!dce_i2c_hw)
return NULL;
@@ -541,7 +541,7 @@ static struct clock_source *dce120_clock_source_create(
const struct dce110_clk_src_regs *regs,
bool dp_clk_src)
{
- struct dce110_clk_src *clk_src = kzalloc_obj(*clk_src, GFP_KERNEL);
+ struct dce110_clk_src *clk_src = kzalloc_obj(*clk_src);
if (!clk_src)
return NULL;
@@ -582,7 +582,7 @@ static struct timing_generator *dce120_timing_generator_create(
const struct dce110_timing_generator_offsets *offsets)
{
struct dce110_timing_generator *tg110 =
- kzalloc_obj(struct dce110_timing_generator, GFP_KERNEL);
+ kzalloc_obj(struct dce110_timing_generator);
if (!tg110)
return NULL;
@@ -713,7 +713,7 @@ static struct link_encoder *dce120_link_encoder_create(
const struct encoder_init_data *enc_init_data)
{
struct dce110_link_encoder *enc110 =
- kzalloc_obj(struct dce110_link_encoder, GFP_KERNEL);
+ kzalloc_obj(struct dce110_link_encoder);
int link_regs_id;
if (!enc110 || enc_init_data->hpd_source >= ARRAY_SIZE(link_enc_hpd_regs))
@@ -735,7 +735,7 @@ static struct link_encoder *dce120_link_encoder_create(
static struct panel_cntl *dce120_panel_cntl_create(const struct panel_cntl_init_data *init_data)
{
struct dce_panel_cntl *panel_cntl =
- kzalloc_obj(struct dce_panel_cntl, GFP_KERNEL);
+ kzalloc_obj(struct dce_panel_cntl);
if (!panel_cntl)
return NULL;
@@ -752,7 +752,7 @@ static struct panel_cntl *dce120_panel_cntl_create(const struct panel_cntl_init_
static struct input_pixel_processor *dce120_ipp_create(
struct dc_context *ctx, uint32_t inst)
{
- struct dce_ipp *ipp = kzalloc_obj(struct dce_ipp, GFP_KERNEL);
+ struct dce_ipp *ipp = kzalloc_obj(struct dce_ipp);
if (!ipp) {
BREAK_TO_DEBUGGER();
@@ -769,7 +769,7 @@ static struct stream_encoder *dce120_stream_encoder_create(
struct dc_context *ctx)
{
struct dce110_stream_encoder *enc110 =
- kzalloc_obj(struct dce110_stream_encoder, GFP_KERNEL);
+ kzalloc_obj(struct dce110_stream_encoder);
if (!enc110)
return NULL;
@@ -812,7 +812,7 @@ static const struct dce_hwseq_mask dce121_hwseq_mask = {
static struct dce_hwseq *dce120_hwseq_create(
struct dc_context *ctx)
{
- struct dce_hwseq *hws = kzalloc_obj(struct dce_hwseq, GFP_KERNEL);
+ struct dce_hwseq *hws = kzalloc_obj(struct dce_hwseq);
if (hws) {
hws->ctx = ctx;
@@ -826,7 +826,7 @@ static struct dce_hwseq *dce120_hwseq_create(
static struct dce_hwseq *dce121_hwseq_create(
struct dc_context *ctx)
{
- struct dce_hwseq *hws = kzalloc_obj(struct dce_hwseq, GFP_KERNEL);
+ struct dce_hwseq *hws = kzalloc_obj(struct dce_hwseq);
if (hws) {
hws->ctx = ctx;
@@ -891,7 +891,7 @@ static struct transform *dce120_transform_create(
uint32_t inst)
{
struct dce_transform *transform =
- kzalloc_obj(struct dce_transform, GFP_KERNEL);
+ kzalloc_obj(struct dce_transform);
if (!transform)
return NULL;
@@ -1295,7 +1295,7 @@ struct resource_pool *dce120_create_resource_pool(
struct dc *dc)
{
struct dce110_resource_pool *pool =
- kzalloc_obj(struct dce110_resource_pool, GFP_KERNEL);
+ kzalloc_obj(struct dce110_resource_pool);
if (!pool)
return NULL;
diff --git a/drivers/gpu/drm/amd/display/dc/resource/dce60/dce60_resource.c b/drivers/gpu/drm/amd/display/dc/resource/dce60/dce60_resource.c
index 621739d0b024..31aa80943c16 100644
--- a/drivers/gpu/drm/amd/display/dc/resource/dce60/dce60_resource.c
+++ b/drivers/gpu/drm/amd/display/dc/resource/dce60/dce60_resource.c
@@ -507,7 +507,7 @@ static struct timing_generator *dce60_timing_generator_create(
const struct dce110_timing_generator_offsets *offsets)
{
struct dce110_timing_generator *tg110 =
- kzalloc_obj(struct dce110_timing_generator, GFP_KERNEL);
+ kzalloc_obj(struct dce110_timing_generator);
if (!tg110)
return NULL;
@@ -521,7 +521,7 @@ static struct output_pixel_processor *dce60_opp_create(
uint32_t inst)
{
struct dce110_opp *opp =
- kzalloc_obj(struct dce110_opp, GFP_KERNEL);
+ kzalloc_obj(struct dce110_opp);
if (!opp)
return NULL;
@@ -536,7 +536,7 @@ static struct dce_aux *dce60_aux_engine_create(
uint32_t inst)
{
struct aux_engine_dce110 *aux_engine =
- kzalloc_obj(struct aux_engine_dce110, GFP_KERNEL);
+ kzalloc_obj(struct aux_engine_dce110);
if (!aux_engine)
return NULL;
@@ -574,7 +574,7 @@ static struct dce_i2c_hw *dce60_i2c_hw_create(
uint32_t inst)
{
struct dce_i2c_hw *dce_i2c_hw =
- kzalloc_obj(struct dce_i2c_hw, GFP_KERNEL);
+ kzalloc_obj(struct dce_i2c_hw);
if (!dce_i2c_hw)
return NULL;
@@ -589,7 +589,7 @@ static struct dce_i2c_sw *dce60_i2c_sw_create(
struct dc_context *ctx)
{
struct dce_i2c_sw *dce_i2c_sw =
- kzalloc_obj(struct dce_i2c_sw, GFP_KERNEL);
+ kzalloc_obj(struct dce_i2c_sw);
if (!dce_i2c_sw)
return NULL;
@@ -603,7 +603,7 @@ static struct stream_encoder *dce60_stream_encoder_create(
struct dc_context *ctx)
{
struct dce110_stream_encoder *enc110 =
- kzalloc_obj(struct dce110_stream_encoder, GFP_KERNEL);
+ kzalloc_obj(struct dce110_stream_encoder);
if (!enc110)
return NULL;
@@ -638,7 +638,7 @@ static const struct dce_hwseq_mask hwseq_mask = {
static struct dce_hwseq *dce60_hwseq_create(
struct dc_context *ctx)
{
- struct dce_hwseq *hws = kzalloc_obj(struct dce_hwseq, GFP_KERNEL);
+ struct dce_hwseq *hws = kzalloc_obj(struct dce_hwseq);
if (hws) {
hws->ctx = ctx;
@@ -707,7 +707,7 @@ static struct transform *dce60_transform_create(
uint32_t inst)
{
struct dce_transform *transform =
- kzalloc_obj(struct dce_transform, GFP_KERNEL);
+ kzalloc_obj(struct dce_transform);
if (!transform)
return NULL;
@@ -730,7 +730,7 @@ static struct link_encoder *dce60_link_encoder_create(
const struct encoder_init_data *enc_init_data)
{
struct dce110_link_encoder *enc110 =
- kzalloc_obj(struct dce110_link_encoder, GFP_KERNEL);
+ kzalloc_obj(struct dce110_link_encoder);
int link_regs_id;
if (!enc110)
@@ -765,7 +765,7 @@ static struct link_encoder *dce60_link_encoder_create(
static struct panel_cntl *dce60_panel_cntl_create(const struct panel_cntl_init_data *init_data)
{
struct dce_panel_cntl *panel_cntl =
- kzalloc_obj(struct dce_panel_cntl, GFP_KERNEL);
+ kzalloc_obj(struct dce_panel_cntl);
if (!panel_cntl)
return NULL;
@@ -787,7 +787,7 @@ static struct clock_source *dce60_clock_source_create(
bool dp_clk_src)
{
struct dce110_clk_src *clk_src =
- kzalloc_obj(struct dce110_clk_src, GFP_KERNEL);
+ kzalloc_obj(struct dce110_clk_src);
if (!clk_src)
return NULL;
@@ -812,7 +812,7 @@ static void dce60_clock_source_destroy(struct clock_source **clk_src)
static struct input_pixel_processor *dce60_ipp_create(
struct dc_context *ctx, uint32_t inst)
{
- struct dce_ipp *ipp = kzalloc_obj(struct dce_ipp, GFP_KERNEL);
+ struct dce_ipp *ipp = kzalloc_obj(struct dce_ipp);
if (!ipp) {
BREAK_TO_DEBUGGER();
@@ -1098,7 +1098,7 @@ struct resource_pool *dce60_create_resource_pool(
struct dc *dc)
{
struct dce110_resource_pool *pool =
- kzalloc_obj(struct dce110_resource_pool, GFP_KERNEL);
+ kzalloc_obj(struct dce110_resource_pool);
if (!pool)
return NULL;
@@ -1296,7 +1296,7 @@ struct resource_pool *dce61_create_resource_pool(
struct dc *dc)
{
struct dce110_resource_pool *pool =
- kzalloc_obj(struct dce110_resource_pool, GFP_KERNEL);
+ kzalloc_obj(struct dce110_resource_pool);
if (!pool)
return NULL;
@@ -1493,7 +1493,7 @@ struct resource_pool *dce64_create_resource_pool(
struct dc *dc)
{
struct dce110_resource_pool *pool =
- kzalloc_obj(struct dce110_resource_pool, GFP_KERNEL);
+ kzalloc_obj(struct dce110_resource_pool);
if (!pool)
return NULL;
diff --git a/drivers/gpu/drm/amd/display/dc/resource/dce80/dce80_resource.c b/drivers/gpu/drm/amd/display/dc/resource/dce80/dce80_resource.c
index bef4a30caf7e..d1f781e61f1e 100644
--- a/drivers/gpu/drm/amd/display/dc/resource/dce80/dce80_resource.c
+++ b/drivers/gpu/drm/amd/display/dc/resource/dce80/dce80_resource.c
@@ -513,7 +513,7 @@ static struct timing_generator *dce80_timing_generator_create(
const struct dce110_timing_generator_offsets *offsets)
{
struct dce110_timing_generator *tg110 =
- kzalloc_obj(struct dce110_timing_generator, GFP_KERNEL);
+ kzalloc_obj(struct dce110_timing_generator);
if (!tg110)
return NULL;
@@ -527,7 +527,7 @@ static struct output_pixel_processor *dce80_opp_create(
uint32_t inst)
{
struct dce110_opp *opp =
- kzalloc_obj(struct dce110_opp, GFP_KERNEL);
+ kzalloc_obj(struct dce110_opp);
if (!opp)
return NULL;
@@ -542,7 +542,7 @@ static struct dce_aux *dce80_aux_engine_create(
uint32_t inst)
{
struct aux_engine_dce110 *aux_engine =
- kzalloc_obj(struct aux_engine_dce110, GFP_KERNEL);
+ kzalloc_obj(struct aux_engine_dce110);
if (!aux_engine)
return NULL;
@@ -580,7 +580,7 @@ static struct dce_i2c_hw *dce80_i2c_hw_create(
uint32_t inst)
{
struct dce_i2c_hw *dce_i2c_hw =
- kzalloc_obj(struct dce_i2c_hw, GFP_KERNEL);
+ kzalloc_obj(struct dce_i2c_hw);
if (!dce_i2c_hw)
return NULL;
@@ -595,7 +595,7 @@ static struct dce_i2c_sw *dce80_i2c_sw_create(
struct dc_context *ctx)
{
struct dce_i2c_sw *dce_i2c_sw =
- kzalloc_obj(struct dce_i2c_sw, GFP_KERNEL);
+ kzalloc_obj(struct dce_i2c_sw);
if (!dce_i2c_sw)
return NULL;
@@ -609,7 +609,7 @@ static struct stream_encoder *dce80_stream_encoder_create(
struct dc_context *ctx)
{
struct dce110_stream_encoder *enc110 =
- kzalloc_obj(struct dce110_stream_encoder, GFP_KERNEL);
+ kzalloc_obj(struct dce110_stream_encoder);
if (!enc110)
return NULL;
@@ -644,7 +644,7 @@ static const struct dce_hwseq_mask hwseq_mask = {
static struct dce_hwseq *dce80_hwseq_create(
struct dc_context *ctx)
{
- struct dce_hwseq *hws = kzalloc_obj(struct dce_hwseq, GFP_KERNEL);
+ struct dce_hwseq *hws = kzalloc_obj(struct dce_hwseq);
if (hws) {
hws->ctx = ctx;
@@ -713,7 +713,7 @@ static struct transform *dce80_transform_create(
uint32_t inst)
{
struct dce_transform *transform =
- kzalloc_obj(struct dce_transform, GFP_KERNEL);
+ kzalloc_obj(struct dce_transform);
if (!transform)
return NULL;
@@ -736,7 +736,7 @@ static struct link_encoder *dce80_link_encoder_create(
const struct encoder_init_data *enc_init_data)
{
struct dce110_link_encoder *enc110 =
- kzalloc_obj(struct dce110_link_encoder, GFP_KERNEL);
+ kzalloc_obj(struct dce110_link_encoder);
int link_regs_id;
if (!enc110)
@@ -771,7 +771,7 @@ static struct link_encoder *dce80_link_encoder_create(
static struct panel_cntl *dce80_panel_cntl_create(const struct panel_cntl_init_data *init_data)
{
struct dce_panel_cntl *panel_cntl =
- kzalloc_obj(struct dce_panel_cntl, GFP_KERNEL);
+ kzalloc_obj(struct dce_panel_cntl);
if (!panel_cntl)
return NULL;
@@ -793,7 +793,7 @@ static struct clock_source *dce80_clock_source_create(
bool dp_clk_src)
{
struct dce110_clk_src *clk_src =
- kzalloc_obj(struct dce110_clk_src, GFP_KERNEL);
+ kzalloc_obj(struct dce110_clk_src);
if (!clk_src)
return NULL;
@@ -818,7 +818,7 @@ static void dce80_clock_source_destroy(struct clock_source **clk_src)
static struct input_pixel_processor *dce80_ipp_create(
struct dc_context *ctx, uint32_t inst)
{
- struct dce_ipp *ipp = kzalloc_obj(struct dce_ipp, GFP_KERNEL);
+ struct dce_ipp *ipp = kzalloc_obj(struct dce_ipp);
if (!ipp) {
BREAK_TO_DEBUGGER();
@@ -1109,7 +1109,7 @@ struct resource_pool *dce80_create_resource_pool(
struct dc *dc)
{
struct dce110_resource_pool *pool =
- kzalloc_obj(struct dce110_resource_pool, GFP_KERNEL);
+ kzalloc_obj(struct dce110_resource_pool);
if (!pool)
return NULL;
@@ -1309,7 +1309,7 @@ struct resource_pool *dce81_create_resource_pool(
struct dc *dc)
{
struct dce110_resource_pool *pool =
- kzalloc_obj(struct dce110_resource_pool, GFP_KERNEL);
+ kzalloc_obj(struct dce110_resource_pool);
if (!pool)
return NULL;
@@ -1507,7 +1507,7 @@ struct resource_pool *dce83_create_resource_pool(
struct dc *dc)
{
struct dce110_resource_pool *pool =
- kzalloc_obj(struct dce110_resource_pool, GFP_KERNEL);
+ kzalloc_obj(struct dce110_resource_pool);
if (!pool)
return NULL;
diff --git a/drivers/gpu/drm/amd/display/dc/resource/dcn10/dcn10_resource.c b/drivers/gpu/drm/amd/display/dc/resource/dcn10/dcn10_resource.c
index 6c066576a5a5..3d1c8344c8bb 100644
--- a/drivers/gpu/drm/amd/display/dc/resource/dcn10/dcn10_resource.c
+++ b/drivers/gpu/drm/amd/display/dc/resource/dcn10/dcn10_resource.c
@@ -574,7 +574,7 @@ static struct dpp *dcn10_dpp_create(
uint32_t inst)
{
struct dcn10_dpp *dpp =
- kzalloc_obj(struct dcn10_dpp, GFP_KERNEL);
+ kzalloc_obj(struct dcn10_dpp);
if (!dpp)
return NULL;
@@ -588,7 +588,7 @@ static struct input_pixel_processor *dcn10_ipp_create(
struct dc_context *ctx, uint32_t inst)
{
struct dcn10_ipp *ipp =
- kzalloc_obj(struct dcn10_ipp, GFP_KERNEL);
+ kzalloc_obj(struct dcn10_ipp);
if (!ipp) {
BREAK_TO_DEBUGGER();
@@ -605,7 +605,7 @@ static struct output_pixel_processor *dcn10_opp_create(
struct dc_context *ctx, uint32_t inst)
{
struct dcn10_opp *opp =
- kzalloc_obj(struct dcn10_opp, GFP_KERNEL);
+ kzalloc_obj(struct dcn10_opp);
if (!opp) {
BREAK_TO_DEBUGGER();
@@ -621,7 +621,7 @@ static struct dce_aux *dcn10_aux_engine_create(struct dc_context *ctx,
uint32_t inst)
{
struct aux_engine_dce110 *aux_engine =
- kzalloc_obj(struct aux_engine_dce110, GFP_KERNEL);
+ kzalloc_obj(struct aux_engine_dce110);
if (!aux_engine)
return NULL;
@@ -658,7 +658,7 @@ static struct dce_i2c_hw *dcn10_i2c_hw_create(struct dc_context *ctx,
uint32_t inst)
{
struct dce_i2c_hw *dce_i2c_hw =
- kzalloc_obj(struct dce_i2c_hw, GFP_KERNEL);
+ kzalloc_obj(struct dce_i2c_hw);
if (!dce_i2c_hw)
return NULL;
@@ -670,7 +670,7 @@ static struct dce_i2c_hw *dcn10_i2c_hw_create(struct dc_context *ctx,
}
static struct mpc *dcn10_mpc_create(struct dc_context *ctx)
{
- struct dcn10_mpc *mpc10 = kzalloc_obj(struct dcn10_mpc, GFP_KERNEL);
+ struct dcn10_mpc *mpc10 = kzalloc_obj(struct dcn10_mpc);
if (!mpc10)
return NULL;
@@ -705,7 +705,7 @@ static struct timing_generator *dcn10_timing_generator_create(
uint32_t instance)
{
struct optc *tgn10 =
- kzalloc_obj(struct optc, GFP_KERNEL);
+ kzalloc_obj(struct optc);
if (!tgn10)
return NULL;
@@ -738,7 +738,7 @@ static struct link_encoder *dcn10_link_encoder_create(
const struct encoder_init_data *enc_init_data)
{
struct dcn10_link_encoder *enc10 =
- kzalloc_obj(struct dcn10_link_encoder, GFP_KERNEL);
+ kzalloc_obj(struct dcn10_link_encoder);
int link_regs_id;
if (!enc10 || enc_init_data->hpd_source >= ARRAY_SIZE(link_enc_hpd_regs))
@@ -762,7 +762,7 @@ static struct link_encoder *dcn10_link_encoder_create(
static struct panel_cntl *dcn10_panel_cntl_create(const struct panel_cntl_init_data *init_data)
{
struct dce_panel_cntl *panel_cntl =
- kzalloc_obj(struct dce_panel_cntl, GFP_KERNEL);
+ kzalloc_obj(struct dce_panel_cntl);
if (!panel_cntl)
return NULL;
@@ -784,7 +784,7 @@ static struct clock_source *dcn10_clock_source_create(
bool dp_clk_src)
{
struct dce110_clk_src *clk_src =
- kzalloc_obj(struct dce110_clk_src, GFP_KERNEL);
+ kzalloc_obj(struct dce110_clk_src);
if (!clk_src)
return NULL;
@@ -820,7 +820,7 @@ static struct stream_encoder *dcn10_stream_encoder_create(
struct dc_context *ctx)
{
struct dcn10_stream_encoder *enc1 =
- kzalloc_obj(struct dcn10_stream_encoder, GFP_KERNEL);
+ kzalloc_obj(struct dcn10_stream_encoder);
if (!enc1)
return NULL;
@@ -846,7 +846,7 @@ static const struct dce_hwseq_mask hwseq_mask = {
static struct dce_hwseq *dcn10_hwseq_create(
struct dc_context *ctx)
{
- struct dce_hwseq *hws = kzalloc_obj(struct dce_hwseq, GFP_KERNEL);
+ struct dce_hwseq *hws = kzalloc_obj(struct dce_hwseq);
if (hws) {
hws->ctx = ctx;
@@ -890,7 +890,7 @@ static void dcn10_clock_source_destroy(struct clock_source **clk_src)
static struct pp_smu_funcs *dcn10_pp_smu_create(struct dc_context *ctx)
{
- struct pp_smu_funcs *pp_smu = kzalloc_obj(*pp_smu, GFP_KERNEL);
+ struct pp_smu_funcs *pp_smu = kzalloc_obj(*pp_smu);
if (!pp_smu)
return pp_smu;
@@ -983,7 +983,7 @@ static struct hubp *dcn10_hubp_create(
uint32_t inst)
{
struct dcn10_hubp *hubp1 =
- kzalloc_obj(struct dcn10_hubp, GFP_KERNEL);
+ kzalloc_obj(struct dcn10_hubp);
if (!hubp1)
return NULL;
@@ -1680,7 +1680,7 @@ struct resource_pool *dcn10_create_resource_pool(
struct dc *dc)
{
struct dcn10_resource_pool *pool =
- kzalloc_obj(struct dcn10_resource_pool, GFP_KERNEL);
+ kzalloc_obj(struct dcn10_resource_pool);
if (!pool)
return NULL;
diff --git a/drivers/gpu/drm/amd/display/dc/resource/dcn20/dcn20_resource.c b/drivers/gpu/drm/amd/display/dc/resource/dcn20/dcn20_resource.c
index ba83a78f7fc1..9906ecdc51ea 100644
--- a/drivers/gpu/drm/amd/display/dc/resource/dcn20/dcn20_resource.c
+++ b/drivers/gpu/drm/amd/display/dc/resource/dcn20/dcn20_resource.c
@@ -736,7 +736,7 @@ struct dpp *dcn20_dpp_create(
uint32_t inst)
{
struct dcn20_dpp *dpp =
- kzalloc_obj(struct dcn20_dpp, GFP_KERNEL);
+ kzalloc_obj(struct dcn20_dpp);
if (!dpp)
return NULL;
@@ -754,7 +754,7 @@ struct input_pixel_processor *dcn20_ipp_create(
struct dc_context *ctx, uint32_t inst)
{
struct dcn10_ipp *ipp =
- kzalloc_obj(struct dcn10_ipp, GFP_KERNEL);
+ kzalloc_obj(struct dcn10_ipp);
if (!ipp) {
BREAK_TO_DEBUGGER();
@@ -771,7 +771,7 @@ struct output_pixel_processor *dcn20_opp_create(
struct dc_context *ctx, uint32_t inst)
{
struct dcn20_opp *opp =
- kzalloc_obj(struct dcn20_opp, GFP_KERNEL);
+ kzalloc_obj(struct dcn20_opp);
if (!opp) {
BREAK_TO_DEBUGGER();
@@ -788,7 +788,7 @@ struct dce_aux *dcn20_aux_engine_create(
uint32_t inst)
{
struct aux_engine_dce110 *aux_engine =
- kzalloc_obj(struct aux_engine_dce110, GFP_KERNEL);
+ kzalloc_obj(struct aux_engine_dce110);
if (!aux_engine)
return NULL;
@@ -826,7 +826,7 @@ struct dce_i2c_hw *dcn20_i2c_hw_create(
uint32_t inst)
{
struct dce_i2c_hw *dce_i2c_hw =
- kzalloc_obj(struct dce_i2c_hw, GFP_KERNEL);
+ kzalloc_obj(struct dce_i2c_hw);
if (!dce_i2c_hw)
return NULL;
@@ -838,7 +838,7 @@ struct dce_i2c_hw *dcn20_i2c_hw_create(
}
struct mpc *dcn20_mpc_create(struct dc_context *ctx)
{
- struct dcn20_mpc *mpc20 = kzalloc_obj(struct dcn20_mpc, GFP_KERNEL);
+ struct dcn20_mpc *mpc20 = kzalloc_obj(struct dcn20_mpc);
if (!mpc20)
return NULL;
@@ -884,7 +884,7 @@ struct timing_generator *dcn20_timing_generator_create(
uint32_t instance)
{
struct optc *tgn10 =
- kzalloc_obj(struct optc, GFP_KERNEL);
+ kzalloc_obj(struct optc);
if (!tgn10)
return NULL;
@@ -918,7 +918,7 @@ struct link_encoder *dcn20_link_encoder_create(
const struct encoder_init_data *enc_init_data)
{
struct dcn20_link_encoder *enc20 =
- kzalloc_obj(struct dcn20_link_encoder, GFP_KERNEL);
+ kzalloc_obj(struct dcn20_link_encoder);
int link_regs_id;
if (!enc20 || enc_init_data->hpd_source >= ARRAY_SIZE(link_enc_hpd_regs))
@@ -942,7 +942,7 @@ struct link_encoder *dcn20_link_encoder_create(
static struct panel_cntl *dcn20_panel_cntl_create(const struct panel_cntl_init_data *init_data)
{
struct dce_panel_cntl *panel_cntl =
- kzalloc_obj(struct dce_panel_cntl, GFP_KERNEL);
+ kzalloc_obj(struct dce_panel_cntl);
if (!panel_cntl)
return NULL;
@@ -964,7 +964,7 @@ static struct clock_source *dcn20_clock_source_create(
bool dp_clk_src)
{
struct dce110_clk_src *clk_src =
- kzalloc_obj(struct dce110_clk_src, GFP_KERNEL);
+ kzalloc_obj(struct dce110_clk_src);
if (!clk_src)
return NULL;
@@ -1000,7 +1000,7 @@ struct stream_encoder *dcn20_stream_encoder_create(
struct dc_context *ctx)
{
struct dcn10_stream_encoder *enc1 =
- kzalloc_obj(struct dcn10_stream_encoder, GFP_KERNEL);
+ kzalloc_obj(struct dcn10_stream_encoder);
if (!enc1)
return NULL;
@@ -1032,7 +1032,7 @@ static const struct dce_hwseq_mask hwseq_mask = {
struct dce_hwseq *dcn20_hwseq_create(
struct dc_context *ctx)
{
- struct dce_hwseq *hws = kzalloc_obj(struct dce_hwseq, GFP_KERNEL);
+ struct dce_hwseq *hws = kzalloc_obj(struct dce_hwseq);
if (hws) {
hws->ctx = ctx;
@@ -1063,7 +1063,7 @@ struct display_stream_compressor *dcn20_dsc_create(
struct dc_context *ctx, uint32_t inst)
{
struct dcn20_dsc *dsc =
- kzalloc_obj(struct dcn20_dsc, GFP_KERNEL);
+ kzalloc_obj(struct dcn20_dsc);
if (!dsc) {
BREAK_TO_DEBUGGER();
@@ -1200,7 +1200,7 @@ struct hubp *dcn20_hubp_create(
uint32_t inst)
{
struct dcn20_hubp *hubp2 =
- kzalloc_obj(struct dcn20_hubp, GFP_KERNEL);
+ kzalloc_obj(struct dcn20_hubp);
if (!hubp2)
return NULL;
@@ -2288,7 +2288,7 @@ bool dcn20_mmhubbub_create(struct dc_context *ctx, struct resource_pool *pool)
static struct pp_smu_funcs *dcn20_pp_smu_create(struct dc_context *ctx)
{
- struct pp_smu_funcs *pp_smu = kzalloc_obj(*pp_smu, GFP_KERNEL);
+ struct pp_smu_funcs *pp_smu = kzalloc_obj(*pp_smu);
if (!pp_smu)
return pp_smu;
@@ -2768,7 +2768,7 @@ struct resource_pool *dcn20_create_resource_pool(
struct dc *dc)
{
struct dcn20_resource_pool *pool =
- kzalloc_obj(struct dcn20_resource_pool, GFP_KERNEL);
+ kzalloc_obj(struct dcn20_resource_pool);
if (!pool)
return NULL;
diff --git a/drivers/gpu/drm/amd/display/dc/resource/dcn201/dcn201_resource.c b/drivers/gpu/drm/amd/display/dc/resource/dcn201/dcn201_resource.c
index 71629186eb30..86281ee78f8c 100644
--- a/drivers/gpu/drm/amd/display/dc/resource/dcn201/dcn201_resource.c
+++ b/drivers/gpu/drm/amd/display/dc/resource/dcn201/dcn201_resource.c
@@ -632,7 +632,7 @@ static struct dpp *dcn201_dpp_create(
uint32_t inst)
{
struct dcn201_dpp *dpp =
- kzalloc_obj(struct dcn201_dpp, GFP_KERNEL);
+ kzalloc_obj(struct dcn201_dpp);
if (!dpp)
return NULL;
@@ -649,7 +649,7 @@ static struct input_pixel_processor *dcn201_ipp_create(
struct dc_context *ctx, uint32_t inst)
{
struct dcn10_ipp *ipp =
- kzalloc_obj(struct dcn10_ipp, GFP_KERNEL);
+ kzalloc_obj(struct dcn10_ipp);
if (!ipp) {
return NULL;
@@ -665,7 +665,7 @@ static struct output_pixel_processor *dcn201_opp_create(
struct dc_context *ctx, uint32_t inst)
{
struct dcn201_opp *opp =
- kzalloc_obj(struct dcn201_opp, GFP_KERNEL);
+ kzalloc_obj(struct dcn201_opp);
if (!opp) {
return NULL;
@@ -680,7 +680,7 @@ static struct dce_aux *dcn201_aux_engine_create(struct dc_context *ctx,
uint32_t inst)
{
struct aux_engine_dce110 *aux_engine =
- kzalloc_obj(struct aux_engine_dce110, GFP_KERNEL);
+ kzalloc_obj(struct aux_engine_dce110);
if (!aux_engine)
return NULL;
@@ -713,7 +713,7 @@ static struct dce_i2c_hw *dcn201_i2c_hw_create(struct dc_context *ctx,
uint32_t inst)
{
struct dce_i2c_hw *dce_i2c_hw =
- kzalloc_obj(struct dce_i2c_hw, GFP_KERNEL);
+ kzalloc_obj(struct dce_i2c_hw);
if (!dce_i2c_hw)
return NULL;
@@ -726,7 +726,7 @@ static struct dce_i2c_hw *dcn201_i2c_hw_create(struct dc_context *ctx,
static struct mpc *dcn201_mpc_create(struct dc_context *ctx, uint32_t num_mpcc)
{
- struct dcn201_mpc *mpc201 = kzalloc_obj(struct dcn201_mpc, GFP_KERNEL);
+ struct dcn201_mpc *mpc201 = kzalloc_obj(struct dcn201_mpc);
if (!mpc201)
return NULL;
@@ -761,7 +761,7 @@ static struct timing_generator *dcn201_timing_generator_create(
uint32_t instance)
{
struct optc *tgn10 =
- kzalloc_obj(struct optc, GFP_KERNEL);
+ kzalloc_obj(struct optc);
if (!tgn10)
return NULL;
@@ -795,7 +795,7 @@ static struct link_encoder *dcn201_link_encoder_create(
const struct encoder_init_data *enc_init_data)
{
struct dcn20_link_encoder *enc20 =
- kzalloc_obj(struct dcn20_link_encoder, GFP_KERNEL);
+ kzalloc_obj(struct dcn20_link_encoder);
struct dcn10_link_encoder *enc10;
if (!enc20 || enc_init_data->hpd_source >= ARRAY_SIZE(link_enc_hpd_regs))
@@ -823,7 +823,7 @@ static struct clock_source *dcn201_clock_source_create(
bool dp_clk_src)
{
struct dce110_clk_src *clk_src =
- kzalloc_obj(struct dce110_clk_src, GFP_KERNEL);
+ kzalloc_obj(struct dce110_clk_src);
if (!clk_src)
return NULL;
@@ -858,7 +858,7 @@ static struct stream_encoder *dcn201_stream_encoder_create(
struct dc_context *ctx)
{
struct dcn10_stream_encoder *enc1 =
- kzalloc_obj(struct dcn10_stream_encoder, GFP_KERNEL);
+ kzalloc_obj(struct dcn10_stream_encoder);
if (!enc1)
return NULL;
@@ -885,7 +885,7 @@ static const struct dce_hwseq_mask hwseq_mask = {
static struct dce_hwseq *dcn201_hwseq_create(
struct dc_context *ctx)
{
- struct dce_hwseq *hws = kzalloc_obj(struct dce_hwseq, GFP_KERNEL);
+ struct dce_hwseq *hws = kzalloc_obj(struct dce_hwseq);
if (hws) {
hws->ctx = ctx;
@@ -985,7 +985,7 @@ static struct hubp *dcn201_hubp_create(
uint32_t inst)
{
struct dcn201_hubp *hubp201 =
- kzalloc_obj(struct dcn201_hubp, GFP_KERNEL);
+ kzalloc_obj(struct dcn201_hubp);
if (!hubp201)
return NULL;
@@ -1306,7 +1306,7 @@ struct resource_pool *dcn201_create_resource_pool(
struct dc *dc)
{
struct dcn201_resource_pool *pool =
- kzalloc_obj(struct dcn201_resource_pool, GFP_KERNEL);
+ kzalloc_obj(struct dcn201_resource_pool);
if (!pool)
return NULL;
diff --git a/drivers/gpu/drm/amd/display/dc/resource/dcn21/dcn21_resource.c b/drivers/gpu/drm/amd/display/dc/resource/dcn21/dcn21_resource.c
index 0e93bc342011..a1bee2257362 100644
--- a/drivers/gpu/drm/amd/display/dc/resource/dcn21/dcn21_resource.c
+++ b/drivers/gpu/drm/amd/display/dc/resource/dcn21/dcn21_resource.c
@@ -484,7 +484,7 @@ static struct input_pixel_processor *dcn21_ipp_create(
struct dc_context *ctx, uint32_t inst)
{
struct dcn10_ipp *ipp =
- kzalloc_obj(struct dcn10_ipp, GFP_KERNEL);
+ kzalloc_obj(struct dcn10_ipp);
if (!ipp) {
BREAK_TO_DEBUGGER();
@@ -501,7 +501,7 @@ static struct dpp *dcn21_dpp_create(
uint32_t inst)
{
struct dcn20_dpp *dpp =
- kzalloc_obj(struct dcn20_dpp, GFP_KERNEL);
+ kzalloc_obj(struct dcn20_dpp);
if (!dpp)
return NULL;
@@ -520,7 +520,7 @@ static struct dce_aux *dcn21_aux_engine_create(
uint32_t inst)
{
struct aux_engine_dce110 *aux_engine =
- kzalloc_obj(struct aux_engine_dce110, GFP_KERNEL);
+ kzalloc_obj(struct aux_engine_dce110);
if (!aux_engine)
return NULL;
@@ -557,7 +557,7 @@ static struct dce_i2c_hw *dcn21_i2c_hw_create(struct dc_context *ctx,
uint32_t inst)
{
struct dce_i2c_hw *dce_i2c_hw =
- kzalloc_obj(struct dce_i2c_hw, GFP_KERNEL);
+ kzalloc_obj(struct dce_i2c_hw);
if (!dce_i2c_hw)
return NULL;
@@ -960,7 +960,7 @@ static struct clock_source *dcn21_clock_source_create(
bool dp_clk_src)
{
struct dce110_clk_src *clk_src =
- kzalloc_obj(struct dce110_clk_src, GFP_KERNEL);
+ kzalloc_obj(struct dce110_clk_src);
if (!clk_src)
return NULL;
@@ -981,7 +981,7 @@ static struct hubp *dcn21_hubp_create(
uint32_t inst)
{
struct dcn21_hubp *hubp21 =
- kzalloc_obj(struct dcn21_hubp, GFP_KERNEL);
+ kzalloc_obj(struct dcn21_hubp);
if (!hubp21)
return NULL;
@@ -1028,7 +1028,7 @@ static struct output_pixel_processor *dcn21_opp_create(struct dc_context *ctx,
uint32_t inst)
{
struct dcn20_opp *opp =
- kzalloc_obj(struct dcn20_opp, GFP_KERNEL);
+ kzalloc_obj(struct dcn20_opp);
if (!opp) {
BREAK_TO_DEBUGGER();
@@ -1044,7 +1044,7 @@ static struct timing_generator *dcn21_timing_generator_create(struct dc_context
uint32_t instance)
{
struct optc *tgn10 =
- kzalloc_obj(struct optc, GFP_KERNEL);
+ kzalloc_obj(struct optc);
if (!tgn10)
return NULL;
@@ -1063,7 +1063,7 @@ static struct timing_generator *dcn21_timing_generator_create(struct dc_context
static struct mpc *dcn21_mpc_create(struct dc_context *ctx)
{
- struct dcn20_mpc *mpc20 = kzalloc_obj(struct dcn20_mpc, GFP_KERNEL);
+ struct dcn20_mpc *mpc20 = kzalloc_obj(struct dcn20_mpc);
if (!mpc20)
return NULL;
@@ -1091,7 +1091,7 @@ static struct display_stream_compressor *dcn21_dsc_create(struct dc_context *ctx
uint32_t inst)
{
struct dcn20_dsc *dsc =
- kzalloc_obj(struct dcn20_dsc, GFP_KERNEL);
+ kzalloc_obj(struct dcn20_dsc);
if (!dsc) {
BREAK_TO_DEBUGGER();
@@ -1104,7 +1104,7 @@ static struct display_stream_compressor *dcn21_dsc_create(struct dc_context *ctx
static struct pp_smu_funcs *dcn21_pp_smu_create(struct dc_context *ctx)
{
- struct pp_smu_funcs *pp_smu = kzalloc_obj(*pp_smu, GFP_KERNEL);
+ struct pp_smu_funcs *pp_smu = kzalloc_obj(*pp_smu);
if (!pp_smu)
return pp_smu;
@@ -1141,7 +1141,7 @@ static struct stream_encoder *dcn21_stream_encoder_create(enum engine_id eng_id,
struct dc_context *ctx)
{
struct dcn10_stream_encoder *enc1 =
- kzalloc_obj(struct dcn10_stream_encoder, GFP_KERNEL);
+ kzalloc_obj(struct dcn10_stream_encoder);
if (!enc1)
return NULL;
@@ -1168,7 +1168,7 @@ static const struct dce_hwseq_mask hwseq_mask = {
static struct dce_hwseq *dcn21_hwseq_create(
struct dc_context *ctx)
{
- struct dce_hwseq *hws = kzalloc_obj(struct dce_hwseq, GFP_KERNEL);
+ struct dce_hwseq *hws = kzalloc_obj(struct dce_hwseq);
if (hws) {
hws->ctx = ctx;
@@ -1295,7 +1295,7 @@ static struct link_encoder *dcn21_link_encoder_create(
const struct encoder_init_data *enc_init_data)
{
struct dcn21_link_encoder *enc21 =
- kzalloc_obj(struct dcn21_link_encoder, GFP_KERNEL);
+ kzalloc_obj(struct dcn21_link_encoder);
int link_regs_id;
if (!enc21 || enc_init_data->hpd_source >= ARRAY_SIZE(link_enc_hpd_regs))
@@ -1319,7 +1319,7 @@ static struct link_encoder *dcn21_link_encoder_create(
static struct panel_cntl *dcn21_panel_cntl_create(const struct panel_cntl_init_data *init_data)
{
struct dce_panel_cntl *panel_cntl =
- kzalloc_obj(struct dce_panel_cntl, GFP_KERNEL);
+ kzalloc_obj(struct dce_panel_cntl);
if (!panel_cntl)
return NULL;
@@ -1704,7 +1704,7 @@ struct resource_pool *dcn21_create_resource_pool(
struct dc *dc)
{
struct dcn21_resource_pool *pool =
- kzalloc_obj(struct dcn21_resource_pool, GFP_KERNEL);
+ kzalloc_obj(struct dcn21_resource_pool);
if (!pool)
return NULL;
diff --git a/drivers/gpu/drm/amd/display/dc/resource/dcn30/dcn30_resource.c b/drivers/gpu/drm/amd/display/dc/resource/dcn30/dcn30_resource.c
index 75aa4b6d7133..465a31eb94c3 100644
--- a/drivers/gpu/drm/amd/display/dc/resource/dcn30/dcn30_resource.c
+++ b/drivers/gpu/drm/amd/display/dc/resource/dcn30/dcn30_resource.c
@@ -753,7 +753,7 @@ static struct dpp *dcn30_dpp_create(
uint32_t inst)
{
struct dcn3_dpp *dpp =
- kzalloc_obj(struct dcn3_dpp, GFP_KERNEL);
+ kzalloc_obj(struct dcn3_dpp);
if (!dpp)
return NULL;
@@ -771,7 +771,7 @@ static struct output_pixel_processor *dcn30_opp_create(
struct dc_context *ctx, uint32_t inst)
{
struct dcn20_opp *opp =
- kzalloc_obj(struct dcn20_opp, GFP_KERNEL);
+ kzalloc_obj(struct dcn20_opp);
if (!opp) {
BREAK_TO_DEBUGGER();
@@ -788,7 +788,7 @@ static struct dce_aux *dcn30_aux_engine_create(
uint32_t inst)
{
struct aux_engine_dce110 *aux_engine =
- kzalloc_obj(struct aux_engine_dce110, GFP_KERNEL);
+ kzalloc_obj(struct aux_engine_dce110);
if (!aux_engine)
return NULL;
@@ -827,7 +827,7 @@ static struct dce_i2c_hw *dcn30_i2c_hw_create(
uint32_t inst)
{
struct dce_i2c_hw *dce_i2c_hw =
- kzalloc_obj(struct dce_i2c_hw, GFP_KERNEL);
+ kzalloc_obj(struct dce_i2c_hw);
if (!dce_i2c_hw)
return NULL;
@@ -843,7 +843,7 @@ static struct mpc *dcn30_mpc_create(
int num_mpcc,
int num_rmu)
{
- struct dcn30_mpc *mpc30 = kzalloc_obj(struct dcn30_mpc, GFP_KERNEL);
+ struct dcn30_mpc *mpc30 = kzalloc_obj(struct dcn30_mpc);
if (!mpc30)
return NULL;
@@ -892,7 +892,7 @@ static struct timing_generator *dcn30_timing_generator_create(
uint32_t instance)
{
struct optc *tgn10 =
- kzalloc_obj(struct optc, GFP_KERNEL);
+ kzalloc_obj(struct optc);
if (!tgn10)
return NULL;
@@ -926,7 +926,7 @@ static struct link_encoder *dcn30_link_encoder_create(
const struct encoder_init_data *enc_init_data)
{
struct dcn20_link_encoder *enc20 =
- kzalloc_obj(struct dcn20_link_encoder, GFP_KERNEL);
+ kzalloc_obj(struct dcn20_link_encoder);
if (!enc20 || enc_init_data->hpd_source >= ARRAY_SIZE(link_enc_hpd_regs))
return NULL;
@@ -946,7 +946,7 @@ static struct link_encoder *dcn30_link_encoder_create(
static struct panel_cntl *dcn30_panel_cntl_create(const struct panel_cntl_init_data *init_data)
{
struct dce_panel_cntl *panel_cntl =
- kzalloc_obj(struct dce_panel_cntl, GFP_KERNEL);
+ kzalloc_obj(struct dce_panel_cntl);
if (!panel_cntl)
return NULL;
@@ -980,7 +980,7 @@ static struct vpg *dcn30_vpg_create(
struct dc_context *ctx,
uint32_t inst)
{
- struct dcn30_vpg *vpg3 = kzalloc_obj(struct dcn30_vpg, GFP_KERNEL);
+ struct dcn30_vpg *vpg3 = kzalloc_obj(struct dcn30_vpg);
if (!vpg3)
return NULL;
@@ -997,7 +997,7 @@ static struct afmt *dcn30_afmt_create(
struct dc_context *ctx,
uint32_t inst)
{
- struct dcn30_afmt *afmt3 = kzalloc_obj(struct dcn30_afmt, GFP_KERNEL);
+ struct dcn30_afmt *afmt3 = kzalloc_obj(struct dcn30_afmt);
if (!afmt3)
return NULL;
@@ -1026,7 +1026,7 @@ static struct stream_encoder *dcn30_stream_encoder_create(enum engine_id eng_id,
} else
return NULL;
- enc1 = kzalloc_obj(struct dcn10_stream_encoder, GFP_KERNEL);
+ enc1 = kzalloc_obj(struct dcn10_stream_encoder);
vpg = dcn30_vpg_create(ctx, vpg_inst);
afmt = dcn30_afmt_create(ctx, afmt_inst);
@@ -1047,7 +1047,7 @@ static struct stream_encoder *dcn30_stream_encoder_create(enum engine_id eng_id,
static struct dce_hwseq *dcn30_hwseq_create(struct dc_context *ctx)
{
- struct dce_hwseq *hws = kzalloc_obj(struct dce_hwseq, GFP_KERNEL);
+ struct dce_hwseq *hws = kzalloc_obj(struct dce_hwseq);
if (hws) {
hws->ctx = ctx;
@@ -1200,7 +1200,7 @@ static struct hubp *dcn30_hubp_create(
uint32_t inst)
{
struct dcn20_hubp *hubp2 =
- kzalloc_obj(struct dcn20_hubp, GFP_KERNEL);
+ kzalloc_obj(struct dcn20_hubp);
if (!hubp2)
return NULL;
@@ -1268,7 +1268,7 @@ static struct display_stream_compressor *dcn30_dsc_create(
struct dc_context *ctx, uint32_t inst)
{
struct dcn20_dsc *dsc =
- kzalloc_obj(struct dcn20_dsc, GFP_KERNEL);
+ kzalloc_obj(struct dcn20_dsc);
if (!dsc) {
BREAK_TO_DEBUGGER();
@@ -1302,7 +1302,7 @@ static struct clock_source *dcn30_clock_source_create(
bool dp_clk_src)
{
struct dce110_clk_src *clk_src =
- kzalloc_obj(struct dce110_clk_src, GFP_KERNEL);
+ kzalloc_obj(struct dce110_clk_src);
if (!clk_src)
return NULL;
@@ -2622,7 +2622,7 @@ struct resource_pool *dcn30_create_resource_pool(
struct dc *dc)
{
struct dcn30_resource_pool *pool =
- kzalloc_obj(struct dcn30_resource_pool, GFP_KERNEL);
+ kzalloc_obj(struct dcn30_resource_pool);
if (!pool)
return NULL;
diff --git a/drivers/gpu/drm/amd/display/dc/resource/dcn301/dcn301_resource.c b/drivers/gpu/drm/amd/display/dc/resource/dcn301/dcn301_resource.c
index 6bced8def669..b08f5d3cb673 100644
--- a/drivers/gpu/drm/amd/display/dc/resource/dcn301/dcn301_resource.c
+++ b/drivers/gpu/drm/amd/display/dc/resource/dcn301/dcn301_resource.c
@@ -717,7 +717,7 @@ static void dcn301_dpp_destroy(struct dpp **dpp)
static struct dpp *dcn301_dpp_create(struct dc_context *ctx, uint32_t inst)
{
struct dcn3_dpp *dpp =
- kzalloc_obj(struct dcn3_dpp, GFP_KERNEL);
+ kzalloc_obj(struct dcn3_dpp);
if (!dpp)
return NULL;
@@ -734,7 +734,7 @@ static struct output_pixel_processor *dcn301_opp_create(struct dc_context *ctx,
uint32_t inst)
{
struct dcn20_opp *opp =
- kzalloc_obj(struct dcn20_opp, GFP_KERNEL);
+ kzalloc_obj(struct dcn20_opp);
if (!opp) {
BREAK_TO_DEBUGGER();
@@ -749,7 +749,7 @@ static struct output_pixel_processor *dcn301_opp_create(struct dc_context *ctx,
static struct dce_aux *dcn301_aux_engine_create(struct dc_context *ctx, uint32_t inst)
{
struct aux_engine_dce110 *aux_engine =
- kzalloc_obj(struct aux_engine_dce110, GFP_KERNEL);
+ kzalloc_obj(struct aux_engine_dce110);
if (!aux_engine)
return NULL;
@@ -783,7 +783,7 @@ static const struct dce_i2c_mask i2c_masks = {
static struct dce_i2c_hw *dcn301_i2c_hw_create(struct dc_context *ctx, uint32_t inst)
{
struct dce_i2c_hw *dce_i2c_hw =
- kzalloc_obj(struct dce_i2c_hw, GFP_KERNEL);
+ kzalloc_obj(struct dce_i2c_hw);
if (!dce_i2c_hw)
return NULL;
@@ -798,7 +798,7 @@ static struct mpc *dcn301_mpc_create(
int num_mpcc,
int num_rmu)
{
- struct dcn30_mpc *mpc30 = kzalloc_obj(struct dcn30_mpc, GFP_KERNEL);
+ struct dcn30_mpc *mpc30 = kzalloc_obj(struct dcn30_mpc);
if (!mpc30)
return NULL;
@@ -848,7 +848,7 @@ static struct timing_generator *dcn301_timing_generator_create(
struct dc_context *ctx, uint32_t instance)
{
struct optc *tgn10 =
- kzalloc_obj(struct optc, GFP_KERNEL);
+ kzalloc_obj(struct optc);
if (!tgn10)
return NULL;
@@ -882,7 +882,7 @@ static struct link_encoder *dcn301_link_encoder_create(
const struct encoder_init_data *enc_init_data)
{
struct dcn20_link_encoder *enc20 =
- kzalloc_obj(struct dcn20_link_encoder, GFP_KERNEL);
+ kzalloc_obj(struct dcn20_link_encoder);
if (!enc20 || enc_init_data->hpd_source >= ARRAY_SIZE(link_enc_hpd_regs))
return NULL;
@@ -902,7 +902,7 @@ static struct link_encoder *dcn301_link_encoder_create(
static struct panel_cntl *dcn301_panel_cntl_create(const struct panel_cntl_init_data *init_data)
{
struct dcn301_panel_cntl *panel_cntl =
- kzalloc_obj(struct dcn301_panel_cntl, GFP_KERNEL);
+ kzalloc_obj(struct dcn301_panel_cntl);
if (!panel_cntl)
return NULL;
@@ -951,7 +951,7 @@ static struct vpg *dcn301_vpg_create(
struct dc_context *ctx,
uint32_t inst)
{
- struct dcn30_vpg *vpg3 = kzalloc_obj(struct dcn30_vpg, GFP_KERNEL);
+ struct dcn30_vpg *vpg3 = kzalloc_obj(struct dcn30_vpg);
if (!vpg3)
return NULL;
@@ -968,7 +968,7 @@ static struct afmt *dcn301_afmt_create(
struct dc_context *ctx,
uint32_t inst)
{
- struct dcn30_afmt *afmt3 = kzalloc_obj(struct dcn30_afmt, GFP_KERNEL);
+ struct dcn30_afmt *afmt3 = kzalloc_obj(struct dcn30_afmt);
if (!afmt3)
return NULL;
@@ -997,7 +997,7 @@ static struct stream_encoder *dcn301_stream_encoder_create(enum engine_id eng_id
} else
return NULL;
- enc1 = kzalloc_obj(struct dcn10_stream_encoder, GFP_KERNEL);
+ enc1 = kzalloc_obj(struct dcn10_stream_encoder);
vpg = dcn301_vpg_create(ctx, vpg_inst);
afmt = dcn301_afmt_create(ctx, afmt_inst);
@@ -1018,7 +1018,7 @@ static struct stream_encoder *dcn301_stream_encoder_create(enum engine_id eng_id
static struct dce_hwseq *dcn301_hwseq_create(struct dc_context *ctx)
{
- struct dce_hwseq *hws = kzalloc_obj(struct dce_hwseq, GFP_KERNEL);
+ struct dce_hwseq *hws = kzalloc_obj(struct dce_hwseq);
if (hws) {
hws->ctx = ctx;
@@ -1160,7 +1160,7 @@ static void dcn301_destruct(struct dcn301_resource_pool *pool)
static struct hubp *dcn301_hubp_create(struct dc_context *ctx, uint32_t inst)
{
struct dcn20_hubp *hubp2 =
- kzalloc_obj(struct dcn20_hubp, GFP_KERNEL);
+ kzalloc_obj(struct dcn20_hubp);
if (!hubp2)
return NULL;
@@ -1228,7 +1228,7 @@ static struct display_stream_compressor *dcn301_dsc_create(
struct dc_context *ctx, uint32_t inst)
{
struct dcn20_dsc *dsc =
- kzalloc_obj(struct dcn20_dsc, GFP_KERNEL);
+ kzalloc_obj(struct dcn20_dsc);
if (!dsc) {
BREAK_TO_DEBUGGER();
@@ -1257,7 +1257,7 @@ static struct clock_source *dcn301_clock_source_create(
bool dp_clk_src)
{
struct dce110_clk_src *clk_src =
- kzalloc_obj(struct dce110_clk_src, GFP_KERNEL);
+ kzalloc_obj(struct dce110_clk_src);
if (!clk_src)
return NULL;
@@ -1727,7 +1727,7 @@ struct resource_pool *dcn301_create_resource_pool(
struct dc *dc)
{
struct dcn301_resource_pool *pool =
- kzalloc_obj(struct dcn301_resource_pool, GFP_KERNEL);
+ kzalloc_obj(struct dcn301_resource_pool);
if (!pool)
return NULL;
diff --git a/drivers/gpu/drm/amd/display/dc/resource/dcn302/dcn302_resource.c b/drivers/gpu/drm/amd/display/dc/resource/dcn302/dcn302_resource.c
index 1dba37343c0f..c69a7f962a42 100644
--- a/drivers/gpu/drm/amd/display/dc/resource/dcn302/dcn302_resource.c
+++ b/drivers/gpu/drm/amd/display/dc/resource/dcn302/dcn302_resource.c
@@ -300,7 +300,7 @@ static const struct dcn30_vpg_mask vpg_mask = {
static struct vpg *dcn302_vpg_create(struct dc_context *ctx, uint32_t inst)
{
- struct dcn30_vpg *vpg3 = kzalloc_obj(struct dcn30_vpg, GFP_KERNEL);
+ struct dcn30_vpg *vpg3 = kzalloc_obj(struct dcn30_vpg);
if (!vpg3)
return NULL;
@@ -332,7 +332,7 @@ static const struct dcn30_afmt_mask afmt_mask = {
static struct afmt *dcn302_afmt_create(struct dc_context *ctx, uint32_t inst)
{
- struct dcn30_afmt *afmt3 = kzalloc_obj(struct dcn30_afmt, GFP_KERNEL);
+ struct dcn30_afmt *afmt3 = kzalloc_obj(struct dcn30_afmt);
if (!afmt3)
return NULL;
@@ -407,7 +407,7 @@ static struct stream_encoder *dcn302_stream_encoder_create(enum engine_id eng_id
} else
return NULL;
- enc1 = kzalloc_obj(struct dcn10_stream_encoder, GFP_KERNEL);
+ enc1 = kzalloc_obj(struct dcn10_stream_encoder);
vpg = dcn302_vpg_create(ctx, vpg_inst);
afmt = dcn302_afmt_create(ctx, afmt_inst);
@@ -476,7 +476,7 @@ static const struct dce_hwseq_mask hwseq_mask = {
static struct dce_hwseq *dcn302_hwseq_create(struct dc_context *ctx)
{
- struct dce_hwseq *hws = kzalloc_obj(struct dce_hwseq, GFP_KERNEL);
+ struct dce_hwseq *hws = kzalloc_obj(struct dce_hwseq);
if (hws) {
hws->ctx = ctx;
@@ -508,7 +508,7 @@ static const struct dcn_hubp2_mask hubp_mask = {
static struct hubp *dcn302_hubp_create(struct dc_context *ctx, uint32_t inst)
{
- struct dcn20_hubp *hubp2 = kzalloc_obj(struct dcn20_hubp, GFP_KERNEL);
+ struct dcn20_hubp *hubp2 = kzalloc_obj(struct dcn20_hubp);
if (!hubp2)
return NULL;
@@ -542,7 +542,7 @@ static const struct dcn3_dpp_mask tf_mask = {
static struct dpp *dcn302_dpp_create(struct dc_context *ctx, uint32_t inst)
{
- struct dcn3_dpp *dpp = kzalloc_obj(struct dcn3_dpp, GFP_KERNEL);
+ struct dcn3_dpp *dpp = kzalloc_obj(struct dcn3_dpp);
if (!dpp)
return NULL;
@@ -576,7 +576,7 @@ static const struct dcn20_opp_mask opp_mask = {
static struct output_pixel_processor *dcn302_opp_create(struct dc_context *ctx, uint32_t inst)
{
- struct dcn20_opp *opp = kzalloc_obj(struct dcn20_opp, GFP_KERNEL);
+ struct dcn20_opp *opp = kzalloc_obj(struct dcn20_opp);
if (!opp) {
BREAK_TO_DEBUGGER();
@@ -608,7 +608,7 @@ static const struct dcn_optc_mask optc_mask = {
static struct timing_generator *dcn302_timing_generator_create(struct dc_context *ctx, uint32_t instance)
{
- struct optc *tgn10 = kzalloc_obj(struct optc, GFP_KERNEL);
+ struct optc *tgn10 = kzalloc_obj(struct optc);
if (!tgn10)
return NULL;
@@ -653,7 +653,7 @@ static const struct dcn30_mpc_mask mpc_mask = {
static struct mpc *dcn302_mpc_create(struct dc_context *ctx, int num_mpcc, int num_rmu)
{
- struct dcn30_mpc *mpc30 = kzalloc_obj(struct dcn30_mpc, GFP_KERNEL);
+ struct dcn30_mpc *mpc30 = kzalloc_obj(struct dcn30_mpc);
if (!mpc30)
return NULL;
@@ -684,7 +684,7 @@ static const struct dcn20_dsc_mask dsc_mask = {
static struct display_stream_compressor *dcn302_dsc_create(struct dc_context *ctx, uint32_t inst)
{
- struct dcn20_dsc *dsc = kzalloc_obj(struct dcn20_dsc, GFP_KERNEL);
+ struct dcn20_dsc *dsc = kzalloc_obj(struct dcn20_dsc);
if (!dsc) {
BREAK_TO_DEBUGGER();
diff --git a/drivers/gpu/drm/amd/display/dc/resource/dcn303/dcn303_resource.c b/drivers/gpu/drm/amd/display/dc/resource/dcn303/dcn303_resource.c
index 2f81c0b51d1a..e4e179212d57 100644
--- a/drivers/gpu/drm/amd/display/dc/resource/dcn303/dcn303_resource.c
+++ b/drivers/gpu/drm/amd/display/dc/resource/dcn303/dcn303_resource.c
@@ -293,7 +293,7 @@ static const struct dcn30_vpg_mask vpg_mask = {
static struct vpg *dcn303_vpg_create(struct dc_context *ctx, uint32_t inst)
{
- struct dcn30_vpg *vpg3 = kzalloc_obj(struct dcn30_vpg, GFP_KERNEL);
+ struct dcn30_vpg *vpg3 = kzalloc_obj(struct dcn30_vpg);
if (!vpg3)
return NULL;
@@ -322,7 +322,7 @@ static const struct dcn30_afmt_mask afmt_mask = {
static struct afmt *dcn303_afmt_create(struct dc_context *ctx, uint32_t inst)
{
- struct dcn30_afmt *afmt3 = kzalloc_obj(struct dcn30_afmt, GFP_KERNEL);
+ struct dcn30_afmt *afmt3 = kzalloc_obj(struct dcn30_afmt);
if (!afmt3)
return NULL;
@@ -394,7 +394,7 @@ static struct stream_encoder *dcn303_stream_encoder_create(enum engine_id eng_id
} else
return NULL;
- enc1 = kzalloc_obj(struct dcn10_stream_encoder, GFP_KERNEL);
+ enc1 = kzalloc_obj(struct dcn10_stream_encoder);
vpg = dcn303_vpg_create(ctx, vpg_inst);
afmt = dcn303_afmt_create(ctx, afmt_inst);
@@ -460,7 +460,7 @@ static const struct dce_hwseq_mask hwseq_mask = {
static struct dce_hwseq *dcn303_hwseq_create(struct dc_context *ctx)
{
- struct dce_hwseq *hws = kzalloc_obj(struct dce_hwseq, GFP_KERNEL);
+ struct dce_hwseq *hws = kzalloc_obj(struct dce_hwseq);
if (hws) {
hws->ctx = ctx;
@@ -489,7 +489,7 @@ static const struct dcn_hubp2_mask hubp_mask = {
static struct hubp *dcn303_hubp_create(struct dc_context *ctx, uint32_t inst)
{
- struct dcn20_hubp *hubp2 = kzalloc_obj(struct dcn20_hubp, GFP_KERNEL);
+ struct dcn20_hubp *hubp2 = kzalloc_obj(struct dcn20_hubp);
if (!hubp2)
return NULL;
@@ -520,7 +520,7 @@ static const struct dcn3_dpp_mask tf_mask = {
static struct dpp *dcn303_dpp_create(struct dc_context *ctx, uint32_t inst)
{
- struct dcn3_dpp *dpp = kzalloc_obj(struct dcn3_dpp, GFP_KERNEL);
+ struct dcn3_dpp *dpp = kzalloc_obj(struct dcn3_dpp);
if (!dpp)
return NULL;
@@ -551,7 +551,7 @@ static const struct dcn20_opp_mask opp_mask = {
static struct output_pixel_processor *dcn303_opp_create(struct dc_context *ctx, uint32_t inst)
{
- struct dcn20_opp *opp = kzalloc_obj(struct dcn20_opp, GFP_KERNEL);
+ struct dcn20_opp *opp = kzalloc_obj(struct dcn20_opp);
if (!opp) {
BREAK_TO_DEBUGGER();
@@ -580,7 +580,7 @@ static const struct dcn_optc_mask optc_mask = {
static struct timing_generator *dcn303_timing_generator_create(struct dc_context *ctx, uint32_t instance)
{
- struct optc *tgn10 = kzalloc_obj(struct optc, GFP_KERNEL);
+ struct optc *tgn10 = kzalloc_obj(struct optc);
if (!tgn10)
return NULL;
@@ -617,7 +617,7 @@ static const struct dcn30_mpc_mask mpc_mask = {
static struct mpc *dcn303_mpc_create(struct dc_context *ctx, int num_mpcc, int num_rmu)
{
- struct dcn30_mpc *mpc30 = kzalloc_obj(struct dcn30_mpc, GFP_KERNEL);
+ struct dcn30_mpc *mpc30 = kzalloc_obj(struct dcn30_mpc);
if (!mpc30)
return NULL;
@@ -645,7 +645,7 @@ static const struct dcn20_dsc_mask dsc_mask = {
static struct display_stream_compressor *dcn303_dsc_create(struct dc_context *ctx, uint32_t inst)
{
- struct dcn20_dsc *dsc = kzalloc_obj(struct dcn20_dsc, GFP_KERNEL);
+ struct dcn20_dsc *dsc = kzalloc_obj(struct dcn20_dsc);
if (!dsc) {
BREAK_TO_DEBUGGER();
diff --git a/drivers/gpu/drm/amd/display/dc/resource/dcn31/dcn31_resource.c b/drivers/gpu/drm/amd/display/dc/resource/dcn31/dcn31_resource.c
index 4fb54637f41e..b1b598dd97f2 100644
--- a/drivers/gpu/drm/amd/display/dc/resource/dcn31/dcn31_resource.c
+++ b/drivers/gpu/drm/amd/display/dc/resource/dcn31/dcn31_resource.c
@@ -919,7 +919,7 @@ static struct dpp *dcn31_dpp_create(
uint32_t inst)
{
struct dcn3_dpp *dpp =
- kzalloc_obj(struct dcn3_dpp, GFP_KERNEL);
+ kzalloc_obj(struct dcn3_dpp);
if (!dpp)
return NULL;
@@ -937,7 +937,7 @@ static struct output_pixel_processor *dcn31_opp_create(
struct dc_context *ctx, uint32_t inst)
{
struct dcn20_opp *opp =
- kzalloc_obj(struct dcn20_opp, GFP_KERNEL);
+ kzalloc_obj(struct dcn20_opp);
if (!opp) {
BREAK_TO_DEBUGGER();
@@ -954,7 +954,7 @@ static struct dce_aux *dcn31_aux_engine_create(
uint32_t inst)
{
struct aux_engine_dce110 *aux_engine =
- kzalloc_obj(struct aux_engine_dce110, GFP_KERNEL);
+ kzalloc_obj(struct aux_engine_dce110);
if (!aux_engine)
return NULL;
@@ -991,7 +991,7 @@ static struct dce_i2c_hw *dcn31_i2c_hw_create(
uint32_t inst)
{
struct dce_i2c_hw *dce_i2c_hw =
- kzalloc_obj(struct dce_i2c_hw, GFP_KERNEL);
+ kzalloc_obj(struct dce_i2c_hw);
if (!dce_i2c_hw)
return NULL;
@@ -1006,7 +1006,7 @@ static struct mpc *dcn31_mpc_create(
int num_mpcc,
int num_rmu)
{
- struct dcn30_mpc *mpc30 = kzalloc_obj(struct dcn30_mpc, GFP_KERNEL);
+ struct dcn30_mpc *mpc30 = kzalloc_obj(struct dcn30_mpc);
if (!mpc30)
return NULL;
@@ -1058,7 +1058,7 @@ static struct timing_generator *dcn31_timing_generator_create(
uint32_t instance)
{
struct optc *tgn10 =
- kzalloc_obj(struct optc, GFP_KERNEL);
+ kzalloc_obj(struct optc);
if (!tgn10)
return NULL;
@@ -1092,7 +1092,7 @@ static struct link_encoder *dcn31_link_encoder_create(
const struct encoder_init_data *enc_init_data)
{
struct dcn20_link_encoder *enc20 =
- kzalloc_obj(struct dcn20_link_encoder, GFP_KERNEL);
+ kzalloc_obj(struct dcn20_link_encoder);
if (!enc20 || enc_init_data->hpd_source >= ARRAY_SIZE(link_enc_hpd_regs))
return NULL;
@@ -1121,7 +1121,7 @@ static struct link_encoder *dcn31_link_enc_create_minimal(
if ((eng_id - ENGINE_ID_DIGA) > ctx->dc->res_pool->res_cap->num_dig_link_enc)
return NULL;
- enc20 = kzalloc_obj(struct dcn20_link_encoder, GFP_KERNEL);
+ enc20 = kzalloc_obj(struct dcn20_link_encoder);
if (!enc20)
return NULL;
@@ -1138,7 +1138,7 @@ static struct link_encoder *dcn31_link_enc_create_minimal(
static struct panel_cntl *dcn31_panel_cntl_create(const struct panel_cntl_init_data *init_data)
{
struct dcn31_panel_cntl *panel_cntl =
- kzalloc_obj(struct dcn31_panel_cntl, GFP_KERNEL);
+ kzalloc_obj(struct dcn31_panel_cntl);
if (!panel_cntl)
return NULL;
@@ -1168,7 +1168,7 @@ static struct vpg *dcn31_vpg_create(
struct dc_context *ctx,
uint32_t inst)
{
- struct dcn31_vpg *vpg31 = kzalloc_obj(struct dcn31_vpg, GFP_KERNEL);
+ struct dcn31_vpg *vpg31 = kzalloc_obj(struct dcn31_vpg);
if (!vpg31)
return NULL;
@@ -1185,7 +1185,7 @@ static struct afmt *dcn31_afmt_create(
struct dc_context *ctx,
uint32_t inst)
{
- struct dcn31_afmt *afmt31 = kzalloc_obj(struct dcn31_afmt, GFP_KERNEL);
+ struct dcn31_afmt *afmt31 = kzalloc_obj(struct dcn31_afmt);
if (!afmt31)
return NULL;
@@ -1204,7 +1204,7 @@ static struct apg *dcn31_apg_create(
struct dc_context *ctx,
uint32_t inst)
{
- struct dcn31_apg *apg31 = kzalloc_obj(struct dcn31_apg, GFP_KERNEL);
+ struct dcn31_apg *apg31 = kzalloc_obj(struct dcn31_apg);
if (!apg31)
return NULL;
@@ -1234,7 +1234,7 @@ static struct stream_encoder *dcn31_stream_encoder_create(
} else
return NULL;
- enc1 = kzalloc_obj(struct dcn10_stream_encoder, GFP_KERNEL);
+ enc1 = kzalloc_obj(struct dcn10_stream_encoder);
vpg = dcn31_vpg_create(ctx, vpg_inst);
afmt = dcn31_afmt_create(ctx, afmt_inst);
@@ -1311,7 +1311,7 @@ static struct hpo_dp_link_encoder *dcn31_hpo_dp_link_encoder_create(
struct dcn31_hpo_dp_link_encoder *hpo_dp_enc31;
/* allocate HPO link encoder */
- hpo_dp_enc31 = kzalloc_obj(struct dcn31_hpo_dp_link_encoder, GFP_KERNEL);
+ hpo_dp_enc31 = kzalloc_obj(struct dcn31_hpo_dp_link_encoder);
if (!hpo_dp_enc31)
return NULL; /* out of memory */
@@ -1325,7 +1325,7 @@ static struct hpo_dp_link_encoder *dcn31_hpo_dp_link_encoder_create(
static struct dce_hwseq *dcn31_hwseq_create(
struct dc_context *ctx)
{
- struct dce_hwseq *hws = kzalloc_obj(struct dce_hwseq, GFP_KERNEL);
+ struct dce_hwseq *hws = kzalloc_obj(struct dce_hwseq);
if (hws) {
hws->ctx = ctx;
@@ -1499,7 +1499,7 @@ static struct hubp *dcn31_hubp_create(
uint32_t inst)
{
struct dcn20_hubp *hubp2 =
- kzalloc_obj(struct dcn20_hubp, GFP_KERNEL);
+ kzalloc_obj(struct dcn20_hubp);
if (!hubp2)
return NULL;
@@ -1567,7 +1567,7 @@ static struct display_stream_compressor *dcn31_dsc_create(
struct dc_context *ctx, uint32_t inst)
{
struct dcn20_dsc *dsc =
- kzalloc_obj(struct dcn20_dsc, GFP_KERNEL);
+ kzalloc_obj(struct dcn20_dsc);
if (!dsc) {
BREAK_TO_DEBUGGER();
@@ -1595,7 +1595,7 @@ static struct clock_source *dcn31_clock_source_create(
bool dp_clk_src)
{
struct dce110_clk_src *clk_src =
- kzalloc_obj(struct dce110_clk_src, GFP_KERNEL);
+ kzalloc_obj(struct dce110_clk_src);
if (!clk_src)
return NULL;
@@ -1867,7 +1867,7 @@ static struct clock_source *dcn30_clock_source_create(
bool dp_clk_src)
{
struct dce110_clk_src *clk_src =
- kzalloc_obj(struct dce110_clk_src, GFP_KERNEL);
+ kzalloc_obj(struct dce110_clk_src);
if (!clk_src)
return NULL;
@@ -2228,7 +2228,7 @@ struct resource_pool *dcn31_create_resource_pool(
struct dc *dc)
{
struct dcn31_resource_pool *pool =
- kzalloc_obj(struct dcn31_resource_pool, GFP_KERNEL);
+ kzalloc_obj(struct dcn31_resource_pool);
if (!pool)
return NULL;
diff --git a/drivers/gpu/drm/amd/display/dc/resource/dcn314/dcn314_resource.c b/drivers/gpu/drm/amd/display/dc/resource/dcn314/dcn314_resource.c
index 8c451d2a040a..d3b8de5c9b32 100644
--- a/drivers/gpu/drm/amd/display/dc/resource/dcn314/dcn314_resource.c
+++ b/drivers/gpu/drm/amd/display/dc/resource/dcn314/dcn314_resource.c
@@ -955,7 +955,7 @@ static struct dpp *dcn31_dpp_create(
uint32_t inst)
{
struct dcn3_dpp *dpp =
- kzalloc_obj(struct dcn3_dpp, GFP_KERNEL);
+ kzalloc_obj(struct dcn3_dpp);
if (!dpp)
return NULL;
@@ -973,7 +973,7 @@ static struct output_pixel_processor *dcn31_opp_create(
struct dc_context *ctx, uint32_t inst)
{
struct dcn20_opp *opp =
- kzalloc_obj(struct dcn20_opp, GFP_KERNEL);
+ kzalloc_obj(struct dcn20_opp);
if (!opp) {
BREAK_TO_DEBUGGER();
@@ -990,7 +990,7 @@ static struct dce_aux *dcn31_aux_engine_create(
uint32_t inst)
{
struct aux_engine_dce110 *aux_engine =
- kzalloc_obj(struct aux_engine_dce110, GFP_KERNEL);
+ kzalloc_obj(struct aux_engine_dce110);
if (!aux_engine)
return NULL;
@@ -1049,7 +1049,7 @@ static struct dce_i2c_hw *dcn31_i2c_hw_create(
uint32_t inst)
{
struct dce_i2c_hw *dce_i2c_hw =
- kzalloc_obj(struct dce_i2c_hw, GFP_KERNEL);
+ kzalloc_obj(struct dce_i2c_hw);
if (!dce_i2c_hw)
return NULL;
@@ -1064,7 +1064,7 @@ static struct mpc *dcn31_mpc_create(
int num_mpcc,
int num_rmu)
{
- struct dcn30_mpc *mpc30 = kzalloc_obj(struct dcn30_mpc, GFP_KERNEL);
+ struct dcn30_mpc *mpc30 = kzalloc_obj(struct dcn30_mpc);
if (!mpc30)
return NULL;
@@ -1116,7 +1116,7 @@ static struct timing_generator *dcn31_timing_generator_create(
uint32_t instance)
{
struct optc *tgn10 =
- kzalloc_obj(struct optc, GFP_KERNEL);
+ kzalloc_obj(struct optc);
if (!tgn10)
return NULL;
@@ -1150,7 +1150,7 @@ static struct link_encoder *dcn31_link_encoder_create(
const struct encoder_init_data *enc_init_data)
{
struct dcn20_link_encoder *enc20 =
- kzalloc_obj(struct dcn20_link_encoder, GFP_KERNEL);
+ kzalloc_obj(struct dcn20_link_encoder);
if (!enc20 || enc_init_data->hpd_source >= ARRAY_SIZE(link_enc_hpd_regs))
return NULL;
@@ -1179,7 +1179,7 @@ static struct link_encoder *dcn31_link_enc_create_minimal(
if ((eng_id - ENGINE_ID_DIGA) > ctx->dc->res_pool->res_cap->num_dig_link_enc)
return NULL;
- enc20 = kzalloc_obj(struct dcn20_link_encoder, GFP_KERNEL);
+ enc20 = kzalloc_obj(struct dcn20_link_encoder);
if (!enc20)
return NULL;
@@ -1196,7 +1196,7 @@ static struct link_encoder *dcn31_link_enc_create_minimal(
static struct panel_cntl *dcn31_panel_cntl_create(const struct panel_cntl_init_data *init_data)
{
struct dcn31_panel_cntl *panel_cntl =
- kzalloc_obj(struct dcn31_panel_cntl, GFP_KERNEL);
+ kzalloc_obj(struct dcn31_panel_cntl);
if (!panel_cntl)
return NULL;
@@ -1226,7 +1226,7 @@ static struct vpg *dcn31_vpg_create(
struct dc_context *ctx,
uint32_t inst)
{
- struct dcn31_vpg *vpg31 = kzalloc_obj(struct dcn31_vpg, GFP_KERNEL);
+ struct dcn31_vpg *vpg31 = kzalloc_obj(struct dcn31_vpg);
if (!vpg31)
return NULL;
@@ -1243,7 +1243,7 @@ static struct afmt *dcn31_afmt_create(
struct dc_context *ctx,
uint32_t inst)
{
- struct dcn31_afmt *afmt31 = kzalloc_obj(struct dcn31_afmt, GFP_KERNEL);
+ struct dcn31_afmt *afmt31 = kzalloc_obj(struct dcn31_afmt);
if (!afmt31)
return NULL;
@@ -1262,7 +1262,7 @@ static struct apg *dcn31_apg_create(
struct dc_context *ctx,
uint32_t inst)
{
- struct dcn31_apg *apg31 = kzalloc_obj(struct dcn31_apg, GFP_KERNEL);
+ struct dcn31_apg *apg31 = kzalloc_obj(struct dcn31_apg);
if (!apg31)
return NULL;
@@ -1292,7 +1292,7 @@ static struct stream_encoder *dcn314_stream_encoder_create(
} else
return NULL;
- enc1 = kzalloc_obj(struct dcn10_stream_encoder, GFP_KERNEL);
+ enc1 = kzalloc_obj(struct dcn10_stream_encoder);
vpg = dcn31_vpg_create(ctx, vpg_inst);
afmt = dcn31_afmt_create(ctx, afmt_inst);
@@ -1370,7 +1370,7 @@ static struct hpo_dp_link_encoder *dcn31_hpo_dp_link_encoder_create(
struct dcn31_hpo_dp_link_encoder *hpo_dp_enc31;
/* allocate HPO link encoder */
- hpo_dp_enc31 = kzalloc_obj(struct dcn31_hpo_dp_link_encoder, GFP_KERNEL);
+ hpo_dp_enc31 = kzalloc_obj(struct dcn31_hpo_dp_link_encoder);
if (!hpo_dp_enc31)
return NULL; /* out of memory */
@@ -1384,7 +1384,7 @@ static struct hpo_dp_link_encoder *dcn31_hpo_dp_link_encoder_create(
static struct dce_hwseq *dcn314_hwseq_create(
struct dc_context *ctx)
{
- struct dce_hwseq *hws = kzalloc_obj(struct dce_hwseq, GFP_KERNEL);
+ struct dce_hwseq *hws = kzalloc_obj(struct dce_hwseq);
if (hws) {
hws->ctx = ctx;
@@ -1557,7 +1557,7 @@ static struct hubp *dcn31_hubp_create(
uint32_t inst)
{
struct dcn20_hubp *hubp2 =
- kzalloc_obj(struct dcn20_hubp, GFP_KERNEL);
+ kzalloc_obj(struct dcn20_hubp);
if (!hubp2)
return NULL;
@@ -1625,7 +1625,7 @@ static struct display_stream_compressor *dcn314_dsc_create(
struct dc_context *ctx, uint32_t inst)
{
struct dcn20_dsc *dsc =
- kzalloc_obj(struct dcn20_dsc, GFP_KERNEL);
+ kzalloc_obj(struct dcn20_dsc);
if (!dsc) {
BREAK_TO_DEBUGGER();
@@ -1653,7 +1653,7 @@ static struct clock_source *dcn31_clock_source_create(
bool dp_clk_src)
{
struct dce110_clk_src *clk_src =
- kzalloc_obj(struct dce110_clk_src, GFP_KERNEL);
+ kzalloc_obj(struct dce110_clk_src);
if (!clk_src)
return NULL;
@@ -1798,7 +1798,7 @@ static struct clock_source *dcn30_clock_source_create(
bool dp_clk_src)
{
struct dce110_clk_src *clk_src =
- kzalloc_obj(struct dce110_clk_src, GFP_KERNEL);
+ kzalloc_obj(struct dce110_clk_src);
if (!clk_src)
return NULL;
@@ -2146,7 +2146,7 @@ struct resource_pool *dcn314_create_resource_pool(
struct dc *dc)
{
struct dcn314_resource_pool *pool =
- kzalloc_obj(struct dcn314_resource_pool, GFP_KERNEL);
+ kzalloc_obj(struct dcn314_resource_pool);
if (!pool)
return NULL;
diff --git a/drivers/gpu/drm/amd/display/dc/resource/dcn315/dcn315_resource.c b/drivers/gpu/drm/amd/display/dc/resource/dcn315/dcn315_resource.c
index 1a63eaf5e1d9..4398b5db4834 100644
--- a/drivers/gpu/drm/amd/display/dc/resource/dcn315/dcn315_resource.c
+++ b/drivers/gpu/drm/amd/display/dc/resource/dcn315/dcn315_resource.c
@@ -918,7 +918,7 @@ static struct dpp *dcn31_dpp_create(
uint32_t inst)
{
struct dcn3_dpp *dpp =
- kzalloc_obj(struct dcn3_dpp, GFP_KERNEL);
+ kzalloc_obj(struct dcn3_dpp);
if (!dpp)
return NULL;
@@ -936,7 +936,7 @@ static struct output_pixel_processor *dcn31_opp_create(
struct dc_context *ctx, uint32_t inst)
{
struct dcn20_opp *opp =
- kzalloc_obj(struct dcn20_opp, GFP_KERNEL);
+ kzalloc_obj(struct dcn20_opp);
if (!opp) {
BREAK_TO_DEBUGGER();
@@ -953,7 +953,7 @@ static struct dce_aux *dcn31_aux_engine_create(
uint32_t inst)
{
struct aux_engine_dce110 *aux_engine =
- kzalloc_obj(struct aux_engine_dce110, GFP_KERNEL);
+ kzalloc_obj(struct aux_engine_dce110);
if (!aux_engine)
return NULL;
@@ -990,7 +990,7 @@ static struct dce_i2c_hw *dcn31_i2c_hw_create(
uint32_t inst)
{
struct dce_i2c_hw *dce_i2c_hw =
- kzalloc_obj(struct dce_i2c_hw, GFP_KERNEL);
+ kzalloc_obj(struct dce_i2c_hw);
if (!dce_i2c_hw)
return NULL;
@@ -1005,7 +1005,7 @@ static struct mpc *dcn31_mpc_create(
int num_mpcc,
int num_rmu)
{
- struct dcn30_mpc *mpc30 = kzalloc_obj(struct dcn30_mpc, GFP_KERNEL);
+ struct dcn30_mpc *mpc30 = kzalloc_obj(struct dcn30_mpc);
if (!mpc30)
return NULL;
@@ -1057,7 +1057,7 @@ static struct timing_generator *dcn31_timing_generator_create(
uint32_t instance)
{
struct optc *tgn10 =
- kzalloc_obj(struct optc, GFP_KERNEL);
+ kzalloc_obj(struct optc);
if (!tgn10)
return NULL;
@@ -1091,7 +1091,7 @@ static struct link_encoder *dcn31_link_encoder_create(
const struct encoder_init_data *enc_init_data)
{
struct dcn20_link_encoder *enc20 =
- kzalloc_obj(struct dcn20_link_encoder, GFP_KERNEL);
+ kzalloc_obj(struct dcn20_link_encoder);
if (!enc20 || enc_init_data->hpd_source >= ARRAY_SIZE(link_enc_hpd_regs))
return NULL;
@@ -1120,7 +1120,7 @@ static struct link_encoder *dcn31_link_enc_create_minimal(
if ((eng_id - ENGINE_ID_DIGA) > ctx->dc->res_pool->res_cap->num_dig_link_enc)
return NULL;
- enc20 = kzalloc_obj(struct dcn20_link_encoder, GFP_KERNEL);
+ enc20 = kzalloc_obj(struct dcn20_link_encoder);
if (!enc20)
return NULL;
@@ -1137,7 +1137,7 @@ static struct link_encoder *dcn31_link_enc_create_minimal(
static struct panel_cntl *dcn31_panel_cntl_create(const struct panel_cntl_init_data *init_data)
{
struct dcn31_panel_cntl *panel_cntl =
- kzalloc_obj(struct dcn31_panel_cntl, GFP_KERNEL);
+ kzalloc_obj(struct dcn31_panel_cntl);
if (!panel_cntl)
return NULL;
@@ -1167,7 +1167,7 @@ static struct vpg *dcn31_vpg_create(
struct dc_context *ctx,
uint32_t inst)
{
- struct dcn31_vpg *vpg31 = kzalloc_obj(struct dcn31_vpg, GFP_KERNEL);
+ struct dcn31_vpg *vpg31 = kzalloc_obj(struct dcn31_vpg);
if (!vpg31)
return NULL;
@@ -1184,7 +1184,7 @@ static struct afmt *dcn31_afmt_create(
struct dc_context *ctx,
uint32_t inst)
{
- struct dcn31_afmt *afmt31 = kzalloc_obj(struct dcn31_afmt, GFP_KERNEL);
+ struct dcn31_afmt *afmt31 = kzalloc_obj(struct dcn31_afmt);
if (!afmt31)
return NULL;
@@ -1203,7 +1203,7 @@ static struct apg *dcn31_apg_create(
struct dc_context *ctx,
uint32_t inst)
{
- struct dcn31_apg *apg31 = kzalloc_obj(struct dcn31_apg, GFP_KERNEL);
+ struct dcn31_apg *apg31 = kzalloc_obj(struct dcn31_apg);
if (!apg31)
return NULL;
@@ -1235,7 +1235,7 @@ static struct stream_encoder *dcn315_stream_encoder_create(
vpg_inst = eng_id;
afmt_inst = eng_id;
- enc1 = kzalloc_obj(struct dcn10_stream_encoder, GFP_KERNEL);
+ enc1 = kzalloc_obj(struct dcn10_stream_encoder);
vpg = dcn31_vpg_create(ctx, vpg_inst);
afmt = dcn31_afmt_create(ctx, afmt_inst);
@@ -1312,7 +1312,7 @@ static struct hpo_dp_link_encoder *dcn31_hpo_dp_link_encoder_create(
struct dcn31_hpo_dp_link_encoder *hpo_dp_enc31;
/* allocate HPO link encoder */
- hpo_dp_enc31 = kzalloc_obj(struct dcn31_hpo_dp_link_encoder, GFP_KERNEL);
+ hpo_dp_enc31 = kzalloc_obj(struct dcn31_hpo_dp_link_encoder);
if (!hpo_dp_enc31)
return NULL; /* out of memory */
@@ -1326,7 +1326,7 @@ static struct hpo_dp_link_encoder *dcn31_hpo_dp_link_encoder_create(
static struct dce_hwseq *dcn31_hwseq_create(
struct dc_context *ctx)
{
- struct dce_hwseq *hws = kzalloc_obj(struct dce_hwseq, GFP_KERNEL);
+ struct dce_hwseq *hws = kzalloc_obj(struct dce_hwseq);
if (hws) {
hws->ctx = ctx;
@@ -1500,7 +1500,7 @@ static struct hubp *dcn31_hubp_create(
uint32_t inst)
{
struct dcn20_hubp *hubp2 =
- kzalloc_obj(struct dcn20_hubp, GFP_KERNEL);
+ kzalloc_obj(struct dcn20_hubp);
if (!hubp2)
return NULL;
@@ -1568,7 +1568,7 @@ static struct display_stream_compressor *dcn31_dsc_create(
struct dc_context *ctx, uint32_t inst)
{
struct dcn20_dsc *dsc =
- kzalloc_obj(struct dcn20_dsc, GFP_KERNEL);
+ kzalloc_obj(struct dcn20_dsc);
if (!dsc) {
BREAK_TO_DEBUGGER();
@@ -1596,7 +1596,7 @@ static struct clock_source *dcn31_clock_source_create(
bool dp_clk_src)
{
struct dce110_clk_src *clk_src =
- kzalloc_obj(struct dce110_clk_src, GFP_KERNEL);
+ kzalloc_obj(struct dce110_clk_src);
if (!clk_src)
return NULL;
@@ -2167,7 +2167,7 @@ struct resource_pool *dcn315_create_resource_pool(
struct dc *dc)
{
struct dcn315_resource_pool *pool =
- kzalloc_obj(struct dcn315_resource_pool, GFP_KERNEL);
+ kzalloc_obj(struct dcn315_resource_pool);
if (!pool)
return NULL;
diff --git a/drivers/gpu/drm/amd/display/dc/resource/dcn316/dcn316_resource.c b/drivers/gpu/drm/amd/display/dc/resource/dcn316/dcn316_resource.c
index 4b8dddba34b8..68845cbf8383 100644
--- a/drivers/gpu/drm/amd/display/dc/resource/dcn316/dcn316_resource.c
+++ b/drivers/gpu/drm/amd/display/dc/resource/dcn316/dcn316_resource.c
@@ -911,7 +911,7 @@ static struct dpp *dcn31_dpp_create(
uint32_t inst)
{
struct dcn3_dpp *dpp =
- kzalloc_obj(struct dcn3_dpp, GFP_KERNEL);
+ kzalloc_obj(struct dcn3_dpp);
if (!dpp)
return NULL;
@@ -929,7 +929,7 @@ static struct output_pixel_processor *dcn31_opp_create(
struct dc_context *ctx, uint32_t inst)
{
struct dcn20_opp *opp =
- kzalloc_obj(struct dcn20_opp, GFP_KERNEL);
+ kzalloc_obj(struct dcn20_opp);
if (!opp) {
BREAK_TO_DEBUGGER();
@@ -946,7 +946,7 @@ static struct dce_aux *dcn31_aux_engine_create(
uint32_t inst)
{
struct aux_engine_dce110 *aux_engine =
- kzalloc_obj(struct aux_engine_dce110, GFP_KERNEL);
+ kzalloc_obj(struct aux_engine_dce110);
if (!aux_engine)
return NULL;
@@ -983,7 +983,7 @@ static struct dce_i2c_hw *dcn31_i2c_hw_create(
uint32_t inst)
{
struct dce_i2c_hw *dce_i2c_hw =
- kzalloc_obj(struct dce_i2c_hw, GFP_KERNEL);
+ kzalloc_obj(struct dce_i2c_hw);
if (!dce_i2c_hw)
return NULL;
@@ -998,7 +998,7 @@ static struct mpc *dcn31_mpc_create(
int num_mpcc,
int num_rmu)
{
- struct dcn30_mpc *mpc30 = kzalloc_obj(struct dcn30_mpc, GFP_KERNEL);
+ struct dcn30_mpc *mpc30 = kzalloc_obj(struct dcn30_mpc);
if (!mpc30)
return NULL;
@@ -1050,7 +1050,7 @@ static struct timing_generator *dcn31_timing_generator_create(
uint32_t instance)
{
struct optc *tgn10 =
- kzalloc_obj(struct optc, GFP_KERNEL);
+ kzalloc_obj(struct optc);
if (!tgn10)
return NULL;
@@ -1084,7 +1084,7 @@ static struct link_encoder *dcn31_link_encoder_create(
const struct encoder_init_data *enc_init_data)
{
struct dcn20_link_encoder *enc20 =
- kzalloc_obj(struct dcn20_link_encoder, GFP_KERNEL);
+ kzalloc_obj(struct dcn20_link_encoder);
if (!enc20 || enc_init_data->hpd_source >= ARRAY_SIZE(link_enc_hpd_regs))
return NULL;
@@ -1113,7 +1113,7 @@ static struct link_encoder *dcn31_link_enc_create_minimal(
if ((eng_id - ENGINE_ID_DIGA) > ctx->dc->res_pool->res_cap->num_dig_link_enc)
return NULL;
- enc20 = kzalloc_obj(struct dcn20_link_encoder, GFP_KERNEL);
+ enc20 = kzalloc_obj(struct dcn20_link_encoder);
if (!enc20)
return NULL;
@@ -1130,7 +1130,7 @@ static struct link_encoder *dcn31_link_enc_create_minimal(
static struct panel_cntl *dcn31_panel_cntl_create(const struct panel_cntl_init_data *init_data)
{
struct dcn31_panel_cntl *panel_cntl =
- kzalloc_obj(struct dcn31_panel_cntl, GFP_KERNEL);
+ kzalloc_obj(struct dcn31_panel_cntl);
if (!panel_cntl)
return NULL;
@@ -1160,7 +1160,7 @@ static struct vpg *dcn31_vpg_create(
struct dc_context *ctx,
uint32_t inst)
{
- struct dcn31_vpg *vpg31 = kzalloc_obj(struct dcn31_vpg, GFP_KERNEL);
+ struct dcn31_vpg *vpg31 = kzalloc_obj(struct dcn31_vpg);
if (!vpg31)
return NULL;
@@ -1177,7 +1177,7 @@ static struct afmt *dcn31_afmt_create(
struct dc_context *ctx,
uint32_t inst)
{
- struct dcn31_afmt *afmt31 = kzalloc_obj(struct dcn31_afmt, GFP_KERNEL);
+ struct dcn31_afmt *afmt31 = kzalloc_obj(struct dcn31_afmt);
if (!afmt31)
return NULL;
@@ -1197,7 +1197,7 @@ static struct apg *dcn31_apg_create(
struct dc_context *ctx,
uint32_t inst)
{
- struct dcn31_apg *apg31 = kzalloc_obj(struct dcn31_apg, GFP_KERNEL);
+ struct dcn31_apg *apg31 = kzalloc_obj(struct dcn31_apg);
if (!apg31)
return NULL;
@@ -1228,7 +1228,7 @@ static struct stream_encoder *dcn316_stream_encoder_create(
vpg_inst = eng_id;
afmt_inst = eng_id;
- enc1 = kzalloc_obj(struct dcn10_stream_encoder, GFP_KERNEL);
+ enc1 = kzalloc_obj(struct dcn10_stream_encoder);
vpg = dcn31_vpg_create(ctx, vpg_inst);
afmt = dcn31_afmt_create(ctx, afmt_inst);
@@ -1306,7 +1306,7 @@ static struct hpo_dp_link_encoder *dcn31_hpo_dp_link_encoder_create(
struct dcn31_hpo_dp_link_encoder *hpo_dp_enc31;
/* allocate HPO link encoder */
- hpo_dp_enc31 = kzalloc_obj(struct dcn31_hpo_dp_link_encoder, GFP_KERNEL);
+ hpo_dp_enc31 = kzalloc_obj(struct dcn31_hpo_dp_link_encoder);
if (!hpo_dp_enc31)
return NULL; /* out of memory */
@@ -1321,7 +1321,7 @@ static struct hpo_dp_link_encoder *dcn31_hpo_dp_link_encoder_create(
static struct dce_hwseq *dcn31_hwseq_create(
struct dc_context *ctx)
{
- struct dce_hwseq *hws = kzalloc_obj(struct dce_hwseq, GFP_KERNEL);
+ struct dce_hwseq *hws = kzalloc_obj(struct dce_hwseq);
if (hws) {
hws->ctx = ctx;
@@ -1492,7 +1492,7 @@ static struct hubp *dcn31_hubp_create(
uint32_t inst)
{
struct dcn20_hubp *hubp2 =
- kzalloc_obj(struct dcn20_hubp, GFP_KERNEL);
+ kzalloc_obj(struct dcn20_hubp);
if (!hubp2)
return NULL;
@@ -1560,7 +1560,7 @@ static struct display_stream_compressor *dcn31_dsc_create(
struct dc_context *ctx, uint32_t inst)
{
struct dcn20_dsc *dsc =
- kzalloc_obj(struct dcn20_dsc, GFP_KERNEL);
+ kzalloc_obj(struct dcn20_dsc);
if (!dsc) {
BREAK_TO_DEBUGGER();
@@ -1588,7 +1588,7 @@ static struct clock_source *dcn31_clock_source_create(
bool dp_clk_src)
{
struct dce110_clk_src *clk_src =
- kzalloc_obj(struct dce110_clk_src, GFP_KERNEL);
+ kzalloc_obj(struct dce110_clk_src);
if (!clk_src)
return NULL;
@@ -2034,7 +2034,7 @@ struct resource_pool *dcn316_create_resource_pool(
struct dc *dc)
{
struct dcn316_resource_pool *pool =
- kzalloc_obj(struct dcn316_resource_pool, GFP_KERNEL);
+ kzalloc_obj(struct dcn316_resource_pool);
if (!pool)
return NULL;
diff --git a/drivers/gpu/drm/amd/display/dc/resource/dcn32/dcn32_resource.c b/drivers/gpu/drm/amd/display/dc/resource/dcn32/dcn32_resource.c
index a93862071ff5..debf6a08e012 100644
--- a/drivers/gpu/drm/amd/display/dc/resource/dcn32/dcn32_resource.c
+++ b/drivers/gpu/drm/amd/display/dc/resource/dcn32/dcn32_resource.c
@@ -750,7 +750,7 @@ static struct dce_aux *dcn32_aux_engine_create(
uint32_t inst)
{
struct aux_engine_dce110 *aux_engine =
- kzalloc_obj(struct aux_engine_dce110, GFP_KERNEL);
+ kzalloc_obj(struct aux_engine_dce110);
if (!aux_engine)
return NULL;
@@ -790,7 +790,7 @@ static struct dce_i2c_hw *dcn32_i2c_hw_create(
uint32_t inst)
{
struct dce_i2c_hw *dce_i2c_hw =
- kzalloc_obj(struct dce_i2c_hw, GFP_KERNEL);
+ kzalloc_obj(struct dce_i2c_hw);
if (!dce_i2c_hw)
return NULL;
@@ -817,7 +817,7 @@ static struct clock_source *dcn32_clock_source_create(
bool dp_clk_src)
{
struct dce110_clk_src *clk_src =
- kzalloc_obj(struct dce110_clk_src, GFP_KERNEL);
+ kzalloc_obj(struct dce110_clk_src);
if (!clk_src)
return NULL;
@@ -893,7 +893,7 @@ static struct hubp *dcn32_hubp_create(
uint32_t inst)
{
struct dcn20_hubp *hubp2 =
- kzalloc_obj(struct dcn20_hubp, GFP_KERNEL);
+ kzalloc_obj(struct dcn20_hubp);
if (!hubp2)
return NULL;
@@ -925,7 +925,7 @@ static struct dpp *dcn32_dpp_create(
uint32_t inst)
{
struct dcn3_dpp *dpp3 =
- kzalloc_obj(struct dcn3_dpp, GFP_KERNEL);
+ kzalloc_obj(struct dcn3_dpp);
if (!dpp3)
return NULL;
@@ -951,7 +951,7 @@ static struct mpc *dcn32_mpc_create(
int num_mpcc,
int num_rmu)
{
- struct dcn30_mpc *mpc30 = kzalloc_obj(struct dcn30_mpc, GFP_KERNEL);
+ struct dcn30_mpc *mpc30 = kzalloc_obj(struct dcn30_mpc);
if (!mpc30)
return NULL;
@@ -974,7 +974,7 @@ static struct output_pixel_processor *dcn32_opp_create(
struct dc_context *ctx, uint32_t inst)
{
struct dcn20_opp *opp2 =
- kzalloc_obj(struct dcn20_opp, GFP_KERNEL);
+ kzalloc_obj(struct dcn20_opp);
if (!opp2) {
BREAK_TO_DEBUGGER();
@@ -999,7 +999,7 @@ static struct timing_generator *dcn32_timing_generator_create(
uint32_t instance)
{
struct optc *tgn10 =
- kzalloc_obj(struct optc, GFP_KERNEL);
+ kzalloc_obj(struct optc);
if (!tgn10)
return NULL;
@@ -1040,7 +1040,7 @@ static struct link_encoder *dcn32_link_encoder_create(
const struct encoder_init_data *enc_init_data)
{
struct dcn20_link_encoder *enc20 =
- kzalloc_obj(struct dcn20_link_encoder, GFP_KERNEL);
+ kzalloc_obj(struct dcn20_link_encoder);
if (!enc20 || enc_init_data->hpd_source >= ARRAY_SIZE(link_enc_hpd_regs))
return NULL;
@@ -1084,7 +1084,7 @@ static struct link_encoder *dcn32_link_encoder_create(
struct panel_cntl *dcn32_panel_cntl_create(const struct panel_cntl_init_data *init_data)
{
struct dcn31_panel_cntl *panel_cntl =
- kzalloc_obj(struct dcn31_panel_cntl, GFP_KERNEL);
+ kzalloc_obj(struct dcn31_panel_cntl);
if (!panel_cntl)
return NULL;
@@ -1123,7 +1123,7 @@ static struct vpg *dcn32_vpg_create(
struct dc_context *ctx,
uint32_t inst)
{
- struct dcn30_vpg *vpg3 = kzalloc_obj(struct dcn30_vpg, GFP_KERNEL);
+ struct dcn30_vpg *vpg3 = kzalloc_obj(struct dcn30_vpg);
if (!vpg3)
return NULL;
@@ -1153,7 +1153,7 @@ static struct afmt *dcn32_afmt_create(
struct dc_context *ctx,
uint32_t inst)
{
- struct dcn30_afmt *afmt3 = kzalloc_obj(struct dcn30_afmt, GFP_KERNEL);
+ struct dcn30_afmt *afmt3 = kzalloc_obj(struct dcn30_afmt);
if (!afmt3)
return NULL;
@@ -1179,7 +1179,7 @@ static struct apg *dcn31_apg_create(
struct dc_context *ctx,
uint32_t inst)
{
- struct dcn31_apg *apg31 = kzalloc_obj(struct dcn31_apg, GFP_KERNEL);
+ struct dcn31_apg *apg31 = kzalloc_obj(struct dcn31_apg);
if (!apg31)
return NULL;
@@ -1216,7 +1216,7 @@ static struct stream_encoder *dcn32_stream_encoder_create(
vpg_inst = eng_id;
afmt_inst = eng_id;
- enc1 = kzalloc_obj(struct dcn10_stream_encoder, GFP_KERNEL);
+ enc1 = kzalloc_obj(struct dcn10_stream_encoder);
vpg = dcn32_vpg_create(ctx, vpg_inst);
afmt = dcn32_afmt_create(ctx, afmt_inst);
@@ -1308,7 +1308,7 @@ static struct hpo_dp_link_encoder *dcn32_hpo_dp_link_encoder_create(
struct dcn31_hpo_dp_link_encoder *hpo_dp_enc31;
/* allocate HPO link encoder */
- hpo_dp_enc31 = kzalloc_obj(struct dcn31_hpo_dp_link_encoder, GFP_KERNEL);
+ hpo_dp_enc31 = kzalloc_obj(struct dcn31_hpo_dp_link_encoder);
if (!hpo_dp_enc31)
return NULL; /* out of memory */
@@ -1327,7 +1327,7 @@ static struct hpo_dp_link_encoder *dcn32_hpo_dp_link_encoder_create(
static struct dce_hwseq *dcn32_hwseq_create(
struct dc_context *ctx)
{
- struct dce_hwseq *hws = kzalloc_obj(struct dce_hwseq, GFP_KERNEL);
+ struct dce_hwseq *hws = kzalloc_obj(struct dce_hwseq);
#undef REG_STRUCT
#define REG_STRUCT hwseq_reg
@@ -1566,7 +1566,7 @@ static struct display_stream_compressor *dcn32_dsc_create(
struct dc_context *ctx, uint32_t inst)
{
struct dcn20_dsc *dsc =
- kzalloc_obj(struct dcn20_dsc, GFP_KERNEL);
+ kzalloc_obj(struct dcn20_dsc);
if (!dsc) {
BREAK_TO_DEBUGGER();
@@ -2572,7 +2572,7 @@ struct resource_pool *dcn32_create_resource_pool(
struct dc *dc)
{
struct dcn32_resource_pool *pool =
- kzalloc_obj(struct dcn32_resource_pool, GFP_KERNEL);
+ kzalloc_obj(struct dcn32_resource_pool);
if (!pool)
return NULL;
diff --git a/drivers/gpu/drm/amd/display/dc/resource/dcn321/dcn321_resource.c b/drivers/gpu/drm/amd/display/dc/resource/dcn321/dcn321_resource.c
index 97976318f4c0..d936192c3a6c 100644
--- a/drivers/gpu/drm/amd/display/dc/resource/dcn321/dcn321_resource.c
+++ b/drivers/gpu/drm/amd/display/dc/resource/dcn321/dcn321_resource.c
@@ -744,7 +744,7 @@ static struct dce_aux *dcn321_aux_engine_create(
uint32_t inst)
{
struct aux_engine_dce110 *aux_engine =
- kzalloc_obj(struct aux_engine_dce110, GFP_KERNEL);
+ kzalloc_obj(struct aux_engine_dce110);
if (!aux_engine)
return NULL;
@@ -784,7 +784,7 @@ static struct dce_i2c_hw *dcn321_i2c_hw_create(
uint32_t inst)
{
struct dce_i2c_hw *dce_i2c_hw =
- kzalloc_obj(struct dce_i2c_hw, GFP_KERNEL);
+ kzalloc_obj(struct dce_i2c_hw);
if (!dce_i2c_hw)
return NULL;
@@ -811,7 +811,7 @@ static struct clock_source *dcn321_clock_source_create(
bool dp_clk_src)
{
struct dce110_clk_src *clk_src =
- kzalloc_obj(struct dce110_clk_src, GFP_KERNEL);
+ kzalloc_obj(struct dce110_clk_src);
if (!clk_src)
return NULL;
@@ -887,7 +887,7 @@ static struct hubp *dcn321_hubp_create(
uint32_t inst)
{
struct dcn20_hubp *hubp2 =
- kzalloc_obj(struct dcn20_hubp, GFP_KERNEL);
+ kzalloc_obj(struct dcn20_hubp);
if (!hubp2)
return NULL;
@@ -919,7 +919,7 @@ static struct dpp *dcn321_dpp_create(
uint32_t inst)
{
struct dcn3_dpp *dpp3 =
- kzalloc_obj(struct dcn3_dpp, GFP_KERNEL);
+ kzalloc_obj(struct dcn3_dpp);
if (!dpp3)
return NULL;
@@ -945,7 +945,7 @@ static struct mpc *dcn321_mpc_create(
int num_mpcc,
int num_rmu)
{
- struct dcn30_mpc *mpc30 = kzalloc_obj(struct dcn30_mpc, GFP_KERNEL);
+ struct dcn30_mpc *mpc30 = kzalloc_obj(struct dcn30_mpc);
if (!mpc30)
return NULL;
@@ -968,7 +968,7 @@ static struct output_pixel_processor *dcn321_opp_create(
struct dc_context *ctx, uint32_t inst)
{
struct dcn20_opp *opp2 =
- kzalloc_obj(struct dcn20_opp, GFP_KERNEL);
+ kzalloc_obj(struct dcn20_opp);
if (!opp2) {
BREAK_TO_DEBUGGER();
@@ -993,7 +993,7 @@ static struct timing_generator *dcn321_timing_generator_create(
uint32_t instance)
{
struct optc *tgn10 =
- kzalloc_obj(struct optc, GFP_KERNEL);
+ kzalloc_obj(struct optc);
if (!tgn10)
return NULL;
@@ -1034,7 +1034,7 @@ static struct link_encoder *dcn321_link_encoder_create(
const struct encoder_init_data *enc_init_data)
{
struct dcn20_link_encoder *enc20 =
- kzalloc_obj(struct dcn20_link_encoder, GFP_KERNEL);
+ kzalloc_obj(struct dcn20_link_encoder);
if (!enc20 || enc_init_data->hpd_source >= ARRAY_SIZE(link_enc_hpd_regs))
return NULL;
@@ -1104,7 +1104,7 @@ static struct vpg *dcn321_vpg_create(
struct dc_context *ctx,
uint32_t inst)
{
- struct dcn30_vpg *vpg3 = kzalloc_obj(struct dcn30_vpg, GFP_KERNEL);
+ struct dcn30_vpg *vpg3 = kzalloc_obj(struct dcn30_vpg);
if (!vpg3)
return NULL;
@@ -1134,7 +1134,7 @@ static struct afmt *dcn321_afmt_create(
struct dc_context *ctx,
uint32_t inst)
{
- struct dcn30_afmt *afmt3 = kzalloc_obj(struct dcn30_afmt, GFP_KERNEL);
+ struct dcn30_afmt *afmt3 = kzalloc_obj(struct dcn30_afmt);
if (!afmt3)
return NULL;
@@ -1160,7 +1160,7 @@ static struct apg *dcn321_apg_create(
struct dc_context *ctx,
uint32_t inst)
{
- struct dcn31_apg *apg31 = kzalloc_obj(struct dcn31_apg, GFP_KERNEL);
+ struct dcn31_apg *apg31 = kzalloc_obj(struct dcn31_apg);
if (!apg31)
return NULL;
@@ -1197,7 +1197,7 @@ static struct stream_encoder *dcn321_stream_encoder_create(
vpg_inst = eng_id;
afmt_inst = eng_id;
- enc1 = kzalloc_obj(struct dcn10_stream_encoder, GFP_KERNEL);
+ enc1 = kzalloc_obj(struct dcn10_stream_encoder);
vpg = dcn321_vpg_create(ctx, vpg_inst);
afmt = dcn321_afmt_create(ctx, afmt_inst);
@@ -1289,7 +1289,7 @@ static struct hpo_dp_link_encoder *dcn321_hpo_dp_link_encoder_create(
struct dcn31_hpo_dp_link_encoder *hpo_dp_enc31;
/* allocate HPO link encoder */
- hpo_dp_enc31 = kzalloc_obj(struct dcn31_hpo_dp_link_encoder, GFP_KERNEL);
+ hpo_dp_enc31 = kzalloc_obj(struct dcn31_hpo_dp_link_encoder);
if (!hpo_dp_enc31)
return NULL; /* out of memory */
@@ -1308,7 +1308,7 @@ static struct hpo_dp_link_encoder *dcn321_hpo_dp_link_encoder_create(
static struct dce_hwseq *dcn321_hwseq_create(
struct dc_context *ctx)
{
- struct dce_hwseq *hws = kzalloc_obj(struct dce_hwseq, GFP_KERNEL);
+ struct dce_hwseq *hws = kzalloc_obj(struct dce_hwseq);
#undef REG_STRUCT
#define REG_STRUCT hwseq_reg
@@ -1546,7 +1546,7 @@ static struct display_stream_compressor *dcn321_dsc_create(
struct dc_context *ctx, uint32_t inst)
{
struct dcn20_dsc *dsc =
- kzalloc_obj(struct dcn20_dsc, GFP_KERNEL);
+ kzalloc_obj(struct dcn20_dsc);
if (!dsc) {
BREAK_TO_DEBUGGER();
@@ -2064,7 +2064,7 @@ struct resource_pool *dcn321_create_resource_pool(
struct dc *dc)
{
struct dcn321_resource_pool *pool =
- kzalloc_obj(struct dcn321_resource_pool, GFP_KERNEL);
+ kzalloc_obj(struct dcn321_resource_pool);
if (!pool)
return NULL;
diff --git a/drivers/gpu/drm/amd/display/dc/resource/dcn35/dcn35_resource.c b/drivers/gpu/drm/amd/display/dc/resource/dcn35/dcn35_resource.c
index 26493ed5a6fc..2be765f70889 100644
--- a/drivers/gpu/drm/amd/display/dc/resource/dcn35/dcn35_resource.c
+++ b/drivers/gpu/drm/amd/display/dc/resource/dcn35/dcn35_resource.c
@@ -810,7 +810,7 @@ static void dcn35_dpp_destroy(struct dpp **dpp)
static struct dpp *dcn35_dpp_create(struct dc_context *ctx, uint32_t inst)
{
- struct dcn3_dpp *dpp = kzalloc_obj(struct dcn3_dpp, GFP_KERNEL);
+ struct dcn3_dpp *dpp = kzalloc_obj(struct dcn3_dpp);
bool success = (dpp != NULL);
if (!success)
@@ -841,7 +841,7 @@ static struct output_pixel_processor *dcn35_opp_create(
struct dc_context *ctx, uint32_t inst)
{
struct dcn20_opp *opp =
- kzalloc_obj(struct dcn20_opp, GFP_KERNEL);
+ kzalloc_obj(struct dcn20_opp);
if (!opp) {
BREAK_TO_DEBUGGER();
@@ -868,7 +868,7 @@ static struct dce_aux *dcn31_aux_engine_create(
uint32_t inst)
{
struct aux_engine_dce110 *aux_engine =
- kzalloc_obj(struct aux_engine_dce110, GFP_KERNEL);
+ kzalloc_obj(struct aux_engine_dce110);
if (!aux_engine)
return NULL;
@@ -931,7 +931,7 @@ static struct dce_i2c_hw *dcn31_i2c_hw_create(
uint32_t inst)
{
struct dce_i2c_hw *dce_i2c_hw =
- kzalloc_obj(struct dce_i2c_hw, GFP_KERNEL);
+ kzalloc_obj(struct dce_i2c_hw);
if (!dce_i2c_hw)
return NULL;
@@ -954,7 +954,7 @@ static struct mpc *dcn35_mpc_create(
int num_mpcc,
int num_rmu)
{
- struct dcn30_mpc *mpc30 = kzalloc_obj(struct dcn30_mpc, GFP_KERNEL);
+ struct dcn30_mpc *mpc30 = kzalloc_obj(struct dcn30_mpc);
if (!mpc30)
return NULL;
@@ -1033,7 +1033,7 @@ static struct timing_generator *dcn35_timing_generator_create(
uint32_t instance)
{
struct optc *tgn10 =
- kzalloc_obj(struct optc, GFP_KERNEL);
+ kzalloc_obj(struct optc);
if (!tgn10)
return NULL;
@@ -1074,7 +1074,7 @@ static struct link_encoder *dcn35_link_encoder_create(
const struct encoder_init_data *enc_init_data)
{
struct dcn20_link_encoder *enc20 =
- kzalloc_obj(struct dcn20_link_encoder, GFP_KERNEL);
+ kzalloc_obj(struct dcn20_link_encoder);
if (!enc20 || enc_init_data->hpd_source >= ARRAY_SIZE(link_enc_hpd_regs))
return NULL;
@@ -1127,7 +1127,7 @@ static struct link_encoder *dcn31_link_enc_create_minimal(
if ((eng_id - ENGINE_ID_DIGA) > ctx->dc->res_pool->res_cap->num_dig_link_enc)
return NULL;
- enc20 = kzalloc_obj(struct dcn20_link_encoder, GFP_KERNEL);
+ enc20 = kzalloc_obj(struct dcn20_link_encoder);
if (!enc20)
return NULL;
@@ -1144,7 +1144,7 @@ static struct link_encoder *dcn31_link_enc_create_minimal(
static struct panel_cntl *dcn31_panel_cntl_create(const struct panel_cntl_init_data *init_data)
{
struct dcn31_panel_cntl *panel_cntl =
- kzalloc_obj(struct dcn31_panel_cntl, GFP_KERNEL);
+ kzalloc_obj(struct dcn31_panel_cntl);
if (!panel_cntl)
return NULL;
@@ -1185,7 +1185,7 @@ static struct vpg *dcn31_vpg_create(
struct dc_context *ctx,
uint32_t inst)
{
- struct dcn31_vpg *vpg31 = kzalloc_obj(struct dcn31_vpg, GFP_KERNEL);
+ struct dcn31_vpg *vpg31 = kzalloc_obj(struct dcn31_vpg);
if (!vpg31)
return NULL;
@@ -1215,7 +1215,7 @@ static struct afmt *dcn31_afmt_create(
struct dc_context *ctx,
uint32_t inst)
{
- struct dcn31_afmt *afmt31 = kzalloc_obj(struct dcn31_afmt, GFP_KERNEL);
+ struct dcn31_afmt *afmt31 = kzalloc_obj(struct dcn31_afmt);
if (!afmt31)
return NULL;
@@ -1243,7 +1243,7 @@ static struct apg *dcn31_apg_create(
struct dc_context *ctx,
uint32_t inst)
{
- struct dcn31_apg *apg31 = kzalloc_obj(struct dcn31_apg, GFP_KERNEL);
+ struct dcn31_apg *apg31 = kzalloc_obj(struct dcn31_apg);
if (!apg31)
return NULL;
@@ -1280,7 +1280,7 @@ static struct stream_encoder *dcn35_stream_encoder_create(
vpg_inst = eng_id;
afmt_inst = eng_id;
- enc1 = kzalloc_obj(struct dcn10_stream_encoder, GFP_KERNEL);
+ enc1 = kzalloc_obj(struct dcn10_stream_encoder);
vpg = dcn31_vpg_create(ctx, vpg_inst);
afmt = dcn31_afmt_create(ctx, afmt_inst);
@@ -1372,7 +1372,7 @@ static struct hpo_dp_link_encoder *dcn31_hpo_dp_link_encoder_create(
struct dcn31_hpo_dp_link_encoder *hpo_dp_enc31;
/* allocate HPO link encoder */
- hpo_dp_enc31 = kzalloc_obj(struct dcn31_hpo_dp_link_encoder, GFP_KERNEL);
+ hpo_dp_enc31 = kzalloc_obj(struct dcn31_hpo_dp_link_encoder);
if (!hpo_dp_enc31)
return NULL; /* out of memory */
@@ -1391,7 +1391,7 @@ static struct hpo_dp_link_encoder *dcn31_hpo_dp_link_encoder_create(
static struct dce_hwseq *dcn35_hwseq_create(
struct dc_context *ctx)
{
- struct dce_hwseq *hws = kzalloc_obj(struct dce_hwseq, GFP_KERNEL);
+ struct dce_hwseq *hws = kzalloc_obj(struct dce_hwseq);
#undef REG_STRUCT
#define REG_STRUCT hwseq_reg
@@ -1572,7 +1572,7 @@ static struct hubp *dcn35_hubp_create(
uint32_t inst)
{
struct dcn20_hubp *hubp2 =
- kzalloc_obj(struct dcn20_hubp, GFP_KERNEL);
+ kzalloc_obj(struct dcn20_hubp);
if (!hubp2)
return NULL;
@@ -1673,7 +1673,7 @@ static struct display_stream_compressor *dcn35_dsc_create(
struct dc_context *ctx, uint32_t inst)
{
struct dcn20_dsc *dsc =
- kzalloc_obj(struct dcn20_dsc, GFP_KERNEL);
+ kzalloc_obj(struct dcn20_dsc);
if (!dsc) {
BREAK_TO_DEBUGGER();
@@ -1710,7 +1710,7 @@ static struct clock_source *dcn35_clock_source_create(
bool dp_clk_src)
{
struct dce110_clk_src *clk_src =
- kzalloc_obj(struct dce110_clk_src, GFP_KERNEL);
+ kzalloc_obj(struct dce110_clk_src);
if (!clk_src)
return NULL;
@@ -2210,7 +2210,7 @@ struct resource_pool *dcn35_create_resource_pool(
struct dc *dc)
{
struct dcn35_resource_pool *pool =
- kzalloc_obj(struct dcn35_resource_pool, GFP_KERNEL);
+ kzalloc_obj(struct dcn35_resource_pool);
if (!pool)
return NULL;
diff --git a/drivers/gpu/drm/amd/display/dc/resource/dcn351/dcn351_resource.c b/drivers/gpu/drm/amd/display/dc/resource/dcn351/dcn351_resource.c
index 0e204d8e1336..bc41df90715c 100644
--- a/drivers/gpu/drm/amd/display/dc/resource/dcn351/dcn351_resource.c
+++ b/drivers/gpu/drm/amd/display/dc/resource/dcn351/dcn351_resource.c
@@ -790,7 +790,7 @@ static void dcn35_dpp_destroy(struct dpp **dpp)
static struct dpp *dcn35_dpp_create(struct dc_context *ctx, uint32_t inst)
{
- struct dcn3_dpp *dpp = kzalloc_obj(struct dcn3_dpp, GFP_KERNEL);
+ struct dcn3_dpp *dpp = kzalloc_obj(struct dcn3_dpp);
bool success = (dpp != NULL);
if (!success)
@@ -821,7 +821,7 @@ static struct output_pixel_processor *dcn35_opp_create(
struct dc_context *ctx, uint32_t inst)
{
struct dcn20_opp *opp =
- kzalloc_obj(struct dcn20_opp, GFP_KERNEL);
+ kzalloc_obj(struct dcn20_opp);
if (!opp) {
BREAK_TO_DEBUGGER();
@@ -848,7 +848,7 @@ static struct dce_aux *dcn31_aux_engine_create(
uint32_t inst)
{
struct aux_engine_dce110 *aux_engine =
- kzalloc_obj(struct aux_engine_dce110, GFP_KERNEL);
+ kzalloc_obj(struct aux_engine_dce110);
if (!aux_engine)
return NULL;
@@ -911,7 +911,7 @@ static struct dce_i2c_hw *dcn31_i2c_hw_create(
uint32_t inst)
{
struct dce_i2c_hw *dce_i2c_hw =
- kzalloc_obj(struct dce_i2c_hw, GFP_KERNEL);
+ kzalloc_obj(struct dce_i2c_hw);
if (!dce_i2c_hw)
return NULL;
@@ -934,7 +934,7 @@ static struct mpc *dcn35_mpc_create(
int num_mpcc,
int num_rmu)
{
- struct dcn30_mpc *mpc30 = kzalloc_obj(struct dcn30_mpc, GFP_KERNEL);
+ struct dcn30_mpc *mpc30 = kzalloc_obj(struct dcn30_mpc);
if (!mpc30)
return NULL;
@@ -1013,7 +1013,7 @@ static struct timing_generator *dcn35_timing_generator_create(
uint32_t instance)
{
struct optc *tgn10 =
- kzalloc_obj(struct optc, GFP_KERNEL);
+ kzalloc_obj(struct optc);
if (!tgn10)
return NULL;
@@ -1054,7 +1054,7 @@ static struct link_encoder *dcn35_link_encoder_create(
const struct encoder_init_data *enc_init_data)
{
struct dcn20_link_encoder *enc20 =
- kzalloc_obj(struct dcn20_link_encoder, GFP_KERNEL);
+ kzalloc_obj(struct dcn20_link_encoder);
if (!enc20 || enc_init_data->hpd_source >= ARRAY_SIZE(link_enc_hpd_regs))
return NULL;
@@ -1107,7 +1107,7 @@ static struct link_encoder *dcn31_link_enc_create_minimal(
if ((eng_id - ENGINE_ID_DIGA) > ctx->dc->res_pool->res_cap->num_dig_link_enc)
return NULL;
- enc20 = kzalloc_obj(struct dcn20_link_encoder, GFP_KERNEL);
+ enc20 = kzalloc_obj(struct dcn20_link_encoder);
if (!enc20)
return NULL;
@@ -1124,7 +1124,7 @@ static struct link_encoder *dcn31_link_enc_create_minimal(
static struct panel_cntl *dcn31_panel_cntl_create(const struct panel_cntl_init_data *init_data)
{
struct dcn31_panel_cntl *panel_cntl =
- kzalloc_obj(struct dcn31_panel_cntl, GFP_KERNEL);
+ kzalloc_obj(struct dcn31_panel_cntl);
if (!panel_cntl)
return NULL;
@@ -1165,7 +1165,7 @@ static struct vpg *dcn31_vpg_create(
struct dc_context *ctx,
uint32_t inst)
{
- struct dcn31_vpg *vpg31 = kzalloc_obj(struct dcn31_vpg, GFP_KERNEL);
+ struct dcn31_vpg *vpg31 = kzalloc_obj(struct dcn31_vpg);
if (!vpg31)
return NULL;
@@ -1195,7 +1195,7 @@ static struct afmt *dcn31_afmt_create(
struct dc_context *ctx,
uint32_t inst)
{
- struct dcn31_afmt *afmt31 = kzalloc_obj(struct dcn31_afmt, GFP_KERNEL);
+ struct dcn31_afmt *afmt31 = kzalloc_obj(struct dcn31_afmt);
if (!afmt31)
return NULL;
@@ -1223,7 +1223,7 @@ static struct apg *dcn31_apg_create(
struct dc_context *ctx,
uint32_t inst)
{
- struct dcn31_apg *apg31 = kzalloc_obj(struct dcn31_apg, GFP_KERNEL);
+ struct dcn31_apg *apg31 = kzalloc_obj(struct dcn31_apg);
if (!apg31)
return NULL;
@@ -1260,7 +1260,7 @@ static struct stream_encoder *dcn35_stream_encoder_create(
vpg_inst = eng_id;
afmt_inst = eng_id;
- enc1 = kzalloc_obj(struct dcn10_stream_encoder, GFP_KERNEL);
+ enc1 = kzalloc_obj(struct dcn10_stream_encoder);
vpg = dcn31_vpg_create(ctx, vpg_inst);
afmt = dcn31_afmt_create(ctx, afmt_inst);
@@ -1352,7 +1352,7 @@ static struct hpo_dp_link_encoder *dcn31_hpo_dp_link_encoder_create(
struct dcn31_hpo_dp_link_encoder *hpo_dp_enc31;
/* allocate HPO link encoder */
- hpo_dp_enc31 = kzalloc_obj(struct dcn31_hpo_dp_link_encoder, GFP_KERNEL);
+ hpo_dp_enc31 = kzalloc_obj(struct dcn31_hpo_dp_link_encoder);
if (!hpo_dp_enc31)
return NULL; /* out of memory */
@@ -1371,7 +1371,7 @@ static struct hpo_dp_link_encoder *dcn31_hpo_dp_link_encoder_create(
static struct dce_hwseq *dcn351_hwseq_create(
struct dc_context *ctx)
{
- struct dce_hwseq *hws = kzalloc_obj(struct dce_hwseq, GFP_KERNEL);
+ struct dce_hwseq *hws = kzalloc_obj(struct dce_hwseq);
#undef REG_STRUCT
#define REG_STRUCT hwseq_reg
@@ -1552,7 +1552,7 @@ static struct hubp *dcn35_hubp_create(
uint32_t inst)
{
struct dcn20_hubp *hubp2 =
- kzalloc_obj(struct dcn20_hubp, GFP_KERNEL);
+ kzalloc_obj(struct dcn20_hubp);
if (!hubp2)
return NULL;
@@ -1653,7 +1653,7 @@ static struct display_stream_compressor *dcn35_dsc_create(
struct dc_context *ctx, uint32_t inst)
{
struct dcn20_dsc *dsc =
- kzalloc_obj(struct dcn20_dsc, GFP_KERNEL);
+ kzalloc_obj(struct dcn20_dsc);
if (!dsc) {
BREAK_TO_DEBUGGER();
@@ -1690,7 +1690,7 @@ static struct clock_source *dcn35_clock_source_create(
bool dp_clk_src)
{
struct dce110_clk_src *clk_src =
- kzalloc_obj(struct dce110_clk_src, GFP_KERNEL);
+ kzalloc_obj(struct dce110_clk_src);
if (!clk_src)
return NULL;
@@ -2183,7 +2183,7 @@ struct resource_pool *dcn351_create_resource_pool(
struct dc *dc)
{
struct dcn351_resource_pool *pool =
- kzalloc_obj(struct dcn351_resource_pool, GFP_KERNEL);
+ kzalloc_obj(struct dcn351_resource_pool);
if (!pool)
return NULL;
diff --git a/drivers/gpu/drm/amd/display/dc/resource/dcn36/dcn36_resource.c b/drivers/gpu/drm/amd/display/dc/resource/dcn36/dcn36_resource.c
index c0cf8c46031f..ae95b1497af3 100644
--- a/drivers/gpu/drm/amd/display/dc/resource/dcn36/dcn36_resource.c
+++ b/drivers/gpu/drm/amd/display/dc/resource/dcn36/dcn36_resource.c
@@ -797,7 +797,7 @@ static void dcn35_dpp_destroy(struct dpp **dpp)
static struct dpp *dcn35_dpp_create(struct dc_context *ctx, uint32_t inst)
{
- struct dcn3_dpp *dpp = kzalloc_obj(struct dcn3_dpp, GFP_KERNEL);
+ struct dcn3_dpp *dpp = kzalloc_obj(struct dcn3_dpp);
bool success = (dpp != NULL);
if (!success)
@@ -828,7 +828,7 @@ static struct output_pixel_processor *dcn35_opp_create(
struct dc_context *ctx, uint32_t inst)
{
struct dcn20_opp *opp =
- kzalloc_obj(struct dcn20_opp, GFP_KERNEL);
+ kzalloc_obj(struct dcn20_opp);
if (!opp) {
BREAK_TO_DEBUGGER();
@@ -855,7 +855,7 @@ static struct dce_aux *dcn31_aux_engine_create(
uint32_t inst)
{
struct aux_engine_dce110 *aux_engine =
- kzalloc_obj(struct aux_engine_dce110, GFP_KERNEL);
+ kzalloc_obj(struct aux_engine_dce110);
if (!aux_engine)
return NULL;
@@ -918,7 +918,7 @@ static struct dce_i2c_hw *dcn31_i2c_hw_create(
uint32_t inst)
{
struct dce_i2c_hw *dce_i2c_hw =
- kzalloc_obj(struct dce_i2c_hw, GFP_KERNEL);
+ kzalloc_obj(struct dce_i2c_hw);
if (!dce_i2c_hw)
return NULL;
@@ -941,7 +941,7 @@ static struct mpc *dcn35_mpc_create(
int num_mpcc,
int num_rmu)
{
- struct dcn30_mpc *mpc30 = kzalloc_obj(struct dcn30_mpc, GFP_KERNEL);
+ struct dcn30_mpc *mpc30 = kzalloc_obj(struct dcn30_mpc);
if (!mpc30)
return NULL;
@@ -1020,7 +1020,7 @@ static struct timing_generator *dcn35_timing_generator_create(
uint32_t instance)
{
struct optc *tgn10 =
- kzalloc_obj(struct optc, GFP_KERNEL);
+ kzalloc_obj(struct optc);
if (!tgn10)
return NULL;
@@ -1061,7 +1061,7 @@ static struct link_encoder *dcn35_link_encoder_create(
const struct encoder_init_data *enc_init_data)
{
struct dcn20_link_encoder *enc20 =
- kzalloc_obj(struct dcn20_link_encoder, GFP_KERNEL);
+ kzalloc_obj(struct dcn20_link_encoder);
if (!enc20 || enc_init_data->hpd_source >= ARRAY_SIZE(link_enc_hpd_regs))
return NULL;
@@ -1114,7 +1114,7 @@ static struct link_encoder *dcn31_link_enc_create_minimal(
if ((eng_id - ENGINE_ID_DIGA) > ctx->dc->res_pool->res_cap->num_dig_link_enc)
return NULL;
- enc20 = kzalloc_obj(struct dcn20_link_encoder, GFP_KERNEL);
+ enc20 = kzalloc_obj(struct dcn20_link_encoder);
if (!enc20)
return NULL;
@@ -1131,7 +1131,7 @@ static struct link_encoder *dcn31_link_enc_create_minimal(
static struct panel_cntl *dcn31_panel_cntl_create(const struct panel_cntl_init_data *init_data)
{
struct dcn31_panel_cntl *panel_cntl =
- kzalloc_obj(struct dcn31_panel_cntl, GFP_KERNEL);
+ kzalloc_obj(struct dcn31_panel_cntl);
if (!panel_cntl)
return NULL;
@@ -1172,7 +1172,7 @@ static struct vpg *dcn31_vpg_create(
struct dc_context *ctx,
uint32_t inst)
{
- struct dcn31_vpg *vpg31 = kzalloc_obj(struct dcn31_vpg, GFP_KERNEL);
+ struct dcn31_vpg *vpg31 = kzalloc_obj(struct dcn31_vpg);
if (!vpg31)
return NULL;
@@ -1202,7 +1202,7 @@ static struct afmt *dcn31_afmt_create(
struct dc_context *ctx,
uint32_t inst)
{
- struct dcn31_afmt *afmt31 = kzalloc_obj(struct dcn31_afmt, GFP_KERNEL);
+ struct dcn31_afmt *afmt31 = kzalloc_obj(struct dcn31_afmt);
if (!afmt31)
return NULL;
@@ -1230,7 +1230,7 @@ static struct apg *dcn31_apg_create(
struct dc_context *ctx,
uint32_t inst)
{
- struct dcn31_apg *apg31 = kzalloc_obj(struct dcn31_apg, GFP_KERNEL);
+ struct dcn31_apg *apg31 = kzalloc_obj(struct dcn31_apg);
if (!apg31)
return NULL;
@@ -1267,7 +1267,7 @@ static struct stream_encoder *dcn35_stream_encoder_create(
} else
return NULL;
- enc1 = kzalloc_obj(struct dcn10_stream_encoder, GFP_KERNEL);
+ enc1 = kzalloc_obj(struct dcn10_stream_encoder);
vpg = dcn31_vpg_create(ctx, vpg_inst);
afmt = dcn31_afmt_create(ctx, afmt_inst);
@@ -1359,7 +1359,7 @@ static struct hpo_dp_link_encoder *dcn31_hpo_dp_link_encoder_create(
struct dcn31_hpo_dp_link_encoder *hpo_dp_enc31;
/* allocate HPO link encoder */
- hpo_dp_enc31 = kzalloc_obj(struct dcn31_hpo_dp_link_encoder, GFP_KERNEL);
+ hpo_dp_enc31 = kzalloc_obj(struct dcn31_hpo_dp_link_encoder);
if (!hpo_dp_enc31)
return NULL; /* out of memory */
@@ -1378,7 +1378,7 @@ static struct hpo_dp_link_encoder *dcn31_hpo_dp_link_encoder_create(
static struct dce_hwseq *dcn36_hwseq_create(
struct dc_context *ctx)
{
- struct dce_hwseq *hws = kzalloc_obj(struct dce_hwseq, GFP_KERNEL);
+ struct dce_hwseq *hws = kzalloc_obj(struct dce_hwseq);
#undef REG_STRUCT
#define REG_STRUCT hwseq_reg
@@ -1559,7 +1559,7 @@ static struct hubp *dcn35_hubp_create(
uint32_t inst)
{
struct dcn20_hubp *hubp2 =
- kzalloc_obj(struct dcn20_hubp, GFP_KERNEL);
+ kzalloc_obj(struct dcn20_hubp);
if (!hubp2)
return NULL;
@@ -1660,7 +1660,7 @@ static struct display_stream_compressor *dcn35_dsc_create(
struct dc_context *ctx, uint32_t inst)
{
struct dcn20_dsc *dsc =
- kzalloc_obj(struct dcn20_dsc, GFP_KERNEL);
+ kzalloc_obj(struct dcn20_dsc);
if (!dsc) {
BREAK_TO_DEBUGGER();
@@ -1697,7 +1697,7 @@ static struct clock_source *dcn35_clock_source_create(
bool dp_clk_src)
{
struct dce110_clk_src *clk_src =
- kzalloc_obj(struct dce110_clk_src, GFP_KERNEL);
+ kzalloc_obj(struct dce110_clk_src);
if (!clk_src)
return NULL;
@@ -2189,7 +2189,7 @@ struct resource_pool *dcn36_create_resource_pool(
struct dc *dc)
{
struct dcn36_resource_pool *pool =
- kzalloc_obj(struct dcn36_resource_pool, GFP_KERNEL);
+ kzalloc_obj(struct dcn36_resource_pool);
if (!pool)
return NULL;
diff --git a/drivers/gpu/drm/amd/display/dc/resource/dcn401/dcn401_resource.c b/drivers/gpu/drm/amd/display/dc/resource/dcn401/dcn401_resource.c
index db8a0c0b8cda..ce272e279c5f 100644
--- a/drivers/gpu/drm/amd/display/dc/resource/dcn401/dcn401_resource.c
+++ b/drivers/gpu/drm/amd/display/dc/resource/dcn401/dcn401_resource.c
@@ -762,7 +762,7 @@ static struct dce_aux *dcn401_aux_engine_create(
uint32_t inst)
{
struct aux_engine_dce110 *aux_engine =
- kzalloc_obj(struct aux_engine_dce110, GFP_KERNEL);
+ kzalloc_obj(struct aux_engine_dce110);
if (!aux_engine)
return NULL;
@@ -801,7 +801,7 @@ static struct dce_i2c_hw *dcn401_i2c_hw_create(
uint32_t inst)
{
struct dce_i2c_hw *dce_i2c_hw =
- kzalloc_obj(struct dce_i2c_hw, GFP_KERNEL);
+ kzalloc_obj(struct dce_i2c_hw);
if (!dce_i2c_hw)
return NULL;
@@ -827,7 +827,7 @@ static struct clock_source *dcn401_clock_source_create(
bool dp_clk_src)
{
struct dce110_clk_src *clk_src =
- kzalloc_obj(struct dce110_clk_src, GFP_KERNEL);
+ kzalloc_obj(struct dce110_clk_src);
if (!clk_src)
return NULL;
@@ -900,7 +900,7 @@ static struct hubbub *dcn401_hubbub_create(struct dc_context *ctx)
static struct dio *dcn401_dio_create(struct dc_context *ctx)
{
- struct dcn10_dio *dio10 = kzalloc_obj(struct dcn10_dio, GFP_KERNEL);
+ struct dcn10_dio *dio10 = kzalloc_obj(struct dcn10_dio);
if (!dio10)
return NULL;
@@ -919,7 +919,7 @@ static struct hubp *dcn401_hubp_create(
uint32_t inst)
{
struct dcn20_hubp *hubp2 =
- kzalloc_obj(struct dcn20_hubp, GFP_KERNEL);
+ kzalloc_obj(struct dcn20_hubp);
if (!hubp2)
return NULL;
@@ -951,7 +951,7 @@ static struct dpp *dcn401_dpp_create(
uint32_t inst)
{
struct dcn401_dpp *dpp401 =
- kzalloc_obj(struct dcn401_dpp, GFP_KERNEL);
+ kzalloc_obj(struct dcn401_dpp);
if (!dpp401)
return NULL;
@@ -977,7 +977,7 @@ static struct mpc *dcn401_mpc_create(
int num_mpcc,
int num_rmu)
{
- struct dcn401_mpc *mpc401 = kzalloc_obj(struct dcn401_mpc, GFP_KERNEL);
+ struct dcn401_mpc *mpc401 = kzalloc_obj(struct dcn401_mpc);
if (!mpc401)
return NULL;
@@ -1000,7 +1000,7 @@ static struct output_pixel_processor *dcn401_opp_create(
struct dc_context *ctx, uint32_t inst)
{
struct dcn20_opp *opp4 =
- kzalloc_obj(struct dcn20_opp, GFP_KERNEL);
+ kzalloc_obj(struct dcn20_opp);
if (!opp4) {
BREAK_TO_DEBUGGER();
@@ -1025,7 +1025,7 @@ static struct timing_generator *dcn401_timing_generator_create(
uint32_t instance)
{
struct optc *tgn10 =
- kzalloc_obj(struct optc, GFP_KERNEL);
+ kzalloc_obj(struct optc);
if (!tgn10)
return NULL;
@@ -1065,7 +1065,7 @@ static struct link_encoder *dcn401_link_encoder_create(
const struct encoder_init_data *enc_init_data)
{
struct dcn20_link_encoder *enc20 =
- kzalloc_obj(struct dcn20_link_encoder, GFP_KERNEL);
+ kzalloc_obj(struct dcn20_link_encoder);
if (!enc20 || enc_init_data->hpd_source >= ARRAY_SIZE(link_enc_hpd_regs))
return NULL;
@@ -1130,7 +1130,7 @@ static struct vpg *dcn401_vpg_create(
struct dc_context *ctx,
uint32_t inst)
{
- struct dcn31_vpg *vpg4 = kzalloc_obj(struct dcn31_vpg, GFP_KERNEL);
+ struct dcn31_vpg *vpg4 = kzalloc_obj(struct dcn31_vpg);
if (!vpg4)
return NULL;
@@ -1160,7 +1160,7 @@ static struct afmt *dcn401_afmt_create(
struct dc_context *ctx,
uint32_t inst)
{
- struct dcn30_afmt *afmt401 = kzalloc_obj(struct dcn30_afmt, GFP_KERNEL);
+ struct dcn30_afmt *afmt401 = kzalloc_obj(struct dcn30_afmt);
if (!afmt401)
return NULL;
@@ -1185,7 +1185,7 @@ static struct apg *dcn401_apg_create(
struct dc_context *ctx,
uint32_t inst)
{
- struct dcn31_apg *apg31 = kzalloc_obj(struct dcn31_apg, GFP_KERNEL);
+ struct dcn31_apg *apg31 = kzalloc_obj(struct dcn31_apg);
if (!apg31)
return NULL;
@@ -1222,7 +1222,7 @@ static struct stream_encoder *dcn401_stream_encoder_create(
} else
return NULL;
- enc1 = kzalloc_obj(struct dcn10_stream_encoder, GFP_KERNEL);
+ enc1 = kzalloc_obj(struct dcn10_stream_encoder);
vpg = dcn401_vpg_create(ctx, vpg_inst);
afmt = dcn401_afmt_create(ctx, afmt_inst);
@@ -1312,7 +1312,7 @@ static struct hpo_dp_link_encoder *dcn401_hpo_dp_link_encoder_create(
struct dcn31_hpo_dp_link_encoder *hpo_dp_enc31;
/* allocate HPO link encoder */
- hpo_dp_enc31 = kzalloc_obj(struct dcn31_hpo_dp_link_encoder, GFP_KERNEL);
+ hpo_dp_enc31 = kzalloc_obj(struct dcn31_hpo_dp_link_encoder);
if (!hpo_dp_enc31)
return NULL; /* out of memory */
@@ -1356,7 +1356,7 @@ static unsigned int dcn401_calc_num_avail_chans_for_mall(struct dc *dc, unsigned
static struct dce_hwseq *dcn401_hwseq_create(
struct dc_context *ctx)
{
- struct dce_hwseq *hws = kzalloc_obj(struct dce_hwseq, GFP_KERNEL);
+ struct dce_hwseq *hws = kzalloc_obj(struct dce_hwseq);
#undef REG_STRUCT
#define REG_STRUCT hwseq_reg
@@ -1609,7 +1609,7 @@ static struct display_stream_compressor *dcn401_dsc_create(
struct dc_context *ctx, uint32_t inst)
{
struct dcn401_dsc *dsc =
- kzalloc_obj(struct dcn401_dsc, GFP_KERNEL);
+ kzalloc_obj(struct dcn401_dsc);
if (!dsc) {
BREAK_TO_DEBUGGER();
@@ -2314,7 +2314,7 @@ struct resource_pool *dcn401_create_resource_pool(
struct dc *dc)
{
struct dcn401_resource_pool *pool =
- kzalloc_obj(struct dcn401_resource_pool, GFP_KERNEL);
+ kzalloc_obj(struct dcn401_resource_pool);
if (!pool)
return NULL;
diff --git a/drivers/gpu/drm/amd/display/dc/soc_and_ip_translator/soc_and_ip_translator.c b/drivers/gpu/drm/amd/display/dc/soc_and_ip_translator/soc_and_ip_translator.c
index 1334d0efe6e3..6617c9d2d5f8 100644
--- a/drivers/gpu/drm/amd/display/dc/soc_and_ip_translator/soc_and_ip_translator.c
+++ b/drivers/gpu/drm/amd/display/dc/soc_and_ip_translator/soc_and_ip_translator.c
@@ -21,7 +21,7 @@ struct soc_and_ip_translator *dc_create_soc_and_ip_translator(enum dce_version d
{
struct soc_and_ip_translator *soc_and_ip_translator;
- soc_and_ip_translator = kzalloc_obj(*soc_and_ip_translator, GFP_KERNEL);
+ soc_and_ip_translator = kzalloc_obj(*soc_and_ip_translator);
if (!soc_and_ip_translator)
return NULL;
diff --git a/drivers/gpu/drm/amd/display/modules/color/color_gamma.c b/drivers/gpu/drm/amd/display/modules/color/color_gamma.c
index 33a7627191f8..a62ff18f3434 100644
--- a/drivers/gpu/drm/amd/display/modules/color/color_gamma.c
+++ b/drivers/gpu/drm/amd/display/modules/color/color_gamma.c
@@ -933,7 +933,7 @@ static bool build_regamma(struct pwl_float_data_ex *rgb_regamma,
struct pwl_float_data_ex *rgb = rgb_regamma;
const struct hw_x_point *coord_x = coordinate_x;
- coeff = kvzalloc_obj(*coeff, GFP_KERNEL);
+ coeff = kvzalloc_obj(*coeff);
if (!coeff)
goto release;
@@ -1738,11 +1738,11 @@ bool mod_color_calculate_degamma_params(struct dc_color_caps *dc_caps,
scale_gamma(rgb_user, ramp, dividers);
}
- curve = kvzalloc_objs(*curve, MAX_HW_POINTS + _EXTRA_POINTS, GFP_KERNEL);
+ curve = kvzalloc_objs(*curve, MAX_HW_POINTS + _EXTRA_POINTS);
if (!curve)
goto curve_alloc_fail;
- coeff = kvzalloc_objs(*coeff, MAX_HW_POINTS + _EXTRA_POINTS, GFP_KERNEL);
+ coeff = kvzalloc_objs(*coeff, MAX_HW_POINTS + _EXTRA_POINTS);
if (!coeff)
goto coeff_alloc_fail;
@@ -1970,7 +1970,7 @@ bool mod_color_calculate_regamma_params(struct dc_transfer_func *output_tf,
if (!rgb_regamma)
goto rgb_regamma_alloc_fail;
- coeff = kvzalloc_objs(*coeff, MAX_HW_POINTS + _EXTRA_POINTS, GFP_KERNEL);
+ coeff = kvzalloc_objs(*coeff, MAX_HW_POINTS + _EXTRA_POINTS);
if (!coeff)
goto coeff_alloc_fail;
diff --git a/drivers/gpu/drm/amd/display/modules/freesync/freesync.c b/drivers/gpu/drm/amd/display/modules/freesync/freesync.c
index b819610021f2..19de72173052 100644
--- a/drivers/gpu/drm/amd/display/modules/freesync/freesync.c
+++ b/drivers/gpu/drm/amd/display/modules/freesync/freesync.c
@@ -61,7 +61,7 @@ struct core_freesync {
struct mod_freesync *mod_freesync_create(struct dc *dc)
{
struct core_freesync *core_freesync =
- kzalloc_obj(struct core_freesync, GFP_KERNEL);
+ kzalloc_obj(struct core_freesync);
if (core_freesync == NULL)
goto fail_alloc_context;
diff --git a/drivers/gpu/drm/amd/display/modules/vmid/vmid.c b/drivers/gpu/drm/amd/display/modules/vmid/vmid.c
index ccd35d1f05ec..9f408cb11ac9 100644
--- a/drivers/gpu/drm/amd/display/modules/vmid/vmid.c
+++ b/drivers/gpu/drm/amd/display/modules/vmid/vmid.c
@@ -144,7 +144,7 @@ struct mod_vmid *mod_vmid_create(
if (dc == NULL)
goto fail_dc_null;
- core_vmid = kzalloc_obj(struct core_vmid, GFP_KERNEL);
+ core_vmid = kzalloc_obj(struct core_vmid);
if (core_vmid == NULL)
goto fail_alloc_context;
diff --git a/drivers/gpu/drm/amd/pm/amdgpu_pm.c b/drivers/gpu/drm/amd/pm/amdgpu_pm.c
index 28b178d0aff6..eca93a9d0b84 100644
--- a/drivers/gpu/drm/amd/pm/amdgpu_pm.c
+++ b/drivers/gpu/drm/amd/pm/amdgpu_pm.c
@@ -2746,7 +2746,7 @@ static int amdgpu_device_attr_create(struct amdgpu_device *adev,
name, ret);
}
- attr_entry = kmalloc_obj(*attr_entry, GFP_KERNEL);
+ attr_entry = kmalloc_obj(*attr_entry);
if (!attr_entry)
return -ENOMEM;
@@ -4592,7 +4592,7 @@ static int amdgpu_od_set_init(struct amdgpu_device *adev)
int ret;
/* Setup the top `gpu_od` directory which holds all other OD interfaces */
- top_set = kzalloc_obj(*top_set, GFP_KERNEL);
+ top_set = kzalloc_obj(*top_set);
if (!top_set)
return -ENOMEM;
list_add(&top_set->entry, &adev->pm.od_kobj_list);
@@ -4629,7 +4629,7 @@ static int amdgpu_od_set_init(struct amdgpu_device *adev)
* The container is presented as a plain file under top `gpu_od`
* directory.
*/
- attribute = kzalloc_obj(*attribute, GFP_KERNEL);
+ attribute = kzalloc_obj(*attribute);
if (!attribute) {
ret = -ENOMEM;
goto err_out;
@@ -4649,7 +4649,7 @@ static int amdgpu_od_set_init(struct amdgpu_device *adev)
goto err_out;
} else {
/* The container is presented as a sub directory. */
- sub_set = kzalloc_obj(*sub_set, GFP_KERNEL);
+ sub_set = kzalloc_obj(*sub_set);
if (!sub_set) {
ret = -ENOMEM;
goto err_out;
@@ -4679,7 +4679,7 @@ static int amdgpu_od_set_init(struct amdgpu_device *adev)
* With the container presented as a sub directory, the entry within
* it is presented as a plain file under the sub directory.
*/
- attribute = kzalloc_obj(*attribute, GFP_KERNEL);
+ attribute = kzalloc_obj(*attribute);
if (!attribute) {
ret = -ENOMEM;
goto err_out;
diff --git a/drivers/gpu/drm/amd/pm/legacy-dpm/kv_dpm.c b/drivers/gpu/drm/amd/pm/legacy-dpm/kv_dpm.c
index 5d0c0c5a706b..7a0d6e05e83b 100644
--- a/drivers/gpu/drm/amd/pm/legacy-dpm/kv_dpm.c
+++ b/drivers/gpu/drm/amd/pm/legacy-dpm/kv_dpm.c
@@ -2735,7 +2735,7 @@ static int kv_parse_power_table(struct amdgpu_device *adev)
non_clock_array_index = power_state->v2.nonClockInfoIndex;
non_clock_info = (struct _ATOM_PPLIB_NONCLOCK_INFO *)
&non_clock_info_array->nonClockInfo[non_clock_array_index];
- ps = kzalloc_obj(struct kv_ps, GFP_KERNEL);
+ ps = kzalloc_obj(struct kv_ps);
if (ps == NULL)
return -ENOMEM;
adev->pm.dpm.ps[i].ps_priv = ps;
@@ -2782,7 +2782,7 @@ static int kv_dpm_init(struct amdgpu_device *adev)
struct kv_power_info *pi;
int ret, i;
- pi = kzalloc_obj(struct kv_power_info, GFP_KERNEL);
+ pi = kzalloc_obj(struct kv_power_info);
if (pi == NULL)
return -ENOMEM;
adev->pm.dpm.priv = pi;
diff --git a/drivers/gpu/drm/amd/pm/legacy-dpm/legacy_dpm.c b/drivers/gpu/drm/amd/pm/legacy-dpm/legacy_dpm.c
index c41bcc8a7efb..37d704ac3841 100644
--- a/drivers/gpu/drm/amd/pm/legacy-dpm/legacy_dpm.c
+++ b/drivers/gpu/drm/amd/pm/legacy-dpm/legacy_dpm.c
@@ -502,7 +502,7 @@ int amdgpu_parse_extended_power_table(struct amdgpu_device *adev)
(mode_info->atom_context->bios + data_offset +
le16_to_cpu(ext_hdr->usPPMTableOffset));
adev->pm.dpm.dyn_state.ppm_table =
- kzalloc_obj(struct amdgpu_ppm_table, GFP_KERNEL);
+ kzalloc_obj(struct amdgpu_ppm_table);
if (!adev->pm.dpm.dyn_state.ppm_table)
return -ENOMEM;
adev->pm.dpm.dyn_state.ppm_table->ppm_design = ppm->ucPpmDesign;
diff --git a/drivers/gpu/drm/amd/pm/legacy-dpm/si_dpm.c b/drivers/gpu/drm/amd/pm/legacy-dpm/si_dpm.c
index b4fc0106f973..c81327da1f72 100644
--- a/drivers/gpu/drm/amd/pm/legacy-dpm/si_dpm.c
+++ b/drivers/gpu/drm/amd/pm/legacy-dpm/si_dpm.c
@@ -2586,7 +2586,7 @@ static int si_initialize_smc_dte_tables(struct amdgpu_device *adev)
if (dte_data->k <= 0)
return -EINVAL;
- dte_tables = kzalloc_obj(Smc_SIslands_DTE_Configuration, GFP_KERNEL);
+ dte_tables = kzalloc_obj(Smc_SIslands_DTE_Configuration);
if (dte_tables == NULL) {
si_pi->enable_dte = false;
return -ENOMEM;
@@ -2767,7 +2767,7 @@ static int si_initialize_smc_cac_tables(struct amdgpu_device *adev)
if (ni_pi->enable_cac == false)
return 0;
- cac_tables = kzalloc_obj(PP_SIslands_CacConfig, GFP_KERNEL);
+ cac_tables = kzalloc_obj(PP_SIslands_CacConfig);
if (!cac_tables)
return -ENOMEM;
@@ -2964,7 +2964,7 @@ static int si_init_smc_spll_table(struct amdgpu_device *adev)
if (si_pi->spll_table_start == 0)
return -EINVAL;
- spll_table = kzalloc_obj(SMC_SISLANDS_SPLL_DIV_TABLE, GFP_KERNEL);
+ spll_table = kzalloc_obj(SMC_SISLANDS_SPLL_DIV_TABLE);
if (spll_table == NULL)
return -ENOMEM;
@@ -6054,7 +6054,7 @@ static int si_initialize_mc_reg_table(struct amdgpu_device *adev)
u8 module_index = rv770_get_memory_module_index(adev);
int ret;
- table = kzalloc_obj(struct atom_mc_reg_table, GFP_KERNEL);
+ table = kzalloc_obj(struct atom_mc_reg_table);
if (!table)
return -ENOMEM;
@@ -7352,7 +7352,7 @@ static int si_parse_power_table(struct amdgpu_device *adev)
non_clock_array_index = power_state->v2.nonClockInfoIndex;
non_clock_info = (struct _ATOM_PPLIB_NONCLOCK_INFO *)
&non_clock_info_array->nonClockInfo[non_clock_array_index];
- ps = kzalloc_obj(struct si_ps, GFP_KERNEL);
+ ps = kzalloc_obj(struct si_ps);
if (ps == NULL)
return -ENOMEM;
adev->pm.dpm.ps[i].ps_priv = ps;
@@ -7405,7 +7405,7 @@ static int si_dpm_init(struct amdgpu_device *adev)
struct atom_clock_dividers dividers;
int ret;
- si_pi = kzalloc_obj(struct si_power_info, GFP_KERNEL);
+ si_pi = kzalloc_obj(struct si_power_info);
if (si_pi == NULL)
return -ENOMEM;
adev->pm.dpm.priv = si_pi;
diff --git a/drivers/gpu/drm/amd/pm/powerplay/amd_powerplay.c b/drivers/gpu/drm/amd/pm/powerplay/amd_powerplay.c
index cd3036e33c5a..e558b81b25c9 100644
--- a/drivers/gpu/drm/amd/pm/powerplay/amd_powerplay.c
+++ b/drivers/gpu/drm/amd/pm/powerplay/amd_powerplay.c
@@ -41,7 +41,7 @@ static int amd_powerplay_create(struct amdgpu_device *adev)
if (adev == NULL)
return -EINVAL;
- hwmgr = kzalloc_obj(struct pp_hwmgr, GFP_KERNEL);
+ hwmgr = kzalloc_obj(struct pp_hwmgr);
if (hwmgr == NULL)
return -ENOMEM;
diff --git a/drivers/gpu/drm/amd/pm/powerplay/hwmgr/process_pptables_v1_0.c b/drivers/gpu/drm/amd/pm/powerplay/hwmgr/process_pptables_v1_0.c
index a1292d5b0a1c..37a85d8a3db2 100644
--- a/drivers/gpu/drm/amd/pm/powerplay/hwmgr/process_pptables_v1_0.c
+++ b/drivers/gpu/drm/amd/pm/powerplay/hwmgr/process_pptables_v1_0.c
@@ -200,7 +200,7 @@ static int get_platform_power_management_table(
struct pp_hwmgr *hwmgr,
ATOM_Tonga_PPM_Table *atom_ppm_table)
{
- struct phm_ppm_table *ptr = kzalloc_obj(*ptr, GFP_KERNEL);
+ struct phm_ppm_table *ptr = kzalloc_obj(*ptr);
struct phm_ppt_v1_information *pp_table_information =
(struct phm_ppt_v1_information *)(hwmgr->pptable);
@@ -1142,7 +1142,7 @@ static int pp_tables_v1_0_initialize(struct pp_hwmgr *hwmgr)
int result = 0;
const ATOM_Tonga_POWERPLAYTABLE *powerplay_table;
- hwmgr->pptable = kzalloc_obj(struct phm_ppt_v1_information, GFP_KERNEL);
+ hwmgr->pptable = kzalloc_obj(struct phm_ppt_v1_information);
PP_ASSERT_WITH_CODE((NULL != hwmgr->pptable),
"Failed to allocate hwmgr->pptable!", return -ENOMEM);
diff --git a/drivers/gpu/drm/amd/pm/powerplay/hwmgr/smu10_hwmgr.c b/drivers/gpu/drm/amd/pm/powerplay/hwmgr/smu10_hwmgr.c
index 49dc20b790ad..d83e5c53bd43 100644
--- a/drivers/gpu/drm/amd/pm/powerplay/hwmgr/smu10_hwmgr.c
+++ b/drivers/gpu/drm/amd/pm/powerplay/hwmgr/smu10_hwmgr.c
@@ -550,7 +550,7 @@ static int smu10_hwmgr_backend_init(struct pp_hwmgr *hwmgr)
int result = 0;
struct smu10_hwmgr *data;
- data = kzalloc_obj(struct smu10_hwmgr, GFP_KERNEL);
+ data = kzalloc_obj(struct smu10_hwmgr);
if (data == NULL)
return -ENOMEM;
diff --git a/drivers/gpu/drm/amd/pm/powerplay/hwmgr/smu7_hwmgr.c b/drivers/gpu/drm/amd/pm/powerplay/hwmgr/smu7_hwmgr.c
index a97136743723..e38222877f7e 100644
--- a/drivers/gpu/drm/amd/pm/powerplay/hwmgr/smu7_hwmgr.c
+++ b/drivers/gpu/drm/amd/pm/powerplay/hwmgr/smu7_hwmgr.c
@@ -2961,7 +2961,7 @@ static int smu7_hwmgr_backend_init(struct pp_hwmgr *hwmgr)
struct smu7_hwmgr *data;
int result = 0;
- data = kzalloc_obj(struct smu7_hwmgr, GFP_KERNEL);
+ data = kzalloc_obj(struct smu7_hwmgr);
if (data == NULL)
return -ENOMEM;
@@ -4652,7 +4652,7 @@ static const struct amdgpu_irq_src_funcs smu7_irq_funcs = {
static int smu7_register_irq_handlers(struct pp_hwmgr *hwmgr)
{
struct amdgpu_irq_src *source =
- kzalloc_obj(struct amdgpu_irq_src, GFP_KERNEL);
+ kzalloc_obj(struct amdgpu_irq_src);
if (!source)
return -ENOMEM;
diff --git a/drivers/gpu/drm/amd/pm/powerplay/hwmgr/smu8_hwmgr.c b/drivers/gpu/drm/amd/pm/powerplay/hwmgr/smu8_hwmgr.c
index 5d20c41b3803..8133f2cc5e1d 100644
--- a/drivers/gpu/drm/amd/pm/powerplay/hwmgr/smu8_hwmgr.c
+++ b/drivers/gpu/drm/amd/pm/powerplay/hwmgr/smu8_hwmgr.c
@@ -1121,7 +1121,7 @@ static int smu8_hwmgr_backend_init(struct pp_hwmgr *hwmgr)
int result = 0;
struct smu8_hwmgr *data;
- data = kzalloc_obj(struct smu8_hwmgr, GFP_KERNEL);
+ data = kzalloc_obj(struct smu8_hwmgr);
if (data == NULL)
return -ENOMEM;
diff --git a/drivers/gpu/drm/amd/pm/powerplay/hwmgr/smu_helper.c b/drivers/gpu/drm/amd/pm/powerplay/hwmgr/smu_helper.c
index 68ae1bc36a7f..29837c0f42ed 100644
--- a/drivers/gpu/drm/amd/pm/powerplay/hwmgr/smu_helper.c
+++ b/drivers/gpu/drm/amd/pm/powerplay/hwmgr/smu_helper.c
@@ -211,7 +211,7 @@ int phm_trim_voltage_table(struct pp_atomctrl_voltage_table *vol_table)
PP_ASSERT_WITH_CODE((NULL != vol_table),
"Voltage Table empty.", return -EINVAL);
- table = kzalloc_obj(struct pp_atomctrl_voltage_table, GFP_KERNEL);
+ table = kzalloc_obj(struct pp_atomctrl_voltage_table);
if (NULL == table)
return -EINVAL;
@@ -644,7 +644,7 @@ static const struct amdgpu_irq_src_funcs smu9_irq_funcs = {
int smu9_register_irq_handlers(struct pp_hwmgr *hwmgr)
{
struct amdgpu_irq_src *source =
- kzalloc_obj(struct amdgpu_irq_src, GFP_KERNEL);
+ kzalloc_obj(struct amdgpu_irq_src);
if (!source)
return -ENOMEM;
diff --git a/drivers/gpu/drm/amd/pm/powerplay/hwmgr/vega10_hwmgr.c b/drivers/gpu/drm/amd/pm/powerplay/hwmgr/vega10_hwmgr.c
index 255fa6c96120..d9899cf7020b 100644
--- a/drivers/gpu/drm/amd/pm/powerplay/hwmgr/vega10_hwmgr.c
+++ b/drivers/gpu/drm/amd/pm/powerplay/hwmgr/vega10_hwmgr.c
@@ -831,7 +831,7 @@ static int vega10_hwmgr_backend_init(struct pp_hwmgr *hwmgr)
struct pp_atomfwctrl_voltage_table vol_table;
struct amdgpu_device *adev = hwmgr->adev;
- data = kzalloc_obj(struct vega10_hwmgr, GFP_KERNEL);
+ data = kzalloc_obj(struct vega10_hwmgr);
if (data == NULL)
return -ENOMEM;
@@ -1029,7 +1029,7 @@ static int vega10_trim_voltage_table(struct pp_hwmgr *hwmgr,
PP_ASSERT_WITH_CODE(vol_table,
"Voltage Table empty.", return -EINVAL);
- table = kzalloc_obj(struct pp_atomfwctrl_voltage_table, GFP_KERNEL);
+ table = kzalloc_obj(struct pp_atomfwctrl_voltage_table);
if (!table)
return -ENOMEM;
diff --git a/drivers/gpu/drm/amd/pm/powerplay/hwmgr/vega10_processpptables.c b/drivers/gpu/drm/amd/pm/powerplay/hwmgr/vega10_processpptables.c
index 2b9a1840a35a..b9a1ab27d995 100644
--- a/drivers/gpu/drm/amd/pm/powerplay/hwmgr/vega10_processpptables.c
+++ b/drivers/gpu/drm/amd/pm/powerplay/hwmgr/vega10_processpptables.c
@@ -1148,7 +1148,7 @@ static int vega10_pp_tables_initialize(struct pp_hwmgr *hwmgr)
int result = 0;
const ATOM_Vega10_POWERPLAYTABLE *powerplay_table;
- hwmgr->pptable = kzalloc_obj(struct phm_ppt_v2_information, GFP_KERNEL);
+ hwmgr->pptable = kzalloc_obj(struct phm_ppt_v2_information);
PP_ASSERT_WITH_CODE((hwmgr->pptable != NULL),
"Failed to allocate hwmgr->pptable!", return -ENOMEM);
diff --git a/drivers/gpu/drm/amd/pm/powerplay/hwmgr/vega12_hwmgr.c b/drivers/gpu/drm/amd/pm/powerplay/hwmgr/vega12_hwmgr.c
index eca05a6c868f..a9a85fd639b2 100644
--- a/drivers/gpu/drm/amd/pm/powerplay/hwmgr/vega12_hwmgr.c
+++ b/drivers/gpu/drm/amd/pm/powerplay/hwmgr/vega12_hwmgr.c
@@ -395,7 +395,7 @@ static int vega12_hwmgr_backend_init(struct pp_hwmgr *hwmgr)
struct vega12_hwmgr *data;
struct amdgpu_device *adev = hwmgr->adev;
- data = kzalloc_obj(struct vega12_hwmgr, GFP_KERNEL);
+ data = kzalloc_obj(struct vega12_hwmgr);
if (data == NULL)
return -ENOMEM;
diff --git a/drivers/gpu/drm/amd/pm/powerplay/hwmgr/vega12_processpptables.c b/drivers/gpu/drm/amd/pm/powerplay/hwmgr/vega12_processpptables.c
index b8fad7417190..55e13f376039 100644
--- a/drivers/gpu/drm/amd/pm/powerplay/hwmgr/vega12_processpptables.c
+++ b/drivers/gpu/drm/amd/pm/powerplay/hwmgr/vega12_processpptables.c
@@ -263,7 +263,7 @@ static int vega12_pp_tables_initialize(struct pp_hwmgr *hwmgr)
int result = 0;
const ATOM_Vega12_POWERPLAYTABLE *powerplay_table;
- hwmgr->pptable = kzalloc_obj(struct phm_ppt_v3_information, GFP_KERNEL);
+ hwmgr->pptable = kzalloc_obj(struct phm_ppt_v3_information);
PP_ASSERT_WITH_CODE((hwmgr->pptable != NULL),
"Failed to allocate hwmgr->pptable!", return -ENOMEM);
diff --git a/drivers/gpu/drm/amd/pm/powerplay/hwmgr/vega20_hwmgr.c b/drivers/gpu/drm/amd/pm/powerplay/hwmgr/vega20_hwmgr.c
index 1dc84beaf440..dab9b78a9fc8 100644
--- a/drivers/gpu/drm/amd/pm/powerplay/hwmgr/vega20_hwmgr.c
+++ b/drivers/gpu/drm/amd/pm/powerplay/hwmgr/vega20_hwmgr.c
@@ -436,7 +436,7 @@ static int vega20_hwmgr_backend_init(struct pp_hwmgr *hwmgr)
struct amdgpu_device *adev = hwmgr->adev;
int result;
- data = kzalloc_obj(struct vega20_hwmgr, GFP_KERNEL);
+ data = kzalloc_obj(struct vega20_hwmgr);
if (data == NULL)
return -ENOMEM;
diff --git a/drivers/gpu/drm/amd/pm/powerplay/hwmgr/vega20_processpptables.c b/drivers/gpu/drm/amd/pm/powerplay/hwmgr/vega20_processpptables.c
index 4316b5e4b848..36cb7aa80d07 100644
--- a/drivers/gpu/drm/amd/pm/powerplay/hwmgr/vega20_processpptables.c
+++ b/drivers/gpu/drm/amd/pm/powerplay/hwmgr/vega20_processpptables.c
@@ -336,7 +336,7 @@ static int vega20_pp_tables_initialize(struct pp_hwmgr *hwmgr)
int result = 0;
const ATOM_Vega20_POWERPLAYTABLE *powerplay_table;
- hwmgr->pptable = kzalloc_obj(struct phm_ppt_v3_information, GFP_KERNEL);
+ hwmgr->pptable = kzalloc_obj(struct phm_ppt_v3_information);
PP_ASSERT_WITH_CODE((hwmgr->pptable != NULL),
"Failed to allocate hwmgr->pptable!", return -ENOMEM);
diff --git a/drivers/gpu/drm/amd/pm/powerplay/smumgr/ci_smumgr.c b/drivers/gpu/drm/amd/pm/powerplay/smumgr/ci_smumgr.c
index 12a699a8c954..62ebec1c6fe3 100644
--- a/drivers/gpu/drm/amd/pm/powerplay/smumgr/ci_smumgr.c
+++ b/drivers/gpu/drm/amd/pm/powerplay/smumgr/ci_smumgr.c
@@ -2681,7 +2681,7 @@ static int ci_initialize_mc_reg_table(struct pp_hwmgr *hwmgr)
struct ci_mc_reg_table *ni_table = &smu_data->mc_reg_table;
uint8_t module_index = ci_get_memory_modile_index(hwmgr);
- table = kzalloc_obj(pp_atomctrl_mc_reg_table, GFP_KERNEL);
+ table = kzalloc_obj(pp_atomctrl_mc_reg_table);
if (NULL == table)
return -ENOMEM;
@@ -2735,7 +2735,7 @@ static int ci_smu_init(struct pp_hwmgr *hwmgr)
{
struct ci_smumgr *ci_priv;
- ci_priv = kzalloc_obj(struct ci_smumgr, GFP_KERNEL);
+ ci_priv = kzalloc_obj(struct ci_smumgr);
if (ci_priv == NULL)
return -ENOMEM;
diff --git a/drivers/gpu/drm/amd/pm/powerplay/smumgr/fiji_smumgr.c b/drivers/gpu/drm/amd/pm/powerplay/smumgr/fiji_smumgr.c
index d7fd3a36ac95..7cf389e4717e 100644
--- a/drivers/gpu/drm/amd/pm/powerplay/smumgr/fiji_smumgr.c
+++ b/drivers/gpu/drm/amd/pm/powerplay/smumgr/fiji_smumgr.c
@@ -334,7 +334,7 @@ static int fiji_smu_init(struct pp_hwmgr *hwmgr)
{
struct fiji_smumgr *fiji_priv;
- fiji_priv = kzalloc_obj(struct fiji_smumgr, GFP_KERNEL);
+ fiji_priv = kzalloc_obj(struct fiji_smumgr);
if (fiji_priv == NULL)
return -ENOMEM;
diff --git a/drivers/gpu/drm/amd/pm/powerplay/smumgr/iceland_smumgr.c b/drivers/gpu/drm/amd/pm/powerplay/smumgr/iceland_smumgr.c
index b990def7d1aa..8f1bcbb482b5 100644
--- a/drivers/gpu/drm/amd/pm/powerplay/smumgr/iceland_smumgr.c
+++ b/drivers/gpu/drm/amd/pm/powerplay/smumgr/iceland_smumgr.c
@@ -261,7 +261,7 @@ static int iceland_smu_init(struct pp_hwmgr *hwmgr)
{
struct iceland_smumgr *iceland_priv;
- iceland_priv = kzalloc_obj(struct iceland_smumgr, GFP_KERNEL);
+ iceland_priv = kzalloc_obj(struct iceland_smumgr);
if (iceland_priv == NULL)
return -ENOMEM;
@@ -2608,7 +2608,7 @@ static int iceland_initialize_mc_reg_table(struct pp_hwmgr *hwmgr)
struct iceland_mc_reg_table *ni_table = &smu_data->mc_reg_table;
uint8_t module_index = iceland_get_memory_modile_index(hwmgr);
- table = kzalloc_obj(pp_atomctrl_mc_reg_table, GFP_KERNEL);
+ table = kzalloc_obj(pp_atomctrl_mc_reg_table);
if (NULL == table)
return -ENOMEM;
diff --git a/drivers/gpu/drm/amd/pm/powerplay/smumgr/polaris10_smumgr.c b/drivers/gpu/drm/amd/pm/powerplay/smumgr/polaris10_smumgr.c
index 497a70988960..e59b87238e76 100644
--- a/drivers/gpu/drm/amd/pm/powerplay/smumgr/polaris10_smumgr.c
+++ b/drivers/gpu/drm/amd/pm/powerplay/smumgr/polaris10_smumgr.c
@@ -336,7 +336,7 @@ static int polaris10_smu_init(struct pp_hwmgr *hwmgr)
{
struct polaris10_smumgr *smu_data;
- smu_data = kzalloc_obj(struct polaris10_smumgr, GFP_KERNEL);
+ smu_data = kzalloc_obj(struct polaris10_smumgr);
if (smu_data == NULL)
return -ENOMEM;
diff --git a/drivers/gpu/drm/amd/pm/powerplay/smumgr/smu10_smumgr.c b/drivers/gpu/drm/amd/pm/powerplay/smumgr/smu10_smumgr.c
index 22e0db4e097f..c9fdca88c96a 100644
--- a/drivers/gpu/drm/amd/pm/powerplay/smumgr/smu10_smumgr.c
+++ b/drivers/gpu/drm/amd/pm/powerplay/smumgr/smu10_smumgr.c
@@ -244,7 +244,7 @@ static int smu10_smu_init(struct pp_hwmgr *hwmgr)
struct smu10_smumgr *priv;
int r;
- priv = kzalloc_obj(struct smu10_smumgr, GFP_KERNEL);
+ priv = kzalloc_obj(struct smu10_smumgr);
if (!priv)
return -ENOMEM;
diff --git a/drivers/gpu/drm/amd/pm/powerplay/smumgr/smu7_smumgr.c b/drivers/gpu/drm/amd/pm/powerplay/smumgr/smu7_smumgr.c
index 9d6203998b5c..3e0068a6aeb2 100644
--- a/drivers/gpu/drm/amd/pm/powerplay/smumgr/smu7_smumgr.c
+++ b/drivers/gpu/drm/amd/pm/powerplay/smumgr/smu7_smumgr.c
@@ -333,7 +333,7 @@ int smu7_request_smu_load_fw(struct pp_hwmgr *hwmgr)
if (!smu_data->toc) {
struct SMU_DRAMData_TOC *toc;
- smu_data->toc = kzalloc_obj(struct SMU_DRAMData_TOC, GFP_KERNEL);
+ smu_data->toc = kzalloc_obj(struct SMU_DRAMData_TOC);
if (!smu_data->toc)
return -ENOMEM;
toc = smu_data->toc;
diff --git a/drivers/gpu/drm/amd/pm/powerplay/smumgr/smu8_smumgr.c b/drivers/gpu/drm/amd/pm/powerplay/smumgr/smu8_smumgr.c
index 82f4f466db8a..f3f2b8fe8d63 100644
--- a/drivers/gpu/drm/amd/pm/powerplay/smumgr/smu8_smumgr.c
+++ b/drivers/gpu/drm/amd/pm/powerplay/smumgr/smu8_smumgr.c
@@ -758,7 +758,7 @@ static int smu8_smu_init(struct pp_hwmgr *hwmgr)
int ret = 0;
struct smu8_smumgr *smu8_smu;
- smu8_smu = kzalloc_obj(struct smu8_smumgr, GFP_KERNEL);
+ smu8_smu = kzalloc_obj(struct smu8_smumgr);
if (smu8_smu == NULL)
return -ENOMEM;
diff --git a/drivers/gpu/drm/amd/pm/powerplay/smumgr/tonga_smumgr.c b/drivers/gpu/drm/amd/pm/powerplay/smumgr/tonga_smumgr.c
index 95d87b12df04..28fe988c2262 100644
--- a/drivers/gpu/drm/amd/pm/powerplay/smumgr/tonga_smumgr.c
+++ b/drivers/gpu/drm/amd/pm/powerplay/smumgr/tonga_smumgr.c
@@ -228,7 +228,7 @@ static int tonga_smu_init(struct pp_hwmgr *hwmgr)
{
struct tonga_smumgr *tonga_priv;
- tonga_priv = kzalloc_obj(struct tonga_smumgr, GFP_KERNEL);
+ tonga_priv = kzalloc_obj(struct tonga_smumgr);
if (tonga_priv == NULL)
return -ENOMEM;
@@ -3072,7 +3072,7 @@ static int tonga_initialize_mc_reg_table(struct pp_hwmgr *hwmgr)
struct tonga_mc_reg_table *ni_table = &smu_data->mc_reg_table;
uint8_t module_index = tonga_get_memory_modile_index(hwmgr);
- table = kzalloc_obj(pp_atomctrl_mc_reg_table, GFP_KERNEL);
+ table = kzalloc_obj(pp_atomctrl_mc_reg_table);
if (table == NULL)
return -ENOMEM;
diff --git a/drivers/gpu/drm/amd/pm/powerplay/smumgr/vega10_smumgr.c b/drivers/gpu/drm/amd/pm/powerplay/smumgr/vega10_smumgr.c
index fe960e3c1010..39192adf441f 100644
--- a/drivers/gpu/drm/amd/pm/powerplay/smumgr/vega10_smumgr.c
+++ b/drivers/gpu/drm/amd/pm/powerplay/smumgr/vega10_smumgr.c
@@ -218,7 +218,7 @@ static int vega10_smu_init(struct pp_hwmgr *hwmgr)
if (ret || !info.kptr)
return -EINVAL;
- priv = kzalloc_obj(struct vega10_smumgr, GFP_KERNEL);
+ priv = kzalloc_obj(struct vega10_smumgr);
if (!priv)
return -ENOMEM;
diff --git a/drivers/gpu/drm/amd/pm/powerplay/smumgr/vega12_smumgr.c b/drivers/gpu/drm/amd/pm/powerplay/smumgr/vega12_smumgr.c
index bd846c4f09a1..99db4cf8e11d 100644
--- a/drivers/gpu/drm/amd/pm/powerplay/smumgr/vega12_smumgr.c
+++ b/drivers/gpu/drm/amd/pm/powerplay/smumgr/vega12_smumgr.c
@@ -221,7 +221,7 @@ static int vega12_smu_init(struct pp_hwmgr *hwmgr)
if (ret || !info.kptr)
return -EINVAL;
- priv = kzalloc_obj(struct vega12_smumgr, GFP_KERNEL);
+ priv = kzalloc_obj(struct vega12_smumgr);
if (!priv)
return -ENOMEM;
diff --git a/drivers/gpu/drm/amd/pm/powerplay/smumgr/vega20_smumgr.c b/drivers/gpu/drm/amd/pm/powerplay/smumgr/vega20_smumgr.c
index 7dda3ad13861..b982c03f9e9a 100644
--- a/drivers/gpu/drm/amd/pm/powerplay/smumgr/vega20_smumgr.c
+++ b/drivers/gpu/drm/amd/pm/powerplay/smumgr/vega20_smumgr.c
@@ -430,7 +430,7 @@ static int vega20_smu_init(struct pp_hwmgr *hwmgr)
if (ret || !info.kptr)
return -EINVAL;
- priv = kzalloc_obj(struct vega20_smumgr, GFP_KERNEL);
+ priv = kzalloc_obj(struct vega20_smumgr);
if (!priv)
return -ENOMEM;
diff --git a/drivers/gpu/drm/amd/pm/powerplay/smumgr/vegam_smumgr.c b/drivers/gpu/drm/amd/pm/powerplay/smumgr/vegam_smumgr.c
index 57eed236baa4..cca6693853ec 100644
--- a/drivers/gpu/drm/amd/pm/powerplay/smumgr/vegam_smumgr.c
+++ b/drivers/gpu/drm/amd/pm/powerplay/smumgr/vegam_smumgr.c
@@ -83,7 +83,7 @@ static int vegam_smu_init(struct pp_hwmgr *hwmgr)
{
struct vegam_smumgr *smu_data;
- smu_data = kzalloc_obj(struct vegam_smumgr, GFP_KERNEL);
+ smu_data = kzalloc_obj(struct vegam_smumgr);
if (smu_data == NULL)
return -ENOMEM;
diff --git a/drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c b/drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c
index 2f02410376b9..b05c8bbdf2f3 100644
--- a/drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c
+++ b/drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c
@@ -803,7 +803,7 @@ static int smu_early_init(struct amdgpu_ip_block *ip_block)
struct smu_context *smu;
int r;
- smu = kzalloc_obj(struct smu_context, GFP_KERNEL);
+ smu = kzalloc_obj(struct smu_context);
if (!smu)
return -ENOMEM;
diff --git a/drivers/gpu/drm/amd/pm/swsmu/smu11/arcturus_ppt.c b/drivers/gpu/drm/amd/pm/swsmu/smu11/arcturus_ppt.c
index 747879cbb4e6..ff3776eb0c69 100644
--- a/drivers/gpu/drm/amd/pm/swsmu/smu11/arcturus_ppt.c
+++ b/drivers/gpu/drm/amd/pm/swsmu/smu11/arcturus_ppt.c
@@ -267,7 +267,7 @@ static int arcturus_tables_init(struct smu_context *smu)
sizeof(DpmActivityMonitorCoeffInt_t), PAGE_SIZE,
AMDGPU_GEM_DOMAIN_VRAM);
- smu_table->metrics_table = kzalloc_obj(SmuMetrics_t, GFP_KERNEL);
+ smu_table->metrics_table = kzalloc_obj(SmuMetrics_t);
if (!smu_table->metrics_table)
return -ENOMEM;
smu_table->metrics_time = 0;
@@ -314,7 +314,7 @@ static int arcturus_allocate_dpm_context(struct smu_context *smu)
smu_dpm->dpm_context_size = sizeof(struct smu_11_0_dpm_context);
smu_dpm->dpm_policies =
- kzalloc_obj(struct smu_dpm_policy_ctxt, GFP_KERNEL);
+ kzalloc_obj(struct smu_dpm_policy_ctxt);
if (!smu_dpm->dpm_policies)
return -ENOMEM;
@@ -1579,7 +1579,7 @@ static int arcturus_i2c_xfer(struct i2c_adapter *i2c_adap,
if (!adev->pm.dpm_enabled)
return -EBUSY;
- req = kzalloc_obj(*req, GFP_KERNEL);
+ req = kzalloc_obj(*req);
if (!req)
return -ENOMEM;
diff --git a/drivers/gpu/drm/amd/pm/swsmu/smu11/cyan_skillfish_ppt.c b/drivers/gpu/drm/amd/pm/swsmu/smu11/cyan_skillfish_ppt.c
index 97a785182e58..4e70308a455e 100644
--- a/drivers/gpu/drm/amd/pm/swsmu/smu11/cyan_skillfish_ppt.c
+++ b/drivers/gpu/drm/amd/pm/swsmu/smu11/cyan_skillfish_ppt.c
@@ -97,7 +97,7 @@ static int cyan_skillfish_tables_init(struct smu_context *smu)
PAGE_SIZE,
AMDGPU_GEM_DOMAIN_VRAM);
- smu_table->metrics_table = kzalloc_obj(SmuMetrics_t, GFP_KERNEL);
+ smu_table->metrics_table = kzalloc_obj(SmuMetrics_t);
if (!smu_table->metrics_table)
goto err0_out;
diff --git a/drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c b/drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c
index 48c75e293541..4f12543270c3 100644
--- a/drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c
+++ b/drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c
@@ -516,7 +516,7 @@ static int navi10_tables_init(struct smu_context *smu)
dummy_read_1_table->align = PAGE_SIZE;
dummy_read_1_table->domain = AMDGPU_GEM_DOMAIN_VRAM;
- smu_table->metrics_table = kzalloc_obj(SmuMetrics_NV1X_t, GFP_KERNEL);
+ smu_table->metrics_table = kzalloc_obj(SmuMetrics_NV1X_t);
if (!smu_table->metrics_table)
goto err0_out;
smu_table->metrics_time = 0;
@@ -527,7 +527,7 @@ static int navi10_tables_init(struct smu_context *smu)
if (ret)
goto err1_out;
- smu_table->watermarks_table = kzalloc_obj(Watermarks_t, GFP_KERNEL);
+ smu_table->watermarks_table = kzalloc_obj(Watermarks_t);
if (!smu_table->watermarks_table)
goto err2_out;
@@ -2793,7 +2793,7 @@ static int navi10_i2c_xfer(struct i2c_adapter *i2c_adap,
if (!adev->pm.dpm_enabled)
return -EBUSY;
- req = kzalloc_obj(*req, GFP_KERNEL);
+ req = kzalloc_obj(*req);
if (!req)
return -ENOMEM;
diff --git a/drivers/gpu/drm/amd/pm/swsmu/smu11/sienna_cichlid_ppt.c b/drivers/gpu/drm/amd/pm/swsmu/smu11/sienna_cichlid_ppt.c
index 2c6378c51333..317cc269cc06 100644
--- a/drivers/gpu/drm/amd/pm/swsmu/smu11/sienna_cichlid_ppt.c
+++ b/drivers/gpu/drm/amd/pm/swsmu/smu11/sienna_cichlid_ppt.c
@@ -555,7 +555,7 @@ static int sienna_cichlid_tables_init(struct smu_context *smu)
SMU_TABLE_INIT(tables, SMU_TABLE_DRIVER_SMU_CONFIG, sizeof(DriverSmuConfigExternal_t),
PAGE_SIZE, AMDGPU_GEM_DOMAIN_VRAM);
- smu_table->metrics_table = kzalloc_obj(SmuMetricsExternal_t, GFP_KERNEL);
+ smu_table->metrics_table = kzalloc_obj(SmuMetricsExternal_t);
if (!smu_table->metrics_table)
goto err0_out;
smu_table->metrics_time = 0;
@@ -566,7 +566,7 @@ static int sienna_cichlid_tables_init(struct smu_context *smu)
if (ret)
goto err1_out;
- smu_table->watermarks_table = kzalloc_obj(Watermarks_t, GFP_KERNEL);
+ smu_table->watermarks_table = kzalloc_obj(Watermarks_t);
if (!smu_table->watermarks_table)
goto err2_out;
@@ -2507,7 +2507,7 @@ static int sienna_cichlid_i2c_xfer(struct i2c_adapter *i2c_adap,
if (!adev->pm.dpm_enabled)
return -EBUSY;
- req = kzalloc_obj(*req, GFP_KERNEL);
+ req = kzalloc_obj(*req);
if (!req)
return -ENOMEM;
diff --git a/drivers/gpu/drm/amd/pm/swsmu/smu11/smu_v11_0.c b/drivers/gpu/drm/amd/pm/swsmu/smu11/smu_v11_0.c
index 87502f9b5ca4..12b052d920f5 100644
--- a/drivers/gpu/drm/amd/pm/swsmu/smu11/smu_v11_0.c
+++ b/drivers/gpu/drm/amd/pm/swsmu/smu11/smu_v11_0.c
@@ -378,7 +378,7 @@ int smu_v11_0_init_smc_tables(struct smu_context *smu)
}
smu_table->max_sustainable_clocks =
- kzalloc_obj(struct smu_11_0_max_sustainable_clocks, GFP_KERNEL);
+ kzalloc_obj(struct smu_11_0_max_sustainable_clocks);
if (!smu_table->max_sustainable_clocks) {
ret = -ENOMEM;
goto err1_out;
diff --git a/drivers/gpu/drm/amd/pm/swsmu/smu11/vangogh_ppt.c b/drivers/gpu/drm/amd/pm/swsmu/smu11/vangogh_ppt.c
index 86d8e5df1eb1..16eb73ba6b0c 100644
--- a/drivers/gpu/drm/amd/pm/swsmu/smu11/vangogh_ppt.c
+++ b/drivers/gpu/drm/amd/pm/swsmu/smu11/vangogh_ppt.c
@@ -253,11 +253,11 @@ static int vangogh_tables_init(struct smu_context *smu)
if (ret)
goto err1_out;
- smu_table->watermarks_table = kzalloc_obj(Watermarks_t, GFP_KERNEL);
+ smu_table->watermarks_table = kzalloc_obj(Watermarks_t);
if (!smu_table->watermarks_table)
goto err2_out;
- smu_table->clocks_table = kzalloc_obj(DpmClocks_t, GFP_KERNEL);
+ smu_table->clocks_table = kzalloc_obj(DpmClocks_t);
if (!smu_table->clocks_table)
goto err3_out;
diff --git a/drivers/gpu/drm/amd/pm/swsmu/smu12/renoir_ppt.c b/drivers/gpu/drm/amd/pm/swsmu/smu12/renoir_ppt.c
index f4951630375b..186020ed6708 100644
--- a/drivers/gpu/drm/amd/pm/swsmu/smu12/renoir_ppt.c
+++ b/drivers/gpu/drm/amd/pm/swsmu/smu12/renoir_ppt.c
@@ -157,16 +157,16 @@ static int renoir_init_smc_tables(struct smu_context *smu)
SMU_TABLE_INIT(tables, SMU_TABLE_SMU_METRICS, sizeof(SmuMetrics_t),
PAGE_SIZE, AMDGPU_GEM_DOMAIN_VRAM);
- smu_table->clocks_table = kzalloc_obj(DpmClocks_t, GFP_KERNEL);
+ smu_table->clocks_table = kzalloc_obj(DpmClocks_t);
if (!smu_table->clocks_table)
goto err0_out;
- smu_table->metrics_table = kzalloc_obj(SmuMetrics_t, GFP_KERNEL);
+ smu_table->metrics_table = kzalloc_obj(SmuMetrics_t);
if (!smu_table->metrics_table)
goto err1_out;
smu_table->metrics_time = 0;
- smu_table->watermarks_table = kzalloc_obj(Watermarks_t, GFP_KERNEL);
+ smu_table->watermarks_table = kzalloc_obj(Watermarks_t);
if (!smu_table->watermarks_table)
goto err2_out;
diff --git a/drivers/gpu/drm/amd/pm/swsmu/smu13/aldebaran_ppt.c b/drivers/gpu/drm/amd/pm/swsmu/smu13/aldebaran_ppt.c
index 618d0098208d..35495da90ee7 100644
--- a/drivers/gpu/drm/amd/pm/swsmu/smu13/aldebaran_ppt.c
+++ b/drivers/gpu/drm/amd/pm/swsmu/smu13/aldebaran_ppt.c
@@ -245,7 +245,7 @@ static int aldebaran_tables_init(struct smu_context *smu)
SMU_TABLE_INIT(tables, SMU_TABLE_ECCINFO, sizeof(EccInfoTable_t),
PAGE_SIZE, AMDGPU_GEM_DOMAIN_VRAM);
- smu_table->metrics_table = kzalloc_obj(SmuMetrics_t, GFP_KERNEL);
+ smu_table->metrics_table = kzalloc_obj(SmuMetrics_t);
if (!smu_table->metrics_table)
return -ENOMEM;
smu_table->metrics_time = 0;
@@ -301,7 +301,7 @@ static int aldebaran_allocate_dpm_context(struct smu_context *smu)
smu_dpm->dpm_context_size = sizeof(struct smu_13_0_dpm_context);
smu_dpm->dpm_policies =
- kzalloc_obj(struct smu_dpm_policy_ctxt, GFP_KERNEL);
+ kzalloc_obj(struct smu_dpm_policy_ctxt);
if (!smu_dpm->dpm_policies)
return -ENOMEM;
@@ -1422,7 +1422,7 @@ static int aldebaran_i2c_xfer(struct i2c_adapter *i2c_adap,
if (!adev->pm.dpm_enabled)
return -EBUSY;
- req = kzalloc_obj(*req, GFP_KERNEL);
+ req = kzalloc_obj(*req);
if (!req)
return -ENOMEM;
diff --git a/drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0.c b/drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0.c
index 531fb265c948..f06608df14c4 100644
--- a/drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0.c
+++ b/drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0.c
@@ -449,7 +449,7 @@ int smu_v13_0_init_smc_tables(struct smu_context *smu)
}
smu_table->max_sustainable_clocks =
- kzalloc_obj(struct smu_13_0_max_sustainable_clocks, GFP_KERNEL);
+ kzalloc_obj(struct smu_13_0_max_sustainable_clocks);
if (!smu_table->max_sustainable_clocks) {
ret = -ENOMEM;
goto err1_out;
diff --git a/drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_0_ppt.c b/drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_0_ppt.c
index 013942fac955..a0d146a99f2a 100644
--- a/drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_0_ppt.c
+++ b/drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_0_ppt.c
@@ -495,7 +495,7 @@ static int smu_v13_0_0_tables_init(struct smu_context *smu)
sizeof(WifiBandEntryTable_t), PAGE_SIZE,
AMDGPU_GEM_DOMAIN_VRAM);
- smu_table->metrics_table = kzalloc_obj(SmuMetricsExternal_t, GFP_KERNEL);
+ smu_table->metrics_table = kzalloc_obj(SmuMetricsExternal_t);
if (!smu_table->metrics_table)
goto err0_out;
smu_table->metrics_time = 0;
@@ -506,7 +506,7 @@ static int smu_v13_0_0_tables_init(struct smu_context *smu)
if (ret)
goto err1_out;
- smu_table->watermarks_table = kzalloc_obj(Watermarks_t, GFP_KERNEL);
+ smu_table->watermarks_table = kzalloc_obj(Watermarks_t);
if (!smu_table->watermarks_table)
goto err2_out;
@@ -2638,7 +2638,7 @@ static int smu_v13_0_0_i2c_xfer(struct i2c_adapter *i2c_adap,
if (!adev->pm.dpm_enabled)
return -EBUSY;
- req = kzalloc_obj(*req, GFP_KERNEL);
+ req = kzalloc_obj(*req);
if (!req)
return -ENOMEM;
diff --git a/drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_12_ppt.c b/drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_12_ppt.c
index 5ada870f8b65..32d5e2170d80 100644
--- a/drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_12_ppt.c
+++ b/drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_12_ppt.c
@@ -223,7 +223,7 @@ static int smu_v13_0_12_fru_get_product_info(struct smu_context *smu,
struct amdgpu_device *adev = smu->adev;
if (!adev->fru_info) {
- adev->fru_info = kzalloc_obj(*adev->fru_info, GFP_KERNEL);
+ adev->fru_info = kzalloc_obj(*adev->fru_info);
if (!adev->fru_info)
return -ENOMEM;
}
diff --git a/drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_4_ppt.c b/drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_4_ppt.c
index 9e8b330f34dc..5b1a038d6a19 100644
--- a/drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_4_ppt.c
+++ b/drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_4_ppt.c
@@ -161,16 +161,16 @@ static int smu_v13_0_4_init_smc_tables(struct smu_context *smu)
SMU_TABLE_INIT(tables, SMU_TABLE_SMU_METRICS, sizeof(SmuMetrics_t),
PAGE_SIZE, AMDGPU_GEM_DOMAIN_VRAM);
- smu_table->clocks_table = kzalloc_obj(DpmClocks_t, GFP_KERNEL);
+ smu_table->clocks_table = kzalloc_obj(DpmClocks_t);
if (!smu_table->clocks_table)
goto err0_out;
- smu_table->metrics_table = kzalloc_obj(SmuMetrics_t, GFP_KERNEL);
+ smu_table->metrics_table = kzalloc_obj(SmuMetrics_t);
if (!smu_table->metrics_table)
goto err1_out;
smu_table->metrics_time = 0;
- smu_table->watermarks_table = kzalloc_obj(Watermarks_t, GFP_KERNEL);
+ smu_table->watermarks_table = kzalloc_obj(Watermarks_t);
if (!smu_table->watermarks_table)
goto err2_out;
diff --git a/drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_5_ppt.c b/drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_5_ppt.c
index 25de5e2dde83..d534723fef91 100644
--- a/drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_5_ppt.c
+++ b/drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_5_ppt.c
@@ -136,16 +136,16 @@ static int smu_v13_0_5_init_smc_tables(struct smu_context *smu)
SMU_TABLE_INIT(tables, SMU_TABLE_SMU_METRICS, sizeof(SmuMetrics_t),
PAGE_SIZE, AMDGPU_GEM_DOMAIN_VRAM);
- smu_table->clocks_table = kzalloc_obj(DpmClocks_t, GFP_KERNEL);
+ smu_table->clocks_table = kzalloc_obj(DpmClocks_t);
if (!smu_table->clocks_table)
goto err0_out;
- smu_table->metrics_table = kzalloc_obj(SmuMetrics_t, GFP_KERNEL);
+ smu_table->metrics_table = kzalloc_obj(SmuMetrics_t);
if (!smu_table->metrics_table)
goto err1_out;
smu_table->metrics_time = 0;
- smu_table->watermarks_table = kzalloc_obj(Watermarks_t, GFP_KERNEL);
+ smu_table->watermarks_table = kzalloc_obj(Watermarks_t);
if (!smu_table->watermarks_table)
goto err2_out;
diff --git a/drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_6_ppt.c b/drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_6_ppt.c
index b85130bd8c08..896b51c8a9a7 100644
--- a/drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_6_ppt.c
+++ b/drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_6_ppt.c
@@ -586,7 +586,7 @@ static int smu_v13_0_6_tables_init(struct smu_context *smu)
return -ENOMEM;
smu_table->metrics_time = 0;
- driver_pptable = kzalloc_obj(struct PPTable_t, GFP_KERNEL);
+ driver_pptable = kzalloc_obj(struct PPTable_t);
if (!driver_pptable)
return -ENOMEM;
@@ -690,13 +690,13 @@ static int smu_v13_0_6_allocate_dpm_context(struct smu_context *smu)
struct smu_dpm_policy *policy;
smu_dpm->dpm_context =
- kzalloc_obj(struct smu_13_0_dpm_context, GFP_KERNEL);
+ kzalloc_obj(struct smu_13_0_dpm_context);
if (!smu_dpm->dpm_context)
return -ENOMEM;
smu_dpm->dpm_context_size = sizeof(struct smu_13_0_dpm_context);
smu_dpm->dpm_policies =
- kzalloc_obj(struct smu_dpm_policy_ctxt, GFP_KERNEL);
+ kzalloc_obj(struct smu_dpm_policy_ctxt);
if (!smu_dpm->dpm_policies) {
kfree(smu_dpm->dpm_context);
return -ENOMEM;
@@ -2341,7 +2341,7 @@ static int smu_v13_0_6_i2c_xfer(struct i2c_adapter *i2c_adap,
if (!adev->pm.dpm_enabled)
return -EBUSY;
- req = kzalloc_obj(*req, GFP_KERNEL);
+ req = kzalloc_obj(*req);
if (!req)
return -ENOMEM;
diff --git a/drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_7_ppt.c b/drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_7_ppt.c
index 6aefebdb0bad..b82034f3bc2a 100644
--- a/drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_7_ppt.c
+++ b/drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_7_ppt.c
@@ -530,7 +530,7 @@ static int smu_v13_0_7_tables_init(struct smu_context *smu)
sizeof(WifiBandEntryTable_t), PAGE_SIZE,
AMDGPU_GEM_DOMAIN_VRAM);
- smu_table->metrics_table = kzalloc_obj(SmuMetricsExternal_t, GFP_KERNEL);
+ smu_table->metrics_table = kzalloc_obj(SmuMetricsExternal_t);
if (!smu_table->metrics_table)
goto err0_out;
smu_table->metrics_time = 0;
@@ -541,7 +541,7 @@ static int smu_v13_0_7_tables_init(struct smu_context *smu)
if (ret)
goto err1_out;
- smu_table->watermarks_table = kzalloc_obj(Watermarks_t, GFP_KERNEL);
+ smu_table->watermarks_table = kzalloc_obj(Watermarks_t);
if (!smu_table->watermarks_table)
goto err2_out;
diff --git a/drivers/gpu/drm/amd/pm/swsmu/smu13/yellow_carp_ppt.c b/drivers/gpu/drm/amd/pm/swsmu/smu13/yellow_carp_ppt.c
index e3700c704016..f43a91ac6970 100644
--- a/drivers/gpu/drm/amd/pm/swsmu/smu13/yellow_carp_ppt.c
+++ b/drivers/gpu/drm/amd/pm/swsmu/smu13/yellow_carp_ppt.c
@@ -163,16 +163,16 @@ static int yellow_carp_init_smc_tables(struct smu_context *smu)
SMU_TABLE_INIT(tables, SMU_TABLE_SMU_METRICS, sizeof(SmuMetrics_t),
PAGE_SIZE, AMDGPU_GEM_DOMAIN_VRAM);
- smu_table->clocks_table = kzalloc_obj(DpmClocks_t, GFP_KERNEL);
+ smu_table->clocks_table = kzalloc_obj(DpmClocks_t);
if (!smu_table->clocks_table)
goto err0_out;
- smu_table->metrics_table = kzalloc_obj(SmuMetrics_t, GFP_KERNEL);
+ smu_table->metrics_table = kzalloc_obj(SmuMetrics_t);
if (!smu_table->metrics_table)
goto err1_out;
smu_table->metrics_time = 0;
- smu_table->watermarks_table = kzalloc_obj(Watermarks_t, GFP_KERNEL);
+ smu_table->watermarks_table = kzalloc_obj(Watermarks_t);
if (!smu_table->watermarks_table)
goto err2_out;
diff --git a/drivers/gpu/drm/amd/pm/swsmu/smu14/smu_v14_0.c b/drivers/gpu/drm/amd/pm/swsmu/smu14/smu_v14_0.c
index 2cfa8eb70cb3..1334776dd034 100644
--- a/drivers/gpu/drm/amd/pm/swsmu/smu14/smu_v14_0.c
+++ b/drivers/gpu/drm/amd/pm/swsmu/smu14/smu_v14_0.c
@@ -439,7 +439,7 @@ int smu_v14_0_init_smc_tables(struct smu_context *smu)
}
smu_table->max_sustainable_clocks =
- kzalloc_obj(struct smu_14_0_max_sustainable_clocks, GFP_KERNEL);
+ kzalloc_obj(struct smu_14_0_max_sustainable_clocks);
if (!smu_table->max_sustainable_clocks) {
ret = -ENOMEM;
goto err1_out;
diff --git a/drivers/gpu/drm/amd/pm/swsmu/smu14/smu_v14_0_0_ppt.c b/drivers/gpu/drm/amd/pm/swsmu/smu14/smu_v14_0_0_ppt.c
index a863e637e37f..2353524b8821 100644
--- a/drivers/gpu/drm/amd/pm/swsmu/smu14/smu_v14_0_0_ppt.c
+++ b/drivers/gpu/drm/amd/pm/swsmu/smu14/smu_v14_0_0_ppt.c
@@ -197,7 +197,7 @@ static int smu_v14_0_0_init_smc_tables(struct smu_context *smu)
SMU_TABLE_INIT(tables, SMU_TABLE_SMU_METRICS, sizeof(SmuMetrics_t),
PAGE_SIZE, AMDGPU_GEM_DOMAIN_VRAM);
- smu_table->metrics_table = kzalloc_obj(SmuMetrics_t, GFP_KERNEL);
+ smu_table->metrics_table = kzalloc_obj(SmuMetrics_t);
if (!smu_table->metrics_table)
goto err0_out;
smu_table->metrics_time = 0;
@@ -206,7 +206,7 @@ static int smu_v14_0_0_init_smc_tables(struct smu_context *smu)
if (!smu_table->clocks_table)
goto err1_out;
- smu_table->watermarks_table = kzalloc_obj(Watermarks_t, GFP_KERNEL);
+ smu_table->watermarks_table = kzalloc_obj(Watermarks_t);
if (!smu_table->watermarks_table)
goto err2_out;
diff --git a/drivers/gpu/drm/amd/pm/swsmu/smu14/smu_v14_0_2_ppt.c b/drivers/gpu/drm/amd/pm/swsmu/smu14/smu_v14_0_2_ppt.c
index b051a1f58760..fc50552771a4 100644
--- a/drivers/gpu/drm/amd/pm/swsmu/smu14/smu_v14_0_2_ppt.c
+++ b/drivers/gpu/drm/amd/pm/swsmu/smu14/smu_v14_0_2_ppt.c
@@ -393,7 +393,7 @@ static int smu_v14_0_2_tables_init(struct smu_context *smu)
SMU_TABLE_INIT(tables, SMU_TABLE_ECCINFO, sizeof(EccInfoTable_t),
PAGE_SIZE, AMDGPU_GEM_DOMAIN_VRAM);
- smu_table->metrics_table = kzalloc_obj(SmuMetricsExternal_t, GFP_KERNEL);
+ smu_table->metrics_table = kzalloc_obj(SmuMetricsExternal_t);
if (!smu_table->metrics_table)
goto err0_out;
smu_table->metrics_time = 0;
@@ -404,7 +404,7 @@ static int smu_v14_0_2_tables_init(struct smu_context *smu)
if (ret)
goto err1_out;
- smu_table->watermarks_table = kzalloc_obj(Watermarks_t, GFP_KERNEL);
+ smu_table->watermarks_table = kzalloc_obj(Watermarks_t);
if (!smu_table->watermarks_table)
goto err2_out;
@@ -1876,7 +1876,7 @@ static int smu_v14_0_2_i2c_xfer(struct i2c_adapter *i2c_adap,
if (!adev->pm.dpm_enabled)
return -EBUSY;
- req = kzalloc_obj(*req, GFP_KERNEL);
+ req = kzalloc_obj(*req);
if (!req)
return -ENOMEM;
diff --git a/drivers/gpu/drm/amd/pm/swsmu/smu15/smu_v15_0.c b/drivers/gpu/drm/amd/pm/swsmu/smu15/smu_v15_0.c
index 2070cb31f185..1fbc104afa6a 100644
--- a/drivers/gpu/drm/amd/pm/swsmu/smu15/smu_v15_0.c
+++ b/drivers/gpu/drm/amd/pm/swsmu/smu15/smu_v15_0.c
@@ -408,7 +408,7 @@ int smu_v15_0_init_smc_tables(struct smu_context *smu)
}
smu_table->max_sustainable_clocks =
- kzalloc_obj(struct smu_15_0_max_sustainable_clocks, GFP_KERNEL);
+ kzalloc_obj(struct smu_15_0_max_sustainable_clocks);
if (!smu_table->max_sustainable_clocks) {
ret = -ENOMEM;
goto err1_out;
diff --git a/drivers/gpu/drm/amd/pm/swsmu/smu15/smu_v15_0_0_ppt.c b/drivers/gpu/drm/amd/pm/swsmu/smu15/smu_v15_0_0_ppt.c
index 18c31a50d281..49cf2b9d931e 100644
--- a/drivers/gpu/drm/amd/pm/swsmu/smu15/smu_v15_0_0_ppt.c
+++ b/drivers/gpu/drm/amd/pm/swsmu/smu15/smu_v15_0_0_ppt.c
@@ -173,16 +173,16 @@ static int smu_v15_0_0_init_smc_tables(struct smu_context *smu)
SMU_TABLE_INIT(tables, SMU_TABLE_SMU_METRICS, sizeof(SmuMetrics_t),
PAGE_SIZE, AMDGPU_GEM_DOMAIN_VRAM);
- smu_table->metrics_table = kzalloc_obj(SmuMetrics_t, GFP_KERNEL);
+ smu_table->metrics_table = kzalloc_obj(SmuMetrics_t);
if (!smu_table->metrics_table)
goto err0_out;
smu_table->metrics_time = 0;
- smu_table->clocks_table = kzalloc_obj(DpmClocks_t, GFP_KERNEL);
+ smu_table->clocks_table = kzalloc_obj(DpmClocks_t);
if (!smu_table->clocks_table)
goto err1_out;
- smu_table->watermarks_table = kzalloc_obj(Watermarks_t, GFP_KERNEL);
+ smu_table->watermarks_table = kzalloc_obj(Watermarks_t);
if (!smu_table->watermarks_table)
goto err2_out;
diff --git a/drivers/gpu/drm/amd/ras/ras_mgr/amdgpu_ras_mgr.c b/drivers/gpu/drm/amd/ras/ras_mgr/amdgpu_ras_mgr.c
index 611171fea3cb..9190c9cd7993 100644
--- a/drivers/gpu/drm/amd/ras/ras_mgr/amdgpu_ras_mgr.c
+++ b/drivers/gpu/drm/amd/ras/ras_mgr/amdgpu_ras_mgr.c
@@ -299,7 +299,7 @@ static int amdgpu_ras_mgr_sw_init(struct amdgpu_ip_block *ip_block)
if (!con->uniras_enabled)
return 0;
- ras_mgr = kzalloc_obj(*ras_mgr, GFP_KERNEL);
+ ras_mgr = kzalloc_obj(*ras_mgr);
if (!ras_mgr)
return -EINVAL;
diff --git a/drivers/gpu/drm/amd/ras/ras_mgr/amdgpu_virt_ras_cmd.c b/drivers/gpu/drm/amd/ras/ras_mgr/amdgpu_virt_ras_cmd.c
index 65223bfec688..087a893afbba 100644
--- a/drivers/gpu/drm/amd/ras/ras_mgr/amdgpu_virt_ras_cmd.c
+++ b/drivers/gpu/drm/amd/ras/ras_mgr/amdgpu_virt_ras_cmd.c
@@ -195,7 +195,7 @@ static int amdgpu_virt_ras_get_cper_records(struct ras_core_context *ras_core,
if (!req->buf_size || !req->buf_ptr || !req->cper_num)
return RAS_CMD__ERROR_INVALID_INPUT_DATA;
- trace = kzalloc_objs(*trace, MAX_RECORD_PER_BATCH, GFP_KERNEL);
+ trace = kzalloc_objs(*trace, MAX_RECORD_PER_BATCH);
if (!trace)
return RAS_CMD__ERROR_GENERIC;
diff --git a/drivers/gpu/drm/amd/ras/rascore/ras_core.c b/drivers/gpu/drm/amd/ras/rascore/ras_core.c
index e4a6f6cfd2d5..3f56f26abd6d 100644
--- a/drivers/gpu/drm/amd/ras/rascore/ras_core.c
+++ b/drivers/gpu/drm/amd/ras/rascore/ras_core.c
@@ -263,11 +263,11 @@ struct ras_core_context *ras_core_create(struct ras_core_config *init_config)
struct ras_core_context *ras_core;
struct ras_core_config *config;
- ras_core = kzalloc_obj(*ras_core, GFP_KERNEL);
+ ras_core = kzalloc_obj(*ras_core);
if (!ras_core)
return NULL;
- config = kzalloc_obj(*config, GFP_KERNEL);
+ config = kzalloc_obj(*config);
if (!config) {
kfree(ras_core);
return NULL;
diff --git a/drivers/gpu/drm/amd/ras/rascore/ras_log_ring.c b/drivers/gpu/drm/amd/ras/rascore/ras_log_ring.c
index 5d3e46c7740f..f10e856f3c8c 100644
--- a/drivers/gpu/drm/amd/ras/rascore/ras_log_ring.c
+++ b/drivers/gpu/drm/amd/ras/rascore/ras_log_ring.c
@@ -202,7 +202,7 @@ struct ras_log_batch_tag *ras_log_ring_create_batch_tag(struct ras_core_context
struct ras_log_batch_tag *batch_tag;
unsigned long flags = 0;
- batch_tag = kzalloc_obj(*batch_tag, GFP_KERNEL);
+ batch_tag = kzalloc_obj(*batch_tag);
if (!batch_tag)
return NULL;
diff --git a/drivers/gpu/drm/amd/ras/rascore/ras_umc.c b/drivers/gpu/drm/amd/ras/rascore/ras_umc.c
index 7c69a7a8c5f6..2abe8553e479 100644
--- a/drivers/gpu/drm/amd/ras/rascore/ras_umc.c
+++ b/drivers/gpu/drm/amd/ras/rascore/ras_umc.c
@@ -199,7 +199,7 @@ int ras_umc_log_bad_bank_pending(struct ras_core_context *ras_core, struct ras_b
struct ras_umc *ras_umc = &ras_core->ras_umc;
struct ras_bank_ecc_node *ecc_node;
- ecc_node = kzalloc_obj(*ecc_node, GFP_KERNEL);
+ ecc_node = kzalloc_obj(*ecc_node);
if (!ecc_node)
return -ENOMEM;
@@ -246,7 +246,7 @@ int ras_umc_log_bad_bank(struct ras_core_context *ras_core, struct ras_bank_ecc
if (ret)
goto out;
- err_rec = kzalloc_obj(*err_rec, GFP_KERNEL);
+ err_rec = kzalloc_obj(*err_rec);
if (!err_rec) {
ret = -ENOMEM;
goto out;
@@ -454,7 +454,7 @@ int ras_umc_load_bad_pages(struct ras_core_context *ras_core)
ras_core->ras_eeprom.record_threshold_config == DISABLE_RETIRE_PAGE)
return 0;
- bps = kzalloc_objs(*bps, ras_num_recs, GFP_KERNEL);
+ bps = kzalloc_objs(*bps, ras_num_recs);
if (!bps)
return -ENOMEM;
@@ -512,7 +512,7 @@ int ras_umc_handle_bad_pages(struct ras_core_context *ras_core, void *data)
struct eeprom_umc_record *records;
int count, ret;
- records = kzalloc_objs(*records, MAX_ECC_NUM_PER_RETIREMENT, GFP_KERNEL);
+ records = kzalloc_objs(*records, MAX_ECC_NUM_PER_RETIREMENT);
if (!records)
return -ENOMEM;
diff --git a/drivers/gpu/drm/arm/display/komeda/komeda_crtc.c b/drivers/gpu/drm/arm/display/komeda/komeda_crtc.c
index 7221dc4731ab..9c8b8da531a7 100644
--- a/drivers/gpu/drm/arm/display/komeda/komeda_crtc.c
+++ b/drivers/gpu/drm/arm/display/komeda/komeda_crtc.c
@@ -503,7 +503,7 @@ static void komeda_crtc_reset(struct drm_crtc *crtc)
kfree(to_kcrtc_st(crtc->state));
crtc->state = NULL;
- state = kzalloc_obj(*state, GFP_KERNEL);
+ state = kzalloc_obj(*state);
if (state)
__drm_atomic_helper_crtc_reset(crtc, &state->base);
}
@@ -514,7 +514,7 @@ komeda_crtc_atomic_duplicate_state(struct drm_crtc *crtc)
struct komeda_crtc_state *old = to_kcrtc_st(crtc->state);
struct komeda_crtc_state *new;
- new = kzalloc_obj(*new, GFP_KERNEL);
+ new = kzalloc_obj(*new);
if (!new)
return NULL;
diff --git a/drivers/gpu/drm/arm/display/komeda/komeda_framebuffer.c b/drivers/gpu/drm/arm/display/komeda/komeda_framebuffer.c
index ec34491f4f8b..6ee909f8d534 100644
--- a/drivers/gpu/drm/arm/display/komeda/komeda_framebuffer.c
+++ b/drivers/gpu/drm/arm/display/komeda/komeda_framebuffer.c
@@ -165,7 +165,7 @@ komeda_fb_create(struct drm_device *dev, struct drm_file *file,
struct komeda_fb *kfb;
int ret = 0, i;
- kfb = kzalloc_obj(*kfb, GFP_KERNEL);
+ kfb = kzalloc_obj(*kfb);
if (!kfb)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/gpu/drm/arm/display/komeda/komeda_plane.c b/drivers/gpu/drm/arm/display/komeda/komeda_plane.c
index 05342c6d5b6d..835c11fdd7ff 100644
--- a/drivers/gpu/drm/arm/display/komeda/komeda_plane.c
+++ b/drivers/gpu/drm/arm/display/komeda/komeda_plane.c
@@ -142,7 +142,7 @@ static void komeda_plane_reset(struct drm_plane *plane)
kfree(plane->state);
plane->state = NULL;
- state = kzalloc_obj(*state, GFP_KERNEL);
+ state = kzalloc_obj(*state);
if (state)
__drm_atomic_helper_plane_reset(plane, &state->base);
}
@@ -155,7 +155,7 @@ komeda_plane_atomic_duplicate_state(struct drm_plane *plane)
if (WARN_ON(!plane->state))
return NULL;
- new = kzalloc_obj(*new, GFP_KERNEL);
+ new = kzalloc_obj(*new);
if (!new)
return NULL;
@@ -247,7 +247,7 @@ static int komeda_plane_add(struct komeda_kms_dev *kms,
u32 *formats, n_formats = 0;
int err;
- kplane = kzalloc_obj(*kplane, GFP_KERNEL);
+ kplane = kzalloc_obj(*kplane);
if (!kplane)
return -ENOMEM;
diff --git a/drivers/gpu/drm/arm/display/komeda/komeda_private_obj.c b/drivers/gpu/drm/arm/display/komeda/komeda_private_obj.c
index 56703456fbfa..ee57e306bf7b 100644
--- a/drivers/gpu/drm/arm/display/komeda/komeda_private_obj.c
+++ b/drivers/gpu/drm/arm/display/komeda/komeda_private_obj.c
@@ -50,7 +50,7 @@ static int komeda_layer_obj_add(struct komeda_kms_dev *kms,
{
struct komeda_layer_state *st;
- st = kzalloc_obj(*st, GFP_KERNEL);
+ st = kzalloc_obj(*st);
if (!st)
return -ENOMEM;
@@ -92,7 +92,7 @@ static int komeda_scaler_obj_add(struct komeda_kms_dev *kms,
{
struct komeda_scaler_state *st;
- st = kzalloc_obj(*st, GFP_KERNEL);
+ st = kzalloc_obj(*st);
if (!st)
return -ENOMEM;
@@ -135,7 +135,7 @@ static int komeda_compiz_obj_add(struct komeda_kms_dev *kms,
{
struct komeda_compiz_state *st;
- st = kzalloc_obj(*st, GFP_KERNEL);
+ st = kzalloc_obj(*st);
if (!st)
return -ENOMEM;
@@ -178,7 +178,7 @@ static int komeda_splitter_obj_add(struct komeda_kms_dev *kms,
{
struct komeda_splitter_state *st;
- st = kzalloc_obj(*st, GFP_KERNEL);
+ st = kzalloc_obj(*st);
if (!st)
return -ENOMEM;
@@ -221,7 +221,7 @@ static int komeda_merger_obj_add(struct komeda_kms_dev *kms,
{
struct komeda_merger_state *st;
- st = kzalloc_obj(*st, GFP_KERNEL);
+ st = kzalloc_obj(*st);
if (!st)
return -ENOMEM;
@@ -265,7 +265,7 @@ static int komeda_improc_obj_add(struct komeda_kms_dev *kms,
{
struct komeda_improc_state *st;
- st = kzalloc_obj(*st, GFP_KERNEL);
+ st = kzalloc_obj(*st);
if (!st)
return -ENOMEM;
@@ -308,7 +308,7 @@ static int komeda_timing_ctrlr_obj_add(struct komeda_kms_dev *kms,
{
struct komeda_compiz_state *st;
- st = kzalloc_obj(*st, GFP_KERNEL);
+ st = kzalloc_obj(*st);
if (!st)
return -ENOMEM;
@@ -352,7 +352,7 @@ static int komeda_pipeline_obj_add(struct komeda_kms_dev *kms,
{
struct komeda_pipeline_state *st;
- st = kzalloc_obj(*st, GFP_KERNEL);
+ st = kzalloc_obj(*st);
if (!st)
return -ENOMEM;
diff --git a/drivers/gpu/drm/arm/display/komeda/komeda_wb_connector.c b/drivers/gpu/drm/arm/display/komeda/komeda_wb_connector.c
index 5e290815c32b..41cc3e080dc9 100644
--- a/drivers/gpu/drm/arm/display/komeda/komeda_wb_connector.c
+++ b/drivers/gpu/drm/arm/display/komeda/komeda_wb_connector.c
@@ -149,7 +149,7 @@ static int komeda_wb_connector_add(struct komeda_kms_dev *kms,
if (!kcrtc->master->wb_layer)
return 0;
- kwb_conn = kzalloc_obj(*kwb_conn, GFP_KERNEL);
+ kwb_conn = kzalloc_obj(*kwb_conn);
if (!kwb_conn)
return -ENOMEM;
diff --git a/drivers/gpu/drm/arm/malidp_crtc.c b/drivers/gpu/drm/arm/malidp_crtc.c
index c3a295f3c82d..18e6157b1047 100644
--- a/drivers/gpu/drm/arm/malidp_crtc.c
+++ b/drivers/gpu/drm/arm/malidp_crtc.c
@@ -447,7 +447,7 @@ static struct drm_crtc_state *malidp_crtc_duplicate_state(struct drm_crtc *crtc)
return NULL;
old_state = to_malidp_crtc_state(crtc->state);
- state = kmalloc_obj(*state, GFP_KERNEL);
+ state = kmalloc_obj(*state);
if (!state)
return NULL;
@@ -478,7 +478,7 @@ static void malidp_crtc_destroy_state(struct drm_crtc *crtc,
static void malidp_crtc_reset(struct drm_crtc *crtc)
{
- struct malidp_crtc_state *state = kzalloc_obj(*state, GFP_KERNEL);
+ struct malidp_crtc_state *state = kzalloc_obj(*state);
if (crtc->state)
malidp_crtc_destroy_state(crtc, crtc->state);
diff --git a/drivers/gpu/drm/arm/malidp_mw.c b/drivers/gpu/drm/arm/malidp_mw.c
index 81442a011b09..0af7eaf9abc1 100644
--- a/drivers/gpu/drm/arm/malidp_mw.c
+++ b/drivers/gpu/drm/arm/malidp_mw.c
@@ -98,7 +98,7 @@ malidp_mw_connector_duplicate_state(struct drm_connector *connector)
if (WARN_ON(!connector->state))
return NULL;
- mw_state = kzalloc_obj(*mw_state, GFP_KERNEL);
+ mw_state = kzalloc_obj(*mw_state);
if (!mw_state)
return NULL;
diff --git a/drivers/gpu/drm/arm/malidp_planes.c b/drivers/gpu/drm/arm/malidp_planes.c
index 1ba8fdf2dc4f..4b9876322501 100644
--- a/drivers/gpu/drm/arm/malidp_planes.c
+++ b/drivers/gpu/drm/arm/malidp_planes.c
@@ -81,7 +81,7 @@ static void malidp_plane_reset(struct drm_plane *plane)
__drm_atomic_helper_plane_destroy_state(&state->base);
kfree(state);
plane->state = NULL;
- state = kzalloc_obj(*state, GFP_KERNEL);
+ state = kzalloc_obj(*state);
if (state)
__drm_atomic_helper_plane_reset(plane, &state->base);
}
@@ -94,7 +94,7 @@ drm_plane_state *malidp_duplicate_plane_state(struct drm_plane *plane)
if (!plane->state)
return NULL;
- state = kmalloc_obj(*state, GFP_KERNEL);
+ state = kmalloc_obj(*state);
if (!state)
return NULL;
diff --git a/drivers/gpu/drm/armada/armada_crtc.c b/drivers/gpu/drm/armada/armada_crtc.c
index ed57b60d0f12..d40bb9cf9ff1 100644
--- a/drivers/gpu/drm/armada/armada_crtc.c
+++ b/drivers/gpu/drm/armada/armada_crtc.c
@@ -921,7 +921,7 @@ static int armada_drm_crtc_create(struct drm_device *drm, struct device *dev,
if (IS_ERR(base))
return PTR_ERR(base);
- dcrtc = kzalloc_obj(*dcrtc, GFP_KERNEL);
+ dcrtc = kzalloc_obj(*dcrtc);
if (!dcrtc) {
DRM_ERROR("failed to allocate Armada crtc\n");
return -ENOMEM;
@@ -970,7 +970,7 @@ static int armada_drm_crtc_create(struct drm_device *drm, struct device *dev,
dcrtc->crtc.port = port;
- primary = kzalloc_obj(*primary, GFP_KERNEL);
+ primary = kzalloc_obj(*primary);
if (!primary) {
ret = -ENOMEM;
goto err_crtc;
diff --git a/drivers/gpu/drm/armada/armada_fb.c b/drivers/gpu/drm/armada/armada_fb.c
index 9355a7a20a50..b828bba419bf 100644
--- a/drivers/gpu/drm/armada/armada_fb.c
+++ b/drivers/gpu/drm/armada/armada_fb.c
@@ -57,7 +57,7 @@ struct armada_framebuffer *armada_framebuffer_create(struct drm_device *dev,
return ERR_PTR(-EINVAL);
}
- dfb = kzalloc_obj(*dfb, GFP_KERNEL);
+ dfb = kzalloc_obj(*dfb);
if (!dfb) {
DRM_ERROR("failed to allocate Armada fb object\n");
return ERR_PTR(-ENOMEM);
diff --git a/drivers/gpu/drm/armada/armada_gem.c b/drivers/gpu/drm/armada/armada_gem.c
index 56563816ca54..da7335cbe82d 100644
--- a/drivers/gpu/drm/armada/armada_gem.c
+++ b/drivers/gpu/drm/armada/armada_gem.c
@@ -137,7 +137,7 @@ armada_gem_linear_back(struct drm_device *dev, struct armada_gem_object *obj)
void __iomem *ptr;
int ret;
- node = kzalloc_obj(*node, GFP_KERNEL);
+ node = kzalloc_obj(*node);
if (!node)
return -ENOSPC;
@@ -200,7 +200,7 @@ armada_gem_alloc_private_object(struct drm_device *dev, size_t size)
size = roundup_gem_size(size);
- obj = kzalloc_obj(*obj, GFP_KERNEL);
+ obj = kzalloc_obj(*obj);
if (!obj)
return NULL;
@@ -221,7 +221,7 @@ static struct armada_gem_object *armada_gem_alloc_object(struct drm_device *dev,
size = roundup_gem_size(size);
- obj = kzalloc_obj(*obj, GFP_KERNEL);
+ obj = kzalloc_obj(*obj);
if (!obj)
return NULL;
@@ -393,7 +393,7 @@ armada_gem_prime_map_dma_buf(struct dma_buf_attachment *attach,
struct sg_table *sgt;
int i;
- sgt = kmalloc_obj(*sgt, GFP_KERNEL);
+ sgt = kmalloc_obj(*sgt);
if (!sgt)
return NULL;
diff --git a/drivers/gpu/drm/armada/armada_overlay.c b/drivers/gpu/drm/armada/armada_overlay.c
index c003a8dce805..361fdcece4b0 100644
--- a/drivers/gpu/drm/armada/armada_overlay.c
+++ b/drivers/gpu/drm/armada/armada_overlay.c
@@ -310,7 +310,7 @@ static void armada_overlay_reset(struct drm_plane *plane)
kfree(plane->state);
plane->state = NULL;
- state = kzalloc_obj(*state, GFP_KERNEL);
+ state = kzalloc_obj(*state);
if (state) {
state->colorkey_yr = 0xfefefe00;
state->colorkey_ug = 0x01010100;
@@ -550,7 +550,7 @@ int armada_overlay_plane_create(struct drm_device *dev, unsigned long crtcs)
if (ret)
return ret;
- overlay = kzalloc_obj(*overlay, GFP_KERNEL);
+ overlay = kzalloc_obj(*overlay);
if (!overlay)
return -ENOMEM;
diff --git a/drivers/gpu/drm/armada/armada_plane.c b/drivers/gpu/drm/armada/armada_plane.c
index 88cac3e7e592..eba12bba1e09 100644
--- a/drivers/gpu/drm/armada/armada_plane.c
+++ b/drivers/gpu/drm/armada/armada_plane.c
@@ -262,7 +262,7 @@ void armada_plane_reset(struct drm_plane *plane)
if (plane->state)
__drm_atomic_helper_plane_destroy_state(plane->state);
kfree(plane->state);
- st = kzalloc_obj(*st, GFP_KERNEL);
+ st = kzalloc_obj(*st);
if (st)
__drm_atomic_helper_plane_reset(plane, &st->base);
}
diff --git a/drivers/gpu/drm/ast/ast_dp.c b/drivers/gpu/drm/ast/ast_dp.c
index 056b372803b1..19acd1eff4f3 100644
--- a/drivers/gpu/drm/ast/ast_dp.c
+++ b/drivers/gpu/drm/ast/ast_dp.c
@@ -500,7 +500,7 @@ ast_astdp_connector_atomic_duplicate_state(struct drm_connector *connector)
if (drm_WARN_ON(dev, !connector->state))
return NULL;
- new_astdp_state = kmalloc_obj(*new_astdp_state, GFP_KERNEL);
+ new_astdp_state = kmalloc_obj(*new_astdp_state);
if (!new_astdp_state)
return NULL;
__drm_atomic_helper_connector_duplicate_state(connector, &new_astdp_state->base);
diff --git a/drivers/gpu/drm/ast/ast_mode.c b/drivers/gpu/drm/ast/ast_mode.c
index b017afe7e546..21abb6a6d8bc 100644
--- a/drivers/gpu/drm/ast/ast_mode.c
+++ b/drivers/gpu/drm/ast/ast_mode.c
@@ -876,7 +876,7 @@ static const struct drm_crtc_helper_funcs ast_crtc_helper_funcs = {
static void ast_crtc_reset(struct drm_crtc *crtc)
{
- struct ast_crtc_state *ast_state = kzalloc_obj(*ast_state, GFP_KERNEL);
+ struct ast_crtc_state *ast_state = kzalloc_obj(*ast_state);
if (crtc->state)
crtc->funcs->atomic_destroy_state(crtc, crtc->state);
@@ -896,7 +896,7 @@ ast_crtc_atomic_duplicate_state(struct drm_crtc *crtc)
if (drm_WARN_ON(dev, !crtc->state))
return NULL;
- new_ast_state = kmalloc_obj(*new_ast_state, GFP_KERNEL);
+ new_ast_state = kmalloc_obj(*new_ast_state);
if (!new_ast_state)
return NULL;
__drm_atomic_helper_crtc_duplicate_state(crtc, &new_ast_state->base);
diff --git a/drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_crtc.c b/drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_crtc.c
index 7204ef72c4d2..d8cf3d231920 100644
--- a/drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_crtc.c
+++ b/drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_crtc.c
@@ -540,7 +540,7 @@ static void atmel_hlcdc_crtc_reset(struct drm_crtc *crtc)
crtc->state = NULL;
}
- state = kzalloc_obj(*state, GFP_KERNEL);
+ state = kzalloc_obj(*state);
if (state)
__drm_atomic_helper_crtc_reset(crtc, &state->base);
}
@@ -554,7 +554,7 @@ atmel_hlcdc_crtc_duplicate_state(struct drm_crtc *crtc)
if (WARN_ON(!crtc->state))
return NULL;
- state = kmalloc_obj(*state, GFP_KERNEL);
+ state = kmalloc_obj(*state);
if (!state)
return NULL;
__drm_atomic_helper_crtc_duplicate_state(crtc, &state->base);
diff --git a/drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_plane.c b/drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_plane.c
index 1a1e76dc4727..bccd1564216e 100644
--- a/drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_plane.c
+++ b/drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_plane.c
@@ -1194,7 +1194,7 @@ static void atmel_hlcdc_plane_reset(struct drm_plane *p)
p->state = NULL;
}
- state = kzalloc_obj(*state, GFP_KERNEL);
+ state = kzalloc_obj(*state);
if (state) {
if (atmel_hlcdc_plane_alloc_dscrs(p, state)) {
kfree(state);
diff --git a/drivers/gpu/drm/bridge/aux-bridge.c b/drivers/gpu/drm/bridge/aux-bridge.c
index 50309a23dbea..1ed21a8713bf 100644
--- a/drivers/gpu/drm/bridge/aux-bridge.c
+++ b/drivers/gpu/drm/bridge/aux-bridge.c
@@ -47,7 +47,7 @@ int drm_aux_bridge_register(struct device *parent)
struct auxiliary_device *adev;
int ret;
- adev = kzalloc_obj(*adev, GFP_KERNEL);
+ adev = kzalloc_obj(*adev);
if (!adev)
return -ENOMEM;
diff --git a/drivers/gpu/drm/bridge/aux-hpd-bridge.c b/drivers/gpu/drm/bridge/aux-hpd-bridge.c
index 0f8a0fb50fbc..f02a38a2638a 100644
--- a/drivers/gpu/drm/bridge/aux-hpd-bridge.c
+++ b/drivers/gpu/drm/bridge/aux-hpd-bridge.c
@@ -52,7 +52,7 @@ struct auxiliary_device *devm_drm_dp_hpd_bridge_alloc(struct device *parent, str
struct auxiliary_device *adev;
int ret;
- adev = kzalloc_obj(*adev, GFP_KERNEL);
+ adev = kzalloc_obj(*adev);
if (!adev)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/gpu/drm/bridge/cadence/cdns-dsi-core.c b/drivers/gpu/drm/bridge/cadence/cdns-dsi-core.c
index c094740523ea..0dd85e26248c 100644
--- a/drivers/gpu/drm/bridge/cadence/cdns-dsi-core.c
+++ b/drivers/gpu/drm/bridge/cadence/cdns-dsi-core.c
@@ -902,7 +902,7 @@ static u32 *cdns_dsi_bridge_get_input_bus_fmts(struct drm_bridge *bridge,
*num_input_fmts = 0;
- input_fmts = kzalloc_obj(*input_fmts, GFP_KERNEL);
+ input_fmts = kzalloc_obj(*input_fmts);
if (!input_fmts)
return NULL;
@@ -985,7 +985,7 @@ cdns_dsi_bridge_atomic_duplicate_state(struct drm_bridge *bridge)
bridge_state = drm_priv_to_bridge_state(bridge->base.state);
old_dsi_state = to_cdns_dsi_bridge_state(bridge_state);
- dsi_state = kzalloc_obj(*dsi_state, GFP_KERNEL);
+ dsi_state = kzalloc_obj(*dsi_state);
if (!dsi_state)
return NULL;
@@ -1013,7 +1013,7 @@ cdns_dsi_bridge_atomic_reset(struct drm_bridge *bridge)
{
struct cdns_dsi_bridge_state *dsi_state;
- dsi_state = kzalloc_obj(*dsi_state, GFP_KERNEL);
+ dsi_state = kzalloc_obj(*dsi_state);
if (!dsi_state)
return NULL;
diff --git a/drivers/gpu/drm/bridge/cadence/cdns-mhdp8546-core.c b/drivers/gpu/drm/bridge/cadence/cdns-mhdp8546-core.c
index 9d41e824e757..9392c226ff5b 100644
--- a/drivers/gpu/drm/bridge/cadence/cdns-mhdp8546-core.c
+++ b/drivers/gpu/drm/bridge/cadence/cdns-mhdp8546-core.c
@@ -2055,7 +2055,7 @@ cdns_mhdp_bridge_atomic_duplicate_state(struct drm_bridge *bridge)
{
struct cdns_mhdp_bridge_state *state;
- state = kzalloc_obj(*state, GFP_KERNEL);
+ state = kzalloc_obj(*state);
if (!state)
return NULL;
@@ -2085,7 +2085,7 @@ cdns_mhdp_bridge_atomic_reset(struct drm_bridge *bridge)
{
struct cdns_mhdp_bridge_state *cdns_mhdp_state;
- cdns_mhdp_state = kzalloc_obj(*cdns_mhdp_state, GFP_KERNEL);
+ cdns_mhdp_state = kzalloc_obj(*cdns_mhdp_state);
if (!cdns_mhdp_state)
return NULL;
@@ -2105,7 +2105,7 @@ static u32 *cdns_mhdp_get_input_bus_fmts(struct drm_bridge *bridge,
*num_input_fmts = 0;
- input_fmts = kzalloc_obj(*input_fmts, GFP_KERNEL);
+ input_fmts = kzalloc_obj(*input_fmts);
if (!input_fmts)
return NULL;
diff --git a/drivers/gpu/drm/bridge/display-connector.c b/drivers/gpu/drm/bridge/display-connector.c
index f5ffef625a9b..16c0631adeb1 100644
--- a/drivers/gpu/drm/bridge/display-connector.c
+++ b/drivers/gpu/drm/bridge/display-connector.c
@@ -116,7 +116,7 @@ static u32 *display_connector_get_output_bus_fmts(struct drm_bridge *bridge,
u32 *out_bus_fmts;
*num_output_fmts = 1;
- out_bus_fmts = kmalloc_obj(*out_bus_fmts, GFP_KERNEL);
+ out_bus_fmts = kmalloc_obj(*out_bus_fmts);
if (!out_bus_fmts)
return NULL;
@@ -158,7 +158,7 @@ static u32 *display_connector_get_input_bus_fmts(struct drm_bridge *bridge,
u32 *in_bus_fmts;
*num_input_fmts = 1;
- in_bus_fmts = kmalloc_obj(*in_bus_fmts, GFP_KERNEL);
+ in_bus_fmts = kmalloc_obj(*in_bus_fmts);
if (!in_bus_fmts)
return NULL;
diff --git a/drivers/gpu/drm/bridge/imx/imx8qm-ldb.c b/drivers/gpu/drm/bridge/imx/imx8qm-ldb.c
index 157cda9d2fb1..bdecee56fa49 100644
--- a/drivers/gpu/drm/bridge/imx/imx8qm-ldb.c
+++ b/drivers/gpu/drm/bridge/imx/imx8qm-ldb.c
@@ -319,7 +319,7 @@ imx8qm_ldb_bridge_atomic_get_input_bus_fmts(struct drm_bridge *bridge,
*num_input_fmts = 1;
- input_fmts = kmalloc_obj(*input_fmts, GFP_KERNEL);
+ input_fmts = kmalloc_obj(*input_fmts);
if (!input_fmts)
return NULL;
diff --git a/drivers/gpu/drm/bridge/imx/imx8qxp-ldb.c b/drivers/gpu/drm/bridge/imx/imx8qxp-ldb.c
index eb06266f15fb..fbd7a37c0812 100644
--- a/drivers/gpu/drm/bridge/imx/imx8qxp-ldb.c
+++ b/drivers/gpu/drm/bridge/imx/imx8qxp-ldb.c
@@ -333,7 +333,7 @@ imx8qxp_ldb_bridge_atomic_get_input_bus_fmts(struct drm_bridge *bridge,
*num_input_fmts = 1;
- input_fmts = kmalloc_obj(*input_fmts, GFP_KERNEL);
+ input_fmts = kmalloc_obj(*input_fmts);
if (!input_fmts)
return NULL;
diff --git a/drivers/gpu/drm/bridge/imx/imx8qxp-pixel-combiner.c b/drivers/gpu/drm/bridge/imx/imx8qxp-pixel-combiner.c
index a7dd49e2d3bb..5582456a4490 100644
--- a/drivers/gpu/drm/bridge/imx/imx8qxp-pixel-combiner.c
+++ b/drivers/gpu/drm/bridge/imx/imx8qxp-pixel-combiner.c
@@ -216,7 +216,7 @@ imx8qxp_pc_bridge_atomic_get_input_bus_fmts(struct drm_bridge *bridge,
*num_input_fmts = 1;
- input_fmts = kmalloc_obj(*input_fmts, GFP_KERNEL);
+ input_fmts = kmalloc_obj(*input_fmts);
if (!input_fmts)
return NULL;
diff --git a/drivers/gpu/drm/bridge/imx/imx8qxp-pixel-link.c b/drivers/gpu/drm/bridge/imx/imx8qxp-pixel-link.c
index 85976abdda63..b52b7c7ce183 100644
--- a/drivers/gpu/drm/bridge/imx/imx8qxp-pixel-link.c
+++ b/drivers/gpu/drm/bridge/imx/imx8qxp-pixel-link.c
@@ -206,7 +206,7 @@ imx8qxp_pixel_link_bridge_atomic_get_input_bus_fmts(struct drm_bridge *bridge,
*num_input_fmts = 1;
- input_fmts = kmalloc_obj(*input_fmts, GFP_KERNEL);
+ input_fmts = kmalloc_obj(*input_fmts);
if (!input_fmts)
return NULL;
diff --git a/drivers/gpu/drm/bridge/imx/imx8qxp-pxl2dpi.c b/drivers/gpu/drm/bridge/imx/imx8qxp-pxl2dpi.c
index 7c86760171dc..441fd32dc91c 100644
--- a/drivers/gpu/drm/bridge/imx/imx8qxp-pxl2dpi.c
+++ b/drivers/gpu/drm/bridge/imx/imx8qxp-pxl2dpi.c
@@ -175,7 +175,7 @@ imx8qxp_pxl2dpi_bridge_atomic_get_input_bus_fmts(struct drm_bridge *bridge,
*num_input_fmts = 1;
- input_fmts = kmalloc_obj(*input_fmts, GFP_KERNEL);
+ input_fmts = kmalloc_obj(*input_fmts);
if (!input_fmts)
return NULL;
diff --git a/drivers/gpu/drm/bridge/imx/imx93-mipi-dsi.c b/drivers/gpu/drm/bridge/imx/imx93-mipi-dsi.c
index e672a37950e0..8f312f9edf97 100644
--- a/drivers/gpu/drm/bridge/imx/imx93-mipi-dsi.c
+++ b/drivers/gpu/drm/bridge/imx/imx93-mipi-dsi.c
@@ -609,7 +609,7 @@ static u32 *imx93_dsi_get_input_bus_fmts(void *priv_data,
return NULL;
}
- input_fmts = kmalloc_obj(*input_fmts, GFP_KERNEL);
+ input_fmts = kmalloc_obj(*input_fmts);
if (!input_fmts)
return NULL;
input_fmts[0] = input_fmt;
diff --git a/drivers/gpu/drm/bridge/ite-it6263.c b/drivers/gpu/drm/bridge/ite-it6263.c
index 85fbf57001ec..e77681047bb2 100644
--- a/drivers/gpu/drm/bridge/ite-it6263.c
+++ b/drivers/gpu/drm/bridge/ite-it6263.c
@@ -735,7 +735,7 @@ it6263_bridge_atomic_get_input_bus_fmts(struct drm_bridge *bridge,
if (!it6263_is_input_bus_fmt_valid(it->lvds_data_mapping))
return NULL;
- input_fmts = kmalloc_obj(*input_fmts, GFP_KERNEL);
+ input_fmts = kmalloc_obj(*input_fmts);
if (!input_fmts)
return NULL;
diff --git a/drivers/gpu/drm/bridge/samsung-dsim.c b/drivers/gpu/drm/bridge/samsung-dsim.c
index 810c6984cf6b..930aaa659c97 100644
--- a/drivers/gpu/drm/bridge/samsung-dsim.c
+++ b/drivers/gpu/drm/bridge/samsung-dsim.c
@@ -1741,7 +1741,7 @@ samsung_dsim_atomic_get_input_bus_fmts(struct drm_bridge *bridge,
{
u32 *input_fmts;
- input_fmts = kmalloc_obj(*input_fmts, GFP_KERNEL);
+ input_fmts = kmalloc_obj(*input_fmts);
if (!input_fmts)
return NULL;
diff --git a/drivers/gpu/drm/bridge/sil-sii8620.c b/drivers/gpu/drm/bridge/sil-sii8620.c
index 10fcec9d653b..d3f238b1f2a9 100644
--- a/drivers/gpu/drm/bridge/sil-sii8620.c
+++ b/drivers/gpu/drm/bridge/sil-sii8620.c
@@ -384,7 +384,7 @@ static void sii8620_mt_msc_cmd_send(struct sii8620 *ctx,
static struct sii8620_mt_msg *sii8620_mt_msg_new(struct sii8620 *ctx)
{
- struct sii8620_mt_msg *msg = kzalloc_obj(*msg, GFP_KERNEL);
+ struct sii8620_mt_msg *msg = kzalloc_obj(*msg);
if (!msg)
ctx->error = -ENOMEM;
diff --git a/drivers/gpu/drm/bridge/synopsys/dw-dp.c b/drivers/gpu/drm/bridge/synopsys/dw-dp.c
index 04e2e19c9e25..4ab6922dd79c 100644
--- a/drivers/gpu/drm/bridge/synopsys/dw-dp.c
+++ b/drivers/gpu/drm/bridge/synopsys/dw-dp.c
@@ -1809,7 +1809,7 @@ static struct drm_bridge_state *dw_dp_bridge_atomic_duplicate_state(struct drm_b
{
struct dw_dp_bridge_state *state;
- state = kzalloc_obj(*state, GFP_KERNEL);
+ state = kzalloc_obj(*state);
if (!state)
return NULL;
diff --git a/drivers/gpu/drm/bridge/synopsys/dw-mipi-dsi.c b/drivers/gpu/drm/bridge/synopsys/dw-mipi-dsi.c
index 8d5d8a196479..ca4dea226f4b 100644
--- a/drivers/gpu/drm/bridge/synopsys/dw-mipi-dsi.c
+++ b/drivers/gpu/drm/bridge/synopsys/dw-mipi-dsi.c
@@ -561,7 +561,7 @@ dw_mipi_dsi_bridge_atomic_get_input_bus_fmts(struct drm_bridge *bridge,
output_fmt, num_input_fmts);
/* Fall back to MEDIA_BUS_FMT_FIXED as the only input format. */
- input_fmts = kmalloc_obj(*input_fmts, GFP_KERNEL);
+ input_fmts = kmalloc_obj(*input_fmts);
if (!input_fmts)
return NULL;
input_fmts[0] = MEDIA_BUS_FMT_FIXED;
diff --git a/drivers/gpu/drm/bridge/synopsys/dw-mipi-dsi2.c b/drivers/gpu/drm/bridge/synopsys/dw-mipi-dsi2.c
index 9f06d00569ec..e6eaf9fd0251 100644
--- a/drivers/gpu/drm/bridge/synopsys/dw-mipi-dsi2.c
+++ b/drivers/gpu/drm/bridge/synopsys/dw-mipi-dsi2.c
@@ -711,7 +711,7 @@ dw_mipi_dsi2_bridge_atomic_get_input_bus_fmts(struct drm_bridge *bridge,
output_fmt, num_input_fmts);
/* Fall back to MEDIA_BUS_FMT_FIXED as the only input format. */
- input_fmts = kmalloc_obj(*input_fmts, GFP_KERNEL);
+ input_fmts = kmalloc_obj(*input_fmts);
if (!input_fmts)
return NULL;
input_fmts[0] = MEDIA_BUS_FMT_FIXED;
diff --git a/drivers/gpu/drm/bridge/ti-tfp410.c b/drivers/gpu/drm/bridge/ti-tfp410.c
index cae2ea075670..3b6b0e92cf89 100644
--- a/drivers/gpu/drm/bridge/ti-tfp410.c
+++ b/drivers/gpu/drm/bridge/ti-tfp410.c
@@ -213,7 +213,7 @@ static u32 *tfp410_get_input_bus_fmts(struct drm_bridge *bridge,
*num_input_fmts = 0;
- input_fmts = kzalloc_obj(*input_fmts, GFP_KERNEL);
+ input_fmts = kzalloc_obj(*input_fmts);
if (!input_fmts)
return NULL;
diff --git a/drivers/gpu/drm/clients/drm_fbdev_client.c b/drivers/gpu/drm/clients/drm_fbdev_client.c
index f708c0d2bf6a..91d196a397cf 100644
--- a/drivers/gpu/drm/clients/drm_fbdev_client.c
+++ b/drivers/gpu/drm/clients/drm_fbdev_client.c
@@ -154,7 +154,7 @@ int drm_fbdev_client_setup(struct drm_device *dev, const struct drm_format_info
drm_WARN(dev, !dev->registered, "Device has not been registered.\n");
drm_WARN(dev, dev->fb_helper, "fb_helper is already set!\n");
- fb_helper = kzalloc_obj(*fb_helper, GFP_KERNEL);
+ fb_helper = kzalloc_obj(*fb_helper);
if (!fb_helper)
return -ENOMEM;
drm_fb_helper_prepare(dev, fb_helper, color_mode, NULL);
diff --git a/drivers/gpu/drm/clients/drm_log.c b/drivers/gpu/drm/clients/drm_log.c
index 1055f05dbfa2..8d21b785bead 100644
--- a/drivers/gpu/drm/clients/drm_log.c
+++ b/drivers/gpu/drm/clients/drm_log.c
@@ -248,7 +248,7 @@ static void drm_log_init_client(struct drm_log *dlog)
if (!max_modeset)
return;
- dlog->scanout = kzalloc_objs(*dlog->scanout, max_modeset, GFP_KERNEL);
+ dlog->scanout = kzalloc_objs(*dlog->scanout, max_modeset);
if (!dlog->scanout)
return;
@@ -419,7 +419,7 @@ void drm_log_register(struct drm_device *dev)
{
struct drm_log *new;
- new = kzalloc_obj(*new, GFP_KERNEL);
+ new = kzalloc_obj(*new);
if (!new)
goto err_warn;
diff --git a/drivers/gpu/drm/display/drm_dp_aux_bus.c b/drivers/gpu/drm/display/drm_dp_aux_bus.c
index a36feef1cd6a..6e5e3e542290 100644
--- a/drivers/gpu/drm/display/drm_dp_aux_bus.c
+++ b/drivers/gpu/drm/display/drm_dp_aux_bus.c
@@ -280,7 +280,7 @@ int of_dp_aux_populate_bus(struct drm_dp_aux *aux,
goto err_did_get_np;
}
- aux_ep_with_data = kzalloc_obj(*aux_ep_with_data, GFP_KERNEL);
+ aux_ep_with_data = kzalloc_obj(*aux_ep_with_data);
if (!aux_ep_with_data) {
ret = -ENOMEM;
goto err_did_set_populated;
diff --git a/drivers/gpu/drm/display/drm_dp_aux_dev.c b/drivers/gpu/drm/display/drm_dp_aux_dev.c
index df02dbca7338..f0632e43b69e 100644
--- a/drivers/gpu/drm/display/drm_dp_aux_dev.c
+++ b/drivers/gpu/drm/display/drm_dp_aux_dev.c
@@ -75,7 +75,7 @@ static struct drm_dp_aux_dev *alloc_drm_dp_aux_dev(struct drm_dp_aux *aux)
struct drm_dp_aux_dev *aux_dev;
int index;
- aux_dev = kzalloc_obj(*aux_dev, GFP_KERNEL);
+ aux_dev = kzalloc_obj(*aux_dev);
if (!aux_dev)
return ERR_PTR(-ENOMEM);
aux_dev->aux = aux;
diff --git a/drivers/gpu/drm/display/drm_dp_mst_topology.c b/drivers/gpu/drm/display/drm_dp_mst_topology.c
index 954ecaa6fd6b..953228cc46cb 100644
--- a/drivers/gpu/drm/display/drm_dp_mst_topology.c
+++ b/drivers/gpu/drm/display/drm_dp_mst_topology.c
@@ -1333,7 +1333,7 @@ static struct drm_dp_mst_branch *drm_dp_add_mst_branch_device(u8 lct, u8 *rad)
{
struct drm_dp_mst_branch *mstb;
- mstb = kzalloc_obj(*mstb, GFP_KERNEL);
+ mstb = kzalloc_obj(*mstb);
if (!mstb)
return NULL;
@@ -2317,7 +2317,7 @@ drm_dp_mst_add_port(struct drm_device *dev,
struct drm_dp_mst_topology_mgr *mgr,
struct drm_dp_mst_branch *mstb, u8 port_number)
{
- struct drm_dp_mst_port *port = kzalloc_obj(*port, GFP_KERNEL);
+ struct drm_dp_mst_port *port = kzalloc_obj(*port);
if (!port)
return NULL;
@@ -2923,7 +2923,7 @@ static int drm_dp_send_link_address(struct drm_dp_mst_topology_mgr *mgr,
int i, ret, port_mask = 0;
bool changed = false;
- txmsg = kzalloc_obj(*txmsg, GFP_KERNEL);
+ txmsg = kzalloc_obj(*txmsg);
if (!txmsg)
return -ENOMEM;
@@ -3000,7 +3000,7 @@ drm_dp_send_clear_payload_id_table(struct drm_dp_mst_topology_mgr *mgr,
struct drm_dp_sideband_msg_tx *txmsg;
int ret;
- txmsg = kzalloc_obj(*txmsg, GFP_KERNEL);
+ txmsg = kzalloc_obj(*txmsg);
if (!txmsg)
return;
@@ -3025,7 +3025,7 @@ drm_dp_send_enum_path_resources(struct drm_dp_mst_topology_mgr *mgr,
struct drm_dp_sideband_msg_tx *txmsg;
int ret;
- txmsg = kzalloc_obj(*txmsg, GFP_KERNEL);
+ txmsg = kzalloc_obj(*txmsg);
if (!txmsg)
return -ENOMEM;
@@ -3138,7 +3138,7 @@ static int drm_dp_payload_send_msg(struct drm_dp_mst_topology_mgr *mgr,
return -EINVAL;
}
- txmsg = kzalloc_obj(*txmsg, GFP_KERNEL);
+ txmsg = kzalloc_obj(*txmsg);
if (!txmsg) {
ret = -ENOMEM;
goto fail_put;
@@ -3185,7 +3185,7 @@ int drm_dp_send_power_updown_phy(struct drm_dp_mst_topology_mgr *mgr,
if (!port)
return -EINVAL;
- txmsg = kzalloc_obj(*txmsg, GFP_KERNEL);
+ txmsg = kzalloc_obj(*txmsg);
if (!txmsg) {
drm_dp_mst_topology_put_port(port);
return -ENOMEM;
@@ -3219,7 +3219,7 @@ int drm_dp_send_query_stream_enc_status(struct drm_dp_mst_topology_mgr *mgr,
u8 nonce[7];
int ret;
- txmsg = kzalloc_obj(*txmsg, GFP_KERNEL);
+ txmsg = kzalloc_obj(*txmsg);
if (!txmsg)
return -ENOMEM;
@@ -3470,7 +3470,7 @@ static int drm_dp_send_dpcd_read(struct drm_dp_mst_topology_mgr *mgr,
if (!mstb)
return -EINVAL;
- txmsg = kzalloc_obj(*txmsg, GFP_KERNEL);
+ txmsg = kzalloc_obj(*txmsg);
if (!txmsg) {
ret = -ENOMEM;
goto fail_put;
@@ -3521,7 +3521,7 @@ static int drm_dp_send_dpcd_write(struct drm_dp_mst_topology_mgr *mgr,
if (!mstb)
return -EINVAL;
- txmsg = kzalloc_obj(*txmsg, GFP_KERNEL);
+ txmsg = kzalloc_obj(*txmsg);
if (!txmsg) {
ret = -ENOMEM;
goto fail_put;
@@ -3562,7 +3562,7 @@ static int drm_dp_send_up_ack_reply(struct drm_dp_mst_topology_mgr *mgr,
{
struct drm_dp_sideband_msg_tx *txmsg;
- txmsg = kzalloc_obj(*txmsg, GFP_KERNEL);
+ txmsg = kzalloc_obj(*txmsg);
if (!txmsg)
return -ENOMEM;
@@ -4135,7 +4135,7 @@ static int drm_dp_mst_handle_up_req(struct drm_dp_mst_topology_mgr *mgr)
if (!mgr->up_req_recv.have_eomt)
return 0;
- up_req = kzalloc_obj(*up_req, GFP_KERNEL);
+ up_req = kzalloc_obj(*up_req);
if (!up_req) {
ret = -ENOMEM;
goto out_clear_reply;
@@ -4479,7 +4479,7 @@ int drm_dp_atomic_find_time_slots(struct drm_atomic_state *state,
/* Add the new allocation to the state, note the VCPI isn't assigned until the end */
if (!payload) {
- payload = kzalloc_obj(*payload, GFP_KERNEL);
+ payload = kzalloc_obj(*payload);
if (!payload)
return -ENOMEM;
@@ -5744,7 +5744,7 @@ int drm_dp_mst_topology_mgr_init(struct drm_dp_mst_topology_mgr *mgr,
mgr->max_payloads = max_payloads;
mgr->conn_base_id = conn_base_id;
- mst_state = kzalloc_obj(*mst_state, GFP_KERNEL);
+ mst_state = kzalloc_obj(*mst_state);
if (mst_state == NULL)
return -ENOMEM;
@@ -5844,7 +5844,7 @@ static int drm_dp_mst_i2c_read(struct drm_dp_mst_branch *mstb,
msg.u.i2c_read.read_i2c_device_id = msgs[num - 1].addr;
msg.u.i2c_read.num_bytes_read = msgs[num - 1].len;
- txmsg = kzalloc_obj(*txmsg, GFP_KERNEL);
+ txmsg = kzalloc_obj(*txmsg);
if (!txmsg) {
ret = -ENOMEM;
goto out;
@@ -5884,7 +5884,7 @@ static int drm_dp_mst_i2c_write(struct drm_dp_mst_branch *mstb,
struct drm_dp_sideband_msg_tx *txmsg = NULL;
int ret;
- txmsg = kzalloc_obj(*txmsg, GFP_KERNEL);
+ txmsg = kzalloc_obj(*txmsg);
if (!txmsg) {
ret = -ENOMEM;
goto out;
diff --git a/drivers/gpu/drm/display/drm_dp_tunnel.c b/drivers/gpu/drm/display/drm_dp_tunnel.c
index 005ee68e6cd4..7aee57416902 100644
--- a/drivers/gpu/drm/display/drm_dp_tunnel.c
+++ b/drivers/gpu/drm/display/drm_dp_tunnel.c
@@ -476,7 +476,7 @@ create_tunnel(struct drm_dp_tunnel_mgr *mgr,
u8 drv_group_id = tunnel_reg_drv_group_id(regs);
struct drm_dp_tunnel *tunnel;
- tunnel = kzalloc_obj(*tunnel, GFP_KERNEL);
+ tunnel = kzalloc_obj(*tunnel);
if (!tunnel)
return NULL;
@@ -1387,7 +1387,7 @@ add_tunnel_state(struct drm_dp_tunnel_group_state *group_state,
"Adding state for tunnel %p to group state %p\n",
tunnel, group_state);
- tunnel_state = kzalloc_obj(*tunnel_state, GFP_KERNEL);
+ tunnel_state = kzalloc_obj(*tunnel_state);
if (!tunnel_state)
return NULL;
@@ -1458,7 +1458,7 @@ tunnel_group_duplicate_state(struct drm_private_obj *obj)
struct drm_dp_tunnel_group_state *group_state;
struct drm_dp_tunnel_state *tunnel_state;
- group_state = kzalloc_obj(*group_state, GFP_KERNEL);
+ group_state = kzalloc_obj(*group_state);
if (!group_state)
return NULL;
@@ -1583,7 +1583,7 @@ static bool init_group(struct drm_dp_tunnel_mgr *mgr, struct drm_dp_tunnel_group
{
struct drm_dp_tunnel_group_state *group_state;
- group_state = kzalloc_obj(*group_state, GFP_KERNEL);
+ group_state = kzalloc_obj(*group_state);
if (!group_state)
return false;
@@ -1644,7 +1644,7 @@ static int resize_bw_array(struct drm_dp_tunnel_state *tunnel_state,
if (old_mask == new_mask)
return 0;
- new_bws = kzalloc_objs(*new_bws, hweight32(new_mask), GFP_KERNEL);
+ new_bws = kzalloc_objs(*new_bws, hweight32(new_mask));
if (!new_bws)
return -ENOMEM;
@@ -1906,14 +1906,14 @@ drm_dp_tunnel_mgr_create(struct drm_device *dev, int max_group_count)
struct drm_dp_tunnel_mgr *mgr;
int i;
- mgr = kzalloc_obj(*mgr, GFP_KERNEL);
+ mgr = kzalloc_obj(*mgr);
if (!mgr)
return ERR_PTR(-ENOMEM);
mgr->dev = dev;
init_waitqueue_head(&mgr->bw_req_queue);
- mgr->groups = kzalloc_objs(*mgr->groups, max_group_count, GFP_KERNEL);
+ mgr->groups = kzalloc_objs(*mgr->groups, max_group_count);
if (!mgr->groups) {
kfree(mgr);
diff --git a/drivers/gpu/drm/display/drm_hdmi_cec_helper.c b/drivers/gpu/drm/display/drm_hdmi_cec_helper.c
index 7308ed792089..ef6dbaa59dee 100644
--- a/drivers/gpu/drm/display/drm_hdmi_cec_helper.c
+++ b/drivers/gpu/drm/display/drm_hdmi_cec_helper.c
@@ -97,7 +97,7 @@ int drmm_connector_hdmi_cec_register(struct drm_connector *connector,
if (!funcs->init || !funcs->enable || !funcs->log_addr || !funcs->transmit)
return -EINVAL;
- data = kzalloc_obj(*data, GFP_KERNEL);
+ data = kzalloc_obj(*data);
if (!data)
return -ENOMEM;
diff --git a/drivers/gpu/drm/drm_atomic.c b/drivers/gpu/drm/drm_atomic.c
index a666fca65d6c..565c47f976b1 100644
--- a/drivers/gpu/drm/drm_atomic.c
+++ b/drivers/gpu/drm/drm_atomic.c
@@ -177,7 +177,7 @@ drm_atomic_state_alloc(struct drm_device *dev)
if (!config->funcs->atomic_state_alloc) {
struct drm_atomic_state *state;
- state = kzalloc_obj(*state, GFP_KERNEL);
+ state = kzalloc_obj(*state);
if (!state)
return NULL;
if (drm_atomic_state_init(dev, state) < 0) {
diff --git a/drivers/gpu/drm/drm_atomic_helper.c b/drivers/gpu/drm/drm_atomic_helper.c
index 8626f903fdd5..3bdf32234bb3 100644
--- a/drivers/gpu/drm/drm_atomic_helper.c
+++ b/drivers/gpu/drm/drm_atomic_helper.c
@@ -2525,7 +2525,7 @@ int drm_atomic_helper_setup_commit(struct drm_atomic_state *state,
funcs = state->dev->mode_config.helper_private;
for_each_oldnew_crtc_in_state(state, crtc, old_crtc_state, new_crtc_state, i) {
- commit = kzalloc_obj(*commit, GFP_KERNEL);
+ commit = kzalloc_obj(*commit);
if (!commit)
return -ENOMEM;
@@ -2554,7 +2554,7 @@ int drm_atomic_helper_setup_commit(struct drm_atomic_state *state,
}
if (!new_crtc_state->event) {
- commit->event = kzalloc_obj(*commit->event, GFP_KERNEL);
+ commit->event = kzalloc_obj(*commit->event);
if (!commit->event)
return -ENOMEM;
@@ -4080,7 +4080,7 @@ drm_atomic_helper_bridge_propagate_bus_fmt(struct drm_bridge *bridge,
{
u32 *input_fmts;
- input_fmts = kzalloc_obj(*input_fmts, GFP_KERNEL);
+ input_fmts = kzalloc_obj(*input_fmts);
if (!input_fmts) {
*num_input_fmts = 0;
return NULL;
diff --git a/drivers/gpu/drm/drm_atomic_state_helper.c b/drivers/gpu/drm/drm_atomic_state_helper.c
index 67812085dca7..2a101fd5a714 100644
--- a/drivers/gpu/drm/drm_atomic_state_helper.c
+++ b/drivers/gpu/drm/drm_atomic_state_helper.c
@@ -114,7 +114,7 @@ EXPORT_SYMBOL(__drm_atomic_helper_crtc_reset);
void drm_atomic_helper_crtc_reset(struct drm_crtc *crtc)
{
struct drm_crtc_state *crtc_state =
- kzalloc_obj(*crtc->state, GFP_KERNEL);
+ kzalloc_obj(*crtc->state);
if (crtc->state)
crtc->funcs->atomic_destroy_state(crtc, crtc->state);
@@ -175,7 +175,7 @@ drm_atomic_helper_crtc_duplicate_state(struct drm_crtc *crtc)
if (WARN_ON(!crtc->state))
return NULL;
- state = kmalloc_obj(*state, GFP_KERNEL);
+ state = kmalloc_obj(*state);
if (state)
__drm_atomic_helper_crtc_duplicate_state(crtc, state);
@@ -333,7 +333,7 @@ void drm_atomic_helper_plane_reset(struct drm_plane *plane)
__drm_atomic_helper_plane_destroy_state(plane->state);
kfree(plane->state);
- plane->state = kzalloc_obj(*plane->state, GFP_KERNEL);
+ plane->state = kzalloc_obj(*plane->state);
if (plane->state)
__drm_atomic_helper_plane_reset(plane, plane->state);
}
@@ -377,7 +377,7 @@ drm_atomic_helper_plane_duplicate_state(struct drm_plane *plane)
if (WARN_ON(!plane->state))
return NULL;
- state = kmalloc_obj(*state, GFP_KERNEL);
+ state = kmalloc_obj(*state);
if (state)
__drm_atomic_helper_plane_duplicate_state(plane, state);
@@ -666,7 +666,7 @@ drm_atomic_helper_connector_duplicate_state(struct drm_connector *connector)
if (WARN_ON(!connector->state))
return NULL;
- state = kmalloc_obj(*state, GFP_KERNEL);
+ state = kmalloc_obj(*state);
if (state)
__drm_atomic_helper_connector_duplicate_state(connector, state);
@@ -763,7 +763,7 @@ drm_atomic_helper_bridge_duplicate_state(struct drm_bridge *bridge)
if (WARN_ON(!bridge->base.state))
return NULL;
- new = kzalloc_obj(*new, GFP_KERNEL);
+ new = kzalloc_obj(*new);
if (new)
__drm_atomic_helper_bridge_duplicate_state(bridge, new);
@@ -821,7 +821,7 @@ drm_atomic_helper_bridge_reset(struct drm_bridge *bridge)
{
struct drm_bridge_state *bridge_state;
- bridge_state = kzalloc_obj(*bridge_state, GFP_KERNEL);
+ bridge_state = kzalloc_obj(*bridge_state);
if (!bridge_state)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/gpu/drm/drm_atomic_uapi.c b/drivers/gpu/drm/drm_atomic_uapi.c
index ac2175f5e5b0..87de41fb4459 100644
--- a/drivers/gpu/drm/drm_atomic_uapi.c
+++ b/drivers/gpu/drm/drm_atomic_uapi.c
@@ -1088,7 +1088,7 @@ static struct drm_pending_vblank_event *create_vblank_event(
{
struct drm_pending_vblank_event *e = NULL;
- e = kzalloc_obj(*e, GFP_KERNEL);
+ e = kzalloc_obj(*e);
if (!e)
return NULL;
diff --git a/drivers/gpu/drm/drm_auth.c b/drivers/gpu/drm/drm_auth.c
index d9d984ae62c4..e17bb0f1f9e0 100644
--- a/drivers/gpu/drm/drm_auth.c
+++ b/drivers/gpu/drm/drm_auth.c
@@ -132,7 +132,7 @@ struct drm_master *drm_master_create(struct drm_device *dev)
{
struct drm_master *master;
- master = kzalloc_obj(*master, GFP_KERNEL);
+ master = kzalloc_obj(*master);
if (!master)
return NULL;
diff --git a/drivers/gpu/drm/drm_blend.c b/drivers/gpu/drm/drm_blend.c
index 9a81992b04e9..3b1f5f72885e 100644
--- a/drivers/gpu/drm/drm_blend.c
+++ b/drivers/gpu/drm/drm_blend.c
@@ -459,7 +459,7 @@ static int drm_atomic_helper_crtc_normalize_zpos(struct drm_crtc *crtc,
drm_dbg_atomic(dev, "[CRTC:%d:%s] calculating normalized zpos values\n",
crtc->base.id, crtc->name);
- states = kmalloc_objs(*states, total_planes, GFP_KERNEL);
+ states = kmalloc_objs(*states, total_planes);
if (!states)
return -ENOMEM;
diff --git a/drivers/gpu/drm/drm_bridge.c b/drivers/gpu/drm/drm_bridge.c
index 5518760a88c1..d6f11c68bb6a 100644
--- a/drivers/gpu/drm/drm_bridge.c
+++ b/drivers/gpu/drm/drm_bridge.c
@@ -1189,7 +1189,7 @@ drm_atomic_bridge_chain_select_bus_fmts(struct drm_bridge *bridge,
return -ENOMEM;
} else {
num_out_bus_fmts = 1;
- out_bus_fmts = kmalloc_obj(*out_bus_fmts, GFP_KERNEL);
+ out_bus_fmts = kmalloc_obj(*out_bus_fmts);
if (!out_bus_fmts)
return -ENOMEM;
diff --git a/drivers/gpu/drm/drm_client.c b/drivers/gpu/drm/drm_client.c
index 0e6f4b73827d..6236ec46d62a 100644
--- a/drivers/gpu/drm/drm_client.c
+++ b/drivers/gpu/drm/drm_client.c
@@ -225,7 +225,7 @@ drm_client_buffer_create(struct drm_client_dev *client, u32 width, u32 height,
struct drm_framebuffer *fb;
int ret;
- buffer = kzalloc_obj(*buffer, GFP_KERNEL);
+ buffer = kzalloc_obj(*buffer);
if (!buffer)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/gpu/drm/drm_client_modeset.c b/drivers/gpu/drm/drm_client_modeset.c
index fce35c27b361..8e41cb8d0011 100644
--- a/drivers/gpu/drm/drm_client_modeset.c
+++ b/drivers/gpu/drm/drm_client_modeset.c
@@ -567,7 +567,7 @@ static int drm_client_pick_crtcs(struct drm_client_dev *client,
if (modes[n] == NULL)
return best_score;
- crtcs = kzalloc_objs(*crtcs, connector_count, GFP_KERNEL);
+ crtcs = kzalloc_objs(*crtcs, connector_count);
if (!crtcs)
return best_score;
@@ -643,7 +643,7 @@ static bool drm_client_firmware_config(struct drm_client_dev *client,
if (drm_WARN_ON(dev, count <= 0))
return false;
- save_enabled = kzalloc_objs(bool, count, GFP_KERNEL);
+ save_enabled = kzalloc_objs(bool, count);
if (!save_enabled)
return false;
@@ -855,10 +855,10 @@ int drm_client_modeset_probe(struct drm_client_dev *client, unsigned int width,
if (!connector_count)
return 0;
- crtcs = kzalloc_objs(*crtcs, connector_count, GFP_KERNEL);
- modes = kzalloc_objs(*modes, connector_count, GFP_KERNEL);
- offsets = kzalloc_objs(*offsets, connector_count, GFP_KERNEL);
- enabled = kzalloc_objs(bool, connector_count, GFP_KERNEL);
+ crtcs = kzalloc_objs(*crtcs, connector_count);
+ modes = kzalloc_objs(*modes, connector_count);
+ offsets = kzalloc_objs(*offsets, connector_count);
+ enabled = kzalloc_objs(bool, connector_count);
if (!crtcs || !modes || !enabled || !offsets) {
ret = -ENOMEM;
goto out;
diff --git a/drivers/gpu/drm/drm_colorop.c b/drivers/gpu/drm/drm_colorop.c
index 2f3cd856df03..398cc81ae588 100644
--- a/drivers/gpu/drm/drm_colorop.c
+++ b/drivers/gpu/drm/drm_colorop.c
@@ -453,7 +453,7 @@ drm_atomic_helper_colorop_duplicate_state(struct drm_colorop *colorop)
if (WARN_ON(!colorop->state))
return NULL;
- state = kmalloc_obj(*state, GFP_KERNEL);
+ state = kmalloc_obj(*state);
if (state)
__drm_atomic_helper_colorop_duplicate_state(colorop, state);
@@ -514,7 +514,7 @@ static void __drm_colorop_reset(struct drm_colorop *colorop,
void drm_colorop_reset(struct drm_colorop *colorop)
{
kfree(colorop->state);
- colorop->state = kzalloc_obj(*colorop->state, GFP_KERNEL);
+ colorop->state = kzalloc_obj(*colorop->state);
if (colorop->state)
__drm_colorop_reset(colorop, colorop->state);
diff --git a/drivers/gpu/drm/drm_connector.c b/drivers/gpu/drm/drm_connector.c
index 7528c848ccfb..2a3a1fa0594b 100644
--- a/drivers/gpu/drm/drm_connector.c
+++ b/drivers/gpu/drm/drm_connector.c
@@ -3605,7 +3605,7 @@ struct drm_tile_group *drm_mode_create_tile_group(struct drm_device *dev,
struct drm_tile_group *tg;
int ret;
- tg = kzalloc_obj(*tg, GFP_KERNEL);
+ tg = kzalloc_obj(*tg);
if (!tg)
return NULL;
diff --git a/drivers/gpu/drm/drm_crtc.c b/drivers/gpu/drm/drm_crtc.c
index f24b5593b613..6d0bf06b4d31 100644
--- a/drivers/gpu/drm/drm_crtc.c
+++ b/drivers/gpu/drm/drm_crtc.c
@@ -185,7 +185,7 @@ struct dma_fence *drm_crtc_create_fence(struct drm_crtc *crtc)
{
struct dma_fence *fence;
- fence = kzalloc_obj(*fence, GFP_KERNEL);
+ fence = kzalloc_obj(*fence);
if (!fence)
return NULL;
diff --git a/drivers/gpu/drm/drm_damage_helper.c b/drivers/gpu/drm/drm_damage_helper.c
index 928cccac527e..1b6850aa1688 100644
--- a/drivers/gpu/drm/drm_damage_helper.c
+++ b/drivers/gpu/drm/drm_damage_helper.c
@@ -140,7 +140,7 @@ int drm_atomic_helper_dirtyfb(struct drm_framebuffer *fb,
num_clips /= 2;
}
- rects = kzalloc_objs(*rects, num_clips, GFP_KERNEL);
+ rects = kzalloc_objs(*rects, num_clips);
if (!rects) {
ret = -ENOMEM;
goto out;
diff --git a/drivers/gpu/drm/drm_debugfs_crc.c b/drivers/gpu/drm/drm_debugfs_crc.c
index 835deddcc538..371edb0b9b17 100644
--- a/drivers/gpu/drm/drm_debugfs_crc.c
+++ b/drivers/gpu/drm/drm_debugfs_crc.c
@@ -224,7 +224,7 @@ static int crtc_crc_open(struct inode *inode, struct file *filep)
if (WARN_ON(values_cnt == 0))
return -EINVAL;
- entries = kzalloc_objs(*entries, DRM_CRC_ENTRIES_NR, GFP_KERNEL);
+ entries = kzalloc_objs(*entries, DRM_CRC_ENTRIES_NR);
if (!entries)
return -ENOMEM;
diff --git a/drivers/gpu/drm/drm_edid.c b/drivers/gpu/drm/drm_edid.c
index d248d2b295a0..ff432ac6b569 100644
--- a/drivers/gpu/drm/drm_edid.c
+++ b/drivers/gpu/drm/drm_edid.c
@@ -2503,7 +2503,7 @@ static const struct drm_edid *_drm_edid_alloc(const void *edid, size_t size)
if (!edid || !size || size < EDID_LENGTH)
return NULL;
- drm_edid = kzalloc_obj(*drm_edid, GFP_KERNEL);
+ drm_edid = kzalloc_obj(*drm_edid);
if (drm_edid) {
drm_edid->edid = edid;
drm_edid->size = size;
@@ -5764,7 +5764,7 @@ static int _drm_edid_to_sad(const struct drm_edid *drm_edid,
int i;
count = cea_db_payload_len(db) / 3; /* SAD is 3B */
- sads = kzalloc_objs(*sads, count, GFP_KERNEL);
+ sads = kzalloc_objs(*sads, count);
*psads = sads;
if (!sads)
return -ENOMEM;
diff --git a/drivers/gpu/drm/drm_file.c b/drivers/gpu/drm/drm_file.c
index 608763984794..ec820686b302 100644
--- a/drivers/gpu/drm/drm_file.c
+++ b/drivers/gpu/drm/drm_file.c
@@ -136,7 +136,7 @@ struct drm_file *drm_file_alloc(struct drm_minor *minor)
struct drm_file *file;
int ret;
- file = kzalloc_obj(*file, GFP_KERNEL);
+ file = kzalloc_obj(*file);
if (!file)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/gpu/drm/drm_framebuffer.c b/drivers/gpu/drm/drm_framebuffer.c
index 45963ff2192c..147ac19f851b 100644
--- a/drivers/gpu/drm/drm_framebuffer.c
+++ b/drivers/gpu/drm/drm_framebuffer.c
@@ -747,7 +747,7 @@ int drm_mode_dirtyfb_ioctl(struct drm_device *dev,
ret = -EINVAL;
goto out_err1;
}
- clips = kzalloc_objs(*clips, num_clips, GFP_KERNEL);
+ clips = kzalloc_objs(*clips, num_clips);
if (!clips) {
ret = -ENOMEM;
goto out_err1;
diff --git a/drivers/gpu/drm/drm_gem.c b/drivers/gpu/drm/drm_gem.c
index 4eb96aa589a1..891c3bff5ae0 100644
--- a/drivers/gpu/drm/drm_gem.c
+++ b/drivers/gpu/drm/drm_gem.c
@@ -684,7 +684,7 @@ struct page **drm_gem_get_pages(struct drm_gem_object *obj)
npages = obj->size >> PAGE_SHIFT;
- pages = kvmalloc_objs(struct page *, npages, GFP_KERNEL);
+ pages = kvmalloc_objs(struct page *, npages);
if (pages == NULL)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/gpu/drm/drm_gem_atomic_helper.c b/drivers/gpu/drm/drm_gem_atomic_helper.c
index fa43e586eb49..b2e3778fb7a7 100644
--- a/drivers/gpu/drm/drm_gem_atomic_helper.c
+++ b/drivers/gpu/drm/drm_gem_atomic_helper.c
@@ -338,7 +338,7 @@ void drm_gem_reset_shadow_plane(struct drm_plane *plane)
plane->state = NULL; /* must be set to NULL here */
}
- shadow_plane_state = kzalloc_obj(*shadow_plane_state, GFP_KERNEL);
+ shadow_plane_state = kzalloc_obj(*shadow_plane_state);
__drm_gem_reset_shadow_plane(plane, shadow_plane_state);
}
EXPORT_SYMBOL(drm_gem_reset_shadow_plane);
diff --git a/drivers/gpu/drm/drm_gem_dma_helper.c b/drivers/gpu/drm/drm_gem_dma_helper.c
index ffcdf733984f..ecb9746f4da8 100644
--- a/drivers/gpu/drm/drm_gem_dma_helper.c
+++ b/drivers/gpu/drm/drm_gem_dma_helper.c
@@ -82,7 +82,7 @@ __drm_gem_dma_create(struct drm_device *drm, size_t size, bool private)
return ERR_CAST(gem_obj);
dma_obj = to_drm_gem_dma_obj(gem_obj);
} else {
- dma_obj = kzalloc_obj(*dma_obj, GFP_KERNEL);
+ dma_obj = kzalloc_obj(*dma_obj);
if (!dma_obj)
return ERR_PTR(-ENOMEM);
gem_obj = &dma_obj->base;
@@ -428,7 +428,7 @@ struct sg_table *drm_gem_dma_get_sg_table(struct drm_gem_dma_object *dma_obj)
struct sg_table *sgt;
int ret;
- sgt = kzalloc_obj(*sgt, GFP_KERNEL);
+ sgt = kzalloc_obj(*sgt);
if (!sgt)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/gpu/drm/drm_gem_framebuffer_helper.c b/drivers/gpu/drm/drm_gem_framebuffer_helper.c
index e8b81ea55878..9166c353f131 100644
--- a/drivers/gpu/drm/drm_gem_framebuffer_helper.c
+++ b/drivers/gpu/drm/drm_gem_framebuffer_helper.c
@@ -238,7 +238,7 @@ drm_gem_fb_create_with_funcs(struct drm_device *dev, struct drm_file *file,
struct drm_framebuffer *fb;
int ret;
- fb = kzalloc_obj(*fb, GFP_KERNEL);
+ fb = kzalloc_obj(*fb);
if (!fb)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/gpu/drm/drm_gem_shmem_helper.c b/drivers/gpu/drm/drm_gem_shmem_helper.c
index 4acc632e73b1..7b5a49935ae4 100644
--- a/drivers/gpu/drm/drm_gem_shmem_helper.c
+++ b/drivers/gpu/drm/drm_gem_shmem_helper.c
@@ -127,7 +127,7 @@ __drm_gem_shmem_create(struct drm_device *dev, size_t size, bool private)
return ERR_CAST(obj);
shmem = to_drm_gem_shmem_obj(obj);
} else {
- shmem = kzalloc_obj(*shmem, GFP_KERNEL);
+ shmem = kzalloc_obj(*shmem);
if (!shmem)
return ERR_PTR(-ENOMEM);
obj = &shmem->base;
diff --git a/drivers/gpu/drm/drm_gem_vram_helper.c b/drivers/gpu/drm/drm_gem_vram_helper.c
index 27ceae40cfe3..d7fcced75e79 100644
--- a/drivers/gpu/drm/drm_gem_vram_helper.c
+++ b/drivers/gpu/drm/drm_gem_vram_helper.c
@@ -197,7 +197,7 @@ struct drm_gem_vram_object *drm_gem_vram_create(struct drm_device *dev,
return ERR_CAST(gem);
gbo = drm_gem_vram_of_gem(gem);
} else {
- gbo = kzalloc_obj(*gbo, GFP_KERNEL);
+ gbo = kzalloc_obj(*gbo);
if (!gbo)
return ERR_PTR(-ENOMEM);
gem = &gbo->bo.base;
@@ -721,7 +721,7 @@ static struct ttm_tt *bo_driver_ttm_tt_create(struct ttm_buffer_object *bo,
struct ttm_tt *tt;
int ret;
- tt = kzalloc_obj(*tt, GFP_KERNEL);
+ tt = kzalloc_obj(*tt);
if (!tt)
return NULL;
@@ -890,7 +890,7 @@ static struct drm_vram_mm *drm_vram_helper_alloc_mm(struct drm_device *dev, uint
if (WARN_ON(dev->vram_mm))
return dev->vram_mm;
- dev->vram_mm = kzalloc_obj(*dev->vram_mm, GFP_KERNEL);
+ dev->vram_mm = kzalloc_obj(*dev->vram_mm);
if (!dev->vram_mm)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/gpu/drm/drm_gpusvm.c b/drivers/gpu/drm/drm_gpusvm.c
index 7570a0e05450..24180bfdf5a2 100644
--- a/drivers/gpu/drm/drm_gpusvm.c
+++ b/drivers/gpu/drm/drm_gpusvm.c
@@ -522,7 +522,7 @@ drm_gpusvm_notifier_alloc(struct drm_gpusvm *gpusvm, unsigned long fault_addr)
if (gpusvm->ops->notifier_alloc)
notifier = gpusvm->ops->notifier_alloc();
else
- notifier = kzalloc_obj(*notifier, GFP_KERNEL);
+ notifier = kzalloc_obj(*notifier);
if (!notifier)
return ERR_PTR(-ENOMEM);
@@ -629,7 +629,7 @@ drm_gpusvm_range_alloc(struct drm_gpusvm *gpusvm,
if (gpusvm->ops->range_alloc)
range = gpusvm->ops->range_alloc(gpusvm);
else
- range = kzalloc_obj(*range, GFP_KERNEL);
+ range = kzalloc_obj(*range);
if (!range)
return ERR_PTR(-ENOMEM);
@@ -1471,7 +1471,7 @@ int drm_gpusvm_get_pages(struct drm_gpusvm *gpusvm,
/* Unlock and restart mapping to allocate memory. */
drm_gpusvm_notifier_unlock(gpusvm);
svm_pages->dma_addr =
- kvmalloc_objs(*svm_pages->dma_addr, npages, GFP_KERNEL);
+ kvmalloc_objs(*svm_pages->dma_addr, npages);
if (!svm_pages->dma_addr) {
err = -ENOMEM;
goto err_free;
diff --git a/drivers/gpu/drm/drm_gpuvm.c b/drivers/gpu/drm/drm_gpuvm.c
index 9d2f4ae8cc9d..44acfe4120d2 100644
--- a/drivers/gpu/drm/drm_gpuvm.c
+++ b/drivers/gpu/drm/drm_gpuvm.c
@@ -1060,7 +1060,7 @@ drm_gpuvm_resv_object_alloc(struct drm_device *drm)
{
struct drm_gem_object *obj;
- obj = kzalloc_obj(*obj, GFP_KERNEL);
+ obj = kzalloc_obj(*obj);
if (!obj)
return NULL;
@@ -1581,7 +1581,7 @@ drm_gpuvm_bo_create(struct drm_gpuvm *gpuvm,
if (ops && ops->vm_bo_alloc)
vm_bo = ops->vm_bo_alloc();
else
- vm_bo = kzalloc_obj(*vm_bo, GFP_KERNEL);
+ vm_bo = kzalloc_obj(*vm_bo);
if (unlikely(!vm_bo))
return NULL;
@@ -2852,7 +2852,7 @@ gpuva_op_alloc(struct drm_gpuvm *gpuvm)
if (fn && fn->op_alloc)
op = fn->op_alloc();
else
- op = kzalloc_obj(*op, GFP_KERNEL);
+ op = kzalloc_obj(*op);
if (unlikely(!op))
return NULL;
@@ -2946,7 +2946,7 @@ __drm_gpuvm_sm_map_ops_create(struct drm_gpuvm *gpuvm,
} args;
int ret;
- ops = kzalloc_obj(*ops, GFP_KERNEL);
+ ops = kzalloc_obj(*ops);
if (unlikely(!ops))
return ERR_PTR(-ENOMEM);
@@ -3080,7 +3080,7 @@ drm_gpuvm_sm_unmap_ops_create(struct drm_gpuvm *gpuvm,
} args;
int ret;
- ops = kzalloc_obj(*ops, GFP_KERNEL);
+ ops = kzalloc_obj(*ops);
if (unlikely(!ops))
return ERR_PTR(-ENOMEM);
@@ -3130,7 +3130,7 @@ drm_gpuvm_prefetch_ops_create(struct drm_gpuvm *gpuvm,
u64 end = addr + range;
int ret;
- ops = kzalloc_obj(*ops, GFP_KERNEL);
+ ops = kzalloc_obj(*ops);
if (!ops)
return ERR_PTR(-ENOMEM);
@@ -3184,7 +3184,7 @@ drm_gpuvm_bo_unmap_ops_create(struct drm_gpuvm_bo *vm_bo)
drm_gem_gpuva_assert_lock_held(vm_bo->vm, vm_bo->obj);
- ops = kzalloc_obj(*ops, GFP_KERNEL);
+ ops = kzalloc_obj(*ops);
if (!ops)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/gpu/drm/drm_mipi_dsi.c b/drivers/gpu/drm/drm_mipi_dsi.c
index 55542a360adc..0390e14d3157 100644
--- a/drivers/gpu/drm/drm_mipi_dsi.c
+++ b/drivers/gpu/drm/drm_mipi_dsi.c
@@ -134,7 +134,7 @@ static struct mipi_dsi_device *mipi_dsi_device_alloc(struct mipi_dsi_host *host)
{
struct mipi_dsi_device *dsi;
- dsi = kzalloc_obj(*dsi, GFP_KERNEL);
+ dsi = kzalloc_obj(*dsi);
if (!dsi)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/gpu/drm/drm_modes.c b/drivers/gpu/drm/drm_modes.c
index e1293ef88581..3f8e025fd6d9 100644
--- a/drivers/gpu/drm/drm_modes.c
+++ b/drivers/gpu/drm/drm_modes.c
@@ -75,7 +75,7 @@ struct drm_display_mode *drm_mode_create(struct drm_device *dev)
{
struct drm_display_mode *nmode;
- nmode = kzalloc_obj(struct drm_display_mode, GFP_KERNEL);
+ nmode = kzalloc_obj(struct drm_display_mode);
if (!nmode)
return NULL;
diff --git a/drivers/gpu/drm/drm_pagemap.c b/drivers/gpu/drm/drm_pagemap.c
index 4e9b5f5f2539..bdc79140875c 100644
--- a/drivers/gpu/drm/drm_pagemap.c
+++ b/drivers/gpu/drm/drm_pagemap.c
@@ -94,7 +94,7 @@ drm_pagemap_zdd_alloc(struct drm_pagemap *dpagemap)
{
struct drm_pagemap_zdd *zdd;
- zdd = kmalloc_obj(*zdd, GFP_KERNEL);
+ zdd = kmalloc_obj(*zdd);
if (!zdd)
return NULL;
@@ -861,7 +861,7 @@ drm_pagemap_dev_hold(struct drm_pagemap *dpagemap)
struct drm_pagemap_dev_hold *dev_hold;
struct drm_device *drm = dpagemap->drm;
- dev_hold = kzalloc_obj(*dev_hold, GFP_KERNEL);
+ dev_hold = kzalloc_obj(*dev_hold);
if (!dev_hold)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/gpu/drm/drm_pagemap_util.c b/drivers/gpu/drm/drm_pagemap_util.c
index c53031308308..14ddb948a32e 100644
--- a/drivers/gpu/drm/drm_pagemap_util.c
+++ b/drivers/gpu/drm/drm_pagemap_util.c
@@ -94,7 +94,7 @@ static void drm_pagemap_cache_fini(void *arg)
*/
struct drm_pagemap_cache *drm_pagemap_cache_create_devm(struct drm_pagemap_shrinker *shrinker)
{
- struct drm_pagemap_cache *cache = kzalloc_obj(*cache, GFP_KERNEL);
+ struct drm_pagemap_cache *cache = kzalloc_obj(*cache);
int err;
if (!cache)
@@ -424,7 +424,7 @@ struct drm_pagemap_shrinker *drm_pagemap_shrinker_create_devm(struct drm_device
struct shrinker *shrink;
int err;
- shrinker = kzalloc_obj(*shrinker, GFP_KERNEL);
+ shrinker = kzalloc_obj(*shrinker);
if (!shrinker)
return ERR_PTR(-ENOMEM);
@@ -548,7 +548,7 @@ int drm_pagemap_acquire_owner(struct drm_pagemap_peer *peer,
}
if (!interconnect) {
- owner = kmalloc_obj(*owner, GFP_KERNEL);
+ owner = kmalloc_obj(*owner);
if (!owner) {
mutex_unlock(&owner_list->lock);
return -ENOMEM;
diff --git a/drivers/gpu/drm/drm_plane.c b/drivers/gpu/drm/drm_plane.c
index 75ec5ca579b0..3e8c36484b06 100644
--- a/drivers/gpu/drm/drm_plane.c
+++ b/drivers/gpu/drm/drm_plane.c
@@ -1514,7 +1514,7 @@ int drm_mode_page_flip_ioctl(struct drm_device *dev,
}
if (page_flip->flags & DRM_MODE_PAGE_FLIP_EVENT) {
- e = kzalloc_obj(*e, GFP_KERNEL);
+ e = kzalloc_obj(*e);
if (!e) {
ret = -ENOMEM;
goto out;
diff --git a/drivers/gpu/drm/drm_prime.c b/drivers/gpu/drm/drm_prime.c
index ad09be486ea0..51fdb06d3e9f 100644
--- a/drivers/gpu/drm/drm_prime.c
+++ b/drivers/gpu/drm/drm_prime.c
@@ -100,7 +100,7 @@ int drm_prime_add_buf_handle(struct drm_prime_file_private *prime_fpriv,
struct drm_prime_member *member;
struct rb_node **p, *rb;
- member = kmalloc_obj(*member, GFP_KERNEL);
+ member = kmalloc_obj(*member);
if (!member)
return -ENOMEM;
@@ -780,8 +780,8 @@ int drm_gem_prime_mmap(struct drm_gem_object *obj, struct vm_area_struct *vma)
return 0;
}
- priv = kzalloc_obj(*priv, GFP_KERNEL);
- fil = kzalloc_obj(*fil, GFP_KERNEL);
+ priv = kzalloc_obj(*priv);
+ fil = kzalloc_obj(*fil);
if (!priv || !fil) {
ret = -ENOMEM;
goto out;
@@ -854,7 +854,7 @@ struct sg_table *drm_prime_pages_to_sg(struct drm_device *dev,
size_t max_segment = 0;
int err;
- sg = kmalloc_obj(struct sg_table, GFP_KERNEL);
+ sg = kmalloc_obj(struct sg_table);
if (!sg)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/gpu/drm/drm_privacy_screen.c b/drivers/gpu/drm/drm_privacy_screen.c
index d9d0c5a38ffd..a2a6e8368131 100644
--- a/drivers/gpu/drm/drm_privacy_screen.c
+++ b/drivers/gpu/drm/drm_privacy_screen.c
@@ -395,7 +395,7 @@ struct drm_privacy_screen *drm_privacy_screen_register(
struct drm_privacy_screen *priv;
int ret;
- priv = kzalloc_obj(*priv, GFP_KERNEL);
+ priv = kzalloc_obj(*priv);
if (!priv)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/gpu/drm/drm_property.c b/drivers/gpu/drm/drm_property.c
index fb8a23832c37..f38f2c5437e6 100644
--- a/drivers/gpu/drm/drm_property.c
+++ b/drivers/gpu/drm/drm_property.c
@@ -107,7 +107,7 @@ struct drm_property *drm_property_create(struct drm_device *dev,
if (WARN_ON(strlen(name) >= DRM_PROP_NAME_LEN))
return NULL;
- property = kzalloc_obj(struct drm_property, GFP_KERNEL);
+ property = kzalloc_obj(struct drm_property);
if (!property)
return NULL;
@@ -417,7 +417,7 @@ int drm_property_add_enum(struct drm_property *property,
if (WARN_ON(index >= property->num_values))
return -EINVAL;
- prop_enum = kzalloc_obj(struct drm_property_enum, GFP_KERNEL);
+ prop_enum = kzalloc_obj(struct drm_property_enum);
if (!prop_enum)
return -ENOMEM;
diff --git a/drivers/gpu/drm/drm_self_refresh_helper.c b/drivers/gpu/drm/drm_self_refresh_helper.c
index 294343259f8a..74907f33841c 100644
--- a/drivers/gpu/drm/drm_self_refresh_helper.c
+++ b/drivers/gpu/drm/drm_self_refresh_helper.c
@@ -238,7 +238,7 @@ int drm_self_refresh_helper_init(struct drm_crtc *crtc)
if (WARN_ON(sr_data))
return -EINVAL;
- sr_data = kzalloc_obj(*sr_data, GFP_KERNEL);
+ sr_data = kzalloc_obj(*sr_data);
if (!sr_data)
return -ENOMEM;
diff --git a/drivers/gpu/drm/drm_syncobj.c b/drivers/gpu/drm/drm_syncobj.c
index bed005abf08e..250734dee928 100644
--- a/drivers/gpu/drm/drm_syncobj.c
+++ b/drivers/gpu/drm/drm_syncobj.c
@@ -557,7 +557,7 @@ int drm_syncobj_create(struct drm_syncobj **out_syncobj, uint32_t flags,
int ret;
struct drm_syncobj *syncobj;
- syncobj = kzalloc_obj(struct drm_syncobj, GFP_KERNEL);
+ syncobj = kzalloc_obj(struct drm_syncobj);
if (!syncobj)
return -ENOMEM;
@@ -1062,7 +1062,7 @@ static signed long drm_syncobj_array_wait_timeout(struct drm_syncobj **syncobjs,
goto err_free_points;
}
- entries = kzalloc_objs(*entries, count, GFP_KERNEL);
+ entries = kzalloc_objs(*entries, count);
if (!entries) {
timeout = -ENOMEM;
goto err_free_points;
@@ -1279,7 +1279,7 @@ static int drm_syncobj_array_find(struct drm_file *file_private,
goto err_free_handles;
}
- syncobjs = kmalloc_objs(*syncobjs, count_handles, GFP_KERNEL);
+ syncobjs = kmalloc_objs(*syncobjs, count_handles);
if (syncobjs == NULL) {
ret = -ENOMEM;
goto err_free_handles;
@@ -1485,7 +1485,7 @@ drm_syncobj_eventfd_ioctl(struct drm_device *dev, void *data,
goto err_fdget;
}
- entry = kzalloc_obj(*entry, GFP_KERNEL);
+ entry = kzalloc_obj(*entry);
if (!entry) {
ret = -ENOMEM;
goto err_kzalloc;
diff --git a/drivers/gpu/drm/drm_sysfs.c b/drivers/gpu/drm/drm_sysfs.c
index 0dccd5362138..ef4e923a8728 100644
--- a/drivers/gpu/drm/drm_sysfs.c
+++ b/drivers/gpu/drm/drm_sysfs.c
@@ -349,7 +349,7 @@ int drm_sysfs_connector_add(struct drm_connector *connector)
if (connector->kdev)
return 0;
- kdev = kzalloc_obj(*kdev, GFP_KERNEL);
+ kdev = kzalloc_obj(*kdev);
if (!kdev)
return -ENOMEM;
@@ -554,7 +554,7 @@ struct device *drm_sysfs_minor_alloc(struct drm_minor *minor)
struct device *kdev;
int r;
- kdev = kzalloc_obj(*kdev, GFP_KERNEL);
+ kdev = kzalloc_obj(*kdev);
if (!kdev)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/gpu/drm/drm_vblank.c b/drivers/gpu/drm/drm_vblank.c
index 4b196e48c8fe..f78bf37f1e0a 100644
--- a/drivers/gpu/drm/drm_vblank.c
+++ b/drivers/gpu/drm/drm_vblank.c
@@ -1615,7 +1615,7 @@ static int drm_queue_vblank_event(struct drm_device *dev, unsigned int pipe,
u64 seq;
int ret;
- e = kzalloc_obj(*e, GFP_KERNEL);
+ e = kzalloc_obj(*e);
if (e == NULL) {
ret = -ENOMEM;
goto err_put;
@@ -2094,7 +2094,7 @@ int drm_crtc_queue_sequence_ioctl(struct drm_device *dev, void *data,
vblank = drm_crtc_vblank_crtc(crtc);
- e = kzalloc_obj(*e, GFP_KERNEL);
+ e = kzalloc_obj(*e);
if (e == NULL)
return -ENOMEM;
diff --git a/drivers/gpu/drm/drm_vma_manager.c b/drivers/gpu/drm/drm_vma_manager.c
index 7978b6276a6a..1b8daec1013e 100644
--- a/drivers/gpu/drm/drm_vma_manager.c
+++ b/drivers/gpu/drm/drm_vma_manager.c
@@ -253,7 +253,7 @@ static int vma_node_allow(struct drm_vma_offset_node *node,
* unlikely that an open-file is added twice to a single node so we
* don't optimize for this case. OOM is checked below only if the entry
* is actually used. */
- new = kmalloc_obj(*entry, GFP_KERNEL);
+ new = kmalloc_obj(*entry);
write_lock(&node->vm_lock);
diff --git a/drivers/gpu/drm/drm_writeback.c b/drivers/gpu/drm/drm_writeback.c
index 7b1dbc0df135..a4805d47ea4d 100644
--- a/drivers/gpu/drm/drm_writeback.c
+++ b/drivers/gpu/drm/drm_writeback.c
@@ -581,7 +581,7 @@ drm_writeback_get_out_fence(struct drm_writeback_connector *wb_connector)
DRM_MODE_CONNECTOR_WRITEBACK))
return NULL;
- fence = kzalloc_obj(*fence, GFP_KERNEL);
+ fence = kzalloc_obj(*fence);
if (!fence)
return NULL;
diff --git a/drivers/gpu/drm/etnaviv/etnaviv_cmdbuf.c b/drivers/gpu/drm/etnaviv/etnaviv_cmdbuf.c
index 57a82526a54f..854292066ce8 100644
--- a/drivers/gpu/drm/etnaviv/etnaviv_cmdbuf.c
+++ b/drivers/gpu/drm/etnaviv/etnaviv_cmdbuf.c
@@ -33,7 +33,7 @@ etnaviv_cmdbuf_suballoc_new(struct device *dev)
struct etnaviv_cmdbuf_suballoc *suballoc;
int ret;
- suballoc = kzalloc_obj(*suballoc, GFP_KERNEL);
+ suballoc = kzalloc_obj(*suballoc);
if (!suballoc)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/gpu/drm/etnaviv/etnaviv_drv.c b/drivers/gpu/drm/etnaviv/etnaviv_drv.c
index 06e76d6d2e47..08aca9035fc1 100644
--- a/drivers/gpu/drm/etnaviv/etnaviv_drv.c
+++ b/drivers/gpu/drm/etnaviv/etnaviv_drv.c
@@ -66,7 +66,7 @@ static int etnaviv_open(struct drm_device *dev, struct drm_file *file)
struct etnaviv_file_private *ctx;
int ret, i;
- ctx = kzalloc_obj(*ctx, GFP_KERNEL);
+ ctx = kzalloc_obj(*ctx);
if (!ctx)
return -ENOMEM;
@@ -531,7 +531,7 @@ static int etnaviv_bind(struct device *dev)
if (IS_ERR(drm))
return PTR_ERR(drm);
- priv = kzalloc_obj(*priv, GFP_KERNEL);
+ priv = kzalloc_obj(*priv);
if (!priv) {
dev_err(dev, "failed to allocate private data\n");
ret = -ENOMEM;
diff --git a/drivers/gpu/drm/etnaviv/etnaviv_gem.c b/drivers/gpu/drm/etnaviv/etnaviv_gem.c
index 3e330f30eaa2..b0436a1e103f 100644
--- a/drivers/gpu/drm/etnaviv/etnaviv_gem.c
+++ b/drivers/gpu/drm/etnaviv/etnaviv_gem.c
@@ -288,7 +288,7 @@ struct etnaviv_vram_mapping *etnaviv_gem_mapping_get(
*/
mapping = etnaviv_gem_get_vram_mapping(etnaviv_obj, NULL);
if (!mapping) {
- mapping = kzalloc_obj(*mapping, GFP_KERNEL);
+ mapping = kzalloc_obj(*mapping);
if (!mapping) {
ret = -ENOMEM;
goto out;
@@ -675,7 +675,7 @@ static int etnaviv_gem_userptr_get_pages(struct etnaviv_gem_object *etnaviv_obj)
if (userptr->mm != current->mm)
return -EPERM;
- pvec = kvmalloc_objs(struct page *, npages, GFP_KERNEL);
+ pvec = kvmalloc_objs(struct page *, npages);
if (!pvec)
return -ENOMEM;
diff --git a/drivers/gpu/drm/etnaviv/etnaviv_gem_prime.c b/drivers/gpu/drm/etnaviv/etnaviv_gem_prime.c
index 1d9a4ca5d5e6..6757ae6ec304 100644
--- a/drivers/gpu/drm/etnaviv/etnaviv_gem_prime.c
+++ b/drivers/gpu/drm/etnaviv/etnaviv_gem_prime.c
@@ -126,7 +126,7 @@ struct drm_gem_object *etnaviv_gem_prime_import_sg_table(struct drm_device *dev,
npages = size / PAGE_SIZE;
etnaviv_obj->sgt = sgt;
- etnaviv_obj->pages = kvmalloc_objs(struct page *, npages, GFP_KERNEL);
+ etnaviv_obj->pages = kvmalloc_objs(struct page *, npages);
if (!etnaviv_obj->pages) {
ret = -ENOMEM;
goto fail;
diff --git a/drivers/gpu/drm/etnaviv/etnaviv_gem_submit.c b/drivers/gpu/drm/etnaviv/etnaviv_gem_submit.c
index e3accccf22be..c35a3f77118c 100644
--- a/drivers/gpu/drm/etnaviv/etnaviv_gem_submit.c
+++ b/drivers/gpu/drm/etnaviv/etnaviv_gem_submit.c
@@ -468,9 +468,9 @@ int etnaviv_ioctl_gem_submit(struct drm_device *dev, void *data,
* Copy the command submission and bo array to kernel space in
* one go, and do this outside of any locks.
*/
- bos = kvmalloc_objs(*bos, args->nr_bos, GFP_KERNEL);
- relocs = kvmalloc_objs(*relocs, args->nr_relocs, GFP_KERNEL);
- pmrs = kvmalloc_objs(*pmrs, args->nr_pmrs, GFP_KERNEL);
+ bos = kvmalloc_objs(*bos, args->nr_bos);
+ relocs = kvmalloc_objs(*relocs, args->nr_relocs);
+ pmrs = kvmalloc_objs(*pmrs, args->nr_pmrs);
stream = kvmalloc_array(1, args->stream_size, GFP_KERNEL);
if (!bos || !relocs || !pmrs || !stream) {
ret = -ENOMEM;
diff --git a/drivers/gpu/drm/etnaviv/etnaviv_gpu.c b/drivers/gpu/drm/etnaviv/etnaviv_gpu.c
index 0d2a2684b2a6..a891d4f1f843 100644
--- a/drivers/gpu/drm/etnaviv/etnaviv_gpu.c
+++ b/drivers/gpu/drm/etnaviv/etnaviv_gpu.c
@@ -1184,7 +1184,7 @@ static struct dma_fence *etnaviv_gpu_fence_alloc(struct etnaviv_gpu *gpu)
*/
lockdep_assert_held(&gpu->lock);
- f = kzalloc_obj(*f, GFP_KERNEL);
+ f = kzalloc_obj(*f);
if (!f)
return NULL;
diff --git a/drivers/gpu/drm/etnaviv/etnaviv_iommu.c b/drivers/gpu/drm/etnaviv/etnaviv_iommu.c
index 7cb29d6daa90..38377b2065b7 100644
--- a/drivers/gpu/drm/etnaviv/etnaviv_iommu.c
+++ b/drivers/gpu/drm/etnaviv/etnaviv_iommu.c
@@ -143,7 +143,7 @@ etnaviv_iommuv1_context_alloc(struct etnaviv_iommu_global *global)
return context;
}
- v1_context = kzalloc_obj(*v1_context, GFP_KERNEL);
+ v1_context = kzalloc_obj(*v1_context);
if (!v1_context) {
mutex_unlock(&global->lock);
return NULL;
diff --git a/drivers/gpu/drm/etnaviv/etnaviv_mmu.c b/drivers/gpu/drm/etnaviv/etnaviv_mmu.c
index 2ffb18ccde61..e3572461b599 100644
--- a/drivers/gpu/drm/etnaviv/etnaviv_mmu.c
+++ b/drivers/gpu/drm/etnaviv/etnaviv_mmu.c
@@ -494,7 +494,7 @@ int etnaviv_iommu_global_init(struct etnaviv_gpu *gpu)
return 0;
}
- global = kzalloc_obj(*global, GFP_KERNEL);
+ global = kzalloc_obj(*global);
if (!global)
return -ENOMEM;
diff --git a/drivers/gpu/drm/exynos/exynos_drm_crtc.c b/drivers/gpu/drm/exynos/exynos_drm_crtc.c
index 03ad7dd8bf07..41252caccd67 100644
--- a/drivers/gpu/drm/exynos/exynos_drm_crtc.c
+++ b/drivers/gpu/drm/exynos/exynos_drm_crtc.c
@@ -180,7 +180,7 @@ struct exynos_drm_crtc *exynos_drm_crtc_create(struct drm_device *drm_dev,
struct drm_crtc *crtc;
int ret;
- exynos_crtc = kzalloc_obj(*exynos_crtc, GFP_KERNEL);
+ exynos_crtc = kzalloc_obj(*exynos_crtc);
if (!exynos_crtc)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/gpu/drm/exynos/exynos_drm_drv.c b/drivers/gpu/drm/exynos/exynos_drm_drv.c
index 311d5077a2bf..2101a74dc1ed 100644
--- a/drivers/gpu/drm/exynos/exynos_drm_drv.c
+++ b/drivers/gpu/drm/exynos/exynos_drm_drv.c
@@ -50,7 +50,7 @@ static int exynos_drm_open(struct drm_device *dev, struct drm_file *file)
struct drm_exynos_file_private *file_priv;
int ret;
- file_priv = kzalloc_obj(*file_priv, GFP_KERNEL);
+ file_priv = kzalloc_obj(*file_priv);
if (!file_priv)
return -ENOMEM;
@@ -245,7 +245,7 @@ static int exynos_drm_bind(struct device *dev)
if (IS_ERR(drm))
return PTR_ERR(drm);
- private = kzalloc_obj(struct exynos_drm_private, GFP_KERNEL);
+ private = kzalloc_obj(struct exynos_drm_private);
if (!private) {
ret = -ENOMEM;
goto err_free_drm;
diff --git a/drivers/gpu/drm/exynos/exynos_drm_fb.c b/drivers/gpu/drm/exynos/exynos_drm_fb.c
index b078295c96e2..ab0e0c74ec47 100644
--- a/drivers/gpu/drm/exynos/exynos_drm_fb.c
+++ b/drivers/gpu/drm/exynos/exynos_drm_fb.c
@@ -66,7 +66,7 @@ exynos_drm_framebuffer_init(struct drm_device *dev,
int i;
int ret;
- fb = kzalloc_obj(*fb, GFP_KERNEL);
+ fb = kzalloc_obj(*fb);
if (!fb)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/gpu/drm/exynos/exynos_drm_g2d.c b/drivers/gpu/drm/exynos/exynos_drm_g2d.c
index aa70e249f512..a63087ceaf9e 100644
--- a/drivers/gpu/drm/exynos/exynos_drm_g2d.c
+++ b/drivers/gpu/drm/exynos/exynos_drm_g2d.c
@@ -287,7 +287,7 @@ static int g2d_init_cmdlist(struct g2d_data *g2d)
return -ENOMEM;
}
- node = kzalloc_objs(*node, G2D_CMDLIST_NUM, GFP_KERNEL);
+ node = kzalloc_objs(*node, G2D_CMDLIST_NUM);
if (!node) {
ret = -ENOMEM;
goto err;
@@ -459,7 +459,7 @@ static dma_addr_t *g2d_userptr_get_dma_addr(struct g2d_data *g2d,
}
}
- g2d_userptr = kzalloc_obj(*g2d_userptr, GFP_KERNEL);
+ g2d_userptr = kzalloc_obj(*g2d_userptr);
if (!g2d_userptr)
return ERR_PTR(-ENOMEM);
@@ -491,7 +491,7 @@ static dma_addr_t *g2d_userptr_get_dma_addr(struct g2d_data *g2d,
}
g2d_userptr->npages = npages;
- sgt = kzalloc_obj(*sgt, GFP_KERNEL);
+ sgt = kzalloc_obj(*sgt);
if (!sgt) {
ret = -ENOMEM;
goto err_unpin_pages;
@@ -1169,7 +1169,7 @@ int exynos_g2d_set_cmdlist_ioctl(struct drm_device *drm_dev, void *data,
node->event = NULL;
if (req->event_type != G2D_EVENT_NOT) {
- e = kzalloc_obj(*node->event, GFP_KERNEL);
+ e = kzalloc_obj(*node->event);
if (!e) {
ret = -ENOMEM;
goto err;
diff --git a/drivers/gpu/drm/exynos/exynos_drm_gem.c b/drivers/gpu/drm/exynos/exynos_drm_gem.c
index 8b21623c2075..69ef6cda1ce9 100644
--- a/drivers/gpu/drm/exynos/exynos_drm_gem.c
+++ b/drivers/gpu/drm/exynos/exynos_drm_gem.c
@@ -152,7 +152,7 @@ static struct exynos_drm_gem *exynos_drm_gem_init(struct drm_device *dev,
struct drm_gem_object *obj;
int ret;
- exynos_gem = kzalloc_obj(*exynos_gem, GFP_KERNEL);
+ exynos_gem = kzalloc_obj(*exynos_gem);
if (!exynos_gem)
return ERR_PTR(-ENOMEM);
@@ -411,7 +411,7 @@ struct sg_table *exynos_drm_gem_prime_get_sg_table(struct drm_gem_object *obj)
struct sg_table *sgt;
int ret;
- sgt = kzalloc_obj(*sgt, GFP_KERNEL);
+ sgt = kzalloc_obj(*sgt);
if (!sgt)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/gpu/drm/exynos/exynos_drm_ipp.c b/drivers/gpu/drm/exynos/exynos_drm_ipp.c
index a4d72e12d1a6..ee3d61345a66 100644
--- a/drivers/gpu/drm/exynos/exynos_drm_ipp.c
+++ b/drivers/gpu/drm/exynos/exynos_drm_ipp.c
@@ -260,7 +260,7 @@ static inline struct exynos_drm_ipp_task *
{
struct exynos_drm_ipp_task *task;
- task = kzalloc_obj(*task, GFP_KERNEL);
+ task = kzalloc_obj(*task);
if (!task)
return NULL;
@@ -699,7 +699,7 @@ static int exynos_drm_ipp_event_create(struct exynos_drm_ipp_task *task,
struct drm_pending_exynos_ipp_event *e = NULL;
int ret;
- e = kzalloc_obj(*e, GFP_KERNEL);
+ e = kzalloc_obj(*e);
if (!e)
return -ENOMEM;
diff --git a/drivers/gpu/drm/exynos/exynos_drm_plane.c b/drivers/gpu/drm/exynos/exynos_drm_plane.c
index fec9033ec13e..da043bd357a4 100644
--- a/drivers/gpu/drm/exynos/exynos_drm_plane.c
+++ b/drivers/gpu/drm/exynos/exynos_drm_plane.c
@@ -134,7 +134,7 @@ static void exynos_drm_plane_reset(struct drm_plane *plane)
plane->state = NULL;
}
- exynos_state = kzalloc_obj(*exynos_state, GFP_KERNEL);
+ exynos_state = kzalloc_obj(*exynos_state);
if (exynos_state) {
__drm_atomic_helper_plane_reset(plane, &exynos_state->base);
plane->state->zpos = exynos_plane->config->zpos;
@@ -148,7 +148,7 @@ exynos_drm_plane_duplicate_state(struct drm_plane *plane)
struct exynos_drm_plane_state *copy;
exynos_state = to_exynos_plane_state(plane->state);
- copy = kzalloc_obj(*exynos_state, GFP_KERNEL);
+ copy = kzalloc_obj(*exynos_state);
if (!copy)
return NULL;
diff --git a/drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_plane.c b/drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_plane.c
index 7702788003a7..a9b3467263d6 100644
--- a/drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_plane.c
+++ b/drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_plane.c
@@ -209,7 +209,7 @@ struct drm_plane *fsl_dcu_drm_primary_create_plane(struct drm_device *dev)
struct drm_plane *primary;
int ret;
- primary = kzalloc_obj(*primary, GFP_KERNEL);
+ primary = kzalloc_obj(*primary);
if (!primary) {
DRM_DEBUG_KMS("Failed to allocate primary plane\n");
return NULL;
diff --git a/drivers/gpu/drm/gma500/cdv_intel_crt.c b/drivers/gpu/drm/gma500/cdv_intel_crt.c
index df38fefd4722..342a57c82846 100644
--- a/drivers/gpu/drm/gma500/cdv_intel_crt.c
+++ b/drivers/gpu/drm/gma500/cdv_intel_crt.c
@@ -250,11 +250,11 @@ void cdv_intel_crt_init(struct drm_device *dev,
struct drm_encoder *encoder;
int ret;
- gma_encoder = kzalloc_obj(struct gma_encoder, GFP_KERNEL);
+ gma_encoder = kzalloc_obj(struct gma_encoder);
if (!gma_encoder)
return;
- gma_connector = kzalloc_obj(struct gma_connector, GFP_KERNEL);
+ gma_connector = kzalloc_obj(struct gma_connector);
if (!gma_connector)
goto err_free_encoder;
diff --git a/drivers/gpu/drm/gma500/cdv_intel_display.c b/drivers/gpu/drm/gma500/cdv_intel_display.c
index 1f6e2f65c33f..a901721ea73a 100644
--- a/drivers/gpu/drm/gma500/cdv_intel_display.c
+++ b/drivers/gpu/drm/gma500/cdv_intel_display.c
@@ -939,7 +939,7 @@ struct drm_display_mode *cdv_intel_crtc_mode_get(struct drm_device *dev,
vsync = p->vsync;
}
- mode = kzalloc_obj(*mode, GFP_KERNEL);
+ mode = kzalloc_obj(*mode);
if (!mode)
return NULL;
diff --git a/drivers/gpu/drm/gma500/cdv_intel_dp.c b/drivers/gpu/drm/gma500/cdv_intel_dp.c
index 4f3fbe31a779..fbed35cf7603 100644
--- a/drivers/gpu/drm/gma500/cdv_intel_dp.c
+++ b/drivers/gpu/drm/gma500/cdv_intel_dp.c
@@ -1953,13 +1953,13 @@ cdv_intel_dp_init(struct drm_device *dev, struct psb_intel_mode_device *mode_dev
const char *name = NULL;
int type = DRM_MODE_CONNECTOR_DisplayPort;
- gma_encoder = kzalloc_obj(struct gma_encoder, GFP_KERNEL);
+ gma_encoder = kzalloc_obj(struct gma_encoder);
if (!gma_encoder)
return;
- gma_connector = kzalloc_obj(struct gma_connector, GFP_KERNEL);
+ gma_connector = kzalloc_obj(struct gma_connector);
if (!gma_connector)
goto err_connector;
- intel_dp = kzalloc_obj(struct cdv_intel_dp, GFP_KERNEL);
+ intel_dp = kzalloc_obj(struct cdv_intel_dp);
if (!intel_dp)
goto err_priv;
diff --git a/drivers/gpu/drm/gma500/cdv_intel_hdmi.c b/drivers/gpu/drm/gma500/cdv_intel_hdmi.c
index 5bfdc7adcaab..ce7850647778 100644
--- a/drivers/gpu/drm/gma500/cdv_intel_hdmi.c
+++ b/drivers/gpu/drm/gma500/cdv_intel_hdmi.c
@@ -284,15 +284,15 @@ void cdv_hdmi_init(struct drm_device *dev,
int ddc_reg;
int ret;
- gma_encoder = kzalloc_obj(struct gma_encoder, GFP_KERNEL);
+ gma_encoder = kzalloc_obj(struct gma_encoder);
if (!gma_encoder)
return;
- gma_connector = kzalloc_obj(struct gma_connector, GFP_KERNEL);
+ gma_connector = kzalloc_obj(struct gma_connector);
if (!gma_connector)
goto err_free_encoder;
- hdmi_priv = kzalloc_obj(struct mid_intel_hdmi_priv, GFP_KERNEL);
+ hdmi_priv = kzalloc_obj(struct mid_intel_hdmi_priv);
if (!hdmi_priv)
goto err_free_connector;
diff --git a/drivers/gpu/drm/gma500/cdv_intel_lvds.c b/drivers/gpu/drm/gma500/cdv_intel_lvds.c
index 5b6b0ac77c99..d7fd9a783cde 100644
--- a/drivers/gpu/drm/gma500/cdv_intel_lvds.c
+++ b/drivers/gpu/drm/gma500/cdv_intel_lvds.c
@@ -501,15 +501,15 @@ void cdv_intel_lvds_init(struct drm_device *dev,
return;
}
- gma_encoder = kzalloc_obj(struct gma_encoder, GFP_KERNEL);
+ gma_encoder = kzalloc_obj(struct gma_encoder);
if (!gma_encoder)
return;
- gma_connector = kzalloc_obj(struct gma_connector, GFP_KERNEL);
+ gma_connector = kzalloc_obj(struct gma_connector);
if (!gma_connector)
goto err_free_encoder;
- lvds_priv = kzalloc_obj(struct cdv_intel_lvds_priv, GFP_KERNEL);
+ lvds_priv = kzalloc_obj(struct cdv_intel_lvds_priv);
if (!lvds_priv)
goto err_free_connector;
diff --git a/drivers/gpu/drm/gma500/framebuffer.c b/drivers/gpu/drm/gma500/framebuffer.c
index 808feee5fe2a..fe1f43f0abff 100644
--- a/drivers/gpu/drm/gma500/framebuffer.c
+++ b/drivers/gpu/drm/gma500/framebuffer.c
@@ -75,7 +75,7 @@ struct drm_framebuffer *psb_framebuffer_create(struct drm_device *dev,
struct drm_framebuffer *fb;
int ret;
- fb = kzalloc_obj(*fb, GFP_KERNEL);
+ fb = kzalloc_obj(*fb);
if (!fb)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/gpu/drm/gma500/gem.c b/drivers/gpu/drm/gma500/gem.c
index 238f0dfafacf..88f1e86c8903 100644
--- a/drivers/gpu/drm/gma500/gem.c
+++ b/drivers/gpu/drm/gma500/gem.c
@@ -146,7 +146,7 @@ psb_gem_create(struct drm_device *dev, u64 size, const char *name, bool stolen,
size = roundup(size, PAGE_SIZE);
- pobj = kzalloc_obj(*pobj, GFP_KERNEL);
+ pobj = kzalloc_obj(*pobj);
if (!pobj)
return ERR_PTR(-ENOMEM);
obj = &pobj->base;
diff --git a/drivers/gpu/drm/gma500/intel_bios.c b/drivers/gpu/drm/gma500/intel_bios.c
index 527adf563bfa..c6a945358e3e 100644
--- a/drivers/gpu/drm/gma500/intel_bios.c
+++ b/drivers/gpu/drm/gma500/intel_bios.c
@@ -247,7 +247,7 @@ static void parse_lfp_panel_data(struct drm_psb_private *dev_priv,
entry = &lvds_lfp_data->data[lvds_options->panel_type];
dvo_timing = &entry->dvo_timing;
- panel_fixed_mode = kzalloc_obj(*panel_fixed_mode, GFP_KERNEL);
+ panel_fixed_mode = kzalloc_obj(*panel_fixed_mode);
if (panel_fixed_mode == NULL) {
dev_err(dev_priv->dev.dev, "out of memory for fixed panel mode\n");
return;
@@ -285,7 +285,7 @@ static void parse_sdvo_panel_data(struct drm_psb_private *dev_priv,
if (!dvo_timing)
return;
- panel_fixed_mode = kzalloc_obj(*panel_fixed_mode, GFP_KERNEL);
+ panel_fixed_mode = kzalloc_obj(*panel_fixed_mode);
if (!panel_fixed_mode)
return;
@@ -477,7 +477,7 @@ parse_device_mapping(struct drm_psb_private *dev_priv,
DRM_DEBUG_KMS("no child dev is parsed from VBT\n");
return;
}
- dev_priv->child_dev = kzalloc_objs(*p_child, count, GFP_KERNEL);
+ dev_priv->child_dev = kzalloc_objs(*p_child, count);
if (!dev_priv->child_dev) {
DRM_DEBUG_KMS("No memory space for child devices\n");
return;
diff --git a/drivers/gpu/drm/gma500/intel_gmbus.c b/drivers/gpu/drm/gma500/intel_gmbus.c
index 04eba78fa816..71782c369acf 100644
--- a/drivers/gpu/drm/gma500/intel_gmbus.c
+++ b/drivers/gpu/drm/gma500/intel_gmbus.c
@@ -187,7 +187,7 @@ intel_gpio_create(struct drm_psb_private *dev_priv, u32 pin)
if (pin >= ARRAY_SIZE(map_pin_to_reg) || !map_pin_to_reg[pin])
return NULL;
- gpio = kzalloc_obj(struct intel_gpio, GFP_KERNEL);
+ gpio = kzalloc_obj(struct intel_gpio);
if (gpio == NULL)
return NULL;
diff --git a/drivers/gpu/drm/gma500/intel_i2c.c b/drivers/gpu/drm/gma500/intel_i2c.c
index e121c7c27638..ab8217796817 100644
--- a/drivers/gpu/drm/gma500/intel_i2c.c
+++ b/drivers/gpu/drm/gma500/intel_i2c.c
@@ -107,7 +107,7 @@ struct gma_i2c_chan *gma_i2c_create(struct drm_device *dev, const u32 reg,
{
struct gma_i2c_chan *chan;
- chan = kzalloc_obj(struct gma_i2c_chan, GFP_KERNEL);
+ chan = kzalloc_obj(struct gma_i2c_chan);
if (!chan)
goto out_free;
diff --git a/drivers/gpu/drm/gma500/mid_bios.c b/drivers/gpu/drm/gma500/mid_bios.c
index 16128e84936a..428aff92a7bb 100644
--- a/drivers/gpu/drm/gma500/mid_bios.c
+++ b/drivers/gpu/drm/gma500/mid_bios.c
@@ -228,7 +228,7 @@ static int mid_get_vbt_data_r10(struct drm_psb_private *dev_priv, u32 addr)
if (read_vbt_r10(addr, &vbt))
return -1;
- gct = kmalloc_objs(*gct, vbt.panel_count, GFP_KERNEL);
+ gct = kmalloc_objs(*gct, vbt.panel_count);
if (!gct)
return -ENOMEM;
diff --git a/drivers/gpu/drm/gma500/mmu.c b/drivers/gpu/drm/gma500/mmu.c
index 7bc6a914a378..6b6b44e426cf 100644
--- a/drivers/gpu/drm/gma500/mmu.c
+++ b/drivers/gpu/drm/gma500/mmu.c
@@ -158,7 +158,7 @@ static inline uint32_t psb_mmu_mask_pte(uint32_t pfn, int type)
struct psb_mmu_pd *psb_mmu_alloc_pd(struct psb_mmu_driver *driver,
int trap_pagefaults, int invalid_type)
{
- struct psb_mmu_pd *pd = kmalloc_obj(*pd, GFP_KERNEL);
+ struct psb_mmu_pd *pd = kmalloc_obj(*pd);
uint32_t *v;
int i;
@@ -260,7 +260,7 @@ void psb_mmu_free_pagedir(struct psb_mmu_pd *pd)
static struct psb_mmu_pt *psb_mmu_alloc_pt(struct psb_mmu_pd *pd)
{
- struct psb_mmu_pt *pt = kmalloc_obj(*pt, GFP_KERNEL);
+ struct psb_mmu_pt *pt = kmalloc_obj(*pt);
void *v;
uint32_t clflush_add = pd->driver->clflush_add >> PAGE_SHIFT;
uint32_t clflush_count = PAGE_SIZE / clflush_add;
@@ -425,7 +425,7 @@ struct psb_mmu_driver *psb_mmu_driver_init(struct drm_device *dev,
struct psb_mmu_driver *driver;
struct drm_psb_private *dev_priv = to_drm_psb_private(dev);
- driver = kmalloc_obj(*driver, GFP_KERNEL);
+ driver = kmalloc_obj(*driver);
if (!driver)
return NULL;
diff --git a/drivers/gpu/drm/gma500/oaktrail_hdmi.c b/drivers/gpu/drm/gma500/oaktrail_hdmi.c
index d48c9711e95a..58d7e191fd56 100644
--- a/drivers/gpu/drm/gma500/oaktrail_hdmi.c
+++ b/drivers/gpu/drm/gma500/oaktrail_hdmi.c
@@ -633,11 +633,11 @@ void oaktrail_hdmi_init(struct drm_device *dev,
struct drm_connector *connector;
struct drm_encoder *encoder;
- gma_encoder = kzalloc_obj(struct gma_encoder, GFP_KERNEL);
+ gma_encoder = kzalloc_obj(struct gma_encoder);
if (!gma_encoder)
return;
- gma_connector = kzalloc_obj(struct gma_connector, GFP_KERNEL);
+ gma_connector = kzalloc_obj(struct gma_connector);
if (!gma_connector)
goto failed_connector;
@@ -677,7 +677,7 @@ void oaktrail_hdmi_setup(struct drm_device *dev)
if (!pdev)
return;
- hdmi_dev = kzalloc_obj(struct oaktrail_hdmi_dev, GFP_KERNEL);
+ hdmi_dev = kzalloc_obj(struct oaktrail_hdmi_dev);
if (!hdmi_dev) {
dev_err(dev->dev, "failed to allocate memory\n");
goto out;
diff --git a/drivers/gpu/drm/gma500/oaktrail_hdmi_i2c.c b/drivers/gpu/drm/gma500/oaktrail_hdmi_i2c.c
index 7c02a92c60cb..2a7916ca5907 100644
--- a/drivers/gpu/drm/gma500/oaktrail_hdmi_i2c.c
+++ b/drivers/gpu/drm/gma500/oaktrail_hdmi_i2c.c
@@ -280,7 +280,7 @@ int oaktrail_hdmi_i2c_init(struct pci_dev *dev)
hdmi_dev = pci_get_drvdata(dev);
- i2c_dev = kzalloc_obj(struct hdmi_i2c_dev, GFP_KERNEL);
+ i2c_dev = kzalloc_obj(struct hdmi_i2c_dev);
if (!i2c_dev)
return -ENOMEM;
diff --git a/drivers/gpu/drm/gma500/oaktrail_lvds.c b/drivers/gpu/drm/gma500/oaktrail_lvds.c
index f6ca1559081d..884d324f0044 100644
--- a/drivers/gpu/drm/gma500/oaktrail_lvds.c
+++ b/drivers/gpu/drm/gma500/oaktrail_lvds.c
@@ -223,7 +223,7 @@ static void oaktrail_lvds_get_configuration_mode(struct drm_device *dev,
/* Use the firmware provided data on Moorestown */
if (dev_priv->has_gct) {
- mode = kzalloc_obj(*mode, GFP_KERNEL);
+ mode = kzalloc_obj(*mode);
if (!mode)
return;
@@ -302,11 +302,11 @@ void oaktrail_lvds_init(struct drm_device *dev,
struct drm_display_mode *scan; /* *modes, *bios_mode; */
int ret;
- gma_encoder = kzalloc_obj(struct gma_encoder, GFP_KERNEL);
+ gma_encoder = kzalloc_obj(struct gma_encoder);
if (!gma_encoder)
return;
- gma_connector = kzalloc_obj(struct gma_connector, GFP_KERNEL);
+ gma_connector = kzalloc_obj(struct gma_connector);
if (!gma_connector)
goto err_free_encoder;
diff --git a/drivers/gpu/drm/gma500/oaktrail_lvds_i2c.c b/drivers/gpu/drm/gma500/oaktrail_lvds_i2c.c
index 2b5ef15df09f..bbfbe893d1c4 100644
--- a/drivers/gpu/drm/gma500/oaktrail_lvds_i2c.c
+++ b/drivers/gpu/drm/gma500/oaktrail_lvds_i2c.c
@@ -135,7 +135,7 @@ struct gma_i2c_chan *oaktrail_lvds_i2c_init(struct drm_device *dev)
struct gma_i2c_chan *chan;
int ret;
- chan = kzalloc_obj(struct gma_i2c_chan, GFP_KERNEL);
+ chan = kzalloc_obj(struct gma_i2c_chan);
if (!chan)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/gpu/drm/gma500/psb_intel_display.c b/drivers/gpu/drm/gma500/psb_intel_display.c
index 2864b209fcdf..0df75a4a7739 100644
--- a/drivers/gpu/drm/gma500/psb_intel_display.c
+++ b/drivers/gpu/drm/gma500/psb_intel_display.c
@@ -404,7 +404,7 @@ struct drm_display_mode *psb_intel_crtc_mode_get(struct drm_device *dev,
vsync = p->vsync;
}
- mode = kzalloc_obj(*mode, GFP_KERNEL);
+ mode = kzalloc_obj(*mode);
if (!mode)
return NULL;
@@ -487,7 +487,7 @@ void psb_intel_crtc_init(struct drm_device *dev, int pipe,
return;
gma_crtc->crtc_state =
- kzalloc_obj(struct psb_intel_crtc_state, GFP_KERNEL);
+ kzalloc_obj(struct psb_intel_crtc_state);
if (!gma_crtc->crtc_state) {
dev_err(dev->dev, "Crtc state error: No memory\n");
kfree(gma_crtc);
diff --git a/drivers/gpu/drm/gma500/psb_intel_lvds.c b/drivers/gpu/drm/gma500/psb_intel_lvds.c
index 6183360b1a81..2ca164b21293 100644
--- a/drivers/gpu/drm/gma500/psb_intel_lvds.c
+++ b/drivers/gpu/drm/gma500/psb_intel_lvds.c
@@ -639,20 +639,20 @@ void psb_intel_lvds_init(struct drm_device *dev,
int pipe;
int ret;
- gma_encoder = kzalloc_obj(struct gma_encoder, GFP_KERNEL);
+ gma_encoder = kzalloc_obj(struct gma_encoder);
if (!gma_encoder) {
dev_err(dev->dev, "gma_encoder allocation error\n");
return;
}
encoder = &gma_encoder->base;
- gma_connector = kzalloc_obj(struct gma_connector, GFP_KERNEL);
+ gma_connector = kzalloc_obj(struct gma_connector);
if (!gma_connector) {
dev_err(dev->dev, "gma_connector allocation error\n");
goto err_free_encoder;
}
- lvds_priv = kzalloc_obj(struct psb_intel_lvds_priv, GFP_KERNEL);
+ lvds_priv = kzalloc_obj(struct psb_intel_lvds_priv);
if (!lvds_priv) {
dev_err(dev->dev, "LVDS private allocation error\n");
goto err_free_connector;
diff --git a/drivers/gpu/drm/gma500/psb_intel_sdvo.c b/drivers/gpu/drm/gma500/psb_intel_sdvo.c
index 6f973c9044e0..e81431957e7f 100644
--- a/drivers/gpu/drm/gma500/psb_intel_sdvo.c
+++ b/drivers/gpu/drm/gma500/psb_intel_sdvo.c
@@ -2446,7 +2446,7 @@ bool psb_intel_sdvo_init(struct drm_device *dev, int sdvo_reg)
struct psb_intel_sdvo *psb_intel_sdvo;
int i;
- psb_intel_sdvo = kzalloc_obj(struct psb_intel_sdvo, GFP_KERNEL);
+ psb_intel_sdvo = kzalloc_obj(struct psb_intel_sdvo);
if (!psb_intel_sdvo)
return false;
diff --git a/drivers/gpu/drm/gud/gud_connector.c b/drivers/gpu/drm/gud/gud_connector.c
index b3d5df5f7a5c..78be37092748 100644
--- a/drivers/gpu/drm/gud/gud_connector.c
+++ b/drivers/gpu/drm/gud/gud_connector.c
@@ -621,7 +621,7 @@ static int gud_connector_create(struct gud_device *gdrm, unsigned int index,
int ret, connector_type;
u32 flags;
- gconn = kzalloc_obj(*gconn, GFP_KERNEL);
+ gconn = kzalloc_obj(*gconn);
if (!gconn)
return -ENOMEM;
@@ -700,7 +700,7 @@ int gud_get_connectors(struct gud_device *gdrm)
unsigned int i, num_connectors;
int ret;
- descs = kmalloc_objs(*descs, GUD_CONNECTORS_MAX_NUM, GFP_KERNEL);
+ descs = kmalloc_objs(*descs, GUD_CONNECTORS_MAX_NUM);
if (!descs)
return -ENOMEM;
diff --git a/drivers/gpu/drm/gud/gud_drv.c b/drivers/gpu/drm/gud/gud_drv.c
index 66780b9f6026..a301e1580b3f 100644
--- a/drivers/gpu/drm/gud/gud_drv.c
+++ b/drivers/gpu/drm/gud/gud_drv.c
@@ -82,7 +82,7 @@ static int gud_get_display_descriptor(struct usb_interface *intf,
void *buf;
int ret;
- buf = kmalloc_obj(*desc, GFP_KERNEL);
+ buf = kmalloc_obj(*desc);
if (!buf)
return -ENOMEM;
@@ -135,7 +135,7 @@ static int gud_usb_get_status(struct usb_interface *intf)
int ret, status = -EIO;
u8 *buf;
- buf = kmalloc_obj(*buf, GFP_KERNEL);
+ buf = kmalloc_obj(*buf);
if (!buf)
return -ENOMEM;
@@ -402,7 +402,7 @@ static int gud_alloc_bulk_buffer(struct gud_device *gdrm)
return -ENOMEM;
num_pages = DIV_ROUND_UP(gdrm->bulk_len, PAGE_SIZE);
- pages = kmalloc_objs(struct page *, num_pages, GFP_KERNEL);
+ pages = kmalloc_objs(struct page *, num_pages);
if (!pages)
return -ENOMEM;
diff --git a/drivers/gpu/drm/i915/display/dvo_ch7017.c b/drivers/gpu/drm/i915/display/dvo_ch7017.c
index 032c41e55a07..326b08e7a362 100644
--- a/drivers/gpu/drm/i915/display/dvo_ch7017.c
+++ b/drivers/gpu/drm/i915/display/dvo_ch7017.c
@@ -207,7 +207,7 @@ static bool ch7017_init(struct intel_dvo_device *dvo,
const char *str;
u8 val;
- priv = kzalloc_obj(*priv, GFP_KERNEL);
+ priv = kzalloc_obj(*priv);
if (priv == NULL)
return false;
diff --git a/drivers/gpu/drm/i915/display/dvo_ch7xxx.c b/drivers/gpu/drm/i915/display/dvo_ch7xxx.c
index b85c9afb0c64..1382fe195bb1 100644
--- a/drivers/gpu/drm/i915/display/dvo_ch7xxx.c
+++ b/drivers/gpu/drm/i915/display/dvo_ch7xxx.c
@@ -218,7 +218,7 @@ static bool ch7xxx_init(struct intel_dvo_device *dvo,
u8 vendor, device;
char *name, *devid;
- ch7xxx = kzalloc_obj(*ch7xxx, GFP_KERNEL);
+ ch7xxx = kzalloc_obj(*ch7xxx);
if (ch7xxx == NULL)
return false;
diff --git a/drivers/gpu/drm/i915/display/dvo_ivch.c b/drivers/gpu/drm/i915/display/dvo_ivch.c
index 9bcdd02d5f36..0970dc6fd73d 100644
--- a/drivers/gpu/drm/i915/display/dvo_ivch.c
+++ b/drivers/gpu/drm/i915/display/dvo_ivch.c
@@ -269,7 +269,7 @@ static bool ivch_init(struct intel_dvo_device *dvo,
u16 temp;
int i;
- priv = kzalloc_obj(*priv, GFP_KERNEL);
+ priv = kzalloc_obj(*priv);
if (priv == NULL)
return false;
diff --git a/drivers/gpu/drm/i915/display/dvo_ns2501.c b/drivers/gpu/drm/i915/display/dvo_ns2501.c
index 248b79795edf..6a6072b78410 100644
--- a/drivers/gpu/drm/i915/display/dvo_ns2501.c
+++ b/drivers/gpu/drm/i915/display/dvo_ns2501.c
@@ -476,7 +476,7 @@ static bool ns2501_init(struct intel_dvo_device *dvo,
struct ns2501_priv *ns;
unsigned char ch;
- ns = kzalloc_obj(*ns, GFP_KERNEL);
+ ns = kzalloc_obj(*ns);
if (ns == NULL)
return false;
diff --git a/drivers/gpu/drm/i915/display/dvo_sil164.c b/drivers/gpu/drm/i915/display/dvo_sil164.c
index 765d2517fb10..c6989a4bad0f 100644
--- a/drivers/gpu/drm/i915/display/dvo_sil164.c
+++ b/drivers/gpu/drm/i915/display/dvo_sil164.c
@@ -143,7 +143,7 @@ static bool sil164_init(struct intel_dvo_device *dvo,
struct sil164_priv *sil;
unsigned char ch;
- sil = kzalloc_obj(*sil, GFP_KERNEL);
+ sil = kzalloc_obj(*sil);
if (sil == NULL)
return false;
diff --git a/drivers/gpu/drm/i915/display/dvo_tfp410.c b/drivers/gpu/drm/i915/display/dvo_tfp410.c
index 9bd8305bc291..10d8dd4f4d17 100644
--- a/drivers/gpu/drm/i915/display/dvo_tfp410.c
+++ b/drivers/gpu/drm/i915/display/dvo_tfp410.c
@@ -175,7 +175,7 @@ static bool tfp410_init(struct intel_dvo_device *dvo,
struct tfp410_priv *tfp;
int id;
- tfp = kzalloc_obj(*tfp, GFP_KERNEL);
+ tfp = kzalloc_obj(*tfp);
if (tfp == NULL)
return false;
diff --git a/drivers/gpu/drm/i915/display/icl_dsi.c b/drivers/gpu/drm/i915/display/icl_dsi.c
index b46b79eee5bb..fc265f71d72b 100644
--- a/drivers/gpu/drm/i915/display/icl_dsi.c
+++ b/drivers/gpu/drm/i915/display/icl_dsi.c
@@ -1934,7 +1934,7 @@ void icl_dsi_init(struct intel_display *display,
if (port == PORT_NONE)
return;
- intel_dsi = kzalloc_obj(*intel_dsi, GFP_KERNEL);
+ intel_dsi = kzalloc_obj(*intel_dsi);
if (!intel_dsi)
return;
diff --git a/drivers/gpu/drm/i915/display/intel_atomic.c b/drivers/gpu/drm/i915/display/intel_atomic.c
index 208d6a449edc..71b7325917b6 100644
--- a/drivers/gpu/drm/i915/display/intel_atomic.c
+++ b/drivers/gpu/drm/i915/display/intel_atomic.c
@@ -323,7 +323,7 @@ intel_crtc_destroy_state(struct drm_crtc *crtc,
struct drm_atomic_state *
intel_atomic_state_alloc(struct drm_device *dev)
{
- struct intel_atomic_state *state = kzalloc_obj(*state, GFP_KERNEL);
+ struct intel_atomic_state *state = kzalloc_obj(*state);
if (!state || drm_atomic_state_init(dev, &state->base) < 0) {
kfree(state);
diff --git a/drivers/gpu/drm/i915/display/intel_bios.c b/drivers/gpu/drm/i915/display/intel_bios.c
index 4731afb418da..85f5f9bdf741 100644
--- a/drivers/gpu/drm/i915/display/intel_bios.c
+++ b/drivers/gpu/drm/i915/display/intel_bios.c
@@ -852,7 +852,7 @@ parse_lfp_panel_dtd(struct intel_display *display,
lfp_data_ptrs,
panel_type);
- panel_fixed_mode = kzalloc_obj(*panel_fixed_mode, GFP_KERNEL);
+ panel_fixed_mode = kzalloc_obj(*panel_fixed_mode);
if (!panel_fixed_mode)
return;
@@ -968,7 +968,7 @@ parse_generic_dtd(struct intel_display *display,
dtd = &generic_dtd->dtd[panel->vbt.panel_type];
- panel_fixed_mode = kzalloc_obj(*panel_fixed_mode, GFP_KERNEL);
+ panel_fixed_mode = kzalloc_obj(*panel_fixed_mode);
if (!panel_fixed_mode)
return;
@@ -1141,7 +1141,7 @@ parse_sdvo_lvds_data(struct intel_display *display,
return;
}
- panel_fixed_mode = kzalloc_obj(*panel_fixed_mode, GFP_KERNEL);
+ panel_fixed_mode = kzalloc_obj(*panel_fixed_mode);
if (!panel_fixed_mode)
return;
@@ -2929,7 +2929,7 @@ parse_general_definitions(struct intel_display *display)
"Found VBT child device with type 0x%x\n",
child->device_type);
- devdata = kzalloc_obj(*devdata, GFP_KERNEL);
+ devdata = kzalloc_obj(*devdata);
if (!devdata)
break;
@@ -3010,7 +3010,7 @@ init_vbt_missing_defaults(struct intel_display *display)
continue;
/* Create fake child device config */
- devdata = kzalloc_obj(*devdata, GFP_KERNEL);
+ devdata = kzalloc_obj(*devdata);
if (!devdata)
break;
diff --git a/drivers/gpu/drm/i915/display/intel_bw.c b/drivers/gpu/drm/i915/display/intel_bw.c
index e08e477e882a..fe48949b5880 100644
--- a/drivers/gpu/drm/i915/display/intel_bw.c
+++ b/drivers/gpu/drm/i915/display/intel_bw.c
@@ -1470,7 +1470,7 @@ int intel_bw_init(struct intel_display *display)
{
struct intel_bw_state *state;
- state = kzalloc_obj(*state, GFP_KERNEL);
+ state = kzalloc_obj(*state);
if (!state)
return -ENOMEM;
diff --git a/drivers/gpu/drm/i915/display/intel_cdclk.c b/drivers/gpu/drm/i915/display/intel_cdclk.c
index 46375d4972be..f5946e677c93 100644
--- a/drivers/gpu/drm/i915/display/intel_cdclk.c
+++ b/drivers/gpu/drm/i915/display/intel_cdclk.c
@@ -3409,7 +3409,7 @@ int intel_cdclk_init(struct intel_display *display)
{
struct intel_cdclk_state *cdclk_state;
- cdclk_state = kzalloc_obj(*cdclk_state, GFP_KERNEL);
+ cdclk_state = kzalloc_obj(*cdclk_state);
if (!cdclk_state)
return -ENOMEM;
diff --git a/drivers/gpu/drm/i915/display/intel_colorop.c b/drivers/gpu/drm/i915/display/intel_colorop.c
index 8326916ccdc1..a898b8d73dd8 100644
--- a/drivers/gpu/drm/i915/display/intel_colorop.c
+++ b/drivers/gpu/drm/i915/display/intel_colorop.c
@@ -15,7 +15,7 @@ struct intel_colorop *intel_colorop_alloc(void)
{
struct intel_colorop *colorop;
- colorop = kzalloc_obj(*colorop, GFP_KERNEL);
+ colorop = kzalloc_obj(*colorop);
if (!colorop)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/gpu/drm/i915/display/intel_connector.c b/drivers/gpu/drm/i915/display/intel_connector.c
index 8712f6a61778..7ef9338d67ab 100644
--- a/drivers/gpu/drm/i915/display/intel_connector.c
+++ b/drivers/gpu/drm/i915/display/intel_connector.c
@@ -86,7 +86,7 @@ static int intel_connector_init(struct intel_connector *connector)
* need it we'll free the state and allocate a smaller one on the first
* successful commit anyway.
*/
- conn_state = kzalloc_obj(*conn_state, GFP_KERNEL);
+ conn_state = kzalloc_obj(*conn_state);
if (!conn_state)
return -ENOMEM;
@@ -105,7 +105,7 @@ struct intel_connector *intel_connector_alloc(void)
{
struct intel_connector *connector;
- connector = kzalloc_obj(*connector, GFP_KERNEL);
+ connector = kzalloc_obj(*connector);
if (!connector)
return NULL;
diff --git a/drivers/gpu/drm/i915/display/intel_crt.c b/drivers/gpu/drm/i915/display/intel_crt.c
index 7be2361e52e7..59d637c6a187 100644
--- a/drivers/gpu/drm/i915/display/intel_crt.c
+++ b/drivers/gpu/drm/i915/display/intel_crt.c
@@ -1037,7 +1037,7 @@ void intel_crt_init(struct intel_display *display)
intel_de_write(display, adpa_reg, adpa);
}
- crt = kzalloc_obj(struct intel_crt, GFP_KERNEL);
+ crt = kzalloc_obj(struct intel_crt);
if (!crt)
return;
diff --git a/drivers/gpu/drm/i915/display/intel_crtc.c b/drivers/gpu/drm/i915/display/intel_crtc.c
index e41975b34929..53378d2dcbec 100644
--- a/drivers/gpu/drm/i915/display/intel_crtc.c
+++ b/drivers/gpu/drm/i915/display/intel_crtc.c
@@ -168,7 +168,7 @@ struct intel_crtc_state *intel_crtc_state_alloc(struct intel_crtc *crtc)
{
struct intel_crtc_state *crtc_state;
- crtc_state = kmalloc_obj(*crtc_state, GFP_KERNEL);
+ crtc_state = kmalloc_obj(*crtc_state);
if (crtc_state)
intel_crtc_state_reset(crtc_state, crtc);
@@ -196,7 +196,7 @@ static struct intel_crtc *intel_crtc_alloc(void)
struct intel_crtc_state *crtc_state;
struct intel_crtc *crtc;
- crtc = kzalloc_obj(*crtc, GFP_KERNEL);
+ crtc = kzalloc_obj(*crtc);
if (!crtc)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/gpu/drm/i915/display/intel_dbuf_bw.c b/drivers/gpu/drm/i915/display/intel_dbuf_bw.c
index 73d22de72226..0562d4df6a07 100644
--- a/drivers/gpu/drm/i915/display/intel_dbuf_bw.c
+++ b/drivers/gpu/drm/i915/display/intel_dbuf_bw.c
@@ -284,7 +284,7 @@ int intel_dbuf_bw_init(struct intel_display *display)
{
struct intel_dbuf_bw_state *state;
- state = kzalloc_obj(*state, GFP_KERNEL);
+ state = kzalloc_obj(*state);
if (!state)
return -ENOMEM;
diff --git a/drivers/gpu/drm/i915/display/intel_display.c b/drivers/gpu/drm/i915/display/intel_display.c
index 4a081b30477c..3b8ba8ab76a1 100644
--- a/drivers/gpu/drm/i915/display/intel_display.c
+++ b/drivers/gpu/drm/i915/display/intel_display.c
@@ -4122,7 +4122,7 @@ intel_encoder_current_mode(struct intel_encoder *encoder)
crtc = intel_crtc_for_pipe(display, pipe);
- mode = kzalloc_obj(*mode, GFP_KERNEL);
+ mode = kzalloc_obj(*mode);
if (!mode)
return NULL;
diff --git a/drivers/gpu/drm/i915/display/intel_display_device.c b/drivers/gpu/drm/i915/display/intel_display_device.c
index 648294f234cc..01e0ae01fc50 100644
--- a/drivers/gpu/drm/i915/display/intel_display_device.c
+++ b/drivers/gpu/drm/i915/display/intel_display_device.c
@@ -1663,7 +1663,7 @@ struct intel_display *intel_display_device_probe(struct pci_dev *pdev,
const struct subplatform_desc *subdesc;
enum intel_step step;
- display = kzalloc_obj(*display, GFP_KERNEL);
+ display = kzalloc_obj(*display);
if (!display)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/gpu/drm/i915/display/intel_display_rps.c b/drivers/gpu/drm/i915/display/intel_display_rps.c
index f37361f87894..b58281edc563 100644
--- a/drivers/gpu/drm/i915/display/intel_display_rps.c
+++ b/drivers/gpu/drm/i915/display/intel_display_rps.c
@@ -59,7 +59,7 @@ void intel_display_rps_boost_after_vblank(struct drm_crtc *crtc,
if (drm_crtc_vblank_get(crtc))
return;
- wait = kmalloc_obj(*wait, GFP_KERNEL);
+ wait = kmalloc_obj(*wait);
if (!wait) {
drm_crtc_vblank_put(crtc);
return;
diff --git a/drivers/gpu/drm/i915/display/intel_dmc.c b/drivers/gpu/drm/i915/display/intel_dmc.c
index 7e51d8873178..1006b060c3f3 100644
--- a/drivers/gpu/drm/i915/display/intel_dmc.c
+++ b/drivers/gpu/drm/i915/display/intel_dmc.c
@@ -1417,7 +1417,7 @@ void intel_dmc_init(struct intel_display *display)
*/
intel_dmc_runtime_pm_get(display);
- dmc = kzalloc_obj(*dmc, GFP_KERNEL);
+ dmc = kzalloc_obj(*dmc);
if (!dmc)
return;
diff --git a/drivers/gpu/drm/i915/display/intel_dp_mst.c b/drivers/gpu/drm/i915/display/intel_dp_mst.c
index 96da2f8da8b5..70a21685a3e1 100644
--- a/drivers/gpu/drm/i915/display/intel_dp_mst.c
+++ b/drivers/gpu/drm/i915/display/intel_dp_mst.c
@@ -1765,7 +1765,7 @@ mst_stream_encoder_create(struct intel_digital_port *dig_port, enum pipe pipe)
struct intel_dp_mst_encoder *intel_mst;
struct intel_encoder *encoder;
- intel_mst = kzalloc_obj(*intel_mst, GFP_KERNEL);
+ intel_mst = kzalloc_obj(*intel_mst);
if (!intel_mst)
return NULL;
diff --git a/drivers/gpu/drm/i915/display/intel_dpt.c b/drivers/gpu/drm/i915/display/intel_dpt.c
index 05e5c8f839a1..da472371c7d7 100644
--- a/drivers/gpu/drm/i915/display/intel_dpt.c
+++ b/drivers/gpu/drm/i915/display/intel_dpt.c
@@ -280,7 +280,7 @@ intel_dpt_create(struct intel_framebuffer *fb)
return ERR_PTR(ret);
}
- dpt = kzalloc_obj(*dpt, GFP_KERNEL);
+ dpt = kzalloc_obj(*dpt);
if (!dpt) {
i915_gem_object_put(dpt_obj);
return ERR_PTR(-ENOMEM);
diff --git a/drivers/gpu/drm/i915/display/intel_dsb.c b/drivers/gpu/drm/i915/display/intel_dsb.c
index d9aff12a0a9b..b5d774706fec 100644
--- a/drivers/gpu/drm/i915/display/intel_dsb.c
+++ b/drivers/gpu/drm/i915/display/intel_dsb.c
@@ -974,7 +974,7 @@ struct intel_dsb *intel_dsb_prepare(struct intel_atomic_state *state,
if (!display->params.enable_dsb)
return NULL;
- dsb = kzalloc_obj(*dsb, GFP_KERNEL);
+ dsb = kzalloc_obj(*dsb);
if (!dsb)
goto out;
diff --git a/drivers/gpu/drm/i915/display/intel_dsb_buffer.c b/drivers/gpu/drm/i915/display/intel_dsb_buffer.c
index 28d63ba2f032..9b6060af250d 100644
--- a/drivers/gpu/drm/i915/display/intel_dsb_buffer.c
+++ b/drivers/gpu/drm/i915/display/intel_dsb_buffer.c
@@ -46,7 +46,7 @@ struct intel_dsb_buffer *intel_dsb_buffer_create(struct drm_device *drm, size_t
u32 *buf;
int ret;
- dsb_buf = kzalloc_obj(*dsb_buf, GFP_KERNEL);
+ dsb_buf = kzalloc_obj(*dsb_buf);
if (!dsb_buf)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/gpu/drm/i915/display/intel_dsi.c b/drivers/gpu/drm/i915/display/intel_dsi.c
index 1ac274964c4c..9005c1f5d857 100644
--- a/drivers/gpu/drm/i915/display/intel_dsi.c
+++ b/drivers/gpu/drm/i915/display/intel_dsi.c
@@ -87,7 +87,7 @@ struct intel_dsi_host *intel_dsi_host_init(struct intel_dsi *intel_dsi,
struct intel_dsi_host *host;
struct mipi_dsi_device *device;
- host = kzalloc_obj(*host, GFP_KERNEL);
+ host = kzalloc_obj(*host);
if (!host)
return NULL;
@@ -102,7 +102,7 @@ struct intel_dsi_host *intel_dsi_host_init(struct intel_dsi *intel_dsi,
* devices by ourselves here too. Need to be careful though, because we
* don't initialize any of the driver model devices here.
*/
- device = kzalloc_obj(*device, GFP_KERNEL);
+ device = kzalloc_obj(*device);
if (!device) {
kfree(host);
return NULL;
diff --git a/drivers/gpu/drm/i915/display/intel_dvo.c b/drivers/gpu/drm/i915/display/intel_dvo.c
index d6fbf4fd29d9..405b33aca9dd 100644
--- a/drivers/gpu/drm/i915/display/intel_dvo.c
+++ b/drivers/gpu/drm/i915/display/intel_dvo.c
@@ -494,7 +494,7 @@ void intel_dvo_init(struct intel_display *display)
struct intel_encoder *encoder;
struct intel_dvo *intel_dvo;
- intel_dvo = kzalloc_obj(*intel_dvo, GFP_KERNEL);
+ intel_dvo = kzalloc_obj(*intel_dvo);
if (!intel_dvo)
return;
diff --git a/drivers/gpu/drm/i915/display/intel_encoder.c b/drivers/gpu/drm/i915/display/intel_encoder.c
index b02297d56950..d01b081a6074 100644
--- a/drivers/gpu/drm/i915/display/intel_encoder.c
+++ b/drivers/gpu/drm/i915/display/intel_encoder.c
@@ -108,7 +108,7 @@ struct intel_digital_port *intel_dig_port_alloc(void)
{
struct intel_digital_port *dig_port;
- dig_port = kzalloc_obj(*dig_port, GFP_KERNEL);
+ dig_port = kzalloc_obj(*dig_port);
if (!dig_port)
return NULL;
diff --git a/drivers/gpu/drm/i915/display/intel_fb.c b/drivers/gpu/drm/i915/display/intel_fb.c
index 3b6d0d4ccff7..38c33f2ca05c 100644
--- a/drivers/gpu/drm/i915/display/intel_fb.c
+++ b/drivers/gpu/drm/i915/display/intel_fb.c
@@ -2173,7 +2173,7 @@ static int intel_user_framebuffer_dirty(struct drm_framebuffer *fb,
if (ret || !fence)
goto flush;
- cb = kmalloc_obj(*cb, GFP_KERNEL);
+ cb = kmalloc_obj(*cb);
if (!cb) {
dma_fence_put(fence);
ret = -ENOMEM;
@@ -2361,7 +2361,7 @@ struct intel_framebuffer *intel_framebuffer_alloc(void)
{
struct intel_framebuffer *intel_fb;
- intel_fb = kzalloc_obj(*intel_fb, GFP_KERNEL);
+ intel_fb = kzalloc_obj(*intel_fb);
if (!intel_fb)
return NULL;
diff --git a/drivers/gpu/drm/i915/display/intel_fbc.c b/drivers/gpu/drm/i915/display/intel_fbc.c
index c0dfa65809f9..91de38379282 100644
--- a/drivers/gpu/drm/i915/display/intel_fbc.c
+++ b/drivers/gpu/drm/i915/display/intel_fbc.c
@@ -2294,7 +2294,7 @@ static struct intel_fbc *intel_fbc_create(struct intel_display *display,
{
struct intel_fbc *fbc;
- fbc = kzalloc_obj(*fbc, GFP_KERNEL);
+ fbc = kzalloc_obj(*fbc);
if (!fbc)
return NULL;
diff --git a/drivers/gpu/drm/i915/display/intel_global_state.c b/drivers/gpu/drm/i915/display/intel_global_state.c
index 49f32828c3f1..9e1369c834e4 100644
--- a/drivers/gpu/drm/i915/display/intel_global_state.c
+++ b/drivers/gpu/drm/i915/display/intel_global_state.c
@@ -52,7 +52,7 @@ static struct intel_global_commit *commit_new(void)
{
struct intel_global_commit *commit;
- commit = kzalloc_obj(*commit, GFP_KERNEL);
+ commit = kzalloc_obj(*commit);
if (!commit)
return NULL;
diff --git a/drivers/gpu/drm/i915/display/intel_gmbus.c b/drivers/gpu/drm/i915/display/intel_gmbus.c
index b27330b95145..a7bce0c6a17e 100644
--- a/drivers/gpu/drm/i915/display/intel_gmbus.c
+++ b/drivers/gpu/drm/i915/display/intel_gmbus.c
@@ -925,7 +925,7 @@ int intel_gmbus_setup(struct intel_display *display)
if (!gmbus_pin)
continue;
- bus = kzalloc_obj(*bus, GFP_KERNEL);
+ bus = kzalloc_obj(*bus);
if (!bus) {
ret = -ENOMEM;
goto err;
diff --git a/drivers/gpu/drm/i915/display/intel_hdcp_gsc_message.c b/drivers/gpu/drm/i915/display/intel_hdcp_gsc_message.c
index 5b941bfa8c17..c2de48f57f30 100644
--- a/drivers/gpu/drm/i915/display/intel_hdcp_gsc_message.c
+++ b/drivers/gpu/drm/i915/display/intel_hdcp_gsc_message.c
@@ -633,7 +633,7 @@ int intel_hdcp_gsc_init(struct intel_display *display)
struct i915_hdcp_arbiter *arbiter;
int ret = 0;
- arbiter = kzalloc_obj(*arbiter, GFP_KERNEL);
+ arbiter = kzalloc_obj(*arbiter);
if (!arbiter)
return -ENOMEM;
diff --git a/drivers/gpu/drm/i915/display/intel_lpe_audio.c b/drivers/gpu/drm/i915/display/intel_lpe_audio.c
index c7f28b537509..117b60656ca1 100644
--- a/drivers/gpu/drm/i915/display/intel_lpe_audio.c
+++ b/drivers/gpu/drm/i915/display/intel_lpe_audio.c
@@ -87,11 +87,11 @@ lpe_audio_platdev_create(struct intel_display *display)
struct platform_device *platdev;
struct intel_hdmi_lpe_audio_pdata *pdata;
- pdata = kzalloc_obj(*pdata, GFP_KERNEL);
+ pdata = kzalloc_obj(*pdata);
if (!pdata)
return ERR_PTR(-ENOMEM);
- rsc = kzalloc_objs(*rsc, 2, GFP_KERNEL);
+ rsc = kzalloc_objs(*rsc, 2);
if (!rsc) {
kfree(pdata);
return ERR_PTR(-ENOMEM);
diff --git a/drivers/gpu/drm/i915/display/intel_lvds.c b/drivers/gpu/drm/i915/display/intel_lvds.c
index 7f085f475664..cc6d4bfcff10 100644
--- a/drivers/gpu/drm/i915/display/intel_lvds.c
+++ b/drivers/gpu/drm/i915/display/intel_lvds.c
@@ -886,7 +886,7 @@ void intel_lvds_init(struct intel_display *display)
"LVDS is not present in VBT, but enabled anyway\n");
}
- lvds_encoder = kzalloc_obj(*lvds_encoder, GFP_KERNEL);
+ lvds_encoder = kzalloc_obj(*lvds_encoder);
if (!lvds_encoder)
return;
diff --git a/drivers/gpu/drm/i915/display/intel_opregion.c b/drivers/gpu/drm/i915/display/intel_opregion.c
index e968834dc7b7..e25be56e678b 100644
--- a/drivers/gpu/drm/i915/display/intel_opregion.c
+++ b/drivers/gpu/drm/i915/display/intel_opregion.c
@@ -898,7 +898,7 @@ int intel_opregion_setup(struct intel_display *display)
return -ENOTSUPP;
}
- opregion = kzalloc_obj(*opregion, GFP_KERNEL);
+ opregion = kzalloc_obj(*opregion);
if (!opregion)
return -ENOMEM;
diff --git a/drivers/gpu/drm/i915/display/intel_overlay.c b/drivers/gpu/drm/i915/display/intel_overlay.c
index 8ab5a866fb67..05c7545c49e5 100644
--- a/drivers/gpu/drm/i915/display/intel_overlay.c
+++ b/drivers/gpu/drm/i915/display/intel_overlay.c
@@ -1409,7 +1409,7 @@ void intel_overlay_setup(struct intel_display *display)
if (!engine || !engine->kernel_context)
return;
- overlay = kzalloc_obj(*overlay, GFP_KERNEL);
+ overlay = kzalloc_obj(*overlay);
if (!overlay)
return;
diff --git a/drivers/gpu/drm/i915/display/intel_plane.c b/drivers/gpu/drm/i915/display/intel_plane.c
index a5d60180cc7a..e06a0618b4c6 100644
--- a/drivers/gpu/drm/i915/display/intel_plane.c
+++ b/drivers/gpu/drm/i915/display/intel_plane.c
@@ -77,11 +77,11 @@ struct intel_plane *intel_plane_alloc(void)
struct intel_plane_state *plane_state;
struct intel_plane *plane;
- plane = kzalloc_obj(*plane, GFP_KERNEL);
+ plane = kzalloc_obj(*plane);
if (!plane)
return ERR_PTR(-ENOMEM);
- plane_state = kzalloc_obj(*plane_state, GFP_KERNEL);
+ plane_state = kzalloc_obj(*plane_state);
if (!plane_state) {
kfree(plane);
return ERR_PTR(-ENOMEM);
diff --git a/drivers/gpu/drm/i915/display/intel_pmdemand.c b/drivers/gpu/drm/i915/display/intel_pmdemand.c
index d12fabbe90de..f3db55710010 100644
--- a/drivers/gpu/drm/i915/display/intel_pmdemand.c
+++ b/drivers/gpu/drm/i915/display/intel_pmdemand.c
@@ -121,7 +121,7 @@ int intel_pmdemand_init(struct intel_display *display)
{
struct intel_pmdemand_state *pmdemand_state;
- pmdemand_state = kzalloc_obj(*pmdemand_state, GFP_KERNEL);
+ pmdemand_state = kzalloc_obj(*pmdemand_state);
if (!pmdemand_state)
return -ENOMEM;
diff --git a/drivers/gpu/drm/i915/display/intel_rom.c b/drivers/gpu/drm/i915/display/intel_rom.c
index 930b9cb9d1b7..05b6ea764ebb 100644
--- a/drivers/gpu/drm/i915/display/intel_rom.c
+++ b/drivers/gpu/drm/i915/display/intel_rom.c
@@ -47,7 +47,7 @@ struct intel_rom *intel_rom_spi(struct drm_device *drm)
struct intel_rom *rom;
u32 static_region;
- rom = kzalloc_obj(*rom, GFP_KERNEL);
+ rom = kzalloc_obj(*rom);
if (!rom)
return NULL;
@@ -92,7 +92,7 @@ struct intel_rom *intel_rom_pci(struct drm_device *drm)
{
struct intel_rom *rom;
- rom = kzalloc_obj(*rom, GFP_KERNEL);
+ rom = kzalloc_obj(*rom);
if (!rom)
return NULL;
diff --git a/drivers/gpu/drm/i915/display/intel_sdvo.c b/drivers/gpu/drm/i915/display/intel_sdvo.c
index 273487e8ec5c..2e1af9e869de 100644
--- a/drivers/gpu/drm/i915/display/intel_sdvo.c
+++ b/drivers/gpu/drm/i915/display/intel_sdvo.c
@@ -474,7 +474,7 @@ static bool __intel_sdvo_write_cmd(struct intel_sdvo *intel_sdvo, u8 cmd,
if (!buf)
return false;
- msgs = kzalloc_objs(*msgs, args_len + 3, GFP_KERNEL);
+ msgs = kzalloc_objs(*msgs, args_len + 3);
if (!msgs) {
kfree(buf);
return false;
@@ -2774,11 +2774,11 @@ static struct intel_sdvo_connector *intel_sdvo_connector_alloc(void)
struct intel_sdvo_connector *sdvo_connector;
struct intel_sdvo_connector_state *conn_state;
- sdvo_connector = kzalloc_obj(*sdvo_connector, GFP_KERNEL);
+ sdvo_connector = kzalloc_obj(*sdvo_connector);
if (!sdvo_connector)
return NULL;
- conn_state = kzalloc_obj(*conn_state, GFP_KERNEL);
+ conn_state = kzalloc_obj(*conn_state);
if (!conn_state) {
kfree(sdvo_connector);
return NULL;
@@ -3389,7 +3389,7 @@ bool intel_sdvo_init(struct intel_display *display,
if (!assert_sdvo_port_valid(display, port))
return false;
- intel_sdvo = kzalloc_obj(*intel_sdvo, GFP_KERNEL);
+ intel_sdvo = kzalloc_obj(*intel_sdvo);
if (!intel_sdvo)
return false;
diff --git a/drivers/gpu/drm/i915/display/intel_tc.c b/drivers/gpu/drm/i915/display/intel_tc.c
index 0f9efe45acf2..bd12148e42f7 100644
--- a/drivers/gpu/drm/i915/display/intel_tc.c
+++ b/drivers/gpu/drm/i915/display/intel_tc.c
@@ -1977,7 +1977,7 @@ int intel_tc_port_init(struct intel_digital_port *dig_port, bool is_legacy)
if (drm_WARN_ON(display->drm, tc_port == TC_PORT_NONE))
return -EINVAL;
- tc = kzalloc_obj(*tc, GFP_KERNEL);
+ tc = kzalloc_obj(*tc);
if (!tc)
return -ENOMEM;
diff --git a/drivers/gpu/drm/i915/display/intel_tv.c b/drivers/gpu/drm/i915/display/intel_tv.c
index 2036eaf2d1ff..8fbf0adb5699 100644
--- a/drivers/gpu/drm/i915/display/intel_tv.c
+++ b/drivers/gpu/drm/i915/display/intel_tv.c
@@ -1966,7 +1966,7 @@ intel_tv_init(struct intel_display *display)
(tv_dac_off & TVDAC_STATE_CHG_EN) != 0)
return;
- intel_tv = kzalloc_obj(*intel_tv, GFP_KERNEL);
+ intel_tv = kzalloc_obj(*intel_tv);
if (!intel_tv) {
return;
}
diff --git a/drivers/gpu/drm/i915/display/skl_watermark.c b/drivers/gpu/drm/i915/display/skl_watermark.c
index edd6ca199106..f5a6fae815d1 100644
--- a/drivers/gpu/drm/i915/display/skl_watermark.c
+++ b/drivers/gpu/drm/i915/display/skl_watermark.c
@@ -3366,7 +3366,7 @@ int intel_dbuf_init(struct intel_display *display)
{
struct intel_dbuf_state *dbuf_state;
- dbuf_state = kzalloc_obj(*dbuf_state, GFP_KERNEL);
+ dbuf_state = kzalloc_obj(*dbuf_state);
if (!dbuf_state)
return -ENOMEM;
@@ -3892,7 +3892,7 @@ void intel_wm_state_verify(struct intel_atomic_state *state,
if (DISPLAY_VER(display) < 9 || !new_crtc_state->hw.active)
return;
- hw = kzalloc_obj(*hw, GFP_KERNEL);
+ hw = kzalloc_obj(*hw);
if (!hw)
return;
diff --git a/drivers/gpu/drm/i915/display/vlv_dsi.c b/drivers/gpu/drm/i915/display/vlv_dsi.c
index 31625b0070c6..60857d2afdb1 100644
--- a/drivers/gpu/drm/i915/display/vlv_dsi.c
+++ b/drivers/gpu/drm/i915/display/vlv_dsi.c
@@ -1919,7 +1919,7 @@ void vlv_dsi_init(struct intel_display *display)
else
display->dsi.mmio_base = VLV_MIPI_BASE;
- intel_dsi = kzalloc_obj(*intel_dsi, GFP_KERNEL);
+ intel_dsi = kzalloc_obj(*intel_dsi);
if (!intel_dsi)
return;
diff --git a/drivers/gpu/drm/i915/gem/i915_gem_clflush.c b/drivers/gpu/drm/i915/gem/i915_gem_clflush.c
index 50ade188edc5..30cc08583cbd 100644
--- a/drivers/gpu/drm/i915/gem/i915_gem_clflush.c
+++ b/drivers/gpu/drm/i915/gem/i915_gem_clflush.c
@@ -52,7 +52,7 @@ static struct clflush *clflush_work_create(struct drm_i915_gem_object *obj)
GEM_BUG_ON(!obj->cache_dirty);
- clflush = kmalloc_obj(*clflush, GFP_KERNEL);
+ clflush = kmalloc_obj(*clflush);
if (!clflush)
return NULL;
diff --git a/drivers/gpu/drm/i915/gem/i915_gem_context.c b/drivers/gpu/drm/i915/gem/i915_gem_context.c
index c364423706c6..6ff5dc07b719 100644
--- a/drivers/gpu/drm/i915/gem/i915_gem_context.c
+++ b/drivers/gpu/drm/i915/gem/i915_gem_context.c
@@ -285,7 +285,7 @@ proto_context_create(struct drm_i915_file_private *fpriv,
{
struct i915_gem_proto_context *pc, *err;
- pc = kzalloc_obj(*pc, GFP_KERNEL);
+ pc = kzalloc_obj(*pc);
if (!pc)
return ERR_PTR(-ENOMEM);
@@ -442,7 +442,7 @@ set_proto_ctx_engines_balance(struct i915_user_extension __user *base,
if (num_siblings == 0)
return 0;
- siblings = kmalloc_objs(*siblings, num_siblings, GFP_KERNEL);
+ siblings = kmalloc_objs(*siblings, num_siblings);
if (!siblings)
return -ENOMEM;
@@ -644,7 +644,7 @@ set_proto_ctx_engines_parallel_submit(struct i915_user_extension __user *base,
return -EINVAL;
}
- siblings = kmalloc_objs(*siblings, num_siblings * width, GFP_KERNEL);
+ siblings = kmalloc_objs(*siblings, num_siblings * width);
if (!siblings)
return -ENOMEM;
@@ -759,7 +759,7 @@ static int set_proto_ctx_engines(struct drm_i915_file_private *fpriv,
if (set.num_engines > I915_EXEC_RING_MASK + 1)
return -EINVAL;
- set.engines = kmalloc_objs(*set.engines, set.num_engines, GFP_KERNEL);
+ set.engines = kmalloc_objs(*set.engines, set.num_engines);
if (!set.engines)
return -ENOMEM;
@@ -1609,7 +1609,7 @@ i915_gem_create_context(struct drm_i915_private *i915,
int err;
int i;
- ctx = kzalloc_obj(*ctx, GFP_KERNEL);
+ ctx = kzalloc_obj(*ctx);
if (!ctx)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/gpu/drm/i915/gem/i915_gem_dmabuf.c b/drivers/gpu/drm/i915/gem/i915_gem_dmabuf.c
index db7166784731..b43d34c7d641 100644
--- a/drivers/gpu/drm/i915/gem/i915_gem_dmabuf.c
+++ b/drivers/gpu/drm/i915/gem/i915_gem_dmabuf.c
@@ -36,7 +36,7 @@ static struct sg_table *i915_gem_map_dma_buf(struct dma_buf_attachment *attach,
* Make a copy of the object's sgt, so that we can make an independent
* mapping
*/
- sgt = kmalloc_obj(*sgt, GFP_KERNEL);
+ sgt = kmalloc_obj(*sgt);
if (!sgt) {
ret = -ENOMEM;
goto err;
diff --git a/drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c b/drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c
index c2e91eeb7c16..e7918f896a26 100644
--- a/drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c
+++ b/drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c
@@ -2006,7 +2006,7 @@ static int eb_capture_stage(struct i915_execbuffer *eb)
for_each_batch_create_order(eb, j) {
struct i915_capture_list *capture;
- capture = kmalloc_obj(*capture, GFP_KERNEL);
+ capture = kmalloc_obj(*capture);
if (!capture)
continue;
@@ -3190,7 +3190,7 @@ eb_composite_fence_create(struct i915_execbuffer *eb, int out_fence_fd)
GEM_BUG_ON(!intel_context_is_parent(eb->context));
- fences = kmalloc_objs(*fences, eb->num_batches, GFP_KERNEL);
+ fences = kmalloc_objs(*fences, eb->num_batches);
if (!fences)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/gpu/drm/i915/gem/i915_gem_internal.c b/drivers/gpu/drm/i915/gem/i915_gem_internal.c
index e90fe30cc44e..37d286ecb99b 100644
--- a/drivers/gpu/drm/i915/gem/i915_gem_internal.c
+++ b/drivers/gpu/drm/i915/gem/i915_gem_internal.c
@@ -54,7 +54,7 @@ static int i915_gem_object_get_pages_internal(struct drm_i915_gem_object *obj)
}
create_st:
- st = kmalloc_obj(*st, GFP_KERNEL);
+ st = kmalloc_obj(*st);
if (!st)
return -ENOMEM;
diff --git a/drivers/gpu/drm/i915/gem/i915_gem_mman.c b/drivers/gpu/drm/i915/gem/i915_gem_mman.c
index e10a9e21e6c8..0644f85c6c8e 100644
--- a/drivers/gpu/drm/i915/gem/i915_gem_mman.c
+++ b/drivers/gpu/drm/i915/gem/i915_gem_mman.c
@@ -730,7 +730,7 @@ mmap_offset_attach(struct drm_i915_gem_object *obj,
if (mmo)
goto out;
- mmo = kmalloc_obj(*mmo, GFP_KERNEL);
+ mmo = kmalloc_obj(*mmo);
if (!mmo)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/gpu/drm/i915/gem/i915_gem_object_frontbuffer.c b/drivers/gpu/drm/i915/gem/i915_gem_object_frontbuffer.c
index e9b7d76927bb..adba3fa96c05 100644
--- a/drivers/gpu/drm/i915/gem/i915_gem_object_frontbuffer.c
+++ b/drivers/gpu/drm/i915/gem/i915_gem_object_frontbuffer.c
@@ -32,7 +32,7 @@ i915_gem_object_frontbuffer_get(struct drm_i915_gem_object *obj)
if (front)
return front;
- front = kmalloc_obj(*front, GFP_KERNEL);
+ front = kmalloc_obj(*front);
if (!front)
return NULL;
diff --git a/drivers/gpu/drm/i915/gem/i915_gem_pages.c b/drivers/gpu/drm/i915/gem/i915_gem_pages.c
index fa6d174987ac..df35bdb755e4 100644
--- a/drivers/gpu/drm/i915/gem/i915_gem_pages.c
+++ b/drivers/gpu/drm/i915/gem/i915_gem_pages.c
@@ -314,7 +314,7 @@ static void *i915_gem_object_map_page(struct drm_i915_gem_object *obj,
if (n_pages > ARRAY_SIZE(stack)) {
/* Too big for stack -- allocate temporary array instead */
- pages = kvmalloc_objs(*pages, n_pages, GFP_KERNEL);
+ pages = kvmalloc_objs(*pages, n_pages);
if (!pages)
return ERR_PTR(-ENOMEM);
}
@@ -437,7 +437,7 @@ struct intel_panic *i915_gem_object_alloc_panic(void)
{
struct intel_panic *panic;
- panic = kzalloc_obj(*panic, GFP_KERNEL);
+ panic = kzalloc_obj(*panic);
return panic;
}
diff --git a/drivers/gpu/drm/i915/gem/i915_gem_phys.c b/drivers/gpu/drm/i915/gem/i915_gem_phys.c
index 71a2c2bb5087..ce2780ef97ef 100644
--- a/drivers/gpu/drm/i915/gem/i915_gem_phys.c
+++ b/drivers/gpu/drm/i915/gem/i915_gem_phys.c
@@ -47,7 +47,7 @@ static int i915_gem_object_get_pages_phys(struct drm_i915_gem_object *obj)
if (!vaddr)
return -ENOMEM;
- st = kmalloc_obj(*st, GFP_KERNEL);
+ st = kmalloc_obj(*st);
if (!st)
goto err_pci;
diff --git a/drivers/gpu/drm/i915/gem/i915_gem_stolen.c b/drivers/gpu/drm/i915/gem/i915_gem_stolen.c
index a577f8df7c60..77f85359f279 100644
--- a/drivers/gpu/drm/i915/gem/i915_gem_stolen.c
+++ b/drivers/gpu/drm/i915/gem/i915_gem_stolen.c
@@ -648,7 +648,7 @@ i915_pages_create_for_stolen(struct drm_device *dev,
* dma mapping in a single scatterlist.
*/
- st = kmalloc_obj(*st, GFP_KERNEL);
+ st = kmalloc_obj(*st);
if (st == NULL)
return ERR_PTR(-ENOMEM);
@@ -783,7 +783,7 @@ static int _i915_gem_object_stolen_init(struct intel_memory_region *mem,
!(flags & I915_BO_ALLOC_GPU_ONLY))
return -ENOSPC;
- stolen = kzalloc_obj(*stolen, GFP_KERNEL);
+ stolen = kzalloc_obj(*stolen);
if (!stolen)
return -ENOMEM;
@@ -1074,7 +1074,7 @@ static struct intel_stolen_node *i915_gem_stolen_node_alloc(struct drm_device *d
struct drm_i915_private *i915 = to_i915(drm);
struct intel_stolen_node *node;
- node = kzalloc_obj(*node, GFP_KERNEL);
+ node = kzalloc_obj(*node);
if (!node)
return NULL;
diff --git a/drivers/gpu/drm/i915/gem/i915_gem_ttm.c b/drivers/gpu/drm/i915/gem/i915_gem_ttm.c
index 46ed4ff8658d..033eda38e4b5 100644
--- a/drivers/gpu/drm/i915/gem/i915_gem_ttm.c
+++ b/drivers/gpu/drm/i915/gem/i915_gem_ttm.c
@@ -279,7 +279,7 @@ static struct ttm_tt *i915_ttm_tt_create(struct ttm_buffer_object *bo,
if (i915_ttm_is_ghost_object(bo))
return NULL;
- i915_tt = kzalloc_obj(*i915_tt, GFP_KERNEL);
+ i915_tt = kzalloc_obj(*i915_tt);
if (!i915_tt)
return NULL;
diff --git a/drivers/gpu/drm/i915/gem/i915_gem_ttm_move.c b/drivers/gpu/drm/i915/gem/i915_gem_ttm_move.c
index ff2e02113fe6..3a7e202ae87d 100644
--- a/drivers/gpu/drm/i915/gem/i915_gem_ttm_move.c
+++ b/drivers/gpu/drm/i915/gem/i915_gem_ttm_move.c
@@ -498,7 +498,7 @@ __i915_ttm_move(struct ttm_buffer_object *bo,
struct dma_fence *dep = fence;
if (!I915_SELFTEST_ONLY(fail_work_allocation))
- copy_work = kzalloc_obj(*copy_work, GFP_KERNEL);
+ copy_work = kzalloc_obj(*copy_work);
if (copy_work) {
copy_work->i915 = i915;
diff --git a/drivers/gpu/drm/i915/gem/i915_gem_userptr.c b/drivers/gpu/drm/i915/gem/i915_gem_userptr.c
index 6518a02397c6..043095f93ac6 100644
--- a/drivers/gpu/drm/i915/gem/i915_gem_userptr.c
+++ b/drivers/gpu/drm/i915/gem/i915_gem_userptr.c
@@ -109,7 +109,7 @@ static int i915_gem_userptr_get_pages(struct drm_i915_gem_object *obj)
return -E2BIG;
num_pages = obj->base.size >> PAGE_SHIFT;
- st = kmalloc_obj(*st, GFP_KERNEL);
+ st = kmalloc_obj(*st);
if (!st)
return -ENOMEM;
@@ -258,7 +258,7 @@ int i915_gem_object_userptr_submit_init(struct drm_i915_gem_object *obj)
if (ret)
return ret;
- pvec = kvmalloc_objs(struct page *, num_pages, GFP_KERNEL);
+ pvec = kvmalloc_objs(struct page *, num_pages);
if (!pvec)
return -ENOMEM;
diff --git a/drivers/gpu/drm/i915/gem/selftests/i915_gem_client_blt.c b/drivers/gpu/drm/i915/gem/selftests/i915_gem_client_blt.c
index ee661b7d3c6f..1d4d7cfb3f9c 100644
--- a/drivers/gpu/drm/i915/gem/selftests/i915_gem_client_blt.c
+++ b/drivers/gpu/drm/i915/gem/selftests/i915_gem_client_blt.c
@@ -540,7 +540,7 @@ tiled_blits_create(struct intel_engine_cs *engine, struct rnd_state *prng)
u64 hole_size;
int err;
- t = kzalloc_obj(*t, GFP_KERNEL);
+ t = kzalloc_obj(*t);
if (!t)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/gpu/drm/i915/gem/selftests/i915_gem_context.c b/drivers/gpu/drm/i915/gem/selftests/i915_gem_context.c
index 223a9ca32d22..9d405098f9e7 100644
--- a/drivers/gpu/drm/i915/gem/selftests/i915_gem_context.c
+++ b/drivers/gpu/drm/i915/gem/selftests/i915_gem_context.c
@@ -56,7 +56,7 @@ static int live_nop_switch(void *arg)
if (IS_ERR(file))
return PTR_ERR(file);
- ctx = kzalloc_objs(*ctx, nctx, GFP_KERNEL);
+ ctx = kzalloc_objs(*ctx, nctx);
if (!ctx) {
err = -ENOMEM;
goto out_file;
@@ -317,7 +317,7 @@ static int live_parallel_switch(void *arg)
engines = i915_gem_context_lock_engines(ctx);
count = engines->num_engines;
- data = kzalloc_objs(*data, count, GFP_KERNEL);
+ data = kzalloc_objs(*data, count);
if (!data) {
i915_gem_context_unlock_engines(ctx);
err = -ENOMEM;
@@ -1054,7 +1054,7 @@ __sseu_prepare(const char *name,
if (!(flags & (TEST_BUSY | TEST_RESET)))
return 0;
- *spin = kzalloc_obj(**spin, GFP_KERNEL);
+ *spin = kzalloc_obj(**spin);
if (!*spin)
return -ENOMEM;
diff --git a/drivers/gpu/drm/i915/gem/selftests/mock_context.c b/drivers/gpu/drm/i915/gem/selftests/mock_context.c
index 35cf3d0dd08f..24f1437262ec 100644
--- a/drivers/gpu/drm/i915/gem/selftests/mock_context.c
+++ b/drivers/gpu/drm/i915/gem/selftests/mock_context.c
@@ -17,7 +17,7 @@ mock_context(struct drm_i915_private *i915,
struct i915_gem_engines *e;
struct intel_sseu null_sseu = {};
- ctx = kzalloc_obj(*ctx, GFP_KERNEL);
+ ctx = kzalloc_obj(*ctx);
if (!ctx)
return NULL;
diff --git a/drivers/gpu/drm/i915/gem/selftests/mock_dmabuf.c b/drivers/gpu/drm/i915/gem/selftests/mock_dmabuf.c
index 8eabb6aa2f65..4212873c326d 100644
--- a/drivers/gpu/drm/i915/gem/selftests/mock_dmabuf.c
+++ b/drivers/gpu/drm/i915/gem/selftests/mock_dmabuf.c
@@ -15,7 +15,7 @@ static struct sg_table *mock_map_dma_buf(struct dma_buf_attachment *attachment,
struct scatterlist *sg;
int i, err;
- st = kmalloc_obj(*st, GFP_KERNEL);
+ st = kmalloc_obj(*st);
if (!st)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/gpu/drm/i915/gt/gen6_ppgtt.c b/drivers/gpu/drm/i915/gt/gen6_ppgtt.c
index 6cbf5dc04d9a..e8fab45759c3 100644
--- a/drivers/gpu/drm/i915/gt/gen6_ppgtt.c
+++ b/drivers/gpu/drm/i915/gt/gen6_ppgtt.c
@@ -431,7 +431,7 @@ struct i915_ppgtt *gen6_ppgtt_create(struct intel_gt *gt)
struct gen6_ppgtt *ppgtt;
int err;
- ppgtt = kzalloc_obj(*ppgtt, GFP_KERNEL);
+ ppgtt = kzalloc_obj(*ppgtt);
if (!ppgtt)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/gpu/drm/i915/gt/gen8_ppgtt.c b/drivers/gpu/drm/i915/gt/gen8_ppgtt.c
index 1e1d035a0391..cfa09b250a1b 100644
--- a/drivers/gpu/drm/i915/gt/gen8_ppgtt.c
+++ b/drivers/gpu/drm/i915/gt/gen8_ppgtt.c
@@ -1006,7 +1006,7 @@ struct i915_ppgtt *gen8_ppgtt_create(struct intel_gt *gt,
struct i915_ppgtt *ppgtt;
int err;
- ppgtt = kzalloc_obj(*ppgtt, GFP_KERNEL);
+ ppgtt = kzalloc_obj(*ppgtt);
if (!ppgtt)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/gpu/drm/i915/gt/intel_breadcrumbs.c b/drivers/gpu/drm/i915/gt/intel_breadcrumbs.c
index e18c019b7725..a2b413982ce6 100644
--- a/drivers/gpu/drm/i915/gt/intel_breadcrumbs.c
+++ b/drivers/gpu/drm/i915/gt/intel_breadcrumbs.c
@@ -279,7 +279,7 @@ intel_breadcrumbs_create(struct intel_engine_cs *irq_engine)
{
struct intel_breadcrumbs *b;
- b = kzalloc_obj(*b, GFP_KERNEL);
+ b = kzalloc_obj(*b);
if (!b)
return NULL;
diff --git a/drivers/gpu/drm/i915/gt/intel_engine_cs.c b/drivers/gpu/drm/i915/gt/intel_engine_cs.c
index 53b7554b78b9..d37966ec7a92 100644
--- a/drivers/gpu/drm/i915/gt/intel_engine_cs.c
+++ b/drivers/gpu/drm/i915/gt/intel_engine_cs.c
@@ -471,7 +471,7 @@ static int intel_engine_setup(struct intel_gt *gt, enum intel_engine_id id,
if (GEM_DEBUG_WARN_ON(gt->engine_class[info->class][info->instance]))
return -EINVAL;
- engine = kzalloc_obj(*engine, GFP_KERNEL);
+ engine = kzalloc_obj(*engine);
if (!engine)
return -ENOMEM;
@@ -1311,7 +1311,7 @@ static int measure_breadcrumb_dw(struct intel_context *ce)
GEM_BUG_ON(!engine->gt->scratch);
- frame = kzalloc_obj(*frame, GFP_KERNEL);
+ frame = kzalloc_obj(*frame);
if (!frame)
return -ENOMEM;
diff --git a/drivers/gpu/drm/i915/gt/intel_gsc.c b/drivers/gpu/drm/i915/gt/intel_gsc.c
index d0b61fcc6eb7..050d909fb4f8 100644
--- a/drivers/gpu/drm/i915/gt/intel_gsc.c
+++ b/drivers/gpu/drm/i915/gt/intel_gsc.c
@@ -204,7 +204,7 @@ static void gsc_init_one(struct drm_i915_private *i915, struct intel_gsc *gsc,
}
add_device:
- adev = kzalloc_obj(*adev, GFP_KERNEL);
+ adev = kzalloc_obj(*adev);
if (!adev)
goto fail;
diff --git a/drivers/gpu/drm/i915/gt/intel_ring.c b/drivers/gpu/drm/i915/gt/intel_ring.c
index 73e342a95dcb..be7eeb95ff12 100644
--- a/drivers/gpu/drm/i915/gt/intel_ring.c
+++ b/drivers/gpu/drm/i915/gt/intel_ring.c
@@ -152,7 +152,7 @@ intel_engine_create_ring(struct intel_engine_cs *engine, int size)
GEM_BUG_ON(!is_power_of_2(size));
GEM_BUG_ON(RING_CTL_SIZE(size) & ~RING_NR_PAGES);
- ring = kzalloc_obj(*ring, GFP_KERNEL);
+ ring = kzalloc_obj(*ring);
if (!ring)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/gpu/drm/i915/gt/intel_timeline.c b/drivers/gpu/drm/i915/gt/intel_timeline.c
index 98a6aadff7dd..7070047bfbaa 100644
--- a/drivers/gpu/drm/i915/gt/intel_timeline.c
+++ b/drivers/gpu/drm/i915/gt/intel_timeline.c
@@ -151,7 +151,7 @@ __intel_timeline_create(struct intel_gt *gt,
struct intel_timeline *timeline;
int err;
- timeline = kzalloc_obj(*timeline, GFP_KERNEL);
+ timeline = kzalloc_obj(*timeline);
if (!timeline)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/gpu/drm/i915/gt/selftest_engine_heartbeat.c b/drivers/gpu/drm/i915/gt/selftest_engine_heartbeat.c
index 67326bc83310..b893a8fde895 100644
--- a/drivers/gpu/drm/i915/gt/selftest_engine_heartbeat.c
+++ b/drivers/gpu/drm/i915/gt/selftest_engine_heartbeat.c
@@ -72,7 +72,7 @@ static struct pulse *pulse_create(void)
{
struct pulse *p;
- p = kmalloc_obj(*p, GFP_KERNEL);
+ p = kmalloc_obj(*p);
if (!p)
return p;
diff --git a/drivers/gpu/drm/i915/gt/selftest_execlists.c b/drivers/gpu/drm/i915/gt/selftest_execlists.c
index 1e99179ce32f..8c3b76e71eae 100644
--- a/drivers/gpu/drm/i915/gt/selftest_execlists.c
+++ b/drivers/gpu/drm/i915/gt/selftest_execlists.c
@@ -3564,7 +3564,7 @@ static int smoke_crescendo(struct preempt_smoke *smoke, unsigned int flags)
unsigned long count;
int err = 0;
- arg = kmalloc_objs(*arg, I915_NUM_ENGINES, GFP_KERNEL);
+ arg = kmalloc_objs(*arg, I915_NUM_ENGINES);
if (!arg)
return -ENOMEM;
diff --git a/drivers/gpu/drm/i915/gt/selftest_hangcheck.c b/drivers/gpu/drm/i915/gt/selftest_hangcheck.c
index 2204058849bd..00dfc37221fa 100644
--- a/drivers/gpu/drm/i915/gt/selftest_hangcheck.c
+++ b/drivers/gpu/drm/i915/gt/selftest_hangcheck.c
@@ -986,7 +986,7 @@ static int __igt_reset_engines(struct intel_gt *gt,
h.ctx->sched.priority = 1024;
}
- threads = kmalloc_objs(*threads, I915_NUM_ENGINES, GFP_KERNEL);
+ threads = kmalloc_objs(*threads, I915_NUM_ENGINES);
if (!threads)
return -ENOMEM;
diff --git a/drivers/gpu/drm/i915/gt/selftest_migrate.c b/drivers/gpu/drm/i915/gt/selftest_migrate.c
index 71f2c2ca71a2..5b986a7687d9 100644
--- a/drivers/gpu/drm/i915/gt/selftest_migrate.c
+++ b/drivers/gpu/drm/i915/gt/selftest_migrate.c
@@ -689,7 +689,7 @@ static int threaded_migrate(struct intel_migrate *migrate,
unsigned int i;
int err = 0;
- thread = kzalloc_objs(*thread, n_cpus, GFP_KERNEL);
+ thread = kzalloc_objs(*thread, n_cpus);
if (!thread)
return 0;
diff --git a/drivers/gpu/drm/i915/gt/selftest_rc6.c b/drivers/gpu/drm/i915/gt/selftest_rc6.c
index 166175f0b19c..90f30b988d68 100644
--- a/drivers/gpu/drm/i915/gt/selftest_rc6.c
+++ b/drivers/gpu/drm/i915/gt/selftest_rc6.c
@@ -201,7 +201,7 @@ randomised_engines(struct intel_gt *gt,
if (!n)
return NULL;
- engines = kmalloc_objs(*engines, n, GFP_KERNEL);
+ engines = kmalloc_objs(*engines, n);
if (!engines)
return NULL;
diff --git a/drivers/gpu/drm/i915/gt/selftest_slpc.c b/drivers/gpu/drm/i915/gt/selftest_slpc.c
index 6e25d39fa193..c3c918248989 100644
--- a/drivers/gpu/drm/i915/gt/selftest_slpc.c
+++ b/drivers/gpu/drm/i915/gt/selftest_slpc.c
@@ -499,7 +499,7 @@ static int live_slpc_tile_interaction(void *arg)
struct slpc_thread *threads;
int i = 0, ret = 0;
- threads = kzalloc_objs(*threads, I915_MAX_GT, GFP_KERNEL);
+ threads = kzalloc_objs(*threads, I915_MAX_GT);
if (!threads)
return -ENOMEM;
diff --git a/drivers/gpu/drm/i915/gt/selftest_timeline.c b/drivers/gpu/drm/i915/gt/selftest_timeline.c
index 6860b61915b9..351271045d36 100644
--- a/drivers/gpu/drm/i915/gt/selftest_timeline.c
+++ b/drivers/gpu/drm/i915/gt/selftest_timeline.c
@@ -170,7 +170,7 @@ static int mock_hwsp_freelist(void *arg)
state.max = PAGE_SIZE / sizeof(*state.history);
state.count = 0;
- state.history = kzalloc_objs(*state.history, state.max, GFP_KERNEL);
+ state.history = kzalloc_objs(*state.history, state.max);
if (!state.history) {
err = -ENOMEM;
goto err_put;
diff --git a/drivers/gpu/drm/i915/gt/selftest_workarounds.c b/drivers/gpu/drm/i915/gt/selftest_workarounds.c
index 24ee4ec4c287..81cdecd38346 100644
--- a/drivers/gpu/drm/i915/gt/selftest_workarounds.c
+++ b/drivers/gpu/drm/i915/gt/selftest_workarounds.c
@@ -1204,7 +1204,7 @@ live_gpu_reset_workarounds(void *arg)
if (!intel_has_gpu_reset(gt))
return 0;
- lists = kzalloc_obj(*lists, GFP_KERNEL);
+ lists = kzalloc_obj(*lists);
if (!lists)
return -ENOMEM;
@@ -1248,7 +1248,7 @@ live_engine_reset_workarounds(void *arg)
if (!intel_has_reset_engine(gt))
return 0;
- lists = kzalloc_obj(*lists, GFP_KERNEL);
+ lists = kzalloc_obj(*lists);
if (!lists)
return -ENOMEM;
diff --git a/drivers/gpu/drm/i915/gt/shmem_utils.c b/drivers/gpu/drm/i915/gt/shmem_utils.c
index 1db6aa1e32d8..5850adaebf82 100644
--- a/drivers/gpu/drm/i915/gt/shmem_utils.c
+++ b/drivers/gpu/drm/i915/gt/shmem_utils.c
@@ -63,7 +63,7 @@ void *shmem_pin_map(struct file *file)
void *vaddr;
n_pages = file->f_mapping->host->i_size >> PAGE_SHIFT;
- pages = kvmalloc_objs(*pages, n_pages, GFP_KERNEL);
+ pages = kvmalloc_objs(*pages, n_pages);
if (!pages)
return NULL;
diff --git a/drivers/gpu/drm/i915/gt/sysfs_engines.c b/drivers/gpu/drm/i915/gt/sysfs_engines.c
index bb4eb815f0ff..da740bbcd083 100644
--- a/drivers/gpu/drm/i915/gt/sysfs_engines.c
+++ b/drivers/gpu/drm/i915/gt/sysfs_engines.c
@@ -430,7 +430,7 @@ kobj_engine(struct kobject *dir, struct intel_engine_cs *engine)
{
struct kobj_engine *ke;
- ke = kzalloc_obj(*ke, GFP_KERNEL);
+ ke = kzalloc_obj(*ke);
if (!ke)
return NULL;
@@ -458,7 +458,7 @@ static void add_defaults(struct kobj_engine *parent)
};
struct kobj_engine *ke;
- ke = kzalloc_obj(*ke, GFP_KERNEL);
+ ke = kzalloc_obj(*ke);
if (!ke)
return;
diff --git a/drivers/gpu/drm/i915/gt/uc/intel_guc_capture.c b/drivers/gpu/drm/i915/gt/uc/intel_guc_capture.c
index 2e7257f5543b..73b9959119a5 100644
--- a/drivers/gpu/drm/i915/gt/uc/intel_guc_capture.c
+++ b/drivers/gpu/drm/i915/gt/uc/intel_guc_capture.c
@@ -275,7 +275,7 @@ __alloc_ext_regs(struct __guc_mmio_reg_descr_group *newlist,
{
struct __guc_mmio_reg_descr *list;
- list = kzalloc_objs(struct __guc_mmio_reg_descr, num_regs, GFP_KERNEL);
+ list = kzalloc_objs(struct __guc_mmio_reg_descr, num_regs);
if (!list)
return -ENOMEM;
@@ -985,7 +985,7 @@ guc_capture_alloc_one_node(struct intel_guc *guc)
struct __guc_capture_parsed_output *new;
int i;
- new = kzalloc_obj(*new, GFP_KERNEL);
+ new = kzalloc_obj(*new);
if (!new)
return NULL;
@@ -1641,7 +1641,7 @@ void intel_guc_capture_destroy(struct intel_guc *guc)
int intel_guc_capture_init(struct intel_guc *guc)
{
- guc->capture = kzalloc_obj(*guc->capture, GFP_KERNEL);
+ guc->capture = kzalloc_obj(*guc->capture);
if (!guc->capture)
return -ENOMEM;
diff --git a/drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c b/drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c
index 1ba53ff64861..142183d3f7fb 100644
--- a/drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c
+++ b/drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c
@@ -2110,7 +2110,7 @@ static int init_tlb_lookup(struct intel_guc *guc)
xa_init_flags(&guc->tlb_lookup, XA_FLAGS_ALLOC);
- wait = kzalloc_obj(*wait, GFP_KERNEL);
+ wait = kzalloc_obj(*wait);
if (!wait)
return -ENOMEM;
@@ -4222,7 +4222,7 @@ guc_create_parallel(struct intel_engine_cs **engines,
struct intel_context *parent = NULL, *ce, *err;
int i, j;
- siblings = kmalloc_objs(*siblings, num_siblings, GFP_KERNEL);
+ siblings = kmalloc_objs(*siblings, num_siblings);
if (!siblings)
return ERR_PTR(-ENOMEM);
@@ -5905,7 +5905,7 @@ guc_create_virtual(struct intel_engine_cs **siblings, unsigned int count,
unsigned int n;
int err;
- ve = kzalloc_obj(*ve, GFP_KERNEL);
+ ve = kzalloc_obj(*ve);
if (!ve)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/gpu/drm/i915/gt/uc/selftest_guc.c b/drivers/gpu/drm/i915/gt/uc/selftest_guc.c
index 8556a3e1ac3f..477c163d2660 100644
--- a/drivers/gpu/drm/i915/gt/uc/selftest_guc.c
+++ b/drivers/gpu/drm/i915/gt/uc/selftest_guc.c
@@ -153,7 +153,7 @@ static int intel_guc_steal_guc_ids(void *arg)
struct i915_request *spin_rq = NULL, *rq, *last = NULL;
int number_guc_id_stolen = guc->number_guc_id_stolen;
- ce = kzalloc_objs(*ce, GUC_MAX_CONTEXT_ID, GFP_KERNEL);
+ ce = kzalloc_objs(*ce, GUC_MAX_CONTEXT_ID);
if (!ce) {
guc_err(guc, "Context array allocation failed\n");
return -ENOMEM;
diff --git a/drivers/gpu/drm/i915/gvt/cmd_parser.c b/drivers/gpu/drm/i915/gvt/cmd_parser.c
index d5d00cb84f2f..b868a0501886 100644
--- a/drivers/gpu/drm/i915/gvt/cmd_parser.c
+++ b/drivers/gpu/drm/i915/gvt/cmd_parser.c
@@ -1921,7 +1921,7 @@ static int perform_bb_shadow(struct parser_exec_state *s)
if (ret)
return ret;
- bb = kzalloc_obj(*bb, GFP_KERNEL);
+ bb = kzalloc_obj(*bb);
if (!bb)
return -ENOMEM;
@@ -3226,7 +3226,7 @@ static int init_cmd_table(struct intel_gvt *gvt)
if (!(cmd_info[i].devices & gen_type))
continue;
- e = kzalloc_obj(*e, GFP_KERNEL);
+ e = kzalloc_obj(*e);
if (!e)
return -ENOMEM;
diff --git a/drivers/gpu/drm/i915/gvt/display.c b/drivers/gpu/drm/i915/gvt/display.c
index 04ddd4709933..fe4302c8cae5 100644
--- a/drivers/gpu/drm/i915/gvt/display.c
+++ b/drivers/gpu/drm/i915/gvt/display.c
@@ -562,11 +562,11 @@ static int setup_virtual_dp_monitor(struct intel_vgpu *vgpu, int port_num,
if (drm_WARN_ON(&i915->drm, resolution >= GVT_EDID_NUM))
return -EINVAL;
- port->edid = kzalloc_obj(*(port->edid), GFP_KERNEL);
+ port->edid = kzalloc_obj(*(port->edid));
if (!port->edid)
return -ENOMEM;
- port->dpcd = kzalloc_obj(*(port->dpcd), GFP_KERNEL);
+ port->dpcd = kzalloc_obj(*(port->dpcd));
if (!port->dpcd) {
kfree(port->edid);
return -ENOMEM;
diff --git a/drivers/gpu/drm/i915/gvt/dmabuf.c b/drivers/gpu/drm/i915/gvt/dmabuf.c
index 255abb5a849b..8a1d6c5636c2 100644
--- a/drivers/gpu/drm/i915/gvt/dmabuf.c
+++ b/drivers/gpu/drm/i915/gvt/dmabuf.c
@@ -67,7 +67,7 @@ static int vgpu_gem_get_pages(struct drm_i915_gem_object *obj)
if (drm_WARN_ON(&dev_priv->drm, !vgpu))
return -ENODEV;
- st = kmalloc_obj(*st, GFP_KERNEL);
+ st = kmalloc_obj(*st);
if (unlikely(!st))
return -ENOMEM;
@@ -447,14 +447,14 @@ int intel_vgpu_query_plane(struct intel_vgpu *vgpu, void *args)
mutex_unlock(&vgpu->dmabuf_lock);
/* Need to allocate a new one*/
- dmabuf_obj = kmalloc_obj(struct intel_vgpu_dmabuf_obj, GFP_KERNEL);
+ dmabuf_obj = kmalloc_obj(struct intel_vgpu_dmabuf_obj);
if (unlikely(!dmabuf_obj)) {
gvt_vgpu_err("alloc dmabuf_obj failed\n");
ret = -ENOMEM;
goto out;
}
- dmabuf_obj->info = kmalloc_obj(struct intel_vgpu_fb_info, GFP_KERNEL);
+ dmabuf_obj->info = kmalloc_obj(struct intel_vgpu_fb_info);
if (unlikely(!dmabuf_obj->info)) {
gvt_vgpu_err("allocate intel vgpu fb info failed\n");
ret = -ENOMEM;
diff --git a/drivers/gpu/drm/i915/gvt/gtt.c b/drivers/gpu/drm/i915/gvt/gtt.c
index 8cc24620a32e..5056a5887b31 100644
--- a/drivers/gpu/drm/i915/gvt/gtt.c
+++ b/drivers/gpu/drm/i915/gvt/gtt.c
@@ -1770,7 +1770,7 @@ static struct intel_vgpu_mm *vgpu_alloc_mm(struct intel_vgpu *vgpu)
{
struct intel_vgpu_mm *mm;
- mm = kzalloc_obj(*mm, GFP_KERNEL);
+ mm = kzalloc_obj(*mm);
if (!mm)
return NULL;
@@ -2206,7 +2206,7 @@ static int emulate_ggtt_mmio_write(struct intel_vgpu *vgpu, unsigned int off,
if (!found) {
/* the first partial part */
- partial_pte = kzalloc_obj(*partial_pte, GFP_KERNEL);
+ partial_pte = kzalloc_obj(*partial_pte);
if (!partial_pte)
return -ENOMEM;
partial_pte->offset = off;
@@ -2502,7 +2502,7 @@ static int setup_spt_oos(struct intel_gvt *gvt)
INIT_LIST_HEAD(>t->oos_page_use_list_head);
for (i = 0; i < preallocated_oos_pages; i++) {
- oos_page = kzalloc_obj(*oos_page, GFP_KERNEL);
+ oos_page = kzalloc_obj(*oos_page);
if (!oos_page) {
ret = -ENOMEM;
goto fail;
diff --git a/drivers/gpu/drm/i915/gvt/handlers.c b/drivers/gpu/drm/i915/gvt/handlers.c
index ade07397a585..b0d8d3e74ae7 100644
--- a/drivers/gpu/drm/i915/gvt/handlers.c
+++ b/drivers/gpu/drm/i915/gvt/handlers.c
@@ -2892,7 +2892,7 @@ static int handle_mmio(struct intel_gvt_mmio_table_iter *iter, u32 offset,
return -EEXIST;
}
- info = kzalloc_obj(*info, GFP_KERNEL);
+ info = kzalloc_obj(*info);
if (!info)
return -ENOMEM;
diff --git a/drivers/gpu/drm/i915/gvt/kvmgt.c b/drivers/gpu/drm/i915/gvt/kvmgt.c
index 62da85b3f2ca..8cced31d1d96 100644
--- a/drivers/gpu/drm/i915/gvt/kvmgt.c
+++ b/drivers/gpu/drm/i915/gvt/kvmgt.c
@@ -250,7 +250,7 @@ static int __gvt_cache_add(struct intel_vgpu *vgpu, gfn_t gfn,
struct gvt_dma *new, *itr;
struct rb_node **link, *parent = NULL;
- new = kzalloc_obj(struct gvt_dma, GFP_KERNEL);
+ new = kzalloc_obj(struct gvt_dma);
if (!new)
return -ENOMEM;
@@ -595,7 +595,7 @@ int intel_gvt_set_edid(struct intel_vgpu *vgpu, int port_num)
struct vfio_edid_region *base;
int ret;
- base = kzalloc_obj(*base, GFP_KERNEL);
+ base = kzalloc_obj(*base);
if (!base)
return -ENOMEM;
@@ -1829,7 +1829,7 @@ static int intel_gvt_init_device(struct drm_i915_private *i915)
if (drm_WARN_ON(&i915->drm, i915->gvt))
return -EEXIST;
- gvt = kzalloc_obj(struct intel_gvt, GFP_KERNEL);
+ gvt = kzalloc_obj(struct intel_gvt);
if (!gvt)
return -ENOMEM;
diff --git a/drivers/gpu/drm/i915/gvt/page_track.c b/drivers/gpu/drm/i915/gvt/page_track.c
index 862e199e5486..3ecac67b0fc4 100644
--- a/drivers/gpu/drm/i915/gvt/page_track.c
+++ b/drivers/gpu/drm/i915/gvt/page_track.c
@@ -58,7 +58,7 @@ int intel_vgpu_register_page_track(struct intel_vgpu *vgpu, unsigned long gfn,
if (track)
return -EEXIST;
- track = kzalloc_obj(*track, GFP_KERNEL);
+ track = kzalloc_obj(*track);
if (!track)
return -ENOMEM;
diff --git a/drivers/gpu/drm/i915/gvt/sched_policy.c b/drivers/gpu/drm/i915/gvt/sched_policy.c
index 21e823113543..b353fedc0ba0 100644
--- a/drivers/gpu/drm/i915/gvt/sched_policy.c
+++ b/drivers/gpu/drm/i915/gvt/sched_policy.c
@@ -282,7 +282,7 @@ static int tbs_sched_init(struct intel_gvt *gvt)
struct gvt_sched_data *data;
- data = kzalloc_obj(*data, GFP_KERNEL);
+ data = kzalloc_obj(*data);
if (!data)
return -ENOMEM;
@@ -312,7 +312,7 @@ static int tbs_sched_init_vgpu(struct intel_vgpu *vgpu)
{
struct vgpu_sched_data *data;
- data = kzalloc_obj(*data, GFP_KERNEL);
+ data = kzalloc_obj(*data);
if (!data)
return -ENOMEM;
diff --git a/drivers/gpu/drm/i915/gvt/vgpu.c b/drivers/gpu/drm/i915/gvt/vgpu.c
index 003aacd770e9..a437875a30e3 100644
--- a/drivers/gpu/drm/i915/gvt/vgpu.c
+++ b/drivers/gpu/drm/i915/gvt/vgpu.c
@@ -113,11 +113,11 @@ int intel_gvt_init_vgpu_types(struct intel_gvt *gvt)
unsigned int num_types = ARRAY_SIZE(intel_vgpu_configs);
unsigned int i;
- gvt->types = kzalloc_objs(struct intel_vgpu_type, num_types, GFP_KERNEL);
+ gvt->types = kzalloc_objs(struct intel_vgpu_type, num_types);
if (!gvt->types)
return -ENOMEM;
- gvt->mdev_types = kzalloc_objs(*gvt->mdev_types, num_types, GFP_KERNEL);
+ gvt->mdev_types = kzalloc_objs(*gvt->mdev_types, num_types);
if (!gvt->mdev_types)
goto out_free_types;
diff --git a/drivers/gpu/drm/i915/i915_active.c b/drivers/gpu/drm/i915/i915_active.c
index 4cbbbe8307a8..25c46d7b1ea7 100644
--- a/drivers/gpu/drm/i915/i915_active.c
+++ b/drivers/gpu/drm/i915/i915_active.c
@@ -650,7 +650,7 @@ static int __await_barrier(struct i915_active *ref, struct i915_sw_fence *fence)
{
struct wait_barrier *wb;
- wb = kmalloc_obj(*wb, GFP_KERNEL);
+ wb = kmalloc_obj(*wb);
if (unlikely(!wb))
return -ENOMEM;
@@ -1160,7 +1160,7 @@ struct i915_active *i915_active_create(void)
{
struct auto_active *aa;
- aa = kmalloc_obj(*aa, GFP_KERNEL);
+ aa = kmalloc_obj(*aa);
if (!aa)
return NULL;
diff --git a/drivers/gpu/drm/i915/i915_drm_client.c b/drivers/gpu/drm/i915/i915_drm_client.c
index 2407414c2ff1..82cbb0528ff1 100644
--- a/drivers/gpu/drm/i915/i915_drm_client.c
+++ b/drivers/gpu/drm/i915/i915_drm_client.c
@@ -21,7 +21,7 @@ struct i915_drm_client *i915_drm_client_alloc(void)
{
struct i915_drm_client *client;
- client = kzalloc_obj(*client, GFP_KERNEL);
+ client = kzalloc_obj(*client);
if (!client)
return NULL;
diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c
index 6e44b4d633f9..160733619a4a 100644
--- a/drivers/gpu/drm/i915/i915_gem.c
+++ b/drivers/gpu/drm/i915/i915_gem.c
@@ -1319,7 +1319,7 @@ int i915_gem_open(struct drm_i915_private *i915, struct drm_file *file)
drm_dbg(&i915->drm, "\n");
- file_priv = kzalloc_obj(*file_priv, GFP_KERNEL);
+ file_priv = kzalloc_obj(*file_priv);
if (!file_priv)
goto err_alloc;
diff --git a/drivers/gpu/drm/i915/i915_hdcp_gsc.c b/drivers/gpu/drm/i915/i915_hdcp_gsc.c
index 988c4cafa7c6..168b9ccbef3e 100644
--- a/drivers/gpu/drm/i915/i915_hdcp_gsc.c
+++ b/drivers/gpu/drm/i915/i915_hdcp_gsc.c
@@ -94,7 +94,7 @@ static struct intel_hdcp_gsc_context *intel_hdcp_gsc_context_alloc(struct drm_de
struct intel_hdcp_gsc_context *gsc_context;
int ret;
- gsc_context = kzalloc_obj(*gsc_context, GFP_KERNEL);
+ gsc_context = kzalloc_obj(*gsc_context);
if (!gsc_context)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/gpu/drm/i915/i915_hwmon.c b/drivers/gpu/drm/i915/i915_hwmon.c
index 9d87d58d2385..16e64d752e12 100644
--- a/drivers/gpu/drm/i915/i915_hwmon.c
+++ b/drivers/gpu/drm/i915/i915_hwmon.c
@@ -915,7 +915,7 @@ void i915_hwmon_register(struct drm_i915_private *i915)
if (!IS_DGFX(i915))
return;
- hwmon = kzalloc_obj(*hwmon, GFP_KERNEL);
+ hwmon = kzalloc_obj(*hwmon);
if (!hwmon)
return;
diff --git a/drivers/gpu/drm/i915/i915_perf.c b/drivers/gpu/drm/i915/i915_perf.c
index 1b11442a3a39..2820e8f0f765 100644
--- a/drivers/gpu/drm/i915/i915_perf.c
+++ b/drivers/gpu/drm/i915/i915_perf.c
@@ -2200,7 +2200,7 @@ alloc_oa_config_buffer(struct i915_perf_stream *stream,
u32 *cs;
int err;
- oa_bo = kzalloc_obj(*oa_bo, GFP_KERNEL);
+ oa_bo = kzalloc_obj(*oa_bo);
if (!oa_bo)
return ERR_PTR(-ENOMEM);
@@ -3872,7 +3872,7 @@ i915_perf_open_ioctl_locked(struct i915_perf *perf,
goto err_ctx;
}
- stream = kzalloc_obj(*stream, GFP_KERNEL);
+ stream = kzalloc_obj(*stream);
if (!stream) {
ret = -ENOMEM;
goto err_ctx;
@@ -4505,7 +4505,7 @@ static struct i915_oa_reg *alloc_oa_regs(struct i915_perf *perf,
if (!is_valid)
return ERR_PTR(-EINVAL);
- oa_regs = kmalloc_objs(*oa_regs, n_regs, GFP_KERNEL);
+ oa_regs = kmalloc_objs(*oa_regs, n_regs);
if (!oa_regs)
return ERR_PTR(-ENOMEM);
@@ -4614,7 +4614,7 @@ int i915_perf_add_config_ioctl(struct drm_device *dev, void *data,
return -EINVAL;
}
- oa_config = kzalloc_obj(*oa_config, GFP_KERNEL);
+ oa_config = kzalloc_obj(*oa_config);
if (!oa_config) {
drm_dbg(&perf->i915->drm,
"Failed to allocate memory for the OA config\n");
@@ -4910,7 +4910,7 @@ static int oa_init_gt(struct intel_gt *gt)
struct i915_perf_group *g;
intel_engine_mask_t tmp;
- g = kzalloc_objs(*g, num_groups, GFP_KERNEL);
+ g = kzalloc_objs(*g, num_groups);
if (!g)
return -ENOMEM;
diff --git a/drivers/gpu/drm/i915/i915_pmu.c b/drivers/gpu/drm/i915/i915_pmu.c
index d52c1ed69b8e..1c3bafda9c70 100644
--- a/drivers/gpu/drm/i915/i915_pmu.c
+++ b/drivers/gpu/drm/i915/i915_pmu.c
@@ -1028,16 +1028,16 @@ create_event_attributes(struct i915_pmu *pmu)
}
/* Allocate attribute objects and table. */
- i915_attr = kzalloc_objs(*i915_attr, count, GFP_KERNEL);
+ i915_attr = kzalloc_objs(*i915_attr, count);
if (!i915_attr)
goto err_alloc;
- pmu_attr = kzalloc_objs(*pmu_attr, count, GFP_KERNEL);
+ pmu_attr = kzalloc_objs(*pmu_attr, count);
if (!pmu_attr)
goto err_alloc;
/* Max one pointer of each attribute type plus a termination entry. */
- attr = kzalloc_objs(*attr, count * 2 + 1, GFP_KERNEL);
+ attr = kzalloc_objs(*attr, count * 2 + 1);
if (!attr)
goto err_alloc;
diff --git a/drivers/gpu/drm/i915/i915_scheduler.c b/drivers/gpu/drm/i915/i915_scheduler.c
index 101df7236d6c..aec1342402ca 100644
--- a/drivers/gpu/drm/i915/i915_scheduler.c
+++ b/drivers/gpu/drm/i915/i915_scheduler.c
@@ -453,7 +453,7 @@ i915_sched_engine_create(unsigned int subclass)
{
struct i915_sched_engine *sched_engine;
- sched_engine = kzalloc_obj(*sched_engine, GFP_KERNEL);
+ sched_engine = kzalloc_obj(*sched_engine);
if (!sched_engine)
return NULL;
diff --git a/drivers/gpu/drm/i915/i915_ttm_buddy_manager.c b/drivers/gpu/drm/i915/i915_ttm_buddy_manager.c
index cf79995f1a5b..caceef5ab543 100644
--- a/drivers/gpu/drm/i915/i915_ttm_buddy_manager.c
+++ b/drivers/gpu/drm/i915/i915_ttm_buddy_manager.c
@@ -48,7 +48,7 @@ static int i915_ttm_buddy_man_alloc(struct ttm_resource_manager *man,
if (!lpfn)
lpfn = man->size;
- bman_res = kzalloc_obj(*bman_res, GFP_KERNEL);
+ bman_res = kzalloc_obj(*bman_res);
if (!bman_res)
return -ENOMEM;
@@ -289,7 +289,7 @@ int i915_ttm_buddy_man_init(struct ttm_device *bdev,
struct i915_ttm_buddy_manager *bman;
int err;
- bman = kzalloc_obj(*bman, GFP_KERNEL);
+ bman = kzalloc_obj(*bman);
if (!bman)
return -ENOMEM;
diff --git a/drivers/gpu/drm/i915/i915_vma.c b/drivers/gpu/drm/i915/i915_vma.c
index 39eb1808fd11..afc192d9931b 100644
--- a/drivers/gpu/drm/i915/i915_vma.c
+++ b/drivers/gpu/drm/i915/i915_vma.c
@@ -394,7 +394,7 @@ struct i915_vma_work *i915_vma_work(void)
{
struct i915_vma_work *vw;
- vw = kzalloc_obj(*vw, GFP_KERNEL);
+ vw = kzalloc_obj(*vw);
if (!vw)
return NULL;
@@ -1027,7 +1027,7 @@ intel_rotate_pages(struct intel_rotation_info *rot_info,
int i;
/* Allocate target SG list. */
- st = kmalloc_obj(*st, GFP_KERNEL);
+ st = kmalloc_obj(*st);
if (!st)
goto err_st_alloc;
@@ -1237,7 +1237,7 @@ intel_remap_pages(struct intel_remapped_info *rem_info,
int i;
/* Allocate target SG list. */
- st = kmalloc_obj(*st, GFP_KERNEL);
+ st = kmalloc_obj(*st);
if (!st)
goto err_st_alloc;
@@ -1275,7 +1275,7 @@ intel_partial_pages(const struct i915_gtt_view *view,
unsigned int count = view->partial.size;
int ret = -ENOMEM;
- st = kmalloc_obj(*st, GFP_KERNEL);
+ st = kmalloc_obj(*st);
if (!st)
goto err_st_alloc;
diff --git a/drivers/gpu/drm/i915/intel_memory_region.c b/drivers/gpu/drm/i915/intel_memory_region.c
index 426355f75db8..35f96ce7822f 100644
--- a/drivers/gpu/drm/i915/intel_memory_region.c
+++ b/drivers/gpu/drm/i915/intel_memory_region.c
@@ -258,7 +258,7 @@ intel_memory_region_create(struct drm_i915_private *i915,
struct intel_memory_region *mem;
int err;
- mem = kzalloc_obj(*mem, GFP_KERNEL);
+ mem = kzalloc_obj(*mem);
if (!mem)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/gpu/drm/i915/intel_uncore.c b/drivers/gpu/drm/i915/intel_uncore.c
index b0d7cc7eb98f..bccedd59a114 100644
--- a/drivers/gpu/drm/i915/intel_uncore.c
+++ b/drivers/gpu/drm/i915/intel_uncore.c
@@ -2072,7 +2072,7 @@ static int __fw_domain_init(struct intel_uncore *uncore,
GEM_BUG_ON(domain_id >= FW_DOMAIN_ID_COUNT);
GEM_BUG_ON(uncore->fw_domain[domain_id]);
- d = kzalloc_obj(*d, GFP_KERNEL);
+ d = kzalloc_obj(*d);
if (!d)
return -ENOMEM;
diff --git a/drivers/gpu/drm/i915/pxp/intel_pxp.c b/drivers/gpu/drm/i915/pxp/intel_pxp.c
index d87d58433307..f7ed4e18a3ab 100644
--- a/drivers/gpu/drm/i915/pxp/intel_pxp.c
+++ b/drivers/gpu/drm/i915/pxp/intel_pxp.c
@@ -222,7 +222,7 @@ int intel_pxp_init(struct drm_i915_private *i915)
* including session and object management, or we will init the backend tee
* channel for internal users such as HuC loading by GSC
*/
- i915->pxp = kzalloc_obj(*i915->pxp, GFP_KERNEL);
+ i915->pxp = kzalloc_obj(*i915->pxp);
if (!i915->pxp)
return -ENOMEM;
diff --git a/drivers/gpu/drm/i915/selftests/i915_active.c b/drivers/gpu/drm/i915/selftests/i915_active.c
index 3eaee7e8cc65..52345073b409 100644
--- a/drivers/gpu/drm/i915/selftests/i915_active.c
+++ b/drivers/gpu/drm/i915/selftests/i915_active.c
@@ -66,7 +66,7 @@ static struct live_active *__live_alloc(struct drm_i915_private *i915)
{
struct live_active *active;
- active = kzalloc_obj(*active, GFP_KERNEL);
+ active = kzalloc_obj(*active);
if (!active)
return NULL;
diff --git a/drivers/gpu/drm/i915/selftests/i915_gem_evict.c b/drivers/gpu/drm/i915/selftests/i915_gem_evict.c
index 3362421467e8..718cddde7e73 100644
--- a/drivers/gpu/drm/i915/selftests/i915_gem_evict.c
+++ b/drivers/gpu/drm/i915/selftests/i915_gem_evict.c
@@ -421,7 +421,7 @@ static int igt_evict_contexts(void *arg)
struct reserved *r;
mutex_unlock(&ggtt->vm.mutex);
- r = kzalloc_objs(*r, 1, GFP_KERNEL);
+ r = kzalloc_objs(*r, 1);
mutex_lock(&ggtt->vm.mutex);
if (!r) {
err = -ENOMEM;
diff --git a/drivers/gpu/drm/i915/selftests/i915_perf.c b/drivers/gpu/drm/i915/selftests/i915_perf.c
index 411d43acd0d8..e9469e27f42a 100644
--- a/drivers/gpu/drm/i915/selftests/i915_perf.c
+++ b/drivers/gpu/drm/i915/selftests/i915_perf.c
@@ -21,7 +21,7 @@ alloc_empty_config(struct i915_perf *perf)
{
struct i915_oa_config *oa_config;
- oa_config = kzalloc_obj(*oa_config, GFP_KERNEL);
+ oa_config = kzalloc_obj(*oa_config);
if (!oa_config)
return -ENOMEM;
@@ -114,7 +114,7 @@ test_stream(struct i915_perf *perf)
props.metrics_set = oa_config->id;
- stream = kzalloc_obj(*stream, GFP_KERNEL);
+ stream = kzalloc_obj(*stream);
if (!stream) {
i915_oa_config_put(oa_config);
return NULL;
diff --git a/drivers/gpu/drm/i915/selftests/i915_request.c b/drivers/gpu/drm/i915/selftests/i915_request.c
index d1d48ea8d264..f2c304d70c17 100644
--- a/drivers/gpu/drm/i915/selftests/i915_request.c
+++ b/drivers/gpu/drm/i915/selftests/i915_request.c
@@ -329,7 +329,7 @@ static void __igt_breadcrumbs_smoketest(struct kthread_work *work)
* that the fences were marked as signaled.
*/
- requests = kzalloc_objs(*requests, total, GFP_KERNEL);
+ requests = kzalloc_objs(*requests, total);
if (!requests) {
thread->result = -ENOMEM;
return;
@@ -472,11 +472,11 @@ static int mock_breadcrumbs_smoketest(void *arg)
* See __igt_breadcrumbs_smoketest();
*/
- threads = kzalloc_objs(*threads, ncpus, GFP_KERNEL);
+ threads = kzalloc_objs(*threads, ncpus);
if (!threads)
return -ENOMEM;
- t.contexts = kzalloc_objs(*t.contexts, t.ncontexts, GFP_KERNEL);
+ t.contexts = kzalloc_objs(*t.contexts, t.ncontexts);
if (!t.contexts) {
ret = -ENOMEM;
goto out_threads;
@@ -1203,7 +1203,7 @@ static int live_all_engines(void *arg)
* block doing so, and that they don't complete too soon.
*/
- request = kzalloc_objs(*request, nengines, GFP_KERNEL);
+ request = kzalloc_objs(*request, nengines);
if (!request)
return -ENOMEM;
@@ -1333,7 +1333,7 @@ static int live_sequential_engines(void *arg)
* they are running on independent engines.
*/
- request = kzalloc_objs(*request, nengines, GFP_KERNEL);
+ request = kzalloc_objs(*request, nengines);
if (!request)
return -ENOMEM;
@@ -1626,7 +1626,7 @@ static int live_parallel_engines(void *arg)
* tests that we load up the system maximally.
*/
- threads = kzalloc_objs(*threads, nengines, GFP_KERNEL);
+ threads = kzalloc_objs(*threads, nengines);
if (!threads)
return -ENOMEM;
@@ -1754,13 +1754,13 @@ static int live_breadcrumbs_smoketest(void *arg)
goto out_rpm;
}
- smoke = kzalloc_objs(*smoke, nengines, GFP_KERNEL);
+ smoke = kzalloc_objs(*smoke, nengines);
if (!smoke) {
ret = -ENOMEM;
goto out_file;
}
- threads = kzalloc_objs(*threads, ncpus * nengines, GFP_KERNEL);
+ threads = kzalloc_objs(*threads, ncpus * nengines);
if (!threads) {
ret = -ENOMEM;
goto out_smoke;
@@ -2837,7 +2837,7 @@ static int perf_series_engines(void *arg)
unsigned int idx;
int err = 0;
- stats = kzalloc_objs(*stats, nengines, GFP_KERNEL);
+ stats = kzalloc_objs(*stats, nengines);
if (!stats)
return -ENOMEM;
@@ -3193,7 +3193,7 @@ static int perf_parallel_engines(void *arg)
struct p_thread *engines;
int err = 0;
- engines = kzalloc_objs(*engines, nengines, GFP_KERNEL);
+ engines = kzalloc_objs(*engines, nengines);
if (!engines)
return -ENOMEM;
diff --git a/drivers/gpu/drm/i915/selftests/i915_sw_fence.c b/drivers/gpu/drm/i915/selftests/i915_sw_fence.c
index 34bcdbaac7c3..6c376338bb37 100644
--- a/drivers/gpu/drm/i915/selftests/i915_sw_fence.c
+++ b/drivers/gpu/drm/i915/selftests/i915_sw_fence.c
@@ -47,7 +47,7 @@ static struct i915_sw_fence *alloc_fence(void)
{
struct i915_sw_fence *fence;
- fence = kmalloc_obj(*fence, GFP_KERNEL);
+ fence = kmalloc_obj(*fence);
if (!fence)
return NULL;
@@ -454,7 +454,7 @@ static int test_chain(void *arg)
int ret, i;
/* Test a long chain of fences */
- fences = kmalloc_objs(*fences, nfences, GFP_KERNEL);
+ fences = kmalloc_objs(*fences, nfences);
if (!fences)
return -ENOMEM;
@@ -639,7 +639,7 @@ static struct dma_fence *alloc_dma_fence(void)
{
struct dma_fence *dma;
- dma = kmalloc_obj(*dma, GFP_KERNEL);
+ dma = kmalloc_obj(*dma);
if (dma)
dma_fence_init(dma, &mock_fence_ops, &mock_fence_lock, 0, 0);
diff --git a/drivers/gpu/drm/i915/selftests/mock_gem_device.c b/drivers/gpu/drm/i915/selftests/mock_gem_device.c
index d6b4796fde82..210b9f8f7b61 100644
--- a/drivers/gpu/drm/i915/selftests/mock_gem_device.c
+++ b/drivers/gpu/drm/i915/selftests/mock_gem_device.c
@@ -148,7 +148,7 @@ struct drm_i915_private *mock_gem_device(void)
struct pci_dev *pdev;
int ret;
- pdev = kzalloc_obj(*pdev, GFP_KERNEL);
+ pdev = kzalloc_obj(*pdev);
if (!pdev)
return NULL;
device_initialize(&pdev->dev);
diff --git a/drivers/gpu/drm/i915/selftests/mock_gtt.c b/drivers/gpu/drm/i915/selftests/mock_gtt.c
index 1b13502add8a..933990a8dc52 100644
--- a/drivers/gpu/drm/i915/selftests/mock_gtt.c
+++ b/drivers/gpu/drm/i915/selftests/mock_gtt.c
@@ -66,7 +66,7 @@ struct i915_ppgtt *mock_ppgtt(struct drm_i915_private *i915, const char *name)
{
struct i915_ppgtt *ppgtt;
- ppgtt = kzalloc_obj(*ppgtt, GFP_KERNEL);
+ ppgtt = kzalloc_obj(*ppgtt);
if (!ppgtt)
return NULL;
diff --git a/drivers/gpu/drm/i915/vlv_suspend.c b/drivers/gpu/drm/i915/vlv_suspend.c
index b5360ddc34e7..dac4b9bac743 100644
--- a/drivers/gpu/drm/i915/vlv_suspend.c
+++ b/drivers/gpu/drm/i915/vlv_suspend.c
@@ -464,7 +464,7 @@ int vlv_suspend_init(struct drm_i915_private *i915)
return 0;
/* we write all the values in the struct, so no need to zero it out */
- i915->vlv_s0ix_state = kmalloc_obj(*i915->vlv_s0ix_state, GFP_KERNEL);
+ i915->vlv_s0ix_state = kmalloc_obj(*i915->vlv_s0ix_state);
if (!i915->vlv_s0ix_state)
return -ENOMEM;
diff --git a/drivers/gpu/drm/imagination/pvr_ccb.c b/drivers/gpu/drm/imagination/pvr_ccb.c
index 998b9ceb54ca..00c236d24acc 100644
--- a/drivers/gpu/drm/imagination/pvr_ccb.c
+++ b/drivers/gpu/drm/imagination/pvr_ccb.c
@@ -543,7 +543,7 @@ struct dma_fence *pvr_kccb_fence_alloc(void)
{
struct pvr_kccb_fence *kccb_fence;
- kccb_fence = kzalloc_obj(*kccb_fence, GFP_KERNEL);
+ kccb_fence = kzalloc_obj(*kccb_fence);
if (!kccb_fence)
return NULL;
diff --git a/drivers/gpu/drm/imagination/pvr_context.c b/drivers/gpu/drm/imagination/pvr_context.c
index 1aa4f098f93d..8de70c30b9de 100644
--- a/drivers/gpu/drm/imagination/pvr_context.c
+++ b/drivers/gpu/drm/imagination/pvr_context.c
@@ -292,7 +292,7 @@ int pvr_context_create(struct pvr_file *pvr_file, struct drm_pvr_ioctl_create_co
if (ctx_size < 0)
return ctx_size;
- ctx = kzalloc_obj(*ctx, GFP_KERNEL);
+ ctx = kzalloc_obj(*ctx);
if (!ctx)
return -ENOMEM;
diff --git a/drivers/gpu/drm/imagination/pvr_drv.c b/drivers/gpu/drm/imagination/pvr_drv.c
index b6171d10e8ac..268900464ab6 100644
--- a/drivers/gpu/drm/imagination/pvr_drv.c
+++ b/drivers/gpu/drm/imagination/pvr_drv.c
@@ -1312,7 +1312,7 @@ pvr_drm_driver_open(struct drm_device *drm_dev, struct drm_file *file)
struct pvr_device *pvr_dev = to_pvr_device(drm_dev);
struct pvr_file *pvr_file;
- pvr_file = kzalloc_obj(*pvr_file, GFP_KERNEL);
+ pvr_file = kzalloc_obj(*pvr_file);
if (!pvr_file)
return -ENOMEM;
diff --git a/drivers/gpu/drm/imagination/pvr_free_list.c b/drivers/gpu/drm/imagination/pvr_free_list.c
index cfcfbd89052a..e85cac83834c 100644
--- a/drivers/gpu/drm/imagination/pvr_free_list.c
+++ b/drivers/gpu/drm/imagination/pvr_free_list.c
@@ -307,7 +307,7 @@ pvr_free_list_grow(struct pvr_free_list *free_list, u32 num_pages)
goto err_unlock;
}
- free_list_node = kzalloc_obj(*free_list_node, GFP_KERNEL);
+ free_list_node = kzalloc_obj(*free_list_node);
if (!free_list_node) {
err = -ENOMEM;
goto err_unlock;
@@ -415,7 +415,7 @@ pvr_free_list_create(struct pvr_file *pvr_file,
int err;
/* Create and fill out the kernel structure */
- free_list = kzalloc_obj(*free_list, GFP_KERNEL);
+ free_list = kzalloc_obj(*free_list);
if (!free_list)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/gpu/drm/imagination/pvr_fw.c b/drivers/gpu/drm/imagination/pvr_fw.c
index 1cbbaff3e7bf..288516dc2560 100644
--- a/drivers/gpu/drm/imagination/pvr_fw.c
+++ b/drivers/gpu/drm/imagination/pvr_fw.c
@@ -1272,7 +1272,7 @@ pvr_fw_object_create_and_map_common(struct pvr_device *pvr_dev, size_t size,
/* %DRM_PVR_BO_PM_FW_PROTECT is implicit for FW objects. */
flags |= DRM_PVR_BO_PM_FW_PROTECT;
- fw_obj = kzalloc_obj(*fw_obj, GFP_KERNEL);
+ fw_obj = kzalloc_obj(*fw_obj);
if (!fw_obj)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/gpu/drm/imagination/pvr_fw_trace.c b/drivers/gpu/drm/imagination/pvr_fw_trace.c
index f2c92a3b3a94..e154cb35f604 100644
--- a/drivers/gpu/drm/imagination/pvr_fw_trace.c
+++ b/drivers/gpu/drm/imagination/pvr_fw_trace.c
@@ -455,7 +455,7 @@ static int fw_trace_open(struct inode *inode, struct file *file)
struct pvr_fw_trace_seq_data *trace_seq_data;
int err;
- trace_seq_data = kzalloc_obj(*trace_seq_data, GFP_KERNEL);
+ trace_seq_data = kzalloc_obj(*trace_seq_data);
if (!trace_seq_data)
return -ENOMEM;
diff --git a/drivers/gpu/drm/imagination/pvr_gem.c b/drivers/gpu/drm/imagination/pvr_gem.c
index 7a4e8ec92e1e..686a3fe22986 100644
--- a/drivers/gpu/drm/imagination/pvr_gem.c
+++ b/drivers/gpu/drm/imagination/pvr_gem.c
@@ -314,7 +314,7 @@ struct drm_gem_object *pvr_gem_create_object(struct drm_device *drm_dev, size_t
struct drm_gem_object *gem_obj;
struct pvr_gem_object *pvr_obj;
- pvr_obj = kzalloc_obj(*pvr_obj, GFP_KERNEL);
+ pvr_obj = kzalloc_obj(*pvr_obj);
if (!pvr_obj)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/gpu/drm/imagination/pvr_hwrt.c b/drivers/gpu/drm/imagination/pvr_hwrt.c
index 93ea3c8ee176..05c68c78da22 100644
--- a/drivers/gpu/drm/imagination/pvr_hwrt.c
+++ b/drivers/gpu/drm/imagination/pvr_hwrt.c
@@ -457,7 +457,7 @@ pvr_hwrt_dataset_create(struct pvr_file *pvr_file,
int err, i = 0;
/* Create and fill out the kernel structure */
- hwrt = kzalloc_obj(*hwrt, GFP_KERNEL);
+ hwrt = kzalloc_obj(*hwrt);
if (!hwrt)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/gpu/drm/imagination/pvr_job.c b/drivers/gpu/drm/imagination/pvr_job.c
index a4e550505504..0c2f511a6178 100644
--- a/drivers/gpu/drm/imagination/pvr_job.c
+++ b/drivers/gpu/drm/imagination/pvr_job.c
@@ -415,7 +415,7 @@ create_job(struct pvr_device *pvr_dev,
(args->hwrt.set_handle || args->hwrt.data_index))
return ERR_PTR(-EINVAL);
- job = kzalloc_obj(*job, GFP_KERNEL);
+ job = kzalloc_obj(*job);
if (!job)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/gpu/drm/imagination/pvr_mmu.c b/drivers/gpu/drm/imagination/pvr_mmu.c
index 4d35879a344b..2e4da5b2c499 100644
--- a/drivers/gpu/drm/imagination/pvr_mmu.c
+++ b/drivers/gpu/drm/imagination/pvr_mmu.c
@@ -1828,7 +1828,7 @@ pvr_page_table_l0_get_or_insert(struct pvr_mmu_op_context *op_ctx,
*/
struct pvr_mmu_context *pvr_mmu_context_create(struct pvr_device *pvr_dev)
{
- struct pvr_mmu_context *ctx = kzalloc_obj(*ctx, GFP_KERNEL);
+ struct pvr_mmu_context *ctx = kzalloc_obj(*ctx);
int err;
if (!ctx)
@@ -1877,7 +1877,7 @@ pvr_page_table_l1_alloc(struct pvr_mmu_context *ctx)
{
int err;
- struct pvr_page_table_l1 *table = kzalloc_obj(*table, GFP_KERNEL);
+ struct pvr_page_table_l1 *table = kzalloc_obj(*table);
if (!table)
return ERR_PTR(-ENOMEM);
@@ -1905,7 +1905,7 @@ pvr_page_table_l0_alloc(struct pvr_mmu_context *ctx)
{
int err;
- struct pvr_page_table_l0 *table = kzalloc_obj(*table, GFP_KERNEL);
+ struct pvr_page_table_l0 *table = kzalloc_obj(*table);
if (!table)
return ERR_PTR(-ENOMEM);
@@ -2350,7 +2350,7 @@ pvr_mmu_op_context_create(struct pvr_mmu_context *ctx, struct sg_table *sgt,
{
int err;
- struct pvr_mmu_op_context *op_ctx = kzalloc_obj(*op_ctx, GFP_KERNEL);
+ struct pvr_mmu_op_context *op_ctx = kzalloc_obj(*op_ctx);
if (!op_ctx)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/gpu/drm/imagination/pvr_power.c b/drivers/gpu/drm/imagination/pvr_power.c
index c70a62192d79..0cf7393f89c6 100644
--- a/drivers/gpu/drm/imagination/pvr_power.c
+++ b/drivers/gpu/drm/imagination/pvr_power.c
@@ -614,11 +614,11 @@ int pvr_power_domains_init(struct pvr_device *pvr_dev)
link_count = domain_count + (domain_count - 1);
- domain_devs = kzalloc_objs(*domain_devs, domain_count, GFP_KERNEL);
+ domain_devs = kzalloc_objs(*domain_devs, domain_count);
if (!domain_devs)
return -ENOMEM;
- domain_links = kzalloc_objs(*domain_links, link_count, GFP_KERNEL);
+ domain_links = kzalloc_objs(*domain_links, link_count);
if (!domain_links)
return -ENOMEM;
diff --git a/drivers/gpu/drm/imagination/pvr_queue.c b/drivers/gpu/drm/imagination/pvr_queue.c
index 12f759c17f93..dd88949f6194 100644
--- a/drivers/gpu/drm/imagination/pvr_queue.c
+++ b/drivers/gpu/drm/imagination/pvr_queue.c
@@ -249,7 +249,7 @@ pvr_queue_fence_alloc(void)
{
struct pvr_queue_fence *fence;
- fence = kzalloc_obj(*fence, GFP_KERNEL);
+ fence = kzalloc_obj(*fence);
if (!fence)
return NULL;
@@ -1266,7 +1266,7 @@ struct pvr_queue *pvr_queue_create(struct pvr_context *ctx,
if (ctx_state_size < 0)
return ERR_PTR(ctx_state_size);
- queue = kzalloc_obj(*queue, GFP_KERNEL);
+ queue = kzalloc_obj(*queue);
if (!queue)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/gpu/drm/imagination/pvr_sync.c b/drivers/gpu/drm/imagination/pvr_sync.c
index b5268c9b885b..3582616ff722 100644
--- a/drivers/gpu/drm/imagination/pvr_sync.c
+++ b/drivers/gpu/drm/imagination/pvr_sync.c
@@ -64,7 +64,7 @@ pvr_sync_signal_array_add(struct xarray *array, struct drm_file *file, u32 handl
int err;
u32 id;
- sig_sync = kzalloc_obj(*sig_sync, GFP_KERNEL);
+ sig_sync = kzalloc_obj(*sig_sync);
if (!sig_sync)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/gpu/drm/imagination/pvr_vm.c b/drivers/gpu/drm/imagination/pvr_vm.c
index e482bfc00576..e1ec60f34b6e 100644
--- a/drivers/gpu/drm/imagination/pvr_vm.c
+++ b/drivers/gpu/drm/imagination/pvr_vm.c
@@ -261,9 +261,9 @@ pvr_vm_bind_op_map_init(struct pvr_vm_bind_op *bind_op,
if (IS_ERR(bind_op->gpuvm_bo))
return PTR_ERR(bind_op->gpuvm_bo);
- bind_op->new_va = kzalloc_obj(*bind_op->new_va, GFP_KERNEL);
- bind_op->prev_va = kzalloc_obj(*bind_op->prev_va, GFP_KERNEL);
- bind_op->next_va = kzalloc_obj(*bind_op->next_va, GFP_KERNEL);
+ bind_op->new_va = kzalloc_obj(*bind_op->new_va);
+ bind_op->prev_va = kzalloc_obj(*bind_op->prev_va);
+ bind_op->next_va = kzalloc_obj(*bind_op->next_va);
if (!bind_op->new_va || !bind_op->prev_va || !bind_op->next_va) {
err = -ENOMEM;
goto err_bind_op_fini;
@@ -310,8 +310,8 @@ pvr_vm_bind_op_unmap_init(struct pvr_vm_bind_op *bind_op,
bind_op->type = PVR_VM_BIND_TYPE_UNMAP;
- bind_op->prev_va = kzalloc_obj(*bind_op->prev_va, GFP_KERNEL);
- bind_op->next_va = kzalloc_obj(*bind_op->next_va, GFP_KERNEL);
+ bind_op->prev_va = kzalloc_obj(*bind_op->prev_va);
+ bind_op->next_va = kzalloc_obj(*bind_op->next_va);
if (!bind_op->prev_va || !bind_op->next_va) {
err = -ENOMEM;
goto err_bind_op_fini;
@@ -565,7 +565,7 @@ pvr_vm_create_context(struct pvr_device *pvr_dev, bool is_userspace_context)
return ERR_PTR(-EINVAL);
}
- vm_ctx = kzalloc_obj(*vm_ctx, GFP_KERNEL);
+ vm_ctx = kzalloc_obj(*vm_ctx);
if (!vm_ctx)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/gpu/drm/imx/dcss/dcss-plane.c b/drivers/gpu/drm/imx/dcss/dcss-plane.c
index 07bc2044f76a..c014ef70dfd1 100644
--- a/drivers/gpu/drm/imx/dcss/dcss-plane.c
+++ b/drivers/gpu/drm/imx/dcss/dcss-plane.c
@@ -381,7 +381,7 @@ struct dcss_plane *dcss_plane_init(struct drm_device *drm,
if (zpos > 2)
return ERR_PTR(-EINVAL);
- dcss_plane = kzalloc_obj(*dcss_plane, GFP_KERNEL);
+ dcss_plane = kzalloc_obj(*dcss_plane);
if (!dcss_plane) {
DRM_ERROR("failed to allocate plane\n");
return ERR_PTR(-ENOMEM);
diff --git a/drivers/gpu/drm/imx/ipuv3/ipuv3-crtc.c b/drivers/gpu/drm/imx/ipuv3/ipuv3-crtc.c
index eeff0d535b02..a18b9d1a68b6 100644
--- a/drivers/gpu/drm/imx/ipuv3/ipuv3-crtc.c
+++ b/drivers/gpu/drm/imx/ipuv3/ipuv3-crtc.c
@@ -117,7 +117,7 @@ static void imx_drm_crtc_reset(struct drm_crtc *crtc)
kfree(to_imx_crtc_state(crtc->state));
crtc->state = NULL;
- state = kzalloc_obj(*state, GFP_KERNEL);
+ state = kzalloc_obj(*state);
if (state)
__drm_atomic_helper_crtc_reset(crtc, &state->base);
}
@@ -126,7 +126,7 @@ static struct drm_crtc_state *imx_drm_crtc_duplicate_state(struct drm_crtc *crtc
{
struct imx_crtc_state *state;
- state = kzalloc_obj(*state, GFP_KERNEL);
+ state = kzalloc_obj(*state);
if (!state)
return NULL;
diff --git a/drivers/gpu/drm/imx/ipuv3/ipuv3-plane.c b/drivers/gpu/drm/imx/ipuv3/ipuv3-plane.c
index 0b58871277d7..0ea70b8fd743 100644
--- a/drivers/gpu/drm/imx/ipuv3/ipuv3-plane.c
+++ b/drivers/gpu/drm/imx/ipuv3/ipuv3-plane.c
@@ -308,7 +308,7 @@ static void ipu_plane_state_reset(struct drm_plane *plane)
plane->state = NULL;
}
- ipu_state = kzalloc_obj(*ipu_state, GFP_KERNEL);
+ ipu_state = kzalloc_obj(*ipu_state);
if (ipu_state)
__drm_atomic_helper_plane_reset(plane, &ipu_state->base);
@@ -322,7 +322,7 @@ ipu_plane_duplicate_state(struct drm_plane *plane)
if (WARN_ON(!plane->state))
return NULL;
- state = kmalloc_obj(*state, GFP_KERNEL);
+ state = kmalloc_obj(*state);
if (state)
__drm_atomic_helper_plane_duplicate_state(plane, &state->base);
diff --git a/drivers/gpu/drm/imx/ipuv3/parallel-display.c b/drivers/gpu/drm/imx/ipuv3/parallel-display.c
index e82cbb92faee..dea85577513a 100644
--- a/drivers/gpu/drm/imx/ipuv3/parallel-display.c
+++ b/drivers/gpu/drm/imx/ipuv3/parallel-display.c
@@ -66,7 +66,7 @@ imx_pd_bridge_atomic_get_output_bus_fmts(struct drm_bridge *bridge,
}
*num_output_fmts = 1;
- output_fmts = kmalloc_obj(*output_fmts, GFP_KERNEL);
+ output_fmts = kmalloc_obj(*output_fmts);
if (!output_fmts)
return NULL;
@@ -117,7 +117,7 @@ imx_pd_bridge_atomic_get_input_bus_fmts(struct drm_bridge *bridge,
}
*num_input_fmts = 1;
- input_fmts = kmalloc_obj(*input_fmts, GFP_KERNEL);
+ input_fmts = kmalloc_obj(*input_fmts);
if (!input_fmts)
return NULL;
diff --git a/drivers/gpu/drm/ingenic/ingenic-drm-drv.c b/drivers/gpu/drm/ingenic/ingenic-drm-drv.c
index 6273058b1bee..6601589339f6 100644
--- a/drivers/gpu/drm/ingenic/ingenic-drm-drv.c
+++ b/drivers/gpu/drm/ingenic/ingenic-drm-drv.c
@@ -923,7 +923,7 @@ ingenic_drm_gem_create_object(struct drm_device *drm, size_t size)
struct ingenic_drm *priv = drm_device_get_priv(drm);
struct drm_gem_dma_object *obj;
- obj = kzalloc_obj(*obj, GFP_KERNEL);
+ obj = kzalloc_obj(*obj);
if (!obj)
return ERR_PTR(-ENOMEM);
@@ -1387,7 +1387,7 @@ static int ingenic_drm_bind(struct device *dev, bool has_components)
goto err_devclk_disable;
}
- private_state = kzalloc_obj(*private_state, GFP_KERNEL);
+ private_state = kzalloc_obj(*private_state);
if (!private_state) {
ret = -ENOMEM;
goto err_clk_notifier_unregister;
diff --git a/drivers/gpu/drm/ingenic/ingenic-ipu.c b/drivers/gpu/drm/ingenic/ingenic-ipu.c
index 88b6b406e796..289274f464ba 100644
--- a/drivers/gpu/drm/ingenic/ingenic-ipu.c
+++ b/drivers/gpu/drm/ingenic/ingenic-ipu.c
@@ -887,7 +887,7 @@ static int ingenic_ipu_bind(struct device *dev, struct device *master, void *d)
return err;
}
- private_state = kzalloc_obj(*private_state, GFP_KERNEL);
+ private_state = kzalloc_obj(*private_state);
if (!private_state) {
err = -ENOMEM;
goto err_clk_unprepare;
diff --git a/drivers/gpu/drm/kmb/kmb_dsi.c b/drivers/gpu/drm/kmb/kmb_dsi.c
index 1d2ce15d703a..aeb2f9f98f23 100644
--- a/drivers/gpu/drm/kmb/kmb_dsi.c
+++ b/drivers/gpu/drm/kmb/kmb_dsi.c
@@ -220,14 +220,14 @@ int kmb_dsi_host_bridge_init(struct device *dev)
/* Create and register MIPI DSI host */
if (!dsi_host) {
- dsi_host = kzalloc_obj(*dsi_host, GFP_KERNEL);
+ dsi_host = kzalloc_obj(*dsi_host);
if (!dsi_host)
return -ENOMEM;
dsi_host->ops = &kmb_dsi_host_ops;
if (!dsi_device) {
- dsi_device = kzalloc_obj(*dsi_device, GFP_KERNEL);
+ dsi_device = kzalloc_obj(*dsi_device);
if (!dsi_device) {
kfree(dsi_host);
return -ENOMEM;
diff --git a/drivers/gpu/drm/lima/lima_ctx.c b/drivers/gpu/drm/lima/lima_ctx.c
index edcd3733dd95..68ede7a725e2 100644
--- a/drivers/gpu/drm/lima/lima_ctx.c
+++ b/drivers/gpu/drm/lima/lima_ctx.c
@@ -12,7 +12,7 @@ int lima_ctx_create(struct lima_device *dev, struct lima_ctx_mgr *mgr, u32 *id)
struct lima_ctx *ctx;
int i, err;
- ctx = kzalloc_obj(*ctx, GFP_KERNEL);
+ ctx = kzalloc_obj(*ctx);
if (!ctx)
return -ENOMEM;
ctx->dev = dev;
diff --git a/drivers/gpu/drm/lima/lima_drv.c b/drivers/gpu/drm/lima/lima_drv.c
index f2bdf0d1b2fc..9a0eb1092ad3 100644
--- a/drivers/gpu/drm/lima/lima_drv.c
+++ b/drivers/gpu/drm/lima/lima_drv.c
@@ -215,7 +215,7 @@ static int lima_drm_driver_open(struct drm_device *dev, struct drm_file *file)
struct lima_drm_priv *priv;
struct lima_device *ldev = to_lima_dev(dev);
- priv = kzalloc_obj(*priv, GFP_KERNEL);
+ priv = kzalloc_obj(*priv);
if (!priv)
return -ENOMEM;
diff --git a/drivers/gpu/drm/lima/lima_gem.c b/drivers/gpu/drm/lima/lima_gem.c
index bed7945d8440..0c73860bb501 100644
--- a/drivers/gpu/drm/lima/lima_gem.c
+++ b/drivers/gpu/drm/lima/lima_gem.c
@@ -73,7 +73,7 @@ int lima_heap_alloc(struct lima_bo *bo, struct lima_vm *vm)
dma_unmap_sgtable(dev, bo->base.sgt, DMA_BIDIRECTIONAL, 0);
sg_free_table(bo->base.sgt);
} else {
- bo->base.sgt = kmalloc_obj(*bo->base.sgt, GFP_KERNEL);
+ bo->base.sgt = kmalloc_obj(*bo->base.sgt);
if (!bo->base.sgt) {
ret = -ENOMEM;
goto err_out0;
@@ -226,7 +226,7 @@ struct drm_gem_object *lima_gem_create_object(struct drm_device *dev, size_t siz
{
struct lima_bo *bo;
- bo = kzalloc_obj(*bo, GFP_KERNEL);
+ bo = kzalloc_obj(*bo);
if (!bo)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/gpu/drm/lima/lima_vm.c b/drivers/gpu/drm/lima/lima_vm.c
index 5db2a1ad1983..c1b75b15c260 100644
--- a/drivers/gpu/drm/lima/lima_vm.c
+++ b/drivers/gpu/drm/lima/lima_vm.c
@@ -109,7 +109,7 @@ int lima_vm_bo_add(struct lima_vm *vm, struct lima_bo *bo, bool create)
return -ENOENT;
}
- bo_va = kzalloc_obj(*bo_va, GFP_KERNEL);
+ bo_va = kzalloc_obj(*bo_va);
if (!bo_va) {
err = -ENOMEM;
goto err_out0;
@@ -201,7 +201,7 @@ struct lima_vm *lima_vm_create(struct lima_device *dev)
{
struct lima_vm *vm;
- vm = kzalloc_obj(*vm, GFP_KERNEL);
+ vm = kzalloc_obj(*vm);
if (!vm)
return NULL;
diff --git a/drivers/gpu/drm/loongson/lsdc_crtc.c b/drivers/gpu/drm/loongson/lsdc_crtc.c
index 32ef0f3826ac..587fbe285e9e 100644
--- a/drivers/gpu/drm/loongson/lsdc_crtc.c
+++ b/drivers/gpu/drm/loongson/lsdc_crtc.c
@@ -397,7 +397,7 @@ static void lsdc_crtc_reset(struct drm_crtc *crtc)
if (crtc->state)
crtc->funcs->atomic_destroy_state(crtc, crtc->state);
- priv_crtc_state = kzalloc_obj(*priv_crtc_state, GFP_KERNEL);
+ priv_crtc_state = kzalloc_obj(*priv_crtc_state);
if (!priv_crtc_state)
__drm_atomic_helper_crtc_reset(crtc, NULL);
@@ -424,7 +424,7 @@ lsdc_crtc_atomic_duplicate_state(struct drm_crtc *crtc)
struct lsdc_crtc_state *new_priv_state;
struct lsdc_crtc_state *old_priv_state;
- new_priv_state = kzalloc_obj(*new_priv_state, GFP_KERNEL);
+ new_priv_state = kzalloc_obj(*new_priv_state);
if (!new_priv_state)
return NULL;
diff --git a/drivers/gpu/drm/loongson/lsdc_gfxpll.c b/drivers/gpu/drm/loongson/lsdc_gfxpll.c
index 984ee165cacb..2daa62e72fda 100644
--- a/drivers/gpu/drm/loongson/lsdc_gfxpll.c
+++ b/drivers/gpu/drm/loongson/lsdc_gfxpll.c
@@ -178,7 +178,7 @@ int loongson_gfxpll_create(struct drm_device *ddev,
struct loongson_gfxpll *this;
int ret;
- this = kzalloc_obj(*this, GFP_KERNEL);
+ this = kzalloc_obj(*this);
if (IS_ERR_OR_NULL(this))
return -ENOMEM;
diff --git a/drivers/gpu/drm/loongson/lsdc_i2c.c b/drivers/gpu/drm/loongson/lsdc_i2c.c
index 5ed314a76dde..b5ff68866f02 100644
--- a/drivers/gpu/drm/loongson/lsdc_i2c.c
+++ b/drivers/gpu/drm/loongson/lsdc_i2c.c
@@ -124,7 +124,7 @@ int lsdc_create_i2c_chan(struct drm_device *ddev,
struct lsdc_i2c *li2c;
int ret;
- li2c = kzalloc_obj(*li2c, GFP_KERNEL);
+ li2c = kzalloc_obj(*li2c);
if (!li2c)
return -ENOMEM;
diff --git a/drivers/gpu/drm/loongson/lsdc_pixpll.c b/drivers/gpu/drm/loongson/lsdc_pixpll.c
index d9c9de7b5de0..41131a74056f 100644
--- a/drivers/gpu/drm/loongson/lsdc_pixpll.c
+++ b/drivers/gpu/drm/loongson/lsdc_pixpll.c
@@ -124,7 +124,7 @@ static int lsdc_pixel_pll_setup(struct lsdc_pixpll * const this)
if (!this->mmio)
return -ENOMEM;
- pparms = kzalloc_obj(*pparms, GFP_KERNEL);
+ pparms = kzalloc_obj(*pparms);
if (!pparms) {
iounmap(this->mmio);
return -ENOMEM;
diff --git a/drivers/gpu/drm/loongson/lsdc_ttm.c b/drivers/gpu/drm/loongson/lsdc_ttm.c
index 3404e18e87b4..d7441d96a0dc 100644
--- a/drivers/gpu/drm/loongson/lsdc_ttm.c
+++ b/drivers/gpu/drm/loongson/lsdc_ttm.c
@@ -96,7 +96,7 @@ lsdc_ttm_tt_create(struct ttm_buffer_object *tbo, uint32_t page_flags)
struct ttm_tt *tt;
int ret;
- tt = kzalloc_obj(*tt, GFP_KERNEL);
+ tt = kzalloc_obj(*tt);
if (!tt)
return NULL;
@@ -441,7 +441,7 @@ struct lsdc_bo *lsdc_bo_create(struct drm_device *ddev,
enum ttm_bo_type bo_type;
int ret;
- lbo = kzalloc_obj(*lbo, GFP_KERNEL);
+ lbo = kzalloc_obj(*lbo);
if (!lbo)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/gpu/drm/mediatek/mtk_crtc.c b/drivers/gpu/drm/mediatek/mtk_crtc.c
index 1c1459a4af13..351d58c50b84 100644
--- a/drivers/gpu/drm/mediatek/mtk_crtc.c
+++ b/drivers/gpu/drm/mediatek/mtk_crtc.c
@@ -160,7 +160,7 @@ static void mtk_crtc_reset(struct drm_crtc *crtc)
kfree(to_mtk_crtc_state(crtc->state));
crtc->state = NULL;
- state = kzalloc_obj(*state, GFP_KERNEL);
+ state = kzalloc_obj(*state);
if (state)
__drm_atomic_helper_crtc_reset(crtc, &state->base);
}
@@ -169,7 +169,7 @@ static struct drm_crtc_state *mtk_crtc_duplicate_state(struct drm_crtc *crtc)
{
struct mtk_crtc_state *state;
- state = kmalloc_obj(*state, GFP_KERNEL);
+ state = kmalloc_obj(*state);
if (!state)
return NULL;
diff --git a/drivers/gpu/drm/mediatek/mtk_dp.c b/drivers/gpu/drm/mediatek/mtk_dp.c
index 08d954e412d1..08c4d64b87b9 100644
--- a/drivers/gpu/drm/mediatek/mtk_dp.c
+++ b/drivers/gpu/drm/mediatek/mtk_dp.c
@@ -2482,7 +2482,7 @@ static u32 *mtk_dp_bridge_atomic_get_output_bus_fmts(struct drm_bridge *bridge,
u32 *output_fmts;
*num_output_fmts = 0;
- output_fmts = kmalloc_obj(*output_fmts, GFP_KERNEL);
+ output_fmts = kmalloc_obj(*output_fmts);
if (!output_fmts)
return NULL;
*num_output_fmts = 1;
diff --git a/drivers/gpu/drm/mediatek/mtk_gem.c b/drivers/gpu/drm/mediatek/mtk_gem.c
index 5f7e50ff70ae..f059a1452220 100644
--- a/drivers/gpu/drm/mediatek/mtk_gem.c
+++ b/drivers/gpu/drm/mediatek/mtk_gem.c
@@ -50,7 +50,7 @@ static struct sg_table *mtk_gem_prime_get_sg_table(struct drm_gem_object *obj)
struct sg_table *sgt;
int ret;
- sgt = kzalloc_obj(*sgt, GFP_KERNEL);
+ sgt = kzalloc_obj(*sgt);
if (!sgt)
return ERR_PTR(-ENOMEM);
@@ -85,7 +85,7 @@ static struct drm_gem_dma_object *mtk_gem_init(struct drm_device *dev,
if (size == 0)
return ERR_PTR(-EINVAL);
- dma_obj = kzalloc_obj(*dma_obj, GFP_KERNEL);
+ dma_obj = kzalloc_obj(*dma_obj);
if (!dma_obj)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/gpu/drm/mediatek/mtk_plane.c b/drivers/gpu/drm/mediatek/mtk_plane.c
index 60c35d3cbb9b..86c6f60eadb3 100644
--- a/drivers/gpu/drm/mediatek/mtk_plane.c
+++ b/drivers/gpu/drm/mediatek/mtk_plane.c
@@ -35,7 +35,7 @@ static void mtk_plane_reset(struct drm_plane *plane)
state = to_mtk_plane_state(plane->state);
memset(state, 0, sizeof(*state));
} else {
- state = kzalloc_obj(*state, GFP_KERNEL);
+ state = kzalloc_obj(*state);
if (!state)
return;
}
@@ -52,7 +52,7 @@ static struct drm_plane_state *mtk_plane_duplicate_state(struct drm_plane *plane
struct mtk_plane_state *old_state = to_mtk_plane_state(plane->state);
struct mtk_plane_state *state;
- state = kmalloc_obj(*state, GFP_KERNEL);
+ state = kmalloc_obj(*state);
if (!state)
return NULL;
diff --git a/drivers/gpu/drm/mgag200/mgag200_mode.c b/drivers/gpu/drm/mgag200/mgag200_mode.c
index fe7451ff4ea4..4387d5f5898f 100644
--- a/drivers/gpu/drm/mgag200/mgag200_mode.c
+++ b/drivers/gpu/drm/mgag200/mgag200_mode.c
@@ -697,7 +697,7 @@ void mgag200_crtc_reset(struct drm_crtc *crtc)
if (crtc->state)
crtc->funcs->atomic_destroy_state(crtc, crtc->state);
- mgag200_crtc_state = kzalloc_obj(*mgag200_crtc_state, GFP_KERNEL);
+ mgag200_crtc_state = kzalloc_obj(*mgag200_crtc_state);
if (mgag200_crtc_state)
__drm_atomic_helper_crtc_reset(crtc, &mgag200_crtc_state->base);
else
diff --git a/drivers/gpu/drm/msm/adreno/a2xx_gpu.c b/drivers/gpu/drm/msm/adreno/a2xx_gpu.c
index 9cf06fd3a21e..d5a5fa9e2cf8 100644
--- a/drivers/gpu/drm/msm/adreno/a2xx_gpu.c
+++ b/drivers/gpu/drm/msm/adreno/a2xx_gpu.c
@@ -457,7 +457,7 @@ static void a2xx_dump(struct msm_gpu *gpu)
static struct msm_gpu_state *a2xx_gpu_state_get(struct msm_gpu *gpu)
{
- struct msm_gpu_state *state = kzalloc_obj(*state, GFP_KERNEL);
+ struct msm_gpu_state *state = kzalloc_obj(*state);
if (!state)
return ERR_PTR(-ENOMEM);
@@ -509,7 +509,7 @@ static struct msm_gpu *a2xx_gpu_init(struct drm_device *dev)
goto fail;
}
- a2xx_gpu = kzalloc_obj(*a2xx_gpu, GFP_KERNEL);
+ a2xx_gpu = kzalloc_obj(*a2xx_gpu);
if (!a2xx_gpu) {
ret = -ENOMEM;
goto fail;
diff --git a/drivers/gpu/drm/msm/adreno/a2xx_gpummu.c b/drivers/gpu/drm/msm/adreno/a2xx_gpummu.c
index 4e8148497295..d77b4774d414 100644
--- a/drivers/gpu/drm/msm/adreno/a2xx_gpummu.c
+++ b/drivers/gpu/drm/msm/adreno/a2xx_gpummu.c
@@ -95,7 +95,7 @@ struct msm_mmu *a2xx_gpummu_new(struct device *dev, struct msm_gpu *gpu)
{
struct a2xx_gpummu *gpummu;
- gpummu = kzalloc_obj(*gpummu, GFP_KERNEL);
+ gpummu = kzalloc_obj(*gpummu);
if (!gpummu)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/gpu/drm/msm/adreno/a3xx_gpu.c b/drivers/gpu/drm/msm/adreno/a3xx_gpu.c
index 5d47f8c0b7ea..018183e0ac3f 100644
--- a/drivers/gpu/drm/msm/adreno/a3xx_gpu.c
+++ b/drivers/gpu/drm/msm/adreno/a3xx_gpu.c
@@ -480,7 +480,7 @@ static void a3xx_dump(struct msm_gpu *gpu)
static struct msm_gpu_state *a3xx_gpu_state_get(struct msm_gpu *gpu)
{
- struct msm_gpu_state *state = kzalloc_obj(*state, GFP_KERNEL);
+ struct msm_gpu_state *state = kzalloc_obj(*state);
if (!state)
return ERR_PTR(-ENOMEM);
@@ -533,7 +533,7 @@ static struct msm_gpu *a3xx_gpu_init(struct drm_device *dev)
goto fail;
}
- a3xx_gpu = kzalloc_obj(*a3xx_gpu, GFP_KERNEL);
+ a3xx_gpu = kzalloc_obj(*a3xx_gpu);
if (!a3xx_gpu) {
ret = -ENOMEM;
goto fail;
diff --git a/drivers/gpu/drm/msm/adreno/a4xx_gpu.c b/drivers/gpu/drm/msm/adreno/a4xx_gpu.c
index e44e45ce0714..8464d89e37f3 100644
--- a/drivers/gpu/drm/msm/adreno/a4xx_gpu.c
+++ b/drivers/gpu/drm/msm/adreno/a4xx_gpu.c
@@ -550,7 +550,7 @@ static const unsigned int a405_registers[] = {
static struct msm_gpu_state *a4xx_gpu_state_get(struct msm_gpu *gpu)
{
- struct msm_gpu_state *state = kzalloc_obj(*state, GFP_KERNEL);
+ struct msm_gpu_state *state = kzalloc_obj(*state);
if (!state)
return ERR_PTR(-ENOMEM);
@@ -645,7 +645,7 @@ static struct msm_gpu *a4xx_gpu_init(struct drm_device *dev)
goto fail;
}
- a4xx_gpu = kzalloc_obj(*a4xx_gpu, GFP_KERNEL);
+ a4xx_gpu = kzalloc_obj(*a4xx_gpu);
if (!a4xx_gpu) {
ret = -ENOMEM;
goto fail;
diff --git a/drivers/gpu/drm/msm/adreno/a5xx_gpu.c b/drivers/gpu/drm/msm/adreno/a5xx_gpu.c
index 66e6b828cb84..ef9fd6171af7 100644
--- a/drivers/gpu/drm/msm/adreno/a5xx_gpu.c
+++ b/drivers/gpu/drm/msm/adreno/a5xx_gpu.c
@@ -1570,7 +1570,7 @@ static void a5xx_gpu_state_get_hlsq_regs(struct msm_gpu *gpu,
static struct msm_gpu_state *a5xx_gpu_state_get(struct msm_gpu *gpu)
{
- struct a5xx_gpu_state *a5xx_state = kzalloc_obj(*a5xx_state, GFP_KERNEL);
+ struct a5xx_gpu_state *a5xx_state = kzalloc_obj(*a5xx_state);
bool stalled = !!(gpu_read(gpu, REG_A5XX_RBBM_STATUS3) & BIT(24));
if (!a5xx_state)
@@ -1734,7 +1734,7 @@ static struct msm_gpu *a5xx_gpu_init(struct drm_device *dev)
unsigned int nr_rings;
int ret;
- a5xx_gpu = kzalloc_obj(*a5xx_gpu, GFP_KERNEL);
+ a5xx_gpu = kzalloc_obj(*a5xx_gpu);
if (!a5xx_gpu)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/gpu/drm/msm/adreno/a6xx_gpu.c b/drivers/gpu/drm/msm/adreno/a6xx_gpu.c
index b8cc33fe7279..d6dfe6337bc3 100644
--- a/drivers/gpu/drm/msm/adreno/a6xx_gpu.c
+++ b/drivers/gpu/drm/msm/adreno/a6xx_gpu.c
@@ -2648,7 +2648,7 @@ static struct msm_gpu *a6xx_gpu_init(struct drm_device *dev)
bool is_a7xx;
int ret, nr_rings = 1;
- a6xx_gpu = kzalloc_obj(*a6xx_gpu, GFP_KERNEL);
+ a6xx_gpu = kzalloc_obj(*a6xx_gpu);
if (!a6xx_gpu)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/gpu/drm/msm/adreno/a6xx_gpu_state.c b/drivers/gpu/drm/msm/adreno/a6xx_gpu_state.c
index 40933f4d2424..2d56fe0a65b7 100644
--- a/drivers/gpu/drm/msm/adreno/a6xx_gpu_state.c
+++ b/drivers/gpu/drm/msm/adreno/a6xx_gpu_state.c
@@ -1584,7 +1584,7 @@ struct msm_gpu_state *a6xx_gpu_state_get(struct msm_gpu *gpu)
struct a6xx_crashdumper _dumper = { 0 }, *dumper = NULL;
struct adreno_gpu *adreno_gpu = to_adreno_gpu(gpu);
struct a6xx_gpu *a6xx_gpu = to_a6xx_gpu(adreno_gpu);
- struct a6xx_gpu_state *a6xx_state = kzalloc_obj(*a6xx_state, GFP_KERNEL);
+ struct a6xx_gpu_state *a6xx_state = kzalloc_obj(*a6xx_state);
bool stalled;
if (!a6xx_state)
diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c
index 39c1165c93a7..0f4921b1a892 100644
--- a/drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c
+++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c
@@ -887,7 +887,7 @@ static void _dpu_crtc_setup_cp_blocks(struct drm_crtc *crtc)
if (!state->gamma_lut) {
dspp->ops.setup_gc(dspp, NULL);
} else {
- gc_lut = kzalloc_obj(*gc_lut, GFP_KERNEL);
+ gc_lut = kzalloc_obj(*gc_lut);
if (!gc_lut)
continue;
_dpu_crtc_get_gc_lut(state, gc_lut);
@@ -1146,7 +1146,7 @@ void dpu_crtc_commit_kickoff(struct drm_crtc *crtc)
static void dpu_crtc_reset(struct drm_crtc *crtc)
{
- struct dpu_crtc_state *cstate = kzalloc_obj(*cstate, GFP_KERNEL);
+ struct dpu_crtc_state *cstate = kzalloc_obj(*cstate);
if (crtc->state)
dpu_crtc_destroy_state(crtc, crtc->state);
@@ -1343,7 +1343,7 @@ static int dpu_crtc_reassign_planes(struct drm_crtc *crtc, struct drm_crtc_state
if (!crtc_state->enable)
return 0;
- states = kzalloc_objs(*states, total_planes, GFP_KERNEL);
+ states = kzalloc_objs(*states, total_planes);
if (!states)
return -ENOMEM;
diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c
index 35986cefbf8b..61d7e65469b3 100644
--- a/drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c
+++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c
@@ -385,7 +385,7 @@ static int dpu_kms_global_obj_init(struct dpu_kms *dpu_kms)
{
struct dpu_global_state *state;
- state = kzalloc_obj(*state, GFP_KERNEL);
+ state = kzalloc_obj(*state);
if (!state)
return -ENOMEM;
diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c
index 59c44cce6753..547d084f2944 100644
--- a/drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c
+++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c
@@ -1684,7 +1684,7 @@ static void dpu_plane_reset(struct drm_plane *plane)
plane->state = NULL;
}
- pstate = kzalloc_obj(*pstate, GFP_KERNEL);
+ pstate = kzalloc_obj(*pstate);
if (!pstate) {
DPU_ERROR_PLANE(pdpu, "failed to allocate state\n");
return;
diff --git a/drivers/gpu/drm/msm/disp/mdp5/mdp5_kms.c b/drivers/gpu/drm/msm/disp/mdp5/mdp5_kms.c
index 743517e29626..8bb503e0f962 100644
--- a/drivers/gpu/drm/msm/disp/mdp5/mdp5_kms.c
+++ b/drivers/gpu/drm/msm/disp/mdp5/mdp5_kms.c
@@ -133,7 +133,7 @@ static int mdp5_global_obj_init(struct mdp5_kms *mdp5_kms)
{
struct mdp5_global_state *state;
- state = kzalloc_obj(*state, GFP_KERNEL);
+ state = kzalloc_obj(*state);
if (!state)
return -ENOMEM;
diff --git a/drivers/gpu/drm/msm/disp/mdp5/mdp5_plane.c b/drivers/gpu/drm/msm/disp/mdp5/mdp5_plane.c
index 83088fd8f910..c4624a49b32f 100644
--- a/drivers/gpu/drm/msm/disp/mdp5/mdp5_plane.c
+++ b/drivers/gpu/drm/msm/disp/mdp5/mdp5_plane.c
@@ -89,7 +89,7 @@ static void mdp5_plane_reset(struct drm_plane *plane)
kfree(to_mdp5_plane_state(plane->state));
plane->state = NULL;
- mdp5_state = kzalloc_obj(*mdp5_state, GFP_KERNEL);
+ mdp5_state = kzalloc_obj(*mdp5_state);
if (!mdp5_state)
return;
__drm_atomic_helper_plane_reset(plane, &mdp5_state->base);
diff --git a/drivers/gpu/drm/msm/disp/msm_disp_snapshot.c b/drivers/gpu/drm/msm/disp/msm_disp_snapshot.c
index 60af5c02973f..d99771684728 100644
--- a/drivers/gpu/drm/msm/disp/msm_disp_snapshot.c
+++ b/drivers/gpu/drm/msm/disp/msm_disp_snapshot.c
@@ -36,7 +36,7 @@ msm_disp_snapshot_state_sync(struct msm_kms *kms)
WARN_ON(!mutex_is_locked(&kms->dump_mutex));
- disp_state = kzalloc_obj(struct msm_disp_state, GFP_KERNEL);
+ disp_state = kzalloc_obj(struct msm_disp_state);
if (!disp_state)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/gpu/drm/msm/disp/msm_disp_snapshot_util.c b/drivers/gpu/drm/msm/disp/msm_disp_snapshot_util.c
index fdb8ca642794..427d3ee2b833 100644
--- a/drivers/gpu/drm/msm/disp/msm_disp_snapshot_util.c
+++ b/drivers/gpu/drm/msm/disp/msm_disp_snapshot_util.c
@@ -172,7 +172,7 @@ void msm_disp_snapshot_add_block(struct msm_disp_state *disp_state, u32 len,
struct va_format vaf;
va_list va;
- new_blk = kzalloc_obj(struct msm_disp_state_block, GFP_KERNEL);
+ new_blk = kzalloc_obj(struct msm_disp_state_block);
if (!new_blk)
return;
diff --git a/drivers/gpu/drm/msm/dp/dp_ctrl.c b/drivers/gpu/drm/msm/dp/dp_ctrl.c
index 00c36fa75c5c..ef298c7d3e5e 100644
--- a/drivers/gpu/drm/msm/dp/dp_ctrl.c
+++ b/drivers/gpu/drm/msm/dp/dp_ctrl.c
@@ -921,7 +921,7 @@ static void _dp_ctrl_calc_tu(struct msm_dp_ctrl_private *ctrl,
uint EXTRA_PIXCLK_CYCLE_DELAY = 4;
uint HBLANK_MARGIN = 4;
- tu = kzalloc_obj(*tu, GFP_KERNEL);
+ tu = kzalloc_obj(*tu);
if (!tu)
return;
diff --git a/drivers/gpu/drm/msm/hdmi/hdmi_hdcp.c b/drivers/gpu/drm/msm/hdmi/hdmi_hdcp.c
index c59c7b4c3ee0..8fb5497aac9f 100644
--- a/drivers/gpu/drm/msm/hdmi/hdmi_hdcp.c
+++ b/drivers/gpu/drm/msm/hdmi/hdmi_hdcp.c
@@ -1400,7 +1400,7 @@ struct hdmi_hdcp_ctrl *msm_hdmi_hdcp_init(struct hdmi *hdmi)
return ERR_PTR(-EINVAL);
}
- hdcp_ctrl = kzalloc_obj(*hdcp_ctrl, GFP_KERNEL);
+ hdcp_ctrl = kzalloc_obj(*hdcp_ctrl);
if (!hdcp_ctrl)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/gpu/drm/msm/hdmi/hdmi_i2c.c b/drivers/gpu/drm/msm/hdmi/hdmi_i2c.c
index 020b2f432b38..6b9265159195 100644
--- a/drivers/gpu/drm/msm/hdmi/hdmi_i2c.c
+++ b/drivers/gpu/drm/msm/hdmi/hdmi_i2c.c
@@ -246,7 +246,7 @@ struct i2c_adapter *msm_hdmi_i2c_init(struct hdmi *hdmi)
struct i2c_adapter *i2c = NULL;
int ret;
- hdmi_i2c = kzalloc_obj(*hdmi_i2c, GFP_KERNEL);
+ hdmi_i2c = kzalloc_obj(*hdmi_i2c);
if (!hdmi_i2c) {
ret = -ENOMEM;
goto fail;
diff --git a/drivers/gpu/drm/msm/msm_debugfs.c b/drivers/gpu/drm/msm/msm_debugfs.c
index 785172f5d74f..1059a9b29d6a 100644
--- a/drivers/gpu/drm/msm/msm_debugfs.c
+++ b/drivers/gpu/drm/msm/msm_debugfs.c
@@ -76,7 +76,7 @@ static int msm_gpu_open(struct inode *inode, struct file *file)
if (!gpu || !gpu->funcs->gpu_state_get)
return -ENODEV;
- show_priv = kmalloc_obj(*show_priv, GFP_KERNEL);
+ show_priv = kmalloc_obj(*show_priv);
if (!show_priv)
return -ENOMEM;
diff --git a/drivers/gpu/drm/msm/msm_drv.c b/drivers/gpu/drm/msm/msm_drv.c
index 2fc0fa82a275..e5ab1e28851d 100644
--- a/drivers/gpu/drm/msm/msm_drv.c
+++ b/drivers/gpu/drm/msm/msm_drv.c
@@ -247,7 +247,7 @@ static int context_init(struct drm_device *dev, struct drm_file *file)
static atomic_t ident = ATOMIC_INIT(0);
struct msm_context *ctx;
- ctx = kzalloc_obj(*ctx, GFP_KERNEL);
+ ctx = kzalloc_obj(*ctx);
if (!ctx)
return -ENOMEM;
diff --git a/drivers/gpu/drm/msm/msm_fb.c b/drivers/gpu/drm/msm/msm_fb.c
index d784d1773dee..b3fdb83202ab 100644
--- a/drivers/gpu/drm/msm/msm_fb.c
+++ b/drivers/gpu/drm/msm/msm_fb.c
@@ -194,7 +194,7 @@ static struct drm_framebuffer *msm_framebuffer_init(struct drm_device *dev,
goto fail;
}
- msm_fb = kzalloc_obj(*msm_fb, GFP_KERNEL);
+ msm_fb = kzalloc_obj(*msm_fb);
if (!msm_fb) {
ret = -ENOMEM;
goto fail;
diff --git a/drivers/gpu/drm/msm/msm_fence.c b/drivers/gpu/drm/msm/msm_fence.c
index eafd52f03d17..3dca8e09c192 100644
--- a/drivers/gpu/drm/msm/msm_fence.c
+++ b/drivers/gpu/drm/msm/msm_fence.c
@@ -46,7 +46,7 @@ msm_fence_context_alloc(struct drm_device *dev, volatile uint32_t *fenceptr,
struct msm_fence_context *fctx;
static int index = 0;
- fctx = kzalloc_obj(*fctx, GFP_KERNEL);
+ fctx = kzalloc_obj(*fctx);
if (!fctx)
return ERR_PTR(-ENOMEM);
@@ -176,7 +176,7 @@ msm_fence_alloc(void)
{
struct msm_fence *f;
- f = kzalloc_obj(*f, GFP_KERNEL);
+ f = kzalloc_obj(*f);
if (!f)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/gpu/drm/msm/msm_gem.c b/drivers/gpu/drm/msm/msm_gem.c
index 5d4ab1900984..b27abaa13926 100644
--- a/drivers/gpu/drm/msm/msm_gem.c
+++ b/drivers/gpu/drm/msm/msm_gem.c
@@ -1215,7 +1215,7 @@ static int msm_gem_new_impl(struct drm_device *dev, uint32_t flags,
return -EINVAL;
}
- msm_obj = kzalloc_obj(*msm_obj, GFP_KERNEL);
+ msm_obj = kzalloc_obj(*msm_obj);
if (!msm_obj)
return -ENOMEM;
@@ -1301,7 +1301,7 @@ struct drm_gem_object *msm_gem_import(struct drm_device *dev,
msm_obj = to_msm_bo(obj);
msm_gem_lock(obj);
msm_obj->sgt = sgt;
- msm_obj->pages = kvmalloc_objs(struct page *, npages, GFP_KERNEL);
+ msm_obj->pages = kvmalloc_objs(struct page *, npages);
if (!msm_obj->pages) {
msm_gem_unlock(obj);
ret = -ENOMEM;
diff --git a/drivers/gpu/drm/msm/msm_gem_vma.c b/drivers/gpu/drm/msm/msm_gem_vma.c
index 3c43e27ce553..adf88cf8f41a 100644
--- a/drivers/gpu/drm/msm/msm_gem_vma.c
+++ b/drivers/gpu/drm/msm/msm_gem_vma.c
@@ -375,7 +375,7 @@ msm_gem_vma_new(struct drm_gpuvm *gpuvm, struct drm_gem_object *obj,
drm_gpuvm_resv_assert_held(&vm->base);
- vma = kzalloc_obj(*vma, GFP_KERNEL);
+ vma = kzalloc_obj(*vma);
if (!vma)
return ERR_PTR(-ENOMEM);
@@ -465,7 +465,7 @@ struct op_arg {
static int
vm_op_enqueue(struct op_arg *arg, struct msm_vm_op _op)
{
- struct msm_vm_op *op = kmalloc_obj(*op, GFP_KERNEL);
+ struct msm_vm_op *op = kmalloc_obj(*op);
if (!op)
return -ENOMEM;
@@ -819,7 +819,7 @@ msm_gem_vm_create(struct drm_device *drm, struct msm_mmu *mmu, const char *name,
if (IS_ERR(mmu))
return ERR_CAST(mmu);
- vm = kzalloc_obj(*vm, GFP_KERNEL);
+ vm = kzalloc_obj(*vm);
if (!vm)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/gpu/drm/msm/msm_gpu.c b/drivers/gpu/drm/msm/msm_gpu.c
index 24f164a04f59..84d6c7f50c8d 100644
--- a/drivers/gpu/drm/msm/msm_gpu.c
+++ b/drivers/gpu/drm/msm/msm_gpu.c
@@ -346,7 +346,7 @@ static void crashstate_get_vm_logs(struct msm_gpu_state *state, struct msm_gem_v
state->nr_vm_logs = vm_log_len;
}
- state->vm_logs = kmalloc_objs(vm->log[0], state->nr_vm_logs, GFP_KERNEL);
+ state->vm_logs = kmalloc_objs(vm->log[0], state->nr_vm_logs);
if (!state->vm_logs) {
state->nr_vm_logs = 0;
}
diff --git a/drivers/gpu/drm/msm/msm_iommu.c b/drivers/gpu/drm/msm/msm_iommu.c
index 425ae5eb9af3..7d449e5202c5 100644
--- a/drivers/gpu/drm/msm/msm_iommu.c
+++ b/drivers/gpu/drm/msm/msm_iommu.c
@@ -332,7 +332,7 @@ msm_iommu_pagetable_prealloc_allocate(struct msm_mmu *mmu, struct msm_mmu_preall
struct kmem_cache *pt_cache = get_pt_cache(mmu);
int ret;
- p->pages = kvmalloc_objs(*p->pages, p->count, GFP_KERNEL);
+ p->pages = kvmalloc_objs(*p->pages, p->count);
if (!p->pages)
return -ENOMEM;
@@ -521,7 +521,7 @@ struct msm_mmu *msm_iommu_pagetable_create(struct msm_mmu *parent, bool kernel_m
if (WARN_ONCE(!ttbr1_cfg, "No per-process page tables"))
return ERR_PTR(-ENODEV);
- pagetable = kzalloc_obj(*pagetable, GFP_KERNEL);
+ pagetable = kzalloc_obj(*pagetable);
if (!pagetable)
return ERR_PTR(-ENOMEM);
@@ -734,7 +734,7 @@ struct msm_mmu *msm_iommu_new(struct device *dev, unsigned long quirks)
iommu_set_pgtable_quirks(domain, quirks);
- iommu = kzalloc_obj(*iommu, GFP_KERNEL);
+ iommu = kzalloc_obj(*iommu);
if (!iommu) {
iommu_domain_free(domain);
return ERR_PTR(-ENOMEM);
diff --git a/drivers/gpu/drm/msm/msm_perf.c b/drivers/gpu/drm/msm/msm_perf.c
index e40f6aa5917d..7768bde6745f 100644
--- a/drivers/gpu/drm/msm/msm_perf.c
+++ b/drivers/gpu/drm/msm/msm_perf.c
@@ -204,7 +204,7 @@ int msm_perf_debugfs_init(struct drm_minor *minor)
if (priv->perf)
return 0;
- perf = kzalloc_obj(*perf, GFP_KERNEL);
+ perf = kzalloc_obj(*perf);
if (!perf)
return -ENOMEM;
diff --git a/drivers/gpu/drm/msm/msm_rd.c b/drivers/gpu/drm/msm/msm_rd.c
index 3275ce9a4f07..8fab0b4ed8f4 100644
--- a/drivers/gpu/drm/msm/msm_rd.c
+++ b/drivers/gpu/drm/msm/msm_rd.c
@@ -245,7 +245,7 @@ static struct msm_rd_state *rd_init(struct drm_minor *minor, const char *name)
{
struct msm_rd_state *rd;
- rd = kzalloc_obj(*rd, GFP_KERNEL);
+ rd = kzalloc_obj(*rd);
if (!rd)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/gpu/drm/msm/msm_ringbuffer.c b/drivers/gpu/drm/msm/msm_ringbuffer.c
index 9540a615b7a9..30ddb5351e98 100644
--- a/drivers/gpu/drm/msm/msm_ringbuffer.c
+++ b/drivers/gpu/drm/msm/msm_ringbuffer.c
@@ -79,7 +79,7 @@ struct msm_ringbuffer *msm_ringbuffer_new(struct msm_gpu *gpu, int id,
/* We assume everywhere that MSM_GPU_RINGBUFFER_SZ is a power of 2 */
BUILD_BUG_ON(!is_power_of_2(MSM_GPU_RINGBUFFER_SZ));
- ring = kzalloc_obj(*ring, GFP_KERNEL);
+ ring = kzalloc_obj(*ring);
if (!ring) {
ret = -ENOMEM;
goto fail;
diff --git a/drivers/gpu/drm/msm/msm_submitqueue.c b/drivers/gpu/drm/msm/msm_submitqueue.c
index 04e4a2f2a3b0..2598d674a99d 100644
--- a/drivers/gpu/drm/msm/msm_submitqueue.c
+++ b/drivers/gpu/drm/msm/msm_submitqueue.c
@@ -151,7 +151,7 @@ get_sched_entity(struct msm_context *ctx, struct msm_ringbuffer *ring,
struct drm_gpu_scheduler *sched = &ring->sched;
int ret;
- entity = kzalloc_obj(*ctx->entities[idx], GFP_KERNEL);
+ entity = kzalloc_obj(*ctx->entities[idx]);
ret = drm_sched_entity_init(entity, sched_prio, &sched, 1, NULL);
if (ret) {
@@ -207,7 +207,7 @@ int msm_submitqueue_create(struct drm_device *drm, struct msm_context *ctx,
if (ret)
return ret;
- queue = kzalloc_obj(*queue, GFP_KERNEL);
+ queue = kzalloc_obj(*queue);
}
if (!queue)
diff --git a/drivers/gpu/drm/mxsfb/lcdif_kms.c b/drivers/gpu/drm/mxsfb/lcdif_kms.c
index e6ef6e318df9..ef3250a5c54f 100644
--- a/drivers/gpu/drm/mxsfb/lcdif_kms.c
+++ b/drivers/gpu/drm/mxsfb/lcdif_kms.c
@@ -595,7 +595,7 @@ static void lcdif_crtc_reset(struct drm_crtc *crtc)
crtc->state = NULL;
- state = kzalloc_obj(*state, GFP_KERNEL);
+ state = kzalloc_obj(*state);
if (state)
__drm_atomic_helper_crtc_reset(crtc, &state->base);
}
@@ -609,7 +609,7 @@ lcdif_crtc_atomic_duplicate_state(struct drm_crtc *crtc)
if (WARN_ON(!crtc->state))
return NULL;
- new = kzalloc_obj(*new, GFP_KERNEL);
+ new = kzalloc_obj(*new);
if (!new)
return NULL;
diff --git a/drivers/gpu/drm/nouveau/dispnv04/crtc.c b/drivers/gpu/drm/nouveau/dispnv04/crtc.c
index e8b4f272aa8c..500fd77b87d1 100644
--- a/drivers/gpu/drm/nouveau/dispnv04/crtc.c
+++ b/drivers/gpu/drm/nouveau/dispnv04/crtc.c
@@ -1158,7 +1158,7 @@ nv04_crtc_page_flip(struct drm_crtc *crtc, struct drm_framebuffer *fb,
cli = chan->cli;
push = &chan->chan.push;
- s = kzalloc_obj(*s, GFP_KERNEL);
+ s = kzalloc_obj(*s);
if (!s)
return -ENOMEM;
@@ -1291,7 +1291,7 @@ nv04_crtc_create(struct drm_device *dev, int crtc_num)
struct drm_plane *primary;
int ret;
- nv_crtc = kzalloc_obj(*nv_crtc, GFP_KERNEL);
+ nv_crtc = kzalloc_obj(*nv_crtc);
if (!nv_crtc)
return -ENOMEM;
diff --git a/drivers/gpu/drm/nouveau/dispnv04/dac.c b/drivers/gpu/drm/nouveau/dispnv04/dac.c
index 4137e694a7b6..22f903258f96 100644
--- a/drivers/gpu/drm/nouveau/dispnv04/dac.c
+++ b/drivers/gpu/drm/nouveau/dispnv04/dac.c
@@ -532,7 +532,7 @@ nv04_dac_create(struct drm_connector *connector, struct dcb_output *entry)
struct drm_device *dev = connector->dev;
struct drm_encoder *encoder;
- nv_encoder = kzalloc_obj(*nv_encoder, GFP_KERNEL);
+ nv_encoder = kzalloc_obj(*nv_encoder);
if (!nv_encoder)
return -ENOMEM;
diff --git a/drivers/gpu/drm/nouveau/dispnv04/dfp.c b/drivers/gpu/drm/nouveau/dispnv04/dfp.c
index a1cfc8e562d9..c9f96ec8455d 100644
--- a/drivers/gpu/drm/nouveau/dispnv04/dfp.c
+++ b/drivers/gpu/drm/nouveau/dispnv04/dfp.c
@@ -697,7 +697,7 @@ nv04_dfp_create(struct drm_connector *connector, struct dcb_output *entry)
return -EINVAL;
}
- nv_encoder = kzalloc_obj(*nv_encoder, GFP_KERNEL);
+ nv_encoder = kzalloc_obj(*nv_encoder);
if (!nv_encoder)
return -ENOMEM;
diff --git a/drivers/gpu/drm/nouveau/dispnv04/i2c/ch7006_drv.c b/drivers/gpu/drm/nouveau/dispnv04/i2c/ch7006_drv.c
index 369646b00802..976ed59a86e4 100644
--- a/drivers/gpu/drm/nouveau/dispnv04/i2c/ch7006_drv.c
+++ b/drivers/gpu/drm/nouveau/dispnv04/i2c/ch7006_drv.c
@@ -444,7 +444,7 @@ static int ch7006_encoder_init(struct i2c_client *client,
ch7006_dbg(client, "\n");
- priv = kzalloc_obj(*priv, GFP_KERNEL);
+ priv = kzalloc_obj(*priv);
if (!priv)
return -ENOMEM;
diff --git a/drivers/gpu/drm/nouveau/dispnv04/i2c/sil164_drv.c b/drivers/gpu/drm/nouveau/dispnv04/i2c/sil164_drv.c
index 1af644b20b0b..7f402b901977 100644
--- a/drivers/gpu/drm/nouveau/dispnv04/i2c/sil164_drv.c
+++ b/drivers/gpu/drm/nouveau/dispnv04/i2c/sil164_drv.c
@@ -399,7 +399,7 @@ sil164_encoder_init(struct i2c_client *client,
struct sil164_priv *priv;
struct i2c_client *slave_client;
- priv = kzalloc_obj(*priv, GFP_KERNEL);
+ priv = kzalloc_obj(*priv);
if (!priv)
return -ENOMEM;
diff --git a/drivers/gpu/drm/nouveau/dispnv04/tvnv04.c b/drivers/gpu/drm/nouveau/dispnv04/tvnv04.c
index 3ddcffe5c58e..9e1d4b353680 100644
--- a/drivers/gpu/drm/nouveau/dispnv04/tvnv04.c
+++ b/drivers/gpu/drm/nouveau/dispnv04/tvnv04.c
@@ -215,7 +215,7 @@ nv04_tv_create(struct drm_connector *connector, struct dcb_output *entry)
return type;
/* Allocate the necessary memory */
- nv_encoder = kzalloc_obj(*nv_encoder, GFP_KERNEL);
+ nv_encoder = kzalloc_obj(*nv_encoder);
if (!nv_encoder)
return -ENOMEM;
diff --git a/drivers/gpu/drm/nouveau/dispnv04/tvnv17.c b/drivers/gpu/drm/nouveau/dispnv04/tvnv17.c
index 8d252e8013b6..2721a2e0c885 100644
--- a/drivers/gpu/drm/nouveau/dispnv04/tvnv17.c
+++ b/drivers/gpu/drm/nouveau/dispnv04/tvnv17.c
@@ -797,7 +797,7 @@ nv17_tv_create(struct drm_connector *connector, struct dcb_output *entry)
struct drm_encoder *encoder;
struct nv17_tv_encoder *tv_enc = NULL;
- tv_enc = kzalloc_obj(*tv_enc, GFP_KERNEL);
+ tv_enc = kzalloc_obj(*tv_enc);
if (!tv_enc)
return -ENOMEM;
diff --git a/drivers/gpu/drm/nouveau/dispnv50/core507d.c b/drivers/gpu/drm/nouveau/dispnv50/core507d.c
index 8997e53fd2be..46c945480522 100644
--- a/drivers/gpu/drm/nouveau/dispnv50/core507d.c
+++ b/drivers/gpu/drm/nouveau/dispnv50/core507d.c
@@ -162,7 +162,7 @@ core507d_new_(const struct nv50_core_func *func, struct nouveau_drm *drm,
struct nv50_core *core;
int ret;
- if (!(core = *pcore = kzalloc_obj(*core, GFP_KERNEL)))
+ if (!(core = *pcore = kzalloc_obj(*core)))
return -ENOMEM;
core->func = func;
core->disp = disp;
diff --git a/drivers/gpu/drm/nouveau/dispnv50/disp.c b/drivers/gpu/drm/nouveau/dispnv50/disp.c
index c4c5ba876775..6c3a8712d38a 100644
--- a/drivers/gpu/drm/nouveau/dispnv50/disp.c
+++ b/drivers/gpu/drm/nouveau/dispnv50/disp.c
@@ -1115,7 +1115,7 @@ nv50_msto_new(struct drm_device *dev, struct nv50_head *head, int id)
struct nv50_msto *msto;
int ret;
- msto = kzalloc_obj(*msto, GFP_KERNEL);
+ msto = kzalloc_obj(*msto);
if (!msto)
return ERR_PTR(-ENOMEM);
@@ -1267,7 +1267,7 @@ nv50_mstc_new(struct nv50_mstm *mstm, struct drm_dp_mst_port *port,
struct nv50_mstc *mstc;
int ret;
- if (!(mstc = *pmstc = kzalloc_obj(*mstc, GFP_KERNEL)))
+ if (!(mstc = *pmstc = kzalloc_obj(*mstc)))
return -ENOMEM;
mstc->mstm = mstm;
mstc->port = port;
@@ -1520,7 +1520,7 @@ nv50_mstm_new(struct nouveau_encoder *outp, struct drm_dp_aux *aux, int aux_max,
struct nv50_mstm *mstm;
int ret;
- if (!(mstm = *pmstm = kzalloc_obj(*mstm, GFP_KERNEL)))
+ if (!(mstm = *pmstm = kzalloc_obj(*mstm)))
return -ENOMEM;
mstm->outp = outp;
mstm->mgr.cbs = &nv50_mstm;
@@ -2496,7 +2496,7 @@ nv50_disp_outp_atomic_add(struct nv50_atom *atom, struct drm_encoder *encoder)
return outp;
}
- outp = kzalloc_obj(*outp, GFP_KERNEL);
+ outp = kzalloc_obj(*outp);
if (!outp)
return ERR_PTR(-ENOMEM);
@@ -2643,7 +2643,7 @@ static struct drm_atomic_state *
nv50_disp_atomic_state_alloc(struct drm_device *dev)
{
struct nv50_atom *atom;
- if (!(atom = kzalloc_obj(*atom, GFP_KERNEL)) ||
+ if (!(atom = kzalloc_obj(*atom)) ||
drm_atomic_state_init(dev, &atom->state) < 0) {
kfree(atom);
return NULL;
@@ -2833,7 +2833,7 @@ nv50_display_create(struct drm_device *dev)
int ret, i;
bool has_mst = false;
- disp = kzalloc_obj(*disp, GFP_KERNEL);
+ disp = kzalloc_obj(*disp);
if (!disp)
return -ENOMEM;
@@ -2900,7 +2900,7 @@ nv50_display_create(struct drm_device *dev)
for_each_set_bit(i, &disp->disp->outp_mask, sizeof(disp->disp->outp_mask) * 8) {
struct nouveau_encoder *outp;
- outp = kzalloc_obj(*outp, GFP_KERNEL);
+ outp = kzalloc_obj(*outp);
if (!outp)
break;
@@ -2921,7 +2921,7 @@ nv50_display_create(struct drm_device *dev)
outp->base.base.possible_clones = 0;
outp->conn = nouveau_connector(connector);
- outp->dcb = kzalloc_obj(*outp->dcb, GFP_KERNEL);
+ outp->dcb = kzalloc_obj(*outp->dcb);
if (!outp->dcb)
break;
diff --git a/drivers/gpu/drm/nouveau/dispnv50/head.c b/drivers/gpu/drm/nouveau/dispnv50/head.c
index 3f1b3c6cc7d9..4ca7700fb784 100644
--- a/drivers/gpu/drm/nouveau/dispnv50/head.c
+++ b/drivers/gpu/drm/nouveau/dispnv50/head.c
@@ -470,7 +470,7 @@ nv50_head_atomic_duplicate_state(struct drm_crtc *crtc)
{
struct nv50_head_atom *armh = nv50_head_atom(crtc->state);
struct nv50_head_atom *asyh;
- if (!(asyh = kmalloc_obj(*asyh, GFP_KERNEL)))
+ if (!(asyh = kmalloc_obj(*asyh)))
return NULL;
__drm_atomic_helper_crtc_duplicate_state(crtc, &asyh->state);
asyh->wndw = armh->wndw;
@@ -496,7 +496,7 @@ nv50_head_reset(struct drm_crtc *crtc)
{
struct nv50_head_atom *asyh;
- if (WARN_ON(!(asyh = kzalloc_obj(*asyh, GFP_KERNEL))))
+ if (WARN_ON(!(asyh = kzalloc_obj(*asyh))))
return;
if (crtc->state)
@@ -577,7 +577,7 @@ nv50_head_create(struct drm_device *dev, int index)
const struct drm_crtc_funcs *funcs;
int ret;
- head = kzalloc_obj(*head, GFP_KERNEL);
+ head = kzalloc_obj(*head);
if (!head)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/gpu/drm/nouveau/dispnv50/lut.c b/drivers/gpu/drm/nouveau/dispnv50/lut.c
index e07060917cc0..d9db2486ef6e 100644
--- a/drivers/gpu/drm/nouveau/dispnv50/lut.c
+++ b/drivers/gpu/drm/nouveau/dispnv50/lut.c
@@ -38,7 +38,7 @@ nv50_lut_load(struct nv50_lut *lut, int buffer, struct drm_property_blob *blob,
int i;
if (!in) {
- in = kvmalloc_objs(*in, 1024, GFP_KERNEL);
+ in = kvmalloc_objs(*in, 1024);
if (!WARN_ON(!in)) {
for (i = 0; i < 1024; i++) {
in[i].red =
diff --git a/drivers/gpu/drm/nouveau/dispnv50/wndw.c b/drivers/gpu/drm/nouveau/dispnv50/wndw.c
index 54b4252f4f49..9ad4973716f7 100644
--- a/drivers/gpu/drm/nouveau/dispnv50/wndw.c
+++ b/drivers/gpu/drm/nouveau/dispnv50/wndw.c
@@ -80,7 +80,7 @@ nv50_wndw_ctxdma_new(struct nv50_wndw *wndw, struct drm_framebuffer *fb)
return ctxdma;
}
- if (!(ctxdma = kzalloc_obj(*ctxdma, GFP_KERNEL)))
+ if (!(ctxdma = kzalloc_obj(*ctxdma)))
return ERR_PTR(-ENOMEM);
list_add(&ctxdma->head, &wndw->ctxdma.list);
@@ -730,7 +730,7 @@ nv50_wndw_atomic_duplicate_state(struct drm_plane *plane)
{
struct nv50_wndw_atom *armw = nv50_wndw_atom(plane->state);
struct nv50_wndw_atom *asyw;
- if (!(asyw = kmalloc_obj(*asyw, GFP_KERNEL)))
+ if (!(asyw = kmalloc_obj(*asyw)))
return NULL;
__drm_atomic_helper_plane_duplicate_state(plane, &asyw->state);
asyw->sema = armw->sema;
@@ -757,7 +757,7 @@ nv50_wndw_reset(struct drm_plane *plane)
{
struct nv50_wndw_atom *asyw;
- if (WARN_ON(!(asyw = kzalloc_obj(*asyw, GFP_KERNEL))))
+ if (WARN_ON(!(asyw = kzalloc_obj(*asyw))))
return;
if (plane->state)
@@ -863,7 +863,7 @@ nv50_wndw_new_(const struct nv50_wndw_func *func, struct drm_device *dev,
int nformat;
int ret;
- if (!(wndw = *pwndw = kzalloc_obj(*wndw, GFP_KERNEL)))
+ if (!(wndw = *pwndw = kzalloc_obj(*wndw)))
return -ENOMEM;
wndw->func = func;
wndw->id = index;
diff --git a/drivers/gpu/drm/nouveau/nouveau_abi16.c b/drivers/gpu/drm/nouveau/nouveau_abi16.c
index 8c0cfab73f8f..f9201f2e73a3 100644
--- a/drivers/gpu/drm/nouveau/nouveau_abi16.c
+++ b/drivers/gpu/drm/nouveau/nouveau_abi16.c
@@ -44,7 +44,7 @@ nouveau_abi16(struct drm_file *file_priv)
struct nouveau_cli *cli = nouveau_cli(file_priv);
if (!cli->abi16) {
struct nouveau_abi16 *abi16;
- cli->abi16 = abi16 = kzalloc_obj(*abi16, GFP_KERNEL);
+ cli->abi16 = abi16 = kzalloc_obj(*abi16);
if (cli->abi16) {
abi16->cli = cli;
INIT_LIST_HEAD(&abi16->channels);
@@ -124,7 +124,7 @@ nouveau_abi16_obj_new(struct nouveau_abi16 *abi16, enum nouveau_abi16_obj_type t
if (obj)
return ERR_PTR(-EEXIST);
- obj = kzalloc_obj(*obj, GFP_KERNEL);
+ obj = kzalloc_obj(*obj);
if (!obj)
return ERR_PTR(-ENOMEM);
@@ -397,7 +397,7 @@ nouveau_abi16_ioctl_channel_alloc(ABI16_IOCTL_ARGS)
return nouveau_abi16_put(abi16, -EINVAL);
/* allocate "abi16 channel" data and make up a handle for it */
- chan = kzalloc_obj(*chan, GFP_KERNEL);
+ chan = kzalloc_obj(*chan);
if (!chan)
return nouveau_abi16_put(abi16, -ENOMEM);
@@ -597,7 +597,7 @@ nouveau_abi16_ioctl_grobj_alloc(ABI16_IOCTL_ARGS)
if (!oclass)
return nouveau_abi16_put(abi16, -EINVAL);
- ntfy = kzalloc_obj(*ntfy, GFP_KERNEL);
+ ntfy = kzalloc_obj(*ntfy);
if (!ntfy)
return nouveau_abi16_put(abi16, -ENOMEM);
@@ -635,7 +635,7 @@ nouveau_abi16_ioctl_notifierobj_alloc(ABI16_IOCTL_ARGS)
if (!chan)
return nouveau_abi16_put(abi16, -ENOENT);
- ntfy = kzalloc_obj(*ntfy, GFP_KERNEL);
+ ntfy = kzalloc_obj(*ntfy);
if (!ntfy)
return nouveau_abi16_put(abi16, -ENOMEM);
diff --git a/drivers/gpu/drm/nouveau/nouveau_backlight.c b/drivers/gpu/drm/nouveau/nouveau_backlight.c
index 1ddc8d1817f6..da1ee24a2531 100644
--- a/drivers/gpu/drm/nouveau/nouveau_backlight.c
+++ b/drivers/gpu/drm/nouveau/nouveau_backlight.c
@@ -314,7 +314,7 @@ nouveau_backlight_init(struct drm_connector *connector)
if (!nv_encoder)
return 0;
- bl = kzalloc_obj(*bl, GFP_KERNEL);
+ bl = kzalloc_obj(*bl);
if (!bl)
return -ENOMEM;
diff --git a/drivers/gpu/drm/nouveau/nouveau_bo.c b/drivers/gpu/drm/nouveau/nouveau_bo.c
index 710f0551e091..3c7d2e5b3850 100644
--- a/drivers/gpu/drm/nouveau/nouveau_bo.c
+++ b/drivers/gpu/drm/nouveau/nouveau_bo.c
@@ -222,7 +222,7 @@ nouveau_bo_alloc(struct nouveau_cli *cli, u64 *size, int *align, u32 domain,
return ERR_PTR(-EINVAL);
}
- nvbo = kzalloc_obj(struct nouveau_bo, GFP_KERNEL);
+ nvbo = kzalloc_obj(struct nouveau_bo);
if (!nvbo)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/gpu/drm/nouveau/nouveau_chan.c b/drivers/gpu/drm/nouveau/nouveau_chan.c
index 5b94aa9c1d9d..598513f60449 100644
--- a/drivers/gpu/drm/nouveau/nouveau_chan.c
+++ b/drivers/gpu/drm/nouveau/nouveau_chan.c
@@ -149,7 +149,7 @@ nouveau_channel_prep(struct nouveau_cli *cli,
u32 target;
int ret;
- chan = *pchan = kzalloc_obj(*chan, GFP_KERNEL);
+ chan = *pchan = kzalloc_obj(*chan);
if (!chan)
return -ENOMEM;
@@ -545,7 +545,7 @@ nouveau_channels_init(struct nouveau_drm *drm)
drm->chan_nr = drm->chan_total = channels->data;
drm->runl_nr = fls64(runlists->data);
- drm->runl = kzalloc_objs(*drm->runl, drm->runl_nr, GFP_KERNEL);
+ drm->runl = kzalloc_objs(*drm->runl, drm->runl_nr);
if (!drm->runl)
return -ENOMEM;
diff --git a/drivers/gpu/drm/nouveau/nouveau_connector.c b/drivers/gpu/drm/nouveau/nouveau_connector.c
index a8250d04eaf4..00d4530aea71 100644
--- a/drivers/gpu/drm/nouveau/nouveau_connector.c
+++ b/drivers/gpu/drm/nouveau/nouveau_connector.c
@@ -232,7 +232,7 @@ nouveau_conn_atomic_duplicate_state(struct drm_connector *connector)
{
struct nouveau_conn_atom *armc = nouveau_conn_atom(connector->state);
struct nouveau_conn_atom *asyc;
- if (!(asyc = kmalloc_obj(*asyc, GFP_KERNEL)))
+ if (!(asyc = kmalloc_obj(*asyc)))
return NULL;
__drm_atomic_helper_connector_duplicate_state(connector, &asyc->state);
asyc->dither = armc->dither;
@@ -249,7 +249,7 @@ nouveau_conn_reset(struct drm_connector *connector)
struct nouveau_conn_atom *asyc;
if (drm_drv_uses_atomic_modeset(connector->dev)) {
- if (WARN_ON(!(asyc = kzalloc_obj(*asyc, GFP_KERNEL))))
+ if (WARN_ON(!(asyc = kzalloc_obj(*asyc))))
return;
if (connector->state)
@@ -1298,7 +1298,7 @@ nouveau_connector_create(struct drm_device *dev, int index)
}
drm_connector_list_iter_end(&conn_iter);
- nv_connector = kzalloc_obj(*nv_connector, GFP_KERNEL);
+ nv_connector = kzalloc_obj(*nv_connector);
if (!nv_connector)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/gpu/drm/nouveau/nouveau_debugfs.c b/drivers/gpu/drm/nouveau/nouveau_debugfs.c
index cb7c77f5a9a8..47d5579c568d 100644
--- a/drivers/gpu/drm/nouveau/nouveau_debugfs.c
+++ b/drivers/gpu/drm/nouveau/nouveau_debugfs.c
@@ -295,7 +295,7 @@ nouveau_drm_debugfs_init(struct drm_minor *minor)
int
nouveau_debugfs_init(struct nouveau_drm *drm)
{
- drm->debugfs = kzalloc_obj(*drm->debugfs, GFP_KERNEL);
+ drm->debugfs = kzalloc_obj(*drm->debugfs);
if (!drm->debugfs)
return -ENOMEM;
diff --git a/drivers/gpu/drm/nouveau/nouveau_display.c b/drivers/gpu/drm/nouveau/nouveau_display.c
index ff51329c5565..d71dcfc6ee66 100644
--- a/drivers/gpu/drm/nouveau/nouveau_display.c
+++ b/drivers/gpu/drm/nouveau/nouveau_display.c
@@ -316,7 +316,7 @@ nouveau_framebuffer_new(struct drm_device *dev,
}
}
- if (!(fb = *pfb = kzalloc_obj(*fb, GFP_KERNEL)))
+ if (!(fb = *pfb = kzalloc_obj(*fb)))
return -ENOMEM;
drm_helper_mode_fill_fb_struct(dev, fb, info, mode_cmd);
@@ -646,7 +646,7 @@ nouveau_display_create(struct drm_device *dev)
struct nouveau_display *disp;
int ret;
- disp = drm->display = kzalloc_obj(*disp, GFP_KERNEL);
+ disp = drm->display = kzalloc_obj(*disp);
if (!disp)
return -ENOMEM;
diff --git a/drivers/gpu/drm/nouveau/nouveau_dmem.c b/drivers/gpu/drm/nouveau/nouveau_dmem.c
index dbc87f8e64f9..9442ec6e1f6c 100644
--- a/drivers/gpu/drm/nouveau/nouveau_dmem.c
+++ b/drivers/gpu/drm/nouveau/nouveau_dmem.c
@@ -303,7 +303,7 @@ nouveau_dmem_chunk_alloc(struct nouveau_drm *drm, struct page **ppage,
unsigned long i, pfn_first, pfn;
int ret;
- chunk = kzalloc_obj(*chunk, GFP_KERNEL);
+ chunk = kzalloc_obj(*chunk);
if (chunk == NULL) {
ret = -ENOMEM;
goto out;
@@ -707,7 +707,7 @@ nouveau_dmem_init(struct nouveau_drm *drm)
if (drm->client.device.info.family < NV_DEVICE_INFO_V0_PASCAL)
return;
- if (!(drm->dmem = kzalloc_obj(*drm->dmem, GFP_KERNEL)))
+ if (!(drm->dmem = kzalloc_obj(*drm->dmem)))
return;
drm->dmem->drm = drm;
@@ -855,7 +855,7 @@ nouveau_dmem_migrate_vma(struct nouveau_drm *drm,
if (!args.dst)
goto out_free_src;
- dma_info = kmalloc_objs(*dma_info, max, GFP_KERNEL);
+ dma_info = kmalloc_objs(*dma_info, max);
if (!dma_info)
goto out_free_dst;
diff --git a/drivers/gpu/drm/nouveau/nouveau_drm.c b/drivers/gpu/drm/nouveau/nouveau_drm.c
index f5cfac289983..915f73279302 100644
--- a/drivers/gpu/drm/nouveau/nouveau_drm.c
+++ b/drivers/gpu/drm/nouveau/nouveau_drm.c
@@ -739,7 +739,7 @@ nouveau_drm_device_new(const struct drm_driver *drm_driver, struct device *paren
struct nouveau_drm *drm;
int ret;
- drm = kzalloc_obj(*drm, GFP_KERNEL);
+ drm = kzalloc_obj(*drm);
if (!drm)
return ERR_PTR(-ENOMEM);
@@ -1203,7 +1203,7 @@ nouveau_drm_open(struct drm_device *dev, struct drm_file *fpriv)
current->comm, pid_nr(rcu_dereference(fpriv->pid)));
rcu_read_unlock();
- if (!(cli = kzalloc_obj(*cli, GFP_KERNEL))) {
+ if (!(cli = kzalloc_obj(*cli))) {
ret = -ENOMEM;
goto done;
}
diff --git a/drivers/gpu/drm/nouveau/nouveau_exec.c b/drivers/gpu/drm/nouveau/nouveau_exec.c
index b0522e97ebb3..c01a01aee32b 100644
--- a/drivers/gpu/drm/nouveau/nouveau_exec.c
+++ b/drivers/gpu/drm/nouveau/nouveau_exec.c
@@ -219,7 +219,7 @@ nouveau_exec_job_init(struct nouveau_exec_job **pjob,
}
}
- job = *pjob = kzalloc_obj(*job, GFP_KERNEL);
+ job = *pjob = kzalloc_obj(*job);
if (!job)
return -ENOMEM;
diff --git a/drivers/gpu/drm/nouveau/nouveau_fence.c b/drivers/gpu/drm/nouveau/nouveau_fence.c
index 6af37c49913f..903d326927ca 100644
--- a/drivers/gpu/drm/nouveau/nouveau_fence.c
+++ b/drivers/gpu/drm/nouveau/nouveau_fence.c
@@ -408,7 +408,7 @@ nouveau_fence_create(struct nouveau_fence **pfence,
if (unlikely(!chan->fence))
return -ENODEV;
- fence = kzalloc_obj(*fence, GFP_KERNEL);
+ fence = kzalloc_obj(*fence);
if (!fence)
return -ENOMEM;
diff --git a/drivers/gpu/drm/nouveau/nouveau_gem.c b/drivers/gpu/drm/nouveau/nouveau_gem.c
index 2ef7cb01a0c9..82621ede42e1 100644
--- a/drivers/gpu/drm/nouveau/nouveau_gem.c
+++ b/drivers/gpu/drm/nouveau/nouveau_gem.c
@@ -168,7 +168,7 @@ nouveau_gem_object_unmap(struct nouveau_bo *nvbo, struct nouveau_vma *vma)
return;
}
- if (!(work = kmalloc_obj(*work, GFP_KERNEL))) {
+ if (!(work = kmalloc_obj(*work))) {
WARN_ON(dma_fence_wait_timeout(fence, false, 2 * HZ) <= 0);
nouveau_gem_object_delete(vma);
return;
diff --git a/drivers/gpu/drm/nouveau/nouveau_hwmon.c b/drivers/gpu/drm/nouveau/nouveau_hwmon.c
index a0f018380744..726397ab035d 100644
--- a/drivers/gpu/drm/nouveau/nouveau_hwmon.c
+++ b/drivers/gpu/drm/nouveau/nouveau_hwmon.c
@@ -678,7 +678,7 @@ nouveau_hwmon_init(struct drm_device *dev)
return 0;
}
- hwmon = drm->hwmon = kzalloc_obj(*hwmon, GFP_KERNEL);
+ hwmon = drm->hwmon = kzalloc_obj(*hwmon);
if (!hwmon)
return -ENOMEM;
hwmon->dev = dev;
diff --git a/drivers/gpu/drm/nouveau/nouveau_led.c b/drivers/gpu/drm/nouveau/nouveau_led.c
index 87397fe57021..19e2110904d1 100644
--- a/drivers/gpu/drm/nouveau/nouveau_led.c
+++ b/drivers/gpu/drm/nouveau/nouveau_led.c
@@ -89,7 +89,7 @@ nouveau_led_init(struct drm_device *dev)
if (nvkm_gpio_find(gpio, 0, DCB_GPIO_LOGO_LED_PWM, 0xff, &logo_led))
return 0;
- drm->led = kzalloc_obj(*drm->led, GFP_KERNEL);
+ drm->led = kzalloc_obj(*drm->led);
if (!drm->led)
return -ENOMEM;
drm->led->dev = dev;
diff --git a/drivers/gpu/drm/nouveau/nouveau_mem.c b/drivers/gpu/drm/nouveau/nouveau_mem.c
index b370158ba3f7..b26c521166f1 100644
--- a/drivers/gpu/drm/nouveau/nouveau_mem.c
+++ b/drivers/gpu/drm/nouveau/nouveau_mem.c
@@ -176,7 +176,7 @@ nouveau_mem_new(struct nouveau_drm *drm, u8 kind, u8 comp,
{
struct nouveau_mem *mem;
- if (!(mem = kzalloc_obj(*mem, GFP_KERNEL)))
+ if (!(mem = kzalloc_obj(*mem)))
return -ENOMEM;
mem->drm = drm;
diff --git a/drivers/gpu/drm/nouveau/nouveau_sched.c b/drivers/gpu/drm/nouveau/nouveau_sched.c
index 402ef5e95ad7..9bd3dc16a467 100644
--- a/drivers/gpu/drm/nouveau/nouveau_sched.c
+++ b/drivers/gpu/drm/nouveau/nouveau_sched.c
@@ -467,7 +467,7 @@ nouveau_sched_create(struct nouveau_sched **psched, struct nouveau_drm *drm,
struct nouveau_sched *sched;
int ret;
- sched = kzalloc_obj(*sched, GFP_KERNEL);
+ sched = kzalloc_obj(*sched);
if (!sched)
return -ENOMEM;
diff --git a/drivers/gpu/drm/nouveau/nouveau_sgdma.c b/drivers/gpu/drm/nouveau/nouveau_sgdma.c
index a22483f68a7c..fa3b4ebf38a8 100644
--- a/drivers/gpu/drm/nouveau/nouveau_sgdma.c
+++ b/drivers/gpu/drm/nouveau/nouveau_sgdma.c
@@ -79,7 +79,7 @@ nouveau_sgdma_create_ttm(struct ttm_buffer_object *bo, uint32_t page_flags)
else
caching = ttm_cached;
- nvbe = kzalloc_obj(*nvbe, GFP_KERNEL);
+ nvbe = kzalloc_obj(*nvbe);
if (!nvbe)
return NULL;
diff --git a/drivers/gpu/drm/nouveau/nouveau_svm.c b/drivers/gpu/drm/nouveau/nouveau_svm.c
index 947601a8955b..72d7290a4394 100644
--- a/drivers/gpu/drm/nouveau/nouveau_svm.c
+++ b/drivers/gpu/drm/nouveau/nouveau_svm.c
@@ -223,7 +223,7 @@ nouveau_svmm_join(struct nouveau_svmm *svmm, u64 inst)
{
struct nouveau_ivmm *ivmm;
if (svmm) {
- if (!(ivmm = kmalloc_obj(*ivmm, GFP_KERNEL)))
+ if (!(ivmm = kmalloc_obj(*ivmm)))
return -ENOMEM;
ivmm->svmm = svmm;
ivmm->inst = inst;
@@ -326,7 +326,7 @@ nouveau_svmm_init(struct drm_device *dev, void *data,
return -ENOSYS;
/* Allocate tracking for SVM-enabled VMM. */
- if (!(svmm = kzalloc_obj(*svmm, GFP_KERNEL)))
+ if (!(svmm = kzalloc_obj(*svmm)))
return -ENOMEM;
svmm->vmm = &cli->svm;
svmm->unmanaged.start = args->unmanaged_addr;
@@ -475,7 +475,7 @@ nouveau_svm_fault_cache(struct nouveau_svm *svm,
nvif_mask(memory, offset + 0x1c, 0x80000000, 0x00000000);
if (!buffer->fault[buffer->fault_nr]) {
- fault = kmalloc_obj(*fault, GFP_KERNEL);
+ fault = kmalloc_obj(*fault);
if (WARN_ON(!fault)) {
nouveau_svm_fault_cancel(svm, inst, hub, gpc, client);
return;
diff --git a/drivers/gpu/drm/nouveau/nouveau_ttm.c b/drivers/gpu/drm/nouveau/nouveau_ttm.c
index 89216d0a8e7e..ad01f922aa86 100644
--- a/drivers/gpu/drm/nouveau/nouveau_ttm.c
+++ b/drivers/gpu/drm/nouveau/nouveau_ttm.c
@@ -181,7 +181,7 @@ static int
nouveau_ttm_init_vram(struct nouveau_drm *drm)
{
if (drm->client.device.info.family >= NV_DEVICE_INFO_V0_TESLA) {
- struct ttm_resource_manager *man = kzalloc_obj(*man, GFP_KERNEL);
+ struct ttm_resource_manager *man = kzalloc_obj(*man);
if (!man)
return -ENOMEM;
@@ -229,7 +229,7 @@ nouveau_ttm_init_gtt(struct nouveau_drm *drm)
return ttm_range_man_init(&drm->ttm.bdev, TTM_PL_TT, true,
size_pages);
- man = kzalloc_obj(*man, GFP_KERNEL);
+ man = kzalloc_obj(*man);
if (!man)
return -ENOMEM;
diff --git a/drivers/gpu/drm/nouveau/nouveau_uvmm.c b/drivers/gpu/drm/nouveau/nouveau_uvmm.c
index caa26db2b04b..36445915aa58 100644
--- a/drivers/gpu/drm/nouveau/nouveau_uvmm.c
+++ b/drivers/gpu/drm/nouveau/nouveau_uvmm.c
@@ -218,7 +218,7 @@ nouveau_uvma_unmap(struct nouveau_uvma *uvma)
static int
nouveau_uvma_alloc(struct nouveau_uvma **puvma)
{
- *puvma = kzalloc_obj(**puvma, GFP_KERNEL);
+ *puvma = kzalloc_obj(**puvma);
if (!*puvma)
return -ENOMEM;
@@ -246,7 +246,7 @@ nouveau_uvma_gem_put(struct nouveau_uvma *uvma)
static int
nouveau_uvma_region_alloc(struct nouveau_uvma_region **preg)
{
- *preg = kzalloc_obj(**preg, GFP_KERNEL);
+ *preg = kzalloc_obj(**preg);
if (!*preg)
return -ENOMEM;
@@ -1020,7 +1020,7 @@ nouveau_uvmm_validate_range(struct nouveau_uvmm *uvmm, u64 addr, u64 range)
static int
nouveau_uvmm_bind_job_alloc(struct nouveau_uvmm_bind_job **pjob)
{
- *pjob = kzalloc_obj(**pjob, GFP_KERNEL);
+ *pjob = kzalloc_obj(**pjob);
if (!*pjob)
return -ENOMEM;
@@ -1618,7 +1618,7 @@ bind_job_op_from_uop(struct bind_job_op **pop,
{
struct bind_job_op *op;
- op = *pop = kzalloc_obj(*op, GFP_KERNEL);
+ op = *pop = kzalloc_obj(*op);
if (!op)
return -ENOMEM;
@@ -1911,7 +1911,7 @@ nouveau_uvmm_ioctl_vm_init(struct drm_device *dev,
goto out_unlock;
}
- uvmm = kzalloc_obj(*uvmm, GFP_KERNEL);
+ uvmm = kzalloc_obj(*uvmm);
if (!uvmm) {
ret = -ENOMEM;
goto out_unlock;
diff --git a/drivers/gpu/drm/nouveau/nouveau_vmm.c b/drivers/gpu/drm/nouveau/nouveau_vmm.c
index a5e8efc3042c..5812f27bfecf 100644
--- a/drivers/gpu/drm/nouveau/nouveau_vmm.c
+++ b/drivers/gpu/drm/nouveau/nouveau_vmm.c
@@ -87,7 +87,7 @@ nouveau_vma_new(struct nouveau_bo *nvbo, struct nouveau_vmm *vmm,
return 0;
}
- if (!(vma = *pvma = kmalloc_obj(*vma, GFP_KERNEL)))
+ if (!(vma = *pvma = kmalloc_obj(*vma)))
return -ENOMEM;
vma->vmm = vmm;
vma->refs = 1;
diff --git a/drivers/gpu/drm/nouveau/nv04_fence.c b/drivers/gpu/drm/nouveau/nv04_fence.c
index 7fa9eede7c5d..a640430944ee 100644
--- a/drivers/gpu/drm/nouveau/nv04_fence.c
+++ b/drivers/gpu/drm/nouveau/nv04_fence.c
@@ -76,7 +76,7 @@ nv04_fence_context_del(struct nouveau_channel *chan)
static int
nv04_fence_context_new(struct nouveau_channel *chan)
{
- struct nv04_fence_chan *fctx = kzalloc_obj(*fctx, GFP_KERNEL);
+ struct nv04_fence_chan *fctx = kzalloc_obj(*fctx);
if (fctx) {
nouveau_fence_context_new(chan, &fctx->base);
fctx->base.emit = nv04_fence_emit;
@@ -101,7 +101,7 @@ nv04_fence_create(struct nouveau_drm *drm)
{
struct nv04_fence_priv *priv;
- priv = drm->fence = kzalloc_obj(*priv, GFP_KERNEL);
+ priv = drm->fence = kzalloc_obj(*priv);
if (!priv)
return -ENOMEM;
diff --git a/drivers/gpu/drm/nouveau/nv10_fence.c b/drivers/gpu/drm/nouveau/nv10_fence.c
index 0f859251d9db..6e88050f41fb 100644
--- a/drivers/gpu/drm/nouveau/nv10_fence.c
+++ b/drivers/gpu/drm/nouveau/nv10_fence.c
@@ -70,7 +70,7 @@ nv10_fence_context_new(struct nouveau_channel *chan)
{
struct nv10_fence_chan *fctx;
- fctx = chan->fence = kzalloc_obj(*fctx, GFP_KERNEL);
+ fctx = chan->fence = kzalloc_obj(*fctx);
if (!fctx)
return -ENOMEM;
@@ -96,7 +96,7 @@ nv10_fence_create(struct nouveau_drm *drm)
{
struct nv10_fence_priv *priv;
- priv = drm->fence = kzalloc_obj(*priv, GFP_KERNEL);
+ priv = drm->fence = kzalloc_obj(*priv);
if (!priv)
return -ENOMEM;
diff --git a/drivers/gpu/drm/nouveau/nv17_fence.c b/drivers/gpu/drm/nouveau/nv17_fence.c
index 56682cb03d81..1e1a01699935 100644
--- a/drivers/gpu/drm/nouveau/nv17_fence.c
+++ b/drivers/gpu/drm/nouveau/nv17_fence.c
@@ -83,7 +83,7 @@ nv17_fence_context_new(struct nouveau_channel *chan)
u32 limit = start + priv->bo->bo.base.size - 1;
int ret = 0;
- fctx = chan->fence = kzalloc_obj(*fctx, GFP_KERNEL);
+ fctx = chan->fence = kzalloc_obj(*fctx);
if (!fctx)
return -ENOMEM;
@@ -120,7 +120,7 @@ nv17_fence_create(struct nouveau_drm *drm)
struct nv10_fence_priv *priv;
int ret = 0;
- priv = drm->fence = kzalloc_obj(*priv, GFP_KERNEL);
+ priv = drm->fence = kzalloc_obj(*priv);
if (!priv)
return -ENOMEM;
diff --git a/drivers/gpu/drm/nouveau/nv50_fence.c b/drivers/gpu/drm/nouveau/nv50_fence.c
index d64c070fe48b..2dd0ef4e6497 100644
--- a/drivers/gpu/drm/nouveau/nv50_fence.c
+++ b/drivers/gpu/drm/nouveau/nv50_fence.c
@@ -42,7 +42,7 @@ nv50_fence_context_new(struct nouveau_channel *chan)
u32 limit = start + priv->bo->bo.base.size - 1;
int ret;
- fctx = chan->fence = kzalloc_obj(*fctx, GFP_KERNEL);
+ fctx = chan->fence = kzalloc_obj(*fctx);
if (!fctx)
return -ENOMEM;
@@ -71,7 +71,7 @@ nv50_fence_create(struct nouveau_drm *drm)
struct nv10_fence_priv *priv;
int ret = 0;
- priv = drm->fence = kzalloc_obj(*priv, GFP_KERNEL);
+ priv = drm->fence = kzalloc_obj(*priv);
if (!priv)
return -ENOMEM;
diff --git a/drivers/gpu/drm/nouveau/nv84_fence.c b/drivers/gpu/drm/nouveau/nv84_fence.c
index 7a2ad00870af..6e5eb279b3a8 100644
--- a/drivers/gpu/drm/nouveau/nv84_fence.c
+++ b/drivers/gpu/drm/nouveau/nv84_fence.c
@@ -131,7 +131,7 @@ nv84_fence_context_new(struct nouveau_channel *chan)
struct nv84_fence_chan *fctx;
int ret;
- fctx = chan->fence = kzalloc_obj(*fctx, GFP_KERNEL);
+ fctx = chan->fence = kzalloc_obj(*fctx);
if (!fctx)
return -ENOMEM;
@@ -198,7 +198,7 @@ nv84_fence_create(struct nouveau_drm *drm)
u32 domain;
int ret;
- priv = drm->fence = kzalloc_obj(*priv, GFP_KERNEL);
+ priv = drm->fence = kzalloc_obj(*priv);
if (!priv)
return -ENOMEM;
diff --git a/drivers/gpu/drm/nouveau/nvif/fifo.c b/drivers/gpu/drm/nouveau/nvif/fifo.c
index b42fc34cb5ce..59b3ba3265fe 100644
--- a/drivers/gpu/drm/nouveau/nvif/fifo.c
+++ b/drivers/gpu/drm/nouveau/nvif/fifo.c
@@ -36,7 +36,7 @@ nvif_fifo_runlists(struct nvif_device *device)
if (device->runlist)
return 0;
- if (!(a = kmalloc_obj(*a, GFP_KERNEL)))
+ if (!(a = kmalloc_obj(*a)))
return -ENOMEM;
a->m.version = 1;
a->m.count = sizeof(a->v) / sizeof(a->v.runlists);
diff --git a/drivers/gpu/drm/nouveau/nvif/mmu.c b/drivers/gpu/drm/nouveau/nvif/mmu.c
index eaa96608a264..e1e902750991 100644
--- a/drivers/gpu/drm/nouveau/nvif/mmu.c
+++ b/drivers/gpu/drm/nouveau/nvif/mmu.c
@@ -69,12 +69,12 @@ nvif_mmu_ctor(struct nvif_object *parent, const char *name, s32 oclass,
goto done;
mmu->mem = mems[ret].oclass;
- mmu->heap = kmalloc_objs(*mmu->heap, mmu->heap_nr, GFP_KERNEL);
- mmu->type = kmalloc_objs(*mmu->type, mmu->type_nr, GFP_KERNEL);
+ mmu->heap = kmalloc_objs(*mmu->heap, mmu->heap_nr);
+ mmu->type = kmalloc_objs(*mmu->type, mmu->type_nr);
if (ret = -ENOMEM, !mmu->heap || !mmu->type)
goto done;
- mmu->kind = kmalloc_objs(*mmu->kind, mmu->kind_nr, GFP_KERNEL);
+ mmu->kind = kmalloc_objs(*mmu->kind, mmu->kind_nr);
if (!mmu->kind && mmu->kind_nr)
goto done;
diff --git a/drivers/gpu/drm/nouveau/nvif/object.c b/drivers/gpu/drm/nouveau/nvif/object.c
index 93ad63f9021f..6d5018a5e93c 100644
--- a/drivers/gpu/drm/nouveau/nvif/object.c
+++ b/drivers/gpu/drm/nouveau/nvif/object.c
@@ -81,7 +81,7 @@ nvif_object_sclass_get(struct nvif_object *object, struct nvif_sclass **psclass)
return ret;
}
- *psclass = kzalloc_objs(**psclass, args->sclass.count, GFP_KERNEL);
+ *psclass = kzalloc_objs(**psclass, args->sclass.count);
if (*psclass) {
for (i = 0; i < args->sclass.count; i++) {
(*psclass)[i].oclass = args->sclass.oclass[i].oclass;
diff --git a/drivers/gpu/drm/nouveau/nvif/outp.c b/drivers/gpu/drm/nouveau/nvif/outp.c
index 567cacc04989..8cf4775a0a1e 100644
--- a/drivers/gpu/drm/nouveau/nvif/outp.c
+++ b/drivers/gpu/drm/nouveau/nvif/outp.c
@@ -438,7 +438,7 @@ nvif_outp_edid_get(struct nvif_outp *outp, u8 **pedid)
struct nvif_outp_edid_get_v0 *args;
int ret;
- args = kmalloc_obj(*args, GFP_KERNEL);
+ args = kmalloc_obj(*args);
if (!args)
return -ENOMEM;
diff --git a/drivers/gpu/drm/nouveau/nvif/vmm.c b/drivers/gpu/drm/nouveau/nvif/vmm.c
index 15e5f423c680..65c3e883b119 100644
--- a/drivers/gpu/drm/nouveau/nvif/vmm.c
+++ b/drivers/gpu/drm/nouveau/nvif/vmm.c
@@ -234,7 +234,7 @@ nvif_vmm_ctor(struct nvif_mmu *mmu, const char *name, s32 oclass,
vmm->limit = args->size;
vmm->page_nr = args->page_nr;
- vmm->page = kmalloc_objs(*vmm->page, vmm->page_nr, GFP_KERNEL);
+ vmm->page = kmalloc_objs(*vmm->page, vmm->page_nr);
if (!vmm->page) {
ret = -ENOMEM;
goto done;
diff --git a/drivers/gpu/drm/nouveau/nvkm/core/client.c b/drivers/gpu/drm/nouveau/nvkm/core/client.c
index 637fa5f89dc7..9590834d3777 100644
--- a/drivers/gpu/drm/nouveau/nvkm/core/client.c
+++ b/drivers/gpu/drm/nouveau/nvkm/core/client.c
@@ -109,7 +109,7 @@ nvkm_client_new(const char *name, u64 device, const char *cfg, const char *dbg,
struct nvkm_oclass oclass = { .base = nvkm_uclient_sclass };
struct nvkm_client *client;
- if (!(client = *pclient = kzalloc_obj(*client, GFP_KERNEL)))
+ if (!(client = *pclient = kzalloc_obj(*client)))
return -ENOMEM;
oclass.client = client;
diff --git a/drivers/gpu/drm/nouveau/nvkm/core/engine.c b/drivers/gpu/drm/nouveau/nvkm/core/engine.c
index 1b94e0aa0f28..b1453bc4ad79 100644
--- a/drivers/gpu/drm/nouveau/nvkm/core/engine.c
+++ b/drivers/gpu/drm/nouveau/nvkm/core/engine.c
@@ -183,7 +183,7 @@ nvkm_engine_new_(const struct nvkm_engine_func *func, struct nvkm_device *device
enum nvkm_subdev_type type, int inst, bool enable,
struct nvkm_engine **pengine)
{
- if (!(*pengine = kzalloc_obj(**pengine, GFP_KERNEL)))
+ if (!(*pengine = kzalloc_obj(**pengine)))
return -ENOMEM;
return nvkm_engine_ctor(func, device, type, inst, enable, *pengine);
}
diff --git a/drivers/gpu/drm/nouveau/nvkm/core/gpuobj.c b/drivers/gpu/drm/nouveau/nvkm/core/gpuobj.c
index a81eddf777ba..8916e31ee210 100644
--- a/drivers/gpu/drm/nouveau/nvkm/core/gpuobj.c
+++ b/drivers/gpu/drm/nouveau/nvkm/core/gpuobj.c
@@ -232,7 +232,7 @@ nvkm_gpuobj_new(struct nvkm_device *device, u32 size, int align, bool zero,
struct nvkm_gpuobj *gpuobj;
int ret;
- if (!(gpuobj = *pgpuobj = kzalloc_obj(*gpuobj, GFP_KERNEL)))
+ if (!(gpuobj = *pgpuobj = kzalloc_obj(*gpuobj)))
return -ENOMEM;
ret = nvkm_gpuobj_ctor(device, size, align, zero, parent, gpuobj);
@@ -249,7 +249,7 @@ nvkm_gpuobj_new(struct nvkm_device *device, u32 size, int align, bool zero,
int
nvkm_gpuobj_wrap(struct nvkm_memory *memory, struct nvkm_gpuobj **pgpuobj)
{
- if (!(*pgpuobj = kzalloc_obj(**pgpuobj, GFP_KERNEL)))
+ if (!(*pgpuobj = kzalloc_obj(**pgpuobj)))
return -ENOMEM;
(*pgpuobj)->addr = nvkm_memory_addr(memory);
diff --git a/drivers/gpu/drm/nouveau/nvkm/core/intr.c b/drivers/gpu/drm/nouveau/nvkm/core/intr.c
index a58de178cdf6..f31aca949e2c 100644
--- a/drivers/gpu/drm/nouveau/nvkm/core/intr.c
+++ b/drivers/gpu/drm/nouveau/nvkm/core/intr.c
@@ -239,8 +239,8 @@ nvkm_intr_add(const struct nvkm_intr_func *func, const struct nvkm_intr_data *da
intr->data = data;
intr->subdev = subdev;
intr->leaves = leaves;
- intr->stat = kzalloc_objs(*intr->stat, leaves, GFP_KERNEL);
- intr->mask = kzalloc_objs(*intr->mask, leaves, GFP_KERNEL);
+ intr->stat = kzalloc_objs(*intr->stat, leaves);
+ intr->mask = kzalloc_objs(*intr->mask, leaves);
if (!intr->stat || !intr->mask) {
kfree(intr->stat);
return -ENOMEM;
diff --git a/drivers/gpu/drm/nouveau/nvkm/core/memory.c b/drivers/gpu/drm/nouveau/nvkm/core/memory.c
index bf69467e44da..548df7b76f02 100644
--- a/drivers/gpu/drm/nouveau/nvkm/core/memory.c
+++ b/drivers/gpu/drm/nouveau/nvkm/core/memory.c
@@ -69,7 +69,7 @@ nvkm_memory_tags_get(struct nvkm_memory *memory, struct nvkm_device *device,
return 0;
}
- if (!(tags = kmalloc_obj(*tags, GFP_KERNEL))) {
+ if (!(tags = kmalloc_obj(*tags))) {
mutex_unlock(&fb->tags.mutex);
return -ENOMEM;
}
diff --git a/drivers/gpu/drm/nouveau/nvkm/core/mm.c b/drivers/gpu/drm/nouveau/nvkm/core/mm.c
index bd47502d82ae..cc32003086a0 100644
--- a/drivers/gpu/drm/nouveau/nvkm/core/mm.c
+++ b/drivers/gpu/drm/nouveau/nvkm/core/mm.c
@@ -90,7 +90,7 @@ region_head(struct nvkm_mm *mm, struct nvkm_mm_node *a, u32 size)
if (a->length == size)
return a;
- b = kmalloc_obj(*b, GFP_KERNEL);
+ b = kmalloc_obj(*b);
if (unlikely(b == NULL))
return NULL;
@@ -165,7 +165,7 @@ region_tail(struct nvkm_mm *mm, struct nvkm_mm_node *a, u32 size)
if (a->length == size)
return a;
- b = kmalloc_obj(*b, GFP_KERNEL);
+ b = kmalloc_obj(*b);
if (unlikely(b == NULL))
return NULL;
@@ -247,7 +247,7 @@ nvkm_mm_init(struct nvkm_mm *mm, u8 heap, u32 offset, u32 length, u32 block)
next = prev->offset + prev->length;
if (next != offset) {
BUG_ON(next > offset);
- if (!(node = kzalloc_obj(*node, GFP_KERNEL)))
+ if (!(node = kzalloc_obj(*node)))
return -ENOMEM;
node->type = NVKM_MM_TYPE_HOLE;
node->offset = next;
@@ -262,7 +262,7 @@ nvkm_mm_init(struct nvkm_mm *mm, u8 heap, u32 offset, u32 length, u32 block)
mm->heap_nodes = 0;
}
- node = kzalloc_obj(*node, GFP_KERNEL);
+ node = kzalloc_obj(*node);
if (!node)
return -ENOMEM;
diff --git a/drivers/gpu/drm/nouveau/nvkm/core/object.c b/drivers/gpu/drm/nouveau/nvkm/core/object.c
index 6e84cf72bfc8..d2f827b9a435 100644
--- a/drivers/gpu/drm/nouveau/nvkm/core/object.c
+++ b/drivers/gpu/drm/nouveau/nvkm/core/object.c
@@ -290,7 +290,7 @@ nvkm_object_new_(const struct nvkm_object_func *func,
struct nvkm_object **pobject)
{
if (size == 0) {
- if (!(*pobject = kzalloc_obj(**pobject, GFP_KERNEL)))
+ if (!(*pobject = kzalloc_obj(**pobject)))
return -ENOMEM;
nvkm_object_ctor(func, oclass, *pobject);
return 0;
diff --git a/drivers/gpu/drm/nouveau/nvkm/core/oproxy.c b/drivers/gpu/drm/nouveau/nvkm/core/oproxy.c
index bfa9821b3ac4..27406ac3171a 100644
--- a/drivers/gpu/drm/nouveau/nvkm/core/oproxy.c
+++ b/drivers/gpu/drm/nouveau/nvkm/core/oproxy.c
@@ -178,7 +178,7 @@ int
nvkm_oproxy_new_(const struct nvkm_oproxy_func *func,
const struct nvkm_oclass *oclass, struct nvkm_oproxy **poproxy)
{
- if (!(*poproxy = kzalloc_obj(**poproxy, GFP_KERNEL)))
+ if (!(*poproxy = kzalloc_obj(**poproxy)))
return -ENOMEM;
nvkm_oproxy_ctor(func, oclass, *poproxy);
return 0;
diff --git a/drivers/gpu/drm/nouveau/nvkm/core/subdev.c b/drivers/gpu/drm/nouveau/nvkm/core/subdev.c
index 97f5db788ba6..aab5a73f467a 100644
--- a/drivers/gpu/drm/nouveau/nvkm/core/subdev.c
+++ b/drivers/gpu/drm/nouveau/nvkm/core/subdev.c
@@ -280,7 +280,7 @@ int
nvkm_subdev_new_(const struct nvkm_subdev_func *func, struct nvkm_device *device,
enum nvkm_subdev_type type, int inst, struct nvkm_subdev **psubdev)
{
- if (!(*psubdev = kzalloc_obj(**psubdev, GFP_KERNEL)))
+ if (!(*psubdev = kzalloc_obj(**psubdev)))
return -ENOMEM;
nvkm_subdev_ctor(func, device, type, inst, *psubdev);
return 0;
diff --git a/drivers/gpu/drm/nouveau/nvkm/core/uevent.c b/drivers/gpu/drm/nouveau/nvkm/core/uevent.c
index 5295b2b920e6..81ab29fffbf4 100644
--- a/drivers/gpu/drm/nouveau/nvkm/core/uevent.c
+++ b/drivers/gpu/drm/nouveau/nvkm/core/uevent.c
@@ -144,7 +144,7 @@ nvkm_uevent_new(const struct nvkm_oclass *oclass, void *argv, u32 argc,
if (argc < sizeof(args->v0) || args->v0.version != 0)
return -ENOSYS;
- if (!(uevent = kzalloc_obj(*uevent, GFP_KERNEL)))
+ if (!(uevent = kzalloc_obj(*uevent)))
return -ENOMEM;
*pobject = &uevent->object;
diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/device/ctrl.c b/drivers/gpu/drm/nouveau/nvkm/engine/device/ctrl.c
index 4d09157fd7c0..f2e9a06263ce 100644
--- a/drivers/gpu/drm/nouveau/nvkm/engine/device/ctrl.c
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/device/ctrl.c
@@ -194,7 +194,7 @@ nvkm_control_new(struct nvkm_device *device, const struct nvkm_oclass *oclass,
{
struct nvkm_control *ctrl;
- if (!(ctrl = kzalloc_obj(*ctrl, GFP_KERNEL)))
+ if (!(ctrl = kzalloc_obj(*ctrl)))
return -ENOMEM;
*pobject = &ctrl->object;
ctrl->device = device;
diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/device/pci.c b/drivers/gpu/drm/nouveau/nvkm/engine/device/pci.c
index 1e7b4a455049..248623b91e29 100644
--- a/drivers/gpu/drm/nouveau/nvkm/engine/device/pci.c
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/device/pci.c
@@ -1688,7 +1688,7 @@ nvkm_device_pci_new(struct pci_dev *pci_dev, const char *cfg, const char *dbg,
pcid++;
}
- if (!(pdev = kzalloc_obj(*pdev, GFP_KERNEL))) {
+ if (!(pdev = kzalloc_obj(*pdev))) {
pci_disable_device(pci_dev);
return -ENOMEM;
}
diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/device/tegra.c b/drivers/gpu/drm/nouveau/nvkm/engine/device/tegra.c
index d49d92fa4648..46bb55a1f565 100644
--- a/drivers/gpu/drm/nouveau/nvkm/engine/device/tegra.c
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/device/tegra.c
@@ -253,7 +253,7 @@ nvkm_device_tegra_new(const struct nvkm_device_tegra_func *func,
unsigned long rate;
int ret;
- if (!(tdev = kzalloc_obj(*tdev, GFP_KERNEL)))
+ if (!(tdev = kzalloc_obj(*tdev)))
return -ENOMEM;
tdev->func = func;
diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/device/user.c b/drivers/gpu/drm/nouveau/nvkm/engine/device/user.c
index 7dea6bf31b10..23d11d8221cb 100644
--- a/drivers/gpu/drm/nouveau/nvkm/engine/device/user.c
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/device/user.c
@@ -327,7 +327,7 @@ nvkm_udevice_new(const struct nvkm_oclass *oclass, void *data, u32 size,
struct nvkm_client *client = oclass->client;
struct nvkm_udevice *udev;
- if (!(udev = kzalloc_obj(*udev, GFP_KERNEL)))
+ if (!(udev = kzalloc_obj(*udev)))
return -ENOMEM;
nvkm_object_ctor(&nvkm_udevice, oclass, &udev->object);
*pobject = &udev->object;
diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/disp/base.c b/drivers/gpu/drm/nouveau/nvkm/engine/disp/base.c
index d25ef27ccf5d..d44c4316a578 100644
--- a/drivers/gpu/drm/nouveau/nvkm/engine/disp/base.c
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/disp/base.c
@@ -232,7 +232,7 @@ nvkm_disp_new_(const struct nvkm_disp_func *func, struct nvkm_device *device,
struct nvkm_disp *disp;
int ret;
- if (!(disp = *pdisp = kzalloc_obj(**pdisp, GFP_KERNEL)))
+ if (!(disp = *pdisp = kzalloc_obj(**pdisp)))
return -ENOMEM;
disp->func = func;
diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/disp/chan.c b/drivers/gpu/drm/nouveau/nvkm/engine/disp/chan.c
index 9b7148ce8d1b..a8f72abbb371 100644
--- a/drivers/gpu/drm/nouveau/nvkm/engine/disp/chan.c
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/disp/chan.c
@@ -86,7 +86,7 @@ nvkm_disp_chan_child_new(const struct nvkm_oclass *oclass, void *argv, u32 argc,
struct nvkm_disp_chan_object *object;
int ret;
- if (!(object = kzalloc_obj(*object, GFP_KERNEL)))
+ if (!(object = kzalloc_obj(*object)))
return -ENOMEM;
nvkm_oproxy_ctor(&nvkm_disp_chan_child_func_, oclass, &object->oproxy);
object->disp = disp;
@@ -195,7 +195,7 @@ nvkm_disp_chan_new_(struct nvkm_disp *disp, int nr, const struct nvkm_oclass *oc
if (args->v0.id >= nr || !args->v0.pushbuf != !user->func->push)
return -EINVAL;
- if (!(chan = kzalloc_obj(*chan, GFP_KERNEL)))
+ if (!(chan = kzalloc_obj(*chan)))
return -ENOMEM;
*pobject = &chan->object;
diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/disp/conn.c b/drivers/gpu/drm/nouveau/nvkm/engine/disp/conn.c
index e4cfb172c383..e4e238aa514b 100644
--- a/drivers/gpu/drm/nouveau/nvkm/engine/disp/conn.c
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/disp/conn.c
@@ -78,7 +78,7 @@ int
nvkm_conn_new(struct nvkm_disp *disp, int index, struct nvbios_connE *info,
struct nvkm_conn **pconn)
{
- if (!(*pconn = kzalloc_obj(**pconn, GFP_KERNEL)))
+ if (!(*pconn = kzalloc_obj(**pconn)))
return -ENOMEM;
nvkm_conn_ctor(disp, index, info, *pconn);
return 0;
diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/disp/gv100.c b/drivers/gpu/drm/nouveau/nvkm/engine/disp/gv100.c
index bf79076081f6..dbd984da7501 100644
--- a/drivers/gpu/drm/nouveau/nvkm/engine/disp/gv100.c
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/disp/gv100.c
@@ -822,7 +822,7 @@ gv100_disp_caps_new(const struct nvkm_oclass *oclass, void *argv, u32 argc,
struct nvkm_disp *disp = nvkm_udisp(oclass->parent);
struct gv100_disp_caps *caps;
- if (!(caps = kzalloc_obj(*caps, GFP_KERNEL)))
+ if (!(caps = kzalloc_obj(*caps)))
return -ENOMEM;
*pobject = &caps->object;
diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/disp/head.c b/drivers/gpu/drm/nouveau/nvkm/engine/disp/head.c
index ffe2ec55a15a..c70cbbe418a3 100644
--- a/drivers/gpu/drm/nouveau/nvkm/engine/disp/head.c
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/disp/head.c
@@ -56,7 +56,7 @@ nvkm_head_new_(const struct nvkm_head_func *func,
struct nvkm_disp *disp, int id)
{
struct nvkm_head *head;
- if (!(head = kzalloc_obj(*head, GFP_KERNEL)))
+ if (!(head = kzalloc_obj(*head)))
return -ENOMEM;
head->func = func;
head->disp = disp;
diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/disp/ior.c b/drivers/gpu/drm/nouveau/nvkm/engine/disp/ior.c
index d680ef5355a3..36bce3f75a57 100644
--- a/drivers/gpu/drm/nouveau/nvkm/engine/disp/ior.c
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/disp/ior.c
@@ -58,7 +58,7 @@ nvkm_ior_new_(const struct nvkm_ior_func *func, struct nvkm_disp *disp,
enum nvkm_ior_type type, int id, bool hda)
{
struct nvkm_ior *ior;
- if (!(ior = kzalloc_obj(*ior, GFP_KERNEL)))
+ if (!(ior = kzalloc_obj(*ior)))
return -ENOMEM;
ior->func = func;
ior->disp = disp;
diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/disp/outp.c b/drivers/gpu/drm/nouveau/nvkm/engine/disp/outp.c
index c61453db7597..5360b4e223af 100644
--- a/drivers/gpu/drm/nouveau/nvkm/engine/disp/outp.c
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/disp/outp.c
@@ -379,7 +379,7 @@ nvkm_outp_new_(const struct nvkm_outp_func *func, struct nvkm_disp *disp,
enum nvkm_ior_proto proto;
enum nvkm_ior_type type;
- if (!(outp = *poutp = kzalloc_obj(*outp, GFP_KERNEL)))
+ if (!(outp = *poutp = kzalloc_obj(*outp)))
return -ENOMEM;
outp->func = func;
diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/dma/base.c b/drivers/gpu/drm/nouveau/nvkm/engine/dma/base.c
index 8fcc4c587a28..151da7a0a6ea 100644
--- a/drivers/gpu/drm/nouveau/nvkm/engine/dma/base.c
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/dma/base.c
@@ -108,7 +108,7 @@ nvkm_dma_new_(const struct nvkm_dma_func *func, struct nvkm_device *device,
{
struct nvkm_dma *dma;
- if (!(dma = *pdma = kzalloc_obj(*dma, GFP_KERNEL)))
+ if (!(dma = *pdma = kzalloc_obj(*dma)))
return -ENOMEM;
dma->func = func;
diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/dma/usergf100.c b/drivers/gpu/drm/nouveau/nvkm/engine/dma/usergf100.c
index 2c1b14f93fb2..dccf53585c0b 100644
--- a/drivers/gpu/drm/nouveau/nvkm/engine/dma/usergf100.c
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/dma/usergf100.c
@@ -78,7 +78,7 @@ gf100_dmaobj_new(struct nvkm_dma *dma, const struct nvkm_oclass *oclass,
u32 kind, user, unkn;
int ret;
- if (!(dmaobj = kzalloc_obj(*dmaobj, GFP_KERNEL)))
+ if (!(dmaobj = kzalloc_obj(*dmaobj)))
return -ENOMEM;
*pdmaobj = &dmaobj->base;
diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/dma/usergf119.c b/drivers/gpu/drm/nouveau/nvkm/engine/dma/usergf119.c
index c16449eb3c95..89f707ac1657 100644
--- a/drivers/gpu/drm/nouveau/nvkm/engine/dma/usergf119.c
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/dma/usergf119.c
@@ -76,7 +76,7 @@ gf119_dmaobj_new(struct nvkm_dma *dma, const struct nvkm_oclass *oclass,
u32 kind, page;
int ret;
- if (!(dmaobj = kzalloc_obj(*dmaobj, GFP_KERNEL)))
+ if (!(dmaobj = kzalloc_obj(*dmaobj)))
return -ENOMEM;
*pdmaobj = &dmaobj->base;
diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/dma/usergv100.c b/drivers/gpu/drm/nouveau/nvkm/engine/dma/usergv100.c
index 982ee81fd2bc..1b65a6aa31d7 100644
--- a/drivers/gpu/drm/nouveau/nvkm/engine/dma/usergv100.c
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/dma/usergv100.c
@@ -75,7 +75,7 @@ gv100_dmaobj_new(struct nvkm_dma *dma, const struct nvkm_oclass *oclass,
u32 kind, page;
int ret;
- if (!(dmaobj = kzalloc_obj(*dmaobj, GFP_KERNEL)))
+ if (!(dmaobj = kzalloc_obj(*dmaobj)))
return -ENOMEM;
*pdmaobj = &dmaobj->base;
diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/dma/usernv04.c b/drivers/gpu/drm/nouveau/nvkm/engine/dma/usernv04.c
index fcc87163c2d6..2201ca225fe1 100644
--- a/drivers/gpu/drm/nouveau/nvkm/engine/dma/usernv04.c
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/dma/usernv04.c
@@ -85,7 +85,7 @@ nv04_dmaobj_new(struct nvkm_dma *dma, const struct nvkm_oclass *oclass,
struct nv04_dmaobj *dmaobj;
int ret;
- if (!(dmaobj = kzalloc_obj(*dmaobj, GFP_KERNEL)))
+ if (!(dmaobj = kzalloc_obj(*dmaobj)))
return -ENOMEM;
*pdmaobj = &dmaobj->base;
diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/dma/usernv50.c b/drivers/gpu/drm/nouveau/nvkm/engine/dma/usernv50.c
index 5cf0986c7944..e12c9544a856 100644
--- a/drivers/gpu/drm/nouveau/nvkm/engine/dma/usernv50.c
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/dma/usernv50.c
@@ -78,7 +78,7 @@ nv50_dmaobj_new(struct nvkm_dma *dma, const struct nvkm_oclass *oclass,
u32 user, part, comp, kind;
int ret;
- if (!(dmaobj = kzalloc_obj(*dmaobj, GFP_KERNEL)))
+ if (!(dmaobj = kzalloc_obj(*dmaobj)))
return -ENOMEM;
*pdmaobj = &dmaobj->base;
diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/falcon.c b/drivers/gpu/drm/nouveau/nvkm/engine/falcon.c
index bf6a225f5673..fa34c223a46f 100644
--- a/drivers/gpu/drm/nouveau/nvkm/engine/falcon.c
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/falcon.c
@@ -341,7 +341,7 @@ nvkm_falcon_new_(const struct nvkm_falcon_func *func, struct nvkm_device *device
{
struct nvkm_falcon *falcon;
- if (!(falcon = kzalloc_obj(*falcon, GFP_KERNEL)))
+ if (!(falcon = kzalloc_obj(*falcon)))
return -ENOMEM;
falcon->func = func;
falcon->addr = addr;
diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/fifo/base.c b/drivers/gpu/drm/nouveau/nvkm/engine/fifo/base.c
index 7dad0bf10631..9dd924694306 100644
--- a/drivers/gpu/drm/nouveau/nvkm/engine/fifo/base.c
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/fifo/base.c
@@ -377,7 +377,7 @@ nvkm_fifo_new_(const struct nvkm_fifo_func *func, struct nvkm_device *device,
{
struct nvkm_fifo *fifo;
- if (!(fifo = *pfifo = kzalloc_obj(*fifo, GFP_KERNEL)))
+ if (!(fifo = *pfifo = kzalloc_obj(*fifo)))
return -ENOMEM;
fifo->func = func;
diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/fifo/cgrp.c b/drivers/gpu/drm/nouveau/nvkm/engine/fifo/cgrp.c
index 2b852341d8f4..7e2d5711a1cb 100644
--- a/drivers/gpu/drm/nouveau/nvkm/engine/fifo/cgrp.c
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/fifo/cgrp.c
@@ -69,7 +69,7 @@ nvkm_cgrp_ectx_get(struct nvkm_cgrp *cgrp, struct nvkm_engn *engn, struct nvkm_e
/* Nope - create a fresh one. */
CGRP_TRACE(cgrp, "ctor ectx %d[%s]", engn->id, engn->engine->subdev.name);
- if (!(ectx = *pectx = kzalloc_obj(*ectx, GFP_KERNEL)))
+ if (!(ectx = *pectx = kzalloc_obj(*ectx)))
return -ENOMEM;
ectx->engn = engn;
@@ -141,7 +141,7 @@ nvkm_cgrp_vctx_get(struct nvkm_cgrp *cgrp, struct nvkm_engn *engn, struct nvkm_c
/* Now, create the sub-context. */
CGRP_TRACE(cgrp, "ctor vctx %d[%s]", engn->id, engn->engine->subdev.name);
- if (!(vctx = *pvctx = kzalloc_obj(*vctx, GFP_KERNEL))) {
+ if (!(vctx = *pvctx = kzalloc_obj(*vctx))) {
nvkm_cgrp_ectx_put(cgrp, &ectx);
return -ENOMEM;
}
@@ -224,7 +224,7 @@ nvkm_cgrp_new(struct nvkm_runl *runl, const char *name, struct nvkm_vmm *vmm, bo
{
struct nvkm_cgrp *cgrp;
- if (!(cgrp = *pcgrp = kmalloc_obj(*cgrp, GFP_KERNEL)))
+ if (!(cgrp = *pcgrp = kmalloc_obj(*cgrp)))
return -ENOMEM;
cgrp->func = runl->fifo->func->cgrp.func;
diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/fifo/chan.c b/drivers/gpu/drm/nouveau/nvkm/engine/fifo/chan.c
index 0c6a5220ef80..418a8918bcb8 100644
--- a/drivers/gpu/drm/nouveau/nvkm/engine/fifo/chan.c
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/fifo/chan.c
@@ -117,7 +117,7 @@ nvkm_chan_cctx_get(struct nvkm_chan *chan, struct nvkm_engn *engn, struct nvkm_c
/* Now, create the channel context - to track engine binding. */
CHAN_TRACE(chan, "ctor cctx %d[%s]", engn->id, engn->engine->subdev.name);
- if (!(cctx = *pcctx = kzalloc_obj(*cctx, GFP_KERNEL))) {
+ if (!(cctx = *pcctx = kzalloc_obj(*cctx))) {
nvkm_cgrp_vctx_put(cgrp, &vctx);
ret = -ENOMEM;
goto done;
@@ -367,7 +367,7 @@ nvkm_chan_new_(const struct nvkm_chan_func *func, struct nvkm_runl *runl, int ru
return -EINVAL;
}
- if (!(chan = *pchan = kzalloc_obj(*chan, GFP_KERNEL)))
+ if (!(chan = *pchan = kzalloc_obj(*chan)))
return -ENOMEM;
chan->func = func;
diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/fifo/runl.c b/drivers/gpu/drm/nouveau/nvkm/engine/fifo/runl.c
index 42e49781eb21..2092521053ef 100644
--- a/drivers/gpu/drm/nouveau/nvkm/engine/fifo/runl.c
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/fifo/runl.c
@@ -349,7 +349,7 @@ nvkm_runl_add(struct nvkm_runl *runl, int engi, const struct nvkm_engn_func *fun
return NULL;
}
- if (!(engn = kzalloc_obj(*engn, GFP_KERNEL)))
+ if (!(engn = kzalloc_obj(*engn)))
return NULL;
engn->func = func;
@@ -398,7 +398,7 @@ nvkm_runl_new(struct nvkm_fifo *fifo, int runi, u32 addr, int id_nr)
struct nvkm_runl *runl;
int ret;
- if (!(runl = kzalloc_obj(*runl, GFP_KERNEL)))
+ if (!(runl = kzalloc_obj(*runl)))
return ERR_PTR(-ENOMEM);
runl->func = fifo->func->runl;
diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/fifo/runq.c b/drivers/gpu/drm/nouveau/nvkm/engine/fifo/runq.c
index e26e0f093755..cc000adbcaf0 100644
--- a/drivers/gpu/drm/nouveau/nvkm/engine/fifo/runq.c
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/fifo/runq.c
@@ -34,7 +34,7 @@ nvkm_runq_new(struct nvkm_fifo *fifo, int pbid)
{
struct nvkm_runq *runq;
- if (!(runq = kzalloc_obj(*runq, GFP_KERNEL)))
+ if (!(runq = kzalloc_obj(*runq)))
return NULL;
runq->func = fifo->func->runq;
diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/fifo/ucgrp.c b/drivers/gpu/drm/nouveau/nvkm/engine/fifo/ucgrp.c
index cea98ea25178..dfa3c7dbdf34 100644
--- a/drivers/gpu/drm/nouveau/nvkm/engine/fifo/ucgrp.c
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/fifo/ucgrp.c
@@ -104,7 +104,7 @@ nvkm_ucgrp_new(struct nvkm_fifo *fifo, const struct nvkm_oclass *oclass, void *a
return PTR_ERR(vmm);
/* Allocate channel group. */
- if (!(ucgrp = kzalloc_obj(*ucgrp, GFP_KERNEL))) {
+ if (!(ucgrp = kzalloc_obj(*ucgrp))) {
ret = -ENOMEM;
goto done;
}
diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/fifo/uchan.c b/drivers/gpu/drm/nouveau/nvkm/engine/fifo/uchan.c
index f986dbd14f73..d6a87cec2150 100644
--- a/drivers/gpu/drm/nouveau/nvkm/engine/fifo/uchan.c
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/fifo/uchan.c
@@ -166,7 +166,7 @@ nvkm_uchan_object_new(const struct nvkm_oclass *oclass, void *argv, u32 argc,
return -EINVAL;
/* Allocate SW object. */
- if (!(uobj = kzalloc_obj(*uobj, GFP_KERNEL)))
+ if (!(uobj = kzalloc_obj(*uobj)))
return -ENOMEM;
nvkm_oproxy_ctor(&nvkm_uchan_object, oclass, &uobj->oproxy);
@@ -375,7 +375,7 @@ nvkm_uchan_new(struct nvkm_fifo *fifo, struct nvkm_cgrp *cgrp, const struct nvkm
}
/* Allocate channel. */
- if (!(uchan = kzalloc_obj(*uchan, GFP_KERNEL))) {
+ if (!(uchan = kzalloc_obj(*uchan))) {
ret = -ENOMEM;
goto done;
}
diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/gr/gf100.c b/drivers/gpu/drm/nouveau/nvkm/engine/gr/gf100.c
index 910ca0d4aa0f..c2a9dd9018b8 100644
--- a/drivers/gpu/drm/nouveau/nvkm/engine/gr/gf100.c
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/gr/gf100.c
@@ -285,7 +285,7 @@ gf100_gr_object_new(const struct nvkm_oclass *oclass, void *data, u32 size,
struct gf100_gr_chan *chan = gf100_gr_chan(oclass->parent);
struct gf100_gr_object *object;
- if (!(object = kzalloc_obj(*object, GFP_KERNEL)))
+ if (!(object = kzalloc_obj(*object)))
return -ENOMEM;
*pobject = &object->object;
@@ -384,7 +384,7 @@ gf100_gr_chan_new(struct nvkm_gr *base, struct nvkm_chan *fifoch,
struct nvkm_device *device = gr->base.engine.subdev.device;
int ret;
- if (!(chan = kzalloc_obj(*chan, GFP_KERNEL)))
+ if (!(chan = kzalloc_obj(*chan)))
return -ENOMEM;
nvkm_object_ctor(&gf100_gr_chan, oclass, &chan->object);
chan->gr = gr;
@@ -2624,7 +2624,7 @@ gf100_gr_new_(const struct gf100_gr_fwif *fwif, struct nvkm_device *device,
struct gf100_gr *gr;
int ret;
- if (!(gr = kzalloc_obj(*gr, GFP_KERNEL)))
+ if (!(gr = kzalloc_obj(*gr)))
return -ENOMEM;
*pgr = &gr->base;
diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/gr/nv04.c b/drivers/gpu/drm/nouveau/nvkm/engine/gr/nv04.c
index 3bf288190cd1..7568b3ddb2b8 100644
--- a/drivers/gpu/drm/nouveau/nvkm/engine/gr/nv04.c
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/gr/nv04.c
@@ -1188,7 +1188,7 @@ nv04_gr_chan_new(struct nvkm_gr *base, struct nvkm_chan *fifoch,
struct nv04_gr_chan *chan;
unsigned long flags;
- if (!(chan = kzalloc_obj(*chan, GFP_KERNEL)))
+ if (!(chan = kzalloc_obj(*chan)))
return -ENOMEM;
nvkm_object_ctor(&nv04_gr_chan, oclass, &chan->object);
chan->gr = gr;
@@ -1417,7 +1417,7 @@ nv04_gr_new(struct nvkm_device *device, enum nvkm_subdev_type type, int inst, st
{
struct nv04_gr *gr;
- if (!(gr = kzalloc_obj(*gr, GFP_KERNEL)))
+ if (!(gr = kzalloc_obj(*gr)))
return -ENOMEM;
spin_lock_init(&gr->lock);
*pgr = &gr->base;
diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/gr/nv10.c b/drivers/gpu/drm/nouveau/nvkm/engine/gr/nv10.c
index 8b724b3acdba..abcf1ffbf66c 100644
--- a/drivers/gpu/drm/nouveau/nvkm/engine/gr/nv10.c
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/gr/nv10.c
@@ -1007,7 +1007,7 @@ nv10_gr_chan_new(struct nvkm_gr *base, struct nvkm_chan *fifoch,
struct nvkm_device *device = gr->base.engine.subdev.device;
unsigned long flags;
- if (!(chan = kzalloc_obj(*chan, GFP_KERNEL)))
+ if (!(chan = kzalloc_obj(*chan)))
return -ENOMEM;
nvkm_object_ctor(&nv10_gr_chan, oclass, &chan->object);
chan->gr = gr;
@@ -1177,7 +1177,7 @@ nv10_gr_new_(const struct nvkm_gr_func *func, struct nvkm_device *device,
{
struct nv10_gr *gr;
- if (!(gr = kzalloc_obj(*gr, GFP_KERNEL)))
+ if (!(gr = kzalloc_obj(*gr)))
return -ENOMEM;
spin_lock_init(&gr->lock);
*pgr = &gr->base;
diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/gr/nv20.c b/drivers/gpu/drm/nouveau/nvkm/engine/gr/nv20.c
index f12053d47fcf..66aa6398754b 100644
--- a/drivers/gpu/drm/nouveau/nvkm/engine/gr/nv20.c
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/gr/nv20.c
@@ -79,7 +79,7 @@ nv20_gr_chan_new(struct nvkm_gr *base, struct nvkm_chan *fifoch,
struct nv20_gr_chan *chan;
int ret, i;
- if (!(chan = kzalloc_obj(*chan, GFP_KERNEL)))
+ if (!(chan = kzalloc_obj(*chan)))
return -ENOMEM;
nvkm_object_ctor(&nv20_gr_chan, oclass, &chan->object);
chan->gr = gr;
@@ -334,7 +334,7 @@ nv20_gr_new_(const struct nvkm_gr_func *func, struct nvkm_device *device,
{
struct nv20_gr *gr;
- if (!(gr = kzalloc_obj(*gr, GFP_KERNEL)))
+ if (!(gr = kzalloc_obj(*gr)))
return -ENOMEM;
*pgr = &gr->base;
diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/gr/nv25.c b/drivers/gpu/drm/nouveau/nvkm/engine/gr/nv25.c
index 91c613e00e5e..bcf2a3697e7a 100644
--- a/drivers/gpu/drm/nouveau/nvkm/engine/gr/nv25.c
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/gr/nv25.c
@@ -25,7 +25,7 @@ nv25_gr_chan_new(struct nvkm_gr *base, struct nvkm_chan *fifoch,
struct nv20_gr_chan *chan;
int ret, i;
- if (!(chan = kzalloc_obj(*chan, GFP_KERNEL)))
+ if (!(chan = kzalloc_obj(*chan)))
return -ENOMEM;
nvkm_object_ctor(&nv25_gr_chan, oclass, &chan->object);
chan->gr = gr;
diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/gr/nv2a.c b/drivers/gpu/drm/nouveau/nvkm/engine/gr/nv2a.c
index 4435db568bb4..6526538dfdb0 100644
--- a/drivers/gpu/drm/nouveau/nvkm/engine/gr/nv2a.c
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/gr/nv2a.c
@@ -25,7 +25,7 @@ nv2a_gr_chan_new(struct nvkm_gr *base, struct nvkm_chan *fifoch,
struct nv20_gr_chan *chan;
int ret, i;
- if (!(chan = kzalloc_obj(*chan, GFP_KERNEL)))
+ if (!(chan = kzalloc_obj(*chan)))
return -ENOMEM;
nvkm_object_ctor(&nv2a_gr_chan, oclass, &chan->object);
chan->gr = gr;
diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/gr/nv30.c b/drivers/gpu/drm/nouveau/nvkm/engine/gr/nv30.c
index 6da312944498..00e25d68d72d 100644
--- a/drivers/gpu/drm/nouveau/nvkm/engine/gr/nv30.c
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/gr/nv30.c
@@ -26,7 +26,7 @@ nv30_gr_chan_new(struct nvkm_gr *base, struct nvkm_chan *fifoch,
struct nv20_gr_chan *chan;
int ret, i;
- if (!(chan = kzalloc_obj(*chan, GFP_KERNEL)))
+ if (!(chan = kzalloc_obj(*chan)))
return -ENOMEM;
nvkm_object_ctor(&nv30_gr_chan, oclass, &chan->object);
chan->gr = gr;
diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/gr/nv34.c b/drivers/gpu/drm/nouveau/nvkm/engine/gr/nv34.c
index 8cb48adc5d58..ffd1840f0271 100644
--- a/drivers/gpu/drm/nouveau/nvkm/engine/gr/nv34.c
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/gr/nv34.c
@@ -25,7 +25,7 @@ nv34_gr_chan_new(struct nvkm_gr *base, struct nvkm_chan *fifoch,
struct nv20_gr_chan *chan;
int ret, i;
- if (!(chan = kzalloc_obj(*chan, GFP_KERNEL)))
+ if (!(chan = kzalloc_obj(*chan)))
return -ENOMEM;
nvkm_object_ctor(&nv34_gr_chan, oclass, &chan->object);
chan->gr = gr;
diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/gr/nv35.c b/drivers/gpu/drm/nouveau/nvkm/engine/gr/nv35.c
index 4116872fd2d1..22011e3fdbfd 100644
--- a/drivers/gpu/drm/nouveau/nvkm/engine/gr/nv35.c
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/gr/nv35.c
@@ -25,7 +25,7 @@ nv35_gr_chan_new(struct nvkm_gr *base, struct nvkm_chan *fifoch,
struct nv20_gr_chan *chan;
int ret, i;
- if (!(chan = kzalloc_obj(*chan, GFP_KERNEL)))
+ if (!(chan = kzalloc_obj(*chan)))
return -ENOMEM;
nvkm_object_ctor(&nv35_gr_chan, oclass, &chan->object);
chan->gr = gr;
diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/gr/nv40.c b/drivers/gpu/drm/nouveau/nvkm/engine/gr/nv40.c
index 5af4fa408fb8..c8b97aabcb69 100644
--- a/drivers/gpu/drm/nouveau/nvkm/engine/gr/nv40.c
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/gr/nv40.c
@@ -152,7 +152,7 @@ nv40_gr_chan_new(struct nvkm_gr *base, struct nvkm_chan *fifoch,
struct nv40_gr_chan *chan;
unsigned long flags;
- if (!(chan = kzalloc_obj(*chan, GFP_KERNEL)))
+ if (!(chan = kzalloc_obj(*chan)))
return -ENOMEM;
nvkm_object_ctor(&nv40_gr_chan, oclass, &chan->object);
chan->gr = gr;
@@ -433,7 +433,7 @@ nv40_gr_new_(const struct nvkm_gr_func *func, struct nvkm_device *device,
{
struct nv40_gr *gr;
- if (!(gr = kzalloc_obj(*gr, GFP_KERNEL)))
+ if (!(gr = kzalloc_obj(*gr)))
return -ENOMEM;
*pgr = &gr->base;
INIT_LIST_HEAD(&gr->chan);
diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/gr/nv50.c b/drivers/gpu/drm/nouveau/nvkm/engine/gr/nv50.c
index fae9254fa870..1aff861a845e 100644
--- a/drivers/gpu/drm/nouveau/nvkm/engine/gr/nv50.c
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/gr/nv50.c
@@ -92,7 +92,7 @@ nv50_gr_chan_new(struct nvkm_gr *base, struct nvkm_chan *fifoch,
struct nv50_gr *gr = nv50_gr(base);
struct nv50_gr_chan *chan;
- if (!(chan = kzalloc_obj(*chan, GFP_KERNEL)))
+ if (!(chan = kzalloc_obj(*chan)))
return -ENOMEM;
nvkm_object_ctor(&nv50_gr_chan, oclass, &chan->object);
chan->gr = gr;
@@ -765,7 +765,7 @@ nv50_gr_new_(const struct nvkm_gr_func *func, struct nvkm_device *device,
{
struct nv50_gr *gr;
- if (!(gr = kzalloc_obj(*gr, GFP_KERNEL)))
+ if (!(gr = kzalloc_obj(*gr)))
return -ENOMEM;
spin_lock_init(&gr->lock);
*pgr = &gr->base;
diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/mpeg/nv31.c b/drivers/gpu/drm/nouveau/nvkm/engine/mpeg/nv31.c
index ee907c2987a6..3652833c7951 100644
--- a/drivers/gpu/drm/nouveau/nvkm/engine/mpeg/nv31.c
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/mpeg/nv31.c
@@ -89,7 +89,7 @@ nv31_mpeg_chan_new(struct nvkm_chan *fifoch, const struct nvkm_oclass *oclass,
unsigned long flags;
int ret = -EBUSY;
- if (!(chan = kzalloc_obj(*chan, GFP_KERNEL)))
+ if (!(chan = kzalloc_obj(*chan)))
return -ENOMEM;
nvkm_object_ctor(&nv31_mpeg_chan, oclass, &chan->object);
chan->mpeg = mpeg;
@@ -277,7 +277,7 @@ nv31_mpeg_new_(const struct nv31_mpeg_func *func, struct nvkm_device *device,
{
struct nv31_mpeg *mpeg;
- if (!(mpeg = kzalloc_obj(*mpeg, GFP_KERNEL)))
+ if (!(mpeg = kzalloc_obj(*mpeg)))
return -ENOMEM;
mpeg->func = func;
*pmpeg = &mpeg->engine;
diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/mpeg/nv44.c b/drivers/gpu/drm/nouveau/nvkm/engine/mpeg/nv44.c
index c14b6efcaf6d..eeb9f90745b3 100644
--- a/drivers/gpu/drm/nouveau/nvkm/engine/mpeg/nv44.c
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/mpeg/nv44.c
@@ -107,7 +107,7 @@ nv44_mpeg_chan_new(struct nvkm_chan *fifoch, const struct nvkm_oclass *oclass,
struct nv44_mpeg_chan *chan;
unsigned long flags;
- if (!(chan = kzalloc_obj(*chan, GFP_KERNEL)))
+ if (!(chan = kzalloc_obj(*chan)))
return -ENOMEM;
nvkm_object_ctor(&nv44_mpeg_chan, oclass, &chan->object);
chan->mpeg = mpeg;
@@ -207,7 +207,7 @@ nv44_mpeg_new(struct nvkm_device *device, enum nvkm_subdev_type type, int inst,
{
struct nv44_mpeg *mpeg;
- if (!(mpeg = kzalloc_obj(*mpeg, GFP_KERNEL)))
+ if (!(mpeg = kzalloc_obj(*mpeg)))
return -ENOMEM;
INIT_LIST_HEAD(&mpeg->chan);
*pmpeg = &mpeg->engine;
diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/nvdec/base.c b/drivers/gpu/drm/nouveau/nvkm/engine/nvdec/base.c
index 175a372a1de4..b3b3d0e1efc4 100644
--- a/drivers/gpu/drm/nouveau/nvkm/engine/nvdec/base.c
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/nvdec/base.c
@@ -43,7 +43,7 @@ nvkm_nvdec_new_(const struct nvkm_nvdec_fwif *fwif, struct nvkm_device *device,
struct nvkm_nvdec *nvdec;
int ret;
- if (!(nvdec = *pnvdec = kzalloc_obj(*nvdec, GFP_KERNEL)))
+ if (!(nvdec = *pnvdec = kzalloc_obj(*nvdec)))
return -ENOMEM;
ret = nvkm_engine_ctor(&nvkm_nvdec, device, type, inst, true,
diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/nvenc/base.c b/drivers/gpu/drm/nouveau/nvkm/engine/nvenc/base.c
index d8e6c8b58643..aeda415a2dd3 100644
--- a/drivers/gpu/drm/nouveau/nvkm/engine/nvenc/base.c
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/nvenc/base.c
@@ -44,7 +44,7 @@ nvkm_nvenc_new_(const struct nvkm_nvenc_fwif *fwif, struct nvkm_device *device,
struct nvkm_nvenc *nvenc;
int ret;
- if (!(nvenc = *pnvenc = kzalloc_obj(*nvenc, GFP_KERNEL)))
+ if (!(nvenc = *pnvenc = kzalloc_obj(*nvenc)))
return -ENOMEM;
ret = nvkm_engine_ctor(&nvkm_nvenc, device, type, inst, true,
diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/sec2/base.c b/drivers/gpu/drm/nouveau/nvkm/engine/sec2/base.c
index f8c0656f74c1..417ed23a6b81 100644
--- a/drivers/gpu/drm/nouveau/nvkm/engine/sec2/base.c
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/sec2/base.c
@@ -137,7 +137,7 @@ nvkm_sec2_new_(const struct nvkm_sec2_fwif *fwif, struct nvkm_device *device,
struct nvkm_sec2 *sec2;
int ret;
- if (!(sec2 = *psec2 = kzalloc_obj(*sec2, GFP_KERNEL)))
+ if (!(sec2 = *psec2 = kzalloc_obj(*sec2)))
return -ENOMEM;
ret = nvkm_engine_ctor(&nvkm_sec2, device, type, inst, true, &sec2->engine);
diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/sec2/r535.c b/drivers/gpu/drm/nouveau/nvkm/engine/sec2/r535.c
index fb5c05e49b80..c119f1415a12 100644
--- a/drivers/gpu/drm/nouveau/nvkm/engine/sec2/r535.c
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/sec2/r535.c
@@ -42,7 +42,7 @@ r535_sec2_new(const struct nvkm_sec2_func *func, struct nvkm_device *device,
struct nvkm_sec2 *sec2;
int ret;
- if (!(sec2 = *psec2 = kzalloc_obj(*sec2, GFP_KERNEL)))
+ if (!(sec2 = *psec2 = kzalloc_obj(*sec2)))
return -ENOMEM;
ret = nvkm_engine_ctor(&r535_sec2, device, type, inst, true, &sec2->engine);
diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/sw/base.c b/drivers/gpu/drm/nouveau/nvkm/engine/sw/base.c
index 3201ab862764..02aac061c1ee 100644
--- a/drivers/gpu/drm/nouveau/nvkm/engine/sw/base.c
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/sw/base.c
@@ -100,7 +100,7 @@ nvkm_sw_new_(const struct nvkm_sw_func *func, struct nvkm_device *device,
{
struct nvkm_sw *sw;
- if (!(sw = *psw = kzalloc_obj(*sw, GFP_KERNEL)))
+ if (!(sw = *psw = kzalloc_obj(*sw)))
return -ENOMEM;
INIT_LIST_HEAD(&sw->chan);
sw->func = func;
diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/sw/gf100.c b/drivers/gpu/drm/nouveau/nvkm/engine/sw/gf100.c
index 42a1fcacb45b..0171cdf6f639 100644
--- a/drivers/gpu/drm/nouveau/nvkm/engine/sw/gf100.c
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/sw/gf100.c
@@ -110,7 +110,7 @@ gf100_sw_chan_new(struct nvkm_sw *sw, struct nvkm_chan *fifoch,
struct nv50_sw_chan *chan;
int ret, i;
- if (!(chan = kzalloc_obj(*chan, GFP_KERNEL)))
+ if (!(chan = kzalloc_obj(*chan)))
return -ENOMEM;
*pobject = &chan->base.object;
diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/sw/nv04.c b/drivers/gpu/drm/nouveau/nvkm/engine/sw/nv04.c
index d1fc9c58653d..83b93ce06c64 100644
--- a/drivers/gpu/drm/nouveau/nvkm/engine/sw/nv04.c
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/sw/nv04.c
@@ -111,7 +111,7 @@ nv04_sw_chan_new(struct nvkm_sw *sw, struct nvkm_chan *fifo,
{
struct nv04_sw_chan *chan;
- if (!(chan = kzalloc_obj(*chan, GFP_KERNEL)))
+ if (!(chan = kzalloc_obj(*chan)))
return -ENOMEM;
atomic_set(&chan->ref, 0);
*pobject = &chan->base.object;
diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/sw/nv10.c b/drivers/gpu/drm/nouveau/nvkm/engine/sw/nv10.c
index cac43cedebf9..2ca044861508 100644
--- a/drivers/gpu/drm/nouveau/nvkm/engine/sw/nv10.c
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/sw/nv10.c
@@ -41,7 +41,7 @@ nv10_sw_chan_new(struct nvkm_sw *sw, struct nvkm_chan *fifo,
{
struct nvkm_sw_chan *chan;
- if (!(chan = kzalloc_obj(*chan, GFP_KERNEL)))
+ if (!(chan = kzalloc_obj(*chan)))
return -ENOMEM;
*pobject = &chan->object;
diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/sw/nv50.c b/drivers/gpu/drm/nouveau/nvkm/engine/sw/nv50.c
index 62d719241cf6..0cfb1eaae6de 100644
--- a/drivers/gpu/drm/nouveau/nvkm/engine/sw/nv50.c
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/sw/nv50.c
@@ -106,7 +106,7 @@ nv50_sw_chan_new(struct nvkm_sw *sw, struct nvkm_chan *fifoch,
struct nv50_sw_chan *chan;
int ret, i;
- if (!(chan = kzalloc_obj(*chan, GFP_KERNEL)))
+ if (!(chan = kzalloc_obj(*chan)))
return -ENOMEM;
*pobject = &chan->base.object;
diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/sw/nvsw.c b/drivers/gpu/drm/nouveau/nvkm/engine/sw/nvsw.c
index 023b94c7abe0..ff0dd2153052 100644
--- a/drivers/gpu/drm/nouveau/nvkm/engine/sw/nvsw.c
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/sw/nvsw.c
@@ -64,7 +64,7 @@ nvkm_nvsw_new_(const struct nvkm_nvsw_func *func, struct nvkm_sw_chan *chan,
{
struct nvkm_nvsw *nvsw;
- if (!(nvsw = kzalloc_obj(*nvsw, GFP_KERNEL)))
+ if (!(nvsw = kzalloc_obj(*nvsw)))
return -ENOMEM;
*pobject = &nvsw->object;
diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/xtensa.c b/drivers/gpu/drm/nouveau/nvkm/engine/xtensa.c
index e1fa755134d5..127657d485b0 100644
--- a/drivers/gpu/drm/nouveau/nvkm/engine/xtensa.c
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/xtensa.c
@@ -181,7 +181,7 @@ nvkm_xtensa_new_(const struct nvkm_xtensa_func *func, struct nvkm_device *device
{
struct nvkm_xtensa *xtensa;
- if (!(xtensa = kzalloc_obj(*xtensa, GFP_KERNEL)))
+ if (!(xtensa = kzalloc_obj(*xtensa)))
return -ENOMEM;
xtensa->func = func;
xtensa->addr = addr;
diff --git a/drivers/gpu/drm/nouveau/nvkm/falcon/cmdq.c b/drivers/gpu/drm/nouveau/nvkm/falcon/cmdq.c
index 449ef127e56c..a73783fb5557 100644
--- a/drivers/gpu/drm/nouveau/nvkm/falcon/cmdq.c
+++ b/drivers/gpu/drm/nouveau/nvkm/falcon/cmdq.c
@@ -203,7 +203,7 @@ nvkm_falcon_cmdq_new(struct nvkm_falcon_qmgr *qmgr, const char *name,
{
struct nvkm_falcon_cmdq *cmdq = *pcmdq;
- if (!(cmdq = *pcmdq = kzalloc_obj(*cmdq, GFP_KERNEL)))
+ if (!(cmdq = *pcmdq = kzalloc_obj(*cmdq)))
return -ENOMEM;
cmdq->qmgr = qmgr;
diff --git a/drivers/gpu/drm/nouveau/nvkm/falcon/msgq.c b/drivers/gpu/drm/nouveau/nvkm/falcon/msgq.c
index 4bff735a08df..56d038ce9e6c 100644
--- a/drivers/gpu/drm/nouveau/nvkm/falcon/msgq.c
+++ b/drivers/gpu/drm/nouveau/nvkm/falcon/msgq.c
@@ -203,7 +203,7 @@ nvkm_falcon_msgq_new(struct nvkm_falcon_qmgr *qmgr, const char *name,
{
struct nvkm_falcon_msgq *msgq = *pmsgq;
- if (!(msgq = *pmsgq = kzalloc_obj(*msgq, GFP_KERNEL)))
+ if (!(msgq = *pmsgq = kzalloc_obj(*msgq)))
return -ENOMEM;
msgq->qmgr = qmgr;
diff --git a/drivers/gpu/drm/nouveau/nvkm/falcon/qmgr.c b/drivers/gpu/drm/nouveau/nvkm/falcon/qmgr.c
index 4e1518b43fed..96aa621be4ed 100644
--- a/drivers/gpu/drm/nouveau/nvkm/falcon/qmgr.c
+++ b/drivers/gpu/drm/nouveau/nvkm/falcon/qmgr.c
@@ -73,7 +73,7 @@ nvkm_falcon_qmgr_new(struct nvkm_falcon *falcon,
struct nvkm_falcon_qmgr *qmgr;
int i;
- if (!(qmgr = *pqmgr = kzalloc_obj(*qmgr, GFP_KERNEL)))
+ if (!(qmgr = *pqmgr = kzalloc_obj(*qmgr)))
return -ENOMEM;
qmgr->falcon = falcon;
diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/acr/base.c b/drivers/gpu/drm/nouveau/nvkm/subdev/acr/base.c
index 0f83774f31a1..4c7745cd6ae5 100644
--- a/drivers/gpu/drm/nouveau/nvkm/subdev/acr/base.c
+++ b/drivers/gpu/drm/nouveau/nvkm/subdev/acr/base.c
@@ -251,7 +251,7 @@ nvkm_acr_oneinit(struct nvkm_subdev *subdev)
nvkm_falcon_put(lsfw->falcon, subdev);
- if (!(lsf = kmalloc_obj(*lsf, GFP_KERNEL)))
+ if (!(lsf = kmalloc_obj(*lsf)))
return -ENOMEM;
lsf->func = lsfw->func;
lsf->falcon = lsfw->falcon;
@@ -422,7 +422,7 @@ nvkm_acr_new_(const struct nvkm_acr_fwif *fwif, struct nvkm_device *device,
struct nvkm_acr *acr;
long wprfw;
- if (!(acr = *pacr = kzalloc_obj(*acr, GFP_KERNEL)))
+ if (!(acr = *pacr = kzalloc_obj(*acr)))
return -ENOMEM;
nvkm_subdev_ctor(&nvkm_acr, device, type, inst, &acr->subdev);
INIT_LIST_HEAD(&acr->hsfw);
diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/acr/ga100.c b/drivers/gpu/drm/nouveau/nvkm/subdev/acr/ga100.c
index 70405ba5a87e..b3f84345ee53 100644
--- a/drivers/gpu/drm/nouveau/nvkm/subdev/acr/ga100.c
+++ b/drivers/gpu/drm/nouveau/nvkm/subdev/acr/ga100.c
@@ -37,7 +37,7 @@ ga100_acr_hsfw_ctor(struct nvkm_acr *acr, const char *bl, const char *fw,
{
struct nvkm_acr_hsfw *hsfw;
- if (!(hsfw = kzalloc_obj(*hsfw, GFP_KERNEL)))
+ if (!(hsfw = kzalloc_obj(*hsfw)))
return -ENOMEM;
hsfw->falcon_id = fwif->falcon_id;
diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/acr/ga102.c b/drivers/gpu/drm/nouveau/nvkm/subdev/acr/ga102.c
index 77535b0d1d75..a9f0090b2310 100644
--- a/drivers/gpu/drm/nouveau/nvkm/subdev/acr/ga102.c
+++ b/drivers/gpu/drm/nouveau/nvkm/subdev/acr/ga102.c
@@ -32,7 +32,7 @@ ga102_acr_wpr_patch(struct nvkm_acr *acr, s64 adjust)
struct nvkm_acr_lsfw *lsfw;
u32 offset = 0;
- lsb = kvmalloc_obj(*lsb, GFP_KERNEL);
+ lsb = kvmalloc_obj(*lsb);
if (!lsb)
return -ENOMEM;
@@ -67,7 +67,7 @@ ga102_acr_wpr_build_lsb(struct nvkm_acr *acr, struct nvkm_acr_lsfw *lsfw)
if (WARN_ON(lsfw->sig->size != sizeof(hdr->signature)))
return -EINVAL;
- hdr = kvzalloc_obj(*hdr, GFP_KERNEL);
+ hdr = kvzalloc_obj(*hdr);
if (!hdr)
return -ENOMEM;
diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/acr/gm200.c b/drivers/gpu/drm/nouveau/nvkm/subdev/acr/gm200.c
index 5b812bed400d..fd78965d841f 100644
--- a/drivers/gpu/drm/nouveau/nvkm/subdev/acr/gm200.c
+++ b/drivers/gpu/drm/nouveau/nvkm/subdev/acr/gm200.c
@@ -247,7 +247,7 @@ gm200_acr_hsfw_ctor(struct nvkm_acr *acr, const char *bl, const char *fw, const
{
struct nvkm_acr_hsfw *hsfw;
- if (!(hsfw = kzalloc_obj(*hsfw, GFP_KERNEL)))
+ if (!(hsfw = kzalloc_obj(*hsfw)))
return -ENOMEM;
hsfw->falcon_id = fwif->falcon_id;
diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/acr/lsfw.c b/drivers/gpu/drm/nouveau/nvkm/subdev/acr/lsfw.c
index ecf7500dc135..acb5e1dd4744 100644
--- a/drivers/gpu/drm/nouveau/nvkm/subdev/acr/lsfw.c
+++ b/drivers/gpu/drm/nouveau/nvkm/subdev/acr/lsfw.c
@@ -71,7 +71,7 @@ nvkm_acr_lsfw_add(const struct nvkm_acr_lsf_func *func, struct nvkm_acr *acr,
}
if (!lsfw) {
- if (!(lsfw = kzalloc_obj(*lsfw, GFP_KERNEL)))
+ if (!(lsfw = kzalloc_obj(*lsfw)))
return ERR_PTR(-ENOMEM);
lsfw->id = id;
diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/bar/gf100.c b/drivers/gpu/drm/nouveau/nvkm/subdev/bar/gf100.c
index 8f45161e3f2b..a1fa1b0c8954 100644
--- a/drivers/gpu/drm/nouveau/nvkm/subdev/bar/gf100.c
+++ b/drivers/gpu/drm/nouveau/nvkm/subdev/bar/gf100.c
@@ -165,7 +165,7 @@ gf100_bar_new_(const struct nvkm_bar_func *func, struct nvkm_device *device,
enum nvkm_subdev_type type, int inst, struct nvkm_bar **pbar)
{
struct gf100_bar *bar;
- if (!(bar = kzalloc_obj(*bar, GFP_KERNEL)))
+ if (!(bar = kzalloc_obj(*bar)))
return -ENOMEM;
nvkm_bar_ctor(func, device, type, inst, &bar->base);
bar->bar2_halve = nvkm_boolopt(device->cfgopt, "NvBar2Halve", false);
diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/bar/nv50.c b/drivers/gpu/drm/nouveau/nvkm/subdev/bar/nv50.c
index eb66234bc478..cf3bbaf1a85a 100644
--- a/drivers/gpu/drm/nouveau/nvkm/subdev/bar/nv50.c
+++ b/drivers/gpu/drm/nouveau/nvkm/subdev/bar/nv50.c
@@ -223,7 +223,7 @@ nv50_bar_new_(const struct nvkm_bar_func *func, struct nvkm_device *device,
enum nvkm_subdev_type type, int inst, u32 pgd_addr, struct nvkm_bar **pbar)
{
struct nv50_bar *bar;
- if (!(bar = kzalloc_obj(*bar, GFP_KERNEL)))
+ if (!(bar = kzalloc_obj(*bar)))
return -ENOMEM;
nvkm_bar_ctor(func, device, type, inst, &bar->base);
bar->pgd_addr = pgd_addr;
diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/bios/base.c b/drivers/gpu/drm/nouveau/nvkm/subdev/bios/base.c
index 9edc439ac790..fd3192df452e 100644
--- a/drivers/gpu/drm/nouveau/nvkm/subdev/bios/base.c
+++ b/drivers/gpu/drm/nouveau/nvkm/subdev/bios/base.c
@@ -156,7 +156,7 @@ nvkm_bios_new(struct nvkm_device *device, enum nvkm_subdev_type type, int inst,
struct bit_entry bit_i;
int ret, idx = 0;
- if (!(bios = *pbios = kzalloc_obj(*bios, GFP_KERNEL)))
+ if (!(bios = *pbios = kzalloc_obj(*bios)))
return -ENOMEM;
nvkm_subdev_ctor(&nvkm_bios, device, type, inst, &bios->subdev);
diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/bios/iccsense.c b/drivers/gpu/drm/nouveau/nvkm/subdev/bios/iccsense.c
index f1fec267ebad..5a481fa56fd5 100644
--- a/drivers/gpu/drm/nouveau/nvkm/subdev/bios/iccsense.c
+++ b/drivers/gpu/drm/nouveau/nvkm/subdev/bios/iccsense.c
@@ -73,7 +73,7 @@ nvbios_iccsense_parse(struct nvkm_bios *bios, struct nvbios_iccsense *iccsense)
}
iccsense->nr_entry = cnt;
- iccsense->rail = kmalloc_objs(struct pwr_rail_t, cnt, GFP_KERNEL);
+ iccsense->rail = kmalloc_objs(struct pwr_rail_t, cnt);
if (!iccsense->rail)
return -ENOMEM;
diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/bios/shadowof.c b/drivers/gpu/drm/nouveau/nvkm/subdev/bios/shadowof.c
index 02c2551b82cf..e963090f95be 100644
--- a/drivers/gpu/drm/nouveau/nvkm/subdev/bios/shadowof.c
+++ b/drivers/gpu/drm/nouveau/nvkm/subdev/bios/shadowof.c
@@ -58,7 +58,7 @@ of_init(struct nvkm_bios *bios, const char *name)
struct priv *priv;
if (!(dn = pci_device_to_OF_node(pdev)))
return ERR_PTR(-ENODEV);
- if (!(priv = kzalloc_obj(*priv, GFP_KERNEL)))
+ if (!(priv = kzalloc_obj(*priv)))
return ERR_PTR(-ENOMEM);
if ((priv->data = of_get_property(dn, "NVDA,BMP", &priv->size)))
return priv;
diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/bios/shadowpci.c b/drivers/gpu/drm/nouveau/nvkm/subdev/bios/shadowpci.c
index 72658f45cdf0..cb07c2a2d362 100644
--- a/drivers/gpu/drm/nouveau/nvkm/subdev/bios/shadowpci.c
+++ b/drivers/gpu/drm/nouveau/nvkm/subdev/bios/shadowpci.c
@@ -65,7 +65,7 @@ pcirom_init(struct nvkm_bios *bios, const char *name)
if (!(ret = pci_enable_rom(pdev))) {
if (ret = -ENOMEM,
- (priv = kmalloc_obj(*priv, GFP_KERNEL))) {
+ (priv = kmalloc_obj(*priv))) {
if (ret = -EFAULT,
(priv->rom = pci_map_rom(pdev, &priv->size))) {
priv->pdev = pdev;
@@ -104,7 +104,7 @@ platform_init(struct nvkm_bios *bios, const char *name)
if (!pdev->rom || pdev->romlen == 0)
return ERR_PTR(-ENODEV);
- if ((priv = kmalloc_obj(*priv, GFP_KERNEL))) {
+ if ((priv = kmalloc_obj(*priv))) {
priv->size = pdev->romlen;
if (ret = -ENODEV,
(priv->rom = ioremap(pdev->rom, pdev->romlen)))
diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/bios/shadowramin.c b/drivers/gpu/drm/nouveau/nvkm/subdev/bios/shadowramin.c
index 0cae8502301a..d5411d176e3a 100644
--- a/drivers/gpu/drm/nouveau/nvkm/subdev/bios/shadowramin.c
+++ b/drivers/gpu/drm/nouveau/nvkm/subdev/bios/shadowramin.c
@@ -102,7 +102,7 @@ pramin_init(struct nvkm_bios *bios, const char *name)
}
/* modify bar0 PRAMIN window to cover the bios image */
- if (!(priv = kmalloc_obj(*priv, GFP_KERNEL))) {
+ if (!(priv = kmalloc_obj(*priv))) {
nvkm_error(subdev, "... out of memory\n");
return ERR_PTR(-ENOMEM);
}
diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/bus/base.c b/drivers/gpu/drm/nouveau/nvkm/subdev/bus/base.c
index 6c789ef5e341..ca1825b71669 100644
--- a/drivers/gpu/drm/nouveau/nvkm/subdev/bus/base.c
+++ b/drivers/gpu/drm/nouveau/nvkm/subdev/bus/base.c
@@ -56,7 +56,7 @@ nvkm_bus_new_(const struct nvkm_bus_func *func, struct nvkm_device *device,
enum nvkm_subdev_type type, int inst, struct nvkm_bus **pbus)
{
struct nvkm_bus *bus;
- if (!(bus = *pbus = kzalloc_obj(*bus, GFP_KERNEL)))
+ if (!(bus = *pbus = kzalloc_obj(*bus)))
return -ENOMEM;
nvkm_subdev_ctor(&nvkm_bus, device, type, inst, &bus->subdev);
bus->func = func;
diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/bus/hwsq.c b/drivers/gpu/drm/nouveau/nvkm/subdev/bus/hwsq.c
index 8cb4bc5fdedf..7cd19e77f6a1 100644
--- a/drivers/gpu/drm/nouveau/nvkm/subdev/bus/hwsq.c
+++ b/drivers/gpu/drm/nouveau/nvkm/subdev/bus/hwsq.c
@@ -45,7 +45,7 @@ nvkm_hwsq_init(struct nvkm_subdev *subdev, struct nvkm_hwsq **phwsq)
{
struct nvkm_hwsq *hwsq;
- hwsq = *phwsq = kmalloc_obj(*hwsq, GFP_KERNEL);
+ hwsq = *phwsq = kmalloc_obj(*hwsq);
if (hwsq) {
hwsq->subdev = subdev;
hwsq->addr = ~0;
diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/clk/base.c b/drivers/gpu/drm/nouveau/nvkm/subdev/clk/base.c
index 39b88d995411..572e63846315 100644
--- a/drivers/gpu/drm/nouveau/nvkm/subdev/clk/base.c
+++ b/drivers/gpu/drm/nouveau/nvkm/subdev/clk/base.c
@@ -239,7 +239,7 @@ nvkm_cstate_new(struct nvkm_clk *clk, int idx, struct nvkm_pstate *pstate)
if (volt && nvkm_volt_map_min(volt, cstepX.voltage) > volt->max_uv)
return -EINVAL;
- cstate = kzalloc_obj(*cstate, GFP_KERNEL);
+ cstate = kzalloc_obj(*cstate);
if (!cstate)
return -ENOMEM;
@@ -416,7 +416,7 @@ nvkm_pstate_new(struct nvkm_clk *clk, int idx)
if (perfE.pstate == 0xff)
return 0;
- pstate = kzalloc_obj(*pstate, GFP_KERNEL);
+ pstate = kzalloc_obj(*pstate);
if (!pstate)
return -ENOMEM;
@@ -710,7 +710,7 @@ int
nvkm_clk_new_(const struct nvkm_clk_func *func, struct nvkm_device *device,
enum nvkm_subdev_type type, int inst, bool allow_reclock, struct nvkm_clk **pclk)
{
- if (!(*pclk = kzalloc_obj(**pclk, GFP_KERNEL)))
+ if (!(*pclk = kzalloc_obj(**pclk)))
return -ENOMEM;
return nvkm_clk_ctor(func, device, type, inst, allow_reclock, *pclk);
}
diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/clk/gf100.c b/drivers/gpu/drm/nouveau/nvkm/subdev/clk/gf100.c
index ec1effd3417b..163c1b2b9b8d 100644
--- a/drivers/gpu/drm/nouveau/nvkm/subdev/clk/gf100.c
+++ b/drivers/gpu/drm/nouveau/nvkm/subdev/clk/gf100.c
@@ -473,7 +473,7 @@ gf100_clk_new(struct nvkm_device *device, enum nvkm_subdev_type type, int inst,
{
struct gf100_clk *clk;
- if (!(clk = kzalloc_obj(*clk, GFP_KERNEL)))
+ if (!(clk = kzalloc_obj(*clk)))
return -ENOMEM;
*pclk = &clk->base;
diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/clk/gk104.c b/drivers/gpu/drm/nouveau/nvkm/subdev/clk/gk104.c
index 8ef413154f7e..9860a50bb4ca 100644
--- a/drivers/gpu/drm/nouveau/nvkm/subdev/clk/gk104.c
+++ b/drivers/gpu/drm/nouveau/nvkm/subdev/clk/gk104.c
@@ -509,7 +509,7 @@ gk104_clk_new(struct nvkm_device *device, enum nvkm_subdev_type type, int inst,
{
struct gk104_clk *clk;
- if (!(clk = kzalloc_obj(*clk, GFP_KERNEL)))
+ if (!(clk = kzalloc_obj(*clk)))
return -ENOMEM;
*pclk = &clk->base;
diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/clk/gk20a.c b/drivers/gpu/drm/nouveau/nvkm/subdev/clk/gk20a.c
index 4a87023154ec..b1197fa70687 100644
--- a/drivers/gpu/drm/nouveau/nvkm/subdev/clk/gk20a.c
+++ b/drivers/gpu/drm/nouveau/nvkm/subdev/clk/gk20a.c
@@ -649,7 +649,7 @@ gk20a_clk_new(struct nvkm_device *device, enum nvkm_subdev_type type, int inst,
struct gk20a_clk *clk;
int ret;
- clk = kzalloc_obj(*clk, GFP_KERNEL);
+ clk = kzalloc_obj(*clk);
if (!clk)
return -ENOMEM;
*pclk = &clk->base;
diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/clk/gm20b.c b/drivers/gpu/drm/nouveau/nvkm/subdev/clk/gm20b.c
index 59132544985a..73d696dbb698 100644
--- a/drivers/gpu/drm/nouveau/nvkm/subdev/clk/gm20b.c
+++ b/drivers/gpu/drm/nouveau/nvkm/subdev/clk/gm20b.c
@@ -919,7 +919,7 @@ gm20b_clk_new_speedo0(struct nvkm_device *device, enum nvkm_subdev_type type, in
struct gk20a_clk *clk;
int ret;
- clk = kzalloc_obj(*clk, GFP_KERNEL);
+ clk = kzalloc_obj(*clk);
if (!clk)
return -ENOMEM;
*pclk = &clk->base;
diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/clk/gp10b.c b/drivers/gpu/drm/nouveau/nvkm/subdev/clk/gp10b.c
index 13fea8f3e5c0..7fa8beb95180 100644
--- a/drivers/gpu/drm/nouveau/nvkm/subdev/clk/gp10b.c
+++ b/drivers/gpu/drm/nouveau/nvkm/subdev/clk/gp10b.c
@@ -165,7 +165,7 @@ gp10b_clk_new(struct nvkm_device *device, enum nvkm_subdev_type type, int inst,
struct gp10b_clk *clk;
int ret, i;
- clk = kzalloc_obj(*clk, GFP_KERNEL);
+ clk = kzalloc_obj(*clk);
if (!clk)
return -ENOMEM;
*pclk = &clk->base;
diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/clk/gt215.c b/drivers/gpu/drm/nouveau/nvkm/subdev/clk/gt215.c
index ed792f2b251e..5421200282b9 100644
--- a/drivers/gpu/drm/nouveau/nvkm/subdev/clk/gt215.c
+++ b/drivers/gpu/drm/nouveau/nvkm/subdev/clk/gt215.c
@@ -542,7 +542,7 @@ gt215_clk_new(struct nvkm_device *device, enum nvkm_subdev_type type, int inst,
{
struct gt215_clk *clk;
- if (!(clk = kzalloc_obj(*clk, GFP_KERNEL)))
+ if (!(clk = kzalloc_obj(*clk)))
return -ENOMEM;
*pclk = &clk->base;
diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/clk/mcp77.c b/drivers/gpu/drm/nouveau/nvkm/subdev/clk/mcp77.c
index 4960cf6acb2d..3d01de9b892c 100644
--- a/drivers/gpu/drm/nouveau/nvkm/subdev/clk/mcp77.c
+++ b/drivers/gpu/drm/nouveau/nvkm/subdev/clk/mcp77.c
@@ -414,7 +414,7 @@ mcp77_clk_new(struct nvkm_device *device, enum nvkm_subdev_type type, int inst,
{
struct mcp77_clk *clk;
- if (!(clk = kzalloc_obj(*clk, GFP_KERNEL)))
+ if (!(clk = kzalloc_obj(*clk)))
return -ENOMEM;
*pclk = &clk->base;
diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/clk/nv40.c b/drivers/gpu/drm/nouveau/nvkm/subdev/clk/nv40.c
index de429f26fa4f..7fcba24855ba 100644
--- a/drivers/gpu/drm/nouveau/nvkm/subdev/clk/nv40.c
+++ b/drivers/gpu/drm/nouveau/nvkm/subdev/clk/nv40.c
@@ -223,7 +223,7 @@ nv40_clk_new(struct nvkm_device *device, enum nvkm_subdev_type type, int inst,
{
struct nv40_clk *clk;
- if (!(clk = kzalloc_obj(*clk, GFP_KERNEL)))
+ if (!(clk = kzalloc_obj(*clk)))
return -ENOMEM;
clk->base.pll_calc = nv04_clk_pll_calc;
clk->base.pll_prog = nv04_clk_pll_prog;
diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/clk/nv50.c b/drivers/gpu/drm/nouveau/nvkm/subdev/clk/nv50.c
index aec4bb2b3550..630c4fc26500 100644
--- a/drivers/gpu/drm/nouveau/nvkm/subdev/clk/nv50.c
+++ b/drivers/gpu/drm/nouveau/nvkm/subdev/clk/nv50.c
@@ -513,7 +513,7 @@ nv50_clk_new_(const struct nvkm_clk_func *func, struct nvkm_device *device,
struct nv50_clk *clk;
int ret;
- if (!(clk = kzalloc_obj(*clk, GFP_KERNEL)))
+ if (!(clk = kzalloc_obj(*clk)))
return -ENOMEM;
ret = nvkm_clk_ctor(func, device, type, inst, allow_reclock, &clk->base);
*pclk = &clk->base;
diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/devinit/nv04.c b/drivers/gpu/drm/nouveau/nvkm/subdev/devinit/nv04.c
index 92b846d28869..ab97a177ea97 100644
--- a/drivers/gpu/drm/nouveau/nvkm/subdev/devinit/nv04.c
+++ b/drivers/gpu/drm/nouveau/nvkm/subdev/devinit/nv04.c
@@ -439,7 +439,7 @@ nv04_devinit_new_(const struct nvkm_devinit_func *func, struct nvkm_device *devi
{
struct nv04_devinit *init;
- if (!(init = kzalloc_obj(*init, GFP_KERNEL)))
+ if (!(init = kzalloc_obj(*init)))
return -ENOMEM;
*pinit = &init->base;
diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/devinit/nv50.c b/drivers/gpu/drm/nouveau/nvkm/subdev/devinit/nv50.c
index 1eb0908dcb5c..0983a29a6655 100644
--- a/drivers/gpu/drm/nouveau/nvkm/subdev/devinit/nv50.c
+++ b/drivers/gpu/drm/nouveau/nvkm/subdev/devinit/nv50.c
@@ -150,7 +150,7 @@ nv50_devinit_new_(const struct nvkm_devinit_func *func, struct nvkm_device *devi
{
struct nv50_devinit *init;
- if (!(init = kzalloc_obj(*init, GFP_KERNEL)))
+ if (!(init = kzalloc_obj(*init)))
return -ENOMEM;
*pinit = &init->base;
diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/devinit/r535.c b/drivers/gpu/drm/nouveau/nvkm/subdev/devinit/r535.c
index e226a2e24da5..9921dd3d3fd9 100644
--- a/drivers/gpu/drm/nouveau/nvkm/subdev/devinit/r535.c
+++ b/drivers/gpu/drm/nouveau/nvkm/subdev/devinit/r535.c
@@ -36,7 +36,7 @@ r535_devinit_new(const struct nvkm_devinit_func *hw,
struct nvkm_devinit_func *rm;
int ret;
- if (!(rm = kzalloc_obj(*rm, GFP_KERNEL)))
+ if (!(rm = kzalloc_obj(*rm)))
return -ENOMEM;
rm->dtor = r535_devinit_dtor;
diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/fault/base.c b/drivers/gpu/drm/nouveau/nvkm/subdev/fault/base.c
index 0ebda68c7d96..92e38755c218 100644
--- a/drivers/gpu/drm/nouveau/nvkm/subdev/fault/base.c
+++ b/drivers/gpu/drm/nouveau/nvkm/subdev/fault/base.c
@@ -76,7 +76,7 @@ nvkm_fault_oneinit_buffer(struct nvkm_fault *fault, int id)
struct nvkm_fault_buffer *buffer;
int ret;
- if (!(buffer = kzalloc_obj(*buffer, GFP_KERNEL)))
+ if (!(buffer = kzalloc_obj(*buffer)))
return -ENOMEM;
buffer->fault = fault;
buffer->id = id;
@@ -156,7 +156,7 @@ nvkm_fault_new_(const struct nvkm_fault_func *func, struct nvkm_device *device,
enum nvkm_subdev_type type, int inst, struct nvkm_fault **pfault)
{
struct nvkm_fault *fault;
- if (!(fault = *pfault = kzalloc_obj(*fault, GFP_KERNEL)))
+ if (!(fault = *pfault = kzalloc_obj(*fault)))
return -ENOMEM;
nvkm_subdev_ctor(&nvkm_fault, device, type, inst, &fault->subdev);
fault->func = func;
diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/fb/base.c b/drivers/gpu/drm/nouveau/nvkm/subdev/fb/base.c
index f15635ea99b8..6f521653adaa 100644
--- a/drivers/gpu/drm/nouveau/nvkm/subdev/fb/base.c
+++ b/drivers/gpu/drm/nouveau/nvkm/subdev/fb/base.c
@@ -296,7 +296,7 @@ int
nvkm_fb_new_(const struct nvkm_fb_func *func, struct nvkm_device *device,
enum nvkm_subdev_type type, int inst, struct nvkm_fb **pfb)
{
- if (!(*pfb = kzalloc_obj(**pfb, GFP_KERNEL)))
+ if (!(*pfb = kzalloc_obj(**pfb)))
return -ENOMEM;
return nvkm_fb_ctor(func, device, type, inst, *pfb);
}
diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/fb/gf100.c b/drivers/gpu/drm/nouveau/nvkm/subdev/fb/gf100.c
index 0c3e52e29baa..dc5cb6c54b13 100644
--- a/drivers/gpu/drm/nouveau/nvkm/subdev/fb/gf100.c
+++ b/drivers/gpu/drm/nouveau/nvkm/subdev/fb/gf100.c
@@ -112,7 +112,7 @@ gf100_fb_new_(const struct nvkm_fb_func *func, struct nvkm_device *device,
{
struct gf100_fb *fb;
- if (!(fb = kzalloc_obj(*fb, GFP_KERNEL)))
+ if (!(fb = kzalloc_obj(*fb)))
return -ENOMEM;
nvkm_fb_ctor(func, device, type, inst, &fb->base);
*pfb = &fb->base;
diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/fb/nv50.c b/drivers/gpu/drm/nouveau/nvkm/subdev/fb/nv50.c
index c2687ade0d7e..f1413fd193ad 100644
--- a/drivers/gpu/drm/nouveau/nvkm/subdev/fb/nv50.c
+++ b/drivers/gpu/drm/nouveau/nvkm/subdev/fb/nv50.c
@@ -244,7 +244,7 @@ nv50_fb_new_(const struct nv50_fb_func *func, struct nvkm_device *device,
{
struct nv50_fb *fb;
- if (!(fb = kzalloc_obj(*fb, GFP_KERNEL)))
+ if (!(fb = kzalloc_obj(*fb)))
return -ENOMEM;
nvkm_fb_ctor(&nv50_fb_, device, type, inst, &fb->base);
fb->func = func;
diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/fb/r535.c b/drivers/gpu/drm/nouveau/nvkm/subdev/fb/r535.c
index 167eb70143ce..9db6accc75a8 100644
--- a/drivers/gpu/drm/nouveau/nvkm/subdev/fb/r535.c
+++ b/drivers/gpu/drm/nouveau/nvkm/subdev/fb/r535.c
@@ -35,7 +35,7 @@ r535_fb_ram_new(struct nvkm_fb *fb, struct nvkm_ram **pram)
struct nvkm_ram *ram;
int ret;
- if (!(ram = *pram = kzalloc_obj(*ram, GFP_KERNEL)))
+ if (!(ram = *pram = kzalloc_obj(*ram)))
return -ENOMEM;
ram->func = &r535_fb_ram;
@@ -71,7 +71,7 @@ r535_fb_new(const struct nvkm_fb_func *hw,
struct nvkm_fb_func *rm;
int ret;
- if (!(rm = kzalloc_obj(*rm, GFP_KERNEL)))
+ if (!(rm = kzalloc_obj(*rm)))
return -ENOMEM;
rm->dtor = r535_fb_dtor;
diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/fb/ram.c b/drivers/gpu/drm/nouveau/nvkm/subdev/fb/ram.c
index e3f161f27189..66274083e215 100644
--- a/drivers/gpu/drm/nouveau/nvkm/subdev/fb/ram.c
+++ b/drivers/gpu/drm/nouveau/nvkm/subdev/fb/ram.c
@@ -127,7 +127,7 @@ nvkm_ram_wrap(struct nvkm_device *device, u64 addr, u64 size,
return -ENODEV;
ram = device->fb->ram;
- if (!(vram = kzalloc_obj(*vram, GFP_KERNEL)))
+ if (!(vram = kzalloc_obj(*vram)))
return -ENOMEM;
nvkm_memory_ctor(&nvkm_vram, &vram->memory);
@@ -135,7 +135,7 @@ nvkm_ram_wrap(struct nvkm_device *device, u64 addr, u64 size,
vram->page = NVKM_RAM_MM_SHIFT;
*pmemory = &vram->memory;
- vram->mn = kzalloc_obj(*vram->mn, GFP_KERNEL);
+ vram->mn = kzalloc_obj(*vram->mn);
if (!vram->mn)
return -ENOMEM;
@@ -163,7 +163,7 @@ nvkm_ram_get(struct nvkm_device *device, u8 heap, u8 type, u8 rpage, u64 size,
ram = device->fb->ram;
mm = &ram->vram;
- if (!(vram = kzalloc_obj(*vram, GFP_KERNEL)))
+ if (!(vram = kzalloc_obj(*vram)))
return -ENOMEM;
nvkm_memory_ctor(&nvkm_vram, &vram->memory);
vram->ram = ram;
@@ -257,7 +257,7 @@ int
nvkm_ram_new_(const struct nvkm_ram_func *func, struct nvkm_fb *fb,
enum nvkm_ram_type type, u64 size, struct nvkm_ram **pram)
{
- if (!(*pram = kzalloc_obj(**pram, GFP_KERNEL)))
+ if (!(*pram = kzalloc_obj(**pram)))
return -ENOMEM;
return nvkm_ram_ctor(func, fb, type, size, *pram);
}
diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/fb/ramgf100.c b/drivers/gpu/drm/nouveau/nvkm/subdev/fb/ramgf100.c
index 1367cb8adb8f..b6b8398eb254 100644
--- a/drivers/gpu/drm/nouveau/nvkm/subdev/fb/ramgf100.c
+++ b/drivers/gpu/drm/nouveau/nvkm/subdev/fb/ramgf100.c
@@ -572,7 +572,7 @@ gf100_ram_new_(const struct nvkm_ram_func *func,
struct gf100_ram *ram;
int ret;
- if (!(ram = kzalloc_obj(*ram, GFP_KERNEL)))
+ if (!(ram = kzalloc_obj(*ram)))
return -ENOMEM;
*pram = &ram->base;
diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/fb/ramgk104.c b/drivers/gpu/drm/nouveau/nvkm/subdev/fb/ramgk104.c
index 9bcbbe5469a3..f89e7101e65c 100644
--- a/drivers/gpu/drm/nouveau/nvkm/subdev/fb/ramgk104.c
+++ b/drivers/gpu/drm/nouveau/nvkm/subdev/fb/ramgk104.c
@@ -1371,7 +1371,7 @@ gk104_ram_train_init(struct nvkm_ram *ram)
struct gk104_ram_train *train;
int ret, i;
- if (!(train = kzalloc_obj(*train, GFP_KERNEL)))
+ if (!(train = kzalloc_obj(*train)))
return -ENOMEM;
for (i = 0; i < 0x100; i++) {
@@ -1446,7 +1446,7 @@ gk104_ram_ctor_data(struct gk104_ram *ram, u8 ramcfg, int i)
u32 data;
int ret;
- if (!(cfg = kmalloc_obj(*cfg, GFP_KERNEL)))
+ if (!(cfg = kmalloc_obj(*cfg)))
return -ENOMEM;
p = &list_last_entry(&ram->cfg, typeof(*cfg), head)->bios;
n = &cfg->bios;
@@ -1530,7 +1530,7 @@ gk104_ram_new_(const struct nvkm_ram_func *func, struct nvkm_fb *fb,
u8 ramcfg = nvbios_ramcfg_index(subdev);
u32 tmp;
- if (!(ram = kzalloc_obj(*ram, GFP_KERNEL)))
+ if (!(ram = kzalloc_obj(*ram)))
return -ENOMEM;
*pram = &ram->base;
diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/fb/ramgp100.c b/drivers/gpu/drm/nouveau/nvkm/subdev/fb/ramgp100.c
index fb958bb6c1d1..980aa9f2a7a1 100644
--- a/drivers/gpu/drm/nouveau/nvkm/subdev/fb/ramgp100.c
+++ b/drivers/gpu/drm/nouveau/nvkm/subdev/fb/ramgp100.c
@@ -91,7 +91,7 @@ gp100_ram_new(struct nvkm_fb *fb, struct nvkm_ram **pram)
{
struct nvkm_ram *ram;
- if (!(ram = *pram = kzalloc_obj(*ram, GFP_KERNEL)))
+ if (!(ram = *pram = kzalloc_obj(*ram)))
return -ENOMEM;
return gf100_ram_ctor(&gp100_ram, fb, ram);
diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/fb/ramgt215.c b/drivers/gpu/drm/nouveau/nvkm/subdev/fb/ramgt215.c
index 6417ee503aaf..3135b46cbfcd 100644
--- a/drivers/gpu/drm/nouveau/nvkm/subdev/fb/ramgt215.c
+++ b/drivers/gpu/drm/nouveau/nvkm/subdev/fb/ramgt215.c
@@ -942,7 +942,7 @@ gt215_ram_new(struct nvkm_fb *fb, struct nvkm_ram **pram)
struct gt215_ram *ram;
int ret, i;
- if (!(ram = kzalloc_obj(*ram, GFP_KERNEL)))
+ if (!(ram = kzalloc_obj(*ram)))
return -ENOMEM;
*pram = &ram->base;
diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/fb/rammcp77.c b/drivers/gpu/drm/nouveau/nvkm/subdev/fb/rammcp77.c
index 2e1890ada5f9..56605cbf0130 100644
--- a/drivers/gpu/drm/nouveau/nvkm/subdev/fb/rammcp77.c
+++ b/drivers/gpu/drm/nouveau/nvkm/subdev/fb/rammcp77.c
@@ -66,7 +66,7 @@ mcp77_ram_new(struct nvkm_fb *fb, struct nvkm_ram **pram)
struct mcp77_ram *ram;
int ret;
- if (!(ram = kzalloc_obj(*ram, GFP_KERNEL)))
+ if (!(ram = kzalloc_obj(*ram)))
return -ENOMEM;
*pram = &ram->base;
diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/fb/ramnv40.c b/drivers/gpu/drm/nouveau/nvkm/subdev/fb/ramnv40.c
index 5dc6012c67cd..53d37c9cc7ba 100644
--- a/drivers/gpu/drm/nouveau/nvkm/subdev/fb/ramnv40.c
+++ b/drivers/gpu/drm/nouveau/nvkm/subdev/fb/ramnv40.c
@@ -192,7 +192,7 @@ nv40_ram_new_(struct nvkm_fb *fb, enum nvkm_ram_type type, u64 size,
struct nvkm_ram **pram)
{
struct nv40_ram *ram;
- if (!(ram = kzalloc_obj(*ram, GFP_KERNEL)))
+ if (!(ram = kzalloc_obj(*ram)))
return -ENOMEM;
*pram = &ram->base;
return nvkm_ram_ctor(&nv40_ram_func, fb, type, size, &ram->base);
diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/fb/ramnv50.c b/drivers/gpu/drm/nouveau/nvkm/subdev/fb/ramnv50.c
index d767a6488e4c..be15519d0c96 100644
--- a/drivers/gpu/drm/nouveau/nvkm/subdev/fb/ramnv50.c
+++ b/drivers/gpu/drm/nouveau/nvkm/subdev/fb/ramnv50.c
@@ -587,7 +587,7 @@ nv50_ram_new(struct nvkm_fb *fb, struct nvkm_ram **pram)
struct nv50_ram *ram;
int ret, i;
- if (!(ram = kzalloc_obj(*ram, GFP_KERNEL)))
+ if (!(ram = kzalloc_obj(*ram)))
return -ENOMEM;
*pram = &ram->base;
diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/fsp/base.c b/drivers/gpu/drm/nouveau/nvkm/subdev/fsp/base.c
index ba24758d5ed1..b782fef91dca 100644
--- a/drivers/gpu/drm/nouveau/nvkm/subdev/fsp/base.c
+++ b/drivers/gpu/drm/nouveau/nvkm/subdev/fsp/base.c
@@ -55,7 +55,7 @@ nvkm_fsp_new_(const struct nvkm_fsp_func *func,
{
struct nvkm_fsp *fsp;
- fsp = *pfsp = kzalloc_obj(*fsp, GFP_KERNEL);
+ fsp = *pfsp = kzalloc_obj(*fsp);
if (!fsp)
return -ENOMEM;
diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/fuse/base.c b/drivers/gpu/drm/nouveau/nvkm/subdev/fuse/base.c
index ad5c0de62459..c1318e92e1f4 100644
--- a/drivers/gpu/drm/nouveau/nvkm/subdev/fuse/base.c
+++ b/drivers/gpu/drm/nouveau/nvkm/subdev/fuse/base.c
@@ -45,7 +45,7 @@ nvkm_fuse_new_(const struct nvkm_fuse_func *func, struct nvkm_device *device,
enum nvkm_subdev_type type, int inst, struct nvkm_fuse **pfuse)
{
struct nvkm_fuse *fuse;
- if (!(fuse = *pfuse = kzalloc_obj(*fuse, GFP_KERNEL)))
+ if (!(fuse = *pfuse = kzalloc_obj(*fuse)))
return -ENOMEM;
nvkm_subdev_ctor(&nvkm_fuse, device, type, inst, &fuse->subdev);
fuse->func = func;
diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/gpio/base.c b/drivers/gpu/drm/nouveau/nvkm/subdev/gpio/base.c
index d8b434a7276d..7a90196d2d09 100644
--- a/drivers/gpu/drm/nouveau/nvkm/subdev/gpio/base.c
+++ b/drivers/gpu/drm/nouveau/nvkm/subdev/gpio/base.c
@@ -227,7 +227,7 @@ nvkm_gpio_new_(const struct nvkm_gpio_func *func, struct nvkm_device *device,
{
struct nvkm_gpio *gpio;
- if (!(gpio = *pgpio = kzalloc_obj(*gpio, GFP_KERNEL)))
+ if (!(gpio = *pgpio = kzalloc_obj(*gpio)))
return -ENOMEM;
nvkm_subdev_ctor(&nvkm_gpio, device, type, inst, &gpio->subdev);
diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/gsp/base.c b/drivers/gpu/drm/nouveau/nvkm/subdev/gsp/base.c
index 3952b96a5abb..9ba1316831e7 100644
--- a/drivers/gpu/drm/nouveau/nvkm/subdev/gsp/base.c
+++ b/drivers/gpu/drm/nouveau/nvkm/subdev/gsp/base.c
@@ -132,7 +132,7 @@ nvkm_gsp_new_(const struct nvkm_gsp_fwif *fwif, struct nvkm_device *device,
{
struct nvkm_gsp *gsp;
- if (!(gsp = *pgsp = kzalloc_obj(*gsp, GFP_KERNEL)))
+ if (!(gsp = *pgsp = kzalloc_obj(*gsp)))
return -ENOMEM;
nvkm_subdev_ctor(&nvkm_gsp, device, type, inst, &gsp->subdev);
@@ -148,7 +148,7 @@ nvkm_gsp_new_(const struct nvkm_gsp_fwif *fwif, struct nvkm_device *device,
if (fwif->rm) {
nvkm_info(&gsp->subdev, "RM version: %s\n", fwif->ver);
- gsp->rm = kzalloc_obj(*gsp->rm, GFP_KERNEL);
+ gsp->rm = kzalloc_obj(*gsp->rm);
if (!gsp->rm)
return -ENOMEM;
diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/gsp/rm/engine.c b/drivers/gpu/drm/nouveau/nvkm/subdev/gsp/rm/engine.c
index 01c90b592dca..b1a2ebd94a45 100644
--- a/drivers/gpu/drm/nouveau/nvkm/subdev/gsp/rm/engine.c
+++ b/drivers/gpu/drm/nouveau/nvkm/subdev/gsp/rm/engine.c
@@ -44,7 +44,7 @@ nvkm_rm_engine_obj_new(struct nvkm_gsp_object *chan, int chid, const struct nvkm
struct nvkm_rm_engine_obj *obj;
int ret;
- obj = kzalloc_obj(*obj, GFP_KERNEL);
+ obj = kzalloc_obj(*obj);
if (!obj)
return -ENOMEM;
@@ -130,7 +130,7 @@ nvkm_rm_engine_new_(struct nvkm_rm *rm, enum nvkm_subdev_type type, int inst, u3
struct nvkm_engine *engine;
int ret;
- engine = kzalloc_obj(*engine, GFP_KERNEL);
+ engine = kzalloc_obj(*engine);
if (!engine)
return -ENOMEM;
diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/gsp/rm/gr.c b/drivers/gpu/drm/nouveau/nvkm/subdev/gsp/rm/gr.c
index c13aaeb9fc89..a726f44583cb 100644
--- a/drivers/gpu/drm/nouveau/nvkm/subdev/gsp/rm/gr.c
+++ b/drivers/gpu/drm/nouveau/nvkm/subdev/gsp/rm/gr.c
@@ -74,7 +74,7 @@ nvkm_rm_gr_new(struct nvkm_rm *rm)
func->sclass[i].ctor = nvkm_rm_gr_obj_ctor;
}
- gr = kzalloc_obj(*gr, GFP_KERNEL);
+ gr = kzalloc_obj(*gr);
if (!gr) {
kfree(func);
return -ENOMEM;
diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/gsp/rm/nvdec.c b/drivers/gpu/drm/nouveau/nvkm/subdev/gsp/rm/nvdec.c
index c0c6695bd547..e2a74973a1e8 100644
--- a/drivers/gpu/drm/nouveau/nvkm/subdev/gsp/rm/nvdec.c
+++ b/drivers/gpu/drm/nouveau/nvkm/subdev/gsp/rm/nvdec.c
@@ -17,7 +17,7 @@ nvkm_rm_nvdec_new(struct nvkm_rm *rm, int inst)
struct nvkm_nvdec *nvdec;
int ret;
- nvdec = kzalloc_obj(*nvdec, GFP_KERNEL);
+ nvdec = kzalloc_obj(*nvdec);
if (!nvdec)
return -ENOMEM;
diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/gsp/rm/nvenc.c b/drivers/gpu/drm/nouveau/nvkm/subdev/gsp/rm/nvenc.c
index db1c8b508b08..0da6a3e0c8f9 100644
--- a/drivers/gpu/drm/nouveau/nvkm/subdev/gsp/rm/nvenc.c
+++ b/drivers/gpu/drm/nouveau/nvkm/subdev/gsp/rm/nvenc.c
@@ -17,7 +17,7 @@ nvkm_rm_nvenc_new(struct nvkm_rm *rm, int inst)
struct nvkm_nvenc *nvenc;
int ret;
- nvenc = kzalloc_obj(*nvenc, GFP_KERNEL);
+ nvenc = kzalloc_obj(*nvenc);
if (!nvenc)
return -ENOMEM;
diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/gsp/rm/r535/bar.c b/drivers/gpu/drm/nouveau/nvkm/subdev/gsp/rm/r535/bar.c
index 37d0e21905bf..fae08ac3b18c 100644
--- a/drivers/gpu/drm/nouveau/nvkm/subdev/gsp/rm/r535/bar.c
+++ b/drivers/gpu/drm/nouveau/nvkm/subdev/gsp/rm/r535/bar.c
@@ -169,7 +169,7 @@ r535_bar_new_(const struct nvkm_bar_func *hw, struct nvkm_device *device,
struct nvkm_bar *bar;
int ret;
- if (!(rm = kzalloc_obj(*rm, GFP_KERNEL)))
+ if (!(rm = kzalloc_obj(*rm)))
return -ENOMEM;
rm->dtor = r535_bar_dtor;
diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/gsp/rm/r535/fbsr.c b/drivers/gpu/drm/nouveau/nvkm/subdev/gsp/rm/r535/fbsr.c
index c0d3d4f66d30..700cea5def35 100644
--- a/drivers/gpu/drm/nouveau/nvkm/subdev/gsp/rm/r535/fbsr.c
+++ b/drivers/gpu/drm/nouveau/nvkm/subdev/gsp/rm/r535/fbsr.c
@@ -184,7 +184,7 @@ fbsr_vram(struct fbsr *fbsr, const char *type, u64 addr, u64 size)
{
struct fbsr_item *item;
- if (!(item = kzalloc_obj(*item, GFP_KERNEL)))
+ if (!(item = kzalloc_obj(*item)))
return false;
item->type = type;
@@ -309,7 +309,7 @@ r535_instmem_new(const struct nvkm_instmem_func *hw,
struct nvkm_instmem_func *rm;
int ret;
- if (!(rm = kzalloc_obj(*rm, GFP_KERNEL)))
+ if (!(rm = kzalloc_obj(*rm)))
return -ENOMEM;
rm->dtor = r535_instmem_dtor;
diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/gsp/rm/r535/fifo.c b/drivers/gpu/drm/nouveau/nvkm/subdev/gsp/rm/r535/fifo.c
index 3d20574f5f70..76ee938efea3 100644
--- a/drivers/gpu/drm/nouveau/nvkm/subdev/gsp/rm/r535/fifo.c
+++ b/drivers/gpu/drm/nouveau/nvkm/subdev/gsp/rm/r535/fifo.c
@@ -591,7 +591,7 @@ r535_fifo_new(const struct nvkm_fifo_func *hw, struct nvkm_device *device,
const struct nvkm_rm_gpu *gpu = device->gsp->rm->gpu;
struct nvkm_fifo_func *rm;
- if (!(rm = kzalloc_obj(*rm, GFP_KERNEL)))
+ if (!(rm = kzalloc_obj(*rm)))
return -ENOMEM;
rm->dtor = r535_fifo_dtor;
diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/gsp/rm/r535/gr.c b/drivers/gpu/drm/nouveau/nvkm/subdev/gsp/rm/r535/gr.c
index d9029a87c010..7fe488d4d5ff 100644
--- a/drivers/gpu/drm/nouveau/nvkm/subdev/gsp/rm/r535/gr.c
+++ b/drivers/gpu/drm/nouveau/nvkm/subdev/gsp/rm/r535/gr.c
@@ -147,7 +147,7 @@ r535_gr_chan_new(struct nvkm_gr *base, struct nvkm_chan *chan, const struct nvkm
struct r535_gr_chan *grc;
int ret;
- if (!(grc = kzalloc_obj(*grc, GFP_KERNEL)))
+ if (!(grc = kzalloc_obj(*grc)))
return -ENOMEM;
nvkm_object_ctor(&r535_gr_chan, oclass, &grc->object);
diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/gsp/rm/r535/gsp.c b/drivers/gpu/drm/nouveau/nvkm/subdev/gsp/rm/r535/gsp.c
index 9fd073619c38..e10192fe1d0f 100644
--- a/drivers/gpu/drm/nouveau/nvkm/subdev/gsp/rm/r535/gsp.c
+++ b/drivers/gpu/drm/nouveau/nvkm/subdev/gsp/rm/r535/gsp.c
@@ -2003,7 +2003,7 @@ static void r535_gsp_retain_logging(struct nvkm_gsp *gsp)
goto exit;
}
- log = kzalloc_obj(*log, GFP_KERNEL);
+ log = kzalloc_obj(*log);
if (!log)
goto error;
diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/gsp/rm/r535/vmm.c b/drivers/gpu/drm/nouveau/nvkm/subdev/gsp/rm/r535/vmm.c
index 8ce33b757589..1ff42f1a8486 100644
--- a/drivers/gpu/drm/nouveau/nvkm/subdev/gsp/rm/r535/vmm.c
+++ b/drivers/gpu/drm/nouveau/nvkm/subdev/gsp/rm/r535/vmm.c
@@ -171,7 +171,7 @@ r535_mmu_new(const struct nvkm_mmu_func *hw,
struct nvkm_mmu_func *rm;
int ret;
- if (!(rm = kzalloc_obj(*rm, GFP_KERNEL)))
+ if (!(rm = kzalloc_obj(*rm)))
return -ENOMEM;
rm->dtor = r535_mmu_dtor;
diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/i2c/anx9805.c b/drivers/gpu/drm/nouveau/nvkm/subdev/i2c/anx9805.c
index 9e523e0d0a10..f01abe193e25 100644
--- a/drivers/gpu/drm/nouveau/nvkm/subdev/i2c/anx9805.c
+++ b/drivers/gpu/drm/nouveau/nvkm/subdev/i2c/anx9805.c
@@ -107,7 +107,7 @@ anx9805_bus_new(struct nvkm_i2c_pad *base, int id, u8 drive,
struct anx9805_bus *bus;
int ret;
- if (!(bus = kzalloc_obj(*bus, GFP_KERNEL)))
+ if (!(bus = kzalloc_obj(*bus)))
return -ENOMEM;
*pbus = &bus->base;
bus->pad = pad;
@@ -236,7 +236,7 @@ anx9805_aux_new(struct nvkm_i2c_pad *base, int id, u8 drive,
struct anx9805_aux *aux;
int ret;
- if (!(aux = kzalloc_obj(*aux, GFP_KERNEL)))
+ if (!(aux = kzalloc_obj(*aux)))
return -ENOMEM;
*pbus = &aux->base;
aux->pad = pad;
@@ -267,7 +267,7 @@ anx9805_pad_new(struct nvkm_i2c_bus *bus, int id, u8 addr,
{
struct anx9805_pad *pad;
- if (!(pad = kzalloc_obj(*pad, GFP_KERNEL)))
+ if (!(pad = kzalloc_obj(*pad)))
return -ENOMEM;
*ppad = &pad->base;
diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/i2c/auxch.c b/drivers/gpu/drm/nouveau/nvkm/subdev/i2c/auxch.c
index 62b8b9d2d03b..383af72f006e 100644
--- a/drivers/gpu/drm/nouveau/nvkm/subdev/i2c/auxch.c
+++ b/drivers/gpu/drm/nouveau/nvkm/subdev/i2c/auxch.c
@@ -209,7 +209,7 @@ nvkm_i2c_aux_new_(const struct nvkm_i2c_aux_func *func,
struct nvkm_i2c_pad *pad, int id,
struct nvkm_i2c_aux **paux)
{
- if (!(*paux = kzalloc_obj(**paux, GFP_KERNEL)))
+ if (!(*paux = kzalloc_obj(**paux)))
return -ENOMEM;
return nvkm_i2c_aux_ctor(func, pad, id, *paux);
}
diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/i2c/auxg94.c b/drivers/gpu/drm/nouveau/nvkm/subdev/i2c/auxg94.c
index 4906dad21347..f41bd332064d 100644
--- a/drivers/gpu/drm/nouveau/nvkm/subdev/i2c/auxg94.c
+++ b/drivers/gpu/drm/nouveau/nvkm/subdev/i2c/auxg94.c
@@ -171,7 +171,7 @@ g94_i2c_aux_new_(const struct nvkm_i2c_aux_func *func,
{
struct g94_i2c_aux *aux;
- if (!(aux = kzalloc_obj(*aux, GFP_KERNEL)))
+ if (!(aux = kzalloc_obj(*aux)))
return -ENOMEM;
*paux = &aux->base;
diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/i2c/auxgm200.c b/drivers/gpu/drm/nouveau/nvkm/subdev/i2c/auxgm200.c
index 3f0ed4057e9c..b8a16eddc553 100644
--- a/drivers/gpu/drm/nouveau/nvkm/subdev/i2c/auxgm200.c
+++ b/drivers/gpu/drm/nouveau/nvkm/subdev/i2c/auxgm200.c
@@ -177,7 +177,7 @@ gm200_i2c_aux_new(struct nvkm_i2c_pad *pad, int index, u8 drive,
{
struct gm200_i2c_aux *aux;
- if (!(aux = kzalloc_obj(*aux, GFP_KERNEL)))
+ if (!(aux = kzalloc_obj(*aux)))
return -ENOMEM;
*paux = &aux->base;
diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/i2c/base.c b/drivers/gpu/drm/nouveau/nvkm/subdev/i2c/base.c
index 42b9df6d6825..bd256e99feed 100644
--- a/drivers/gpu/drm/nouveau/nvkm/subdev/i2c/base.c
+++ b/drivers/gpu/drm/nouveau/nvkm/subdev/i2c/base.c
@@ -266,7 +266,7 @@ nvkm_i2c_new_(const struct nvkm_i2c_func *func, struct nvkm_device *device,
u8 ver, hdr;
int ret, i, ids;
- if (!(i2c = *pi2c = kzalloc_obj(*i2c, GFP_KERNEL)))
+ if (!(i2c = *pi2c = kzalloc_obj(*i2c)))
return -ENOMEM;
nvkm_subdev_ctor(&nvkm_i2c, device, type, inst, &i2c->subdev);
diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/i2c/bus.c b/drivers/gpu/drm/nouveau/nvkm/subdev/i2c/bus.c
index 84d6c0238be2..5129f692ae1c 100644
--- a/drivers/gpu/drm/nouveau/nvkm/subdev/i2c/bus.c
+++ b/drivers/gpu/drm/nouveau/nvkm/subdev/i2c/bus.c
@@ -232,7 +232,7 @@ nvkm_i2c_bus_ctor(const struct nvkm_i2c_bus_func *func,
if ( bus->func->drive_scl &&
!nvkm_boolopt(device->cfgopt, "NvI2C", internal)) {
- if (!(bit = kzalloc_obj(*bit, GFP_KERNEL)))
+ if (!(bit = kzalloc_obj(*bit)))
return -ENOMEM;
bit->udelay = 10;
bit->timeout = usecs_to_jiffies(2200);
@@ -258,7 +258,7 @@ nvkm_i2c_bus_new_(const struct nvkm_i2c_bus_func *func,
struct nvkm_i2c_pad *pad, int id,
struct nvkm_i2c_bus **pbus)
{
- if (!(*pbus = kzalloc_obj(**pbus, GFP_KERNEL)))
+ if (!(*pbus = kzalloc_obj(**pbus)))
return -ENOMEM;
return nvkm_i2c_bus_ctor(func, pad, id, *pbus);
}
diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/i2c/busgf119.c b/drivers/gpu/drm/nouveau/nvkm/subdev/i2c/busgf119.c
index 598df4da20b6..a0fdc623d204 100644
--- a/drivers/gpu/drm/nouveau/nvkm/subdev/i2c/busgf119.c
+++ b/drivers/gpu/drm/nouveau/nvkm/subdev/i2c/busgf119.c
@@ -85,7 +85,7 @@ gf119_i2c_bus_new(struct nvkm_i2c_pad *pad, int id, u8 drive,
{
struct gf119_i2c_bus *bus;
- if (!(bus = kzalloc_obj(*bus, GFP_KERNEL)))
+ if (!(bus = kzalloc_obj(*bus)))
return -ENOMEM;
*pbus = &bus->base;
diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/i2c/busnv04.c b/drivers/gpu/drm/nouveau/nvkm/subdev/i2c/busnv04.c
index 1a83c872d9d0..04e180257553 100644
--- a/drivers/gpu/drm/nouveau/nvkm/subdev/i2c/busnv04.c
+++ b/drivers/gpu/drm/nouveau/nvkm/subdev/i2c/busnv04.c
@@ -85,7 +85,7 @@ nv04_i2c_bus_new(struct nvkm_i2c_pad *pad, int id, u8 drive, u8 sense,
{
struct nv04_i2c_bus *bus;
- if (!(bus = kzalloc_obj(*bus, GFP_KERNEL)))
+ if (!(bus = kzalloc_obj(*bus)))
return -ENOMEM;
*pbus = &bus->base;
diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/i2c/busnv4e.c b/drivers/gpu/drm/nouveau/nvkm/subdev/i2c/busnv4e.c
index 3019cab91e4b..b9b08860939d 100644
--- a/drivers/gpu/drm/nouveau/nvkm/subdev/i2c/busnv4e.c
+++ b/drivers/gpu/drm/nouveau/nvkm/subdev/i2c/busnv4e.c
@@ -76,7 +76,7 @@ nv4e_i2c_bus_new(struct nvkm_i2c_pad *pad, int id, u8 drive,
{
struct nv4e_i2c_bus *bus;
- if (!(bus = kzalloc_obj(*bus, GFP_KERNEL)))
+ if (!(bus = kzalloc_obj(*bus)))
return -ENOMEM;
*pbus = &bus->base;
diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/i2c/busnv50.c b/drivers/gpu/drm/nouveau/nvkm/subdev/i2c/busnv50.c
index 995abbf8ef61..29db5cae8358 100644
--- a/drivers/gpu/drm/nouveau/nvkm/subdev/i2c/busnv50.c
+++ b/drivers/gpu/drm/nouveau/nvkm/subdev/i2c/busnv50.c
@@ -102,7 +102,7 @@ nv50_i2c_bus_new(struct nvkm_i2c_pad *pad, int id, u8 drive,
return -ENODEV;
}
- if (!(bus = kzalloc_obj(*bus, GFP_KERNEL)))
+ if (!(bus = kzalloc_obj(*bus)))
return -ENOMEM;
*pbus = &bus->base;
diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/i2c/pad.c b/drivers/gpu/drm/nouveau/nvkm/subdev/i2c/pad.c
index 7b167b691fc6..b4b9c24b7130 100644
--- a/drivers/gpu/drm/nouveau/nvkm/subdev/i2c/pad.c
+++ b/drivers/gpu/drm/nouveau/nvkm/subdev/i2c/pad.c
@@ -109,7 +109,7 @@ int
nvkm_i2c_pad_new_(const struct nvkm_i2c_pad_func *func, struct nvkm_i2c *i2c,
int id, struct nvkm_i2c_pad **ppad)
{
- if (!(*ppad = kzalloc_obj(**ppad, GFP_KERNEL)))
+ if (!(*ppad = kzalloc_obj(**ppad)))
return -ENOMEM;
nvkm_i2c_pad_ctor(func, i2c, id, *ppad);
return 0;
diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/iccsense/base.c b/drivers/gpu/drm/nouveau/nvkm/subdev/iccsense/base.c
index 365747909077..3ccdbbe2fad0 100644
--- a/drivers/gpu/drm/nouveau/nvkm/subdev/iccsense/base.c
+++ b/drivers/gpu/drm/nouveau/nvkm/subdev/iccsense/base.c
@@ -188,7 +188,7 @@ nvkm_iccsense_create_sensor(struct nvkm_iccsense *iccsense, u8 id)
return NULL;
}
- sensor = kmalloc_obj(*sensor, GFP_KERNEL);
+ sensor = kmalloc_obj(*sensor);
if (!sensor)
return NULL;
@@ -279,7 +279,7 @@ nvkm_iccsense_oneinit(struct nvkm_subdev *subdev)
continue;
}
- rail = kmalloc_obj(*rail, GFP_KERNEL);
+ rail = kmalloc_obj(*rail);
if (!rail)
return -ENOMEM;
@@ -322,7 +322,7 @@ int
nvkm_iccsense_new_(struct nvkm_device *device, enum nvkm_subdev_type type, int inst,
struct nvkm_iccsense **iccsense)
{
- if (!(*iccsense = kzalloc_obj(**iccsense, GFP_KERNEL)))
+ if (!(*iccsense = kzalloc_obj(**iccsense)))
return -ENOMEM;
INIT_LIST_HEAD(&(*iccsense)->sensors);
INIT_LIST_HEAD(&(*iccsense)->rails);
diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/instmem/gk20a.c b/drivers/gpu/drm/nouveau/nvkm/subdev/instmem/gk20a.c
index dab22c47d85e..8f85fc88bdb6 100644
--- a/drivers/gpu/drm/nouveau/nvkm/subdev/instmem/gk20a.c
+++ b/drivers/gpu/drm/nouveau/nvkm/subdev/instmem/gk20a.c
@@ -387,7 +387,7 @@ gk20a_instobj_ctor_dma(struct gk20a_instmem *imem, u32 npages, u32 align,
struct nvkm_subdev *subdev = &imem->base.subdev;
struct device *dev = subdev->device->dev;
- if (!(node = kzalloc_obj(*node, GFP_KERNEL)))
+ if (!(node = kzalloc_obj(*node)))
return -ENOMEM;
*_node = &node->base;
@@ -577,7 +577,7 @@ gk20a_instmem_new(struct nvkm_device *device, enum nvkm_subdev_type type, int in
struct nvkm_device_tegra *tdev = device->func->tegra(device);
struct gk20a_instmem *imem;
- if (!(imem = kzalloc_obj(*imem, GFP_KERNEL)))
+ if (!(imem = kzalloc_obj(*imem)))
return -ENOMEM;
nvkm_instmem_ctor(&gk20a_instmem, device, type, inst, &imem->base);
mutex_init(&imem->lock);
diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/instmem/nv04.c b/drivers/gpu/drm/nouveau/nvkm/subdev/instmem/nv04.c
index 247a7bf5fe39..c6859a775085 100644
--- a/drivers/gpu/drm/nouveau/nvkm/subdev/instmem/nv04.c
+++ b/drivers/gpu/drm/nouveau/nvkm/subdev/instmem/nv04.c
@@ -125,7 +125,7 @@ nv04_instobj_new(struct nvkm_instmem *base, u32 size, u32 align, bool zero,
struct nv04_instobj *iobj;
int ret;
- if (!(iobj = kzalloc_obj(*iobj, GFP_KERNEL)))
+ if (!(iobj = kzalloc_obj(*iobj)))
return -ENOMEM;
*pmemory = &iobj->base.memory;
@@ -267,7 +267,7 @@ nv04_instmem_new(struct nvkm_device *device, enum nvkm_subdev_type type, int ins
{
struct nv04_instmem *imem;
- if (!(imem = kzalloc_obj(*imem, GFP_KERNEL)))
+ if (!(imem = kzalloc_obj(*imem)))
return -ENOMEM;
nvkm_instmem_ctor(&nv04_instmem, device, type, inst, &imem->base);
*pimem = &imem->base;
diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/instmem/nv40.c b/drivers/gpu/drm/nouveau/nvkm/subdev/instmem/nv40.c
index 5a0f30d94198..ee790d70a92b 100644
--- a/drivers/gpu/drm/nouveau/nvkm/subdev/instmem/nv40.c
+++ b/drivers/gpu/drm/nouveau/nvkm/subdev/instmem/nv40.c
@@ -124,7 +124,7 @@ nv40_instobj_new(struct nvkm_instmem *base, u32 size, u32 align, bool zero,
struct nv40_instobj *iobj;
int ret;
- if (!(iobj = kzalloc_obj(*iobj, GFP_KERNEL)))
+ if (!(iobj = kzalloc_obj(*iobj)))
return -ENOMEM;
*pmemory = &iobj->base.memory;
@@ -240,7 +240,7 @@ nv40_instmem_new(struct nvkm_device *device, enum nvkm_subdev_type type, int ins
{
struct nv40_instmem *imem;
- if (!(imem = kzalloc_obj(*imem, GFP_KERNEL)))
+ if (!(imem = kzalloc_obj(*imem)))
return -ENOMEM;
nvkm_instmem_ctor(&nv40_instmem, device, type, inst, &imem->base);
*pimem = &imem->base;
diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/instmem/nv50.c b/drivers/gpu/drm/nouveau/nvkm/subdev/instmem/nv50.c
index d6c781ae57e9..6fbaa1e5876d 100644
--- a/drivers/gpu/drm/nouveau/nvkm/subdev/instmem/nv50.c
+++ b/drivers/gpu/drm/nouveau/nvkm/subdev/instmem/nv50.c
@@ -360,7 +360,7 @@ nv50_instobj_wrap(struct nvkm_instmem *base,
struct nv50_instmem *imem = nv50_instmem(base);
struct nv50_instobj *iobj;
- if (!(iobj = kzalloc_obj(*iobj, GFP_KERNEL)))
+ if (!(iobj = kzalloc_obj(*iobj)))
return -ENOMEM;
*pmemory = &iobj->base.memory;
@@ -431,7 +431,7 @@ nv50_instmem_new_(const struct nvkm_instmem_func *func,
{
struct nv50_instmem *imem;
- if (!(imem = kzalloc_obj(*imem, GFP_KERNEL)))
+ if (!(imem = kzalloc_obj(*imem)))
return -ENOMEM;
nvkm_instmem_ctor(func, device, type, inst, &imem->base);
INIT_LIST_HEAD(&imem->lru);
diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/ltc/base.c b/drivers/gpu/drm/nouveau/nvkm/subdev/ltc/base.c
index 7c1652bc28cd..371892c9cf44 100644
--- a/drivers/gpu/drm/nouveau/nvkm/subdev/ltc/base.c
+++ b/drivers/gpu/drm/nouveau/nvkm/subdev/ltc/base.c
@@ -133,7 +133,7 @@ nvkm_ltc_new_(const struct nvkm_ltc_func *func, struct nvkm_device *device,
{
struct nvkm_ltc *ltc;
- if (!(ltc = *pltc = kzalloc_obj(*ltc, GFP_KERNEL)))
+ if (!(ltc = *pltc = kzalloc_obj(*ltc)))
return -ENOMEM;
nvkm_subdev_ctor(&nvkm_ltc, device, type, inst, <c->subdev);
diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/mc/base.c b/drivers/gpu/drm/nouveau/nvkm/subdev/mc/base.c
index 2d7e6d6f8760..5f85c806abd7 100644
--- a/drivers/gpu/drm/nouveau/nvkm/subdev/mc/base.c
+++ b/drivers/gpu/drm/nouveau/nvkm/subdev/mc/base.c
@@ -130,7 +130,7 @@ nvkm_mc_new_(const struct nvkm_mc_func *func, struct nvkm_device *device,
struct nvkm_mc *mc;
int ret;
- if (!(mc = *pmc = kzalloc_obj(*mc, GFP_KERNEL)))
+ if (!(mc = *pmc = kzalloc_obj(*mc)))
return -ENOMEM;
nvkm_subdev_ctor(&nvkm_mc, device, type, inst, &mc->subdev);
diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/mmu/base.c b/drivers/gpu/drm/nouveau/nvkm/subdev/mmu/base.c
index 2d9c4d6f9162..df86214183cc 100644
--- a/drivers/gpu/drm/nouveau/nvkm/subdev/mmu/base.c
+++ b/drivers/gpu/drm/nouveau/nvkm/subdev/mmu/base.c
@@ -68,13 +68,13 @@ nvkm_mmu_ptp_get(struct nvkm_mmu *mmu, u32 size, bool zero)
struct nvkm_mmu_ptp *ptp;
int slot;
- if (!(pt = kzalloc_obj(*pt, GFP_KERNEL)))
+ if (!(pt = kzalloc_obj(*pt)))
return NULL;
ptp = list_first_entry_or_null(&mmu->ptp.list, typeof(*ptp), head);
if (!ptp) {
/* Need to allocate a new parent to sub-allocate from. */
- if (!(ptp = kmalloc_obj(*ptp, GFP_KERNEL))) {
+ if (!(ptp = kmalloc_obj(*ptp))) {
kfree(pt);
return NULL;
}
@@ -126,7 +126,7 @@ nvkm_mmu_ptc_find(struct nvkm_mmu *mmu, u32 size)
return ptc;
}
- ptc = kmalloc_obj(*ptc, GFP_KERNEL);
+ ptc = kmalloc_obj(*ptc);
if (ptc) {
INIT_LIST_HEAD(&ptc->item);
ptc->size = size;
@@ -199,7 +199,7 @@ nvkm_mmu_ptc_get(struct nvkm_mmu *mmu, u32 size, u32 align, bool zero)
mutex_unlock(&mmu->ptc.mutex);
/* No such luck, we need to allocate. */
- if (!(pt = kmalloc_obj(*pt, GFP_KERNEL)))
+ if (!(pt = kmalloc_obj(*pt)))
return NULL;
pt->ptc = ptc;
pt->sub = false;
@@ -434,7 +434,7 @@ int
nvkm_mmu_new_(const struct nvkm_mmu_func *func, struct nvkm_device *device,
enum nvkm_subdev_type type, int inst, struct nvkm_mmu **pmmu)
{
- if (!(*pmmu = kzalloc_obj(**pmmu, GFP_KERNEL)))
+ if (!(*pmmu = kzalloc_obj(**pmmu)))
return -ENOMEM;
nvkm_mmu_ctor(func, device, type, inst, *pmmu);
return 0;
diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/mmu/mem.c b/drivers/gpu/drm/nouveau/nvkm/subdev/mmu/mem.c
index 96b620ed07ca..81fecf852e98 100644
--- a/drivers/gpu/drm/nouveau/nvkm/subdev/mmu/mem.c
+++ b/drivers/gpu/drm/nouveau/nvkm/subdev/mmu/mem.c
@@ -163,7 +163,7 @@ nvkm_mem_new_host(struct nvkm_mmu *mmu, int type, u8 page, u64 size,
if (page != PAGE_SHIFT)
return -EINVAL;
- if (!(mem = kzalloc_obj(*mem, GFP_KERNEL)))
+ if (!(mem = kzalloc_obj(*mem)))
return -ENOMEM;
mem->target = target;
mem->mmu = mmu;
@@ -191,9 +191,9 @@ nvkm_mem_new_host(struct nvkm_mmu *mmu, int type, u8 page, u64 size,
nvkm_memory_ctor(&nvkm_mem_dma, &mem->memory);
size = ALIGN(size, PAGE_SIZE) >> PAGE_SHIFT;
- if (!(mem->mem = kvmalloc_objs(*mem->mem, size, GFP_KERNEL)))
+ if (!(mem->mem = kvmalloc_objs(*mem->mem, size)))
return -ENOMEM;
- if (!(mem->dma = kvmalloc_objs(*mem->dma, size, GFP_KERNEL)))
+ if (!(mem->dma = kvmalloc_objs(*mem->dma, size)))
return -ENOMEM;
if (mmu->dma_bits > 32)
diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/mmu/umem.c b/drivers/gpu/drm/nouveau/nvkm/subdev/mmu/umem.c
index 79ab3a99d98c..456d7356b3e5 100644
--- a/drivers/gpu/drm/nouveau/nvkm/subdev/mmu/umem.c
+++ b/drivers/gpu/drm/nouveau/nvkm/subdev/mmu/umem.c
@@ -161,7 +161,7 @@ nvkm_umem_new(const struct nvkm_oclass *oclass, void *argv, u32 argc,
if (type >= mmu->type_nr)
return -EINVAL;
- if (!(umem = kzalloc_obj(*umem, GFP_KERNEL)))
+ if (!(umem = kzalloc_obj(*umem)))
return -ENOMEM;
nvkm_object_ctor(&nvkm_umem, oclass, &umem->object);
umem->mmu = mmu;
diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/mmu/ummu.c b/drivers/gpu/drm/nouveau/nvkm/subdev/mmu/ummu.c
index 8de3a707b5c2..cc450e7bb3fd 100644
--- a/drivers/gpu/drm/nouveau/nvkm/subdev/mmu/ummu.c
+++ b/drivers/gpu/drm/nouveau/nvkm/subdev/mmu/ummu.c
@@ -172,7 +172,7 @@ nvkm_ummu_new(struct nvkm_device *device, const struct nvkm_oclass *oclass,
} else
return ret;
- if (!(ummu = kzalloc_obj(*ummu, GFP_KERNEL)))
+ if (!(ummu = kzalloc_obj(*ummu)))
return -ENOMEM;
nvkm_object_ctor(&nvkm_ummu, oclass, &ummu->object);
ummu->mmu = mmu;
diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/mmu/uvmm.c b/drivers/gpu/drm/nouveau/nvkm/subdev/mmu/uvmm.c
index 1778daa0af3a..fefbe65af9f1 100644
--- a/drivers/gpu/drm/nouveau/nvkm/subdev/mmu/uvmm.c
+++ b/drivers/gpu/drm/nouveau/nvkm/subdev/mmu/uvmm.c
@@ -551,7 +551,7 @@ nvkm_uvmm_new(const struct nvkm_oclass *oclass, void *argv, u32 argc,
} else
return ret;
- if (!(uvmm = kzalloc_obj(*uvmm, GFP_KERNEL)))
+ if (!(uvmm = kzalloc_obj(*uvmm)))
return -ENOMEM;
nvkm_object_ctor(&nvkm_uvmm, oclass, &uvmm->object);
diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/mmu/vmm.c b/drivers/gpu/drm/nouveau/nvkm/subdev/mmu/vmm.c
index 3a53ce15ea29..958fd78080bd 100644
--- a/drivers/gpu/drm/nouveau/nvkm/subdev/mmu/vmm.c
+++ b/drivers/gpu/drm/nouveau/nvkm/subdev/mmu/vmm.c
@@ -59,7 +59,7 @@ nvkm_vmm_pt_new(const struct nvkm_vmm_desc *desc, bool sparse,
pgt->sparse = sparse;
if (desc->type == PGD) {
- pgt->pde = kvzalloc_objs(*pgt->pde, pten, GFP_KERNEL);
+ pgt->pde = kvzalloc_objs(*pgt->pde, pten);
if (!pgt->pde) {
kfree(pgt);
return NULL;
@@ -823,7 +823,7 @@ nvkm_vmm_ptes_get_map(struct nvkm_vmm *vmm, const struct nvkm_vmm_page *page,
struct nvkm_vma *
nvkm_vma_new(u64 addr, u64 size)
{
- struct nvkm_vma *vma = kzalloc_obj(*vma, GFP_KERNEL);
+ struct nvkm_vma *vma = kzalloc_obj(*vma);
if (vma) {
vma->addr = addr;
vma->size = size;
@@ -1226,7 +1226,7 @@ nvkm_vmm_new_(const struct nvkm_vmm_func *func, struct nvkm_mmu *mmu,
struct lock_class_key *key, const char *name,
struct nvkm_vmm **pvmm)
{
- if (!(*pvmm = kzalloc_obj(**pvmm, GFP_KERNEL)))
+ if (!(*pvmm = kzalloc_obj(**pvmm)))
return -ENOMEM;
return nvkm_vmm_ctor(func, mmu, hdr, managed, addr, size, key, name, *pvmm);
}
diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/mmu/vmmnv50.c b/drivers/gpu/drm/nouveau/nvkm/subdev/mmu/vmmnv50.c
index 86f038ebb360..5217ce64d005 100644
--- a/drivers/gpu/drm/nouveau/nvkm/subdev/mmu/vmmnv50.c
+++ b/drivers/gpu/drm/nouveau/nvkm/subdev/mmu/vmmnv50.c
@@ -346,7 +346,7 @@ nv50_vmm_join(struct nvkm_vmm *vmm, struct nvkm_memory *inst)
u64 data;
u32 pdei;
- if (!(join = kmalloc_obj(*join, GFP_KERNEL)))
+ if (!(join = kmalloc_obj(*join)))
return -ENOMEM;
join->inst = inst;
list_add_tail(&join->head, &vmm->join);
diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/mxm/base.c b/drivers/gpu/drm/nouveau/nvkm/subdev/mxm/base.c
index 6d6c4b831a58..26ec50b66e66 100644
--- a/drivers/gpu/drm/nouveau/nvkm/subdev/mxm/base.c
+++ b/drivers/gpu/drm/nouveau/nvkm/subdev/mxm/base.c
@@ -238,7 +238,7 @@ nvkm_mxm_new_(struct nvkm_device *device, enum nvkm_subdev_type type, int inst,
u8 ver, len;
u16 data;
- if (!(mxm = *pmxm = kzalloc_obj(*mxm, GFP_KERNEL)))
+ if (!(mxm = *pmxm = kzalloc_obj(*mxm)))
return -ENOMEM;
nvkm_subdev_ctor(&nvkm_mxm, device, type, inst, &mxm->subdev);
diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/pci/base.c b/drivers/gpu/drm/nouveau/nvkm/subdev/pci/base.c
index f357d777bc96..bd421d5b1faf 100644
--- a/drivers/gpu/drm/nouveau/nvkm/subdev/pci/base.c
+++ b/drivers/gpu/drm/nouveau/nvkm/subdev/pci/base.c
@@ -162,7 +162,7 @@ nvkm_pci_new_(const struct nvkm_pci_func *func, struct nvkm_device *device,
{
struct nvkm_pci *pci;
- if (!(pci = *ppci = kzalloc_obj(**ppci, GFP_KERNEL)))
+ if (!(pci = *ppci = kzalloc_obj(**ppci)))
return -ENOMEM;
nvkm_subdev_ctor(&nvkm_pci_func, device, type, inst, &pci->subdev);
pci->func = func;
diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/pmu/base.c b/drivers/gpu/drm/nouveau/nvkm/subdev/pmu/base.c
index 0d7cfd73ff17..e556b1905702 100644
--- a/drivers/gpu/drm/nouveau/nvkm/subdev/pmu/base.c
+++ b/drivers/gpu/drm/nouveau/nvkm/subdev/pmu/base.c
@@ -161,7 +161,7 @@ nvkm_pmu_new_(const struct nvkm_pmu_fwif *fwif, struct nvkm_device *device,
enum nvkm_subdev_type type, int inst, struct nvkm_pmu **ppmu)
{
struct nvkm_pmu *pmu;
- if (!(pmu = *ppmu = kzalloc_obj(*pmu, GFP_KERNEL)))
+ if (!(pmu = *ppmu = kzalloc_obj(*pmu)))
return -ENOMEM;
return nvkm_pmu_ctor(fwif, device, type, inst, *ppmu);
}
diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/pmu/gk20a.c b/drivers/gpu/drm/nouveau/nvkm/subdev/pmu/gk20a.c
index 46abf56cc830..9831d849e4d7 100644
--- a/drivers/gpu/drm/nouveau/nvkm/subdev/pmu/gk20a.c
+++ b/drivers/gpu/drm/nouveau/nvkm/subdev/pmu/gk20a.c
@@ -215,7 +215,7 @@ gk20a_pmu_new(struct nvkm_device *device, enum nvkm_subdev_type type, int inst,
struct gk20a_pmu *pmu;
int ret;
- if (!(pmu = kzalloc_obj(*pmu, GFP_KERNEL)))
+ if (!(pmu = kzalloc_obj(*pmu)))
return -ENOMEM;
*ppmu = &pmu->base;
diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/pmu/memx.c b/drivers/gpu/drm/nouveau/nvkm/subdev/pmu/memx.c
index 0fed890a8f95..cdbadb5b71d7 100644
--- a/drivers/gpu/drm/nouveau/nvkm/subdev/pmu/memx.c
+++ b/drivers/gpu/drm/nouveau/nvkm/subdev/pmu/memx.c
@@ -53,7 +53,7 @@ nvkm_memx_init(struct nvkm_pmu *pmu, struct nvkm_memx **pmemx)
if (ret)
return ret;
- memx = *pmemx = kzalloc_obj(*memx, GFP_KERNEL);
+ memx = *pmemx = kzalloc_obj(*memx);
if (!memx)
return -ENOMEM;
memx->pmu = pmu;
diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/therm/base.c b/drivers/gpu/drm/nouveau/nvkm/subdev/therm/base.c
index 2613f5872bcd..224222914f1c 100644
--- a/drivers/gpu/drm/nouveau/nvkm/subdev/therm/base.c
+++ b/drivers/gpu/drm/nouveau/nvkm/subdev/therm/base.c
@@ -447,7 +447,7 @@ nvkm_therm_new_(const struct nvkm_therm_func *func, struct nvkm_device *device,
{
struct nvkm_therm *therm;
- if (!(therm = *ptherm = kzalloc_obj(*therm, GFP_KERNEL)))
+ if (!(therm = *ptherm = kzalloc_obj(*therm)))
return -ENOMEM;
nvkm_therm_ctor(therm, device, type, inst, func);
diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/therm/fannil.c b/drivers/gpu/drm/nouveau/nvkm/subdev/therm/fannil.c
index 92737c2770b6..8970422c9eeb 100644
--- a/drivers/gpu/drm/nouveau/nvkm/subdev/therm/fannil.c
+++ b/drivers/gpu/drm/nouveau/nvkm/subdev/therm/fannil.c
@@ -40,7 +40,7 @@ nvkm_fannil_create(struct nvkm_therm *therm)
{
struct nvkm_fan *priv;
- priv = kzalloc_obj(*priv, GFP_KERNEL);
+ priv = kzalloc_obj(*priv);
therm->fan = priv;
if (!priv)
return -ENOMEM;
diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/therm/fanpwm.c b/drivers/gpu/drm/nouveau/nvkm/subdev/therm/fanpwm.c
index aa13cd45785a..7e61be4bcf88 100644
--- a/drivers/gpu/drm/nouveau/nvkm/subdev/therm/fanpwm.c
+++ b/drivers/gpu/drm/nouveau/nvkm/subdev/therm/fanpwm.c
@@ -97,7 +97,7 @@ nvkm_fanpwm_create(struct nvkm_therm *therm, struct dcb_gpio_func *func)
therm->func->pwm_get(therm, func->line, &divs, &duty) == -ENODEV)
return -ENODEV;
- fan = kzalloc_obj(*fan, GFP_KERNEL);
+ fan = kzalloc_obj(*fan);
if (!fan)
return -ENOMEM;
diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/therm/fantog.c b/drivers/gpu/drm/nouveau/nvkm/subdev/therm/fantog.c
index 6cfe7fee54f0..4b8e2c3bef59 100644
--- a/drivers/gpu/drm/nouveau/nvkm/subdev/therm/fantog.c
+++ b/drivers/gpu/drm/nouveau/nvkm/subdev/therm/fantog.c
@@ -99,7 +99,7 @@ nvkm_fantog_create(struct nvkm_therm *therm, struct dcb_gpio_func *func)
return ret;
}
- fan = kzalloc_obj(*fan, GFP_KERNEL);
+ fan = kzalloc_obj(*fan);
if (!fan)
return -ENOMEM;
diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/therm/gk104.c b/drivers/gpu/drm/nouveau/nvkm/subdev/therm/gk104.c
index f58f4add5ef3..b816fd304238 100644
--- a/drivers/gpu/drm/nouveau/nvkm/subdev/therm/gk104.c
+++ b/drivers/gpu/drm/nouveau/nvkm/subdev/therm/gk104.c
@@ -112,7 +112,7 @@ gk104_therm_new_(const struct nvkm_therm_func *func, struct nvkm_device *device,
const struct gf100_idle_filter *idle_filter,
struct nvkm_therm **ptherm)
{
- struct gk104_therm *therm = kzalloc_obj(*therm, GFP_KERNEL);
+ struct gk104_therm *therm = kzalloc_obj(*therm);
if (!therm)
return -ENOMEM;
diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/timer/base.c b/drivers/gpu/drm/nouveau/nvkm/subdev/timer/base.c
index dcb4763e1c08..e971b6643483 100644
--- a/drivers/gpu/drm/nouveau/nvkm/subdev/timer/base.c
+++ b/drivers/gpu/drm/nouveau/nvkm/subdev/timer/base.c
@@ -187,7 +187,7 @@ nvkm_timer_new_(const struct nvkm_timer_func *func, struct nvkm_device *device,
{
struct nvkm_timer *tmr;
- if (!(tmr = *ptmr = kzalloc_obj(*tmr, GFP_KERNEL)))
+ if (!(tmr = *ptmr = kzalloc_obj(*tmr)))
return -ENOMEM;
nvkm_subdev_ctor(&nvkm_timer, device, type, inst, &tmr->subdev);
diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/top/base.c b/drivers/gpu/drm/nouveau/nvkm/subdev/top/base.c
index fb55ff2b2a46..c987c4abe15c 100644
--- a/drivers/gpu/drm/nouveau/nvkm/subdev/top/base.c
+++ b/drivers/gpu/drm/nouveau/nvkm/subdev/top/base.c
@@ -26,7 +26,7 @@
struct nvkm_top_device *
nvkm_top_device_new(struct nvkm_top *top)
{
- struct nvkm_top_device *info = kmalloc_obj(*info, GFP_KERNEL);
+ struct nvkm_top_device *info = kmalloc_obj(*info);
if (info) {
info->type = NVKM_SUBDEV_NR;
info->inst = -1;
@@ -152,7 +152,7 @@ nvkm_top_new_(const struct nvkm_top_func *func, struct nvkm_device *device,
enum nvkm_subdev_type type, int inst, struct nvkm_top **ptop)
{
struct nvkm_top *top;
- if (!(top = *ptop = kzalloc_obj(*top, GFP_KERNEL)))
+ if (!(top = *ptop = kzalloc_obj(*top)))
return -ENOMEM;
nvkm_subdev_ctor(&nvkm_top, device, type, inst, &top->subdev);
top->func = func;
diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/vfn/base.c b/drivers/gpu/drm/nouveau/nvkm/subdev/vfn/base.c
index 3d584be9e201..c0258bcfe8f5 100644
--- a/drivers/gpu/drm/nouveau/nvkm/subdev/vfn/base.c
+++ b/drivers/gpu/drm/nouveau/nvkm/subdev/vfn/base.c
@@ -39,7 +39,7 @@ nvkm_vfn_new_(const struct nvkm_vfn_func *func, struct nvkm_device *device,
struct nvkm_vfn *vfn;
int ret;
- if (!(vfn = *pvfn = kzalloc_obj(*vfn, GFP_KERNEL)))
+ if (!(vfn = *pvfn = kzalloc_obj(*vfn)))
return -ENOMEM;
nvkm_subdev_ctor(&nvkm_vfn, device, type, inst, &vfn->subdev);
diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/vfn/r535.c b/drivers/gpu/drm/nouveau/nvkm/subdev/vfn/r535.c
index e01ea0dcd529..36709c0e3bb4 100644
--- a/drivers/gpu/drm/nouveau/nvkm/subdev/vfn/r535.c
+++ b/drivers/gpu/drm/nouveau/nvkm/subdev/vfn/r535.c
@@ -38,7 +38,7 @@ r535_vfn_new(const struct nvkm_vfn_func *hw,
struct nvkm_vfn_func *rm;
int ret;
- if (!(rm = kzalloc_obj(*rm, GFP_KERNEL)))
+ if (!(rm = kzalloc_obj(*rm)))
return -ENOMEM;
rm->dtor = r535_vfn_dtor;
diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/vfn/uvfn.c b/drivers/gpu/drm/nouveau/nvkm/subdev/vfn/uvfn.c
index 27fd15559796..0004cf642ec6 100644
--- a/drivers/gpu/drm/nouveau/nvkm/subdev/vfn/uvfn.c
+++ b/drivers/gpu/drm/nouveau/nvkm/subdev/vfn/uvfn.c
@@ -56,7 +56,7 @@ nvkm_uvfn_new(struct nvkm_device *device, const struct nvkm_oclass *oclass,
if (argc != 0)
return -ENOSYS;
- if (!(uvfn = kzalloc_obj(*uvfn, GFP_KERNEL)))
+ if (!(uvfn = kzalloc_obj(*uvfn)))
return -ENOMEM;
nvkm_object_ctor(&nvkm_uvfn, oclass, &uvfn->object);
diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/volt/base.c b/drivers/gpu/drm/nouveau/nvkm/subdev/volt/base.c
index 8bb3761e547b..f0c66f9b4b1f 100644
--- a/drivers/gpu/drm/nouveau/nvkm/subdev/volt/base.c
+++ b/drivers/gpu/drm/nouveau/nvkm/subdev/volt/base.c
@@ -321,7 +321,7 @@ int
nvkm_volt_new_(const struct nvkm_volt_func *func, struct nvkm_device *device,
enum nvkm_subdev_type type, int inst, struct nvkm_volt **pvolt)
{
- if (!(*pvolt = kzalloc_obj(**pvolt, GFP_KERNEL)))
+ if (!(*pvolt = kzalloc_obj(**pvolt)))
return -ENOMEM;
nvkm_volt_ctor(func, device, type, inst, *pvolt);
return 0;
diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/volt/gk104.c b/drivers/gpu/drm/nouveau/nvkm/subdev/volt/gk104.c
index 5146666ea0f5..7bc264fb753b 100644
--- a/drivers/gpu/drm/nouveau/nvkm/subdev/volt/gk104.c
+++ b/drivers/gpu/drm/nouveau/nvkm/subdev/volt/gk104.c
@@ -113,7 +113,7 @@ gk104_volt_new(struct nvkm_device *device, enum nvkm_subdev_type type, int inst,
volt_func = &gk104_volt_pwm;
}
- if (!(volt = kzalloc_obj(*volt, GFP_KERNEL)))
+ if (!(volt = kzalloc_obj(*volt)))
return -ENOMEM;
nvkm_volt_ctor(volt_func, device, type, inst, &volt->base);
*pvolt = &volt->base;
diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/volt/gk20a.c b/drivers/gpu/drm/nouveau/nvkm/subdev/volt/gk20a.c
index 5941a1eeabd9..5aef95c9f20f 100644
--- a/drivers/gpu/drm/nouveau/nvkm/subdev/volt/gk20a.c
+++ b/drivers/gpu/drm/nouveau/nvkm/subdev/volt/gk20a.c
@@ -176,7 +176,7 @@ gk20a_volt_new(struct nvkm_device *device, enum nvkm_subdev_type type, int inst,
{
struct gk20a_volt *volt;
- volt = kzalloc_obj(*volt, GFP_KERNEL);
+ volt = kzalloc_obj(*volt);
if (!volt)
return -ENOMEM;
*pvolt = &volt->base;
diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/volt/gm20b.c b/drivers/gpu/drm/nouveau/nvkm/subdev/volt/gm20b.c
index 7348acb147bf..5a2a909b57eb 100644
--- a/drivers/gpu/drm/nouveau/nvkm/subdev/volt/gm20b.c
+++ b/drivers/gpu/drm/nouveau/nvkm/subdev/volt/gm20b.c
@@ -77,7 +77,7 @@ gm20b_volt_new(struct nvkm_device *device, enum nvkm_subdev_type type, int inst,
return -EINVAL;
}
- volt = kzalloc_obj(*volt, GFP_KERNEL);
+ volt = kzalloc_obj(*volt);
if (!volt)
return -ENOMEM;
*pvolt = &volt->base;
diff --git a/drivers/gpu/drm/omapdrm/dss/dispc.c b/drivers/gpu/drm/omapdrm/dss/dispc.c
index c3cca5234f67..78b74217f952 100644
--- a/drivers/gpu/drm/omapdrm/dss/dispc.c
+++ b/drivers/gpu/drm/omapdrm/dss/dispc.c
@@ -4603,7 +4603,7 @@ static int dispc_bind(struct device *dev, struct device *master, void *data)
int r = 0;
struct device_node *np = pdev->dev.of_node;
- dispc = kzalloc_obj(*dispc, GFP_KERNEL);
+ dispc = kzalloc_obj(*dispc);
if (!dispc)
return -ENOMEM;
diff --git a/drivers/gpu/drm/omapdrm/dss/dsi.c b/drivers/gpu/drm/omapdrm/dss/dsi.c
index 1269978ba292..27fe7bca9e2c 100644
--- a/drivers/gpu/drm/omapdrm/dss/dsi.c
+++ b/drivers/gpu/drm/omapdrm/dss/dsi.c
@@ -1041,7 +1041,7 @@ static int dsi_dump_dsi_irqs(struct seq_file *s, void *p)
unsigned long flags;
struct dsi_irq_stats *stats;
- stats = kmalloc_obj(*stats, GFP_KERNEL);
+ stats = kmalloc_obj(*stats);
if (!stats)
return -ENOMEM;
diff --git a/drivers/gpu/drm/omapdrm/dss/dss.c b/drivers/gpu/drm/omapdrm/dss/dss.c
index 791d88933084..53b7938a3d05 100644
--- a/drivers/gpu/drm/omapdrm/dss/dss.c
+++ b/drivers/gpu/drm/omapdrm/dss/dss.c
@@ -928,7 +928,7 @@ dss_debugfs_create_file(struct dss_device *dss, const char *name,
{
struct dss_debugfs_entry *entry;
- entry = kzalloc_obj(*entry, GFP_KERNEL);
+ entry = kzalloc_obj(*entry);
if (!entry)
return ERR_PTR(-ENOMEM);
@@ -1419,7 +1419,7 @@ static int dss_probe(struct platform_device *pdev)
struct dss_device *dss;
int r;
- dss = kzalloc_obj(*dss, GFP_KERNEL);
+ dss = kzalloc_obj(*dss);
if (!dss)
return -ENOMEM;
diff --git a/drivers/gpu/drm/omapdrm/omap_crtc.c b/drivers/gpu/drm/omapdrm/omap_crtc.c
index ba730242ad74..ee4c0119d408 100644
--- a/drivers/gpu/drm/omapdrm/omap_crtc.c
+++ b/drivers/gpu/drm/omapdrm/omap_crtc.c
@@ -716,7 +716,7 @@ static void omap_crtc_reset(struct drm_crtc *crtc)
kfree(crtc->state);
- state = kzalloc_obj(*state, GFP_KERNEL);
+ state = kzalloc_obj(*state);
if (state)
__drm_atomic_helper_crtc_reset(crtc, &state->base);
}
@@ -731,7 +731,7 @@ omap_crtc_duplicate_state(struct drm_crtc *crtc)
current_state = to_omap_crtc_state(crtc->state);
- state = kmalloc_obj(*state, GFP_KERNEL);
+ state = kmalloc_obj(*state);
if (!state)
return NULL;
@@ -793,7 +793,7 @@ struct drm_crtc *omap_crtc_init(struct drm_device *dev,
DBG("%s", channel_names[channel]);
- omap_crtc = kzalloc_obj(*omap_crtc, GFP_KERNEL);
+ omap_crtc = kzalloc_obj(*omap_crtc);
if (!omap_crtc)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/gpu/drm/omapdrm/omap_dmm_tiler.c b/drivers/gpu/drm/omapdrm/omap_dmm_tiler.c
index 8312c4d14348..839b8d0092f2 100644
--- a/drivers/gpu/drm/omapdrm/omap_dmm_tiler.c
+++ b/drivers/gpu/drm/omapdrm/omap_dmm_tiler.c
@@ -536,7 +536,7 @@ struct tiler_block *tiler_reserve_2d(enum tiler_fmt fmt, u16 w,
unsigned long flags;
u32 slot_bytes;
- block = kzalloc_obj(*block, GFP_KERNEL);
+ block = kzalloc_obj(*block);
if (!block)
return ERR_PTR(-ENOMEM);
@@ -571,7 +571,7 @@ struct tiler_block *tiler_reserve_2d(enum tiler_fmt fmt, u16 w,
struct tiler_block *tiler_reserve_1d(size_t size)
{
- struct tiler_block *block = kzalloc_obj(*block, GFP_KERNEL);
+ struct tiler_block *block = kzalloc_obj(*block);
int num_pages = (size + PAGE_SIZE - 1) >> PAGE_SHIFT;
unsigned long flags;
@@ -774,7 +774,7 @@ static int omap_dmm_probe(struct platform_device *dev)
u32 hwinfo, pat_geom;
struct resource *mem;
- omap_dmm = kzalloc_obj(*omap_dmm, GFP_KERNEL);
+ omap_dmm = kzalloc_obj(*omap_dmm);
if (!omap_dmm)
goto fail;
diff --git a/drivers/gpu/drm/omapdrm/omap_drv.c b/drivers/gpu/drm/omapdrm/omap_drv.c
index 206018aab88e..bf0bad8c8cf1 100644
--- a/drivers/gpu/drm/omapdrm/omap_drv.c
+++ b/drivers/gpu/drm/omapdrm/omap_drv.c
@@ -146,7 +146,7 @@ static int omap_atomic_update_normalize_zpos(struct drm_device *dev,
struct drm_plane_state **states;
int ret = 0;
- states = kmalloc_objs(*states, total_planes, GFP_KERNEL);
+ states = kmalloc_objs(*states, total_planes);
if (!states)
return -ENOMEM;
@@ -285,7 +285,7 @@ static int omap_global_obj_init(struct drm_device *dev)
struct omap_drm_private *priv = dev->dev_private;
struct omap_global_state *state;
- state = kzalloc_obj(*state, GFP_KERNEL);
+ state = kzalloc_obj(*state);
if (!state)
return -ENOMEM;
@@ -798,7 +798,7 @@ static int pdev_probe(struct platform_device *pdev)
}
/* Allocate and initialize the driver private structure. */
- priv = kzalloc_obj(*priv, GFP_KERNEL);
+ priv = kzalloc_obj(*priv);
if (!priv)
return -ENOMEM;
diff --git a/drivers/gpu/drm/omapdrm/omap_encoder.c b/drivers/gpu/drm/omapdrm/omap_encoder.c
index 2577ba92b1b9..b02c46d70f29 100644
--- a/drivers/gpu/drm/omapdrm/omap_encoder.c
+++ b/drivers/gpu/drm/omapdrm/omap_encoder.c
@@ -122,7 +122,7 @@ struct drm_encoder *omap_encoder_init(struct drm_device *dev,
struct drm_encoder *encoder = NULL;
struct omap_encoder *omap_encoder;
- omap_encoder = kzalloc_obj(*omap_encoder, GFP_KERNEL);
+ omap_encoder = kzalloc_obj(*omap_encoder);
if (!omap_encoder)
goto fail;
diff --git a/drivers/gpu/drm/omapdrm/omap_fb.c b/drivers/gpu/drm/omapdrm/omap_fb.c
index c3b1bea75f7f..1df232232a64 100644
--- a/drivers/gpu/drm/omapdrm/omap_fb.c
+++ b/drivers/gpu/drm/omapdrm/omap_fb.c
@@ -390,7 +390,7 @@ struct drm_framebuffer *omap_framebuffer_init(struct drm_device *dev,
goto fail;
}
- omap_fb = kzalloc_obj(*omap_fb, GFP_KERNEL);
+ omap_fb = kzalloc_obj(*omap_fb);
if (!omap_fb) {
ret = -ENOMEM;
goto fail;
diff --git a/drivers/gpu/drm/omapdrm/omap_gem.c b/drivers/gpu/drm/omapdrm/omap_gem.c
index 63c4bfc9a5c0..8e013e4f2c6b 100644
--- a/drivers/gpu/drm/omapdrm/omap_gem.c
+++ b/drivers/gpu/drm/omapdrm/omap_gem.c
@@ -254,7 +254,7 @@ static int omap_gem_attach_pages(struct drm_gem_object *obj)
* DSS, GPU, etc. are not cache coherent:
*/
if (omap_obj->flags & (OMAP_BO_WC|OMAP_BO_UNCACHED)) {
- addrs = kmalloc_objs(*addrs, npages, GFP_KERNEL);
+ addrs = kmalloc_objs(*addrs, npages);
if (!addrs) {
ret = -ENOMEM;
goto free_pages;
@@ -278,7 +278,7 @@ static int omap_gem_attach_pages(struct drm_gem_object *obj)
}
}
} else {
- addrs = kzalloc_objs(*addrs, npages, GFP_KERNEL);
+ addrs = kzalloc_objs(*addrs, npages);
if (!addrs) {
ret = -ENOMEM;
goto free_pages;
@@ -989,7 +989,7 @@ struct sg_table *omap_gem_get_sg(struct drm_gem_object *obj,
if (sgt)
goto out;
- sgt = kzalloc_obj(*sgt, GFP_KERNEL);
+ sgt = kzalloc_obj(*sgt);
if (!sgt) {
ret = -ENOMEM;
goto err_unpin;
@@ -1319,7 +1319,7 @@ struct drm_gem_object *omap_gem_new(struct drm_device *dev,
}
/* Allocate the initialize the OMAP GEM object. */
- omap_obj = kzalloc_obj(*omap_obj, GFP_KERNEL);
+ omap_obj = kzalloc_obj(*omap_obj);
if (!omap_obj)
return NULL;
@@ -1410,7 +1410,7 @@ struct drm_gem_object *omap_gem_new_dmabuf(struct drm_device *dev, size_t size,
unsigned int ret;
npages = DIV_ROUND_UP(size, PAGE_SIZE);
- pages = kzalloc_objs(*pages, npages, GFP_KERNEL);
+ pages = kzalloc_objs(*pages, npages);
if (!pages) {
omap_gem_free_object(obj);
return ERR_PTR(-ENOMEM);
@@ -1470,7 +1470,7 @@ void omap_gem_init(struct drm_device *dev)
return;
}
- usergart = kzalloc_objs(*usergart, 3, GFP_KERNEL);
+ usergart = kzalloc_objs(*usergart, 3);
if (!usergart)
return;
diff --git a/drivers/gpu/drm/omapdrm/omap_irq.c b/drivers/gpu/drm/omapdrm/omap_irq.c
index b1da72838824..d0f895c43ee4 100644
--- a/drivers/gpu/drm/omapdrm/omap_irq.c
+++ b/drivers/gpu/drm/omapdrm/omap_irq.c
@@ -43,7 +43,7 @@ struct omap_irq_wait * omap_irq_wait_init(struct drm_device *dev,
u32 irqmask, int count)
{
struct omap_drm_private *priv = dev->dev_private;
- struct omap_irq_wait *wait = kzalloc_obj(*wait, GFP_KERNEL);
+ struct omap_irq_wait *wait = kzalloc_obj(*wait);
unsigned long flags;
init_waitqueue_head(&wait->wq);
diff --git a/drivers/gpu/drm/omapdrm/omap_overlay.c b/drivers/gpu/drm/omapdrm/omap_overlay.c
index 3b673662bf99..77c1b78d0163 100644
--- a/drivers/gpu/drm/omapdrm/omap_overlay.c
+++ b/drivers/gpu/drm/omapdrm/omap_overlay.c
@@ -159,7 +159,7 @@ static struct omap_hw_overlay *omap_overlay_init(enum omap_plane_id overlay_id,
{
struct omap_hw_overlay *overlay;
- overlay = kzalloc_obj(*overlay, GFP_KERNEL);
+ overlay = kzalloc_obj(*overlay);
if (!overlay)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/gpu/drm/omapdrm/omap_plane.c b/drivers/gpu/drm/omapdrm/omap_plane.c
index ff2c692c3ede..0e09d8f1fe5e 100644
--- a/drivers/gpu/drm/omapdrm/omap_plane.c
+++ b/drivers/gpu/drm/omapdrm/omap_plane.c
@@ -410,7 +410,7 @@ static void omap_plane_reset(struct drm_plane *plane)
if (plane->state)
drm_atomic_helper_plane_destroy_state(plane, plane->state);
- omap_state = kzalloc_obj(*omap_state, GFP_KERNEL);
+ omap_state = kzalloc_obj(*omap_state);
if (!omap_state)
return;
@@ -427,7 +427,7 @@ omap_plane_atomic_duplicate_state(struct drm_plane *plane)
current_state = to_omap_plane_state(plane->state);
- state = kmalloc_obj(*state, GFP_KERNEL);
+ state = kmalloc_obj(*state);
if (!state)
return NULL;
@@ -533,7 +533,7 @@ struct drm_plane *omap_plane_init(struct drm_device *dev,
if (WARN_ON(idx >= num_planes))
return ERR_PTR(-EINVAL);
- omap_plane = kzalloc_obj(*omap_plane, GFP_KERNEL);
+ omap_plane = kzalloc_obj(*omap_plane);
if (!omap_plane)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/gpu/drm/panfrost/panfrost_drv.c b/drivers/gpu/drm/panfrost/panfrost_drv.c
index 191d909f5845..711f5101aa04 100644
--- a/drivers/gpu/drm/panfrost/panfrost_drv.c
+++ b/drivers/gpu/drm/panfrost/panfrost_drv.c
@@ -316,7 +316,7 @@ static int panfrost_ioctl_submit(struct drm_device *dev, void *data,
goto out_put_syncout;
}
- job = kzalloc_obj(*job, GFP_KERNEL);
+ job = kzalloc_obj(*job);
if (!job) {
ret = -ENOMEM;
goto out_put_jm_ctx;
@@ -597,7 +597,7 @@ static int panfrost_ioctl_sync_bo(struct drm_device *ddev, void *data,
if (!args->op_count)
return 0;
- ops = kvmalloc_objs(*ops, args->op_count, GFP_KERNEL);
+ ops = kvmalloc_objs(*ops, args->op_count);
if (!ops) {
DRM_DEBUG("Failed to allocate incoming BO sync ops array\n");
return -ENOMEM;
@@ -682,7 +682,7 @@ panfrost_open(struct drm_device *dev, struct drm_file *file)
struct panfrost_device *pfdev = to_panfrost_device(dev);
struct panfrost_file_priv *panfrost_priv;
- panfrost_priv = kzalloc_obj(*panfrost_priv, GFP_KERNEL);
+ panfrost_priv = kzalloc_obj(*panfrost_priv);
if (!panfrost_priv)
return -ENOMEM;
diff --git a/drivers/gpu/drm/panfrost/panfrost_gem.c b/drivers/gpu/drm/panfrost/panfrost_gem.c
index a70847a73f98..822633da741e 100644
--- a/drivers/gpu/drm/panfrost/panfrost_gem.c
+++ b/drivers/gpu/drm/panfrost/panfrost_gem.c
@@ -175,7 +175,7 @@ int panfrost_gem_open(struct drm_gem_object *obj, struct drm_file *file_priv)
struct panfrost_file_priv *priv = file_priv->driver_priv;
struct panfrost_gem_mapping *mapping;
- mapping = kzalloc_obj(*mapping, GFP_KERNEL);
+ mapping = kzalloc_obj(*mapping);
if (!mapping)
return -ENOMEM;
@@ -429,7 +429,7 @@ struct drm_gem_object *panfrost_gem_create_object(struct drm_device *dev, size_t
struct panfrost_device *pfdev = to_panfrost_device(dev);
struct panfrost_gem_object *obj;
- obj = kzalloc_obj(*obj, GFP_KERNEL);
+ obj = kzalloc_obj(*obj);
if (!obj)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/gpu/drm/panfrost/panfrost_job.c b/drivers/gpu/drm/panfrost/panfrost_job.c
index 862acf9c8422..d59b4863b8ad 100644
--- a/drivers/gpu/drm/panfrost/panfrost_job.c
+++ b/drivers/gpu/drm/panfrost/panfrost_job.c
@@ -95,7 +95,7 @@ static struct dma_fence *panfrost_fence_create(struct panfrost_device *pfdev, in
struct panfrost_fence *fence;
struct panfrost_job_slot *js = pfdev->js;
- fence = kzalloc_obj(*fence, GFP_KERNEL);
+ fence = kzalloc_obj(*fence);
if (!fence)
return ERR_PTR(-ENOMEM);
@@ -1053,7 +1053,7 @@ int panfrost_jm_ctx_create(struct drm_file *file,
struct panfrost_jm_ctx *jm_ctx;
int ret;
- jm_ctx = kzalloc_obj(*jm_ctx, GFP_KERNEL);
+ jm_ctx = kzalloc_obj(*jm_ctx);
if (!jm_ctx)
return -ENOMEM;
diff --git a/drivers/gpu/drm/panfrost/panfrost_mmu.c b/drivers/gpu/drm/panfrost/panfrost_mmu.c
index 71eef57af549..4a3162c3b659 100644
--- a/drivers/gpu/drm/panfrost/panfrost_mmu.c
+++ b/drivers/gpu/drm/panfrost/panfrost_mmu.c
@@ -794,7 +794,7 @@ struct panfrost_mmu *panfrost_mmu_ctx_create(struct panfrost_device *pfdev)
fmt = ARM_MALI_LPAE;
}
- mmu = kzalloc_obj(*mmu, GFP_KERNEL);
+ mmu = kzalloc_obj(*mmu);
if (!mmu)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/gpu/drm/panthor/panthor_drv.c b/drivers/gpu/drm/panthor/panthor_drv.c
index e1e51daba356..1bcec6a2e3e0 100644
--- a/drivers/gpu/drm/panthor/panthor_drv.c
+++ b/drivers/gpu/drm/panthor/panthor_drv.c
@@ -382,7 +382,7 @@ panthor_submit_ctx_add_sync_signal(struct panthor_submit_ctx *ctx, u32 handle, u
struct dma_fence *cur_fence;
int ret;
- sig_sync = kzalloc_obj(*sig_sync, GFP_KERNEL);
+ sig_sync = kzalloc_obj(*sig_sync);
if (!sig_sync)
return -ENOMEM;
@@ -1471,7 +1471,7 @@ panthor_open(struct drm_device *ddev, struct drm_file *file)
struct panthor_file *pfile;
int ret;
- pfile = kzalloc_obj(*pfile, GFP_KERNEL);
+ pfile = kzalloc_obj(*pfile);
if (!pfile)
return -ENOMEM;
diff --git a/drivers/gpu/drm/panthor/panthor_gem.c b/drivers/gpu/drm/panthor/panthor_gem.c
index 3d94f9cc94d6..4b4575dd6e90 100644
--- a/drivers/gpu/drm/panthor/panthor_gem.c
+++ b/drivers/gpu/drm/panthor/panthor_gem.c
@@ -183,7 +183,7 @@ panthor_kernel_bo_create(struct panthor_device *ptdev, struct panthor_vm *vm,
if (drm_WARN_ON(&ptdev->base, !vm))
return ERR_PTR(-EINVAL);
- kbo = kzalloc_obj(*kbo, GFP_KERNEL);
+ kbo = kzalloc_obj(*kbo);
if (!kbo)
return ERR_PTR(-ENOMEM);
@@ -399,7 +399,7 @@ struct drm_gem_object *panthor_gem_create_object(struct drm_device *ddev, size_t
{
struct panthor_gem_object *obj;
- obj = kzalloc_obj(*obj, GFP_KERNEL);
+ obj = kzalloc_obj(*obj);
if (!obj)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/gpu/drm/panthor/panthor_heap.c b/drivers/gpu/drm/panthor/panthor_heap.c
index ded9cb83842c..1ee30dc7066f 100644
--- a/drivers/gpu/drm/panthor/panthor_heap.c
+++ b/drivers/gpu/drm/panthor/panthor_heap.c
@@ -145,7 +145,7 @@ static int panthor_alloc_heap_chunk(struct panthor_heap_pool *pool,
struct panthor_heap_chunk_header *hdr;
int ret;
- chunk = kmalloc_obj(*chunk, GFP_KERNEL);
+ chunk = kmalloc_obj(*chunk);
if (!chunk)
return -ENOMEM;
@@ -303,7 +303,7 @@ int panthor_heap_create(struct panthor_heap_pool *pool,
if (!vm)
return -EINVAL;
- heap = kzalloc_obj(*heap, GFP_KERNEL);
+ heap = kzalloc_obj(*heap);
if (!heap) {
ret = -ENOMEM;
goto err_put_vm;
@@ -541,7 +541,7 @@ panthor_heap_pool_create(struct panthor_device *ptdev, struct panthor_vm *vm)
struct panthor_heap_pool *pool;
int ret = 0;
- pool = kzalloc_obj(*pool, GFP_KERNEL);
+ pool = kzalloc_obj(*pool);
if (!pool)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/gpu/drm/panthor/panthor_mmu.c b/drivers/gpu/drm/panthor/panthor_mmu.c
index c482bbe6fffd..c5ebe68d5a97 100644
--- a/drivers/gpu/drm/panthor/panthor_mmu.c
+++ b/drivers/gpu/drm/panthor/panthor_mmu.c
@@ -1159,7 +1159,7 @@ panthor_vm_op_ctx_prealloc_vmas(struct panthor_vm_op_ctx *op_ctx)
}
for (u32 i = 0; i < vma_count; i++) {
- struct panthor_vma *vma = kzalloc_obj(*vma, GFP_KERNEL);
+ struct panthor_vma *vma = kzalloc_obj(*vma);
if (!vma)
return -ENOMEM;
@@ -1586,7 +1586,7 @@ void panthor_vm_pool_destroy(struct panthor_file *pfile)
*/
int panthor_vm_pool_create(struct panthor_file *pfile)
{
- pfile->vms = kzalloc_obj(*pfile->vms, GFP_KERNEL);
+ pfile->vms = kzalloc_obj(*pfile->vms);
if (!pfile->vms)
return -ENOMEM;
@@ -2425,7 +2425,7 @@ panthor_vm_create(struct panthor_device *ptdev, bool for_mcu,
struct panthor_vm *vm;
int ret;
- vm = kzalloc_obj(*vm, GFP_KERNEL);
+ vm = kzalloc_obj(*vm);
if (!vm)
return ERR_PTR(-ENOMEM);
@@ -2608,7 +2608,7 @@ panthor_vm_bind_job_create(struct drm_file *file,
if (vm->destroyed || vm->unusable)
return ERR_PTR(-EINVAL);
- job = kzalloc_obj(*job, GFP_KERNEL);
+ job = kzalloc_obj(*job);
if (!job)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/gpu/drm/panthor/panthor_sched.c b/drivers/gpu/drm/panthor/panthor_sched.c
index e40d7be90bb9..bd703a2904a1 100644
--- a/drivers/gpu/drm/panthor/panthor_sched.c
+++ b/drivers/gpu/drm/panthor/panthor_sched.c
@@ -3512,7 +3512,7 @@ group_create_queue(struct panthor_group *group,
if (args->priority > CSF_MAX_QUEUE_PRIO)
return ERR_PTR(-EINVAL);
- queue = kzalloc_obj(*queue, GFP_KERNEL);
+ queue = kzalloc_obj(*queue);
if (!queue)
return ERR_PTR(-ENOMEM);
@@ -3659,7 +3659,7 @@ int panthor_group_create(struct panthor_file *pfile,
hweight64(group_args->tiler_core_mask) < group_args->max_tiler_cores)
return -EINVAL;
- group = kzalloc_obj(*group, GFP_KERNEL);
+ group = kzalloc_obj(*group);
if (!group)
return -ENOMEM;
@@ -3853,7 +3853,7 @@ int panthor_group_pool_create(struct panthor_file *pfile)
{
struct panthor_group_pool *gpool;
- gpool = kzalloc_obj(*gpool, GFP_KERNEL);
+ gpool = kzalloc_obj(*gpool);
if (!gpool)
return -ENOMEM;
@@ -3979,7 +3979,7 @@ panthor_job_create(struct panthor_file *pfile,
if (qsubmit->latest_flush & GENMASK(30, 24))
return ERR_PTR(-EINVAL);
- job = kzalloc_obj(*job, GFP_KERNEL);
+ job = kzalloc_obj(*job);
if (!job)
return ERR_PTR(-ENOMEM);
@@ -4011,7 +4011,7 @@ panthor_job_create(struct panthor_file *pfile,
* the previously submitted job.
*/
if (job->call_info.size) {
- job->done_fence = kzalloc_obj(*job->done_fence, GFP_KERNEL);
+ job->done_fence = kzalloc_obj(*job->done_fence);
if (!job->done_fence) {
ret = -ENOMEM;
goto err_put_job;
diff --git a/drivers/gpu/drm/qxl/qxl_cmd.c b/drivers/gpu/drm/qxl/qxl_cmd.c
index 47c7f4e68dc6..0be2c4334b74 100644
--- a/drivers/gpu/drm/qxl/qxl_cmd.c
+++ b/drivers/gpu/drm/qxl/qxl_cmd.c
@@ -63,7 +63,7 @@ qxl_ring_create(struct qxl_ring_header *header,
{
struct qxl_ring *ring;
- ring = kmalloc_obj(*ring, GFP_KERNEL);
+ ring = kmalloc_obj(*ring);
if (!ring)
return NULL;
diff --git a/drivers/gpu/drm/qxl/qxl_display.c b/drivers/gpu/drm/qxl/qxl_display.c
index 3b6e48b28480..f5bd6e96fb90 100644
--- a/drivers/gpu/drm/qxl/qxl_display.c
+++ b/drivers/gpu/drm/qxl/qxl_display.c
@@ -1008,7 +1008,7 @@ static int qdev_crtc_init(struct drm_device *dev, int crtc_id)
struct qxl_device *qdev = to_qxl(dev);
int r;
- qxl_crtc = kzalloc_obj(struct qxl_crtc, GFP_KERNEL);
+ qxl_crtc = kzalloc_obj(struct qxl_crtc);
if (!qxl_crtc)
return -ENOMEM;
@@ -1159,7 +1159,7 @@ static int qdev_output_init(struct drm_device *dev, int num_output)
struct drm_encoder *encoder;
int ret;
- qxl_output = kzalloc_obj(struct qxl_output, GFP_KERNEL);
+ qxl_output = kzalloc_obj(struct qxl_output);
if (!qxl_output)
return -ENOMEM;
diff --git a/drivers/gpu/drm/qxl/qxl_image.c b/drivers/gpu/drm/qxl/qxl_image.c
index 01c56913b582..578e8aa63f24 100644
--- a/drivers/gpu/drm/qxl/qxl_image.c
+++ b/drivers/gpu/drm/qxl/qxl_image.c
@@ -40,7 +40,7 @@ qxl_allocate_chunk(struct qxl_device *qdev,
struct qxl_drm_chunk *chunk;
int ret;
- chunk = kmalloc_obj(struct qxl_drm_chunk, GFP_KERNEL);
+ chunk = kmalloc_obj(struct qxl_drm_chunk);
if (!chunk)
return -ENOMEM;
@@ -63,7 +63,7 @@ qxl_image_alloc_objects(struct qxl_device *qdev,
struct qxl_drm_image *image;
int ret;
- image = kmalloc_obj(struct qxl_drm_image, GFP_KERNEL);
+ image = kmalloc_obj(struct qxl_drm_image);
if (!image)
return -ENOMEM;
diff --git a/drivers/gpu/drm/qxl/qxl_object.c b/drivers/gpu/drm/qxl/qxl_object.c
index 14b325703034..313f6c30cac8 100644
--- a/drivers/gpu/drm/qxl/qxl_object.c
+++ b/drivers/gpu/drm/qxl/qxl_object.c
@@ -116,7 +116,7 @@ int qxl_bo_create(struct qxl_device *qdev, unsigned long size,
else
type = ttm_bo_type_device;
*bo_ptr = NULL;
- bo = kzalloc_obj(struct qxl_bo, GFP_KERNEL);
+ bo = kzalloc_obj(struct qxl_bo);
if (bo == NULL)
return -ENOMEM;
size = roundup(size, PAGE_SIZE);
diff --git a/drivers/gpu/drm/qxl/qxl_release.c b/drivers/gpu/drm/qxl/qxl_release.c
index ec2b1120aef9..b1bf1e798cc6 100644
--- a/drivers/gpu/drm/qxl/qxl_release.c
+++ b/drivers/gpu/drm/qxl/qxl_release.c
@@ -177,7 +177,7 @@ int qxl_release_list_add(struct qxl_release *release, struct qxl_bo *bo)
return 0;
}
- entry = kmalloc_obj(struct qxl_bo_list, GFP_KERNEL);
+ entry = kmalloc_obj(struct qxl_bo_list);
if (!entry)
return -ENOMEM;
diff --git a/drivers/gpu/drm/qxl/qxl_ttm.c b/drivers/gpu/drm/qxl/qxl_ttm.c
index 7ac5e40ac851..5d495c4798a3 100644
--- a/drivers/gpu/drm/qxl/qxl_ttm.c
+++ b/drivers/gpu/drm/qxl/qxl_ttm.c
@@ -109,7 +109,7 @@ static struct ttm_tt *qxl_ttm_tt_create(struct ttm_buffer_object *bo,
{
struct ttm_tt *ttm;
- ttm = kzalloc_obj(struct ttm_tt, GFP_KERNEL);
+ ttm = kzalloc_obj(struct ttm_tt);
if (ttm == NULL)
return NULL;
if (ttm_tt_init(ttm, bo, page_flags, ttm_cached, 0)) {
diff --git a/drivers/gpu/drm/radeon/atom.c b/drivers/gpu/drm/radeon/atom.c
index 01bbbde30914..dbd192650c69 100644
--- a/drivers/gpu/drm/radeon/atom.c
+++ b/drivers/gpu/drm/radeon/atom.c
@@ -1281,7 +1281,7 @@ struct atom_context *atom_parse(struct card_info *card, void *bios)
{
int base;
struct atom_context *ctx =
- kzalloc_obj(struct atom_context, GFP_KERNEL);
+ kzalloc_obj(struct atom_context);
char *str;
char name[512];
int i;
diff --git a/drivers/gpu/drm/radeon/atombios_encoders.c b/drivers/gpu/drm/radeon/atombios_encoders.c
index 0ed85b5dd193..eba8618ccbf1 100644
--- a/drivers/gpu/drm/radeon/atombios_encoders.c
+++ b/drivers/gpu/drm/radeon/atombios_encoders.c
@@ -218,7 +218,7 @@ void radeon_atom_backlight_init(struct radeon_encoder *radeon_encoder,
return;
}
- pdata = kmalloc_obj(struct radeon_backlight_privdata, GFP_KERNEL);
+ pdata = kmalloc_obj(struct radeon_backlight_privdata);
if (!pdata) {
DRM_ERROR("Memory allocation failed\n");
goto error;
@@ -2678,7 +2678,7 @@ radeon_add_atom_encoder(struct drm_device *dev,
}
/* add a new one */
- radeon_encoder = kzalloc_obj(struct radeon_encoder, GFP_KERNEL);
+ radeon_encoder = kzalloc_obj(struct radeon_encoder);
if (!radeon_encoder)
return;
diff --git a/drivers/gpu/drm/radeon/btc_dpm.c b/drivers/gpu/drm/radeon/btc_dpm.c
index 36486a9c7b06..670cb0683396 100644
--- a/drivers/gpu/drm/radeon/btc_dpm.c
+++ b/drivers/gpu/drm/radeon/btc_dpm.c
@@ -1992,7 +1992,7 @@ static int btc_initialize_mc_reg_table(struct radeon_device *rdev)
struct evergreen_mc_reg_table *eg_table = &eg_pi->mc_reg_table;
u8 module_index = rv770_get_memory_module_index(rdev);
- table = kzalloc_obj(struct atom_mc_reg_table, GFP_KERNEL);
+ table = kzalloc_obj(struct atom_mc_reg_table);
if (!table)
return -ENOMEM;
@@ -2526,7 +2526,7 @@ int btc_dpm_init(struct radeon_device *rdev)
struct atom_clock_dividers dividers;
int ret;
- eg_pi = kzalloc_obj(struct evergreen_power_info, GFP_KERNEL);
+ eg_pi = kzalloc_obj(struct evergreen_power_info);
if (eg_pi == NULL)
return -ENOMEM;
rdev->pm.dpm.priv = eg_pi;
diff --git a/drivers/gpu/drm/radeon/ci_dpm.c b/drivers/gpu/drm/radeon/ci_dpm.c
index f8de657c3ed0..6814262d2c8f 100644
--- a/drivers/gpu/drm/radeon/ci_dpm.c
+++ b/drivers/gpu/drm/radeon/ci_dpm.c
@@ -4579,7 +4579,7 @@ static int ci_initialize_mc_reg_table(struct radeon_device *rdev)
u8 module_index = rv770_get_memory_module_index(rdev);
int ret;
- table = kzalloc_obj(struct atom_mc_reg_table, GFP_KERNEL);
+ table = kzalloc_obj(struct atom_mc_reg_table);
if (!table)
return -ENOMEM;
@@ -5533,7 +5533,7 @@ static int ci_parse_power_table(struct radeon_device *rdev)
ret = -EINVAL;
goto err_free_ps;
}
- ps = kzalloc_obj(struct ci_ps, GFP_KERNEL);
+ ps = kzalloc_obj(struct ci_ps);
if (ps == NULL) {
ret = -ENOMEM;
goto err_free_ps;
@@ -5637,7 +5637,7 @@ int ci_dpm_init(struct radeon_device *rdev)
struct pci_dev *root = rdev->pdev->bus->self;
int ret;
- pi = kzalloc_obj(struct ci_power_info, GFP_KERNEL);
+ pi = kzalloc_obj(struct ci_power_info);
if (pi == NULL)
return -ENOMEM;
rdev->pm.dpm.priv = pi;
diff --git a/drivers/gpu/drm/radeon/cypress_dpm.c b/drivers/gpu/drm/radeon/cypress_dpm.c
index 1fe0eecb3ea3..aef702ff12ee 100644
--- a/drivers/gpu/drm/radeon/cypress_dpm.c
+++ b/drivers/gpu/drm/radeon/cypress_dpm.c
@@ -2028,7 +2028,7 @@ int cypress_dpm_init(struct radeon_device *rdev)
struct atom_clock_dividers dividers;
int ret;
- eg_pi = kzalloc_obj(struct evergreen_power_info, GFP_KERNEL);
+ eg_pi = kzalloc_obj(struct evergreen_power_info);
if (eg_pi == NULL)
return -ENOMEM;
rdev->pm.dpm.priv = eg_pi;
diff --git a/drivers/gpu/drm/radeon/evergreen_cs.c b/drivers/gpu/drm/radeon/evergreen_cs.c
index 257caf19583a..3142ef4da7f4 100644
--- a/drivers/gpu/drm/radeon/evergreen_cs.c
+++ b/drivers/gpu/drm/radeon/evergreen_cs.c
@@ -2769,7 +2769,7 @@ int evergreen_cs_parse(struct radeon_cs_parser *p)
if (p->track == NULL) {
/* initialize tracker, we are in kms */
- track = kzalloc_obj(*track, GFP_KERNEL);
+ track = kzalloc_obj(*track);
if (track == NULL)
return -ENOMEM;
evergreen_cs_track_init(track);
diff --git a/drivers/gpu/drm/radeon/kv_dpm.c b/drivers/gpu/drm/radeon/kv_dpm.c
index 7c896c24f03d..1544c24f4647 100644
--- a/drivers/gpu/drm/radeon/kv_dpm.c
+++ b/drivers/gpu/drm/radeon/kv_dpm.c
@@ -2470,7 +2470,7 @@ static int kv_parse_power_table(struct radeon_device *rdev)
&non_clock_info_array->nonClockInfo[non_clock_array_index];
if (!rdev->pm.power_state[i].clock_info)
return -EINVAL;
- ps = kzalloc_obj(struct kv_ps, GFP_KERNEL);
+ ps = kzalloc_obj(struct kv_ps);
if (ps == NULL) {
kfree(rdev->pm.dpm.ps);
return -ENOMEM;
@@ -2519,7 +2519,7 @@ int kv_dpm_init(struct radeon_device *rdev)
struct kv_power_info *pi;
int ret, i;
- pi = kzalloc_obj(struct kv_power_info, GFP_KERNEL);
+ pi = kzalloc_obj(struct kv_power_info);
if (pi == NULL)
return -ENOMEM;
rdev->pm.dpm.priv = pi;
diff --git a/drivers/gpu/drm/radeon/ni_dpm.c b/drivers/gpu/drm/radeon/ni_dpm.c
index c4305bacd47d..05bc2131376c 100644
--- a/drivers/gpu/drm/radeon/ni_dpm.c
+++ b/drivers/gpu/drm/radeon/ni_dpm.c
@@ -2104,7 +2104,7 @@ static int ni_init_smc_spll_table(struct radeon_device *rdev)
if (ni_pi->spll_table_start == 0)
return -EINVAL;
- spll_table = kzalloc_obj(SMC_NISLANDS_SPLL_DIV_TABLE, GFP_KERNEL);
+ spll_table = kzalloc_obj(SMC_NISLANDS_SPLL_DIV_TABLE);
if (spll_table == NULL)
return -ENOMEM;
@@ -2879,7 +2879,7 @@ static int ni_initialize_mc_reg_table(struct radeon_device *rdev)
struct ni_mc_reg_table *ni_table = &ni_pi->mc_reg_table;
u8 module_index = rv770_get_memory_module_index(rdev);
- table = kzalloc_obj(struct atom_mc_reg_table, GFP_KERNEL);
+ table = kzalloc_obj(struct atom_mc_reg_table);
if (!table)
return -ENOMEM;
@@ -3147,7 +3147,7 @@ static int ni_initialize_smc_cac_tables(struct radeon_device *rdev)
if (ni_pi->enable_cac == false)
return 0;
- cac_tables = kzalloc_obj(PP_NIslands_CACTABLES, GFP_KERNEL);
+ cac_tables = kzalloc_obj(PP_NIslands_CACTABLES);
if (!cac_tables)
return -ENOMEM;
@@ -4018,7 +4018,7 @@ static int ni_parse_power_table(struct radeon_device *rdev)
power_info->pplib.ucNonClockSize));
if (power_info->pplib.ucStateEntrySize - 1) {
u8 *idx;
- ps = kzalloc_obj(struct ni_ps, GFP_KERNEL);
+ ps = kzalloc_obj(struct ni_ps);
if (ps == NULL) {
kfree(rdev->pm.dpm.ps);
return -ENOMEM;
@@ -4051,7 +4051,7 @@ int ni_dpm_init(struct radeon_device *rdev)
struct atom_clock_dividers dividers;
int ret;
- ni_pi = kzalloc_obj(struct ni_power_info, GFP_KERNEL);
+ ni_pi = kzalloc_obj(struct ni_power_info);
if (ni_pi == NULL)
return -ENOMEM;
rdev->pm.dpm.priv = ni_pi;
diff --git a/drivers/gpu/drm/radeon/r100.c b/drivers/gpu/drm/radeon/r100.c
index 53d336b15662..3ac1a79b6f13 100644
--- a/drivers/gpu/drm/radeon/r100.c
+++ b/drivers/gpu/drm/radeon/r100.c
@@ -2063,7 +2063,7 @@ int r100_cs_parse(struct radeon_cs_parser *p)
struct r100_cs_track *track;
int r;
- track = kzalloc_obj(*track, GFP_KERNEL);
+ track = kzalloc_obj(*track);
if (!track)
return -ENOMEM;
r100_cs_track_clear(p->rdev, track);
diff --git a/drivers/gpu/drm/radeon/r300.c b/drivers/gpu/drm/radeon/r300.c
index aad94b49671c..60a784769120 100644
--- a/drivers/gpu/drm/radeon/r300.c
+++ b/drivers/gpu/drm/radeon/r300.c
@@ -1284,7 +1284,7 @@ int r300_cs_parse(struct radeon_cs_parser *p)
struct r100_cs_track *track;
int r;
- track = kzalloc_obj(*track, GFP_KERNEL);
+ track = kzalloc_obj(*track);
if (track == NULL)
return -ENOMEM;
r100_cs_track_clear(p->rdev, track);
diff --git a/drivers/gpu/drm/radeon/r600_cs.c b/drivers/gpu/drm/radeon/r600_cs.c
index 5db10ad3fd8b..17b2ff2387aa 100644
--- a/drivers/gpu/drm/radeon/r600_cs.c
+++ b/drivers/gpu/drm/radeon/r600_cs.c
@@ -2282,7 +2282,7 @@ int r600_cs_parse(struct radeon_cs_parser *p)
if (p->track == NULL) {
/* initialize tracker, we are in kms */
- track = kzalloc_obj(*track, GFP_KERNEL);
+ track = kzalloc_obj(*track);
if (track == NULL)
return -ENOMEM;
r600_cs_track_init(track);
diff --git a/drivers/gpu/drm/radeon/r600_dpm.c b/drivers/gpu/drm/radeon/r600_dpm.c
index cfe851bf1848..c407db0c26aa 100644
--- a/drivers/gpu/drm/radeon/r600_dpm.c
+++ b/drivers/gpu/drm/radeon/r600_dpm.c
@@ -1197,7 +1197,7 @@ int r600_parse_extended_power_table(struct radeon_device *rdev)
(mode_info->atom_context->bios + data_offset +
le16_to_cpu(ext_hdr->usPPMTableOffset));
rdev->pm.dpm.dyn_state.ppm_table =
- kzalloc_obj(struct radeon_ppm_table, GFP_KERNEL);
+ kzalloc_obj(struct radeon_ppm_table);
if (!rdev->pm.dpm.dyn_state.ppm_table) {
r600_free_extended_power_table(rdev);
return -ENOMEM;
diff --git a/drivers/gpu/drm/radeon/radeon_agp.c b/drivers/gpu/drm/radeon/radeon_agp.c
index fb75d0bb8726..84cf71bc1330 100644
--- a/drivers/gpu/drm/radeon/radeon_agp.c
+++ b/drivers/gpu/drm/radeon/radeon_agp.c
@@ -132,7 +132,7 @@ struct radeon_agp_head *radeon_agp_head_init(struct drm_device *dev)
struct pci_dev *pdev = to_pci_dev(dev->dev);
struct radeon_agp_head *head;
- head = kzalloc_obj(*head, GFP_KERNEL);
+ head = kzalloc_obj(*head);
if (!head)
return NULL;
head->bridge = agp_find_bridge(pdev);
diff --git a/drivers/gpu/drm/radeon/radeon_atombios.c b/drivers/gpu/drm/radeon/radeon_atombios.c
index 35c37b6054ad..c4c11d25c636 100644
--- a/drivers/gpu/drm/radeon/radeon_atombios.c
+++ b/drivers/gpu/drm/radeon/radeon_atombios.c
@@ -1632,7 +1632,7 @@ struct radeon_encoder_atom_dig *radeon_atombios_get_lvds_info(struct
lvds_info =
(union lvds_info *)(mode_info->atom_context->bios + data_offset);
lvds =
- kzalloc_obj(struct radeon_encoder_atom_dig, GFP_KERNEL);
+ kzalloc_obj(struct radeon_encoder_atom_dig);
if (!lvds)
return NULL;
@@ -1961,7 +1961,7 @@ radeon_atombios_get_tv_dac_info(struct radeon_encoder *encoder)
dac_info = (struct _COMPASSIONATE_DATA *)
(mode_info->atom_context->bios + data_offset);
- tv_dac = kzalloc_obj(struct radeon_encoder_tv_dac, GFP_KERNEL);
+ tv_dac = kzalloc_obj(struct radeon_encoder_tv_dac);
if (!tv_dac)
return NULL;
diff --git a/drivers/gpu/drm/radeon/radeon_combios.c b/drivers/gpu/drm/radeon/radeon_combios.c
index 6cb0b7cfe510..b96b556b80c8 100644
--- a/drivers/gpu/drm/radeon/radeon_combios.c
+++ b/drivers/gpu/drm/radeon/radeon_combios.c
@@ -851,7 +851,7 @@ struct radeon_encoder_primary_dac *radeon_combios_get_primary_dac_info(struct
struct radeon_encoder_primary_dac *p_dac;
int found = 0;
- p_dac = kzalloc_obj(struct radeon_encoder_primary_dac, GFP_KERNEL);
+ p_dac = kzalloc_obj(struct radeon_encoder_primary_dac);
if (!p_dac)
return NULL;
@@ -1001,7 +1001,7 @@ struct radeon_encoder_tv_dac *radeon_combios_get_tv_dac_info(struct
struct radeon_encoder_tv_dac *tv_dac;
int found = 0;
- tv_dac = kzalloc_obj(struct radeon_encoder_tv_dac, GFP_KERNEL);
+ tv_dac = kzalloc_obj(struct radeon_encoder_tv_dac);
if (!tv_dac)
return NULL;
@@ -1089,7 +1089,7 @@ static struct radeon_encoder_lvds *radeon_legacy_get_lvds_info_from_regs(struct
uint32_t ppll_div_sel, ppll_val;
uint32_t lvds_ss_gen_cntl = RREG32(RADEON_LVDS_SS_GEN_CNTL);
- lvds = kzalloc_obj(struct radeon_encoder_lvds, GFP_KERNEL);
+ lvds = kzalloc_obj(struct radeon_encoder_lvds);
if (!lvds)
return NULL;
@@ -1164,7 +1164,7 @@ struct radeon_encoder_lvds *radeon_combios_get_lvds_info(struct radeon_encoder
lcd_info = combios_get_table_offset(dev, COMBIOS_LCD_INFO_TABLE);
if (lcd_info) {
- lvds = kzalloc_obj(struct radeon_encoder_lvds, GFP_KERNEL);
+ lvds = kzalloc_obj(struct radeon_encoder_lvds);
if (!lvds)
return NULL;
@@ -2634,9 +2634,9 @@ void radeon_combios_get_power_modes(struct radeon_device *rdev)
if (rdev->pm.power_state) {
/* allocate 1 clock mode per state */
rdev->pm.power_state[0].clock_info =
- kzalloc_objs(struct radeon_pm_clock_info, 1, GFP_KERNEL);
+ kzalloc_objs(struct radeon_pm_clock_info, 1);
rdev->pm.power_state[1].clock_info =
- kzalloc_objs(struct radeon_pm_clock_info, 1, GFP_KERNEL);
+ kzalloc_objs(struct radeon_pm_clock_info, 1);
if (!rdev->pm.power_state[0].clock_info ||
!rdev->pm.power_state[1].clock_info)
goto pm_failed;
diff --git a/drivers/gpu/drm/radeon/radeon_connectors.c b/drivers/gpu/drm/radeon/radeon_connectors.c
index e5bf06d7b981..b4377dbc99f0 100644
--- a/drivers/gpu/drm/radeon/radeon_connectors.c
+++ b/drivers/gpu/drm/radeon/radeon_connectors.c
@@ -1887,7 +1887,7 @@ radeon_add_atom_connector(struct drm_device *dev,
}
}
- radeon_connector = kzalloc_obj(struct radeon_connector, GFP_KERNEL);
+ radeon_connector = kzalloc_obj(struct radeon_connector);
if (!radeon_connector)
return;
@@ -2385,7 +2385,7 @@ radeon_add_legacy_connector(struct drm_device *dev,
}
}
- radeon_connector = kzalloc_obj(struct radeon_connector, GFP_KERNEL);
+ radeon_connector = kzalloc_obj(struct radeon_connector);
if (!radeon_connector)
return;
diff --git a/drivers/gpu/drm/radeon/radeon_cs.c b/drivers/gpu/drm/radeon/radeon_cs.c
index 3b2cbd69b58b..f021e58d454f 100644
--- a/drivers/gpu/drm/radeon/radeon_cs.c
+++ b/drivers/gpu/drm/radeon/radeon_cs.c
@@ -93,7 +93,7 @@ static int radeon_cs_parser_relocs(struct radeon_cs_parser *p)
p->dma_reloc_idx = 0;
/* FIXME: we assume that each relocs use 4 dwords */
p->nrelocs = chunk->length_dw / 4;
- p->relocs = kvzalloc_objs(struct radeon_bo_list, p->nrelocs, GFP_KERNEL);
+ p->relocs = kvzalloc_objs(struct radeon_bo_list, p->nrelocs);
if (p->relocs == NULL) {
return -ENOMEM;
}
diff --git a/drivers/gpu/drm/radeon/radeon_device.c b/drivers/gpu/drm/radeon/radeon_device.c
index c58d24fe74f9..5d523d5dae88 100644
--- a/drivers/gpu/drm/radeon/radeon_device.c
+++ b/drivers/gpu/drm/radeon/radeon_device.c
@@ -974,7 +974,7 @@ static uint32_t cail_ioreg_read(struct card_info *info, uint32_t reg)
int radeon_atombios_init(struct radeon_device *rdev)
{
struct card_info *atom_card_info =
- kzalloc_obj(struct card_info, GFP_KERNEL);
+ kzalloc_obj(struct card_info);
if (!atom_card_info)
return -ENOMEM;
diff --git a/drivers/gpu/drm/radeon/radeon_display.c b/drivers/gpu/drm/radeon/radeon_display.c
index 4296ebd3dd94..589dc9df34aa 100644
--- a/drivers/gpu/drm/radeon/radeon_display.c
+++ b/drivers/gpu/drm/radeon/radeon_display.c
@@ -494,7 +494,7 @@ static int radeon_crtc_page_flip_target(struct drm_crtc *crtc,
unsigned long flags;
int r;
- work = kzalloc_obj(*work, GFP_KERNEL);
+ work = kzalloc_obj(*work);
if (work == NULL)
return -ENOMEM;
@@ -682,7 +682,7 @@ static void radeon_crtc_init(struct drm_device *dev, int index)
struct radeon_device *rdev = dev->dev_private;
struct radeon_crtc *radeon_crtc;
- radeon_crtc = kzalloc_obj(*radeon_crtc, GFP_KERNEL);
+ radeon_crtc = kzalloc_obj(*radeon_crtc);
if (radeon_crtc == NULL)
return;
@@ -1346,7 +1346,7 @@ radeon_user_framebuffer_create(struct drm_device *dev,
return ERR_PTR(-EINVAL);
}
- fb = kzalloc_obj(*fb, GFP_KERNEL);
+ fb = kzalloc_obj(*fb);
if (fb == NULL) {
drm_gem_object_put(obj);
return ERR_PTR(-ENOMEM);
diff --git a/drivers/gpu/drm/radeon/radeon_fbdev.c b/drivers/gpu/drm/radeon/radeon_fbdev.c
index 9d760c221c5a..18d61f3f7344 100644
--- a/drivers/gpu/drm/radeon/radeon_fbdev.c
+++ b/drivers/gpu/drm/radeon/radeon_fbdev.c
@@ -228,7 +228,7 @@ int radeon_fbdev_driver_fbdev_probe(struct drm_fb_helper *fb_helper,
}
rbo = gem_to_radeon_bo(gobj);
- fb = kzalloc_obj(*fb, GFP_KERNEL);
+ fb = kzalloc_obj(*fb);
if (!fb) {
ret = -ENOMEM;
goto err_radeon_fbdev_destroy_pinned_object;
diff --git a/drivers/gpu/drm/radeon/radeon_fence.c b/drivers/gpu/drm/radeon/radeon_fence.c
index 6a13299089d5..02a40e4750c7 100644
--- a/drivers/gpu/drm/radeon/radeon_fence.c
+++ b/drivers/gpu/drm/radeon/radeon_fence.c
@@ -137,7 +137,7 @@ int radeon_fence_emit(struct radeon_device *rdev,
u64 seq;
/* we are protected by the ring emission mutex */
- *fence = kmalloc_obj(struct radeon_fence, GFP_KERNEL);
+ *fence = kmalloc_obj(struct radeon_fence);
if ((*fence) == NULL)
return -ENOMEM;
diff --git a/drivers/gpu/drm/radeon/radeon_i2c.c b/drivers/gpu/drm/radeon/radeon_i2c.c
index 007d9353b1ab..13a091ec797b 100644
--- a/drivers/gpu/drm/radeon/radeon_i2c.c
+++ b/drivers/gpu/drm/radeon/radeon_i2c.c
@@ -912,7 +912,7 @@ struct radeon_i2c_chan *radeon_i2c_create(struct drm_device *dev,
if (rec->mm_i2c && (radeon_hw_i2c == 0))
return NULL;
- i2c = kzalloc_obj(struct radeon_i2c_chan, GFP_KERNEL);
+ i2c = kzalloc_obj(struct radeon_i2c_chan);
if (i2c == NULL)
return NULL;
diff --git a/drivers/gpu/drm/radeon/radeon_kms.c b/drivers/gpu/drm/radeon/radeon_kms.c
index 9833d77170fc..dc43fd790a9c 100644
--- a/drivers/gpu/drm/radeon/radeon_kms.c
+++ b/drivers/gpu/drm/radeon/radeon_kms.c
@@ -640,7 +640,7 @@ int radeon_driver_open_kms(struct drm_device *dev, struct drm_file *file_priv)
/* new gpu have virtual address space support */
if (rdev->family >= CHIP_CAYMAN) {
- fpriv = kzalloc_obj(*fpriv, GFP_KERNEL);
+ fpriv = kzalloc_obj(*fpriv);
if (unlikely(!fpriv)) {
r = -ENOMEM;
goto err_suspend;
diff --git a/drivers/gpu/drm/radeon/radeon_legacy_encoders.c b/drivers/gpu/drm/radeon/radeon_legacy_encoders.c
index f2bb046a595e..1f82e2b57f5d 100644
--- a/drivers/gpu/drm/radeon/radeon_legacy_encoders.c
+++ b/drivers/gpu/drm/radeon/radeon_legacy_encoders.c
@@ -394,7 +394,7 @@ void radeon_legacy_backlight_init(struct radeon_encoder *radeon_encoder,
return;
}
- pdata = kmalloc_obj(struct radeon_backlight_privdata, GFP_KERNEL);
+ pdata = kmalloc_obj(struct radeon_backlight_privdata);
if (!pdata) {
DRM_ERROR("Memory allocation failed\n");
goto error;
@@ -1695,7 +1695,7 @@ static struct radeon_encoder_int_tmds *radeon_legacy_get_tmds_info(struct radeon
struct radeon_encoder_int_tmds *tmds;
bool ret;
- tmds = kzalloc_obj(struct radeon_encoder_int_tmds, GFP_KERNEL);
+ tmds = kzalloc_obj(struct radeon_encoder_int_tmds);
if (!tmds)
return NULL;
@@ -1721,7 +1721,7 @@ static struct radeon_encoder_ext_tmds *radeon_legacy_get_ext_tmds_info(struct ra
if (rdev->is_atom_bios)
return NULL;
- tmds = kzalloc_obj(struct radeon_encoder_ext_tmds, GFP_KERNEL);
+ tmds = kzalloc_obj(struct radeon_encoder_ext_tmds);
if (!tmds)
return NULL;
@@ -1752,7 +1752,7 @@ radeon_add_legacy_encoder(struct drm_device *dev, uint32_t encoder_enum, uint32_
}
/* add a new one */
- radeon_encoder = kzalloc_obj(struct radeon_encoder, GFP_KERNEL);
+ radeon_encoder = kzalloc_obj(struct radeon_encoder);
if (!radeon_encoder)
return;
diff --git a/drivers/gpu/drm/radeon/radeon_semaphore.c b/drivers/gpu/drm/radeon/radeon_semaphore.c
index 28331fef03c5..da0a0b28f2b8 100644
--- a/drivers/gpu/drm/radeon/radeon_semaphore.c
+++ b/drivers/gpu/drm/radeon/radeon_semaphore.c
@@ -36,7 +36,7 @@ int radeon_semaphore_create(struct radeon_device *rdev,
{
int r;
- *semaphore = kmalloc_obj(struct radeon_semaphore, GFP_KERNEL);
+ *semaphore = kmalloc_obj(struct radeon_semaphore);
if (*semaphore == NULL) {
return -ENOMEM;
}
diff --git a/drivers/gpu/drm/radeon/radeon_test.c b/drivers/gpu/drm/radeon/radeon_test.c
index cab04dccbd1d..0b459f7df23b 100644
--- a/drivers/gpu/drm/radeon/radeon_test.c
+++ b/drivers/gpu/drm/radeon/radeon_test.c
@@ -60,7 +60,7 @@ static void radeon_do_test_moves(struct radeon_device *rdev, int flag)
n = rdev->mc.gtt_size - rdev->gart_pin_size;
n /= size;
- gtt_obj = kzalloc_objs(*gtt_obj, n, GFP_KERNEL);
+ gtt_obj = kzalloc_objs(*gtt_obj, n);
if (!gtt_obj) {
DRM_ERROR("Failed to allocate %d pointers\n", n);
r = 1;
diff --git a/drivers/gpu/drm/radeon/radeon_ttm.c b/drivers/gpu/drm/radeon/radeon_ttm.c
index 4cb141b052b6..e7ab8162ac69 100644
--- a/drivers/gpu/drm/radeon/radeon_ttm.c
+++ b/drivers/gpu/drm/radeon/radeon_ttm.c
@@ -492,7 +492,7 @@ static struct ttm_tt *radeon_ttm_tt_create(struct ttm_buffer_object *bo,
#endif
rbo = container_of(bo, struct radeon_bo, tbo);
- gtt = kzalloc_obj(struct radeon_ttm_tt, GFP_KERNEL);
+ gtt = kzalloc_obj(struct radeon_ttm_tt);
if (gtt == NULL) {
return NULL;
}
@@ -533,7 +533,7 @@ static int radeon_ttm_tt_populate(struct ttm_device *bdev,
bool slave = !!(ttm->page_flags & TTM_TT_FLAG_EXTERNAL);
if (gtt && gtt->userptr) {
- ttm->sg = kzalloc_obj(struct sg_table, GFP_KERNEL);
+ ttm->sg = kzalloc_obj(struct sg_table);
if (!ttm->sg)
return -ENOMEM;
diff --git a/drivers/gpu/drm/radeon/radeon_vm.c b/drivers/gpu/drm/radeon/radeon_vm.c
index 5be6cf123d8d..170f1688c211 100644
--- a/drivers/gpu/drm/radeon/radeon_vm.c
+++ b/drivers/gpu/drm/radeon/radeon_vm.c
@@ -321,7 +321,7 @@ struct radeon_bo_va *radeon_vm_bo_add(struct radeon_device *rdev,
{
struct radeon_bo_va *bo_va;
- bo_va = kzalloc_obj(struct radeon_bo_va, GFP_KERNEL);
+ bo_va = kzalloc_obj(struct radeon_bo_va);
if (bo_va == NULL)
return NULL;
@@ -495,7 +495,7 @@ int radeon_vm_bo_set_addr(struct radeon_device *rdev,
if (bo_va->it.start || bo_va->it.last) {
/* add a clone of the bo_va to clear the old address */
struct radeon_bo_va *tmp;
- tmp = kzalloc_obj(struct radeon_bo_va, GFP_KERNEL);
+ tmp = kzalloc_obj(struct radeon_bo_va);
if (!tmp) {
mutex_unlock(&vm->mutex);
r = -ENOMEM;
diff --git a/drivers/gpu/drm/radeon/rs780_dpm.c b/drivers/gpu/drm/radeon/rs780_dpm.c
index 813ef291b349..af0a032e3ded 100644
--- a/drivers/gpu/drm/radeon/rs780_dpm.c
+++ b/drivers/gpu/drm/radeon/rs780_dpm.c
@@ -826,7 +826,7 @@ static int rs780_parse_power_table(struct radeon_device *rdev)
le16_to_cpu(power_info->pplib.usClockInfoArrayOffset) +
(power_state->v1.ucClockStateIndices[0] *
power_info->pplib.ucClockInfoSize));
- ps = kzalloc_obj(struct igp_ps, GFP_KERNEL);
+ ps = kzalloc_obj(struct igp_ps);
if (ps == NULL) {
kfree(rdev->pm.dpm.ps);
return -ENOMEM;
@@ -853,7 +853,7 @@ int rs780_dpm_init(struct radeon_device *rdev)
u8 frev, crev;
int ret;
- pi = kzalloc_obj(struct igp_power_info, GFP_KERNEL);
+ pi = kzalloc_obj(struct igp_power_info);
if (pi == NULL)
return -ENOMEM;
rdev->pm.dpm.priv = pi;
diff --git a/drivers/gpu/drm/radeon/rv6xx_dpm.c b/drivers/gpu/drm/radeon/rv6xx_dpm.c
index 2a4c5d79271b..3cb8842fce65 100644
--- a/drivers/gpu/drm/radeon/rv6xx_dpm.c
+++ b/drivers/gpu/drm/radeon/rv6xx_dpm.c
@@ -1905,7 +1905,7 @@ static int rv6xx_parse_power_table(struct radeon_device *rdev)
power_info->pplib.ucNonClockSize));
if (power_info->pplib.ucStateEntrySize - 1) {
u8 *idx;
- ps = kzalloc_obj(struct rv6xx_ps, GFP_KERNEL);
+ ps = kzalloc_obj(struct rv6xx_ps);
if (ps == NULL) {
kfree(rdev->pm.dpm.ps);
return -ENOMEM;
@@ -1936,7 +1936,7 @@ int rv6xx_dpm_init(struct radeon_device *rdev)
struct rv6xx_power_info *pi;
int ret;
- pi = kzalloc_obj(struct rv6xx_power_info, GFP_KERNEL);
+ pi = kzalloc_obj(struct rv6xx_power_info);
if (pi == NULL)
return -ENOMEM;
rdev->pm.dpm.priv = pi;
diff --git a/drivers/gpu/drm/radeon/rv770_dpm.c b/drivers/gpu/drm/radeon/rv770_dpm.c
index 0de4b5171aac..4d6ed9668ad1 100644
--- a/drivers/gpu/drm/radeon/rv770_dpm.c
+++ b/drivers/gpu/drm/radeon/rv770_dpm.c
@@ -2301,7 +2301,7 @@ int rv7xx_parse_power_table(struct radeon_device *rdev)
power_info->pplib.ucNonClockSize));
if (power_info->pplib.ucStateEntrySize - 1) {
u8 *idx;
- ps = kzalloc_obj(struct rv7xx_ps, GFP_KERNEL);
+ ps = kzalloc_obj(struct rv7xx_ps);
if (ps == NULL) {
kfree(rdev->pm.dpm.ps);
return -ENOMEM;
@@ -2348,7 +2348,7 @@ int rv770_dpm_init(struct radeon_device *rdev)
struct atom_clock_dividers dividers;
int ret;
- pi = kzalloc_obj(struct rv7xx_power_info, GFP_KERNEL);
+ pi = kzalloc_obj(struct rv7xx_power_info);
if (pi == NULL)
return -ENOMEM;
rdev->pm.dpm.priv = pi;
diff --git a/drivers/gpu/drm/radeon/si_dpm.c b/drivers/gpu/drm/radeon/si_dpm.c
index b7897f89dee8..e4e725e4f4e7 100644
--- a/drivers/gpu/drm/radeon/si_dpm.c
+++ b/drivers/gpu/drm/radeon/si_dpm.c
@@ -2419,7 +2419,7 @@ static int si_initialize_smc_dte_tables(struct radeon_device *rdev)
if (dte_data->k <= 0)
return -EINVAL;
- dte_tables = kzalloc_obj(Smc_SIslands_DTE_Configuration, GFP_KERNEL);
+ dte_tables = kzalloc_obj(Smc_SIslands_DTE_Configuration);
if (dte_tables == NULL) {
si_pi->enable_dte = false;
return -ENOMEM;
@@ -2599,7 +2599,7 @@ static int si_initialize_smc_cac_tables(struct radeon_device *rdev)
if (ni_pi->enable_cac == false)
return 0;
- cac_tables = kzalloc_obj(PP_SIslands_CacConfig, GFP_KERNEL);
+ cac_tables = kzalloc_obj(PP_SIslands_CacConfig);
if (!cac_tables)
return -ENOMEM;
@@ -2794,7 +2794,7 @@ static int si_init_smc_spll_table(struct radeon_device *rdev)
if (si_pi->spll_table_start == 0)
return -EINVAL;
- spll_table = kzalloc_obj(SMC_SISLANDS_SPLL_DIV_TABLE, GFP_KERNEL);
+ spll_table = kzalloc_obj(SMC_SISLANDS_SPLL_DIV_TABLE);
if (spll_table == NULL)
return -ENOMEM;
@@ -5479,7 +5479,7 @@ static int si_initialize_mc_reg_table(struct radeon_device *rdev)
u8 module_index = rv770_get_memory_module_index(rdev);
int ret;
- table = kzalloc_obj(struct atom_mc_reg_table, GFP_KERNEL);
+ table = kzalloc_obj(struct atom_mc_reg_table);
if (!table)
return -ENOMEM;
@@ -6791,7 +6791,7 @@ static int si_parse_power_table(struct radeon_device *rdev)
&non_clock_info_array->nonClockInfo[non_clock_array_index];
if (!rdev->pm.power_state[i].clock_info)
return -EINVAL;
- ps = kzalloc_obj(struct ni_ps, GFP_KERNEL);
+ ps = kzalloc_obj(struct ni_ps);
if (ps == NULL) {
kfree(rdev->pm.dpm.ps);
return -ENOMEM;
@@ -6848,7 +6848,7 @@ int si_dpm_init(struct radeon_device *rdev)
struct pci_dev *root = rdev->pdev->bus->self;
int ret;
- si_pi = kzalloc_obj(struct si_power_info, GFP_KERNEL);
+ si_pi = kzalloc_obj(struct si_power_info);
if (si_pi == NULL)
return -ENOMEM;
rdev->pm.dpm.priv = si_pi;
diff --git a/drivers/gpu/drm/radeon/sumo_dpm.c b/drivers/gpu/drm/radeon/sumo_dpm.c
index 43d452b65c6a..5f14adeee13e 100644
--- a/drivers/gpu/drm/radeon/sumo_dpm.c
+++ b/drivers/gpu/drm/radeon/sumo_dpm.c
@@ -1494,7 +1494,7 @@ static int sumo_parse_power_table(struct radeon_device *rdev)
kfree(rdev->pm.dpm.ps);
return -EINVAL;
}
- ps = kzalloc_obj(struct sumo_ps, GFP_KERNEL);
+ ps = kzalloc_obj(struct sumo_ps);
if (ps == NULL) {
kfree(rdev->pm.dpm.ps);
return -ENOMEM;
@@ -1744,7 +1744,7 @@ int sumo_dpm_init(struct radeon_device *rdev)
u32 hw_rev = (RREG32(HW_REV) & ATI_REV_ID_MASK) >> ATI_REV_ID_SHIFT;
int ret;
- pi = kzalloc_obj(struct sumo_power_info, GFP_KERNEL);
+ pi = kzalloc_obj(struct sumo_power_info);
if (pi == NULL)
return -ENOMEM;
rdev->pm.dpm.priv = pi;
diff --git a/drivers/gpu/drm/radeon/trinity_dpm.c b/drivers/gpu/drm/radeon/trinity_dpm.c
index a8e8cb8e2b01..34b7beb9cf9a 100644
--- a/drivers/gpu/drm/radeon/trinity_dpm.c
+++ b/drivers/gpu/drm/radeon/trinity_dpm.c
@@ -1725,7 +1725,7 @@ static int trinity_parse_power_table(struct radeon_device *rdev)
kfree(rdev->pm.dpm.ps);
return -EINVAL;
}
- ps = kzalloc_obj(struct sumo_ps, GFP_KERNEL);
+ ps = kzalloc_obj(struct sumo_ps);
if (ps == NULL) {
kfree(rdev->pm.dpm.ps);
return -ENOMEM;
@@ -1902,7 +1902,7 @@ int trinity_dpm_init(struct radeon_device *rdev)
struct trinity_power_info *pi;
int ret, i;
- pi = kzalloc_obj(struct trinity_power_info, GFP_KERNEL);
+ pi = kzalloc_obj(struct trinity_power_info);
if (pi == NULL)
return -ENOMEM;
rdev->pm.dpm.priv = pi;
diff --git a/drivers/gpu/drm/renesas/rcar-du/rcar_du_crtc.c b/drivers/gpu/drm/renesas/rcar-du/rcar_du_crtc.c
index dad019714c3e..28a5aa5a14d8 100644
--- a/drivers/gpu/drm/renesas/rcar-du/rcar_du_crtc.c
+++ b/drivers/gpu/drm/renesas/rcar-du/rcar_du_crtc.c
@@ -1006,7 +1006,7 @@ static void rcar_du_crtc_reset(struct drm_crtc *crtc)
crtc->state = NULL;
}
- state = kzalloc_obj(*state, GFP_KERNEL);
+ state = kzalloc_obj(*state);
if (state == NULL)
return;
diff --git a/drivers/gpu/drm/renesas/rcar-du/rcar_du_kms.c b/drivers/gpu/drm/renesas/rcar-du/rcar_du_kms.c
index 6ef11717b2ff..60e6f43b8ab2 100644
--- a/drivers/gpu/drm/renesas/rcar-du/rcar_du_kms.c
+++ b/drivers/gpu/drm/renesas/rcar-du/rcar_du_kms.c
@@ -381,7 +381,7 @@ struct drm_gem_object *rcar_du_gem_prime_import_sg_table(struct drm_device *dev,
return drm_gem_dma_prime_import_sg_table(dev, attach, sgt);
/* Create a DMA GEM buffer. */
- dma_obj = kzalloc_obj(*dma_obj, GFP_KERNEL);
+ dma_obj = kzalloc_obj(*dma_obj);
if (!dma_obj)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/gpu/drm/renesas/rcar-du/rcar_du_plane.c b/drivers/gpu/drm/renesas/rcar-du/rcar_du_plane.c
index 29d5574a5d8e..01840feabdbe 100644
--- a/drivers/gpu/drm/renesas/rcar-du/rcar_du_plane.c
+++ b/drivers/gpu/drm/renesas/rcar-du/rcar_du_plane.c
@@ -721,7 +721,7 @@ static void rcar_du_plane_reset(struct drm_plane *plane)
plane->state = NULL;
}
- state = kzalloc_obj(*state, GFP_KERNEL);
+ state = kzalloc_obj(*state);
if (state == NULL)
return;
diff --git a/drivers/gpu/drm/renesas/rcar-du/rcar_du_vsp.c b/drivers/gpu/drm/renesas/rcar-du/rcar_du_vsp.c
index 87eb80cb931e..94c22d2db197 100644
--- a/drivers/gpu/drm/renesas/rcar-du/rcar_du_vsp.c
+++ b/drivers/gpu/drm/renesas/rcar-du/rcar_du_vsp.c
@@ -404,7 +404,7 @@ rcar_du_vsp_plane_atomic_duplicate_state(struct drm_plane *plane)
if (WARN_ON(!plane->state))
return NULL;
- copy = kzalloc_obj(*copy, GFP_KERNEL);
+ copy = kzalloc_obj(*copy);
if (copy == NULL)
return NULL;
@@ -429,7 +429,7 @@ static void rcar_du_vsp_plane_reset(struct drm_plane *plane)
plane->state = NULL;
}
- state = kzalloc_obj(*state, GFP_KERNEL);
+ state = kzalloc_obj(*state);
if (state == NULL)
return;
@@ -488,7 +488,7 @@ int rcar_du_vsp_init(struct rcar_du_vsp *vsp, struct device_node *np,
num_planes = rcdu->info->num_rpf;
- vsp->planes = kzalloc_objs(*vsp->planes, num_planes, GFP_KERNEL);
+ vsp->planes = kzalloc_objs(*vsp->planes, num_planes);
if (!vsp->planes)
return -ENOMEM;
diff --git a/drivers/gpu/drm/renesas/rcar-du/rcar_du_writeback.c b/drivers/gpu/drm/renesas/rcar-du/rcar_du_writeback.c
index 0d818663b1ce..e5e6e6a156aa 100644
--- a/drivers/gpu/drm/renesas/rcar-du/rcar_du_writeback.c
+++ b/drivers/gpu/drm/renesas/rcar-du/rcar_du_writeback.c
@@ -57,7 +57,7 @@ static int rcar_du_wb_prepare_job(struct drm_writeback_connector *connector,
if (!job->fb)
return 0;
- rjob = kzalloc_obj(*rjob, GFP_KERNEL);
+ rjob = kzalloc_obj(*rjob);
if (!rjob)
return -ENOMEM;
@@ -99,7 +99,7 @@ rcar_du_wb_conn_duplicate_state(struct drm_connector *connector)
if (WARN_ON(!connector->state))
return NULL;
- copy = kzalloc_obj(*copy, GFP_KERNEL);
+ copy = kzalloc_obj(*copy);
if (!copy)
return NULL;
@@ -124,7 +124,7 @@ static void rcar_du_wb_conn_reset(struct drm_connector *connector)
connector->state = NULL;
}
- state = kzalloc_obj(*state, GFP_KERNEL);
+ state = kzalloc_obj(*state);
if (state == NULL)
return;
diff --git a/drivers/gpu/drm/renesas/rz-du/rzg2l_du_crtc.c b/drivers/gpu/drm/renesas/rz-du/rzg2l_du_crtc.c
index e9a95a026a2a..18e2b981b691 100644
--- a/drivers/gpu/drm/renesas/rz-du/rzg2l_du_crtc.c
+++ b/drivers/gpu/drm/renesas/rz-du/rzg2l_du_crtc.c
@@ -336,7 +336,7 @@ static void rzg2l_du_crtc_reset(struct drm_crtc *crtc)
crtc->state = NULL;
}
- state = kzalloc_obj(*state, GFP_KERNEL);
+ state = kzalloc_obj(*state);
if (!state)
return;
diff --git a/drivers/gpu/drm/renesas/rz-du/rzg2l_du_vsp.c b/drivers/gpu/drm/renesas/rz-du/rzg2l_du_vsp.c
index 525889dba500..bd486377f037 100644
--- a/drivers/gpu/drm/renesas/rz-du/rzg2l_du_vsp.c
+++ b/drivers/gpu/drm/renesas/rz-du/rzg2l_du_vsp.c
@@ -249,7 +249,7 @@ rzg2l_du_vsp_plane_atomic_duplicate_state(struct drm_plane *plane)
if (WARN_ON(!plane->state))
return NULL;
- copy = kzalloc_obj(*copy, GFP_KERNEL);
+ copy = kzalloc_obj(*copy);
if (!copy)
return NULL;
@@ -274,7 +274,7 @@ static void rzg2l_du_vsp_plane_reset(struct drm_plane *plane)
plane->state = NULL;
}
- state = kzalloc_obj(*state, GFP_KERNEL);
+ state = kzalloc_obj(*state);
if (!state)
return;
diff --git a/drivers/gpu/drm/renesas/shmobile/shmob_drm_crtc.c b/drivers/gpu/drm/renesas/shmobile/shmob_drm_crtc.c
index 931d797c598a..5f460b38596c 100644
--- a/drivers/gpu/drm/renesas/shmobile/shmob_drm_crtc.c
+++ b/drivers/gpu/drm/renesas/shmobile/shmob_drm_crtc.c
@@ -551,7 +551,7 @@ shmob_drm_connector_init(struct shmob_drm_device *sdev,
return ERR_PTR(-EINVAL);
}
- scon = kzalloc_obj(*scon, GFP_KERNEL);
+ scon = kzalloc_obj(*scon);
if (!scon)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/gpu/drm/renesas/shmobile/shmob_drm_plane.c b/drivers/gpu/drm/renesas/shmobile/shmob_drm_plane.c
index 983e4c72002a..b61fda52d17a 100644
--- a/drivers/gpu/drm/renesas/shmobile/shmob_drm_plane.c
+++ b/drivers/gpu/drm/renesas/shmobile/shmob_drm_plane.c
@@ -260,7 +260,7 @@ static void shmob_drm_plane_reset(struct drm_plane *plane)
plane->state = NULL;
}
- state = kzalloc_obj(*state, GFP_KERNEL);
+ state = kzalloc_obj(*state);
if (state == NULL)
return;
diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_fb.c b/drivers/gpu/drm/rockchip/rockchip_drm_fb.c
index 43688d0322d7..45588b79b3d4 100644
--- a/drivers/gpu/drm/rockchip/rockchip_drm_fb.c
+++ b/drivers/gpu/drm/rockchip/rockchip_drm_fb.c
@@ -36,7 +36,7 @@ rockchip_fb_create(struct drm_device *dev, struct drm_file *file,
struct drm_afbc_framebuffer *afbc_fb;
int ret;
- afbc_fb = kzalloc_obj(*afbc_fb, GFP_KERNEL);
+ afbc_fb = kzalloc_obj(*afbc_fb);
if (!afbc_fb)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_gem.c b/drivers/gpu/drm/rockchip/rockchip_drm_gem.c
index e6216773a6c4..09d14a072d27 100644
--- a/drivers/gpu/drm/rockchip/rockchip_drm_gem.c
+++ b/drivers/gpu/drm/rockchip/rockchip_drm_gem.c
@@ -289,7 +289,7 @@ static struct rockchip_gem_object *
size = round_up(size, PAGE_SIZE);
- rk_obj = kzalloc_obj(*rk_obj, GFP_KERNEL);
+ rk_obj = kzalloc_obj(*rk_obj);
if (!rk_obj)
return ERR_PTR(-ENOMEM);
@@ -434,7 +434,7 @@ struct sg_table *rockchip_gem_prime_get_sg_table(struct drm_gem_object *obj)
if (rk_obj->pages)
return drm_prime_pages_to_sg(obj->dev, rk_obj->pages, rk_obj->num_pages);
- sgt = kzalloc_obj(*sgt, GFP_KERNEL);
+ sgt = kzalloc_obj(*sgt);
if (!sgt)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_vop2.c b/drivers/gpu/drm/rockchip/rockchip_drm_vop2.c
index b12970bcc588..a195f5c819a2 100644
--- a/drivers/gpu/drm/rockchip/rockchip_drm_vop2.c
+++ b/drivers/gpu/drm/rockchip/rockchip_drm_vop2.c
@@ -2140,7 +2140,7 @@ static void vop2_crtc_destroy_state(struct drm_crtc *crtc,
static void vop2_crtc_reset(struct drm_crtc *crtc)
{
- struct rockchip_crtc_state *vcstate = kzalloc_obj(*vcstate, GFP_KERNEL);
+ struct rockchip_crtc_state *vcstate = kzalloc_obj(*vcstate);
if (crtc->state)
vop2_crtc_destroy_state(crtc, crtc->state);
diff --git a/drivers/gpu/drm/sitronix/st7920.c b/drivers/gpu/drm/sitronix/st7920.c
index 21d9369d01c3..18fe7a28ed07 100644
--- a/drivers/gpu/drm/sitronix/st7920.c
+++ b/drivers/gpu/drm/sitronix/st7920.c
@@ -459,7 +459,7 @@ static void st7920_primary_plane_reset(struct drm_plane *plane)
drm_WARN_ON_ONCE(plane->dev, plane->state);
- st7920_state = kzalloc_obj(*st7920_state, GFP_KERNEL);
+ st7920_state = kzalloc_obj(*st7920_state);
if (!st7920_state)
return;
@@ -474,7 +474,7 @@ static struct drm_plane_state *st7920_primary_plane_duplicate_state(struct drm_p
if (drm_WARN_ON_ONCE(plane->dev, !plane->state))
return NULL;
- st7920_state = kzalloc_obj(*st7920_state, GFP_KERNEL);
+ st7920_state = kzalloc_obj(*st7920_state);
if (!st7920_state)
return NULL;
@@ -581,7 +581,7 @@ static void st7920_crtc_reset(struct drm_crtc *crtc)
drm_WARN_ON_ONCE(crtc->dev, crtc->state);
- st7920_state = kzalloc_obj(*st7920_state, GFP_KERNEL);
+ st7920_state = kzalloc_obj(*st7920_state);
if (!st7920_state)
return;
@@ -595,7 +595,7 @@ static struct drm_crtc_state *st7920_crtc_duplicate_state(struct drm_crtc *crtc)
if (drm_WARN_ON_ONCE(crtc->dev, !crtc->state))
return NULL;
- st7920_state = kzalloc_obj(*st7920_state, GFP_KERNEL);
+ st7920_state = kzalloc_obj(*st7920_state);
if (!st7920_state)
return NULL;
diff --git a/drivers/gpu/drm/solomon/ssd130x.c b/drivers/gpu/drm/solomon/ssd130x.c
index aa08e13e4bb7..6ecf9e2ff61b 100644
--- a/drivers/gpu/drm/solomon/ssd130x.c
+++ b/drivers/gpu/drm/solomon/ssd130x.c
@@ -1396,7 +1396,7 @@ static void ssd130x_primary_plane_reset(struct drm_plane *plane)
drm_WARN_ON_ONCE(plane->dev, plane->state);
- ssd130x_state = kzalloc_obj(*ssd130x_state, GFP_KERNEL);
+ ssd130x_state = kzalloc_obj(*ssd130x_state);
if (!ssd130x_state)
return;
@@ -1553,7 +1553,7 @@ static void ssd130x_crtc_reset(struct drm_crtc *crtc)
drm_WARN_ON_ONCE(crtc->dev, crtc->state);
- ssd130x_state = kzalloc_obj(*ssd130x_state, GFP_KERNEL);
+ ssd130x_state = kzalloc_obj(*ssd130x_state);
if (!ssd130x_state)
return;
diff --git a/drivers/gpu/drm/sti/sti_drv.c b/drivers/gpu/drm/sti/sti_drv.c
index b0c73fe2731d..d02d71866f2a 100644
--- a/drivers/gpu/drm/sti/sti_drv.c
+++ b/drivers/gpu/drm/sti/sti_drv.c
@@ -151,7 +151,7 @@ static int sti_init(struct drm_device *ddev)
{
struct sti_private *private;
- private = kzalloc_obj(*private, GFP_KERNEL);
+ private = kzalloc_obj(*private);
if (!private)
return -ENOMEM;
diff --git a/drivers/gpu/drm/sun4i/sun4i_layer.c b/drivers/gpu/drm/sun4i/sun4i_layer.c
index 10e8dbdc6a76..63cb8c7c3636 100644
--- a/drivers/gpu/drm/sun4i/sun4i_layer.c
+++ b/drivers/gpu/drm/sun4i/sun4i_layer.c
@@ -29,7 +29,7 @@ static void sun4i_backend_layer_reset(struct drm_plane *plane)
plane->state = NULL;
}
- state = kzalloc_obj(*state, GFP_KERNEL);
+ state = kzalloc_obj(*state);
if (state)
__drm_atomic_helper_plane_reset(plane, &state->state);
}
@@ -40,7 +40,7 @@ sun4i_backend_layer_duplicate_state(struct drm_plane *plane)
struct sun4i_layer_state *orig = state_to_sun4i_layer_state(plane->state);
struct sun4i_layer_state *copy;
- copy = kzalloc_obj(*copy, GFP_KERNEL);
+ copy = kzalloc_obj(*copy);
if (!copy)
return NULL;
diff --git a/drivers/gpu/drm/sysfb/drm_sysfb_modeset.c b/drivers/gpu/drm/sysfb/drm_sysfb_modeset.c
index 02c59d401b45..808b1eda871a 100644
--- a/drivers/gpu/drm/sysfb/drm_sysfb_modeset.c
+++ b/drivers/gpu/drm/sysfb/drm_sysfb_modeset.c
@@ -427,7 +427,7 @@ void drm_sysfb_plane_reset(struct drm_plane *plane)
if (plane->state)
drm_sysfb_plane_state_destroy(to_drm_sysfb_plane_state(plane->state));
- sysfb_plane_state = kzalloc_obj(*sysfb_plane_state, GFP_KERNEL);
+ sysfb_plane_state = kzalloc_obj(*sysfb_plane_state);
if (sysfb_plane_state)
__drm_gem_reset_shadow_plane(plane, &sysfb_plane_state->base);
else
@@ -447,7 +447,7 @@ struct drm_plane_state *drm_sysfb_plane_atomic_duplicate_state(struct drm_plane
return NULL;
sysfb_plane_state = to_drm_sysfb_plane_state(plane_state);
- new_sysfb_plane_state = kzalloc_obj(*new_sysfb_plane_state, GFP_KERNEL);
+ new_sysfb_plane_state = kzalloc_obj(*new_sysfb_plane_state);
if (!new_sysfb_plane_state)
return NULL;
new_shadow_plane_state = &new_sysfb_plane_state->base;
@@ -523,7 +523,7 @@ void drm_sysfb_crtc_reset(struct drm_crtc *crtc)
if (crtc->state)
drm_sysfb_crtc_state_destroy(to_drm_sysfb_crtc_state(crtc->state));
- sysfb_crtc_state = kzalloc_obj(*sysfb_crtc_state, GFP_KERNEL);
+ sysfb_crtc_state = kzalloc_obj(*sysfb_crtc_state);
if (sysfb_crtc_state) {
sysfb_crtc_state->format = sysfb->fb_format;
__drm_atomic_helper_crtc_reset(crtc, &sysfb_crtc_state->base);
@@ -543,7 +543,7 @@ struct drm_crtc_state *drm_sysfb_crtc_atomic_duplicate_state(struct drm_crtc *cr
if (drm_WARN_ON(dev, !crtc_state))
return NULL;
- new_sysfb_crtc_state = kzalloc_obj(*new_sysfb_crtc_state, GFP_KERNEL);
+ new_sysfb_crtc_state = kzalloc_obj(*new_sysfb_crtc_state);
if (!new_sysfb_crtc_state)
return NULL;
diff --git a/drivers/gpu/drm/tegra/dc.c b/drivers/gpu/drm/tegra/dc.c
index 21cadb50c671..06370b7e0e56 100644
--- a/drivers/gpu/drm/tegra/dc.c
+++ b/drivers/gpu/drm/tegra/dc.c
@@ -812,7 +812,7 @@ static struct drm_plane *tegra_primary_plane_create(struct drm_device *drm,
const u32 *formats;
int err;
- plane = kzalloc_obj(*plane, GFP_KERNEL);
+ plane = kzalloc_obj(*plane);
if (!plane)
return ERR_PTR(-ENOMEM);
@@ -1115,7 +1115,7 @@ static struct drm_plane *tegra_dc_cursor_plane_create(struct drm_device *drm,
const u32 *formats;
int err;
- plane = kzalloc_obj(*plane, GFP_KERNEL);
+ plane = kzalloc_obj(*plane);
if (!plane)
return ERR_PTR(-ENOMEM);
@@ -1263,7 +1263,7 @@ static struct drm_plane *tegra_dc_overlay_plane_create(struct drm_device *drm,
const u32 *formats;
int err;
- plane = kzalloc_obj(*plane, GFP_KERNEL);
+ plane = kzalloc_obj(*plane);
if (!plane)
return ERR_PTR(-ENOMEM);
@@ -1389,7 +1389,7 @@ static void tegra_dc_destroy(struct drm_crtc *crtc)
static void tegra_crtc_reset(struct drm_crtc *crtc)
{
- struct tegra_dc_state *state = kzalloc_obj(*state, GFP_KERNEL);
+ struct tegra_dc_state *state = kzalloc_obj(*state);
if (crtc->state)
tegra_crtc_atomic_destroy_state(crtc, crtc->state);
@@ -1406,7 +1406,7 @@ tegra_crtc_atomic_duplicate_state(struct drm_crtc *crtc)
struct tegra_dc_state *state = to_dc_state(crtc->state);
struct tegra_dc_state *copy;
- copy = kmalloc_obj(*copy, GFP_KERNEL);
+ copy = kmalloc_obj(*copy);
if (!copy)
return NULL;
diff --git a/drivers/gpu/drm/tegra/drm.c b/drivers/gpu/drm/tegra/drm.c
index 1d1bbeae4522..1dcef4e7d104 100644
--- a/drivers/gpu/drm/tegra/drm.c
+++ b/drivers/gpu/drm/tegra/drm.c
@@ -104,7 +104,7 @@ static int tegra_drm_open(struct drm_device *drm, struct drm_file *filp)
{
struct tegra_drm_file *fpriv;
- fpriv = kzalloc_obj(*fpriv, GFP_KERNEL);
+ fpriv = kzalloc_obj(*fpriv);
if (!fpriv)
return -ENOMEM;
@@ -212,7 +212,7 @@ int tegra_drm_submit(struct tegra_drm_context *context,
*/
num_refs = num_cmdbufs + num_relocs * 2;
- refs = kmalloc_objs(*refs, num_refs, GFP_KERNEL);
+ refs = kmalloc_objs(*refs, num_refs);
if (!refs) {
err = -ENOMEM;
goto put;
@@ -465,7 +465,7 @@ static int tegra_open_channel(struct drm_device *drm, void *data,
struct tegra_drm_client *client;
int err = -ENODEV;
- context = kzalloc_obj(*context, GFP_KERNEL);
+ context = kzalloc_obj(*context);
if (!context)
return -ENOMEM;
@@ -1147,7 +1147,7 @@ static int host1x_drm_probe(struct host1x_device *dev)
if (IS_ERR(drm))
return PTR_ERR(drm);
- tegra = kzalloc_obj(*tegra, GFP_KERNEL);
+ tegra = kzalloc_obj(*tegra);
if (!tegra) {
err = -ENOMEM;
goto put;
diff --git a/drivers/gpu/drm/tegra/dsi.c b/drivers/gpu/drm/tegra/dsi.c
index f28e7bd63508..2c5aefe9621a 100644
--- a/drivers/gpu/drm/tegra/dsi.c
+++ b/drivers/gpu/drm/tegra/dsi.c
@@ -772,7 +772,7 @@ static void tegra_dsi_soft_reset(struct tegra_dsi *dsi)
static void tegra_dsi_connector_reset(struct drm_connector *connector)
{
- struct tegra_dsi_state *state = kzalloc_obj(*state, GFP_KERNEL);
+ struct tegra_dsi_state *state = kzalloc_obj(*state);
if (!state)
return;
diff --git a/drivers/gpu/drm/tegra/fb.c b/drivers/gpu/drm/tegra/fb.c
index e795570776fd..1e4803d355dd 100644
--- a/drivers/gpu/drm/tegra/fb.c
+++ b/drivers/gpu/drm/tegra/fb.c
@@ -112,7 +112,7 @@ struct drm_framebuffer *tegra_fb_alloc(struct drm_device *drm,
unsigned int i;
int err;
- fb = kzalloc_obj(*fb, GFP_KERNEL);
+ fb = kzalloc_obj(*fb);
if (!fb)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/gpu/drm/tegra/gem.c b/drivers/gpu/drm/tegra/gem.c
index c7355b11424c..d2bae88ad545 100644
--- a/drivers/gpu/drm/tegra/gem.c
+++ b/drivers/gpu/drm/tegra/gem.c
@@ -64,7 +64,7 @@ static struct host1x_bo_mapping *tegra_bo_pin(struct device *dev, struct host1x_
struct host1x_bo_mapping *map;
int err;
- map = kzalloc_obj(*map, GFP_KERNEL);
+ map = kzalloc_obj(*map);
if (!map)
return ERR_PTR(-ENOMEM);
@@ -103,7 +103,7 @@ static struct host1x_bo_mapping *tegra_bo_pin(struct device *dev, struct host1x_
* If we don't have a mapping for this buffer yet, return an SG table
* so that host1x can do the mapping for us via the DMA API.
*/
- map->sgt = kzalloc_obj(*map->sgt, GFP_KERNEL);
+ map->sgt = kzalloc_obj(*map->sgt);
if (!map->sgt) {
err = -ENOMEM;
goto free;
@@ -240,7 +240,7 @@ static int tegra_bo_iommu_map(struct tegra_drm *tegra, struct tegra_bo *bo)
if (bo->mm)
return -EBUSY;
- bo->mm = kzalloc_obj(*bo->mm, GFP_KERNEL);
+ bo->mm = kzalloc_obj(*bo->mm);
if (!bo->mm)
return -ENOMEM;
@@ -302,7 +302,7 @@ static struct tegra_bo *tegra_bo_alloc_object(struct drm_device *drm,
struct tegra_bo *bo;
int err;
- bo = kzalloc_obj(*bo, GFP_KERNEL);
+ bo = kzalloc_obj(*bo);
if (!bo)
return ERR_PTR(-ENOMEM);
@@ -639,7 +639,7 @@ tegra_gem_prime_map_dma_buf(struct dma_buf_attachment *attach,
struct tegra_bo *bo = to_tegra_bo(gem);
struct sg_table *sgt;
- sgt = kmalloc_obj(*sgt, GFP_KERNEL);
+ sgt = kmalloc_obj(*sgt);
if (!sgt)
return NULL;
diff --git a/drivers/gpu/drm/tegra/hub.c b/drivers/gpu/drm/tegra/hub.c
index e0f84efb3b76..a6fa196c2813 100644
--- a/drivers/gpu/drm/tegra/hub.c
+++ b/drivers/gpu/drm/tegra/hub.c
@@ -769,7 +769,7 @@ struct drm_plane *tegra_shared_plane_create(struct drm_device *drm,
const u32 *formats;
int err;
- plane = kzalloc_obj(*plane, GFP_KERNEL);
+ plane = kzalloc_obj(*plane);
if (!plane)
return ERR_PTR(-ENOMEM);
@@ -943,7 +943,7 @@ static int tegra_display_hub_init(struct host1x_client *client)
struct tegra_drm *tegra = drm->dev_private;
struct tegra_display_hub_state *state;
- state = kzalloc_obj(*state, GFP_KERNEL);
+ state = kzalloc_obj(*state);
if (!state)
return -ENOMEM;
diff --git a/drivers/gpu/drm/tegra/plane.c b/drivers/gpu/drm/tegra/plane.c
index ce49c2de2c08..0cb30910773f 100644
--- a/drivers/gpu/drm/tegra/plane.c
+++ b/drivers/gpu/drm/tegra/plane.c
@@ -36,7 +36,7 @@ static void tegra_plane_reset(struct drm_plane *plane)
kfree(plane->state);
plane->state = NULL;
- state = kzalloc_obj(*state, GFP_KERNEL);
+ state = kzalloc_obj(*state);
if (state) {
plane->state = &state->base;
plane->state->plane = plane;
@@ -55,7 +55,7 @@ tegra_plane_atomic_duplicate_state(struct drm_plane *plane)
struct tegra_plane_state *copy;
unsigned int i;
- copy = kmalloc_obj(*copy, GFP_KERNEL);
+ copy = kmalloc_obj(*copy);
if (!copy)
return NULL;
diff --git a/drivers/gpu/drm/tegra/sor.c b/drivers/gpu/drm/tegra/sor.c
index a2cb68f42612..de8b2dfc4984 100644
--- a/drivers/gpu/drm/tegra/sor.c
+++ b/drivers/gpu/drm/tegra/sor.c
@@ -1721,7 +1721,7 @@ static void tegra_sor_connector_reset(struct drm_connector *connector)
{
struct tegra_sor_state *state;
- state = kzalloc_obj(*state, GFP_KERNEL);
+ state = kzalloc_obj(*state);
if (!state)
return;
diff --git a/drivers/gpu/drm/tegra/submit.c b/drivers/gpu/drm/tegra/submit.c
index 7747d5b9f3ca..3009b8b9e619 100644
--- a/drivers/gpu/drm/tegra/submit.c
+++ b/drivers/gpu/drm/tegra/submit.c
@@ -71,7 +71,7 @@ gather_bo_pin(struct device *dev, struct host1x_bo *bo, enum dma_data_direction
struct host1x_bo_mapping *map;
int err;
- map = kzalloc_obj(*map, GFP_KERNEL);
+ map = kzalloc_obj(*map);
if (!map)
return ERR_PTR(-ENOMEM);
@@ -80,7 +80,7 @@ gather_bo_pin(struct device *dev, struct host1x_bo *bo, enum dma_data_direction
map->direction = direction;
map->dev = dev;
- map->sgt = kzalloc_obj(*map->sgt, GFP_KERNEL);
+ map->sgt = kzalloc_obj(*map->sgt);
if (!map->sgt) {
err = -ENOMEM;
goto free;
@@ -193,7 +193,7 @@ static int submit_copy_gather_data(struct gather_bo **pbo, struct device *dev,
return -EINVAL;
}
- bo = kzalloc_obj(*bo, GFP_KERNEL);
+ bo = kzalloc_obj(*bo);
if (!bo) {
SUBMIT_ERR(context, "failed to allocate memory for bo info");
return -ENOMEM;
@@ -270,7 +270,7 @@ static int submit_process_bufs(struct tegra_drm_context *context, struct gather_
return PTR_ERR(bufs);
}
- mappings = kzalloc_objs(*mappings, args->num_bufs, GFP_KERNEL);
+ mappings = kzalloc_objs(*mappings, args->num_bufs);
if (!mappings) {
SUBMIT_ERR(context, "failed to allocate memory for mapping info");
err = -ENOMEM;
@@ -560,7 +560,7 @@ int tegra_drm_ioctl_channel_submit(struct drm_device *drm, void *data,
if (err)
goto unlock;
- job_data = kzalloc_obj(*job_data, GFP_KERNEL);
+ job_data = kzalloc_obj(*job_data);
if (!job_data) {
SUBMIT_ERR(context, "failed to allocate memory for job data");
err = -ENOMEM;
diff --git a/drivers/gpu/drm/tegra/uapi.c b/drivers/gpu/drm/tegra/uapi.c
index c4061d0f69a7..c0ac6b45f2d7 100644
--- a/drivers/gpu/drm/tegra/uapi.c
+++ b/drivers/gpu/drm/tegra/uapi.c
@@ -86,7 +86,7 @@ int tegra_drm_ioctl_channel_open(struct drm_device *drm, void *data, struct drm_
if (args->flags)
return -EINVAL;
- context = kzalloc_obj(*context, GFP_KERNEL);
+ context = kzalloc_obj(*context);
if (!context)
return -ENOMEM;
@@ -206,7 +206,7 @@ int tegra_drm_ioctl_channel_map(struct drm_device *drm, void *data, struct drm_f
return -EINVAL;
}
- mapping = kzalloc_obj(*mapping, GFP_KERNEL);
+ mapping = kzalloc_obj(*mapping);
if (!mapping) {
err = -ENOMEM;
goto unlock;
diff --git a/drivers/gpu/drm/tests/drm_gem_shmem_test.c b/drivers/gpu/drm/tests/drm_gem_shmem_test.c
index f401b9c42a9c..44a190109249 100644
--- a/drivers/gpu/drm/tests/drm_gem_shmem_test.c
+++ b/drivers/gpu/drm/tests/drm_gem_shmem_test.c
@@ -80,7 +80,7 @@ static void drm_gem_shmem_test_obj_create_private(struct kunit *test)
buf = kunit_kzalloc(test, TEST_SIZE, GFP_KERNEL);
KUNIT_ASSERT_NOT_NULL(test, buf);
- sgt = kzalloc_obj(*sgt, GFP_KERNEL);
+ sgt = kzalloc_obj(*sgt);
KUNIT_ASSERT_NOT_NULL(test, sgt);
ret = kunit_add_action_or_reset(test, kfree_wrapper, sgt);
diff --git a/drivers/gpu/drm/tests/drm_mm_test.c b/drivers/gpu/drm/tests/drm_mm_test.c
index 6a1a27ee5f36..f4f473f87838 100644
--- a/drivers/gpu/drm/tests/drm_mm_test.c
+++ b/drivers/gpu/drm/tests/drm_mm_test.c
@@ -252,7 +252,7 @@ static void drm_test_mm_align_pot(struct kunit *test, int max)
for (bit = max - 1; bit; bit--) {
u64 align, size;
- node = kzalloc_obj(*node, GFP_KERNEL);
+ node = kzalloc_obj(*node);
if (!node) {
KUNIT_FAIL(test, "failed to allocate node");
goto out;
diff --git a/drivers/gpu/drm/tests/drm_panic_test.c b/drivers/gpu/drm/tests/drm_panic_test.c
index a36f5106c139..ad2f3a2f93b6 100644
--- a/drivers/gpu/drm/tests/drm_panic_test.c
+++ b/drivers/gpu/drm/tests/drm_panic_test.c
@@ -127,7 +127,7 @@ static void drm_test_panic_screen_user_page(struct kunit *test)
fb_size = params->width * params->height * sb->format->cpp[0];
npages = DIV_ROUND_UP(fb_size, PAGE_SIZE);
- pages = kmalloc_objs(struct page *, npages, GFP_KERNEL);
+ pages = kmalloc_objs(struct page *, npages);
KUNIT_ASSERT_NOT_NULL(test, pages);
for (p = 0; p < npages; p++) {
diff --git a/drivers/gpu/drm/tidss/tidss_crtc.c b/drivers/gpu/drm/tidss/tidss_crtc.c
index e7fc496e2ce4..a31c21c5f855 100644
--- a/drivers/gpu/drm/tidss/tidss_crtc.c
+++ b/drivers/gpu/drm/tidss/tidss_crtc.c
@@ -364,7 +364,7 @@ static void tidss_crtc_reset(struct drm_crtc *crtc)
if (crtc->state)
tidss_crtc_destroy_state(crtc, crtc->state);
- tstate = kzalloc_obj(*tstate, GFP_KERNEL);
+ tstate = kzalloc_obj(*tstate);
if (!tstate) {
crtc->state = NULL;
return;
@@ -382,7 +382,7 @@ static struct drm_crtc_state *tidss_crtc_duplicate_state(struct drm_crtc *crtc)
current_state = to_tidss_crtc_state(crtc->state);
- state = kmalloc_obj(*state, GFP_KERNEL);
+ state = kmalloc_obj(*state);
if (!state)
return NULL;
@@ -425,7 +425,7 @@ struct tidss_crtc *tidss_crtc_create(struct tidss_device *tidss,
bool has_ctm = tidss->feat->vp_feat.color.has_ctm;
int ret;
- tcrtc = kzalloc_obj(*tcrtc, GFP_KERNEL);
+ tcrtc = kzalloc_obj(*tcrtc);
if (!tcrtc)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/gpu/drm/tidss/tidss_plane.c b/drivers/gpu/drm/tidss/tidss_plane.c
index a8e681c4e03b..aaa02c851c59 100644
--- a/drivers/gpu/drm/tidss/tidss_plane.c
+++ b/drivers/gpu/drm/tidss/tidss_plane.c
@@ -203,7 +203,7 @@ struct tidss_plane *tidss_plane_create(struct tidss_device *tidss,
BIT(DRM_MODE_BLEND_COVERAGE));
int ret;
- tplane = kzalloc_obj(*tplane, GFP_KERNEL);
+ tplane = kzalloc_obj(*tplane);
if (!tplane)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/gpu/drm/tilcdc/tilcdc_panel.c b/drivers/gpu/drm/tilcdc/tilcdc_panel.c
index ed0822b3a020..1de3996501f7 100644
--- a/drivers/gpu/drm/tilcdc/tilcdc_panel.c
+++ b/drivers/gpu/drm/tilcdc/tilcdc_panel.c
@@ -272,7 +272,7 @@ static struct tilcdc_panel_info *of_get_panel_info(struct device_node *np)
return NULL;
}
- info = kzalloc_obj(*info, GFP_KERNEL);
+ info = kzalloc_obj(*info);
if (!info)
goto put_node;
diff --git a/drivers/gpu/drm/tiny/appletbdrm.c b/drivers/gpu/drm/tiny/appletbdrm.c
index 585c1a0ec025..0b0c058e9013 100644
--- a/drivers/gpu/drm/tiny/appletbdrm.c
+++ b/drivers/gpu/drm/tiny/appletbdrm.c
@@ -225,7 +225,7 @@ static int appletbdrm_send_msg(struct appletbdrm_device *adev, __le32 msg)
struct appletbdrm_msg_simple_request *request;
int ret;
- request = kzalloc_obj(*request, GFP_KERNEL);
+ request = kzalloc_obj(*request);
if (!request)
return -ENOMEM;
@@ -260,7 +260,7 @@ static int appletbdrm_get_information(struct appletbdrm_device *adev)
__le32 pixel_format;
int ret;
- info = kzalloc_obj(*info, GFP_KERNEL);
+ info = kzalloc_obj(*info);
if (!info)
return -ENOMEM;
@@ -506,7 +506,7 @@ static void appletbdrm_primary_plane_reset(struct drm_plane *plane)
WARN_ON(plane->state);
- appletbdrm_state = kzalloc_obj(*appletbdrm_state, GFP_KERNEL);
+ appletbdrm_state = kzalloc_obj(*appletbdrm_state);
if (!appletbdrm_state)
return;
@@ -521,7 +521,7 @@ static struct drm_plane_state *appletbdrm_primary_plane_duplicate_state(struct d
if (WARN_ON(!plane->state))
return NULL;
- appletbdrm_state = kzalloc_obj(*appletbdrm_state, GFP_KERNEL);
+ appletbdrm_state = kzalloc_obj(*appletbdrm_state);
if (!appletbdrm_state)
return NULL;
diff --git a/drivers/gpu/drm/ttm/tests/ttm_kunit_helpers.c b/drivers/gpu/drm/ttm/tests/ttm_kunit_helpers.c
index 5cefc50304e4..5cfe8f3f80d7 100644
--- a/drivers/gpu/drm/ttm/tests/ttm_kunit_helpers.c
+++ b/drivers/gpu/drm/ttm/tests/ttm_kunit_helpers.c
@@ -49,7 +49,7 @@ static struct ttm_tt *ttm_tt_simple_create(struct ttm_buffer_object *bo, u32 pag
{
struct ttm_tt *tt;
- tt = kzalloc_obj(*tt, GFP_KERNEL);
+ tt = kzalloc_obj(*tt);
ttm_tt_init(tt, bo, page_flags, ttm_cached, 0);
return tt;
diff --git a/drivers/gpu/drm/ttm/tests/ttm_mock_manager.c b/drivers/gpu/drm/ttm/tests/ttm_mock_manager.c
index d6558f5c7e48..c97e8b7a4e7a 100644
--- a/drivers/gpu/drm/ttm/tests/ttm_mock_manager.c
+++ b/drivers/gpu/drm/ttm/tests/ttm_mock_manager.c
@@ -35,7 +35,7 @@ static int ttm_mock_manager_alloc(struct ttm_resource_manager *man,
u64 lpfn, fpfn, alloc_size;
int err;
- mock_res = kzalloc_obj(*mock_res, GFP_KERNEL);
+ mock_res = kzalloc_obj(*mock_res);
if (!mock_res)
return -ENOMEM;
@@ -100,7 +100,7 @@ int ttm_mock_manager_init(struct ttm_device *bdev, u32 mem_type, u32 size)
struct ttm_resource_manager *base;
int err;
- manager = kzalloc_obj(*manager, GFP_KERNEL);
+ manager = kzalloc_obj(*manager);
if (!manager)
return -ENOMEM;
@@ -194,7 +194,7 @@ int ttm_bad_manager_init(struct ttm_device *bdev, u32 mem_type, u32 size)
{
struct ttm_resource_manager *man;
- man = kzalloc_obj(*man, GFP_KERNEL);
+ man = kzalloc_obj(*man);
if (!man)
return -ENOMEM;
diff --git a/drivers/gpu/drm/ttm/ttm_agp_backend.c b/drivers/gpu/drm/ttm/ttm_agp_backend.c
index a973aafd6f7f..147e25ee53ba 100644
--- a/drivers/gpu/drm/ttm/ttm_agp_backend.c
+++ b/drivers/gpu/drm/ttm/ttm_agp_backend.c
@@ -128,7 +128,7 @@ struct ttm_tt *ttm_agp_tt_create(struct ttm_buffer_object *bo,
{
struct ttm_agp_backend *agp_be;
- agp_be = kmalloc_obj(*agp_be, GFP_KERNEL);
+ agp_be = kmalloc_obj(*agp_be);
if (!agp_be)
return NULL;
diff --git a/drivers/gpu/drm/ttm/ttm_bo_util.c b/drivers/gpu/drm/ttm/ttm_bo_util.c
index 93871aaa33b2..f83b7d5ec6c6 100644
--- a/drivers/gpu/drm/ttm/ttm_bo_util.c
+++ b/drivers/gpu/drm/ttm/ttm_bo_util.c
@@ -233,7 +233,7 @@ static int ttm_buffer_object_transfer(struct ttm_buffer_object *bo,
struct ttm_transfer_obj *fbo;
int ret;
- fbo = kmalloc_obj(*fbo, GFP_KERNEL);
+ fbo = kmalloc_obj(*fbo);
if (!fbo)
return -ENOMEM;
diff --git a/drivers/gpu/drm/ttm/ttm_pool.c b/drivers/gpu/drm/ttm/ttm_pool.c
index b1fa78edad1f..c0d95559197c 100644
--- a/drivers/gpu/drm/ttm/ttm_pool.c
+++ b/drivers/gpu/drm/ttm/ttm_pool.c
@@ -164,7 +164,7 @@ static struct page *ttm_pool_alloc_page(struct ttm_pool *pool, gfp_t gfp_flags,
return p;
}
- dma = kmalloc_obj(*dma, GFP_KERNEL);
+ dma = kmalloc_obj(*dma);
if (!dma)
return NULL;
diff --git a/drivers/gpu/drm/ttm/ttm_range_manager.c b/drivers/gpu/drm/ttm/ttm_range_manager.c
index b223b873d0c6..616978b8d945 100644
--- a/drivers/gpu/drm/ttm/ttm_range_manager.c
+++ b/drivers/gpu/drm/ttm/ttm_range_manager.c
@@ -184,7 +184,7 @@ int ttm_range_man_init_nocheck(struct ttm_device *bdev,
struct ttm_resource_manager *man;
struct ttm_range_manager *rman;
- rman = kzalloc_obj(*rman, GFP_KERNEL);
+ rman = kzalloc_obj(*rman);
if (!rman)
return -ENOMEM;
diff --git a/drivers/gpu/drm/ttm/ttm_sys_manager.c b/drivers/gpu/drm/ttm/ttm_sys_manager.c
index fb3e9869704a..04398bb9c710 100644
--- a/drivers/gpu/drm/ttm/ttm_sys_manager.c
+++ b/drivers/gpu/drm/ttm/ttm_sys_manager.c
@@ -12,7 +12,7 @@ static int ttm_sys_man_alloc(struct ttm_resource_manager *man,
const struct ttm_place *place,
struct ttm_resource **res)
{
- *res = kzalloc_obj(**res, GFP_KERNEL);
+ *res = kzalloc_obj(**res);
if (!*res)
return -ENOMEM;
diff --git a/drivers/gpu/drm/udl/udl_main.c b/drivers/gpu/drm/udl/udl_main.c
index 27dac7cc50a6..08a0e9480d70 100644
--- a/drivers/gpu/drm/udl/udl_main.c
+++ b/drivers/gpu/drm/udl/udl_main.c
@@ -218,7 +218,7 @@ static int udl_alloc_urb_list(struct udl_device *udl, int count, size_t size)
udl->urbs.size = size;
while (udl->urbs.count * size < wanted_size) {
- unode = kzalloc_obj(struct urb_node, GFP_KERNEL);
+ unode = kzalloc_obj(struct urb_node);
if (!unode)
break;
unode->dev = udl;
diff --git a/drivers/gpu/drm/v3d/v3d_bo.c b/drivers/gpu/drm/v3d/v3d_bo.c
index 146bcb30f37b..a847d2f0ccf5 100644
--- a/drivers/gpu/drm/v3d/v3d_bo.c
+++ b/drivers/gpu/drm/v3d/v3d_bo.c
@@ -86,7 +86,7 @@ struct drm_gem_object *v3d_create_object(struct drm_device *dev, size_t size)
if (size == 0)
return ERR_PTR(-EINVAL);
- bo = kzalloc_obj(*bo, GFP_KERNEL);
+ bo = kzalloc_obj(*bo);
if (!bo)
return ERR_PTR(-ENOMEM);
obj = &bo->base.base;
diff --git a/drivers/gpu/drm/v3d/v3d_drv.c b/drivers/gpu/drm/v3d/v3d_drv.c
index 0ed83100c95a..dd60acdf52c2 100644
--- a/drivers/gpu/drm/v3d/v3d_drv.c
+++ b/drivers/gpu/drm/v3d/v3d_drv.c
@@ -133,7 +133,7 @@ v3d_open(struct drm_device *dev, struct drm_file *file)
struct drm_gpu_scheduler *sched;
int i;
- v3d_priv = kzalloc_obj(*v3d_priv, GFP_KERNEL);
+ v3d_priv = kzalloc_obj(*v3d_priv);
if (!v3d_priv)
return -ENOMEM;
diff --git a/drivers/gpu/drm/v3d/v3d_fence.c b/drivers/gpu/drm/v3d/v3d_fence.c
index 0deaf636387e..3c999f60003c 100644
--- a/drivers/gpu/drm/v3d/v3d_fence.c
+++ b/drivers/gpu/drm/v3d/v3d_fence.c
@@ -8,7 +8,7 @@ struct dma_fence *v3d_fence_create(struct v3d_dev *v3d, enum v3d_queue q)
struct v3d_queue_state *queue = &v3d->queue[q];
struct v3d_fence *fence;
- fence = kzalloc_obj(*fence, GFP_KERNEL);
+ fence = kzalloc_obj(*fence);
if (!fence)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/gpu/drm/vboxvideo/vbox_mode.c b/drivers/gpu/drm/vboxvideo/vbox_mode.c
index 86229323eeac..9c11a6b945ff 100644
--- a/drivers/gpu/drm/vboxvideo/vbox_mode.c
+++ b/drivers/gpu/drm/vboxvideo/vbox_mode.c
@@ -528,7 +528,7 @@ static struct drm_plane *vbox_create_plane(struct vbox_private *vbox,
return ERR_PTR(-EINVAL);
}
- plane = kzalloc_obj(*plane, GFP_KERNEL);
+ plane = kzalloc_obj(*plane);
if (!plane)
return ERR_PTR(-ENOMEM);
@@ -562,7 +562,7 @@ static struct vbox_crtc *vbox_crtc_init(struct drm_device *dev, unsigned int i)
if (ret)
return ERR_PTR(ret);
- vbox_crtc = kzalloc_obj(*vbox_crtc, GFP_KERNEL);
+ vbox_crtc = kzalloc_obj(*vbox_crtc);
if (!vbox_crtc)
return ERR_PTR(-ENOMEM);
@@ -622,7 +622,7 @@ static struct drm_encoder *vbox_encoder_init(struct drm_device *dev,
{
struct vbox_encoder *vbox_encoder;
- vbox_encoder = kzalloc_obj(*vbox_encoder, GFP_KERNEL);
+ vbox_encoder = kzalloc_obj(*vbox_encoder);
if (!vbox_encoder)
return NULL;
@@ -808,7 +808,7 @@ static int vbox_connector_init(struct drm_device *dev,
struct vbox_connector *vbox_connector;
struct drm_connector *connector;
- vbox_connector = kzalloc_obj(*vbox_connector, GFP_KERNEL);
+ vbox_connector = kzalloc_obj(*vbox_connector);
if (!vbox_connector)
return -ENOMEM;
diff --git a/drivers/gpu/drm/vc4/vc4_bo.c b/drivers/gpu/drm/vc4/vc4_bo.c
index 274cad424059..7e86e89360e2 100644
--- a/drivers/gpu/drm/vc4/vc4_bo.c
+++ b/drivers/gpu/drm/vc4/vc4_bo.c
@@ -205,7 +205,7 @@ static struct list_head *vc4_get_cache_list_for_size(struct drm_device *dev,
struct list_head *new_list;
uint32_t i;
- new_list = kmalloc_objs(struct list_head, new_size, GFP_KERNEL);
+ new_list = kmalloc_objs(struct list_head, new_size);
if (!new_list)
return NULL;
@@ -399,7 +399,7 @@ struct drm_gem_object *vc4_create_object(struct drm_device *dev, size_t size)
if (WARN_ON_ONCE(vc4->gen > VC4_GEN_4))
return ERR_PTR(-ENODEV);
- bo = kzalloc_obj(*bo, GFP_KERNEL);
+ bo = kzalloc_obj(*bo);
if (!bo)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/gpu/drm/vc4/vc4_crtc.c b/drivers/gpu/drm/vc4/vc4_crtc.c
index 27a9eab1c2d0..4a606986afcc 100644
--- a/drivers/gpu/drm/vc4/vc4_crtc.c
+++ b/drivers/gpu/drm/vc4/vc4_crtc.c
@@ -997,7 +997,7 @@ vc4_async_page_flip_common(struct drm_crtc *crtc,
struct drm_plane *plane = crtc->primary;
struct vc4_async_flip_state *flip_state;
- flip_state = kzalloc_obj(*flip_state, GFP_KERNEL);
+ flip_state = kzalloc_obj(*flip_state);
if (!flip_state)
return -ENOMEM;
@@ -1105,7 +1105,7 @@ struct drm_crtc_state *vc4_crtc_duplicate_state(struct drm_crtc *crtc)
{
struct vc4_crtc_state *vc4_state, *old_vc4_state;
- vc4_state = kzalloc_obj(*vc4_state, GFP_KERNEL);
+ vc4_state = kzalloc_obj(*vc4_state);
if (!vc4_state)
return NULL;
@@ -1142,7 +1142,7 @@ void vc4_crtc_reset(struct drm_crtc *crtc)
if (crtc->state)
vc4_crtc_destroy_state(crtc, crtc->state);
- vc4_crtc_state = kzalloc_obj(*vc4_crtc_state, GFP_KERNEL);
+ vc4_crtc_state = kzalloc_obj(*vc4_crtc_state);
if (!vc4_crtc_state) {
crtc->state = NULL;
return;
diff --git a/drivers/gpu/drm/vc4/vc4_drv.c b/drivers/gpu/drm/vc4/vc4_drv.c
index 0677458e28f8..a14ecb769461 100644
--- a/drivers/gpu/drm/vc4/vc4_drv.c
+++ b/drivers/gpu/drm/vc4/vc4_drv.c
@@ -152,7 +152,7 @@ static int vc4_open(struct drm_device *dev, struct drm_file *file)
if (WARN_ON_ONCE(vc4->gen > VC4_GEN_4))
return -ENODEV;
- vc4file = kzalloc_obj(*vc4file, GFP_KERNEL);
+ vc4file = kzalloc_obj(*vc4file);
if (!vc4file)
return -ENOMEM;
vc4file->dev = vc4;
diff --git a/drivers/gpu/drm/vc4/vc4_gem.c b/drivers/gpu/drm/vc4/vc4_gem.c
index 42b6dcbaa01b..ad8cbd727b80 100644
--- a/drivers/gpu/drm/vc4/vc4_gem.c
+++ b/drivers/gpu/drm/vc4/vc4_gem.c
@@ -110,7 +110,7 @@ vc4_get_hang_state_ioctl(struct drm_device *dev, void *data,
state->bo = get_state->bo;
memcpy(get_state, state, sizeof(*state));
- bo_state = kzalloc_objs(*bo_state, state->bo_count, GFP_KERNEL);
+ bo_state = kzalloc_objs(*bo_state, state->bo_count);
if (!bo_state) {
ret = -ENOMEM;
goto err_free;
@@ -161,7 +161,7 @@ vc4_save_hang_state(struct drm_device *dev)
unsigned long irqflags;
unsigned int i, j, k, unref_list_count;
- kernel_state = kzalloc_objs(*kernel_state, 1, GFP_KERNEL);
+ kernel_state = kzalloc_objs(*kernel_state, 1);
if (!kernel_state)
return;
@@ -622,7 +622,7 @@ vc4_queue_submit(struct drm_device *dev, struct vc4_exec_info *exec,
unsigned long irqflags;
struct vc4_fence *fence;
- fence = kzalloc_obj(*fence, GFP_KERNEL);
+ fence = kzalloc_obj(*fence);
if (!fence)
return -ENOMEM;
fence->dev = dev;
@@ -1043,7 +1043,7 @@ vc4_submit_cl_ioctl(struct drm_device *dev, void *data,
return -EINVAL;
}
- exec = kzalloc_objs(*exec, 1, GFP_KERNEL);
+ exec = kzalloc_objs(*exec, 1);
if (!exec)
return -ENOMEM;
diff --git a/drivers/gpu/drm/vc4/vc4_hdmi.c b/drivers/gpu/drm/vc4/vc4_hdmi.c
index ef5825a00bc3..fda214b5a466 100644
--- a/drivers/gpu/drm/vc4/vc4_hdmi.c
+++ b/drivers/gpu/drm/vc4/vc4_hdmi.c
@@ -2941,7 +2941,7 @@ static int vc4_hdmi_build_regset(struct drm_device *drm,
unsigned int i;
int ret;
- regs = kzalloc_objs(*regs, variant->num_registers, GFP_KERNEL);
+ regs = kzalloc_objs(*regs, variant->num_registers);
if (!regs)
return -ENOMEM;
diff --git a/drivers/gpu/drm/vc4/vc4_kms.c b/drivers/gpu/drm/vc4/vc4_kms.c
index de39992bbaa2..245485e744a5 100644
--- a/drivers/gpu/drm/vc4/vc4_kms.c
+++ b/drivers/gpu/drm/vc4/vc4_kms.c
@@ -103,7 +103,7 @@ static int vc4_ctm_obj_init(struct vc4_dev *vc4)
drm_modeset_lock_init(&vc4->ctm_state_lock);
- ctm_state = kzalloc_obj(*ctm_state, GFP_KERNEL);
+ ctm_state = kzalloc_obj(*ctm_state);
if (!ctm_state)
return -ENOMEM;
@@ -734,7 +734,7 @@ static int vc4_load_tracker_obj_init(struct vc4_dev *vc4)
{
struct vc4_load_tracker_state *load_state;
- load_state = kzalloc_obj(*load_state, GFP_KERNEL);
+ load_state = kzalloc_obj(*load_state);
if (!load_state)
return -ENOMEM;
@@ -752,7 +752,7 @@ vc4_hvs_channels_duplicate_state(struct drm_private_obj *obj)
struct vc4_hvs_state *state;
unsigned int i;
- state = kzalloc_obj(*state, GFP_KERNEL);
+ state = kzalloc_obj(*state);
if (!state)
return NULL;
@@ -817,7 +817,7 @@ static int vc4_hvs_channels_obj_init(struct vc4_dev *vc4)
{
struct vc4_hvs_state *state;
- state = kzalloc_obj(*state, GFP_KERNEL);
+ state = kzalloc_obj(*state);
if (!state)
return -ENOMEM;
@@ -911,7 +911,7 @@ static int vc4_pv_muxing_atomic_check(struct drm_device *dev,
* If the layout changes and doesn't give us that in the future,
* we will need to have something smarter, but it works so far.
*/
- sorted_crtcs = kmalloc_objs(*sorted_crtcs, dev->num_crtcs, GFP_KERNEL);
+ sorted_crtcs = kmalloc_objs(*sorted_crtcs, dev->num_crtcs);
if (!sorted_crtcs)
return -ENOMEM;
diff --git a/drivers/gpu/drm/vc4/vc4_plane.c b/drivers/gpu/drm/vc4/vc4_plane.c
index 26392ae43b99..91d499fefba2 100644
--- a/drivers/gpu/drm/vc4/vc4_plane.c
+++ b/drivers/gpu/drm/vc4/vc4_plane.c
@@ -374,7 +374,7 @@ static void vc4_plane_reset(struct drm_plane *plane)
kfree(plane->state);
- vc4_state = kzalloc_obj(*vc4_state, GFP_KERNEL);
+ vc4_state = kzalloc_obj(*vc4_state);
if (!vc4_state)
return;
diff --git a/drivers/gpu/drm/vc4/vc4_validate_shaders.c b/drivers/gpu/drm/vc4/vc4_validate_shaders.c
index 8e2fe5eef1b9..d48cf76983c0 100644
--- a/drivers/gpu/drm/vc4/vc4_validate_shaders.c
+++ b/drivers/gpu/drm/vc4/vc4_validate_shaders.c
@@ -803,7 +803,7 @@ vc4_validate_shader(struct drm_gem_dma_object *shader_obj)
if (!validation_state.branch_targets)
goto fail;
- validated_shader = kzalloc_objs(*validated_shader, 1, GFP_KERNEL);
+ validated_shader = kzalloc_objs(*validated_shader, 1);
if (!validated_shader)
goto fail;
diff --git a/drivers/gpu/drm/vgem/vgem_drv.c b/drivers/gpu/drm/vgem/vgem_drv.c
index 7dc9e2e422f5..a9f5c247db71 100644
--- a/drivers/gpu/drm/vgem/vgem_drv.c
+++ b/drivers/gpu/drm/vgem/vgem_drv.c
@@ -60,7 +60,7 @@ static int vgem_open(struct drm_device *dev, struct drm_file *file)
struct vgem_file *vfile;
int ret;
- vfile = kzalloc_obj(*vfile, GFP_KERNEL);
+ vfile = kzalloc_obj(*vfile);
if (!vfile)
return -ENOMEM;
@@ -94,7 +94,7 @@ static struct drm_gem_object *vgem_gem_create_object(struct drm_device *dev, siz
{
struct drm_gem_shmem_object *obj;
- obj = kzalloc_obj(*obj, GFP_KERNEL);
+ obj = kzalloc_obj(*obj);
if (!obj)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/gpu/drm/vgem/vgem_fence.c b/drivers/gpu/drm/vgem/vgem_fence.c
index 313e706abe37..0e53ba7db629 100644
--- a/drivers/gpu/drm/vgem/vgem_fence.c
+++ b/drivers/gpu/drm/vgem/vgem_fence.c
@@ -71,7 +71,7 @@ static struct dma_fence *vgem_fence_create(struct vgem_file *vfile,
{
struct vgem_fence *fence;
- fence = kzalloc_obj(*fence, GFP_KERNEL);
+ fence = kzalloc_obj(*fence);
if (!fence)
return NULL;
diff --git a/drivers/gpu/drm/virtio/virtgpu_display.c b/drivers/gpu/drm/virtio/virtgpu_display.c
index a4b7761d9250..f1dae9569805 100644
--- a/drivers/gpu/drm/virtio/virtgpu_display.c
+++ b/drivers/gpu/drm/virtio/virtgpu_display.c
@@ -334,7 +334,7 @@ virtio_gpu_user_framebuffer_create(struct drm_device *dev,
if (!obj)
return ERR_PTR(-EINVAL);
- virtio_gpu_fb = kzalloc_obj(*virtio_gpu_fb, GFP_KERNEL);
+ virtio_gpu_fb = kzalloc_obj(*virtio_gpu_fb);
if (virtio_gpu_fb == NULL) {
drm_gem_object_put(obj);
return ERR_PTR(-ENOMEM);
diff --git a/drivers/gpu/drm/virtio/virtgpu_kms.c b/drivers/gpu/drm/virtio/virtgpu_kms.c
index b1a13946d4db..80ba69b4860b 100644
--- a/drivers/gpu/drm/virtio/virtgpu_kms.c
+++ b/drivers/gpu/drm/virtio/virtgpu_kms.c
@@ -316,7 +316,7 @@ int virtio_gpu_driver_open(struct drm_device *dev, struct drm_file *file)
return 0;
/* allocate a virt GPU context for this opener */
- vfpriv = kzalloc_obj(*vfpriv, GFP_KERNEL);
+ vfpriv = kzalloc_obj(*vfpriv);
if (!vfpriv)
return -ENOMEM;
diff --git a/drivers/gpu/drm/virtio/virtgpu_object.c b/drivers/gpu/drm/virtio/virtgpu_object.c
index c7381c564492..ec9efacc6919 100644
--- a/drivers/gpu/drm/virtio/virtgpu_object.c
+++ b/drivers/gpu/drm/virtio/virtgpu_object.c
@@ -149,7 +149,7 @@ struct drm_gem_object *virtio_gpu_create_object(struct drm_device *dev,
struct virtio_gpu_object_shmem *shmem;
struct drm_gem_shmem_object *dshmem;
- shmem = kzalloc_obj(*shmem, GFP_KERNEL);
+ shmem = kzalloc_obj(*shmem);
if (!shmem)
return ERR_PTR(-ENOMEM);
@@ -177,7 +177,7 @@ static int virtio_gpu_object_shmem_init(struct virtio_gpu_device *vgdev,
else
*nents = pages->orig_nents;
- *ents = kvmalloc_objs(struct virtio_gpu_mem_entry, *nents, GFP_KERNEL);
+ *ents = kvmalloc_objs(struct virtio_gpu_mem_entry, *nents);
if (!(*ents)) {
DRM_ERROR("failed to allocate ent list\n");
return -ENOMEM;
diff --git a/drivers/gpu/drm/virtio/virtgpu_plane.c b/drivers/gpu/drm/virtio/virtgpu_plane.c
index 9b72ece71264..a126d1b25f46 100644
--- a/drivers/gpu/drm/virtio/virtgpu_plane.c
+++ b/drivers/gpu/drm/virtio/virtgpu_plane.c
@@ -79,7 +79,7 @@ drm_plane_state *virtio_gpu_plane_duplicate_state(struct drm_plane *plane)
if (WARN_ON(!plane->state))
return NULL;
- new = kzalloc_obj(*new, GFP_KERNEL);
+ new = kzalloc_obj(*new);
if (!new)
return NULL;
diff --git a/drivers/gpu/drm/virtio/virtgpu_prime.c b/drivers/gpu/drm/virtio/virtgpu_prime.c
index 9cae1f3b18e8..94ad448c35b6 100644
--- a/drivers/gpu/drm/virtio/virtgpu_prime.c
+++ b/drivers/gpu/drm/virtio/virtgpu_prime.c
@@ -314,7 +314,7 @@ struct drm_gem_object *virtgpu_gem_prime_import(struct drm_device *dev,
if (!vgdev->has_resource_blob || vgdev->has_virgl_3d)
return drm_gem_prime_import(dev, buf);
- bo = kzalloc_obj(*bo, GFP_KERNEL);
+ bo = kzalloc_obj(*bo);
if (!bo)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/gpu/drm/virtio/virtgpu_submit.c b/drivers/gpu/drm/virtio/virtgpu_submit.c
index 8f171d87545f..dae761fa5788 100644
--- a/drivers/gpu/drm/virtio/virtgpu_submit.c
+++ b/drivers/gpu/drm/virtio/virtgpu_submit.c
@@ -104,7 +104,7 @@ virtio_gpu_parse_deps(struct virtio_gpu_submit *submit)
* internally for allocations larger than a page size, preventing
* storm of KMSG warnings.
*/
- syncobjs = kvzalloc_objs(*syncobjs, num_in_syncobjs, GFP_KERNEL);
+ syncobjs = kvzalloc_objs(*syncobjs, num_in_syncobjs);
if (!syncobjs)
return -ENOMEM;
@@ -195,7 +195,7 @@ static int virtio_gpu_parse_post_deps(struct virtio_gpu_submit *submit)
if (!num_out_syncobjs)
return 0;
- post_deps = kvzalloc_objs(*post_deps, num_out_syncobjs, GFP_KERNEL);
+ post_deps = kvzalloc_objs(*post_deps, num_out_syncobjs);
if (!post_deps)
return -ENOMEM;
@@ -277,7 +277,7 @@ static int virtio_gpu_fence_event_create(struct drm_device *dev,
struct virtio_gpu_fence_event *e = NULL;
int ret;
- e = kzalloc_obj(*e, GFP_KERNEL);
+ e = kzalloc_obj(*e);
if (!e)
return -ENOMEM;
diff --git a/drivers/gpu/drm/virtio/virtgpu_vq.c b/drivers/gpu/drm/virtio/virtgpu_vq.c
index 9a45a58e9f58..67865810a2e7 100644
--- a/drivers/gpu/drm/virtio/virtgpu_vq.c
+++ b/drivers/gpu/drm/virtio/virtgpu_vq.c
@@ -312,7 +312,7 @@ static struct sg_table *vmalloc_to_sgt(char *data, uint32_t size, int *sg_ents)
if (WARN_ON(!PAGE_ALIGNED(data)))
return NULL;
- sgt = kmalloc_obj(*sgt, GFP_KERNEL);
+ sgt = kmalloc_obj(*sgt);
if (!sgt)
return NULL;
@@ -936,7 +936,7 @@ int virtio_gpu_cmd_get_display_info(struct virtio_gpu_device *vgdev)
struct virtio_gpu_vbuffer *vbuf;
void *resp_buf;
- resp_buf = kzalloc_obj(struct virtio_gpu_resp_display_info, GFP_KERNEL);
+ resp_buf = kzalloc_obj(struct virtio_gpu_resp_display_info);
if (!resp_buf)
return -ENOMEM;
@@ -958,7 +958,7 @@ int virtio_gpu_cmd_get_capset_info(struct virtio_gpu_device *vgdev, int idx)
struct virtio_gpu_vbuffer *vbuf;
void *resp_buf;
- resp_buf = kzalloc_obj(struct virtio_gpu_resp_capset_info, GFP_KERNEL);
+ resp_buf = kzalloc_obj(struct virtio_gpu_resp_capset_info);
if (!resp_buf)
return -ENOMEM;
@@ -993,7 +993,7 @@ int virtio_gpu_cmd_get_capset(struct virtio_gpu_device *vgdev,
if (version > vgdev->capsets[idx].max_version)
return -EINVAL;
- cache_ent = kzalloc_obj(*cache_ent, GFP_KERNEL);
+ cache_ent = kzalloc_obj(*cache_ent);
if (!cache_ent)
return -ENOMEM;
@@ -1061,7 +1061,7 @@ int virtio_gpu_cmd_get_edids(struct virtio_gpu_device *vgdev)
return -EINVAL;
for (scanout = 0; scanout < vgdev->num_scanouts; scanout++) {
- resp_buf = kzalloc_obj(struct virtio_gpu_resp_edid, GFP_KERNEL);
+ resp_buf = kzalloc_obj(struct virtio_gpu_resp_edid);
if (!resp_buf)
return -ENOMEM;
@@ -1338,7 +1338,7 @@ virtio_gpu_cmd_resource_assign_uuid(struct virtio_gpu_device *vgdev,
struct virtio_gpu_vbuffer *vbuf;
struct virtio_gpu_resp_resource_uuid *resp_buf;
- resp_buf = kzalloc_obj(*resp_buf, GFP_KERNEL);
+ resp_buf = kzalloc_obj(*resp_buf);
if (!resp_buf) {
spin_lock(&vgdev->resource_export_lock);
bo->uuid_state = STATE_ERR;
@@ -1391,7 +1391,7 @@ int virtio_gpu_cmd_map(struct virtio_gpu_device *vgdev,
struct virtio_gpu_vbuffer *vbuf;
struct virtio_gpu_resp_map_info *resp_buf;
- resp_buf = kzalloc_obj(*resp_buf, GFP_KERNEL);
+ resp_buf = kzalloc_obj(*resp_buf);
if (!resp_buf)
return -ENOMEM;
diff --git a/drivers/gpu/drm/virtio/virtgpu_vram.c b/drivers/gpu/drm/virtio/virtgpu_vram.c
index da5d4ee8ddef..084e80227433 100644
--- a/drivers/gpu/drm/virtio/virtgpu_vram.c
+++ b/drivers/gpu/drm/virtio/virtgpu_vram.c
@@ -79,7 +79,7 @@ struct sg_table *virtio_gpu_vram_map_dma_buf(struct virtio_gpu_object *bo,
dma_addr_t addr;
int ret;
- sgt = kzalloc_obj(*sgt, GFP_KERNEL);
+ sgt = kzalloc_obj(*sgt);
if (!sgt)
return ERR_PTR(-ENOMEM);
@@ -193,7 +193,7 @@ int virtio_gpu_vram_create(struct virtio_gpu_device *vgdev,
struct virtio_gpu_object_vram *vram;
int ret;
- vram = kzalloc_obj(*vram, GFP_KERNEL);
+ vram = kzalloc_obj(*vram);
if (!vram)
return -ENOMEM;
diff --git a/drivers/gpu/drm/vkms/vkms_colorop.c b/drivers/gpu/drm/vkms/vkms_colorop.c
index 8aeea73de617..bf8a0e4fc719 100644
--- a/drivers/gpu/drm/vkms/vkms_colorop.c
+++ b/drivers/gpu/drm/vkms/vkms_colorop.c
@@ -24,7 +24,7 @@ static int vkms_initialize_color_pipeline(struct drm_plane *plane, struct drm_pr
memset(ops, 0, sizeof(ops));
/* 1st op: 1d curve */
- ops[i] = kzalloc_obj(*ops[i], GFP_KERNEL);
+ ops[i] = kzalloc_obj(*ops[i]);
if (!ops[i]) {
drm_err(dev, "KMS: Failed to allocate colorop\n");
ret = -ENOMEM;
@@ -41,7 +41,7 @@ static int vkms_initialize_color_pipeline(struct drm_plane *plane, struct drm_pr
i++;
/* 2nd op: 3x4 matrix */
- ops[i] = kzalloc_obj(*ops[i], GFP_KERNEL);
+ ops[i] = kzalloc_obj(*ops[i]);
if (!ops[i]) {
drm_err(dev, "KMS: Failed to allocate colorop\n");
ret = -ENOMEM;
@@ -57,7 +57,7 @@ static int vkms_initialize_color_pipeline(struct drm_plane *plane, struct drm_pr
i++;
/* 3rd op: 3x4 matrix */
- ops[i] = kzalloc_obj(*ops[i], GFP_KERNEL);
+ ops[i] = kzalloc_obj(*ops[i]);
if (!ops[i]) {
drm_err(dev, "KMS: Failed to allocate colorop\n");
ret = -ENOMEM;
@@ -73,7 +73,7 @@ static int vkms_initialize_color_pipeline(struct drm_plane *plane, struct drm_pr
i++;
/* 4th op: 1d curve */
- ops[i] = kzalloc_obj(*ops[i], GFP_KERNEL);
+ ops[i] = kzalloc_obj(*ops[i]);
if (!ops[i]) {
drm_err(dev, "KMS: Failed to allocate colorop\n");
ret = -ENOMEM;
diff --git a/drivers/gpu/drm/vkms/vkms_config.c b/drivers/gpu/drm/vkms/vkms_config.c
index 8447b654e229..5a654d6dead8 100644
--- a/drivers/gpu/drm/vkms/vkms_config.c
+++ b/drivers/gpu/drm/vkms/vkms_config.c
@@ -12,7 +12,7 @@ struct vkms_config *vkms_config_create(const char *dev_name)
{
struct vkms_config *config;
- config = kzalloc_obj(*config, GFP_KERNEL);
+ config = kzalloc_obj(*config);
if (!config)
return ERR_PTR(-ENOMEM);
@@ -388,7 +388,7 @@ struct vkms_config_plane *vkms_config_create_plane(struct vkms_config *config)
{
struct vkms_config_plane *plane_cfg;
- plane_cfg = kzalloc_obj(*plane_cfg, GFP_KERNEL);
+ plane_cfg = kzalloc_obj(*plane_cfg);
if (!plane_cfg)
return ERR_PTR(-ENOMEM);
@@ -448,7 +448,7 @@ struct vkms_config_crtc *vkms_config_create_crtc(struct vkms_config *config)
{
struct vkms_config_crtc *crtc_cfg;
- crtc_cfg = kzalloc_obj(*crtc_cfg, GFP_KERNEL);
+ crtc_cfg = kzalloc_obj(*crtc_cfg);
if (!crtc_cfg)
return ERR_PTR(-ENOMEM);
@@ -527,7 +527,7 @@ struct vkms_config_encoder *vkms_config_create_encoder(struct vkms_config *confi
{
struct vkms_config_encoder *encoder_cfg;
- encoder_cfg = kzalloc_obj(*encoder_cfg, GFP_KERNEL);
+ encoder_cfg = kzalloc_obj(*encoder_cfg);
if (!encoder_cfg)
return ERR_PTR(-ENOMEM);
@@ -591,7 +591,7 @@ struct vkms_config_connector *vkms_config_create_connector(struct vkms_config *c
{
struct vkms_config_connector *connector_cfg;
- connector_cfg = kzalloc_obj(*connector_cfg, GFP_KERNEL);
+ connector_cfg = kzalloc_obj(*connector_cfg);
if (!connector_cfg)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/gpu/drm/vkms/vkms_configfs.c b/drivers/gpu/drm/vkms/vkms_configfs.c
index f6471ee9a58c..7551b8c7766d 100644
--- a/drivers/gpu/drm/vkms/vkms_configfs.c
+++ b/drivers/gpu/drm/vkms/vkms_configfs.c
@@ -769,7 +769,7 @@ static struct config_group *make_device_group(struct config_group *group,
if (strcmp(name, DEFAULT_DEVICE_NAME) == 0)
return ERR_PTR(-EINVAL);
- dev = kzalloc_obj(*dev, GFP_KERNEL);
+ dev = kzalloc_obj(*dev);
if (!dev)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/gpu/drm/vkms/vkms_crtc.c b/drivers/gpu/drm/vkms/vkms_crtc.c
index f5b99ebb37e3..92e54c27897e 100644
--- a/drivers/gpu/drm/vkms/vkms_crtc.c
+++ b/drivers/gpu/drm/vkms/vkms_crtc.c
@@ -62,7 +62,7 @@ vkms_atomic_crtc_duplicate_state(struct drm_crtc *crtc)
if (WARN_ON(!crtc->state))
return NULL;
- vkms_state = kzalloc_obj(*vkms_state, GFP_KERNEL);
+ vkms_state = kzalloc_obj(*vkms_state);
if (!vkms_state)
return NULL;
diff --git a/drivers/gpu/drm/vkms/vkms_plane.c b/drivers/gpu/drm/vkms/vkms_plane.c
index 73d3c4af7743..ca7aee101a95 100644
--- a/drivers/gpu/drm/vkms/vkms_plane.c
+++ b/drivers/gpu/drm/vkms/vkms_plane.c
@@ -56,11 +56,11 @@ vkms_plane_duplicate_state(struct drm_plane *plane)
struct vkms_plane_state *vkms_state;
struct vkms_frame_info *frame_info;
- vkms_state = kzalloc_obj(*vkms_state, GFP_KERNEL);
+ vkms_state = kzalloc_obj(*vkms_state);
if (!vkms_state)
return NULL;
- frame_info = kzalloc_obj(*frame_info, GFP_KERNEL);
+ frame_info = kzalloc_obj(*frame_info);
if (!frame_info) {
DRM_DEBUG_KMS("Couldn't allocate frame_info\n");
kfree(vkms_state);
@@ -104,7 +104,7 @@ static void vkms_plane_reset(struct drm_plane *plane)
plane->state = NULL; /* must be set to NULL here */
}
- vkms_state = kzalloc_obj(*vkms_state, GFP_KERNEL);
+ vkms_state = kzalloc_obj(*vkms_state);
if (!vkms_state) {
DRM_ERROR("Cannot allocate vkms_plane_state\n");
return;
diff --git a/drivers/gpu/drm/vkms/vkms_writeback.c b/drivers/gpu/drm/vkms/vkms_writeback.c
index 1cd760f75779..908b7e602ffb 100644
--- a/drivers/gpu/drm/vkms/vkms_writeback.c
+++ b/drivers/gpu/drm/vkms/vkms_writeback.c
@@ -81,7 +81,7 @@ static int vkms_wb_prepare_job(struct drm_writeback_connector *wb_connector,
if (!job->fb)
return 0;
- vkmsjob = kzalloc_obj(*vkmsjob, GFP_KERNEL);
+ vkmsjob = kzalloc_obj(*vkmsjob);
if (!vkmsjob)
return -ENOMEM;
diff --git a/drivers/gpu/drm/vmwgfx/ttm_object.c b/drivers/gpu/drm/vmwgfx/ttm_object.c
index 23ffb7069d01..2421b0dd057c 100644
--- a/drivers/gpu/drm/vmwgfx/ttm_object.c
+++ b/drivers/gpu/drm/vmwgfx/ttm_object.c
@@ -318,7 +318,7 @@ int ttm_ref_object_add(struct ttm_object_file *tfile,
if (require_existed)
return -EPERM;
- ref = kmalloc_obj(*ref, GFP_KERNEL);
+ ref = kmalloc_obj(*ref);
if (unlikely(ref == NULL)) {
return -ENOMEM;
}
@@ -404,7 +404,7 @@ void ttm_object_file_release(struct ttm_object_file **p_tfile)
struct ttm_object_file *ttm_object_file_init(struct ttm_object_device *tdev)
{
- struct ttm_object_file *tfile = kmalloc_obj(*tfile, GFP_KERNEL);
+ struct ttm_object_file *tfile = kmalloc_obj(*tfile);
if (unlikely(tfile == NULL))
return NULL;
@@ -422,7 +422,7 @@ struct ttm_object_file *ttm_object_file_init(struct ttm_object_device *tdev)
struct ttm_object_device *
ttm_object_device_init(const struct dma_buf_ops *ops)
{
- struct ttm_object_device *tdev = kmalloc_obj(*tdev, GFP_KERNEL);
+ struct ttm_object_device *tdev = kmalloc_obj(*tdev);
if (unlikely(tdev == NULL))
return NULL;
diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_bo.c b/drivers/gpu/drm/vmwgfx/vmwgfx_bo.c
index 97290b5d65d0..9c7a73c0b0dc 100644
--- a/drivers/gpu/drm/vmwgfx/vmwgfx_bo.c
+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_bo.c
@@ -449,7 +449,7 @@ int vmw_bo_create(struct vmw_private *vmw,
{
int ret;
- *p_bo = kmalloc_obj(**p_bo, GFP_KERNEL);
+ *p_bo = kmalloc_obj(**p_bo);
if (unlikely(!*p_bo)) {
DRM_ERROR("Failed to allocate a buffer.\n");
return -ENOMEM;
diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_cmd.c b/drivers/gpu/drm/vmwgfx/vmwgfx_cmd.c
index cfecea9bfa24..d932e38d7942 100644
--- a/drivers/gpu/drm/vmwgfx/vmwgfx_cmd.c
+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_cmd.c
@@ -103,7 +103,7 @@ struct vmw_fifo_state *vmw_fifo_create(struct vmw_private *dev_priv)
if (!dev_priv->fifo_mem)
return NULL;
- fifo = kzalloc_obj(*fifo, GFP_KERNEL);
+ fifo = kzalloc_obj(*fifo);
if (!fifo)
return ERR_PTR(-ENOMEM);
fifo->static_buffer_size = VMWGFX_FIFO_STATIC_SIZE;
diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_cmdbuf.c b/drivers/gpu/drm/vmwgfx/vmwgfx_cmdbuf.c
index 5756af107555..2170b45c30e9 100644
--- a/drivers/gpu/drm/vmwgfx/vmwgfx_cmdbuf.c
+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_cmdbuf.c
@@ -961,7 +961,7 @@ void *vmw_cmdbuf_alloc(struct vmw_cmdbuf_man *man,
*p_header = NULL;
- header = kzalloc_obj(*header, GFP_KERNEL);
+ header = kzalloc_obj(*header);
if (!header)
return ERR_PTR(-ENOMEM);
@@ -1296,7 +1296,7 @@ struct vmw_cmdbuf_man *vmw_cmdbuf_man_create(struct vmw_private *dev_priv)
if (!(dev_priv->capabilities & SVGA_CAP_COMMAND_BUFFERS))
return ERR_PTR(-ENOSYS);
- man = kzalloc_obj(*man, GFP_KERNEL);
+ man = kzalloc_obj(*man);
if (!man)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_cmdbuf_res.c b/drivers/gpu/drm/vmwgfx/vmwgfx_cmdbuf_res.c
index b8b4834d40fb..fe1ba1a61a68 100644
--- a/drivers/gpu/drm/vmwgfx/vmwgfx_cmdbuf_res.c
+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_cmdbuf_res.c
@@ -200,7 +200,7 @@ int vmw_cmdbuf_res_add(struct vmw_cmdbuf_res_manager *man,
{
struct vmw_cmdbuf_res *cres;
- cres = kzalloc_obj(*cres, GFP_KERNEL);
+ cres = kzalloc_obj(*cres);
if (unlikely(!cres))
return -ENOMEM;
@@ -284,7 +284,7 @@ vmw_cmdbuf_res_man_create(struct vmw_private *dev_priv)
{
struct vmw_cmdbuf_res_manager *man;
- man = kzalloc_obj(*man, GFP_KERNEL);
+ man = kzalloc_obj(*man);
if (!man)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_context.c b/drivers/gpu/drm/vmwgfx/vmwgfx_context.c
index 0845c00e777d..bd96f4d5e090 100644
--- a/drivers/gpu/drm/vmwgfx/vmwgfx_context.c
+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_context.c
@@ -738,7 +738,7 @@ static int vmw_context_define(struct drm_device *dev, void *data,
return -EINVAL;
}
- ctx = kzalloc_obj(*ctx, GFP_KERNEL);
+ ctx = kzalloc_obj(*ctx);
if (unlikely(!ctx)) {
ret = -ENOMEM;
goto out_ret;
diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_cotable.c b/drivers/gpu/drm/vmwgfx/vmwgfx_cotable.c
index 6220a1a0326a..091f1039a052 100644
--- a/drivers/gpu/drm/vmwgfx/vmwgfx_cotable.c
+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_cotable.c
@@ -604,7 +604,7 @@ struct vmw_resource *vmw_cotable_alloc(struct vmw_private *dev_priv,
int ret;
u32 num_entries;
- vcotbl = kzalloc_obj(*vcotbl, GFP_KERNEL);
+ vcotbl = kzalloc_obj(*vcotbl);
if (unlikely(!vcotbl)) {
ret = -ENOMEM;
goto out_no_alloc;
diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c b/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c
index eb5695bcae89..0f101aedb49a 100644
--- a/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c
+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c
@@ -1209,7 +1209,7 @@ static int vmw_driver_open(struct drm_device *dev, struct drm_file *file_priv)
struct vmw_fpriv *vmw_fp;
int ret = -ENOMEM;
- vmw_fp = kzalloc_obj(*vmw_fp, GFP_KERNEL);
+ vmw_fp = kzalloc_obj(*vmw_fp);
if (unlikely(!vmw_fp))
return ret;
diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_fence.c b/drivers/gpu/drm/vmwgfx/vmwgfx_fence.c
index 4500771a8f42..3469e2c9e706 100644
--- a/drivers/gpu/drm/vmwgfx/vmwgfx_fence.c
+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_fence.c
@@ -129,7 +129,7 @@ static const struct dma_fence_ops vmw_fence_ops = {
struct vmw_fence_manager *vmw_fence_manager_init(struct vmw_private *dev_priv)
{
- struct vmw_fence_manager *fman = kzalloc_obj(*fman, GFP_KERNEL);
+ struct vmw_fence_manager *fman = kzalloc_obj(*fman);
if (unlikely(!fman))
return NULL;
@@ -251,7 +251,7 @@ int vmw_fence_create(struct vmw_fence_manager *fman,
struct vmw_fence_obj *fence;
int ret;
- fence = kzalloc_obj(*fence, GFP_KERNEL);
+ fence = kzalloc_obj(*fence);
if (unlikely(!fence))
return -ENOMEM;
@@ -298,7 +298,7 @@ int vmw_user_fence_create(struct drm_file *file_priv,
struct vmw_fence_obj *tmp;
int ret;
- ufence = kzalloc_obj(*ufence, GFP_KERNEL);
+ ufence = kzalloc_obj(*ufence);
if (unlikely(!ufence)) {
ret = -ENOMEM;
goto out_no_object;
@@ -580,7 +580,7 @@ int vmw_event_fence_action_queue(struct drm_file *file_priv,
struct vmw_event_fence_action *eaction;
struct vmw_fence_manager *fman = fman_from_fence(fence);
- eaction = kzalloc_obj(*eaction, GFP_KERNEL);
+ eaction = kzalloc_obj(*eaction);
if (unlikely(!eaction))
return -ENOMEM;
@@ -612,7 +612,7 @@ static int vmw_event_fence_action_create(struct drm_file *file_priv,
struct drm_device *dev = &fman->dev_priv->drm;
int ret;
- event = kzalloc_obj(*event, GFP_KERNEL);
+ event = kzalloc_obj(*event);
if (unlikely(!event)) {
DRM_ERROR("Failed to allocate an event.\n");
ret = -ENOMEM;
diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_gmrid_manager.c b/drivers/gpu/drm/vmwgfx/vmwgfx_gmrid_manager.c
index 1a45220d3607..d607452dff6a 100644
--- a/drivers/gpu/drm/vmwgfx/vmwgfx_gmrid_manager.c
+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_gmrid_manager.c
@@ -57,7 +57,7 @@ static int vmw_gmrid_man_get_node(struct ttm_resource_manager *man,
struct vmwgfx_gmrid_man *gman = to_gmrid_manager(man);
int id;
- *res = kmalloc_obj(**res, GFP_KERNEL);
+ *res = kmalloc_obj(**res);
if (!*res)
return -ENOMEM;
@@ -154,7 +154,7 @@ static const struct ttm_resource_manager_func vmw_gmrid_manager_func;
int vmw_gmrid_man_init(struct vmw_private *dev_priv, int type)
{
struct ttm_resource_manager *man;
- struct vmwgfx_gmrid_man *gman = kzalloc_obj(*gman, GFP_KERNEL);
+ struct vmwgfx_gmrid_man *gman = kzalloc_obj(*gman);
if (unlikely(!gman))
return -ENOMEM;
diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_ioctl.c b/drivers/gpu/drm/vmwgfx/vmwgfx_ioctl.c
index 1c4fc5f0d586..d962ef2ef316 100644
--- a/drivers/gpu/drm/vmwgfx/vmwgfx_ioctl.c
+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_ioctl.c
@@ -196,7 +196,7 @@ int vmw_present_ioctl(struct drm_device *dev, void *data,
goto out_clips;
}
- clips = kzalloc_objs(*clips, num_clips, GFP_KERNEL);
+ clips = kzalloc_objs(*clips, num_clips);
if (clips == NULL) {
DRM_ERROR("Failed to allocate clip rect list.\n");
ret = -ENOMEM;
@@ -273,7 +273,7 @@ int vmw_present_readback_ioctl(struct drm_device *dev, void *data,
goto out_clips;
}
- clips = kzalloc_objs(*clips, num_clips, GFP_KERNEL);
+ clips = kzalloc_objs(*clips, num_clips);
if (clips == NULL) {
DRM_ERROR("Failed to allocate clip rect list.\n");
ret = -ENOMEM;
diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_kms.c b/drivers/gpu/drm/vmwgfx/vmwgfx_kms.c
index ca6aec15f113..60306d075428 100644
--- a/drivers/gpu/drm/vmwgfx/vmwgfx_kms.c
+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_kms.c
@@ -224,7 +224,7 @@ void vmw_du_crtc_reset(struct drm_crtc *crtc)
kfree(vmw_crtc_state_to_vcs(crtc->state));
}
- vcs = kzalloc_obj(*vcs, GFP_KERNEL);
+ vcs = kzalloc_obj(*vcs);
if (!vcs) {
DRM_ERROR("Cannot allocate vmw_crtc_state\n");
@@ -300,7 +300,7 @@ void vmw_du_plane_reset(struct drm_plane *plane)
if (plane->state)
vmw_du_plane_destroy_state(plane, plane->state);
- vps = kzalloc_obj(*vps, GFP_KERNEL);
+ vps = kzalloc_obj(*vps);
if (!vps) {
DRM_ERROR("Cannot allocate vmw_plane_state\n");
@@ -382,7 +382,7 @@ void vmw_du_connector_reset(struct drm_connector *connector)
kfree(vmw_connector_state_to_vcs(connector->state));
}
- vcs = kzalloc_obj(*vcs, GFP_KERNEL);
+ vcs = kzalloc_obj(*vcs);
if (!vcs) {
DRM_ERROR("Cannot allocate vmw_connector_state\n");
@@ -543,7 +543,7 @@ static int vmw_kms_new_framebuffer_surface(struct vmw_private *dev_priv,
return -EINVAL;
}
- vfbs = kzalloc_obj(*vfbs, GFP_KERNEL);
+ vfbs = kzalloc_obj(*vfbs);
if (!vfbs) {
ret = -ENOMEM;
goto out_err1;
@@ -632,7 +632,7 @@ static int vmw_kms_new_framebuffer_bo(struct vmw_private *dev_priv,
return -EINVAL;
}
- vfbd = kzalloc_obj(*vfbd, GFP_KERNEL);
+ vfbd = kzalloc_obj(*vfbd);
if (!vfbd) {
ret = -ENOMEM;
goto out_err1;
@@ -1422,7 +1422,7 @@ int vmw_kms_update_layout_ioctl(struct drm_device *dev, void *data,
}
rects_size = arg->num_outputs * sizeof(struct drm_vmw_rect);
- rects = kzalloc_objs(struct drm_vmw_rect, arg->num_outputs, GFP_KERNEL);
+ rects = kzalloc_objs(struct drm_vmw_rect, arg->num_outputs);
if (unlikely(!rects))
return -ENOMEM;
diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_ldu.c b/drivers/gpu/drm/vmwgfx/vmwgfx_ldu.c
index e07ee831064b..f07669b27fba 100644
--- a/drivers/gpu/drm/vmwgfx/vmwgfx_ldu.c
+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_ldu.c
@@ -416,7 +416,7 @@ static int vmw_ldu_init(struct vmw_private *dev_priv, unsigned unit)
struct drm_crtc *crtc;
int ret;
- ldu = kzalloc_obj(*ldu, GFP_KERNEL);
+ ldu = kzalloc_obj(*ldu);
if (!ldu)
return -ENOMEM;
@@ -547,7 +547,7 @@ int vmw_kms_ldu_init_display(struct vmw_private *dev_priv)
return -EINVAL;
}
- dev_priv->ldu_priv = kmalloc_obj(*dev_priv->ldu_priv, GFP_KERNEL);
+ dev_priv->ldu_priv = kmalloc_obj(*dev_priv->ldu_priv);
if (!dev_priv->ldu_priv)
return -ENOMEM;
diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_mob.c b/drivers/gpu/drm/vmwgfx/vmwgfx_mob.c
index d29ac15a742b..de7a504de9ce 100644
--- a/drivers/gpu/drm/vmwgfx/vmwgfx_mob.c
+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_mob.c
@@ -390,7 +390,7 @@ static unsigned long vmw_mob_calculate_pt_pages(unsigned long data_pages)
*/
struct vmw_mob *vmw_mob_create(unsigned long data_pages)
{
- struct vmw_mob *mob = kzalloc_obj(*mob, GFP_KERNEL);
+ struct vmw_mob *mob = kzalloc_obj(*mob);
if (unlikely(!mob))
return NULL;
diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_overlay.c b/drivers/gpu/drm/vmwgfx/vmwgfx_overlay.c
index 9a75a35f605b..679adf7c7183 100644
--- a/drivers/gpu/drm/vmwgfx/vmwgfx_overlay.c
+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_overlay.c
@@ -539,7 +539,7 @@ int vmw_overlay_init(struct vmw_private *dev_priv)
if (dev_priv->overlay_priv)
return -EINVAL;
- overlay = kzalloc_obj(*overlay, GFP_KERNEL);
+ overlay = kzalloc_obj(*overlay);
if (!overlay)
return -ENOMEM;
diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_scrn.c b/drivers/gpu/drm/vmwgfx/vmwgfx_scrn.c
index 37bcdfb585ce..605d037d18c6 100644
--- a/drivers/gpu/drm/vmwgfx/vmwgfx_scrn.c
+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_scrn.c
@@ -811,7 +811,7 @@ static int vmw_sou_init(struct vmw_private *dev_priv, unsigned unit)
struct drm_crtc *crtc;
int ret;
- sou = kzalloc_obj(*sou, GFP_KERNEL);
+ sou = kzalloc_obj(*sou);
if (!sou)
return -ENOMEM;
diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_shader.c b/drivers/gpu/drm/vmwgfx/vmwgfx_shader.c
index d74d9b72f80d..eca4e3e97eb4 100644
--- a/drivers/gpu/drm/vmwgfx/vmwgfx_shader.c
+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_shader.c
@@ -595,7 +595,7 @@ int vmw_dx_shader_add(struct vmw_cmdbuf_res_manager *man,
if (!vmw_shader_id_ok(user_key, shader_type))
return -EINVAL;
- shader = kmalloc_obj(*shader, GFP_KERNEL);
+ shader = kmalloc_obj(*shader);
if (!shader) {
return -ENOMEM;
}
@@ -696,7 +696,7 @@ static int vmw_user_shader_alloc(struct vmw_private *dev_priv,
struct vmw_resource *res, *tmp;
int ret;
- ushader = kzalloc_obj(*ushader, GFP_KERNEL);
+ ushader = kzalloc_obj(*ushader);
if (unlikely(!ushader)) {
ret = -ENOMEM;
goto out;
@@ -746,7 +746,7 @@ static struct vmw_resource *vmw_shader_alloc(struct vmw_private *dev_priv,
struct vmw_resource *res;
int ret;
- shader = kzalloc_obj(*shader, GFP_KERNEL);
+ shader = kzalloc_obj(*shader);
if (unlikely(!shader)) {
ret = -ENOMEM;
goto out_err;
diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_stdu.c b/drivers/gpu/drm/vmwgfx/vmwgfx_stdu.c
index 14f583ab4bac..dcbacee97f61 100644
--- a/drivers/gpu/drm/vmwgfx/vmwgfx_stdu.c
+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_stdu.c
@@ -1541,7 +1541,7 @@ static int vmw_stdu_init(struct vmw_private *dev_priv, unsigned unit)
struct drm_crtc *crtc;
int ret;
- stdu = kzalloc_obj(*stdu, GFP_KERNEL);
+ stdu = kzalloc_obj(*stdu);
if (!stdu)
return -ENOMEM;
diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_streamoutput.c b/drivers/gpu/drm/vmwgfx/vmwgfx_streamoutput.c
index 6805c03ae248..52c6cfa163da 100644
--- a/drivers/gpu/drm/vmwgfx/vmwgfx_streamoutput.c
+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_streamoutput.c
@@ -284,7 +284,7 @@ int vmw_dx_streamoutput_add(struct vmw_cmdbuf_res_manager *man,
struct vmw_private *dev_priv = ctx->dev_priv;
int ret;
- so = kmalloc_obj(*so, GFP_KERNEL);
+ so = kmalloc_obj(*so);
if (!so) {
return -ENOMEM;
}
diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_surface.c b/drivers/gpu/drm/vmwgfx/vmwgfx_surface.c
index 9ff2d54d548e..865621839d03 100644
--- a/drivers/gpu/drm/vmwgfx/vmwgfx_surface.c
+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_surface.c
@@ -741,7 +741,7 @@ int vmw_surface_define_ioctl(struct drm_device *dev, void *data,
return -EINVAL;
}
- user_srf = kzalloc_obj(*user_srf, GFP_KERNEL);
+ user_srf = kzalloc_obj(*user_srf);
if (unlikely(!user_srf)) {
ret = -ENOMEM;
goto out_unlock;
@@ -2144,7 +2144,7 @@ int vmw_gb_surface_define(struct vmw_private *dev_priv,
if (req->sizes != NULL)
return -EINVAL;
- user_srf = kzalloc_obj(*user_srf, GFP_KERNEL);
+ user_srf = kzalloc_obj(*user_srf);
if (unlikely(!user_srf)) {
ret = -ENOMEM;
goto out_unlock;
diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_system_manager.c b/drivers/gpu/drm/vmwgfx/vmwgfx_system_manager.c
index 08b492534fe9..585996b6c9b7 100644
--- a/drivers/gpu/drm/vmwgfx/vmwgfx_system_manager.c
+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_system_manager.c
@@ -37,7 +37,7 @@ static int vmw_sys_man_alloc(struct ttm_resource_manager *man,
const struct ttm_place *place,
struct ttm_resource **res)
{
- *res = kzalloc_obj(**res, GFP_KERNEL);
+ *res = kzalloc_obj(**res);
if (!*res)
return -ENOMEM;
@@ -60,7 +60,7 @@ static const struct ttm_resource_manager_func vmw_sys_manager_func = {
int vmw_sys_man_init(struct vmw_private *dev_priv)
{
struct ttm_device *bdev = &dev_priv->bdev;
- struct ttm_resource_manager *man = kzalloc_obj(*man, GFP_KERNEL);
+ struct ttm_resource_manager *man = kzalloc_obj(*man);
if (!man)
return -ENOMEM;
diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_ttm_buffer.c b/drivers/gpu/drm/vmwgfx/vmwgfx_ttm_buffer.c
index 232c2b8ff520..dfd08ee19041 100644
--- a/drivers/gpu/drm/vmwgfx/vmwgfx_ttm_buffer.c
+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_ttm_buffer.c
@@ -404,7 +404,7 @@ static struct ttm_tt *vmw_ttm_tt_create(struct ttm_buffer_object *bo,
int ret;
bool external = bo->type == ttm_bo_type_sg;
- vmw_be = kzalloc_obj(*vmw_be, GFP_KERNEL);
+ vmw_be = kzalloc_obj(*vmw_be);
if (!vmw_be)
return NULL;
diff --git a/drivers/gpu/drm/xe/display/intel_bo.c b/drivers/gpu/drm/xe/display/intel_bo.c
index 89ee5f3491c6..05d5e5c0a0de 100644
--- a/drivers/gpu/drm/xe/display/intel_bo.c
+++ b/drivers/gpu/drm/xe/display/intel_bo.c
@@ -57,7 +57,7 @@ struct intel_frontbuffer *intel_bo_frontbuffer_get(struct drm_gem_object *obj)
{
struct xe_frontbuffer *front;
- front = kmalloc_obj(*front, GFP_KERNEL);
+ front = kmalloc_obj(*front);
if (!front)
return NULL;
diff --git a/drivers/gpu/drm/xe/display/xe_dsb_buffer.c b/drivers/gpu/drm/xe/display/xe_dsb_buffer.c
index 1c35eb2def8c..8ffc13855ef7 100644
--- a/drivers/gpu/drm/xe/display/xe_dsb_buffer.c
+++ b/drivers/gpu/drm/xe/display/xe_dsb_buffer.c
@@ -43,7 +43,7 @@ struct intel_dsb_buffer *intel_dsb_buffer_create(struct drm_device *drm, size_t
struct xe_bo *obj;
int ret;
- dsb_buf = kzalloc_obj(*dsb_buf, GFP_KERNEL);
+ dsb_buf = kzalloc_obj(*dsb_buf);
if (!dsb_buf)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/gpu/drm/xe/display/xe_hdcp_gsc.c b/drivers/gpu/drm/xe/display/xe_hdcp_gsc.c
index 0266deccb31a..29c72aa4b0d2 100644
--- a/drivers/gpu/drm/xe/display/xe_hdcp_gsc.c
+++ b/drivers/gpu/drm/xe/display/xe_hdcp_gsc.c
@@ -95,7 +95,7 @@ static struct intel_hdcp_gsc_context *intel_hdcp_gsc_context_alloc(struct drm_de
struct intel_hdcp_gsc_context *gsc_context;
int ret;
- gsc_context = kzalloc_obj(*gsc_context, GFP_KERNEL);
+ gsc_context = kzalloc_obj(*gsc_context);
if (!gsc_context)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/gpu/drm/xe/display/xe_panic.c b/drivers/gpu/drm/xe/display/xe_panic.c
index e68abd9268f2..bebb21d617f0 100644
--- a/drivers/gpu/drm/xe/display/xe_panic.c
+++ b/drivers/gpu/drm/xe/display/xe_panic.c
@@ -79,7 +79,7 @@ static struct intel_panic *xe_panic_alloc(void)
{
struct intel_panic *panic;
- panic = kzalloc_obj(*panic, GFP_KERNEL);
+ panic = kzalloc_obj(*panic);
return panic;
}
diff --git a/drivers/gpu/drm/xe/display/xe_stolen.c b/drivers/gpu/drm/xe/display/xe_stolen.c
index fac3d60e8a31..5c7df67be8f9 100644
--- a/drivers/gpu/drm/xe/display/xe_stolen.c
+++ b/drivers/gpu/drm/xe/display/xe_stolen.c
@@ -86,7 +86,7 @@ static struct intel_stolen_node *xe_stolen_node_alloc(struct drm_device *drm)
struct xe_device *xe = to_xe_device(drm);
struct intel_stolen_node *node;
- node = kzalloc_obj(*node, GFP_KERNEL);
+ node = kzalloc_obj(*node);
if (!node)
return NULL;
diff --git a/drivers/gpu/drm/xe/tests/xe_bo.c b/drivers/gpu/drm/xe/tests/xe_bo.c
index acbc7802cc5e..49c95ed67d7e 100644
--- a/drivers/gpu/drm/xe/tests/xe_bo.c
+++ b/drivers/gpu/drm/xe/tests/xe_bo.c
@@ -482,7 +482,7 @@ static int shrink_test_run_device(struct xe_device *xe)
unsigned int mem_type;
struct xe_ttm_tt *xe_tt;
- link = kzalloc_obj(*link, GFP_KERNEL);
+ link = kzalloc_obj(*link);
if (!link) {
KUNIT_FAIL(test, "Unexpected link allocation failure\n");
failed = true;
diff --git a/drivers/gpu/drm/xe/xe_bb.c b/drivers/gpu/drm/xe/xe_bb.c
index 18236fbe8e63..4749aa7f9466 100644
--- a/drivers/gpu/drm/xe/xe_bb.c
+++ b/drivers/gpu/drm/xe/xe_bb.c
@@ -31,7 +31,7 @@ static int bb_prefetch(struct xe_gt *gt)
struct xe_bb *xe_bb_new(struct xe_gt *gt, u32 dwords, bool usm)
{
struct xe_tile *tile = gt_to_tile(gt);
- struct xe_bb *bb = kmalloc_obj(*bb, GFP_KERNEL);
+ struct xe_bb *bb = kmalloc_obj(*bb);
int err;
if (!bb)
@@ -62,7 +62,7 @@ struct xe_bb *xe_bb_new(struct xe_gt *gt, u32 dwords, bool usm)
struct xe_bb *xe_bb_ccs_new(struct xe_gt *gt, u32 dwords,
enum xe_sriov_vf_ccs_rw_ctxs ctx_id)
{
- struct xe_bb *bb = kmalloc_obj(*bb, GFP_KERNEL);
+ struct xe_bb *bb = kmalloc_obj(*bb);
struct xe_device *xe = gt_to_xe(gt);
struct xe_sa_manager *bb_pool;
int err;
diff --git a/drivers/gpu/drm/xe/xe_bo.c b/drivers/gpu/drm/xe/xe_bo.c
index 31eacbbfe50a..29fffc81f240 100644
--- a/drivers/gpu/drm/xe/xe_bo.c
+++ b/drivers/gpu/drm/xe/xe_bo.c
@@ -480,7 +480,7 @@ static struct ttm_tt *xe_ttm_tt_create(struct ttm_buffer_object *ttm_bo,
enum ttm_caching caching = ttm_cached;
int err;
- xe_tt = kzalloc_obj(*xe_tt, GFP_KERNEL);
+ xe_tt = kzalloc_obj(*xe_tt);
if (!xe_tt)
return NULL;
@@ -2089,7 +2089,7 @@ static const struct drm_gem_object_funcs xe_gem_object_funcs = {
*/
struct xe_bo *xe_bo_alloc(void)
{
- struct xe_bo *bo = kzalloc_obj(*bo, GFP_KERNEL);
+ struct xe_bo *bo = kzalloc_obj(*bo);
if (!bo)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/gpu/drm/xe/xe_configfs.c b/drivers/gpu/drm/xe/xe_configfs.c
index b58191735e31..c59b1414df22 100644
--- a/drivers/gpu/drm/xe/xe_configfs.c
+++ b/drivers/gpu/drm/xe/xe_configfs.c
@@ -998,7 +998,7 @@ static struct config_group *xe_config_make_device_group(struct config_group *gro
if (!match)
return ERR_PTR(-ENOENT);
- dev = kzalloc_obj(*dev, GFP_KERNEL);
+ dev = kzalloc_obj(*dev);
if (!dev)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/gpu/drm/xe/xe_dep_scheduler.c b/drivers/gpu/drm/xe/xe_dep_scheduler.c
index f1620711fbd2..51d99fee9aa5 100644
--- a/drivers/gpu/drm/xe/xe_dep_scheduler.c
+++ b/drivers/gpu/drm/xe/xe_dep_scheduler.c
@@ -86,7 +86,7 @@ xe_dep_scheduler_create(struct xe_device *xe,
};
int err;
- dep_scheduler = kzalloc_obj(*dep_scheduler, GFP_KERNEL);
+ dep_scheduler = kzalloc_obj(*dep_scheduler);
if (!dep_scheduler)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/gpu/drm/xe/xe_device.c b/drivers/gpu/drm/xe/xe_device.c
index f96d992b2ca4..52ee24e9cd3a 100644
--- a/drivers/gpu/drm/xe/xe_device.c
+++ b/drivers/gpu/drm/xe/xe_device.c
@@ -86,7 +86,7 @@ static int xe_file_open(struct drm_device *dev, struct drm_file *file)
int ret = -ENOMEM;
struct task_struct *task = NULL;
- xef = kzalloc_obj(*xef, GFP_KERNEL);
+ xef = kzalloc_obj(*xef);
if (!xef)
return ret;
diff --git a/drivers/gpu/drm/xe/xe_drm_client.c b/drivers/gpu/drm/xe/xe_drm_client.c
index b7284acc379c..84b66147bf49 100644
--- a/drivers/gpu/drm/xe/xe_drm_client.c
+++ b/drivers/gpu/drm/xe/xe_drm_client.c
@@ -88,7 +88,7 @@ struct xe_drm_client *xe_drm_client_alloc(void)
{
struct xe_drm_client *client;
- client = kzalloc_obj(*client, GFP_KERNEL);
+ client = kzalloc_obj(*client);
if (!client)
return NULL;
diff --git a/drivers/gpu/drm/xe/xe_eu_stall.c b/drivers/gpu/drm/xe/xe_eu_stall.c
index a9fa39bfeca7..36ad47ce22b6 100644
--- a/drivers/gpu/drm/xe/xe_eu_stall.c
+++ b/drivers/gpu/drm/xe/xe_eu_stall.c
@@ -238,7 +238,7 @@ int xe_eu_stall_init(struct xe_gt *gt)
if (!xe_eu_stall_supported_on_platform(xe))
return 0;
- gt->eu_stall = kzalloc_obj(*gt->eu_stall, GFP_KERNEL);
+ gt->eu_stall = kzalloc_obj(*gt->eu_stall);
if (!gt->eu_stall) {
ret = -ENOMEM;
goto exit;
@@ -906,7 +906,7 @@ static int xe_eu_stall_stream_open_locked(struct drm_device *dev,
return -EBUSY;
}
- stream = kzalloc_obj(*stream, GFP_KERNEL);
+ stream = kzalloc_obj(*stream);
if (!stream)
return -ENOMEM;
diff --git a/drivers/gpu/drm/xe/xe_exec.c b/drivers/gpu/drm/xe/xe_exec.c
index 45b7a7fd7a3b..e05dabfcd43c 100644
--- a/drivers/gpu/drm/xe/xe_exec.c
+++ b/drivers/gpu/drm/xe/xe_exec.c
@@ -162,7 +162,7 @@ int xe_exec_ioctl(struct drm_device *dev, void *data, struct drm_file *file)
}
if (args->num_syncs) {
- syncs = kzalloc_objs(*syncs, args->num_syncs, GFP_KERNEL);
+ syncs = kzalloc_objs(*syncs, args->num_syncs);
if (!syncs) {
err = -ENOMEM;
goto err_exec_queue;
diff --git a/drivers/gpu/drm/xe/xe_exec_queue.c b/drivers/gpu/drm/xe/xe_exec_queue.c
index 36b0bd32e2a6..c41e7cc13d8a 100644
--- a/drivers/gpu/drm/xe/xe_exec_queue.c
+++ b/drivers/gpu/drm/xe/xe_exec_queue.c
@@ -681,7 +681,7 @@ static int xe_exec_queue_group_init(struct xe_device *xe, struct xe_exec_queue *
struct xe_exec_queue_group *group;
struct xe_bo *bo;
- group = kzalloc_obj(*group, GFP_KERNEL);
+ group = kzalloc_obj(*group);
if (!group)
return -ENOMEM;
diff --git a/drivers/gpu/drm/xe/xe_execlist.c b/drivers/gpu/drm/xe/xe_execlist.c
index 405069c72773..371983c94a1b 100644
--- a/drivers/gpu/drm/xe/xe_execlist.c
+++ b/drivers/gpu/drm/xe/xe_execlist.c
@@ -352,7 +352,7 @@ static int execlist_exec_queue_init(struct xe_exec_queue *q)
drm_info(&xe->drm, "Enabling execlist submission (GuC submission disabled)\n");
- exl = kzalloc_obj(*exl, GFP_KERNEL);
+ exl = kzalloc_obj(*exl);
if (!exl)
return -ENOMEM;
diff --git a/drivers/gpu/drm/xe/xe_gt_sysfs.c b/drivers/gpu/drm/xe/xe_gt_sysfs.c
index e2ab22643c63..7fc0bed6ece0 100644
--- a/drivers/gpu/drm/xe/xe_gt_sysfs.c
+++ b/drivers/gpu/drm/xe/xe_gt_sysfs.c
@@ -36,7 +36,7 @@ int xe_gt_sysfs_init(struct xe_gt *gt)
struct kobj_gt *kg;
int err;
- kg = kzalloc_obj(*kg, GFP_KERNEL);
+ kg = kzalloc_obj(*kg);
if (!kg)
return -ENOMEM;
diff --git a/drivers/gpu/drm/xe/xe_guc_submit.c b/drivers/gpu/drm/xe/xe_guc_submit.c
index e15a38ff7354..799ef9f48003 100644
--- a/drivers/gpu/drm/xe/xe_guc_submit.c
+++ b/drivers/gpu/drm/xe/xe_guc_submit.c
@@ -1903,7 +1903,7 @@ static int guc_exec_queue_init(struct xe_exec_queue *q)
xe_gt_assert(guc_to_gt(guc), xe_device_uc_enabled(guc_to_xe(guc)));
- ge = kzalloc_obj(*ge, GFP_KERNEL);
+ ge = kzalloc_obj(*ge);
if (!ge)
return -ENOMEM;
@@ -2057,7 +2057,7 @@ static int guc_exec_queue_set_priority(struct xe_exec_queue *q,
exec_queue_killed_or_banned_or_wedged(q))
return 0;
- msg = kmalloc_obj(*msg, GFP_KERNEL);
+ msg = kmalloc_obj(*msg);
if (!msg)
return -ENOMEM;
@@ -2075,7 +2075,7 @@ static int guc_exec_queue_set_timeslice(struct xe_exec_queue *q, u32 timeslice_u
exec_queue_killed_or_banned_or_wedged(q))
return 0;
- msg = kmalloc_obj(*msg, GFP_KERNEL);
+ msg = kmalloc_obj(*msg);
if (!msg)
return -ENOMEM;
@@ -2094,7 +2094,7 @@ static int guc_exec_queue_set_preempt_timeout(struct xe_exec_queue *q,
exec_queue_killed_or_banned_or_wedged(q))
return 0;
- msg = kmalloc_obj(*msg, GFP_KERNEL);
+ msg = kmalloc_obj(*msg);
if (!msg)
return -ENOMEM;
@@ -2115,7 +2115,7 @@ static int guc_exec_queue_set_multi_queue_priority(struct xe_exec_queue *q,
exec_queue_killed_or_banned_or_wedged(q))
return 0;
- msg = kmalloc_obj(*msg, GFP_KERNEL);
+ msg = kmalloc_obj(*msg);
if (!msg)
return -ENOMEM;
diff --git a/drivers/gpu/drm/xe/xe_heci_gsc.c b/drivers/gpu/drm/xe/xe_heci_gsc.c
index 1e0eeb77427c..5af8903e10af 100644
--- a/drivers/gpu/drm/xe/xe_heci_gsc.c
+++ b/drivers/gpu/drm/xe/xe_heci_gsc.c
@@ -131,7 +131,7 @@ static int heci_gsc_add_device(struct xe_device *xe, const struct heci_gsc_def *
struct mei_aux_device *adev;
int ret;
- adev = kzalloc_obj(*adev, GFP_KERNEL);
+ adev = kzalloc_obj(*adev);
if (!adev)
return -ENOMEM;
adev->irq = heci_gsc->irq;
diff --git a/drivers/gpu/drm/xe/xe_hw_engine_class_sysfs.c b/drivers/gpu/drm/xe/xe_hw_engine_class_sysfs.c
index 4425a1ce140f..d42e263e0611 100644
--- a/drivers/gpu/drm/xe/xe_hw_engine_class_sysfs.c
+++ b/drivers/gpu/drm/xe/xe_hw_engine_class_sysfs.c
@@ -549,7 +549,7 @@ kobj_xe_hw_engine_class(struct xe_device *xe, struct kobject *parent, const char
struct kobj_eclass *keclass;
int err = 0;
- keclass = kzalloc_obj(*keclass, GFP_KERNEL);
+ keclass = kzalloc_obj(*keclass);
if (!keclass)
return NULL;
@@ -582,7 +582,7 @@ static int xe_add_hw_engine_class_defaults(struct xe_device *xe,
struct kobject *kobj;
int err = 0;
- kobj = kzalloc_obj(*kobj, GFP_KERNEL);
+ kobj = kzalloc_obj(*kobj);
if (!kobj)
return -ENOMEM;
@@ -629,7 +629,7 @@ int xe_hw_engine_class_sysfs_init(struct xe_gt *gt)
u16 class_mask = 0;
int err = 0;
- kobj = kzalloc_obj(*kobj, GFP_KERNEL);
+ kobj = kzalloc_obj(*kobj);
if (!kobj)
return -ENOMEM;
diff --git a/drivers/gpu/drm/xe/xe_lrc.c b/drivers/gpu/drm/xe/xe_lrc.c
index 4b2091d552fd..b0f037bc227f 100644
--- a/drivers/gpu/drm/xe/xe_lrc.c
+++ b/drivers/gpu/drm/xe/xe_lrc.c
@@ -1616,7 +1616,7 @@ struct xe_lrc *xe_lrc_create(struct xe_hw_engine *hwe, struct xe_vm *vm,
struct xe_lrc *lrc;
int err;
- lrc = kzalloc_obj(*lrc, GFP_KERNEL);
+ lrc = kzalloc_obj(*lrc);
if (!lrc)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/gpu/drm/xe/xe_migrate.c b/drivers/gpu/drm/xe/xe_migrate.c
index 9d463a48a4d4..e58b9b433654 100644
--- a/drivers/gpu/drm/xe/xe_migrate.c
+++ b/drivers/gpu/drm/xe/xe_migrate.c
@@ -2303,7 +2303,7 @@ static struct drm_pagemap_addr *xe_migrate_dma_map(struct xe_device *xe,
struct drm_pagemap_addr *pagemap_addr;
unsigned long i, npages = DIV_ROUND_UP(len, PAGE_SIZE);
- pagemap_addr = kzalloc_objs(*pagemap_addr, npages, GFP_KERNEL);
+ pagemap_addr = kzalloc_objs(*pagemap_addr, npages);
if (!pagemap_addr)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/gpu/drm/xe/xe_mmio_gem.c b/drivers/gpu/drm/xe/xe_mmio_gem.c
index c4fb55d2dcce..8c803ef233cc 100644
--- a/drivers/gpu/drm/xe/xe_mmio_gem.c
+++ b/drivers/gpu/drm/xe/xe_mmio_gem.c
@@ -78,7 +78,7 @@ struct xe_mmio_gem *xe_mmio_gem_create(struct xe_device *xe, struct drm_file *fi
if ((phys_addr % PAGE_SIZE != 0) || (size % PAGE_SIZE != 0))
return ERR_PTR(-EINVAL);
- obj = kzalloc_obj(*obj, GFP_KERNEL);
+ obj = kzalloc_obj(*obj);
if (!obj)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/gpu/drm/xe/xe_nvm.c b/drivers/gpu/drm/xe/xe_nvm.c
index fb5eb9099921..9c4ccd3b39d4 100644
--- a/drivers/gpu/drm/xe/xe_nvm.c
+++ b/drivers/gpu/drm/xe/xe_nvm.c
@@ -133,7 +133,7 @@ int xe_nvm_init(struct xe_device *xe)
if (WARN_ON(xe->nvm))
return -EFAULT;
- xe->nvm = kzalloc_obj(*nvm, GFP_KERNEL);
+ xe->nvm = kzalloc_obj(*nvm);
if (!xe->nvm)
return -ENOMEM;
diff --git a/drivers/gpu/drm/xe/xe_oa.c b/drivers/gpu/drm/xe/xe_oa.c
index 283cd72ef40b..e40cfeb64911 100644
--- a/drivers/gpu/drm/xe/xe_oa.c
+++ b/drivers/gpu/drm/xe/xe_oa.c
@@ -905,7 +905,7 @@ __xe_oa_alloc_config_buffer(struct xe_oa_stream *stream, struct xe_oa_config *oa
size_t config_length;
struct xe_bb *bb;
- oa_bo = kzalloc_obj(*oa_bo, GFP_KERNEL);
+ oa_bo = kzalloc_obj(*oa_bo);
if (!oa_bo)
return ERR_PTR(-ENOMEM);
@@ -997,7 +997,7 @@ static int xe_oa_emit_oa_config(struct xe_oa_stream *stream, struct xe_oa_config
int i, err, num_signal = 0;
struct dma_fence *fence;
- ofence = kzalloc_obj(*ofence, GFP_KERNEL);
+ ofence = kzalloc_obj(*ofence);
if (!ofence) {
err = -ENOMEM;
goto exit;
@@ -1853,7 +1853,7 @@ static int xe_oa_stream_open_ioctl_locked(struct xe_oa *oa,
if (ret)
goto exit;
- stream = kzalloc_obj(*stream, GFP_KERNEL);
+ stream = kzalloc_obj(*stream);
if (!stream) {
ret = -ENOMEM;
goto err_syncobj;
@@ -2260,7 +2260,7 @@ xe_oa_alloc_regs(struct xe_oa *oa, bool (*is_valid)(struct xe_oa *oa, u32 addr),
int err;
u32 i;
- oa_regs = kmalloc_objs(*oa_regs, n_regs, GFP_KERNEL);
+ oa_regs = kmalloc_objs(*oa_regs, n_regs);
if (!oa_regs)
return ERR_PTR(-ENOMEM);
@@ -2362,7 +2362,7 @@ int xe_oa_add_config_ioctl(struct drm_device *dev, u64 data, struct drm_file *fi
XE_IOCTL_DBG(oa->xe, !arg->n_regs))
return -EINVAL;
- oa_config = kzalloc_obj(*oa_config, GFP_KERNEL);
+ oa_config = kzalloc_obj(*oa_config);
if (!oa_config)
return -ENOMEM;
diff --git a/drivers/gpu/drm/xe/xe_pmu.c b/drivers/gpu/drm/xe/xe_pmu.c
index ac8303509d48..ce1b110f762b 100644
--- a/drivers/gpu/drm/xe/xe_pmu.c
+++ b/drivers/gpu/drm/xe/xe_pmu.c
@@ -142,7 +142,7 @@ static bool event_gt_forcewake(struct perf_event *event)
gt = xe_device_get_gt(xe, config_to_gt_id(config));
- fw_ref = kzalloc_obj(*fw_ref, GFP_KERNEL);
+ fw_ref = kzalloc_obj(*fw_ref);
if (!fw_ref)
return false;
diff --git a/drivers/gpu/drm/xe/xe_preempt_fence.c b/drivers/gpu/drm/xe/xe_preempt_fence.c
index 85c792ee0818..d6427b473ddd 100644
--- a/drivers/gpu/drm/xe/xe_preempt_fence.c
+++ b/drivers/gpu/drm/xe/xe_preempt_fence.c
@@ -101,7 +101,7 @@ struct xe_preempt_fence *xe_preempt_fence_alloc(void)
{
struct xe_preempt_fence *pfence;
- pfence = kmalloc_obj(*pfence, GFP_KERNEL);
+ pfence = kmalloc_obj(*pfence);
if (!pfence)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/gpu/drm/xe/xe_pt.c b/drivers/gpu/drm/xe/xe_pt.c
index 5d3a84baa80b..c6ccef09916d 100644
--- a/drivers/gpu/drm/xe/xe_pt.c
+++ b/drivers/gpu/drm/xe/xe_pt.c
@@ -109,11 +109,11 @@ struct xe_pt *xe_pt_create(struct xe_vm *vm, struct xe_tile *tile,
int err;
if (level) {
- struct xe_pt_dir *dir = kzalloc_obj(*dir, GFP_KERNEL);
+ struct xe_pt_dir *dir = kzalloc_obj(*dir);
pt = (dir) ? &dir->pt : NULL;
} else {
- pt = kzalloc_obj(*pt, GFP_KERNEL);
+ pt = kzalloc_obj(*pt);
}
if (!pt)
return ERR_PTR(-ENOMEM);
@@ -2573,7 +2573,7 @@ xe_pt_update_ops_run(struct xe_tile *tile, struct xe_vma_ops *vops)
}
}
- rfence = kzalloc_obj(*rfence, GFP_KERNEL);
+ rfence = kzalloc_obj(*rfence);
if (!rfence) {
err = -ENOMEM;
goto free_ijob;
diff --git a/drivers/gpu/drm/xe/xe_reg_sr.c b/drivers/gpu/drm/xe/xe_reg_sr.c
index 80532bbce727..2e5c78940b41 100644
--- a/drivers/gpu/drm/xe/xe_reg_sr.c
+++ b/drivers/gpu/drm/xe/xe_reg_sr.c
@@ -89,7 +89,7 @@ int xe_reg_sr_add(struct xe_reg_sr *sr,
return 0;
}
- pentry = kmalloc_obj(*pentry, GFP_KERNEL);
+ pentry = kmalloc_obj(*pentry);
if (!pentry) {
ret = -ENOMEM;
goto fail;
diff --git a/drivers/gpu/drm/xe/xe_shrinker.c b/drivers/gpu/drm/xe/xe_shrinker.c
index f798404ac337..83374cd57660 100644
--- a/drivers/gpu/drm/xe/xe_shrinker.c
+++ b/drivers/gpu/drm/xe/xe_shrinker.c
@@ -282,7 +282,7 @@ static void xe_shrinker_fini(struct drm_device *drm, void *arg)
*/
int xe_shrinker_create(struct xe_device *xe)
{
- struct xe_shrinker *shrinker = kzalloc_obj(*shrinker, GFP_KERNEL);
+ struct xe_shrinker *shrinker = kzalloc_obj(*shrinker);
if (!shrinker)
return -ENOMEM;
diff --git a/drivers/gpu/drm/xe/xe_sriov_packet.c b/drivers/gpu/drm/xe/xe_sriov_packet.c
index 26905bc61979..968f32496282 100644
--- a/drivers/gpu/drm/xe/xe_sriov_packet.c
+++ b/drivers/gpu/drm/xe/xe_sriov_packet.c
@@ -89,7 +89,7 @@ struct xe_sriov_packet *xe_sriov_packet_alloc(struct xe_device *xe)
{
struct xe_sriov_packet *data;
- data = kzalloc_obj(*data, GFP_KERNEL);
+ data = kzalloc_obj(*data);
if (!data)
return NULL;
diff --git a/drivers/gpu/drm/xe/xe_sriov_pf_sysfs.c b/drivers/gpu/drm/xe/xe_sriov_pf_sysfs.c
index 457676713402..0b88cdade6f1 100644
--- a/drivers/gpu/drm/xe/xe_sriov_pf_sysfs.c
+++ b/drivers/gpu/drm/xe/xe_sriov_pf_sysfs.c
@@ -364,7 +364,7 @@ static struct kobject *create_xe_sriov_kobj(struct xe_device *xe, unsigned int v
xe_sriov_pf_assert_vfid(xe, vfid);
- vkobj = kzalloc_obj(*vkobj, GFP_KERNEL);
+ vkobj = kzalloc_obj(*vkobj);
if (!vkobj)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/gpu/drm/xe/xe_svm.c b/drivers/gpu/drm/xe/xe_svm.c
index ead9a61b1cdb..ca67d0bdbfac 100644
--- a/drivers/gpu/drm/xe/xe_svm.c
+++ b/drivers/gpu/drm/xe/xe_svm.c
@@ -109,7 +109,7 @@ xe_svm_range_alloc(struct drm_gpusvm *gpusvm)
{
struct xe_svm_range *range;
- range = kzalloc_obj(*range, GFP_KERNEL);
+ range = kzalloc_obj(*range);
if (!range)
return NULL;
@@ -1748,7 +1748,7 @@ static struct xe_pagemap *xe_pagemap_create(struct xe_device *xe, struct xe_vram
void *addr;
int err;
- xpagemap = kzalloc_obj(*xpagemap, GFP_KERNEL);
+ xpagemap = kzalloc_obj(*xpagemap);
if (!xpagemap)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/gpu/drm/xe/xe_sync.c b/drivers/gpu/drm/xe/xe_sync.c
index 69a723a8c68e..eb136390dafd 100644
--- a/drivers/gpu/drm/xe/xe_sync.c
+++ b/drivers/gpu/drm/xe/xe_sync.c
@@ -59,7 +59,7 @@ static struct xe_user_fence *user_fence_create(struct xe_device *xe, u64 addr,
if (get_user(prefetch_val, ptr))
return ERR_PTR(-EFAULT);
- ufence = kzalloc_obj(*ufence, GFP_KERNEL);
+ ufence = kzalloc_obj(*ufence);
if (!ufence)
return ERR_PTR(-ENOMEM);
@@ -343,7 +343,7 @@ xe_sync_in_fence_get(struct xe_sync_entry *sync, int num_sync,
num_fence++;
}
- fences = kmalloc_objs(*fences, num_fence, GFP_KERNEL);
+ fences = kmalloc_objs(*fences, num_fence);
if (!fences)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/gpu/drm/xe/xe_tile_sysfs.c b/drivers/gpu/drm/xe/xe_tile_sysfs.c
index 39f04b309e73..0bfd28422dc2 100644
--- a/drivers/gpu/drm/xe/xe_tile_sysfs.c
+++ b/drivers/gpu/drm/xe/xe_tile_sysfs.c
@@ -36,7 +36,7 @@ int xe_tile_sysfs_init(struct xe_tile *tile)
struct kobj_tile *kt;
int err;
- kt = kzalloc_obj(*kt, GFP_KERNEL);
+ kt = kzalloc_obj(*kt);
if (!kt)
return -ENOMEM;
diff --git a/drivers/gpu/drm/xe/xe_tlb_inval_job.c b/drivers/gpu/drm/xe/xe_tlb_inval_job.c
index 0560605588db..04d21015cd5d 100644
--- a/drivers/gpu/drm/xe/xe_tlb_inval_job.c
+++ b/drivers/gpu/drm/xe/xe_tlb_inval_job.c
@@ -108,7 +108,7 @@ xe_tlb_inval_job_create(struct xe_exec_queue *q, struct xe_tlb_inval *tlb_inval,
xe_assert(vm->xe, type == XE_EXEC_QUEUE_TLB_INVAL_MEDIA_GT ||
type == XE_EXEC_QUEUE_TLB_INVAL_PRIMARY_GT);
- job = kmalloc_obj(*job, GFP_KERNEL);
+ job = kmalloc_obj(*job);
if (!job)
return ERR_PTR(-ENOMEM);
@@ -125,7 +125,7 @@ xe_tlb_inval_job_create(struct xe_exec_queue *q, struct xe_tlb_inval *tlb_inval,
xe_exec_queue_get(q); /* Pairs with put in xe_tlb_inval_job_destroy */
xe_vm_get(vm); /* Pairs with put in xe_tlb_inval_job_destroy */
- ifence = kmalloc_obj(*ifence, GFP_KERNEL);
+ ifence = kmalloc_obj(*ifence);
if (!ifence) {
err = -ENOMEM;
goto err_job;
diff --git a/drivers/gpu/drm/xe/xe_ttm_vram_mgr.c b/drivers/gpu/drm/xe/xe_ttm_vram_mgr.c
index 93ad02ec76eb..344769d939e0 100644
--- a/drivers/gpu/drm/xe/xe_ttm_vram_mgr.c
+++ b/drivers/gpu/drm/xe/xe_ttm_vram_mgr.c
@@ -64,7 +64,7 @@ static int xe_ttm_vram_mgr_new(struct ttm_resource_manager *man,
if (tbo->base.size >> PAGE_SHIFT > (lpfn - place->fpfn))
return -E2BIG; /* don't trigger eviction for the impossible */
- vres = kzalloc_obj(*vres, GFP_KERNEL);
+ vres = kzalloc_obj(*vres);
if (!vres)
return -ENOMEM;
@@ -371,7 +371,7 @@ int xe_ttm_vram_mgr_alloc_sgt(struct xe_device *xe,
if (vres->used_visible_size < res->size)
return -EOPNOTSUPP;
- *sgt = kmalloc_obj(**sgt, GFP_KERNEL);
+ *sgt = kmalloc_obj(**sgt);
if (!*sgt)
return -ENOMEM;
diff --git a/drivers/gpu/drm/xe/xe_vm.c b/drivers/gpu/drm/xe/xe_vm.c
index b53d76dc62b2..a82e3a4fb389 100644
--- a/drivers/gpu/drm/xe/xe_vm.c
+++ b/drivers/gpu/drm/xe/xe_vm.c
@@ -667,7 +667,7 @@ static int xe_vm_ops_add_rebind(struct xe_vma_ops *vops, struct xe_vma *vma,
{
struct xe_vma_op *op;
- op = kzalloc_obj(*op, GFP_KERNEL);
+ op = kzalloc_obj(*op);
if (!op)
return -ENOMEM;
@@ -803,7 +803,7 @@ xe_vm_ops_add_range_rebind(struct xe_vma_ops *vops,
{
struct xe_vma_op *op;
- op = kzalloc_obj(*op, GFP_KERNEL);
+ op = kzalloc_obj(*op);
if (!op)
return -ENOMEM;
@@ -889,7 +889,7 @@ xe_vm_ops_add_range_unbind(struct xe_vma_ops *vops,
{
struct xe_vma_op *op;
- op = kzalloc_obj(*op, GFP_KERNEL);
+ op = kzalloc_obj(*op);
if (!op)
return -ENOMEM;
@@ -1008,14 +1008,14 @@ static struct xe_vma *xe_vma_create(struct xe_vm *vm,
* matches what was allocated.
*/
if (!bo && !is_null && !is_cpu_addr_mirror) {
- struct xe_userptr_vma *uvma = kzalloc_obj(*uvma, GFP_KERNEL);
+ struct xe_userptr_vma *uvma = kzalloc_obj(*uvma);
if (!uvma)
return ERR_PTR(-ENOMEM);
vma = &uvma->vma;
} else {
- vma = kzalloc_obj(*vma, GFP_KERNEL);
+ vma = kzalloc_obj(*vma);
if (!vma)
return ERR_PTR(-ENOMEM);
@@ -1235,7 +1235,7 @@ static struct drm_gpuva_op *xe_vm_op_alloc(void)
{
struct xe_vma_op *op;
- op = kzalloc_obj(*op, GFP_KERNEL);
+ op = kzalloc_obj(*op);
if (unlikely(!op))
return NULL;
@@ -3161,7 +3161,7 @@ static struct dma_fence *ops_execute(struct xe_vm *vm,
++n_fence;
}
- fences = kmalloc_objs(*fences, n_fence, GFP_KERNEL);
+ fences = kmalloc_objs(*fences, n_fence);
if (!fences) {
fence = ERR_PTR(-ENOMEM);
goto err_trace;
@@ -3705,7 +3705,7 @@ int xe_vm_bind_ioctl(struct drm_device *dev, void *data, struct drm_file *file)
}
if (args->num_syncs) {
- syncs = kzalloc_objs(*syncs, args->num_syncs, GFP_KERNEL);
+ syncs = kzalloc_objs(*syncs, args->num_syncs);
if (!syncs) {
err = -ENOMEM;
goto put_obj;
diff --git a/drivers/gpu/drm/xen/xen_drm_front.c b/drivers/gpu/drm/xen/xen_drm_front.c
index 79dce72c9bc4..e1890d0c7369 100644
--- a/drivers/gpu/drm/xen/xen_drm_front.c
+++ b/drivers/gpu/drm/xen/xen_drm_front.c
@@ -171,7 +171,7 @@ int xen_drm_front_dbuf_create(struct xen_drm_front_info *front_info,
if (unlikely(!evtchnl))
return -EIO;
- dbuf = kzalloc_obj(*dbuf, GFP_KERNEL);
+ dbuf = kzalloc_obj(*dbuf);
if (!dbuf)
return -ENOMEM;
@@ -496,7 +496,7 @@ static int xen_drm_drv_init(struct xen_drm_front_info *front_info)
DRM_INFO("Creating %s\n", xen_drm_driver.desc);
- drm_info = kzalloc_obj(*drm_info, GFP_KERNEL);
+ drm_info = kzalloc_obj(*drm_info);
if (!drm_info) {
ret = -ENOMEM;
goto fail;
diff --git a/drivers/gpu/drm/xen/xen_drm_front_gem.c b/drivers/gpu/drm/xen/xen_drm_front_gem.c
index afad19fe01d2..c80043a6a99f 100644
--- a/drivers/gpu/drm/xen/xen_drm_front_gem.c
+++ b/drivers/gpu/drm/xen/xen_drm_front_gem.c
@@ -118,7 +118,7 @@ static struct xen_gem_object *gem_create_obj(struct drm_device *dev,
struct xen_gem_object *xen_obj;
int ret;
- xen_obj = kzalloc_obj(*xen_obj, GFP_KERNEL);
+ xen_obj = kzalloc_obj(*xen_obj);
if (!xen_obj)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/gpu/drm/xlnx/zynqmp_disp.c b/drivers/gpu/drm/xlnx/zynqmp_disp.c
index db1053161e35..9a8f38230cb4 100644
--- a/drivers/gpu/drm/xlnx/zynqmp_disp.c
+++ b/drivers/gpu/drm/xlnx/zynqmp_disp.c
@@ -1360,7 +1360,7 @@ int zynqmp_disp_probe(struct zynqmp_dpsub *dpsub)
struct zynqmp_disp *disp;
int ret;
- disp = kzalloc_obj(*disp, GFP_KERNEL);
+ disp = kzalloc_obj(*disp);
if (!disp)
return -ENOMEM;
diff --git a/drivers/gpu/drm/xlnx/zynqmp_dp.c b/drivers/gpu/drm/xlnx/zynqmp_dp.c
index 4f21dc062170..379180fb3004 100644
--- a/drivers/gpu/drm/xlnx/zynqmp_dp.c
+++ b/drivers/gpu/drm/xlnx/zynqmp_dp.c
@@ -1739,7 +1739,7 @@ static const struct drm_edid *zynqmp_dp_bridge_edid_read(struct drm_bridge *brid
static u32 *zynqmp_dp_bridge_default_bus_fmts(unsigned int *num_input_fmts)
{
- u32 *formats = kzalloc_obj(*formats, GFP_KERNEL);
+ u32 *formats = kzalloc_obj(*formats);
if (formats)
*formats = MEDIA_BUS_FMT_FIXED;
diff --git a/drivers/gpu/drm/xlnx/zynqmp_dpsub.c b/drivers/gpu/drm/xlnx/zynqmp_dpsub.c
index 137d3e85e0fb..53ab1a2a5aaf 100644
--- a/drivers/gpu/drm/xlnx/zynqmp_dpsub.c
+++ b/drivers/gpu/drm/xlnx/zynqmp_dpsub.c
@@ -189,7 +189,7 @@ static int zynqmp_dpsub_probe(struct platform_device *pdev)
int ret;
/* Allocate private data. */
- dpsub = kzalloc_obj(*dpsub, GFP_KERNEL);
+ dpsub = kzalloc_obj(*dpsub);
if (!dpsub)
return -ENOMEM;
diff --git a/drivers/gpu/host1x/bus.c b/drivers/gpu/host1x/bus.c
index b0c12d63d7b4..f814eb4941c0 100644
--- a/drivers/gpu/host1x/bus.c
+++ b/drivers/gpu/host1x/bus.c
@@ -43,7 +43,7 @@ static int host1x_subdev_add(struct host1x_device *device,
struct host1x_subdev *subdev;
int err;
- subdev = kzalloc_obj(*subdev, GFP_KERNEL);
+ subdev = kzalloc_obj(*subdev);
if (!subdev)
return -ENOMEM;
@@ -459,7 +459,7 @@ static int host1x_device_add(struct host1x *host1x,
struct host1x_device *device;
int err;
- device = kzalloc_obj(*device, GFP_KERNEL);
+ device = kzalloc_obj(*device);
if (!device)
return -ENOMEM;
diff --git a/drivers/gpu/host1x/context.c b/drivers/gpu/host1x/context.c
index 8d7719dab510..d50d41c20561 100644
--- a/drivers/gpu/host1x/context.c
+++ b/drivers/gpu/host1x/context.c
@@ -35,7 +35,7 @@ int host1x_memory_context_list_init(struct host1x *host1x)
return 0;
cdl->len = err / 4;
- cdl->devs = kzalloc_objs(*cdl->devs, cdl->len, GFP_KERNEL);
+ cdl->devs = kzalloc_objs(*cdl->devs, cdl->len);
if (!cdl->devs)
return -ENOMEM;
diff --git a/drivers/gpu/host1x/fence.c b/drivers/gpu/host1x/fence.c
index d8f3aade9b2e..b9a7d0bf91f8 100644
--- a/drivers/gpu/host1x/fence.c
+++ b/drivers/gpu/host1x/fence.c
@@ -127,7 +127,7 @@ struct dma_fence *host1x_fence_create(struct host1x_syncpt *sp, u32 threshold,
{
struct host1x_syncpt_fence *fence;
- fence = kzalloc_obj(*fence, GFP_KERNEL);
+ fence = kzalloc_obj(*fence);
if (!fence)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/gpu/host1x/mipi.c b/drivers/gpu/host1x/mipi.c
index 90108d695f63..fea9f491df66 100644
--- a/drivers/gpu/host1x/mipi.c
+++ b/drivers/gpu/host1x/mipi.c
@@ -219,7 +219,7 @@ struct tegra_mipi_device *tegra_mipi_request(struct device *device,
if (err < 0)
return ERR_PTR(err);
- dev = kzalloc_obj(*dev, GFP_KERNEL);
+ dev = kzalloc_obj(*dev);
if (!dev) {
err = -ENOMEM;
goto out;
diff --git a/drivers/gpu/ipu-v3/ipu-common.c b/drivers/gpu/ipu-v3/ipu-common.c
index fa3a8f1f7aa7..5db100bb1e4d 100644
--- a/drivers/gpu/ipu-v3/ipu-common.c
+++ b/drivers/gpu/ipu-v3/ipu-common.c
@@ -183,7 +183,7 @@ struct ipuv3_channel *ipu_idmac_get(struct ipu_soc *ipu, unsigned num)
}
}
- channel = kzalloc_obj(*channel, GFP_KERNEL);
+ channel = kzalloc_obj(*channel);
if (!channel) {
channel = ERR_PTR(-ENOMEM);
goto out;
diff --git a/drivers/gpu/ipu-v3/ipu-image-convert.c b/drivers/gpu/ipu-v3/ipu-image-convert.c
index e994abcd7a0d..29b6d36c9bb6 100644
--- a/drivers/gpu/ipu-v3/ipu-image-convert.c
+++ b/drivers/gpu/ipu-v3/ipu-image-convert.c
@@ -2082,7 +2082,7 @@ ipu_image_convert_prepare(struct ipu_soc *ipu, enum ipu_ic_task ic_task,
chan = &priv->chan[ic_task];
- ctx = kzalloc_obj(*ctx, GFP_KERNEL);
+ ctx = kzalloc_obj(*ctx);
if (!ctx)
return ERR_PTR(-ENOMEM);
@@ -2402,7 +2402,7 @@ ipu_image_convert(struct ipu_soc *ipu, enum ipu_ic_task ic_task,
if (IS_ERR(ctx))
return ERR_CAST(ctx);
- run = kzalloc_obj(*run, GFP_KERNEL);
+ run = kzalloc_obj(*run);
if (!run) {
ipu_image_convert_unprepare(ctx);
return ERR_PTR(-ENOMEM);
diff --git a/drivers/gpu/vga/vga_switcheroo.c b/drivers/gpu/vga/vga_switcheroo.c
index 1d7d52245197..8fe1ae3c71bb 100644
--- a/drivers/gpu/vga/vga_switcheroo.c
+++ b/drivers/gpu/vga/vga_switcheroo.c
@@ -297,7 +297,7 @@ static int register_client(struct pci_dev *pdev,
{
struct vga_switcheroo_client *client;
- client = kzalloc_obj(*client, GFP_KERNEL);
+ client = kzalloc_obj(*client);
if (!client)
return -ENOMEM;
diff --git a/drivers/greybus/bundle.c b/drivers/greybus/bundle.c
index f8aee6da89a4..d1831d0986e9 100644
--- a/drivers/greybus/bundle.c
+++ b/drivers/greybus/bundle.c
@@ -197,7 +197,7 @@ struct gb_bundle *gb_bundle_create(struct gb_interface *intf, u8 bundle_id,
return NULL;
}
- bundle = kzalloc_obj(*bundle, GFP_KERNEL);
+ bundle = kzalloc_obj(*bundle);
if (!bundle)
return NULL;
diff --git a/drivers/greybus/connection.c b/drivers/greybus/connection.c
index 91fd5cbb716d..bd04485decb3 100644
--- a/drivers/greybus/connection.c
+++ b/drivers/greybus/connection.c
@@ -165,7 +165,7 @@ _gb_connection_create(struct gb_host_device *hd, int hd_cport_id,
}
hd_cport_id = ret;
- connection = kzalloc_obj(*connection, GFP_KERNEL);
+ connection = kzalloc_obj(*connection);
if (!connection) {
ret = -ENOMEM;
goto err_hd_cport_release;
diff --git a/drivers/greybus/control.c b/drivers/greybus/control.c
index 8e5c8288bf5a..aec3c8e3802a 100644
--- a/drivers/greybus/control.c
+++ b/drivers/greybus/control.c
@@ -446,7 +446,7 @@ struct gb_control *gb_control_create(struct gb_interface *intf)
struct gb_connection *connection;
struct gb_control *control;
- control = kzalloc_obj(*control, GFP_KERNEL);
+ control = kzalloc_obj(*control);
if (!control)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/greybus/es2.c b/drivers/greybus/es2.c
index 5acb238dde17..6ae0ac828afa 100644
--- a/drivers/greybus/es2.c
+++ b/drivers/greybus/es2.c
@@ -547,7 +547,7 @@ static int cport_enable(struct gb_host_device *hd, u16 cport_id,
u32 connection_flags;
int ret;
- req = kzalloc_obj(*req, GFP_KERNEL);
+ req = kzalloc_obj(*req);
if (!req)
return -ENOMEM;
@@ -883,7 +883,7 @@ static struct arpc *arpc_alloc(void *payload, u16 size, u8 type)
if (size + sizeof(*rpc->req) > ARPC_OUT_SIZE_MAX)
return NULL;
- rpc = kzalloc_obj(*rpc, GFP_KERNEL);
+ rpc = kzalloc_obj(*rpc);
if (!rpc)
return NULL;
@@ -892,7 +892,7 @@ static struct arpc *arpc_alloc(void *payload, u16 size, u8 type)
if (!rpc->req)
goto err_free_rpc;
- rpc->resp = kzalloc_obj(*rpc->resp, GFP_KERNEL);
+ rpc->resp = kzalloc_obj(*rpc->resp);
if (!rpc->resp)
goto err_free_req;
@@ -1203,7 +1203,7 @@ static int apb_get_cport_count(struct usb_device *udev)
int retval;
__le16 *cport_count;
- cport_count = kzalloc_obj(*cport_count, GFP_KERNEL);
+ cport_count = kzalloc_obj(*cport_count);
if (!cport_count)
return -ENOMEM;
diff --git a/drivers/greybus/interface.c b/drivers/greybus/interface.c
index 881eb5e545a0..4ee4bda4a267 100644
--- a/drivers/greybus/interface.c
+++ b/drivers/greybus/interface.c
@@ -789,7 +789,7 @@ struct gb_interface *gb_interface_create(struct gb_module *module,
struct gb_host_device *hd = module->hd;
struct gb_interface *intf;
- intf = kzalloc_obj(*intf, GFP_KERNEL);
+ intf = kzalloc_obj(*intf);
if (!intf)
return NULL;
diff --git a/drivers/greybus/manifest.c b/drivers/greybus/manifest.c
index 0cb87bea249e..a1b2567895bf 100644
--- a/drivers/greybus/manifest.c
+++ b/drivers/greybus/manifest.c
@@ -157,7 +157,7 @@ static int identify_descriptor(struct gb_interface *intf,
expected_size, desc_size);
}
- descriptor = kzalloc_obj(*descriptor, GFP_KERNEL);
+ descriptor = kzalloc_obj(*descriptor);
if (!descriptor)
return -ENOMEM;
diff --git a/drivers/greybus/svc.c b/drivers/greybus/svc.c
index 4efe3dd5bc17..ee79048e3033 100644
--- a/drivers/greybus/svc.c
+++ b/drivers/greybus/svc.c
@@ -1128,7 +1128,7 @@ static int gb_svc_queue_deferred_request(struct gb_operation *operation)
struct gb_svc *svc = gb_connection_get_data(operation->connection);
struct gb_svc_deferred_request *dr;
- dr = kmalloc_obj(*dr, GFP_KERNEL);
+ dr = kmalloc_obj(*dr);
if (!dr)
return -ENOMEM;
@@ -1315,7 +1315,7 @@ struct gb_svc *gb_svc_create(struct gb_host_device *hd)
{
struct gb_svc *svc;
- svc = kzalloc_obj(*svc, GFP_KERNEL);
+ svc = kzalloc_obj(*svc);
if (!svc)
return NULL;
diff --git a/drivers/greybus/svc_watchdog.c b/drivers/greybus/svc_watchdog.c
index 2d2171f95822..16e6de5e9eff 100644
--- a/drivers/greybus/svc_watchdog.c
+++ b/drivers/greybus/svc_watchdog.c
@@ -112,7 +112,7 @@ int gb_svc_watchdog_create(struct gb_svc *svc)
if (svc->watchdog)
return 0;
- watchdog = kmalloc_obj(*watchdog, GFP_KERNEL);
+ watchdog = kmalloc_obj(*watchdog);
if (!watchdog)
return -ENOMEM;
diff --git a/drivers/hid/amd-sfh-hid/amd_sfh_client.c b/drivers/hid/amd-sfh-hid/amd_sfh_client.c
index 8b479441bf90..96ae792beeb6 100644
--- a/drivers/hid/amd-sfh-hid/amd_sfh_client.c
+++ b/drivers/hid/amd-sfh-hid/amd_sfh_client.c
@@ -47,7 +47,7 @@ int amd_sfh_get_report(struct hid_device *hid, int report_id, int report_type)
guard(mutex)(&mp2->lock);
for (i = 0; i < cli_data->num_hid_devices; i++) {
if (cli_data->hid_sensor_hubs[i] == hid) {
- struct request_list *new = kzalloc_obj(*new, GFP_KERNEL);
+ struct request_list *new = kzalloc_obj(*new);
if (!new)
return -ENOMEM;
diff --git a/drivers/hid/amd-sfh-hid/amd_sfh_hid.c b/drivers/hid/amd-sfh-hid/amd_sfh_hid.c
index 59bc9a2e0cd7..b04f675d49b0 100644
--- a/drivers/hid/amd-sfh-hid/amd_sfh_hid.c
+++ b/drivers/hid/amd-sfh-hid/amd_sfh_hid.c
@@ -135,7 +135,7 @@ int amdtp_hid_probe(u32 cur_hid_dev, struct amdtp_cl_data *cli_data)
if (IS_ERR(hid))
return PTR_ERR(hid);
- hid_data = kzalloc_obj(*hid_data, GFP_KERNEL);
+ hid_data = kzalloc_obj(*hid_data);
if (!hid_data) {
rc = -ENOMEM;
goto err_hid_data;
diff --git a/drivers/hid/bpf/hid_bpf_dispatch.c b/drivers/hid/bpf/hid_bpf_dispatch.c
index c99d81789eb3..f3d15994ca1e 100644
--- a/drivers/hid/bpf/hid_bpf_dispatch.c
+++ b/drivers/hid/bpf/hid_bpf_dispatch.c
@@ -320,7 +320,7 @@ hid_bpf_allocate_context(unsigned int hid_id)
if (IS_ERR(hdev))
return NULL;
- ctx_kern = kzalloc_obj(*ctx_kern, GFP_KERNEL);
+ ctx_kern = kzalloc_obj(*ctx_kern);
if (!ctx_kern) {
hid_put_device(hdev);
return NULL;
diff --git a/drivers/hid/hid-apple.c b/drivers/hid/hid-apple.c
index 189baafe2d1e..b949b767cf08 100644
--- a/drivers/hid/hid-apple.c
+++ b/drivers/hid/hid-apple.c
@@ -794,7 +794,7 @@ static int apple_backlight_set(struct hid_device *hdev, u16 value, u16 rate)
int ret = 0;
struct apple_backlight_set_report *rep;
- rep = kmalloc_obj(*rep, GFP_KERNEL);
+ rep = kmalloc_obj(*rep);
if (rep == NULL)
return -ENOMEM;
diff --git a/drivers/hid/hid-axff.c b/drivers/hid/hid-axff.c
index c7dcdffff9e6..3c5c2bf02425 100644
--- a/drivers/hid/hid-axff.c
+++ b/drivers/hid/hid-axff.c
@@ -96,7 +96,7 @@ static int axff_init(struct hid_device *hid)
return -ENODEV;
}
- axff = kzalloc_obj(struct axff_device, GFP_KERNEL);
+ axff = kzalloc_obj(struct axff_device);
if (!axff)
return -ENOMEM;
diff --git a/drivers/hid/hid-betopff.c b/drivers/hid/hid-betopff.c
index d739b3746138..8a7fe895926c 100644
--- a/drivers/hid/hid-betopff.c
+++ b/drivers/hid/hid-betopff.c
@@ -100,7 +100,7 @@ static int betopff_init(struct hid_device *hid)
}
}
- betopff = kzalloc_obj(*betopff, GFP_KERNEL);
+ betopff = kzalloc_obj(*betopff);
if (!betopff)
return -ENOMEM;
diff --git a/drivers/hid/hid-cmedia.c b/drivers/hid/hid-cmedia.c
index c81c34e5b41a..6bc50df9b3e1 100644
--- a/drivers/hid/hid-cmedia.c
+++ b/drivers/hid/hid-cmedia.c
@@ -145,7 +145,7 @@ static int cmhid_probe(struct hid_device *hid, const struct hid_device_id *id)
int ret;
struct cmhid *cm;
- cm = kzalloc_obj(struct cmhid, GFP_KERNEL);
+ cm = kzalloc_obj(struct cmhid);
if (!cm) {
ret = -ENOMEM;
goto allocfail;
diff --git a/drivers/hid/hid-core.c b/drivers/hid/hid-core.c
index d1ea455ce3d2..ef307c4c575e 100644
--- a/drivers/hid/hid-core.c
+++ b/drivers/hid/hid-core.c
@@ -93,7 +93,7 @@ struct hid_report *hid_register_report(struct hid_device *device,
if (report_enum->report_id_hash[id])
return report_enum->report_id_hash[id];
- report = kzalloc_obj(struct hid_report, GFP_KERNEL);
+ report = kzalloc_obj(struct hid_report);
if (!report)
return NULL;
@@ -1797,7 +1797,7 @@ static void hid_report_process_ordering(struct hid_device *hid,
}
/* allocate the memory to process the fields */
- entries = kzalloc_objs(*entries, count, GFP_KERNEL);
+ entries = kzalloc_objs(*entries, count);
if (!entries)
return;
@@ -2611,7 +2611,7 @@ static ssize_t new_id_store(struct device_driver *drv, const char *buf,
if (ret < 3)
return -EINVAL;
- dynid = kzalloc_obj(*dynid, GFP_KERNEL);
+ dynid = kzalloc_obj(*dynid);
if (!dynid)
return -ENOMEM;
@@ -2973,7 +2973,7 @@ struct hid_device *hid_allocate_device(void)
struct hid_device *hdev;
int ret = -ENOMEM;
- hdev = kzalloc_obj(*hdev, GFP_KERNEL);
+ hdev = kzalloc_obj(*hdev);
if (hdev == NULL)
return ERR_PTR(ret);
diff --git a/drivers/hid/hid-corsair.c b/drivers/hid/hid-corsair.c
index 750cac0a2a69..21cd8b12a757 100644
--- a/drivers/hid/hid-corsair.c
+++ b/drivers/hid/hid-corsair.c
@@ -427,7 +427,7 @@ static int k90_init_backlight(struct hid_device *dev)
size_t name_sz;
char *name;
- drvdata->backlight = kzalloc_obj(struct k90_led, GFP_KERNEL);
+ drvdata->backlight = kzalloc_obj(struct k90_led);
if (!drvdata->backlight) {
ret = -ENOMEM;
goto fail_backlight_alloc;
@@ -471,7 +471,7 @@ static int k90_init_macro_functions(struct hid_device *dev)
size_t name_sz;
char *name;
- k90 = kzalloc_obj(struct k90_drvdata, GFP_KERNEL);
+ k90 = kzalloc_obj(struct k90_drvdata);
if (!k90) {
ret = -ENOMEM;
goto fail_drvdata;
diff --git a/drivers/hid/hid-cougar.c b/drivers/hid/hid-cougar.c
index 0b66a7c61ac6..ad027c45f162 100644
--- a/drivers/hid/hid-cougar.c
+++ b/drivers/hid/hid-cougar.c
@@ -166,7 +166,7 @@ static int cougar_bind_shared_data(struct hid_device *hdev,
shared = cougar_get_shared_data(hdev);
if (!shared) {
- shared = kzalloc_obj(*shared, GFP_KERNEL);
+ shared = kzalloc_obj(*shared);
if (!shared) {
error = -ENOMEM;
goto out;
diff --git a/drivers/hid/hid-debug.c b/drivers/hid/hid-debug.c
index 220b497c573a..f20dc46fd8eb 100644
--- a/drivers/hid/hid-debug.c
+++ b/drivers/hid/hid-debug.c
@@ -3681,7 +3681,7 @@ static int hid_debug_events_open(struct inode *inode, struct file *file)
struct hid_debug_list *list;
unsigned long flags;
- if (!(list = kzalloc_obj(struct hid_debug_list, GFP_KERNEL))) {
+ if (!(list = kzalloc_obj(struct hid_debug_list))) {
err = -ENOMEM;
goto out;
}
diff --git a/drivers/hid/hid-dr.c b/drivers/hid/hid-dr.c
index 9923b222383a..8a8f68a7feb0 100644
--- a/drivers/hid/hid-dr.c
+++ b/drivers/hid/hid-dr.c
@@ -104,7 +104,7 @@ static int drff_init(struct hid_device *hid)
return -ENODEV;
}
- drff = kzalloc_obj(struct drff_device, GFP_KERNEL);
+ drff = kzalloc_obj(struct drff_device);
if (!drff)
return -ENOMEM;
diff --git a/drivers/hid/hid-elo.c b/drivers/hid/hid-elo.c
index 465f04ed1a55..b8f5f3eb53a4 100644
--- a/drivers/hid/hid-elo.c
+++ b/drivers/hid/hid-elo.c
@@ -232,7 +232,7 @@ static int elo_probe(struct hid_device *hdev, const struct hid_device_id *id)
if (!hid_is_usb(hdev))
return -EINVAL;
- priv = kzalloc_obj(*priv, GFP_KERNEL);
+ priv = kzalloc_obj(*priv);
if (!priv)
return -ENOMEM;
diff --git a/drivers/hid/hid-emsff.c b/drivers/hid/hid-emsff.c
index 0dbe598f2e48..1b4ad18f6051 100644
--- a/drivers/hid/hid-emsff.c
+++ b/drivers/hid/hid-emsff.c
@@ -76,7 +76,7 @@ static int emsff_init(struct hid_device *hid)
return -ENODEV;
}
- emsff = kzalloc_obj(struct emsff_device, GFP_KERNEL);
+ emsff = kzalloc_obj(struct emsff_device);
if (!emsff)
return -ENOMEM;
diff --git a/drivers/hid/hid-gaff.c b/drivers/hid/hid-gaff.c
index a9d305a193d2..8b99686b63df 100644
--- a/drivers/hid/hid-gaff.c
+++ b/drivers/hid/hid-gaff.c
@@ -96,7 +96,7 @@ static int gaff_init(struct hid_device *hid)
return -ENODEV;
}
- gaff = kzalloc_obj(struct gaff_device, GFP_KERNEL);
+ gaff = kzalloc_obj(struct gaff_device);
if (!gaff)
return -ENOMEM;
diff --git a/drivers/hid/hid-holtekff.c b/drivers/hid/hid-holtekff.c
index 56980af08683..32d08f7a660d 100644
--- a/drivers/hid/hid-holtekff.c
+++ b/drivers/hid/hid-holtekff.c
@@ -149,7 +149,7 @@ static int holtekff_init(struct hid_device *hid)
return -ENODEV;
}
- holtekff = kzalloc_obj(*holtekff, GFP_KERNEL);
+ holtekff = kzalloc_obj(*holtekff);
if (!holtekff)
return -ENOMEM;
diff --git a/drivers/hid/hid-hyperv.c b/drivers/hid/hid-hyperv.c
index f092547d08d2..7d2b0063df15 100644
--- a/drivers/hid/hid-hyperv.c
+++ b/drivers/hid/hid-hyperv.c
@@ -149,7 +149,7 @@ static struct mousevsc_dev *mousevsc_alloc_device(struct hv_device *device)
{
struct mousevsc_dev *input_dev;
- input_dev = kzalloc_obj(struct mousevsc_dev, GFP_KERNEL);
+ input_dev = kzalloc_obj(struct mousevsc_dev);
if (!input_dev)
return NULL;
diff --git a/drivers/hid/hid-input.c b/drivers/hid/hid-input.c
index 6137cc0aeeaf..d5308adb2894 100644
--- a/drivers/hid/hid-input.c
+++ b/drivers/hid/hid-input.c
@@ -531,7 +531,7 @@ static int hidinput_setup_battery(struct hid_device *dev, unsigned report_type,
if (quirks & HID_BATTERY_QUIRK_IGNORE)
return 0;
- psy_desc = kzalloc_obj(*psy_desc, GFP_KERNEL);
+ psy_desc = kzalloc_obj(*psy_desc);
if (!psy_desc)
return -ENOMEM;
@@ -2023,7 +2023,7 @@ static void report_features(struct hid_device *hid)
static struct hid_input *hidinput_allocate(struct hid_device *hid,
unsigned int application)
{
- struct hid_input *hidinput = kzalloc_obj(*hidinput, GFP_KERNEL);
+ struct hid_input *hidinput = kzalloc_obj(*hidinput);
struct input_dev *input_dev = input_allocate_device();
const char *suffix = NULL;
size_t suffix_len, name_len;
diff --git a/drivers/hid/hid-lg.c b/drivers/hid/hid-lg.c
index 7cdf1e895b69..197c2f3b077f 100644
--- a/drivers/hid/hid-lg.c
+++ b/drivers/hid/hid-lg.c
@@ -768,7 +768,7 @@ static int lg_probe(struct hid_device *hdev, const struct hid_device_id *id)
return -ENODEV;
}
- drv_data = kzalloc_obj(struct lg_drv_data, GFP_KERNEL);
+ drv_data = kzalloc_obj(struct lg_drv_data);
if (!drv_data) {
hid_err(hdev, "Insufficient memory, cannot allocate driver data\n");
return -ENOMEM;
diff --git a/drivers/hid/hid-lg2ff.c b/drivers/hid/hid-lg2ff.c
index e4a034bd4095..c3e85b079d80 100644
--- a/drivers/hid/hid-lg2ff.c
+++ b/drivers/hid/hid-lg2ff.c
@@ -66,7 +66,7 @@ int lg2ff_init(struct hid_device *hid)
if (!report)
return -ENODEV;
- lg2ff = kmalloc_obj(struct lg2ff_device, GFP_KERNEL);
+ lg2ff = kmalloc_obj(struct lg2ff_device);
if (!lg2ff)
return -ENOMEM;
diff --git a/drivers/hid/hid-lg4ff.c b/drivers/hid/hid-lg4ff.c
index 4979f7779de8..e901fdb7d033 100644
--- a/drivers/hid/hid-lg4ff.c
+++ b/drivers/hid/hid-lg4ff.c
@@ -1288,7 +1288,7 @@ int lg4ff_init(struct hid_device *hid)
hid_err(hid, "Cannot add device, private driver data not allocated\n");
return -1;
}
- entry = kzalloc_obj(*entry, GFP_KERNEL);
+ entry = kzalloc_obj(*entry);
if (!entry)
return -ENOMEM;
spin_lock_init(&entry->report_lock);
diff --git a/drivers/hid/hid-logitech-dj.c b/drivers/hid/hid-logitech-dj.c
index 2fb6a67bede2..d9b6c72fc254 100644
--- a/drivers/hid/hid-logitech-dj.c
+++ b/drivers/hid/hid-logitech-dj.c
@@ -733,7 +733,7 @@ static struct dj_receiver_dev *dj_get_receiver_dev(struct hid_device *hdev,
djrcv_dev = dj_find_receiver_dev(hdev, type);
if (!djrcv_dev) {
- djrcv_dev = kzalloc_obj(*djrcv_dev, GFP_KERNEL);
+ djrcv_dev = kzalloc_obj(*djrcv_dev);
if (!djrcv_dev)
goto out;
@@ -851,7 +851,7 @@ static void logi_dj_recv_add_djhid_device(struct dj_receiver_dev *djrcv_dev,
snprintf(tmpstr, sizeof(tmpstr), ":%d", device_index);
strlcat(dj_hiddev->phys, tmpstr, sizeof(dj_hiddev->phys));
- dj_dev = kzalloc_obj(struct dj_device, GFP_KERNEL);
+ dj_dev = kzalloc_obj(struct dj_device);
if (!dj_dev) {
hid_err(djrcv_hdev, "%s: failed allocating dj_dev\n", __func__);
@@ -1332,7 +1332,7 @@ static int logi_dj_recv_query_paired_devices(struct dj_receiver_dev *djrcv_dev)
goto out;
}
- dj_report = kzalloc_obj(struct dj_report, GFP_KERNEL);
+ dj_report = kzalloc_obj(struct dj_report);
if (!dj_report)
return -ENOMEM;
dj_report->report_id = REPORT_ID_DJ_SHORT;
@@ -1356,7 +1356,7 @@ static int logi_dj_recv_switch_to_dj_mode(struct dj_receiver_dev *djrcv_dev,
u8 *buf;
int retval = 0;
- dj_report = kzalloc_obj(struct dj_report, GFP_KERNEL);
+ dj_report = kzalloc_obj(struct dj_report);
if (!dj_report)
return -ENOMEM;
diff --git a/drivers/hid/hid-logitech-hidpp.c b/drivers/hid/hid-logitech-hidpp.c
index 4f3289b8a7c2..d40932809ce1 100644
--- a/drivers/hid/hid-logitech-hidpp.c
+++ b/drivers/hid/hid-logitech-hidpp.c
@@ -390,7 +390,7 @@ static int hidpp_send_fap_command_sync(struct hidpp_device *hidpp,
return -EINVAL;
}
- message = kzalloc_obj(struct hidpp_report, GFP_KERNEL);
+ message = kzalloc_obj(struct hidpp_report);
if (!message)
return -ENOMEM;
@@ -443,7 +443,7 @@ static int hidpp_send_rap_command_sync(struct hidpp_device *hidpp_dev,
if (param_count > max_count)
return -EINVAL;
- message = kzalloc_obj(struct hidpp_report, GFP_KERNEL);
+ message = kzalloc_obj(struct hidpp_report);
if (!message)
return -ENOMEM;
message->report_id = report_id;
@@ -2527,7 +2527,7 @@ static void hidpp_ff_work_handler(struct work_struct *w)
static int hidpp_ff_queue_work(struct hidpp_ff_private_data *data, int effect_id, u8 command, u8 *params, u8 size)
{
- struct hidpp_ff_work_data *wd = kzalloc_obj(*wd, GFP_KERNEL);
+ struct hidpp_ff_work_data *wd = kzalloc_obj(*wd);
int s;
if (!wd)
@@ -2853,7 +2853,7 @@ static int hidpp_ff_init(struct hidpp_device *hidpp,
data = kmemdup(data, sizeof(*data), GFP_KERNEL);
if (!data)
return -ENOMEM;
- data->effect_ids = kzalloc_objs(int, num_slots, GFP_KERNEL);
+ data->effect_ids = kzalloc_objs(int, num_slots);
if (!data->effect_ids) {
kfree(data);
return -ENOMEM;
diff --git a/drivers/hid/hid-megaworld.c b/drivers/hid/hid-megaworld.c
index 62f3e976f6b3..81acdbc3a00f 100644
--- a/drivers/hid/hid-megaworld.c
+++ b/drivers/hid/hid-megaworld.c
@@ -57,7 +57,7 @@ static int mwctrl_init(struct hid_device *hid)
return -ENODEV;
}
- mwctrl = kzalloc_obj(struct mwctrl_device, GFP_KERNEL);
+ mwctrl = kzalloc_obj(struct mwctrl_device);
if (!mwctrl)
return -ENOMEM;
diff --git a/drivers/hid/hid-mf.c b/drivers/hid/hid-mf.c
index 9a34645e92b6..6ff54a1ec697 100644
--- a/drivers/hid/hid-mf.c
+++ b/drivers/hid/hid-mf.c
@@ -88,7 +88,7 @@ static int mf_init(struct hid_device *hid)
input_ptr = input_ptr->next;
input = list_entry(input_ptr, struct hid_input, list);
- mf = kzalloc_obj(struct mf_device, GFP_KERNEL);
+ mf = kzalloc_obj(struct mf_device);
if (!mf)
return -ENOMEM;
diff --git a/drivers/hid/hid-ntrig.c b/drivers/hid/hid-ntrig.c
index f48dc2f34f79..2b31756b549e 100644
--- a/drivers/hid/hid-ntrig.c
+++ b/drivers/hid/hid-ntrig.c
@@ -900,7 +900,7 @@ static int ntrig_probe(struct hid_device *hdev, const struct hid_device_id *id)
hdev->quirks |= HID_QUIRK_MULTI_INPUT
| HID_QUIRK_NO_INIT_REPORTS;
- nd = kmalloc_obj(struct ntrig_data, GFP_KERNEL);
+ nd = kmalloc_obj(struct ntrig_data);
if (!nd) {
hid_err(hdev, "cannot allocate N-Trig data\n");
return -ENOMEM;
diff --git a/drivers/hid/hid-picolcd_core.c b/drivers/hid/hid-picolcd_core.c
index 99cae54dc769..2cc01e1bc1a8 100644
--- a/drivers/hid/hid-picolcd_core.c
+++ b/drivers/hid/hid-picolcd_core.c
@@ -78,7 +78,7 @@ struct picolcd_pending *picolcd_send_and_wait(struct hid_device *hdev,
return NULL;
if (data->status & PICOLCD_FAILED)
return NULL;
- work = kzalloc_obj(*work, GFP_KERNEL);
+ work = kzalloc_obj(*work);
if (!work)
return NULL;
@@ -528,7 +528,7 @@ static int picolcd_probe(struct hid_device *hdev,
* Let's allocate the picolcd data structure, set some reasonable
* defaults, and associate it with the device
*/
- data = kzalloc_obj(struct picolcd_data, GFP_KERNEL);
+ data = kzalloc_obj(struct picolcd_data);
if (data == NULL) {
hid_err(hdev, "can't allocate space for Minibox PicoLCD device data\n");
return -ENOMEM;
diff --git a/drivers/hid/hid-pl.c b/drivers/hid/hid-pl.c
index 967f93d9b46b..c6c2961dd574 100644
--- a/drivers/hid/hid-pl.c
+++ b/drivers/hid/hid-pl.c
@@ -140,7 +140,7 @@ static int plff_init(struct hid_device *hid)
return -ENODEV;
}
- plff = kzalloc_obj(struct plff_device, GFP_KERNEL);
+ plff = kzalloc_obj(struct plff_device);
if (!plff)
return -ENOMEM;
diff --git a/drivers/hid/hid-playstation.c b/drivers/hid/hid-playstation.c
index 2458c6b61358..3c0db8f93c82 100644
--- a/drivers/hid/hid-playstation.c
+++ b/drivers/hid/hid-playstation.c
@@ -1658,7 +1658,7 @@ static int dualsense_reset_leds(struct dualsense *ds)
struct dualsense_output_report report;
struct dualsense_output_report_bt *buf;
- buf = kzalloc_obj(*buf, GFP_KERNEL);
+ buf = kzalloc_obj(*buf);
if (!buf)
return -ENOMEM;
diff --git a/drivers/hid/hid-prodikeys.c b/drivers/hid/hid-prodikeys.c
index e69b3cb682bc..fba01e4fcab1 100644
--- a/drivers/hid/hid-prodikeys.c
+++ b/drivers/hid/hid-prodikeys.c
@@ -797,7 +797,7 @@ static int pk_probe(struct hid_device *hdev, const struct hid_device_id *id)
intf = to_usb_interface(hdev->dev.parent);
ifnum = intf->cur_altsetting->desc.bInterfaceNumber;
- pm = kzalloc_obj(*pm, GFP_KERNEL);
+ pm = kzalloc_obj(*pm);
if (pm == NULL) {
hid_err(hdev, "can't alloc descriptor\n");
return -ENOMEM;
diff --git a/drivers/hid/hid-quirks.c b/drivers/hid/hid-quirks.c
index b6a9cfb71ec9..edc4339adb50 100644
--- a/drivers/hid/hid-quirks.c
+++ b/drivers/hid/hid-quirks.c
@@ -1164,11 +1164,11 @@ static int hid_modify_dquirk(const struct hid_device_id *id,
int list_edited = 0;
int ret = 0;
- hdev = kzalloc_obj(*hdev, GFP_KERNEL);
+ hdev = kzalloc_obj(*hdev);
if (!hdev)
return -ENOMEM;
- q_new = kmalloc_obj(struct quirks_list_struct, GFP_KERNEL);
+ q_new = kmalloc_obj(struct quirks_list_struct);
if (!q_new) {
ret = -ENOMEM;
goto out;
diff --git a/drivers/hid/hid-roccat-arvo.c b/drivers/hid/hid-roccat-arvo.c
index f7318bc9e1a5..0cf2f0008c7f 100644
--- a/drivers/hid/hid-roccat-arvo.c
+++ b/drivers/hid/hid-roccat-arvo.c
@@ -299,7 +299,7 @@ static int arvo_init_specials(struct hid_device *hdev)
return 0;
}
- arvo = kzalloc_obj(*arvo, GFP_KERNEL);
+ arvo = kzalloc_obj(*arvo);
if (!arvo) {
hid_err(hdev, "can't alloc device descriptor\n");
return -ENOMEM;
diff --git a/drivers/hid/hid-roccat-isku.c b/drivers/hid/hid-roccat-isku.c
index 470c5e47d185..93a49c93ae8c 100644
--- a/drivers/hid/hid-roccat-isku.c
+++ b/drivers/hid/hid-roccat-isku.c
@@ -279,7 +279,7 @@ static int isku_init_specials(struct hid_device *hdev)
return 0;
}
- isku = kzalloc_obj(*isku, GFP_KERNEL);
+ isku = kzalloc_obj(*isku);
if (!isku) {
hid_err(hdev, "can't alloc device descriptor\n");
return -ENOMEM;
diff --git a/drivers/hid/hid-roccat-kone.c b/drivers/hid/hid-roccat-kone.c
index 9ec3e015acb9..58654cf78f0d 100644
--- a/drivers/hid/hid-roccat-kone.c
+++ b/drivers/hid/hid-roccat-kone.c
@@ -704,7 +704,7 @@ static int kone_init_specials(struct hid_device *hdev)
if (intf->cur_altsetting->desc.bInterfaceProtocol
== USB_INTERFACE_PROTOCOL_MOUSE) {
- kone = kzalloc_obj(*kone, GFP_KERNEL);
+ kone = kzalloc_obj(*kone);
if (!kone)
return -ENOMEM;
hid_set_drvdata(hdev, kone);
diff --git a/drivers/hid/hid-roccat-koneplus.c b/drivers/hid/hid-roccat-koneplus.c
index 534d67a2617e..f80a60539a96 100644
--- a/drivers/hid/hid-roccat-koneplus.c
+++ b/drivers/hid/hid-roccat-koneplus.c
@@ -384,7 +384,7 @@ static int koneplus_init_specials(struct hid_device *hdev)
if (intf->cur_altsetting->desc.bInterfaceProtocol
== USB_INTERFACE_PROTOCOL_MOUSE) {
- koneplus = kzalloc_obj(*koneplus, GFP_KERNEL);
+ koneplus = kzalloc_obj(*koneplus);
if (!koneplus) {
hid_err(hdev, "can't alloc device descriptor\n");
return -ENOMEM;
diff --git a/drivers/hid/hid-roccat-konepure.c b/drivers/hid/hid-roccat-konepure.c
index 1994efc4f26b..7f753dfc2a10 100644
--- a/drivers/hid/hid-roccat-konepure.c
+++ b/drivers/hid/hid-roccat-konepure.c
@@ -88,7 +88,7 @@ static int konepure_init_specials(struct hid_device *hdev)
return 0;
}
- konepure = kzalloc_obj(*konepure, GFP_KERNEL);
+ konepure = kzalloc_obj(*konepure);
if (!konepure) {
hid_err(hdev, "can't alloc device descriptor\n");
return -ENOMEM;
diff --git a/drivers/hid/hid-roccat-kovaplus.c b/drivers/hid/hid-roccat-kovaplus.c
index 429d9b86b672..9ec42c218ef9 100644
--- a/drivers/hid/hid-roccat-kovaplus.c
+++ b/drivers/hid/hid-roccat-kovaplus.c
@@ -453,7 +453,7 @@ static int kovaplus_init_specials(struct hid_device *hdev)
if (intf->cur_altsetting->desc.bInterfaceProtocol
== USB_INTERFACE_PROTOCOL_MOUSE) {
- kovaplus = kzalloc_obj(*kovaplus, GFP_KERNEL);
+ kovaplus = kzalloc_obj(*kovaplus);
if (!kovaplus) {
hid_err(hdev, "can't alloc device descriptor\n");
return -ENOMEM;
diff --git a/drivers/hid/hid-roccat-lua.c b/drivers/hid/hid-roccat-lua.c
index a7ed873f8761..8e35e1a0660b 100644
--- a/drivers/hid/hid-roccat-lua.c
+++ b/drivers/hid/hid-roccat-lua.c
@@ -119,7 +119,7 @@ static int lua_init_specials(struct hid_device *hdev)
struct lua_device *lua;
int retval;
- lua = kzalloc_obj(*lua, GFP_KERNEL);
+ lua = kzalloc_obj(*lua);
if (!lua) {
hid_err(hdev, "can't alloc device descriptor\n");
return -ENOMEM;
diff --git a/drivers/hid/hid-roccat-pyra.c b/drivers/hid/hid-roccat-pyra.c
index 35fffc55eb4f..0d515995bb9d 100644
--- a/drivers/hid/hid-roccat-pyra.c
+++ b/drivers/hid/hid-roccat-pyra.c
@@ -403,7 +403,7 @@ static int pyra_init_specials(struct hid_device *hdev)
if (intf->cur_altsetting->desc.bInterfaceProtocol
== USB_INTERFACE_PROTOCOL_MOUSE) {
- pyra = kzalloc_obj(*pyra, GFP_KERNEL);
+ pyra = kzalloc_obj(*pyra);
if (!pyra) {
hid_err(hdev, "can't alloc device descriptor\n");
return -ENOMEM;
diff --git a/drivers/hid/hid-roccat-ryos.c b/drivers/hid/hid-roccat-ryos.c
index 0f4b52ef5404..db83f42457da 100644
--- a/drivers/hid/hid-roccat-ryos.c
+++ b/drivers/hid/hid-roccat-ryos.c
@@ -96,7 +96,7 @@ static int ryos_init_specials(struct hid_device *hdev)
return 0;
}
- ryos = kzalloc_obj(*ryos, GFP_KERNEL);
+ ryos = kzalloc_obj(*ryos);
if (!ryos) {
hid_err(hdev, "can't alloc device descriptor\n");
return -ENOMEM;
diff --git a/drivers/hid/hid-roccat-savu.c b/drivers/hid/hid-roccat-savu.c
index 90f9b0feb754..679136933560 100644
--- a/drivers/hid/hid-roccat-savu.c
+++ b/drivers/hid/hid-roccat-savu.c
@@ -68,7 +68,7 @@ static int savu_init_specials(struct hid_device *hdev)
return 0;
}
- savu = kzalloc_obj(*savu, GFP_KERNEL);
+ savu = kzalloc_obj(*savu);
if (!savu) {
hid_err(hdev, "can't alloc device descriptor\n");
return -ENOMEM;
diff --git a/drivers/hid/hid-roccat.c b/drivers/hid/hid-roccat.c
index 5fe16ec1849a..fd0ea52f7cba 100644
--- a/drivers/hid/hid-roccat.c
+++ b/drivers/hid/hid-roccat.c
@@ -152,7 +152,7 @@ static int roccat_open(struct inode *inode, struct file *file)
struct roccat_device *device;
int error = 0;
- reader = kzalloc_obj(struct roccat_reader, GFP_KERNEL);
+ reader = kzalloc_obj(struct roccat_reader);
if (!reader)
return -ENOMEM;
@@ -301,7 +301,7 @@ int roccat_connect(const struct class *klass, struct hid_device *hid, int report
struct roccat_device *device;
int temp;
- device = kzalloc_obj(struct roccat_device, GFP_KERNEL);
+ device = kzalloc_obj(struct roccat_device);
if (!device)
return -ENOMEM;
diff --git a/drivers/hid/hid-sensor-custom.c b/drivers/hid/hid-sensor-custom.c
index 75d827c85e14..afffea894021 100644
--- a/drivers/hid/hid-sensor-custom.c
+++ b/drivers/hid/hid-sensor-custom.c
@@ -912,7 +912,7 @@ hid_sensor_custom_get_known(struct hid_sensor_hub_device *hsdev,
hid_sensor_custom_known_table;
struct hid_sensor_custom_properties *prop;
- prop = kmalloc_obj(struct hid_sensor_custom_properties, GFP_KERNEL);
+ prop = kmalloc_obj(struct hid_sensor_custom_properties);
if (!prop)
return -ENOMEM;
diff --git a/drivers/hid/hid-sjoy.c b/drivers/hid/hid-sjoy.c
index e567c264aed3..bab93d71b760 100644
--- a/drivers/hid/hid-sjoy.c
+++ b/drivers/hid/hid-sjoy.c
@@ -83,7 +83,7 @@ static int sjoyff_init(struct hid_device *hid)
return -ENODEV;
}
- sjoyff = kzalloc_obj(struct sjoyff_device, GFP_KERNEL);
+ sjoyff = kzalloc_obj(struct sjoyff_device);
if (!sjoyff)
return -ENOMEM;
diff --git a/drivers/hid/hid-thrustmaster.c b/drivers/hid/hid-thrustmaster.c
index 15847eef4ac0..48a79c97b7d0 100644
--- a/drivers/hid/hid-thrustmaster.c
+++ b/drivers/hid/hid-thrustmaster.c
@@ -308,7 +308,7 @@ static int thrustmaster_probe(struct hid_device *hdev, const struct hid_device_i
}
// Now we allocate the tm_wheel
- tm_wheel = kzalloc_obj(struct tm_wheel, GFP_KERNEL);
+ tm_wheel = kzalloc_obj(struct tm_wheel);
if (!tm_wheel) {
ret = -ENOMEM;
goto error1;
@@ -328,7 +328,7 @@ static int thrustmaster_probe(struct hid_device *hdev, const struct hid_device_i
goto error3;
}
- tm_wheel->response = kzalloc_obj(struct tm_wheel_response, GFP_KERNEL);
+ tm_wheel->response = kzalloc_obj(struct tm_wheel_response);
if (!tm_wheel->response) {
ret = -ENOMEM;
goto error4;
diff --git a/drivers/hid/hid-tmff.c b/drivers/hid/hid-tmff.c
index ddb2629ed9e1..423f395d01ac 100644
--- a/drivers/hid/hid-tmff.c
+++ b/drivers/hid/hid-tmff.c
@@ -132,7 +132,7 @@ static int tmff_init(struct hid_device *hid, const signed short *ff_bits)
hidinput = list_entry(hid->inputs.next, struct hid_input, list);
input_dev = hidinput->input;
- tmff = kzalloc_obj(struct tmff_device, GFP_KERNEL);
+ tmff = kzalloc_obj(struct tmff_device);
if (!tmff)
return -ENOMEM;
diff --git a/drivers/hid/hid-uclogic-params.c b/drivers/hid/hid-uclogic-params.c
index 21b1d865bd0d..ed16f50f21ed 100644
--- a/drivers/hid/hid-uclogic-params.c
+++ b/drivers/hid/hid-uclogic-params.c
@@ -1358,13 +1358,13 @@ static int uclogic_params_ugee_v2_init_event_hooks(struct hid_device *hdev,
if (!uclogic_params_ugee_v2_has_battery(hdev))
return 0;
- p->event_hooks = kzalloc_obj(*p->event_hooks, GFP_KERNEL);
+ p->event_hooks = kzalloc_obj(*p->event_hooks);
if (!p->event_hooks)
return -ENOMEM;
INIT_LIST_HEAD(&p->event_hooks->list);
- event_hook = kzalloc_obj(*event_hook, GFP_KERNEL);
+ event_hook = kzalloc_obj(*event_hook);
if (!event_hook)
return -ENOMEM;
diff --git a/drivers/hid/hid-wiimote-core.c b/drivers/hid/hid-wiimote-core.c
index c24ccfc7c05a..63c4fa8fbb9b 100644
--- a/drivers/hid/hid-wiimote-core.c
+++ b/drivers/hid/hid-wiimote-core.c
@@ -1737,7 +1737,7 @@ static struct wiimote_data *wiimote_create(struct hid_device *hdev)
{
struct wiimote_data *wdata;
- wdata = kzalloc_obj(*wdata, GFP_KERNEL);
+ wdata = kzalloc_obj(*wdata);
if (!wdata)
return NULL;
diff --git a/drivers/hid/hid-wiimote-debug.c b/drivers/hid/hid-wiimote-debug.c
index 07d7137acfd4..5f74917781f2 100644
--- a/drivers/hid/hid-wiimote-debug.c
+++ b/drivers/hid/hid-wiimote-debug.c
@@ -174,7 +174,7 @@ int wiidebug_init(struct wiimote_data *wdata)
struct wiimote_debug *dbg;
unsigned long flags;
- dbg = kzalloc_obj(*dbg, GFP_KERNEL);
+ dbg = kzalloc_obj(*dbg);
if (!dbg)
return -ENOMEM;
diff --git a/drivers/hid/hid-zpff.c b/drivers/hid/hid-zpff.c
index b9d94b3fe8b2..d8e023c8aa84 100644
--- a/drivers/hid/hid-zpff.c
+++ b/drivers/hid/hid-zpff.c
@@ -71,7 +71,7 @@ static int zpff_init(struct hid_device *hid)
return -ENODEV;
}
- zpff = kzalloc_obj(struct zpff_device, GFP_KERNEL);
+ zpff = kzalloc_obj(struct zpff_device);
if (!zpff)
return -ENOMEM;
diff --git a/drivers/hid/hidraw.c b/drivers/hid/hidraw.c
index c3cd8521b695..9129fabed181 100644
--- a/drivers/hid/hidraw.c
+++ b/drivers/hid/hidraw.c
@@ -281,7 +281,7 @@ static int hidraw_open(struct inode *inode, struct file *file)
unsigned long flags;
int err = 0;
- if (!(list = kzalloc_obj(struct hidraw_list, GFP_KERNEL))) {
+ if (!(list = kzalloc_obj(struct hidraw_list))) {
err = -ENOMEM;
goto out;
}
@@ -603,7 +603,7 @@ int hidraw_connect(struct hid_device *hid)
/* we accept any HID device, all applications */
- dev = kzalloc_obj(struct hidraw, GFP_KERNEL);
+ dev = kzalloc_obj(struct hidraw);
if (!dev)
return -ENOMEM;
diff --git a/drivers/hid/intel-ish-hid/ishtp-hid.c b/drivers/hid/intel-ish-hid/ishtp-hid.c
index 48f06c93a07b..6e255b1bc721 100644
--- a/drivers/hid/intel-ish-hid/ishtp-hid.c
+++ b/drivers/hid/intel-ish-hid/ishtp-hid.c
@@ -214,7 +214,7 @@ int ishtp_hid_probe(unsigned int cur_hid_dev,
if (IS_ERR(hid))
return PTR_ERR(hid);
- hid_data = kzalloc_obj(*hid_data, GFP_KERNEL);
+ hid_data = kzalloc_obj(*hid_data);
if (!hid_data) {
rv = -ENOMEM;
goto err_hid_data;
diff --git a/drivers/hid/intel-ish-hid/ishtp/bus.c b/drivers/hid/intel-ish-hid/ishtp/bus.c
index ff60be49f2b8..44db90ad5495 100644
--- a/drivers/hid/intel-ish-hid/ishtp/bus.c
+++ b/drivers/hid/intel-ish-hid/ishtp/bus.c
@@ -435,7 +435,7 @@ static struct ishtp_cl_device *ishtp_bus_add_device(struct ishtp_device *dev,
}
spin_unlock_irqrestore(&dev->device_list_lock, flags);
- device = kzalloc_obj(struct ishtp_cl_device, GFP_KERNEL);
+ device = kzalloc_obj(struct ishtp_cl_device);
if (!device)
return NULL;
diff --git a/drivers/hid/intel-ish-hid/ishtp/client-buffers.c b/drivers/hid/intel-ish-hid/ishtp/client-buffers.c
index 717276f8460a..45ddc9a047bc 100644
--- a/drivers/hid/intel-ish-hid/ishtp/client-buffers.c
+++ b/drivers/hid/intel-ish-hid/ishtp/client-buffers.c
@@ -66,7 +66,7 @@ int ishtp_cl_alloc_tx_ring(struct ishtp_cl *cl)
for (j = 0; j < cl->tx_ring_size; ++j) {
struct ishtp_cl_tx_ring *tx_buf;
- tx_buf = kzalloc_obj(struct ishtp_cl_tx_ring, GFP_KERNEL);
+ tx_buf = kzalloc_obj(struct ishtp_cl_tx_ring);
if (!tx_buf)
goto out;
@@ -183,7 +183,7 @@ struct ishtp_cl_rb *ishtp_io_rb_init(struct ishtp_cl *cl)
{
struct ishtp_cl_rb *rb;
- rb = kzalloc_obj(struct ishtp_cl_rb, GFP_KERNEL);
+ rb = kzalloc_obj(struct ishtp_cl_rb);
if (!rb)
return NULL;
diff --git a/drivers/hid/intel-ish-hid/ishtp/client.c b/drivers/hid/intel-ish-hid/ishtp/client.c
index f22b2f85e70f..4824f3302927 100644
--- a/drivers/hid/intel-ish-hid/ishtp/client.c
+++ b/drivers/hid/intel-ish-hid/ishtp/client.c
@@ -105,7 +105,7 @@ struct ishtp_cl *ishtp_cl_allocate(struct ishtp_cl_device *cl_device)
{
struct ishtp_cl *cl;
- cl = kmalloc_obj(struct ishtp_cl, GFP_KERNEL);
+ cl = kmalloc_obj(struct ishtp_cl);
if (!cl)
return NULL;
diff --git a/drivers/hid/uhid.c b/drivers/hid/uhid.c
index a4f57143642c..524b53a3c87b 100644
--- a/drivers/hid/uhid.c
+++ b/drivers/hid/uhid.c
@@ -110,7 +110,7 @@ static int uhid_queue_event(struct uhid_device *uhid, __u32 event)
unsigned long flags;
struct uhid_event *ev;
- ev = kzalloc_obj(*ev, GFP_KERNEL);
+ ev = kzalloc_obj(*ev);
if (!ev)
return -ENOMEM;
@@ -129,7 +129,7 @@ static int uhid_hid_start(struct hid_device *hid)
struct uhid_event *ev;
unsigned long flags;
- ev = kzalloc_obj(*ev, GFP_KERNEL);
+ ev = kzalloc_obj(*ev);
if (!ev)
return -ENOMEM;
@@ -240,7 +240,7 @@ static int uhid_hid_get_report(struct hid_device *hid, unsigned char rnum,
if (!READ_ONCE(uhid->running))
return -EIO;
- ev = kzalloc_obj(*ev, GFP_KERNEL);
+ ev = kzalloc_obj(*ev);
if (!ev)
return -ENOMEM;
@@ -282,7 +282,7 @@ static int uhid_hid_set_report(struct hid_device *hid, unsigned char rnum,
if (!READ_ONCE(uhid->running) || count > UHID_DATA_MAX)
return -EIO;
- ev = kzalloc_obj(*ev, GFP_KERNEL);
+ ev = kzalloc_obj(*ev);
if (!ev)
return -ENOMEM;
@@ -365,7 +365,7 @@ static int uhid_hid_output_raw(struct hid_device *hid, __u8 *buf, size_t count,
if (count < 1 || count > UHID_DATA_MAX)
return -EINVAL;
- ev = kzalloc_obj(*ev, GFP_KERNEL);
+ ev = kzalloc_obj(*ev);
if (!ev)
return -ENOMEM;
@@ -433,7 +433,7 @@ static int uhid_event_from_user(const char __user *buffer, size_t len,
*/
struct uhid_create_req_compat *compat;
- compat = kzalloc_obj(*compat, GFP_KERNEL);
+ compat = kzalloc_obj(*compat);
if (!compat)
return -ENOMEM;
@@ -636,7 +636,7 @@ static int uhid_char_open(struct inode *inode, struct file *file)
{
struct uhid_device *uhid;
- uhid = kzalloc_obj(*uhid, GFP_KERNEL);
+ uhid = kzalloc_obj(*uhid);
if (!uhid)
return -ENOMEM;
diff --git a/drivers/hid/usbhid/hid-core.c b/drivers/hid/usbhid/hid-core.c
index 922022a9c253..ddd5d77fb5a5 100644
--- a/drivers/hid/usbhid/hid-core.c
+++ b/drivers/hid/usbhid/hid-core.c
@@ -858,7 +858,7 @@ static int hid_alloc_buffers(struct usb_device *dev, struct hid_device *hid)
&usbhid->inbuf_dma);
usbhid->outbuf = usb_alloc_coherent(dev, usbhid->bufsize, GFP_KERNEL,
&usbhid->outbuf_dma);
- usbhid->cr = kmalloc_obj(*usbhid->cr, GFP_KERNEL);
+ usbhid->cr = kmalloc_obj(*usbhid->cr);
usbhid->ctrlbuf = usb_alloc_coherent(dev, usbhid->bufsize, GFP_KERNEL,
&usbhid->ctrlbuf_dma);
if (!usbhid->inbuf || !usbhid->outbuf || !usbhid->cr ||
@@ -1430,7 +1430,7 @@ static int usbhid_probe(struct usb_interface *intf, const struct usb_device_id *
if (usb_string(dev, dev->descriptor.iSerialNumber, hid->uniq, 64) <= 0)
hid->uniq[0] = 0;
- usbhid = kzalloc_obj(*usbhid, GFP_KERNEL);
+ usbhid = kzalloc_obj(*usbhid);
if (usbhid == NULL) {
ret = -ENOMEM;
goto err;
diff --git a/drivers/hid/usbhid/hid-pidff.c b/drivers/hid/usbhid/hid-pidff.c
index 6719c976a3c3..fdcf03408f47 100644
--- a/drivers/hid/usbhid/hid-pidff.c
+++ b/drivers/hid/usbhid/hid-pidff.c
@@ -1528,7 +1528,7 @@ int hid_pidff_init_with_quirks(struct hid_device *hid, u32 initial_quirks)
return -ENODEV;
}
- pidff = kzalloc_obj(*pidff, GFP_KERNEL);
+ pidff = kzalloc_obj(*pidff);
if (!pidff)
return -ENOMEM;
diff --git a/drivers/hid/usbhid/hiddev.c b/drivers/hid/usbhid/hiddev.c
index 3a115ea49cd2..6378801b22c6 100644
--- a/drivers/hid/usbhid/hiddev.c
+++ b/drivers/hid/usbhid/hiddev.c
@@ -434,7 +434,7 @@ static noinline int hiddev_ioctl_usage(struct hiddev *hiddev, unsigned int cmd,
struct hid_field *field;
int i;
- uref_multi = kmalloc_obj(struct hiddev_usage_ref_multi, GFP_KERNEL);
+ uref_multi = kmalloc_obj(struct hiddev_usage_ref_multi);
if (!uref_multi)
return -ENOMEM;
uref = &uref_multi->uref;
@@ -890,7 +890,7 @@ int hiddev_connect(struct hid_device *hid, unsigned int force)
return -EINVAL;
}
- if (!(hiddev = kzalloc_obj(struct hiddev, GFP_KERNEL)))
+ if (!(hiddev = kzalloc_obj(struct hiddev)))
return -ENOMEM;
init_waitqueue_head(&hiddev->wait);
diff --git a/drivers/hid/usbhid/usbkbd.c b/drivers/hid/usbhid/usbkbd.c
index d32a860c6979..6b33e6ad0846 100644
--- a/drivers/hid/usbhid/usbkbd.c
+++ b/drivers/hid/usbhid/usbkbd.c
@@ -241,7 +241,7 @@ static int usb_kbd_alloc_mem(struct usb_device *dev, struct usb_kbd *kbd)
return -1;
if (!(kbd->new = usb_alloc_coherent(dev, 8, GFP_KERNEL, &kbd->new_dma)))
return -1;
- if (!(kbd->cr = kmalloc_obj(struct usb_ctrlrequest, GFP_KERNEL)))
+ if (!(kbd->cr = kmalloc_obj(struct usb_ctrlrequest)))
return -1;
if (!(kbd->leds = usb_alloc_coherent(dev, 1, GFP_KERNEL, &kbd->leds_dma)))
return -1;
@@ -281,7 +281,7 @@ static int usb_kbd_probe(struct usb_interface *iface,
pipe = usb_rcvintpipe(dev, endpoint->bEndpointAddress);
maxp = usb_maxpacket(dev, pipe);
- kbd = kzalloc_obj(struct usb_kbd, GFP_KERNEL);
+ kbd = kzalloc_obj(struct usb_kbd);
input_dev = input_allocate_device();
if (!kbd || !input_dev)
goto fail1;
diff --git a/drivers/hid/usbhid/usbmouse.c b/drivers/hid/usbhid/usbmouse.c
index da0d30de1d26..7cc4f9558e5f 100644
--- a/drivers/hid/usbhid/usbmouse.c
+++ b/drivers/hid/usbhid/usbmouse.c
@@ -125,7 +125,7 @@ static int usb_mouse_probe(struct usb_interface *intf, const struct usb_device_i
pipe = usb_rcvintpipe(dev, endpoint->bEndpointAddress);
maxp = usb_maxpacket(dev, pipe);
- mouse = kzalloc_obj(struct usb_mouse, GFP_KERNEL);
+ mouse = kzalloc_obj(struct usb_mouse);
input_dev = input_allocate_device();
if (!mouse || !input_dev)
goto fail1;
diff --git a/drivers/hid/wacom_sys.c b/drivers/hid/wacom_sys.c
index e2e9f8afec11..0d1c6d90fe21 100644
--- a/drivers/hid/wacom_sys.c
+++ b/drivers/hid/wacom_sys.c
@@ -892,7 +892,7 @@ static int wacom_add_shared_data(struct hid_device *hdev)
data = wacom_get_hdev_data(hdev);
if (!data) {
- data = kzalloc_obj(struct wacom_hdev_data, GFP_KERNEL);
+ data = kzalloc_obj(struct wacom_hdev_data);
if (!data) {
mutex_unlock(&wacom_udev_list_lock);
return -ENOMEM;
diff --git a/drivers/hsi/clients/cmt_speech.c b/drivers/hsi/clients/cmt_speech.c
index 5918401a4db9..d5aa87833768 100644
--- a/drivers/hsi/clients/cmt_speech.c
+++ b/drivers/hsi/clients/cmt_speech.c
@@ -273,7 +273,7 @@ static int cs_alloc_cmds(struct cs_hsi_iface *hi)
msg = hsi_alloc_msg(1, GFP_KERNEL);
if (!msg)
goto out;
- buf = kmalloc_obj(*buf, GFP_KERNEL);
+ buf = kmalloc_obj(*buf);
if (!buf) {
hsi_free_msg(msg);
goto out;
@@ -985,7 +985,7 @@ static int cs_hsi_start(struct cs_hsi_iface **hi, struct hsi_client *cl,
unsigned long mmap_base, unsigned long mmap_size)
{
int err = 0;
- struct cs_hsi_iface *hsi_if = kzalloc_obj(*hsi_if, GFP_KERNEL);
+ struct cs_hsi_iface *hsi_if = kzalloc_obj(*hsi_if);
dev_dbg(&cl->device, "cs_hsi_start\n");
diff --git a/drivers/hsi/clients/hsi_char.c b/drivers/hsi/clients/hsi_char.c
index 3258a7cf81ac..a31cc1466dd3 100644
--- a/drivers/hsi/clients/hsi_char.c
+++ b/drivers/hsi/clients/hsi_char.c
@@ -683,7 +683,7 @@ static int hsc_probe(struct device *dev)
int ret;
int i;
- cl_data = kzalloc_obj(*cl_data, GFP_KERNEL);
+ cl_data = kzalloc_obj(*cl_data);
if (!cl_data)
return -ENOMEM;
diff --git a/drivers/hsi/clients/ssi_protocol.c b/drivers/hsi/clients/ssi_protocol.c
index e7bb2803ace5..7c6ca8391a6b 100644
--- a/drivers/hsi/clients/ssi_protocol.c
+++ b/drivers/hsi/clients/ssi_protocol.c
@@ -259,7 +259,7 @@ static int ssip_alloc_cmds(struct ssi_protocol *ssi)
msg = hsi_alloc_msg(1, GFP_KERNEL);
if (!msg)
goto out;
- buf = kmalloc_obj(*buf, GFP_KERNEL);
+ buf = kmalloc_obj(*buf);
if (!buf) {
hsi_free_msg(msg);
goto out;
@@ -1077,7 +1077,7 @@ static int ssi_protocol_probe(struct device *dev)
struct ssi_protocol *ssi;
int err;
- ssi = kzalloc_obj(*ssi, GFP_KERNEL);
+ ssi = kzalloc_obj(*ssi);
if (!ssi)
return -ENOMEM;
diff --git a/drivers/hsi/hsi_boardinfo.c b/drivers/hsi/hsi_boardinfo.c
index 109b0fb71a9a..8c79e4062798 100644
--- a/drivers/hsi/hsi_boardinfo.c
+++ b/drivers/hsi/hsi_boardinfo.c
@@ -36,7 +36,7 @@ int __init hsi_register_board_info(struct hsi_board_info const *info,
{
struct hsi_cl_info *cl_info;
- cl_info = kzalloc_objs(*cl_info, len, GFP_KERNEL);
+ cl_info = kzalloc_objs(*cl_info, len);
if (!cl_info)
return -ENOMEM;
diff --git a/drivers/hsi/hsi_core.c b/drivers/hsi/hsi_core.c
index 84792da4caca..7cb2dcb30fdb 100644
--- a/drivers/hsi/hsi_core.c
+++ b/drivers/hsi/hsi_core.c
@@ -70,7 +70,7 @@ struct hsi_client *hsi_new_client(struct hsi_port *port,
struct hsi_client *cl;
size_t size;
- cl = kzalloc_obj(*cl, GFP_KERNEL);
+ cl = kzalloc_obj(*cl);
if (!cl)
goto err;
@@ -203,7 +203,7 @@ static void hsi_add_client_from_dt(struct hsi_port *port,
char name[32];
int length, cells, err, i, max_chan, mode;
- cl = kzalloc_obj(*cl, GFP_KERNEL);
+ cl = kzalloc_obj(*cl);
if (!cl)
return;
@@ -253,13 +253,13 @@ static void hsi_add_client_from_dt(struct hsi_port *port,
cl->rx_cfg.num_channels = cells;
cl->tx_cfg.num_channels = cells;
- cl->rx_cfg.channels = kzalloc_objs(channel, cells, GFP_KERNEL);
+ cl->rx_cfg.channels = kzalloc_objs(channel, cells);
if (!cl->rx_cfg.channels) {
err = -ENOMEM;
goto err;
}
- cl->tx_cfg.channels = kzalloc_objs(channel, cells, GFP_KERNEL);
+ cl->tx_cfg.channels = kzalloc_objs(channel, cells);
if (!cl->tx_cfg.channels) {
err = -ENOMEM;
goto err2;
diff --git a/drivers/hv/hv_kvp.c b/drivers/hv/hv_kvp.c
index 29ef1dc5c184..0d73daf745a7 100644
--- a/drivers/hv/hv_kvp.c
+++ b/drivers/hv/hv_kvp.c
@@ -134,7 +134,7 @@ kvp_register(int reg_value)
struct hv_kvp_msg *kvp_msg;
char *version;
- kvp_msg = kzalloc_obj(*kvp_msg, GFP_KERNEL);
+ kvp_msg = kzalloc_obj(*kvp_msg);
if (kvp_msg) {
version = kvp_msg->body.kvp_register.version;
@@ -385,7 +385,7 @@ kvp_send_key(struct work_struct *dummy)
if (kvp_transaction.state != HVUTIL_HOSTMSG_RECEIVED)
return;
- message = kzalloc_obj(*message, GFP_KERNEL);
+ message = kzalloc_obj(*message);
if (!message)
return;
diff --git a/drivers/hv/hv_proc.c b/drivers/hv/hv_proc.c
index 216a0e8fd15b..3cb4b2a3035c 100644
--- a/drivers/hv/hv_proc.c
+++ b/drivers/hv/hv_proc.c
@@ -40,7 +40,7 @@ int hv_call_deposit_pages(int node, u64 partition_id, u32 num_pages)
return -ENOMEM;
pages = page_address(page);
- counts = kzalloc_objs(int, HV_DEPOSIT_MAX, GFP_KERNEL);
+ counts = kzalloc_objs(int, HV_DEPOSIT_MAX);
if (!counts) {
free_page((unsigned long)pages);
return -ENOMEM;
diff --git a/drivers/hv/hv_snapshot.c b/drivers/hv/hv_snapshot.c
index 50f9348789ee..506871aeacf0 100644
--- a/drivers/hv/hv_snapshot.c
+++ b/drivers/hv/hv_snapshot.c
@@ -184,7 +184,7 @@ static void vss_send_op(void)
return;
}
- vss_msg = kzalloc_obj(*vss_msg, GFP_KERNEL);
+ vss_msg = kzalloc_obj(*vss_msg);
if (!vss_msg)
return;
@@ -424,7 +424,7 @@ int hv_vss_pre_suspend(void)
* write() will fail with EINVAL (see vss_on_msg()), and the daemon
* will reset the device by closing and re-opening it.
*/
- vss_msg = kzalloc_obj(*vss_msg, GFP_KERNEL);
+ vss_msg = kzalloc_obj(*vss_msg);
if (!vss_msg)
return -ENOMEM;
diff --git a/drivers/hv/hv_utils_transport.c b/drivers/hv/hv_utils_transport.c
index 43b7ffae8852..c3be5c570263 100644
--- a/drivers/hv/hv_utils_transport.c
+++ b/drivers/hv/hv_utils_transport.c
@@ -274,7 +274,7 @@ struct hvutil_transport *hvutil_transport_init(const char *name,
{
struct hvutil_transport *hvt;
- hvt = kzalloc_obj(*hvt, GFP_KERNEL);
+ hvt = kzalloc_obj(*hvt);
if (!hvt)
return NULL;
diff --git a/drivers/hv/mshv_debugfs.c b/drivers/hv/mshv_debugfs.c
index 6a080d728836..418b6dc8f3c2 100644
--- a/drivers/hv/mshv_debugfs.c
+++ b/drivers/hv/mshv_debugfs.c
@@ -511,7 +511,7 @@ static int __init mshv_debugfs_parent_partition_create(void)
if (err)
goto remove_debugfs_partition;
- parent_vp_stats = kzalloc_objs(*parent_vp_stats, nr_cpu_ids, GFP_KERNEL);
+ parent_vp_stats = kzalloc_objs(*parent_vp_stats, nr_cpu_ids);
if (!parent_vp_stats) {
err = -ENOMEM;
goto remove_debugfs_partition;
diff --git a/drivers/hv/mshv_eventfd.c b/drivers/hv/mshv_eventfd.c
index 5b3c09f08a1e..d8471546e6a0 100644
--- a/drivers/hv/mshv_eventfd.c
+++ b/drivers/hv/mshv_eventfd.c
@@ -394,7 +394,7 @@ static int mshv_irqfd_assign(struct mshv_partition *pt,
CLASS(fd, f)(args->fd);
- irqfd = kzalloc_obj(*irqfd, GFP_KERNEL);
+ irqfd = kzalloc_obj(*irqfd);
if (!irqfd)
return -ENOMEM;
@@ -707,7 +707,7 @@ static int mshv_assign_ioeventfd(struct mshv_partition *pt,
if (IS_ERR(eventfd))
return PTR_ERR(eventfd);
- p = kzalloc_obj(*p, GFP_KERNEL);
+ p = kzalloc_obj(*p);
if (!p) {
ret = -ENOMEM;
goto fail;
diff --git a/drivers/hv/mshv_root_main.c b/drivers/hv/mshv_root_main.c
index 4715d23d22f2..82ff823ef0ca 100644
--- a/drivers/hv/mshv_root_main.c
+++ b/drivers/hv/mshv_root_main.c
@@ -713,7 +713,7 @@ mshv_vp_ioctl_get_set_state_pfn(struct mshv_vp *vp,
return -EOVERFLOW;
/* Pin user pages so hypervisor can copy directly to them */
- pages = kzalloc_objs(struct page *, page_count, GFP_KERNEL);
+ pages = kzalloc_objs(struct page *, page_count);
if (!pages)
return -ENOMEM;
@@ -1072,7 +1072,7 @@ mshv_partition_ioctl_create_vp(struct mshv_partition *partition,
if (ret)
goto unmap_ghcb_page;
- vp = kzalloc_obj(*vp, GFP_KERNEL);
+ vp = kzalloc_obj(*vp);
if (!vp)
goto unmap_stats_pages;
@@ -1977,7 +1977,7 @@ mshv_ioctl_create_partition(void __user *user_arg, struct device *module_dev)
if (ret)
return ret;
- partition = kzalloc_obj(*partition, GFP_KERNEL);
+ partition = kzalloc_obj(*partition);
if (!partition)
return -ENOMEM;
diff --git a/drivers/hv/mshv_synic.c b/drivers/hv/mshv_synic.c
index 49e3a59ffb90..216065e21d28 100644
--- a/drivers/hv/mshv_synic.c
+++ b/drivers/hv/mshv_synic.c
@@ -605,7 +605,7 @@ mshv_register_doorbell(u64 partition_id, doorbell_cb_t doorbell_cb, void *data,
union hv_port_id port_id = { 0 };
int ret;
- port_table_info = kmalloc_obj(*port_table_info, GFP_KERNEL);
+ port_table_info = kmalloc_obj(*port_table_info);
if (!port_table_info)
return -ENOMEM;
diff --git a/drivers/hv/mshv_vtl_main.c b/drivers/hv/mshv_vtl_main.c
index 916021a175f3..5856975f32e1 100644
--- a/drivers/hv/mshv_vtl_main.c
+++ b/drivers/hv/mshv_vtl_main.c
@@ -117,7 +117,7 @@ mshv_ioctl_create_vtl(void __user *user_arg, struct device *module_dev)
struct file *file;
int fd;
- vtl = kzalloc_obj(*vtl, GFP_KERNEL);
+ vtl = kzalloc_obj(*vtl);
if (!vtl)
return -ENOMEM;
@@ -393,7 +393,7 @@ static int mshv_vtl_ioctl_add_vtl0_mem(struct mshv_vtl *vtl, void __user *arg)
return -EFAULT;
}
- pgmap = kzalloc_obj(*pgmap, GFP_KERNEL);
+ pgmap = kzalloc_obj(*pgmap);
if (!pgmap)
return -ENOMEM;
@@ -1344,7 +1344,7 @@ static int __init mshv_vtl_init(void)
/*
* "mshv vtl mem dev" device is later used to setup VTL0 memory.
*/
- mem_dev = kzalloc_obj(*mem_dev, GFP_KERNEL);
+ mem_dev = kzalloc_obj(*mem_dev);
if (!mem_dev) {
ret = -ENOMEM;
goto free_low;
diff --git a/drivers/hv/vmbus_drv.c b/drivers/hv/vmbus_drv.c
index 3119f68fd27b..bc4fc1951ae1 100644
--- a/drivers/hv/vmbus_drv.c
+++ b/drivers/hv/vmbus_drv.c
@@ -756,7 +756,7 @@ static int vmbus_add_dynid(struct hv_driver *drv, guid_t *guid)
{
struct vmbus_dynid *dynid;
- dynid = kzalloc_obj(*dynid, GFP_KERNEL);
+ dynid = kzalloc_obj(*dynid);
if (!dynid)
return -ENOMEM;
@@ -2156,7 +2156,7 @@ struct hv_device *vmbus_device_create(const guid_t *type,
{
struct hv_device *child_device_obj;
- child_device_obj = kzalloc_obj(struct hv_device, GFP_KERNEL);
+ child_device_obj = kzalloc_obj(struct hv_device);
if (!child_device_obj) {
pr_err("Unable to allocate device object for child device\n");
return NULL;
@@ -2672,7 +2672,7 @@ static int vmbus_device_add(struct platform_device *pdev)
for_each_of_range(&parser, &range) {
struct resource *res;
- res = kzalloc_obj(*res, GFP_KERNEL);
+ res = kzalloc_obj(*res);
if (!res) {
vmbus_mmio_remove();
return -ENOMEM;
diff --git a/drivers/hwmon/acpi_power_meter.c b/drivers/hwmon/acpi_power_meter.c
index 1fa3657f4630..2da06524bdb3 100644
--- a/drivers/hwmon/acpi_power_meter.c
+++ b/drivers/hwmon/acpi_power_meter.c
@@ -892,7 +892,7 @@ static int acpi_power_meter_add(struct acpi_device *device)
if (!device)
return -EINVAL;
- resource = kzalloc_obj(*resource, GFP_KERNEL);
+ resource = kzalloc_obj(*resource);
if (!resource)
return -ENOMEM;
diff --git a/drivers/hwmon/applesmc.c b/drivers/hwmon/applesmc.c
index 0dbad1d3808c..24f3e86d0ebf 100644
--- a/drivers/hwmon/applesmc.c
+++ b/drivers/hwmon/applesmc.c
@@ -586,7 +586,7 @@ static int applesmc_init_smcreg_try(void)
s->key_count = count;
if (!s->cache)
- s->cache = kzalloc_objs(*s->cache, s->key_count, GFP_KERNEL);
+ s->cache = kzalloc_objs(*s->cache, s->key_count);
if (!s->cache)
return -ENOMEM;
@@ -1141,7 +1141,7 @@ static int applesmc_create_nodes(struct applesmc_node_group *groups, int num)
int ret, i;
for (grp = groups; grp->format; grp++) {
- grp->nodes = kzalloc_objs(*node, num + 1, GFP_KERNEL);
+ grp->nodes = kzalloc_objs(*node, num + 1);
if (!grp->nodes) {
ret = -ENOMEM;
goto out;
diff --git a/drivers/hwmon/coretemp.c b/drivers/hwmon/coretemp.c
index eb00a9f08955..ad9d5c5702b1 100644
--- a/drivers/hwmon/coretemp.c
+++ b/drivers/hwmon/coretemp.c
@@ -498,7 +498,7 @@ init_temp_data(struct platform_data *pdata, unsigned int cpu, int pkg_flag)
return NULL;
}
- tdata = kzalloc_obj(struct temp_data, GFP_KERNEL);
+ tdata = kzalloc_obj(struct temp_data);
if (!tdata)
return NULL;
@@ -625,7 +625,7 @@ static int coretemp_device_add(int zoneid)
int err;
/* Initialize the per-zone data structures */
- pdata = kzalloc_obj(*pdata, GFP_KERNEL);
+ pdata = kzalloc_obj(*pdata);
if (!pdata)
return -ENOMEM;
diff --git a/drivers/hwmon/drivetemp.c b/drivers/hwmon/drivetemp.c
index f2fa7223be7a..002e0660a0b8 100644
--- a/drivers/hwmon/drivetemp.c
+++ b/drivers/hwmon/drivetemp.c
@@ -556,7 +556,7 @@ static int drivetemp_add(struct device *dev)
struct drivetemp_data *st;
int err;
- st = kzalloc_obj(*st, GFP_KERNEL);
+ st = kzalloc_obj(*st);
if (!st)
return -ENOMEM;
diff --git a/drivers/hwmon/fschmd.c b/drivers/hwmon/fschmd.c
index 740d46634b4c..1211fa2259e5 100644
--- a/drivers/hwmon/fschmd.c
+++ b/drivers/hwmon/fschmd.c
@@ -1088,7 +1088,7 @@ static int fschmd_probe(struct i2c_client *client)
int i, err;
enum chips kind = (uintptr_t)i2c_get_match_data(client);
- data = kzalloc_obj(struct fschmd_data, GFP_KERNEL);
+ data = kzalloc_obj(struct fschmd_data);
if (!data)
return -ENOMEM;
diff --git a/drivers/hwmon/hwmon.c b/drivers/hwmon/hwmon.c
index a1173ea0b029..9695dca62a7e 100644
--- a/drivers/hwmon/hwmon.c
+++ b/drivers/hwmon/hwmon.c
@@ -533,7 +533,7 @@ static struct attribute *hwmon_genattr(const void *drvdata,
if ((mode & 0222) && !ops->write)
return ERR_PTR(-EINVAL);
- hattr = kzalloc_obj(*hattr, GFP_KERNEL);
+ hattr = kzalloc_obj(*hattr);
if (!hattr)
return ERR_PTR(-ENOMEM);
@@ -879,7 +879,7 @@ __hwmon_create_attrs(const void *drvdata, const struct hwmon_chip_info *chip)
if (nattrs == 0)
return ERR_PTR(-EINVAL);
- attrs = kzalloc_objs(*attrs, nattrs + 1, GFP_KERNEL);
+ attrs = kzalloc_objs(*attrs, nattrs + 1);
if (!attrs)
return ERR_PTR(-ENOMEM);
@@ -917,7 +917,7 @@ __hwmon_device_register(struct device *dev, const char *name, void *drvdata,
if (id < 0)
return ERR_PTR(id);
- hwdev = kzalloc_obj(*hwdev, GFP_KERNEL);
+ hwdev = kzalloc_obj(*hwdev);
if (hwdev == NULL) {
err = -ENOMEM;
goto ida_remove;
@@ -933,7 +933,7 @@ __hwmon_device_register(struct device *dev, const char *name, void *drvdata,
for (i = 0; groups[i]; i++)
ngroups++;
- hwdev->groups = kzalloc_objs(*groups, ngroups, GFP_KERNEL);
+ hwdev->groups = kzalloc_objs(*groups, ngroups);
if (!hwdev->groups) {
err = -ENOMEM;
goto free_hwmon;
diff --git a/drivers/hwmon/i5k_amb.c b/drivers/hwmon/i5k_amb.c
index f3835606179c..de486e69e6b8 100644
--- a/drivers/hwmon/i5k_amb.c
+++ b/drivers/hwmon/i5k_amb.c
@@ -494,7 +494,7 @@ static int i5k_amb_probe(struct platform_device *pdev)
struct resource *reso;
int i, res;
- data = kzalloc_obj(*data, GFP_KERNEL);
+ data = kzalloc_obj(*data);
if (!data)
return -ENOMEM;
diff --git a/drivers/hwmon/ibmaem.c b/drivers/hwmon/ibmaem.c
index e62e7bab0865..0a9c3a29e6f2 100644
--- a/drivers/hwmon/ibmaem.c
+++ b/drivers/hwmon/ibmaem.c
@@ -517,7 +517,7 @@ static int aem_init_aem1_inst(struct aem_ipmi_data *probe, u8 module_handle)
int i;
int res = -ENOMEM;
- data = kzalloc_obj(*data, GFP_KERNEL);
+ data = kzalloc_obj(*data);
if (!data)
return res;
mutex_init(&data->lock);
@@ -657,7 +657,7 @@ static int aem_init_aem2_inst(struct aem_ipmi_data *probe,
int i;
int res = -ENOMEM;
- data = kzalloc_obj(*data, GFP_KERNEL);
+ data = kzalloc_obj(*data);
if (!data)
return res;
mutex_init(&data->lock);
diff --git a/drivers/hwmon/ibmpex.c b/drivers/hwmon/ibmpex.c
index 331aa8159ab8..949bc2403b2d 100644
--- a/drivers/hwmon/ibmpex.c
+++ b/drivers/hwmon/ibmpex.c
@@ -438,7 +438,7 @@ static void ibmpex_register_bmc(int iface, struct device *dev)
struct ibmpex_bmc_data *data;
int err;
- data = kzalloc_obj(*data, GFP_KERNEL);
+ data = kzalloc_obj(*data);
if (!data)
return;
diff --git a/drivers/hwmon/sch56xx-common.c b/drivers/hwmon/sch56xx-common.c
index 1b0442fe2bf3..a385aae3bb0f 100644
--- a/drivers/hwmon/sch56xx-common.c
+++ b/drivers/hwmon/sch56xx-common.c
@@ -330,7 +330,7 @@ struct regmap *devm_regmap_init_sch56xx(struct device *dev, struct mutex *lock,
if (config->reg_bits != 16 && config->val_bits != 8)
return ERR_PTR(-EOPNOTSUPP);
- context = kzalloc_obj(*context, GFP_KERNEL);
+ context = kzalloc_obj(*context);
if (!context)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/hwmon/via-cputemp.c b/drivers/hwmon/via-cputemp.c
index 72a4f514a78c..a5c03ed59c1f 100644
--- a/drivers/hwmon/via-cputemp.c
+++ b/drivers/hwmon/via-cputemp.c
@@ -222,7 +222,7 @@ static int via_cputemp_online(unsigned int cpu)
goto exit;
}
- pdev_entry = kzalloc_obj(struct pdev_entry, GFP_KERNEL);
+ pdev_entry = kzalloc_obj(struct pdev_entry);
if (!pdev_entry) {
err = -ENOMEM;
goto exit_device_put;
diff --git a/drivers/hwmon/w83793.c b/drivers/hwmon/w83793.c
index 8081ef3b1592..24772cfbecb3 100644
--- a/drivers/hwmon/w83793.c
+++ b/drivers/hwmon/w83793.c
@@ -1650,7 +1650,7 @@ static int w83793_probe(struct i2c_client *client)
int files_pwm = ARRAY_SIZE(w83793_left_pwm) / 5;
int files_temp = ARRAY_SIZE(w83793_temp) / 6;
- data = kzalloc_obj(struct w83793_data, GFP_KERNEL);
+ data = kzalloc_obj(struct w83793_data);
if (!data) {
err = -ENOMEM;
goto exit;
diff --git a/drivers/hwtracing/coresight/coresight-catu.c b/drivers/hwtracing/coresight/coresight-catu.c
index 4123d4e16bbe..dfd035852b12 100644
--- a/drivers/hwtracing/coresight/coresight-catu.c
+++ b/drivers/hwtracing/coresight/coresight-catu.c
@@ -337,7 +337,7 @@ static int catu_alloc_etr_buf(struct tmc_drvdata *tmc_drvdata,
csdev = tmc_etr_get_catu_device(tmc_drvdata);
if (!csdev)
return -ENODEV;
- catu_buf = kzalloc_obj(*catu_buf, GFP_KERNEL);
+ catu_buf = kzalloc_obj(*catu_buf);
if (!catu_buf)
return -ENOMEM;
diff --git a/drivers/hwtracing/coresight/coresight-core.c b/drivers/hwtracing/coresight/coresight-core.c
index b03d228f6bf7..80e26396ad0a 100644
--- a/drivers/hwtracing/coresight/coresight-core.c
+++ b/drivers/hwtracing/coresight/coresight-core.c
@@ -821,7 +821,7 @@ static int _coresight_build_path(struct coresight_device *csdev,
if (ret)
return ret;
- node = kzalloc_obj(struct coresight_node, GFP_KERNEL);
+ node = kzalloc_obj(struct coresight_node);
if (!node)
return -ENOMEM;
@@ -840,7 +840,7 @@ struct coresight_path *coresight_build_path(struct coresight_device *source,
if (!sink)
return ERR_PTR(-EINVAL);
- path = kzalloc_obj(struct coresight_path, GFP_KERNEL);
+ path = kzalloc_obj(struct coresight_path);
if (!path)
return ERR_PTR(-ENOMEM);
@@ -1327,7 +1327,7 @@ struct coresight_device *coresight_register(struct coresight_desc *desc)
struct coresight_device *csdev;
bool registered = false;
- csdev = kzalloc_obj(*csdev, GFP_KERNEL);
+ csdev = kzalloc_obj(*csdev);
if (!csdev) {
ret = -ENOMEM;
goto err_out;
diff --git a/drivers/hwtracing/coresight/coresight-cti-platform.c b/drivers/hwtracing/coresight/coresight-cti-platform.c
index ecb0bdc2c3e6..4eff96f48594 100644
--- a/drivers/hwtracing/coresight/coresight-cti-platform.c
+++ b/drivers/hwtracing/coresight/coresight-cti-platform.c
@@ -325,7 +325,7 @@ static int cti_plat_process_filter_sigs(struct cti_drvdata *drvdata,
if (nr_filter_sigs > drvdata->config.nr_trig_max)
return -EINVAL;
- tg = kzalloc_obj(*tg, GFP_KERNEL);
+ tg = kzalloc_obj(*tg);
if (!tg)
return -ENOMEM;
diff --git a/drivers/hwtracing/coresight/coresight-etm-perf.c b/drivers/hwtracing/coresight/coresight-etm-perf.c
index 01d4c422fed9..72017dcc3b7f 100644
--- a/drivers/hwtracing/coresight/coresight-etm-perf.c
+++ b/drivers/hwtracing/coresight/coresight-etm-perf.c
@@ -260,7 +260,7 @@ static void *alloc_event_data(int cpu)
struct etm_event_data *event_data;
/* First get memory for the session's data */
- event_data = kzalloc_obj(struct etm_event_data, GFP_KERNEL);
+ event_data = kzalloc_obj(struct etm_event_data);
if (!event_data)
return NULL;
diff --git a/drivers/hwtracing/coresight/coresight-syscfg.c b/drivers/hwtracing/coresight/coresight-syscfg.c
index de2f6947f521..d7f5037953d6 100644
--- a/drivers/hwtracing/coresight/coresight-syscfg.c
+++ b/drivers/hwtracing/coresight/coresight-syscfg.c
@@ -756,7 +756,7 @@ static int cscfg_list_add_csdev(struct coresight_device *csdev,
struct cscfg_registered_csdev *csdev_item;
/* allocate the list entry structure */
- csdev_item = kzalloc_obj(struct cscfg_registered_csdev, GFP_KERNEL);
+ csdev_item = kzalloc_obj(struct cscfg_registered_csdev);
if (!csdev_item)
return -ENOMEM;
@@ -1190,7 +1190,7 @@ static int cscfg_create_device(void)
goto create_dev_exit_unlock;
}
- cscfg_mgr = kzalloc_obj(struct cscfg_manager, GFP_KERNEL);
+ cscfg_mgr = kzalloc_obj(struct cscfg_manager);
if (!cscfg_mgr)
goto create_dev_exit_unlock;
diff --git a/drivers/hwtracing/coresight/coresight-tmc-etr.c b/drivers/hwtracing/coresight/coresight-tmc-etr.c
index 7aca22d6e335..5ddd979a1b10 100644
--- a/drivers/hwtracing/coresight/coresight-tmc-etr.c
+++ b/drivers/hwtracing/coresight/coresight-tmc-etr.c
@@ -208,7 +208,7 @@ static int tmc_pages_alloc(struct tmc_pages *tmc_pages,
GFP_KERNEL);
if (!tmc_pages->daddrs)
return -ENOMEM;
- tmc_pages->pages = kzalloc_objs(*tmc_pages->pages, nr_pages, GFP_KERNEL);
+ tmc_pages->pages = kzalloc_objs(*tmc_pages->pages, nr_pages);
if (!tmc_pages->pages) {
kfree(tmc_pages->daddrs);
tmc_pages->daddrs = NULL;
@@ -331,7 +331,7 @@ struct tmc_sg_table *tmc_alloc_sg_table(struct device *dev,
long rc;
struct tmc_sg_table *sg_table;
- sg_table = kzalloc_obj(*sg_table, GFP_KERNEL);
+ sg_table = kzalloc_obj(*sg_table);
if (!sg_table)
return ERR_PTR(-ENOMEM);
sg_table->data_pages.nr_pages = nr_dpages;
@@ -574,7 +574,7 @@ tmc_init_etr_sg_table(struct device *dev, int node,
struct tmc_sg_table *sg_table;
struct etr_sg_table *etr_table;
- etr_table = kzalloc_obj(*etr_table, GFP_KERNEL);
+ etr_table = kzalloc_obj(*etr_table);
if (!etr_table)
return ERR_PTR(-ENOMEM);
nr_entries = tmc_etr_sg_table_entries(nr_dpages);
@@ -611,7 +611,7 @@ static int tmc_etr_alloc_flat_buf(struct tmc_drvdata *drvdata,
if (pages)
return -EINVAL;
- flat_buf = kzalloc_obj(*flat_buf, GFP_KERNEL);
+ flat_buf = kzalloc_obj(*flat_buf);
if (!flat_buf)
return -ENOMEM;
@@ -709,7 +709,7 @@ static int tmc_etr_alloc_resrv_buf(struct tmc_drvdata *drvdata,
if (pages)
return -EINVAL;
- resrv_buf = kzalloc_obj(*resrv_buf, GFP_KERNEL);
+ resrv_buf = kzalloc_obj(*resrv_buf);
if (!resrv_buf)
return -ENOMEM;
@@ -941,7 +941,7 @@ static struct etr_buf *tmc_alloc_etr_buf(struct tmc_drvdata *drvdata,
struct device *dev = &drvdata->csdev->dev;
get_etr_buf_hw(dev, &buf_hw);
- etr_buf = kzalloc_obj(*etr_buf, GFP_KERNEL);
+ etr_buf = kzalloc_obj(*etr_buf);
if (!etr_buf)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/hwtracing/coresight/coresight-trbe.c b/drivers/hwtracing/coresight/coresight-trbe.c
index 257dd5689c81..1511f8eb95af 100644
--- a/drivers/hwtracing/coresight/coresight-trbe.c
+++ b/drivers/hwtracing/coresight/coresight-trbe.c
@@ -751,7 +751,7 @@ static void *arm_trbe_alloc_buffer(struct coresight_device *csdev,
if (!buf)
return NULL;
- pglist = kzalloc_objs(*pglist, nr_pages, GFP_KERNEL);
+ pglist = kzalloc_objs(*pglist, nr_pages);
if (!pglist) {
kfree(buf);
return NULL;
diff --git a/drivers/hwtracing/intel_th/core.c b/drivers/hwtracing/intel_th/core.c
index 641efa0016e0..3924e63e2eee 100644
--- a/drivers/hwtracing/intel_th/core.c
+++ b/drivers/hwtracing/intel_th/core.c
@@ -891,7 +891,7 @@ intel_th_alloc(struct device *dev, const struct intel_th_drvdata *drvdata,
int err, r, nr_mmios = 0;
struct intel_th *th;
- th = kzalloc_obj(*th, GFP_KERNEL);
+ th = kzalloc_obj(*th);
if (!th)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/hwtracing/intel_th/msu-sink.c b/drivers/hwtracing/intel_th/msu-sink.c
index d3373be9109b..b809a7f805a9 100644
--- a/drivers/hwtracing/intel_th/msu-sink.c
+++ b/drivers/hwtracing/intel_th/msu-sink.c
@@ -23,7 +23,7 @@ static void *msu_sink_assign(struct device *dev, int *mode)
{
struct msu_sink_private *priv;
- priv = kzalloc_obj(*priv, GFP_KERNEL);
+ priv = kzalloc_obj(*priv);
if (!priv)
return NULL;
diff --git a/drivers/hwtracing/intel_th/msu.c b/drivers/hwtracing/intel_th/msu.c
index 33e16c40f0ec..a82cf74f39ad 100644
--- a/drivers/hwtracing/intel_th/msu.c
+++ b/drivers/hwtracing/intel_th/msu.c
@@ -236,7 +236,7 @@ int intel_th_msu_buffer_register(const struct msu_buffer *mbuf,
struct msu_buffer_entry *mbe;
int ret = 0;
- mbe = kzalloc_obj(*mbe, GFP_KERNEL);
+ mbe = kzalloc_obj(*mbe);
if (!mbe)
return -ENOMEM;
@@ -450,7 +450,7 @@ static struct msc_iter *msc_iter_install(struct msc *msc)
{
struct msc_iter *iter;
- iter = kzalloc_obj(*iter, GFP_KERNEL);
+ iter = kzalloc_obj(*iter);
if (!iter)
return ERR_PTR(-ENOMEM);
@@ -1105,7 +1105,7 @@ static int msc_buffer_win_alloc(struct msc *msc, unsigned int nr_blocks)
if (!nr_blocks)
return 0;
- win = kzalloc_obj(*win, GFP_KERNEL);
+ win = kzalloc_obj(*win);
if (!win)
return -ENOMEM;
diff --git a/drivers/hwtracing/ptt/hisi_ptt.c b/drivers/hwtracing/ptt/hisi_ptt.c
index 3d7a80dacce5..94c371c49135 100644
--- a/drivers/hwtracing/ptt/hisi_ptt.c
+++ b/drivers/hwtracing/ptt/hisi_ptt.c
@@ -384,7 +384,7 @@ hisi_ptt_alloc_add_filter(struct hisi_ptt *hisi_ptt, u16 devid, bool is_port)
return NULL;
}
- filter = kzalloc_obj(*filter, GFP_KERNEL);
+ filter = kzalloc_obj(*filter);
if (!filter) {
pci_err(hisi_ptt->pdev, "failed to add filter for %s\n",
filter_name);
@@ -1043,11 +1043,11 @@ static void *hisi_ptt_pmu_setup_aux(struct perf_event *event, void **pages,
if (nr_pages < HISI_PTT_TRACE_TOTAL_BUF_SIZE / PAGE_SIZE)
return NULL;
- buf = kzalloc_obj(*buf, GFP_KERNEL);
+ buf = kzalloc_obj(*buf);
if (!buf)
return NULL;
- pagelist = kzalloc_objs(*pagelist, nr_pages, GFP_KERNEL);
+ pagelist = kzalloc_objs(*pagelist, nr_pages);
if (!pagelist)
goto err;
diff --git a/drivers/hwtracing/stm/core.c b/drivers/hwtracing/stm/core.c
index b3df3104aa3d..37584e786bb5 100644
--- a/drivers/hwtracing/stm/core.c
+++ b/drivers/hwtracing/stm/core.c
@@ -406,7 +406,7 @@ int stm_register_protocol(const struct stm_protocol_driver *pdrv)
goto unlock;
}
- pe = kzalloc_obj(*pe, GFP_KERNEL);
+ pe = kzalloc_obj(*pe);
if (!pe)
goto unlock;
@@ -493,7 +493,7 @@ static int stm_char_open(struct inode *inode, struct file *file)
if (!dev)
return -ENODEV;
- stmf = kzalloc_obj(*stmf, GFP_KERNEL);
+ stmf = kzalloc_obj(*stmf);
if (!stmf)
goto err_put_device;
@@ -1229,7 +1229,7 @@ int stm_source_register_device(struct device *parent,
if (!stm_core_up)
return -EPROBE_DEFER;
- src = kzalloc_obj(*src, GFP_KERNEL);
+ src = kzalloc_obj(*src);
if (!src)
return -ENOMEM;
diff --git a/drivers/hwtracing/stm/policy.c b/drivers/hwtracing/stm/policy.c
index f0f8876008ed..fabaf4b14889 100644
--- a/drivers/hwtracing/stm/policy.c
+++ b/drivers/hwtracing/stm/policy.c
@@ -437,7 +437,7 @@ stp_policy_make(struct config_group *group, const char *name)
goto unlock_policy;
}
- stm->policy = kzalloc_obj(*stm->policy, GFP_KERNEL);
+ stm->policy = kzalloc_obj(*stm->policy);
if (!stm->policy) {
ret = ERR_PTR(-ENOMEM);
goto unlock_policy;
diff --git a/drivers/i2c/busses/i2c-cp2615.c b/drivers/i2c/busses/i2c-cp2615.c
index b9a86eb10cc2..e2d7cd2390fc 100644
--- a/drivers/i2c/busses/i2c-cp2615.c
+++ b/drivers/i2c/busses/i2c-cp2615.c
@@ -124,7 +124,7 @@ static int cp2615_check_status(enum cp2615_i2c_status status)
static int
cp2615_i2c_send(struct usb_interface *usbif, struct cp2615_i2c_transfer *i2c_w)
{
- struct cp2615_iop_msg *msg = kzalloc_obj(*msg, GFP_KERNEL);
+ struct cp2615_iop_msg *msg = kzalloc_obj(*msg);
struct usb_device *usbdev = interface_to_usbdev(usbif);
int res = cp2615_init_i2c_msg(msg, i2c_w);
@@ -143,7 +143,7 @@ cp2615_i2c_recv(struct usb_interface *usbif, unsigned char tag, void *buf)
struct cp2615_i2c_transfer_result *i2c_r;
int res;
- msg = kzalloc_obj(*msg, GFP_KERNEL);
+ msg = kzalloc_obj(*msg);
if (!msg)
return -ENOMEM;
@@ -171,7 +171,7 @@ cp2615_i2c_recv(struct usb_interface *usbif, unsigned char tag, void *buf)
/* Checks if the IOP is functional by querying the part's ID */
static int cp2615_check_iop(struct usb_interface *usbif)
{
- struct cp2615_iop_msg *msg = kzalloc_obj(*msg, GFP_KERNEL);
+ struct cp2615_iop_msg *msg = kzalloc_obj(*msg);
struct cp2615_iop_accessory_info *info = (struct cp2615_iop_accessory_info *)&msg->data;
struct usb_device *usbdev = interface_to_usbdev(usbif);
int res = cp2615_init_iop_msg(msg, iop_GetAccessoryInfo, NULL, 0);
diff --git a/drivers/i2c/busses/i2c-cpm.c b/drivers/i2c/busses/i2c-cpm.c
index dbe90974167a..2cb6a233d313 100644
--- a/drivers/i2c/busses/i2c-cpm.c
+++ b/drivers/i2c/busses/i2c-cpm.c
@@ -636,7 +636,7 @@ static int cpm_i2c_probe(struct platform_device *ofdev)
struct cpm_i2c *cpm;
const u32 *data;
- cpm = kzalloc_obj(struct cpm_i2c, GFP_KERNEL);
+ cpm = kzalloc_obj(struct cpm_i2c);
if (!cpm)
return -ENOMEM;
diff --git a/drivers/i2c/busses/i2c-designware-amdpsp.c b/drivers/i2c/busses/i2c-designware-amdpsp.c
index c4d3b0ee6f4d..186f9b9f48b4 100644
--- a/drivers/i2c/busses/i2c-designware-amdpsp.c
+++ b/drivers/i2c/busses/i2c-designware-amdpsp.c
@@ -93,7 +93,7 @@ static int psp_send_i2c_req(enum psp_i2c_req_type i2c_req_type)
int status, ret;
/* Allocate command-response buffer */
- req = kzalloc_obj(*req, GFP_KERNEL);
+ req = kzalloc_obj(*req);
if (!req)
return -ENOMEM;
diff --git a/drivers/i2c/busses/i2c-diolan-u2c.c b/drivers/i2c/busses/i2c-diolan-u2c.c
index ba0a2e03f490..077b093ba834 100644
--- a/drivers/i2c/busses/i2c-diolan-u2c.c
+++ b/drivers/i2c/busses/i2c-diolan-u2c.c
@@ -445,7 +445,7 @@ static int diolan_u2c_probe(struct usb_interface *interface,
return -ENODEV;
/* allocate memory for our device state and initialize it */
- dev = kzalloc_obj(*dev, GFP_KERNEL);
+ dev = kzalloc_obj(*dev);
if (dev == NULL) {
ret = -ENOMEM;
goto error;
diff --git a/drivers/i2c/busses/i2c-eg20t.c b/drivers/i2c/busses/i2c-eg20t.c
index 65ac713e8a84..f83238868802 100644
--- a/drivers/i2c/busses/i2c-eg20t.c
+++ b/drivers/i2c/busses/i2c-eg20t.c
@@ -720,7 +720,7 @@ static int pch_i2c_probe(struct pci_dev *pdev,
pch_pci_dbg(pdev, "Entered.\n");
- adap_info = kzalloc_obj(struct adapter_info, GFP_KERNEL);
+ adap_info = kzalloc_obj(struct adapter_info);
if (adap_info == NULL)
return -ENOMEM;
diff --git a/drivers/i2c/busses/i2c-fsi.c b/drivers/i2c/busses/i2c-fsi.c
index 77b4129e1ee6..82c87e04ac6f 100644
--- a/drivers/i2c/busses/i2c-fsi.c
+++ b/drivers/i2c/busses/i2c-fsi.c
@@ -707,7 +707,7 @@ static int fsi_i2c_probe(struct fsi_device *fsi_dev)
if (!of_device_is_available(np))
continue;
- port = kzalloc_obj(*port, GFP_KERNEL);
+ port = kzalloc_obj(*port);
if (!port) {
of_node_put(np);
break;
diff --git a/drivers/i2c/busses/i2c-highlander.c b/drivers/i2c/busses/i2c-highlander.c
index ddea5847f0c5..a53b4bb7c3c0 100644
--- a/drivers/i2c/busses/i2c-highlander.c
+++ b/drivers/i2c/busses/i2c-highlander.c
@@ -365,7 +365,7 @@ static int highlander_i2c_probe(struct platform_device *pdev)
return -ENODEV;
}
- dev = kzalloc_obj(struct highlander_i2c_dev, GFP_KERNEL);
+ dev = kzalloc_obj(struct highlander_i2c_dev);
if (unlikely(!dev))
return -ENOMEM;
diff --git a/drivers/i2c/busses/i2c-ibm_iic.c b/drivers/i2c/busses/i2c-ibm_iic.c
index ca2534bba932..7c70e8bda24e 100644
--- a/drivers/i2c/busses/i2c-ibm_iic.c
+++ b/drivers/i2c/busses/i2c-ibm_iic.c
@@ -687,7 +687,7 @@ static int iic_probe(struct platform_device *ofdev)
const u32 *freq;
int ret;
- dev = kzalloc_obj(*dev, GFP_KERNEL);
+ dev = kzalloc_obj(*dev);
if (!dev)
return -ENOMEM;
diff --git a/drivers/i2c/busses/i2c-iop3xx.c b/drivers/i2c/busses/i2c-iop3xx.c
index f5c1d2191c98..4c67c5d18f34 100644
--- a/drivers/i2c/busses/i2c-iop3xx.c
+++ b/drivers/i2c/busses/i2c-iop3xx.c
@@ -415,13 +415,13 @@ iop3xx_i2c_probe(struct platform_device *pdev)
struct i2c_adapter *new_adapter;
struct i2c_algo_iop3xx_data *adapter_data;
- new_adapter = kzalloc_obj(struct i2c_adapter, GFP_KERNEL);
+ new_adapter = kzalloc_obj(struct i2c_adapter);
if (!new_adapter) {
ret = -ENOMEM;
goto out;
}
- adapter_data = kzalloc_obj(struct i2c_algo_iop3xx_data, GFP_KERNEL);
+ adapter_data = kzalloc_obj(struct i2c_algo_iop3xx_data);
if (!adapter_data) {
ret = -ENOMEM;
goto free_adapter;
diff --git a/drivers/i2c/busses/i2c-nforce2.c b/drivers/i2c/busses/i2c-nforce2.c
index b673206313fc..7064fab81eac 100644
--- a/drivers/i2c/busses/i2c-nforce2.c
+++ b/drivers/i2c/busses/i2c-nforce2.c
@@ -359,7 +359,7 @@ static int nforce2_probe(struct pci_dev *dev, const struct pci_device_id *id)
int res1, res2;
/* we support 2 SMBus adapters */
- smbuses = kzalloc_objs(struct nforce2_smbus, 2, GFP_KERNEL);
+ smbuses = kzalloc_objs(struct nforce2_smbus, 2);
if (!smbuses)
return -ENOMEM;
pci_set_drvdata(dev, smbuses);
diff --git a/drivers/i2c/busses/i2c-parport.c b/drivers/i2c/busses/i2c-parport.c
index 5ae1c7f8b9b5..e438ec8175d9 100644
--- a/drivers/i2c/busses/i2c-parport.c
+++ b/drivers/i2c/busses/i2c-parport.c
@@ -288,7 +288,7 @@ static void i2c_parport_attach(struct parport *port)
return;
}
- adapter = kzalloc_obj(struct i2c_par, GFP_KERNEL);
+ adapter = kzalloc_obj(struct i2c_par);
if (!adapter)
return;
memset(&i2c_parport_cb, 0, sizeof(i2c_parport_cb));
diff --git a/drivers/i2c/busses/i2c-piix4.c b/drivers/i2c/busses/i2c-piix4.c
index e159a9aed41f..7b6a4e201be4 100644
--- a/drivers/i2c/busses/i2c-piix4.c
+++ b/drivers/i2c/busses/i2c-piix4.c
@@ -919,7 +919,7 @@ static int piix4_add_adapter(struct pci_dev *dev, unsigned short smba,
struct i2c_piix4_adapdata *adapdata;
int retval;
- adap = kzalloc_obj(*adap, GFP_KERNEL);
+ adap = kzalloc_obj(*adap);
if (adap == NULL) {
release_region(smba, SMBIOSIZE);
return -ENOMEM;
@@ -930,7 +930,7 @@ static int piix4_add_adapter(struct pci_dev *dev, unsigned short smba,
adap->algo = sb800_main ? &piix4_smbus_algorithm_sb800
: &smbus_algorithm;
- adapdata = kzalloc_obj(*adapdata, GFP_KERNEL);
+ adapdata = kzalloc_obj(*adapdata);
if (adapdata == NULL) {
kfree(adap);
release_region(smba, SMBIOSIZE);
diff --git a/drivers/i2c/busses/i2c-pxa-pci.c b/drivers/i2c/busses/i2c-pxa-pci.c
index c80a054fc4e9..dbd542300f80 100644
--- a/drivers/i2c/busses/i2c-pxa-pci.c
+++ b/drivers/i2c/busses/i2c-pxa-pci.c
@@ -112,7 +112,7 @@ static int ce4100_i2c_probe(struct pci_dev *dev,
dev_err(&dev->dev, "Missing device tree node.\n");
return -EINVAL;
}
- sds = kzalloc_obj(*sds, GFP_KERNEL);
+ sds = kzalloc_obj(*sds);
if (!sds)
return -ENOMEM;
diff --git a/drivers/i2c/busses/i2c-scmi.c b/drivers/i2c/busses/i2c-scmi.c
index c10ad0677949..324a63efa1ab 100644
--- a/drivers/i2c/busses/i2c-scmi.c
+++ b/drivers/i2c/busses/i2c-scmi.c
@@ -359,7 +359,7 @@ static int smbus_cmi_probe(struct platform_device *device)
struct acpi_smbus_cmi *smbus_cmi;
int ret;
- smbus_cmi = kzalloc_obj(struct acpi_smbus_cmi, GFP_KERNEL);
+ smbus_cmi = kzalloc_obj(struct acpi_smbus_cmi);
if (!smbus_cmi)
return -ENOMEM;
diff --git a/drivers/i2c/busses/i2c-sh7760.c b/drivers/i2c/busses/i2c-sh7760.c
index dcdf56398f70..ba0cbb36ab15 100644
--- a/drivers/i2c/busses/i2c-sh7760.c
+++ b/drivers/i2c/busses/i2c-sh7760.c
@@ -443,7 +443,7 @@ static int sh7760_i2c_probe(struct platform_device *pdev)
goto out0;
}
- id = kzalloc_obj(*id, GFP_KERNEL);
+ id = kzalloc_obj(*id);
if (!id) {
ret = -ENOMEM;
goto out0;
diff --git a/drivers/i2c/busses/i2c-simtec.c b/drivers/i2c/busses/i2c-simtec.c
index 9572357cc177..b4ca256a0aa9 100644
--- a/drivers/i2c/busses/i2c-simtec.c
+++ b/drivers/i2c/busses/i2c-simtec.c
@@ -64,7 +64,7 @@ static int simtec_i2c_probe(struct platform_device *dev)
int size;
int ret;
- pd = kzalloc_obj(struct simtec_i2c_data, GFP_KERNEL);
+ pd = kzalloc_obj(struct simtec_i2c_data);
if (pd == NULL)
return -ENOMEM;
diff --git a/drivers/i2c/busses/i2c-stm32f7.c b/drivers/i2c/busses/i2c-stm32f7.c
index e2388862f29e..70cb5822bf17 100644
--- a/drivers/i2c/busses/i2c-stm32f7.c
+++ b/drivers/i2c/busses/i2c-stm32f7.c
@@ -544,7 +544,7 @@ static int stm32f7_i2c_compute_timing(struct stm32f7_i2c_dev *i2c_dev,
if (((sdadel >= sdadel_min) &&
(sdadel <= sdadel_max)) &&
(p != p_prev)) {
- v = kmalloc_obj(*v, GFP_KERNEL);
+ v = kmalloc_obj(*v);
if (!v) {
ret = -ENOMEM;
goto exit;
diff --git a/drivers/i2c/busses/i2c-taos-evm.c b/drivers/i2c/busses/i2c-taos-evm.c
index e8a89b7d2174..debaf5189a83 100644
--- a/drivers/i2c/busses/i2c-taos-evm.c
+++ b/drivers/i2c/busses/i2c-taos-evm.c
@@ -203,7 +203,7 @@ static int taos_connect(struct serio *serio, struct serio_driver *drv)
char *name;
int err;
- taos = kzalloc_obj(struct taos_data, GFP_KERNEL);
+ taos = kzalloc_obj(struct taos_data);
if (!taos) {
err = -ENOMEM;
goto exit;
diff --git a/drivers/i2c/busses/i2c-tiny-usb.c b/drivers/i2c/busses/i2c-tiny-usb.c
index ab021042901b..9ef495f88ef2 100644
--- a/drivers/i2c/busses/i2c-tiny-usb.c
+++ b/drivers/i2c/busses/i2c-tiny-usb.c
@@ -55,7 +55,7 @@ static int usb_xfer(struct i2c_adapter *adapter, struct i2c_msg *msgs, int num)
struct i2c_msg *pmsg;
int i, ret;
- pstatus = kmalloc_obj(*pstatus, GFP_KERNEL);
+ pstatus = kmalloc_obj(*pstatus);
if (!pstatus)
return -ENOMEM;
@@ -123,7 +123,7 @@ static u32 usb_func(struct i2c_adapter *adapter)
__le32 *pfunc;
u32 ret;
- pfunc = kmalloc_obj(*pfunc, GFP_KERNEL);
+ pfunc = kmalloc_obj(*pfunc);
/* get functionality from adapter */
if (!pfunc || usb_read(adapter, CMD_GET_FUNC, 0, 0, pfunc,
@@ -233,7 +233,7 @@ static int i2c_tiny_usb_probe(struct usb_interface *interface,
dev_dbg(&interface->dev, "probing usb device\n");
/* allocate memory for our device state and initialize it */
- dev = kzalloc_obj(*dev, GFP_KERNEL);
+ dev = kzalloc_obj(*dev);
if (!dev)
goto error;
diff --git a/drivers/i2c/busses/i2c-virtio.c b/drivers/i2c/busses/i2c-virtio.c
index 01ef98e90243..7b0b0bff8000 100644
--- a/drivers/i2c/busses/i2c-virtio.c
+++ b/drivers/i2c/busses/i2c-virtio.c
@@ -139,7 +139,7 @@ static int virtio_i2c_xfer(struct i2c_adapter *adap, struct i2c_msg *msgs,
struct virtio_i2c_req *reqs;
int count;
- reqs = kzalloc_objs(*reqs, num, GFP_KERNEL);
+ reqs = kzalloc_objs(*reqs, num);
if (!reqs)
return -ENOMEM;
diff --git a/drivers/i2c/busses/scx200_acb.c b/drivers/i2c/busses/scx200_acb.c
index 1c76aef0a423..0cd0a18a7082 100644
--- a/drivers/i2c/busses/scx200_acb.c
+++ b/drivers/i2c/busses/scx200_acb.c
@@ -418,7 +418,7 @@ static struct scx200_acb_iface *scx200_create_iface(const char *text,
struct scx200_acb_iface *iface;
struct i2c_adapter *adapter;
- iface = kzalloc_obj(*iface, GFP_KERNEL);
+ iface = kzalloc_obj(*iface);
if (!iface)
return NULL;
diff --git a/drivers/i2c/i2c-atr.c b/drivers/i2c/i2c-atr.c
index 8e3fe365caaf..ea6bfa67b518 100644
--- a/drivers/i2c/i2c-atr.c
+++ b/drivers/i2c/i2c-atr.c
@@ -137,7 +137,7 @@ static struct i2c_atr_alias_pool *i2c_atr_alloc_alias_pool(size_t num_aliases, b
struct i2c_atr_alias_pool *alias_pool;
int ret;
- alias_pool = kzalloc_obj(*alias_pool, GFP_KERNEL);
+ alias_pool = kzalloc_obj(*alias_pool);
if (!alias_pool)
return ERR_PTR(-ENOMEM);
@@ -183,7 +183,7 @@ static struct i2c_atr_alias_pair *i2c_atr_create_c2a(struct i2c_atr_chan *chan,
lockdep_assert_held(&chan->alias_pairs_lock);
- c2a = kzalloc_obj(*c2a, GFP_KERNEL);
+ c2a = kzalloc_obj(*c2a);
if (!c2a)
return NULL;
@@ -800,7 +800,7 @@ int i2c_atr_add_adapter(struct i2c_atr *atr, struct i2c_atr_adap_desc *desc)
return -EEXIST;
}
- chan = kzalloc_obj(*chan, GFP_KERNEL);
+ chan = kzalloc_obj(*chan);
if (!chan)
return -ENOMEM;
diff --git a/drivers/i2c/i2c-boardinfo.c b/drivers/i2c/i2c-boardinfo.c
index 31fcc051bf20..735fd13fefc4 100644
--- a/drivers/i2c/i2c-boardinfo.c
+++ b/drivers/i2c/i2c-boardinfo.c
@@ -61,7 +61,7 @@ int i2c_register_board_info(int busnum, struct i2c_board_info const *info, unsig
for (status = 0; len; len--, info++) {
struct i2c_devinfo *devinfo;
- devinfo = kzalloc_obj(*devinfo, GFP_KERNEL);
+ devinfo = kzalloc_obj(*devinfo);
if (!devinfo) {
pr_debug("i2c-core: can't register boardinfo!\n");
status = -ENOMEM;
diff --git a/drivers/i2c/i2c-core-acpi.c b/drivers/i2c/i2c-core-acpi.c
index 5b16d76a5bc2..2cbd31f77667 100644
--- a/drivers/i2c/i2c-core-acpi.c
+++ b/drivers/i2c/i2c-core-acpi.c
@@ -683,7 +683,7 @@ i2c_acpi_space_handler(u32 function, acpi_physical_address command,
if (ACPI_FAILURE(ret))
return ret;
- client = kzalloc_obj(*client, GFP_KERNEL);
+ client = kzalloc_obj(*client);
if (!client) {
ret = AE_NO_MEMORY;
goto err;
@@ -793,7 +793,7 @@ int i2c_acpi_install_space_handler(struct i2c_adapter *adapter)
if (!handle)
return -ENODEV;
- data = kzalloc_obj(struct i2c_acpi_handler_data, GFP_KERNEL);
+ data = kzalloc_obj(struct i2c_acpi_handler_data);
if (!data)
return -ENOMEM;
diff --git a/drivers/i2c/i2c-core-base.c b/drivers/i2c/i2c-core-base.c
index 91b388070525..9c46147e3506 100644
--- a/drivers/i2c/i2c-core-base.c
+++ b/drivers/i2c/i2c-core-base.c
@@ -964,7 +964,7 @@ i2c_new_client_device(struct i2c_adapter *adap, struct i2c_board_info const *inf
bool need_put = false;
int status;
- client = kzalloc_obj(*client, GFP_KERNEL);
+ client = kzalloc_obj(*client);
if (!client)
return ERR_PTR(-ENOMEM);
@@ -2529,7 +2529,7 @@ static int i2c_detect(struct i2c_adapter *adapter, struct i2c_driver *driver)
return 0;
/* Set up a temporary client to help detect callback */
- temp_client = kzalloc_obj(*temp_client, GFP_KERNEL);
+ temp_client = kzalloc_obj(*temp_client);
if (!temp_client)
return -ENOMEM;
diff --git a/drivers/i2c/i2c-core-of-prober.c b/drivers/i2c/i2c-core-of-prober.c
index 8c820d70846a..6a82b03809d4 100644
--- a/drivers/i2c/i2c-core-of-prober.c
+++ b/drivers/i2c/i2c-core-of-prober.c
@@ -63,7 +63,7 @@ static int i2c_of_probe_enable_node(struct device *dev, struct device_node *node
dev_dbg(dev, "Enabling %pOF\n", node);
- struct of_changeset *ocs __free(kfree) = kzalloc_obj(*ocs, GFP_KERNEL);
+ struct of_changeset *ocs __free(kfree) = kzalloc_obj(*ocs);
if (!ocs)
return -ENOMEM;
diff --git a/drivers/i2c/i2c-dev.c b/drivers/i2c/i2c-dev.c
index e4ac9f2df8d5..e0aec8ee2dee 100644
--- a/drivers/i2c/i2c-dev.c
+++ b/drivers/i2c/i2c-dev.c
@@ -74,7 +74,7 @@ static struct i2c_dev *get_free_i2c_dev(struct i2c_adapter *adap)
return ERR_PTR(-ENODEV);
}
- i2c_dev = kzalloc_obj(*i2c_dev, GFP_KERNEL);
+ i2c_dev = kzalloc_obj(*i2c_dev);
if (!i2c_dev)
return ERR_PTR(-ENOMEM);
i2c_dev->adap = adap;
@@ -612,7 +612,7 @@ static int i2cdev_open(struct inode *inode, struct file *file)
* or I2C core code!! It just holds private copies of addressing
* information and maybe a PEC flag.
*/
- client = kzalloc_obj(*client, GFP_KERNEL);
+ client = kzalloc_obj(*client);
if (!client) {
i2c_put_adapter(adap);
return -ENOMEM;
diff --git a/drivers/i2c/i2c-mux.c b/drivers/i2c/i2c-mux.c
index 2e7b4073a4df..681a201c239b 100644
--- a/drivers/i2c/i2c-mux.c
+++ b/drivers/i2c/i2c-mux.c
@@ -277,7 +277,7 @@ int i2c_mux_add_adapter(struct i2c_mux_core *muxc,
return -EINVAL;
}
- priv = kzalloc_obj(*priv, GFP_KERNEL);
+ priv = kzalloc_obj(*priv);
if (!priv)
return -ENOMEM;
diff --git a/drivers/i2c/i2c-smbus.c b/drivers/i2c/i2c-smbus.c
index 14e45590e97e..bc7bd55e6370 100644
--- a/drivers/i2c/i2c-smbus.c
+++ b/drivers/i2c/i2c-smbus.c
@@ -319,7 +319,7 @@ struct i2c_client *i2c_new_slave_host_notify_device(struct i2c_adapter *adapter)
struct i2c_client *client;
int ret;
- status = kzalloc_obj(struct i2c_slave_host_notify_status, GFP_KERNEL);
+ status = kzalloc_obj(struct i2c_slave_host_notify_status);
if (!status)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/i2c/i2c-stub.c b/drivers/i2c/i2c-stub.c
index 1d7d105c5643..fbb0db41b10e 100644
--- a/drivers/i2c/i2c-stub.c
+++ b/drivers/i2c/i2c-stub.c
@@ -372,7 +372,7 @@ static int __init i2c_stub_init(void)
/* Allocate memory for all chips at once */
stub_chips_nr = i;
- stub_chips = kzalloc_objs(struct stub_chip, stub_chips_nr, GFP_KERNEL);
+ stub_chips = kzalloc_objs(struct stub_chip, stub_chips_nr);
if (!stub_chips)
return -ENOMEM;
diff --git a/drivers/i3c/master.c b/drivers/i3c/master.c
index 161eab16d17e..9446a56d692f 100644
--- a/drivers/i3c/master.c
+++ b/drivers/i3c/master.c
@@ -858,7 +858,7 @@ i3c_master_alloc_i2c_dev(struct i3c_master_controller *master,
{
struct i2c_dev_desc *dev;
- dev = kzalloc_obj(*dev, GFP_KERNEL);
+ dev = kzalloc_obj(*dev);
if (!dev)
return ERR_PTR(-ENOMEM);
@@ -983,7 +983,7 @@ i3c_master_alloc_i3c_dev(struct i3c_master_controller *master,
{
struct i3c_dev_desc *dev;
- dev = kzalloc_obj(*dev, GFP_KERNEL);
+ dev = kzalloc_obj(*dev);
if (!dev)
return ERR_PTR(-ENOMEM);
@@ -1742,7 +1742,7 @@ i3c_master_register_new_i3c_devs(struct i3c_master_controller *master)
if (desc->dev || !desc->info.dyn_addr || desc == master->this)
continue;
- desc->dev = kzalloc_obj(*desc->dev, GFP_KERNEL);
+ desc->dev = kzalloc_obj(*desc->dev);
if (!desc->dev)
continue;
@@ -2848,7 +2848,7 @@ i3c_generic_ibi_alloc_pool(struct i3c_dev_desc *dev,
unsigned int i;
int ret;
- pool = kzalloc_obj(*pool, GFP_KERNEL);
+ pool = kzalloc_obj(*pool);
if (!pool)
return ERR_PTR(-ENOMEM);
@@ -2856,7 +2856,7 @@ i3c_generic_ibi_alloc_pool(struct i3c_dev_desc *dev,
INIT_LIST_HEAD(&pool->free_slots);
INIT_LIST_HEAD(&pool->pending);
- pool->slots = kzalloc_objs(*slot, req->num_slots, GFP_KERNEL);
+ pool->slots = kzalloc_objs(*slot, req->num_slots);
if (!pool->slots) {
ret = -ENOMEM;
goto err_free_pool;
@@ -3219,7 +3219,7 @@ int i3c_dev_request_ibi_locked(struct i3c_dev_desc *dev,
if (dev->ibi)
return -EBUSY;
- ibi = kzalloc_obj(*ibi, GFP_KERNEL);
+ ibi = kzalloc_obj(*ibi);
if (!ibi)
return -ENOMEM;
diff --git a/drivers/i3c/master/adi-i3c-master.c b/drivers/i3c/master/adi-i3c-master.c
index e60dc306a03e..7894723b8399 100644
--- a/drivers/i3c/master/adi-i3c-master.c
+++ b/drivers/i3c/master/adi-i3c-master.c
@@ -459,7 +459,7 @@ static int adi_i3c_master_attach_i3c_dev(struct i3c_dev_desc *dev)
int slot;
u8 addr;
- data = kzalloc_obj(*data, GFP_KERNEL);
+ data = kzalloc_obj(*data);
if (!data)
return -ENOMEM;
@@ -531,7 +531,7 @@ static int adi_i3c_master_attach_i2c_dev(struct i2c_dev_desc *dev)
if (slot < 0)
return slot;
- data = kzalloc_obj(*data, GFP_KERNEL);
+ data = kzalloc_obj(*data);
if (!data)
return -ENOMEM;
diff --git a/drivers/i3c/master/dw-i3c-master.c b/drivers/i3c/master/dw-i3c-master.c
index e4740cd07c66..28c9e37f9b0d 100644
--- a/drivers/i3c/master/dw-i3c-master.c
+++ b/drivers/i3c/master/dw-i3c-master.c
@@ -1044,7 +1044,7 @@ static int dw_i3c_master_attach_i3c_dev(struct i3c_dev_desc *dev)
if (pos < 0)
return pos;
- data = kzalloc_obj(*data, GFP_KERNEL);
+ data = kzalloc_obj(*data);
if (!data)
return -ENOMEM;
@@ -1162,7 +1162,7 @@ static int dw_i3c_master_attach_i2c_dev(struct i2c_dev_desc *dev)
if (pos < 0)
return pos;
- data = kzalloc_obj(*data, GFP_KERNEL);
+ data = kzalloc_obj(*data);
if (!data)
return -ENOMEM;
diff --git a/drivers/i3c/master/i3c-master-cdns.c b/drivers/i3c/master/i3c-master-cdns.c
index 2f31e7ef3ea8..e806ae292aee 100644
--- a/drivers/i3c/master/i3c-master-cdns.c
+++ b/drivers/i3c/master/i3c-master-cdns.c
@@ -940,7 +940,7 @@ static int cdns_i3c_master_attach_i3c_dev(struct i3c_dev_desc *dev)
struct cdns_i3c_i2c_dev_data *data;
int slot;
- data = kzalloc_obj(*data, GFP_KERNEL);
+ data = kzalloc_obj(*data);
if (!data)
return -ENOMEM;
@@ -991,7 +991,7 @@ static int cdns_i3c_master_attach_i2c_dev(struct i2c_dev_desc *dev)
if (slot < 0)
return slot;
- data = kzalloc_obj(*data, GFP_KERNEL);
+ data = kzalloc_obj(*data);
if (!data)
return -ENOMEM;
diff --git a/drivers/i3c/master/mipi-i3c-hci/core.c b/drivers/i3c/master/mipi-i3c-hci/core.c
index a527e7305c09..5879bba78164 100644
--- a/drivers/i3c/master/mipi-i3c-hci/core.c
+++ b/drivers/i3c/master/mipi-i3c-hci/core.c
@@ -410,7 +410,7 @@ static int i3c_hci_attach_i3c_dev(struct i3c_dev_desc *dev)
struct i3c_hci_dev_data *dev_data;
int ret;
- dev_data = kzalloc_obj(*dev_data, GFP_KERNEL);
+ dev_data = kzalloc_obj(*dev_data);
if (!dev_data)
return -ENOMEM;
if (hci->cmd == &mipi_i3c_hci_cmd_v1) {
@@ -460,7 +460,7 @@ static int i3c_hci_attach_i2c_dev(struct i2c_dev_desc *dev)
if (hci->cmd != &mipi_i3c_hci_cmd_v1)
return 0;
- dev_data = kzalloc_obj(*dev_data, GFP_KERNEL);
+ dev_data = kzalloc_obj(*dev_data);
if (!dev_data)
return -ENOMEM;
ret = mipi_i3c_hci_dat_v1.alloc_entry(hci);
diff --git a/drivers/i3c/master/mipi-i3c-hci/dma.c b/drivers/i3c/master/mipi-i3c-hci/dma.c
index cdba4c9c839d..e55455369eaa 100644
--- a/drivers/i3c/master/mipi-i3c-hci/dma.c
+++ b/drivers/i3c/master/mipi-i3c-hci/dma.c
@@ -636,7 +636,7 @@ static int hci_dma_request_ibi(struct i3c_hci *hci, struct i3c_dev_desc *dev,
struct i3c_generic_ibi_pool *pool;
struct hci_dma_dev_ibi_data *dev_ibi;
- dev_ibi = kmalloc_obj(*dev_ibi, GFP_KERNEL);
+ dev_ibi = kmalloc_obj(*dev_ibi);
if (!dev_ibi)
return -ENOMEM;
pool = i3c_generic_ibi_alloc_pool(dev, req);
diff --git a/drivers/i3c/master/mipi-i3c-hci/hci.h b/drivers/i3c/master/mipi-i3c-hci/hci.h
index 7d57ebba0c24..337b7ab1cb06 100644
--- a/drivers/i3c/master/mipi-i3c-hci/hci.h
+++ b/drivers/i3c/master/mipi-i3c-hci/hci.h
@@ -107,7 +107,7 @@ struct hci_xfer {
static inline struct hci_xfer *hci_alloc_xfer(unsigned int n)
{
- return kzalloc_objs(struct hci_xfer, n, GFP_KERNEL);
+ return kzalloc_objs(struct hci_xfer, n);
}
static inline void hci_free_xfer(struct hci_xfer *xfer, unsigned int n)
diff --git a/drivers/i3c/master/mipi-i3c-hci/mipi-i3c-hci-pci.c b/drivers/i3c/master/mipi-i3c-hci/mipi-i3c-hci-pci.c
index 4fa3d5cf14d2..30302e4d08e2 100644
--- a/drivers/i3c/master/mipi-i3c-hci/mipi-i3c-hci-pci.c
+++ b/drivers/i3c/master/mipi-i3c-hci/mipi-i3c-hci-pci.c
@@ -242,7 +242,7 @@ static void mipi_i3c_hci_pci_setup_cell(struct mipi_i3c_hci_pci *hci, int idx,
cell->resources = &data->res;
}
-#define mipi_i3c_hci_pci_alloc(h, x) kzalloc_objs(*(x), (h)->info->instance_count, GFP_KERNEL)
+#define mipi_i3c_hci_pci_alloc(h, x) kzalloc_objs(*(x), (h)->info->instance_count)
static int mipi_i3c_hci_pci_add_instances(struct mipi_i3c_hci_pci *hci)
{
diff --git a/drivers/i3c/master/mipi-i3c-hci/pio.c b/drivers/i3c/master/mipi-i3c-hci/pio.c
index 0c333e40378c..f8825ac81408 100644
--- a/drivers/i3c/master/mipi-i3c-hci/pio.c
+++ b/drivers/i3c/master/mipi-i3c-hci/pio.c
@@ -977,7 +977,7 @@ static int hci_pio_request_ibi(struct i3c_hci *hci, struct i3c_dev_desc *dev,
struct i3c_generic_ibi_pool *pool;
struct hci_pio_dev_ibi_data *dev_ibi;
- dev_ibi = kmalloc_obj(*dev_ibi, GFP_KERNEL);
+ dev_ibi = kmalloc_obj(*dev_ibi);
if (!dev_ibi)
return -ENOMEM;
pool = i3c_generic_ibi_alloc_pool(dev, req);
diff --git a/drivers/i3c/master/renesas-i3c.c b/drivers/i3c/master/renesas-i3c.c
index a100bbaabf2d..d7ab232586c7 100644
--- a/drivers/i3c/master/renesas-i3c.c
+++ b/drivers/i3c/master/renesas-i3c.c
@@ -874,7 +874,7 @@ static int renesas_i3c_attach_i3c_dev(struct i3c_dev_desc *dev)
if (pos < 0)
return pos;
- data = kzalloc_obj(*data, GFP_KERNEL);
+ data = kzalloc_obj(*data);
if (!data)
return -ENOMEM;
@@ -984,7 +984,7 @@ static int renesas_i3c_attach_i2c_dev(struct i2c_dev_desc *dev)
if (pos < 0)
return pos;
- data = kzalloc_obj(*data, GFP_KERNEL);
+ data = kzalloc_obj(*data);
if (!data)
return -ENOMEM;
diff --git a/drivers/i3c/master/svc-i3c-master.c b/drivers/i3c/master/svc-i3c-master.c
index 0e3b1a7be6a4..b849bc1d5d4c 100644
--- a/drivers/i3c/master/svc-i3c-master.c
+++ b/drivers/i3c/master/svc-i3c-master.c
@@ -900,7 +900,7 @@ static int svc_i3c_master_attach_i3c_dev(struct i3c_dev_desc *dev)
if (slot < 0)
return slot;
- data = kzalloc_obj(*data, GFP_KERNEL);
+ data = kzalloc_obj(*data);
if (!data) {
svc_i3c_master_release_slot(master, slot);
return -ENOMEM;
@@ -953,7 +953,7 @@ static int svc_i3c_master_attach_i2c_dev(struct i2c_dev_desc *dev)
if (slot < 0)
return slot;
- data = kzalloc_obj(*data, GFP_KERNEL);
+ data = kzalloc_obj(*data);
if (!data) {
svc_i3c_master_release_slot(master, slot);
return -ENOMEM;
diff --git a/drivers/iio/buffer/industrialio-buffer-cb.c b/drivers/iio/buffer/industrialio-buffer-cb.c
index 7a251b030b7e..0c266c216525 100644
--- a/drivers/iio/buffer/industrialio-buffer-cb.c
+++ b/drivers/iio/buffer/industrialio-buffer-cb.c
@@ -60,7 +60,7 @@ struct iio_cb_buffer *iio_channel_get_all_cb(struct device *dev,
return ERR_PTR(-EINVAL);
}
- cb_buff = kzalloc_obj(*cb_buff, GFP_KERNEL);
+ cb_buff = kzalloc_obj(*cb_buff);
if (cb_buff == NULL)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/iio/buffer/industrialio-buffer-dma.c b/drivers/iio/buffer/industrialio-buffer-dma.c
index 2425e1113a7d..1daac23087a7 100644
--- a/drivers/iio/buffer/industrialio-buffer-dma.c
+++ b/drivers/iio/buffer/industrialio-buffer-dma.c
@@ -174,7 +174,7 @@ iio_dma_buffer_alloc_block(struct iio_dma_buffer_queue *queue, size_t size,
bool fileio)
{
struct iio_dma_buffer_block *block __free(kfree) =
- kzalloc_obj(*block, GFP_KERNEL);
+ kzalloc_obj(*block);
if (!block)
return NULL;
diff --git a/drivers/iio/buffer/industrialio-buffer-dmaengine.c b/drivers/iio/buffer/industrialio-buffer-dmaengine.c
index 23b4ac7cca9c..98acce909854 100644
--- a/drivers/iio/buffer/industrialio-buffer-dmaengine.c
+++ b/drivers/iio/buffer/industrialio-buffer-dmaengine.c
@@ -224,7 +224,7 @@ static struct iio_buffer *iio_dmaengine_buffer_alloc(struct dma_chan *chan)
if (ret < 0)
return ERR_PTR(ret);
- dmaengine_buffer = kzalloc_obj(*dmaengine_buffer, GFP_KERNEL);
+ dmaengine_buffer = kzalloc_obj(*dmaengine_buffer);
if (!dmaengine_buffer)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/iio/buffer/industrialio-hw-consumer.c b/drivers/iio/buffer/industrialio-hw-consumer.c
index 9745b3bd4ac7..51e3b360584f 100644
--- a/drivers/iio/buffer/industrialio-hw-consumer.c
+++ b/drivers/iio/buffer/industrialio-hw-consumer.c
@@ -87,7 +87,7 @@ struct iio_hw_consumer *iio_hw_consumer_alloc(struct device *dev)
struct iio_channel *chan;
int ret;
- hwc = kzalloc_obj(*hwc, GFP_KERNEL);
+ hwc = kzalloc_obj(*hwc);
if (!hwc)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/iio/buffer/kfifo_buf.c b/drivers/iio/buffer/kfifo_buf.c
index 73e2cd7e7313..a6ff9085b8a2 100644
--- a/drivers/iio/buffer/kfifo_buf.c
+++ b/drivers/iio/buffer/kfifo_buf.c
@@ -204,7 +204,7 @@ struct iio_buffer *iio_kfifo_allocate(void)
{
struct iio_kfifo *kf;
- kf = kzalloc_obj(*kf, GFP_KERNEL);
+ kf = kzalloc_obj(*kf);
if (!kf)
return NULL;
diff --git a/drivers/iio/common/ssp_sensors/ssp_spi.c b/drivers/iio/common/ssp_sensors/ssp_spi.c
index 5fd9ef819417..6c81c0385fb5 100644
--- a/drivers/iio/common/ssp_sensors/ssp_spi.c
+++ b/drivers/iio/common/ssp_sensors/ssp_spi.c
@@ -77,7 +77,7 @@ static struct ssp_msg *ssp_create_msg(u8 cmd, u16 len, u16 opt, u32 data)
struct ssp_msg_header h;
struct ssp_msg *msg;
- msg = kzalloc_obj(*msg, GFP_KERNEL);
+ msg = kzalloc_obj(*msg);
if (!msg)
return NULL;
diff --git a/drivers/iio/dummy/iio_dummy_evgen.c b/drivers/iio/dummy/iio_dummy_evgen.c
index 84bc2281c03a..30f0ae7c5116 100644
--- a/drivers/iio/dummy/iio_dummy_evgen.c
+++ b/drivers/iio/dummy/iio_dummy_evgen.c
@@ -47,7 +47,7 @@ static int iio_dummy_evgen_create(void)
{
int ret;
- iio_evgen = kzalloc_obj(*iio_evgen, GFP_KERNEL);
+ iio_evgen = kzalloc_obj(*iio_evgen);
if (!iio_evgen)
return -ENOMEM;
diff --git a/drivers/iio/dummy/iio_simple_dummy.c b/drivers/iio/dummy/iio_simple_dummy.c
index cba19b6a23cb..19fcdbbc11c6 100644
--- a/drivers/iio/dummy/iio_simple_dummy.c
+++ b/drivers/iio/dummy/iio_simple_dummy.c
@@ -588,7 +588,7 @@ static struct iio_sw_device *iio_dummy_probe(const char *name)
* parent = &client->dev;
*/
- swd = kzalloc_obj(*swd, GFP_KERNEL);
+ swd = kzalloc_obj(*swd);
if (!swd)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/iio/dummy/iio_simple_dummy_buffer.c b/drivers/iio/dummy/iio_simple_dummy_buffer.c
index 5bbfda407bc2..57f3611a86d9 100644
--- a/drivers/iio/dummy/iio_simple_dummy_buffer.c
+++ b/drivers/iio/dummy/iio_simple_dummy_buffer.c
@@ -60,7 +60,7 @@ static irqreturn_t iio_simple_dummy_trigger_h(int irq, void *p)
* - A buffer at the end of the structure accessed via iio_priv()
* that is marked __aligned(IIO_DMA_MINALIGN).
*/
- scan = kzalloc_obj(*scan, GFP_KERNEL);
+ scan = kzalloc_obj(*scan);
if (!scan)
goto done;
diff --git a/drivers/iio/imu/adis_buffer.c b/drivers/iio/imu/adis_buffer.c
index 222b77781639..501da4eaef69 100644
--- a/drivers/iio/imu/adis_buffer.c
+++ b/drivers/iio/imu/adis_buffer.c
@@ -33,7 +33,7 @@ static int adis_update_scan_mode_burst(struct iio_dev *indio_dev,
else
burst_max_length = burst_length;
- adis->xfer = kzalloc_objs(*adis->xfer, 2, GFP_KERNEL);
+ adis->xfer = kzalloc_objs(*adis->xfer, 2);
if (!adis->xfer)
return -ENOMEM;
@@ -81,7 +81,7 @@ int adis_update_scan_mode(struct iio_dev *indio_dev,
scan_count = indio_dev->scan_bytes / 2;
- adis->xfer = kzalloc_objs(*adis->xfer, scan_count + 1, GFP_KERNEL);
+ adis->xfer = kzalloc_objs(*adis->xfer, scan_count + 1);
if (!adis->xfer)
return -ENOMEM;
diff --git a/drivers/iio/industrialio-buffer.c b/drivers/iio/industrialio-buffer.c
index ac141289a2f3..f15a180dc49e 100644
--- a/drivers/iio/industrialio-buffer.c
+++ b/drivers/iio/industrialio-buffer.c
@@ -1024,7 +1024,7 @@ static int iio_buffer_add_demux(struct iio_buffer *buffer,
(*p)->to + (*p)->length == out_loc) {
(*p)->length += length;
} else {
- *p = kmalloc_obj(**p, GFP_KERNEL);
+ *p = kmalloc_obj(**p);
if (!(*p))
return -ENOMEM;
(*p)->from = in_loc;
@@ -1478,7 +1478,7 @@ static struct attribute *iio_buffer_wrap_attr(struct iio_buffer *buffer,
struct device_attribute *dattr = to_dev_attr(attr);
struct iio_dev_attr *iio_attr;
- iio_attr = kzalloc_obj(*iio_attr, GFP_KERNEL);
+ iio_attr = kzalloc_obj(*iio_attr);
if (!iio_attr)
return NULL;
@@ -1507,7 +1507,7 @@ static int iio_buffer_register_legacy_sysfs_groups(struct iio_dev *indio_dev,
struct attribute **attrs;
int ret;
- attrs = kzalloc_objs(*attrs, buffer_attrcount + 1, GFP_KERNEL);
+ attrs = kzalloc_objs(*attrs, buffer_attrcount + 1);
if (!attrs)
return -ENOMEM;
@@ -1521,7 +1521,7 @@ static int iio_buffer_register_legacy_sysfs_groups(struct iio_dev *indio_dev,
if (ret)
goto error_free_buffer_attrs;
- attrs = kzalloc_objs(*attrs, scan_el_attrcount + 1, GFP_KERNEL);
+ attrs = kzalloc_objs(*attrs, scan_el_attrcount + 1);
if (!attrs) {
ret = -ENOMEM;
goto error_free_buffer_attrs;
@@ -1674,7 +1674,7 @@ static int iio_buffer_attach_dmabuf(struct iio_dev_buffer_pair *ib,
if (copy_from_user(&fd, user_fd, sizeof(fd)))
return -EFAULT;
- priv = kzalloc_obj(*priv, GFP_KERNEL);
+ priv = kzalloc_obj(*priv);
if (!priv)
return -ENOMEM;
@@ -1862,7 +1862,7 @@ static int iio_buffer_enqueue_dmabuf(struct iio_dev_buffer_pair *ib,
priv = attach->importer_priv;
- fence = kmalloc_obj(*fence, GFP_KERNEL);
+ fence = kmalloc_obj(*fence);
if (!fence) {
ret = -ENOMEM;
goto err_attachment_put;
@@ -2035,7 +2035,7 @@ static long iio_device_buffer_getfd(struct iio_dev *indio_dev, unsigned long arg
goto error_iio_dev_put;
}
- ib = kzalloc_obj(*ib, GFP_KERNEL);
+ ib = kzalloc_obj(*ib);
if (!ib) {
ret = -ENOMEM;
goto error_clear_busy_bit;
@@ -2182,7 +2182,7 @@ static int __iio_buffer_alloc_sysfs_and_mask(struct iio_buffer *buffer,
}
attrn = buffer_attrcount + scan_el_attrcount;
- attr = kzalloc_objs(*attr, attrn + 1, GFP_KERNEL);
+ attr = kzalloc_objs(*attr, attrn + 1);
if (!attr) {
ret = -ENOMEM;
goto error_free_scan_mask;
diff --git a/drivers/iio/industrialio-core.c b/drivers/iio/industrialio-core.c
index 9e3d23368413..d4a9dd889eef 100644
--- a/drivers/iio/industrialio-core.c
+++ b/drivers/iio/industrialio-core.c
@@ -1192,7 +1192,7 @@ int __iio_add_chan_devattr(const char *postfix,
int ret;
struct iio_dev_attr *iio_attr, *t;
- iio_attr = kzalloc_obj(*iio_attr, GFP_KERNEL);
+ iio_attr = kzalloc_obj(*iio_attr);
if (iio_attr == NULL)
return -ENOMEM;
ret = __iio_device_attr_init(&iio_attr->dev_attr,
@@ -1796,7 +1796,7 @@ static int iio_chrdev_open(struct inode *inode, struct file *filp)
iio_device_get(indio_dev);
- ib = kmalloc_obj(*ib, GFP_KERNEL);
+ ib = kmalloc_obj(*ib);
if (!ib) {
iio_device_put(indio_dev);
clear_bit(IIO_BUSY_BIT_POS, &iio_dev_opaque->flags);
diff --git a/drivers/iio/industrialio-event.c b/drivers/iio/industrialio-event.c
index 43043ea897e0..d71cb9fd09a3 100644
--- a/drivers/iio/industrialio-event.c
+++ b/drivers/iio/industrialio-event.c
@@ -583,7 +583,7 @@ int iio_device_register_eventset(struct iio_dev *indio_dev)
iio_check_for_dynamic_events(indio_dev)))
return 0;
- ev_int = kzalloc_obj(*ev_int, GFP_KERNEL);
+ ev_int = kzalloc_obj(*ev_int);
if (!ev_int)
return -ENOMEM;
diff --git a/drivers/iio/industrialio-gts-helper.c b/drivers/iio/industrialio-gts-helper.c
index d7b52ca256b2..4f52dc373abf 100644
--- a/drivers/iio/industrialio-gts-helper.c
+++ b/drivers/iio/industrialio-gts-helper.c
@@ -250,12 +250,12 @@ static int iio_gts_alloc_int_table_array(int ***arr, int num_tables, int num_tab
{
int i, **tmp;
- tmp = kzalloc_objs(**arr, num_tables, GFP_KERNEL);
+ tmp = kzalloc_objs(**arr, num_tables);
if (!tmp)
return -ENOMEM;
for (i = 0; i < num_tables; i++) {
- tmp[i] = kzalloc_objs(int, num_table_items, GFP_KERNEL);
+ tmp[i] = kzalloc_objs(int, num_table_items);
if (!tmp[i])
goto err_free;
}
@@ -432,7 +432,7 @@ static int iio_gts_build_avail_time_table(struct iio_gts *gts)
if (!gts->num_itime)
return 0;
- times = kzalloc_objs(int, gts->num_itime, GFP_KERNEL);
+ times = kzalloc_objs(int, gts->num_itime);
if (!times)
return -ENOMEM;
diff --git a/drivers/iio/industrialio-trigger.c b/drivers/iio/industrialio-trigger.c
index 97a808554609..7f34fe7bad07 100644
--- a/drivers/iio/industrialio-trigger.c
+++ b/drivers/iio/industrialio-trigger.c
@@ -372,7 +372,7 @@ struct iio_poll_func
va_list vargs;
struct iio_poll_func *pf;
- pf = kmalloc_obj(*pf, GFP_KERNEL);
+ pf = kmalloc_obj(*pf);
if (!pf)
return NULL;
va_start(vargs, fmt);
@@ -557,7 +557,7 @@ struct iio_trigger *viio_trigger_alloc(struct device *parent,
struct iio_trigger *trig;
int i;
- trig = kzalloc_obj(*trig, GFP_KERNEL);
+ trig = kzalloc_obj(*trig);
if (!trig)
return NULL;
diff --git a/drivers/iio/inkern.c b/drivers/iio/inkern.c
index 44600bc1b879..0df0ab3de270 100644
--- a/drivers/iio/inkern.c
+++ b/drivers/iio/inkern.c
@@ -55,7 +55,7 @@ int iio_map_array_register(struct iio_dev *indio_dev, const struct iio_map *maps
guard(mutex)(&iio_map_list_lock);
while (maps[i].consumer_dev_name) {
- mapi = kzalloc_obj(*mapi, GFP_KERNEL);
+ mapi = kzalloc_obj(*mapi);
if (!mapi) {
ret = -ENOMEM;
goto error_ret;
@@ -188,7 +188,7 @@ static struct iio_channel *fwnode_iio_channel_get(struct fwnode_handle *fwnode,
return ERR_PTR(-EINVAL);
struct iio_channel *channel __free(kfree) =
- kzalloc_obj(*channel, GFP_KERNEL);
+ kzalloc_obj(*channel);
if (!channel)
return ERR_PTR(-ENOMEM);
@@ -302,7 +302,7 @@ static struct iio_channel *fwnode_iio_channel_get_all(struct device *dev)
/* NULL terminated array to save passing size */
struct iio_channel *chans __free(kfree) =
- kzalloc_objs(*chans, nummaps + 1, GFP_KERNEL);
+ kzalloc_objs(*chans, nummaps + 1);
if (!chans)
return ERR_PTR(-ENOMEM);
@@ -474,7 +474,7 @@ struct iio_channel *iio_channel_get_all(struct device *dev)
/* NULL terminated array to save passing size */
struct iio_channel *chans __free(kfree) =
- kzalloc_objs(*chans, nummaps + 1, GFP_KERNEL);
+ kzalloc_objs(*chans, nummaps + 1);
if (!chans)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/iio/trigger/iio-trig-hrtimer.c b/drivers/iio/trigger/iio-trig-hrtimer.c
index 02f137ace26d..57550b581593 100644
--- a/drivers/iio/trigger/iio-trig-hrtimer.c
+++ b/drivers/iio/trigger/iio-trig-hrtimer.c
@@ -131,7 +131,7 @@ static struct iio_sw_trigger *iio_trig_hrtimer_probe(const char *name)
struct iio_hrtimer_info *trig_info;
int ret;
- trig_info = kzalloc_obj(*trig_info, GFP_KERNEL);
+ trig_info = kzalloc_obj(*trig_info);
if (!trig_info)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/iio/trigger/iio-trig-interrupt.c b/drivers/iio/trigger/iio-trig-interrupt.c
index 432c9b2f2c64..a100c2e3a0d9 100644
--- a/drivers/iio/trigger/iio-trig-interrupt.c
+++ b/drivers/iio/trigger/iio-trig-interrupt.c
@@ -48,7 +48,7 @@ static int iio_interrupt_trigger_probe(struct platform_device *pdev)
goto error_ret;
}
- trig_info = kzalloc_obj(*trig_info, GFP_KERNEL);
+ trig_info = kzalloc_obj(*trig_info);
if (!trig_info) {
ret = -ENOMEM;
goto error_free_trigger;
diff --git a/drivers/iio/trigger/iio-trig-loop.c b/drivers/iio/trigger/iio-trig-loop.c
index 8996aaffb3f8..580a465035d1 100644
--- a/drivers/iio/trigger/iio-trig-loop.c
+++ b/drivers/iio/trigger/iio-trig-loop.c
@@ -80,7 +80,7 @@ static struct iio_sw_trigger *iio_trig_loop_probe(const char *name)
struct iio_loop_info *trig_info;
int ret;
- trig_info = kzalloc_obj(*trig_info, GFP_KERNEL);
+ trig_info = kzalloc_obj(*trig_info);
if (!trig_info)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/iio/trigger/iio-trig-sysfs.c b/drivers/iio/trigger/iio-trig-sysfs.c
index f242b3209307..b242b050ba18 100644
--- a/drivers/iio/trigger/iio-trig-sysfs.c
+++ b/drivers/iio/trigger/iio-trig-sysfs.c
@@ -140,7 +140,7 @@ static int iio_sysfs_trigger_probe(int id)
ret = -EINVAL;
goto err_unlock;
}
- t = kmalloc_obj(*t, GFP_KERNEL);
+ t = kmalloc_obj(*t);
if (t == NULL) {
ret = -ENOMEM;
goto err_unlock;
diff --git a/drivers/infiniband/core/addr.c b/drivers/infiniband/core/addr.c
index 0764d71a9dd5..866746695712 100644
--- a/drivers/infiniband/core/addr.c
+++ b/drivers/infiniband/core/addr.c
@@ -646,7 +646,7 @@ int rdma_resolve_ip(struct sockaddr *src_addr, const struct sockaddr *dst_addr,
struct addr_req *req;
int ret = 0;
- req = kzalloc_obj(*req, GFP_KERNEL);
+ req = kzalloc_obj(*req);
if (!req)
return -ENOMEM;
diff --git a/drivers/infiniband/core/agent.c b/drivers/infiniband/core/agent.c
index 8b889cb85c59..7847ede210bf 100644
--- a/drivers/infiniband/core/agent.c
+++ b/drivers/infiniband/core/agent.c
@@ -162,7 +162,7 @@ int ib_agent_port_open(struct ib_device *device, int port_num)
int ret;
/* Create new device info */
- port_priv = kzalloc_obj(*port_priv, GFP_KERNEL);
+ port_priv = kzalloc_obj(*port_priv);
if (!port_priv) {
ret = -ENOMEM;
goto error1;
diff --git a/drivers/infiniband/core/cache.c b/drivers/infiniband/core/cache.c
index c3d542187129..c066befec91b 100644
--- a/drivers/infiniband/core/cache.c
+++ b/drivers/infiniband/core/cache.c
@@ -296,7 +296,7 @@ alloc_gid_entry(const struct ib_gid_attr *attr)
struct ib_gid_table_entry *entry;
struct net_device *ndev;
- entry = kzalloc_obj(*entry, GFP_KERNEL);
+ entry = kzalloc_obj(*entry);
if (!entry)
return NULL;
@@ -771,12 +771,12 @@ const struct ib_gid_attr *rdma_find_gid_by_filter(
static struct ib_gid_table *alloc_gid_table(int sz)
{
- struct ib_gid_table *table = kzalloc_obj(*table, GFP_KERNEL);
+ struct ib_gid_table *table = kzalloc_obj(*table);
if (!table)
return NULL;
- table->data_vec = kzalloc_objs(*table->data_vec, sz, GFP_KERNEL);
+ table->data_vec = kzalloc_objs(*table->data_vec, sz);
if (!table->data_vec)
goto err_free_table;
@@ -1452,7 +1452,7 @@ ib_cache_update(struct ib_device *device, u32 port, bool update_gids,
if (!rdma_is_port_valid(device, port))
return -EINVAL;
- tprops = kmalloc_obj(*tprops, GFP_KERNEL);
+ tprops = kmalloc_obj(*tprops);
if (!tprops)
return -ENOMEM;
diff --git a/drivers/infiniband/core/cm.c b/drivers/infiniband/core/cm.c
index c2fb11197d02..9cc26c9d1e47 100644
--- a/drivers/infiniband/core/cm.c
+++ b/drivers/infiniband/core/cm.c
@@ -827,7 +827,7 @@ static struct cm_id_private *cm_alloc_id_priv(struct ib_device *device,
u32 id;
int ret;
- cm_id_priv = kzalloc_obj(*cm_id_priv, GFP_KERNEL);
+ cm_id_priv = kzalloc_obj(*cm_id_priv);
if (!cm_id_priv)
return ERR_PTR(-ENOMEM);
@@ -976,7 +976,7 @@ static struct cm_timewait_info *cm_create_timewait_info(__be32 local_id)
{
struct cm_timewait_info *timewait_info;
- timewait_info = kzalloc_obj(*timewait_info, GFP_KERNEL);
+ timewait_info = kzalloc_obj(*timewait_info);
if (!timewait_info)
return ERR_PTR(-ENOMEM);
@@ -4366,7 +4366,7 @@ static int cm_add_one(struct ib_device *ib_device)
if (!rdma_cap_ib_cm(ib_device, i))
continue;
- port = kzalloc_obj(*port, GFP_KERNEL);
+ port = kzalloc_obj(*port);
if (!port) {
ret = -ENOMEM;
goto error1;
diff --git a/drivers/infiniband/core/cma.c b/drivers/infiniband/core/cma.c
index e4bd705cc046..df6f34d5e041 100644
--- a/drivers/infiniband/core/cma.c
+++ b/drivers/infiniband/core/cma.c
@@ -490,7 +490,7 @@ static int cma_add_id_to_tree(struct rdma_id_private *node_id_priv)
unsigned long flags;
int result;
- node = kzalloc_obj(*node, GFP_KERNEL);
+ node = kzalloc_obj(*node);
if (!node)
return -ENOMEM;
@@ -1013,7 +1013,7 @@ __rdma_create_id(struct net *net, rdma_cm_event_handler event_handler,
{
struct rdma_id_private *id_priv;
- id_priv = kzalloc_obj(*id_priv, GFP_KERNEL);
+ id_priv = kzalloc_obj(*id_priv);
if (!id_priv)
return ERR_PTR(-ENOMEM);
@@ -3083,14 +3083,14 @@ static int cma_resolve_ib_route(struct rdma_id_private *id_priv,
struct cma_work *work;
int ret;
- work = kzalloc_obj(*work, GFP_KERNEL);
+ work = kzalloc_obj(*work);
if (!work)
return -ENOMEM;
cma_init_resolve_route_work(work, id_priv);
if (!route->path_rec)
- route->path_rec = kmalloc_obj(*route->path_rec, GFP_KERNEL);
+ route->path_rec = kmalloc_obj(*route->path_rec);
if (!route->path_rec) {
ret = -ENOMEM;
goto err1;
@@ -3204,7 +3204,7 @@ static int cma_resolve_iw_route(struct rdma_id_private *id_priv)
{
struct cma_work *work;
- work = kzalloc_obj(*work, GFP_KERNEL);
+ work = kzalloc_obj(*work);
if (!work)
return -ENOMEM;
@@ -3311,11 +3311,11 @@ static int cma_resolve_iboe_route(struct rdma_id_private *id_priv)
tos = id_priv->tos_set ? id_priv->tos : default_roce_tos;
mutex_unlock(&id_priv->qp_mutex);
- work = kzalloc_obj(*work, GFP_KERNEL);
+ work = kzalloc_obj(*work);
if (!work)
return -ENOMEM;
- route->path_rec = kzalloc_obj(*route->path_rec, GFP_KERNEL);
+ route->path_rec = kzalloc_obj(*route->path_rec);
if (!route->path_rec) {
ret = -ENOMEM;
goto err1;
@@ -3560,7 +3560,7 @@ static int cma_resolve_loopback(struct rdma_id_private *id_priv)
union ib_gid gid;
int ret;
- work = kzalloc_obj(*work, GFP_KERNEL);
+ work = kzalloc_obj(*work);
if (!work)
return -ENOMEM;
@@ -3585,7 +3585,7 @@ static int cma_resolve_ib_addr(struct rdma_id_private *id_priv)
struct cma_work *work;
int ret;
- work = kzalloc_obj(*work, GFP_KERNEL);
+ work = kzalloc_obj(*work);
if (!work)
return -ENOMEM;
@@ -3685,7 +3685,7 @@ static int cma_alloc_port(enum rdma_ucm_port_space ps,
lockdep_assert_held(&lock);
- bind_list = kzalloc_obj(*bind_list, GFP_KERNEL);
+ bind_list = kzalloc_obj(*bind_list);
if (!bind_list)
return -ENOMEM;
@@ -5100,7 +5100,7 @@ int rdma_join_multicast(struct rdma_cm_id *id, struct sockaddr *addr,
if (id_priv->id.qp_type != IB_QPT_UD)
return -EINVAL;
- mc = kzalloc_obj(*mc, GFP_KERNEL);
+ mc = kzalloc_obj(*mc);
if (!mc)
return -ENOMEM;
@@ -5166,7 +5166,7 @@ static int cma_netdev_change(struct net_device *ndev, struct rdma_id_private *id
memcmp(dev_addr->src_dev_addr, ndev->dev_addr, ndev->addr_len)) {
pr_info("RDMA CM addr change for ndev %s used by id %p\n",
ndev->name, &id_priv->id);
- work = kzalloc_obj(*work, GFP_KERNEL);
+ work = kzalloc_obj(*work);
if (!work)
return -ENOMEM;
@@ -5373,7 +5373,7 @@ static int cma_add_one(struct ib_device *device)
if (!cma_supported(device))
return -EOPNOTSUPP;
- cma_dev = kmalloc_obj(*cma_dev, GFP_KERNEL);
+ cma_dev = kmalloc_obj(*cma_dev);
if (!cma_dev)
return -ENOMEM;
@@ -5570,7 +5570,7 @@ static void cma_query_ib_service_handler(int status,
}
id_priv->id.route.service_recs =
- kmalloc_objs(*recs, num_recs, GFP_KERNEL);
+ kmalloc_objs(*recs, num_recs);
if (!id_priv->id.route.service_recs) {
status = -ENOMEM;
goto fail;
@@ -5610,7 +5610,7 @@ static int cma_resolve_ib_service(struct rdma_id_private *id_priv,
ib_sa_comp_mask mask = 0;
struct cma_work *work;
- work = kzalloc_obj(*work, GFP_KERNEL);
+ work = kzalloc_obj(*work);
if (!work)
return -ENOMEM;
diff --git a/drivers/infiniband/core/cma_configfs.c b/drivers/infiniband/core/cma_configfs.c
index a914edb8ffef..819927ce4f0e 100644
--- a/drivers/infiniband/core/cma_configfs.c
+++ b/drivers/infiniband/core/cma_configfs.c
@@ -210,7 +210,7 @@ static int make_cma_ports(struct cma_dev_group *cma_dev_group,
return -ENODEV;
ports_num = ibdev->phys_port_cnt;
- ports = kzalloc_objs(*cma_dev_group->ports, ports_num, GFP_KERNEL);
+ ports = kzalloc_objs(*cma_dev_group->ports, ports_num);
if (!ports)
return -ENOMEM;
@@ -284,7 +284,7 @@ static struct config_group *make_cma_dev(struct config_group *group,
if (!cma_dev)
goto fail;
- cma_dev_group = kzalloc_obj(*cma_dev_group, GFP_KERNEL);
+ cma_dev_group = kzalloc_obj(*cma_dev_group);
if (!cma_dev_group) {
err = -ENOMEM;
diff --git a/drivers/infiniband/core/cq.c b/drivers/infiniband/core/cq.c
index ffe357d01dce..81316228f614 100644
--- a/drivers/infiniband/core/cq.c
+++ b/drivers/infiniband/core/cq.c
@@ -58,7 +58,7 @@ static void rdma_dim_init(struct ib_cq *cq)
cq->poll_ctx == IB_POLL_DIRECT)
return;
- dim = kzalloc_obj(struct dim, GFP_KERNEL);
+ dim = kzalloc_obj(struct dim);
if (!dim)
return;
@@ -230,7 +230,7 @@ struct ib_cq *__ib_alloc_cq(struct ib_device *dev, void *private, int nr_cqe,
atomic_set(&cq->usecnt, 0);
cq->comp_vector = comp_vector;
- cq->wc = kmalloc_objs(*cq->wc, IB_POLL_BATCH, GFP_KERNEL);
+ cq->wc = kmalloc_objs(*cq->wc, IB_POLL_BATCH);
if (!cq->wc)
goto out_free_cq;
diff --git a/drivers/infiniband/core/device.c b/drivers/infiniband/core/device.c
index 8d50ee81a6d1..358ffe6756a4 100644
--- a/drivers/infiniband/core/device.c
+++ b/drivers/infiniband/core/device.c
@@ -957,7 +957,7 @@ static int add_one_compat_dev(struct ib_device *device,
if (ret)
goto done;
- cdev = kzalloc_obj(*cdev, GFP_KERNEL);
+ cdev = kzalloc_obj(*cdev);
if (!cdev) {
ret = -ENOMEM;
goto cdev_err;
diff --git a/drivers/infiniband/core/ib_core_uverbs.c b/drivers/infiniband/core/ib_core_uverbs.c
index 9e26868e50b6..d3836a62a004 100644
--- a/drivers/infiniband/core/ib_core_uverbs.c
+++ b/drivers/infiniband/core/ib_core_uverbs.c
@@ -87,7 +87,7 @@ int rdma_user_mmap_io(struct ib_ucontext *ucontext, struct vm_area_struct *vma,
return -EINVAL;
lockdep_assert_held(&ufile->device->disassociate_srcu);
- priv = kzalloc_obj(*priv, GFP_KERNEL);
+ priv = kzalloc_obj(*priv);
if (!priv)
return -ENOMEM;
diff --git a/drivers/infiniband/core/iwcm.c b/drivers/infiniband/core/iwcm.c
index 73e6849140fb..9761d9365ffd 100644
--- a/drivers/infiniband/core/iwcm.c
+++ b/drivers/infiniband/core/iwcm.c
@@ -171,7 +171,7 @@ static int alloc_work_entries(struct iwcm_id_private *cm_id_priv, int count)
BUG_ON(!list_empty(&cm_id_priv->work_free_list));
while (count--) {
- work = kmalloc_obj(struct iwcm_work, GFP_KERNEL);
+ work = kmalloc_obj(struct iwcm_work);
if (!work) {
dealloc_work_entries(cm_id_priv);
return -ENOMEM;
@@ -242,7 +242,7 @@ struct iw_cm_id *iw_create_cm_id(struct ib_device *device,
{
struct iwcm_id_private *cm_id_priv;
- cm_id_priv = kzalloc_obj(*cm_id_priv, GFP_KERNEL);
+ cm_id_priv = kzalloc_obj(*cm_id_priv);
if (!cm_id_priv)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/infiniband/core/iwpm_util.c b/drivers/infiniband/core/iwpm_util.c
index 96c707a49a71..7817b7dab7f9 100644
--- a/drivers/infiniband/core/iwpm_util.c
+++ b/drivers/infiniband/core/iwpm_util.c
@@ -113,7 +113,7 @@ int iwpm_create_mapinfo(struct sockaddr_storage *local_sockaddr,
unsigned long flags;
int ret = -EINVAL;
- map_info = kzalloc_obj(struct iwpm_mapping_info, GFP_KERNEL);
+ map_info = kzalloc_obj(struct iwpm_mapping_info);
if (!map_info)
return -ENOMEM;
diff --git a/drivers/infiniband/core/mad.c b/drivers/infiniband/core/mad.c
index a2b2cd4f8e0a..8d19613179e3 100644
--- a/drivers/infiniband/core/mad.c
+++ b/drivers/infiniband/core/mad.c
@@ -386,7 +386,7 @@ struct ib_mad_agent *ib_register_mad_agent(struct ib_device *device,
}
/* Allocate structures */
- mad_agent_priv = kzalloc_obj(*mad_agent_priv, GFP_KERNEL);
+ mad_agent_priv = kzalloc_obj(*mad_agent_priv);
if (!mad_agent_priv) {
ret = ERR_PTR(-ENOMEM);
goto error1;
@@ -2612,7 +2612,7 @@ static bool ib_mad_send_error(struct ib_mad_port_private *port_priv,
struct ib_qp_attr *attr;
/* Transition QP to RTS and fail offending send */
- attr = kmalloc_obj(*attr, GFP_KERNEL);
+ attr = kmalloc_obj(*attr);
if (attr) {
attr->qp_state = IB_QPS_RTS;
attr->cur_qp_state = IB_QPS_SQE;
@@ -3042,7 +3042,7 @@ static int ib_mad_port_start(struct ib_mad_port_private *port_priv)
struct ib_qp *qp;
u16 pkey_index;
- attr = kmalloc_obj(*attr, GFP_KERNEL);
+ attr = kmalloc_obj(*attr);
if (!attr)
return -ENOMEM;
@@ -3207,7 +3207,7 @@ static int ib_mad_port_open(struct ib_device *device,
return -EFAULT;
/* Create new device info */
- port_priv = kzalloc_obj(*port_priv, GFP_KERNEL);
+ port_priv = kzalloc_obj(*port_priv);
if (!port_priv)
return -ENOMEM;
diff --git a/drivers/infiniband/core/mad_rmpp.c b/drivers/infiniband/core/mad_rmpp.c
index 7d577d26f3eb..17c4c52a19e4 100644
--- a/drivers/infiniband/core/mad_rmpp.c
+++ b/drivers/infiniband/core/mad_rmpp.c
@@ -279,7 +279,7 @@ create_rmpp_recv(struct ib_mad_agent_private *agent,
struct mad_rmpp_recv *rmpp_recv;
struct ib_mad_hdr *mad_hdr;
- rmpp_recv = kmalloc_obj(*rmpp_recv, GFP_KERNEL);
+ rmpp_recv = kmalloc_obj(*rmpp_recv);
if (!rmpp_recv)
return NULL;
diff --git a/drivers/infiniband/core/restrack.c b/drivers/infiniband/core/restrack.c
index 87a9ac4bf987..ac3688952cab 100644
--- a/drivers/infiniband/core/restrack.c
+++ b/drivers/infiniband/core/restrack.c
@@ -25,7 +25,7 @@ int rdma_restrack_init(struct ib_device *dev)
struct rdma_restrack_root *rt;
int i;
- dev->res = kzalloc_objs(*rt, RDMA_RESTRACK_MAX, GFP_KERNEL);
+ dev->res = kzalloc_objs(*rt, RDMA_RESTRACK_MAX);
if (!dev->res)
return -ENOMEM;
diff --git a/drivers/infiniband/core/rw.c b/drivers/infiniband/core/rw.c
index 71345ccf1bf8..5a3092abb4e6 100644
--- a/drivers/infiniband/core/rw.c
+++ b/drivers/infiniband/core/rw.c
@@ -162,7 +162,7 @@ static int rdma_rw_init_mr_wrs(struct rdma_rw_ctx *ctx, struct ib_qp *qp,
int i, j, ret = 0, count = 0;
ctx->nr_ops = DIV_ROUND_UP(sg_cnt, pages_per_mr);
- ctx->reg = kzalloc_objs(*ctx->reg, ctx->nr_ops, GFP_KERNEL);
+ ctx->reg = kzalloc_objs(*ctx->reg, ctx->nr_ops);
if (!ctx->reg) {
ret = -ENOMEM;
goto out;
@@ -297,11 +297,11 @@ static int rdma_rw_init_map_wrs(struct rdma_rw_ctx *ctx, struct ib_qp *qp,
ctx->nr_ops = DIV_ROUND_UP(sg_cnt, max_sge);
- ctx->map.sges = sge = kzalloc_objs(*sge, sg_cnt, GFP_KERNEL);
+ ctx->map.sges = sge = kzalloc_objs(*sge, sg_cnt);
if (!ctx->map.sges)
goto out;
- ctx->map.wrs = kzalloc_objs(*ctx->map.wrs, ctx->nr_ops, GFP_KERNEL);
+ ctx->map.wrs = kzalloc_objs(*ctx->map.wrs, ctx->nr_ops);
if (!ctx->map.wrs)
goto out_free_sges;
@@ -756,7 +756,7 @@ int rdma_rw_ctx_signature_init(struct rdma_rw_ctx *ctx, struct ib_qp *qp,
ctx->type = RDMA_RW_SIG_MR;
ctx->nr_ops = 1;
- ctx->reg = kzalloc_obj(*ctx->reg, GFP_KERNEL);
+ ctx->reg = kzalloc_obj(*ctx->reg);
if (!ctx->reg) {
ret = -ENOMEM;
goto out_unmap_prot_sg;
diff --git a/drivers/infiniband/core/sa_query.c b/drivers/infiniband/core/sa_query.c
index cbea6fdd0e75..dbd452efe7aa 100644
--- a/drivers/infiniband/core/sa_query.c
+++ b/drivers/infiniband/core/sa_query.c
@@ -1607,7 +1607,7 @@ static void ib_sa_service_rec_callback(struct ib_sa_query *sa_query, int status,
return;
}
- rec = kmalloc_objs(*rec, num_services, GFP_KERNEL);
+ rec = kmalloc_objs(*rec, num_services);
if (!rec) {
query->callback(-ENOMEM, NULL, 0, query->context);
return;
@@ -2188,7 +2188,7 @@ static void update_ib_cpi(struct work_struct *work)
}
spin_unlock_irqrestore(&port->classport_lock, flags);
- cb_context = kmalloc_obj(*cb_context, GFP_KERNEL);
+ cb_context = kmalloc_obj(*cb_context);
if (!cb_context)
goto err_nomem;
@@ -2306,7 +2306,7 @@ static void update_sm_ah(struct work_struct *work)
return;
}
- new_ah = kmalloc_obj(*new_ah, GFP_KERNEL);
+ new_ah = kmalloc_obj(*new_ah);
if (!new_ah)
return;
diff --git a/drivers/infiniband/core/security.c b/drivers/infiniband/core/security.c
index deccd7b7eb51..9af31d1d9d70 100644
--- a/drivers/infiniband/core/security.c
+++ b/drivers/infiniband/core/security.c
@@ -258,7 +258,7 @@ static int port_pkey_list_insert(struct ib_port_pkey *pp)
if (!pkey) {
bool found = false;
- pkey = kzalloc_obj(*pkey, GFP_KERNEL);
+ pkey = kzalloc_obj(*pkey);
if (!pkey)
return -ENOMEM;
@@ -335,7 +335,7 @@ static struct ib_ports_pkeys *get_new_pps(const struct ib_qp *qp,
struct ib_ports_pkeys *new_pps;
struct ib_ports_pkeys *qp_pps = qp->qp_sec->ports_pkeys;
- new_pps = kzalloc_obj(*new_pps, GFP_KERNEL);
+ new_pps = kzalloc_obj(*new_pps);
if (!new_pps)
return NULL;
@@ -428,7 +428,7 @@ int ib_create_qp_security(struct ib_qp *qp, struct ib_device *dev)
if (!is_ib)
return 0;
- qp->qp_sec = kzalloc_obj(*qp->qp_sec, GFP_KERNEL);
+ qp->qp_sec = kzalloc_obj(*qp->qp_sec);
if (!qp->qp_sec)
return -ENOMEM;
diff --git a/drivers/infiniband/core/sysfs.c b/drivers/infiniband/core/sysfs.c
index c2becb0b39a2..d55f6a98c456 100644
--- a/drivers/infiniband/core/sysfs.c
+++ b/drivers/infiniband/core/sysfs.c
@@ -515,8 +515,8 @@ static int get_perf_mad(struct ib_device *dev, int port_num, __be16 attr,
if (!dev->ops.process_mad)
return -ENOSYS;
- in_mad = kzalloc_obj(*in_mad, GFP_KERNEL);
- out_mad = kzalloc_obj(*out_mad, GFP_KERNEL);
+ in_mad = kzalloc_obj(*in_mad);
+ out_mad = kzalloc_obj(*out_mad);
if (!in_mad || !out_mad) {
ret = -ENOMEM;
goto out;
@@ -1054,7 +1054,7 @@ alloc_port_table_group(const char *name, struct attribute_group *group,
struct attribute **attr_list;
int i;
- attr_list = kzalloc_objs(*attr_list, num + 1, GFP_KERNEL);
+ attr_list = kzalloc_objs(*attr_list, num + 1);
if (!attr_list)
return -ENOMEM;
diff --git a/drivers/infiniband/core/ucaps.c b/drivers/infiniband/core/ucaps.c
index d5524f69b981..948093260dbd 100644
--- a/drivers/infiniband/core/ucaps.c
+++ b/drivers/infiniband/core/ucaps.c
@@ -160,7 +160,7 @@ int ib_create_ucap(enum rdma_user_cap type)
return 0;
}
- ucap = kzalloc_obj(*ucap, GFP_KERNEL);
+ ucap = kzalloc_obj(*ucap);
if (!ucap) {
ret = -ENOMEM;
goto unlock;
diff --git a/drivers/infiniband/core/ucma.c b/drivers/infiniband/core/ucma.c
index f84c6a02eaff..878561fa1cb5 100644
--- a/drivers/infiniband/core/ucma.c
+++ b/drivers/infiniband/core/ucma.c
@@ -195,7 +195,7 @@ static struct ucma_context *ucma_alloc_ctx(struct ucma_file *file)
{
struct ucma_context *ctx;
- ctx = kzalloc_obj(*ctx, GFP_KERNEL);
+ ctx = kzalloc_obj(*ctx);
if (!ctx)
return NULL;
@@ -262,7 +262,7 @@ static struct ucma_event *ucma_create_uevent(struct ucma_context *ctx,
{
struct ucma_event *uevent;
- uevent = kzalloc_obj(*uevent, GFP_KERNEL);
+ uevent = kzalloc_obj(*uevent);
if (!uevent)
return NULL;
@@ -1529,7 +1529,7 @@ static ssize_t ucma_process_join(struct ucma_file *file,
if (IS_ERR(ctx))
return PTR_ERR(ctx);
- mc = kzalloc_obj(*mc, GFP_KERNEL);
+ mc = kzalloc_obj(*mc);
if (!mc) {
ret = -ENOMEM;
goto err_put_ctx;
@@ -1770,7 +1770,7 @@ static ssize_t ucma_write_cm_event(struct ucma_file *file,
event.status = cmd.status;
event.param.arg = cmd.param.arg;
- uevent = kzalloc_obj(*uevent, GFP_KERNEL);
+ uevent = kzalloc_obj(*uevent);
if (!uevent) {
ret = -ENOMEM;
goto out;
@@ -1885,7 +1885,7 @@ static int ucma_open(struct inode *inode, struct file *filp)
{
struct ucma_file *file;
- file = kmalloc_obj(*file, GFP_KERNEL);
+ file = kmalloc_obj(*file);
if (!file)
return -ENOMEM;
diff --git a/drivers/infiniband/core/umem.c b/drivers/infiniband/core/umem.c
index 8863fd1b85d8..cff4fcca2c34 100644
--- a/drivers/infiniband/core/umem.c
+++ b/drivers/infiniband/core/umem.c
@@ -189,7 +189,7 @@ struct ib_umem *ib_umem_get(struct ib_device *device, unsigned long addr,
if (access & IB_ACCESS_ON_DEMAND)
return ERR_PTR(-EOPNOTSUPP);
- umem = kzalloc_obj(*umem, GFP_KERNEL);
+ umem = kzalloc_obj(*umem);
if (!umem)
return ERR_PTR(-ENOMEM);
umem->ibdev = device;
diff --git a/drivers/infiniband/core/umem_dmabuf.c b/drivers/infiniband/core/umem_dmabuf.c
index dc35dbe18951..f5298c33e581 100644
--- a/drivers/infiniband/core/umem_dmabuf.c
+++ b/drivers/infiniband/core/umem_dmabuf.c
@@ -136,7 +136,7 @@ ib_umem_dmabuf_get_with_dma_device(struct ib_device *device,
if (dmabuf->size < end)
goto out_release_dmabuf;
- umem_dmabuf = kzalloc_obj(*umem_dmabuf, GFP_KERNEL);
+ umem_dmabuf = kzalloc_obj(*umem_dmabuf);
if (!umem_dmabuf) {
ret = ERR_PTR(-ENOMEM);
goto out_release_dmabuf;
diff --git a/drivers/infiniband/core/umem_odp.c b/drivers/infiniband/core/umem_odp.c
index d14bd597a2b7..404fa1cc3254 100644
--- a/drivers/infiniband/core/umem_odp.c
+++ b/drivers/infiniband/core/umem_odp.c
@@ -140,7 +140,7 @@ struct ib_umem_odp *ib_umem_odp_alloc_implicit(struct ib_device *device,
if (access & IB_ACCESS_HUGETLB)
return ERR_PTR(-EINVAL);
- umem_odp = kzalloc_obj(*umem_odp, GFP_KERNEL);
+ umem_odp = kzalloc_obj(*umem_odp);
if (!umem_odp)
return ERR_PTR(-ENOMEM);
umem = &umem_odp->umem;
@@ -181,7 +181,7 @@ ib_umem_odp_alloc_child(struct ib_umem_odp *root, unsigned long addr,
if (WARN_ON(!root->is_implicit_odp))
return ERR_PTR(-EINVAL);
- odp_data = kzalloc_obj(*odp_data, GFP_KERNEL);
+ odp_data = kzalloc_obj(*odp_data);
if (!odp_data)
return ERR_PTR(-ENOMEM);
umem = &odp_data->umem;
@@ -241,7 +241,7 @@ struct ib_umem_odp *ib_umem_odp_get(struct ib_device *device,
if (WARN_ON_ONCE(!(access & IB_ACCESS_ON_DEMAND)))
return ERR_PTR(-EINVAL);
- umem_odp = kzalloc_obj(struct ib_umem_odp, GFP_KERNEL);
+ umem_odp = kzalloc_obj(struct ib_umem_odp);
if (!umem_odp)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/infiniband/core/user_mad.c b/drivers/infiniband/core/user_mad.c
index 0ff2b7ba6b79..d9991d1f6e9a 100644
--- a/drivers/infiniband/core/user_mad.c
+++ b/drivers/infiniband/core/user_mad.c
@@ -247,7 +247,7 @@ static void recv_handler(struct ib_mad_agent *agent,
if (mad_recv_wc->wc->status != IB_WC_SUCCESS)
goto err1;
- packet = kzalloc_obj(*packet, GFP_KERNEL);
+ packet = kzalloc_obj(*packet);
if (!packet)
goto err1;
@@ -1018,7 +1018,7 @@ static int ib_umad_open(struct inode *inode, struct file *filp)
goto out;
}
- file = kzalloc_obj(*file, GFP_KERNEL);
+ file = kzalloc_obj(*file);
if (!file) {
ret = -ENOMEM;
goto out;
diff --git a/drivers/infiniband/core/uverbs_cmd.c b/drivers/infiniband/core/uverbs_cmd.c
index 7aa7f1692c73..02abeed9c75d 100644
--- a/drivers/infiniband/core/uverbs_cmd.c
+++ b/drivers/infiniband/core/uverbs_cmd.c
@@ -510,7 +510,7 @@ static int xrcd_table_insert(struct ib_uverbs_device *dev,
struct rb_node **p = &dev->xrcd_tree.rb_node;
struct rb_node *parent = NULL;
- entry = kmalloc_obj(*entry, GFP_KERNEL);
+ entry = kmalloc_obj(*entry);
if (!entry)
return -ENOMEM;
@@ -1672,8 +1672,8 @@ static int ib_uverbs_query_qp(struct uverbs_attr_bundle *attrs)
if (ret)
return ret;
- attr = kmalloc_obj(*attr, GFP_KERNEL);
- init_attr = kmalloc_obj(*init_attr, GFP_KERNEL);
+ attr = kmalloc_obj(*attr);
+ init_attr = kmalloc_obj(*init_attr);
if (!attr || !init_attr) {
ret = -ENOMEM;
goto out;
@@ -1780,7 +1780,7 @@ static int modify_qp(struct uverbs_attr_bundle *attrs,
struct ib_qp *qp;
int ret;
- attr = kzalloc_obj(*attr, GFP_KERNEL);
+ attr = kzalloc_obj(*attr);
if (!attr)
return -ENOMEM;
@@ -2525,7 +2525,7 @@ static int ib_uverbs_attach_mcast(struct uverbs_attr_bundle *attrs)
goto out_put;
}
- mcast = kmalloc_obj(*mcast, GFP_KERNEL);
+ mcast = kmalloc_obj(*mcast);
if (!mcast) {
ret = -ENOMEM;
goto out_put;
@@ -2595,7 +2595,7 @@ struct ib_uflow_resources *flow_resources_alloc(size_t num_specs)
{
struct ib_uflow_resources *resources;
- resources = kzalloc_obj(*resources, GFP_KERNEL);
+ resources = kzalloc_obj(*resources);
if (!resources)
return NULL;
@@ -2604,9 +2604,9 @@ struct ib_uflow_resources *flow_resources_alloc(size_t num_specs)
goto out;
resources->counters =
- kzalloc_objs(*resources->counters, num_specs, GFP_KERNEL);
+ kzalloc_objs(*resources->counters, num_specs);
resources->collection =
- kzalloc_objs(*resources->collection, num_specs, GFP_KERNEL);
+ kzalloc_objs(*resources->collection, num_specs);
if (!resources->counters || !resources->collection)
goto err;
@@ -3116,7 +3116,7 @@ static int ib_uverbs_ex_create_rwq_ind_table(struct uverbs_attr_bundle *attrs)
if (err)
goto err_free;
- wqs = kzalloc_objs(*wqs, num_wq_handles, GFP_KERNEL);
+ wqs = kzalloc_objs(*wqs, num_wq_handles);
if (!wqs) {
err = -ENOMEM;
goto err_free;
diff --git a/drivers/infiniband/core/uverbs_main.c b/drivers/infiniband/core/uverbs_main.c
index 2a3c8a5ead1c..7b68967a6301 100644
--- a/drivers/infiniband/core/uverbs_main.c
+++ b/drivers/infiniband/core/uverbs_main.c
@@ -737,7 +737,7 @@ static void rdma_umap_open(struct vm_area_struct *vma)
if (!ufile->ucontext)
goto out_unlock;
- priv = kzalloc_obj(*priv, GFP_KERNEL);
+ priv = kzalloc_obj(*priv);
if (!priv)
goto out_unlock;
rdma_umap_priv_init(priv, vma, opriv->entry);
@@ -966,7 +966,7 @@ static int ib_uverbs_open(struct inode *inode, struct file *filp)
}
}
- file = kzalloc_obj(*file, GFP_KERNEL);
+ file = kzalloc_obj(*file);
if (!file) {
ret = -ENOMEM;
if (module_dependent)
@@ -1154,7 +1154,7 @@ static int ib_uverbs_add_one(struct ib_device *device)
device->type == RDMA_DEVICE_TYPE_SMI)
return -EOPNOTSUPP;
- uverbs_dev = kzalloc_obj(*uverbs_dev, GFP_KERNEL);
+ uverbs_dev = kzalloc_obj(*uverbs_dev);
if (!uverbs_dev)
return -ENOMEM;
diff --git a/drivers/infiniband/core/uverbs_uapi.c b/drivers/infiniband/core/uverbs_uapi.c
index 7e8b04658526..7ed69890d87a 100644
--- a/drivers/infiniband/core/uverbs_uapi.c
+++ b/drivers/infiniband/core/uverbs_uapi.c
@@ -648,7 +648,7 @@ struct uverbs_api *uverbs_alloc_api(struct ib_device *ibdev)
struct uverbs_api *uapi;
int rc;
- uapi = kzalloc_obj(*uapi, GFP_KERNEL);
+ uapi = kzalloc_obj(*uapi);
if (!uapi)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/infiniband/core/verbs.c b/drivers/infiniband/core/verbs.c
index 2e98f1e2e53f..9b3d7088e3e1 100644
--- a/drivers/infiniband/core/verbs.c
+++ b/drivers/infiniband/core/verbs.c
@@ -1186,7 +1186,7 @@ static struct ib_qp *__ib_open_qp(struct ib_qp *real_qp,
unsigned long flags;
int err;
- qp = kzalloc_obj(*qp, GFP_KERNEL);
+ qp = kzalloc_obj(*qp);
if (!qp)
return ERR_PTR(-ENOMEM);
@@ -2420,7 +2420,7 @@ struct ib_mr *ib_alloc_mr_integrity(struct ib_pd *pd,
goto out;
}
- sig_attrs = kzalloc_obj(struct ib_sig_attrs, GFP_KERNEL);
+ sig_attrs = kzalloc_obj(struct ib_sig_attrs);
if (!sig_attrs) {
mr = ERR_PTR(-ENOMEM);
goto out;
diff --git a/drivers/infiniband/hw/bng_re/bng_dev.c b/drivers/infiniband/hw/bng_re/bng_dev.c
index d43fa9a5b109..cf3bf08e5f26 100644
--- a/drivers/infiniband/hw/bng_re/bng_dev.c
+++ b/drivers/infiniband/hw/bng_re/bng_dev.c
@@ -77,7 +77,7 @@ static int bng_re_setup_chip_ctx(struct bng_re_dev *rdev)
aux_dev = rdev->aux_dev;
rdev->bng_res.pdev = aux_dev->pdev;
rdev->rcfw.res = &rdev->bng_res;
- chip_ctx = kzalloc_obj(*chip_ctx, GFP_KERNEL);
+ chip_ctx = kzalloc_obj(*chip_ctx);
if (!chip_ctx)
return -ENOMEM;
chip_ctx->chip_num = aux_dev->chip_num;
@@ -85,7 +85,7 @@ static int bng_re_setup_chip_ctx(struct bng_re_dev *rdev)
rdev->chip_ctx = chip_ctx;
rdev->bng_res.cctx = rdev->chip_ctx;
- rdev->dev_attr = kzalloc_obj(*rdev->dev_attr, GFP_KERNEL);
+ rdev->dev_attr = kzalloc_obj(*rdev->dev_attr);
if (!rdev->dev_attr)
goto free_chip_ctx;
rdev->bng_res.dattr = rdev->dev_attr;
@@ -337,7 +337,7 @@ static int bng_re_dev_init(struct bng_re_dev *rdev)
}
/* Allocate nq record memory */
- rdev->nqr = kzalloc_obj(*rdev->nqr, GFP_KERNEL);
+ rdev->nqr = kzalloc_obj(*rdev->nqr);
if (!rdev->nqr) {
bng_re_destroy_chip_ctx(rdev);
bnge_unregister_dev(rdev->aux_dev);
@@ -464,7 +464,7 @@ static int bng_re_probe(struct auxiliary_device *adev,
struct bng_re_en_dev_info *en_info;
int rc;
- en_info = kzalloc_obj(*en_info, GFP_KERNEL);
+ en_info = kzalloc_obj(*en_info);
if (!en_info)
return -ENOMEM;
diff --git a/drivers/infiniband/hw/bnxt_re/debugfs.c b/drivers/infiniband/hw/bnxt_re/debugfs.c
index e43698156c61..a2ad79c3bbd0 100644
--- a/drivers/infiniband/hw/bnxt_re/debugfs.c
+++ b/drivers/infiniband/hw/bnxt_re/debugfs.c
@@ -467,7 +467,7 @@ static void bnxt_re_init_cq_coal_debugfs(struct bnxt_re_dev *rdev)
if (!_is_cq_coalescing_supported(rdev->dev_attr->dev_cap_flags2))
return;
- dbg_cq_coal_params = kzalloc_obj(*dbg_cq_coal_params, GFP_KERNEL);
+ dbg_cq_coal_params = kzalloc_obj(*dbg_cq_coal_params);
if (!dbg_cq_coal_params)
return;
@@ -497,7 +497,7 @@ void bnxt_re_debugfs_add_pdev(struct bnxt_re_dev *rdev)
bnxt_re_debugfs_add_info(rdev);
- rdev->cc_config_params = kzalloc_obj(*cc_params, GFP_KERNEL);
+ rdev->cc_config_params = kzalloc_obj(*cc_params);
for (i = 0; i < BNXT_RE_CC_PARAM_GEN0; i++) {
struct bnxt_re_cc_param *tmp_params = &rdev->cc_config_params->gen0_parms[i];
diff --git a/drivers/infiniband/hw/bnxt_re/ib_verbs.c b/drivers/infiniband/hw/bnxt_re/ib_verbs.c
index ea1518ba5c02..312d8856adb4 100644
--- a/drivers/infiniband/hw/bnxt_re/ib_verbs.c
+++ b/drivers/infiniband/hw/bnxt_re/ib_verbs.c
@@ -461,7 +461,7 @@ int bnxt_re_add_gid(const struct ib_gid_attr *attr, void **context)
return rc;
}
- ctx = kmalloc_obj(*ctx, GFP_KERNEL);
+ ctx = kmalloc_obj(*ctx);
if (!ctx)
return -ENOMEM;
ctx_tbl = sgid_tbl->ctx;
@@ -593,7 +593,7 @@ static int bnxt_re_create_fence_mr(struct bnxt_re_pd *pd)
fence->dma_addr = dma_addr;
/* Allocate a MR */
- mr = kzalloc_obj(*mr, GFP_KERNEL);
+ mr = kzalloc_obj(*mr);
if (!mr) {
rc = -ENOMEM;
goto fail;
@@ -651,7 +651,7 @@ bnxt_re_mmap_entry_insert(struct bnxt_re_ucontext *uctx, u64 mem_offset,
struct bnxt_re_user_mmap_entry *entry;
int ret;
- entry = kzalloc_obj(*entry, GFP_KERNEL);
+ entry = kzalloc_obj(*entry);
if (!entry)
return NULL;
@@ -1190,7 +1190,7 @@ static struct bnxt_re_ah *bnxt_re_create_shadow_qp_ah
union ib_gid sgid;
int rc;
- ah = kzalloc_obj(*ah, GFP_KERNEL);
+ ah = kzalloc_obj(*ah);
if (!ah)
return NULL;
@@ -1237,7 +1237,7 @@ static struct bnxt_re_qp *bnxt_re_create_shadow_qp
struct bnxt_re_qp *qp;
int rc;
- qp = kzalloc_obj(*qp, GFP_KERNEL);
+ qp = kzalloc_obj(*qp);
if (!qp)
return NULL;
@@ -2359,7 +2359,7 @@ int bnxt_re_query_qp(struct ib_qp *ib_qp, struct ib_qp_attr *qp_attr,
struct bnxt_qplib_qp *qplib_qp;
int rc;
- qplib_qp = kzalloc_obj(*qplib_qp, GFP_KERNEL);
+ qplib_qp = kzalloc_obj(*qplib_qp);
if (!qplib_qp)
return -ENOMEM;
@@ -4030,7 +4030,7 @@ struct ib_mr *bnxt_re_get_dma_mr(struct ib_pd *ib_pd, int mr_access_flags)
u32 active_mrs;
int rc;
- mr = kzalloc_obj(*mr, GFP_KERNEL);
+ mr = kzalloc_obj(*mr);
if (!mr)
return ERR_PTR(-ENOMEM);
@@ -4133,7 +4133,7 @@ struct ib_mr *bnxt_re_alloc_mr(struct ib_pd *ib_pd, enum ib_mr_type type,
if (max_num_sg > MAX_PBL_LVL_1_PGS)
return ERR_PTR(-EINVAL);
- mr = kzalloc_obj(*mr, GFP_KERNEL);
+ mr = kzalloc_obj(*mr);
if (!mr)
return ERR_PTR(-ENOMEM);
@@ -4185,7 +4185,7 @@ struct ib_mw *bnxt_re_alloc_mw(struct ib_pd *ib_pd, enum ib_mw_type type,
u32 active_mws;
int rc;
- mw = kzalloc_obj(*mw, GFP_KERNEL);
+ mw = kzalloc_obj(*mw);
if (!mw)
return ERR_PTR(-ENOMEM);
mw->rdev = rdev;
@@ -4250,7 +4250,7 @@ static struct ib_mr *__bnxt_re_user_reg_mr(struct ib_pd *ib_pd, u64 length, u64
return ERR_PTR(-EINVAL);
}
- mr = kzalloc_obj(*mr, GFP_KERNEL);
+ mr = kzalloc_obj(*mr);
if (!mr)
return ERR_PTR(-ENOMEM);
@@ -4507,7 +4507,7 @@ struct ib_flow *bnxt_re_create_flow(struct ib_qp *ib_qp,
return ERR_PTR(-EBUSY);
}
- flow = kzalloc_obj(*flow, GFP_KERNEL);
+ flow = kzalloc_obj(*flow);
if (!flow) {
mutex_unlock(&rdev->qp_lock);
return ERR_PTR(-ENOMEM);
diff --git a/drivers/infiniband/hw/bnxt_re/main.c b/drivers/infiniband/hw/bnxt_re/main.c
index cbb56ba634fc..b576f05e3b26 100644
--- a/drivers/infiniband/hw/bnxt_re/main.c
+++ b/drivers/infiniband/hw/bnxt_re/main.c
@@ -171,7 +171,7 @@ static int bnxt_re_setup_chip_ctx(struct bnxt_re_dev *rdev)
en_dev = rdev->en_dev;
rdev->qplib_res.pdev = en_dev->pdev;
- chip_ctx = kzalloc_obj(*chip_ctx, GFP_KERNEL);
+ chip_ctx = kzalloc_obj(*chip_ctx);
if (!chip_ctx)
return -ENOMEM;
chip_ctx->chip_num = en_dev->chip_num;
@@ -182,7 +182,7 @@ static int bnxt_re_setup_chip_ctx(struct bnxt_re_dev *rdev)
rdev->qplib_res.cctx = rdev->chip_ctx;
rdev->rcfw.res = &rdev->qplib_res;
- rdev->dev_attr = kzalloc_obj(*rdev->dev_attr, GFP_KERNEL);
+ rdev->dev_attr = kzalloc_obj(*rdev->dev_attr);
if (!rdev->dev_attr)
goto free_chip_ctx;
rdev->qplib_res.dattr = rdev->dev_attr;
@@ -2033,7 +2033,7 @@ static int bnxt_re_ib_init(struct bnxt_re_dev *rdev)
static int bnxt_re_alloc_nqr_mem(struct bnxt_re_dev *rdev)
{
- rdev->nqr = kzalloc_obj(*rdev->nqr, GFP_KERNEL);
+ rdev->nqr = kzalloc_obj(*rdev->nqr);
if (!rdev->nqr)
return -ENOMEM;
@@ -2491,7 +2491,7 @@ static int bnxt_re_probe(struct auxiliary_device *adev,
en_dev = aux_priv->edev;
mutex_lock(&bnxt_re_mutex);
- en_info = kzalloc_obj(*en_info, GFP_KERNEL);
+ en_info = kzalloc_obj(*en_info);
if (!en_info) {
mutex_unlock(&bnxt_re_mutex);
return -ENOMEM;
diff --git a/drivers/infiniband/hw/bnxt_re/qplib_fp.c b/drivers/infiniband/hw/bnxt_re/qplib_fp.c
index 9a491e489b2f..5a7cc3b1987e 100644
--- a/drivers/infiniband/hw/bnxt_re/qplib_fp.c
+++ b/drivers/infiniband/hw/bnxt_re/qplib_fp.c
@@ -799,7 +799,7 @@ static int bnxt_qplib_alloc_init_swq(struct bnxt_qplib_q *que)
{
int indx;
- que->swq = kzalloc_objs(*que->swq, que->max_sw_wqe, GFP_KERNEL);
+ que->swq = kzalloc_objs(*que->swq, que->max_sw_wqe);
if (!que->swq)
return -ENOMEM;
diff --git a/drivers/infiniband/hw/bnxt_re/qplib_res.c b/drivers/infiniband/hw/bnxt_re/qplib_res.c
index 619947e2f114..2f907246478f 100644
--- a/drivers/infiniband/hw/bnxt_re/qplib_res.c
+++ b/drivers/infiniband/hw/bnxt_re/qplib_res.c
@@ -556,7 +556,7 @@ static int bnxt_qplib_alloc_sgid_tbl(struct bnxt_qplib_res *res,
struct bnxt_qplib_sgid_tbl *sgid_tbl,
u16 max)
{
- sgid_tbl->tbl = kzalloc_objs(*sgid_tbl->tbl, max, GFP_KERNEL);
+ sgid_tbl->tbl = kzalloc_objs(*sgid_tbl->tbl, max);
if (!sgid_tbl->tbl)
return -ENOMEM;
diff --git a/drivers/infiniband/hw/cxgb4/cq.c b/drivers/infiniband/hw/cxgb4/cq.c
index c891fc3177e9..e31fb9134aa8 100644
--- a/drivers/infiniband/hw/cxgb4/cq.c
+++ b/drivers/infiniband/hw/cxgb4/cq.c
@@ -1095,10 +1095,10 @@ int c4iw_create_cq(struct ib_cq *ibcq, const struct ib_cq_init_attr *attr,
if (ucontext) {
ret = -ENOMEM;
- mm = kmalloc_obj(*mm, GFP_KERNEL);
+ mm = kmalloc_obj(*mm);
if (!mm)
goto err_remove_handle;
- mm2 = kmalloc_obj(*mm2, GFP_KERNEL);
+ mm2 = kmalloc_obj(*mm2);
if (!mm2)
goto err_free_mm;
diff --git a/drivers/infiniband/hw/cxgb4/device.c b/drivers/infiniband/hw/cxgb4/device.c
index 95e01f23c7b9..505bf009941e 100644
--- a/drivers/infiniband/hw/cxgb4/device.c
+++ b/drivers/infiniband/hw/cxgb4/device.c
@@ -330,7 +330,7 @@ static int qp_open(struct inode *inode, struct file *file)
unsigned long index;
int count = 1;
- qpd = kmalloc_obj(*qpd, GFP_KERNEL);
+ qpd = kmalloc_obj(*qpd);
if (!qpd)
return -ENOMEM;
@@ -424,7 +424,7 @@ static int stag_open(struct inode *inode, struct file *file)
int ret = 0;
int count = 1;
- stagd = kmalloc_obj(*stagd, GFP_KERNEL);
+ stagd = kmalloc_obj(*stagd);
if (!stagd) {
ret = -ENOMEM;
goto out;
@@ -675,7 +675,7 @@ static int ep_open(struct inode *inode, struct file *file)
int ret = 0;
int count = 1;
- epd = kmalloc_obj(*epd, GFP_KERNEL);
+ epd = kmalloc_obj(*epd);
if (!epd) {
ret = -ENOMEM;
goto out;
@@ -1078,7 +1078,7 @@ static void *c4iw_uld_add(const struct cxgb4_lld_info *infop)
pr_info("Chelsio T4/T5 RDMA Driver - version %s\n",
DRV_VERSION);
- ctx = kzalloc_obj(*ctx, GFP_KERNEL);
+ ctx = kzalloc_obj(*ctx);
if (!ctx) {
ctx = ERR_PTR(-ENOMEM);
goto out;
diff --git a/drivers/infiniband/hw/cxgb4/mem.c b/drivers/infiniband/hw/cxgb4/mem.c
index caa489c653ce..b8d49abde099 100644
--- a/drivers/infiniband/hw/cxgb4/mem.c
+++ b/drivers/infiniband/hw/cxgb4/mem.c
@@ -282,7 +282,7 @@ static int write_tpt_entry(struct c4iw_rdev *rdev, u32 reset_tpt_entry,
if (c4iw_fatal_error(rdev))
return -EIO;
- tpt = kmalloc_obj(*tpt, GFP_KERNEL);
+ tpt = kmalloc_obj(*tpt);
if (!tpt)
return -ENOMEM;
@@ -439,7 +439,7 @@ struct ib_mr *c4iw_get_dma_mr(struct ib_pd *pd, int acc)
php = to_c4iw_pd(pd);
rhp = php->rhp;
- mhp = kzalloc_obj(*mhp, GFP_KERNEL);
+ mhp = kzalloc_obj(*mhp);
if (!mhp)
return ERR_PTR(-ENOMEM);
mhp->wr_waitp = c4iw_alloc_wr_wait(GFP_KERNEL);
@@ -517,7 +517,7 @@ struct ib_mr *c4iw_reg_user_mr(struct ib_pd *pd, u64 start, u64 length,
if (mr_exceeds_hw_limits(rhp, length))
return ERR_PTR(-EINVAL);
- mhp = kzalloc_obj(*mhp, GFP_KERNEL);
+ mhp = kzalloc_obj(*mhp);
if (!mhp)
return ERR_PTR(-ENOMEM);
mhp->wr_waitp = c4iw_alloc_wr_wait(GFP_KERNEL);
@@ -618,7 +618,7 @@ struct ib_mr *c4iw_alloc_mr(struct ib_pd *pd, enum ib_mr_type mr_type,
use_dsgl))
return ERR_PTR(-EINVAL);
- mhp = kzalloc_obj(*mhp, GFP_KERNEL);
+ mhp = kzalloc_obj(*mhp);
if (!mhp) {
ret = -ENOMEM;
goto err;
diff --git a/drivers/infiniband/hw/cxgb4/provider.c b/drivers/infiniband/hw/cxgb4/provider.c
index 03db946208b6..616019ac1da5 100644
--- a/drivers/infiniband/hw/cxgb4/provider.c
+++ b/drivers/infiniband/hw/cxgb4/provider.c
@@ -92,7 +92,7 @@ static int c4iw_alloc_ucontext(struct ib_ucontext *ucontext,
pr_err_once("Warning - downlevel libcxgb4 (non-fatal), device status page disabled\n");
rhp->rdev.flags |= T4_STATUS_PAGE_DISABLED;
} else {
- mm = kmalloc_obj(*mm, GFP_KERNEL);
+ mm = kmalloc_obj(*mm);
if (!mm) {
ret = -ENOMEM;
goto err;
diff --git a/drivers/infiniband/hw/cxgb4/qp.c b/drivers/infiniband/hw/cxgb4/qp.c
index f942a5428283..1b9104d41b55 100644
--- a/drivers/infiniband/hw/cxgb4/qp.c
+++ b/drivers/infiniband/hw/cxgb4/qp.c
@@ -2220,25 +2220,25 @@ int c4iw_create_qp(struct ib_qp *qp, struct ib_qp_init_attr *attrs,
goto err_destroy_qp;
if (udata && ucontext) {
- sq_key_mm = kmalloc_obj(*sq_key_mm, GFP_KERNEL);
+ sq_key_mm = kmalloc_obj(*sq_key_mm);
if (!sq_key_mm) {
ret = -ENOMEM;
goto err_remove_handle;
}
if (!attrs->srq) {
- rq_key_mm = kmalloc_obj(*rq_key_mm, GFP_KERNEL);
+ rq_key_mm = kmalloc_obj(*rq_key_mm);
if (!rq_key_mm) {
ret = -ENOMEM;
goto err_free_sq_key;
}
}
- sq_db_key_mm = kmalloc_obj(*sq_db_key_mm, GFP_KERNEL);
+ sq_db_key_mm = kmalloc_obj(*sq_db_key_mm);
if (!sq_db_key_mm) {
ret = -ENOMEM;
goto err_free_rq_key;
}
if (!attrs->srq) {
- rq_db_key_mm = kmalloc_obj(*rq_db_key_mm, GFP_KERNEL);
+ rq_db_key_mm = kmalloc_obj(*rq_db_key_mm);
if (!rq_db_key_mm) {
ret = -ENOMEM;
goto err_free_sq_db_key;
@@ -2550,7 +2550,7 @@ static int alloc_srq_queue(struct c4iw_srq *srq, struct c4iw_dev_ucontext *uctx,
goto err;
if (!user) {
- wq->sw_rq = kzalloc_objs(*wq->sw_rq, wq->size, GFP_KERNEL);
+ wq->sw_rq = kzalloc_objs(*wq->sw_rq, wq->size);
if (!wq->sw_rq)
goto err_put_qpid;
wq->pending_wrs = kzalloc_objs(*srq->wq.pending_wrs,
@@ -2757,12 +2757,12 @@ int c4iw_create_srq(struct ib_srq *ib_srq, struct ib_srq_init_attr *attrs,
srq->flags = T4_SRQ_LIMIT_SUPPORT;
if (udata) {
- srq_key_mm = kmalloc_obj(*srq_key_mm, GFP_KERNEL);
+ srq_key_mm = kmalloc_obj(*srq_key_mm);
if (!srq_key_mm) {
ret = -ENOMEM;
goto err_free_queue;
}
- srq_db_key_mm = kmalloc_obj(*srq_db_key_mm, GFP_KERNEL);
+ srq_db_key_mm = kmalloc_obj(*srq_db_key_mm);
if (!srq_db_key_mm) {
ret = -ENOMEM;
goto err_free_srq_key_mm;
diff --git a/drivers/infiniband/hw/cxgb4/resource.c b/drivers/infiniband/hw/cxgb4/resource.c
index 224098e456c6..479d12824c72 100644
--- a/drivers/infiniband/hw/cxgb4/resource.c
+++ b/drivers/infiniband/hw/cxgb4/resource.c
@@ -126,7 +126,7 @@ u32 c4iw_get_cqid(struct c4iw_rdev *rdev, struct c4iw_dev_ucontext *uctx)
rdev->stats.qid.cur += rdev->qpmask + 1;
mutex_unlock(&rdev->stats.lock);
for (i = qid+1; i & rdev->qpmask; i++) {
- entry = kmalloc_obj(*entry, GFP_KERNEL);
+ entry = kmalloc_obj(*entry);
if (!entry)
goto out;
entry->qid = i;
@@ -137,13 +137,13 @@ u32 c4iw_get_cqid(struct c4iw_rdev *rdev, struct c4iw_dev_ucontext *uctx)
* now put the same ids on the qp list since they all
* map to the same db/gts page.
*/
- entry = kmalloc_obj(*entry, GFP_KERNEL);
+ entry = kmalloc_obj(*entry);
if (!entry)
goto out;
entry->qid = qid;
list_add_tail(&entry->entry, &uctx->qpids);
for (i = qid+1; i & rdev->qpmask; i++) {
- entry = kmalloc_obj(*entry, GFP_KERNEL);
+ entry = kmalloc_obj(*entry);
if (!entry)
goto out;
entry->qid = i;
@@ -165,7 +165,7 @@ void c4iw_put_cqid(struct c4iw_rdev *rdev, u32 qid,
{
struct c4iw_qid_list *entry;
- entry = kmalloc_obj(*entry, GFP_KERNEL);
+ entry = kmalloc_obj(*entry);
if (!entry)
return;
pr_debug("qid 0x%x\n", qid);
@@ -200,7 +200,7 @@ u32 c4iw_get_qpid(struct c4iw_rdev *rdev, struct c4iw_dev_ucontext *uctx)
rdev->stats.qid.cur += rdev->qpmask + 1;
mutex_unlock(&rdev->stats.lock);
for (i = qid+1; i & rdev->qpmask; i++) {
- entry = kmalloc_obj(*entry, GFP_KERNEL);
+ entry = kmalloc_obj(*entry);
if (!entry)
goto out;
entry->qid = i;
@@ -211,13 +211,13 @@ u32 c4iw_get_qpid(struct c4iw_rdev *rdev, struct c4iw_dev_ucontext *uctx)
* now put the same ids on the cq list since they all
* map to the same db/gts page.
*/
- entry = kmalloc_obj(*entry, GFP_KERNEL);
+ entry = kmalloc_obj(*entry);
if (!entry)
goto out;
entry->qid = qid;
list_add_tail(&entry->entry, &uctx->cqids);
for (i = qid + 1; i & rdev->qpmask; i++) {
- entry = kmalloc_obj(*entry, GFP_KERNEL);
+ entry = kmalloc_obj(*entry);
if (!entry)
goto out;
entry->qid = i;
@@ -239,7 +239,7 @@ void c4iw_put_qpid(struct c4iw_rdev *rdev, u32 qid,
{
struct c4iw_qid_list *entry;
- entry = kmalloc_obj(*entry, GFP_KERNEL);
+ entry = kmalloc_obj(*entry);
if (!entry)
return;
pr_debug("qid 0x%x\n", qid);
diff --git a/drivers/infiniband/hw/cxgb4/restrack.c b/drivers/infiniband/hw/cxgb4/restrack.c
index d9fdedce0f21..4f45d961d913 100644
--- a/drivers/infiniband/hw/cxgb4/restrack.c
+++ b/drivers/infiniband/hw/cxgb4/restrack.c
@@ -209,7 +209,7 @@ int c4iw_fill_res_cm_id_entry(struct sk_buff *msg,
epcp = (struct c4iw_ep_common *)iw_cm_id->provider_data;
if (!epcp)
return 0;
- uep = kzalloc_obj(*uep, GFP_KERNEL);
+ uep = kzalloc_obj(*uep);
if (!uep)
return 0;
diff --git a/drivers/infiniband/hw/efa/efa_main.c b/drivers/infiniband/hw/efa/efa_main.c
index 2e6b37385e5a..c1397086dc47 100644
--- a/drivers/infiniband/hw/efa/efa_main.c
+++ b/drivers/infiniband/hw/efa/efa_main.c
@@ -332,7 +332,7 @@ static int efa_create_eqs(struct efa_dev *dev)
neqs = min_t(u32, neqs, dev->num_irq_vectors - EFA_COMP_EQS_VEC_BASE);
dev->neqs = neqs;
- dev->eqs = kzalloc_objs(*dev->eqs, neqs, GFP_KERNEL);
+ dev->eqs = kzalloc_objs(*dev->eqs, neqs);
if (!dev->eqs)
return -ENOMEM;
diff --git a/drivers/infiniband/hw/efa/efa_verbs.c b/drivers/infiniband/hw/efa/efa_verbs.c
index 29a4e51dc015..51130bac3974 100644
--- a/drivers/infiniband/hw/efa/efa_verbs.c
+++ b/drivers/infiniband/hw/efa/efa_verbs.c
@@ -525,7 +525,7 @@ efa_user_mmap_entry_insert(struct ib_ucontext *ucontext,
u64 address, size_t length,
u8 mmap_flag, u64 *offset)
{
- struct efa_user_mmap_entry *entry = kzalloc_obj(*entry, GFP_KERNEL);
+ struct efa_user_mmap_entry *entry = kzalloc_obj(*entry);
int err;
if (!entry)
@@ -1335,7 +1335,7 @@ static struct scatterlist *efa_vmalloc_buf_to_sg(u64 *buf, int page_cnt)
struct page *pg;
int i;
- sglist = kmalloc_objs(*sglist, page_cnt, GFP_KERNEL);
+ sglist = kmalloc_objs(*sglist, page_cnt);
if (!sglist)
return NULL;
sg_init_table(sglist, page_cnt);
@@ -1681,7 +1681,7 @@ static struct efa_mr *efa_alloc_mr(struct ib_pd *ibpd, int access_flags,
return ERR_PTR(-EOPNOTSUPP);
}
- mr = kzalloc_obj(*mr, GFP_KERNEL);
+ mr = kzalloc_obj(*mr);
if (!mr)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/infiniband/hw/erdma/erdma_cm.c b/drivers/infiniband/hw/erdma/erdma_cm.c
index 3b164f645e6e..5c7d3a8f8038 100644
--- a/drivers/infiniband/hw/erdma/erdma_cm.c
+++ b/drivers/infiniband/hw/erdma/erdma_cm.c
@@ -91,7 +91,7 @@ static void erdma_disassoc_listen_cep(struct erdma_cep *cep)
static struct erdma_cep *erdma_cep_alloc(struct erdma_dev *dev)
{
- struct erdma_cep *cep = kzalloc_obj(*cep, GFP_KERNEL);
+ struct erdma_cep *cep = kzalloc_obj(*cep);
unsigned long flags;
if (!cep)
@@ -217,7 +217,7 @@ static int erdma_cm_alloc_work(struct erdma_cep *cep, int num)
struct erdma_cm_work *work;
while (num--) {
- work = kmalloc_obj(*work, GFP_KERNEL);
+ work = kmalloc_obj(*work);
if (!work) {
if (!(list_empty(&cep->work_freelist)))
erdma_cm_free_work(cep);
@@ -1340,7 +1340,7 @@ int erdma_create_listen(struct iw_cm_id *id, int backlog)
if (!id->provider_data) {
id->provider_data =
- kmalloc_obj(struct list_head, GFP_KERNEL);
+ kmalloc_obj(struct list_head);
if (!id->provider_data) {
ret = -ENOMEM;
goto error;
diff --git a/drivers/infiniband/hw/erdma/erdma_verbs.c b/drivers/infiniband/hw/erdma/erdma_verbs.c
index 7adf95d1315b..9f74aadc3047 100644
--- a/drivers/infiniband/hw/erdma/erdma_verbs.c
+++ b/drivers/infiniband/hw/erdma/erdma_verbs.c
@@ -291,7 +291,7 @@ static struct rdma_user_mmap_entry *
erdma_user_mmap_entry_insert(struct erdma_ucontext *uctx, void *address,
u32 size, u8 mmap_flag, u64 *mmap_offset)
{
- struct erdma_user_mmap_entry *entry = kzalloc_obj(*entry, GFP_KERNEL);
+ struct erdma_user_mmap_entry *entry = kzalloc_obj(*entry);
int ret;
if (!entry)
@@ -599,7 +599,7 @@ static struct erdma_mtt *erdma_create_cont_mtt(struct erdma_dev *dev,
{
struct erdma_mtt *mtt;
- mtt = kzalloc_obj(*mtt, GFP_KERNEL);
+ mtt = kzalloc_obj(*mtt);
if (!mtt)
return ERR_PTR(-ENOMEM);
@@ -724,7 +724,7 @@ static struct erdma_mtt *erdma_create_scatter_mtt(struct erdma_dev *dev,
struct erdma_mtt *mtt;
int ret = -ENOMEM;
- mtt = kzalloc_obj(*mtt, GFP_KERNEL);
+ mtt = kzalloc_obj(*mtt);
if (!mtt)
return ERR_PTR(-ENOMEM);
@@ -887,7 +887,7 @@ static int erdma_map_user_dbrecords(struct erdma_ucontext *ctx,
if (page->va == (dbrecords_va & PAGE_MASK))
goto found;
- page = kmalloc_obj(*page, GFP_KERNEL);
+ page = kmalloc_obj(*page);
if (!page) {
rv = -ENOMEM;
goto out;
@@ -1115,7 +1115,7 @@ struct ib_mr *erdma_get_dma_mr(struct ib_pd *ibpd, int acc)
u32 stag;
int ret;
- mr = kzalloc_obj(*mr, GFP_KERNEL);
+ mr = kzalloc_obj(*mr);
if (!mr)
return ERR_PTR(-ENOMEM);
@@ -1159,7 +1159,7 @@ struct ib_mr *erdma_ib_alloc_mr(struct ib_pd *ibpd, enum ib_mr_type mr_type,
if (max_num_sg > ERDMA_MR_MAX_MTT_CNT)
return ERR_PTR(-EINVAL);
- mr = kzalloc_obj(*mr, GFP_KERNEL);
+ mr = kzalloc_obj(*mr);
if (!mr)
return ERR_PTR(-ENOMEM);
@@ -1245,7 +1245,7 @@ struct ib_mr *erdma_reg_user_mr(struct ib_pd *ibpd, u64 start, u64 len,
if (!len || len > dev->attrs.max_mr_size)
return ERR_PTR(-EINVAL);
- mr = kzalloc_obj(*mr, GFP_KERNEL);
+ mr = kzalloc_obj(*mr);
if (!mr)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/infiniband/hw/hfi1/affinity.c b/drivers/infiniband/hw/hfi1/affinity.c
index 28ded5e12b42..a684e25482b2 100644
--- a/drivers/infiniband/hw/hfi1/affinity.c
+++ b/drivers/infiniband/hw/hfi1/affinity.c
@@ -199,7 +199,7 @@ static struct hfi1_affinity_node *node_affinity_allocate(int node)
{
struct hfi1_affinity_node *entry;
- entry = kzalloc_obj(*entry, GFP_KERNEL);
+ entry = kzalloc_obj(*entry);
if (!entry)
return NULL;
entry->node = node;
diff --git a/drivers/infiniband/hw/hfi1/chip.c b/drivers/infiniband/hw/hfi1/chip.c
index b03f39ee1964..6a9db4d17c5a 100644
--- a/drivers/infiniband/hw/hfi1/chip.c
+++ b/drivers/infiniband/hw/hfi1/chip.c
@@ -14221,7 +14221,7 @@ static struct rsm_map_table *alloc_rsm_map_table(struct hfi1_devdata *dd)
struct rsm_map_table *rmt;
u8 rxcontext = is_ax(dd) ? 0 : 0xff; /* 0 is default if a0 ver. */
- rmt = kmalloc_obj(*rmt, GFP_KERNEL);
+ rmt = kmalloc_obj(*rmt);
if (rmt) {
memset(rmt->map, rxcontext, sizeof(rmt->map));
rmt->used = 0;
@@ -14872,7 +14872,7 @@ static int init_asic_data(struct hfi1_devdata *dd)
int ret = 0;
/* pre-allocate the asic structure in case we are the first device */
- asic_data = kzalloc_obj(*dd->asic_data, GFP_KERNEL);
+ asic_data = kzalloc_obj(*dd->asic_data);
if (!asic_data)
return -ENOMEM;
diff --git a/drivers/infiniband/hw/hfi1/efivar.c b/drivers/infiniband/hw/hfi1/efivar.c
index f311b2f328a9..c4974c3bea5e 100644
--- a/drivers/infiniband/hw/hfi1/efivar.c
+++ b/drivers/infiniband/hw/hfi1/efivar.c
@@ -41,7 +41,7 @@ static int read_efi_var(const char *name, unsigned long *size,
if (!efi_rt_services_supported(EFI_RT_SUPPORTED_GET_VARIABLE))
return -EOPNOTSUPP;
- uni_name = kzalloc_objs(efi_char16_t, strlen(name) + 1, GFP_KERNEL);
+ uni_name = kzalloc_objs(efi_char16_t, strlen(name) + 1);
temp_buffer = kzalloc(EFI_DATA_SIZE, GFP_KERNEL);
if (!uni_name || !temp_buffer) {
diff --git a/drivers/infiniband/hw/hfi1/fault.c b/drivers/infiniband/hw/hfi1/fault.c
index 697210b84937..4ab72ef03ba1 100644
--- a/drivers/infiniband/hw/hfi1/fault.c
+++ b/drivers/infiniband/hw/hfi1/fault.c
@@ -209,7 +209,7 @@ int hfi1_fault_init_debugfs(struct hfi1_ibdev *ibd)
struct dentry *parent = ibd->hfi1_ibdev_dbg;
struct dentry *fault_dir;
- ibd->fault = kzalloc_obj(*ibd->fault, GFP_KERNEL);
+ ibd->fault = kzalloc_obj(*ibd->fault);
if (!ibd->fault)
return -ENOMEM;
diff --git a/drivers/infiniband/hw/hfi1/file_ops.c b/drivers/infiniband/hw/hfi1/file_ops.c
index 9baedace9ccc..56031becb273 100644
--- a/drivers/infiniband/hw/hfi1/file_ops.c
+++ b/drivers/infiniband/hw/hfi1/file_ops.c
@@ -158,7 +158,7 @@ static int hfi1_file_open(struct inode *inode, struct file *fp)
/* The real work is performed later in assign_ctxt() */
- fd = kzalloc_obj(*fd, GFP_KERNEL);
+ fd = kzalloc_obj(*fd);
if (!fd || init_srcu_struct(&fd->pq_srcu))
goto nomem;
diff --git a/drivers/infiniband/hw/hfi1/init.c b/drivers/infiniband/hw/hfi1/init.c
index 5bc8250ffbb2..07333dd37652 100644
--- a/drivers/infiniband/hw/hfi1/init.c
+++ b/drivers/infiniband/hw/hfi1/init.c
@@ -646,7 +646,7 @@ void hfi1_init_pportdata(struct pci_dev *pdev, struct hfi1_pportdata *ppd,
spin_lock_init(&ppd->cc_state_lock);
spin_lock_init(&ppd->cc_log_lock);
- cc_state = kzalloc_obj(*cc_state, GFP_KERNEL);
+ cc_state = kzalloc_obj(*cc_state);
RCU_INIT_POINTER(ppd->cc_state, cc_state);
if (!cc_state)
goto bail;
@@ -1282,7 +1282,7 @@ static struct hfi1_devdata *hfi1_alloc_devdata(struct pci_dev *pdev,
goto bail;
}
- dd->comp_vect = kzalloc_obj(*dd->comp_vect, GFP_KERNEL);
+ dd->comp_vect = kzalloc_obj(*dd->comp_vect);
if (!dd->comp_vect) {
ret = -ENOMEM;
goto bail;
diff --git a/drivers/infiniband/hw/hfi1/mad.c b/drivers/infiniband/hw/hfi1/mad.c
index 41791ade91bd..03467e6c19a0 100644
--- a/drivers/infiniband/hw/hfi1/mad.c
+++ b/drivers/infiniband/hw/hfi1/mad.c
@@ -3736,7 +3736,7 @@ static void apply_cc_state(struct hfi1_pportdata *ppd)
{
struct cc_state *old_cc_state, *new_cc_state;
- new_cc_state = kzalloc_obj(*new_cc_state, GFP_KERNEL);
+ new_cc_state = kzalloc_obj(*new_cc_state);
if (!new_cc_state)
return;
diff --git a/drivers/infiniband/hw/hfi1/msix.c b/drivers/infiniband/hw/hfi1/msix.c
index 790a4fd79421..3ac50ca4afcc 100644
--- a/drivers/infiniband/hw/hfi1/msix.c
+++ b/drivers/infiniband/hw/hfi1/msix.c
@@ -38,7 +38,7 @@ int msix_initialize(struct hfi1_devdata *dd)
return ret;
}
- entries = kzalloc_objs(*dd->msix_info.msix_entries, total, GFP_KERNEL);
+ entries = kzalloc_objs(*dd->msix_info.msix_entries, total);
if (!entries) {
pci_free_irq_vectors(dd->pcidev);
return -ENOMEM;
diff --git a/drivers/infiniband/hw/hfi1/pin_system.c b/drivers/infiniband/hw/hfi1/pin_system.c
index d8109b06aa70..e62b4d9c7a0f 100644
--- a/drivers/infiniband/hw/hfi1/pin_system.c
+++ b/drivers/infiniband/hw/hfi1/pin_system.c
@@ -119,7 +119,7 @@ static int pin_system_pages(struct user_sdma_request *req,
int pinned, cleared;
struct page **pages;
- pages = kzalloc_objs(*pages, npages, GFP_KERNEL);
+ pages = kzalloc_objs(*pages, npages);
if (!pages)
return -ENOMEM;
@@ -173,7 +173,7 @@ static int add_system_pinning(struct user_sdma_request *req,
struct sdma_mmu_node *node;
int ret;
- node = kzalloc_obj(*node, GFP_KERNEL);
+ node = kzalloc_obj(*node);
if (!node)
return -ENOMEM;
diff --git a/drivers/infiniband/hw/hfi1/qsfp.c b/drivers/infiniband/hw/hfi1/qsfp.c
index 7c133037397c..2b6d45d092bc 100644
--- a/drivers/infiniband/hw/hfi1/qsfp.c
+++ b/drivers/infiniband/hw/hfi1/qsfp.c
@@ -107,7 +107,7 @@ static struct hfi1_i2c_bus *init_i2c_bus(struct hfi1_devdata *dd,
struct hfi1_i2c_bus *bus;
int ret;
- bus = kzalloc_obj(*bus, GFP_KERNEL);
+ bus = kzalloc_obj(*bus);
if (!bus)
return NULL;
diff --git a/drivers/infiniband/hw/hfi1/sdma.c b/drivers/infiniband/hw/hfi1/sdma.c
index 04763f50ff60..e5f442938177 100644
--- a/drivers/infiniband/hw/hfi1/sdma.c
+++ b/drivers/infiniband/hw/hfi1/sdma.c
@@ -937,7 +937,7 @@ ssize_t sdma_set_cpu_to_sde_map(struct sdma_engine *sde, const char *buf,
rht_node = rhashtable_lookup_fast(dd->sdma_rht, &cpu,
sdma_rht_params);
if (!rht_node) {
- rht_node = kzalloc_obj(*rht_node, GFP_KERNEL);
+ rht_node = kzalloc_obj(*rht_node);
if (!rht_node) {
ret = -ENOMEM;
goto out;
@@ -1481,7 +1481,7 @@ int sdma_init(struct hfi1_devdata *dd, u8 port)
if (ret < 0)
goto bail;
- tmp_sdma_rht = kzalloc_obj(*tmp_sdma_rht, GFP_KERNEL);
+ tmp_sdma_rht = kzalloc_obj(*tmp_sdma_rht);
if (!tmp_sdma_rht) {
ret = -ENOMEM;
goto bail;
diff --git a/drivers/infiniband/hw/hfi1/user_exp_rcv.c b/drivers/infiniband/hw/hfi1/user_exp_rcv.c
index 1c16d4f9e1ab..95611f725257 100644
--- a/drivers/infiniband/hw/hfi1/user_exp_rcv.c
+++ b/drivers/infiniband/hw/hfi1/user_exp_rcv.c
@@ -169,7 +169,7 @@ static int pin_rcv_pages(struct hfi1_filedata *fd, struct tid_user_buf *tidbuf)
}
/* Allocate the array of struct page pointers needed for pinning */
- pages = kzalloc_objs(*pages, npages, GFP_KERNEL);
+ pages = kzalloc_objs(*pages, npages);
if (!pages)
return -ENOMEM;
diff --git a/drivers/infiniband/hw/hfi1/user_sdma.c b/drivers/infiniband/hw/hfi1/user_sdma.c
index f2642fef0bf4..8ea5ed918a02 100644
--- a/drivers/infiniband/hw/hfi1/user_sdma.c
+++ b/drivers/infiniband/hw/hfi1/user_sdma.c
@@ -120,7 +120,7 @@ int hfi1_user_sdma_alloc_queues(struct hfi1_ctxtdata *uctxt,
dd = uctxt->dd;
- pq = kzalloc_obj(*pq, GFP_KERNEL);
+ pq = kzalloc_obj(*pq);
if (!pq)
return -ENOMEM;
pq->dd = dd;
@@ -135,7 +135,7 @@ int hfi1_user_sdma_alloc_queues(struct hfi1_ctxtdata *uctxt,
activate_packet_queue, NULL, NULL);
pq->reqidx = 0;
- pq->reqs = kzalloc_objs(*pq->reqs, hfi1_sdma_comp_ring_size, GFP_KERNEL);
+ pq->reqs = kzalloc_objs(*pq->reqs, hfi1_sdma_comp_ring_size);
if (!pq->reqs)
goto pq_reqs_nomem;
@@ -156,7 +156,7 @@ int hfi1_user_sdma_alloc_queues(struct hfi1_ctxtdata *uctxt,
goto pq_txreq_nomem;
}
- cq = kzalloc_obj(*cq, GFP_KERNEL);
+ cq = kzalloc_obj(*cq);
if (!cq)
goto cq_nomem;
diff --git a/drivers/infiniband/hw/hns/hns_roce_bond.c b/drivers/infiniband/hw/hns/hns_roce_bond.c
index e3ffd7e20160..f2b12ae13a58 100644
--- a/drivers/infiniband/hw/hns/hns_roce_bond.c
+++ b/drivers/infiniband/hw/hns/hns_roce_bond.c
@@ -253,7 +253,7 @@ static struct hns_roce_die_info *alloc_die_info(int bus_num)
struct hns_roce_die_info *die_info;
int ret;
- die_info = kzalloc_obj(*die_info, GFP_KERNEL);
+ die_info = kzalloc_obj(*die_info);
if (!die_info)
return NULL;
@@ -855,7 +855,7 @@ int hns_roce_alloc_bond_grp(struct hns_roce_dev *hr_dev)
return 0;
for (i = 0; i < ROCE_BOND_NUM_MAX; i++) {
- bond_grp = kvzalloc_obj(*bond_grp, GFP_KERNEL);
+ bond_grp = kvzalloc_obj(*bond_grp);
if (!bond_grp) {
ret = -ENOMEM;
goto mem_err;
diff --git a/drivers/infiniband/hw/hns/hns_roce_cmd.c b/drivers/infiniband/hw/hns/hns_roce_cmd.c
index f8a42ea6acac..1943031b0dbe 100644
--- a/drivers/infiniband/hw/hns/hns_roce_cmd.c
+++ b/drivers/infiniband/hw/hns/hns_roce_cmd.c
@@ -219,7 +219,7 @@ int hns_roce_cmd_use_events(struct hns_roce_dev *hr_dev)
int i;
hr_cmd->context =
- kzalloc_objs(*hr_cmd->context, hr_cmd->max_cmds, GFP_KERNEL);
+ kzalloc_objs(*hr_cmd->context, hr_cmd->max_cmds);
if (!hr_cmd->context) {
hr_dev->cmd_mod = 0;
return -ENOMEM;
@@ -254,7 +254,7 @@ hns_roce_alloc_cmd_mailbox(struct hns_roce_dev *hr_dev)
{
struct hns_roce_cmd_mailbox *mailbox;
- mailbox = kmalloc_obj(*mailbox, GFP_KERNEL);
+ mailbox = kmalloc_obj(*mailbox);
if (!mailbox)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/infiniband/hw/hns/hns_roce_db.c b/drivers/infiniband/hw/hns/hns_roce_db.c
index ad8fcaf613b9..f64023f5cf0a 100644
--- a/drivers/infiniband/hw/hns/hns_roce_db.c
+++ b/drivers/infiniband/hw/hns/hns_roce_db.c
@@ -21,7 +21,7 @@ int hns_roce_db_map_user(struct hns_roce_ucontext *context, unsigned long virt,
if (page->user_virt == page_addr)
goto found;
- page = kmalloc_obj(*page, GFP_KERNEL);
+ page = kmalloc_obj(*page);
if (!page) {
ret = -ENOMEM;
goto out;
@@ -72,7 +72,7 @@ static struct hns_roce_db_pgdir *hns_roce_alloc_db_pgdir(
{
struct hns_roce_db_pgdir *pgdir;
- pgdir = kzalloc_obj(*pgdir, GFP_KERNEL);
+ pgdir = kzalloc_obj(*pgdir);
if (!pgdir)
return NULL;
diff --git a/drivers/infiniband/hw/hns/hns_roce_hem.c b/drivers/infiniband/hw/hns/hns_roce_hem.c
index 11ba69dde716..9b60392afa39 100644
--- a/drivers/infiniband/hw/hns/hns_roce_hem.c
+++ b/drivers/infiniband/hw/hns/hns_roce_hem.c
@@ -262,7 +262,7 @@ static struct hns_roce_hem *hns_roce_alloc_hem(struct hns_roce_dev *hr_dev,
return NULL;
}
- hem = kmalloc_obj(*hem, GFP_KERNEL);
+ hem = kmalloc_obj(*hem);
if (!hem)
return NULL;
@@ -737,7 +737,7 @@ int hns_roce_init_hem_table(struct hns_roce_dev *hr_dev,
obj_per_chunk = table->table_chunk_size / obj_size;
num_hem = DIV_ROUND_UP(nobj, obj_per_chunk);
- table->hem = kzalloc_objs(*table->hem, num_hem, GFP_KERNEL);
+ table->hem = kzalloc_objs(*table->hem, num_hem);
if (!table->hem)
return -ENOMEM;
} else {
@@ -763,7 +763,7 @@ int hns_roce_init_hem_table(struct hns_roce_dev *hr_dev,
if (type >= HEM_TYPE_MTT)
num_bt_l0 = bt_chunk_num;
- table->hem = kzalloc_objs(*table->hem, num_hem, GFP_KERNEL);
+ table->hem = kzalloc_objs(*table->hem, num_hem);
if (!table->hem)
goto err_kcalloc_hem_buf;
@@ -938,7 +938,7 @@ hem_list_alloc_item(struct hns_roce_dev *hr_dev, int start, int end, int count,
{
struct hns_roce_hem_item *hem;
- hem = kzalloc_obj(*hem, GFP_KERNEL);
+ hem = kzalloc_obj(*hem);
if (!hem)
return NULL;
diff --git a/drivers/infiniband/hw/hns/hns_roce_hw_v2.c b/drivers/infiniband/hw/hns/hns_roce_hw_v2.c
index 3440a6f21c02..fa36700d0db2 100644
--- a/drivers/infiniband/hw/hns/hns_roce_hw_v2.c
+++ b/drivers/infiniband/hw/hns/hns_roce_hw_v2.c
@@ -1948,7 +1948,7 @@ static int hns_roce_hw_v2_query_counter(struct hns_roce_dev *hr_dev,
return -EINVAL;
desc_num = DIV_ROUND_UP(HNS_ROCE_HW_CNT_TOTAL, CNT_PER_DESC);
- desc = kzalloc_objs(*desc, desc_num, GFP_KERNEL);
+ desc = kzalloc_objs(*desc, desc_num);
if (!desc)
return -ENOMEM;
@@ -2881,7 +2881,7 @@ static struct ib_pd *free_mr_init_pd(struct hns_roce_dev *hr_dev)
struct hns_roce_pd *hr_pd;
struct ib_pd *pd;
- hr_pd = kzalloc_obj(*hr_pd, GFP_KERNEL);
+ hr_pd = kzalloc_obj(*hr_pd);
if (!hr_pd)
return NULL;
pd = &hr_pd->ibpd;
@@ -2912,7 +2912,7 @@ static struct ib_cq *free_mr_init_cq(struct hns_roce_dev *hr_dev)
cq_init_attr.cqe = HNS_ROCE_FREE_MR_USED_CQE_NUM;
- hr_cq = kzalloc_obj(*hr_cq, GFP_KERNEL);
+ hr_cq = kzalloc_obj(*hr_cq);
if (!hr_cq)
return NULL;
@@ -2945,7 +2945,7 @@ static int free_mr_init_qp(struct hns_roce_dev *hr_dev, struct ib_cq *cq,
struct ib_qp *qp;
int ret;
- hr_qp = kzalloc_obj(*hr_qp, GFP_KERNEL);
+ hr_qp = kzalloc_obj(*hr_qp);
if (!hr_qp)
return -ENOMEM;
@@ -5021,7 +5021,7 @@ static int alloc_dip_entry(struct xarray *dip_xa, u32 qpn)
if (hr_dip)
return 0;
- hr_dip = kzalloc_obj(*hr_dip, GFP_KERNEL);
+ hr_dip = kzalloc_obj(*hr_dip);
if (!hr_dip)
return -ENOMEM;
@@ -5635,8 +5635,8 @@ static int hns_roce_v2_modify_qp(struct ib_qp *ibqp,
* we should set all bits of the relevant fields in context mask to
* 0 at the same time, else set them to 0x1.
*/
- context = kvzalloc_obj(*context, GFP_KERNEL);
- qpc_mask = kvzalloc_obj(*qpc_mask, GFP_KERNEL);
+ context = kvzalloc_obj(*context);
+ qpc_mask = kvzalloc_obj(*qpc_mask);
if (!context || !qpc_mask)
goto out;
@@ -7107,7 +7107,7 @@ static int hns_roce_v2_init_eq_table(struct hns_roce_dev *hr_dev)
eq_num = comp_num + aeq_num;
irq_num = eq_num + other_num;
- eq_table->eq = kzalloc_objs(*eq_table->eq, eq_num, GFP_KERNEL);
+ eq_table->eq = kzalloc_objs(*eq_table->eq, eq_num);
if (!eq_table->eq)
return -ENOMEM;
@@ -7309,7 +7309,7 @@ static int __hns_roce_hw_v2_init_instance(struct hnae3_handle *handle)
if (!hr_dev)
return -ENOMEM;
- hr_dev->priv = kzalloc_obj(struct hns_roce_v2_priv, GFP_KERNEL);
+ hr_dev->priv = kzalloc_obj(struct hns_roce_v2_priv);
if (!hr_dev->priv) {
ret = -ENOMEM;
goto error_failed_kzalloc;
diff --git a/drivers/infiniband/hw/hns/hns_roce_main.c b/drivers/infiniband/hw/hns/hns_roce_main.c
index 349910dd99c6..1d2d0d8bdcdf 100644
--- a/drivers/infiniband/hw/hns/hns_roce_main.c
+++ b/drivers/infiniband/hw/hns/hns_roce_main.c
@@ -366,7 +366,7 @@ hns_roce_user_mmap_entry_insert(struct ib_ucontext *ucontext, u64 address,
struct hns_user_mmap_entry *entry;
int ret;
- entry = kzalloc_obj(*entry, GFP_KERNEL);
+ entry = kzalloc_obj(*entry);
if (!entry)
return NULL;
diff --git a/drivers/infiniband/hw/hns/hns_roce_mr.c b/drivers/infiniband/hw/hns/hns_roce_mr.c
index 80917b8926c1..741e4f3c557f 100644
--- a/drivers/infiniband/hw/hns/hns_roce_mr.c
+++ b/drivers/infiniband/hw/hns/hns_roce_mr.c
@@ -200,7 +200,7 @@ struct ib_mr *hns_roce_get_dma_mr(struct ib_pd *pd, int acc)
struct hns_roce_mr *mr;
int ret;
- mr = kzalloc_obj(*mr, GFP_KERNEL);
+ mr = kzalloc_obj(*mr);
if (!mr)
return ERR_PTR(-ENOMEM);
@@ -243,7 +243,7 @@ struct ib_mr *hns_roce_reg_user_mr(struct ib_pd *pd, u64 start, u64 length,
goto err_out;
}
- mr = kzalloc_obj(*mr, GFP_KERNEL);
+ mr = kzalloc_obj(*mr);
if (!mr) {
ret = -ENOMEM;
goto err_out;
@@ -395,7 +395,7 @@ struct ib_mr *hns_roce_alloc_mr(struct ib_pd *pd, enum ib_mr_type mr_type,
return ERR_PTR(-EINVAL);
}
- mr = kzalloc_obj(*mr, GFP_KERNEL);
+ mr = kzalloc_obj(*mr);
if (!mr)
return ERR_PTR(-ENOMEM);
@@ -651,7 +651,7 @@ static int mtr_map_bufs(struct hns_roce_dev *hr_dev, struct hns_roce_mtr *mtr)
page_shift = need_split_huge_page(mtr) ? HNS_HW_PAGE_SHIFT :
mtr->hem_cfg.buf_pg_shift;
/* alloc a tmp array to store buffer's dma address */
- pages = kvzalloc_objs(dma_addr_t, page_count, GFP_KERNEL);
+ pages = kvzalloc_objs(dma_addr_t, page_count);
if (!pages)
return -ENOMEM;
diff --git a/drivers/infiniband/hw/ionic/ionic_admin.c b/drivers/infiniband/hw/ionic/ionic_admin.c
index 850bd40ae3cc..59f22e83c931 100644
--- a/drivers/infiniband/hw/ionic/ionic_admin.c
+++ b/drivers/infiniband/hw/ionic/ionic_admin.c
@@ -520,7 +520,7 @@ static struct ionic_vcq *ionic_create_rdma_admincq(struct ionic_ibdev *dev,
struct ionic_cq *cq;
int rc;
- vcq = kzalloc_obj(*vcq, GFP_KERNEL);
+ vcq = kzalloc_obj(*vcq);
if (!vcq)
return ERR_PTR(-ENOMEM);
@@ -558,7 +558,7 @@ static struct ionic_aq *__ionic_create_rdma_adminq(struct ionic_ibdev *dev,
struct ionic_aq *aq;
int rc;
- aq = kzalloc_obj(*aq, GFP_KERNEL);
+ aq = kzalloc_obj(*aq);
if (!aq)
return ERR_PTR(-ENOMEM);
@@ -575,7 +575,7 @@ static struct ionic_aq *__ionic_create_rdma_adminq(struct ionic_ibdev *dev,
ionic_queue_dbell_init(&aq->q, aq->aqid);
- aq->q_wr = kzalloc_objs(*aq->q_wr, (u32)aq->q.mask + 1, GFP_KERNEL);
+ aq->q_wr = kzalloc_objs(*aq->q_wr, (u32)aq->q.mask + 1);
if (!aq->q_wr) {
rc = -ENOMEM;
goto err_wr;
@@ -983,7 +983,7 @@ static struct ionic_eq *ionic_create_eq(struct ionic_ibdev *dev, int eqid)
struct ionic_eq *eq;
int rc;
- eq = kzalloc_obj(*eq, GFP_KERNEL);
+ eq = kzalloc_obj(*eq);
if (!eq)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/infiniband/hw/ionic/ionic_controlpath.c b/drivers/infiniband/hw/ionic/ionic_controlpath.c
index 9a2b09b783e0..7889d76bf69d 100644
--- a/drivers/infiniband/hw/ionic/ionic_controlpath.c
+++ b/drivers/infiniband/hw/ionic/ionic_controlpath.c
@@ -343,7 +343,7 @@ ionic_mmap_entry_insert(struct ionic_ctx *ctx, unsigned long size,
struct ionic_mmap_entry *entry;
int rc;
- entry = kzalloc_obj(*entry, GFP_KERNEL);
+ entry = kzalloc_obj(*entry);
if (!entry)
return NULL;
@@ -852,7 +852,7 @@ struct ib_mr *ionic_get_dma_mr(struct ib_pd *ibpd, int access)
struct ionic_pd *pd = to_ionic_pd(ibpd);
struct ionic_mr *mr;
- mr = kzalloc_obj(*mr, GFP_KERNEL);
+ mr = kzalloc_obj(*mr);
if (!mr)
return ERR_PTR(-ENOMEM);
@@ -878,7 +878,7 @@ struct ib_mr *ionic_reg_user_mr(struct ib_pd *ibpd, u64 start, u64 length,
if (dmah)
return ERR_PTR(-EOPNOTSUPP);
- mr = kzalloc_obj(*mr, GFP_KERNEL);
+ mr = kzalloc_obj(*mr);
if (!mr)
return ERR_PTR(-ENOMEM);
@@ -945,7 +945,7 @@ struct ib_mr *ionic_reg_user_mr_dmabuf(struct ib_pd *ibpd, u64 offset,
if (dmah)
return ERR_PTR(-EOPNOTSUPP);
- mr = kzalloc_obj(*mr, GFP_KERNEL);
+ mr = kzalloc_obj(*mr);
if (!mr)
return ERR_PTR(-ENOMEM);
@@ -1039,7 +1039,7 @@ struct ib_mr *ionic_alloc_mr(struct ib_pd *ibpd, enum ib_mr_type type,
if (type != IB_MR_TYPE_MEM_REG)
return ERR_PTR(-EINVAL);
- mr = kzalloc_obj(*mr, GFP_KERNEL);
+ mr = kzalloc_obj(*mr);
if (!mr)
return ERR_PTR(-ENOMEM);
@@ -2203,7 +2203,7 @@ int ionic_create_qp(struct ib_qp *ibqp, struct ib_qp_init_attr *attr,
qp->has_ah = attr->qp_type == IB_QPT_RC;
if (qp->has_ah) {
- qp->hdr = kzalloc_obj(*qp->hdr, GFP_KERNEL);
+ qp->hdr = kzalloc_obj(*qp->hdr);
if (!qp->hdr) {
rc = -ENOMEM;
goto err_ah_alloc;
diff --git a/drivers/infiniband/hw/ionic/ionic_hw_stats.c b/drivers/infiniband/hw/ionic/ionic_hw_stats.c
index 3fbdc007dd05..03fdd2b16c4e 100644
--- a/drivers/infiniband/hw/ionic/ionic_hw_stats.c
+++ b/drivers/infiniband/hw/ionic/ionic_hw_stats.c
@@ -240,7 +240,7 @@ ionic_counter_alloc_stats(struct rdma_counter *counter)
struct ionic_counter *cntr;
int err;
- cntr = kzalloc_obj(*cntr, GFP_KERNEL);
+ cntr = kzalloc_obj(*cntr);
if (!cntr)
return NULL;
diff --git a/drivers/infiniband/hw/irdma/cm.c b/drivers/infiniband/hw/irdma/cm.c
index aaff968138e2..3627797c6272 100644
--- a/drivers/infiniband/hw/irdma/cm.c
+++ b/drivers/infiniband/hw/irdma/cm.c
@@ -2969,7 +2969,7 @@ irdma_make_listen_node(struct irdma_cm_core *cm_core,
/* create a CM listen node
* 1/2 node to compare incoming traffic to
*/
- listener = kzalloc_obj(*listener, GFP_KERNEL);
+ listener = kzalloc_obj(*listener);
if (!listener)
return NULL;
cm_core->stats_listen_nodes_created++;
diff --git a/drivers/infiniband/hw/irdma/hw.c b/drivers/infiniband/hw/irdma/hw.c
index 8da3b2799593..f4ae530f56db 100644
--- a/drivers/infiniband/hw/irdma/hw.c
+++ b/drivers/infiniband/hw/irdma/hw.c
@@ -1029,7 +1029,7 @@ static int irdma_create_cqp(struct irdma_pci_f *rf)
u16 maj_err, min_err;
int i, status;
- cqp->cqp_requests = kzalloc_objs(*cqp->cqp_requests, sqsize, GFP_KERNEL);
+ cqp->cqp_requests = kzalloc_objs(*cqp->cqp_requests, sqsize);
if (!cqp->cqp_requests)
return -ENOMEM;
@@ -1039,7 +1039,7 @@ static int irdma_create_cqp(struct irdma_pci_f *rf)
goto err_scratch;
}
- cqp->oop_op_array = kzalloc_objs(*cqp->oop_op_array, sqsize, GFP_KERNEL);
+ cqp->oop_op_array = kzalloc_objs(*cqp->oop_op_array, sqsize);
if (!cqp->oop_op_array) {
status = -ENOMEM;
goto err_oop;
@@ -1365,7 +1365,7 @@ static int irdma_setup_ceq_0(struct irdma_pci_f *rf)
u32 num_ceqs;
num_ceqs = min(rf->msix_count, rf->sc_dev.hmc_fpm_misc.max_ceqs);
- rf->ceqlist = kzalloc_objs(*rf->ceqlist, num_ceqs, GFP_KERNEL);
+ rf->ceqlist = kzalloc_objs(*rf->ceqlist, num_ceqs);
if (!rf->ceqlist) {
status = -ENOMEM;
goto exit;
diff --git a/drivers/infiniband/hw/irdma/i40iw_if.c b/drivers/infiniband/hw/irdma/i40iw_if.c
index eea222ae125a..4ff3ad7856aa 100644
--- a/drivers/infiniband/hw/irdma/i40iw_if.c
+++ b/drivers/infiniband/hw/irdma/i40iw_if.c
@@ -120,7 +120,7 @@ static int i40iw_open(struct i40e_info *cdev_info, struct i40e_client *client)
if (!iwdev)
return -ENOMEM;
- iwdev->rf = kzalloc_obj(*rf, GFP_KERNEL);
+ iwdev->rf = kzalloc_obj(*rf);
if (!iwdev->rf) {
ib_dealloc_device(&iwdev->ibdev);
return -ENOMEM;
diff --git a/drivers/infiniband/hw/irdma/icrdma_if.c b/drivers/infiniband/hw/irdma/icrdma_if.c
index 60f3c7f1547d..53c60543d748 100644
--- a/drivers/infiniband/hw/irdma/icrdma_if.c
+++ b/drivers/infiniband/hw/irdma/icrdma_if.c
@@ -258,7 +258,7 @@ static int icrdma_probe(struct auxiliary_device *aux_dev, const struct auxiliary
iwdev = ib_alloc_device(irdma_device, ibdev);
if (!iwdev)
return -ENOMEM;
- iwdev->rf = kzalloc_obj(*rf, GFP_KERNEL);
+ iwdev->rf = kzalloc_obj(*rf);
if (!iwdev->rf) {
ib_dealloc_device(&iwdev->ibdev);
return -ENOMEM;
diff --git a/drivers/infiniband/hw/irdma/ig3rdma_if.c b/drivers/infiniband/hw/irdma/ig3rdma_if.c
index 4d581ec341f3..4035f58efa31 100644
--- a/drivers/infiniband/hw/irdma/ig3rdma_if.c
+++ b/drivers/infiniband/hw/irdma/ig3rdma_if.c
@@ -175,7 +175,7 @@ static int ig3rdma_core_probe(struct auxiliary_device *aux_dev,
struct irdma_pci_f *rf;
int err;
- rf = kzalloc_obj(*rf, GFP_KERNEL);
+ rf = kzalloc_obj(*rf);
if (!rf)
return -ENOMEM;
diff --git a/drivers/infiniband/hw/irdma/verbs.c b/drivers/infiniband/hw/irdma/verbs.c
index 818ea15d5d92..2702825ccb8d 100644
--- a/drivers/infiniband/hw/irdma/verbs.c
+++ b/drivers/infiniband/hw/irdma/verbs.c
@@ -157,7 +157,7 @@ static struct rdma_user_mmap_entry*
irdma_user_mmap_entry_insert(struct irdma_ucontext *ucontext, u64 bar_offset,
enum irdma_mmap_flag mmap_flag, u64 *mmap_offset)
{
- struct irdma_user_mmap_entry *entry = kzalloc_obj(*entry, GFP_KERNEL);
+ struct irdma_user_mmap_entry *entry = kzalloc_obj(*entry);
int ret;
if (!entry)
@@ -2111,7 +2111,7 @@ static int irdma_resize_cq(struct ib_cq *ibcq, int entries,
info.cq_base = kmem_buf.va;
info.cq_pa = kmem_buf.pa;
- cq_buf = kzalloc_obj(*cq_buf, GFP_KERNEL);
+ cq_buf = kzalloc_obj(*cq_buf);
if (!cq_buf) {
ret = -ENOMEM;
goto error;
@@ -3153,7 +3153,7 @@ static struct ib_mr *irdma_alloc_mr(struct ib_pd *pd, enum ib_mr_type mr_type,
u32 stag;
int err_code;
- iwmr = kzalloc_obj(*iwmr, GFP_KERNEL);
+ iwmr = kzalloc_obj(*iwmr);
if (!iwmr)
return ERR_PTR(-ENOMEM);
@@ -3370,7 +3370,7 @@ static struct irdma_mr *irdma_alloc_iwmr(struct ib_umem *region,
struct irdma_mr *iwmr;
unsigned long pgsz_bitmap;
- iwmr = kzalloc_obj(*iwmr, GFP_KERNEL);
+ iwmr = kzalloc_obj(*iwmr);
if (!iwmr)
return ERR_PTR(-ENOMEM);
@@ -3809,7 +3809,7 @@ struct ib_mr *irdma_reg_phys_mr(struct ib_pd *pd, u64 addr, u64 size, int access
u32 stag;
int ret;
- iwmr = kzalloc_obj(*iwmr, GFP_KERNEL);
+ iwmr = kzalloc_obj(*iwmr);
if (!iwmr)
return ERR_PTR(-ENOMEM);
@@ -4851,7 +4851,7 @@ static int irdma_attach_mcast(struct ib_qp *ibqp, union ib_gid *ibgid, u16 lid)
struct irdma_dma_mem *dma_mem_mc;
spin_unlock_irqrestore(&rf->qh_list_lock, flags);
- mc_qht_elem = kzalloc_obj(*mc_qht_elem, GFP_KERNEL);
+ mc_qht_elem = kzalloc_obj(*mc_qht_elem);
if (!mc_qht_elem)
return -ENOMEM;
diff --git a/drivers/infiniband/hw/mana/cq.c b/drivers/infiniband/hw/mana/cq.c
index 413fde213120..b2749f971cd0 100644
--- a/drivers/infiniband/hw/mana/cq.c
+++ b/drivers/infiniband/hw/mana/cq.c
@@ -147,7 +147,7 @@ int mana_ib_install_cq_cb(struct mana_ib_dev *mdev, struct mana_ib_cq *cq)
if (cq->queue.kmem)
gdma_cq = cq->queue.kmem;
else
- gdma_cq = kzalloc_obj(*gdma_cq, GFP_KERNEL);
+ gdma_cq = kzalloc_obj(*gdma_cq);
if (!gdma_cq)
return -ENOMEM;
diff --git a/drivers/infiniband/hw/mana/mr.c b/drivers/infiniband/hw/mana/mr.c
index b67d94842721..9613b225dad4 100644
--- a/drivers/infiniband/hw/mana/mr.c
+++ b/drivers/infiniband/hw/mana/mr.c
@@ -137,7 +137,7 @@ struct ib_mr *mana_ib_reg_user_mr(struct ib_pd *ibpd, u64 start, u64 length,
if (access_flags & ~VALID_MR_FLAGS)
return ERR_PTR(-EINVAL);
- mr = kzalloc_obj(*mr, GFP_KERNEL);
+ mr = kzalloc_obj(*mr);
if (!mr)
return ERR_PTR(-ENOMEM);
@@ -221,7 +221,7 @@ struct ib_mr *mana_ib_reg_user_mr_dmabuf(struct ib_pd *ibpd, u64 start, u64 leng
if (access_flags & ~VALID_MR_FLAGS)
return ERR_PTR(-EOPNOTSUPP);
- mr = kzalloc_obj(*mr, GFP_KERNEL);
+ mr = kzalloc_obj(*mr);
if (!mr)
return ERR_PTR(-ENOMEM);
@@ -286,7 +286,7 @@ struct ib_mr *mana_ib_get_dma_mr(struct ib_pd *ibpd, int access_flags)
if (access_flags & ~VALID_DMA_MR_FLAGS)
return ERR_PTR(-EINVAL);
- mr = kzalloc_obj(*mr, GFP_KERNEL);
+ mr = kzalloc_obj(*mr);
if (!mr)
return ERR_PTR(-ENOMEM);
@@ -360,7 +360,7 @@ struct ib_dm *mana_ib_alloc_dm(struct ib_device *ibdev,
struct mana_ib_dm *dm;
int err;
- dm = kzalloc_obj(*dm, GFP_KERNEL);
+ dm = kzalloc_obj(*dm);
if (!dm)
return ERR_PTR(-ENOMEM);
@@ -425,7 +425,7 @@ struct ib_mr *mana_ib_reg_dm_mr(struct ib_pd *ibpd, struct ib_dm *ibdm,
if (attr->access_flags & ~VALID_MR_FLAGS)
return ERR_PTR(-EOPNOTSUPP);
- mr = kzalloc_obj(*mr, GFP_KERNEL);
+ mr = kzalloc_obj(*mr);
if (!mr)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/infiniband/hw/mana/qp.c b/drivers/infiniband/hw/mana/qp.c
index 811b8e0eab67..82f84f7ad37a 100644
--- a/drivers/infiniband/hw/mana/qp.c
+++ b/drivers/infiniband/hw/mana/qp.c
@@ -164,7 +164,7 @@ static int mana_ib_create_qp_rss(struct ib_qp *ibqp, struct ib_pd *pd,
ibdev_dbg(&mdev->ib_dev, "rx_hash_function %d port %d\n",
ucmd.rx_hash_function, port);
- mana_ind_table = kzalloc_objs(mana_handle_t, ind_tbl_size, GFP_KERNEL);
+ mana_ind_table = kzalloc_objs(mana_handle_t, ind_tbl_size);
if (!mana_ind_table) {
ret = -ENOMEM;
goto fail;
diff --git a/drivers/infiniband/hw/mana/wq.c b/drivers/infiniband/hw/mana/wq.c
index 05789069369b..6206244f762e 100644
--- a/drivers/infiniband/hw/mana/wq.c
+++ b/drivers/infiniband/hw/mana/wq.c
@@ -25,7 +25,7 @@ struct ib_wq *mana_ib_create_wq(struct ib_pd *pd,
return ERR_PTR(err);
}
- wq = kzalloc_obj(*wq, GFP_KERNEL);
+ wq = kzalloc_obj(*wq);
if (!wq)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/infiniband/hw/mlx4/alias_GUID.c b/drivers/infiniband/hw/mlx4/alias_GUID.c
index 82c01b99b60d..e4c539dd2359 100644
--- a/drivers/infiniband/hw/mlx4/alias_GUID.c
+++ b/drivers/infiniband/hw/mlx4/alias_GUID.c
@@ -513,7 +513,7 @@ static int set_guid_rec(struct ib_device *ibdev,
goto new_schedule;
}
- callback_context = kmalloc_obj(*callback_context, GFP_KERNEL);
+ callback_context = kmalloc_obj(*callback_context);
if (!callback_context) {
err = -ENOMEM;
resched_delay = HZ * 5;
@@ -754,7 +754,7 @@ static void alias_guid_work(struct work_struct *work)
alias_guid);
struct mlx4_ib_dev *dev = container_of(ib_sriov, struct mlx4_ib_dev, sriov);
- rec = kzalloc_obj(*rec, GFP_KERNEL);
+ rec = kzalloc_obj(*rec);
if (!rec)
return;
diff --git a/drivers/infiniband/hw/mlx4/cm.c b/drivers/infiniband/hw/mlx4/cm.c
index a71603353dbd..63a868a3822f 100644
--- a/drivers/infiniband/hw/mlx4/cm.c
+++ b/drivers/infiniband/hw/mlx4/cm.c
@@ -235,7 +235,7 @@ id_map_alloc(struct ib_device *ibdev, int slave_id, u32 sl_cm_id)
struct id_map_entry *ent;
struct mlx4_ib_sriov *sriov = &to_mdev(ibdev)->sriov;
- ent = kmalloc_obj(struct id_map_entry, GFP_KERNEL);
+ ent = kmalloc_obj(struct id_map_entry);
if (!ent)
return ERR_PTR(-ENOMEM);
@@ -376,7 +376,7 @@ static int alloc_rej_tmout(struct mlx4_ib_sriov *sriov, u32 rem_pv_cm_id, int sl
}
xa_unlock(&sriov->xa_rej_tmout);
- item = kmalloc_obj(*item, GFP_KERNEL);
+ item = kmalloc_obj(*item);
if (!item)
return -ENOMEM;
diff --git a/drivers/infiniband/hw/mlx4/cq.c b/drivers/infiniband/hw/mlx4/cq.c
index dc05b3d88fe4..d98892283065 100644
--- a/drivers/infiniband/hw/mlx4/cq.c
+++ b/drivers/infiniband/hw/mlx4/cq.c
@@ -300,7 +300,7 @@ static int mlx4_alloc_resize_buf(struct mlx4_ib_dev *dev, struct mlx4_ib_cq *cq,
if (cq->resize_buf)
return -EBUSY;
- cq->resize_buf = kmalloc_obj(*cq->resize_buf, GFP_KERNEL);
+ cq->resize_buf = kmalloc_obj(*cq->resize_buf);
if (!cq->resize_buf)
return -ENOMEM;
@@ -328,7 +328,7 @@ static int mlx4_alloc_resize_umem(struct mlx4_ib_dev *dev, struct mlx4_ib_cq *cq
if (ib_copy_from_udata(&ucmd, udata, sizeof ucmd))
return -EFAULT;
- cq->resize_buf = kmalloc_obj(*cq->resize_buf, GFP_KERNEL);
+ cq->resize_buf = kmalloc_obj(*cq->resize_buf);
if (!cq->resize_buf)
return -ENOMEM;
diff --git a/drivers/infiniband/hw/mlx4/doorbell.c b/drivers/infiniband/hw/mlx4/doorbell.c
index 62f9c65ca140..8ba86b1e4e46 100644
--- a/drivers/infiniband/hw/mlx4/doorbell.c
+++ b/drivers/infiniband/hw/mlx4/doorbell.c
@@ -56,7 +56,7 @@ int mlx4_ib_db_map_user(struct ib_udata *udata, unsigned long virt,
if (page->user_virt == (virt & PAGE_MASK))
goto found;
- page = kmalloc_obj(*page, GFP_KERNEL);
+ page = kmalloc_obj(*page);
if (!page) {
err = -ENOMEM;
goto out;
diff --git a/drivers/infiniband/hw/mlx4/mad.c b/drivers/infiniband/hw/mlx4/mad.c
index ac58fc6e3730..723389353116 100644
--- a/drivers/infiniband/hw/mlx4/mad.c
+++ b/drivers/infiniband/hw/mlx4/mad.c
@@ -1133,8 +1133,8 @@ static void handle_slaves_guid_change(struct mlx4_ib_dev *dev, u32 port_num,
if (!mlx4_is_mfunc(dev->dev) || !mlx4_is_master(dev->dev))
return;
- in_mad = kmalloc_obj(*in_mad, GFP_KERNEL);
- out_mad = kmalloc_obj(*out_mad, GFP_KERNEL);
+ in_mad = kmalloc_obj(*in_mad);
+ out_mad = kmalloc_obj(*out_mad);
if (!in_mad || !out_mad)
goto out;
@@ -1612,7 +1612,7 @@ static int mlx4_ib_alloc_pv_bufs(struct mlx4_ib_demux_pv_ctx *ctx,
tun_qp = &ctx->qp[qp_type];
- tun_qp->ring = kzalloc_objs(struct mlx4_ib_buf, nmbr_bufs, GFP_KERNEL);
+ tun_qp->ring = kzalloc_objs(struct mlx4_ib_buf, nmbr_bufs);
if (!tun_qp->ring)
return -ENOMEM;
@@ -1955,7 +1955,7 @@ static int alloc_pv_object(struct mlx4_ib_dev *dev, int slave, int port,
struct mlx4_ib_demux_pv_ctx *ctx;
*ret_ctx = NULL;
- ctx = kzalloc_obj(struct mlx4_ib_demux_pv_ctx, GFP_KERNEL);
+ ctx = kzalloc_obj(struct mlx4_ib_demux_pv_ctx);
if (!ctx)
return -ENOMEM;
diff --git a/drivers/infiniband/hw/mlx4/main.c b/drivers/infiniband/hw/mlx4/main.c
index 1dab78eb7a03..1109eac52890 100644
--- a/drivers/infiniband/hw/mlx4/main.c
+++ b/drivers/infiniband/hw/mlx4/main.c
@@ -461,8 +461,8 @@ static int mlx4_ib_query_device(struct ib_device *ibdev,
resp.response_length = offsetof(typeof(resp), response_length) +
sizeof(resp.response_length);
- in_mad = kzalloc_obj(*in_mad, GFP_KERNEL);
- out_mad = kmalloc_obj(*out_mad, GFP_KERNEL);
+ in_mad = kzalloc_obj(*in_mad);
+ out_mad = kmalloc_obj(*out_mad);
err = -ENOMEM;
if (!in_mad || !out_mad)
goto out;
@@ -660,8 +660,8 @@ static int ib_link_query_port(struct ib_device *ibdev, u32 port,
int mad_ifc_flags = MLX4_MAD_IFC_IGNORE_KEYS;
int err = -ENOMEM;
- in_mad = kzalloc_obj(*in_mad, GFP_KERNEL);
- out_mad = kmalloc_obj(*out_mad, GFP_KERNEL);
+ in_mad = kzalloc_obj(*in_mad);
+ out_mad = kmalloc_obj(*out_mad);
if (!in_mad || !out_mad)
goto out;
@@ -839,8 +839,8 @@ int __mlx4_ib_query_gid(struct ib_device *ibdev, u32 port, int index,
int clear = 0;
int mad_ifc_flags = MLX4_MAD_IFC_IGNORE_KEYS;
- in_mad = kzalloc_obj(*in_mad, GFP_KERNEL);
- out_mad = kmalloc_obj(*out_mad, GFP_KERNEL);
+ in_mad = kzalloc_obj(*in_mad);
+ out_mad = kmalloc_obj(*out_mad);
if (!in_mad || !out_mad)
goto out;
@@ -908,8 +908,8 @@ static int mlx4_ib_query_sl2vl(struct ib_device *ibdev, u32 port,
return 0;
}
- in_mad = kzalloc_obj(*in_mad, GFP_KERNEL);
- out_mad = kmalloc_obj(*out_mad, GFP_KERNEL);
+ in_mad = kzalloc_obj(*in_mad);
+ out_mad = kmalloc_obj(*out_mad);
if (!in_mad || !out_mad)
goto out;
@@ -962,8 +962,8 @@ int __mlx4_ib_query_pkey(struct ib_device *ibdev, u32 port, u16 index,
int mad_ifc_flags = MLX4_MAD_IFC_IGNORE_KEYS;
int err = -ENOMEM;
- in_mad = kzalloc_obj(*in_mad, GFP_KERNEL);
- out_mad = kmalloc_obj(*out_mad, GFP_KERNEL);
+ in_mad = kzalloc_obj(*in_mad);
+ out_mad = kmalloc_obj(*out_mad);
if (!in_mad || !out_mad)
goto out;
@@ -1267,7 +1267,7 @@ static int add_gid_entry(struct ib_qp *ibqp, union ib_gid *gid)
struct mlx4_ib_dev *mdev = to_mdev(ibqp->device);
struct mlx4_ib_gid_entry *ge;
- ge = kzalloc_obj(*ge, GFP_KERNEL);
+ ge = kzalloc_obj(*ge);
if (!ge)
return -ENOMEM;
@@ -1707,7 +1707,7 @@ static struct ib_flow *mlx4_ib_create_flow(struct ib_qp *qp,
memset(type, 0, sizeof(type));
- mflow = kzalloc_obj(*mflow, GFP_KERNEL);
+ mflow = kzalloc_obj(*mflow);
if (!mflow) {
err = -ENOMEM;
goto err_free;
@@ -1844,7 +1844,7 @@ static int mlx4_ib_mcg_attach(struct ib_qp *ibqp, union ib_gid *gid, u16 lid)
if (mdev->dev->caps.steering_mode ==
MLX4_STEERING_MODE_DEVICE_MANAGED) {
- ib_steering = kmalloc_obj(*ib_steering, GFP_KERNEL);
+ ib_steering = kmalloc_obj(*ib_steering);
if (!ib_steering)
return -ENOMEM;
}
@@ -1978,8 +1978,8 @@ static int init_node_data(struct mlx4_ib_dev *dev)
int mad_ifc_flags = MLX4_MAD_IFC_IGNORE_KEYS;
int err = -ENOMEM;
- in_mad = kzalloc_obj(*in_mad, GFP_KERNEL);
- out_mad = kmalloc_obj(*out_mad, GFP_KERNEL);
+ in_mad = kzalloc_obj(*in_mad);
+ out_mad = kmalloc_obj(*out_mad);
if (!in_mad || !out_mad)
goto out;
@@ -2157,7 +2157,7 @@ static int __mlx4_ib_alloc_diag_counters(struct mlx4_ib_dev *ibdev,
if (!port)
num_counters += ARRAY_SIZE(diag_device_only);
- *pdescs = kzalloc_objs(struct rdma_stat_desc, num_counters, GFP_KERNEL);
+ *pdescs = kzalloc_objs(struct rdma_stat_desc, num_counters);
if (!*pdescs)
return -ENOMEM;
@@ -2730,7 +2730,7 @@ static int mlx4_ib_probe(struct auxiliary_device *adev,
counter_index = mlx4_get_default_counter_index(dev,
i + 1);
}
- new_counter_index = kmalloc_obj(*new_counter_index, GFP_KERNEL);
+ new_counter_index = kmalloc_obj(*new_counter_index);
if (!new_counter_index) {
err = -ENOMEM;
if (allocated)
diff --git a/drivers/infiniband/hw/mlx4/mcg.c b/drivers/infiniband/hw/mlx4/mcg.c
index ef4ab3bc6ffd..dc7c0daaaba5 100644
--- a/drivers/infiniband/hw/mlx4/mcg.c
+++ b/drivers/infiniband/hw/mlx4/mcg.c
@@ -824,7 +824,7 @@ static struct mcast_group *acquire_group(struct mlx4_ib_demux_ctx *ctx,
if (!create)
return ERR_PTR(-ENOENT);
- group = kzalloc_obj(*group, GFP_KERNEL);
+ group = kzalloc_obj(*group);
if (!group)
return ERR_PTR(-ENOMEM);
@@ -946,7 +946,7 @@ int mlx4_ib_mcg_multiplex_handler(struct ib_device *ibdev, int port,
may_create = 1;
fallthrough;
case IB_SA_METHOD_DELETE:
- req = kzalloc_obj(*req, GFP_KERNEL);
+ req = kzalloc_obj(*req);
if (!req)
return -ENOMEM;
@@ -1150,7 +1150,7 @@ void mlx4_ib_mcg_port_cleanup(struct mlx4_ib_demux_ctx *ctx, int destroy_wq)
return;
}
- work = kmalloc_obj(*work, GFP_KERNEL);
+ work = kmalloc_obj(*work);
if (!work) {
ctx->flushing = 0;
return;
@@ -1211,7 +1211,7 @@ static int push_deleteing_req(struct mcast_group *group, int slave)
if (!group->func[slave].join_state)
return 0;
- req = kzalloc_obj(*req, GFP_KERNEL);
+ req = kzalloc_obj(*req);
if (!req)
return -ENOMEM;
diff --git a/drivers/infiniband/hw/mlx4/mr.c b/drivers/infiniband/hw/mlx4/mr.c
index 27038065ee67..77a72d2b0dd2 100644
--- a/drivers/infiniband/hw/mlx4/mr.c
+++ b/drivers/infiniband/hw/mlx4/mr.c
@@ -60,7 +60,7 @@ struct ib_mr *mlx4_ib_get_dma_mr(struct ib_pd *pd, int acc)
struct mlx4_ib_mr *mr;
int err;
- mr = kzalloc_obj(*mr, GFP_KERNEL);
+ mr = kzalloc_obj(*mr);
if (!mr)
return ERR_PTR(-ENOMEM);
@@ -151,7 +151,7 @@ struct ib_mr *mlx4_ib_reg_user_mr(struct ib_pd *pd, u64 start, u64 length,
if (dmah)
return ERR_PTR(-EOPNOTSUPP);
- mr = kzalloc_obj(*mr, GFP_KERNEL);
+ mr = kzalloc_obj(*mr);
if (!mr)
return ERR_PTR(-ENOMEM);
@@ -394,7 +394,7 @@ struct ib_mr *mlx4_ib_alloc_mr(struct ib_pd *pd, enum ib_mr_type mr_type,
max_num_sg > MLX4_MAX_FAST_REG_PAGES)
return ERR_PTR(-EINVAL);
- mr = kzalloc_obj(*mr, GFP_KERNEL);
+ mr = kzalloc_obj(*mr);
if (!mr)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/infiniband/hw/mlx4/qp.c b/drivers/infiniband/hw/mlx4/qp.c
index c7dd9d6e4f8f..1cb890d3d93c 100644
--- a/drivers/infiniband/hw/mlx4/qp.c
+++ b/drivers/infiniband/hw/mlx4/qp.c
@@ -472,12 +472,12 @@ static int alloc_proxy_bufs(struct ib_device *dev, struct mlx4_ib_qp *qp)
int i;
qp->sqp_proxy_rcv =
- kmalloc_objs(struct mlx4_ib_buf, qp->rq.wqe_cnt, GFP_KERNEL);
+ kmalloc_objs(struct mlx4_ib_buf, qp->rq.wqe_cnt);
if (!qp->sqp_proxy_rcv)
return -ENOMEM;
for (i = 0; i < qp->rq.wqe_cnt; i++) {
qp->sqp_proxy_rcv[i].addr =
- kmalloc_obj(struct mlx4_ib_proxy_sqp_hdr, GFP_KERNEL);
+ kmalloc_obj(struct mlx4_ib_proxy_sqp_hdr);
if (!qp->sqp_proxy_rcv[i].addr)
goto err;
qp->sqp_proxy_rcv[i].map =
@@ -681,7 +681,7 @@ static int create_qp_rss(struct mlx4_ib_dev *dev,
qp->mtt = (to_mqp(
(struct ib_qp *)init_attr->rwq_ind_tbl->ind_tbl[0]))->mtt;
- qp->rss_ctx = kzalloc_obj(*qp->rss_ctx, GFP_KERNEL);
+ qp->rss_ctx = kzalloc_obj(*qp->rss_ctx);
if (!qp->rss_ctx) {
err = -ENOMEM;
goto err_qp_alloc;
@@ -791,7 +791,7 @@ static int mlx4_ib_alloc_wqn(struct mlx4_ib_ucontext *context,
struct mlx4_wqn_range, list);
if (!range || (range->refcount == range->size) || range->dirty) {
- range = kzalloc_obj(*range, GFP_KERNEL);
+ range = kzalloc_obj(*range);
if (!range) {
err = -ENOMEM;
goto out;
@@ -1049,7 +1049,7 @@ static int create_qp_common(struct ib_pd *pd, struct ib_qp_init_attr *init_attr,
qp_type == MLX4_IB_QPT_GSI ||
(qp_type & (MLX4_IB_QPT_PROXY_SMI | MLX4_IB_QPT_PROXY_SMI_OWNER |
MLX4_IB_QPT_PROXY_GSI | MLX4_IB_QPT_TUN_SMI_OWNER))) {
- qp->sqp = kzalloc_obj(struct mlx4_ib_sqp, GFP_KERNEL);
+ qp->sqp = kzalloc_obj(struct mlx4_ib_sqp);
if (!qp->sqp)
return -ENOMEM;
}
@@ -1970,7 +1970,7 @@ static int create_qp_lb_counter(struct mlx4_ib_dev *dev, struct mlx4_ib_qp *qp)
if (err)
return err;
- new_counter_index = kmalloc_obj(*new_counter_index, GFP_KERNEL);
+ new_counter_index = kmalloc_obj(*new_counter_index);
if (!new_counter_index) {
mlx4_counter_free(dev->dev, tmp_idx);
return -ENOMEM;
@@ -2163,7 +2163,7 @@ static int __mlx4_ib_modify_qp(void *src, enum mlx4_ib_source_type src_type,
IB_LINK_LAYER_ETHERNET)
return -ENOTSUPP;
- context = kzalloc_obj(*context, GFP_KERNEL);
+ context = kzalloc_obj(*context);
if (!context)
return -ENOMEM;
@@ -4165,7 +4165,7 @@ struct ib_wq *mlx4_ib_create_wq(struct ib_pd *pd,
return ERR_PTR(-EOPNOTSUPP);
}
- qp = kzalloc_obj(*qp, GFP_KERNEL);
+ qp = kzalloc_obj(*qp);
if (!qp)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/infiniband/hw/mlx4/sysfs.c b/drivers/infiniband/hw/mlx4/sysfs.c
index ba0356aa3038..cd9163c5c872 100644
--- a/drivers/infiniband/hw/mlx4/sysfs.c
+++ b/drivers/infiniband/hw/mlx4/sysfs.c
@@ -500,12 +500,12 @@ alloc_group_attrs(ssize_t (*show)(struct mlx4_port *,
struct port_table_attribute *element;
int i;
- tab_attr = kzalloc_objs(struct attribute *, 1 + len, GFP_KERNEL);
+ tab_attr = kzalloc_objs(struct attribute *, 1 + len);
if (!tab_attr)
return NULL;
for (i = 0; i < len; i++) {
- element = kzalloc_obj(struct port_table_attribute, GFP_KERNEL);
+ element = kzalloc_obj(struct port_table_attribute);
if (!element)
goto err;
if (snprintf(element->name, sizeof (element->name),
@@ -629,7 +629,7 @@ static int add_port(struct mlx4_ib_dev *dev, int port_num, int slave)
int is_eth = rdma_port_get_link_layer(&dev->ib_dev, port_num) ==
IB_LINK_LAYER_ETHERNET;
- p = kzalloc_obj(*p, GFP_KERNEL);
+ p = kzalloc_obj(*p);
if (!p)
return -ENOMEM;
diff --git a/drivers/infiniband/hw/mlx5/cong.c b/drivers/infiniband/hw/mlx5/cong.c
index fb2bc450f4ff..d0edf83a2f20 100644
--- a/drivers/infiniband/hw/mlx5/cong.c
+++ b/drivers/infiniband/hw/mlx5/cong.c
@@ -449,7 +449,7 @@ void mlx5_ib_init_cong_debugfs(struct mlx5_ib_dev *dev, u32 port_num)
!MLX5_CAP_GEN(mdev, cc_modify_allowed))
goto put_mdev;
- dbg_cc_params = kzalloc_obj(*dbg_cc_params, GFP_KERNEL);
+ dbg_cc_params = kzalloc_obj(*dbg_cc_params);
if (!dbg_cc_params)
goto err;
diff --git a/drivers/infiniband/hw/mlx5/counters.c b/drivers/infiniband/hw/mlx5/counters.c
index 10feeb77d569..d1ad88908634 100644
--- a/drivers/infiniband/hw/mlx5/counters.c
+++ b/drivers/infiniband/hw/mlx5/counters.c
@@ -863,7 +863,7 @@ static int __mlx5_ib_alloc_counters(struct mlx5_ib_dev *dev,
if (!cnts->descs)
return -ENOMEM;
- cnts->offsets = kzalloc_objs(*cnts->offsets, num_counters, GFP_KERNEL);
+ cnts->offsets = kzalloc_objs(*cnts->offsets, num_counters);
if (!cnts->offsets)
goto err;
diff --git a/drivers/infiniband/hw/mlx5/cq.c b/drivers/infiniband/hw/mlx5/cq.c
index c0e06c05555b..d0cd3f805bcb 100644
--- a/drivers/infiniband/hw/mlx5/cq.c
+++ b/drivers/infiniband/hw/mlx5/cq.c
@@ -1210,7 +1210,7 @@ static int resize_kernel(struct mlx5_ib_dev *dev, struct mlx5_ib_cq *cq,
{
int err;
- cq->resize_buf = kzalloc_obj(*cq->resize_buf, GFP_KERNEL);
+ cq->resize_buf = kzalloc_obj(*cq->resize_buf);
if (!cq->resize_buf)
return -ENOMEM;
diff --git a/drivers/infiniband/hw/mlx5/data_direct.c b/drivers/infiniband/hw/mlx5/data_direct.c
index a93e31e23dc2..8e89dbe40c23 100644
--- a/drivers/infiniband/hw/mlx5/data_direct.c
+++ b/drivers/infiniband/hw/mlx5/data_direct.c
@@ -83,7 +83,7 @@ int mlx5_data_direct_ib_reg(struct mlx5_ib_dev *ibdev, char *vuid)
struct mlx5_data_direct_registration *reg;
struct mlx5_data_direct_dev *dev;
- reg = kzalloc_obj(*reg, GFP_KERNEL);
+ reg = kzalloc_obj(*reg);
if (!reg)
return -ENOMEM;
@@ -160,7 +160,7 @@ static int mlx5_data_direct_probe(struct pci_dev *pdev, const struct pci_device_
struct mlx5_data_direct_dev *dev;
int err;
- dev = kzalloc_obj(*dev, GFP_KERNEL);
+ dev = kzalloc_obj(*dev);
if (!dev)
return -ENOMEM;
diff --git a/drivers/infiniband/hw/mlx5/devx.c b/drivers/infiniband/hw/mlx5/devx.c
index 5e1cefeaa494..0066b2738ac8 100644
--- a/drivers/infiniband/hw/mlx5/devx.c
+++ b/drivers/infiniband/hw/mlx5/devx.c
@@ -1950,7 +1950,7 @@ subscribe_event_xa_alloc(struct mlx5_devx_event_table *devx_event_table,
event = xa_load(&devx_event_table->event_xa, key_level1);
if (!event) {
- event = kzalloc_obj(*event, GFP_KERNEL);
+ event = kzalloc_obj(*event);
if (!event)
return -ENOMEM;
@@ -1972,7 +1972,7 @@ subscribe_event_xa_alloc(struct mlx5_devx_event_table *devx_event_table,
obj_event = xa_load(&event->object_ids, key_level2);
if (!obj_event) {
- obj_event = kzalloc_obj(*obj_event, GFP_KERNEL);
+ obj_event = kzalloc_obj(*obj_event);
if (!obj_event)
/* Level1 is valid for future use, no need to free */
return -ENOMEM;
@@ -2697,7 +2697,7 @@ void mlx5_ib_ufile_hw_cleanup(struct ib_uverbs_file *ufile)
int head = 0;
int tail = 0;
- async_cmd = kzalloc_objs(*async_cmd, MAX_ASYNC_CMDS, GFP_KERNEL);
+ async_cmd = kzalloc_objs(*async_cmd, MAX_ASYNC_CMDS);
if (!async_cmd)
return;
diff --git a/drivers/infiniband/hw/mlx5/dm.c b/drivers/infiniband/hw/mlx5/dm.c
index db45ff9b64a8..9972f38ba88a 100644
--- a/drivers/infiniband/hw/mlx5/dm.c
+++ b/drivers/infiniband/hw/mlx5/dm.c
@@ -285,7 +285,7 @@ static struct ib_dm *handle_alloc_dm_memic(struct ib_ucontext *ctx,
if (!dm_db || !MLX5_CAP_DEV_MEM(dm_db->dev, memic))
return ERR_PTR(-EOPNOTSUPP);
- dm = kzalloc_obj(*dm, GFP_KERNEL);
+ dm = kzalloc_obj(*dm);
if (!dm)
return ERR_PTR(-ENOMEM);
@@ -382,7 +382,7 @@ static struct ib_dm *handle_alloc_dm_sw_icm(struct ib_ucontext *ctx,
return ERR_PTR(-EOPNOTSUPP);
}
- dm = kzalloc_obj(*dm, GFP_KERNEL);
+ dm = kzalloc_obj(*dm);
if (!dm)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/infiniband/hw/mlx5/doorbell.c b/drivers/infiniband/hw/mlx5/doorbell.c
index 277e16a2c714..bd68fcf011f4 100644
--- a/drivers/infiniband/hw/mlx5/doorbell.c
+++ b/drivers/infiniband/hw/mlx5/doorbell.c
@@ -58,7 +58,7 @@ int mlx5_ib_db_map_user(struct mlx5_ib_ucontext *context, unsigned long virt,
(page->user_virt == (virt & PAGE_MASK)))
goto found;
- page = kmalloc_obj(*page, GFP_KERNEL);
+ page = kmalloc_obj(*page);
if (!page) {
err = -ENOMEM;
goto out;
diff --git a/drivers/infiniband/hw/mlx5/fs.c b/drivers/infiniband/hw/mlx5/fs.c
index 3c23bf34b3ab..2b4de32ad600 100644
--- a/drivers/infiniband/hw/mlx5/fs.c
+++ b/drivers/infiniband/hw/mlx5/fs.c
@@ -1021,7 +1021,7 @@ static struct mlx5_per_qp_opfc *get_per_qp_opfc(struct xarray *qpn_opfc_xa,
per_qp_opfc = xa_load(qpn_opfc_xa, qp_num);
if (per_qp_opfc)
return per_qp_opfc;
- per_qp_opfc = kzalloc_obj(*per_qp_opfc, GFP_KERNEL);
+ per_qp_opfc = kzalloc_obj(*per_qp_opfc);
if (!per_qp_opfc)
return NULL;
@@ -1057,7 +1057,7 @@ static int add_op_fc_rules(struct mlx5_ib_dev *dev,
opfc->fc = fc_arr[type];
- spec = kzalloc_objs(*spec, MAX_OPFC_RULES, GFP_KERNEL);
+ spec = kzalloc_objs(*spec, MAX_OPFC_RULES);
if (!spec) {
err = -ENOMEM;
goto null_fc;
@@ -1231,7 +1231,7 @@ int mlx5_ib_fs_add_op_fc(struct mlx5_ib_dev *dev, u32 port_num,
struct mlx5_ib_flow_prio *prio;
struct mlx5_flow_spec *spec;
- spec = kzalloc_objs(*spec, MAX_OPFC_RULES, GFP_KERNEL);
+ spec = kzalloc_objs(*spec, MAX_OPFC_RULES);
if (!spec)
return -ENOMEM;
@@ -1532,8 +1532,8 @@ static struct mlx5_ib_flow_handler *_create_flow_rule(struct mlx5_ib_dev *dev,
if (dev->is_rep && is_egress)
return ERR_PTR(-EINVAL);
- spec = kvzalloc_obj(*spec, GFP_KERNEL);
- handler = kzalloc_obj(*handler, GFP_KERNEL);
+ spec = kvzalloc_obj(*spec);
+ handler = kzalloc_obj(*handler);
if (!handler || !spec) {
err = -ENOMEM;
goto free;
@@ -1792,7 +1792,7 @@ static struct ib_flow *mlx5_ib_create_flow(struct ib_qp *qp,
goto free_ucmd;
}
- dst = kzalloc_obj(*dst, GFP_KERNEL);
+ dst = kzalloc_obj(*dst);
if (!dst) {
err = -ENOMEM;
goto free_ucmd;
@@ -2060,8 +2060,8 @@ _create_raw_flow_rule(struct mlx5_ib_dev *dev,
struct mlx5_flow_table *ft = ft_prio->flow_table;
int err = 0;
- spec = kvzalloc_obj(*spec, GFP_KERNEL);
- handler = kzalloc_obj(*handler, GFP_KERNEL);
+ spec = kvzalloc_obj(*spec);
+ handler = kzalloc_obj(*handler);
if (!handler || !spec) {
err = -ENOMEM;
goto free;
@@ -2153,7 +2153,7 @@ static struct mlx5_ib_flow_handler *raw_fs_rule_add(
if (fs_matcher->priority > MLX5_IB_FLOW_LAST_PRIO)
return ERR_PTR(-ENOMEM);
- dst = kzalloc_objs(*dst, 2, GFP_KERNEL);
+ dst = kzalloc_objs(*dst, 2);
if (!dst)
return ERR_PTR(-ENOMEM);
@@ -3080,7 +3080,7 @@ mlx5_ib_create_modify_header(struct mlx5_ib_dev *dev,
if (ret)
return ERR_PTR(-EINVAL);
- maction = kzalloc_obj(*maction, GFP_KERNEL);
+ maction = kzalloc_obj(*maction);
if (!maction)
return ERR_PTR(-ENOMEM);
@@ -3479,7 +3479,7 @@ int mlx5_ib_fs_init(struct mlx5_ib_dev *dev)
{
int i, j;
- dev->flow_db = kzalloc_obj(*dev->flow_db, GFP_KERNEL);
+ dev->flow_db = kzalloc_obj(*dev->flow_db);
if (!dev->flow_db)
return -ENOMEM;
diff --git a/drivers/infiniband/hw/mlx5/gsi.c b/drivers/infiniband/hw/mlx5/gsi.c
index f572d75f6fd6..ee7463815e77 100644
--- a/drivers/infiniband/hw/mlx5/gsi.c
+++ b/drivers/infiniband/hw/mlx5/gsi.c
@@ -104,7 +104,7 @@ int mlx5_ib_create_gsi(struct ib_pd *pd, struct mlx5_ib_qp *mqp,
}
gsi = &mqp->gsi;
- gsi->tx_qps = kzalloc_objs(*gsi->tx_qps, num_qps, GFP_KERNEL);
+ gsi->tx_qps = kzalloc_objs(*gsi->tx_qps, num_qps);
if (!gsi->tx_qps)
return -ENOMEM;
diff --git a/drivers/infiniband/hw/mlx5/ib_rep.c b/drivers/infiniband/hw/mlx5/ib_rep.c
index 72c870f4f54b..621834d75205 100644
--- a/drivers/infiniband/hw/mlx5/ib_rep.c
+++ b/drivers/infiniband/hw/mlx5/ib_rep.c
@@ -158,7 +158,7 @@ mlx5_ib_vport_rep_load(struct mlx5_core_dev *dev, struct mlx5_eswitch_rep *rep)
goto release_transport;
}
- ibdev->port = kzalloc_objs(*ibdev->port, num_ports, GFP_KERNEL);
+ ibdev->port = kzalloc_objs(*ibdev->port, num_ports);
if (!ibdev->port) {
ret = -ENOMEM;
goto fail_port;
diff --git a/drivers/infiniband/hw/mlx5/ib_virt.c b/drivers/infiniband/hw/mlx5/ib_virt.c
index beb99db3f76f..2c81a4e6712e 100644
--- a/drivers/infiniband/hw/mlx5/ib_virt.c
+++ b/drivers/infiniband/hw/mlx5/ib_virt.c
@@ -55,7 +55,7 @@ int mlx5_ib_get_vf_config(struct ib_device *device, int vf, u32 port,
struct mlx5_hca_vport_context *rep;
int err;
- rep = kzalloc_obj(*rep, GFP_KERNEL);
+ rep = kzalloc_obj(*rep);
if (!rep)
return -ENOMEM;
@@ -98,7 +98,7 @@ int mlx5_ib_set_vf_link_state(struct ib_device *device, int vf,
struct mlx5_vf_context *vfs_ctx = mdev->priv.sriov.vfs_ctx;
int err;
- in = kzalloc_obj(*in, GFP_KERNEL);
+ in = kzalloc_obj(*in);
if (!in)
return -ENOMEM;
@@ -157,7 +157,7 @@ static int set_vf_node_guid(struct ib_device *device, int vf, u32 port,
struct mlx5_vf_context *vfs_ctx = mdev->priv.sriov.vfs_ctx;
int err;
- in = kzalloc_obj(*in, GFP_KERNEL);
+ in = kzalloc_obj(*in);
if (!in)
return -ENOMEM;
@@ -181,7 +181,7 @@ static int set_vf_port_guid(struct ib_device *device, int vf, u32 port,
struct mlx5_vf_context *vfs_ctx = mdev->priv.sriov.vfs_ctx;
int err;
- in = kzalloc_obj(*in, GFP_KERNEL);
+ in = kzalloc_obj(*in);
if (!in)
return -ENOMEM;
diff --git a/drivers/infiniband/hw/mlx5/macsec.c b/drivers/infiniband/hw/mlx5/macsec.c
index f93ce56d7515..b52abe8c47c4 100644
--- a/drivers/infiniband/hw/mlx5/macsec.c
+++ b/drivers/infiniband/hw/mlx5/macsec.c
@@ -52,7 +52,7 @@ static struct mlx5_macsec_device *get_macsec_device(void *macdev,
if (macsec_device)
return macsec_device;
- macsec_device = kzalloc_obj(*macsec_device, GFP_KERNEL);
+ macsec_device = kzalloc_obj(*macsec_device);
if (!macsec_device)
return NULL;
@@ -82,7 +82,7 @@ static void mlx5_macsec_save_roce_gid(struct mlx5_macsec_device *macsec_device,
{
struct mlx5_roce_gids *roce_gids;
- roce_gids = kzalloc_obj(*roce_gids, GFP_KERNEL);
+ roce_gids = kzalloc_obj(*roce_gids);
if (!roce_gids)
return;
diff --git a/drivers/infiniband/hw/mlx5/mad.c b/drivers/infiniband/hw/mlx5/mad.c
index 41dd186deffd..8925331855ff 100644
--- a/drivers/infiniband/hw/mlx5/mad.c
+++ b/drivers/infiniband/hw/mlx5/mad.c
@@ -367,8 +367,8 @@ int mlx5_query_ext_port_caps(struct mlx5_ib_dev *dev, unsigned int port)
int err = -ENOMEM;
u16 packet_error;
- in_mad = kzalloc_obj(*in_mad, GFP_KERNEL);
- out_mad = kmalloc_obj(*out_mad, GFP_KERNEL);
+ in_mad = kzalloc_obj(*in_mad);
+ out_mad = kmalloc_obj(*out_mad);
if (!in_mad || !out_mad)
goto out;
@@ -395,7 +395,7 @@ static int mlx5_query_mad_ifc_smp_attr_node_info(struct ib_device *ibdev,
struct ib_smp *in_mad;
int err;
- in_mad = kzalloc_obj(*in_mad, GFP_KERNEL);
+ in_mad = kzalloc_obj(*in_mad);
if (!in_mad)
return -ENOMEM;
@@ -415,7 +415,7 @@ int mlx5_query_mad_ifc_system_image_guid(struct ib_device *ibdev,
struct ib_smp *out_mad;
int err;
- out_mad = kmalloc_obj(*out_mad, GFP_KERNEL);
+ out_mad = kmalloc_obj(*out_mad);
if (!out_mad)
return -ENOMEM;
@@ -437,7 +437,7 @@ int mlx5_query_mad_ifc_max_pkeys(struct ib_device *ibdev,
struct ib_smp *out_mad;
int err;
- out_mad = kmalloc_obj(*out_mad, GFP_KERNEL);
+ out_mad = kmalloc_obj(*out_mad);
if (!out_mad)
return -ENOMEM;
@@ -459,7 +459,7 @@ int mlx5_query_mad_ifc_vendor_id(struct ib_device *ibdev,
struct ib_smp *out_mad;
int err;
- out_mad = kmalloc_obj(*out_mad, GFP_KERNEL);
+ out_mad = kmalloc_obj(*out_mad);
if (!out_mad)
return -ENOMEM;
@@ -481,8 +481,8 @@ int mlx5_query_mad_ifc_node_desc(struct mlx5_ib_dev *dev, char *node_desc)
struct ib_smp *out_mad;
int err = -ENOMEM;
- in_mad = kzalloc_obj(*in_mad, GFP_KERNEL);
- out_mad = kmalloc_obj(*out_mad, GFP_KERNEL);
+ in_mad = kzalloc_obj(*in_mad);
+ out_mad = kmalloc_obj(*out_mad);
if (!in_mad || !out_mad)
goto out;
@@ -506,8 +506,8 @@ int mlx5_query_mad_ifc_node_guid(struct mlx5_ib_dev *dev, __be64 *node_guid)
struct ib_smp *out_mad;
int err = -ENOMEM;
- in_mad = kzalloc_obj(*in_mad, GFP_KERNEL);
- out_mad = kmalloc_obj(*out_mad, GFP_KERNEL);
+ in_mad = kzalloc_obj(*in_mad);
+ out_mad = kmalloc_obj(*out_mad);
if (!in_mad || !out_mad)
goto out;
@@ -532,8 +532,8 @@ int mlx5_query_mad_ifc_pkey(struct ib_device *ibdev, u32 port, u16 index,
struct ib_smp *out_mad;
int err = -ENOMEM;
- in_mad = kzalloc_obj(*in_mad, GFP_KERNEL);
- out_mad = kmalloc_obj(*out_mad, GFP_KERNEL);
+ in_mad = kzalloc_obj(*in_mad);
+ out_mad = kmalloc_obj(*out_mad);
if (!in_mad || !out_mad)
goto out;
@@ -561,8 +561,8 @@ int mlx5_query_mad_ifc_gids(struct ib_device *ibdev, u32 port, int index,
struct ib_smp *out_mad;
int err = -ENOMEM;
- in_mad = kzalloc_obj(*in_mad, GFP_KERNEL);
- out_mad = kmalloc_obj(*out_mad, GFP_KERNEL);
+ in_mad = kzalloc_obj(*in_mad);
+ out_mad = kmalloc_obj(*out_mad);
if (!in_mad || !out_mad)
goto out;
@@ -604,8 +604,8 @@ int mlx5_query_mad_ifc_port(struct ib_device *ibdev, u32 port,
int ext_active_speed;
int err = -ENOMEM;
- in_mad = kzalloc_obj(*in_mad, GFP_KERNEL);
- out_mad = kmalloc_obj(*out_mad, GFP_KERNEL);
+ in_mad = kzalloc_obj(*in_mad);
+ out_mad = kmalloc_obj(*out_mad);
if (!in_mad || !out_mad)
goto out;
diff --git a/drivers/infiniband/hw/mlx5/main.c b/drivers/infiniband/hw/mlx5/main.c
index a5425f6d5527..ba89b03d36f9 100644
--- a/drivers/infiniband/hw/mlx5/main.c
+++ b/drivers/infiniband/hw/mlx5/main.c
@@ -1460,7 +1460,7 @@ static int mlx5_query_hca_port(struct ib_device *ibdev, u32 port,
int err;
u16 ib_link_width_oper;
- rep = kzalloc_obj(*rep, GFP_KERNEL);
+ rep = kzalloc_obj(*rep);
if (!rep) {
err = -ENOMEM;
goto out;
@@ -4042,7 +4042,7 @@ static int mlx5_ib_init_multiport_master(struct mlx5_ib_dev *dev)
/* build a stub multiport info struct for the native port. */
if (i == port_num) {
- mpi = kzalloc_obj(*mpi, GFP_KERNEL);
+ mpi = kzalloc_obj(*mpi);
if (!mpi) {
mutex_unlock(&mlx5_ib_multiport_mutex);
mlx5_nic_vport_disable_roce(dev->mdev);
@@ -4148,7 +4148,7 @@ alloc_var_entry(struct mlx5_ib_ucontext *c)
int err;
var_table = &to_mdev(c->ibucontext.device)->var_table;
- entry = kzalloc_obj(*entry, GFP_KERNEL);
+ entry = kzalloc_obj(*entry);
if (!entry)
return ERR_PTR(-ENOMEM);
@@ -4269,7 +4269,7 @@ alloc_uar_entry(struct mlx5_ib_ucontext *c,
u32 uar_index;
int err;
- entry = kzalloc_obj(*entry, GFP_KERNEL);
+ entry = kzalloc_obj(*entry);
if (!entry)
return ERR_PTR(-ENOMEM);
@@ -5250,7 +5250,7 @@ static int mlx5r_mp_probe(struct auxiliary_device *adev,
bool bound = false;
int err;
- mpi = kzalloc_obj(*mpi, GFP_KERNEL);
+ mpi = kzalloc_obj(*mpi);
if (!mpi)
return -ENOMEM;
@@ -5326,7 +5326,7 @@ static int mlx5r_probe(struct auxiliary_device *adev,
goto fail;
}
- dev->port = kzalloc_objs(*dev->port, num_ports, GFP_KERNEL);
+ dev->port = kzalloc_objs(*dev->port, num_ports);
if (!dev->port) {
ret = -ENOMEM;
goto fail;
diff --git a/drivers/infiniband/hw/mlx5/mr.c b/drivers/infiniband/hw/mlx5/mr.c
index 0444be024ff9..16b48377f825 100644
--- a/drivers/infiniband/hw/mlx5/mr.c
+++ b/drivers/infiniband/hw/mlx5/mr.c
@@ -742,7 +742,7 @@ static struct mlx5_ib_mr *_mlx5_mr_cache_alloc(struct mlx5_ib_dev *dev,
struct mlx5_ib_mr *mr;
int err;
- mr = kzalloc_obj(*mr, GFP_KERNEL);
+ mr = kzalloc_obj(*mr);
if (!mr)
return ERR_PTR(-ENOMEM);
@@ -867,7 +867,7 @@ static int mlx5r_mkeys_init(struct mlx5_cache_ent *ent)
{
struct mlx5_mkeys_page *page;
- page = kzalloc_obj(*page, GFP_KERNEL);
+ page = kzalloc_obj(*page);
if (!page)
return -ENOMEM;
INIT_LIST_HEAD(&ent->mkeys_queue.pages_list);
@@ -897,7 +897,7 @@ mlx5r_cache_create_ent_locked(struct mlx5_ib_dev *dev,
int order;
int ret;
- ent = kzalloc_obj(*ent, GFP_KERNEL);
+ ent = kzalloc_obj(*ent);
if (!ent)
return ERR_PTR(-ENOMEM);
@@ -1059,7 +1059,7 @@ struct ib_mr *mlx5_ib_get_dma_mr(struct ib_pd *pd, int acc)
u32 *in;
int err;
- mr = kzalloc_obj(*mr, GFP_KERNEL);
+ mr = kzalloc_obj(*mr);
if (!mr)
return ERR_PTR(-ENOMEM);
@@ -1207,7 +1207,7 @@ reg_create_crossing_vhca_mr(struct ib_pd *pd, u64 iova, u64 length, int access_f
if (!MLX5_CAP_GEN(dev->mdev, crossing_vhca_mkey))
return ERR_PTR(-EOPNOTSUPP);
- mr = kzalloc_obj(*mr, GFP_KERNEL);
+ mr = kzalloc_obj(*mr);
if (!mr)
return ERR_PTR(-ENOMEM);
@@ -1272,7 +1272,7 @@ static struct mlx5_ib_mr *reg_create(struct ib_pd *pd, struct ib_umem *umem,
if (!page_size)
return ERR_PTR(-EINVAL);
- mr = kzalloc_obj(*mr, GFP_KERNEL);
+ mr = kzalloc_obj(*mr);
if (!mr)
return ERR_PTR(-ENOMEM);
@@ -1370,7 +1370,7 @@ static struct ib_mr *mlx5_ib_get_dm_mr(struct ib_pd *pd, u64 start_addr,
u32 *in;
int err;
- mr = kzalloc_obj(*mr, GFP_KERNEL);
+ mr = kzalloc_obj(*mr);
if (!mr)
return ERR_PTR(-ENOMEM);
@@ -2343,7 +2343,7 @@ static struct mlx5_ib_mr *mlx5_ib_alloc_pi_mr(struct ib_pd *pd,
u32 *in;
int err;
- mr = kzalloc_obj(*mr, GFP_KERNEL);
+ mr = kzalloc_obj(*mr);
if (!mr)
return ERR_PTR(-ENOMEM);
@@ -2400,7 +2400,7 @@ static int mlx5_alloc_integrity_descs(struct ib_pd *pd, struct mlx5_ib_mr *mr,
void *mkc;
int err;
- mr->sig = kzalloc_obj(*mr->sig, GFP_KERNEL);
+ mr->sig = kzalloc_obj(*mr->sig);
if (!mr->sig)
return -ENOMEM;
@@ -2480,7 +2480,7 @@ static struct ib_mr *__mlx5_ib_alloc_mr(struct ib_pd *pd,
u32 *in;
int err;
- mr = kzalloc_obj(*mr, GFP_KERNEL);
+ mr = kzalloc_obj(*mr);
if (!mr)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/infiniband/hw/mlx5/odp.c b/drivers/infiniband/hw/mlx5/odp.c
index ed73d3e82ea5..090a05743e09 100644
--- a/drivers/infiniband/hw/mlx5/odp.c
+++ b/drivers/infiniband/hw/mlx5/odp.c
@@ -1092,7 +1092,7 @@ static int pagefault_single_data_segment(struct mlx5_ib_dev *dev,
continue;
}
- frame = kzalloc_obj(*frame, GFP_KERNEL);
+ frame = kzalloc_obj(*frame);
if (!frame) {
ret = -ENOMEM;
goto end;
diff --git a/drivers/infiniband/hw/mlx5/qp.c b/drivers/infiniband/hw/mlx5/qp.c
index 762a2dfc4455..ccb59ac9860c 100644
--- a/drivers/infiniband/hw/mlx5/qp.c
+++ b/drivers/infiniband/hw/mlx5/qp.c
@@ -5488,7 +5488,7 @@ struct ib_wq *mlx5_ib_create_wq(struct ib_pd *pd,
dev = to_mdev(pd->device);
switch (init_attr->wq_type) {
case IB_WQT_RQ:
- rwq = kzalloc_obj(*rwq, GFP_KERNEL);
+ rwq = kzalloc_obj(*rwq);
if (!rwq)
return ERR_PTR(-ENOMEM);
err = prepare_user_rq(pd, init_attr, udata, rwq);
diff --git a/drivers/infiniband/hw/mlx5/srq.c b/drivers/infiniband/hw/mlx5/srq.c
index 6e79e7a1015e..17e018554d81 100644
--- a/drivers/infiniband/hw/mlx5/srq.c
+++ b/drivers/infiniband/hw/mlx5/srq.c
@@ -358,7 +358,7 @@ int mlx5_ib_query_srq(struct ib_srq *ibsrq, struct ib_srq_attr *srq_attr)
int ret;
struct mlx5_srq_attr *out;
- out = kzalloc_obj(*out, GFP_KERNEL);
+ out = kzalloc_obj(*out);
if (!out)
return -ENOMEM;
diff --git a/drivers/infiniband/hw/mthca/mthca_allocator.c b/drivers/infiniband/hw/mthca/mthca_allocator.c
index 2532ea4e1278..005902d47eb6 100644
--- a/drivers/infiniband/hw/mthca/mthca_allocator.c
+++ b/drivers/infiniband/hw/mthca/mthca_allocator.c
@@ -157,7 +157,7 @@ int mthca_array_init(struct mthca_array *array, int nent)
int npage = (nent * sizeof (void *) + PAGE_SIZE - 1) / PAGE_SIZE;
int i;
- array->page_list = kmalloc_objs(*array->page_list, npage, GFP_KERNEL);
+ array->page_list = kmalloc_objs(*array->page_list, npage);
if (!array->page_list)
return -ENOMEM;
diff --git a/drivers/infiniband/hw/mthca/mthca_eq.c b/drivers/infiniband/hw/mthca/mthca_eq.c
index 5f109a116390..70adcd54e20e 100644
--- a/drivers/infiniband/hw/mthca/mthca_eq.c
+++ b/drivers/infiniband/hw/mthca/mthca_eq.c
@@ -479,7 +479,7 @@ static int mthca_create_eq(struct mthca_dev *dev,
eq->nent = roundup_pow_of_two(max(nent, 2));
npages = ALIGN(eq->nent * MTHCA_EQ_ENTRY_SIZE, PAGE_SIZE) / PAGE_SIZE;
- eq->page_list = kmalloc_objs(*eq->page_list, npages, GFP_KERNEL);
+ eq->page_list = kmalloc_objs(*eq->page_list, npages);
if (!eq->page_list)
goto err_out;
diff --git a/drivers/infiniband/hw/mthca/mthca_mad.c b/drivers/infiniband/hw/mthca/mthca_mad.c
index 8df1bdd1a1bf..6d8d436de2f3 100644
--- a/drivers/infiniband/hw/mthca/mthca_mad.c
+++ b/drivers/infiniband/hw/mthca/mthca_mad.c
@@ -52,7 +52,7 @@ static int mthca_update_rate(struct mthca_dev *dev, u8 port_num)
struct ib_port_attr *tprops = NULL;
int ret;
- tprops = kmalloc_obj(*tprops, GFP_KERNEL);
+ tprops = kmalloc_obj(*tprops);
if (!tprops)
return -ENOMEM;
diff --git a/drivers/infiniband/hw/mthca/mthca_memfree.c b/drivers/infiniband/hw/mthca/mthca_memfree.c
index e59df6ed0f21..6f4455f123b1 100644
--- a/drivers/infiniband/hw/mthca/mthca_memfree.c
+++ b/drivers/infiniband/hw/mthca/mthca_memfree.c
@@ -707,7 +707,7 @@ int mthca_init_db_tab(struct mthca_dev *dev)
if (!mthca_is_memfree(dev))
return 0;
- dev->db_tab = kmalloc_obj(*dev->db_tab, GFP_KERNEL);
+ dev->db_tab = kmalloc_obj(*dev->db_tab);
if (!dev->db_tab)
return -ENOMEM;
diff --git a/drivers/infiniband/hw/mthca/mthca_mr.c b/drivers/infiniband/hw/mthca/mthca_mr.c
index eae6c92e7515..38a2fecf33f8 100644
--- a/drivers/infiniband/hw/mthca/mthca_mr.c
+++ b/drivers/infiniband/hw/mthca/mthca_mr.c
@@ -212,7 +212,7 @@ static struct mthca_mtt *__mthca_alloc_mtt(struct mthca_dev *dev, int size,
if (size <= 0)
return ERR_PTR(-EINVAL);
- mtt = kmalloc_obj(*mtt, GFP_KERNEL);
+ mtt = kmalloc_obj(*mtt);
if (!mtt)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/infiniband/hw/mthca/mthca_profile.c b/drivers/infiniband/hw/mthca/mthca_profile.c
index 230c073dd11f..5a0643ddefdd 100644
--- a/drivers/infiniband/hw/mthca/mthca_profile.c
+++ b/drivers/infiniband/hw/mthca/mthca_profile.c
@@ -77,7 +77,7 @@ s64 mthca_make_profile(struct mthca_dev *dev,
struct mthca_resource *profile;
int i, j;
- profile = kzalloc_objs(*profile, MTHCA_RES_NUM, GFP_KERNEL);
+ profile = kzalloc_objs(*profile, MTHCA_RES_NUM);
if (!profile)
return -ENOMEM;
diff --git a/drivers/infiniband/hw/mthca/mthca_provider.c b/drivers/infiniband/hw/mthca/mthca_provider.c
index 88ce64eb4704..ef0635064fba 100644
--- a/drivers/infiniband/hw/mthca/mthca_provider.c
+++ b/drivers/infiniband/hw/mthca/mthca_provider.c
@@ -61,8 +61,8 @@ static int mthca_query_device(struct ib_device *ibdev, struct ib_device_attr *pr
if (uhw->inlen || uhw->outlen)
return -EINVAL;
- in_mad = kzalloc_obj(*in_mad, GFP_KERNEL);
- out_mad = kmalloc_obj(*out_mad, GFP_KERNEL);
+ in_mad = kzalloc_obj(*in_mad);
+ out_mad = kmalloc_obj(*out_mad);
if (!in_mad || !out_mad)
goto out;
@@ -125,8 +125,8 @@ static int mthca_query_port(struct ib_device *ibdev,
struct ib_smp *out_mad;
int err = -ENOMEM;
- in_mad = kzalloc_obj(*in_mad, GFP_KERNEL);
- out_mad = kmalloc_obj(*out_mad, GFP_KERNEL);
+ in_mad = kzalloc_obj(*in_mad);
+ out_mad = kmalloc_obj(*out_mad);
if (!in_mad || !out_mad)
goto out;
@@ -221,8 +221,8 @@ static int mthca_query_pkey(struct ib_device *ibdev,
struct ib_smp *out_mad;
int err = -ENOMEM;
- in_mad = kzalloc_obj(*in_mad, GFP_KERNEL);
- out_mad = kmalloc_obj(*out_mad, GFP_KERNEL);
+ in_mad = kzalloc_obj(*in_mad);
+ out_mad = kmalloc_obj(*out_mad);
if (!in_mad || !out_mad)
goto out;
@@ -250,8 +250,8 @@ static int mthca_query_gid(struct ib_device *ibdev, u32 port,
struct ib_smp *out_mad;
int err = -ENOMEM;
- in_mad = kzalloc_obj(*in_mad, GFP_KERNEL);
- out_mad = kmalloc_obj(*out_mad, GFP_KERNEL);
+ in_mad = kzalloc_obj(*in_mad);
+ out_mad = kmalloc_obj(*out_mad);
if (!in_mad || !out_mad)
goto out;
@@ -516,7 +516,7 @@ static int mthca_create_qp(struct ib_qp *ibqp,
case IB_QPT_SMI:
case IB_QPT_GSI:
{
- qp->sqp = kzalloc_obj(struct mthca_sqp, GFP_KERNEL);
+ qp->sqp = kzalloc_obj(struct mthca_sqp);
if (!qp->sqp)
return -ENOMEM;
@@ -806,7 +806,7 @@ static struct ib_mr *mthca_get_dma_mr(struct ib_pd *pd, int acc)
struct mthca_mr *mr;
int err;
- mr = kmalloc_obj(*mr, GFP_KERNEL);
+ mr = kmalloc_obj(*mr);
if (!mr)
return ERR_PTR(-ENOMEM);
@@ -853,7 +853,7 @@ static struct ib_mr *mthca_reg_user_mr(struct ib_pd *pd, u64 start, u64 length,
} else if (ib_copy_from_udata(&ucmd, udata, sizeof ucmd))
return ERR_PTR(-EFAULT);
- mr = kmalloc_obj(*mr, GFP_KERNEL);
+ mr = kmalloc_obj(*mr);
if (!mr)
return ERR_PTR(-ENOMEM);
@@ -998,8 +998,8 @@ static int mthca_init_node_data(struct mthca_dev *dev)
struct ib_smp *out_mad;
int err = -ENOMEM;
- in_mad = kzalloc_obj(*in_mad, GFP_KERNEL);
- out_mad = kmalloc_obj(*out_mad, GFP_KERNEL);
+ in_mad = kzalloc_obj(*in_mad);
+ out_mad = kmalloc_obj(*out_mad);
if (!in_mad || !out_mad)
goto out;
diff --git a/drivers/infiniband/hw/ocrdma/ocrdma_hw.c b/drivers/infiniband/hw/ocrdma/ocrdma_hw.c
index c6a55323408a..006ef2e6b5f3 100644
--- a/drivers/infiniband/hw/ocrdma/ocrdma_hw.c
+++ b/drivers/infiniband/hw/ocrdma/ocrdma_hw.c
@@ -355,7 +355,7 @@ static void *ocrdma_init_emb_mqe(u8 opcode, u32 cmd_len)
{
struct ocrdma_mqe *mqe;
- mqe = kzalloc_obj(struct ocrdma_mqe, GFP_KERNEL);
+ mqe = kzalloc_obj(struct ocrdma_mqe);
if (!mqe)
return NULL;
mqe->hdr.spcl_sge_cnt_emb |=
@@ -1289,7 +1289,7 @@ int ocrdma_mbx_rdma_stats(struct ocrdma_dev *dev, bool reset)
struct ocrdma_rdma_stats_resp *old_stats;
int status;
- old_stats = kmalloc_obj(*old_stats, GFP_KERNEL);
+ old_stats = kmalloc_obj(*old_stats);
if (old_stats == NULL)
return -ENOMEM;
@@ -1332,7 +1332,7 @@ static int ocrdma_mbx_get_ctrl_attribs(struct ocrdma_dev *dev)
struct ocrdma_get_ctrl_attribs_rsp *ctrl_attr_rsp;
struct mgmt_hba_attribs *hba_attribs;
- mqe = kzalloc_obj(struct ocrdma_mqe, GFP_KERNEL);
+ mqe = kzalloc_obj(struct ocrdma_mqe);
if (!mqe)
return status;
@@ -1592,7 +1592,7 @@ void ocrdma_alloc_pd_pool(struct ocrdma_dev *dev)
{
int status;
- dev->pd_mgr = kzalloc_obj(struct ocrdma_pd_resource_mgr, GFP_KERNEL);
+ dev->pd_mgr = kzalloc_obj(struct ocrdma_pd_resource_mgr);
if (!dev->pd_mgr)
return;
@@ -3081,7 +3081,7 @@ static int ocrdma_create_eqs(struct ocrdma_dev *dev)
if (!num_eq)
return -EINVAL;
- dev->eq_tbl = kzalloc_objs(struct ocrdma_eq, num_eq, GFP_KERNEL);
+ dev->eq_tbl = kzalloc_objs(struct ocrdma_eq, num_eq);
if (!dev->eq_tbl)
return -ENOMEM;
diff --git a/drivers/infiniband/hw/ocrdma/ocrdma_main.c b/drivers/infiniband/hw/ocrdma/ocrdma_main.c
index 16e3e0ff97b8..3a88103c1fc4 100644
--- a/drivers/infiniband/hw/ocrdma/ocrdma_main.c
+++ b/drivers/infiniband/hw/ocrdma/ocrdma_main.c
@@ -270,7 +270,7 @@ static struct ocrdma_dev *ocrdma_add(struct be_dev_info *dev_info)
return NULL;
}
- dev->mbx_cmd = kzalloc_obj(struct ocrdma_mqe_emb_cmd, GFP_KERNEL);
+ dev->mbx_cmd = kzalloc_obj(struct ocrdma_mqe_emb_cmd);
if (!dev->mbx_cmd)
goto init_err;
diff --git a/drivers/infiniband/hw/ocrdma/ocrdma_verbs.c b/drivers/infiniband/hw/ocrdma/ocrdma_verbs.c
index e9840337e694..4498ef7810ff 100644
--- a/drivers/infiniband/hw/ocrdma/ocrdma_verbs.c
+++ b/drivers/infiniband/hw/ocrdma/ocrdma_verbs.c
@@ -195,7 +195,7 @@ static int ocrdma_add_mmap(struct ocrdma_ucontext *uctx, u64 phy_addr,
{
struct ocrdma_mm *mm;
- mm = kzalloc_obj(*mm, GFP_KERNEL);
+ mm = kzalloc_obj(*mm);
if (mm == NULL)
return -ENOMEM;
mm->key.phy_addr = phy_addr;
@@ -727,7 +727,7 @@ struct ib_mr *ocrdma_get_dma_mr(struct ib_pd *ibpd, int acc)
return ERR_PTR(-EINVAL);
}
- mr = kzalloc_obj(*mr, GFP_KERNEL);
+ mr = kzalloc_obj(*mr);
if (!mr)
return ERR_PTR(-ENOMEM);
@@ -863,7 +863,7 @@ struct ib_mr *ocrdma_reg_user_mr(struct ib_pd *ibpd, u64 start, u64 len,
if (acc & IB_ACCESS_REMOTE_WRITE && !(acc & IB_ACCESS_LOCAL_WRITE))
return ERR_PTR(-EINVAL);
- mr = kzalloc_obj(*mr, GFP_KERNEL);
+ mr = kzalloc_obj(*mr);
if (!mr)
return ERR_PTR(status);
mr->umem = ib_umem_get(ibpd->device, start, len, acc);
@@ -1255,7 +1255,7 @@ static void ocrdma_set_qp_db(struct ocrdma_dev *dev, struct ocrdma_qp *qp,
static int ocrdma_alloc_wr_id_tbl(struct ocrdma_qp *qp)
{
qp->wqe_wr_id_tbl =
- kzalloc_objs(*(qp->wqe_wr_id_tbl), qp->sq.max_cnt, GFP_KERNEL);
+ kzalloc_objs(*(qp->wqe_wr_id_tbl), qp->sq.max_cnt);
if (qp->wqe_wr_id_tbl == NULL)
return -ENOMEM;
qp->rqe_wr_id_tbl =
@@ -2910,7 +2910,7 @@ struct ib_mr *ocrdma_alloc_mr(struct ib_pd *ibpd, enum ib_mr_type mr_type,
if (max_num_sg > dev->attr.max_pages_per_frmr)
return ERR_PTR(-EINVAL);
- mr = kzalloc_obj(*mr, GFP_KERNEL);
+ mr = kzalloc_obj(*mr);
if (!mr)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/infiniband/hw/qedr/main.c b/drivers/infiniband/hw/qedr/main.c
index 8b074d8982e5..8f7f01e8fe08 100644
--- a/drivers/infiniband/hw/qedr/main.c
+++ b/drivers/infiniband/hw/qedr/main.c
@@ -333,7 +333,7 @@ static int qedr_alloc_resources(struct qedr_dev *dev)
__le16 *cons_pi;
int i, rc;
- dev->sgid_tbl = kzalloc_objs(union ib_gid, QEDR_MAX_SGID, GFP_KERNEL);
+ dev->sgid_tbl = kzalloc_objs(union ib_gid, QEDR_MAX_SGID);
if (!dev->sgid_tbl)
return -ENOMEM;
@@ -350,13 +350,13 @@ static int qedr_alloc_resources(struct qedr_dev *dev)
}
/* Allocate Status blocks for CNQ */
- dev->sb_array = kzalloc_objs(*dev->sb_array, dev->num_cnq, GFP_KERNEL);
+ dev->sb_array = kzalloc_objs(*dev->sb_array, dev->num_cnq);
if (!dev->sb_array) {
rc = -ENOMEM;
goto err_destroy_wq;
}
- dev->cnq_array = kzalloc_objs(*dev->cnq_array, dev->num_cnq, GFP_KERNEL);
+ dev->cnq_array = kzalloc_objs(*dev->cnq_array, dev->num_cnq);
if (!dev->cnq_array) {
rc = -ENOMEM;
goto err2;
@@ -786,7 +786,7 @@ static int qedr_init_hw(struct qedr_dev *dev)
int rc = 0;
int i;
- in_params = kzalloc_obj(*in_params, GFP_KERNEL);
+ in_params = kzalloc_obj(*in_params);
if (!in_params) {
rc = -ENOMEM;
goto out;
diff --git a/drivers/infiniband/hw/qedr/qedr_iw_cm.c b/drivers/infiniband/hw/qedr/qedr_iw_cm.c
index ff1f138ec34f..8d38e74f1b12 100644
--- a/drivers/infiniband/hw/qedr/qedr_iw_cm.c
+++ b/drivers/infiniband/hw/qedr/qedr_iw_cm.c
@@ -560,7 +560,7 @@ int qedr_iw_connect(struct iw_cm_id *cm_id, struct iw_cm_conn_param *conn_param)
if (!laddr->sin_port || !raddr->sin_port)
return -EINVAL;
- ep = kzalloc_obj(*ep, GFP_KERNEL);
+ ep = kzalloc_obj(*ep);
if (!ep)
return -ENOMEM;
@@ -672,7 +672,7 @@ int qedr_iw_create_listen(struct iw_cm_id *cm_id, int backlog)
DP_DEBUG(dev, QEDR_MSG_IWARP,
"Create Listener address: %pISpc\n", &cm_id->local_addr);
- listener = kzalloc_obj(*listener, GFP_KERNEL);
+ listener = kzalloc_obj(*listener);
if (!listener)
return -ENOMEM;
diff --git a/drivers/infiniband/hw/qedr/qedr_roce_cm.c b/drivers/infiniband/hw/qedr/qedr_roce_cm.c
index f0e0ae154302..c7273ed7aa6c 100644
--- a/drivers/infiniband/hw/qedr/qedr_roce_cm.c
+++ b/drivers/infiniband/hw/qedr/qedr_roce_cm.c
@@ -339,10 +339,10 @@ int qedr_create_gsi_qp(struct qedr_dev *dev, struct ib_qp_init_attr *attrs,
qp->rq.max_wr = attrs->cap.max_recv_wr;
qp->sq.max_wr = attrs->cap.max_send_wr;
- qp->rqe_wr_id = kzalloc_objs(*qp->rqe_wr_id, qp->rq.max_wr, GFP_KERNEL);
+ qp->rqe_wr_id = kzalloc_objs(*qp->rqe_wr_id, qp->rq.max_wr);
if (!qp->rqe_wr_id)
goto err;
- qp->wqe_wr_id = kzalloc_objs(*qp->wqe_wr_id, qp->sq.max_wr, GFP_KERNEL);
+ qp->wqe_wr_id = kzalloc_objs(*qp->wqe_wr_id, qp->sq.max_wr);
if (!qp->wqe_wr_id)
goto err;
diff --git a/drivers/infiniband/hw/qedr/verbs.c b/drivers/infiniband/hw/qedr/verbs.c
index ed7d4fc20b21..33b4a0e6d3a8 100644
--- a/drivers/infiniband/hw/qedr/verbs.c
+++ b/drivers/infiniband/hw/qedr/verbs.c
@@ -296,7 +296,7 @@ int qedr_alloc_ucontext(struct ib_ucontext *uctx, struct ib_udata *udata)
ctx->dpi_addr = oparams.dpi_addr;
ctx->dpi_phys_addr = oparams.dpi_phys_addr;
ctx->dpi_size = oparams.dpi_size;
- entry = kzalloc_obj(*entry, GFP_KERNEL);
+ entry = kzalloc_obj(*entry);
if (!entry) {
rc = -ENOMEM;
goto err;
@@ -761,7 +761,7 @@ static int qedr_init_user_db_rec(struct ib_udata *udata,
return -ENOMEM;
}
- entry = kzalloc_obj(*entry, GFP_KERNEL);
+ entry = kzalloc_obj(*entry);
if (!entry)
goto err_free_db_data;
@@ -820,7 +820,7 @@ static inline int qedr_init_user_queue(struct ib_udata *udata,
qedr_populate_pbls(dev, q->umem, q->pbl_tbl, &q->pbl_info,
FW_PAGE_SHIFT);
} else {
- q->pbl_tbl = kzalloc_obj(*q->pbl_tbl, GFP_KERNEL);
+ q->pbl_tbl = kzalloc_obj(*q->pbl_tbl);
if (!q->pbl_tbl) {
rc = -ENOMEM;
goto err0;
@@ -2187,7 +2187,7 @@ static int qedr_create_kernel_qp(struct qedr_dev *dev,
qp->sq.max_wr = min_t(u32, attrs->cap.max_send_wr * dev->wq_multiplier,
dev->attr.max_sqe);
- qp->wqe_wr_id = kzalloc_objs(*qp->wqe_wr_id, qp->sq.max_wr, GFP_KERNEL);
+ qp->wqe_wr_id = kzalloc_objs(*qp->wqe_wr_id, qp->sq.max_wr);
if (!qp->wqe_wr_id) {
DP_ERR(dev, "create qp: failed SQ shadow memory allocation\n");
return -ENOMEM;
@@ -2204,7 +2204,7 @@ static int qedr_create_kernel_qp(struct qedr_dev *dev,
qp->rq.max_wr = (u16) max_t(u32, attrs->cap.max_recv_wr, 1);
/* Allocate driver internal RQ array */
- qp->rqe_wr_id = kzalloc_objs(*qp->rqe_wr_id, qp->rq.max_wr, GFP_KERNEL);
+ qp->rqe_wr_id = kzalloc_objs(*qp->rqe_wr_id, qp->rq.max_wr);
if (!qp->rqe_wr_id) {
DP_ERR(dev,
"create qp: failed RQ shadow memory allocation\n");
@@ -2970,7 +2970,7 @@ struct ib_mr *qedr_reg_user_mr(struct ib_pd *ibpd, u64 start, u64 len,
if (acc & IB_ACCESS_REMOTE_WRITE && !(acc & IB_ACCESS_LOCAL_WRITE))
return ERR_PTR(-EINVAL);
- mr = kzalloc_obj(*mr, GFP_KERNEL);
+ mr = kzalloc_obj(*mr);
if (!mr)
return ERR_PTR(rc);
@@ -3078,7 +3078,7 @@ static struct qedr_mr *__qedr_alloc_mr(struct ib_pd *ibpd,
"qedr_alloc_frmr pd = %d max_page_list_len= %d\n", pd->pd_id,
max_page_list_len);
- mr = kzalloc_obj(*mr, GFP_KERNEL);
+ mr = kzalloc_obj(*mr);
if (!mr)
return ERR_PTR(rc);
@@ -3219,7 +3219,7 @@ struct ib_mr *qedr_get_dma_mr(struct ib_pd *ibpd, int acc)
struct qedr_mr *mr;
int rc;
- mr = kzalloc_obj(*mr, GFP_KERNEL);
+ mr = kzalloc_obj(*mr);
if (!mr)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/infiniband/hw/usnic/usnic_fwd.c b/drivers/infiniband/hw/usnic/usnic_fwd.c
index 7dd66ee61a4e..39cdd72eabf6 100644
--- a/drivers/infiniband/hw/usnic/usnic_fwd.c
+++ b/drivers/infiniband/hw/usnic/usnic_fwd.c
@@ -85,7 +85,7 @@ struct usnic_fwd_dev *usnic_fwd_dev_alloc(struct pci_dev *pdev)
{
struct usnic_fwd_dev *ufdev;
- ufdev = kzalloc_obj(*ufdev, GFP_KERNEL);
+ ufdev = kzalloc_obj(*ufdev);
if (!ufdev)
return NULL;
diff --git a/drivers/infiniband/hw/usnic/usnic_ib_main.c b/drivers/infiniband/hw/usnic/usnic_ib_main.c
index 91e91f78f35b..9336dff81cc4 100644
--- a/drivers/infiniband/hw/usnic/usnic_ib_main.c
+++ b/drivers/infiniband/hw/usnic/usnic_ib_main.c
@@ -556,7 +556,7 @@ static int usnic_ib_pci_probe(struct pci_dev *pdev,
return -EPERM;
}
- vf = kzalloc_obj(*vf, GFP_KERNEL);
+ vf = kzalloc_obj(*vf);
if (!vf)
return -ENOMEM;
diff --git a/drivers/infiniband/hw/usnic/usnic_ib_verbs.c b/drivers/infiniband/hw/usnic/usnic_ib_verbs.c
index bbbea014b784..16b269128f52 100644
--- a/drivers/infiniband/hw/usnic/usnic_ib_verbs.c
+++ b/drivers/infiniband/hw/usnic/usnic_ib_verbs.c
@@ -604,7 +604,7 @@ struct ib_mr *usnic_ib_reg_mr(struct ib_pd *pd, u64 start, u64 length,
if (dmah)
return ERR_PTR(-EOPNOTSUPP);
- mr = kzalloc_obj(*mr, GFP_KERNEL);
+ mr = kzalloc_obj(*mr);
if (!mr)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/infiniband/hw/usnic/usnic_uiom.c b/drivers/infiniband/hw/usnic/usnic_uiom.c
index c659c80a37a6..e94aa9608465 100644
--- a/drivers/infiniband/hw/usnic/usnic_uiom.c
+++ b/drivers/infiniband/hw/usnic/usnic_uiom.c
@@ -351,7 +351,7 @@ struct usnic_uiom_reg *usnic_uiom_reg_get(struct usnic_uiom_pd *pd,
vpn_start = (addr & PAGE_MASK) >> PAGE_SHIFT;
vpn_last = vpn_start + npages - 1;
- uiomr = kmalloc_obj(*uiomr, GFP_KERNEL);
+ uiomr = kmalloc_obj(*uiomr);
if (!uiomr)
return ERR_PTR(-ENOMEM);
@@ -439,7 +439,7 @@ struct usnic_uiom_pd *usnic_uiom_alloc_pd(struct device *dev)
struct usnic_uiom_pd *pd;
void *domain;
- pd = kzalloc_obj(*pd, GFP_KERNEL);
+ pd = kzalloc_obj(*pd);
if (!pd)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/infiniband/hw/usnic/usnic_vnic.c b/drivers/infiniband/hw/usnic/usnic_vnic.c
index 2565b1e136cf..70517a458926 100644
--- a/drivers/infiniband/hw/usnic/usnic_vnic.c
+++ b/drivers/infiniband/hw/usnic/usnic_vnic.c
@@ -311,12 +311,12 @@ static int usnic_vnic_alloc_res_chunk(struct usnic_vnic *vnic,
}
chunk->cnt = chunk->free_cnt = cnt;
- chunk->res = kzalloc_objs(*(chunk->res), cnt, GFP_KERNEL);
+ chunk->res = kzalloc_objs(*(chunk->res), cnt);
if (!chunk->res)
return -ENOMEM;
for (i = 0; i < cnt; i++) {
- res = kzalloc_obj(*res, GFP_KERNEL);
+ res = kzalloc_obj(*res);
if (!res) {
err = -ENOMEM;
goto fail;
@@ -445,7 +445,7 @@ struct usnic_vnic *usnic_vnic_alloc(struct pci_dev *pdev)
return ERR_PTR(-EINVAL);
}
- vnic = kzalloc_obj(*vnic, GFP_KERNEL);
+ vnic = kzalloc_obj(*vnic);
if (!vnic)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/infiniband/hw/vmw_pvrdma/pvrdma_misc.c b/drivers/infiniband/hw/vmw_pvrdma/pvrdma_misc.c
index a4da1b61c27f..0864ad25b9d2 100644
--- a/drivers/infiniband/hw/vmw_pvrdma/pvrdma_misc.c
+++ b/drivers/infiniband/hw/vmw_pvrdma/pvrdma_misc.c
@@ -81,7 +81,7 @@ int pvrdma_page_dir_init(struct pvrdma_dev *dev, struct pvrdma_page_dir *pdir,
pdir->npages = npages;
if (alloc_pages) {
- pdir->pages = kzalloc_objs(*pdir->pages, npages, GFP_KERNEL);
+ pdir->pages = kzalloc_objs(*pdir->pages, npages);
if (!pdir->pages)
goto err;
diff --git a/drivers/infiniband/hw/vmw_pvrdma/pvrdma_mr.c b/drivers/infiniband/hw/vmw_pvrdma/pvrdma_mr.c
index b53fb23c3c86..05a6bd991502 100644
--- a/drivers/infiniband/hw/vmw_pvrdma/pvrdma_mr.c
+++ b/drivers/infiniband/hw/vmw_pvrdma/pvrdma_mr.c
@@ -72,7 +72,7 @@ struct ib_mr *pvrdma_get_dma_mr(struct ib_pd *pd, int acc)
return ERR_PTR(-EOPNOTSUPP);
}
- mr = kzalloc_obj(*mr, GFP_KERNEL);
+ mr = kzalloc_obj(*mr);
if (!mr)
return ERR_PTR(-ENOMEM);
@@ -146,7 +146,7 @@ struct ib_mr *pvrdma_reg_user_mr(struct ib_pd *pd, u64 start, u64 length,
goto err_umem;
}
- mr = kzalloc_obj(*mr, GFP_KERNEL);
+ mr = kzalloc_obj(*mr);
if (!mr) {
ret = -ENOMEM;
goto err_umem;
@@ -222,7 +222,7 @@ struct ib_mr *pvrdma_alloc_mr(struct ib_pd *pd, enum ib_mr_type mr_type,
max_num_sg > PVRDMA_MAX_FAST_REG_PAGES)
return ERR_PTR(-EINVAL);
- mr = kzalloc_obj(*mr, GFP_KERNEL);
+ mr = kzalloc_obj(*mr);
if (!mr)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/infiniband/sw/rdmavt/mcast.c b/drivers/infiniband/sw/rdmavt/mcast.c
index 987e9c0b0466..1fda344d2056 100644
--- a/drivers/infiniband/sw/rdmavt/mcast.c
+++ b/drivers/infiniband/sw/rdmavt/mcast.c
@@ -34,7 +34,7 @@ static struct rvt_mcast_qp *rvt_mcast_qp_alloc(struct rvt_qp *qp)
{
struct rvt_mcast_qp *mqp;
- mqp = kmalloc_obj(*mqp, GFP_KERNEL);
+ mqp = kmalloc_obj(*mqp);
if (!mqp)
goto bail;
@@ -66,7 +66,7 @@ static struct rvt_mcast *rvt_mcast_alloc(union ib_gid *mgid, u16 lid)
{
struct rvt_mcast *mcast;
- mcast = kzalloc_obj(*mcast, GFP_KERNEL);
+ mcast = kzalloc_obj(*mcast);
if (!mcast)
goto bail;
diff --git a/drivers/infiniband/sw/rdmavt/mr.c b/drivers/infiniband/sw/rdmavt/mr.c
index 89b1c7410920..add3dde9488f 100644
--- a/drivers/infiniband/sw/rdmavt/mr.c
+++ b/drivers/infiniband/sw/rdmavt/mr.c
@@ -292,7 +292,7 @@ struct ib_mr *rvt_get_dma_mr(struct ib_pd *pd, int acc)
if (ibpd_to_rvtpd(pd)->user)
return ERR_PTR(-EPERM);
- mr = kzalloc_obj(*mr, GFP_KERNEL);
+ mr = kzalloc_obj(*mr);
if (!mr) {
ret = ERR_PTR(-ENOMEM);
goto bail;
diff --git a/drivers/infiniband/sw/rdmavt/qp.c b/drivers/infiniband/sw/rdmavt/qp.c
index 8108660b2d33..c1199ea5d41f 100644
--- a/drivers/infiniband/sw/rdmavt/qp.c
+++ b/drivers/infiniband/sw/rdmavt/qp.c
@@ -2650,7 +2650,7 @@ struct rvt_qp_iter *rvt_qp_iter_init(struct rvt_dev_info *rdi,
{
struct rvt_qp_iter *i;
- i = kzalloc_obj(*i, GFP_KERNEL);
+ i = kzalloc_obj(*i);
if (!i)
return NULL;
diff --git a/drivers/infiniband/sw/rdmavt/vt.c b/drivers/infiniband/sw/rdmavt/vt.c
index 3a7b1f3c4ac6..0c28b412d81a 100644
--- a/drivers/infiniband/sw/rdmavt/vt.c
+++ b/drivers/infiniband/sw/rdmavt/vt.c
@@ -53,7 +53,7 @@ struct rvt_dev_info *rvt_alloc_device(size_t size, int nports)
if (!rdi)
return rdi;
- rdi->ports = kzalloc_objs(*rdi->ports, nports, GFP_KERNEL);
+ rdi->ports = kzalloc_objs(*rdi->ports, nports);
if (!rdi->ports)
ib_dealloc_device(&rdi->ibdev);
diff --git a/drivers/infiniband/sw/rxe/rxe_mcast.c b/drivers/infiniband/sw/rxe/rxe_mcast.c
index 6c3c78ddedc9..5cad72073eca 100644
--- a/drivers/infiniband/sw/rxe/rxe_mcast.c
+++ b/drivers/infiniband/sw/rxe/rxe_mcast.c
@@ -223,7 +223,7 @@ static struct rxe_mcg *rxe_get_mcg(struct rxe_dev *rxe, union ib_gid *mgid)
}
/* speculative alloc of new mcg */
- mcg = kzalloc_obj(*mcg, GFP_KERNEL);
+ mcg = kzalloc_obj(*mcg);
if (!mcg) {
err = -ENOMEM;
goto err_dec;
@@ -363,7 +363,7 @@ static int rxe_attach_mcg(struct rxe_mcg *mcg, struct rxe_qp *qp)
spin_unlock_bh(&rxe->mcg_lock);
/* speculative alloc new mca without using GFP_ATOMIC */
- mca = kzalloc_obj(*mca, GFP_KERNEL);
+ mca = kzalloc_obj(*mca);
if (!mca)
return -ENOMEM;
diff --git a/drivers/infiniband/sw/rxe/rxe_mmap.c b/drivers/infiniband/sw/rxe/rxe_mmap.c
index 6afd158b4b0b..db380302149e 100644
--- a/drivers/infiniband/sw/rxe/rxe_mmap.c
+++ b/drivers/infiniband/sw/rxe/rxe_mmap.c
@@ -120,7 +120,7 @@ struct rxe_mmap_info *rxe_create_mmap_info(struct rxe_dev *rxe, u32 size,
if (!udata)
return ERR_PTR(-EINVAL);
- ip = kmalloc_obj(*ip, GFP_KERNEL);
+ ip = kmalloc_obj(*ip);
if (!ip)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/infiniband/sw/rxe/rxe_mr.c b/drivers/infiniband/sw/rxe/rxe_mr.c
index e2a4eb72a56e..c696ff874980 100644
--- a/drivers/infiniband/sw/rxe/rxe_mr.c
+++ b/drivers/infiniband/sw/rxe/rxe_mr.c
@@ -156,7 +156,7 @@ static int rxe_mr_fill_pages_from_sgt(struct rxe_mr *mr, struct sg_table *sgt)
static int __alloc_mr_page_info(struct rxe_mr *mr, int num_pages)
{
- mr->page_info = kzalloc_objs(struct rxe_mr_page, num_pages, GFP_KERNEL);
+ mr->page_info = kzalloc_objs(struct rxe_mr_page, num_pages);
if (!mr->page_info)
return -ENOMEM;
diff --git a/drivers/infiniband/sw/rxe/rxe_qp.c b/drivers/infiniband/sw/rxe/rxe_qp.c
index 3e00b1c3db0a..f3dff1aea96a 100644
--- a/drivers/infiniband/sw/rxe/rxe_qp.c
+++ b/drivers/infiniband/sw/rxe/rxe_qp.c
@@ -152,7 +152,7 @@ static int alloc_rd_atomic_resources(struct rxe_qp *qp, unsigned int n)
{
qp->resp.res_head = 0;
qp->resp.res_tail = 0;
- qp->resp.resources = kzalloc_objs(struct resp_res, n, GFP_KERNEL);
+ qp->resp.resources = kzalloc_objs(struct resp_res, n);
if (!qp->resp.resources)
return -ENOMEM;
diff --git a/drivers/infiniband/sw/rxe/rxe_queue.c b/drivers/infiniband/sw/rxe/rxe_queue.c
index e27d57ac687f..63a569d8df2b 100644
--- a/drivers/infiniband/sw/rxe/rxe_queue.c
+++ b/drivers/infiniband/sw/rxe/rxe_queue.c
@@ -63,7 +63,7 @@ struct rxe_queue *rxe_queue_init(struct rxe_dev *rxe, int *num_elem,
if (*num_elem < 0)
return NULL;
- q = kzalloc_obj(*q, GFP_KERNEL);
+ q = kzalloc_obj(*q);
if (!q)
return NULL;
diff --git a/drivers/infiniband/sw/rxe/rxe_verbs.c b/drivers/infiniband/sw/rxe/rxe_verbs.c
index 5d1e0b3228c4..fe41362c5144 100644
--- a/drivers/infiniband/sw/rxe/rxe_verbs.c
+++ b/drivers/infiniband/sw/rxe/rxe_verbs.c
@@ -1245,7 +1245,7 @@ static struct ib_mr *rxe_get_dma_mr(struct ib_pd *ibpd, int access)
struct rxe_mr *mr;
int err;
- mr = kzalloc_obj(*mr, GFP_KERNEL);
+ mr = kzalloc_obj(*mr);
if (!mr)
return ERR_PTR(-ENOMEM);
@@ -1288,7 +1288,7 @@ static struct ib_mr *rxe_reg_user_mr(struct ib_pd *ibpd, u64 start,
return ERR_PTR(-EOPNOTSUPP);
}
- mr = kzalloc_obj(*mr, GFP_KERNEL);
+ mr = kzalloc_obj(*mr);
if (!mr)
return ERR_PTR(-ENOMEM);
@@ -1373,7 +1373,7 @@ static struct ib_mr *rxe_alloc_mr(struct ib_pd *ibpd, enum ib_mr_type mr_type,
goto err_out;
}
- mr = kzalloc_obj(*mr, GFP_KERNEL);
+ mr = kzalloc_obj(*mr);
if (!mr)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/infiniband/sw/siw/siw_cm.c b/drivers/infiniband/sw/siw/siw_cm.c
index 22fa54cacab9..f7ac81c0f267 100644
--- a/drivers/infiniband/sw/siw/siw_cm.c
+++ b/drivers/infiniband/sw/siw/siw_cm.c
@@ -205,7 +205,7 @@ static void siw_cep_socket_assoc(struct siw_cep *cep, struct socket *s)
static struct siw_cep *siw_cep_alloc(struct siw_device *sdev)
{
- struct siw_cep *cep = kzalloc_obj(*cep, GFP_KERNEL);
+ struct siw_cep *cep = kzalloc_obj(*cep);
unsigned long flags;
if (!cep)
@@ -334,7 +334,7 @@ static int siw_cm_alloc_work(struct siw_cep *cep, int num)
struct siw_cm_work *work;
while (num--) {
- work = kmalloc_obj(*work, GFP_KERNEL);
+ work = kmalloc_obj(*work);
if (!work) {
if (!(list_empty(&cep->work_freelist)))
siw_cm_free_work(cep);
@@ -1915,7 +1915,7 @@ int siw_create_listen(struct iw_cm_id *id, int backlog)
*/
if (!id->provider_data) {
id->provider_data =
- kmalloc_obj(struct list_head, GFP_KERNEL);
+ kmalloc_obj(struct list_head);
if (!id->provider_data) {
rv = -ENOMEM;
goto error;
diff --git a/drivers/infiniband/sw/siw/siw_main.c b/drivers/infiniband/sw/siw/siw_main.c
index a896b527bcee..9735b75ac933 100644
--- a/drivers/infiniband/sw/siw/siw_main.c
+++ b/drivers/infiniband/sw/siw/siw_main.c
@@ -128,14 +128,14 @@ static int siw_init_cpulist(void)
siw_cpu_info.num_nodes = num_nodes;
siw_cpu_info.tx_valid_cpus =
- kzalloc_objs(struct cpumask *, num_nodes, GFP_KERNEL);
+ kzalloc_objs(struct cpumask *, num_nodes);
if (!siw_cpu_info.tx_valid_cpus) {
siw_cpu_info.num_nodes = 0;
return -ENOMEM;
}
for (i = 0; i < siw_cpu_info.num_nodes; i++) {
siw_cpu_info.tx_valid_cpus[i] =
- kzalloc_obj(struct cpumask, GFP_KERNEL);
+ kzalloc_obj(struct cpumask);
if (!siw_cpu_info.tx_valid_cpus[i])
goto out_err;
diff --git a/drivers/infiniband/sw/siw/siw_mem.c b/drivers/infiniband/sw/siw/siw_mem.c
index 56d3e5c410ce..acb8b7a17687 100644
--- a/drivers/infiniband/sw/siw/siw_mem.c
+++ b/drivers/infiniband/sw/siw/siw_mem.c
@@ -58,7 +58,7 @@ int siw_mr_add_mem(struct siw_mr *mr, struct ib_pd *pd, void *mem_obj,
u64 start, u64 len, int rights)
{
struct siw_device *sdev = to_siw_dev(pd->device);
- struct siw_mem *mem = kzalloc_obj(*mem, GFP_KERNEL);
+ struct siw_mem *mem = kzalloc_obj(*mem);
struct xa_limit limit = XA_LIMIT(1, SIW_STAG_MAX_INDEX);
u32 id, next;
@@ -347,12 +347,12 @@ struct siw_umem *siw_umem_get(struct ib_device *base_dev, u64 start,
num_pages = PAGE_ALIGN(start + len - first_page_va) >> PAGE_SHIFT;
num_chunks = (num_pages >> CHUNK_SHIFT) + 1;
- umem = kzalloc_obj(*umem, GFP_KERNEL);
+ umem = kzalloc_obj(*umem);
if (!umem)
return ERR_PTR(-ENOMEM);
umem->page_chunk =
- kzalloc_objs(struct siw_page_chunk, num_chunks, GFP_KERNEL);
+ kzalloc_objs(struct siw_page_chunk, num_chunks);
if (!umem->page_chunk) {
rv = -ENOMEM;
goto err_out;
@@ -376,7 +376,7 @@ struct siw_umem *siw_umem_get(struct ib_device *base_dev, u64 start,
for (i = 0; num_pages > 0; i++) {
int nents = min_t(int, num_pages, PAGES_PER_CHUNK);
struct page **plist =
- kzalloc_objs(struct page *, nents, GFP_KERNEL);
+ kzalloc_objs(struct page *, nents);
if (!plist) {
rv = -ENOMEM;
diff --git a/drivers/infiniband/sw/siw/siw_qp.c b/drivers/infiniband/sw/siw/siw_qp.c
index cccfef1e27bf..bb780e3904a2 100644
--- a/drivers/infiniband/sw/siw/siw_qp.c
+++ b/drivers/infiniband/sw/siw/siw_qp.c
@@ -391,7 +391,7 @@ void siw_send_terminate(struct siw_qp *qp)
return;
}
- term = kzalloc_obj(*term, GFP_KERNEL);
+ term = kzalloc_obj(*term);
if (!term)
return;
@@ -405,7 +405,7 @@ void siw_send_terminate(struct siw_qp *qp)
if ((qp->term_info.layer == TERM_ERROR_LAYER_DDP) ||
((qp->term_info.layer == TERM_ERROR_LAYER_RDMAP) &&
(qp->term_info.etype != RDMAP_ETYPE_CATASTROPHIC))) {
- err_hdr = kzalloc_obj(*err_hdr, GFP_KERNEL);
+ err_hdr = kzalloc_obj(*err_hdr);
if (!err_hdr) {
kfree(term);
return;
diff --git a/drivers/infiniband/sw/siw/siw_verbs.c b/drivers/infiniband/sw/siw/siw_verbs.c
index 12719394f1ea..ef504db8f2b4 100644
--- a/drivers/infiniband/sw/siw/siw_verbs.c
+++ b/drivers/infiniband/sw/siw/siw_verbs.c
@@ -274,7 +274,7 @@ siw_mmap_entry_insert(struct siw_ucontext *uctx,
void *address, size_t length,
u64 *offset)
{
- struct siw_user_mmap_entry *entry = kzalloc_obj(*entry, GFP_KERNEL);
+ struct siw_user_mmap_entry *entry = kzalloc_obj(*entry);
int rv;
*offset = SIW_INVAL_UOBJ_KEY;
@@ -1360,7 +1360,7 @@ struct ib_mr *siw_reg_user_mr(struct ib_pd *pd, u64 start, u64 len,
umem = NULL;
goto err_out;
}
- mr = kzalloc_obj(*mr, GFP_KERNEL);
+ mr = kzalloc_obj(*mr);
if (!mr) {
rv = -ENOMEM;
goto err_out;
@@ -1441,7 +1441,7 @@ struct ib_mr *siw_alloc_mr(struct ib_pd *pd, enum ib_mr_type mr_type,
pbl = NULL;
goto err_out;
}
- mr = kzalloc_obj(*mr, GFP_KERNEL);
+ mr = kzalloc_obj(*mr);
if (!mr) {
rv = -ENOMEM;
goto err_out;
@@ -1556,7 +1556,7 @@ struct ib_mr *siw_get_dma_mr(struct ib_pd *pd, int rights)
rv = -ENOMEM;
goto err_out;
}
- mr = kzalloc_obj(*mr, GFP_KERNEL);
+ mr = kzalloc_obj(*mr);
if (!mr) {
rv = -ENOMEM;
goto err_out;
diff --git a/drivers/infiniband/ulp/ipoib/ipoib_cm.c b/drivers/infiniband/ulp/ipoib/ipoib_cm.c
index 54de2be1494b..57fec88a1629 100644
--- a/drivers/infiniband/ulp/ipoib/ipoib_cm.c
+++ b/drivers/infiniband/ulp/ipoib/ipoib_cm.c
@@ -360,7 +360,7 @@ static int ipoib_cm_nonsrq_init_rx(struct net_device *dev, struct ib_cm_id *cm_i
if (!rx->rx_ring)
return -ENOMEM;
- t = kmalloc_obj(*t, GFP_KERNEL);
+ t = kmalloc_obj(*t);
if (!t) {
ret = -ENOMEM;
goto err_free_1;
@@ -449,7 +449,7 @@ static int ipoib_cm_req_handler(struct ib_cm_id *cm_id,
int ret;
ipoib_dbg(priv, "REQ arrived\n");
- p = kzalloc_obj(*p, GFP_KERNEL);
+ p = kzalloc_obj(*p);
if (!p)
return -ENOMEM;
p->dev = dev;
diff --git a/drivers/infiniband/ulp/ipoib/ipoib_ib.c b/drivers/infiniband/ulp/ipoib/ipoib_ib.c
index 44354d661e65..5061d52a7b12 100644
--- a/drivers/infiniband/ulp/ipoib/ipoib_ib.c
+++ b/drivers/infiniband/ulp/ipoib/ipoib_ib.c
@@ -59,7 +59,7 @@ struct ipoib_ah *ipoib_create_ah(struct net_device *dev,
struct ipoib_ah *ah;
struct ib_ah *vah;
- ah = kmalloc_obj(*ah, GFP_KERNEL);
+ ah = kmalloc_obj(*ah);
if (!ah)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/infiniband/ulp/ipoib/ipoib_main.c b/drivers/infiniband/ulp/ipoib/ipoib_main.c
index 934d8e5a8f11..fb8e70eae383 100644
--- a/drivers/infiniband/ulp/ipoib/ipoib_main.c
+++ b/drivers/infiniband/ulp/ipoib/ipoib_main.c
@@ -169,7 +169,7 @@ static void ipoib_schedule_ifupdown_task(struct net_device *dev, bool up)
(!up && !(dev->flags & IFF_UP)))
return;
- work = kmalloc_obj(*work, GFP_KERNEL);
+ work = kmalloc_obj(*work);
if (!work)
return;
work->dev = dev;
@@ -673,7 +673,7 @@ struct ipoib_path_iter *ipoib_path_iter_init(struct net_device *dev)
{
struct ipoib_path_iter *iter;
- iter = kmalloc_obj(*iter, GFP_KERNEL);
+ iter = kmalloc_obj(*iter);
if (!iter)
return NULL;
@@ -1593,11 +1593,11 @@ static int ipoib_neigh_hash_init(struct ipoib_dev_priv *priv)
clear_bit(IPOIB_NEIGH_TBL_FLUSH, &priv->flags);
ntbl->htbl = NULL;
- htbl = kzalloc_obj(*htbl, GFP_KERNEL);
+ htbl = kzalloc_obj(*htbl);
if (!htbl)
return -ENOMEM;
size = roundup_pow_of_two(arp_tbl.gc_thresh3);
- buckets = kvzalloc_objs(*buckets, size, GFP_KERNEL);
+ buckets = kvzalloc_objs(*buckets, size);
if (!buckets) {
kfree(htbl);
return -ENOMEM;
@@ -2277,7 +2277,7 @@ int ipoib_intf_init(struct ib_device *hca, u32 port, const char *name,
struct ipoib_dev_priv *priv;
int rc;
- priv = kzalloc_obj(*priv, GFP_KERNEL);
+ priv = kzalloc_obj(*priv);
if (!priv)
return -ENOMEM;
@@ -2663,7 +2663,7 @@ static int ipoib_add_one(struct ib_device *device)
unsigned int p;
int count = 0;
- dev_list = kmalloc_obj(*dev_list, GFP_KERNEL);
+ dev_list = kmalloc_obj(*dev_list);
if (!dev_list)
return -ENOMEM;
diff --git a/drivers/infiniband/ulp/ipoib/ipoib_multicast.c b/drivers/infiniband/ulp/ipoib/ipoib_multicast.c
index 7b04186f659e..6401af2fd548 100644
--- a/drivers/infiniband/ulp/ipoib/ipoib_multicast.c
+++ b/drivers/infiniband/ulp/ipoib/ipoib_multicast.c
@@ -980,7 +980,7 @@ struct ipoib_mcast_iter *ipoib_mcast_iter_init(struct net_device *dev)
{
struct ipoib_mcast_iter *iter;
- iter = kmalloc_obj(*iter, GFP_KERNEL);
+ iter = kmalloc_obj(*iter);
if (!iter)
return NULL;
diff --git a/drivers/infiniband/ulp/ipoib/ipoib_verbs.c b/drivers/infiniband/ulp/ipoib/ipoib_verbs.c
index 55a612ad2b07..3ed1ea566690 100644
--- a/drivers/infiniband/ulp/ipoib/ipoib_verbs.c
+++ b/drivers/infiniband/ulp/ipoib/ipoib_verbs.c
@@ -52,7 +52,7 @@ int ipoib_mcast_attach(struct net_device *dev, struct ib_device *hca,
if (set_qkey) {
ret = -ENOMEM;
- qp_attr = kmalloc_obj(*qp_attr, GFP_KERNEL);
+ qp_attr = kmalloc_obj(*qp_attr);
if (!qp_attr)
goto out;
diff --git a/drivers/infiniband/ulp/ipoib/ipoib_vlan.c b/drivers/infiniband/ulp/ipoib/ipoib_vlan.c
index df98b4936c32..ba3b45152907 100644
--- a/drivers/infiniband/ulp/ipoib/ipoib_vlan.c
+++ b/drivers/infiniband/ulp/ipoib/ipoib_vlan.c
@@ -274,7 +274,7 @@ int ipoib_vlan_delete(struct net_device *pdev, unsigned short pkey)
priv->child_type == IPOIB_LEGACY_CHILD) {
struct ipoib_vlan_delete_work *work;
- work = kmalloc_obj(*work, GFP_KERNEL);
+ work = kmalloc_obj(*work);
if (!work) {
rc = -ENOMEM;
goto out;
diff --git a/drivers/infiniband/ulp/iser/iscsi_iser.c b/drivers/infiniband/ulp/iser/iscsi_iser.c
index 2e1e97acf342..7df441685780 100644
--- a/drivers/infiniband/ulp/iser/iscsi_iser.c
+++ b/drivers/infiniband/ulp/iser/iscsi_iser.c
@@ -802,7 +802,7 @@ static struct iscsi_endpoint *iscsi_iser_ep_connect(struct Scsi_Host *shost,
if (!ep)
return ERR_PTR(-ENOMEM);
- iser_conn = kzalloc_obj(*iser_conn, GFP_KERNEL);
+ iser_conn = kzalloc_obj(*iser_conn);
if (!iser_conn) {
err = -ENOMEM;
goto failure;
diff --git a/drivers/infiniband/ulp/iser/iser_verbs.c b/drivers/infiniband/ulp/iser/iser_verbs.c
index f08dea6721c4..f03b3bb3c0c4 100644
--- a/drivers/infiniband/ulp/iser/iser_verbs.c
+++ b/drivers/infiniband/ulp/iser/iser_verbs.c
@@ -105,7 +105,7 @@ iser_create_fastreg_desc(struct iser_device *device,
enum ib_mr_type mr_type;
int ret;
- desc = kzalloc_obj(*desc, GFP_KERNEL);
+ desc = kzalloc_obj(*desc);
if (!desc)
return ERR_PTR(-ENOMEM);
@@ -305,7 +305,7 @@ struct iser_device *iser_device_find_by_ib_device(struct rdma_cm_id *cma_id)
if (device->ib_device->node_guid == cma_id->device->node_guid)
goto inc_refcnt;
- device = kzalloc_obj(*device, GFP_KERNEL);
+ device = kzalloc_obj(*device);
if (!device)
goto out;
diff --git a/drivers/infiniband/ulp/isert/ib_isert.c b/drivers/infiniband/ulp/isert/ib_isert.c
index ab5d8790cf87..84de723cacb4 100644
--- a/drivers/infiniband/ulp/isert/ib_isert.c
+++ b/drivers/infiniband/ulp/isert/ib_isert.c
@@ -274,7 +274,7 @@ isert_device_get(struct rdma_cm_id *cma_id)
}
}
- device = kzalloc_obj(struct isert_device, GFP_KERNEL);
+ device = kzalloc_obj(struct isert_device);
if (!device) {
mutex_unlock(&device_list_mutex);
return ERR_PTR(-ENOMEM);
@@ -428,7 +428,7 @@ isert_connect_request(struct rdma_cm_id *cma_id, struct rdma_cm_event *event)
isert_dbg("cma_id: %p, portal: %p\n",
cma_id, cma_id->context);
- isert_conn = kzalloc_obj(struct isert_conn, GFP_KERNEL);
+ isert_conn = kzalloc_obj(struct isert_conn);
if (!isert_conn)
return -ENOMEM;
@@ -2268,7 +2268,7 @@ isert_setup_np(struct iscsi_np *np,
struct rdma_cm_id *isert_lid;
int ret;
- isert_np = kzalloc_obj(struct isert_np, GFP_KERNEL);
+ isert_np = kzalloc_obj(struct isert_np);
if (!isert_np)
return -ENOMEM;
diff --git a/drivers/infiniband/ulp/opa_vnic/opa_vnic_encap.c b/drivers/infiniband/ulp/opa_vnic/opa_vnic_encap.c
index 6d3dbf45e9f5..53dcf06fbee0 100644
--- a/drivers/infiniband/ulp/opa_vnic/opa_vnic_encap.c
+++ b/drivers/infiniband/ulp/opa_vnic/opa_vnic_encap.c
@@ -238,7 +238,7 @@ int opa_vnic_update_mac_tbl(struct opa_vnic_adapter *adapter,
if (!memcmp(mac_addr, empty_mac, ARRAY_SIZE(empty_mac)))
continue;
- node = kzalloc_obj(*node, GFP_KERNEL);
+ node = kzalloc_obj(*node);
if (!node) {
rc = -ENOMEM;
goto updt_done;
@@ -265,7 +265,7 @@ int opa_vnic_update_mac_tbl(struct opa_vnic_adapter *adapter,
(node->index < (loffset + lnum_entries)))
continue;
- new_node = kzalloc_obj(*new_node, GFP_KERNEL);
+ new_node = kzalloc_obj(*new_node);
if (!new_node) {
rc = -ENOMEM;
goto updt_done;
diff --git a/drivers/infiniband/ulp/opa_vnic/opa_vnic_netdev.c b/drivers/infiniband/ulp/opa_vnic/opa_vnic_netdev.c
index 6d5f642ff3d3..1c3e7251f0f4 100644
--- a/drivers/infiniband/ulp/opa_vnic/opa_vnic_netdev.c
+++ b/drivers/infiniband/ulp/opa_vnic/opa_vnic_netdev.c
@@ -337,7 +337,7 @@ struct opa_vnic_adapter *opa_vnic_add_netdev(struct ib_device *ibdev,
return ERR_CAST(netdev);
rn = netdev_priv(netdev);
- adapter = kzalloc_obj(*adapter, GFP_KERNEL);
+ adapter = kzalloc_obj(*adapter);
if (!adapter) {
rc = -ENOMEM;
goto adapter_err;
diff --git a/drivers/infiniband/ulp/rtrs/rtrs-clt.c b/drivers/infiniband/ulp/rtrs/rtrs-clt.c
index 67405a19ea10..c0cd2592dd93 100644
--- a/drivers/infiniband/ulp/rtrs/rtrs-clt.c
+++ b/drivers/infiniband/ulp/rtrs/rtrs-clt.c
@@ -1383,7 +1383,7 @@ static int alloc_path_reqs(struct rtrs_clt_path *clt_path)
if (!req->iu)
goto out;
- req->sge = kzalloc_objs(*req->sge, 2, GFP_KERNEL);
+ req->sge = kzalloc_objs(*req->sge, 2);
if (!req->sge)
goto out;
@@ -1537,7 +1537,7 @@ static struct rtrs_clt_path *alloc_path(struct rtrs_clt_sess *clt,
int cpu;
size_t total_con;
- clt_path = kzalloc_obj(*clt_path, GFP_KERNEL);
+ clt_path = kzalloc_obj(*clt_path);
if (!clt_path)
goto err;
@@ -1546,14 +1546,14 @@ static struct rtrs_clt_path *alloc_path(struct rtrs_clt_sess *clt,
* +1: Extra connection for user messages
*/
total_con = con_num + nr_poll_queues + 1;
- clt_path->s.con = kzalloc_objs(*clt_path->s.con, total_con, GFP_KERNEL);
+ clt_path->s.con = kzalloc_objs(*clt_path->s.con, total_con);
if (!clt_path->s.con)
goto err_free_path;
clt_path->s.con_num = total_con;
clt_path->s.irq_con_num = con_num + 1;
- clt_path->stats = kzalloc_obj(*clt_path->stats, GFP_KERNEL);
+ clt_path->stats = kzalloc_obj(*clt_path->stats);
if (!clt_path->stats)
goto err_free_con;
@@ -1620,7 +1620,7 @@ static int create_con(struct rtrs_clt_path *clt_path, unsigned int cid)
{
struct rtrs_clt_con *con;
- con = kzalloc_obj(*con, GFP_KERNEL);
+ con = kzalloc_obj(*con);
if (!con)
return -ENOMEM;
@@ -2727,7 +2727,7 @@ static struct rtrs_clt_sess *alloc_clt(const char *sessname, size_t paths_num,
if (strlen(sessname) >= sizeof(clt->sessname))
return ERR_PTR(-EINVAL);
- clt = kzalloc_obj(*clt, GFP_KERNEL);
+ clt = kzalloc_obj(*clt);
if (!clt)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/infiniband/ulp/rtrs/rtrs-srv.c b/drivers/infiniband/ulp/rtrs/rtrs-srv.c
index c66929b74805..59c8f72b0b34 100644
--- a/drivers/infiniband/ulp/rtrs/rtrs-srv.c
+++ b/drivers/infiniband/ulp/rtrs/rtrs-srv.c
@@ -144,7 +144,7 @@ static int rtrs_srv_alloc_ops_ids(struct rtrs_srv_path *srv_path)
goto err;
for (i = 0; i < srv->queue_depth; ++i) {
- id = kzalloc_obj(*id, GFP_KERNEL);
+ id = kzalloc_obj(*id);
if (!id)
goto err;
@@ -588,7 +588,7 @@ static int map_cont_bufs(struct rtrs_srv_path *srv_path)
chunks_per_mr = DIV_ROUND_UP(srv->queue_depth, mrs_num);
}
- srv_path->mrs = kzalloc_objs(*srv_path->mrs, mrs_num, GFP_KERNEL);
+ srv_path->mrs = kzalloc_objs(*srv_path->mrs, mrs_num);
if (!srv_path->mrs)
return -ENOMEM;
@@ -836,7 +836,7 @@ static int process_info_req(struct rtrs_srv_con *con,
strscpy(srv_path->s.sessname, msg->pathname,
sizeof(srv_path->s.sessname));
- rwr = kzalloc_objs(*rwr, srv_path->mrs_num, GFP_KERNEL);
+ rwr = kzalloc_objs(*rwr, srv_path->mrs_num);
if (!rwr)
return -ENOMEM;
@@ -1435,7 +1435,7 @@ static struct rtrs_srv_sess *get_or_create_srv(struct rtrs_srv_ctx *ctx,
}
/* need to allocate a new srv */
- srv = kzalloc_obj(*srv, GFP_KERNEL);
+ srv = kzalloc_obj(*srv);
if (!srv)
return ERR_PTR(-ENOMEM);
@@ -1448,7 +1448,7 @@ static struct rtrs_srv_sess *get_or_create_srv(struct rtrs_srv_ctx *ctx,
device_initialize(&srv->dev);
srv->dev.release = rtrs_srv_dev_release;
- srv->chunks = kzalloc_objs(*srv->chunks, srv->queue_depth, GFP_KERNEL);
+ srv->chunks = kzalloc_objs(*srv->chunks, srv->queue_depth);
if (!srv->chunks)
goto err_free_srv;
@@ -1713,7 +1713,7 @@ static int create_con(struct rtrs_srv_path *srv_path,
u32 cq_num, max_send_wr, max_recv_wr, wr_limit;
int err, cq_vector;
- con = kzalloc_obj(*con, GFP_KERNEL);
+ con = kzalloc_obj(*con);
if (!con) {
err = -ENOMEM;
goto err;
@@ -1806,11 +1806,11 @@ static struct rtrs_srv_path *__alloc_path(struct rtrs_srv_sess *srv,
err = -EEXIST;
goto err;
}
- srv_path = kzalloc_obj(*srv_path, GFP_KERNEL);
+ srv_path = kzalloc_obj(*srv_path);
if (!srv_path)
goto err;
- srv_path->stats = kzalloc_obj(*srv_path->stats, GFP_KERNEL);
+ srv_path->stats = kzalloc_obj(*srv_path->stats);
if (!srv_path->stats)
goto err_free_sess;
@@ -1825,7 +1825,7 @@ static struct rtrs_srv_path *__alloc_path(struct rtrs_srv_sess *srv,
if (!srv_path->dma_addr)
goto err_free_percpu;
- srv_path->s.con = kzalloc_objs(*srv_path->s.con, con_num, GFP_KERNEL);
+ srv_path->s.con = kzalloc_objs(*srv_path->s.con, con_num);
if (!srv_path->s.con)
goto err_free_dma_addr;
@@ -2158,7 +2158,7 @@ static struct rtrs_srv_ctx *alloc_srv_ctx(struct rtrs_srv_ops *ops)
{
struct rtrs_srv_ctx *ctx;
- ctx = kzalloc_obj(*ctx, GFP_KERNEL);
+ ctx = kzalloc_obj(*ctx);
if (!ctx)
return NULL;
diff --git a/drivers/infiniband/ulp/rtrs/rtrs.c b/drivers/infiniband/ulp/rtrs/rtrs.c
index f316cbe5e62c..a642626e0ecb 100644
--- a/drivers/infiniband/ulp/rtrs/rtrs.c
+++ b/drivers/infiniband/ulp/rtrs/rtrs.c
@@ -618,7 +618,7 @@ rtrs_ib_dev_find_or_add(struct ib_device *ib_dev,
goto out_unlock;
}
mutex_unlock(&pool->mutex);
- dev = kzalloc_obj(*dev, GFP_KERNEL);
+ dev = kzalloc_obj(*dev);
if (!dev)
goto out_err;
diff --git a/drivers/infiniband/ulp/srp/ib_srp.c b/drivers/infiniband/ulp/srp/ib_srp.c
index e1dfc097f774..7e69c0d1bf60 100644
--- a/drivers/infiniband/ulp/srp/ib_srp.c
+++ b/drivers/infiniband/ulp/srp/ib_srp.c
@@ -274,7 +274,7 @@ static int srp_init_ib_qp(struct srp_target_port *target,
struct ib_qp_attr *attr;
int ret;
- attr = kmalloc_obj(*attr, GFP_KERNEL);
+ attr = kmalloc_obj(*attr);
if (!attr)
return -ENOMEM;
@@ -533,7 +533,7 @@ static int srp_create_ch_ib(struct srp_rdma_ch *ch)
const int m = 1 + dev->use_fast_reg * target->mr_per_cmd * 2;
int ret;
- init_attr = kzalloc_obj(*init_attr, GFP_KERNEL);
+ init_attr = kzalloc_obj(*init_attr);
if (!init_attr)
return -ENOMEM;
@@ -806,7 +806,7 @@ static int srp_send_req(struct srp_rdma_ch *ch, uint32_t max_iu_len,
char *ipi, *tpi;
int status;
- req = kzalloc_obj(*req, GFP_KERNEL);
+ req = kzalloc_obj(*req);
if (!req)
return -ENOMEM;
@@ -2257,10 +2257,10 @@ static int srp_alloc_iu_bufs(struct srp_rdma_ch *ch)
struct srp_target_port *target = ch->target;
int i;
- ch->rx_ring = kzalloc_objs(*ch->rx_ring, target->queue_size, GFP_KERNEL);
+ ch->rx_ring = kzalloc_objs(*ch->rx_ring, target->queue_size);
if (!ch->rx_ring)
goto err_no_ring;
- ch->tx_ring = kzalloc_objs(*ch->tx_ring, target->queue_size, GFP_KERNEL);
+ ch->tx_ring = kzalloc_objs(*ch->tx_ring, target->queue_size);
if (!ch->tx_ring)
goto err_no_ring;
@@ -2385,7 +2385,7 @@ static void srp_cm_rep_handler(struct ib_cm_id *cm_id,
if (!target->using_rdma_cm) {
ret = -ENOMEM;
- qp_attr = kmalloc_obj(*qp_attr, GFP_KERNEL);
+ qp_attr = kmalloc_obj(*qp_attr);
if (!qp_attr)
goto error;
@@ -3822,7 +3822,7 @@ static ssize_t add_target_store(struct device *dev,
num_online_cpus());
}
- target->ch = kzalloc_objs(*target->ch, target->ch_count, GFP_KERNEL);
+ target->ch = kzalloc_objs(*target->ch, target->ch_count);
if (!target->ch)
goto out;
@@ -3957,7 +3957,7 @@ static struct srp_host *srp_add_port(struct srp_device *device, u32 port)
{
struct srp_host *host;
- host = kzalloc_obj(*host, GFP_KERNEL);
+ host = kzalloc_obj(*host);
if (!host)
return NULL;
@@ -4007,7 +4007,7 @@ static int srp_add_one(struct ib_device *device)
u64 max_pages_per_mr;
unsigned int flags = 0;
- srp_dev = kzalloc_obj(*srp_dev, GFP_KERNEL);
+ srp_dev = kzalloc_obj(*srp_dev);
if (!srp_dev)
return -ENOMEM;
diff --git a/drivers/infiniband/ulp/srpt/ib_srpt.c b/drivers/infiniband/ulp/srpt/ib_srpt.c
index 6e371b264054..e67f293c40f9 100644
--- a/drivers/infiniband/ulp/srpt/ib_srpt.c
+++ b/drivers/infiniband/ulp/srpt/ib_srpt.c
@@ -127,7 +127,7 @@ static struct kmem_cache *srpt_cache_get(unsigned int object_size)
return e->c;
}
snprintf(name, sizeof(name), "srpt-%u", object_size);
- e = kmalloc_obj(*e, GFP_KERNEL);
+ e = kmalloc_obj(*e);
if (!e)
return NULL;
refcount_set(&e->ref, 1);
@@ -790,7 +790,7 @@ static struct srpt_ioctx **srpt_alloc_ioctx_ring(struct srpt_device *sdev,
WARN_ON(ioctx_size != sizeof(struct srpt_recv_ioctx) &&
ioctx_size != sizeof(struct srpt_send_ioctx));
- ring = kvmalloc_objs(ring[0], ring_size, GFP_KERNEL);
+ ring = kvmalloc_objs(ring[0], ring_size);
if (!ring)
goto out;
for (i = 0; i < ring_size; ++i) {
@@ -1181,7 +1181,7 @@ static int srpt_init_ch_qp(struct srpt_rdma_ch *ch, struct ib_qp *qp)
WARN_ON_ONCE(ch->using_rdma_cm);
- attr = kzalloc_obj(*attr, GFP_KERNEL);
+ attr = kzalloc_obj(*attr);
if (!attr)
return -ENOMEM;
@@ -1857,7 +1857,7 @@ static int srpt_create_ch_ib(struct srpt_rdma_ch *ch)
WARN_ON(ch->rq_size < 1);
ret = -ENOMEM;
- qp_init = kzalloc_obj(*qp_init, GFP_KERNEL);
+ qp_init = kzalloc_obj(*qp_init);
if (!qp_init)
goto out;
@@ -2089,7 +2089,7 @@ static struct srpt_nexus *srpt_get_nexus(struct srpt_port *sport,
if (nexus)
break;
- tmp_nexus = kzalloc_obj(*nexus, GFP_KERNEL);
+ tmp_nexus = kzalloc_obj(*nexus);
if (!tmp_nexus) {
nexus = ERR_PTR(-ENOMEM);
break;
@@ -2241,9 +2241,9 @@ static int srpt_cm_req_recv(struct srpt_device *const sdev,
}
ret = -ENOMEM;
- rsp = kzalloc_obj(*rsp, GFP_KERNEL);
- rej = kzalloc_obj(*rej, GFP_KERNEL);
- rep_param = kzalloc_obj(*rep_param, GFP_KERNEL);
+ rsp = kzalloc_obj(*rsp);
+ rej = kzalloc_obj(*rej);
+ rep_param = kzalloc_obj(*rep_param);
if (!rsp || !rej || !rep_param)
goto out;
@@ -2273,7 +2273,7 @@ static int srpt_cm_req_recv(struct srpt_device *const sdev,
}
ret = -ENOMEM;
- ch = kzalloc_obj(*ch, GFP_KERNEL);
+ ch = kzalloc_obj(*ch);
if (!ch) {
rej->reason = cpu_to_be32(SRP_LOGIN_REJ_INSUFFICIENT_RESOURCES);
pr_err("rejected SRP_LOGIN_REQ because out of memory.\n");
@@ -3789,7 +3789,7 @@ static struct se_portal_group *srpt_make_tpg(struct se_wwn *wwn,
struct srpt_tpg *stpg;
int res = -ENOMEM;
- stpg = kzalloc_obj(*stpg, GFP_KERNEL);
+ stpg = kzalloc_obj(*stpg);
if (!stpg)
return ERR_PTR(res);
stpg->sport_id = sport_id;
@@ -3846,7 +3846,7 @@ static struct se_wwn *srpt_make_tport(struct target_fabric_configfs *tf,
WARN_ON_ONCE(true);
return &(*papi.port_id)->wwn;
}
- port_id = kzalloc_obj(*port_id, GFP_KERNEL);
+ port_id = kzalloc_obj(*port_id);
if (!port_id) {
srpt_sdev_put(sport->sdev);
return ERR_PTR(-ENOMEM);
diff --git a/drivers/input/apm-power.c b/drivers/input/apm-power.c
index 211ab2c0793a..028fcaf4c142 100644
--- a/drivers/input/apm-power.c
+++ b/drivers/input/apm-power.c
@@ -52,7 +52,7 @@ static int apmpower_connect(struct input_handler *handler,
struct input_handle *handle;
int error;
- handle = kzalloc_obj(struct input_handle, GFP_KERNEL);
+ handle = kzalloc_obj(struct input_handle);
if (!handle)
return -ENOMEM;
diff --git a/drivers/input/evdev.c b/drivers/input/evdev.c
index 884b525e799c..77360def61be 100644
--- a/drivers/input/evdev.c
+++ b/drivers/input/evdev.c
@@ -1346,7 +1346,7 @@ static int evdev_connect(struct input_handler *handler, struct input_dev *dev,
return error;
}
- evdev = kzalloc_obj(struct evdev, GFP_KERNEL);
+ evdev = kzalloc_obj(struct evdev);
if (!evdev) {
error = -ENOMEM;
goto err_free_minor;
diff --git a/drivers/input/ff-core.c b/drivers/input/ff-core.c
index d6e2c3017435..17061fb2f5b8 100644
--- a/drivers/input/ff-core.c
+++ b/drivers/input/ff-core.c
@@ -307,7 +307,7 @@ int input_ff_create(struct input_dev *dev, unsigned int max_effects)
if (!ff)
return -ENOMEM;
- ff->effects = kzalloc_objs(*ff->effects, max_effects, GFP_KERNEL);
+ ff->effects = kzalloc_objs(*ff->effects, max_effects);
if (!ff->effects)
return -ENOMEM;
diff --git a/drivers/input/ff-memless.c b/drivers/input/ff-memless.c
index e018ea328dda..937370d04928 100644
--- a/drivers/input/ff-memless.c
+++ b/drivers/input/ff-memless.c
@@ -508,7 +508,7 @@ int input_ff_create_memless(struct input_dev *dev, void *data,
int error;
int i;
- struct ml_device *ml __free(kfree) = kzalloc_obj(*ml, GFP_KERNEL);
+ struct ml_device *ml __free(kfree) = kzalloc_obj(*ml);
if (!ml)
return -ENOMEM;
diff --git a/drivers/input/gameport/emu10k1-gp.c b/drivers/input/gameport/emu10k1-gp.c
index cbb67f97d0ca..ee97621df59d 100644
--- a/drivers/input/gameport/emu10k1-gp.c
+++ b/drivers/input/gameport/emu10k1-gp.c
@@ -43,7 +43,7 @@ static int emu_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
struct gameport *port;
int error;
- emu = kzalloc_obj(*emu, GFP_KERNEL);
+ emu = kzalloc_obj(*emu);
port = gameport_allocate_port();
if (!emu || !port) {
printk(KERN_ERR "emu10k1-gp: Memory allocation failed\n");
diff --git a/drivers/input/gameport/fm801-gp.c b/drivers/input/gameport/fm801-gp.c
index f5b1a683d1b4..423cccdea34f 100644
--- a/drivers/input/gameport/fm801-gp.c
+++ b/drivers/input/gameport/fm801-gp.c
@@ -68,7 +68,7 @@ static int fm801_gp_probe(struct pci_dev *pci, const struct pci_device_id *id)
struct gameport *port;
int error;
- gp = kzalloc_obj(*gp, GFP_KERNEL);
+ gp = kzalloc_obj(*gp);
port = gameport_allocate_port();
if (!gp || !port) {
printk(KERN_ERR "fm801-gp: Memory allocation failed\n");
diff --git a/drivers/input/gameport/ns558.c b/drivers/input/gameport/ns558.c
index cb04b49a82be..fdece6ec1df3 100644
--- a/drivers/input/gameport/ns558.c
+++ b/drivers/input/gameport/ns558.c
@@ -120,7 +120,7 @@ static int ns558_isa_probe(int io)
return -EBUSY;
}
- ns558 = kzalloc_obj(*ns558, GFP_KERNEL);
+ ns558 = kzalloc_obj(*ns558);
port = gameport_allocate_port();
if (!ns558 || !port) {
printk(KERN_ERR "ns558: Memory allocation failed.\n");
@@ -192,7 +192,7 @@ static int ns558_pnp_probe(struct pnp_dev *dev, const struct pnp_device_id *did)
if (!request_region(ioport, iolen, "ns558-pnp"))
return -EBUSY;
- ns558 = kzalloc_obj(*ns558, GFP_KERNEL);
+ ns558 = kzalloc_obj(*ns558);
port = gameport_allocate_port();
if (!ns558 || !port) {
printk(KERN_ERR "ns558: Memory allocation failed\n");
diff --git a/drivers/input/input-mt.c b/drivers/input/input-mt.c
index 0d4043797e4c..ad6b1d4242ed 100644
--- a/drivers/input/input-mt.c
+++ b/drivers/input/input-mt.c
@@ -84,7 +84,7 @@ int input_mt_init_slots(struct input_dev *dev, unsigned int num_slots,
__set_bit(INPUT_PROP_SEMI_MT, dev->propbit);
if (flags & INPUT_MT_TRACK) {
unsigned int n2 = num_slots * num_slots;
- mt->red = kzalloc_objs(*mt->red, n2, GFP_KERNEL);
+ mt->red = kzalloc_objs(*mt->red, n2);
if (!mt->red)
return -ENOMEM;
}
diff --git a/drivers/input/input-poller.c b/drivers/input/input-poller.c
index fa0c7089f3bb..54dc07fcae0b 100644
--- a/drivers/input/input-poller.c
+++ b/drivers/input/input-poller.c
@@ -71,7 +71,7 @@ int input_setup_polling(struct input_dev *dev,
{
struct input_dev_poller *poller;
- poller = kzalloc_obj(*poller, GFP_KERNEL);
+ poller = kzalloc_obj(*poller);
if (!poller) {
/*
* We want to show message even though kzalloc() may have
diff --git a/drivers/input/input.c b/drivers/input/input.c
index 9486a9ea1541..7b7490a1fbc6 100644
--- a/drivers/input/input.c
+++ b/drivers/input/input.c
@@ -439,7 +439,7 @@ void input_alloc_absinfo(struct input_dev *dev)
if (dev->absinfo)
return;
- dev->absinfo = kzalloc_objs(*dev->absinfo, ABS_CNT, GFP_KERNEL);
+ dev->absinfo = kzalloc_objs(*dev->absinfo, ABS_CNT);
if (!dev->absinfo) {
dev_err(dev->dev.parent ?: &dev->dev,
"%s: unable to allocate memory\n", __func__);
@@ -1887,7 +1887,7 @@ struct input_dev *input_allocate_device(void)
static atomic_t input_no = ATOMIC_INIT(-1);
struct input_dev *dev;
- dev = kzalloc_obj(*dev, GFP_KERNEL);
+ dev = kzalloc_obj(*dev);
if (!dev)
return NULL;
@@ -1897,7 +1897,7 @@ struct input_dev *input_allocate_device(void)
* when we register the device.
*/
dev->max_vals = 10;
- dev->vals = kzalloc_objs(*dev->vals, dev->max_vals, GFP_KERNEL);
+ dev->vals = kzalloc_objs(*dev->vals, dev->max_vals);
if (!dev->vals) {
kfree(dev);
return NULL;
diff --git a/drivers/input/joydev.c b/drivers/input/joydev.c
index 5c773f94646f..32459fd8a7c1 100644
--- a/drivers/input/joydev.c
+++ b/drivers/input/joydev.c
@@ -261,7 +261,7 @@ static int joydev_open(struct inode *inode, struct file *file)
struct joydev_client *client;
int error;
- client = kzalloc_obj(struct joydev_client, GFP_KERNEL);
+ client = kzalloc_obj(struct joydev_client);
if (!client)
return -ENOMEM;
@@ -921,7 +921,7 @@ static int joydev_connect(struct input_handler *handler, struct input_dev *dev,
return error;
}
- joydev = kzalloc_obj(struct joydev, GFP_KERNEL);
+ joydev = kzalloc_obj(struct joydev);
if (!joydev) {
error = -ENOMEM;
goto err_free_minor;
diff --git a/drivers/input/joystick/a3d.c b/drivers/input/joystick/a3d.c
index 07bd0083d654..48a1457961ef 100644
--- a/drivers/input/joystick/a3d.c
+++ b/drivers/input/joystick/a3d.c
@@ -249,7 +249,7 @@ static int a3d_connect(struct gameport *gameport, struct gameport_driver *drv)
int i;
int err;
- a3d = kzalloc_obj(*a3d, GFP_KERNEL);
+ a3d = kzalloc_obj(*a3d);
input_dev = input_allocate_device();
if (!a3d || !input_dev) {
err = -ENOMEM;
diff --git a/drivers/input/joystick/adi.c b/drivers/input/joystick/adi.c
index fa7d0b80e7b7..e07b71978509 100644
--- a/drivers/input/joystick/adi.c
+++ b/drivers/input/joystick/adi.c
@@ -456,7 +456,7 @@ static int adi_connect(struct gameport *gameport, struct gameport_driver *drv)
int i;
int err;
- port = kzalloc_obj(*port, GFP_KERNEL);
+ port = kzalloc_obj(*port);
if (!port)
return -ENOMEM;
diff --git a/drivers/input/joystick/analog.c b/drivers/input/joystick/analog.c
index 79ed2363b8e5..b6f7bce1c14f 100644
--- a/drivers/input/joystick/analog.c
+++ b/drivers/input/joystick/analog.c
@@ -582,7 +582,7 @@ static int analog_connect(struct gameport *gameport, struct gameport_driver *drv
int i;
int err;
- port = kzalloc_obj(*port, GFP_KERNEL);
+ port = kzalloc_obj(*port);
if (!port)
return -ENOMEM;
diff --git a/drivers/input/joystick/as5011.c b/drivers/input/joystick/as5011.c
index 2d1a23866e64..7b4d61626898 100644
--- a/drivers/input/joystick/as5011.c
+++ b/drivers/input/joystick/as5011.c
@@ -237,7 +237,7 @@ static int as5011_probe(struct i2c_client *client)
return -ENODEV;
}
- as5011 = kmalloc_obj(*as5011, GFP_KERNEL);
+ as5011 = kmalloc_obj(*as5011);
input_dev = input_allocate_device();
if (!as5011 || !input_dev) {
dev_err(&client->dev,
diff --git a/drivers/input/joystick/cobra.c b/drivers/input/joystick/cobra.c
index 781cec6b2b24..ffa6d49c81fe 100644
--- a/drivers/input/joystick/cobra.c
+++ b/drivers/input/joystick/cobra.c
@@ -141,7 +141,7 @@ static int cobra_connect(struct gameport *gameport, struct gameport_driver *drv)
int i, j;
int err;
- cobra = kzalloc_obj(*cobra, GFP_KERNEL);
+ cobra = kzalloc_obj(*cobra);
if (!cobra)
return -ENOMEM;
diff --git a/drivers/input/joystick/db9.c b/drivers/input/joystick/db9.c
index 165096fc0a55..e5d9b71aab99 100644
--- a/drivers/input/joystick/db9.c
+++ b/drivers/input/joystick/db9.c
@@ -585,7 +585,7 @@ static void db9_attach(struct parport *pp)
return;
}
- db9 = kzalloc_obj(*db9, GFP_KERNEL);
+ db9 = kzalloc_obj(*db9);
if (!db9)
goto err_unreg_pardev;
diff --git a/drivers/input/joystick/fsia6b.c b/drivers/input/joystick/fsia6b.c
index 0bd7d4bd562a..b0d73648477e 100644
--- a/drivers/input/joystick/fsia6b.c
+++ b/drivers/input/joystick/fsia6b.c
@@ -132,7 +132,7 @@ static int fsia6b_serio_connect(struct serio *serio, struct serio_driver *drv)
int i, j;
int sw_id = 0;
- fsia6b = kzalloc_obj(*fsia6b, GFP_KERNEL);
+ fsia6b = kzalloc_obj(*fsia6b);
if (!fsia6b)
return -ENOMEM;
diff --git a/drivers/input/joystick/gamecon.c b/drivers/input/joystick/gamecon.c
index 03d0e491b688..d84d453b51af 100644
--- a/drivers/input/joystick/gamecon.c
+++ b/drivers/input/joystick/gamecon.c
@@ -291,7 +291,7 @@ static int gc_n64_init_ff(struct input_dev *dev, int i)
struct gc_subdev *sdev;
int err;
- sdev = kmalloc_obj(*sdev, GFP_KERNEL);
+ sdev = kmalloc_obj(*sdev);
if (!sdev)
return -ENOMEM;
@@ -948,7 +948,7 @@ static void gc_attach(struct parport *pp)
return;
}
- gc = kzalloc_obj(*gc, GFP_KERNEL);
+ gc = kzalloc_obj(*gc);
if (!gc) {
pr_err("Not enough memory\n");
goto err_unreg_pardev;
diff --git a/drivers/input/joystick/gf2k.c b/drivers/input/joystick/gf2k.c
index 23dc98146ccd..5a1cdce0bc48 100644
--- a/drivers/input/joystick/gf2k.c
+++ b/drivers/input/joystick/gf2k.c
@@ -222,7 +222,7 @@ static int gf2k_connect(struct gameport *gameport, struct gameport_driver *drv)
unsigned char data[GF2K_LENGTH];
int i, err;
- gf2k = kzalloc_obj(*gf2k, GFP_KERNEL);
+ gf2k = kzalloc_obj(*gf2k);
input_dev = input_allocate_device();
if (!gf2k || !input_dev) {
err = -ENOMEM;
diff --git a/drivers/input/joystick/grip.c b/drivers/input/joystick/grip.c
index f500a32d1ea7..2a3f768a7218 100644
--- a/drivers/input/joystick/grip.c
+++ b/drivers/input/joystick/grip.c
@@ -284,7 +284,7 @@ static int grip_connect(struct gameport *gameport, struct gameport_driver *drv)
int i, j, t;
int err;
- grip = kzalloc_obj(*grip, GFP_KERNEL);
+ grip = kzalloc_obj(*grip);
if (!grip)
return -ENOMEM;
diff --git a/drivers/input/joystick/grip_mp.c b/drivers/input/joystick/grip_mp.c
index 7d90d8e5485b..62fdd0831c83 100644
--- a/drivers/input/joystick/grip_mp.c
+++ b/drivers/input/joystick/grip_mp.c
@@ -632,7 +632,7 @@ static int grip_connect(struct gameport *gameport, struct gameport_driver *drv)
struct grip_mp *grip;
int err;
- grip = kzalloc_obj(*grip, GFP_KERNEL);
+ grip = kzalloc_obj(*grip);
if (!grip)
return -ENOMEM;
diff --git a/drivers/input/joystick/guillemot.c b/drivers/input/joystick/guillemot.c
index eb7faaf3f020..13f0fa4d3938 100644
--- a/drivers/input/joystick/guillemot.c
+++ b/drivers/input/joystick/guillemot.c
@@ -163,7 +163,7 @@ static int guillemot_connect(struct gameport *gameport, struct gameport_driver *
int i, t;
int err;
- guillemot = kzalloc_obj(*guillemot, GFP_KERNEL);
+ guillemot = kzalloc_obj(*guillemot);
input_dev = input_allocate_device();
if (!guillemot || !input_dev) {
err = -ENOMEM;
diff --git a/drivers/input/joystick/iforce/iforce-serio.c b/drivers/input/joystick/iforce/iforce-serio.c
index 0ca2f9bfb17b..e235834888d2 100644
--- a/drivers/input/joystick/iforce/iforce-serio.c
+++ b/drivers/input/joystick/iforce/iforce-serio.c
@@ -185,7 +185,7 @@ static int iforce_serio_connect(struct serio *serio, struct serio_driver *drv)
struct iforce_serio *iforce_serio;
int err;
- iforce_serio = kzalloc_obj(*iforce_serio, GFP_KERNEL);
+ iforce_serio = kzalloc_obj(*iforce_serio);
if (!iforce_serio)
return -ENOMEM;
diff --git a/drivers/input/joystick/iforce/iforce-usb.c b/drivers/input/joystick/iforce/iforce-usb.c
index b41d0b962e3d..0482eaaecf39 100644
--- a/drivers/input/joystick/iforce/iforce-usb.c
+++ b/drivers/input/joystick/iforce/iforce-usb.c
@@ -207,7 +207,7 @@ static int iforce_usb_probe(struct usb_interface *intf,
if (!usb_endpoint_is_int_out(epout))
return -ENODEV;
- iforce_usb = kzalloc_obj(*iforce_usb, GFP_KERNEL);
+ iforce_usb = kzalloc_obj(*iforce_usb);
if (!iforce_usb)
goto fail;
diff --git a/drivers/input/joystick/interact.c b/drivers/input/joystick/interact.c
index 88aa77d1fc36..507cec36b220 100644
--- a/drivers/input/joystick/interact.c
+++ b/drivers/input/joystick/interact.c
@@ -192,7 +192,7 @@ static int interact_connect(struct gameport *gameport, struct gameport_driver *d
int i, t;
int err;
- interact = kzalloc_obj(*interact, GFP_KERNEL);
+ interact = kzalloc_obj(*interact);
input_dev = input_allocate_device();
if (!interact || !input_dev) {
err = -ENOMEM;
diff --git a/drivers/input/joystick/joydump.c b/drivers/input/joystick/joydump.c
index 9feda59dccde..c9cbdcc7f31f 100644
--- a/drivers/input/joystick/joydump.c
+++ b/drivers/input/joystick/joydump.c
@@ -61,7 +61,7 @@ static int joydump_connect(struct gameport *gameport, struct gameport_driver *dr
timeout = gameport_time(gameport, 10000); /* 10 ms */
- buf = kmalloc_objs(struct joydump, BUF_SIZE, GFP_KERNEL);
+ buf = kmalloc_objs(struct joydump, BUF_SIZE);
if (!buf) {
printk(KERN_INFO "joydump: no memory for testing\n");
goto jd_end;
diff --git a/drivers/input/joystick/magellan.c b/drivers/input/joystick/magellan.c
index 3b7f5840caeb..201a049c8c06 100644
--- a/drivers/input/joystick/magellan.c
+++ b/drivers/input/joystick/magellan.c
@@ -132,7 +132,7 @@ static int magellan_connect(struct serio *serio, struct serio_driver *drv)
int err = -ENOMEM;
int i;
- magellan = kzalloc_obj(*magellan, GFP_KERNEL);
+ magellan = kzalloc_obj(*magellan);
input_dev = input_allocate_device();
if (!magellan || !input_dev)
goto fail1;
diff --git a/drivers/input/joystick/maplecontrol.c b/drivers/input/joystick/maplecontrol.c
index 2a811f302173..7f36f73844a9 100644
--- a/drivers/input/joystick/maplecontrol.c
+++ b/drivers/input/joystick/maplecontrol.c
@@ -102,7 +102,7 @@ static int probe_maple_controller(struct device *dev)
struct input_dev *idev;
unsigned long data = be32_to_cpu(mdev->devinfo.function_data[0]);
- pad = kzalloc_obj(*pad, GFP_KERNEL);
+ pad = kzalloc_obj(*pad);
idev = input_allocate_device();
if (!pad || !idev) {
error = -ENOMEM;
diff --git a/drivers/input/joystick/n64joy.c b/drivers/input/joystick/n64joy.c
index b4203825e9e6..43a02bb99fc2 100644
--- a/drivers/input/joystick/n64joy.c
+++ b/drivers/input/joystick/n64joy.c
@@ -243,7 +243,7 @@ static int __init n64joy_probe(struct platform_device *pdev)
int err = 0;
u32 i, j, found = 0;
- priv = kzalloc_obj(*priv, GFP_KERNEL);
+ priv = kzalloc_obj(*priv);
if (!priv)
return -ENOMEM;
mutex_init(&priv->n64joy_mutex);
diff --git a/drivers/input/joystick/sidewinder.c b/drivers/input/joystick/sidewinder.c
index 645c822638ad..7f37d18c8477 100644
--- a/drivers/input/joystick/sidewinder.c
+++ b/drivers/input/joystick/sidewinder.c
@@ -578,7 +578,7 @@ static int sw_connect(struct gameport *gameport, struct gameport_driver *drv)
comment[0] = 0;
- sw = kzalloc_obj(*sw, GFP_KERNEL);
+ sw = kzalloc_obj(*sw);
buf = kmalloc(SW_LENGTH, GFP_KERNEL);
idbuf = kmalloc(SW_LENGTH, GFP_KERNEL);
if (!sw || !buf || !idbuf) {
diff --git a/drivers/input/joystick/spaceball.c b/drivers/input/joystick/spaceball.c
index d562275aa4bc..1af299a41d13 100644
--- a/drivers/input/joystick/spaceball.c
+++ b/drivers/input/joystick/spaceball.c
@@ -199,7 +199,7 @@ static int spaceball_connect(struct serio *serio, struct serio_driver *drv)
if ((id = serio->id.id) > SPACEBALL_MAX_ID)
return -ENODEV;
- spaceball = kmalloc_obj(*spaceball, GFP_KERNEL);
+ spaceball = kmalloc_obj(*spaceball);
input_dev = input_allocate_device();
if (!spaceball || !input_dev)
goto fail1;
diff --git a/drivers/input/joystick/spaceorb.c b/drivers/input/joystick/spaceorb.c
index 3aee84c19a25..ba5b318993ec 100644
--- a/drivers/input/joystick/spaceorb.c
+++ b/drivers/input/joystick/spaceorb.c
@@ -147,7 +147,7 @@ static int spaceorb_connect(struct serio *serio, struct serio_driver *drv)
int err = -ENOMEM;
int i;
- spaceorb = kzalloc_obj(*spaceorb, GFP_KERNEL);
+ spaceorb = kzalloc_obj(*spaceorb);
input_dev = input_allocate_device();
if (!spaceorb || !input_dev)
goto fail1;
diff --git a/drivers/input/joystick/stinger.c b/drivers/input/joystick/stinger.c
index 81d4d1aa1752..011f9b137dca 100644
--- a/drivers/input/joystick/stinger.c
+++ b/drivers/input/joystick/stinger.c
@@ -118,7 +118,7 @@ static int stinger_connect(struct serio *serio, struct serio_driver *drv)
struct input_dev *input_dev;
int err = -ENOMEM;
- stinger = kmalloc_obj(*stinger, GFP_KERNEL);
+ stinger = kmalloc_obj(*stinger);
input_dev = input_allocate_device();
if (!stinger || !input_dev)
goto fail1;
diff --git a/drivers/input/joystick/tmdc.c b/drivers/input/joystick/tmdc.c
index 8d1367fdc400..d419f41e62ac 100644
--- a/drivers/input/joystick/tmdc.c
+++ b/drivers/input/joystick/tmdc.c
@@ -264,7 +264,7 @@ static int tmdc_setup_port(struct tmdc *tmdc, int idx, unsigned char *data)
int i, j, b = 0;
int err;
- tmdc->port[idx] = port = kzalloc_obj(struct tmdc_port, GFP_KERNEL);
+ tmdc->port[idx] = port = kzalloc_obj(struct tmdc_port);
input_dev = input_allocate_device();
if (!port || !input_dev) {
err = -ENOMEM;
@@ -348,7 +348,7 @@ static int tmdc_connect(struct gameport *gameport, struct gameport_driver *drv)
int i;
int err;
- tmdc = kzalloc_obj(*tmdc, GFP_KERNEL);
+ tmdc = kzalloc_obj(*tmdc);
if (!tmdc)
return -ENOMEM;
diff --git a/drivers/input/joystick/turbografx.c b/drivers/input/joystick/turbografx.c
index 90cddb12efbb..4ee45f27290a 100644
--- a/drivers/input/joystick/turbografx.c
+++ b/drivers/input/joystick/turbografx.c
@@ -170,7 +170,7 @@ static void tgfx_attach(struct parport *pp)
return;
}
- tgfx = kzalloc_obj(*tgfx, GFP_KERNEL);
+ tgfx = kzalloc_obj(*tgfx);
if (!tgfx) {
printk(KERN_ERR "turbografx.c: Not enough memory\n");
goto err_unreg_pardev;
diff --git a/drivers/input/joystick/twidjoy.c b/drivers/input/joystick/twidjoy.c
index e8f81d3a4d99..fb452552ceb2 100644
--- a/drivers/input/joystick/twidjoy.c
+++ b/drivers/input/joystick/twidjoy.c
@@ -171,7 +171,7 @@ static int twidjoy_connect(struct serio *serio, struct serio_driver *drv)
int err = -ENOMEM;
int i;
- twidjoy = kzalloc_obj(*twidjoy, GFP_KERNEL);
+ twidjoy = kzalloc_obj(*twidjoy);
input_dev = input_allocate_device();
if (!twidjoy || !input_dev)
goto fail1;
diff --git a/drivers/input/joystick/warrior.c b/drivers/input/joystick/warrior.c
index 45027058a777..2e1c6df98e24 100644
--- a/drivers/input/joystick/warrior.c
+++ b/drivers/input/joystick/warrior.c
@@ -124,7 +124,7 @@ static int warrior_connect(struct serio *serio, struct serio_driver *drv)
struct input_dev *input_dev;
int err = -ENOMEM;
- warrior = kzalloc_obj(*warrior, GFP_KERNEL);
+ warrior = kzalloc_obj(*warrior);
input_dev = input_allocate_device();
if (!warrior || !input_dev)
goto fail1;
diff --git a/drivers/input/joystick/xpad.c b/drivers/input/joystick/xpad.c
index 58ff39dee70c..bf4accf3f581 100644
--- a/drivers/input/joystick/xpad.c
+++ b/drivers/input/joystick/xpad.c
@@ -1744,7 +1744,7 @@ static int xpad_led_probe(struct usb_xpad *xpad)
if (xpad->xtype != XTYPE_XBOX360 && xpad->xtype != XTYPE_XBOX360W)
return 0;
- xpad->led = led = kzalloc_obj(*led, GFP_KERNEL);
+ xpad->led = led = kzalloc_obj(*led);
if (!led)
return -ENOMEM;
@@ -2077,7 +2077,7 @@ static int xpad_probe(struct usb_interface *intf, const struct usb_device_id *id
break;
}
- xpad = kzalloc_obj(*xpad, GFP_KERNEL);
+ xpad = kzalloc_obj(*xpad);
if (!xpad)
return -ENOMEM;
diff --git a/drivers/input/joystick/zhenhua.c b/drivers/input/joystick/zhenhua.c
index 873e71fe6580..8ca1896639de 100644
--- a/drivers/input/joystick/zhenhua.c
+++ b/drivers/input/joystick/zhenhua.c
@@ -131,7 +131,7 @@ static int zhenhua_connect(struct serio *serio, struct serio_driver *drv)
struct input_dev *input_dev;
int err = -ENOMEM;
- zhenhua = kzalloc_obj(*zhenhua, GFP_KERNEL);
+ zhenhua = kzalloc_obj(*zhenhua);
input_dev = input_allocate_device();
if (!zhenhua || !input_dev)
goto fail1;
diff --git a/drivers/input/keyboard/atkbd.c b/drivers/input/keyboard/atkbd.c
index f149ed800a45..840cdf5878dc 100644
--- a/drivers/input/keyboard/atkbd.c
+++ b/drivers/input/keyboard/atkbd.c
@@ -1277,7 +1277,7 @@ static int atkbd_connect(struct serio *serio, struct serio_driver *drv)
struct input_dev *dev;
int err = -ENOMEM;
- atkbd = kzalloc_obj(*atkbd, GFP_KERNEL);
+ atkbd = kzalloc_obj(*atkbd);
dev = input_allocate_device();
if (!atkbd || !dev)
goto fail1;
diff --git a/drivers/input/keyboard/hil_kbd.c b/drivers/input/keyboard/hil_kbd.c
index 8f246865a5ee..5ebde20df755 100644
--- a/drivers/input/keyboard/hil_kbd.c
+++ b/drivers/input/keyboard/hil_kbd.c
@@ -447,7 +447,7 @@ static int hil_dev_connect(struct serio *serio, struct serio_driver *drv)
uint8_t did, *idd;
int error;
- dev = kzalloc_obj(*dev, GFP_KERNEL);
+ dev = kzalloc_obj(*dev);
input_dev = input_allocate_device();
if (!dev || !input_dev) {
error = -ENOMEM;
diff --git a/drivers/input/keyboard/lkkbd.c b/drivers/input/keyboard/lkkbd.c
index f0daee8887cb..f5c2267a2c00 100644
--- a/drivers/input/keyboard/lkkbd.c
+++ b/drivers/input/keyboard/lkkbd.c
@@ -608,7 +608,7 @@ static int lkkbd_connect(struct serio *serio, struct serio_driver *drv)
int i;
int err;
- lk = kzalloc_obj(*lk, GFP_KERNEL);
+ lk = kzalloc_obj(*lk);
input_dev = input_allocate_device();
if (!lk || !input_dev) {
err = -ENOMEM;
diff --git a/drivers/input/keyboard/locomokbd.c b/drivers/input/keyboard/locomokbd.c
index b6b9354b3354..6351562ebf8d 100644
--- a/drivers/input/keyboard/locomokbd.c
+++ b/drivers/input/keyboard/locomokbd.c
@@ -224,7 +224,7 @@ static int locomokbd_probe(struct locomo_dev *dev)
struct input_dev *input_dev;
int i, err;
- locomokbd = kzalloc_obj(*locomokbd, GFP_KERNEL);
+ locomokbd = kzalloc_obj(*locomokbd);
input_dev = input_allocate_device();
if (!locomokbd || !input_dev) {
err = -ENOMEM;
diff --git a/drivers/input/keyboard/maple_keyb.c b/drivers/input/keyboard/maple_keyb.c
index 52dfdcab55f2..80a5181313e1 100644
--- a/drivers/input/keyboard/maple_keyb.c
+++ b/drivers/input/keyboard/maple_keyb.c
@@ -151,7 +151,7 @@ static int probe_maple_kbd(struct device *dev)
mdev = to_maple_dev(dev);
mdrv = to_maple_driver(dev->driver);
- kbd = kzalloc_obj(*kbd, GFP_KERNEL);
+ kbd = kzalloc_obj(*kbd);
if (!kbd) {
error = -ENOMEM;
goto fail;
diff --git a/drivers/input/keyboard/newtonkbd.c b/drivers/input/keyboard/newtonkbd.c
index ee142a2d7c84..e60d1181dad0 100644
--- a/drivers/input/keyboard/newtonkbd.c
+++ b/drivers/input/keyboard/newtonkbd.c
@@ -68,7 +68,7 @@ static int nkbd_connect(struct serio *serio, struct serio_driver *drv)
int err = -ENOMEM;
int i;
- nkbd = kzalloc_obj(*nkbd, GFP_KERNEL);
+ nkbd = kzalloc_obj(*nkbd);
input_dev = input_allocate_device();
if (!nkbd || !input_dev)
goto fail1;
diff --git a/drivers/input/keyboard/sh_keysc.c b/drivers/input/keyboard/sh_keysc.c
index 7ad799efc539..6937f3576c05 100644
--- a/drivers/input/keyboard/sh_keysc.c
+++ b/drivers/input/keyboard/sh_keysc.c
@@ -184,7 +184,7 @@ static int sh_keysc_probe(struct platform_device *pdev)
if (irq < 0)
goto err0;
- priv = kzalloc_obj(*priv, GFP_KERNEL);
+ priv = kzalloc_obj(*priv);
if (priv == NULL) {
dev_err(&pdev->dev, "failed to allocate driver data\n");
error = -ENOMEM;
diff --git a/drivers/input/keyboard/stowaway.c b/drivers/input/keyboard/stowaway.c
index 592801876291..eade05542ed6 100644
--- a/drivers/input/keyboard/stowaway.c
+++ b/drivers/input/keyboard/stowaway.c
@@ -72,7 +72,7 @@ static int skbd_connect(struct serio *serio, struct serio_driver *drv)
int err = -ENOMEM;
int i;
- skbd = kzalloc_obj(*skbd, GFP_KERNEL);
+ skbd = kzalloc_obj(*skbd);
input_dev = input_allocate_device();
if (!skbd || !input_dev)
goto fail1;
diff --git a/drivers/input/keyboard/sunkbd.c b/drivers/input/keyboard/sunkbd.c
index d2783e9a5583..5a0020827047 100644
--- a/drivers/input/keyboard/sunkbd.c
+++ b/drivers/input/keyboard/sunkbd.c
@@ -262,7 +262,7 @@ static int sunkbd_connect(struct serio *serio, struct serio_driver *drv)
int err = -ENOMEM;
int i;
- sunkbd = kzalloc_obj(*sunkbd, GFP_KERNEL);
+ sunkbd = kzalloc_obj(*sunkbd);
input_dev = input_allocate_device();
if (!sunkbd || !input_dev)
goto fail1;
diff --git a/drivers/input/keyboard/xtkbd.c b/drivers/input/keyboard/xtkbd.c
index ce061bd76623..c0b4978a8cd5 100644
--- a/drivers/input/keyboard/xtkbd.c
+++ b/drivers/input/keyboard/xtkbd.c
@@ -70,7 +70,7 @@ static int xtkbd_connect(struct serio *serio, struct serio_driver *drv)
int err = -ENOMEM;
int i;
- xtkbd = kmalloc_obj(*xtkbd, GFP_KERNEL);
+ xtkbd = kmalloc_obj(*xtkbd);
input_dev = input_allocate_device();
if (!xtkbd || !input_dev)
goto fail1;
diff --git a/drivers/input/misc/88pm80x_onkey.c b/drivers/input/misc/88pm80x_onkey.c
index 32d2f4450b7c..fee28e537898 100644
--- a/drivers/input/misc/88pm80x_onkey.c
+++ b/drivers/input/misc/88pm80x_onkey.c
@@ -57,7 +57,7 @@ static int pm80x_onkey_probe(struct platform_device *pdev)
struct pm80x_onkey_info *info;
int err;
- info = kzalloc_obj(*info, GFP_KERNEL);
+ info = kzalloc_obj(*info);
if (!info)
return -ENOMEM;
diff --git a/drivers/input/misc/ati_remote2.c b/drivers/input/misc/ati_remote2.c
index faa03c0b8c92..8db2dca84975 100644
--- a/drivers/input/misc/ati_remote2.c
+++ b/drivers/input/misc/ati_remote2.c
@@ -772,7 +772,7 @@ static int ati_remote2_probe(struct usb_interface *interface, const struct usb_d
if (alt->desc.bInterfaceNumber)
return -ENODEV;
- ar2 = kzalloc_obj(struct ati_remote2, GFP_KERNEL);
+ ar2 = kzalloc_obj(struct ati_remote2);
if (!ar2)
return -ENOMEM;
diff --git a/drivers/input/misc/cm109.c b/drivers/input/misc/cm109.c
index 3fbdd160fb2c..353d3c1d347d 100644
--- a/drivers/input/misc/cm109.c
+++ b/drivers/input/misc/cm109.c
@@ -696,7 +696,7 @@ static int cm109_usb_probe(struct usb_interface *intf,
if (!usb_endpoint_is_int_in(endpoint))
return -ENODEV;
- dev = kzalloc_obj(*dev, GFP_KERNEL);
+ dev = kzalloc_obj(*dev);
if (!dev)
return -ENOMEM;
@@ -721,7 +721,7 @@ static int cm109_usb_probe(struct usb_interface *intf,
if (!dev->ctl_data)
goto err_out;
- dev->ctl_req = kmalloc_obj(*(dev->ctl_req), GFP_KERNEL);
+ dev->ctl_req = kmalloc_obj(*(dev->ctl_req));
if (!dev->ctl_req)
goto err_out;
diff --git a/drivers/input/misc/cma3000_d0x.c b/drivers/input/misc/cma3000_d0x.c
index b5047f74f632..a641453188d9 100644
--- a/drivers/input/misc/cma3000_d0x.c
+++ b/drivers/input/misc/cma3000_d0x.c
@@ -285,7 +285,7 @@ struct cma3000_accl_data *cma3000_init(struct device *dev, int irq,
goto err_out;
}
- data = kzalloc_obj(*data, GFP_KERNEL);
+ data = kzalloc_obj(*data);
input_dev = input_allocate_device();
if (!data || !input_dev) {
error = -ENOMEM;
diff --git a/drivers/input/misc/cs40l50-vibra.c b/drivers/input/misc/cs40l50-vibra.c
index e6c8c9d165d3..996d6c38cca4 100644
--- a/drivers/input/misc/cs40l50-vibra.c
+++ b/drivers/input/misc/cs40l50-vibra.c
@@ -276,7 +276,7 @@ static void cs40l50_add_worker(struct work_struct *work)
/* Update effect if already uploaded, otherwise create new effect */
effect = cs40l50_find_effect(work_data->effect->id, &vib->effect_head);
if (!effect) {
- effect = kzalloc_obj(*effect, GFP_KERNEL);
+ effect = kzalloc_obj(*effect);
if (!effect) {
error = -ENOMEM;
goto err_pm;
diff --git a/drivers/input/misc/da9052_onkey.c b/drivers/input/misc/da9052_onkey.c
index 49112b3ff445..180b3bc76525 100644
--- a/drivers/input/misc/da9052_onkey.c
+++ b/drivers/input/misc/da9052_onkey.c
@@ -80,7 +80,7 @@ static int da9052_onkey_probe(struct platform_device *pdev)
return -EINVAL;
}
- onkey = kzalloc_obj(*onkey, GFP_KERNEL);
+ onkey = kzalloc_obj(*onkey);
input_dev = input_allocate_device();
if (!onkey || !input_dev) {
dev_err(&pdev->dev, "Failed to allocate memory\n");
diff --git a/drivers/input/misc/ims-pcu.c b/drivers/input/misc/ims-pcu.c
index 52ad6e3a8112..f69de9762c4e 100644
--- a/drivers/input/misc/ims-pcu.c
+++ b/drivers/input/misc/ims-pcu.c
@@ -286,7 +286,7 @@ static int ims_pcu_setup_gamepad(struct ims_pcu *pcu)
struct input_dev *input;
int error;
- gamepad = kzalloc_obj(*gamepad, GFP_KERNEL);
+ gamepad = kzalloc_obj(*gamepad);
input = input_allocate_device();
if (!gamepad || !input) {
dev_err(pcu->dev,
@@ -1991,7 +1991,7 @@ static int ims_pcu_probe(struct usb_interface *intf,
struct ims_pcu *pcu;
int error;
- pcu = kzalloc_obj(*pcu, GFP_KERNEL);
+ pcu = kzalloc_obj(*pcu);
if (!pcu)
return -ENOMEM;
diff --git a/drivers/input/misc/keyspan_remote.c b/drivers/input/misc/keyspan_remote.c
index 219a7a92e5b6..152633bd2266 100644
--- a/drivers/input/misc/keyspan_remote.c
+++ b/drivers/input/misc/keyspan_remote.c
@@ -453,7 +453,7 @@ static int keyspan_probe(struct usb_interface *interface, const struct usb_devic
if (!endpoint)
return -ENODEV;
- remote = kzalloc_obj(*remote, GFP_KERNEL);
+ remote = kzalloc_obj(*remote);
input_dev = input_allocate_device();
if (!remote || !input_dev) {
error = -ENOMEM;
diff --git a/drivers/input/misc/max8997_haptic.c b/drivers/input/misc/max8997_haptic.c
index 290c03d8b972..975c3ba023f5 100644
--- a/drivers/input/misc/max8997_haptic.c
+++ b/drivers/input/misc/max8997_haptic.c
@@ -247,7 +247,7 @@ static int max8997_haptic_probe(struct platform_device *pdev)
return -EINVAL;
}
- chip = kzalloc_obj(*chip, GFP_KERNEL);
+ chip = kzalloc_obj(*chip);
input_dev = input_allocate_device();
if (!chip || !input_dev) {
dev_err(&pdev->dev, "unable to allocate memory\n");
diff --git a/drivers/input/misc/mc13783-pwrbutton.c b/drivers/input/misc/mc13783-pwrbutton.c
index d75af824033a..cb781ce967ca 100644
--- a/drivers/input/misc/mc13783-pwrbutton.c
+++ b/drivers/input/misc/mc13783-pwrbutton.c
@@ -108,7 +108,7 @@ static int mc13783_pwrbutton_probe(struct platform_device *pdev)
return -ENOMEM;
}
- priv = kzalloc_obj(*priv, GFP_KERNEL);
+ priv = kzalloc_obj(*priv);
if (!priv) {
err = -ENOMEM;
dev_dbg(&pdev->dev, "Can't allocate power button\n");
diff --git a/drivers/input/misc/palmas-pwrbutton.c b/drivers/input/misc/palmas-pwrbutton.c
index c1608cdee7f2..f22083f44d91 100644
--- a/drivers/input/misc/palmas-pwrbutton.c
+++ b/drivers/input/misc/palmas-pwrbutton.c
@@ -164,7 +164,7 @@ static int palmas_pwron_probe(struct platform_device *pdev)
palmas_pwron_params_ofinit(dev, &config);
- pwron = kzalloc_obj(*pwron, GFP_KERNEL);
+ pwron = kzalloc_obj(*pwron);
if (!pwron)
return -ENOMEM;
diff --git a/drivers/input/misc/pcap_keys.c b/drivers/input/misc/pcap_keys.c
index 003bc50f83a6..b19899b50d0b 100644
--- a/drivers/input/misc/pcap_keys.c
+++ b/drivers/input/misc/pcap_keys.c
@@ -49,7 +49,7 @@ static int pcap_keys_probe(struct platform_device *pdev)
struct pcap_keys *pcap_keys;
struct input_dev *input_dev;
- pcap_keys = kmalloc_obj(*pcap_keys, GFP_KERNEL);
+ pcap_keys = kmalloc_obj(*pcap_keys);
if (!pcap_keys)
return err;
diff --git a/drivers/input/misc/pcf8574_keypad.c b/drivers/input/misc/pcf8574_keypad.c
index bcef6a251237..14fc6c6cf699 100644
--- a/drivers/input/misc/pcf8574_keypad.c
+++ b/drivers/input/misc/pcf8574_keypad.c
@@ -91,7 +91,7 @@ static int pcf8574_kp_probe(struct i2c_client *client)
return -ENODEV;
}
- lp = kzalloc_obj(*lp, GFP_KERNEL);
+ lp = kzalloc_obj(*lp);
if (!lp)
return -ENOMEM;
diff --git a/drivers/input/misc/powermate.c b/drivers/input/misc/powermate.c
index dfcab914d5f3..754379d2625c 100644
--- a/drivers/input/misc/powermate.c
+++ b/drivers/input/misc/powermate.c
@@ -275,7 +275,7 @@ static int powermate_alloc_buffers(struct usb_device *udev, struct powermate_dev
if (!pm->data)
return -1;
- pm->configcr = kmalloc_obj(*(pm->configcr), GFP_KERNEL);
+ pm->configcr = kmalloc_obj(*(pm->configcr));
if (!pm->configcr)
return -ENOMEM;
@@ -313,7 +313,7 @@ static int powermate_probe(struct usb_interface *intf, const struct usb_device_i
0, interface->desc.bInterfaceNumber, NULL, 0,
USB_CTRL_SET_TIMEOUT);
- pm = kzalloc_obj(*pm, GFP_KERNEL);
+ pm = kzalloc_obj(*pm);
input_dev = input_allocate_device();
if (!pm || !input_dev)
goto fail1;
diff --git a/drivers/input/misc/uinput.c b/drivers/input/misc/uinput.c
index f34bda9b1a74..e589060db280 100644
--- a/drivers/input/misc/uinput.c
+++ b/drivers/input/misc/uinput.c
@@ -379,7 +379,7 @@ static int uinput_open(struct inode *inode, struct file *file)
{
struct uinput_device *newdev;
- newdev = kzalloc_obj(*newdev, GFP_KERNEL);
+ newdev = kzalloc_obj(*newdev);
if (!newdev)
return -ENOMEM;
diff --git a/drivers/input/misc/xen-kbdfront.c b/drivers/input/misc/xen-kbdfront.c
index b046df24a433..6471d836f6fe 100644
--- a/drivers/input/misc/xen-kbdfront.c
+++ b/drivers/input/misc/xen-kbdfront.c
@@ -205,7 +205,7 @@ static int xenkbd_probe(struct xenbus_device *dev,
struct xenkbd_info *info;
struct input_dev *kbd, *ptr, *mtouch;
- info = kzalloc_obj(*info, GFP_KERNEL);
+ info = kzalloc_obj(*info);
if (!info) {
xenbus_dev_fatal(dev, -ENOMEM, "allocating info structure");
return -ENOMEM;
diff --git a/drivers/input/misc/yealink.c b/drivers/input/misc/yealink.c
index 10a85f60f6d1..8786ed8b3565 100644
--- a/drivers/input/misc/yealink.c
+++ b/drivers/input/misc/yealink.c
@@ -831,7 +831,7 @@ static int usb_probe(struct usb_interface *intf, const struct usb_device_id *id)
if (!usb_endpoint_is_int_in(endpoint))
return -ENODEV;
- yld = kzalloc_obj(*yld, GFP_KERNEL);
+ yld = kzalloc_obj(*yld);
if (!yld)
return -ENOMEM;
@@ -854,7 +854,7 @@ static int usb_probe(struct usb_interface *intf, const struct usb_device_id *id)
if (!yld->ctl_data)
return usb_cleanup(yld, -ENOMEM);
- yld->ctl_req = kmalloc_obj(*(yld->ctl_req), GFP_KERNEL);
+ yld->ctl_req = kmalloc_obj(*(yld->ctl_req));
if (yld->ctl_req == NULL)
return usb_cleanup(yld, -ENOMEM);
diff --git a/drivers/input/mouse/alps.c b/drivers/input/mouse/alps.c
index 700dad83f6d0..f3d3b6b4e02d 100644
--- a/drivers/input/mouse/alps.c
+++ b/drivers/input/mouse/alps.c
@@ -3206,7 +3206,7 @@ int alps_detect(struct psmouse *psmouse, bool set_properties)
*/
psmouse_reset(psmouse);
- priv = kzalloc_obj(*priv, GFP_KERNEL);
+ priv = kzalloc_obj(*priv);
if (!priv)
return -ENOMEM;
diff --git a/drivers/input/mouse/appletouch.c b/drivers/input/mouse/appletouch.c
index f9b8a4aa24e3..87d8f5afdfd9 100644
--- a/drivers/input/mouse/appletouch.c
+++ b/drivers/input/mouse/appletouch.c
@@ -852,7 +852,7 @@ static int atp_probe(struct usb_interface *iface,
}
/* allocate memory for our device state and initialize it */
- dev = kzalloc_obj(*dev, GFP_KERNEL);
+ dev = kzalloc_obj(*dev);
input_dev = input_allocate_device();
if (!dev || !input_dev) {
dev_err(&iface->dev, "Out of memory\n");
diff --git a/drivers/input/mouse/bcm5974.c b/drivers/input/mouse/bcm5974.c
index a193dc4f8b09..8e3cea9db365 100644
--- a/drivers/input/mouse/bcm5974.c
+++ b/drivers/input/mouse/bcm5974.c
@@ -895,7 +895,7 @@ static int bcm5974_probe(struct usb_interface *iface,
cfg = bcm5974_get_config(udev);
/* allocate memory for our device state and initialize it */
- dev = kzalloc_obj(*dev, GFP_KERNEL);
+ dev = kzalloc_obj(*dev);
input_dev = input_allocate_device();
if (!dev || !input_dev) {
dev_err(&iface->dev, "out of memory\n");
diff --git a/drivers/input/mouse/byd.c b/drivers/input/mouse/byd.c
index ec9306e15a07..f5770a3af2f1 100644
--- a/drivers/input/mouse/byd.c
+++ b/drivers/input/mouse/byd.c
@@ -469,7 +469,7 @@ int byd_init(struct psmouse *psmouse)
if (byd_reset_touchpad(psmouse))
return -EIO;
- priv = kzalloc_obj(*priv, GFP_KERNEL);
+ priv = kzalloc_obj(*priv);
if (!priv)
return -ENOMEM;
diff --git a/drivers/input/mouse/cypress_ps2.c b/drivers/input/mouse/cypress_ps2.c
index e96b838afcf7..309063d07b4d 100644
--- a/drivers/input/mouse/cypress_ps2.c
+++ b/drivers/input/mouse/cypress_ps2.c
@@ -624,7 +624,7 @@ int cypress_init(struct psmouse *psmouse)
struct cytp_data *cytp;
int error;
- cytp = kzalloc_obj(*cytp, GFP_KERNEL);
+ cytp = kzalloc_obj(*cytp);
if (!cytp)
return -ENOMEM;
diff --git a/drivers/input/mouse/elantech.c b/drivers/input/mouse/elantech.c
index c7f510fcb04f..f8575b80d19d 100644
--- a/drivers/input/mouse/elantech.c
+++ b/drivers/input/mouse/elantech.c
@@ -2074,7 +2074,7 @@ static int elantech_setup_ps2(struct psmouse *psmouse,
int error = -EINVAL;
struct input_dev *tp_dev;
- psmouse->private = etd = kzalloc_obj(*etd, GFP_KERNEL);
+ psmouse->private = etd = kzalloc_obj(*etd);
if (!etd)
return -ENOMEM;
diff --git a/drivers/input/mouse/focaltech.c b/drivers/input/mouse/focaltech.c
index 1e8e3f166b47..43f9939b7c63 100644
--- a/drivers/input/mouse/focaltech.c
+++ b/drivers/input/mouse/focaltech.c
@@ -408,7 +408,7 @@ int focaltech_init(struct psmouse *psmouse)
struct focaltech_data *priv;
int error;
- psmouse->private = priv = kzalloc_obj(*priv, GFP_KERNEL);
+ psmouse->private = priv = kzalloc_obj(*priv);
if (!priv)
return -ENOMEM;
diff --git a/drivers/input/mouse/hgpk.c b/drivers/input/mouse/hgpk.c
index 23840c8fba32..3c4d16ed88a9 100644
--- a/drivers/input/mouse/hgpk.c
+++ b/drivers/input/mouse/hgpk.c
@@ -981,7 +981,7 @@ int hgpk_init(struct psmouse *psmouse)
struct hgpk_data *priv;
int err;
- priv = kzalloc_obj(*priv, GFP_KERNEL);
+ priv = kzalloc_obj(*priv);
if (!priv) {
err = -ENOMEM;
goto alloc_fail;
diff --git a/drivers/input/mouse/lifebook.c b/drivers/input/mouse/lifebook.c
index 6af7153e9dc7..ef11b7b19833 100644
--- a/drivers/input/mouse/lifebook.c
+++ b/drivers/input/mouse/lifebook.c
@@ -273,7 +273,7 @@ static int lifebook_create_relative_device(struct psmouse *psmouse)
struct lifebook_data *priv;
int error = -ENOMEM;
- priv = kzalloc_obj(*priv, GFP_KERNEL);
+ priv = kzalloc_obj(*priv);
dev2 = input_allocate_device();
if (!priv || !dev2)
goto err_out;
diff --git a/drivers/input/mouse/maplemouse.c b/drivers/input/mouse/maplemouse.c
index ca4901eb7717..c99f7e234219 100644
--- a/drivers/input/mouse/maplemouse.c
+++ b/drivers/input/mouse/maplemouse.c
@@ -73,7 +73,7 @@ static int probe_maple_mouse(struct device *dev)
struct input_dev *input_dev;
struct dc_mouse *mse;
- mse = kzalloc_obj(*mse, GFP_KERNEL);
+ mse = kzalloc_obj(*mse);
if (!mse) {
error = -ENOMEM;
goto fail;
diff --git a/drivers/input/mouse/psmouse-base.c b/drivers/input/mouse/psmouse-base.c
index 46907609d3d4..ff8cd2d68a3c 100644
--- a/drivers/input/mouse/psmouse-base.c
+++ b/drivers/input/mouse/psmouse-base.c
@@ -1591,7 +1591,7 @@ static int psmouse_connect(struct serio *serio, struct serio_driver *drv)
psmouse_deactivate(parent);
}
- psmouse = kzalloc_obj(*psmouse, GFP_KERNEL);
+ psmouse = kzalloc_obj(*psmouse);
input_dev = input_allocate_device();
if (!psmouse || !input_dev)
goto err_free;
diff --git a/drivers/input/mouse/psmouse-smbus.c b/drivers/input/mouse/psmouse-smbus.c
index 96df86872017..7fb4cbb2aca2 100644
--- a/drivers/input/mouse/psmouse-smbus.c
+++ b/drivers/input/mouse/psmouse-smbus.c
@@ -154,7 +154,7 @@ static void psmouse_smbus_schedule_remove(struct i2c_client *client)
{
struct psmouse_smbus_removal_work *rwork;
- rwork = kzalloc_obj(*rwork, GFP_KERNEL);
+ rwork = kzalloc_obj(*rwork);
if (rwork) {
INIT_WORK(&rwork->work, psmouse_smbus_remove_i2c_device);
rwork->client = client;
diff --git a/drivers/input/mouse/sentelic.c b/drivers/input/mouse/sentelic.c
index 4d1fc22f9732..cda6febe3faf 100644
--- a/drivers/input/mouse/sentelic.c
+++ b/drivers/input/mouse/sentelic.c
@@ -1028,7 +1028,7 @@ int fsp_init(struct psmouse *psmouse)
"Finger Sensing Pad, hw: %d.%d.%d, sn: %x, sw: %s\n",
ver >> 4, ver & 0x0F, rev, sn, fsp_drv_ver);
- psmouse->private = priv = kzalloc_obj(*priv, GFP_KERNEL);
+ psmouse->private = priv = kzalloc_obj(*priv);
if (!priv)
return -ENOMEM;
diff --git a/drivers/input/mouse/sermouse.c b/drivers/input/mouse/sermouse.c
index c38779fcff72..c334a488700f 100644
--- a/drivers/input/mouse/sermouse.c
+++ b/drivers/input/mouse/sermouse.c
@@ -231,7 +231,7 @@ static int sermouse_connect(struct serio *serio, struct serio_driver *drv)
unsigned char c = serio->id.extra;
int err = -ENOMEM;
- sermouse = kzalloc_obj(*sermouse, GFP_KERNEL);
+ sermouse = kzalloc_obj(*sermouse);
input_dev = input_allocate_device();
if (!sermouse || !input_dev)
goto fail1;
diff --git a/drivers/input/mouse/synaptics.c b/drivers/input/mouse/synaptics.c
index b9dfcdbefaed..26071128f43a 100644
--- a/drivers/input/mouse/synaptics.c
+++ b/drivers/input/mouse/synaptics.c
@@ -741,7 +741,7 @@ static void synaptics_pt_create(struct psmouse *psmouse)
{
struct serio *serio;
- serio = kzalloc_obj(*serio, GFP_KERNEL);
+ serio = kzalloc_obj(*serio);
if (!serio) {
psmouse_err(psmouse,
"not enough memory for pass-through port\n");
@@ -1597,7 +1597,7 @@ static int synaptics_init_ps2(struct psmouse *psmouse,
synaptics_apply_quirks(psmouse, info);
- psmouse->private = priv = kzalloc_obj(*priv, GFP_KERNEL);
+ psmouse->private = priv = kzalloc_obj(*priv);
if (!priv)
return -ENOMEM;
diff --git a/drivers/input/mouse/synaptics_usb.c b/drivers/input/mouse/synaptics_usb.c
index 296de386fafe..5a86f6f387d8 100644
--- a/drivers/input/mouse/synaptics_usb.c
+++ b/drivers/input/mouse/synaptics_usb.c
@@ -311,7 +311,7 @@ static int synusb_probe(struct usb_interface *intf,
if (!ep)
return -ENODEV;
- synusb = kzalloc_obj(*synusb, GFP_KERNEL);
+ synusb = kzalloc_obj(*synusb);
input_dev = input_allocate_device();
if (!synusb || !input_dev) {
error = -ENOMEM;
diff --git a/drivers/input/mouse/trackpoint.c b/drivers/input/mouse/trackpoint.c
index c2b2cd057ca3..b06c7ad721fe 100644
--- a/drivers/input/mouse/trackpoint.c
+++ b/drivers/input/mouse/trackpoint.c
@@ -409,7 +409,7 @@ int trackpoint_detect(struct psmouse *psmouse, bool set_properties)
if (!set_properties)
return 0;
- tp = kzalloc_obj(*tp, GFP_KERNEL);
+ tp = kzalloc_obj(*tp);
if (!tp)
return -ENOMEM;
diff --git a/drivers/input/mouse/vmmouse.c b/drivers/input/mouse/vmmouse.c
index eda8f9192423..aaecdd3d50b6 100644
--- a/drivers/input/mouse/vmmouse.c
+++ b/drivers/input/mouse/vmmouse.c
@@ -409,7 +409,7 @@ int vmmouse_init(struct psmouse *psmouse)
if (error)
return error;
- priv = kzalloc_obj(*priv, GFP_KERNEL);
+ priv = kzalloc_obj(*priv);
abs_dev = input_allocate_device();
if (!priv || !abs_dev) {
error = -ENOMEM;
diff --git a/drivers/input/mouse/vsxxxaa.c b/drivers/input/mouse/vsxxxaa.c
index 4556c5232a82..042a17fe81db 100644
--- a/drivers/input/mouse/vsxxxaa.c
+++ b/drivers/input/mouse/vsxxxaa.c
@@ -456,7 +456,7 @@ static int vsxxxaa_connect(struct serio *serio, struct serio_driver *drv)
struct input_dev *input_dev;
int err = -ENOMEM;
- mouse = kzalloc_obj(*mouse, GFP_KERNEL);
+ mouse = kzalloc_obj(*mouse);
input_dev = input_allocate_device();
if (!mouse || !input_dev)
goto fail1;
diff --git a/drivers/input/mousedev.c b/drivers/input/mousedev.c
index 0b842077a7b4..d5c9b0a09fcf 100644
--- a/drivers/input/mousedev.c
+++ b/drivers/input/mousedev.c
@@ -543,7 +543,7 @@ static int mousedev_open(struct inode *inode, struct file *file)
#endif
mousedev = container_of(inode->i_cdev, struct mousedev, cdev);
- client = kzalloc_obj(struct mousedev_client, GFP_KERNEL);
+ client = kzalloc_obj(struct mousedev_client);
if (!client)
return -ENOMEM;
@@ -853,7 +853,7 @@ static struct mousedev *mousedev_create(struct input_dev *dev,
goto err_out;
}
- mousedev = kzalloc_obj(struct mousedev, GFP_KERNEL);
+ mousedev = kzalloc_obj(struct mousedev);
if (!mousedev) {
error = -ENOMEM;
goto err_free_minor;
diff --git a/drivers/input/rmi4/rmi_bus.c b/drivers/input/rmi4/rmi_bus.c
index 0e2bb94e67cc..687cb987bc13 100644
--- a/drivers/input/rmi4/rmi_bus.c
+++ b/drivers/input/rmi4/rmi_bus.c
@@ -78,7 +78,7 @@ int rmi_register_transport_device(struct rmi_transport_dev *xport)
struct rmi_device *rmi_dev;
int error;
- rmi_dev = kzalloc_obj(struct rmi_device, GFP_KERNEL);
+ rmi_dev = kzalloc_obj(struct rmi_device);
if (!rmi_dev)
return -ENOMEM;
diff --git a/drivers/input/rmi4/rmi_f03.c b/drivers/input/rmi4/rmi_f03.c
index 1c7be2d9df42..04f0e5578861 100644
--- a/drivers/input/rmi4/rmi_f03.c
+++ b/drivers/input/rmi4/rmi_f03.c
@@ -171,7 +171,7 @@ static int rmi_f03_register_pt(struct f03_data *f03)
{
struct serio *serio;
- serio = kzalloc_obj(struct serio, GFP_KERNEL);
+ serio = kzalloc_obj(struct serio);
if (!serio)
return -ENOMEM;
diff --git a/drivers/input/serio/altera_ps2.c b/drivers/input/serio/altera_ps2.c
index b2f5fec9290c..4bf37db65b76 100644
--- a/drivers/input/serio/altera_ps2.c
+++ b/drivers/input/serio/altera_ps2.c
@@ -100,7 +100,7 @@ static int altera_ps2_probe(struct platform_device *pdev)
return error;
}
- serio = kzalloc_obj(*serio, GFP_KERNEL);
+ serio = kzalloc_obj(*serio);
if (!serio)
return -ENOMEM;
diff --git a/drivers/input/serio/ambakmi.c b/drivers/input/serio/ambakmi.c
index 5a4ef62fa3d3..046b8f388eb6 100644
--- a/drivers/input/serio/ambakmi.c
+++ b/drivers/input/serio/ambakmi.c
@@ -114,8 +114,8 @@ static int amba_kmi_probe(struct amba_device *dev,
if (ret)
return ret;
- kmi = kzalloc_obj(*kmi, GFP_KERNEL);
- io = kzalloc_obj(*io, GFP_KERNEL);
+ kmi = kzalloc_obj(*kmi);
+ io = kzalloc_obj(*io);
if (!kmi || !io) {
ret = -ENOMEM;
goto out;
diff --git a/drivers/input/serio/ams_delta_serio.c b/drivers/input/serio/ams_delta_serio.c
index 206e6dc3f502..e346bf53eb16 100644
--- a/drivers/input/serio/ams_delta_serio.c
+++ b/drivers/input/serio/ams_delta_serio.c
@@ -150,7 +150,7 @@ static int ams_delta_serio_init(struct platform_device *pdev)
return err;
}
- serio = kzalloc_obj(*serio, GFP_KERNEL);
+ serio = kzalloc_obj(*serio);
if (!serio)
return -ENOMEM;
diff --git a/drivers/input/serio/apbps2.c b/drivers/input/serio/apbps2.c
index 5828a4e9fe82..0aa4ab00af35 100644
--- a/drivers/input/serio/apbps2.c
+++ b/drivers/input/serio/apbps2.c
@@ -165,7 +165,7 @@ static int apbps2_of_probe(struct platform_device *ofdev)
/* Set reload register to core freq in kHz/10 */
iowrite32be(freq_hz / 10000, &priv->regs->reload);
- priv->io = kzalloc_obj(*priv->io, GFP_KERNEL);
+ priv->io = kzalloc_obj(*priv->io);
if (!priv->io)
return -ENOMEM;
diff --git a/drivers/input/serio/arc_ps2.c b/drivers/input/serio/arc_ps2.c
index bce8d6308f8d..2eb069a0f054 100644
--- a/drivers/input/serio/arc_ps2.c
+++ b/drivers/input/serio/arc_ps2.c
@@ -155,7 +155,7 @@ static int arc_ps2_create_port(struct platform_device *pdev,
struct arc_ps2_port *port = &arc_ps2->port[index];
struct serio *io;
- io = kzalloc_obj(*io, GFP_KERNEL);
+ io = kzalloc_obj(*io);
if (!io)
return -ENOMEM;
diff --git a/drivers/input/serio/ct82c710.c b/drivers/input/serio/ct82c710.c
index 3a7424bdf877..fe5f9eda4b77 100644
--- a/drivers/input/serio/ct82c710.c
+++ b/drivers/input/serio/ct82c710.c
@@ -158,7 +158,7 @@ static int __init ct82c710_detect(void)
static int ct82c710_probe(struct platform_device *dev)
{
- ct82c710_port = kzalloc_obj(*ct82c710_port, GFP_KERNEL);
+ ct82c710_port = kzalloc_obj(*ct82c710_port);
if (!ct82c710_port)
return -ENOMEM;
diff --git a/drivers/input/serio/gscps2.c b/drivers/input/serio/gscps2.c
index 59c242f97fd3..22b2f57fd91f 100644
--- a/drivers/input/serio/gscps2.c
+++ b/drivers/input/serio/gscps2.c
@@ -350,8 +350,8 @@ static int __init gscps2_probe(struct parisc_device *dev)
if (dev->id.sversion == 0x96)
hpa += GSC_DINO_OFFSET;
- ps2port = kzalloc_obj(*ps2port, GFP_KERNEL);
- serio = kzalloc_obj(*serio, GFP_KERNEL);
+ ps2port = kzalloc_obj(*ps2port);
+ serio = kzalloc_obj(*serio);
if (!ps2port || !serio) {
ret = -ENOMEM;
goto fail_nomem;
diff --git a/drivers/input/serio/hil_mlc.c b/drivers/input/serio/hil_mlc.c
index f56252d6df5b..2680a816c393 100644
--- a/drivers/input/serio/hil_mlc.c
+++ b/drivers/input/serio/hil_mlc.c
@@ -939,7 +939,7 @@ int hil_mlc_register(hil_mlc *mlc)
for (i = 0; i < HIL_MLC_DEVMEM; i++) {
struct serio *mlc_serio;
hil_mlc_copy_di_scratch(mlc, i);
- mlc_serio = kzalloc_obj(*mlc_serio, GFP_KERNEL);
+ mlc_serio = kzalloc_obj(*mlc_serio);
mlc->serio[i] = mlc_serio;
if (!mlc->serio[i]) {
for (; i >= 0; i--)
diff --git a/drivers/input/serio/hyperv-keyboard.c b/drivers/input/serio/hyperv-keyboard.c
index 7cbf726b47a7..13434b9330c8 100644
--- a/drivers/input/serio/hyperv-keyboard.c
+++ b/drivers/input/serio/hyperv-keyboard.c
@@ -316,8 +316,8 @@ static int hv_kbd_probe(struct hv_device *hv_dev,
struct serio *hv_serio;
int error;
- kbd_dev = kzalloc_obj(*kbd_dev, GFP_KERNEL);
- hv_serio = kzalloc_obj(*hv_serio, GFP_KERNEL);
+ kbd_dev = kzalloc_obj(*kbd_dev);
+ hv_serio = kzalloc_obj(*hv_serio);
if (!kbd_dev || !hv_serio) {
error = -ENOMEM;
goto err_free_mem;
diff --git a/drivers/input/serio/i8042.c b/drivers/input/serio/i8042.c
index 1a5a7f2f0214..8bcce11cb7ce 100644
--- a/drivers/input/serio/i8042.c
+++ b/drivers/input/serio/i8042.c
@@ -1324,7 +1324,7 @@ static int i8042_create_kbd_port(void)
struct serio *serio;
struct i8042_port *port = &i8042_ports[I8042_KBD_PORT_NO];
- serio = kzalloc_obj(*serio, GFP_KERNEL);
+ serio = kzalloc_obj(*serio);
if (!serio)
return -ENOMEM;
@@ -1354,7 +1354,7 @@ static int i8042_create_aux_port(int idx)
int port_no = idx < 0 ? I8042_AUX_PORT_NO : I8042_MUX_PORT_NO + idx;
struct i8042_port *port = &i8042_ports[port_no];
- serio = kzalloc_obj(*serio, GFP_KERNEL);
+ serio = kzalloc_obj(*serio);
if (!serio)
return -ENOMEM;
diff --git a/drivers/input/serio/ioc3kbd.c b/drivers/input/serio/ioc3kbd.c
index 650758115bf0..4ef60c24e788 100644
--- a/drivers/input/serio/ioc3kbd.c
+++ b/drivers/input/serio/ioc3kbd.c
@@ -139,11 +139,11 @@ static int ioc3kbd_probe(struct platform_device *pdev)
if (!d)
return -ENOMEM;
- sk = kzalloc_obj(*sk, GFP_KERNEL);
+ sk = kzalloc_obj(*sk);
if (!sk)
return -ENOMEM;
- sa = kzalloc_obj(*sa, GFP_KERNEL);
+ sa = kzalloc_obj(*sa);
if (!sa) {
kfree(sk);
return -ENOMEM;
diff --git a/drivers/input/serio/maceps2.c b/drivers/input/serio/maceps2.c
index dda52b7d2c1d..fb41e7f5af46 100644
--- a/drivers/input/serio/maceps2.c
+++ b/drivers/input/serio/maceps2.c
@@ -117,7 +117,7 @@ static struct serio *maceps2_allocate_port(int idx)
{
struct serio *serio;
- serio = kzalloc_obj(*serio, GFP_KERNEL);
+ serio = kzalloc_obj(*serio);
if (serio) {
serio->id.type = SERIO_8042;
serio->write = maceps2_write;
diff --git a/drivers/input/serio/olpc_apsp.c b/drivers/input/serio/olpc_apsp.c
index 14c235b0b4e4..ccc40634f582 100644
--- a/drivers/input/serio/olpc_apsp.c
+++ b/drivers/input/serio/olpc_apsp.c
@@ -188,7 +188,7 @@ static int olpc_apsp_probe(struct platform_device *pdev)
return priv->irq;
/* KEYBOARD */
- kb_serio = kzalloc_obj(*kb_serio, GFP_KERNEL);
+ kb_serio = kzalloc_obj(*kb_serio);
if (!kb_serio)
return -ENOMEM;
kb_serio->id.type = SERIO_8042_XL;
@@ -203,7 +203,7 @@ static int olpc_apsp_probe(struct platform_device *pdev)
serio_register_port(kb_serio);
/* TOUCHPAD */
- pad_serio = kzalloc_obj(*pad_serio, GFP_KERNEL);
+ pad_serio = kzalloc_obj(*pad_serio);
if (!pad_serio) {
error = -ENOMEM;
goto err_pad;
diff --git a/drivers/input/serio/parkbd.c b/drivers/input/serio/parkbd.c
index a4b830b499f6..09a24413d940 100644
--- a/drivers/input/serio/parkbd.c
+++ b/drivers/input/serio/parkbd.c
@@ -165,7 +165,7 @@ static struct serio *parkbd_allocate_serio(void)
{
struct serio *serio;
- serio = kzalloc_obj(*serio, GFP_KERNEL);
+ serio = kzalloc_obj(*serio);
if (serio) {
serio->id.type = parkbd_mode;
serio->write = parkbd_write;
diff --git a/drivers/input/serio/pcips2.c b/drivers/input/serio/pcips2.c
index 9e5d022fa502..78f47b0ca125 100644
--- a/drivers/input/serio/pcips2.c
+++ b/drivers/input/serio/pcips2.c
@@ -137,8 +137,8 @@ static int pcips2_probe(struct pci_dev *dev, const struct pci_device_id *id)
if (ret)
goto disable;
- ps2if = kzalloc_obj(*ps2if, GFP_KERNEL);
- serio = kzalloc_obj(*serio, GFP_KERNEL);
+ ps2if = kzalloc_obj(*ps2if);
+ serio = kzalloc_obj(*serio);
if (!ps2if || !serio) {
ret = -ENOMEM;
goto release;
diff --git a/drivers/input/serio/ps2-gpio.c b/drivers/input/serio/ps2-gpio.c
index a52ce59952a9..6cde0d88c6f4 100644
--- a/drivers/input/serio/ps2-gpio.c
+++ b/drivers/input/serio/ps2-gpio.c
@@ -405,7 +405,7 @@ static int ps2_gpio_probe(struct platform_device *pdev)
int error;
drvdata = devm_kzalloc(dev, sizeof(*drvdata), GFP_KERNEL);
- serio = kzalloc_obj(*serio, GFP_KERNEL);
+ serio = kzalloc_obj(*serio);
if (!drvdata || !serio) {
error = -ENOMEM;
goto err_free_serio;
diff --git a/drivers/input/serio/ps2mult.c b/drivers/input/serio/ps2mult.c
index e0462ac3aa1d..27d554b59658 100644
--- a/drivers/input/serio/ps2mult.c
+++ b/drivers/input/serio/ps2mult.c
@@ -122,7 +122,7 @@ static int ps2mult_create_port(struct ps2mult *psm, int i)
struct serio *mx_serio = psm->mx_serio;
struct serio *serio;
- serio = kzalloc_obj(*serio, GFP_KERNEL);
+ serio = kzalloc_obj(*serio);
if (!serio)
return -ENOMEM;
@@ -160,7 +160,7 @@ static int ps2mult_connect(struct serio *serio, struct serio_driver *drv)
if (!serio->write)
return -EINVAL;
- psm = kzalloc_obj(*psm, GFP_KERNEL);
+ psm = kzalloc_obj(*psm);
if (!psm)
return -ENOMEM;
diff --git a/drivers/input/serio/q40kbd.c b/drivers/input/serio/q40kbd.c
index 55c254fbdb24..2f553efbe649 100644
--- a/drivers/input/serio/q40kbd.c
+++ b/drivers/input/serio/q40kbd.c
@@ -102,8 +102,8 @@ static int q40kbd_probe(struct platform_device *pdev)
struct serio *port;
int error;
- q40kbd = kzalloc_obj(*q40kbd, GFP_KERNEL);
- port = kzalloc_obj(*port, GFP_KERNEL);
+ q40kbd = kzalloc_obj(*q40kbd);
+ port = kzalloc_obj(*port);
if (!q40kbd || !port) {
error = -ENOMEM;
goto err_free_mem;
diff --git a/drivers/input/serio/rpckbd.c b/drivers/input/serio/rpckbd.c
index c097716da53e..4d817850ba3b 100644
--- a/drivers/input/serio/rpckbd.c
+++ b/drivers/input/serio/rpckbd.c
@@ -108,8 +108,8 @@ static int rpckbd_probe(struct platform_device *dev)
if (tx_irq < 0)
return tx_irq;
- serio = kzalloc_obj(*serio, GFP_KERNEL);
- rpckbd = kzalloc_obj(*rpckbd, GFP_KERNEL);
+ serio = kzalloc_obj(*serio);
+ rpckbd = kzalloc_obj(*rpckbd);
if (!serio || !rpckbd) {
kfree(rpckbd);
kfree(serio);
diff --git a/drivers/input/serio/sa1111ps2.c b/drivers/input/serio/sa1111ps2.c
index 32752d898797..e3a463c157d1 100644
--- a/drivers/input/serio/sa1111ps2.c
+++ b/drivers/input/serio/sa1111ps2.c
@@ -254,8 +254,8 @@ static int ps2_probe(struct sa1111_dev *dev)
struct serio *serio;
int ret;
- ps2if = kzalloc_obj(*ps2if, GFP_KERNEL);
- serio = kzalloc_obj(*serio, GFP_KERNEL);
+ ps2if = kzalloc_obj(*ps2if);
+ serio = kzalloc_obj(*serio);
if (!ps2if || !serio) {
ret = -ENOMEM;
goto free;
diff --git a/drivers/input/serio/serio_raw.c b/drivers/input/serio/serio_raw.c
index 70df54435a94..a7ccedfa459c 100644
--- a/drivers/input/serio/serio_raw.c
+++ b/drivers/input/serio/serio_raw.c
@@ -270,7 +270,7 @@ static int serio_raw_connect(struct serio *serio, struct serio_driver *drv)
struct serio_raw *serio_raw;
int err;
- serio_raw = kzalloc_obj(*serio_raw, GFP_KERNEL);
+ serio_raw = kzalloc_obj(*serio_raw);
if (!serio_raw) {
dev_dbg(&serio->dev, "can't allocate memory for a device\n");
return -ENOMEM;
diff --git a/drivers/input/serio/serport.c b/drivers/input/serio/serport.c
index 46087c02c340..cabe3876c168 100644
--- a/drivers/input/serio/serport.c
+++ b/drivers/input/serio/serport.c
@@ -78,7 +78,7 @@ static int serport_ldisc_open(struct tty_struct *tty)
if (!capable(CAP_SYS_ADMIN))
return -EPERM;
- serport = kzalloc_obj(*serport, GFP_KERNEL);
+ serport = kzalloc_obj(*serport);
if (!serport)
return -ENOMEM;
@@ -159,7 +159,7 @@ static ssize_t serport_ldisc_read(struct tty_struct * tty, struct file * file,
if (test_and_set_bit(SERPORT_BUSY, &serport->flags))
return -EBUSY;
- serport->serio = serio = kzalloc_obj(*serio, GFP_KERNEL);
+ serport->serio = serio = kzalloc_obj(*serio);
if (!serio)
return -ENOMEM;
diff --git a/drivers/input/serio/sun4i-ps2.c b/drivers/input/serio/sun4i-ps2.c
index 5b46c66b2100..a9812789771c 100644
--- a/drivers/input/serio/sun4i-ps2.c
+++ b/drivers/input/serio/sun4i-ps2.c
@@ -209,8 +209,8 @@ static int sun4i_ps2_probe(struct platform_device *pdev)
struct device *dev = &pdev->dev;
int error;
- drvdata = kzalloc_obj(*drvdata, GFP_KERNEL);
- serio = kzalloc_obj(*serio, GFP_KERNEL);
+ drvdata = kzalloc_obj(*drvdata);
+ serio = kzalloc_obj(*serio);
if (!drvdata || !serio) {
error = -ENOMEM;
goto err_free_mem;
diff --git a/drivers/input/serio/userio.c b/drivers/input/serio/userio.c
index 3bdb17b4dd25..91cb7a177b2d 100644
--- a/drivers/input/serio/userio.c
+++ b/drivers/input/serio/userio.c
@@ -73,7 +73,7 @@ static int userio_device_write(struct serio *id, unsigned char val)
static int userio_char_open(struct inode *inode, struct file *file)
{
struct userio_device *userio __free(kfree) =
- kzalloc_obj(*userio, GFP_KERNEL);
+ kzalloc_obj(*userio);
if (!userio)
return -ENOMEM;
@@ -81,7 +81,7 @@ static int userio_char_open(struct inode *inode, struct file *file)
spin_lock_init(&userio->buf_lock);
init_waitqueue_head(&userio->waitq);
- userio->serio = kzalloc_obj(*userio->serio, GFP_KERNEL);
+ userio->serio = kzalloc_obj(*userio->serio);
if (!userio->serio)
return -ENOMEM;
diff --git a/drivers/input/serio/xilinx_ps2.c b/drivers/input/serio/xilinx_ps2.c
index 0c9ddc532c31..411d55ca1a66 100644
--- a/drivers/input/serio/xilinx_ps2.c
+++ b/drivers/input/serio/xilinx_ps2.c
@@ -247,8 +247,8 @@ static int xps2_of_probe(struct platform_device *ofdev)
return -ENODEV;
}
- drvdata = kzalloc_obj(*drvdata, GFP_KERNEL);
- serio = kzalloc_obj(*serio, GFP_KERNEL);
+ drvdata = kzalloc_obj(*drvdata);
+ serio = kzalloc_obj(*serio);
if (!drvdata || !serio) {
error = -ENOMEM;
goto failed1;
diff --git a/drivers/input/tablet/acecad.c b/drivers/input/tablet/acecad.c
index 6f39938d5bbc..ba79dff21aac 100644
--- a/drivers/input/tablet/acecad.c
+++ b/drivers/input/tablet/acecad.c
@@ -129,7 +129,7 @@ static int usb_acecad_probe(struct usb_interface *intf, const struct usb_device_
pipe = usb_rcvintpipe(dev, endpoint->bEndpointAddress);
maxp = usb_maxpacket(dev, pipe);
- acecad = kzalloc_obj(*acecad, GFP_KERNEL);
+ acecad = kzalloc_obj(*acecad);
input_dev = input_allocate_device();
if (!acecad || !input_dev) {
err = -ENOMEM;
diff --git a/drivers/input/tablet/aiptek.c b/drivers/input/tablet/aiptek.c
index df9ed01dcdb3..6df24cee3c9d 100644
--- a/drivers/input/tablet/aiptek.c
+++ b/drivers/input/tablet/aiptek.c
@@ -1673,7 +1673,7 @@ aiptek_probe(struct usb_interface *intf, const struct usb_device_id *id)
*/
speeds[0] = programmableDelay;
- aiptek = kzalloc_obj(*aiptek, GFP_KERNEL);
+ aiptek = kzalloc_obj(*aiptek);
inputdev = input_allocate_device();
if (!aiptek || !inputdev) {
dev_warn(&intf->dev,
diff --git a/drivers/input/tablet/hanwang.c b/drivers/input/tablet/hanwang.c
index 264cb9c6e807..fd5a7e761dcc 100644
--- a/drivers/input/tablet/hanwang.c
+++ b/drivers/input/tablet/hanwang.c
@@ -322,7 +322,7 @@ static int hanwang_probe(struct usb_interface *intf, const struct usb_device_id
if (intf->cur_altsetting->desc.bNumEndpoints < 1)
return -ENODEV;
- hanwang = kzalloc_obj(*hanwang, GFP_KERNEL);
+ hanwang = kzalloc_obj(*hanwang);
input_dev = input_allocate_device();
if (!hanwang || !input_dev) {
error = -ENOMEM;
diff --git a/drivers/input/tablet/kbtab.c b/drivers/input/tablet/kbtab.c
index 658cf6c144bb..6ce70c8e2d7c 100644
--- a/drivers/input/tablet/kbtab.c
+++ b/drivers/input/tablet/kbtab.c
@@ -121,7 +121,7 @@ static int kbtab_probe(struct usb_interface *intf, const struct usb_device_id *i
if (!usb_endpoint_is_int_in(endpoint))
return -ENODEV;
- kbtab = kzalloc_obj(*kbtab, GFP_KERNEL);
+ kbtab = kzalloc_obj(*kbtab);
input_dev = input_allocate_device();
if (!kbtab || !input_dev)
goto fail1;
diff --git a/drivers/input/tablet/pegasus_notetaker.c b/drivers/input/tablet/pegasus_notetaker.c
index 8ba71855421b..4ce20befc657 100644
--- a/drivers/input/tablet/pegasus_notetaker.c
+++ b/drivers/input/tablet/pegasus_notetaker.c
@@ -293,7 +293,7 @@ static int pegasus_probe(struct usb_interface *intf,
endpoint = &intf->cur_altsetting->endpoint[0].desc;
- pegasus = kzalloc_obj(*pegasus, GFP_KERNEL);
+ pegasus = kzalloc_obj(*pegasus);
input_dev = input_allocate_device();
if (!pegasus || !input_dev) {
error = -ENOMEM;
diff --git a/drivers/input/tablet/wacom_serial4.c b/drivers/input/tablet/wacom_serial4.c
index 218eb157288b..bc0c77e5487f 100644
--- a/drivers/input/tablet/wacom_serial4.c
+++ b/drivers/input/tablet/wacom_serial4.c
@@ -521,7 +521,7 @@ static int wacom_connect(struct serio *serio, struct serio_driver *drv)
struct input_dev *input_dev;
int err = -ENOMEM;
- wacom = kzalloc_obj(*wacom, GFP_KERNEL);
+ wacom = kzalloc_obj(*wacom);
input_dev = input_allocate_device();
if (!wacom || !input_dev)
goto free_device;
diff --git a/drivers/input/touchscreen/ad7877.c b/drivers/input/touchscreen/ad7877.c
index 404a4b7f4021..33c5eb522389 100644
--- a/drivers/input/touchscreen/ad7877.c
+++ b/drivers/input/touchscreen/ad7877.c
@@ -201,7 +201,7 @@ static int ad7877_read(struct spi_device *spi, u16 reg)
struct ser_req *req;
int status, ret;
- req = kzalloc_obj(*req, GFP_KERNEL);
+ req = kzalloc_obj(*req);
if (!req)
return -ENOMEM;
@@ -232,7 +232,7 @@ static int ad7877_write(struct spi_device *spi, u16 reg, u16 val)
struct ser_req *req;
int status;
- req = kzalloc_obj(*req, GFP_KERNEL);
+ req = kzalloc_obj(*req);
if (!req)
return -ENOMEM;
@@ -259,7 +259,7 @@ static int ad7877_read_adc(struct spi_device *spi, unsigned command)
int sample;
int i;
- req = kzalloc_obj(*req, GFP_KERNEL);
+ req = kzalloc_obj(*req);
if (!req)
return -ENOMEM;
diff --git a/drivers/input/touchscreen/ads7846.c b/drivers/input/touchscreen/ads7846.c
index 656e907bc13d..0963b1a78a0c 100644
--- a/drivers/input/touchscreen/ads7846.c
+++ b/drivers/input/touchscreen/ads7846.c
@@ -357,7 +357,7 @@ static int ads7846_read12_ser(struct device *dev, unsigned command)
struct ser_req *req;
int status;
- req = kzalloc_obj(*req, GFP_KERNEL);
+ req = kzalloc_obj(*req);
if (!req)
return -ENOMEM;
@@ -442,7 +442,7 @@ static int ads7845_read12_ser(struct device *dev, unsigned command)
struct ads7845_ser_req *req;
int status;
- req = kzalloc_obj(*req, GFP_KERNEL);
+ req = kzalloc_obj(*req);
if (!req)
return -ENOMEM;
diff --git a/drivers/input/touchscreen/da9052_tsi.c b/drivers/input/touchscreen/da9052_tsi.c
index ab36ecf2ab3b..a8e3d85eece7 100644
--- a/drivers/input/touchscreen/da9052_tsi.c
+++ b/drivers/input/touchscreen/da9052_tsi.c
@@ -232,7 +232,7 @@ static int da9052_ts_probe(struct platform_device *pdev)
if (!da9052)
return -EINVAL;
- tsi = kzalloc_obj(*tsi, GFP_KERNEL);
+ tsi = kzalloc_obj(*tsi);
input_dev = input_allocate_device();
if (!tsi || !input_dev) {
error = -ENOMEM;
diff --git a/drivers/input/touchscreen/dynapro.c b/drivers/input/touchscreen/dynapro.c
index 6d9a25269639..943ba8c2fb6c 100644
--- a/drivers/input/touchscreen/dynapro.c
+++ b/drivers/input/touchscreen/dynapro.c
@@ -110,7 +110,7 @@ static int dynapro_connect(struct serio *serio, struct serio_driver *drv)
struct input_dev *input_dev;
int err;
- pdynapro = kzalloc_obj(*pdynapro, GFP_KERNEL);
+ pdynapro = kzalloc_obj(*pdynapro);
input_dev = input_allocate_device();
if (!pdynapro || !input_dev) {
err = -ENOMEM;
diff --git a/drivers/input/touchscreen/egalax_ts_serial.c b/drivers/input/touchscreen/egalax_ts_serial.c
index b741843719ab..e04ea1fea4ad 100644
--- a/drivers/input/touchscreen/egalax_ts_serial.c
+++ b/drivers/input/touchscreen/egalax_ts_serial.c
@@ -99,7 +99,7 @@ static int egalax_connect(struct serio *serio, struct serio_driver *drv)
struct input_dev *input_dev;
int error;
- egalax = kzalloc_obj(*egalax, GFP_KERNEL);
+ egalax = kzalloc_obj(*egalax);
input_dev = input_allocate_device();
if (!egalax || !input_dev) {
error = -ENOMEM;
diff --git a/drivers/input/touchscreen/elo.c b/drivers/input/touchscreen/elo.c
index f75ea0caf7f9..434b9b47e964 100644
--- a/drivers/input/touchscreen/elo.c
+++ b/drivers/input/touchscreen/elo.c
@@ -307,7 +307,7 @@ static int elo_connect(struct serio *serio, struct serio_driver *drv)
struct input_dev *input_dev;
int err;
- elo = kzalloc_obj(*elo, GFP_KERNEL);
+ elo = kzalloc_obj(*elo);
input_dev = input_allocate_device();
if (!elo || !input_dev) {
err = -ENOMEM;
diff --git a/drivers/input/touchscreen/fujitsu_ts.c b/drivers/input/touchscreen/fujitsu_ts.c
index 3a4f47e37ae7..8ed592294b17 100644
--- a/drivers/input/touchscreen/fujitsu_ts.c
+++ b/drivers/input/touchscreen/fujitsu_ts.c
@@ -99,7 +99,7 @@ static int fujitsu_connect(struct serio *serio, struct serio_driver *drv)
struct input_dev *input_dev;
int err;
- fujitsu = kzalloc_obj(*fujitsu, GFP_KERNEL);
+ fujitsu = kzalloc_obj(*fujitsu);
input_dev = input_allocate_device();
if (!fujitsu || !input_dev) {
err = -ENOMEM;
diff --git a/drivers/input/touchscreen/gunze.c b/drivers/input/touchscreen/gunze.c
index 0311f80d263e..2baeb4f3b941 100644
--- a/drivers/input/touchscreen/gunze.c
+++ b/drivers/input/touchscreen/gunze.c
@@ -97,7 +97,7 @@ static int gunze_connect(struct serio *serio, struct serio_driver *drv)
struct input_dev *input_dev;
int err;
- gunze = kzalloc_obj(*gunze, GFP_KERNEL);
+ gunze = kzalloc_obj(*gunze);
input_dev = input_allocate_device();
if (!gunze || !input_dev) {
err = -ENOMEM;
diff --git a/drivers/input/touchscreen/hampshire.c b/drivers/input/touchscreen/hampshire.c
index b6423c982726..394ae8c88d50 100644
--- a/drivers/input/touchscreen/hampshire.c
+++ b/drivers/input/touchscreen/hampshire.c
@@ -109,7 +109,7 @@ static int hampshire_connect(struct serio *serio, struct serio_driver *drv)
struct input_dev *input_dev;
int err;
- phampshire = kzalloc_obj(*phampshire, GFP_KERNEL);
+ phampshire = kzalloc_obj(*phampshire);
input_dev = input_allocate_device();
if (!phampshire || !input_dev) {
err = -ENOMEM;
diff --git a/drivers/input/touchscreen/inexio.c b/drivers/input/touchscreen/inexio.c
index 72caa754381e..ac3836ff2a30 100644
--- a/drivers/input/touchscreen/inexio.c
+++ b/drivers/input/touchscreen/inexio.c
@@ -114,7 +114,7 @@ static int inexio_connect(struct serio *serio, struct serio_driver *drv)
struct input_dev *input_dev;
int err;
- pinexio = kzalloc_obj(*pinexio, GFP_KERNEL);
+ pinexio = kzalloc_obj(*pinexio);
input_dev = input_allocate_device();
if (!pinexio || !input_dev) {
err = -ENOMEM;
diff --git a/drivers/input/touchscreen/mc13783_ts.c b/drivers/input/touchscreen/mc13783_ts.c
index f539339ee6a0..4b7e70a4c6d5 100644
--- a/drivers/input/touchscreen/mc13783_ts.c
+++ b/drivers/input/touchscreen/mc13783_ts.c
@@ -168,7 +168,7 @@ static int __init mc13783_ts_probe(struct platform_device *pdev)
struct input_dev *idev;
int ret = -ENOMEM;
- priv = kzalloc_obj(*priv, GFP_KERNEL);
+ priv = kzalloc_obj(*priv);
idev = input_allocate_device();
if (!priv || !idev)
goto err_free_mem;
diff --git a/drivers/input/touchscreen/migor_ts.c b/drivers/input/touchscreen/migor_ts.c
index c7d5ca01beba..993d945dcd23 100644
--- a/drivers/input/touchscreen/migor_ts.c
+++ b/drivers/input/touchscreen/migor_ts.c
@@ -122,7 +122,7 @@ static int migor_ts_probe(struct i2c_client *client)
struct input_dev *input;
int error;
- priv = kzalloc_obj(*priv, GFP_KERNEL);
+ priv = kzalloc_obj(*priv);
input = input_allocate_device();
if (!priv || !input) {
dev_err(&client->dev, "failed to allocate memory\n");
diff --git a/drivers/input/touchscreen/mtouch.c b/drivers/input/touchscreen/mtouch.c
index f4e99ccee363..cc2d206d2f3d 100644
--- a/drivers/input/touchscreen/mtouch.c
+++ b/drivers/input/touchscreen/mtouch.c
@@ -128,7 +128,7 @@ static int mtouch_connect(struct serio *serio, struct serio_driver *drv)
struct input_dev *input_dev;
int err;
- mtouch = kzalloc_obj(*mtouch, GFP_KERNEL);
+ mtouch = kzalloc_obj(*mtouch);
input_dev = input_allocate_device();
if (!mtouch || !input_dev) {
err = -ENOMEM;
diff --git a/drivers/input/touchscreen/pcap_ts.c b/drivers/input/touchscreen/pcap_ts.c
index 05e90b36246f..7b89eb74b9de 100644
--- a/drivers/input/touchscreen/pcap_ts.c
+++ b/drivers/input/touchscreen/pcap_ts.c
@@ -138,7 +138,7 @@ static int pcap_ts_probe(struct platform_device *pdev)
struct pcap_ts *pcap_ts;
int err = -ENOMEM;
- pcap_ts = kzalloc_obj(*pcap_ts, GFP_KERNEL);
+ pcap_ts = kzalloc_obj(*pcap_ts);
if (!pcap_ts)
return err;
diff --git a/drivers/input/touchscreen/penmount.c b/drivers/input/touchscreen/penmount.c
index c4979ce707b8..4b57b6664e37 100644
--- a/drivers/input/touchscreen/penmount.c
+++ b/drivers/input/touchscreen/penmount.c
@@ -199,7 +199,7 @@ static int pm_connect(struct serio *serio, struct serio_driver *drv)
int max_x, max_y;
int err;
- pm = kzalloc_obj(*pm, GFP_KERNEL);
+ pm = kzalloc_obj(*pm);
input_dev = input_allocate_device();
if (!pm || !input_dev) {
err = -ENOMEM;
diff --git a/drivers/input/touchscreen/sur40.c b/drivers/input/touchscreen/sur40.c
index dbe3ddb1194a..877eae34fb5a 100644
--- a/drivers/input/touchscreen/sur40.c
+++ b/drivers/input/touchscreen/sur40.c
@@ -672,7 +672,7 @@ static int sur40_probe(struct usb_interface *interface,
return -ENODEV;
/* Allocate memory for our device state and initialize it. */
- sur40 = kzalloc_obj(*sur40, GFP_KERNEL);
+ sur40 = kzalloc_obj(*sur40);
if (!sur40)
return -ENOMEM;
diff --git a/drivers/input/touchscreen/ti_am335x_tsc.c b/drivers/input/touchscreen/ti_am335x_tsc.c
index d03076da7f04..623546e80668 100644
--- a/drivers/input/touchscreen/ti_am335x_tsc.c
+++ b/drivers/input/touchscreen/ti_am335x_tsc.c
@@ -422,7 +422,7 @@ static int titsc_probe(struct platform_device *pdev)
int err;
/* Allocate memory for device */
- ts_dev = kzalloc_obj(*ts_dev, GFP_KERNEL);
+ ts_dev = kzalloc_obj(*ts_dev);
input_dev = input_allocate_device();
if (!ts_dev || !input_dev) {
dev_err(&pdev->dev, "failed to allocate memory.\n");
diff --git a/drivers/input/touchscreen/touchit213.c b/drivers/input/touchscreen/touchit213.c
index 6fc1f60fd7a9..6d4a1acf57c9 100644
--- a/drivers/input/touchscreen/touchit213.c
+++ b/drivers/input/touchscreen/touchit213.c
@@ -139,7 +139,7 @@ static int touchit213_connect(struct serio *serio, struct serio_driver *drv)
struct input_dev *input_dev;
int err;
- touchit213 = kzalloc_obj(*touchit213, GFP_KERNEL);
+ touchit213 = kzalloc_obj(*touchit213);
input_dev = input_allocate_device();
if (!touchit213 || !input_dev) {
err = -ENOMEM;
diff --git a/drivers/input/touchscreen/touchright.c b/drivers/input/touchscreen/touchright.c
index 0493ead34b34..d7fdf201e4d1 100644
--- a/drivers/input/touchscreen/touchright.c
+++ b/drivers/input/touchscreen/touchright.c
@@ -102,7 +102,7 @@ static int tr_connect(struct serio *serio, struct serio_driver *drv)
struct input_dev *input_dev;
int err;
- tr = kzalloc_obj(*tr, GFP_KERNEL);
+ tr = kzalloc_obj(*tr);
input_dev = input_allocate_device();
if (!tr || !input_dev) {
err = -ENOMEM;
diff --git a/drivers/input/touchscreen/touchwin.c b/drivers/input/touchscreen/touchwin.c
index 687fee4a71b9..099fd88e65d8 100644
--- a/drivers/input/touchscreen/touchwin.c
+++ b/drivers/input/touchscreen/touchwin.c
@@ -109,7 +109,7 @@ static int tw_connect(struct serio *serio, struct serio_driver *drv)
struct input_dev *input_dev;
int err;
- tw = kzalloc_obj(*tw, GFP_KERNEL);
+ tw = kzalloc_obj(*tw);
input_dev = input_allocate_device();
if (!tw || !input_dev) {
err = -ENOMEM;
diff --git a/drivers/input/touchscreen/tsc40.c b/drivers/input/touchscreen/tsc40.c
index b83b839d7d5e..2a28a309eab5 100644
--- a/drivers/input/touchscreen/tsc40.c
+++ b/drivers/input/touchscreen/tsc40.c
@@ -83,7 +83,7 @@ static int tsc_connect(struct serio *serio, struct serio_driver *drv)
struct input_dev *input_dev;
int error;
- ptsc = kzalloc_obj(*ptsc, GFP_KERNEL);
+ ptsc = kzalloc_obj(*ptsc);
input_dev = input_allocate_device();
if (!ptsc || !input_dev) {
error = -ENOMEM;
diff --git a/drivers/input/touchscreen/usbtouchscreen.c b/drivers/input/touchscreen/usbtouchscreen.c
index 01dcf448a025..657555c8796c 100644
--- a/drivers/input/touchscreen/usbtouchscreen.c
+++ b/drivers/input/touchscreen/usbtouchscreen.c
@@ -378,7 +378,7 @@ static int mtouch_alloc(struct usbtouch_usb *usbtouch)
{
struct mtouch_priv *priv;
- priv = kmalloc_obj(*priv, GFP_KERNEL);
+ priv = kmalloc_obj(*priv);
if (!priv)
return -ENOMEM;
@@ -938,7 +938,7 @@ static int nexio_alloc(struct usbtouch_usb *usbtouch)
struct nexio_priv *priv;
int ret = -ENOMEM;
- priv = kmalloc_obj(*priv, GFP_KERNEL);
+ priv = kmalloc_obj(*priv);
if (!priv)
goto out_buf;
@@ -1458,7 +1458,7 @@ static int usbtouch_probe(struct usb_interface *intf,
if (!endpoint)
return -ENXIO;
- usbtouch = kzalloc_obj(*usbtouch, GFP_KERNEL);
+ usbtouch = kzalloc_obj(*usbtouch);
input_dev = input_allocate_device();
if (!usbtouch || !input_dev)
goto out_free;
diff --git a/drivers/input/touchscreen/wacom_w8001.c b/drivers/input/touchscreen/wacom_w8001.c
index 4ddca1128d35..45930d731873 100644
--- a/drivers/input/touchscreen/wacom_w8001.c
+++ b/drivers/input/touchscreen/wacom_w8001.c
@@ -596,7 +596,7 @@ static int w8001_connect(struct serio *serio, struct serio_driver *drv)
char basename[64] = "Wacom Serial";
int err, err_pen, err_touch;
- w8001 = kzalloc_obj(*w8001, GFP_KERNEL);
+ w8001 = kzalloc_obj(*w8001);
input_dev_pen = input_allocate_device();
input_dev_touch = input_allocate_device();
if (!w8001 || !input_dev_pen || !input_dev_touch) {
diff --git a/drivers/interconnect/core.c b/drivers/interconnect/core.c
index e4e236798357..fde208ebe685 100644
--- a/drivers/interconnect/core.c
+++ b/drivers/interconnect/core.c
@@ -408,7 +408,7 @@ struct icc_node_data *of_icc_get_from_provider(const struct of_phandle_args *spe
return ERR_CAST(node);
if (!data) {
- data = kzalloc_obj(*data, GFP_KERNEL);
+ data = kzalloc_obj(*data);
if (!data)
return ERR_PTR(-ENOMEM);
data->node = node;
@@ -827,7 +827,7 @@ static struct icc_node *icc_node_create_nolock(int id)
if (node)
return node;
- node = kzalloc_obj(*node, GFP_KERNEL);
+ node = kzalloc_obj(*node);
if (!node)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/interconnect/debugfs-client.c b/drivers/interconnect/debugfs-client.c
index 227235b4b184..5107bff53173 100644
--- a/drivers/interconnect/debugfs-client.c
+++ b/drivers/interconnect/debugfs-client.c
@@ -86,7 +86,7 @@ static int icc_get_set(void *data, u64 val)
goto err_free;
}
- debugfs_path = kzalloc_obj(*debugfs_path, GFP_KERNEL);
+ debugfs_path = kzalloc_obj(*debugfs_path);
if (!debugfs_path) {
ret = -ENOMEM;
goto err_put;
diff --git a/drivers/interconnect/qcom/icc-common.c b/drivers/interconnect/qcom/icc-common.c
index 5f90fcf7b22e..a25564fe1ebd 100644
--- a/drivers/interconnect/qcom/icc-common.c
+++ b/drivers/interconnect/qcom/icc-common.c
@@ -19,7 +19,7 @@ struct icc_node_data *qcom_icc_xlate_extended(const struct of_phandle_args *spec
if (IS_ERR(node))
return ERR_CAST(node);
- ndata = kzalloc_obj(*ndata, GFP_KERNEL);
+ ndata = kzalloc_obj(*ndata);
if (!ndata)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/iommu/amd/init.c b/drivers/iommu/amd/init.c
index cdda0eb8056f..a05aed1fe5e9 100644
--- a/drivers/iommu/amd/init.c
+++ b/drivers/iommu/amd/init.c
@@ -1284,7 +1284,7 @@ set_dev_entry_from_acpi_range(struct amd_iommu *iommu, u16 first, u16 last,
if (search_ivhd_dte_flags(iommu->pci_seg->id, first, last))
return;
- d = kzalloc_obj(struct ivhd_dte_flags, GFP_KERNEL);
+ d = kzalloc_obj(struct ivhd_dte_flags);
if (!d)
return;
@@ -1356,7 +1356,7 @@ int __init add_special_device(u8 type, u8 id, u32 *devid, bool cmd_line)
return 0;
}
- entry = kzalloc_obj(*entry, GFP_KERNEL);
+ entry = kzalloc_obj(*entry);
if (!entry)
return -ENOMEM;
@@ -1387,7 +1387,7 @@ static int __init add_acpi_hid_device(u8 *hid, u8 *uid, u32 *devid,
return 0;
}
- entry = kzalloc_obj(*entry, GFP_KERNEL);
+ entry = kzalloc_obj(*entry);
if (!entry)
return -ENOMEM;
@@ -1720,7 +1720,7 @@ static struct amd_iommu_pci_seg *__init alloc_pci_segment(u16 id,
if (last_bdf < 0)
return NULL;
- pci_seg = kzalloc_obj(struct amd_iommu_pci_seg, GFP_KERNEL);
+ pci_seg = kzalloc_obj(struct amd_iommu_pci_seg);
if (pci_seg == NULL)
return NULL;
@@ -2040,7 +2040,7 @@ static int __init init_iommu_all(struct acpi_table_header *table)
DUMP_printk(" mmio-addr: %016llx\n",
h->mmio_phys);
- iommu = kzalloc_obj(struct amd_iommu, GFP_KERNEL);
+ iommu = kzalloc_obj(struct amd_iommu);
if (iommu == NULL)
return -ENOMEM;
@@ -2641,7 +2641,7 @@ static int __init init_unity_map_range(struct ivmd_header *m,
if (pci_seg == NULL)
return -ENOMEM;
- e = kzalloc_obj(*e, GFP_KERNEL);
+ e = kzalloc_obj(*e);
if (e == NULL)
return -ENOMEM;
diff --git a/drivers/iommu/amd/iommu.c b/drivers/iommu/amd/iommu.c
index e26f94feeaa5..81c4d7733872 100644
--- a/drivers/iommu/amd/iommu.c
+++ b/drivers/iommu/amd/iommu.c
@@ -372,7 +372,7 @@ static struct iommu_dev_data *alloc_dev_data(struct amd_iommu *iommu, u16 devid)
struct iommu_dev_data *dev_data;
struct amd_iommu_pci_seg *pci_seg = iommu->pci_seg;
- dev_data = kzalloc_obj(*dev_data, GFP_KERNEL);
+ dev_data = kzalloc_obj(*dev_data);
if (!dev_data)
return NULL;
@@ -2547,7 +2547,7 @@ struct protection_domain *protection_domain_alloc(void)
struct protection_domain *domain;
int domid;
- domain = kzalloc_obj(*domain, GFP_KERNEL);
+ domain = kzalloc_obj(*domain);
if (!domain)
return NULL;
@@ -3248,7 +3248,7 @@ static struct irq_remap_table *__alloc_irq_table(int nid, size_t size)
{
struct irq_remap_table *table;
- table = kzalloc_obj(*table, GFP_KERNEL);
+ table = kzalloc_obj(*table);
if (!table)
return NULL;
@@ -3799,14 +3799,14 @@ static int irq_remapping_alloc(struct irq_domain *domain, unsigned int virq,
}
ret = -ENOMEM;
- data = kzalloc_obj(*data, GFP_KERNEL);
+ data = kzalloc_obj(*data);
if (!data)
goto out_free_data;
if (!AMD_IOMMU_GUEST_IR_GA(amd_iommu_guest_ir))
- data->entry = kzalloc_obj(union irte, GFP_KERNEL);
+ data->entry = kzalloc_obj(union irte);
else
- data->entry = kzalloc_obj(struct irte_ga, GFP_KERNEL);
+ data->entry = kzalloc_obj(struct irte_ga);
if (!data->entry) {
kfree(data);
goto out_free_data;
diff --git a/drivers/iommu/amd/iommufd.c b/drivers/iommu/amd/iommufd.c
index 760b3afaaf13..52300b867c1f 100644
--- a/drivers/iommu/amd/iommufd.c
+++ b/drivers/iommu/amd/iommufd.c
@@ -19,7 +19,7 @@ void *amd_iommufd_hw_info(struct device *dev, u32 *length, enum iommu_hw_info_ty
*type != IOMMU_HW_INFO_TYPE_AMD)
return ERR_PTR(-EOPNOTSUPP);
- hwinfo = kzalloc_obj(*hwinfo, GFP_KERNEL);
+ hwinfo = kzalloc_obj(*hwinfo);
if (!hwinfo)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/iommu/amd/nested.c b/drivers/iommu/amd/nested.c
index 1a5ff73db628..5b902598e68a 100644
--- a/drivers/iommu/amd/nested.c
+++ b/drivers/iommu/amd/nested.c
@@ -68,7 +68,7 @@ static void *gdom_info_load_or_alloc_locked(struct xarray *xa, unsigned long ind
return elm;
xa_unlock(xa);
- elm = kzalloc_obj(struct guest_domain_mapping_info, GFP_KERNEL);
+ elm = kzalloc_obj(struct guest_domain_mapping_info);
xa_lock(xa);
if (!elm)
return ERR_PTR(-ENOMEM);
@@ -102,7 +102,7 @@ amd_iommu_alloc_domain_nested(struct iommufd_viommu *viommu, u32 flags,
if (user_data->type != IOMMU_HWPT_DATA_AMD_GUEST)
return ERR_PTR(-EOPNOTSUPP);
- ndom = kzalloc_obj(*ndom, GFP_KERNEL);
+ ndom = kzalloc_obj(*ndom);
if (!ndom)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/iommu/amd/pasid.c b/drivers/iommu/amd/pasid.c
index 38cf8f519477..67eace9809f1 100644
--- a/drivers/iommu/amd/pasid.c
+++ b/drivers/iommu/amd/pasid.c
@@ -121,7 +121,7 @@ int iommu_sva_set_dev_pasid(struct iommu_domain *domain,
return ret;
/* Add PASID to protection domain pasid list */
- pdom_dev_data = kzalloc_obj(*pdom_dev_data, GFP_KERNEL);
+ pdom_dev_data = kzalloc_obj(*pdom_dev_data);
if (pdom_dev_data == NULL)
return ret;
diff --git a/drivers/iommu/apple-dart.c b/drivers/iommu/apple-dart.c
index 6b679fa53c3e..17bdadb6b504 100644
--- a/drivers/iommu/apple-dart.c
+++ b/drivers/iommu/apple-dart.c
@@ -768,7 +768,7 @@ static struct iommu_domain *apple_dart_domain_alloc_paging(struct device *dev)
{
struct apple_dart_domain *dart_domain;
- dart_domain = kzalloc_obj(*dart_domain, GFP_KERNEL);
+ dart_domain = kzalloc_obj(*dart_domain);
if (!dart_domain)
return NULL;
@@ -812,7 +812,7 @@ static int apple_dart_of_xlate(struct device *dev,
sid = args->args[0];
if (!cfg) {
- cfg = kzalloc_obj(*cfg, GFP_KERNEL);
+ cfg = kzalloc_obj(*cfg);
if (!cfg)
return -ENOMEM;
/* Will be ANDed with DART capabilities */
diff --git a/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3-iommufd.c b/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3-iommufd.c
index 973afced466c..ddae0b07c76b 100644
--- a/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3-iommufd.c
+++ b/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3-iommufd.c
@@ -23,7 +23,7 @@ void *arm_smmu_hw_info(struct device *dev, u32 *length,
return impl_ops->hw_info(master->smmu, length, type);
}
- info = kzalloc_obj(*info, GFP_KERNEL);
+ info = kzalloc_obj(*info);
if (!info)
return ERR_PTR(-ENOMEM);
@@ -121,7 +121,7 @@ int arm_smmu_attach_prepare_vmaster(struct arm_smmu_attach_state *state,
return ret;
}
- vmaster = kzalloc_obj(*vmaster, GFP_KERNEL);
+ vmaster = kzalloc_obj(*vmaster);
if (!vmaster)
return -ENOMEM;
vmaster->vsmmu = nested_domain->vsmmu;
@@ -361,7 +361,7 @@ int arm_vsmmu_cache_invalidate(struct iommufd_viommu *viommu,
struct arm_vsmmu_invalidation_cmd *end;
int ret;
- cmds = kzalloc_objs(*cmds, array->entry_num, GFP_KERNEL);
+ cmds = kzalloc_objs(*cmds, array->entry_num);
if (!cmds)
return -ENOMEM;
cur = cmds;
diff --git a/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c b/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c
index bee947ad5640..e1c4bf0775fb 100644
--- a/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c
+++ b/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c
@@ -2524,7 +2524,7 @@ struct arm_smmu_domain *arm_smmu_domain_alloc(void)
{
struct arm_smmu_domain *smmu_domain;
- smmu_domain = kzalloc_obj(*smmu_domain, GFP_KERNEL);
+ smmu_domain = kzalloc_obj(*smmu_domain);
if (!smmu_domain)
return ERR_PTR(-ENOMEM);
@@ -2965,7 +2965,7 @@ int arm_smmu_attach_prepare(struct arm_smmu_attach_state *state,
return ret;
}
- master_domain = kzalloc_obj(*master_domain, GFP_KERNEL);
+ master_domain = kzalloc_obj(*master_domain);
if (!master_domain) {
ret = -ENOMEM;
goto err_free_vmaster;
@@ -3597,7 +3597,7 @@ static struct iommu_device *arm_smmu_probe_device(struct device *dev)
if (!smmu)
return ERR_PTR(-ENODEV);
- master = kzalloc_obj(*master, GFP_KERNEL);
+ master = kzalloc_obj(*master);
if (!master)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/iommu/arm/arm-smmu-v3/tegra241-cmdqv.c b/drivers/iommu/arm/arm-smmu-v3/tegra241-cmdqv.c
index c7892443258d..8dcde926794d 100644
--- a/drivers/iommu/arm/arm-smmu-v3/tegra241-cmdqv.c
+++ b/drivers/iommu/arm/arm-smmu-v3/tegra241-cmdqv.c
@@ -693,7 +693,7 @@ tegra241_vintf_alloc_lvcmdq(struct tegra241_vintf *vintf, u16 lidx)
char header[64];
int ret;
- vcmdq = kzalloc_obj(*vcmdq, GFP_KERNEL);
+ vcmdq = kzalloc_obj(*vcmdq);
if (!vcmdq)
return ERR_PTR(-ENOMEM);
@@ -818,7 +818,7 @@ static void *tegra241_cmdqv_hw_info(struct arm_smmu_device *smmu, u32 *length,
if (*type != IOMMU_HW_INFO_TYPE_TEGRA241_CMDQV)
return ERR_PTR(-EOPNOTSUPP);
- info = kzalloc_obj(*info, GFP_KERNEL);
+ info = kzalloc_obj(*info);
if (!info)
return ERR_PTR(-ENOMEM);
@@ -860,7 +860,7 @@ static int tegra241_cmdqv_init_structures(struct arm_smmu_device *smmu)
int lidx;
int ret;
- vintf = kzalloc_obj(*vintf, GFP_KERNEL);
+ vintf = kzalloc_obj(*vintf);
if (!vintf)
return -ENOMEM;
@@ -947,7 +947,7 @@ __tegra241_cmdqv_probe(struct arm_smmu_device *smmu, struct resource *res,
1 << FIELD_GET(CMDQV_NUM_SID_PER_VM_LOG2, regval);
cmdqv->vintfs =
- kzalloc_objs(*cmdqv->vintfs, cmdqv->num_vintfs, GFP_KERNEL);
+ kzalloc_objs(*cmdqv->vintfs, cmdqv->num_vintfs);
if (!cmdqv->vintfs)
goto free_irq;
diff --git a/drivers/iommu/arm/arm-smmu/arm-smmu.c b/drivers/iommu/arm/arm-smmu/arm-smmu.c
index a31e90fcfefe..0bd21d206eb3 100644
--- a/drivers/iommu/arm/arm-smmu/arm-smmu.c
+++ b/drivers/iommu/arm/arm-smmu/arm-smmu.c
@@ -927,7 +927,7 @@ static struct iommu_domain *arm_smmu_domain_alloc_paging(struct device *dev)
* We can't really do anything meaningful until we've added a
* master.
*/
- smmu_domain = kzalloc_obj(*smmu_domain, GFP_KERNEL);
+ smmu_domain = kzalloc_obj(*smmu_domain);
if (!smmu_domain)
return NULL;
diff --git a/drivers/iommu/arm/arm-smmu/qcom_iommu.c b/drivers/iommu/arm/arm-smmu/qcom_iommu.c
index 7126431c966d..a1e8cf29f594 100644
--- a/drivers/iommu/arm/arm-smmu/qcom_iommu.c
+++ b/drivers/iommu/arm/arm-smmu/qcom_iommu.c
@@ -329,7 +329,7 @@ static struct iommu_domain *qcom_iommu_domain_alloc_paging(struct device *dev)
* We can't really do anything meaningful until we've added a
* master.
*/
- qcom_domain = kzalloc_obj(*qcom_domain, GFP_KERNEL);
+ qcom_domain = kzalloc_obj(*qcom_domain);
if (!qcom_domain)
return NULL;
diff --git a/drivers/iommu/dma-iommu.c b/drivers/iommu/dma-iommu.c
index d1ecb722b546..5dac64be61bb 100644
--- a/drivers/iommu/dma-iommu.c
+++ b/drivers/iommu/dma-iommu.c
@@ -372,7 +372,7 @@ int iommu_get_dma_cookie(struct iommu_domain *domain)
if (domain->cookie_type != IOMMU_COOKIE_NONE)
return -EEXIST;
- cookie = kzalloc_obj(*cookie, GFP_KERNEL);
+ cookie = kzalloc_obj(*cookie);
if (!cookie)
return -ENOMEM;
@@ -404,7 +404,7 @@ int iommu_get_msi_cookie(struct iommu_domain *domain, dma_addr_t base)
if (domain->cookie_type != IOMMU_COOKIE_NONE)
return -EEXIST;
- cookie = kzalloc_obj(*cookie, GFP_KERNEL);
+ cookie = kzalloc_obj(*cookie);
if (!cookie)
return -ENOMEM;
@@ -480,7 +480,7 @@ static int cookie_init_hw_msi_region(struct iommu_dma_cookie *cookie,
num_pages = iova_align(iovad, end - start) >> iova_shift(iovad);
for (i = 0; i < num_pages; i++) {
- msi_page = kmalloc_obj(*msi_page, GFP_KERNEL);
+ msi_page = kmalloc_obj(*msi_page);
if (!msi_page)
return -ENOMEM;
@@ -880,7 +880,7 @@ static struct page **__iommu_dma_alloc_pages(struct device *dev,
if (!order_mask)
return NULL;
- pages = kvzalloc_objs(*pages, count, GFP_KERNEL);
+ pages = kvzalloc_objs(*pages, count);
if (!pages)
return NULL;
@@ -2157,7 +2157,7 @@ static struct iommu_dma_msi_page *iommu_dma_get_msi_page(struct device *dev,
if (msi_page->phys == msi_addr)
return msi_page;
- msi_page = kzalloc_obj(*msi_page, GFP_KERNEL);
+ msi_page = kzalloc_obj(*msi_page);
if (!msi_page)
return NULL;
diff --git a/drivers/iommu/exynos-iommu.c b/drivers/iommu/exynos-iommu.c
index 2e439699382d..874d05f4b396 100644
--- a/drivers/iommu/exynos-iommu.c
+++ b/drivers/iommu/exynos-iommu.c
@@ -899,7 +899,7 @@ static struct iommu_domain *exynos_iommu_domain_alloc_paging(struct device *dev)
/* Check if correct PTE offsets are initialized */
BUG_ON(PG_ENT_SHIFT < 0 || !dma_dev);
- domain = kzalloc_obj(*domain, GFP_KERNEL);
+ domain = kzalloc_obj(*domain);
if (!domain)
return NULL;
@@ -1451,7 +1451,7 @@ static int exynos_iommu_of_xlate(struct device *dev,
return -ENODEV;
if (!owner) {
- owner = kzalloc_obj(*owner, GFP_KERNEL);
+ owner = kzalloc_obj(*owner);
if (!owner)
return -ENOMEM;
diff --git a/drivers/iommu/fsl_pamu.c b/drivers/iommu/fsl_pamu.c
index 8db71fe57894..25aa477a95a9 100644
--- a/drivers/iommu/fsl_pamu.c
+++ b/drivers/iommu/fsl_pamu.c
@@ -785,7 +785,7 @@ static int fsl_pamu_probe(struct platform_device *pdev)
goto error;
}
- data = kzalloc_obj(*data, GFP_KERNEL);
+ data = kzalloc_obj(*data);
if (!data) {
ret = -ENOMEM;
goto error;
diff --git a/drivers/iommu/hyperv-iommu.c b/drivers/iommu/hyperv-iommu.c
index b776c52aca6b..479103261ae6 100644
--- a/drivers/iommu/hyperv-iommu.c
+++ b/drivers/iommu/hyperv-iommu.c
@@ -276,7 +276,7 @@ static int hyperv_root_irq_remapping_alloc(struct irq_domain *domain,
if (ret < 0)
return ret;
- data = kzalloc_obj(*data, GFP_KERNEL);
+ data = kzalloc_obj(*data);
if (!data) {
irq_domain_free_irqs_common(domain, virq, nr_irqs);
return -ENOMEM;
diff --git a/drivers/iommu/intel/cache.c b/drivers/iommu/intel/cache.c
index e43c93fb9b1d..249ab5886c73 100644
--- a/drivers/iommu/intel/cache.c
+++ b/drivers/iommu/intel/cache.c
@@ -49,7 +49,7 @@ int cache_tag_assign(struct dmar_domain *domain, u16 did, struct device *dev,
struct list_head *prev;
unsigned long flags;
- tag = kzalloc_obj(*tag, GFP_KERNEL);
+ tag = kzalloc_obj(*tag);
if (!tag)
return -ENOMEM;
diff --git a/drivers/iommu/intel/dmar.c b/drivers/iommu/intel/dmar.c
index 4a2143036b94..d68c06025cac 100644
--- a/drivers/iommu/intel/dmar.c
+++ b/drivers/iommu/intel/dmar.c
@@ -99,7 +99,7 @@ void *dmar_alloc_dev_scope(void *start, void *end, int *cnt)
if (*cnt == 0)
return NULL;
- return kzalloc_objs(struct dmar_dev_scope, *cnt, GFP_KERNEL);
+ return kzalloc_objs(struct dmar_dev_scope, *cnt);
}
void dmar_free_dev_scope(struct dmar_dev_scope **devices, int *cnt)
@@ -1046,7 +1046,7 @@ static int alloc_iommu(struct dmar_drhd_unit *drhd)
return -EINVAL;
}
- iommu = kzalloc_obj(*iommu, GFP_KERNEL);
+ iommu = kzalloc_obj(*iommu);
if (!iommu)
return -ENOMEM;
diff --git a/drivers/iommu/intel/iommu.c b/drivers/iommu/intel/iommu.c
index 3505ced050f0..ef7613b177b9 100644
--- a/drivers/iommu/intel/iommu.c
+++ b/drivers/iommu/intel/iommu.c
@@ -1030,7 +1030,7 @@ int domain_attach_iommu(struct dmar_domain *domain, struct intel_iommu *iommu)
if (domain->domain.type == IOMMU_DOMAIN_SVA)
return 0;
- info = kzalloc_obj(*info, GFP_KERNEL);
+ info = kzalloc_obj(*info);
if (!info)
return -ENOMEM;
@@ -1926,7 +1926,7 @@ int __init dmar_parse_one_rmrr(struct acpi_dmar_header *header, void *arg)
add_taint(TAINT_FIRMWARE_WORKAROUND, LOCKDEP_STILL_OK);
}
- rmrru = kzalloc_obj(*rmrru, GFP_KERNEL);
+ rmrru = kzalloc_obj(*rmrru);
if (!rmrru)
goto out;
@@ -2779,7 +2779,7 @@ static struct dmar_domain *paging_domain_alloc(void)
{
struct dmar_domain *domain;
- domain = kzalloc_obj(*domain, GFP_KERNEL);
+ domain = kzalloc_obj(*domain);
if (!domain)
return ERR_PTR(-ENOMEM);
@@ -3237,7 +3237,7 @@ static struct iommu_device *intel_iommu_probe_device(struct device *dev)
if (!iommu || !iommu->iommu.ops)
return ERR_PTR(-ENODEV);
- info = kzalloc_obj(*info, GFP_KERNEL);
+ info = kzalloc_obj(*info);
if (!info)
return ERR_PTR(-ENOMEM);
@@ -3576,7 +3576,7 @@ domain_add_dev_pasid(struct iommu_domain *domain,
unsigned long flags;
int ret;
- dev_pasid = kzalloc_obj(*dev_pasid, GFP_KERNEL);
+ dev_pasid = kzalloc_obj(*dev_pasid);
if (!dev_pasid)
return ERR_PTR(-ENOMEM);
@@ -3672,7 +3672,7 @@ static void *intel_iommu_hw_info(struct device *dev, u32 *length,
*type != IOMMU_HW_INFO_TYPE_INTEL_VTD)
return ERR_PTR(-EOPNOTSUPP);
- vtd = kzalloc_obj(*vtd, GFP_KERNEL);
+ vtd = kzalloc_obj(*vtd);
if (!vtd)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/iommu/intel/irq_remapping.c b/drivers/iommu/intel/irq_remapping.c
index 105958b4a29e..1cd2101610df 100644
--- a/drivers/iommu/intel/irq_remapping.c
+++ b/drivers/iommu/intel/irq_remapping.c
@@ -533,7 +533,7 @@ static int intel_setup_irq_remapping(struct intel_iommu *iommu)
if (iommu->ir_table)
return 0;
- ir_table = kzalloc_obj(struct ir_table, GFP_KERNEL);
+ ir_table = kzalloc_obj(struct ir_table);
if (!ir_table)
return -ENOMEM;
@@ -1426,7 +1426,7 @@ static int intel_irq_remapping_alloc(struct irq_domain *domain,
return ret;
ret = -ENOMEM;
- data = kzalloc_obj(*data, GFP_KERNEL);
+ data = kzalloc_obj(*data);
if (!data)
goto out_free_parent;
@@ -1448,7 +1448,7 @@ static int intel_irq_remapping_alloc(struct irq_domain *domain,
}
if (i > 0) {
- ird = kzalloc_obj(*ird, GFP_KERNEL);
+ ird = kzalloc_obj(*ird);
if (!ird)
goto out_free_data;
/* Initialize the common data */
diff --git a/drivers/iommu/intel/pasid.c b/drivers/iommu/intel/pasid.c
index 5ffe84dee862..9d30015b8940 100644
--- a/drivers/iommu/intel/pasid.c
+++ b/drivers/iommu/intel/pasid.c
@@ -50,7 +50,7 @@ int intel_pasid_alloc_table(struct device *dev)
if (WARN_ON(info->pasid_table))
return -EEXIST;
- pasid_table = kzalloc_obj(*pasid_table, GFP_KERNEL);
+ pasid_table = kzalloc_obj(*pasid_table);
if (!pasid_table)
return -ENOMEM;
diff --git a/drivers/iommu/intel/perfmon.c b/drivers/iommu/intel/perfmon.c
index 76b62f2c8d92..fec51b6036b6 100644
--- a/drivers/iommu/intel/perfmon.c
+++ b/drivers/iommu/intel/perfmon.c
@@ -591,7 +591,7 @@ int alloc_iommu_pmu(struct intel_iommu *iommu)
if (!ecmd_has_pmu_essential(iommu))
return -ENODEV;
- iommu_pmu = kzalloc_obj(*iommu_pmu, GFP_KERNEL);
+ iommu_pmu = kzalloc_obj(*iommu_pmu);
if (!iommu_pmu)
return -ENOMEM;
diff --git a/drivers/iommu/intel/svm.c b/drivers/iommu/intel/svm.c
index be165cb9d01e..fea10acd4f02 100644
--- a/drivers/iommu/intel/svm.c
+++ b/drivers/iommu/intel/svm.c
@@ -210,7 +210,7 @@ struct iommu_domain *intel_svm_domain_alloc(struct device *dev,
if (ret)
return ERR_PTR(ret);
- domain = kzalloc_obj(*domain, GFP_KERNEL);
+ domain = kzalloc_obj(*domain);
if (!domain)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/iommu/io-pgfault.c b/drivers/iommu/io-pgfault.c
index a0d8fd7f2e84..cca52a34d0ed 100644
--- a/drivers/iommu/io-pgfault.c
+++ b/drivers/iommu/io-pgfault.c
@@ -65,7 +65,7 @@ static int report_partial_fault(struct iommu_fault_param *fault_param,
{
struct iopf_fault *iopf;
- iopf = kzalloc_obj(*iopf, GFP_KERNEL);
+ iopf = kzalloc_obj(*iopf);
if (!iopf)
return -ENOMEM;
@@ -85,7 +85,7 @@ static struct iopf_group *iopf_group_alloc(struct iommu_fault_param *iopf_param,
struct iopf_fault *iopf, *next;
struct iopf_group *group;
- group = kzalloc_obj(*group, GFP_KERNEL);
+ group = kzalloc_obj(*group);
if (!group) {
/*
* We always need to construct the group as we need it to abort
@@ -400,7 +400,7 @@ int iopf_queue_add_device(struct iopf_queue *queue, struct device *dev)
goto done_unlock;
}
- fault_param = kzalloc_obj(*fault_param, GFP_KERNEL);
+ fault_param = kzalloc_obj(*fault_param);
if (!fault_param) {
ret = -ENOMEM;
goto done_unlock;
@@ -503,7 +503,7 @@ struct iopf_queue *iopf_queue_alloc(const char *name)
{
struct iopf_queue *queue;
- queue = kzalloc_obj(*queue, GFP_KERNEL);
+ queue = kzalloc_obj(*queue);
if (!queue)
return NULL;
diff --git a/drivers/iommu/io-pgtable-arm-v7s.c b/drivers/iommu/io-pgtable-arm-v7s.c
index 67ce99ca82b3..40e33257d3c2 100644
--- a/drivers/iommu/io-pgtable-arm-v7s.c
+++ b/drivers/iommu/io-pgtable-arm-v7s.c
@@ -692,7 +692,7 @@ static struct io_pgtable *arm_v7s_alloc_pgtable(struct io_pgtable_cfg *cfg,
!arm_v7s_is_mtk_enabled(cfg))
return NULL;
- data = kmalloc_obj(*data, GFP_KERNEL);
+ data = kmalloc_obj(*data);
if (!data)
return NULL;
diff --git a/drivers/iommu/io-pgtable-arm.c b/drivers/iommu/io-pgtable-arm.c
index c5076caf17aa..0208e5897c29 100644
--- a/drivers/iommu/io-pgtable-arm.c
+++ b/drivers/iommu/io-pgtable-arm.c
@@ -930,7 +930,7 @@ arm_lpae_alloc_pgtable(struct io_pgtable_cfg *cfg)
if (cfg->oas > ARM_LPAE_MAX_ADDR_BITS)
return NULL;
- data = kmalloc_obj(*data, GFP_KERNEL);
+ data = kmalloc_obj(*data);
if (!data)
return NULL;
diff --git a/drivers/iommu/io-pgtable-dart.c b/drivers/iommu/io-pgtable-dart.c
index d31f00ff1206..cbc5d6aa2daa 100644
--- a/drivers/iommu/io-pgtable-dart.c
+++ b/drivers/iommu/io-pgtable-dart.c
@@ -388,7 +388,7 @@ dart_alloc_pgtable(struct io_pgtable_cfg *cfg)
if (tbl_bits > max_tbl_bits)
return NULL;
- data = kzalloc_obj(*data, GFP_KERNEL);
+ data = kzalloc_obj(*data);
if (!data)
return NULL;
diff --git a/drivers/iommu/iommu-sva.c b/drivers/iommu/iommu-sva.c
index 6f3b26a823ec..07d64908a05f 100644
--- a/drivers/iommu/iommu-sva.c
+++ b/drivers/iommu/iommu-sva.c
@@ -35,7 +35,7 @@ static struct iommu_mm_data *iommu_alloc_mm_data(struct mm_struct *mm, struct de
return iommu_mm;
}
- iommu_mm = kzalloc_obj(struct iommu_mm_data, GFP_KERNEL);
+ iommu_mm = kzalloc_obj(struct iommu_mm_data);
if (!iommu_mm)
return ERR_PTR(-ENOMEM);
@@ -108,7 +108,7 @@ struct iommu_sva *iommu_sva_bind_device(struct device *dev, struct mm_struct *mm
goto out_unlock;
}
- handle = kzalloc_obj(*handle, GFP_KERNEL);
+ handle = kzalloc_obj(*handle);
if (!handle) {
ret = -ENOMEM;
goto out_unlock;
diff --git a/drivers/iommu/iommu-sysfs.c b/drivers/iommu/iommu-sysfs.c
index cf72d58fcb7c..937d1c749843 100644
--- a/drivers/iommu/iommu-sysfs.c
+++ b/drivers/iommu/iommu-sysfs.c
@@ -59,7 +59,7 @@ int iommu_device_sysfs_add(struct iommu_device *iommu,
va_list vargs;
int ret;
- iommu->dev = kzalloc_obj(*iommu->dev, GFP_KERNEL);
+ iommu->dev = kzalloc_obj(*iommu->dev);
if (!iommu->dev)
return -ENOMEM;
diff --git a/drivers/iommu/iommu.c b/drivers/iommu/iommu.c
index 1a98d65fb35d..42383121657b 100644
--- a/drivers/iommu/iommu.c
+++ b/drivers/iommu/iommu.c
@@ -233,7 +233,7 @@ static int __init iommu_subsys_init(void)
(iommu_cmd_line & IOMMU_CMD_LINE_STRICT) ?
" (set via kernel command line)" : "");
- nb = kzalloc_objs(*nb, ARRAY_SIZE(iommu_buses), GFP_KERNEL);
+ nb = kzalloc_objs(*nb, ARRAY_SIZE(iommu_buses));
if (!nb)
return -ENOMEM;
@@ -383,7 +383,7 @@ static struct dev_iommu *dev_iommu_get(struct device *dev)
if (param)
return param;
- param = kzalloc_obj(*param, GFP_KERNEL);
+ param = kzalloc_obj(*param);
if (!param)
return NULL;
@@ -1053,7 +1053,7 @@ struct iommu_group *iommu_group_alloc(void)
struct iommu_group *group;
int ret;
- group = kzalloc_obj(*group, GFP_KERNEL);
+ group = kzalloc_obj(*group);
if (!group)
return ERR_PTR(-ENOMEM);
@@ -1244,7 +1244,7 @@ static struct group_device *iommu_group_alloc_device(struct iommu_group *group,
int ret, i = 0;
struct group_device *device;
- device = kzalloc_obj(*device, GFP_KERNEL);
+ device = kzalloc_obj(*device);
if (!device)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/iommu/iommufd/device.c b/drivers/iommu/iommufd/device.c
index 5a2628854a05..344d620cdecc 100644
--- a/drivers/iommu/iommufd/device.c
+++ b/drivers/iommu/iommufd/device.c
@@ -87,7 +87,7 @@ static struct iommufd_group *iommufd_get_group(struct iommufd_ctx *ictx,
}
xa_unlock(&ictx->groups);
- new_igroup = kzalloc_obj(*new_igroup, GFP_KERNEL);
+ new_igroup = kzalloc_obj(*new_igroup);
if (!new_igroup) {
iommu_group_put(group);
return ERR_PTR(-ENOMEM);
@@ -508,7 +508,7 @@ static int iommufd_hwpt_attach_device(struct iommufd_hw_pagetable *hwpt,
if (rc)
return rc;
- handle = kzalloc_obj(*handle, GFP_KERNEL);
+ handle = kzalloc_obj(*handle);
if (!handle)
return -ENOMEM;
@@ -575,7 +575,7 @@ static int iommufd_hwpt_replace_device(struct iommufd_device *idev,
old_handle = iommufd_device_get_attach_handle(idev, pasid);
- handle = kzalloc_obj(*handle, GFP_KERNEL);
+ handle = kzalloc_obj(*handle);
if (!handle)
return -ENOMEM;
@@ -619,7 +619,7 @@ int iommufd_hw_pagetable_attach(struct iommufd_hw_pagetable *hwpt,
}
if (!attach) {
- attach = kzalloc_obj(*attach, GFP_KERNEL);
+ attach = kzalloc_obj(*attach);
if (!attach) {
rc = -ENOMEM;
goto err_release_pasid;
diff --git a/drivers/iommu/iommufd/driver.c b/drivers/iommu/iommufd/driver.c
index b71fb2472945..61e6b02601d1 100644
--- a/drivers/iommu/iommufd/driver.c
+++ b/drivers/iommu/iommufd/driver.c
@@ -202,7 +202,7 @@ iommufd_sw_msi_get_map(struct iommufd_ctx *ictx, phys_addr_t msi_addr,
BITS_PER_BYTE * sizeof_field(struct iommufd_sw_msi_maps, bitmap))
return ERR_PTR(-EOVERFLOW);
- cur = kzalloc_obj(*cur, GFP_KERNEL);
+ cur = kzalloc_obj(*cur);
if (!cur)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/iommu/iommufd/iova_bitmap.c b/drivers/iommu/iommufd/iova_bitmap.c
index 151285e0521e..dac3e657d498 100644
--- a/drivers/iommu/iommufd/iova_bitmap.c
+++ b/drivers/iommu/iommufd/iova_bitmap.c
@@ -247,7 +247,7 @@ struct iova_bitmap *iova_bitmap_alloc(unsigned long iova, size_t length,
struct iova_bitmap *bitmap;
int rc;
- bitmap = kzalloc_obj(*bitmap, GFP_KERNEL);
+ bitmap = kzalloc_obj(*bitmap);
if (!bitmap)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/iommu/iommufd/pages.c b/drivers/iommu/iommufd/pages.c
index 38efabe95dba..9b49f0c5b459 100644
--- a/drivers/iommu/iommufd/pages.c
+++ b/drivers/iommu/iommufd/pages.c
@@ -1575,7 +1575,7 @@ int iopt_dmabuf_track_domain(struct iopt_pages *pages, struct iopt_area *area,
if (WARN_ON(track->domain == domain && track->area == area))
return -EINVAL;
- track = kzalloc_obj(*track, GFP_KERNEL);
+ track = kzalloc_obj(*track);
if (!track)
return -ENOMEM;
track->domain = domain;
diff --git a/drivers/iommu/iommufd/selftest.c b/drivers/iommu/iommufd/selftest.c
index 530202748016..7823142097d4 100644
--- a/drivers/iommu/iommufd/selftest.c
+++ b/drivers/iommu/iommufd/selftest.c
@@ -308,7 +308,7 @@ static void *mock_domain_hw_info(struct device *dev, u32 *length,
*type != IOMMU_HW_INFO_TYPE_SELFTEST)
return ERR_PTR(-EOPNOTSUPP);
- info = kzalloc_obj(*info, GFP_KERNEL);
+ info = kzalloc_obj(*info);
if (!info)
return ERR_PTR(-ENOMEM);
@@ -353,7 +353,7 @@ __mock_domain_alloc_nested(const struct iommu_user_data *user_data)
if (rc)
return ERR_PTR(rc);
- mock_nested = kzalloc_obj(*mock_nested, GFP_KERNEL);
+ mock_nested = kzalloc_obj(*mock_nested);
if (!mock_nested)
return ERR_PTR(-ENOMEM);
mock_nested->domain.ops = &domain_nested_ops;
@@ -441,7 +441,7 @@ mock_domain_alloc_pgtable(struct device *dev,
struct mock_iommu_domain *mock;
int rc;
- mock = kzalloc_obj(*mock, GFP_KERNEL);
+ mock = kzalloc_obj(*mock);
if (!mock)
return ERR_PTR(-ENOMEM);
mock->domain.type = IOMMU_DOMAIN_UNMANAGED;
@@ -674,7 +674,7 @@ static int mock_viommu_cache_invalidate(struct iommufd_viommu *viommu,
return 0;
}
- cmds = kzalloc_objs(*cmds, array->entry_num, GFP_KERNEL);
+ cmds = kzalloc_objs(*cmds, array->entry_num);
if (!cmds)
return -ENOMEM;
cur = cmds;
@@ -1023,7 +1023,7 @@ static struct mock_dev *mock_dev_create(unsigned long dev_flags)
if (dev_flags & ~valid_flags)
return ERR_PTR(-EINVAL);
- mdev = kzalloc_obj(*mdev, GFP_KERNEL);
+ mdev = kzalloc_obj(*mdev);
if (!mdev)
return ERR_PTR(-ENOMEM);
@@ -2032,7 +2032,7 @@ static int iommufd_test_dmabuf_get(struct iommufd_ucmd *ucmd,
if (len == 0 || len > PAGE_SIZE * 512)
return -EINVAL;
- priv = kzalloc_obj(*priv, GFP_KERNEL);
+ priv = kzalloc_obj(*priv);
if (!priv)
return -ENOMEM;
diff --git a/drivers/iommu/ipmmu-vmsa.c b/drivers/iommu/ipmmu-vmsa.c
index bd18c3a7ee54..9386b752dea2 100644
--- a/drivers/iommu/ipmmu-vmsa.c
+++ b/drivers/iommu/ipmmu-vmsa.c
@@ -566,7 +566,7 @@ static struct iommu_domain *ipmmu_domain_alloc_paging(struct device *dev)
{
struct ipmmu_vmsa_domain *domain;
- domain = kzalloc_obj(*domain, GFP_KERNEL);
+ domain = kzalloc_obj(*domain);
if (!domain)
return NULL;
diff --git a/drivers/iommu/msm_iommu.c b/drivers/iommu/msm_iommu.c
index 00b4ea90e500..0ad5ff431d5b 100644
--- a/drivers/iommu/msm_iommu.c
+++ b/drivers/iommu/msm_iommu.c
@@ -306,7 +306,7 @@ static struct iommu_domain *msm_iommu_domain_alloc_paging(struct device *dev)
{
struct msm_priv *priv;
- priv = kzalloc_obj(*priv, GFP_KERNEL);
+ priv = kzalloc_obj(*priv);
if (!priv)
goto fail_nomem;
diff --git a/drivers/iommu/mtk_iommu.c b/drivers/iommu/mtk_iommu.c
index 6dd60f4a8087..2be990c108de 100644
--- a/drivers/iommu/mtk_iommu.c
+++ b/drivers/iommu/mtk_iommu.c
@@ -704,7 +704,7 @@ static struct iommu_domain *mtk_iommu_domain_alloc_paging(struct device *dev)
{
struct mtk_iommu_domain *dom;
- dom = kzalloc_obj(*dom, GFP_KERNEL);
+ dom = kzalloc_obj(*dom);
if (!dom)
return NULL;
mutex_init(&dom->mutex);
diff --git a/drivers/iommu/mtk_iommu_v1.c b/drivers/iommu/mtk_iommu_v1.c
index e5ad7fa6e4e7..ac97dd2868d4 100644
--- a/drivers/iommu/mtk_iommu_v1.c
+++ b/drivers/iommu/mtk_iommu_v1.c
@@ -284,7 +284,7 @@ static struct iommu_domain *mtk_iommu_v1_domain_alloc_paging(struct device *dev)
{
struct mtk_iommu_v1_domain *dom;
- dom = kzalloc_obj(*dom, GFP_KERNEL);
+ dom = kzalloc_obj(*dom);
if (!dom)
return NULL;
diff --git a/drivers/iommu/omap-iommu-debug.c b/drivers/iommu/omap-iommu-debug.c
index b0853f69f98d..34c0a45f73d8 100644
--- a/drivers/iommu/omap-iommu-debug.c
+++ b/drivers/iommu/omap-iommu-debug.c
@@ -147,7 +147,7 @@ static size_t omap_dump_tlb_entries(struct omap_iommu *obj, struct seq_file *s)
num = obj->nr_tlb_entries;
- cr = kzalloc_objs(*cr, num, GFP_KERNEL);
+ cr = kzalloc_objs(*cr, num);
if (!cr)
return 0;
diff --git a/drivers/iommu/omap-iommu.c b/drivers/iommu/omap-iommu.c
index f4fd0fba6a8c..8231d7d6bb6a 100644
--- a/drivers/iommu/omap-iommu.c
+++ b/drivers/iommu/omap-iommu.c
@@ -311,7 +311,7 @@ static struct cr_regs *iotlb_alloc_cr(struct omap_iommu *obj,
return ERR_PTR(-EINVAL);
}
- cr = kmalloc_obj(*cr, GFP_KERNEL);
+ cr = kmalloc_obj(*cr);
if (!cr)
return ERR_PTR(-ENOMEM);
@@ -1563,7 +1563,7 @@ static struct iommu_domain *omap_iommu_domain_alloc_paging(struct device *dev)
{
struct omap_iommu_domain *omap_domain;
- omap_domain = kzalloc_obj(*omap_domain, GFP_KERNEL);
+ omap_domain = kzalloc_obj(*omap_domain);
if (!omap_domain)
return NULL;
@@ -1655,7 +1655,7 @@ static struct iommu_device *omap_iommu_probe_device(struct device *dev)
if (num_iommus < 0)
return ERR_PTR(-ENODEV);
- arch_data = kzalloc_objs(*arch_data, num_iommus + 1, GFP_KERNEL);
+ arch_data = kzalloc_objs(*arch_data, num_iommus + 1);
if (!arch_data)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/iommu/riscv/iommu.c b/drivers/iommu/riscv/iommu.c
index 26068cefa837..fa2ebfd2f912 100644
--- a/drivers/iommu/riscv/iommu.c
+++ b/drivers/iommu/riscv/iommu.c
@@ -853,7 +853,7 @@ static int riscv_iommu_bond_link(struct riscv_iommu_domain *domain,
struct riscv_iommu_bond *bond;
struct list_head *bonds;
- bond = kzalloc_obj(*bond, GFP_KERNEL);
+ bond = kzalloc_obj(*bond);
if (!bond)
return -ENOMEM;
bond->dev = dev;
@@ -1380,7 +1380,7 @@ static struct iommu_domain *riscv_iommu_alloc_paging_domain(struct device *dev)
return ERR_PTR(-ENODEV);
}
- domain = kzalloc_obj(*domain, GFP_KERNEL);
+ domain = kzalloc_obj(*domain);
if (!domain)
return ERR_PTR(-ENOMEM);
@@ -1504,7 +1504,7 @@ static struct iommu_device *riscv_iommu_probe_device(struct device *dev)
if (iommu->ddt_mode <= RISCV_IOMMU_DDTP_IOMMU_MODE_BARE)
return ERR_PTR(-ENODEV);
- info = kzalloc_obj(*info, GFP_KERNEL);
+ info = kzalloc_obj(*info);
if (!info)
return ERR_PTR(-ENOMEM);
/*
diff --git a/drivers/iommu/rockchip-iommu.c b/drivers/iommu/rockchip-iommu.c
index e0cfe7bbef8c..0013cf196c57 100644
--- a/drivers/iommu/rockchip-iommu.c
+++ b/drivers/iommu/rockchip-iommu.c
@@ -1064,7 +1064,7 @@ static struct iommu_domain *rk_iommu_domain_alloc_paging(struct device *dev)
struct rk_iommu_domain *rk_domain;
struct rk_iommu *iommu;
- rk_domain = kzalloc_obj(*rk_domain, GFP_KERNEL);
+ rk_domain = kzalloc_obj(*rk_domain);
if (!rk_domain)
return NULL;
diff --git a/drivers/iommu/s390-iommu.c b/drivers/iommu/s390-iommu.c
index dcef361f9806..f148f559ac56 100644
--- a/drivers/iommu/s390-iommu.c
+++ b/drivers/iommu/s390-iommu.c
@@ -531,7 +531,7 @@ static struct iommu_domain *s390_domain_alloc_paging(struct device *dev)
struct s390_domain *s390_domain;
u64 aperture_size;
- s390_domain = kzalloc_obj(*s390_domain, GFP_KERNEL);
+ s390_domain = kzalloc_obj(*s390_domain);
if (!s390_domain)
return NULL;
diff --git a/drivers/iommu/sprd-iommu.c b/drivers/iommu/sprd-iommu.c
index 0164c08ed9dc..c1a34445d244 100644
--- a/drivers/iommu/sprd-iommu.c
+++ b/drivers/iommu/sprd-iommu.c
@@ -137,7 +137,7 @@ static struct iommu_domain *sprd_iommu_domain_alloc_paging(struct device *dev)
{
struct sprd_iommu_domain *dom;
- dom = kzalloc_obj(*dom, GFP_KERNEL);
+ dom = kzalloc_obj(*dom);
if (!dom)
return NULL;
diff --git a/drivers/iommu/sun50i-iommu.c b/drivers/iommu/sun50i-iommu.c
index 30f93e691c09..be3f1ce696ba 100644
--- a/drivers/iommu/sun50i-iommu.c
+++ b/drivers/iommu/sun50i-iommu.c
@@ -686,7 +686,7 @@ sun50i_iommu_domain_alloc_paging(struct device *dev)
{
struct sun50i_iommu_domain *sun50i_domain;
- sun50i_domain = kzalloc_obj(*sun50i_domain, GFP_KERNEL);
+ sun50i_domain = kzalloc_obj(*sun50i_domain);
if (!sun50i_domain)
return NULL;
diff --git a/drivers/iommu/tegra-smmu.c b/drivers/iommu/tegra-smmu.c
index 4890a88ac169..67e7a7b925f0 100644
--- a/drivers/iommu/tegra-smmu.c
+++ b/drivers/iommu/tegra-smmu.c
@@ -289,7 +289,7 @@ static struct iommu_domain *tegra_smmu_domain_alloc_paging(struct device *dev)
{
struct tegra_smmu_as *as;
- as = kzalloc_obj(*as, GFP_KERNEL);
+ as = kzalloc_obj(*as);
if (!as)
return NULL;
@@ -308,7 +308,7 @@ static struct iommu_domain *tegra_smmu_domain_alloc_paging(struct device *dev)
return NULL;
}
- as->pts = kzalloc_objs(*as->pts, SMMU_NUM_PDE, GFP_KERNEL);
+ as->pts = kzalloc_objs(*as->pts, SMMU_NUM_PDE);
if (!as->pts) {
kfree(as->count);
iommu_free_pages(as->pd);
diff --git a/drivers/iommu/virtio-iommu.c b/drivers/iommu/virtio-iommu.c
index ba8a70fdb494..587fc13197f1 100644
--- a/drivers/iommu/virtio-iommu.c
+++ b/drivers/iommu/virtio-iommu.c
@@ -670,7 +670,7 @@ static struct iommu_domain *viommu_domain_alloc_paging(struct device *dev)
return ERR_PTR(-ENODEV);
}
- vdomain = kzalloc_obj(*vdomain, GFP_KERNEL);
+ vdomain = kzalloc_obj(*vdomain);
if (!vdomain)
return ERR_PTR(-ENOMEM);
@@ -1028,7 +1028,7 @@ static struct iommu_device *viommu_probe_device(struct device *dev)
if (!viommu)
return ERR_PTR(-ENODEV);
- vdev = kzalloc_obj(*vdev, GFP_KERNEL);
+ vdev = kzalloc_obj(*vdev);
if (!vdev)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/ipack/carriers/tpci200.c b/drivers/ipack/carriers/tpci200.c
index 6d1058dc8faa..341fde71356e 100644
--- a/drivers/ipack/carriers/tpci200.c
+++ b/drivers/ipack/carriers/tpci200.c
@@ -209,7 +209,7 @@ static int tpci200_request_irq(struct ipack_device *dev,
goto out_unlock;
}
- slot_irq = kzalloc_obj(struct slot_irq, GFP_KERNEL);
+ slot_irq = kzalloc_obj(struct slot_irq);
if (slot_irq == NULL) {
dev_err(&dev->dev,
"Slot [%d:%d] unable to allocate memory for IRQ !\n",
@@ -487,7 +487,7 @@ static int tpci200_create_device(struct tpci200_board *tpci200, int i)
int ret;
enum ipack_space space;
struct ipack_device *dev =
- kzalloc_obj(struct ipack_device, GFP_KERNEL);
+ kzalloc_obj(struct ipack_device);
if (!dev)
return -ENOMEM;
dev->slot = i;
@@ -521,11 +521,11 @@ static int tpci200_pci_probe(struct pci_dev *pdev,
struct tpci200_board *tpci200;
u32 reg32;
- tpci200 = kzalloc_obj(struct tpci200_board, GFP_KERNEL);
+ tpci200 = kzalloc_obj(struct tpci200_board);
if (!tpci200)
return -ENOMEM;
- tpci200->info = kzalloc_obj(struct tpci200_infos, GFP_KERNEL);
+ tpci200->info = kzalloc_obj(struct tpci200_infos);
if (!tpci200->info) {
ret = -ENOMEM;
goto err_tpci200;
diff --git a/drivers/ipack/devices/ipoctal.c b/drivers/ipack/devices/ipoctal.c
index 563fdf197101..1bbefc6de708 100644
--- a/drivers/ipack/devices/ipoctal.c
+++ b/drivers/ipack/devices/ipoctal.c
@@ -688,7 +688,7 @@ static int ipoctal_probe(struct ipack_device *dev)
int res;
struct ipoctal *ipoctal;
- ipoctal = kzalloc_obj(struct ipoctal, GFP_KERNEL);
+ ipoctal = kzalloc_obj(struct ipoctal);
if (ipoctal == NULL)
return -ENOMEM;
diff --git a/drivers/ipack/ipack.c b/drivers/ipack/ipack.c
index d4ec786bf98d..28214f862ab1 100644
--- a/drivers/ipack/ipack.c
+++ b/drivers/ipack/ipack.c
@@ -203,7 +203,7 @@ struct ipack_bus_device *ipack_bus_register(struct device *parent, int slots,
int bus_nr;
struct ipack_bus_device *bus;
- bus = kzalloc_obj(*bus, GFP_KERNEL);
+ bus = kzalloc_obj(*bus);
if (!bus)
return NULL;
diff --git a/drivers/irqchip/exynos-combiner.c b/drivers/irqchip/exynos-combiner.c
index 8776f2ba4bae..11d105457798 100644
--- a/drivers/irqchip/exynos-combiner.c
+++ b/drivers/irqchip/exynos-combiner.c
@@ -176,7 +176,7 @@ static void __init combiner_init(void __iomem *combiner_base,
nr_irq = max_nr * IRQ_IN_COMBINER;
- combiner_data = kzalloc_objs(*combiner_data, max_nr, GFP_KERNEL);
+ combiner_data = kzalloc_objs(*combiner_data, max_nr);
if (!combiner_data)
return;
diff --git a/drivers/irqchip/irq-al-fic.c b/drivers/irqchip/irq-al-fic.c
index f6b637bebcc0..d10ac9b63c99 100644
--- a/drivers/irqchip/irq-al-fic.c
+++ b/drivers/irqchip/irq-al-fic.c
@@ -194,7 +194,7 @@ static struct al_fic *al_fic_wire_init(struct device_node *node,
int ret;
u32 control = CONTROL_MASK_MSI_X;
- fic = kzalloc_obj(*fic, GFP_KERNEL);
+ fic = kzalloc_obj(*fic);
if (!fic)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/irqchip/irq-apple-aic.c b/drivers/irqchip/irq-apple-aic.c
index e09939e279f6..2b24c82bb0df 100644
--- a/drivers/irqchip/irq-apple-aic.c
+++ b/drivers/irqchip/irq-apple-aic.c
@@ -921,7 +921,7 @@ static void build_fiq_affinity(struct aic_irq_chip *ic, struct device_node *aff)
if (WARN_ON(n < 0))
return;
- ic->fiq_aff[fiq] = kzalloc_obj(*ic->fiq_aff[fiq], GFP_KERNEL);
+ ic->fiq_aff[fiq] = kzalloc_obj(*ic->fiq_aff[fiq]);
if (!ic->fiq_aff[fiq])
return;
@@ -959,7 +959,7 @@ static int __init aic_of_ic_init(struct device_node *node, struct device_node *p
if (WARN_ON(!regs))
return -EIO;
- irqc = kzalloc_obj(*irqc, GFP_KERNEL);
+ irqc = kzalloc_obj(*irqc);
if (!irqc) {
iounmap(regs);
return -ENOMEM;
diff --git a/drivers/irqchip/irq-armada-370-xp.c b/drivers/irqchip/irq-armada-370-xp.c
index 84e8f204edef..1ba82ac0c26b 100644
--- a/drivers/irqchip/irq-armada-370-xp.c
+++ b/drivers/irqchip/irq-armada-370-xp.c
@@ -835,7 +835,7 @@ static int __init mpic_of_init(struct device_node *node, struct device_node *par
struct mpic *mpic;
int err;
- mpic = kzalloc_obj(*mpic, GFP_KERNEL);
+ mpic = kzalloc_obj(*mpic);
if (WARN_ON(!mpic))
return -ENOMEM;
diff --git a/drivers/irqchip/irq-aspeed-i2c-ic.c b/drivers/irqchip/irq-aspeed-i2c-ic.c
index 35189fd06b3d..7996fd5cbae6 100644
--- a/drivers/irqchip/irq-aspeed-i2c-ic.c
+++ b/drivers/irqchip/irq-aspeed-i2c-ic.c
@@ -66,7 +66,7 @@ static int __init aspeed_i2c_ic_of_init(struct device_node *node,
struct aspeed_i2c_ic *i2c_ic;
int ret = 0;
- i2c_ic = kzalloc_obj(*i2c_ic, GFP_KERNEL);
+ i2c_ic = kzalloc_obj(*i2c_ic);
if (!i2c_ic)
return -ENOMEM;
diff --git a/drivers/irqchip/irq-aspeed-intc.c b/drivers/irqchip/irq-aspeed-intc.c
index f3ae18de3b95..4fb0dd8349da 100644
--- a/drivers/irqchip/irq-aspeed-intc.c
+++ b/drivers/irqchip/irq-aspeed-intc.c
@@ -89,7 +89,7 @@ static int __init aspeed_intc_ic_of_init(struct device_node *node,
struct aspeed_intc_ic *intc_ic;
int irq, i, ret = 0;
- intc_ic = kzalloc_obj(*intc_ic, GFP_KERNEL);
+ intc_ic = kzalloc_obj(*intc_ic);
if (!intc_ic)
return -ENOMEM;
diff --git a/drivers/irqchip/irq-aspeed-scu-ic.c b/drivers/irqchip/irq-aspeed-scu-ic.c
index 170fc82091da..097cf45b2126 100644
--- a/drivers/irqchip/irq-aspeed-scu-ic.c
+++ b/drivers/irqchip/irq-aspeed-scu-ic.c
@@ -270,7 +270,7 @@ static int __init aspeed_scu_ic_of_init(struct device_node *node, struct device_
if (!variant)
return -ENODEV;
- scu_ic = kzalloc_obj(*scu_ic, GFP_KERNEL);
+ scu_ic = kzalloc_obj(*scu_ic);
if (!scu_ic)
return -ENOMEM;
diff --git a/drivers/irqchip/irq-aspeed-vic.c b/drivers/irqchip/irq-aspeed-vic.c
index 35cd50aaed81..6649b893f39c 100644
--- a/drivers/irqchip/irq-aspeed-vic.c
+++ b/drivers/irqchip/irq-aspeed-vic.c
@@ -196,7 +196,7 @@ static int __init avic_of_init(struct device_node *node,
if (WARN_ON(!regs))
return -EIO;
- vic = kzalloc_obj(struct aspeed_vic, GFP_KERNEL);
+ vic = kzalloc_obj(struct aspeed_vic);
if (WARN_ON(!vic)) {
iounmap(regs);
return -ENOMEM;
diff --git a/drivers/irqchip/irq-atmel-aic-common.c b/drivers/irqchip/irq-atmel-aic-common.c
index 087eed7ed6db..7a1d60ee0d51 100644
--- a/drivers/irqchip/irq-atmel-aic-common.c
+++ b/drivers/irqchip/irq-atmel-aic-common.c
@@ -213,7 +213,7 @@ struct irq_domain *__init aic_common_of_init(struct device_node *node,
if (!reg_base)
return ERR_PTR(-ENOMEM);
- aic = kzalloc_objs(*aic, nchips, GFP_KERNEL);
+ aic = kzalloc_objs(*aic, nchips);
if (!aic) {
ret = -ENOMEM;
goto err_iounmap;
diff --git a/drivers/irqchip/irq-bcm2712-mip.c b/drivers/irqchip/irq-bcm2712-mip.c
index 118ab4ac6714..06a6ab6270ad 100644
--- a/drivers/irqchip/irq-bcm2712-mip.c
+++ b/drivers/irqchip/irq-bcm2712-mip.c
@@ -238,7 +238,7 @@ static int mip_msi_probe(struct platform_device *pdev, struct device_node *paren
struct mip_priv *mip;
int ret;
- mip = kzalloc_obj(*mip, GFP_KERNEL);
+ mip = kzalloc_obj(*mip);
if (!mip)
return -ENOMEM;
diff --git a/drivers/irqchip/irq-bcm6345-l1.c b/drivers/irqchip/irq-bcm6345-l1.c
index 956c53dffca3..35aab9488edc 100644
--- a/drivers/irqchip/irq-bcm6345-l1.c
+++ b/drivers/irqchip/irq-bcm6345-l1.c
@@ -296,7 +296,7 @@ static int __init bcm6345_l1_of_init(struct device_node *dn,
unsigned int idx;
int ret;
- intc = kzalloc_obj(*intc, GFP_KERNEL);
+ intc = kzalloc_obj(*intc);
if (!intc)
return -ENOMEM;
diff --git a/drivers/irqchip/irq-bcm7038-l1.c b/drivers/irqchip/irq-bcm7038-l1.c
index 3f838f019f4d..fe56c7b5828b 100644
--- a/drivers/irqchip/irq-bcm7038-l1.c
+++ b/drivers/irqchip/irq-bcm7038-l1.c
@@ -398,7 +398,7 @@ static int bcm7038_l1_probe(struct platform_device *pdev, struct device_node *pa
struct bcm7038_l1_chip *intc;
int idx, ret;
- intc = kzalloc_obj(*intc, GFP_KERNEL);
+ intc = kzalloc_obj(*intc);
if (!intc)
return -ENOMEM;
diff --git a/drivers/irqchip/irq-bcm7120-l2.c b/drivers/irqchip/irq-bcm7120-l2.c
index 341b4e62b942..dd6df9004ecb 100644
--- a/drivers/irqchip/irq-bcm7120-l2.c
+++ b/drivers/irqchip/irq-bcm7120-l2.c
@@ -220,7 +220,7 @@ static int bcm7120_l2_intc_probe(struct platform_device *pdev, struct device_nod
unsigned int idx, irq, flags;
u32 valid_mask[MAX_WORDS] = { };
- data = kzalloc_obj(*data, GFP_KERNEL);
+ data = kzalloc_obj(*data);
if (!data)
return -ENOMEM;
diff --git a/drivers/irqchip/irq-brcmstb-l2.c b/drivers/irqchip/irq-brcmstb-l2.c
index c5f4c79e7ea9..d336ac822ea0 100644
--- a/drivers/irqchip/irq-brcmstb-l2.c
+++ b/drivers/irqchip/irq-brcmstb-l2.c
@@ -151,7 +151,7 @@ static int brcmstb_l2_intc_probe(struct platform_device *pdev, struct device_nod
int parent_irq;
void __iomem *base;
- data = kzalloc_obj(*data, GFP_KERNEL);
+ data = kzalloc_obj(*data);
if (!data)
return -ENOMEM;
diff --git a/drivers/irqchip/irq-clps711x.c b/drivers/irqchip/irq-clps711x.c
index 80b9f7bc7bbd..995bbd126f90 100644
--- a/drivers/irqchip/irq-clps711x.c
+++ b/drivers/irqchip/irq-clps711x.c
@@ -155,7 +155,7 @@ static int __init _clps711x_intc_init(struct device_node *np,
{
int err;
- clps711x_intc = kzalloc_obj(*clps711x_intc, GFP_KERNEL);
+ clps711x_intc = kzalloc_obj(*clps711x_intc);
if (!clps711x_intc)
return -ENOMEM;
diff --git a/drivers/irqchip/irq-crossbar.c b/drivers/irqchip/irq-crossbar.c
index c3ddffc28bbd..cd1134101ace 100644
--- a/drivers/irqchip/irq-crossbar.c
+++ b/drivers/irqchip/irq-crossbar.c
@@ -199,7 +199,7 @@ static int __init crossbar_of_init(struct device_node *node)
const __be32 *irqsr;
int ret = -ENOMEM;
- cb = kzalloc_obj(*cb, GFP_KERNEL);
+ cb = kzalloc_obj(*cb);
if (!cb)
return ret;
@@ -268,7 +268,7 @@ static int __init crossbar_of_init(struct device_node *node)
}
- cb->register_offsets = kzalloc_objs(int, max, GFP_KERNEL);
+ cb->register_offsets = kzalloc_objs(int, max);
if (!cb->register_offsets)
goto err_irq_map;
diff --git a/drivers/irqchip/irq-gic-v2m.c b/drivers/irqchip/irq-gic-v2m.c
index d9215d785bcc..bd85bd344f25 100644
--- a/drivers/irqchip/irq-gic-v2m.c
+++ b/drivers/irqchip/irq-gic-v2m.c
@@ -293,7 +293,7 @@ static int __init gicv2m_init_one(struct fwnode_handle *fwnode,
int ret;
struct v2m_data *v2m;
- v2m = kzalloc_obj(struct v2m_data, GFP_KERNEL);
+ v2m = kzalloc_obj(struct v2m_data);
if (!v2m)
return -ENOMEM;
diff --git a/drivers/irqchip/irq-gic-v3-its.c b/drivers/irqchip/irq-gic-v3-its.c
index 4f3212caa1ef..9ac431afdd33 100644
--- a/drivers/irqchip/irq-gic-v3-its.c
+++ b/drivers/irqchip/irq-gic-v3-its.c
@@ -2108,7 +2108,7 @@ static struct lpi_range *mk_lpi_range(u32 base, u32 span)
{
struct lpi_range *range;
- range = kmalloc_obj(*range, GFP_KERNEL);
+ range = kmalloc_obj(*range);
if (range) {
range->base_id = base;
range->span = span;
@@ -3493,7 +3493,7 @@ static struct its_device *its_create_device(struct its_node *its, u32 dev_id,
itt = itt_alloc_pool(its->numa_node, sz);
- dev = kzalloc_obj(*dev, GFP_KERNEL);
+ dev = kzalloc_obj(*dev);
if (alloc_lpis) {
lpi_map = its_lpi_alloc(nvecs, &lpi_base, &nr_lpis);
@@ -5139,7 +5139,7 @@ static int its_init_domain(struct its_node *its)
};
struct msi_domain_info *info;
- info = kzalloc_obj(*info, GFP_KERNEL);
+ info = kzalloc_obj(*info);
if (!info)
return -ENOMEM;
@@ -5169,7 +5169,7 @@ static int its_init_vpe_domain(void)
its = list_first_entry(&its_nodes, struct its_node, entry);
entries = roundup_pow_of_two(nr_cpu_ids);
- vpe_proxy.vpes = kzalloc_objs(*vpe_proxy.vpes, entries, GFP_KERNEL);
+ vpe_proxy.vpes = kzalloc_objs(*vpe_proxy.vpes, entries);
if (!vpe_proxy.vpes)
return -ENOMEM;
@@ -5513,7 +5513,7 @@ static struct its_node __init *its_node_init(struct resource *res,
pr_info("ITS %pR\n", res);
- its = kzalloc_obj(*its, GFP_KERNEL);
+ its = kzalloc_obj(*its);
if (!its)
goto out_unmap;
@@ -5679,7 +5679,7 @@ static void __init acpi_table_parse_srat_its(void)
if (count <= 0)
return;
- its_srat_maps = kmalloc_objs(struct its_srat_map, count, GFP_KERNEL);
+ its_srat_maps = kmalloc_objs(struct its_srat_map, count);
if (!its_srat_maps)
return;
diff --git a/drivers/irqchip/irq-gic-v3-mbi.c b/drivers/irqchip/irq-gic-v3-mbi.c
index 9254a5e92577..62504deb6cd3 100644
--- a/drivers/irqchip/irq-gic-v3-mbi.c
+++ b/drivers/irqchip/irq-gic-v3-mbi.c
@@ -231,7 +231,7 @@ int __init mbi_init(struct fwnode_handle *fwnode, struct irq_domain *parent)
return -EINVAL;
mbi_range_nr = n / 2;
- mbi_ranges = kzalloc_objs(*mbi_ranges, mbi_range_nr, GFP_KERNEL);
+ mbi_ranges = kzalloc_objs(*mbi_ranges, mbi_range_nr);
if (!mbi_ranges)
return -ENOMEM;
diff --git a/drivers/irqchip/irq-gic-v3.c b/drivers/irqchip/irq-gic-v3.c
index 602870a2b8f8..20f13b686ab2 100644
--- a/drivers/irqchip/irq-gic-v3.c
+++ b/drivers/irqchip/irq-gic-v3.c
@@ -2090,7 +2090,7 @@ static void __init gic_populate_ppi_partitions(struct device_node *gic_node)
if (!nr_parts)
goto out_put_node;
- parts = kzalloc_objs(*parts, nr_parts, GFP_KERNEL);
+ parts = kzalloc_objs(*parts, nr_parts);
if (WARN_ON(!parts))
goto out_put_node;
@@ -2218,7 +2218,7 @@ static int __init gic_of_init(struct device_node *node, struct device_node *pare
if (of_property_read_u32(node, "#redistributor-regions", &nr_redist_regions))
nr_redist_regions = 1;
- rdist_regs = kzalloc_objs(*rdist_regs, nr_redist_regions, GFP_KERNEL);
+ rdist_regs = kzalloc_objs(*rdist_regs, nr_redist_regions);
if (!rdist_regs) {
err = -ENOMEM;
goto out_unmap_dist;
diff --git a/drivers/irqchip/irq-gic-v5-irs.c b/drivers/irqchip/irq-gic-v5-irs.c
index 8379e975a172..e518e5dfede7 100644
--- a/drivers/irqchip/irq-gic-v5-irs.c
+++ b/drivers/irqchip/irq-gic-v5-irs.c
@@ -727,7 +727,7 @@ static int __init gicv5_irs_of_init(struct device_node *node)
u32 idr;
int ret;
- irs_data = kzalloc_obj(*irs_data, GFP_KERNEL);
+ irs_data = kzalloc_obj(*irs_data);
if (!irs_data)
return -ENOMEM;
@@ -913,7 +913,7 @@ static int __init gic_acpi_parse_madt_irs(union acpi_subtable_headers *header,
int ret;
/* Per-IRS data structure */
- irs_data = kzalloc_obj(*irs_data, GFP_KERNEL);
+ irs_data = kzalloc_obj(*irs_data);
if (!irs_data)
return -ENOMEM;
diff --git a/drivers/irqchip/irq-gic-v5-its.c b/drivers/irqchip/irq-gic-v5-its.c
index 96c67e168e6f..36a8d1368f0e 100644
--- a/drivers/irqchip/irq-gic-v5-its.c
+++ b/drivers/irqchip/irq-gic-v5-its.c
@@ -757,7 +757,7 @@ static struct gicv5_its_dev *gicv5_its_alloc_device(struct gicv5_its_chip_data *
return ERR_PTR(-EBUSY);
}
- its_dev = kzalloc_obj(*its_dev, GFP_KERNEL);
+ its_dev = kzalloc_obj(*its_dev);
if (!its_dev)
return ERR_PTR(-ENOMEM);
@@ -1100,7 +1100,7 @@ static int gicv5_its_init_domain(struct gicv5_its_chip_data *its, struct irq_dom
};
struct msi_domain_info *info;
- info = kzalloc_obj(*info, GFP_KERNEL);
+ info = kzalloc_obj(*info);
if (!info)
return -ENOMEM;
@@ -1125,7 +1125,7 @@ static int __init gicv5_its_init_bases(void __iomem *its_base, struct fwnode_han
bool enabled;
int ret;
- its_node = kzalloc_obj(*its_node, GFP_KERNEL);
+ its_node = kzalloc_obj(*its_node);
if (!its_node)
return -ENOMEM;
diff --git a/drivers/irqchip/irq-goldfish-pic.c b/drivers/irqchip/irq-goldfish-pic.c
index c2047ccf4360..d458cf898f8e 100644
--- a/drivers/irqchip/irq-goldfish-pic.c
+++ b/drivers/irqchip/irq-goldfish-pic.c
@@ -61,7 +61,7 @@ static int __init goldfish_pic_of_init(struct device_node *of_node,
unsigned int parent_irq;
int ret = 0;
- gfpic = kzalloc_obj(*gfpic, GFP_KERNEL);
+ gfpic = kzalloc_obj(*gfpic);
if (!gfpic) {
ret = -ENOMEM;
goto out_err;
diff --git a/drivers/irqchip/irq-idt3243x.c b/drivers/irqchip/irq-idt3243x.c
index 6812396c6268..8b150c7f7e46 100644
--- a/drivers/irqchip/irq-idt3243x.c
+++ b/drivers/irqchip/irq-idt3243x.c
@@ -52,7 +52,7 @@ static int idt_pic_init(struct device_node *of_node, struct device_node *parent)
unsigned int parent_irq;
int ret = 0;
- idtpic = kzalloc_obj(*idtpic, GFP_KERNEL);
+ idtpic = kzalloc_obj(*idtpic);
if (!idtpic) {
ret = -ENOMEM;
goto out_err;
diff --git a/drivers/irqchip/irq-imx-gpcv2.c b/drivers/irqchip/irq-imx-gpcv2.c
index 7fff14c7b917..6ea10d3356a7 100644
--- a/drivers/irqchip/irq-imx-gpcv2.c
+++ b/drivers/irqchip/irq-imx-gpcv2.c
@@ -231,7 +231,7 @@ static int __init imx_gpcv2_irqchip_init(struct device_node *node,
return -ENXIO;
}
- cd = kzalloc_obj(struct gpcv2_irqchip_data, GFP_KERNEL);
+ cd = kzalloc_obj(struct gpcv2_irqchip_data);
if (!cd)
return -ENOMEM;
diff --git a/drivers/irqchip/irq-ingenic-tcu.c b/drivers/irqchip/irq-ingenic-tcu.c
index e4028ddeb0e8..eebfdf107bd9 100644
--- a/drivers/irqchip/irq-ingenic-tcu.c
+++ b/drivers/irqchip/irq-ingenic-tcu.c
@@ -96,7 +96,7 @@ static int __init ingenic_tcu_irq_init(struct device_node *np,
if (IS_ERR(map))
return PTR_ERR(map);
- tcu = kzalloc_obj(*tcu, GFP_KERNEL);
+ tcu = kzalloc_obj(*tcu);
if (!tcu)
return -ENOMEM;
diff --git a/drivers/irqchip/irq-ingenic.c b/drivers/irqchip/irq-ingenic.c
index fbbe655fa234..27d8c7f87dad 100644
--- a/drivers/irqchip/irq-ingenic.c
+++ b/drivers/irqchip/irq-ingenic.c
@@ -67,7 +67,7 @@ static int __init ingenic_intc_of_init(struct device_node *node,
int parent_irq, err = 0;
unsigned i;
- intc = kzalloc_obj(*intc, GFP_KERNEL);
+ intc = kzalloc_obj(*intc);
if (!intc) {
err = -ENOMEM;
goto out_err;
diff --git a/drivers/irqchip/irq-loongarch-avec.c b/drivers/irqchip/irq-loongarch-avec.c
index cbea378c25c3..758262fd5bd6 100644
--- a/drivers/irqchip/irq-loongarch-avec.c
+++ b/drivers/irqchip/irq-loongarch-avec.c
@@ -276,7 +276,7 @@ static int avecintc_domain_alloc(struct irq_domain *domain, unsigned int virq,
{
for (unsigned int i = 0; i < nr_irqs; i++) {
struct irq_data *irqd = irq_domain_get_irq_data(domain, virq + i);
- struct avecintc_data *adata = kzalloc_obj(*adata, GFP_KERNEL);
+ struct avecintc_data *adata = kzalloc_obj(*adata);
int ret;
if (!adata)
diff --git a/drivers/irqchip/irq-loongson-eiointc.c b/drivers/irqchip/irq-loongson-eiointc.c
index b219cd18a8f7..a9e8b481d31d 100644
--- a/drivers/irqchip/irq-loongson-eiointc.c
+++ b/drivers/irqchip/irq-loongson-eiointc.c
@@ -584,7 +584,7 @@ int __init eiointc_acpi_init(struct irq_domain *parent,
struct eiointc_priv *priv;
int node;
- priv = kzalloc_obj(*priv, GFP_KERNEL);
+ priv = kzalloc_obj(*priv);
if (!priv)
return -ENOMEM;
@@ -633,7 +633,7 @@ static int __init eiointc_of_init(struct device_node *of_node,
struct irq_data *irq_data;
int parent_irq, ret;
- priv = kzalloc_obj(*priv, GFP_KERNEL);
+ priv = kzalloc_obj(*priv);
if (!priv)
return -ENOMEM;
diff --git a/drivers/irqchip/irq-loongson-htpic.c b/drivers/irqchip/irq-loongson-htpic.c
index f0ea5dad7a1c..2d78112f7fc7 100644
--- a/drivers/irqchip/irq-loongson-htpic.c
+++ b/drivers/irqchip/irq-loongson-htpic.c
@@ -95,7 +95,7 @@ static int __init htpic_of_init(struct device_node *node, struct device_node *pa
return -ENODEV;
}
- htpic = kzalloc_obj(*htpic, GFP_KERNEL);
+ htpic = kzalloc_obj(*htpic);
if (!htpic)
return -ENOMEM;
diff --git a/drivers/irqchip/irq-loongson-htvec.c b/drivers/irqchip/irq-loongson-htvec.c
index 4645948222ee..75e40ba6069d 100644
--- a/drivers/irqchip/irq-loongson-htvec.c
+++ b/drivers/irqchip/irq-loongson-htvec.c
@@ -192,7 +192,7 @@ static int htvec_init(phys_addr_t addr, unsigned long size,
int i;
struct htvec *priv;
- priv = kzalloc_obj(*priv, GFP_KERNEL);
+ priv = kzalloc_obj(*priv);
if (!priv)
return -ENOMEM;
diff --git a/drivers/irqchip/irq-loongson-liointc.c b/drivers/irqchip/irq-loongson-liointc.c
index 44b03de6091a..cf44a333b9c8 100644
--- a/drivers/irqchip/irq-loongson-liointc.c
+++ b/drivers/irqchip/irq-loongson-liointc.c
@@ -205,7 +205,7 @@ static int liointc_init(phys_addr_t addr, unsigned long size, int revision,
struct irq_domain *domain;
struct liointc_priv *priv;
- priv = kzalloc_obj(*priv, GFP_KERNEL);
+ priv = kzalloc_obj(*priv);
if (!priv)
return -ENOMEM;
diff --git a/drivers/irqchip/irq-loongson-pch-lpc.c b/drivers/irqchip/irq-loongson-pch-lpc.c
index 7a074077d8ba..3ad46ec94e3c 100644
--- a/drivers/irqchip/irq-loongson-pch-lpc.c
+++ b/drivers/irqchip/irq-loongson-pch-lpc.c
@@ -183,7 +183,7 @@ int __init pch_lpc_acpi_init(struct irq_domain *parent,
struct irq_fwspec fwspec;
struct fwnode_handle *irq_handle;
- priv = kzalloc_obj(*priv, GFP_KERNEL);
+ priv = kzalloc_obj(*priv);
if (!priv)
return -ENOMEM;
diff --git a/drivers/irqchip/irq-loongson-pch-msi.c b/drivers/irqchip/irq-loongson-pch-msi.c
index 9a2d3804bc6e..99a8dd88c48a 100644
--- a/drivers/irqchip/irq-loongson-pch-msi.c
+++ b/drivers/irqchip/irq-loongson-pch-msi.c
@@ -177,7 +177,7 @@ static int pch_msi_init(phys_addr_t msg_address, int irq_base, int irq_count,
int ret;
struct pch_msi_data *priv;
- priv = kzalloc_obj(*priv, GFP_KERNEL);
+ priv = kzalloc_obj(*priv);
if (!priv)
return -ENOMEM;
diff --git a/drivers/irqchip/irq-loongson-pch-pic.c b/drivers/irqchip/irq-loongson-pch-pic.c
index b50fd928e1f6..98fc1770e2a5 100644
--- a/drivers/irqchip/irq-loongson-pch-pic.c
+++ b/drivers/irqchip/irq-loongson-pch-pic.c
@@ -329,7 +329,7 @@ static int pch_pic_init(phys_addr_t addr, unsigned long size, int vec_base,
struct pch_pic *priv;
int i;
- priv = kzalloc_obj(*priv, GFP_KERNEL);
+ priv = kzalloc_obj(*priv);
if (!priv)
return -ENOMEM;
diff --git a/drivers/irqchip/irq-lpc32xx.c b/drivers/irqchip/irq-lpc32xx.c
index 7dfd46d8dab2..6ff93df614f8 100644
--- a/drivers/irqchip/irq-lpc32xx.c
+++ b/drivers/irqchip/irq-lpc32xx.c
@@ -198,7 +198,7 @@ static int __init lpc32xx_of_ic_init(struct device_node *node,
const __be32 *reg = of_get_property(node, "reg", NULL);
u32 parent_irq, i, addr = reg ? be32_to_cpu(*reg) : 0;
- irqc = kzalloc_obj(*irqc, GFP_KERNEL);
+ irqc = kzalloc_obj(*irqc);
if (!irqc)
return -ENOMEM;
diff --git a/drivers/irqchip/irq-ls1x.c b/drivers/irqchip/irq-ls1x.c
index 5c39e02d40aa..208f9d4cd99f 100644
--- a/drivers/irqchip/irq-ls1x.c
+++ b/drivers/irqchip/irq-ls1x.c
@@ -108,7 +108,7 @@ static int __init ls1x_intc_of_init(struct device_node *node,
struct ls1x_intc_priv *priv;
int parent_irq, err = 0;
- priv = kzalloc_obj(*priv, GFP_KERNEL);
+ priv = kzalloc_obj(*priv);
if (!priv)
return -ENOMEM;
diff --git a/drivers/irqchip/irq-mchp-eic.c b/drivers/irqchip/irq-mchp-eic.c
index 15f4d17a2612..be007d325e67 100644
--- a/drivers/irqchip/irq-mchp-eic.c
+++ b/drivers/irqchip/irq-mchp-eic.c
@@ -209,7 +209,7 @@ static int mchp_eic_probe(struct platform_device *pdev, struct device_node *pare
struct irq_domain *parent_domain = NULL;
int ret, i;
- eic = kzalloc_obj(*eic, GFP_KERNEL);
+ eic = kzalloc_obj(*eic);
if (!eic)
return -ENOMEM;
diff --git a/drivers/irqchip/irq-meson-gpio.c b/drivers/irqchip/irq-meson-gpio.c
index a19fa5a5ba3e..f722e9c57e2e 100644
--- a/drivers/irqchip/irq-meson-gpio.c
+++ b/drivers/irqchip/irq-meson-gpio.c
@@ -601,7 +601,7 @@ static int meson_gpio_irq_probe(struct platform_device *pdev, struct device_node
return -ENXIO;
}
- ctl = kzalloc_obj(*ctl, GFP_KERNEL);
+ ctl = kzalloc_obj(*ctl);
if (!ctl)
return -ENOMEM;
diff --git a/drivers/irqchip/irq-mips-cpu.c b/drivers/irqchip/irq-mips-cpu.c
index 37a8221be9fa..c5ae8920acda 100644
--- a/drivers/irqchip/irq-mips-cpu.c
+++ b/drivers/irqchip/irq-mips-cpu.c
@@ -237,7 +237,7 @@ static void mips_cpu_register_ipi_domain(struct device_node *of_node)
{
struct cpu_ipi_domain_state *ipi_domain_state;
- ipi_domain_state = kzalloc_obj(*ipi_domain_state, GFP_KERNEL);
+ ipi_domain_state = kzalloc_obj(*ipi_domain_state);
ipi_domain = irq_domain_create_hierarchy(irq_domain, IRQ_DOMAIN_FLAG_IPI_SINGLE, 2,
of_fwnode_handle(of_node),
&mips_cpu_ipi_chip_ops, ipi_domain_state);
diff --git a/drivers/irqchip/irq-mst-intc.c b/drivers/irqchip/irq-mst-intc.c
index e4c1281e9ae4..b5335f6fd6d6 100644
--- a/drivers/irqchip/irq-mst-intc.c
+++ b/drivers/irqchip/irq-mst-intc.c
@@ -263,7 +263,7 @@ static int __init mst_intc_of_init(struct device_node *dn,
of_property_read_u32_index(dn, "mstar,irqs-map-range", 1, &irq_end))
return -EINVAL;
- cd = kzalloc_obj(*cd, GFP_KERNEL);
+ cd = kzalloc_obj(*cd);
if (!cd)
return -ENOMEM;
diff --git a/drivers/irqchip/irq-mtk-cirq.c b/drivers/irqchip/irq-mtk-cirq.c
index 1ac2b2ae94cf..914d1d639fe3 100644
--- a/drivers/irqchip/irq-mtk-cirq.c
+++ b/drivers/irqchip/irq-mtk-cirq.c
@@ -311,7 +311,7 @@ static int __init mtk_cirq_of_init(struct device_node *node,
return -EINVAL;
}
- cirq_data = kzalloc_obj(*cirq_data, GFP_KERNEL);
+ cirq_data = kzalloc_obj(*cirq_data);
if (!cirq_data)
return -ENOMEM;
diff --git a/drivers/irqchip/irq-mtk-sysirq.c b/drivers/irqchip/irq-mtk-sysirq.c
index 1988bb02b4d3..d057209e1d15 100644
--- a/drivers/irqchip/irq-mtk-sysirq.c
+++ b/drivers/irqchip/irq-mtk-sysirq.c
@@ -133,7 +133,7 @@ static int __init mtk_sysirq_of_init(struct device_node *node,
return -EINVAL;
}
- chip_data = kzalloc_obj(*chip_data, GFP_KERNEL);
+ chip_data = kzalloc_obj(*chip_data);
if (!chip_data)
return -ENOMEM;
diff --git a/drivers/irqchip/irq-mvebu-odmi.c b/drivers/irqchip/irq-mvebu-odmi.c
index 933511ec6d1f..b99ab9dcc14b 100644
--- a/drivers/irqchip/irq-mvebu-odmi.c
+++ b/drivers/irqchip/irq-mvebu-odmi.c
@@ -178,7 +178,7 @@ static int __init mvebu_odmi_init(struct device_node *node,
if (of_property_read_u32(node, "marvell,odmi-frames", &odmis_count))
return -EINVAL;
- odmis = kzalloc_objs(struct odmi_data, odmis_count, GFP_KERNEL);
+ odmis = kzalloc_objs(struct odmi_data, odmis_count);
if (!odmis)
return -ENOMEM;
diff --git a/drivers/irqchip/irq-owl-sirq.c b/drivers/irqchip/irq-owl-sirq.c
index f1985a2dc6a1..cf14780488be 100644
--- a/drivers/irqchip/irq-owl-sirq.c
+++ b/drivers/irqchip/irq-owl-sirq.c
@@ -288,7 +288,7 @@ static int __init owl_sirq_init(const struct owl_sirq_params *params,
return -ENXIO;
}
- chip_data = kzalloc_obj(*chip_data, GFP_KERNEL);
+ chip_data = kzalloc_obj(*chip_data);
if (!chip_data)
return -ENOMEM;
diff --git a/drivers/irqchip/irq-pic32-evic.c b/drivers/irqchip/irq-pic32-evic.c
index be99b64bc35d..e85c3e300701 100644
--- a/drivers/irqchip/irq-pic32-evic.c
+++ b/drivers/irqchip/irq-pic32-evic.c
@@ -221,7 +221,7 @@ static int __init pic32_of_init(struct device_node *node,
if (!evic_base)
return -ENOMEM;
- priv = kzalloc_objs(*priv, nchips, GFP_KERNEL);
+ priv = kzalloc_objs(*priv, nchips);
if (!priv) {
ret = -ENOMEM;
goto err_iounmap;
diff --git a/drivers/irqchip/irq-riscv-imsic-state.c b/drivers/irqchip/irq-riscv-imsic-state.c
index 101b871a6014..61f46fd800fc 100644
--- a/drivers/irqchip/irq-riscv-imsic-state.c
+++ b/drivers/irqchip/irq-riscv-imsic-state.c
@@ -810,7 +810,7 @@ int __init imsic_setup_state(struct fwnode_handle *fwnode, void *opaque)
return -ENODEV;
}
- imsic = kzalloc_obj(*imsic, GFP_KERNEL);
+ imsic = kzalloc_obj(*imsic);
if (!imsic)
return -ENOMEM;
imsic->fwnode = fwnode;
@@ -828,14 +828,14 @@ int __init imsic_setup_state(struct fwnode_handle *fwnode, void *opaque)
goto out_free_local;
/* Allocate MMIO resource array */
- mmios = kzalloc_objs(*mmios, nr_mmios, GFP_KERNEL);
+ mmios = kzalloc_objs(*mmios, nr_mmios);
if (!mmios) {
rc = -ENOMEM;
goto out_free_local;
}
/* Allocate MMIO virtual address array */
- mmios_va = kzalloc_objs(*mmios_va, nr_mmios, GFP_KERNEL);
+ mmios_va = kzalloc_objs(*mmios_va, nr_mmios);
if (!mmios_va) {
rc = -ENOMEM;
goto out_iounmap;
diff --git a/drivers/irqchip/irq-riscv-intc.c b/drivers/irqchip/irq-riscv-intc.c
index 8533a516de1c..85fbe72deda5 100644
--- a/drivers/irqchip/irq-riscv-intc.c
+++ b/drivers/irqchip/irq-riscv-intc.c
@@ -356,7 +356,7 @@ static int __init riscv_intc_acpi_init(union acpi_subtable_headers *header,
}
rintc = (struct acpi_madt_rintc *)header;
- rintc_acpi_data[nr_rintc] = kzalloc_obj(*rintc_acpi_data[0], GFP_KERNEL);
+ rintc_acpi_data[nr_rintc] = kzalloc_obj(*rintc_acpi_data[0]);
if (!rintc_acpi_data[nr_rintc])
return -ENOMEM;
diff --git a/drivers/irqchip/irq-sifive-plic.c b/drivers/irqchip/irq-sifive-plic.c
index 39e85561e8b3..686d39254426 100644
--- a/drivers/irqchip/irq-sifive-plic.c
+++ b/drivers/irqchip/irq-sifive-plic.c
@@ -640,7 +640,7 @@ static int plic_probe(struct fwnode_handle *fwnode)
if (error)
goto fail_free_regs;
- priv = kzalloc_obj(*priv, GFP_KERNEL);
+ priv = kzalloc_obj(*priv);
if (!priv) {
error = -ENOMEM;
goto fail_free_regs;
diff --git a/drivers/irqchip/irq-sni-exiu.c b/drivers/irqchip/irq-sni-exiu.c
index 2e5596048988..bfd2adedf8f3 100644
--- a/drivers/irqchip/irq-sni-exiu.c
+++ b/drivers/irqchip/irq-sni-exiu.c
@@ -199,7 +199,7 @@ static struct exiu_irq_data *exiu_init(const struct fwnode_handle *fwnode,
struct exiu_irq_data *data;
int err;
- data = kzalloc_obj(*data, GFP_KERNEL);
+ data = kzalloc_obj(*data);
if (!data)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/irqchip/irq-starfive-jh8100-intc.c b/drivers/irqchip/irq-starfive-jh8100-intc.c
index aa0a15f97ccf..bb62ef363d0b 100644
--- a/drivers/irqchip/irq-starfive-jh8100-intc.c
+++ b/drivers/irqchip/irq-starfive-jh8100-intc.c
@@ -123,7 +123,7 @@ static int starfive_intc_probe(struct platform_device *pdev, struct device_node
int parent_irq;
int ret;
- irqc = kzalloc_obj(*irqc, GFP_KERNEL);
+ irqc = kzalloc_obj(*irqc);
if (!irqc)
return -ENOMEM;
diff --git a/drivers/irqchip/irq-stm32-exti.c b/drivers/irqchip/irq-stm32-exti.c
index c27aaf7e506a..983b944ea292 100644
--- a/drivers/irqchip/irq-stm32-exti.c
+++ b/drivers/irqchip/irq-stm32-exti.c
@@ -269,7 +269,7 @@ stm32_exti_host_data *stm32_exti_host_init(const struct stm32_exti_drv_data *dd,
{
struct stm32_exti_host_data *host_data;
- host_data = kzalloc_obj(*host_data, GFP_KERNEL);
+ host_data = kzalloc_obj(*host_data);
if (!host_data)
return NULL;
diff --git a/drivers/irqchip/irq-sun4i.c b/drivers/irqchip/irq-sun4i.c
index dde777304171..b095d45da75d 100644
--- a/drivers/irqchip/irq-sun4i.c
+++ b/drivers/irqchip/irq-sun4i.c
@@ -146,7 +146,7 @@ static int __init sun4i_of_init(struct device_node *node,
static int __init sun4i_ic_of_init(struct device_node *node,
struct device_node *parent)
{
- irq_ic_data = kzalloc_obj(struct sun4i_irq_chip_data, GFP_KERNEL);
+ irq_ic_data = kzalloc_obj(struct sun4i_irq_chip_data);
if (!irq_ic_data)
return -ENOMEM;
@@ -161,7 +161,7 @@ IRQCHIP_DECLARE(allwinner_sun4i_ic, "allwinner,sun4i-a10-ic", sun4i_ic_of_init);
static int __init suniv_ic_of_init(struct device_node *node,
struct device_node *parent)
{
- irq_ic_data = kzalloc_obj(struct sun4i_irq_chip_data, GFP_KERNEL);
+ irq_ic_data = kzalloc_obj(struct sun4i_irq_chip_data);
if (!irq_ic_data)
return -ENOMEM;
diff --git a/drivers/irqchip/irq-tegra.c b/drivers/irqchip/irq-tegra.c
index f0cd19f88cf0..b449e9cc4034 100644
--- a/drivers/irqchip/irq-tegra.c
+++ b/drivers/irqchip/irq-tegra.c
@@ -302,7 +302,7 @@ static int __init tegra_ictlr_init(struct device_node *node,
soc = match->data;
- lic = kzalloc_obj(*lic, GFP_KERNEL);
+ lic = kzalloc_obj(*lic);
if (!lic)
return -ENOMEM;
diff --git a/drivers/irqchip/irq-ti-sci-inta.c b/drivers/irqchip/irq-ti-sci-inta.c
index 93aaf19fc4bc..f1eb2f92f0ca 100644
--- a/drivers/irqchip/irq-ti-sci-inta.c
+++ b/drivers/irqchip/irq-ti-sci-inta.c
@@ -222,7 +222,7 @@ static struct ti_sci_inta_vint_desc *ti_sci_inta_alloc_parent_irq(struct irq_dom
goto free_vint;
}
- vint_desc = kzalloc_obj(*vint_desc, GFP_KERNEL);
+ vint_desc = kzalloc_obj(*vint_desc);
if (!vint_desc) {
ret = -ENOMEM;
goto free_vint;
diff --git a/drivers/irqchip/irq-vf610-mscm-ir.c b/drivers/irqchip/irq-vf610-mscm-ir.c
index 750b3d5b4c1d..415a54b27566 100644
--- a/drivers/irqchip/irq-vf610-mscm-ir.c
+++ b/drivers/irqchip/irq-vf610-mscm-ir.c
@@ -188,7 +188,7 @@ static int __init vf610_mscm_ir_of_init(struct device_node *node,
return -EINVAL;
}
- mscm_ir_data = kzalloc_obj(*mscm_ir_data, GFP_KERNEL);
+ mscm_ir_data = kzalloc_obj(*mscm_ir_data);
if (!mscm_ir_data)
return -ENOMEM;
diff --git a/drivers/irqchip/irq-vt8500.c b/drivers/irqchip/irq-vt8500.c
index 48bd0ac5cf63..b159e17ed1df 100644
--- a/drivers/irqchip/irq-vt8500.c
+++ b/drivers/irqchip/irq-vt8500.c
@@ -203,7 +203,7 @@ static int __init vt8500_irq_init(struct device_node *node,
struct vt8500_irq_data *intc;
int irq, i, ret = 0;
- intc = kzalloc_obj(*intc, GFP_KERNEL);
+ intc = kzalloc_obj(*intc);
if (!intc)
return -ENOMEM;
diff --git a/drivers/irqchip/irq-wpcm450-aic.c b/drivers/irqchip/irq-wpcm450-aic.c
index 22ee3cfbfa03..be585ab0306b 100644
--- a/drivers/irqchip/irq-wpcm450-aic.c
+++ b/drivers/irqchip/irq-wpcm450-aic.c
@@ -139,7 +139,7 @@ static int __init wpcm450_aic_of_init(struct device_node *node,
if (parent)
return -EINVAL;
- aic = kzalloc_obj(*aic, GFP_KERNEL);
+ aic = kzalloc_obj(*aic);
if (!aic)
return -ENOMEM;
diff --git a/drivers/irqchip/irq-xilinx-intc.c b/drivers/irqchip/irq-xilinx-intc.c
index b922226adbee..bba6f6dc405e 100644
--- a/drivers/irqchip/irq-xilinx-intc.c
+++ b/drivers/irqchip/irq-xilinx-intc.c
@@ -171,7 +171,7 @@ static int __init xilinx_intc_of_init(struct device_node *intc,
struct xintc_irq_chip *irqc;
int ret, irq;
- irqc = kzalloc_obj(*irqc, GFP_KERNEL);
+ irqc = kzalloc_obj(*irqc);
if (!irqc)
return -ENOMEM;
irqc->base = of_iomap(intc, 0);
diff --git a/drivers/irqchip/qcom-pdc.c b/drivers/irqchip/qcom-pdc.c
index 10d54ab3ad90..32b77fa93f73 100644
--- a/drivers/irqchip/qcom-pdc.c
+++ b/drivers/irqchip/qcom-pdc.c
@@ -318,7 +318,7 @@ static int pdc_setup_pin_mapping(struct device_node *np)
return -EINVAL;
pdc_region_cnt = n / 3;
- pdc_region = kzalloc_objs(*pdc_region, pdc_region_cnt, GFP_KERNEL);
+ pdc_region = kzalloc_objs(*pdc_region, pdc_region_cnt);
if (!pdc_region) {
pdc_region_cnt = 0;
return -ENOMEM;
diff --git a/drivers/isdn/capi/capi.c b/drivers/isdn/capi/capi.c
index b1b367353b4f..b7c04036ace5 100644
--- a/drivers/isdn/capi/capi.c
+++ b/drivers/isdn/capi/capi.c
@@ -215,7 +215,7 @@ static struct capiminor *capiminor_alloc(struct capi20_appl *ap, u32 ncci)
struct device *dev;
unsigned int minor;
- mp = kzalloc_obj(*mp, GFP_KERNEL);
+ mp = kzalloc_obj(*mp);
if (!mp) {
printk(KERN_ERR "capi: can't alloc capiminor\n");
return NULL;
@@ -341,7 +341,7 @@ static struct capincci *capincci_alloc(struct capidev *cdev, u32 ncci)
{
struct capincci *np;
- np = kzalloc_obj(*np, GFP_KERNEL);
+ np = kzalloc_obj(*np);
if (!np)
return NULL;
np->ncci = ncci;
@@ -981,7 +981,7 @@ static int capi_open(struct inode *inode, struct file *file)
{
struct capidev *cdev;
- cdev = kzalloc_obj(*cdev, GFP_KERNEL);
+ cdev = kzalloc_obj(*cdev);
if (!cdev)
return -ENOMEM;
diff --git a/drivers/isdn/capi/capiutil.c b/drivers/isdn/capi/capiutil.c
index 298029340ba8..eec9b36343b7 100644
--- a/drivers/isdn/capi/capiutil.c
+++ b/drivers/isdn/capi/capiutil.c
@@ -618,10 +618,10 @@ _cdebbuf *capi_message2str(u8 *msg)
int __init cdebug_init(void)
{
- g_cmsg = kmalloc_obj(_cmsg, GFP_KERNEL);
+ g_cmsg = kmalloc_obj(_cmsg);
if (!g_cmsg)
return -ENOMEM;
- g_debbuf = kmalloc_obj(_cdebbuf, GFP_KERNEL);
+ g_debbuf = kmalloc_obj(_cdebbuf);
if (!g_debbuf) {
kfree(g_cmsg);
return -ENOMEM;
diff --git a/drivers/isdn/hardware/mISDN/avmfritz.c b/drivers/isdn/hardware/mISDN/avmfritz.c
index e833b45834d2..55e0b9efa194 100644
--- a/drivers/isdn/hardware/mISDN/avmfritz.c
+++ b/drivers/isdn/hardware/mISDN/avmfritz.c
@@ -1090,7 +1090,7 @@ fritzpci_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
int err = -ENOMEM;
struct fritzcard *card;
- card = kzalloc_obj(struct fritzcard, GFP_KERNEL);
+ card = kzalloc_obj(struct fritzcard);
if (!card) {
pr_info("No kmem for fritzcard\n");
return err;
diff --git a/drivers/isdn/hardware/mISDN/hfcmulti.c b/drivers/isdn/hardware/mISDN/hfcmulti.c
index 23db1ca03fa6..b3d28976b33a 100644
--- a/drivers/isdn/hardware/mISDN/hfcmulti.c
+++ b/drivers/isdn/hardware/mISDN/hfcmulti.c
@@ -4777,7 +4777,7 @@ init_e1_port(struct hfc_multi *hc, struct hm_map *m, int pt)
char name[MISDN_MAX_IDLEN];
int bcount = 0;
- dch = kzalloc_obj(struct dchannel, GFP_KERNEL);
+ dch = kzalloc_obj(struct dchannel);
if (!dch)
return -ENOMEM;
dch->debug = debug;
@@ -4795,7 +4795,7 @@ init_e1_port(struct hfc_multi *hc, struct hm_map *m, int pt)
for (ch = 1; ch <= 31; ch++) {
if (!((1 << ch) & hc->bmask[pt])) /* skip unused channel */
continue;
- bch = kzalloc_obj(struct bchannel, GFP_KERNEL);
+ bch = kzalloc_obj(struct bchannel);
if (!bch) {
printk(KERN_ERR "%s: no memory for bchannel\n",
__func__);
@@ -4850,7 +4850,7 @@ init_multi_port(struct hfc_multi *hc, int pt)
int ch, i, ret = 0;
char name[MISDN_MAX_IDLEN];
- dch = kzalloc_obj(struct dchannel, GFP_KERNEL);
+ dch = kzalloc_obj(struct dchannel);
if (!dch)
return -ENOMEM;
dch->debug = debug;
@@ -4868,7 +4868,7 @@ init_multi_port(struct hfc_multi *hc, int pt)
hc->chan[i + 2].port = pt;
hc->chan[i + 2].nt_timer = -1;
for (ch = 0; ch < dch->dev.nrbchan; ch++) {
- bch = kzalloc_obj(struct bchannel, GFP_KERNEL);
+ bch = kzalloc_obj(struct bchannel);
if (!bch) {
printk(KERN_ERR "%s: no memory for bchannel\n",
__func__);
@@ -4991,7 +4991,7 @@ hfcmulti_init(struct hm_map *m, struct pci_dev *pdev,
type[HFC_cnt]);
/* allocate card+fifo structure */
- hc = kzalloc_obj(struct hfc_multi, GFP_KERNEL);
+ hc = kzalloc_obj(struct hfc_multi);
if (!hc) {
printk(KERN_ERR "No kmem for HFC-Multi card\n");
return -ENOMEM;
diff --git a/drivers/isdn/hardware/mISDN/hfcpci.c b/drivers/isdn/hardware/mISDN/hfcpci.c
index 6446eea8d9bb..554a1c640321 100644
--- a/drivers/isdn/hardware/mISDN/hfcpci.c
+++ b/drivers/isdn/hardware/mISDN/hfcpci.c
@@ -2225,7 +2225,7 @@ hfc_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
struct hfc_pci *card;
struct _hfc_map *m = (struct _hfc_map *)ent->driver_data;
- card = kzalloc_obj(struct hfc_pci, GFP_KERNEL);
+ card = kzalloc_obj(struct hfc_pci);
if (!card) {
printk(KERN_ERR "No kmem for HFC card\n");
return err;
diff --git a/drivers/isdn/hardware/mISDN/hfcsusb.c b/drivers/isdn/hardware/mISDN/hfcsusb.c
index 293add6adeaf..227babe83879 100644
--- a/drivers/isdn/hardware/mISDN/hfcsusb.c
+++ b/drivers/isdn/hardware/mISDN/hfcsusb.c
@@ -1696,7 +1696,7 @@ hfcsusb_stop_endpoint(struct hfcsusb *hw, int channel)
static int
setup_hfcsusb(struct hfcsusb *hw)
{
- void *dmabuf = kmalloc_obj(u_char, GFP_KERNEL);
+ void *dmabuf = kmalloc_obj(u_char);
u_char b;
int ret;
@@ -2018,7 +2018,7 @@ hfcsusb_probe(struct usb_interface *intf, const struct usb_device_id *id)
return -EIO;
iface = iface_used;
- hw = kzalloc_obj(struct hfcsusb, GFP_KERNEL);
+ hw = kzalloc_obj(struct hfcsusb);
if (!hw)
return -ENOMEM; /* got no mem */
snprintf(hw->name, MISDN_MAX_IDLEN - 1, "%s", DRIVER_NAME);
diff --git a/drivers/isdn/hardware/mISDN/mISDNinfineon.c b/drivers/isdn/hardware/mISDN/mISDNinfineon.c
index 09d85c5f2ca5..aaa639ad5526 100644
--- a/drivers/isdn/hardware/mISDN/mISDNinfineon.c
+++ b/drivers/isdn/hardware/mISDN/mISDNinfineon.c
@@ -1074,7 +1074,7 @@ inf_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
int err = -ENOMEM;
struct inf_hw *card;
- card = kzalloc_obj(struct inf_hw, GFP_KERNEL);
+ card = kzalloc_obj(struct inf_hw);
if (!card) {
pr_info("No memory for Infineon ISDN card\n");
return err;
@@ -1108,7 +1108,7 @@ inf_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
struct inf_hw *sc;
for (i = 1; i < 4; i++) {
- sc = kzalloc_obj(struct inf_hw, GFP_KERNEL);
+ sc = kzalloc_obj(struct inf_hw);
if (!sc) {
release_card(card);
pci_disable_device(pdev);
diff --git a/drivers/isdn/hardware/mISDN/netjet.c b/drivers/isdn/hardware/mISDN/netjet.c
index e5c28f25d190..8d740d8eacec 100644
--- a/drivers/isdn/hardware/mISDN/netjet.c
+++ b/drivers/isdn/hardware/mISDN/netjet.c
@@ -1070,7 +1070,7 @@ nj_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
return -ENODEV;
}
- card = kzalloc_obj(struct tiger_hw, GFP_KERNEL);
+ card = kzalloc_obj(struct tiger_hw);
if (!card) {
pr_info("No kmem for Netjet\n");
return err;
diff --git a/drivers/isdn/hardware/mISDN/speedfax.c b/drivers/isdn/hardware/mISDN/speedfax.c
index 5df9fd5b0c9c..ab24c3c460e6 100644
--- a/drivers/isdn/hardware/mISDN/speedfax.c
+++ b/drivers/isdn/hardware/mISDN/speedfax.c
@@ -443,7 +443,7 @@ static int
sfaxpci_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
{
int err = -ENOMEM;
- struct sfax_hw *card = kzalloc_obj(struct sfax_hw, GFP_KERNEL);
+ struct sfax_hw *card = kzalloc_obj(struct sfax_hw);
if (!card) {
pr_info("No memory for Speedfax+ PCI\n");
diff --git a/drivers/isdn/hardware/mISDN/w6692.c b/drivers/isdn/hardware/mISDN/w6692.c
index 60bb2f302b1c..a341470c042f 100644
--- a/drivers/isdn/hardware/mISDN/w6692.c
+++ b/drivers/isdn/hardware/mISDN/w6692.c
@@ -1342,7 +1342,7 @@ w6692_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
struct w6692_hw *card;
struct w6692map *m = (struct w6692map *)ent->driver_data;
- card = kzalloc_obj(struct w6692_hw, GFP_KERNEL);
+ card = kzalloc_obj(struct w6692_hw);
if (!card) {
pr_info("No kmem for w6692 card\n");
return err;
diff --git a/drivers/isdn/mISDN/l1oip_core.c b/drivers/isdn/mISDN/l1oip_core.c
index 2e02a81fe760..6866a0d6b382 100644
--- a/drivers/isdn/mISDN/l1oip_core.c
+++ b/drivers/isdn/mISDN/l1oip_core.c
@@ -1370,7 +1370,7 @@ init_card(struct l1oip *hc, int pri, int bundle)
(hc->remoteip >> 8) & 0xff, hc->remoteip & 0xff,
hc->remoteport, hc->ondemand);
- dch = kzalloc_obj(struct dchannel, GFP_KERNEL);
+ dch = kzalloc_obj(struct dchannel);
if (!dch)
return -ENOMEM;
dch->debug = debug;
@@ -1391,7 +1391,7 @@ init_card(struct l1oip *hc, int pri, int bundle)
for (ch = 0; ch < dch->dev.nrbchan; ch++) {
if (ch == 15)
i++;
- bch = kzalloc_obj(struct bchannel, GFP_KERNEL);
+ bch = kzalloc_obj(struct bchannel);
if (!bch) {
printk(KERN_ERR "%s: no memory for bchannel\n",
__func__);
diff --git a/drivers/isdn/mISDN/layer2.c b/drivers/isdn/mISDN/layer2.c
index ea32330c1612..b75869c9f78f 100644
--- a/drivers/isdn/mISDN/layer2.c
+++ b/drivers/isdn/mISDN/layer2.c
@@ -2111,7 +2111,7 @@ create_l2(struct mISDNchannel *ch, u_int protocol, u_long options, int tei,
struct layer2 *l2;
struct channel_req rq;
- l2 = kzalloc_obj(struct layer2, GFP_KERNEL);
+ l2 = kzalloc_obj(struct layer2);
if (!l2) {
printk(KERN_ERR "kzalloc layer2 failed\n");
return NULL;
diff --git a/drivers/isdn/mISDN/stack.c b/drivers/isdn/mISDN/stack.c
index 4226bae0f8c6..4e96684af0aa 100644
--- a/drivers/isdn/mISDN/stack.c
+++ b/drivers/isdn/mISDN/stack.c
@@ -366,7 +366,7 @@ create_stack(struct mISDNdevice *dev)
int err;
DECLARE_COMPLETION_ONSTACK(done);
- newst = kzalloc_obj(struct mISDNstack, GFP_KERNEL);
+ newst = kzalloc_obj(struct mISDNstack);
if (!newst) {
printk(KERN_ERR "kmalloc mISDN_stack failed\n");
return -ENOMEM;
diff --git a/drivers/isdn/mISDN/tei.c b/drivers/isdn/mISDN/tei.c
index e7c1d465cef3..2bad3083be90 100644
--- a/drivers/isdn/mISDN/tei.c
+++ b/drivers/isdn/mISDN/tei.c
@@ -803,7 +803,7 @@ create_new_tei(struct manager *mgr, int tei, int sapi)
printk(KERN_WARNING "%s:no memory for layer2\n", __func__);
return NULL;
}
- l2->tm = kzalloc_obj(struct teimgr, GFP_KERNEL);
+ l2->tm = kzalloc_obj(struct teimgr);
if (!l2->tm) {
kfree(l2);
printk(KERN_WARNING "%s:no memory for teimgr\n", __func__);
@@ -1046,7 +1046,7 @@ create_teimgr(struct manager *mgr, struct channel_req *crq)
crq->adr.tei, crq->adr.sapi);
if (!l2)
return -ENOMEM;
- l2->tm = kzalloc_obj(struct teimgr, GFP_KERNEL);
+ l2->tm = kzalloc_obj(struct teimgr);
if (!l2->tm) {
kfree(l2);
printk(KERN_ERR "kmalloc teimgr failed\n");
@@ -1345,7 +1345,7 @@ create_teimanager(struct mISDNdevice *dev)
{
struct manager *mgr;
- mgr = kzalloc_obj(struct manager, GFP_KERNEL);
+ mgr = kzalloc_obj(struct manager);
if (!mgr)
return -ENOMEM;
INIT_LIST_HEAD(&mgr->layer2);
diff --git a/drivers/isdn/mISDN/timerdev.c b/drivers/isdn/mISDN/timerdev.c
index 25b9625b1cd8..a18845755633 100644
--- a/drivers/isdn/mISDN/timerdev.c
+++ b/drivers/isdn/mISDN/timerdev.c
@@ -47,7 +47,7 @@ mISDN_open(struct inode *ino, struct file *filep)
if (*debug & DEBUG_TIMER)
printk(KERN_DEBUG "%s(%p,%p)\n", __func__, ino, filep);
- dev = kmalloc_obj(struct mISDNtimerdev, GFP_KERNEL);
+ dev = kmalloc_obj(struct mISDNtimerdev);
if (!dev)
return -ENOMEM;
dev->next_id = 1;
@@ -179,7 +179,7 @@ misdn_add_timer(struct mISDNtimerdev *dev, int timeout)
wake_up_interruptible(&dev->wait);
id = 0;
} else {
- timer = kzalloc_obj(struct mISDNtimer, GFP_KERNEL);
+ timer = kzalloc_obj(struct mISDNtimer);
if (!timer)
return -ENOMEM;
timer->dev = dev;
diff --git a/drivers/leds/led-triggers.c b/drivers/leds/led-triggers.c
index 2fdb713307c3..b1223218bda1 100644
--- a/drivers/leds/led-triggers.c
+++ b/drivers/leds/led-triggers.c
@@ -486,7 +486,7 @@ void led_trigger_register_simple(const char *name, struct led_trigger **tp)
struct led_trigger *trig;
int err;
- trig = kzalloc_obj(struct led_trigger, GFP_KERNEL);
+ trig = kzalloc_obj(struct led_trigger);
if (trig) {
trig->name = name;
diff --git a/drivers/leds/rgb/leds-qcom-lpg.c b/drivers/leds/rgb/leds-qcom-lpg.c
index 138c8fb3514c..016bf468e094 100644
--- a/drivers/leds/rgb/leds-qcom-lpg.c
+++ b/drivers/leds/rgb/leds-qcom-lpg.c
@@ -996,7 +996,7 @@ static int lpg_pattern_set(struct lpg_led *led, struct led_pattern *led_pattern,
if (len % 2)
return -EINVAL;
- pattern = kzalloc_objs(*pattern, len / 2, GFP_KERNEL);
+ pattern = kzalloc_objs(*pattern, len / 2);
if (!pattern)
return -ENOMEM;
diff --git a/drivers/leds/trigger/ledtrig-activity.c b/drivers/leds/trigger/ledtrig-activity.c
index 4f0c16b04876..3674bceda718 100644
--- a/drivers/leds/trigger/ledtrig-activity.c
+++ b/drivers/leds/trigger/ledtrig-activity.c
@@ -188,7 +188,7 @@ static int activity_activate(struct led_classdev *led_cdev)
{
struct activity_data *activity_data;
- activity_data = kzalloc_obj(*activity_data, GFP_KERNEL);
+ activity_data = kzalloc_obj(*activity_data);
if (!activity_data)
return -ENOMEM;
diff --git a/drivers/leds/trigger/ledtrig-backlight.c b/drivers/leds/trigger/ledtrig-backlight.c
index 80b33f13beee..e67bc7c2aecb 100644
--- a/drivers/leds/trigger/ledtrig-backlight.c
+++ b/drivers/leds/trigger/ledtrig-backlight.c
@@ -102,7 +102,7 @@ static int bl_trig_activate(struct led_classdev *led)
{
struct bl_trig_notifier *n;
- n = kzalloc_obj(struct bl_trig_notifier, GFP_KERNEL);
+ n = kzalloc_obj(struct bl_trig_notifier);
if (!n)
return -ENOMEM;
led_set_trigger_data(led, n);
diff --git a/drivers/leds/trigger/ledtrig-gpio.c b/drivers/leds/trigger/ledtrig-gpio.c
index eec6de5ea3bc..fc911dfec0ef 100644
--- a/drivers/leds/trigger/ledtrig-gpio.c
+++ b/drivers/leds/trigger/ledtrig-gpio.c
@@ -78,7 +78,7 @@ static int gpio_trig_activate(struct led_classdev *led)
struct device *dev = led->dev;
int ret;
- gpio_data = kzalloc_obj(*gpio_data, GFP_KERNEL);
+ gpio_data = kzalloc_obj(*gpio_data);
if (!gpio_data)
return -ENOMEM;
diff --git a/drivers/leds/trigger/ledtrig-heartbeat.c b/drivers/leds/trigger/ledtrig-heartbeat.c
index 6ad8b486b058..efe0042b3157 100644
--- a/drivers/leds/trigger/ledtrig-heartbeat.c
+++ b/drivers/leds/trigger/ledtrig-heartbeat.c
@@ -129,7 +129,7 @@ static int heartbeat_trig_activate(struct led_classdev *led_cdev)
{
struct heartbeat_trig_data *heartbeat_data;
- heartbeat_data = kzalloc_obj(*heartbeat_data, GFP_KERNEL);
+ heartbeat_data = kzalloc_obj(*heartbeat_data);
if (!heartbeat_data)
return -ENOMEM;
diff --git a/drivers/leds/trigger/ledtrig-input-events.c b/drivers/leds/trigger/ledtrig-input-events.c
index dcdea964311d..d057b2a23967 100644
--- a/drivers/leds/trigger/ledtrig-input-events.c
+++ b/drivers/leds/trigger/ledtrig-input-events.c
@@ -75,7 +75,7 @@ static int input_events_connect(struct input_handler *handler, struct input_dev
struct input_handle *handle;
int ret;
- handle = kzalloc_obj(*handle, GFP_KERNEL);
+ handle = kzalloc_obj(*handle);
if (!handle)
return -ENOMEM;
diff --git a/drivers/leds/trigger/ledtrig-netdev.c b/drivers/leds/trigger/ledtrig-netdev.c
index e15e7dcdbcd9..12cb3311ea22 100644
--- a/drivers/leds/trigger/ledtrig-netdev.c
+++ b/drivers/leds/trigger/ledtrig-netdev.c
@@ -691,7 +691,7 @@ static int netdev_trig_activate(struct led_classdev *led_cdev)
struct device *dev;
int rc;
- trigger_data = kzalloc_obj(struct led_netdev_data, GFP_KERNEL);
+ trigger_data = kzalloc_obj(struct led_netdev_data);
if (!trigger_data)
return -ENOMEM;
diff --git a/drivers/leds/trigger/ledtrig-oneshot.c b/drivers/leds/trigger/ledtrig-oneshot.c
index b825e607bb9f..9068e3bb0bdb 100644
--- a/drivers/leds/trigger/ledtrig-oneshot.c
+++ b/drivers/leds/trigger/ledtrig-oneshot.c
@@ -159,7 +159,7 @@ static int oneshot_trig_activate(struct led_classdev *led_cdev)
{
struct oneshot_trig_data *oneshot_data;
- oneshot_data = kzalloc_obj(*oneshot_data, GFP_KERNEL);
+ oneshot_data = kzalloc_obj(*oneshot_data);
if (!oneshot_data)
return -ENOMEM;
diff --git a/drivers/leds/trigger/ledtrig-pattern.c b/drivers/leds/trigger/ledtrig-pattern.c
index 9eaae7757c8e..8f9cbe54e231 100644
--- a/drivers/leds/trigger/ledtrig-pattern.c
+++ b/drivers/leds/trigger/ledtrig-pattern.c
@@ -465,7 +465,7 @@ static int pattern_trig_activate(struct led_classdev *led_cdev)
{
struct pattern_trig_data *data;
- data = kzalloc_obj(*data, GFP_KERNEL);
+ data = kzalloc_obj(*data);
if (!data)
return -ENOMEM;
diff --git a/drivers/leds/trigger/ledtrig-transient.c b/drivers/leds/trigger/ledtrig-transient.c
index 258e5d8db5b2..8d928bb2a0c5 100644
--- a/drivers/leds/trigger/ledtrig-transient.c
+++ b/drivers/leds/trigger/ledtrig-transient.c
@@ -164,7 +164,7 @@ static int transient_trig_activate(struct led_classdev *led_cdev)
{
struct transient_trig_data *tdata;
- tdata = kzalloc_obj(struct transient_trig_data, GFP_KERNEL);
+ tdata = kzalloc_obj(struct transient_trig_data);
if (!tdata)
return -ENOMEM;
diff --git a/drivers/leds/trigger/ledtrig-tty.c b/drivers/leds/trigger/ledtrig-tty.c
index 4ce915e417f8..8eb6286b33ac 100644
--- a/drivers/leds/trigger/ledtrig-tty.c
+++ b/drivers/leds/trigger/ledtrig-tty.c
@@ -312,7 +312,7 @@ static int ledtrig_tty_activate(struct led_classdev *led_cdev)
{
struct ledtrig_tty_data *trigger_data;
- trigger_data = kzalloc_obj(*trigger_data, GFP_KERNEL);
+ trigger_data = kzalloc_obj(*trigger_data);
if (!trigger_data)
return -ENOMEM;
diff --git a/drivers/leds/uleds.c b/drivers/leds/uleds.c
index b70d203d0b16..ace71ffc0591 100644
--- a/drivers/leds/uleds.c
+++ b/drivers/leds/uleds.c
@@ -53,7 +53,7 @@ static int uleds_open(struct inode *inode, struct file *file)
{
struct uleds_device *udev;
- udev = kzalloc_obj(*udev, GFP_KERNEL);
+ udev = kzalloc_obj(*udev);
if (!udev)
return -ENOMEM;
diff --git a/drivers/macintosh/adb.c b/drivers/macintosh/adb.c
index 959cfbee7387..fe150125e099 100644
--- a/drivers/macintosh/adb.c
+++ b/drivers/macintosh/adb.c
@@ -674,7 +674,7 @@ static int adb_open(struct inode *inode, struct file *file)
ret = -ENXIO;
goto out;
}
- state = kmalloc_obj(struct adbdev_state, GFP_KERNEL);
+ state = kmalloc_obj(struct adbdev_state);
if (!state) {
ret = -ENOMEM;
goto out;
@@ -783,7 +783,7 @@ static ssize_t adb_write(struct file *file, const char __user *buf,
if (adb_controller == NULL)
return -ENXIO;
- req = kmalloc_obj(struct adb_request, GFP_KERNEL);
+ req = kmalloc_obj(struct adb_request);
if (req == NULL)
return -ENOMEM;
diff --git a/drivers/macintosh/adbhid.c b/drivers/macintosh/adbhid.c
index c995f1155a94..6155da58091b 100644
--- a/drivers/macintosh/adbhid.c
+++ b/drivers/macintosh/adbhid.c
@@ -764,7 +764,7 @@ adbhid_input_register(int id, int default_id, int original_handler_id,
return -EEXIST;
}
- adbhid[id] = hid = kzalloc_obj(struct adbhid, GFP_KERNEL);
+ adbhid[id] = hid = kzalloc_obj(struct adbhid);
input_dev = input_allocate_device();
if (!hid || !input_dev) {
err = -ENOMEM;
diff --git a/drivers/macintosh/mac_hid.c b/drivers/macintosh/mac_hid.c
index 37f25b1f68c9..1fdf3855f9bb 100644
--- a/drivers/macintosh/mac_hid.c
+++ b/drivers/macintosh/mac_hid.c
@@ -102,7 +102,7 @@ static int mac_hid_emumouse_connect(struct input_handler *handler,
if (dev == mac_hid_emumouse_dev)
return -ENODEV;
- handle = kzalloc_obj(struct input_handle, GFP_KERNEL);
+ handle = kzalloc_obj(struct input_handle);
if (!handle)
return -ENOMEM;
diff --git a/drivers/macintosh/macio_asic.c b/drivers/macintosh/macio_asic.c
index b11809c41417..ee3caa3d87d1 100644
--- a/drivers/macintosh/macio_asic.c
+++ b/drivers/macintosh/macio_asic.c
@@ -368,7 +368,7 @@ static struct macio_dev * macio_add_one_device(struct macio_chip *chip,
if (np == NULL)
return NULL;
- dev = kzalloc_obj(*dev, GFP_KERNEL);
+ dev = kzalloc_obj(*dev);
if (!dev)
return NULL;
diff --git a/drivers/macintosh/rack-meter.c b/drivers/macintosh/rack-meter.c
index f720c6c64b86..8a1e2c08b096 100644
--- a/drivers/macintosh/rack-meter.c
+++ b/drivers/macintosh/rack-meter.c
@@ -396,7 +396,7 @@ static int rackmeter_probe(struct macio_dev* mdev,
}
/* Create and initialize our instance data */
- rm = kzalloc_obj(*rm, GFP_KERNEL);
+ rm = kzalloc_obj(*rm);
if (rm == NULL) {
printk(KERN_ERR "rackmeter: failed to allocate memory !\n");
rc = -ENOMEM;
diff --git a/drivers/macintosh/smu.c b/drivers/macintosh/smu.c
index 8f1f57a00981..3e6dfb99a5ce 100644
--- a/drivers/macintosh/smu.c
+++ b/drivers/macintosh/smu.c
@@ -1081,7 +1081,7 @@ static int smu_open(struct inode *inode, struct file *file)
struct smu_private *pp;
unsigned long flags;
- pp = kzalloc_obj(struct smu_private, GFP_KERNEL);
+ pp = kzalloc_obj(struct smu_private);
if (!pp)
return -ENOMEM;
spin_lock_init(&pp->lock);
diff --git a/drivers/macintosh/therm_adt746x.c b/drivers/macintosh/therm_adt746x.c
index 0f8ac254ecee..1ac29a5cd324 100644
--- a/drivers/macintosh/therm_adt746x.c
+++ b/drivers/macintosh/therm_adt746x.c
@@ -498,7 +498,7 @@ static int probe_thermostat(struct i2c_client *client)
}
}
- th = kzalloc_obj(struct thermostat, GFP_KERNEL);
+ th = kzalloc_obj(struct thermostat);
if (!th)
return -ENOMEM;
diff --git a/drivers/macintosh/via-pmu.c b/drivers/macintosh/via-pmu.c
index e721c84f51c3..8c652c15018c 100644
--- a/drivers/macintosh/via-pmu.c
+++ b/drivers/macintosh/via-pmu.c
@@ -2147,7 +2147,7 @@ pmu_open(struct inode *inode, struct file *file)
struct pmu_private *pp;
unsigned long flags;
- pp = kmalloc_obj(struct pmu_private, GFP_KERNEL);
+ pp = kmalloc_obj(struct pmu_private);
if (!pp)
return -ENOMEM;
pp->rb_get = pp->rb_put = 0;
diff --git a/drivers/macintosh/windfarm_ad7417_sensor.c b/drivers/macintosh/windfarm_ad7417_sensor.c
index 40af189795d8..4bae07ca6669 100644
--- a/drivers/macintosh/windfarm_ad7417_sensor.c
+++ b/drivers/macintosh/windfarm_ad7417_sensor.c
@@ -260,7 +260,7 @@ static int wf_ad7417_probe(struct i2c_client *client)
return -ENXIO;
}
- pv = kzalloc_obj(struct wf_ad7417_priv, GFP_KERNEL);
+ pv = kzalloc_obj(struct wf_ad7417_priv);
if (pv == NULL)
return -ENODEV;
diff --git a/drivers/macintosh/windfarm_cpufreq_clamp.c b/drivers/macintosh/windfarm_cpufreq_clamp.c
index 570b5428da1a..13ba7488c5c5 100644
--- a/drivers/macintosh/windfarm_cpufreq_clamp.c
+++ b/drivers/macintosh/windfarm_cpufreq_clamp.c
@@ -94,7 +94,7 @@ static int __init wf_cpufreq_clamp_init(void)
goto fail;
}
- clamp = kmalloc_obj(struct wf_control, GFP_KERNEL);
+ clamp = kmalloc_obj(struct wf_control);
if (clamp == NULL) {
ret = -ENOMEM;
goto fail;
diff --git a/drivers/macintosh/windfarm_fcu_controls.c b/drivers/macintosh/windfarm_fcu_controls.c
index c3b95f968592..9def86e0cd04 100644
--- a/drivers/macintosh/windfarm_fcu_controls.c
+++ b/drivers/macintosh/windfarm_fcu_controls.c
@@ -363,7 +363,7 @@ static void wf_fcu_add_fan(struct wf_fcu_priv *pv, const char *name,
{
struct wf_fcu_fan *fan;
- fan = kzalloc_obj(*fan, GFP_KERNEL);
+ fan = kzalloc_obj(*fan);
if (!fan)
return;
fan->fcu_priv = pv;
@@ -518,7 +518,7 @@ static int wf_fcu_probe(struct i2c_client *client)
{
struct wf_fcu_priv *pv;
- pv = kzalloc_obj(*pv, GFP_KERNEL);
+ pv = kzalloc_obj(*pv);
if (!pv)
return -ENOMEM;
diff --git a/drivers/macintosh/windfarm_lm75_sensor.c b/drivers/macintosh/windfarm_lm75_sensor.c
index 188a1a56e34c..128e9944429a 100644
--- a/drivers/macintosh/windfarm_lm75_sensor.c
+++ b/drivers/macintosh/windfarm_lm75_sensor.c
@@ -130,7 +130,7 @@ static int wf_lm75_probe(struct i2c_client *client)
return -ENXIO;
- lm = kzalloc_obj(struct wf_lm75_sensor, GFP_KERNEL);
+ lm = kzalloc_obj(struct wf_lm75_sensor);
if (lm == NULL)
return -ENODEV;
diff --git a/drivers/macintosh/windfarm_lm87_sensor.c b/drivers/macintosh/windfarm_lm87_sensor.c
index dcaba5c7bec1..a571035daff6 100644
--- a/drivers/macintosh/windfarm_lm87_sensor.c
+++ b/drivers/macintosh/windfarm_lm87_sensor.c
@@ -128,7 +128,7 @@ static int wf_lm87_probe(struct i2c_client *client)
return -ENODEV;
}
- lm = kzalloc_obj(struct wf_lm87_sensor, GFP_KERNEL);
+ lm = kzalloc_obj(struct wf_lm87_sensor);
if (lm == NULL)
return -ENODEV;
diff --git a/drivers/macintosh/windfarm_max6690_sensor.c b/drivers/macintosh/windfarm_max6690_sensor.c
index be9e75e2d3cf..26b6436e0bb2 100644
--- a/drivers/macintosh/windfarm_max6690_sensor.c
+++ b/drivers/macintosh/windfarm_max6690_sensor.c
@@ -85,7 +85,7 @@ static int wf_max6690_probe(struct i2c_client *client)
else
return -ENXIO;
- max = kzalloc_obj(struct wf_6690_sensor, GFP_KERNEL);
+ max = kzalloc_obj(struct wf_6690_sensor);
if (max == NULL) {
printk(KERN_ERR "windfarm: Couldn't create MAX6690 sensor: "
"no memory\n");
diff --git a/drivers/macintosh/windfarm_pm121.c b/drivers/macintosh/windfarm_pm121.c
index 82e2e4aa6b2e..5e29670d41ff 100644
--- a/drivers/macintosh/windfarm_pm121.c
+++ b/drivers/macintosh/windfarm_pm121.c
@@ -668,7 +668,7 @@ static void pm121_create_cpu_fans(void)
tmax = 0x5e0000; /* 94 degree default */
/* Alloc & initialize state */
- pm121_cpu_state = kmalloc_obj(struct pm121_cpu_state, GFP_KERNEL);
+ pm121_cpu_state = kmalloc_obj(struct pm121_cpu_state);
if (pm121_cpu_state == NULL)
goto fail;
pm121_cpu_state->ticks = 1;
diff --git a/drivers/macintosh/windfarm_pm81.c b/drivers/macintosh/windfarm_pm81.c
index f62a647a66a3..2a4a3746f6a0 100644
--- a/drivers/macintosh/windfarm_pm81.c
+++ b/drivers/macintosh/windfarm_pm81.c
@@ -283,7 +283,7 @@ static void wf_smu_create_sys_fans(void)
}
/* Alloc & initialize state */
- wf_smu_sys_fans = kmalloc_obj(struct wf_smu_sys_fans_state, GFP_KERNEL);
+ wf_smu_sys_fans = kmalloc_obj(struct wf_smu_sys_fans_state);
if (wf_smu_sys_fans == NULL) {
printk(KERN_WARNING "windfarm: Memory allocation error"
" max fan speed\n");
@@ -418,7 +418,7 @@ static void wf_smu_create_cpu_fans(void)
tmax = 0x5e0000; /* 94 degree default */
/* Alloc & initialize state */
- wf_smu_cpu_fans = kmalloc_obj(struct wf_smu_cpu_fans_state, GFP_KERNEL);
+ wf_smu_cpu_fans = kmalloc_obj(struct wf_smu_cpu_fans_state);
if (wf_smu_cpu_fans == NULL)
goto fail;
wf_smu_cpu_fans->ticks = 1;
diff --git a/drivers/macintosh/windfarm_pm91.c b/drivers/macintosh/windfarm_pm91.c
index 398e61352e16..229be06fda14 100644
--- a/drivers/macintosh/windfarm_pm91.c
+++ b/drivers/macintosh/windfarm_pm91.c
@@ -168,7 +168,7 @@ static void wf_smu_create_cpu_fans(void)
tmax = 0x5e0000; /* 94 degree default */
/* Alloc & initialize state */
- wf_smu_cpu_fans = kmalloc_obj(struct wf_smu_cpu_fans_state, GFP_KERNEL);
+ wf_smu_cpu_fans = kmalloc_obj(struct wf_smu_cpu_fans_state);
if (wf_smu_cpu_fans == NULL)
goto fail;
wf_smu_cpu_fans->ticks = 1;
diff --git a/drivers/macintosh/windfarm_smu_controls.c b/drivers/macintosh/windfarm_smu_controls.c
index 4cba2b51bd8a..9adceae74345 100644
--- a/drivers/macintosh/windfarm_smu_controls.c
+++ b/drivers/macintosh/windfarm_smu_controls.c
@@ -162,7 +162,7 @@ static struct smu_fan_control *smu_fan_create(struct device_node *node,
const u32 *reg;
const char *l;
- fct = kmalloc_obj(struct smu_fan_control, GFP_KERNEL);
+ fct = kmalloc_obj(struct smu_fan_control);
if (fct == NULL)
return NULL;
fct->ctrl.ops = &smu_fan_ops;
diff --git a/drivers/macintosh/windfarm_smu_sat.c b/drivers/macintosh/windfarm_smu_sat.c
index c613484d7a80..256c1654c295 100644
--- a/drivers/macintosh/windfarm_smu_sat.c
+++ b/drivers/macintosh/windfarm_smu_sat.c
@@ -203,7 +203,7 @@ static int wf_sat_probe(struct i2c_client *client)
char *name;
int vsens[2], isens[2];
- sat = kzalloc_obj(struct wf_sat, GFP_KERNEL);
+ sat = kzalloc_obj(struct wf_sat);
if (sat == NULL)
return -ENOMEM;
sat->nr = -1;
diff --git a/drivers/macintosh/windfarm_smu_sensors.c b/drivers/macintosh/windfarm_smu_sensors.c
index d7c934c5759d..03fda09deb53 100644
--- a/drivers/macintosh/windfarm_smu_sensors.c
+++ b/drivers/macintosh/windfarm_smu_sensors.c
@@ -200,7 +200,7 @@ static struct smu_ad_sensor *smu_ads_create(struct device_node *node)
const char *l;
const u32 *v;
- ads = kmalloc_obj(struct smu_ad_sensor, GFP_KERNEL);
+ ads = kmalloc_obj(struct smu_ad_sensor);
if (ads == NULL)
return NULL;
l = of_get_property(node, "location", NULL);
@@ -338,7 +338,7 @@ smu_cpu_power_create(struct wf_sensor *volts, struct wf_sensor *amps)
{
struct smu_cpu_power_sensor *pow;
- pow = kmalloc_obj(struct smu_cpu_power_sensor, GFP_KERNEL);
+ pow = kmalloc_obj(struct smu_cpu_power_sensor);
if (pow == NULL)
return NULL;
pow->sens.ops = &smu_cpu_power_ops;
diff --git a/drivers/mcb/mcb-core.c b/drivers/mcb/mcb-core.c
index ce17092d5c1f..e6e7c11bac6c 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_obj(struct mcb_bus, GFP_KERNEL);
+ bus = kzalloc_obj(struct mcb_bus);
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_obj(struct mcb_device, GFP_KERNEL);
+ dev = kzalloc_obj(struct mcb_device);
if (!dev)
return NULL;
diff --git a/drivers/mcb/mcb-parse.c b/drivers/mcb/mcb-parse.c
index 934f8d96922d..7e09a0ea80f8 100644
--- a/drivers/mcb/mcb-parse.c
+++ b/drivers/mcb/mcb-parse.c
@@ -146,14 +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 = kzalloc_objs(struct chameleon_bar, bar_count, GFP_KERNEL);
+ c = kzalloc_objs(struct chameleon_bar, bar_count);
if (!c)
return -ENOMEM;
chameleon_parse_bar(*base, c, bar_count);
*base += BAR_DESC_SIZE(bar_count);
} else {
- c = kzalloc_obj(struct chameleon_bar, GFP_KERNEL);
+ c = kzalloc_obj(struct chameleon_bar);
if (!c)
return -ENOMEM;
diff --git a/drivers/md/bcache/alloc.c b/drivers/md/bcache/alloc.c
index 90cc6ed4bd6d..3ec240ec685d 100644
--- a/drivers/md/bcache/alloc.c
+++ b/drivers/md/bcache/alloc.c
@@ -697,7 +697,7 @@ int bch_open_buckets_alloc(struct cache_set *c)
spin_lock_init(&c->data_bucket_lock);
for (i = 0; i < MAX_OPEN_BUCKETS; i++) {
- struct open_bucket *b = kzalloc_obj(*b, GFP_KERNEL);
+ struct open_bucket *b = kzalloc_obj(*b);
if (!b)
return -ENOMEM;
diff --git a/drivers/md/bcache/debug.c b/drivers/md/bcache/debug.c
index 55f5e202015d..2691a5da3368 100644
--- a/drivers/md/bcache/debug.c
+++ b/drivers/md/bcache/debug.c
@@ -208,7 +208,7 @@ static int bch_dump_open(struct inode *inode, struct file *file)
struct cache_set *c = inode->i_private;
struct dump_iterator *i;
- i = kzalloc_obj(struct dump_iterator, GFP_KERNEL);
+ i = kzalloc_obj(struct dump_iterator);
if (!i)
return -ENOMEM;
diff --git a/drivers/md/bcache/super.c b/drivers/md/bcache/super.c
index a304ef80820b..64bb38c95895 100644
--- a/drivers/md/bcache/super.c
+++ b/drivers/md/bcache/super.c
@@ -1527,7 +1527,7 @@ static CLOSURE_CALLBACK(flash_dev_flush)
static int flash_dev_run(struct cache_set *c, struct uuid_entry *u)
{
int err = -ENOMEM;
- struct bcache_device *d = kzalloc_obj(struct bcache_device, GFP_KERNEL);
+ struct bcache_device *d = kzalloc_obj(struct bcache_device);
if (!d)
goto err_ret;
@@ -1863,7 +1863,7 @@ struct cache_set *bch_cache_set_alloc(struct cache_sb *sb)
{
int iter_size;
struct cache *ca = container_of(sb, struct cache, sb);
- struct cache_set *c = kzalloc_obj(struct cache_set, GFP_KERNEL);
+ struct cache_set *c = kzalloc_obj(struct cache_set);
if (!c)
return NULL;
@@ -2542,8 +2542,8 @@ static void register_device_async(struct async_reg_args *args)
static void *alloc_holder_object(struct cache_sb *sb)
{
if (SB_IS_BDEV(sb))
- return kzalloc_obj(struct cached_dev, GFP_KERNEL);
- return kzalloc_obj(struct cache, GFP_KERNEL);
+ return kzalloc_obj(struct cached_dev);
+ return kzalloc_obj(struct cache);
}
static ssize_t register_bcache(struct kobject *k, struct kobj_attribute *attr,
@@ -2580,7 +2580,7 @@ static ssize_t register_bcache(struct kobject *k, struct kobj_attribute *attr,
if (!path)
goto out_module_put;
- sb = kmalloc_obj(struct cache_sb, GFP_KERNEL);
+ sb = kmalloc_obj(struct cache_sb);
if (!sb)
goto out_free_path;
@@ -2632,7 +2632,7 @@ static ssize_t register_bcache(struct kobject *k, struct kobj_attribute *attr,
if (async_registration) {
/* register in asynchronous way */
struct async_reg_args *args =
- kzalloc_obj(struct async_reg_args, GFP_KERNEL);
+ kzalloc_obj(struct async_reg_args);
if (!args) {
ret = -ENOMEM;
@@ -2709,7 +2709,7 @@ static ssize_t bch_pending_bdevs_cleanup(struct kobject *k,
mutex_lock(&bch_register_lock);
list_for_each_entry_safe(dc, tdc, &uncached_devices, list) {
- pdev = kmalloc_obj(struct pdev, GFP_KERNEL);
+ pdev = kmalloc_obj(struct pdev);
if (!pdev)
break;
pdev->dc = dc;
diff --git a/drivers/md/bcache/sysfs.c b/drivers/md/bcache/sysfs.c
index b30424075106..cfac56caa804 100644
--- a/drivers/md/bcache/sysfs.c
+++ b/drivers/md/bcache/sysfs.c
@@ -415,7 +415,7 @@ STORE(__cached_dev)
buf, SB_LABEL_SIZE);
bch_uuid_write(dc->disk.c);
}
- env = kzalloc_obj(struct kobj_uevent_env, GFP_KERNEL);
+ env = kzalloc_obj(struct kobj_uevent_env);
if (!env)
return -ENOMEM;
add_uevent_var(env, "DRIVER=bcache");
diff --git a/drivers/md/dm-bio-prison-v1.c b/drivers/md/dm-bio-prison-v1.c
index fc8bb30dc533..29b916c05082 100644
--- a/drivers/md/dm-bio-prison-v1.c
+++ b/drivers/md/dm-bio-prison-v1.c
@@ -301,7 +301,7 @@ struct dm_deferred_set *dm_deferred_set_create(void)
int i;
struct dm_deferred_set *ds;
- ds = kmalloc_obj(*ds, GFP_KERNEL);
+ ds = kmalloc_obj(*ds);
if (!ds)
return NULL;
diff --git a/drivers/md/dm-bio-prison-v2.c b/drivers/md/dm-bio-prison-v2.c
index d4daf426c2c7..4e2af53ad99e 100644
--- a/drivers/md/dm-bio-prison-v2.c
+++ b/drivers/md/dm-bio-prison-v2.c
@@ -36,7 +36,7 @@ static struct kmem_cache *_cell_cache;
*/
struct dm_bio_prison_v2 *dm_bio_prison_create_v2(struct workqueue_struct *wq)
{
- struct dm_bio_prison_v2 *prison = kzalloc_obj(*prison, GFP_KERNEL);
+ struct dm_bio_prison_v2 *prison = kzalloc_obj(*prison);
int ret;
if (!prison)
diff --git a/drivers/md/dm-cache-background-tracker.c b/drivers/md/dm-cache-background-tracker.c
index fb5efaab11a3..2ca3a3e2e50e 100644
--- a/drivers/md/dm-cache-background-tracker.c
+++ b/drivers/md/dm-cache-background-tracker.c
@@ -26,7 +26,7 @@ struct kmem_cache *btracker_work_cache = NULL;
struct background_tracker *btracker_create(unsigned int max_work)
{
- struct background_tracker *b = kmalloc_obj(*b, GFP_KERNEL);
+ struct background_tracker *b = kmalloc_obj(*b);
if (!b) {
DMERR("couldn't create background_tracker");
diff --git a/drivers/md/dm-cache-metadata.c b/drivers/md/dm-cache-metadata.c
index 5060a58605a2..57158c02d096 100644
--- a/drivers/md/dm-cache-metadata.c
+++ b/drivers/md/dm-cache-metadata.c
@@ -760,7 +760,7 @@ static struct dm_cache_metadata *metadata_open(struct block_device *bdev,
int r;
struct dm_cache_metadata *cmd;
- cmd = kzalloc_obj(*cmd, GFP_KERNEL);
+ cmd = kzalloc_obj(*cmd);
if (!cmd) {
DMERR("could not allocate metadata struct");
return ERR_PTR(-ENOMEM);
diff --git a/drivers/md/dm-cache-policy-smq.c b/drivers/md/dm-cache-policy-smq.c
index bec1b5e95170..b328d9601046 100644
--- a/drivers/md/dm-cache-policy-smq.c
+++ b/drivers/md/dm-cache-policy-smq.c
@@ -1735,7 +1735,7 @@ __smq_create(dm_cblock_t cache_size, sector_t origin_size, sector_t cache_block_
unsigned int i;
unsigned int nr_sentinels_per_queue = 2u * NR_CACHE_LEVELS;
unsigned int total_sentinels = 2u * nr_sentinels_per_queue;
- struct smq_policy *mq = kzalloc_obj(*mq, GFP_KERNEL);
+ struct smq_policy *mq = kzalloc_obj(*mq);
if (!mq)
return NULL;
diff --git a/drivers/md/dm-cache-target.c b/drivers/md/dm-cache-target.c
index be1af992b931..935ab79b1d0c 100644
--- a/drivers/md/dm-cache-target.c
+++ b/drivers/md/dm-cache-target.c
@@ -2387,7 +2387,7 @@ static int cache_create(struct cache_args *ca, struct cache **result)
struct dm_cache_metadata *cmd;
bool may_format = ca->features.mode == CM_WRITE;
- cache = kzalloc_obj(*cache, GFP_KERNEL);
+ cache = kzalloc_obj(*cache);
if (!cache)
return -ENOMEM;
@@ -2612,7 +2612,7 @@ static int cache_ctr(struct dm_target *ti, unsigned int argc, char **argv)
struct cache_args *ca;
struct cache *cache = NULL;
- ca = kzalloc_obj(*ca, GFP_KERNEL);
+ ca = kzalloc_obj(*ca);
if (!ca) {
ti->error = "Error allocating memory for cache";
return -ENOMEM;
diff --git a/drivers/md/dm-clone-metadata.c b/drivers/md/dm-clone-metadata.c
index cb474e852548..e50a5b5a4aea 100644
--- a/drivers/md/dm-clone-metadata.c
+++ b/drivers/md/dm-clone-metadata.c
@@ -553,7 +553,7 @@ struct dm_clone_metadata *dm_clone_metadata_open(struct block_device *bdev,
int r;
struct dm_clone_metadata *cmd;
- cmd = kzalloc_obj(*cmd, GFP_KERNEL);
+ cmd = kzalloc_obj(*cmd);
if (!cmd) {
DMERR("Failed to allocate memory for dm-clone metadata");
return ERR_PTR(-ENOMEM);
diff --git a/drivers/md/dm-clone-target.c b/drivers/md/dm-clone-target.c
index c9b25af70063..c0f9b93983d4 100644
--- a/drivers/md/dm-clone-target.c
+++ b/drivers/md/dm-clone-target.c
@@ -580,7 +580,7 @@ static int hash_table_init(struct clone *clone)
sz = 1 << HASH_TABLE_BITS;
- clone->ht = kvmalloc_objs(struct hash_table_bucket, sz, GFP_KERNEL);
+ clone->ht = kvmalloc_objs(struct hash_table_bucket, sz);
if (!clone->ht)
return -ENOMEM;
@@ -1766,7 +1766,7 @@ static int clone_ctr(struct dm_target *ti, unsigned int argc, char **argv)
as.argc = argc;
as.argv = argv;
- clone = kzalloc_obj(*clone, GFP_KERNEL);
+ clone = kzalloc_obj(*clone);
if (!clone) {
ti->error = "Failed to allocate clone structure";
return -ENOMEM;
diff --git a/drivers/md/dm-crypt.c b/drivers/md/dm-crypt.c
index a2f9f0f0db5e..9a17b3b603d1 100644
--- a/drivers/md/dm-crypt.c
+++ b/drivers/md/dm-crypt.c
@@ -2363,7 +2363,7 @@ static int crypt_alloc_tfms_aead(struct crypt_config *cc, char *ciphermode)
{
int err;
- cc->cipher_tfm.tfms = kmalloc_obj(struct crypto_skcipher *, GFP_KERNEL);
+ cc->cipher_tfm.tfms = kmalloc_obj(struct crypto_skcipher *);
if (!cc->cipher_tfm.tfms)
return -ENOMEM;
diff --git a/drivers/md/dm-delay.c b/drivers/md/dm-delay.c
index 5d2dd07a19b0..4864671c2222 100644
--- a/drivers/md/dm-delay.c
+++ b/drivers/md/dm-delay.c
@@ -224,7 +224,7 @@ static int delay_ctr(struct dm_target *ti, unsigned int argc, char **argv)
return -EINVAL;
}
- dc = kzalloc_obj(*dc, GFP_KERNEL);
+ dc = kzalloc_obj(*dc);
if (!dc) {
ti->error = "Cannot allocate context";
return -ENOMEM;
diff --git a/drivers/md/dm-dust.c b/drivers/md/dm-dust.c
index a91f96bad0b9..c7e3077fb1f5 100644
--- a/drivers/md/dm-dust.c
+++ b/drivers/md/dm-dust.c
@@ -108,7 +108,7 @@ static int dust_add_block(struct dust_device *dd, unsigned long long block,
struct badblock *bblock;
unsigned long flags;
- bblock = kmalloc_obj(*bblock, GFP_KERNEL);
+ bblock = kmalloc_obj(*bblock);
if (bblock == NULL) {
if (!dd->quiet_mode)
DMERR("%s: badblock allocation failed", __func__);
@@ -360,7 +360,7 @@ static int dust_ctr(struct dm_target *ti, unsigned int argc, char **argv)
return -EINVAL;
}
- dd = kzalloc_obj(struct dust_device, GFP_KERNEL);
+ dd = kzalloc_obj(struct dust_device);
if (dd == NULL) {
ti->error = "Cannot allocate context";
return -ENOMEM;
diff --git a/drivers/md/dm-ebs-target.c b/drivers/md/dm-ebs-target.c
index 4c9a25ae90d6..1e52bde48b91 100644
--- a/drivers/md/dm-ebs-target.c
+++ b/drivers/md/dm-ebs-target.c
@@ -257,7 +257,7 @@ static int ebs_ctr(struct dm_target *ti, unsigned int argc, char **argv)
return -EINVAL;
}
- ec = ti->private = kzalloc_obj(*ec, GFP_KERNEL);
+ ec = ti->private = kzalloc_obj(*ec);
if (!ec) {
ti->error = "Cannot allocate ebs context";
return -ENOMEM;
diff --git a/drivers/md/dm-era-target.c b/drivers/md/dm-era-target.c
index 9bec72f04b9b..05285c04ff2c 100644
--- a/drivers/md/dm-era-target.c
+++ b/drivers/md/dm-era-target.c
@@ -808,7 +808,7 @@ static struct era_metadata *metadata_open(struct block_device *bdev,
bool may_format)
{
int r;
- struct era_metadata *md = kzalloc_obj(*md, GFP_KERNEL);
+ struct era_metadata *md = kzalloc_obj(*md);
if (!md)
return NULL;
@@ -1473,7 +1473,7 @@ static int era_ctr(struct dm_target *ti, unsigned int argc, char **argv)
return -EINVAL;
}
- era = kzalloc_obj(*era, GFP_KERNEL);
+ era = kzalloc_obj(*era);
if (!era) {
ti->error = "Error allocating era structure";
return -ENOMEM;
diff --git a/drivers/md/dm-exception-store.c b/drivers/md/dm-exception-store.c
index 91d541c66709..58cbc5e5475b 100644
--- a/drivers/md/dm-exception-store.c
+++ b/drivers/md/dm-exception-store.c
@@ -204,7 +204,7 @@ int dm_exception_store_create(struct dm_target *ti, int argc, char **argv,
return -EINVAL;
}
- tmp_store = kzalloc_obj(*tmp_store, GFP_KERNEL);
+ tmp_store = kzalloc_obj(*tmp_store);
if (!tmp_store) {
ti->error = "Exception store allocation failed";
return -ENOMEM;
diff --git a/drivers/md/dm-flakey.c b/drivers/md/dm-flakey.c
index 922e75bfcf17..572225b0e691 100644
--- a/drivers/md/dm-flakey.c
+++ b/drivers/md/dm-flakey.c
@@ -277,7 +277,7 @@ static int flakey_ctr(struct dm_target *ti, unsigned int argc, char **argv)
return -EINVAL;
}
- fc = kzalloc_obj(*fc, GFP_KERNEL);
+ fc = kzalloc_obj(*fc);
if (!fc) {
ti->error = "Cannot allocate context";
return -ENOMEM;
diff --git a/drivers/md/dm-init.c b/drivers/md/dm-init.c
index 703250739a8a..7403823384c5 100644
--- a/drivers/md/dm-init.c
+++ b/drivers/md/dm-init.c
@@ -127,7 +127,7 @@ static char __init *dm_parse_table_entry(struct dm_device *dev, char *str)
/* Delimit last field that can be terminated by comma */
next = str_field_delimit(&field[i], ',');
- sp = kzalloc_obj(*sp, GFP_KERNEL);
+ sp = kzalloc_obj(*sp);
if (!sp)
return ERR_PTR(-ENOMEM);
dev->table[n] = sp;
@@ -244,7 +244,7 @@ static int __init dm_parse_devices(struct list_head *devices, char *str)
DMDEBUG("parsing \"%s\"", str);
while (device) {
- dev = kzalloc_obj(*dev, GFP_KERNEL);
+ dev = kzalloc_obj(*dev);
if (!dev)
return -ENOMEM;
list_add_tail(&dev->list, devices);
diff --git a/drivers/md/dm-integrity.c b/drivers/md/dm-integrity.c
index 3da3ce600758..a52ee38dc30c 100644
--- a/drivers/md/dm-integrity.c
+++ b/drivers/md/dm-integrity.c
@@ -4296,7 +4296,7 @@ static struct scatterlist **dm_integrity_alloc_journal_scatterlist(struct dm_int
n_pages = (end_index - start_index + 1);
- s = kvmalloc_objs(struct scatterlist, n_pages, GFP_KERNEL);
+ s = kvmalloc_objs(struct scatterlist, n_pages);
if (!s) {
dm_integrity_free_journal_scatterlist(ic, sl);
return NULL;
@@ -4701,7 +4701,7 @@ static int dm_integrity_ctr(struct dm_target *ti, unsigned int argc, char **argv
return -EINVAL;
}
- ic = kzalloc_obj(struct dm_integrity_c, GFP_KERNEL);
+ ic = kzalloc_obj(struct dm_integrity_c);
if (!ic) {
ti->error = "Cannot allocate integrity context";
return -ENOMEM;
diff --git a/drivers/md/dm-io.c b/drivers/md/dm-io.c
index d08399b40dac..1db565b37620 100644
--- a/drivers/md/dm-io.c
+++ b/drivers/md/dm-io.c
@@ -52,7 +52,7 @@ struct dm_io_client *dm_io_client_create(void)
unsigned int min_ios = dm_get_reserved_bio_based_ios();
int ret;
- client = kzalloc_obj(*client, GFP_KERNEL);
+ client = kzalloc_obj(*client);
if (!client)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/md/dm-ioctl.c b/drivers/md/dm-ioctl.c
index 7ab970430acd..3ab8b4beff86 100644
--- a/drivers/md/dm-ioctl.c
+++ b/drivers/md/dm-ioctl.c
@@ -218,7 +218,7 @@ static struct hash_cell *alloc_cell(const char *name, const char *uuid,
{
struct hash_cell *hc;
- hc = kmalloc_obj(*hc, GFP_KERNEL);
+ hc = kmalloc_obj(*hc);
if (!hc)
return NULL;
@@ -2136,7 +2136,7 @@ static int dm_open(struct inode *inode, struct file *filp)
if (unlikely(r))
return r;
- priv = filp->private_data = kmalloc_obj(struct dm_file, GFP_KERNEL);
+ priv = filp->private_data = kmalloc_obj(struct dm_file);
if (!priv)
return -ENOMEM;
diff --git a/drivers/md/dm-kcopyd.c b/drivers/md/dm-kcopyd.c
index 03b81b39c65c..96c8b8ff61c2 100644
--- a/drivers/md/dm-kcopyd.c
+++ b/drivers/md/dm-kcopyd.c
@@ -918,7 +918,7 @@ struct dm_kcopyd_client *dm_kcopyd_client_create(struct dm_kcopyd_throttle *thro
unsigned int reserve_pages;
struct dm_kcopyd_client *kc;
- kc = kzalloc_obj(*kc, GFP_KERNEL);
+ kc = kzalloc_obj(*kc);
if (!kc)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/md/dm-linear.c b/drivers/md/dm-linear.c
index 3123227a6e1d..38c17846deb0 100644
--- a/drivers/md/dm-linear.c
+++ b/drivers/md/dm-linear.c
@@ -39,7 +39,7 @@ static int linear_ctr(struct dm_target *ti, unsigned int argc, char **argv)
return -EINVAL;
}
- lc = kmalloc_obj(*lc, GFP_KERNEL);
+ lc = kmalloc_obj(*lc);
if (lc == NULL) {
ti->error = "Cannot allocate linear context";
return -ENOMEM;
diff --git a/drivers/md/dm-log-userspace-base.c b/drivers/md/dm-log-userspace-base.c
index d1bc7d0c89d9..9d5918eb0a30 100644
--- a/drivers/md/dm-log-userspace-base.c
+++ b/drivers/md/dm-log-userspace-base.c
@@ -205,7 +205,7 @@ static int userspace_ctr(struct dm_dirty_log *log, struct dm_target *ti,
return -EINVAL;
}
- lc = kzalloc_obj(*lc, GFP_KERNEL);
+ lc = kzalloc_obj(*lc);
if (!lc) {
DMWARN("Unable to allocate userspace log context.");
return -ENOMEM;
diff --git a/drivers/md/dm-log-writes.c b/drivers/md/dm-log-writes.c
index a1040e8049aa..c72e07c3f5a0 100644
--- a/drivers/md/dm-log-writes.c
+++ b/drivers/md/dm-log-writes.c
@@ -519,7 +519,7 @@ static int log_writes_ctr(struct dm_target *ti, unsigned int argc, char **argv)
return -EINVAL;
}
- lc = kzalloc_obj(struct log_writes_c, GFP_KERNEL);
+ lc = kzalloc_obj(struct log_writes_c);
if (!lc) {
ti->error = "Cannot allocate context";
return -ENOMEM;
@@ -587,7 +587,7 @@ static int log_mark(struct log_writes_c *lc, char *data)
struct pending_block *block;
size_t maxsize = lc->sectorsize - sizeof(struct log_write_entry);
- block = kzalloc_obj(struct pending_block, GFP_KERNEL);
+ block = kzalloc_obj(struct pending_block);
if (!block) {
DMERR("Error allocating pending block");
return -ENOMEM;
diff --git a/drivers/md/dm-log.c b/drivers/md/dm-log.c
index 7865002678f5..1aa6a4a7d232 100644
--- a/drivers/md/dm-log.c
+++ b/drivers/md/dm-log.c
@@ -153,7 +153,7 @@ struct dm_dirty_log *dm_dirty_log_create(const char *type_name,
struct dm_dirty_log_type *type;
struct dm_dirty_log *log;
- log = kmalloc_obj(*log, GFP_KERNEL);
+ log = kmalloc_obj(*log);
if (!log)
return NULL;
@@ -402,7 +402,7 @@ static int create_log_context(struct dm_dirty_log *log, struct dm_target *ti,
region_count = dm_sector_div_up(ti->len, region_size);
- lc = kmalloc_obj(*lc, GFP_KERNEL);
+ lc = kmalloc_obj(*lc);
if (!lc) {
DMWARN("couldn't allocate core log");
return -ENOMEM;
diff --git a/drivers/md/dm-mpath.c b/drivers/md/dm-mpath.c
index e47cfdf4f5d1..8f4ae2f51545 100644
--- a/drivers/md/dm-mpath.c
+++ b/drivers/md/dm-mpath.c
@@ -160,7 +160,7 @@ static bool mpath_double_check_test_bit(int MPATHF_bit, struct multipath *m)
*/
static struct pgpath *alloc_pgpath(void)
{
- struct pgpath *pgpath = kzalloc_obj(*pgpath, GFP_KERNEL);
+ struct pgpath *pgpath = kzalloc_obj(*pgpath);
if (!pgpath)
return NULL;
@@ -179,7 +179,7 @@ static struct priority_group *alloc_priority_group(void)
{
struct priority_group *pg;
- pg = kzalloc_obj(*pg, GFP_KERNEL);
+ pg = kzalloc_obj(*pg);
if (pg)
INIT_LIST_HEAD(&pg->pgpaths);
@@ -216,7 +216,7 @@ static struct multipath *alloc_multipath(struct dm_target *ti)
{
struct multipath *m;
- m = kzalloc_obj(*m, GFP_KERNEL);
+ m = kzalloc_obj(*m);
if (m) {
INIT_LIST_HEAD(&m->priority_groups);
spin_lock_init(&m->lock);
diff --git a/drivers/md/dm-path-selector.c b/drivers/md/dm-path-selector.c
index 28dc759e957a..006a7991f45b 100644
--- a/drivers/md/dm-path-selector.c
+++ b/drivers/md/dm-path-selector.c
@@ -87,7 +87,7 @@ void dm_put_path_selector(struct path_selector_type *pst)
static struct ps_internal *_alloc_path_selector(struct path_selector_type *pst)
{
- struct ps_internal *psi = kzalloc_obj(*psi, GFP_KERNEL);
+ struct ps_internal *psi = kzalloc_obj(*psi);
if (psi)
psi->pst = *pst;
diff --git a/drivers/md/dm-pcache/dm_pcache.c b/drivers/md/dm-pcache/dm_pcache.c
index c36f2afdadc1..81c795c0400e 100644
--- a/drivers/md/dm-pcache/dm_pcache.c
+++ b/drivers/md/dm-pcache/dm_pcache.c
@@ -281,7 +281,7 @@ static int dm_pcache_ctr(struct dm_target *ti, unsigned int argc, char **argv)
}
/* Allocate memory for the cache structure */
- pcache = kzalloc_obj(struct dm_pcache, GFP_KERNEL);
+ pcache = kzalloc_obj(struct dm_pcache);
if (!pcache)
return -ENOMEM;
diff --git a/drivers/md/dm-ps-historical-service-time.c b/drivers/md/dm-ps-historical-service-time.c
index a526b5ab0453..c4755112287a 100644
--- a/drivers/md/dm-ps-historical-service-time.c
+++ b/drivers/md/dm-ps-historical-service-time.c
@@ -129,7 +129,7 @@ static u64 fixed_ema(u64 last, u64 next, u64 weight)
static struct selector *alloc_selector(void)
{
- struct selector *s = kmalloc_obj(*s, GFP_KERNEL);
+ struct selector *s = kmalloc_obj(*s);
if (s) {
INIT_LIST_HEAD(&s->valid_paths);
@@ -289,7 +289,7 @@ static int hst_add_path(struct path_selector *ps, struct dm_path *path,
}
/* allocate the path */
- pi = kmalloc_obj(*pi, GFP_KERNEL);
+ pi = kmalloc_obj(*pi);
if (!pi) {
*error = "historical-service-time ps: Error allocating path context";
return -ENOMEM;
diff --git a/drivers/md/dm-ps-io-affinity.c b/drivers/md/dm-ps-io-affinity.c
index 5d69a4a93684..526d94d138f9 100644
--- a/drivers/md/dm-ps-io-affinity.c
+++ b/drivers/md/dm-ps-io-affinity.c
@@ -53,7 +53,7 @@ static int ioa_add_path(struct path_selector *ps, struct dm_path *path,
return -EINVAL;
}
- pi = kzalloc_obj(*pi, GFP_KERNEL);
+ pi = kzalloc_obj(*pi);
if (!pi) {
*error = "io-affinity ps: Error allocating path context";
return -ENOMEM;
@@ -112,11 +112,11 @@ static int ioa_create(struct path_selector *ps, unsigned int argc, char **argv)
{
struct selector *s;
- s = kmalloc_obj(*s, GFP_KERNEL);
+ s = kmalloc_obj(*s);
if (!s)
return -ENOMEM;
- s->path_map = kzalloc_objs(struct path_info *, nr_cpu_ids, GFP_KERNEL);
+ s->path_map = kzalloc_objs(struct path_info *, nr_cpu_ids);
if (!s->path_map)
goto free_selector;
diff --git a/drivers/md/dm-ps-queue-length.c b/drivers/md/dm-ps-queue-length.c
index d2663b1b136c..4afea160afab 100644
--- a/drivers/md/dm-ps-queue-length.c
+++ b/drivers/md/dm-ps-queue-length.c
@@ -42,7 +42,7 @@ struct path_info {
static struct selector *alloc_selector(void)
{
- struct selector *s = kmalloc_obj(*s, GFP_KERNEL);
+ struct selector *s = kmalloc_obj(*s);
if (s) {
INIT_LIST_HEAD(&s->valid_paths);
@@ -142,7 +142,7 @@ static int ql_add_path(struct path_selector *ps, struct dm_path *path,
}
/* Allocate the path information structure */
- pi = kmalloc_obj(*pi, GFP_KERNEL);
+ pi = kmalloc_obj(*pi);
if (!pi) {
*error = "queue-length ps: Error allocating path information";
return -ENOMEM;
diff --git a/drivers/md/dm-ps-round-robin.c b/drivers/md/dm-ps-round-robin.c
index ec8b9f27d3e7..81c89cda3158 100644
--- a/drivers/md/dm-ps-round-robin.c
+++ b/drivers/md/dm-ps-round-robin.c
@@ -55,7 +55,7 @@ struct selector {
static struct selector *alloc_selector(void)
{
- struct selector *s = kmalloc_obj(*s, GFP_KERNEL);
+ struct selector *s = kmalloc_obj(*s);
if (s) {
INIT_LIST_HEAD(&s->valid_paths);
@@ -144,7 +144,7 @@ static int rr_add_path(struct path_selector *ps, struct dm_path *path,
}
/* allocate the path */
- pi = kmalloc_obj(*pi, GFP_KERNEL);
+ pi = kmalloc_obj(*pi);
if (!pi) {
*error = "round-robin ps: Error allocating path context";
return -ENOMEM;
diff --git a/drivers/md/dm-ps-service-time.c b/drivers/md/dm-ps-service-time.c
index dc119955fadd..83721910e5ea 100644
--- a/drivers/md/dm-ps-service-time.c
+++ b/drivers/md/dm-ps-service-time.c
@@ -38,7 +38,7 @@ struct path_info {
static struct selector *alloc_selector(void)
{
- struct selector *s = kmalloc_obj(*s, GFP_KERNEL);
+ struct selector *s = kmalloc_obj(*s);
if (s) {
INIT_LIST_HEAD(&s->valid_paths);
@@ -153,7 +153,7 @@ static int st_add_path(struct path_selector *ps, struct dm_path *path,
}
/* allocate the path */
- pi = kmalloc_obj(*pi, GFP_KERNEL);
+ pi = kmalloc_obj(*pi);
if (!pi) {
*error = "service-time ps: Error allocating path context";
return -ENOMEM;
diff --git a/drivers/md/dm-region-hash.c b/drivers/md/dm-region-hash.c
index a3489965103c..3ad3aecfdff7 100644
--- a/drivers/md/dm-region-hash.c
+++ b/drivers/md/dm-region-hash.c
@@ -184,7 +184,7 @@ struct dm_region_hash *dm_region_hash_create(
;
nr_buckets >>= 1;
- rh = kzalloc_obj(*rh, GFP_KERNEL);
+ rh = kzalloc_obj(*rh);
if (!rh) {
DMERR("unable to allocate region hash memory");
return ERR_PTR(-ENOMEM);
diff --git a/drivers/md/dm-snap-persistent.c b/drivers/md/dm-snap-persistent.c
index c8128af1dcad..2f429ca8e5aa 100644
--- a/drivers/md/dm-snap-persistent.c
+++ b/drivers/md/dm-snap-persistent.c
@@ -854,7 +854,7 @@ static int persistent_ctr(struct dm_exception_store *store, char *options)
int r;
/* allocate the pstore */
- ps = kzalloc_obj(*ps, GFP_KERNEL);
+ ps = kzalloc_obj(*ps);
if (!ps)
return -ENOMEM;
diff --git a/drivers/md/dm-snap-transient.c b/drivers/md/dm-snap-transient.c
index b7b449db6c34..8680d38cdfcc 100644
--- a/drivers/md/dm-snap-transient.c
+++ b/drivers/md/dm-snap-transient.c
@@ -77,7 +77,7 @@ static int transient_ctr(struct dm_exception_store *store, char *options)
{
struct transient_c *tc;
- tc = kmalloc_obj(struct transient_c, GFP_KERNEL);
+ tc = kmalloc_obj(struct transient_c);
if (!tc)
return -ENOMEM;
diff --git a/drivers/md/dm-snap.c b/drivers/md/dm-snap.c
index 5a77ccd33232..f31e4b8f4457 100644
--- a/drivers/md/dm-snap.c
+++ b/drivers/md/dm-snap.c
@@ -354,7 +354,7 @@ static int init_origin_hash(void)
{
int i;
- _origins = kmalloc_objs(struct list_head, ORIGIN_HASH_SIZE, GFP_KERNEL);
+ _origins = kmalloc_objs(struct list_head, ORIGIN_HASH_SIZE);
if (!_origins) {
DMERR("unable to allocate memory for _origins");
return -ENOMEM;
@@ -557,7 +557,7 @@ static int register_snapshot(struct dm_snapshot *snap)
struct block_device *bdev = snap->origin->bdev;
int r = 0;
- new_o = kmalloc_obj(*new_o, GFP_KERNEL);
+ new_o = kmalloc_obj(*new_o);
if (!new_o)
return -ENOMEM;
@@ -664,7 +664,7 @@ static int dm_exception_table_init(struct dm_exception_table *et,
et->hash_shift = hash_shift;
et->hash_mask = size - 1;
- et->table = kvmalloc_objs(struct dm_hlist_head, size, GFP_KERNEL);
+ et->table = kvmalloc_objs(struct dm_hlist_head, size);
if (!et->table)
return -ENOMEM;
@@ -1249,7 +1249,7 @@ static int snapshot_ctr(struct dm_target *ti, unsigned int argc, char **argv)
origin_mode = BLK_OPEN_WRITE;
}
- s = kzalloc_obj(*s, GFP_KERNEL);
+ s = kzalloc_obj(*s);
if (!s) {
ti->error = "Cannot allocate private snapshot structure";
r = -ENOMEM;
@@ -2623,7 +2623,7 @@ static int origin_ctr(struct dm_target *ti, unsigned int argc, char **argv)
return -EINVAL;
}
- o = kmalloc_obj(struct dm_origin, GFP_KERNEL);
+ o = kmalloc_obj(struct dm_origin);
if (!o) {
ti->error = "Cannot allocate private origin structure";
r = -ENOMEM;
diff --git a/drivers/md/dm-table.c b/drivers/md/dm-table.c
index 4b4712e54797..dc2eff6b739d 100644
--- a/drivers/md/dm-table.c
+++ b/drivers/md/dm-table.c
@@ -133,7 +133,7 @@ int dm_table_create(struct dm_table **result, blk_mode_t mode,
if (num_targets > DM_MAX_TARGETS)
return -EOVERFLOW;
- t = kzalloc_obj(*t, GFP_KERNEL);
+ t = kzalloc_obj(*t);
if (!t)
return -ENOMEM;
@@ -381,7 +381,7 @@ int dm_get_device(struct dm_target *ti, const char *path, blk_mode_t mode,
dd = find_device(&t->devices, dev);
if (!dd) {
- dd = kmalloc_obj(*dd, GFP_KERNEL);
+ dd = kmalloc_obj(*dd);
if (!dd)
return -ENOMEM;
@@ -1391,7 +1391,7 @@ static int dm_table_construct_crypto_profile(struct dm_table *t)
unsigned int i;
bool empty_profile = true;
- dmcp = kmalloc_obj(*dmcp, GFP_KERNEL);
+ dmcp = kmalloc_obj(*dmcp);
if (!dmcp)
return -ENOMEM;
dmcp->md = t->md;
diff --git a/drivers/md/dm-target.c b/drivers/md/dm-target.c
index a138e8a24327..3d294365e3ba 100644
--- a/drivers/md/dm-target.c
+++ b/drivers/md/dm-target.c
@@ -128,7 +128,7 @@ static int io_err_get_args(struct dm_target *tt, unsigned int argc, char **args)
char dummy;
int ret;
- ioec = kmalloc_obj(*ioec, GFP_KERNEL);
+ ioec = kmalloc_obj(*ioec);
if (!ioec) {
tt->error = "Cannot allocate io_err context";
return -ENOMEM;
diff --git a/drivers/md/dm-thin-metadata.c b/drivers/md/dm-thin-metadata.c
index c924ec4d300d..b6a2d2081a24 100644
--- a/drivers/md/dm-thin-metadata.c
+++ b/drivers/md/dm-thin-metadata.c
@@ -957,7 +957,7 @@ struct dm_pool_metadata *dm_pool_metadata_open(struct block_device *bdev,
int r;
struct dm_pool_metadata *pmd;
- pmd = kmalloc_obj(*pmd, GFP_KERNEL);
+ pmd = kmalloc_obj(*pmd);
if (!pmd) {
DMERR("could not allocate metadata struct");
return ERR_PTR(-ENOMEM);
diff --git a/drivers/md/dm-thin.c b/drivers/md/dm-thin.c
index 492ead2d9356..59392de7a477 100644
--- a/drivers/md/dm-thin.c
+++ b/drivers/md/dm-thin.c
@@ -2949,7 +2949,7 @@ static struct pool *pool_create(struct mapped_device *pool_md,
return ERR_CAST(pmd);
}
- pool = kzalloc_obj(*pool, GFP_KERNEL);
+ pool = kzalloc_obj(*pool);
if (!pool) {
*error = "Error allocating memory for pool";
err_p = ERR_PTR(-ENOMEM);
@@ -3354,7 +3354,7 @@ static int pool_ctr(struct dm_target *ti, unsigned int argc, char **argv)
goto out;
}
- pt = kzalloc_obj(*pt, GFP_KERNEL);
+ pt = kzalloc_obj(*pt);
if (!pt) {
r = -ENOMEM;
goto out;
@@ -4193,7 +4193,7 @@ static int thin_ctr(struct dm_target *ti, unsigned int argc, char **argv)
goto out_unlock;
}
- tc = ti->private = kzalloc_obj(*tc, GFP_KERNEL);
+ tc = ti->private = kzalloc_obj(*tc);
if (!tc) {
ti->error = "Out of memory";
r = -ENOMEM;
diff --git a/drivers/md/dm-unstripe.c b/drivers/md/dm-unstripe.c
index c595d0a138fc..bfcbe6bfa71a 100644
--- a/drivers/md/dm-unstripe.c
+++ b/drivers/md/dm-unstripe.c
@@ -48,7 +48,7 @@ static int unstripe_ctr(struct dm_target *ti, unsigned int argc, char **argv)
return -EINVAL;
}
- uc = kzalloc_obj(*uc, GFP_KERNEL);
+ uc = kzalloc_obj(*uc);
if (!uc) {
ti->error = "Memory allocation for unstriped context failed";
return -ENOMEM;
diff --git a/drivers/md/dm-verity-fec.c b/drivers/md/dm-verity-fec.c
index 08bb75f00891..14be4d888af3 100644
--- a/drivers/md/dm-verity-fec.c
+++ b/drivers/md/dm-verity-fec.c
@@ -607,7 +607,7 @@ int verity_fec_ctr_alloc(struct dm_verity *v)
{
struct dm_verity_fec *f;
- f = kzalloc_obj(struct dm_verity_fec, GFP_KERNEL);
+ f = kzalloc_obj(struct dm_verity_fec);
if (!f) {
v->ti->error = "Cannot allocate FEC structure";
return -ENOMEM;
diff --git a/drivers/md/dm-verity-target.c b/drivers/md/dm-verity-target.c
index 9dd0c195091f..61073cd01d13 100644
--- a/drivers/md/dm-verity-target.c
+++ b/drivers/md/dm-verity-target.c
@@ -1369,7 +1369,7 @@ static int verity_setup_salt_and_hashstate(struct dm_verity *v, const char *arg)
if (likely(v->use_sha256_lib)) {
/* Implies version 1: salt at beginning */
v->initial_hashstate.sha256 =
- kmalloc_obj(struct sha256_ctx, GFP_KERNEL);
+ kmalloc_obj(struct sha256_ctx);
if (!v->initial_hashstate.sha256) {
ti->error = "Cannot allocate initial hash state";
return -ENOMEM;
@@ -1430,7 +1430,7 @@ static int verity_ctr(struct dm_target *ti, unsigned int argc, char **argv)
char dummy;
char *root_hash_digest_to_validate;
- v = kzalloc_obj(struct dm_verity, GFP_KERNEL);
+ v = kzalloc_obj(struct dm_verity);
if (!v) {
ti->error = "Cannot allocate verity structure";
return -ENOMEM;
diff --git a/drivers/md/dm-writecache.c b/drivers/md/dm-writecache.c
index bca442478a8d..98bd945f6da7 100644
--- a/drivers/md/dm-writecache.c
+++ b/drivers/md/dm-writecache.c
@@ -2245,7 +2245,7 @@ static int writecache_ctr(struct dm_target *ti, unsigned int argc, char **argv)
as.argc = argc;
as.argv = argv;
- wc = kzalloc_obj(struct dm_writecache, GFP_KERNEL);
+ wc = kzalloc_obj(struct dm_writecache);
if (!wc) {
ti->error = "Cannot allocate writecache structure";
r = -ENOMEM;
diff --git a/drivers/md/dm-zoned-metadata.c b/drivers/md/dm-zoned-metadata.c
index b9a473ffdb70..8d7edd18117d 100644
--- a/drivers/md/dm-zoned-metadata.c
+++ b/drivers/md/dm-zoned-metadata.c
@@ -303,7 +303,7 @@ static struct dm_zone *dmz_get(struct dmz_metadata *zmd, unsigned int zone_id)
static struct dm_zone *dmz_insert(struct dmz_metadata *zmd,
unsigned int zone_id, struct dmz_dev *dev)
{
- struct dm_zone *zone = kzalloc_obj(struct dm_zone, GFP_KERNEL);
+ struct dm_zone *zone = kzalloc_obj(struct dm_zone);
if (!zone)
return ERR_PTR(-ENOMEM);
@@ -1311,7 +1311,7 @@ static int dmz_load_sb(struct dmz_metadata *zmd)
int i;
struct dmz_sb *sb;
- sb = kzalloc_obj(struct dmz_sb, GFP_KERNEL);
+ sb = kzalloc_obj(struct dmz_sb);
if (!sb)
return -ENOMEM;
for (i = 1; i < zmd->nr_devs; i++) {
@@ -2868,7 +2868,7 @@ int dmz_ctr_metadata(struct dmz_dev *dev, int num_dev,
struct dm_zone *zone;
int ret;
- zmd = kzalloc_obj(struct dmz_metadata, GFP_KERNEL);
+ zmd = kzalloc_obj(struct dmz_metadata);
if (!zmd)
return -ENOMEM;
diff --git a/drivers/md/dm-zoned-reclaim.c b/drivers/md/dm-zoned-reclaim.c
index 8598cc9eb40f..ad9c7bc21d54 100644
--- a/drivers/md/dm-zoned-reclaim.c
+++ b/drivers/md/dm-zoned-reclaim.c
@@ -556,7 +556,7 @@ int dmz_ctr_reclaim(struct dmz_metadata *zmd,
struct dmz_reclaim *zrc;
int ret;
- zrc = kzalloc_obj(struct dmz_reclaim, GFP_KERNEL);
+ zrc = kzalloc_obj(struct dmz_reclaim);
if (!zrc)
return -ENOMEM;
diff --git a/drivers/md/dm-zoned-target.c b/drivers/md/dm-zoned-target.c
index 0e6ddfb96e03..d55500fc88ef 100644
--- a/drivers/md/dm-zoned-target.c
+++ b/drivers/md/dm-zoned-target.c
@@ -838,18 +838,18 @@ static int dmz_ctr(struct dm_target *ti, unsigned int argc, char **argv)
}
/* Allocate and initialize the target descriptor */
- dmz = kzalloc_obj(struct dmz_target, GFP_KERNEL);
+ dmz = kzalloc_obj(struct dmz_target);
if (!dmz) {
ti->error = "Unable to allocate the zoned target descriptor";
return -ENOMEM;
}
- dmz->dev = kzalloc_objs(struct dmz_dev, argc, GFP_KERNEL);
+ dmz->dev = kzalloc_objs(struct dmz_dev, argc);
if (!dmz->dev) {
ti->error = "Unable to allocate the zoned device descriptors";
kfree(dmz);
return -ENOMEM;
}
- dmz->ddev = kzalloc_objs(struct dm_dev *, argc, GFP_KERNEL);
+ dmz->ddev = kzalloc_objs(struct dm_dev *, argc);
if (!dmz->ddev) {
ti->error = "Unable to allocate the dm device descriptors";
ret = -ENOMEM;
diff --git a/drivers/md/md-bitmap.c b/drivers/md/md-bitmap.c
index ca833f147c6a..83378c033c72 100644
--- a/drivers/md/md-bitmap.c
+++ b/drivers/md/md-bitmap.c
@@ -1025,7 +1025,7 @@ static int md_bitmap_storage_alloc(struct bitmap_storage *store,
num_pages = DIV_ROUND_UP(bytes, PAGE_SIZE);
offset = slot_number * num_pages;
- store->filemap = kmalloc_objs(struct page *, num_pages, GFP_KERNEL);
+ store->filemap = kmalloc_objs(struct page *, num_pages);
if (!store->filemap)
return -ENOMEM;
@@ -2120,7 +2120,7 @@ static struct bitmap *__bitmap_create(struct mddev *mddev, int slot)
return ERR_PTR(-EBUSY);
}
- bitmap = kzalloc_obj(*bitmap, GFP_KERNEL);
+ bitmap = kzalloc_obj(*bitmap);
if (!bitmap)
return ERR_PTR(-ENOMEM);
@@ -2435,7 +2435,7 @@ static int __bitmap_resize(struct bitmap *bitmap, sector_t blocks,
pages = DIV_ROUND_UP(chunks, PAGE_COUNTER_RATIO);
- new_bp = kzalloc_objs(*new_bp, pages, GFP_KERNEL);
+ new_bp = kzalloc_objs(*new_bp, pages);
ret = -ENOMEM;
if (!new_bp) {
md_bitmap_file_unmap(&store);
diff --git a/drivers/md/md-cluster.c b/drivers/md/md-cluster.c
index c588c972ad54..856e4b3c2bde 100644
--- a/drivers/md/md-cluster.c
+++ b/drivers/md/md-cluster.c
@@ -196,7 +196,7 @@ static struct dlm_lock_resource *lockres_init(struct mddev *mddev,
int ret, namelen;
struct md_cluster_info *cinfo = mddev->cluster_info;
- res = kzalloc_obj(struct dlm_lock_resource, GFP_KERNEL);
+ res = kzalloc_obj(struct dlm_lock_resource);
if (!res)
return NULL;
init_waitqueue_head(&res->sync_locking);
@@ -886,7 +886,7 @@ static int join(struct mddev *mddev, int nodes)
int ret, ops_rv;
char str[64];
- cinfo = kzalloc_obj(struct md_cluster_info, GFP_KERNEL);
+ cinfo = kzalloc_obj(struct md_cluster_info);
if (!cinfo)
return -ENOMEM;
diff --git a/drivers/md/md-llbitmap.c b/drivers/md/md-llbitmap.c
index e8d7af0c665a..bf398d7476b3 100644
--- a/drivers/md/md-llbitmap.c
+++ b/drivers/md/md-llbitmap.c
@@ -982,7 +982,7 @@ static int llbitmap_create(struct mddev *mddev)
if (ret)
return ret;
- llbitmap = kzalloc_obj(*llbitmap, GFP_KERNEL);
+ llbitmap = kzalloc_obj(*llbitmap);
if (!llbitmap)
return -ENOMEM;
diff --git a/drivers/md/md.c b/drivers/md/md.c
index b7ac2440fbbb..3ce6f9e9d38e 100644
--- a/drivers/md/md.c
+++ b/drivers/md/md.c
@@ -853,7 +853,7 @@ static struct mddev *mddev_alloc(dev_t unit)
if (unit && MAJOR(unit) != MD_MAJOR)
unit &= ~((1 << MdpMinorShift) - 1);
- new = kzalloc_obj(*new, GFP_KERNEL);
+ new = kzalloc_obj(*new);
if (!new)
return ERR_PTR(-ENOMEM);
@@ -1222,8 +1222,8 @@ static int md_sb_equal(mdp_super_t *sb1, mdp_super_t *sb2)
int ret;
mdp_super_t *tmp1, *tmp2;
- tmp1 = kmalloc_obj(*tmp1, GFP_KERNEL);
- tmp2 = kmalloc_obj(*tmp2, GFP_KERNEL);
+ tmp1 = kmalloc_obj(*tmp1);
+ tmp2 = kmalloc_obj(*tmp2);
if (!tmp1 || !tmp2) {
ret = 0;
@@ -3817,7 +3817,7 @@ static struct md_rdev *md_import_device(dev_t newdev, int super_format, int supe
sector_t size;
int err;
- rdev = kzalloc_obj(*rdev, GFP_KERNEL);
+ rdev = kzalloc_obj(*rdev);
if (!rdev)
return ERR_PTR(-ENOMEM);
@@ -8541,7 +8541,7 @@ struct md_thread *md_register_thread(void (*run) (struct md_thread *),
{
struct md_thread *thread;
- thread = kzalloc_obj(struct md_thread, GFP_KERNEL);
+ thread = kzalloc_obj(struct md_thread);
if (!thread)
return NULL;
@@ -10749,7 +10749,7 @@ void md_autodetect_dev(dev_t dev)
{
struct detected_devices_node *node_detected_dev;
- node_detected_dev = kzalloc_obj(*node_detected_dev, GFP_KERNEL);
+ node_detected_dev = kzalloc_obj(*node_detected_dev);
if (node_detected_dev) {
node_detected_dev->dev = dev;
mutex_lock(&detected_devices_mutex);
diff --git a/drivers/md/persistent-data/dm-block-manager.c b/drivers/md/persistent-data/dm-block-manager.c
index 43bd64b77a7d..a5003774f8bf 100644
--- a/drivers/md/persistent-data/dm-block-manager.c
+++ b/drivers/md/persistent-data/dm-block-manager.c
@@ -388,7 +388,7 @@ struct dm_block_manager *dm_block_manager_create(struct block_device *bdev,
int r;
struct dm_block_manager *bm;
- bm = kmalloc_obj(*bm, GFP_KERNEL);
+ bm = kmalloc_obj(*bm);
if (!bm) {
r = -ENOMEM;
goto bad;
diff --git a/drivers/md/persistent-data/dm-space-map-disk.c b/drivers/md/persistent-data/dm-space-map-disk.c
index 1d3cfc87701a..27c0be9c5a37 100644
--- a/drivers/md/persistent-data/dm-space-map-disk.c
+++ b/drivers/md/persistent-data/dm-space-map-disk.c
@@ -220,7 +220,7 @@ struct dm_space_map *dm_sm_disk_create(struct dm_transaction_manager *tm,
int r;
struct sm_disk *smd;
- smd = kmalloc_obj(*smd, GFP_KERNEL);
+ smd = kmalloc_obj(*smd);
if (!smd)
return ERR_PTR(-ENOMEM);
@@ -254,7 +254,7 @@ struct dm_space_map *dm_sm_disk_open(struct dm_transaction_manager *tm,
int r;
struct sm_disk *smd;
- smd = kmalloc_obj(*smd, GFP_KERNEL);
+ smd = kmalloc_obj(*smd);
if (!smd)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/md/persistent-data/dm-space-map-metadata.c b/drivers/md/persistent-data/dm-space-map-metadata.c
index 3c82a715ceed..4bffddeed8ec 100644
--- a/drivers/md/persistent-data/dm-space-map-metadata.c
+++ b/drivers/md/persistent-data/dm-space-map-metadata.c
@@ -772,7 +772,7 @@ struct dm_space_map *dm_sm_metadata_init(void)
{
struct sm_metadata *smm;
- smm = kvmalloc_obj(*smm, GFP_KERNEL);
+ smm = kvmalloc_obj(*smm);
if (!smm)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/md/persistent-data/dm-transaction-manager.c b/drivers/md/persistent-data/dm-transaction-manager.c
index 1f50f50665ef..7401add01d12 100644
--- a/drivers/md/persistent-data/dm-transaction-manager.c
+++ b/drivers/md/persistent-data/dm-transaction-manager.c
@@ -185,7 +185,7 @@ static struct dm_transaction_manager *dm_tm_create(struct dm_block_manager *bm,
unsigned int i;
struct dm_transaction_manager *tm;
- tm = kmalloc_obj(*tm, GFP_KERNEL);
+ tm = kmalloc_obj(*tm);
if (!tm)
return ERR_PTR(-ENOMEM);
@@ -207,7 +207,7 @@ struct dm_transaction_manager *dm_tm_create_non_blocking_clone(struct dm_transac
{
struct dm_transaction_manager *tm;
- tm = kmalloc_obj(*tm, GFP_KERNEL);
+ tm = kmalloc_obj(*tm);
if (tm) {
tm->is_clone = 1;
tm->real = real;
diff --git a/drivers/md/raid0.c b/drivers/md/raid0.c
index f316267a2c02..b79d1a0883dc 100644
--- a/drivers/md/raid0.c
+++ b/drivers/md/raid0.c
@@ -69,7 +69,7 @@ static int create_strip_zones(struct mddev *mddev, struct r0conf **private_conf)
struct md_rdev *smallest, *rdev1, *rdev2, *rdev, **dev;
struct strip_zone *zone;
int cnt;
- struct r0conf *conf = kzalloc_obj(*conf, GFP_KERNEL);
+ struct r0conf *conf = kzalloc_obj(*conf);
unsigned int blksize = 512;
if (!mddev_is_dm(mddev))
diff --git a/drivers/md/raid1.c b/drivers/md/raid1.c
index d5fd7841dd9f..cef705c5ffd4 100644
--- a/drivers/md/raid1.c
+++ b/drivers/md/raid1.c
@@ -3069,7 +3069,7 @@ static struct r1conf *setup_conf(struct mddev *mddev)
size_t r1bio_size;
int err = -ENOMEM;
- conf = kzalloc_obj(struct r1conf, GFP_KERNEL);
+ conf = kzalloc_obj(struct r1conf);
if (!conf)
goto abort;
@@ -3083,11 +3083,11 @@ static struct r1conf *setup_conf(struct mddev *mddev)
if (!conf->nr_waiting)
goto abort;
- conf->nr_queued = kzalloc_objs(atomic_t, BARRIER_BUCKETS_NR, GFP_KERNEL);
+ conf->nr_queued = kzalloc_objs(atomic_t, BARRIER_BUCKETS_NR);
if (!conf->nr_queued)
goto abort;
- conf->barrier = kzalloc_objs(atomic_t, BARRIER_BUCKETS_NR, GFP_KERNEL);
+ conf->barrier = kzalloc_objs(atomic_t, BARRIER_BUCKETS_NR);
if (!conf->barrier)
goto abort;
diff --git a/drivers/md/raid10.c b/drivers/md/raid10.c
index bdd3a7feaea7..968bc83b8597 100644
--- a/drivers/md/raid10.c
+++ b/drivers/md/raid10.c
@@ -3852,7 +3852,7 @@ static struct r10conf *setup_conf(struct mddev *mddev)
}
err = -ENOMEM;
- conf = kzalloc_obj(struct r10conf, GFP_KERNEL);
+ conf = kzalloc_obj(struct r10conf);
if (!conf)
goto out;
diff --git a/drivers/md/raid5-cache.c b/drivers/md/raid5-cache.c
index 3ae22f6aacda..66b10cbda96d 100644
--- a/drivers/md/raid5-cache.c
+++ b/drivers/md/raid5-cache.c
@@ -2447,7 +2447,7 @@ static int r5l_recovery_log(struct r5l_log *log)
int ret;
sector_t pos;
- ctx = kzalloc_obj(*ctx, GFP_KERNEL);
+ ctx = kzalloc_obj(*ctx);
if (!ctx)
return -ENOMEM;
@@ -3071,7 +3071,7 @@ int r5l_init_log(struct r5conf *conf, struct md_rdev *rdev)
return -EINVAL;
}
- log = kzalloc_obj(*log, GFP_KERNEL);
+ log = kzalloc_obj(*log);
if (!log)
return -ENOMEM;
log->rdev = rdev;
diff --git a/drivers/md/raid5-ppl.c b/drivers/md/raid5-ppl.c
index 9dfa07ed723f..b0c524e920cb 100644
--- a/drivers/md/raid5-ppl.c
+++ b/drivers/md/raid5-ppl.c
@@ -1352,7 +1352,7 @@ int ppl_init_log(struct r5conf *conf)
return -EINVAL;
}
- ppl_conf = kzalloc_obj(struct ppl_conf, GFP_KERNEL);
+ ppl_conf = kzalloc_obj(struct ppl_conf);
if (!ppl_conf)
return -ENOMEM;
diff --git a/drivers/md/raid5.c b/drivers/md/raid5.c
index ba8381cbb2f1..b785d129ef50 100644
--- a/drivers/md/raid5.c
+++ b/drivers/md/raid5.c
@@ -513,7 +513,7 @@ init_stripe_shared_pages(struct stripe_head *sh, struct r5conf *conf, int disks)
cnt = PAGE_SIZE / conf->stripe_size;
nr_pages = (disks + cnt - 1) / cnt;
- sh->pages = kzalloc_objs(struct page *, nr_pages, GFP_KERNEL);
+ sh->pages = kzalloc_objs(struct page *, nr_pages);
if (!sh->pages)
return -ENOMEM;
sh->nr_pages = nr_pages;
@@ -7497,7 +7497,7 @@ static struct r5conf *setup_conf(struct mddev *mddev)
return ERR_PTR(-EINVAL);
}
- conf = kzalloc_obj(struct r5conf, GFP_KERNEL);
+ conf = kzalloc_obj(struct r5conf);
if (conf == NULL)
goto abort;
@@ -7556,7 +7556,7 @@ static struct r5conf *setup_conf(struct mddev *mddev)
conf->previous_raid_disks = mddev->raid_disks - mddev->delta_disks;
max_disks = max(conf->raid_disks, conf->previous_raid_disks);
- conf->disks = kzalloc_objs(struct disk_info, max_disks, GFP_KERNEL);
+ conf->disks = kzalloc_objs(struct disk_info, max_disks);
if (!conf->disks)
goto abort;
diff --git a/drivers/media/cec/core/cec-adap.c b/drivers/media/cec/core/cec-adap.c
index b81cdf343209..8f7244ac1d43 100644
--- a/drivers/media/cec/core/cec-adap.c
+++ b/drivers/media/cec/core/cec-adap.c
@@ -95,7 +95,7 @@ void cec_queue_event_fh(struct cec_fh *fh,
if (ev_idx < CEC_NUM_CORE_EVENTS)
entry = &fh->core_events[ev_idx];
else
- entry = kmalloc_obj(*entry, GFP_KERNEL);
+ entry = kmalloc_obj(*entry);
if (entry) {
if (new_ev->event == CEC_EVENT_LOST_MSGS &&
fh->queued_events[ev_idx]) {
@@ -218,7 +218,7 @@ static void cec_queue_msg_fh(struct cec_fh *fh, const struct cec_msg *msg)
struct cec_msg_entry *entry;
mutex_lock(&fh->lock);
- entry = kmalloc_obj(*entry, GFP_KERNEL);
+ entry = kmalloc_obj(*entry);
if (entry) {
entry->msg = *msg;
/* Add new msg at the end of the queue */
@@ -922,7 +922,7 @@ int cec_transmit_msg_fh(struct cec_adapter *adap, struct cec_msg *msg,
return -EBUSY;
}
- data = kzalloc_obj(*data, GFP_KERNEL);
+ data = kzalloc_obj(*data);
if (!data)
return -ENOMEM;
diff --git a/drivers/media/cec/core/cec-api.c b/drivers/media/cec/core/cec-api.c
index c634185a3446..103ded79526f 100644
--- a/drivers/media/cec/core/cec-api.c
+++ b/drivers/media/cec/core/cec-api.c
@@ -555,7 +555,7 @@ static int cec_open(struct inode *inode, struct file *filp)
struct cec_devnode *devnode =
container_of(inode->i_cdev, struct cec_devnode, cdev);
struct cec_adapter *adap = to_cec_adapter(devnode);
- struct cec_fh *fh = kzalloc_obj(*fh, GFP_KERNEL);
+ struct cec_fh *fh = kzalloc_obj(*fh);
/*
* Initial events that are automatically sent when the cec device is
* opened.
diff --git a/drivers/media/cec/core/cec-core.c b/drivers/media/cec/core/cec-core.c
index e6d958662d37..1953ce559eca 100644
--- a/drivers/media/cec/core/cec-core.c
+++ b/drivers/media/cec/core/cec-core.c
@@ -237,7 +237,7 @@ struct cec_adapter *cec_allocate_adapter(const struct cec_adap_ops *ops,
return ERR_PTR(-EINVAL);
if (WARN_ON(!available_las || available_las > CEC_MAX_LOG_ADDRS))
return ERR_PTR(-EINVAL);
- adap = kzalloc_obj(*adap, GFP_KERNEL);
+ adap = kzalloc_obj(*adap);
if (!adap)
return ERR_PTR(-ENOMEM);
strscpy(adap->name, name, sizeof(adap->name));
diff --git a/drivers/media/cec/core/cec-notifier.c b/drivers/media/cec/core/cec-notifier.c
index 026476ce6bfb..8cf1474d0361 100644
--- a/drivers/media/cec/core/cec-notifier.c
+++ b/drivers/media/cec/core/cec-notifier.c
@@ -63,7 +63,7 @@ cec_notifier_get_conn(struct device *hdmi_dev, const char *port_name)
return n;
}
}
- n = kzalloc_obj(*n, GFP_KERNEL);
+ n = kzalloc_obj(*n);
if (!n)
goto unlock;
n->hdmi_dev = hdmi_dev;
diff --git a/drivers/media/cec/core/cec-pin.c b/drivers/media/cec/core/cec-pin.c
index 5299d944b526..6e1c39102832 100644
--- a/drivers/media/cec/core/cec-pin.c
+++ b/drivers/media/cec/core/cec-pin.c
@@ -1367,7 +1367,7 @@ struct cec_adapter *cec_pin_allocate_adapter(const struct cec_pin_ops *pin_ops,
void *priv, const char *name, u32 caps)
{
struct cec_adapter *adap;
- struct cec_pin *pin = kzalloc_obj(*pin, GFP_KERNEL);
+ struct cec_pin *pin = kzalloc_obj(*pin);
if (pin == NULL)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/media/cec/usb/extron-da-hd-4k-plus/extron-da-hd-4k-plus.c b/drivers/media/cec/usb/extron-da-hd-4k-plus/extron-da-hd-4k-plus.c
index 8249d3bb11e4..3381d86096a1 100644
--- a/drivers/media/cec/usb/extron-da-hd-4k-plus/extron-da-hd-4k-plus.c
+++ b/drivers/media/cec/usb/extron-da-hd-4k-plus/extron-da-hd-4k-plus.c
@@ -1494,7 +1494,7 @@ static int extron_setup(struct extron *extron)
if (vendor_id)
caps &= ~CEC_CAP_LOG_ADDRS;
- port = kzalloc_obj(*port, GFP_KERNEL);
+ port = kzalloc_obj(*port);
if (!port)
return -ENOMEM;
@@ -1769,7 +1769,7 @@ static int extron_connect(struct serio *serio, struct serio_driver *drv)
manufacturer_name[0] = 0;
}
- extron = kzalloc_obj(*extron, GFP_KERNEL);
+ extron = kzalloc_obj(*extron);
if (!extron)
return -ENOMEM;
diff --git a/drivers/media/cec/usb/pulse8/pulse8-cec.c b/drivers/media/cec/usb/pulse8/pulse8-cec.c
index d000416d25c4..0df3af152762 100644
--- a/drivers/media/cec/usb/pulse8/pulse8-cec.c
+++ b/drivers/media/cec/usb/pulse8/pulse8-cec.c
@@ -840,7 +840,7 @@ static int pulse8_connect(struct serio *serio, struct serio_driver *drv)
struct cec_log_addrs log_addrs = {};
u16 pa = CEC_PHYS_ADDR_INVALID;
- pulse8 = kzalloc_obj(*pulse8, GFP_KERNEL);
+ pulse8 = kzalloc_obj(*pulse8);
if (!pulse8)
return -ENOMEM;
diff --git a/drivers/media/cec/usb/rainshadow/rainshadow-cec.c b/drivers/media/cec/usb/rainshadow/rainshadow-cec.c
index 5457fe240654..764551e060c5 100644
--- a/drivers/media/cec/usb/rainshadow/rainshadow-cec.c
+++ b/drivers/media/cec/usb/rainshadow/rainshadow-cec.c
@@ -313,7 +313,7 @@ static int rain_connect(struct serio *serio, struct serio_driver *drv)
struct cec_log_addrs log_addrs = {};
u16 pa = CEC_PHYS_ADDR_INVALID;
- rain = kzalloc_obj(*rain, GFP_KERNEL);
+ rain = kzalloc_obj(*rain);
if (!rain)
return -ENOMEM;
diff --git a/drivers/media/common/cypress_firmware.c b/drivers/media/common/cypress_firmware.c
index c1c110428928..66274fdf5243 100644
--- a/drivers/media/common/cypress_firmware.c
+++ b/drivers/media/common/cypress_firmware.c
@@ -75,7 +75,7 @@ int cypress_load_firmware(struct usb_device *udev,
struct hexline *hx;
int ret, pos = 0;
- hx = kmalloc_obj(*hx, GFP_KERNEL);
+ hx = kmalloc_obj(*hx);
if (!hx)
return -ENOMEM;
diff --git a/drivers/media/common/saa7146/saa7146_core.c b/drivers/media/common/saa7146/saa7146_core.c
index fc0f88b16dc3..c297d019f2b3 100644
--- a/drivers/media/common/saa7146/saa7146_core.c
+++ b/drivers/media/common/saa7146/saa7146_core.c
@@ -141,7 +141,7 @@ static struct scatterlist* vmalloc_to_sg(unsigned char *virt, int nr_pages)
struct page *pg;
int i;
- sglist = kmalloc_objs(struct scatterlist, nr_pages, GFP_KERNEL);
+ sglist = kmalloc_objs(struct scatterlist, nr_pages);
if (NULL == sglist)
return NULL;
sg_init_table(sglist, nr_pages);
@@ -334,7 +334,7 @@ static int saa7146_init_one(struct pci_dev *pci, const struct pci_device_id *ent
int err = -ENOMEM;
/* clear out mem for sure */
- dev = kzalloc_obj(struct saa7146_dev, GFP_KERNEL);
+ dev = kzalloc_obj(struct saa7146_dev);
if (!dev) {
ERR("out of memory\n");
goto out;
diff --git a/drivers/media/common/saa7146/saa7146_fops.c b/drivers/media/common/saa7146/saa7146_fops.c
index f448c0a0e05f..fd12ef10409c 100644
--- a/drivers/media/common/saa7146/saa7146_fops.c
+++ b/drivers/media/common/saa7146/saa7146_fops.c
@@ -266,7 +266,7 @@ int saa7146_vv_init(struct saa7146_dev* dev, struct saa7146_ext_vv *ext_vv)
}
dev->v4l2_dev.ctrl_handler = hdl;
- vv = kzalloc_obj(struct saa7146_vv, GFP_KERNEL);
+ vv = kzalloc_obj(struct saa7146_vv);
if (vv == NULL) {
ERR("out of memory. aborting.\n");
v4l2_ctrl_handler_free(hdl);
diff --git a/drivers/media/common/siano/smscoreapi.c b/drivers/media/common/siano/smscoreapi.c
index 489a8dd0a161..017629e3cf84 100644
--- a/drivers/media/common/siano/smscoreapi.c
+++ b/drivers/media/common/siano/smscoreapi.c
@@ -439,7 +439,7 @@ static struct smscore_registry_entry_t *smscore_find_registry(char *devpath)
return entry;
}
}
- entry = kmalloc_obj(*entry, GFP_KERNEL);
+ entry = kmalloc_obj(*entry);
if (entry) {
entry->mode = default_mode;
strscpy(entry->devpath, devpath, sizeof(entry->devpath));
@@ -528,7 +528,7 @@ int smscore_register_hotplug(hotplug_t hotplug)
int rc = 0;
mutex_lock(&g_smscore_deviceslock);
- notifyee = kmalloc_obj(*notifyee, GFP_KERNEL);
+ notifyee = kmalloc_obj(*notifyee);
if (notifyee) {
/* now notify callback about existing devices */
first = &g_smscore_devices;
@@ -617,7 +617,7 @@ smscore_buffer_t *smscore_createbuffer(u8 *buffer, void *common_buffer,
{
struct smscore_buffer_t *cb;
- cb = kzalloc_obj(*cb, GFP_KERNEL);
+ cb = kzalloc_obj(*cb);
if (!cb)
return NULL;
@@ -647,7 +647,7 @@ int smscore_register_device(struct smsdevice_params_t *params,
struct smscore_device_t *dev;
u8 *buffer;
- dev = kzalloc_obj(*dev, GFP_KERNEL);
+ dev = kzalloc_obj(*dev);
if (!dev)
return -ENOMEM;
@@ -1678,7 +1678,7 @@ static int smscore_validate_client(struct smscore_device_t *coredev,
pr_err("The msg ID already registered to another client.\n");
return -EEXIST;
}
- listentry = kzalloc_obj(*listentry, GFP_KERNEL);
+ listentry = kzalloc_obj(*listentry);
if (!listentry)
return -ENOMEM;
@@ -1715,7 +1715,7 @@ int smscore_register_client(struct smscore_device_t *coredev,
return -EEXIST;
}
- newclient = kzalloc_obj(*newclient, GFP_KERNEL);
+ newclient = kzalloc_obj(*newclient);
if (!newclient)
return -ENOMEM;
diff --git a/drivers/media/common/siano/smsdvb-debugfs.c b/drivers/media/common/siano/smsdvb-debugfs.c
index e5fbc08d4192..c482777e1c60 100644
--- a/drivers/media/common/siano/smsdvb-debugfs.c
+++ b/drivers/media/common/siano/smsdvb-debugfs.c
@@ -358,7 +358,7 @@ int smsdvb_debugfs_create(struct smsdvb_client_t *client)
if (!smsdvb_debugfs_usb_root || !coredev->is_usb_device)
return -ENODEV;
- debug_data = kzalloc_obj(*client->debug_data, GFP_KERNEL);
+ debug_data = kzalloc_obj(*client->debug_data);
if (!debug_data)
return -ENOMEM;
diff --git a/drivers/media/common/siano/smsdvb-main.c b/drivers/media/common/siano/smsdvb-main.c
index f49845a266e5..415c24fbbb65 100644
--- a/drivers/media/common/siano/smsdvb-main.c
+++ b/drivers/media/common/siano/smsdvb-main.c
@@ -1110,7 +1110,7 @@ static int smsdvb_hotplug(struct smscore_device_t *coredev,
/* device removal handled by onremove callback */
if (!arrival)
return 0;
- client = kzalloc_obj(struct smsdvb_client_t, GFP_KERNEL);
+ client = kzalloc_obj(struct smsdvb_client_t);
if (!client)
return -ENOMEM;
diff --git a/drivers/media/common/videobuf2/videobuf2-core.c b/drivers/media/common/videobuf2/videobuf2-core.c
index a70181f8d9d9..adf668b213c2 100644
--- a/drivers/media/common/videobuf2/videobuf2-core.c
+++ b/drivers/media/common/videobuf2/videobuf2-core.c
@@ -841,7 +841,7 @@ static bool verify_coherency_flags(struct vb2_queue *q, bool non_coherent_mem)
static int vb2_core_allocated_buffers_storage(struct vb2_queue *q)
{
if (!q->bufs)
- q->bufs = kzalloc_objs(*q->bufs, q->max_num_buffers, GFP_KERNEL);
+ q->bufs = kzalloc_objs(*q->bufs, q->max_num_buffers);
if (!q->bufs)
return -ENOMEM;
@@ -2861,7 +2861,7 @@ static int __vb2_init_fileio(struct vb2_queue *q, int read)
(read) ? "read" : "write", q->min_reqbufs_allocation, q->fileio_read_once,
q->fileio_write_immediately);
- fileio = kzalloc_obj(*fileio, GFP_KERNEL);
+ fileio = kzalloc_obj(*fileio);
if (fileio == NULL)
return -ENOMEM;
@@ -3256,7 +3256,7 @@ int vb2_thread_start(struct vb2_queue *q, vb2_thread_fnc fnc, void *priv,
if (WARN_ON(q->fileio))
return -EBUSY;
- threadio = kzalloc_obj(*threadio, GFP_KERNEL);
+ threadio = kzalloc_obj(*threadio);
if (threadio == NULL)
return -ENOMEM;
threadio->fnc = fnc;
diff --git a/drivers/media/common/videobuf2/videobuf2-dma-contig.c b/drivers/media/common/videobuf2/videobuf2-dma-contig.c
index 983de3b99acb..9ce6284cd5f2 100644
--- a/drivers/media/common/videobuf2/videobuf2-dma-contig.c
+++ b/drivers/media/common/videobuf2/videobuf2-dma-contig.c
@@ -238,7 +238,7 @@ static void *vb2_dc_alloc(struct vb2_buffer *vb,
if (WARN_ON(!dev))
return ERR_PTR(-EINVAL);
- buf = kzalloc_obj(*buf, GFP_KERNEL);
+ buf = kzalloc_obj(*buf);
if (!buf)
return ERR_PTR(-ENOMEM);
@@ -325,7 +325,7 @@ static int vb2_dc_dmabuf_ops_attach(struct dma_buf *dbuf,
struct vb2_dc_buf *buf = dbuf->priv;
int ret;
- attach = kzalloc_obj(*attach, GFP_KERNEL);
+ attach = kzalloc_obj(*attach);
if (!attach)
return -ENOMEM;
@@ -479,7 +479,7 @@ static struct sg_table *vb2_dc_get_base_sgt(struct vb2_dc_buf *buf)
if (buf->non_coherent_mem)
return buf->dma_sgt;
- sgt = kmalloc_obj(*sgt, GFP_KERNEL);
+ sgt = kmalloc_obj(*sgt);
if (!sgt) {
dev_err(buf->dev, "failed to alloc sg table\n");
return NULL;
@@ -587,7 +587,7 @@ static void *vb2_dc_get_userptr(struct vb2_buffer *vb, struct device *dev,
if (WARN_ON(!dev))
return ERR_PTR(-EINVAL);
- buf = kzalloc_obj(*buf, GFP_KERNEL);
+ buf = kzalloc_obj(*buf);
if (!buf)
return ERR_PTR(-ENOMEM);
@@ -624,7 +624,7 @@ static void *vb2_dc_get_userptr(struct vb2_buffer *vb, struct device *dev,
goto out;
}
- sgt = kzalloc_obj(*sgt, GFP_KERNEL);
+ sgt = kzalloc_obj(*sgt);
if (!sgt) {
pr_err("failed to allocate sg table\n");
ret = -ENOMEM;
@@ -779,7 +779,7 @@ static void *vb2_dc_attach_dmabuf(struct vb2_buffer *vb, struct device *dev,
if (WARN_ON(!dev))
return ERR_PTR(-EINVAL);
- buf = kzalloc_obj(*buf, GFP_KERNEL);
+ buf = kzalloc_obj(*buf);
if (!buf)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/media/common/videobuf2/videobuf2-dma-sg.c b/drivers/media/common/videobuf2/videobuf2-dma-sg.c
index 76a9301fb85b..982021d547e5 100644
--- a/drivers/media/common/videobuf2/videobuf2-dma-sg.c
+++ b/drivers/media/common/videobuf2/videobuf2-dma-sg.c
@@ -109,7 +109,7 @@ static void *vb2_dma_sg_alloc(struct vb2_buffer *vb, struct device *dev,
if (WARN_ON(!dev) || WARN_ON(!size))
return ERR_PTR(-EINVAL);
- buf = kzalloc_obj(*buf, GFP_KERNEL);
+ buf = kzalloc_obj(*buf);
if (!buf)
return ERR_PTR(-ENOMEM);
@@ -126,7 +126,7 @@ static void *vb2_dma_sg_alloc(struct vb2_buffer *vb, struct device *dev,
* there is no memory consistency guarantee, hence dma-sg ignores DMA
* attributes passed from the upper layer.
*/
- buf->pages = kvzalloc_objs(struct page *, buf->num_pages, GFP_KERNEL);
+ buf->pages = kvzalloc_objs(struct page *, buf->num_pages);
if (!buf->pages)
goto fail_pages_array_alloc;
@@ -230,7 +230,7 @@ static void *vb2_dma_sg_get_userptr(struct vb2_buffer *vb, struct device *dev,
if (WARN_ON(!dev))
return ERR_PTR(-EINVAL);
- buf = kzalloc_obj(*buf, GFP_KERNEL);
+ buf = kzalloc_obj(*buf);
if (!buf)
return ERR_PTR(-ENOMEM);
@@ -375,7 +375,7 @@ static int vb2_dma_sg_dmabuf_ops_attach(struct dma_buf *dbuf,
struct vb2_dma_sg_buf *buf = dbuf->priv;
int ret;
- attach = kzalloc_obj(*attach, GFP_KERNEL);
+ attach = kzalloc_obj(*attach);
if (!attach)
return -ENOMEM;
@@ -626,7 +626,7 @@ static void *vb2_dma_sg_attach_dmabuf(struct vb2_buffer *vb, struct device *dev,
if (dbuf->size < size)
return ERR_PTR(-EFAULT);
- buf = kzalloc_obj(*buf, GFP_KERNEL);
+ buf = kzalloc_obj(*buf);
if (!buf)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/media/common/videobuf2/videobuf2-dvb.c b/drivers/media/common/videobuf2/videobuf2-dvb.c
index e37dd9007b19..ef30a032d9d4 100644
--- a/drivers/media/common/videobuf2/videobuf2-dvb.c
+++ b/drivers/media/common/videobuf2/videobuf2-dvb.c
@@ -299,7 +299,7 @@ struct vb2_dvb_frontend *vb2_dvb_alloc_frontend(
{
struct vb2_dvb_frontend *fe;
- fe = kzalloc_obj(struct vb2_dvb_frontend, GFP_KERNEL);
+ fe = kzalloc_obj(struct vb2_dvb_frontend);
if (fe == NULL)
return NULL;
diff --git a/drivers/media/common/videobuf2/videobuf2-vmalloc.c b/drivers/media/common/videobuf2/videobuf2-vmalloc.c
index a410e9078626..63f023696f3e 100644
--- a/drivers/media/common/videobuf2/videobuf2-vmalloc.c
+++ b/drivers/media/common/videobuf2/videobuf2-vmalloc.c
@@ -78,7 +78,7 @@ static void *vb2_vmalloc_get_userptr(struct vb2_buffer *vb, struct device *dev,
int n_pages, offset, i;
int ret = -ENOMEM;
- buf = kzalloc_obj(*buf, GFP_KERNEL);
+ buf = kzalloc_obj(*buf);
if (!buf)
return ERR_PTR(-ENOMEM);
@@ -221,7 +221,7 @@ static int vb2_vmalloc_dmabuf_ops_attach(struct dma_buf *dbuf,
int ret;
int i;
- attach = kzalloc_obj(*attach, GFP_KERNEL);
+ attach = kzalloc_obj(*attach);
if (!attach)
return -ENOMEM;
@@ -409,7 +409,7 @@ static void *vb2_vmalloc_attach_dmabuf(struct vb2_buffer *vb,
if (dbuf->size < size)
return ERR_PTR(-EFAULT);
- buf = kzalloc_obj(*buf, GFP_KERNEL);
+ buf = kzalloc_obj(*buf);
if (!buf)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/media/dvb-core/dmxdev.c b/drivers/media/dvb-core/dmxdev.c
index 254d56059863..7cfed24054d0 100644
--- a/drivers/media/dvb-core/dmxdev.c
+++ b/drivers/media/dvb-core/dmxdev.c
@@ -892,7 +892,7 @@ static int dvb_dmxdev_add_pid(struct dmxdev *dmxdev,
(!list_empty(&filter->feed.ts)))
return -EINVAL;
- feed = kzalloc_obj(struct dmxdev_feed, GFP_KERNEL);
+ feed = kzalloc_obj(struct dmxdev_feed);
if (feed == NULL)
return -ENOMEM;
diff --git a/drivers/media/dvb-core/dvb_ca_en50221.c b/drivers/media/dvb-core/dvb_ca_en50221.c
index d25d4522240a..1b91ebb8f667 100644
--- a/drivers/media/dvb-core/dvb_ca_en50221.c
+++ b/drivers/media/dvb-core/dvb_ca_en50221.c
@@ -1880,7 +1880,7 @@ int dvb_ca_en50221_init(struct dvb_adapter *dvb_adapter,
return -EINVAL;
/* initialise the system data */
- ca = kzalloc_obj(*ca, GFP_KERNEL);
+ ca = kzalloc_obj(*ca);
if (!ca) {
ret = -ENOMEM;
goto exit;
@@ -1889,7 +1889,7 @@ int dvb_ca_en50221_init(struct dvb_adapter *dvb_adapter,
ca->pub = pubca;
ca->flags = flags;
ca->slot_count = slot_count;
- ca->slot_info = kzalloc_objs(struct dvb_ca_slot, slot_count, GFP_KERNEL);
+ ca->slot_info = kzalloc_objs(struct dvb_ca_slot, slot_count);
if (!ca->slot_info) {
ret = -ENOMEM;
goto free_ca;
diff --git a/drivers/media/dvb-core/dvb_frontend.c b/drivers/media/dvb-core/dvb_frontend.c
index 6ba5857d280f..d082b6c57c76 100644
--- a/drivers/media/dvb-core/dvb_frontend.c
+++ b/drivers/media/dvb-core/dvb_frontend.c
@@ -3021,7 +3021,7 @@ int dvb_register_frontend(struct dvb_adapter *dvb,
if (mutex_lock_interruptible(&frontend_mutex))
return -ERESTARTSYS;
- fe->frontend_priv = kzalloc_obj(struct dvb_frontend_private, GFP_KERNEL);
+ fe->frontend_priv = kzalloc_obj(struct dvb_frontend_private);
if (!fe->frontend_priv) {
mutex_unlock(&frontend_mutex);
return -ENOMEM;
diff --git a/drivers/media/dvb-core/dvbdev.c b/drivers/media/dvb-core/dvbdev.c
index 00476e7ee048..14f7018501cf 100644
--- a/drivers/media/dvb-core/dvbdev.c
+++ b/drivers/media/dvb-core/dvbdev.c
@@ -328,14 +328,14 @@ static int dvb_create_media_entity(struct dvb_device *dvbdev,
return 0;
}
- dvbdev->entity = kzalloc_obj(*dvbdev->entity, GFP_KERNEL);
+ dvbdev->entity = kzalloc_obj(*dvbdev->entity);
if (!dvbdev->entity)
return -ENOMEM;
dvbdev->entity->name = dvbdev->name;
if (npads) {
- dvbdev->pads = kzalloc_objs(*dvbdev->pads, npads, GFP_KERNEL);
+ dvbdev->pads = kzalloc_objs(*dvbdev->pads, npads);
if (!dvbdev->pads) {
kfree(dvbdev->entity);
dvbdev->entity = NULL;
@@ -471,7 +471,7 @@ int dvb_register_device(struct dvb_adapter *adap, struct dvb_device **pdvbdev,
return -ENFILE;
}
- *pdvbdev = dvbdev = kzalloc_obj(*dvbdev, GFP_KERNEL);
+ *pdvbdev = dvbdev = kzalloc_obj(*dvbdev);
if (!dvbdev) {
mutex_unlock(&dvbdev_register_lock);
return -ENOMEM;
@@ -499,7 +499,7 @@ int dvb_register_device(struct dvb_adapter *adap, struct dvb_device **pdvbdev,
return -ENOMEM;
}
- new_node = kzalloc_obj(*new_node, GFP_KERNEL);
+ new_node = kzalloc_obj(*new_node);
if (!new_node) {
kfree(dvbdevfops);
kfree(dvbdev);
@@ -711,12 +711,12 @@ int dvb_create_media_graph(struct dvb_adapter *adap,
demod = NULL;
if (create_rf_connector) {
- conn = kzalloc_obj(*conn, GFP_KERNEL);
+ conn = kzalloc_obj(*conn);
if (!conn)
return -ENOMEM;
adap->conn = conn;
- adap->conn_pads = kzalloc_obj(*adap->conn_pads, GFP_KERNEL);
+ adap->conn_pads = kzalloc_obj(*adap->conn_pads);
if (!adap->conn_pads)
return -ENOMEM;
@@ -1026,7 +1026,7 @@ struct i2c_client *dvb_module_probe(const char *module_name,
struct i2c_client *client;
struct i2c_board_info *board_info;
- board_info = kzalloc_obj(*board_info, GFP_KERNEL);
+ board_info = kzalloc_obj(*board_info);
if (!board_info)
return NULL;
diff --git a/drivers/media/dvb-frontends/a8293.c b/drivers/media/dvb-frontends/a8293.c
index c1eeed1d08e6..7c0963054a8f 100644
--- a/drivers/media/dvb-frontends/a8293.c
+++ b/drivers/media/dvb-frontends/a8293.c
@@ -218,7 +218,7 @@ static int a8293_probe(struct i2c_client *client)
int ret;
u8 buf[2];
- dev = kzalloc_obj(*dev, GFP_KERNEL);
+ dev = kzalloc_obj(*dev);
if (!dev) {
ret = -ENOMEM;
goto err;
diff --git a/drivers/media/dvb-frontends/af9013.c b/drivers/media/dvb-frontends/af9013.c
index d004ec9e94f0..75f3063c193e 100644
--- a/drivers/media/dvb-frontends/af9013.c
+++ b/drivers/media/dvb-frontends/af9013.c
@@ -1447,7 +1447,7 @@ static int af9013_probe(struct i2c_client *client)
.val_bits = 8,
};
- state = kzalloc_obj(*state, GFP_KERNEL);
+ state = kzalloc_obj(*state);
if (!state) {
ret = -ENOMEM;
goto err;
diff --git a/drivers/media/dvb-frontends/af9033.c b/drivers/media/dvb-frontends/af9033.c
index 584cc0405e4a..9a3a4d6513dd 100644
--- a/drivers/media/dvb-frontends/af9033.c
+++ b/drivers/media/dvb-frontends/af9033.c
@@ -1062,7 +1062,7 @@ static int af9033_probe(struct i2c_client *client)
};
/* Allocate memory for the internal state */
- dev = kzalloc_obj(*dev, GFP_KERNEL);
+ dev = kzalloc_obj(*dev);
if (!dev) {
ret = -ENOMEM;
goto err;
diff --git a/drivers/media/dvb-frontends/as102_fe.c b/drivers/media/dvb-frontends/as102_fe.c
index 5b17d0b6f3ea..fecb0735d753 100644
--- a/drivers/media/dvb-frontends/as102_fe.c
+++ b/drivers/media/dvb-frontends/as102_fe.c
@@ -447,7 +447,7 @@ struct dvb_frontend *as102_attach(const char *name,
struct as102_state *state;
struct dvb_frontend *fe;
- state = kzalloc_obj(*state, GFP_KERNEL);
+ state = kzalloc_obj(*state);
if (!state)
return NULL;
diff --git a/drivers/media/dvb-frontends/ascot2e.c b/drivers/media/dvb-frontends/ascot2e.c
index 0d28a3422cae..3bdb4d12f8b7 100644
--- a/drivers/media/dvb-frontends/ascot2e.c
+++ b/drivers/media/dvb-frontends/ascot2e.c
@@ -477,7 +477,7 @@ struct dvb_frontend *ascot2e_attach(struct dvb_frontend *fe,
u8 data[4];
struct ascot2e_priv *priv = NULL;
- priv = kzalloc_obj(struct ascot2e_priv, GFP_KERNEL);
+ priv = kzalloc_obj(struct ascot2e_priv);
if (priv == NULL)
return NULL;
priv->i2c_address = (config->i2c_address >> 1);
diff --git a/drivers/media/dvb-frontends/atbm8830.c b/drivers/media/dvb-frontends/atbm8830.c
index 2b9dbd748ebc..9ef8adbf9f7d 100644
--- a/drivers/media/dvb-frontends/atbm8830.c
+++ b/drivers/media/dvb-frontends/atbm8830.c
@@ -458,7 +458,7 @@ struct dvb_frontend *atbm8830_attach(const struct atbm8830_config *config,
if (config == NULL || i2c == NULL)
return NULL;
- priv = kzalloc_obj(struct atbm_state, GFP_KERNEL);
+ priv = kzalloc_obj(struct atbm_state);
if (priv == NULL)
goto error_out;
diff --git a/drivers/media/dvb-frontends/bcm3510.c b/drivers/media/dvb-frontends/bcm3510.c
index 50f43f9c7aef..7f91156d02c7 100644
--- a/drivers/media/dvb-frontends/bcm3510.c
+++ b/drivers/media/dvb-frontends/bcm3510.c
@@ -800,7 +800,7 @@ struct dvb_frontend* bcm3510_attach(const struct bcm3510_config *config,
bcm3510_register_value v;
/* allocate memory for the internal state */
- state = kzalloc_obj(struct bcm3510_state, GFP_KERNEL);
+ state = kzalloc_obj(struct bcm3510_state);
if (state == NULL)
goto error;
diff --git a/drivers/media/dvb-frontends/cx22700.c b/drivers/media/dvb-frontends/cx22700.c
index 9f36c837fd66..cb1c30aee684 100644
--- a/drivers/media/dvb-frontends/cx22700.c
+++ b/drivers/media/dvb-frontends/cx22700.c
@@ -376,7 +376,7 @@ struct dvb_frontend* cx22700_attach(const struct cx22700_config* config,
struct cx22700_state* state = NULL;
/* allocate memory for the internal state */
- state = kzalloc_obj(struct cx22700_state, GFP_KERNEL);
+ state = kzalloc_obj(struct cx22700_state);
if (state == NULL) goto error;
/* setup the state */
diff --git a/drivers/media/dvb-frontends/cx22702.c b/drivers/media/dvb-frontends/cx22702.c
index acdc8712d343..cbfe156e018a 100644
--- a/drivers/media/dvb-frontends/cx22702.c
+++ b/drivers/media/dvb-frontends/cx22702.c
@@ -582,7 +582,7 @@ struct dvb_frontend *cx22702_attach(const struct cx22702_config *config,
struct cx22702_state *state = NULL;
/* allocate memory for the internal state */
- state = kzalloc_obj(struct cx22702_state, GFP_KERNEL);
+ state = kzalloc_obj(struct cx22702_state);
if (state == NULL)
goto error;
diff --git a/drivers/media/dvb-frontends/cx24110.c b/drivers/media/dvb-frontends/cx24110.c
index a413dd023aa9..fb81a2f264f4 100644
--- a/drivers/media/dvb-frontends/cx24110.c
+++ b/drivers/media/dvb-frontends/cx24110.c
@@ -588,7 +588,7 @@ struct dvb_frontend* cx24110_attach(const struct cx24110_config* config,
int ret;
/* allocate memory for the internal state */
- state = kzalloc_obj(struct cx24110_state, GFP_KERNEL);
+ state = kzalloc_obj(struct cx24110_state);
if (state == NULL) goto error;
/* setup the state */
diff --git a/drivers/media/dvb-frontends/cx24113.c b/drivers/media/dvb-frontends/cx24113.c
index 450e9d02e950..22f8544f1907 100644
--- a/drivers/media/dvb-frontends/cx24113.c
+++ b/drivers/media/dvb-frontends/cx24113.c
@@ -542,7 +542,7 @@ struct dvb_frontend *cx24113_attach(struct dvb_frontend *fe,
const struct cx24113_config *config, struct i2c_adapter *i2c)
{
/* allocate memory for the internal state */
- struct cx24113_state *state = kzalloc_obj(*state, GFP_KERNEL);
+ struct cx24113_state *state = kzalloc_obj(*state);
int rc;
if (!state)
diff --git a/drivers/media/dvb-frontends/cx24116.c b/drivers/media/dvb-frontends/cx24116.c
index f7c2d7b165ce..c10053a7cb82 100644
--- a/drivers/media/dvb-frontends/cx24116.c
+++ b/drivers/media/dvb-frontends/cx24116.c
@@ -1116,7 +1116,7 @@ struct dvb_frontend *cx24116_attach(const struct cx24116_config *config,
dprintk("%s\n", __func__);
/* allocate memory for the internal state */
- state = kzalloc_obj(*state, GFP_KERNEL);
+ state = kzalloc_obj(*state);
if (state == NULL)
return NULL;
diff --git a/drivers/media/dvb-frontends/cx24117.c b/drivers/media/dvb-frontends/cx24117.c
index 99555db3c537..eed03276b3b5 100644
--- a/drivers/media/dvb-frontends/cx24117.c
+++ b/drivers/media/dvb-frontends/cx24117.c
@@ -1184,7 +1184,7 @@ struct dvb_frontend *cx24117_attach(const struct cx24117_config *config,
}
/* allocate memory for the internal state */
- state = kzalloc_obj(struct cx24117_state, GFP_KERNEL);
+ state = kzalloc_obj(struct cx24117_state);
if (state == NULL)
goto error2;
diff --git a/drivers/media/dvb-frontends/cx24120.c b/drivers/media/dvb-frontends/cx24120.c
index 2602fe350d35..438a436762a7 100644
--- a/drivers/media/dvb-frontends/cx24120.c
+++ b/drivers/media/dvb-frontends/cx24120.c
@@ -268,7 +268,7 @@ struct dvb_frontend *cx24120_attach(const struct cx24120_config *config,
int demod_rev;
info("Conexant cx24120/cx24118 - DVBS/S2 Satellite demod/tuner\n");
- state = kzalloc_obj(*state, GFP_KERNEL);
+ state = kzalloc_obj(*state);
if (!state) {
err("Unable to allocate memory for cx24120_state\n");
goto error;
diff --git a/drivers/media/dvb-frontends/cx24123.c b/drivers/media/dvb-frontends/cx24123.c
index ecc1a017cbe1..2706f3831c63 100644
--- a/drivers/media/dvb-frontends/cx24123.c
+++ b/drivers/media/dvb-frontends/cx24123.c
@@ -1043,7 +1043,7 @@ struct dvb_frontend *cx24123_attach(const struct cx24123_config *config,
{
/* allocate memory for the internal state */
struct cx24123_state *state =
- kzalloc_obj(struct cx24123_state, GFP_KERNEL);
+ kzalloc_obj(struct cx24123_state);
dprintk("\n");
if (state == NULL) {
diff --git a/drivers/media/dvb-frontends/cxd2099.c b/drivers/media/dvb-frontends/cxd2099.c
index 80ca00f22d07..f95950a61307 100644
--- a/drivers/media/dvb-frontends/cxd2099.c
+++ b/drivers/media/dvb-frontends/cxd2099.c
@@ -609,7 +609,7 @@ static int cxd2099_probe(struct i2c_client *client)
unsigned int val;
int ret;
- ci = kzalloc_obj(*ci, GFP_KERNEL);
+ ci = kzalloc_obj(*ci);
if (!ci) {
ret = -ENOMEM;
goto err;
diff --git a/drivers/media/dvb-frontends/cxd2820r_core.c b/drivers/media/dvb-frontends/cxd2820r_core.c
index ed3f535db949..3deefeff4bd1 100644
--- a/drivers/media/dvb-frontends/cxd2820r_core.c
+++ b/drivers/media/dvb-frontends/cxd2820r_core.c
@@ -594,7 +594,7 @@ static int cxd2820r_probe(struct i2c_client *client)
dev_dbg(&client->dev, "\n");
- priv = kzalloc_obj(*priv, GFP_KERNEL);
+ priv = kzalloc_obj(*priv);
if (!priv) {
ret = -ENOMEM;
goto err;
diff --git a/drivers/media/dvb-frontends/cxd2841er.c b/drivers/media/dvb-frontends/cxd2841er.c
index db58803c85df..593107f428ce 100644
--- a/drivers/media/dvb-frontends/cxd2841er.c
+++ b/drivers/media/dvb-frontends/cxd2841er.c
@@ -3844,7 +3844,7 @@ static struct dvb_frontend *cxd2841er_attach(struct cxd2841er_config *cfg,
struct cxd2841er_priv *priv = NULL;
/* allocate memory for the internal state */
- priv = kzalloc_obj(struct cxd2841er_priv, GFP_KERNEL);
+ priv = kzalloc_obj(struct cxd2841er_priv);
if (!priv)
return NULL;
priv->i2c = i2c;
diff --git a/drivers/media/dvb-frontends/cxd2880/cxd2880_top.c b/drivers/media/dvb-frontends/cxd2880/cxd2880_top.c
index 1a1ed41f7555..0d058b59a472 100644
--- a/drivers/media/dvb-frontends/cxd2880/cxd2880_top.c
+++ b/drivers/media/dvb-frontends/cxd2880/cxd2880_top.c
@@ -1887,7 +1887,7 @@ struct dvb_frontend *cxd2880_attach(struct dvb_frontend *fe,
return NULL;
}
- priv = kzalloc_obj(struct cxd2880_priv, GFP_KERNEL);
+ priv = kzalloc_obj(struct cxd2880_priv);
if (!priv)
return NULL;
diff --git a/drivers/media/dvb-frontends/dib0090.c b/drivers/media/dvb-frontends/dib0090.c
index f11083a955ec..f77ff444a6b0 100644
--- a/drivers/media/dvb-frontends/dib0090.c
+++ b/drivers/media/dvb-frontends/dib0090.c
@@ -2606,7 +2606,7 @@ static const struct dib0090_wbd_slope dib0090_wbd_table_default[] = {
struct dvb_frontend *dib0090_register(struct dvb_frontend *fe, struct i2c_adapter *i2c, const struct dib0090_config *config)
{
- struct dib0090_state *st = kzalloc_obj(struct dib0090_state, GFP_KERNEL);
+ struct dib0090_state *st = kzalloc_obj(struct dib0090_state);
if (st == NULL)
return NULL;
diff --git a/drivers/media/dvb-frontends/dib3000mb.c b/drivers/media/dvb-frontends/dib3000mb.c
index ab7046a4ff96..251410842b18 100644
--- a/drivers/media/dvb-frontends/dib3000mb.c
+++ b/drivers/media/dvb-frontends/dib3000mb.c
@@ -746,7 +746,7 @@ struct dvb_frontend* dib3000mb_attach(const struct dib3000_config* config,
struct dib3000_state* state = NULL;
/* allocate memory for the internal state */
- state = kzalloc_obj(struct dib3000_state, GFP_KERNEL);
+ state = kzalloc_obj(struct dib3000_state);
if (state == NULL)
goto error;
diff --git a/drivers/media/dvb-frontends/dib3000mc.c b/drivers/media/dvb-frontends/dib3000mc.c
index 12ee8a5d3b6e..544e5a0a5873 100644
--- a/drivers/media/dvb-frontends/dib3000mc.c
+++ b/drivers/media/dvb-frontends/dib3000mc.c
@@ -861,7 +861,7 @@ int dib3000mc_i2c_enumeration(struct i2c_adapter *i2c, int no_of_demods, u8 defa
static const u8 DIB3000MC_I2C_ADDRESS[] = { 20, 22, 24, 26 };
- dmcst = kzalloc_obj(struct dib3000mc_state, GFP_KERNEL);
+ dmcst = kzalloc_obj(struct dib3000mc_state);
if (dmcst == NULL)
return -ENOMEM;
@@ -910,7 +910,7 @@ struct dvb_frontend * dib3000mc_attach(struct i2c_adapter *i2c_adap, u8 i2c_addr
{
struct dvb_frontend *demod;
struct dib3000mc_state *st;
- st = kzalloc_obj(struct dib3000mc_state, GFP_KERNEL);
+ st = kzalloc_obj(struct dib3000mc_state);
if (st == NULL)
return NULL;
diff --git a/drivers/media/dvb-frontends/dib7000m.c b/drivers/media/dvb-frontends/dib7000m.c
index ffbc313915ed..44a78c7539a6 100644
--- a/drivers/media/dvb-frontends/dib7000m.c
+++ b/drivers/media/dvb-frontends/dib7000m.c
@@ -1403,7 +1403,7 @@ struct dvb_frontend * dib7000m_attach(struct i2c_adapter *i2c_adap, u8 i2c_addr,
{
struct dvb_frontend *demod;
struct dib7000m_state *st;
- st = kzalloc_obj(struct dib7000m_state, GFP_KERNEL);
+ st = kzalloc_obj(struct dib7000m_state);
if (st == NULL)
return NULL;
diff --git a/drivers/media/dvb-frontends/dib7000p.c b/drivers/media/dvb-frontends/dib7000p.c
index 2d0c85fb11a0..48d84a05ddfa 100644
--- a/drivers/media/dvb-frontends/dib7000p.c
+++ b/drivers/media/dvb-frontends/dib7000p.c
@@ -2081,7 +2081,7 @@ static int dib7000p_i2c_enumeration(struct i2c_adapter *i2c, int no_of_demods, u
int k = 0;
u8 new_addr = 0;
- dpst = kzalloc_obj(struct dib7000p_state, GFP_KERNEL);
+ dpst = kzalloc_obj(struct dib7000p_state);
if (!dpst)
return -ENOMEM;
@@ -2741,7 +2741,7 @@ static struct dvb_frontend *dib7000p_init(struct i2c_adapter *i2c_adap, u8 i2c_a
{
struct dvb_frontend *demod;
struct dib7000p_state *st;
- st = kzalloc_obj(struct dib7000p_state, GFP_KERNEL);
+ st = kzalloc_obj(struct dib7000p_state);
if (st == NULL)
return NULL;
diff --git a/drivers/media/dvb-frontends/dib8000.c b/drivers/media/dvb-frontends/dib8000.c
index 2266178f0a22..ebef27bcc989 100644
--- a/drivers/media/dvb-frontends/dib8000.c
+++ b/drivers/media/dvb-frontends/dib8000.c
@@ -4307,7 +4307,7 @@ static int dib8000_i2c_enumeration(struct i2c_adapter *host, int no_of_demods,
ret = -ENOMEM;
goto error_memory_read;
}
- client.i2c_buffer_lock = kzalloc_obj(struct mutex, GFP_KERNEL);
+ client.i2c_buffer_lock = kzalloc_obj(struct mutex);
if (!client.i2c_buffer_lock) {
dprintk("%s: not enough memory\n", __func__);
ret = -ENOMEM;
@@ -4448,10 +4448,10 @@ static struct dvb_frontend *dib8000_init(struct i2c_adapter *i2c_adap, u8 i2c_ad
dprintk("dib8000_init\n");
- state = kzalloc_obj(struct dib8000_state, GFP_KERNEL);
+ state = kzalloc_obj(struct dib8000_state);
if (state == NULL)
return NULL;
- fe = kzalloc_obj(struct dvb_frontend, GFP_KERNEL);
+ fe = kzalloc_obj(struct dvb_frontend);
if (fe == NULL)
goto error;
diff --git a/drivers/media/dvb-frontends/dib9000.c b/drivers/media/dvb-frontends/dib9000.c
index b2e5fe1af78a..cb7c943225bd 100644
--- a/drivers/media/dvb-frontends/dib9000.c
+++ b/drivers/media/dvb-frontends/dib9000.c
@@ -2474,10 +2474,10 @@ struct dvb_frontend *dib9000_attach(struct i2c_adapter *i2c_adap, u8 i2c_addr, c
{
struct dvb_frontend *fe;
struct dib9000_state *st;
- st = kzalloc_obj(struct dib9000_state, GFP_KERNEL);
+ st = kzalloc_obj(struct dib9000_state);
if (st == NULL)
return NULL;
- fe = kzalloc_obj(struct dvb_frontend, GFP_KERNEL);
+ fe = kzalloc_obj(struct dvb_frontend);
if (fe == NULL) {
kfree(st);
return NULL;
diff --git a/drivers/media/dvb-frontends/drx39xyj/drxj.c b/drivers/media/dvb-frontends/drx39xyj/drxj.c
index c7a91f90ed10..367acb59b4a3 100644
--- a/drivers/media/dvb-frontends/drx39xyj/drxj.c
+++ b/drivers/media/dvb-frontends/drx39xyj/drxj.c
@@ -12276,7 +12276,7 @@ struct dvb_frontend *drx39xxj_attach(struct i2c_adapter *i2c)
int result;
/* allocate memory for the internal state */
- state = kzalloc_obj(struct drx39xxj_state, GFP_KERNEL);
+ state = kzalloc_obj(struct drx39xxj_state);
if (state == NULL)
goto error;
diff --git a/drivers/media/dvb-frontends/drxd_hard.c b/drivers/media/dvb-frontends/drxd_hard.c
index aefdd620ce2c..4d673a108f61 100644
--- a/drivers/media/dvb-frontends/drxd_hard.c
+++ b/drivers/media/dvb-frontends/drxd_hard.c
@@ -2910,7 +2910,7 @@ struct dvb_frontend *drxd_attach(const struct drxd_config *config,
{
struct drxd_state *state = NULL;
- state = kzalloc_obj(*state, GFP_KERNEL);
+ state = kzalloc_obj(*state);
if (!state)
return NULL;
diff --git a/drivers/media/dvb-frontends/drxk_hard.c b/drivers/media/dvb-frontends/drxk_hard.c
index 7fb5f46aa1d4..47786d0610f0 100644
--- a/drivers/media/dvb-frontends/drxk_hard.c
+++ b/drivers/media/dvb-frontends/drxk_hard.c
@@ -6722,7 +6722,7 @@ struct dvb_frontend *drxk_attach(const struct drxk_config *config,
int status;
dprintk(1, "\n");
- state = kzalloc_obj(struct drxk_state, GFP_KERNEL);
+ state = kzalloc_obj(struct drxk_state);
if (!state)
return NULL;
diff --git a/drivers/media/dvb-frontends/ds3000.c b/drivers/media/dvb-frontends/ds3000.c
index d300c357f177..ce7ae424b27c 100644
--- a/drivers/media/dvb-frontends/ds3000.c
+++ b/drivers/media/dvb-frontends/ds3000.c
@@ -827,7 +827,7 @@ struct dvb_frontend *ds3000_attach(const struct ds3000_config *config,
dprintk("%s\n", __func__);
/* allocate memory for the internal state */
- state = kzalloc_obj(*state, GFP_KERNEL);
+ state = kzalloc_obj(*state);
if (!state)
return NULL;
diff --git a/drivers/media/dvb-frontends/dvb-pll.c b/drivers/media/dvb-frontends/dvb-pll.c
index 078596bd0361..f8fd23f60e3f 100644
--- a/drivers/media/dvb-frontends/dvb-pll.c
+++ b/drivers/media/dvb-frontends/dvb-pll.c
@@ -820,7 +820,7 @@ struct dvb_frontend *dvb_pll_attach(struct dvb_frontend *fe, int pll_addr,
fe->ops.i2c_gate_ctrl(fe, 0);
}
- priv = kzalloc_obj(struct dvb_pll_priv, GFP_KERNEL);
+ priv = kzalloc_obj(struct dvb_pll_priv);
if (!priv)
goto out;
diff --git a/drivers/media/dvb-frontends/dvb_dummy_fe.c b/drivers/media/dvb-frontends/dvb_dummy_fe.c
index 9ed03df364d6..6a34cdc28727 100644
--- a/drivers/media/dvb-frontends/dvb_dummy_fe.c
+++ b/drivers/media/dvb-frontends/dvb_dummy_fe.c
@@ -114,7 +114,7 @@ struct dvb_frontend *dvb_dummy_fe_ofdm_attach(void)
struct dvb_dummy_fe_state *state = NULL;
/* allocate memory for the internal state */
- state = kzalloc_obj(struct dvb_dummy_fe_state, GFP_KERNEL);
+ state = kzalloc_obj(struct dvb_dummy_fe_state);
if (!state)
return NULL;
@@ -135,7 +135,7 @@ struct dvb_frontend *dvb_dummy_fe_qpsk_attach(void)
struct dvb_dummy_fe_state *state = NULL;
/* allocate memory for the internal state */
- state = kzalloc_obj(struct dvb_dummy_fe_state, GFP_KERNEL);
+ state = kzalloc_obj(struct dvb_dummy_fe_state);
if (!state)
return NULL;
@@ -156,7 +156,7 @@ struct dvb_frontend *dvb_dummy_fe_qam_attach(void)
struct dvb_dummy_fe_state *state = NULL;
/* allocate memory for the internal state */
- state = kzalloc_obj(struct dvb_dummy_fe_state, GFP_KERNEL);
+ state = kzalloc_obj(struct dvb_dummy_fe_state);
if (!state)
return NULL;
diff --git a/drivers/media/dvb-frontends/ec100.c b/drivers/media/dvb-frontends/ec100.c
index be9ee1c90434..b7a3572f8a58 100644
--- a/drivers/media/dvb-frontends/ec100.c
+++ b/drivers/media/dvb-frontends/ec100.c
@@ -276,7 +276,7 @@ struct dvb_frontend *ec100_attach(const struct ec100_config *config,
u8 tmp;
/* allocate memory for the internal state */
- state = kzalloc_obj(struct ec100_state, GFP_KERNEL);
+ state = kzalloc_obj(struct ec100_state);
if (state == NULL)
goto error;
diff --git a/drivers/media/dvb-frontends/gp8psk-fe.c b/drivers/media/dvb-frontends/gp8psk-fe.c
index 8893de2758f6..aad311ffd2b5 100644
--- a/drivers/media/dvb-frontends/gp8psk-fe.c
+++ b/drivers/media/dvb-frontends/gp8psk-fe.c
@@ -332,7 +332,7 @@ struct dvb_frontend *gp8psk_fe_attach(const struct gp8psk_fe_ops *ops,
return NULL;
}
- st = kzalloc_obj(struct gp8psk_fe_state, GFP_KERNEL);
+ st = kzalloc_obj(struct gp8psk_fe_state);
if (!st)
return NULL;
diff --git a/drivers/media/dvb-frontends/helene.c b/drivers/media/dvb-frontends/helene.c
index 0b68fa8b2664..1402d124544e 100644
--- a/drivers/media/dvb-frontends/helene.c
+++ b/drivers/media/dvb-frontends/helene.c
@@ -997,7 +997,7 @@ struct dvb_frontend *helene_attach_s(struct dvb_frontend *fe,
{
struct helene_priv *priv = NULL;
- priv = kzalloc_obj(struct helene_priv, GFP_KERNEL);
+ priv = kzalloc_obj(struct helene_priv);
if (priv == NULL)
return NULL;
priv->i2c_address = (config->i2c_address >> 1);
@@ -1033,7 +1033,7 @@ struct dvb_frontend *helene_attach(struct dvb_frontend *fe,
{
struct helene_priv *priv = NULL;
- priv = kzalloc_obj(struct helene_priv, GFP_KERNEL);
+ priv = kzalloc_obj(struct helene_priv);
if (priv == NULL)
return NULL;
priv->i2c_address = (config->i2c_address >> 1);
diff --git a/drivers/media/dvb-frontends/horus3a.c b/drivers/media/dvb-frontends/horus3a.c
index 618301eb26aa..63579d6e24e5 100644
--- a/drivers/media/dvb-frontends/horus3a.c
+++ b/drivers/media/dvb-frontends/horus3a.c
@@ -339,7 +339,7 @@ struct dvb_frontend *horus3a_attach(struct dvb_frontend *fe,
u8 buf[3], val;
struct horus3a_priv *priv = NULL;
- priv = kzalloc_obj(struct horus3a_priv, GFP_KERNEL);
+ priv = kzalloc_obj(struct horus3a_priv);
if (priv == NULL)
return NULL;
priv->i2c_address = (config->i2c_address >> 1);
diff --git a/drivers/media/dvb-frontends/isl6405.c b/drivers/media/dvb-frontends/isl6405.c
index 96635db2eabc..2e681e2ba0c3 100644
--- a/drivers/media/dvb-frontends/isl6405.c
+++ b/drivers/media/dvb-frontends/isl6405.c
@@ -106,7 +106,7 @@ static void isl6405_release(struct dvb_frontend *fe)
struct dvb_frontend *isl6405_attach(struct dvb_frontend *fe, struct i2c_adapter *i2c,
u8 i2c_addr, u8 override_set, u8 override_clear)
{
- struct isl6405 *isl6405 = kmalloc_obj(struct isl6405, GFP_KERNEL);
+ struct isl6405 *isl6405 = kmalloc_obj(struct isl6405);
if (!isl6405)
return NULL;
diff --git a/drivers/media/dvb-frontends/isl6421.c b/drivers/media/dvb-frontends/isl6421.c
index 02d9e3b4e91d..b3c130e7dbe5 100644
--- a/drivers/media/dvb-frontends/isl6421.c
+++ b/drivers/media/dvb-frontends/isl6421.c
@@ -177,7 +177,7 @@ static void isl6421_release(struct dvb_frontend *fe)
struct dvb_frontend *isl6421_attach(struct dvb_frontend *fe, struct i2c_adapter *i2c, u8 i2c_addr,
u8 override_set, u8 override_clear, bool override_tone)
{
- struct isl6421 *isl6421 = kmalloc_obj(struct isl6421, GFP_KERNEL);
+ struct isl6421 *isl6421 = kmalloc_obj(struct isl6421);
if (!isl6421)
return NULL;
diff --git a/drivers/media/dvb-frontends/isl6423.c b/drivers/media/dvb-frontends/isl6423.c
index 6bffcc381fed..48f15cca07d3 100644
--- a/drivers/media/dvb-frontends/isl6423.c
+++ b/drivers/media/dvb-frontends/isl6423.c
@@ -258,7 +258,7 @@ struct dvb_frontend *isl6423_attach(struct dvb_frontend *fe,
{
struct isl6423_dev *isl6423;
- isl6423 = kzalloc_obj(struct isl6423_dev, GFP_KERNEL);
+ isl6423 = kzalloc_obj(struct isl6423_dev);
if (!isl6423)
return NULL;
diff --git a/drivers/media/dvb-frontends/itd1000.c b/drivers/media/dvb-frontends/itd1000.c
index 6c1863efe227..f5f02363917e 100644
--- a/drivers/media/dvb-frontends/itd1000.c
+++ b/drivers/media/dvb-frontends/itd1000.c
@@ -365,7 +365,7 @@ struct dvb_frontend *itd1000_attach(struct dvb_frontend *fe, struct i2c_adapter
struct itd1000_state *state = NULL;
u8 i = 0;
- state = kzalloc_obj(struct itd1000_state, GFP_KERNEL);
+ state = kzalloc_obj(struct itd1000_state);
if (state == NULL)
return NULL;
diff --git a/drivers/media/dvb-frontends/ix2505v.c b/drivers/media/dvb-frontends/ix2505v.c
index db0875f65de8..832c998a3d99 100644
--- a/drivers/media/dvb-frontends/ix2505v.c
+++ b/drivers/media/dvb-frontends/ix2505v.c
@@ -267,7 +267,7 @@ struct dvb_frontend *ix2505v_attach(struct dvb_frontend *fe,
goto error;
}
- state = kzalloc_obj(struct ix2505v_state, GFP_KERNEL);
+ state = kzalloc_obj(struct ix2505v_state);
if (NULL == state)
return NULL;
diff --git a/drivers/media/dvb-frontends/l64781.c b/drivers/media/dvb-frontends/l64781.c
index cfec598001db..ff686c132eaf 100644
--- a/drivers/media/dvb-frontends/l64781.c
+++ b/drivers/media/dvb-frontends/l64781.c
@@ -497,7 +497,7 @@ struct dvb_frontend* l64781_attach(const struct l64781_config* config,
{ .addr = config->demod_address, .flags = I2C_M_RD, .buf = b1, .len = 1 } };
/* allocate memory for the internal state */
- state = kzalloc_obj(struct l64781_state, GFP_KERNEL);
+ state = kzalloc_obj(struct l64781_state);
if (state == NULL) goto error;
/* setup the state */
diff --git a/drivers/media/dvb-frontends/lg2160.c b/drivers/media/dvb-frontends/lg2160.c
index 5c9ebfec4524..41c4aae0cb49 100644
--- a/drivers/media/dvb-frontends/lg2160.c
+++ b/drivers/media/dvb-frontends/lg2160.c
@@ -1396,7 +1396,7 @@ struct dvb_frontend *lg2160_attach(const struct lg2160_config *config,
i2c_adap ? i2c_adapter_id(i2c_adap) : 0,
config ? config->i2c_addr : 0);
- state = kzalloc_obj(struct lg216x_state, GFP_KERNEL);
+ state = kzalloc_obj(struct lg216x_state);
if (!state)
return NULL;
diff --git a/drivers/media/dvb-frontends/lgdt3305.c b/drivers/media/dvb-frontends/lgdt3305.c
index 9fcac3361618..e08ee89c4c26 100644
--- a/drivers/media/dvb-frontends/lgdt3305.c
+++ b/drivers/media/dvb-frontends/lgdt3305.c
@@ -1103,7 +1103,7 @@ struct dvb_frontend *lgdt3305_attach(const struct lgdt3305_config *config,
i2c_adap ? i2c_adapter_id(i2c_adap) : 0,
config ? config->i2c_addr : 0);
- state = kzalloc_obj(struct lgdt3305_state, GFP_KERNEL);
+ state = kzalloc_obj(struct lgdt3305_state);
if (state == NULL)
goto fail;
diff --git a/drivers/media/dvb-frontends/lgdt3306a.c b/drivers/media/dvb-frontends/lgdt3306a.c
index a6d885d951a5..b6a66e122ed5 100644
--- a/drivers/media/dvb-frontends/lgdt3306a.c
+++ b/drivers/media/dvb-frontends/lgdt3306a.c
@@ -1802,7 +1802,7 @@ struct dvb_frontend *lgdt3306a_attach(const struct lgdt3306a_config *config,
i2c_adap ? i2c_adapter_id(i2c_adap) : 0,
config ? config->i2c_addr : 0);
- state = kzalloc_obj(struct lgdt3306a_state, GFP_KERNEL);
+ state = kzalloc_obj(struct lgdt3306a_state);
if (state == NULL)
goto fail;
diff --git a/drivers/media/dvb-frontends/lgdt330x.c b/drivers/media/dvb-frontends/lgdt330x.c
index 43e45c2317e0..19a4a05b3499 100644
--- a/drivers/media/dvb-frontends/lgdt330x.c
+++ b/drivers/media/dvb-frontends/lgdt330x.c
@@ -863,7 +863,7 @@ static int lgdt330x_probe(struct i2c_client *client)
u8 buf[1];
/* Allocate memory for the internal state */
- state = kzalloc_obj(*state, GFP_KERNEL);
+ state = kzalloc_obj(*state);
if (!state)
goto error;
diff --git a/drivers/media/dvb-frontends/lgs8gl5.c b/drivers/media/dvb-frontends/lgs8gl5.c
index 07e422cb53da..3ee12a9e4526 100644
--- a/drivers/media/dvb-frontends/lgs8gl5.c
+++ b/drivers/media/dvb-frontends/lgs8gl5.c
@@ -375,7 +375,7 @@ lgs8gl5_attach(const struct lgs8gl5_config *config, struct i2c_adapter *i2c)
dprintk("%s\n", __func__);
/* Allocate memory for the internal state */
- state = kzalloc_obj(struct lgs8gl5_state, GFP_KERNEL);
+ state = kzalloc_obj(struct lgs8gl5_state);
if (state == NULL)
goto error;
diff --git a/drivers/media/dvb-frontends/lgs8gxx.c b/drivers/media/dvb-frontends/lgs8gxx.c
index 8904f767e4ad..285ac9ddd419 100644
--- a/drivers/media/dvb-frontends/lgs8gxx.c
+++ b/drivers/media/dvb-frontends/lgs8gxx.c
@@ -1012,7 +1012,7 @@ struct dvb_frontend *lgs8gxx_attach(const struct lgs8gxx_config *config,
if (config == NULL || i2c == NULL)
return NULL;
- priv = kzalloc_obj(struct lgs8gxx_state, GFP_KERNEL);
+ priv = kzalloc_obj(struct lgs8gxx_state);
if (priv == NULL)
goto error_out;
diff --git a/drivers/media/dvb-frontends/lnbh25.c b/drivers/media/dvb-frontends/lnbh25.c
index e4e4c43465cf..8a0b9efd17db 100644
--- a/drivers/media/dvb-frontends/lnbh25.c
+++ b/drivers/media/dvb-frontends/lnbh25.c
@@ -148,7 +148,7 @@ struct dvb_frontend *lnbh25_attach(struct dvb_frontend *fe,
struct lnbh25_priv *priv;
dev_dbg(&i2c->dev, "%s()\n", __func__);
- priv = kzalloc_obj(struct lnbh25_priv, GFP_KERNEL);
+ priv = kzalloc_obj(struct lnbh25_priv);
if (!priv)
return NULL;
priv->i2c_address = (cfg->i2c_address >> 1);
diff --git a/drivers/media/dvb-frontends/lnbh29.c b/drivers/media/dvb-frontends/lnbh29.c
index 2bb9f8b9d325..1fcb7ad16508 100644
--- a/drivers/media/dvb-frontends/lnbh29.c
+++ b/drivers/media/dvb-frontends/lnbh29.c
@@ -135,7 +135,7 @@ struct dvb_frontend *lnbh29_attach(struct dvb_frontend *fe,
{
struct lnbh29_priv *priv;
- priv = kzalloc_obj(*priv, GFP_KERNEL);
+ priv = kzalloc_obj(*priv);
if (!priv)
return NULL;
diff --git a/drivers/media/dvb-frontends/lnbp21.c b/drivers/media/dvb-frontends/lnbp21.c
index b68fa4424acd..2007c2713cfb 100644
--- a/drivers/media/dvb-frontends/lnbp21.c
+++ b/drivers/media/dvb-frontends/lnbp21.c
@@ -113,7 +113,7 @@ static struct dvb_frontend *lnbx2x_attach(struct dvb_frontend *fe,
struct i2c_adapter *i2c, u8 override_set,
u8 override_clear, u8 i2c_addr, u8 config)
{
- struct lnbp21 *lnbp21 = kmalloc_obj(struct lnbp21, GFP_KERNEL);
+ struct lnbp21 *lnbp21 = kmalloc_obj(struct lnbp21);
if (!lnbp21)
return NULL;
diff --git a/drivers/media/dvb-frontends/lnbp22.c b/drivers/media/dvb-frontends/lnbp22.c
index 98e54f74f306..9daef48d1569 100644
--- a/drivers/media/dvb-frontends/lnbp22.c
+++ b/drivers/media/dvb-frontends/lnbp22.c
@@ -96,7 +96,7 @@ static void lnbp22_release(struct dvb_frontend *fe)
struct dvb_frontend *lnbp22_attach(struct dvb_frontend *fe,
struct i2c_adapter *i2c)
{
- struct lnbp22 *lnbp22 = kmalloc_obj(struct lnbp22, GFP_KERNEL);
+ struct lnbp22 *lnbp22 = kmalloc_obj(struct lnbp22);
if (!lnbp22)
return NULL;
diff --git a/drivers/media/dvb-frontends/m88ds3103.c b/drivers/media/dvb-frontends/m88ds3103.c
index e419551ca46e..be156180e5ef 100644
--- a/drivers/media/dvb-frontends/m88ds3103.c
+++ b/drivers/media/dvb-frontends/m88ds3103.c
@@ -1775,7 +1775,7 @@ static int m88ds3103_probe(struct i2c_client *client)
int ret;
unsigned int utmp;
- dev = kzalloc_obj(*dev, GFP_KERNEL);
+ dev = kzalloc_obj(*dev);
if (!dev) {
ret = -ENOMEM;
goto err;
diff --git a/drivers/media/dvb-frontends/m88rs2000.c b/drivers/media/dvb-frontends/m88rs2000.c
index 1804c31ebe0f..9c9f34c6d3a2 100644
--- a/drivers/media/dvb-frontends/m88rs2000.c
+++ b/drivers/media/dvb-frontends/m88rs2000.c
@@ -786,7 +786,7 @@ struct dvb_frontend *m88rs2000_attach(const struct m88rs2000_config *config,
struct m88rs2000_state *state = NULL;
/* allocate memory for the internal state */
- state = kzalloc_obj(struct m88rs2000_state, GFP_KERNEL);
+ state = kzalloc_obj(struct m88rs2000_state);
if (state == NULL)
goto error;
diff --git a/drivers/media/dvb-frontends/mb86a16.c b/drivers/media/dvb-frontends/mb86a16.c
index 0c9bd4a47be4..50737e6f81dc 100644
--- a/drivers/media/dvb-frontends/mb86a16.c
+++ b/drivers/media/dvb-frontends/mb86a16.c
@@ -1833,7 +1833,7 @@ struct dvb_frontend *mb86a16_attach(const struct mb86a16_config *config,
u8 dev_id = 0;
struct mb86a16_state *state = NULL;
- state = kmalloc_obj(struct mb86a16_state, GFP_KERNEL);
+ state = kmalloc_obj(struct mb86a16_state);
if (state == NULL)
goto error;
diff --git a/drivers/media/dvb-frontends/mb86a20s.c b/drivers/media/dvb-frontends/mb86a20s.c
index eb596d3b9da5..0d9bfc5b3761 100644
--- a/drivers/media/dvb-frontends/mb86a20s.c
+++ b/drivers/media/dvb-frontends/mb86a20s.c
@@ -2052,7 +2052,7 @@ struct dvb_frontend *mb86a20s_attach(const struct mb86a20s_config *config,
dev_dbg(&i2c->dev, "%s called.\n", __func__);
/* allocate memory for the internal state */
- state = kzalloc_obj(*state, GFP_KERNEL);
+ state = kzalloc_obj(*state);
if (!state)
return NULL;
diff --git a/drivers/media/dvb-frontends/mn88472.c b/drivers/media/dvb-frontends/mn88472.c
index ce3ae7d8d13f..275c404ce286 100644
--- a/drivers/media/dvb-frontends/mn88472.c
+++ b/drivers/media/dvb-frontends/mn88472.c
@@ -586,7 +586,7 @@ static int mn88472_probe(struct i2c_client *client)
dev_dbg(&client->dev, "\n");
- dev = kzalloc_obj(*dev, GFP_KERNEL);
+ dev = kzalloc_obj(*dev);
if (!dev) {
ret = -ENOMEM;
goto err;
diff --git a/drivers/media/dvb-frontends/mn88473.c b/drivers/media/dvb-frontends/mn88473.c
index 371f9faa3038..40a0cb1d9c67 100644
--- a/drivers/media/dvb-frontends/mn88473.c
+++ b/drivers/media/dvb-frontends/mn88473.c
@@ -626,7 +626,7 @@ static int mn88473_probe(struct i2c_client *client)
goto err;
}
- dev = kzalloc_obj(*dev, GFP_KERNEL);
+ dev = kzalloc_obj(*dev);
if (dev == NULL) {
ret = -ENOMEM;
goto err;
diff --git a/drivers/media/dvb-frontends/mt312.c b/drivers/media/dvb-frontends/mt312.c
index 06d7153f57d8..8fe850a8d914 100644
--- a/drivers/media/dvb-frontends/mt312.c
+++ b/drivers/media/dvb-frontends/mt312.c
@@ -780,7 +780,7 @@ struct dvb_frontend *mt312_attach(const struct mt312_config *config,
struct mt312_state *state = NULL;
/* allocate memory for the internal state */
- state = kzalloc_obj(struct mt312_state, GFP_KERNEL);
+ state = kzalloc_obj(struct mt312_state);
if (state == NULL)
goto error;
diff --git a/drivers/media/dvb-frontends/mt352.c b/drivers/media/dvb-frontends/mt352.c
index 3f57ac209654..7ae4d93f1f19 100644
--- a/drivers/media/dvb-frontends/mt352.c
+++ b/drivers/media/dvb-frontends/mt352.c
@@ -533,7 +533,7 @@ struct dvb_frontend* mt352_attach(const struct mt352_config* config,
struct mt352_state* state = NULL;
/* allocate memory for the internal state */
- state = kzalloc_obj(struct mt352_state, GFP_KERNEL);
+ state = kzalloc_obj(struct mt352_state);
if (state == NULL) goto error;
/* setup the state */
diff --git a/drivers/media/dvb-frontends/mxl5xx.c b/drivers/media/dvb-frontends/mxl5xx.c
index 43d953c898fd..64d83589dfc4 100644
--- a/drivers/media/dvb-frontends/mxl5xx.c
+++ b/drivers/media/dvb-frontends/mxl5xx.c
@@ -1829,7 +1829,7 @@ struct dvb_frontend *mxl5xx_attach(struct i2c_adapter *i2c,
struct mxl *state;
struct mxl_base *base;
- state = kzalloc_obj(struct mxl, GFP_KERNEL);
+ state = kzalloc_obj(struct mxl);
if (!state)
return NULL;
@@ -1845,7 +1845,7 @@ struct dvb_frontend *mxl5xx_attach(struct i2c_adapter *i2c,
goto fail;
state->base = base;
} else {
- base = kzalloc_obj(struct mxl_base, GFP_KERNEL);
+ base = kzalloc_obj(struct mxl_base);
if (!base)
goto fail;
base->i2c = i2c;
diff --git a/drivers/media/dvb-frontends/mxl692.c b/drivers/media/dvb-frontends/mxl692.c
index 68455628b03d..2d8eaa20723f 100644
--- a/drivers/media/dvb-frontends/mxl692.c
+++ b/drivers/media/dvb-frontends/mxl692.c
@@ -1314,7 +1314,7 @@ static int mxl692_probe(struct i2c_client *client)
struct mxl692_dev *dev;
int ret = 0;
- dev = kzalloc_obj(*dev, GFP_KERNEL);
+ dev = kzalloc_obj(*dev);
if (!dev) {
ret = -ENOMEM;
dev_dbg(&client->dev, "kzalloc() failed\n");
diff --git a/drivers/media/dvb-frontends/nxt200x.c b/drivers/media/dvb-frontends/nxt200x.c
index 5b0762938c86..d1f93ac18888 100644
--- a/drivers/media/dvb-frontends/nxt200x.c
+++ b/drivers/media/dvb-frontends/nxt200x.c
@@ -1128,7 +1128,7 @@ struct dvb_frontend* nxt200x_attach(const struct nxt200x_config* config,
u8 buf [] = {0,0,0,0,0};
/* allocate memory for the internal state */
- state = kzalloc_obj(struct nxt200x_state, GFP_KERNEL);
+ state = kzalloc_obj(struct nxt200x_state);
if (state == NULL)
goto error;
diff --git a/drivers/media/dvb-frontends/nxt6000.c b/drivers/media/dvb-frontends/nxt6000.c
index ed12ef9cd9df..99cfa610e263 100644
--- a/drivers/media/dvb-frontends/nxt6000.c
+++ b/drivers/media/dvb-frontends/nxt6000.c
@@ -560,7 +560,7 @@ struct dvb_frontend* nxt6000_attach(const struct nxt6000_config* config,
struct nxt6000_state* state = NULL;
/* allocate memory for the internal state */
- state = kzalloc_obj(struct nxt6000_state, GFP_KERNEL);
+ state = kzalloc_obj(struct nxt6000_state);
if (state == NULL) goto error;
/* setup the state */
diff --git a/drivers/media/dvb-frontends/or51132.c b/drivers/media/dvb-frontends/or51132.c
index 4b0063823736..e908d33d7e72 100644
--- a/drivers/media/dvb-frontends/or51132.c
+++ b/drivers/media/dvb-frontends/or51132.c
@@ -552,7 +552,7 @@ struct dvb_frontend* or51132_attach(const struct or51132_config* config,
struct or51132_state* state = NULL;
/* Allocate memory for the internal state */
- state = kzalloc_obj(struct or51132_state, GFP_KERNEL);
+ state = kzalloc_obj(struct or51132_state);
if (state == NULL)
return NULL;
diff --git a/drivers/media/dvb-frontends/or51211.c b/drivers/media/dvb-frontends/or51211.c
index 2a52b1dc9d0a..8c4aabef2d99 100644
--- a/drivers/media/dvb-frontends/or51211.c
+++ b/drivers/media/dvb-frontends/or51211.c
@@ -501,7 +501,7 @@ struct dvb_frontend* or51211_attach(const struct or51211_config* config,
struct or51211_state* state = NULL;
/* Allocate memory for the internal state */
- state = kzalloc_obj(struct or51211_state, GFP_KERNEL);
+ state = kzalloc_obj(struct or51211_state);
if (state == NULL)
return NULL;
diff --git a/drivers/media/dvb-frontends/rtl2830.c b/drivers/media/dvb-frontends/rtl2830.c
index ee6ba9b7c016..f0ee7c38ee79 100644
--- a/drivers/media/dvb-frontends/rtl2830.c
+++ b/drivers/media/dvb-frontends/rtl2830.c
@@ -807,7 +807,7 @@ static int rtl2830_probe(struct i2c_client *client)
}
/* allocate memory for the internal state */
- dev = kzalloc_obj(*dev, GFP_KERNEL);
+ dev = kzalloc_obj(*dev);
if (dev == NULL) {
ret = -ENOMEM;
goto err;
diff --git a/drivers/media/dvb-frontends/rtl2832.c b/drivers/media/dvb-frontends/rtl2832.c
index 19ec892debb7..d8e1546aea5e 100644
--- a/drivers/media/dvb-frontends/rtl2832.c
+++ b/drivers/media/dvb-frontends/rtl2832.c
@@ -1043,7 +1043,7 @@ static int rtl2832_probe(struct i2c_client *client)
dev_dbg(&client->dev, "\n");
/* allocate memory for the internal state */
- dev = kzalloc_obj(struct rtl2832_dev, GFP_KERNEL);
+ dev = kzalloc_obj(struct rtl2832_dev);
if (dev == NULL) {
ret = -ENOMEM;
goto err;
diff --git a/drivers/media/dvb-frontends/rtl2832_sdr.c b/drivers/media/dvb-frontends/rtl2832_sdr.c
index 5a59bdde8f7b..422d1a7b5456 100644
--- a/drivers/media/dvb-frontends/rtl2832_sdr.c
+++ b/drivers/media/dvb-frontends/rtl2832_sdr.c
@@ -1330,7 +1330,7 @@ static int rtl2832_sdr_probe(struct platform_device *pdev)
ret = -EINVAL;
goto err;
}
- dev = kzalloc_obj(*dev, GFP_KERNEL);
+ dev = kzalloc_obj(*dev);
if (dev == NULL) {
ret = -ENOMEM;
goto err_module_put;
diff --git a/drivers/media/dvb-frontends/s5h1409.c b/drivers/media/dvb-frontends/s5h1409.c
index 33f820e2d6d3..370824589ab5 100644
--- a/drivers/media/dvb-frontends/s5h1409.c
+++ b/drivers/media/dvb-frontends/s5h1409.c
@@ -946,7 +946,7 @@ struct dvb_frontend *s5h1409_attach(const struct s5h1409_config *config,
u16 reg;
/* allocate memory for the internal state */
- state = kzalloc_obj(struct s5h1409_state, GFP_KERNEL);
+ state = kzalloc_obj(struct s5h1409_state);
if (state == NULL)
goto error;
diff --git a/drivers/media/dvb-frontends/s5h1411.c b/drivers/media/dvb-frontends/s5h1411.c
index c6379da7361e..bffd3a492c65 100644
--- a/drivers/media/dvb-frontends/s5h1411.c
+++ b/drivers/media/dvb-frontends/s5h1411.c
@@ -861,7 +861,7 @@ struct dvb_frontend *s5h1411_attach(const struct s5h1411_config *config,
u16 reg;
/* allocate memory for the internal state */
- state = kzalloc_obj(struct s5h1411_state, GFP_KERNEL);
+ state = kzalloc_obj(struct s5h1411_state);
if (state == NULL)
goto error;
diff --git a/drivers/media/dvb-frontends/s5h1432.c b/drivers/media/dvb-frontends/s5h1432.c
index 6261df9f383c..3046ee8cc0bc 100644
--- a/drivers/media/dvb-frontends/s5h1432.c
+++ b/drivers/media/dvb-frontends/s5h1432.c
@@ -337,7 +337,7 @@ struct dvb_frontend *s5h1432_attach(const struct s5h1432_config *config,
printk(KERN_INFO " Enter s5h1432_attach(). attach success!\n");
/* allocate memory for the internal state */
- state = kmalloc_obj(struct s5h1432_state, GFP_KERNEL);
+ state = kmalloc_obj(struct s5h1432_state);
if (!state)
return NULL;
diff --git a/drivers/media/dvb-frontends/s921.c b/drivers/media/dvb-frontends/s921.c
index 6d38c9742f1d..41ac1d3a64dc 100644
--- a/drivers/media/dvb-frontends/s921.c
+++ b/drivers/media/dvb-frontends/s921.c
@@ -476,7 +476,7 @@ struct dvb_frontend *s921_attach(const struct s921_config *config,
{
/* allocate memory for the internal state */
struct s921_state *state =
- kzalloc_obj(struct s921_state, GFP_KERNEL);
+ kzalloc_obj(struct s921_state);
dprintk("\n");
if (!state) {
diff --git a/drivers/media/dvb-frontends/si2165.c b/drivers/media/dvb-frontends/si2165.c
index cb6802b81e41..4170696af9f0 100644
--- a/drivers/media/dvb-frontends/si2165.c
+++ b/drivers/media/dvb-frontends/si2165.c
@@ -1158,7 +1158,7 @@ static int si2165_probe(struct i2c_client *client)
};
/* allocate memory for the internal state */
- state = kzalloc_obj(*state, GFP_KERNEL);
+ state = kzalloc_obj(*state);
if (!state) {
ret = -ENOMEM;
goto error;
diff --git a/drivers/media/dvb-frontends/si2168.c b/drivers/media/dvb-frontends/si2168.c
index f7a1d2fc3cfb..c4bbcd127cac 100644
--- a/drivers/media/dvb-frontends/si2168.c
+++ b/drivers/media/dvb-frontends/si2168.c
@@ -681,7 +681,7 @@ static int si2168_probe(struct i2c_client *client)
dev_dbg(&client->dev, "\n");
- dev = kzalloc_obj(*dev, GFP_KERNEL);
+ dev = kzalloc_obj(*dev);
if (!dev) {
ret = -ENOMEM;
goto err;
diff --git a/drivers/media/dvb-frontends/si21xx.c b/drivers/media/dvb-frontends/si21xx.c
index ac50df3c40fb..e64ced2d6c21 100644
--- a/drivers/media/dvb-frontends/si21xx.c
+++ b/drivers/media/dvb-frontends/si21xx.c
@@ -902,7 +902,7 @@ struct dvb_frontend *si21xx_attach(const struct si21xx_config *config,
dprintk("%s\n", __func__);
/* allocate memory for the internal state */
- state = kzalloc_obj(struct si21xx_state, GFP_KERNEL);
+ state = kzalloc_obj(struct si21xx_state);
if (state == NULL)
goto error;
diff --git a/drivers/media/dvb-frontends/sp2.c b/drivers/media/dvb-frontends/sp2.c
index 50103c4a36f9..071c7371c699 100644
--- a/drivers/media/dvb-frontends/sp2.c
+++ b/drivers/media/dvb-frontends/sp2.c
@@ -371,7 +371,7 @@ static int sp2_probe(struct i2c_client *client)
dev_dbg(&client->dev, "\n");
- s = kzalloc_obj(*s, GFP_KERNEL);
+ s = kzalloc_obj(*s);
if (!s) {
ret = -ENOMEM;
goto err;
diff --git a/drivers/media/dvb-frontends/sp887x.c b/drivers/media/dvb-frontends/sp887x.c
index 235ecfd45376..13cb736760d3 100644
--- a/drivers/media/dvb-frontends/sp887x.c
+++ b/drivers/media/dvb-frontends/sp887x.c
@@ -568,7 +568,7 @@ struct dvb_frontend* sp887x_attach(const struct sp887x_config* config,
struct sp887x_state* state = NULL;
/* allocate memory for the internal state */
- state = kzalloc_obj(struct sp887x_state, GFP_KERNEL);
+ state = kzalloc_obj(struct sp887x_state);
if (state == NULL) goto error;
/* setup the state */
diff --git a/drivers/media/dvb-frontends/stb0899_drv.c b/drivers/media/dvb-frontends/stb0899_drv.c
index 19a31a296e0f..4f0f31d248d6 100644
--- a/drivers/media/dvb-frontends/stb0899_drv.c
+++ b/drivers/media/dvb-frontends/stb0899_drv.c
@@ -1613,7 +1613,7 @@ struct dvb_frontend *stb0899_attach(struct stb0899_config *config, struct i2c_ad
{
struct stb0899_state *state = NULL;
- state = kzalloc_obj(struct stb0899_state, GFP_KERNEL);
+ state = kzalloc_obj(struct stb0899_state);
if (state == NULL)
goto error;
diff --git a/drivers/media/dvb-frontends/stb6000.c b/drivers/media/dvb-frontends/stb6000.c
index 85900e616490..c66d4ac17f85 100644
--- a/drivers/media/dvb-frontends/stb6000.c
+++ b/drivers/media/dvb-frontends/stb6000.c
@@ -218,7 +218,7 @@ struct dvb_frontend *stb6000_attach(struct dvb_frontend *fe, int addr,
if (ret != 2)
return NULL;
- priv = kzalloc_obj(struct stb6000_priv, GFP_KERNEL);
+ priv = kzalloc_obj(struct stb6000_priv);
if (priv == NULL)
return NULL;
diff --git a/drivers/media/dvb-frontends/stb6100.c b/drivers/media/dvb-frontends/stb6100.c
index 97238cf98067..ff7b0c780256 100644
--- a/drivers/media/dvb-frontends/stb6100.c
+++ b/drivers/media/dvb-frontends/stb6100.c
@@ -534,7 +534,7 @@ struct dvb_frontend *stb6100_attach(struct dvb_frontend *fe,
{
struct stb6100_state *state = NULL;
- state = kzalloc_obj(struct stb6100_state, GFP_KERNEL);
+ state = kzalloc_obj(struct stb6100_state);
if (!state)
return NULL;
diff --git a/drivers/media/dvb-frontends/stv0288.c b/drivers/media/dvb-frontends/stv0288.c
index 40648b74edd4..09992f6f09cc 100644
--- a/drivers/media/dvb-frontends/stv0288.c
+++ b/drivers/media/dvb-frontends/stv0288.c
@@ -557,7 +557,7 @@ struct dvb_frontend *stv0288_attach(const struct stv0288_config *config,
int id;
/* allocate memory for the internal state */
- state = kzalloc_obj(struct stv0288_state, GFP_KERNEL);
+ state = kzalloc_obj(struct stv0288_state);
if (state == NULL)
goto error;
diff --git a/drivers/media/dvb-frontends/stv0297.c b/drivers/media/dvb-frontends/stv0297.c
index c0634e2436b3..dd0ecc050ad5 100644
--- a/drivers/media/dvb-frontends/stv0297.c
+++ b/drivers/media/dvb-frontends/stv0297.c
@@ -654,7 +654,7 @@ struct dvb_frontend *stv0297_attach(const struct stv0297_config *config,
struct stv0297_state *state = NULL;
/* allocate memory for the internal state */
- state = kzalloc_obj(struct stv0297_state, GFP_KERNEL);
+ state = kzalloc_obj(struct stv0297_state);
if (state == NULL)
goto error;
diff --git a/drivers/media/dvb-frontends/stv0299.c b/drivers/media/dvb-frontends/stv0299.c
index cc15bb93b7dc..0d0bd076dd32 100644
--- a/drivers/media/dvb-frontends/stv0299.c
+++ b/drivers/media/dvb-frontends/stv0299.c
@@ -671,7 +671,7 @@ struct dvb_frontend* stv0299_attach(const struct stv0299_config* config,
int id;
/* allocate memory for the internal state */
- state = kzalloc_obj(struct stv0299_state, GFP_KERNEL);
+ state = kzalloc_obj(struct stv0299_state);
if (state == NULL) goto error;
/* setup the state */
diff --git a/drivers/media/dvb-frontends/stv0367.c b/drivers/media/dvb-frontends/stv0367.c
index cf6b1b646b10..592ada5c77fe 100644
--- a/drivers/media/dvb-frontends/stv0367.c
+++ b/drivers/media/dvb-frontends/stv0367.c
@@ -1698,10 +1698,10 @@ struct dvb_frontend *stv0367ter_attach(const struct stv0367_config *config,
struct stv0367ter_state *ter_state = NULL;
/* allocate memory for the internal state */
- state = kzalloc_obj(struct stv0367_state, GFP_KERNEL);
+ state = kzalloc_obj(struct stv0367_state);
if (state == NULL)
goto error;
- ter_state = kzalloc_obj(struct stv0367ter_state, GFP_KERNEL);
+ ter_state = kzalloc_obj(struct stv0367ter_state);
if (ter_state == NULL)
goto error;
@@ -2865,10 +2865,10 @@ struct dvb_frontend *stv0367cab_attach(const struct stv0367_config *config,
struct stv0367cab_state *cab_state = NULL;
/* allocate memory for the internal state */
- state = kzalloc_obj(struct stv0367_state, GFP_KERNEL);
+ state = kzalloc_obj(struct stv0367_state);
if (state == NULL)
goto error;
- cab_state = kzalloc_obj(struct stv0367cab_state, GFP_KERNEL);
+ cab_state = kzalloc_obj(struct stv0367cab_state);
if (cab_state == NULL)
goto error;
@@ -3274,13 +3274,13 @@ struct dvb_frontend *stv0367ddb_attach(const struct stv0367_config *config,
struct stv0367cab_state *cab_state = NULL;
/* allocate memory for the internal state */
- state = kzalloc_obj(struct stv0367_state, GFP_KERNEL);
+ state = kzalloc_obj(struct stv0367_state);
if (state == NULL)
goto error;
- ter_state = kzalloc_obj(struct stv0367ter_state, GFP_KERNEL);
+ ter_state = kzalloc_obj(struct stv0367ter_state);
if (ter_state == NULL)
goto error;
- cab_state = kzalloc_obj(struct stv0367cab_state, GFP_KERNEL);
+ cab_state = kzalloc_obj(struct stv0367cab_state);
if (cab_state == NULL)
goto error;
diff --git a/drivers/media/dvb-frontends/stv0900_core.c b/drivers/media/dvb-frontends/stv0900_core.c
index 3f1edc8559c5..21899b6223b6 100644
--- a/drivers/media/dvb-frontends/stv0900_core.c
+++ b/drivers/media/dvb-frontends/stv0900_core.c
@@ -85,7 +85,7 @@ static struct stv0900_inode *append_internal(struct stv0900_internal *internal)
struct stv0900_inode *new_node = stv0900_first_inode;
if (new_node == NULL) {
- new_node = kmalloc_obj(struct stv0900_inode, GFP_KERNEL);
+ new_node = kmalloc_obj(struct stv0900_inode);
stv0900_first_inode = new_node;
} else {
while (new_node->next_inode != NULL)
@@ -1903,7 +1903,7 @@ struct dvb_frontend *stv0900_attach(const struct stv0900_config *config,
struct stv0900_init_params init_params;
enum fe_stv0900_error err_stv0900;
- state = kzalloc_obj(struct stv0900_state, GFP_KERNEL);
+ state = kzalloc_obj(struct stv0900_state);
if (state == NULL)
goto error;
diff --git a/drivers/media/dvb-frontends/stv090x.c b/drivers/media/dvb-frontends/stv090x.c
index 16ff5c8cf417..657df713865e 100644
--- a/drivers/media/dvb-frontends/stv090x.c
+++ b/drivers/media/dvb-frontends/stv090x.c
@@ -85,7 +85,7 @@ static struct stv090x_dev *append_internal(struct stv090x_internal *internal)
struct stv090x_dev *new_dev;
struct stv090x_dev *temp_dev;
- new_dev = kmalloc_obj(struct stv090x_dev, GFP_KERNEL);
+ new_dev = kmalloc_obj(struct stv090x_dev);
if (new_dev != NULL) {
new_dev->internal = internal;
new_dev->next_dev = NULL;
@@ -4906,7 +4906,7 @@ static int stv090x_setup_compound(struct stv090x_state *state)
state->internal->num_used++;
dprintk(FE_INFO, 1, "Found Internal Structure!");
} else {
- state->internal = kmalloc_obj(*state->internal, GFP_KERNEL);
+ state->internal = kmalloc_obj(*state->internal);
if (!state->internal)
goto error;
temp_int = append_internal(state->internal);
@@ -5002,7 +5002,7 @@ static int stv090x_probe(struct i2c_client *client)
struct stv090x_state *state = NULL;
- state = kzalloc_obj(*state, GFP_KERNEL);
+ state = kzalloc_obj(*state);
if (!state) {
ret = -ENOMEM;
goto error;
@@ -5050,7 +5050,7 @@ struct dvb_frontend *stv090x_attach(struct stv090x_config *config,
int ret = 0;
struct stv090x_state *state = NULL;
- state = kzalloc_obj(*state, GFP_KERNEL);
+ state = kzalloc_obj(*state);
if (!state)
goto error;
diff --git a/drivers/media/dvb-frontends/stv0910.c b/drivers/media/dvb-frontends/stv0910.c
index 666562f7ca17..b841f7e9c664 100644
--- a/drivers/media/dvb-frontends/stv0910.c
+++ b/drivers/media/dvb-frontends/stv0910.c
@@ -1766,7 +1766,7 @@ struct dvb_frontend *stv0910_attach(struct i2c_adapter *i2c,
struct stv *state;
struct stv_base *base;
- state = kzalloc_obj(*state, GFP_KERNEL);
+ state = kzalloc_obj(*state);
if (!state)
return NULL;
@@ -1788,7 +1788,7 @@ struct dvb_frontend *stv0910_attach(struct i2c_adapter *i2c,
base->count++;
state->base = base;
} else {
- base = kzalloc_obj(*base, GFP_KERNEL);
+ base = kzalloc_obj(*base);
if (!base)
goto fail;
base->i2c = i2c;
diff --git a/drivers/media/dvb-frontends/stv6110.c b/drivers/media/dvb-frontends/stv6110.c
index beb1c832a13d..87019aa57a16 100644
--- a/drivers/media/dvb-frontends/stv6110.c
+++ b/drivers/media/dvb-frontends/stv6110.c
@@ -408,7 +408,7 @@ struct dvb_frontend *stv6110_attach(struct dvb_frontend *fe,
if (ret != 1)
return NULL;
- priv = kzalloc_obj(struct stv6110_priv, GFP_KERNEL);
+ priv = kzalloc_obj(struct stv6110_priv);
if (priv == NULL)
return NULL;
diff --git a/drivers/media/dvb-frontends/stv6110x.c b/drivers/media/dvb-frontends/stv6110x.c
index 4122f7655b0a..7506f39ead55 100644
--- a/drivers/media/dvb-frontends/stv6110x.c
+++ b/drivers/media/dvb-frontends/stv6110x.c
@@ -412,7 +412,7 @@ static int stv6110x_probe(struct i2c_client *client)
struct stv6110x_state *stv6110x;
- stv6110x = kzalloc_obj(*stv6110x, GFP_KERNEL);
+ stv6110x = kzalloc_obj(*stv6110x);
if (!stv6110x)
return -ENOMEM;
@@ -448,7 +448,7 @@ const struct stv6110x_devctl *stv6110x_attach(struct dvb_frontend *fe,
{
struct stv6110x_state *stv6110x;
- stv6110x = kzalloc_obj(*stv6110x, GFP_KERNEL);
+ stv6110x = kzalloc_obj(*stv6110x);
if (!stv6110x)
return NULL;
diff --git a/drivers/media/dvb-frontends/stv6111.c b/drivers/media/dvb-frontends/stv6111.c
index d367ee7f3cbe..876e254c6fbb 100644
--- a/drivers/media/dvb-frontends/stv6111.c
+++ b/drivers/media/dvb-frontends/stv6111.c
@@ -653,7 +653,7 @@ struct dvb_frontend *stv6111_attach(struct dvb_frontend *fe,
int stat = -ENODEV;
int gatestat = 0;
- state = kzalloc_obj(*state, GFP_KERNEL);
+ state = kzalloc_obj(*state);
if (!state)
return NULL;
state->adr = adr;
diff --git a/drivers/media/dvb-frontends/tc90522.c b/drivers/media/dvb-frontends/tc90522.c
index 3ac0b7a0844f..f1343ba67b97 100644
--- a/drivers/media/dvb-frontends/tc90522.c
+++ b/drivers/media/dvb-frontends/tc90522.c
@@ -647,7 +647,7 @@ tc90522_master_xfer(struct i2c_adapter *adap, struct i2c_msg *msgs, int num)
for (i = 0; i < num; i++)
if (msgs[i].flags & I2C_M_RD)
rd_num++;
- new_msgs = kmalloc_objs(*new_msgs, num + rd_num, GFP_KERNEL);
+ new_msgs = kmalloc_objs(*new_msgs, num + rd_num);
if (!new_msgs)
return -ENOMEM;
@@ -788,7 +788,7 @@ static int tc90522_probe(struct i2c_client *client)
struct i2c_adapter *adap;
int ret;
- state = kzalloc_obj(*state, GFP_KERNEL);
+ state = kzalloc_obj(*state);
if (!state)
return -ENOMEM;
state->i2c_client = client;
diff --git a/drivers/media/dvb-frontends/tda10021.c b/drivers/media/dvb-frontends/tda10021.c
index 9a950ee9562e..3c09b7e4a966 100644
--- a/drivers/media/dvb-frontends/tda10021.c
+++ b/drivers/media/dvb-frontends/tda10021.c
@@ -451,7 +451,7 @@ struct dvb_frontend* tda10021_attach(const struct tda1002x_config* config,
u8 id;
/* allocate memory for the internal state */
- state = kzalloc_obj(struct tda10021_state, GFP_KERNEL);
+ state = kzalloc_obj(struct tda10021_state);
if (state == NULL) goto error;
/* setup the state */
diff --git a/drivers/media/dvb-frontends/tda10023.c b/drivers/media/dvb-frontends/tda10023.c
index c8b1cc0f7abb..3284fc46e97f 100644
--- a/drivers/media/dvb-frontends/tda10023.c
+++ b/drivers/media/dvb-frontends/tda10023.c
@@ -511,7 +511,7 @@ struct dvb_frontend *tda10023_attach(const struct tda10023_config *config,
struct tda10023_state* state = NULL;
/* allocate memory for the internal state */
- state = kzalloc_obj(struct tda10023_state, GFP_KERNEL);
+ state = kzalloc_obj(struct tda10023_state);
if (state == NULL) goto error;
/* setup the state */
diff --git a/drivers/media/dvb-frontends/tda10048.c b/drivers/media/dvb-frontends/tda10048.c
index fe9685cbf7a5..c29eda634c85 100644
--- a/drivers/media/dvb-frontends/tda10048.c
+++ b/drivers/media/dvb-frontends/tda10048.c
@@ -1097,7 +1097,7 @@ struct dvb_frontend *tda10048_attach(const struct tda10048_config *config,
dprintk(1, "%s()\n", __func__);
/* allocate memory for the internal state */
- state = kzalloc_obj(struct tda10048_state, GFP_KERNEL);
+ state = kzalloc_obj(struct tda10048_state);
if (state == NULL)
goto error;
diff --git a/drivers/media/dvb-frontends/tda1004x.c b/drivers/media/dvb-frontends/tda1004x.c
index 0a1bf80211d3..7eefc8814243 100644
--- a/drivers/media/dvb-frontends/tda1004x.c
+++ b/drivers/media/dvb-frontends/tda1004x.c
@@ -1271,7 +1271,7 @@ struct dvb_frontend* tda10045_attach(const struct tda1004x_config* config,
int id;
/* allocate memory for the internal state */
- state = kzalloc_obj(struct tda1004x_state, GFP_KERNEL);
+ state = kzalloc_obj(struct tda1004x_state);
if (!state) {
printk(KERN_ERR "Can't allocate memory for tda10045 state\n");
return NULL;
@@ -1341,7 +1341,7 @@ struct dvb_frontend* tda10046_attach(const struct tda1004x_config* config,
int id;
/* allocate memory for the internal state */
- state = kzalloc_obj(struct tda1004x_state, GFP_KERNEL);
+ state = kzalloc_obj(struct tda1004x_state);
if (!state) {
printk(KERN_ERR "Can't allocate memory for tda10046 state\n");
return NULL;
diff --git a/drivers/media/dvb-frontends/tda10071.c b/drivers/media/dvb-frontends/tda10071.c
index 430702da6e79..6e6c2e5c427e 100644
--- a/drivers/media/dvb-frontends/tda10071.c
+++ b/drivers/media/dvb-frontends/tda10071.c
@@ -1156,7 +1156,7 @@ static int tda10071_probe(struct i2c_client *client)
.val_bits = 8,
};
- dev = kzalloc_obj(*dev, GFP_KERNEL);
+ dev = kzalloc_obj(*dev);
if (!dev) {
ret = -ENOMEM;
goto err;
diff --git a/drivers/media/dvb-frontends/tda10086.c b/drivers/media/dvb-frontends/tda10086.c
index 5e63ded2cfbf..d43d0eb73721 100644
--- a/drivers/media/dvb-frontends/tda10086.c
+++ b/drivers/media/dvb-frontends/tda10086.c
@@ -737,7 +737,7 @@ struct dvb_frontend* tda10086_attach(const struct tda10086_config* config,
dprintk ("%s\n", __func__);
/* allocate memory for the internal state */
- state = kzalloc_obj(struct tda10086_state, GFP_KERNEL);
+ state = kzalloc_obj(struct tda10086_state);
if (!state)
return NULL;
diff --git a/drivers/media/dvb-frontends/tda18271c2dd.c b/drivers/media/dvb-frontends/tda18271c2dd.c
index f10d74ff192c..25005e4359ad 100644
--- a/drivers/media/dvb-frontends/tda18271c2dd.c
+++ b/drivers/media/dvb-frontends/tda18271c2dd.c
@@ -1215,7 +1215,7 @@ struct dvb_frontend *tda18271c2dd_attach(struct dvb_frontend *fe,
{
struct tda_state *state;
- state = kzalloc_obj(struct tda_state, GFP_KERNEL);
+ state = kzalloc_obj(struct tda_state);
if (!state)
return NULL;
diff --git a/drivers/media/dvb-frontends/tda665x.c b/drivers/media/dvb-frontends/tda665x.c
index f9dcbb69e949..b2201ec14091 100644
--- a/drivers/media/dvb-frontends/tda665x.c
+++ b/drivers/media/dvb-frontends/tda665x.c
@@ -207,7 +207,7 @@ struct dvb_frontend *tda665x_attach(struct dvb_frontend *fe,
struct tda665x_state *state = NULL;
struct dvb_tuner_info *info;
- state = kzalloc_obj(struct tda665x_state, GFP_KERNEL);
+ state = kzalloc_obj(struct tda665x_state);
if (!state)
return NULL;
diff --git a/drivers/media/dvb-frontends/tda8083.c b/drivers/media/dvb-frontends/tda8083.c
index c9f280cdd7db..5a1b3599afa4 100644
--- a/drivers/media/dvb-frontends/tda8083.c
+++ b/drivers/media/dvb-frontends/tda8083.c
@@ -417,7 +417,7 @@ struct dvb_frontend* tda8083_attach(const struct tda8083_config* config,
struct tda8083_state* state = NULL;
/* allocate memory for the internal state */
- state = kzalloc_obj(struct tda8083_state, GFP_KERNEL);
+ state = kzalloc_obj(struct tda8083_state);
if (state == NULL) goto error;
/* setup the state */
diff --git a/drivers/media/dvb-frontends/tda8261.c b/drivers/media/dvb-frontends/tda8261.c
index 73c90442f403..55f898f6a6f7 100644
--- a/drivers/media/dvb-frontends/tda8261.c
+++ b/drivers/media/dvb-frontends/tda8261.c
@@ -168,7 +168,7 @@ struct dvb_frontend *tda8261_attach(struct dvb_frontend *fe,
{
struct tda8261_state *state = NULL;
- if ((state = kzalloc_obj(struct tda8261_state, GFP_KERNEL)) == NULL)
+ if ((state = kzalloc_obj(struct tda8261_state)) == NULL)
goto exit;
state->config = config;
diff --git a/drivers/media/dvb-frontends/tda826x.c b/drivers/media/dvb-frontends/tda826x.c
index b51da4053ef5..9ee6bc4e6637 100644
--- a/drivers/media/dvb-frontends/tda826x.c
+++ b/drivers/media/dvb-frontends/tda826x.c
@@ -150,7 +150,7 @@ struct dvb_frontend *tda826x_attach(struct dvb_frontend *fe, int addr, struct i2
if (!(b1[1] & 0x80))
return NULL;
- priv = kzalloc_obj(struct tda826x_priv, GFP_KERNEL);
+ priv = kzalloc_obj(struct tda826x_priv);
if (priv == NULL)
return NULL;
diff --git a/drivers/media/dvb-frontends/ts2020.c b/drivers/media/dvb-frontends/ts2020.c
index 2368214781a6..8b6006635e49 100644
--- a/drivers/media/dvb-frontends/ts2020.c
+++ b/drivers/media/dvb-frontends/ts2020.c
@@ -566,7 +566,7 @@ static int ts2020_probe(struct i2c_client *client)
}
fe = pdata->fe;
- dev = kzalloc_obj(*dev, GFP_KERNEL);
+ dev = kzalloc_obj(*dev);
if (!dev) {
ret = -ENOMEM;
goto err;
diff --git a/drivers/media/dvb-frontends/tua6100.c b/drivers/media/dvb-frontends/tua6100.c
index 2d052bfb8a23..d7ca25afd6a6 100644
--- a/drivers/media/dvb-frontends/tua6100.c
+++ b/drivers/media/dvb-frontends/tua6100.c
@@ -175,7 +175,7 @@ struct dvb_frontend *tua6100_attach(struct dvb_frontend *fe, int addr, struct i2
if (ret != 2)
return NULL;
- priv = kzalloc_obj(struct tua6100_priv, GFP_KERNEL);
+ priv = kzalloc_obj(struct tua6100_priv);
if (priv == NULL)
return NULL;
diff --git a/drivers/media/dvb-frontends/ves1820.c b/drivers/media/dvb-frontends/ves1820.c
index 56bbd52d1783..c9461c8c55c7 100644
--- a/drivers/media/dvb-frontends/ves1820.c
+++ b/drivers/media/dvb-frontends/ves1820.c
@@ -366,7 +366,7 @@ struct dvb_frontend* ves1820_attach(const struct ves1820_config* config,
struct ves1820_state* state = NULL;
/* allocate memory for the internal state */
- state = kzalloc_obj(struct ves1820_state, GFP_KERNEL);
+ state = kzalloc_obj(struct ves1820_state);
if (state == NULL)
goto error;
diff --git a/drivers/media/dvb-frontends/ves1x93.c b/drivers/media/dvb-frontends/ves1x93.c
index 5c8abcebbd88..304d877f966a 100644
--- a/drivers/media/dvb-frontends/ves1x93.c
+++ b/drivers/media/dvb-frontends/ves1x93.c
@@ -450,7 +450,7 @@ struct dvb_frontend* ves1x93_attach(const struct ves1x93_config* config,
u8 identity;
/* allocate memory for the internal state */
- state = kzalloc_obj(struct ves1x93_state, GFP_KERNEL);
+ state = kzalloc_obj(struct ves1x93_state);
if (state == NULL) goto error;
/* setup the state */
diff --git a/drivers/media/dvb-frontends/zd1301_demod.c b/drivers/media/dvb-frontends/zd1301_demod.c
index 0c244fd17623..13936a311e56 100644
--- a/drivers/media/dvb-frontends/zd1301_demod.c
+++ b/drivers/media/dvb-frontends/zd1301_demod.c
@@ -470,7 +470,7 @@ static int zd1301_demod_probe(struct platform_device *pdev)
goto err;
}
- dev = kzalloc_obj(*dev, GFP_KERNEL);
+ dev = kzalloc_obj(*dev);
if (!dev) {
ret = -ENOMEM;
goto err;
diff --git a/drivers/media/dvb-frontends/zl10036.c b/drivers/media/dvb-frontends/zl10036.c
index 3d05828e499a..88ca49242925 100644
--- a/drivers/media/dvb-frontends/zl10036.c
+++ b/drivers/media/dvb-frontends/zl10036.c
@@ -457,7 +457,7 @@ struct dvb_frontend *zl10036_attach(struct dvb_frontend *fe,
return NULL;
}
- state = kzalloc_obj(struct zl10036_state, GFP_KERNEL);
+ state = kzalloc_obj(struct zl10036_state);
if (!state)
return NULL;
diff --git a/drivers/media/dvb-frontends/zl10039.c b/drivers/media/dvb-frontends/zl10039.c
index 54e1e4267c1d..696831d7544b 100644
--- a/drivers/media/dvb-frontends/zl10039.c
+++ b/drivers/media/dvb-frontends/zl10039.c
@@ -254,7 +254,7 @@ struct dvb_frontend *zl10039_attach(struct dvb_frontend *fe,
struct zl10039_state *state = NULL;
dprintk("%s\n", __func__);
- state = kmalloc_obj(struct zl10039_state, GFP_KERNEL);
+ state = kmalloc_obj(struct zl10039_state);
if (state == NULL)
goto error;
diff --git a/drivers/media/dvb-frontends/zl10353.c b/drivers/media/dvb-frontends/zl10353.c
index a9f23b142301..6dd8d95651f6 100644
--- a/drivers/media/dvb-frontends/zl10353.c
+++ b/drivers/media/dvb-frontends/zl10353.c
@@ -598,7 +598,7 @@ struct dvb_frontend *zl10353_attach(const struct zl10353_config *config,
int id;
/* allocate memory for the internal state */
- state = kzalloc_obj(struct zl10353_state, GFP_KERNEL);
+ state = kzalloc_obj(struct zl10353_state);
if (state == NULL)
goto error;
diff --git a/drivers/media/firewire/firedtv-fw.c b/drivers/media/firewire/firedtv-fw.c
index 5ee96f290fef..c348526a4c45 100644
--- a/drivers/media/firewire/firedtv-fw.c
+++ b/drivers/media/firewire/firedtv-fw.c
@@ -135,7 +135,7 @@ int fdtv_start_iso(struct firedtv *fdtv)
struct fw_device *device = device_of(fdtv);
int i, err;
- ctx = kmalloc_obj(*ctx, GFP_KERNEL);
+ ctx = kmalloc_obj(*ctx);
if (!ctx)
return -ENOMEM;
@@ -255,7 +255,7 @@ static int node_probe(struct fw_unit *unit, const struct ieee1394_device_id *id)
char name[MAX_MODEL_NAME_LEN];
int name_len, i, err;
- fdtv = kzalloc_obj(*fdtv, GFP_KERNEL);
+ fdtv = kzalloc_obj(*fdtv);
if (!fdtv)
return -ENOMEM;
diff --git a/drivers/media/i2c/alvium-csi2.c b/drivers/media/i2c/alvium-csi2.c
index c063da7d568d..e6fa2f961177 100644
--- a/drivers/media/i2c/alvium-csi2.c
+++ b/drivers/media/i2c/alvium-csi2.c
@@ -1094,7 +1094,7 @@ static int alvium_setup_mipi_fmt(struct alvium_dev *alvium)
/* init alvium_csi2_fmt array */
alvium->alvium_csi2_fmt_n = sz;
alvium->alvium_csi2_fmt =
- kmalloc_objs(struct alvium_pixfmt, sz, GFP_KERNEL);
+ kmalloc_objs(struct alvium_pixfmt, sz);
if (!alvium->alvium_csi2_fmt)
return -ENOMEM;
diff --git a/drivers/media/i2c/cs3308.c b/drivers/media/i2c/cs3308.c
index cc4bd7fd7cdb..3f2f993e16a6 100644
--- a/drivers/media/i2c/cs3308.c
+++ b/drivers/media/i2c/cs3308.c
@@ -79,7 +79,7 @@ static int cs3308_probe(struct i2c_client *client)
v4l_info(client, "chip found @ 0x%x (%s)\n",
client->addr << 1, client->adapter->name);
- sd = kzalloc_obj(struct v4l2_subdev, GFP_KERNEL);
+ sd = kzalloc_obj(struct v4l2_subdev);
if (sd == NULL)
return -ENOMEM;
diff --git a/drivers/media/i2c/ds90ub960.c b/drivers/media/i2c/ds90ub960.c
index 98f45dcad667..e133127397f4 100644
--- a/drivers/media/i2c/ds90ub960.c
+++ b/drivers/media/i2c/ds90ub960.c
@@ -1379,7 +1379,7 @@ static int ub960_parse_dt_txport(struct ub960_data *priv,
struct ub960_txport *txport;
int ret;
- txport = kzalloc_obj(*txport, GFP_KERNEL);
+ txport = kzalloc_obj(*txport);
if (!txport)
return -ENOMEM;
@@ -4573,7 +4573,7 @@ static int ub960_parse_dt_rxport(struct ub960_data *priv, unsigned int nport,
struct ub960_rxport *rxport;
int ret;
- rxport = kzalloc_obj(*rxport, GFP_KERNEL);
+ rxport = kzalloc_obj(*rxport);
if (!rxport)
return -ENOMEM;
diff --git a/drivers/media/i2c/tda1997x.c b/drivers/media/i2c/tda1997x.c
index bf4f7b44d42e..5c6dda5338f5 100644
--- a/drivers/media/i2c/tda1997x.c
+++ b/drivers/media/i2c/tda1997x.c
@@ -2538,7 +2538,7 @@ static int tda1997x_probe(struct i2c_client *client)
if (!i2c_check_functionality(client->adapter, I2C_FUNC_SMBUS_BYTE_DATA))
return -EIO;
- state = kzalloc_obj(struct tda1997x_state, GFP_KERNEL);
+ state = kzalloc_obj(struct tda1997x_state);
if (!state)
return -ENOMEM;
diff --git a/drivers/media/i2c/video-i2c.c b/drivers/media/i2c/video-i2c.c
index eebca7a0fb9b..fef3993f4e2d 100644
--- a/drivers/media/i2c/video-i2c.c
+++ b/drivers/media/i2c/video-i2c.c
@@ -750,7 +750,7 @@ static int video_i2c_probe(struct i2c_client *client)
struct vb2_queue *queue;
int ret = -ENODEV;
- data = kzalloc_obj(*data, GFP_KERNEL);
+ data = kzalloc_obj(*data);
if (!data)
return -ENOMEM;
diff --git a/drivers/media/mc/mc-dev-allocator.c b/drivers/media/mc/mc-dev-allocator.c
index b8a170aaee04..b700ea73517e 100644
--- a/drivers/media/mc/mc-dev-allocator.c
+++ b/drivers/media/mc/mc-dev-allocator.c
@@ -81,7 +81,7 @@ static struct media_device *__media_device_get(struct device *dev,
return &mdi->mdev;
}
- mdi = kzalloc_obj(*mdi, GFP_KERNEL);
+ mdi = kzalloc_obj(*mdi);
if (!mdi)
return NULL;
diff --git a/drivers/media/mc/mc-device.c b/drivers/media/mc/mc-device.c
index a27afa530592..f8ea7cfe10b2 100644
--- a/drivers/media/mc/mc-device.c
+++ b/drivers/media/mc/mc-device.c
@@ -737,7 +737,7 @@ int __must_check __media_device_register(struct media_device *mdev,
struct media_devnode *devnode;
int ret;
- devnode = kzalloc_obj(*devnode, GFP_KERNEL);
+ devnode = kzalloc_obj(*devnode);
if (!devnode)
return -ENOMEM;
diff --git a/drivers/media/mc/mc-entity.c b/drivers/media/mc/mc-entity.c
index a078488874b2..3fa0bc687851 100644
--- a/drivers/media/mc/mc-entity.c
+++ b/drivers/media/mc/mc-entity.c
@@ -587,7 +587,7 @@ static int media_pipeline_add_pad(struct media_pipeline *pipe,
}
}
- ppad = kzalloc_obj(*ppad, GFP_KERNEL);
+ ppad = kzalloc_obj(*ppad);
if (!ppad)
return -ENOMEM;
@@ -977,7 +977,7 @@ __must_check int media_pipeline_alloc_start(struct media_pad *pad)
*/
pipe = media_pad_pipeline(pad);
if (!pipe) {
- new_pipe = kzalloc_obj(*new_pipe, GFP_KERNEL);
+ new_pipe = kzalloc_obj(*new_pipe);
if (!new_pipe) {
ret = -ENOMEM;
goto out;
@@ -1061,7 +1061,7 @@ static struct media_link *media_add_link(struct list_head *head)
{
struct media_link *link;
- link = kzalloc_obj(*link, GFP_KERNEL);
+ link = kzalloc_obj(*link);
if (link == NULL)
return NULL;
@@ -1547,7 +1547,7 @@ struct media_intf_devnode *media_devnode_create(struct media_device *mdev,
{
struct media_intf_devnode *devnode;
- devnode = kzalloc_obj(*devnode, GFP_KERNEL);
+ devnode = kzalloc_obj(*devnode);
if (!devnode)
return NULL;
diff --git a/drivers/media/mc/mc-request.c b/drivers/media/mc/mc-request.c
index 6668f44359ce..c7c7d4a86c6b 100644
--- a/drivers/media/mc/mc-request.c
+++ b/drivers/media/mc/mc-request.c
@@ -293,7 +293,7 @@ int media_request_alloc(struct media_device *mdev, int *alloc_fd)
if (mdev->ops->req_alloc)
req = mdev->ops->req_alloc(mdev);
else
- req = kzalloc_obj(*req, GFP_KERNEL);
+ req = kzalloc_obj(*req);
if (!req)
return -ENOMEM;
diff --git a/drivers/media/mmc/siano/smssdio.c b/drivers/media/mmc/siano/smssdio.c
index 8dc11576f4e8..41dcab816216 100644
--- a/drivers/media/mmc/siano/smssdio.c
+++ b/drivers/media/mmc/siano/smssdio.c
@@ -244,7 +244,7 @@ static int smssdio_probe(struct sdio_func *func,
board_id = id->driver_data;
- smsdev = kzalloc_obj(struct smssdio_device, GFP_KERNEL);
+ smsdev = kzalloc_obj(struct smssdio_device);
if (!smsdev)
return -ENOMEM;
diff --git a/drivers/media/pci/bt8xx/bttv-driver.c b/drivers/media/pci/bt8xx/bttv-driver.c
index 26cc0f6b7571..663469208271 100644
--- a/drivers/media/pci/bt8xx/bttv-driver.c
+++ b/drivers/media/pci/bt8xx/bttv-driver.c
@@ -3216,7 +3216,7 @@ static int bttv_probe(struct pci_dev *dev, const struct pci_device_id *pci_id)
if (bttv_num == BTTV_MAX)
return -ENOMEM;
pr_info("Bt8xx card found (%d)\n", bttv_num);
- bttvs[bttv_num] = btv = kzalloc_obj(*btv, GFP_KERNEL);
+ bttvs[bttv_num] = btv = kzalloc_obj(*btv);
if (btv == NULL) {
pr_err("out of memory\n");
return -ENOMEM;
diff --git a/drivers/media/pci/bt8xx/bttv-gpio.c b/drivers/media/pci/bt8xx/bttv-gpio.c
index 5b4c6336d2d5..b79daa2d440f 100644
--- a/drivers/media/pci/bt8xx/bttv-gpio.c
+++ b/drivers/media/pci/bt8xx/bttv-gpio.c
@@ -73,7 +73,7 @@ int bttv_sub_add_device(struct bttv_core *core, char *name)
struct bttv_sub_device *sub;
int err;
- sub = kzalloc_obj(*sub, GFP_KERNEL);
+ sub = kzalloc_obj(*sub);
if (NULL == sub)
return -ENOMEM;
diff --git a/drivers/media/pci/bt8xx/bttv-input.c b/drivers/media/pci/bt8xx/bttv-input.c
index 45e30ebdc5f8..373b6c6817d7 100644
--- a/drivers/media/pci/bt8xx/bttv-input.c
+++ b/drivers/media/pci/bt8xx/bttv-input.c
@@ -416,7 +416,7 @@ int bttv_input_init(struct bttv *btv)
if (!btv->has_remote)
return -ENODEV;
- ir = kzalloc_obj(*ir, GFP_KERNEL);
+ ir = kzalloc_obj(*ir);
rc = rc_allocate_device(RC_DRIVER_SCANCODE);
if (!ir || !rc)
goto err_out_free;
diff --git a/drivers/media/pci/bt8xx/dst_ca.c b/drivers/media/pci/bt8xx/dst_ca.c
index f26ece10d926..6da75c6ed77b 100644
--- a/drivers/media/pci/bt8xx/dst_ca.c
+++ b/drivers/media/pci/bt8xx/dst_ca.c
@@ -454,7 +454,7 @@ static int ca_send_message(struct dst_state *state, struct ca_msg *p_ca_message,
struct ca_msg *hw_buffer;
int result = 0;
- hw_buffer = kmalloc_obj(*hw_buffer, GFP_KERNEL);
+ hw_buffer = kmalloc_obj(*hw_buffer);
if (!hw_buffer)
return -ENOMEM;
dprintk(verbose, DST_CA_DEBUG, 1, " ");
@@ -535,9 +535,9 @@ static long dst_ca_ioctl(struct file *file, unsigned int cmd, unsigned long ioct
mutex_lock(&dst_ca_mutex);
dvbdev = file->private_data;
state = dvbdev->priv;
- p_ca_message = kmalloc_obj(struct ca_msg, GFP_KERNEL);
- p_ca_slot_info = kmalloc_obj(struct ca_slot_info, GFP_KERNEL);
- p_ca_caps = kmalloc_obj(struct ca_caps, GFP_KERNEL);
+ p_ca_message = kmalloc_obj(struct ca_msg);
+ p_ca_slot_info = kmalloc_obj(struct ca_slot_info);
+ p_ca_caps = kmalloc_obj(struct ca_caps);
if (!p_ca_message || !p_ca_slot_info || !p_ca_caps) {
result = -ENOMEM;
goto free_mem_and_exit;
diff --git a/drivers/media/pci/bt8xx/dvb-bt8xx.c b/drivers/media/pci/bt8xx/dvb-bt8xx.c
index b9c712c078d2..935503acab7d 100644
--- a/drivers/media/pci/bt8xx/dvb-bt8xx.c
+++ b/drivers/media/pci/bt8xx/dvb-bt8xx.c
@@ -657,7 +657,7 @@ static void frontend_init(struct dvb_bt8xx_card *card, u32 type)
case BTTV_BOARD_TWINHAN_DST:
/* DST is not a frontend driver !!! */
- state = kmalloc_obj(struct dst_state, GFP_KERNEL);
+ state = kmalloc_obj(struct dst_state);
if (!state) {
pr_err("No memory\n");
break;
@@ -809,7 +809,7 @@ static int dvb_bt8xx_probe(struct bttv_sub_device *sub)
struct pci_dev* bttv_pci_dev;
int ret;
- if (!(card = kzalloc_obj(struct dvb_bt8xx_card, GFP_KERNEL)))
+ if (!(card = kzalloc_obj(struct dvb_bt8xx_card)))
return -ENOMEM;
mutex_init(&card->lock);
diff --git a/drivers/media/pci/cobalt/cobalt-alsa-main.c b/drivers/media/pci/cobalt/cobalt-alsa-main.c
index 1b30b44ad112..7bb7f13c70c0 100644
--- a/drivers/media/pci/cobalt/cobalt-alsa-main.c
+++ b/drivers/media/pci/cobalt/cobalt-alsa-main.c
@@ -45,7 +45,7 @@ static int snd_cobalt_card_create(struct cobalt_stream *s,
struct snd_card *sc,
struct snd_cobalt_card **cobsc)
{
- *cobsc = kzalloc_obj(struct snd_cobalt_card, GFP_KERNEL);
+ *cobsc = kzalloc_obj(struct snd_cobalt_card);
if (*cobsc == NULL)
return -ENOMEM;
diff --git a/drivers/media/pci/cobalt/cobalt-driver.c b/drivers/media/pci/cobalt/cobalt-driver.c
index 1c2b00278c55..9b9f69ff4016 100644
--- a/drivers/media/pci/cobalt/cobalt-driver.c
+++ b/drivers/media/pci/cobalt/cobalt-driver.c
@@ -663,7 +663,7 @@ static int cobalt_probe(struct pci_dev *pci_dev,
/* FIXME - module parameter arrays constrain max instances */
i = atomic_inc_return(&cobalt_instance) - 1;
- cobalt = kzalloc_obj(struct cobalt, GFP_KERNEL);
+ cobalt = kzalloc_obj(struct cobalt);
if (cobalt == NULL)
return -ENOMEM;
cobalt->pci_dev = pci_dev;
diff --git a/drivers/media/pci/cx18/cx18-alsa-main.c b/drivers/media/pci/cx18/cx18-alsa-main.c
index 6214e29a5cd6..b77f5375f3ff 100644
--- a/drivers/media/pci/cx18/cx18-alsa-main.c
+++ b/drivers/media/pci/cx18/cx18-alsa-main.c
@@ -77,7 +77,7 @@ static int snd_cx18_card_create(struct v4l2_device *v4l2_dev,
struct snd_card *sc,
struct snd_cx18_card **cxsc)
{
- *cxsc = kzalloc_obj(struct snd_cx18_card, GFP_KERNEL);
+ *cxsc = kzalloc_obj(struct snd_cx18_card);
if (*cxsc == NULL)
return -ENOMEM;
diff --git a/drivers/media/pci/cx18/cx18-driver.c b/drivers/media/pci/cx18/cx18-driver.c
index bdfdd403a039..f778f79b921d 100644
--- a/drivers/media/pci/cx18/cx18-driver.c
+++ b/drivers/media/pci/cx18/cx18-driver.c
@@ -314,7 +314,7 @@ void cx18_read_eeprom(struct cx18 *cx, struct tveeprom *tv)
memset(tv, 0, sizeof(*tv));
- c = kzalloc_obj(*c, GFP_KERNEL);
+ c = kzalloc_obj(*c);
if (!c)
return;
@@ -899,7 +899,7 @@ static int cx18_probe(struct pci_dev *pci_dev,
return -ENOMEM;
}
- cx = kzalloc_obj(*cx, GFP_KERNEL);
+ cx = kzalloc_obj(*cx);
if (!cx)
return -ENOMEM;
diff --git a/drivers/media/pci/cx18/cx18-fileops.c b/drivers/media/pci/cx18/cx18-fileops.c
index b3d3a6f67ea8..445afcd3092b 100644
--- a/drivers/media/pci/cx18/cx18-fileops.c
+++ b/drivers/media/pci/cx18/cx18-fileops.c
@@ -732,7 +732,7 @@ static int cx18_serialized_open(struct cx18_stream *s, struct file *filp)
CX18_DEBUG_FILE("open %s\n", s->name);
/* Allocate memory */
- item = kzalloc_obj(struct cx18_open_id, GFP_KERNEL);
+ item = kzalloc_obj(struct cx18_open_id);
if (NULL == item) {
CX18_DEBUG_WARN("nomem on v4l2 open\n");
return -ENOMEM;
diff --git a/drivers/media/pci/cx18/cx18-streams.c b/drivers/media/pci/cx18/cx18-streams.c
index b5b969fa9530..5da1a5d69eed 100644
--- a/drivers/media/pci/cx18/cx18-streams.c
+++ b/drivers/media/pci/cx18/cx18-streams.c
@@ -343,7 +343,7 @@ static int cx18_prep_dev(struct cx18 *cx, int type)
/* Allocate the cx18_dvb struct only for the TS on cards with DTV */
if (type == CX18_ENC_STREAM_TYPE_TS) {
if (cx->card->hw_all & CX18_HW_DVB) {
- s->dvb = kzalloc_obj(struct cx18_dvb, GFP_KERNEL);
+ s->dvb = kzalloc_obj(struct cx18_dvb);
if (s->dvb == NULL) {
CX18_ERR("Couldn't allocate cx18_dvb structure for %s\n",
s->name);
diff --git a/drivers/media/pci/cx23885/altera-ci.c b/drivers/media/pci/cx23885/altera-ci.c
index 7eae29e002ea..20a3b6c51b35 100644
--- a/drivers/media/pci/cx23885/altera-ci.c
+++ b/drivers/media/pci/cx23885/altera-ci.c
@@ -224,14 +224,14 @@ static struct fpga_inode *append_internal(struct fpga_internal *internal)
struct fpga_inode *new_node = fpga_first_inode;
if (new_node == NULL) {
- new_node = kmalloc_obj(struct fpga_inode, GFP_KERNEL);
+ new_node = kmalloc_obj(struct fpga_inode);
fpga_first_inode = new_node;
} else {
while (new_node->next_inode != NULL)
new_node = new_node->next_inode;
new_node->next_inode =
- kmalloc_obj(struct fpga_inode, GFP_KERNEL);
+ kmalloc_obj(struct fpga_inode);
if (new_node->next_inode != NULL)
new_node = new_node->next_inode;
else
@@ -634,7 +634,7 @@ static int altera_hw_filt_init(struct altera_ci_config *config, int hw_filt_nr)
struct fpga_internal *inter = NULL;
int ret = 0;
- pid_filt = kzalloc_obj(struct netup_hw_pid_filter, GFP_KERNEL);
+ pid_filt = kzalloc_obj(struct netup_hw_pid_filter);
ci_dbg_print("%s\n", __func__);
@@ -648,7 +648,7 @@ static int altera_hw_filt_init(struct altera_ci_config *config, int hw_filt_nr)
(inter->filts_used)++;
ci_dbg_print("%s: Find Internal Structure!\n", __func__);
} else {
- inter = kzalloc_obj(struct fpga_internal, GFP_KERNEL);
+ inter = kzalloc_obj(struct fpga_internal);
if (!inter) {
ret = -ENOMEM;
goto err;
@@ -706,7 +706,7 @@ int altera_ci_init(struct altera_ci_config *config, int ci_nr)
int ret = 0;
u8 store = 0;
- state = kzalloc_obj(struct altera_ci_state, GFP_KERNEL);
+ state = kzalloc_obj(struct altera_ci_state);
ci_dbg_print("%s\n", __func__);
@@ -721,7 +721,7 @@ int altera_ci_init(struct altera_ci_config *config, int ci_nr)
inter->fpga_rw = config->fpga_rw;
ci_dbg_print("%s: Find Internal Structure!\n", __func__);
} else {
- inter = kzalloc_obj(struct fpga_internal, GFP_KERNEL);
+ inter = kzalloc_obj(struct fpga_internal);
if (!inter) {
ret = -ENOMEM;
goto err;
diff --git a/drivers/media/pci/cx23885/cimax2.c b/drivers/media/pci/cx23885/cimax2.c
index f0ecc92fc444..154918984534 100644
--- a/drivers/media/pci/cx23885/cimax2.c
+++ b/drivers/media/pci/cx23885/cimax2.c
@@ -451,7 +451,7 @@ int netup_ci_init(struct cx23885_tsport *port)
int ret;
ci_dbg_print("%s\n", __func__);
- state = kzalloc_obj(struct netup_ci_state, GFP_KERNEL);
+ state = kzalloc_obj(struct netup_ci_state);
if (!state) {
ci_dbg_print("%s: Unable create CI structure!\n", __func__);
ret = -ENOMEM;
diff --git a/drivers/media/pci/cx23885/cx23885-alsa.c b/drivers/media/pci/cx23885/cx23885-alsa.c
index e56c5b7d84bc..29f6df0e6de4 100644
--- a/drivers/media/pci/cx23885/cx23885-alsa.c
+++ b/drivers/media/pci/cx23885/cx23885-alsa.c
@@ -374,7 +374,7 @@ static int snd_cx23885_hw_params(struct snd_pcm_substream *substream,
BUG_ON(!chip->dma_size);
BUG_ON(chip->num_periods & (chip->num_periods-1));
- buf = kzalloc_obj(*buf, GFP_KERNEL);
+ buf = kzalloc_obj(*buf);
if (NULL == buf)
return -ENOMEM;
diff --git a/drivers/media/pci/cx23885/cx23885-core.c b/drivers/media/pci/cx23885/cx23885-core.c
index ef2d00db794c..0892a5fd137d 100644
--- a/drivers/media/pci/cx23885/cx23885-core.c
+++ b/drivers/media/pci/cx23885/cx23885-core.c
@@ -2124,7 +2124,7 @@ static int cx23885_initdev(struct pci_dev *pci_dev,
struct v4l2_ctrl_handler *hdl;
int err;
- dev = kzalloc_obj(*dev, GFP_KERNEL);
+ dev = kzalloc_obj(*dev);
if (NULL == dev)
return -ENOMEM;
diff --git a/drivers/media/pci/cx23885/cx23885-input.c b/drivers/media/pci/cx23885/cx23885-input.c
index 9c6e5b360bab..ffbbeca8a8e5 100644
--- a/drivers/media/pci/cx23885/cx23885-input.c
+++ b/drivers/media/pci/cx23885/cx23885-input.c
@@ -327,7 +327,7 @@ int cx23885_input_init(struct cx23885_dev *dev)
}
/* cx23885 board instance kernel IR state */
- kernel_ir = kzalloc_obj(struct cx23885_kernel_ir, GFP_KERNEL);
+ kernel_ir = kzalloc_obj(struct cx23885_kernel_ir);
if (kernel_ir == NULL)
return -ENOMEM;
diff --git a/drivers/media/pci/cx23885/cx23888-ir.c b/drivers/media/pci/cx23885/cx23888-ir.c
index 242b47a7d0af..087beb82a1f1 100644
--- a/drivers/media/pci/cx23885/cx23888-ir.c
+++ b/drivers/media/pci/cx23885/cx23888-ir.c
@@ -1142,7 +1142,7 @@ int cx23888_ir_probe(struct cx23885_dev *dev)
struct v4l2_subdev_ir_parameters default_params;
int ret;
- state = kzalloc_obj(struct cx23888_ir_state, GFP_KERNEL);
+ state = kzalloc_obj(struct cx23888_ir_state);
if (state == NULL)
return -ENOMEM;
diff --git a/drivers/media/pci/cx25821/cx25821-alsa.c b/drivers/media/pci/cx25821/cx25821-alsa.c
index a8197a9b0abf..3f73391f9098 100644
--- a/drivers/media/pci/cx25821/cx25821-alsa.c
+++ b/drivers/media/pci/cx25821/cx25821-alsa.c
@@ -512,7 +512,7 @@ static int snd_cx25821_hw_params(struct snd_pcm_substream *substream,
BUG_ON(!chip->dma_size);
BUG_ON(chip->num_periods & (chip->num_periods - 1));
- buf = kzalloc_obj(*buf, GFP_KERNEL);
+ buf = kzalloc_obj(*buf);
if (NULL == buf)
return -ENOMEM;
diff --git a/drivers/media/pci/cx25821/cx25821-core.c b/drivers/media/pci/cx25821/cx25821-core.c
index d64712f3aed4..5acb1dc00ae8 100644
--- a/drivers/media/pci/cx25821/cx25821-core.c
+++ b/drivers/media/pci/cx25821/cx25821-core.c
@@ -1266,7 +1266,7 @@ static int cx25821_initdev(struct pci_dev *pci_dev,
struct cx25821_dev *dev;
int err = 0;
- dev = kzalloc_obj(*dev, GFP_KERNEL);
+ dev = kzalloc_obj(*dev);
if (NULL == dev)
return -ENOMEM;
diff --git a/drivers/media/pci/cx88/cx88-alsa.c b/drivers/media/pci/cx88/cx88-alsa.c
index 3b8622dd056c..dce041a5e47a 100644
--- a/drivers/media/pci/cx88/cx88-alsa.c
+++ b/drivers/media/pci/cx88/cx88-alsa.c
@@ -465,7 +465,7 @@ static int snd_cx88_hw_params(struct snd_pcm_substream *substream,
WARN_ON(!chip->dma_size);
WARN_ON(chip->num_periods & (chip->num_periods - 1));
- buf = kzalloc_obj(*buf, GFP_KERNEL);
+ buf = kzalloc_obj(*buf);
if (!buf)
return -ENOMEM;
diff --git a/drivers/media/pci/cx88/cx88-cards.c b/drivers/media/pci/cx88/cx88-cards.c
index 3e11bb066f31..7567c2388d95 100644
--- a/drivers/media/pci/cx88/cx88-cards.c
+++ b/drivers/media/pci/cx88/cx88-cards.c
@@ -3700,7 +3700,7 @@ struct cx88_core *cx88_core_create(struct pci_dev *pci, int nr)
struct cx88_core *core;
int i;
- core = kzalloc_obj(*core, GFP_KERNEL);
+ core = kzalloc_obj(*core);
if (!core)
return NULL;
diff --git a/drivers/media/pci/cx88/cx88-dsp.c b/drivers/media/pci/cx88/cx88-dsp.c
index 1d7049edd252..958e4637fa4a 100644
--- a/drivers/media/pci/cx88/cx88-dsp.c
+++ b/drivers/media/pci/cx88/cx88-dsp.c
@@ -252,7 +252,7 @@ static s16 *read_rds_samples(struct cx88_core *core, u32 *N)
current_address,
current_address - srch->fifo_start, sample_count,
cx_read(MO_AUD_INTSTAT));
- samples = kmalloc_objs(*samples, sample_count, GFP_KERNEL);
+ samples = kmalloc_objs(*samples, sample_count);
if (!samples)
return NULL;
diff --git a/drivers/media/pci/cx88/cx88-input.c b/drivers/media/pci/cx88/cx88-input.c
index f94d75c64cf9..e958eecb29c5 100644
--- a/drivers/media/pci/cx88/cx88-input.c
+++ b/drivers/media/pci/cx88/cx88-input.c
@@ -267,7 +267,7 @@ int cx88_ir_init(struct cx88_core *core, struct pci_dev *pci)
* used with a full-code IR table
*/
- ir = kzalloc_obj(*ir, GFP_KERNEL);
+ ir = kzalloc_obj(*ir);
dev = rc_allocate_device(RC_DRIVER_IR_RAW);
if (!ir || !dev)
goto err_out_free;
diff --git a/drivers/media/pci/cx88/cx88-mpeg.c b/drivers/media/pci/cx88/cx88-mpeg.c
index 1ed77f812784..676160e9554d 100644
--- a/drivers/media/pci/cx88/cx88-mpeg.c
+++ b/drivers/media/pci/cx88/cx88-mpeg.c
@@ -619,7 +619,7 @@ int cx8802_register_driver(struct cx8802_driver *drv)
dev->core->boardnr);
/* Bring up a new struct for each driver instance */
- driver = kzalloc_obj(*drv, GFP_KERNEL);
+ driver = kzalloc_obj(*drv);
if (!driver) {
err = -ENOMEM;
goto out;
@@ -715,7 +715,7 @@ static int cx8802_probe(struct pci_dev *pci_dev,
goto fail_core;
err = -ENOMEM;
- dev = kzalloc_obj(*dev, GFP_KERNEL);
+ dev = kzalloc_obj(*dev);
if (!dev)
goto fail_core;
dev->pci = pci_dev;
diff --git a/drivers/media/pci/cx88/cx88-video.c b/drivers/media/pci/cx88/cx88-video.c
index 87752ce17df8..c78b156c5cda 100644
--- a/drivers/media/pci/cx88/cx88-video.c
+++ b/drivers/media/pci/cx88/cx88-video.c
@@ -1261,7 +1261,7 @@ static int cx8800_initdev(struct pci_dev *pci_dev,
int err;
int i;
- dev = kzalloc_obj(*dev, GFP_KERNEL);
+ dev = kzalloc_obj(*dev);
if (!dev)
return -ENOMEM;
diff --git a/drivers/media/pci/cx88/cx88-vp3054-i2c.c b/drivers/media/pci/cx88/cx88-vp3054-i2c.c
index e421589edf4c..dbec12588a39 100644
--- a/drivers/media/pci/cx88/cx88-vp3054-i2c.c
+++ b/drivers/media/pci/cx88/cx88-vp3054-i2c.c
@@ -97,7 +97,7 @@ int vp3054_i2c_probe(struct cx8802_dev *dev)
if (core->boardnr != CX88_BOARD_DNTV_LIVE_DVB_T_PRO)
return 0;
- vp3054_i2c = kzalloc_obj(*vp3054_i2c, GFP_KERNEL);
+ vp3054_i2c = kzalloc_obj(*vp3054_i2c);
if (!vp3054_i2c)
return -ENOMEM;
dev->vp3054 = vp3054_i2c;
diff --git a/drivers/media/pci/ddbridge/ddbridge-ci.c b/drivers/media/pci/ddbridge/ddbridge-ci.c
index 2602256b9f4a..e1d1f277fa9d 100644
--- a/drivers/media/pci/ddbridge/ddbridge-ci.c
+++ b/drivers/media/pci/ddbridge/ddbridge-ci.c
@@ -155,7 +155,7 @@ static void ci_attach(struct ddb_port *port)
{
struct ddb_ci *ci;
- ci = kzalloc_obj(*ci, GFP_KERNEL);
+ ci = kzalloc_obj(*ci);
if (!ci)
return;
memcpy(&ci->en, &en_templ, sizeof(en_templ));
@@ -288,7 +288,7 @@ static void ci_xo2_attach(struct ddb_port *port)
{
struct ddb_ci *ci;
- ci = kzalloc_obj(*ci, GFP_KERNEL);
+ ci = kzalloc_obj(*ci);
if (!ci)
return;
memcpy(&ci->en, &en_xo2_templ, sizeof(en_xo2_templ));
diff --git a/drivers/media/pci/ddbridge/ddbridge-dummy-fe.c b/drivers/media/pci/ddbridge/ddbridge-dummy-fe.c
index 57192c5cb9c3..d2e876a2ca71 100644
--- a/drivers/media/pci/ddbridge/ddbridge-dummy-fe.c
+++ b/drivers/media/pci/ddbridge/ddbridge-dummy-fe.c
@@ -100,7 +100,7 @@ struct dvb_frontend *ddbridge_dummy_fe_qam_attach(void)
struct ddbridge_dummy_fe_state *state = NULL;
/* allocate memory for the internal state */
- state = kzalloc_obj(struct ddbridge_dummy_fe_state, GFP_KERNEL);
+ state = kzalloc_obj(struct ddbridge_dummy_fe_state);
if (!state)
return NULL;
diff --git a/drivers/media/pci/dm1105/dm1105.c b/drivers/media/pci/dm1105/dm1105.c
index 1e1d4bda7c56..de05d8b0f9dc 100644
--- a/drivers/media/pci/dm1105/dm1105.c
+++ b/drivers/media/pci/dm1105/dm1105.c
@@ -976,7 +976,7 @@ static int dm1105_probe(struct pci_dev *pdev,
if (dm1105_devcount >= ARRAY_SIZE(card))
return -ENODEV;
- dev = kzalloc_obj(struct dm1105_dev, GFP_KERNEL);
+ dev = kzalloc_obj(struct dm1105_dev);
if (!dev)
return -ENOMEM;
diff --git a/drivers/media/pci/intel/ipu-bridge.c b/drivers/media/pci/intel/ipu-bridge.c
index 72ebe4016ca2..32cc95a766b7 100644
--- a/drivers/media/pci/intel/ipu-bridge.c
+++ b/drivers/media/pci/intel/ipu-bridge.c
@@ -638,7 +638,7 @@ int ipu_bridge_instantiate_vcm(struct device *sensor)
return 0;
}
- data = kzalloc_obj(*data, GFP_KERNEL);
+ data = kzalloc_obj(*data);
if (!data) {
fwnode_handle_put(vcm_fwnode);
return -ENOMEM;
@@ -851,7 +851,7 @@ int ipu_bridge_init(struct device *dev,
return dev_err_probe(dev, -EPROBE_DEFER,
"waiting for IVSC to become ready\n");
- bridge = kzalloc_obj(*bridge, GFP_KERNEL);
+ bridge = kzalloc_obj(*bridge);
if (!bridge)
return -ENOMEM;
diff --git a/drivers/media/pci/intel/ipu6/ipu6-bus.c b/drivers/media/pci/intel/ipu6/ipu6-bus.c
index 59879e4861ed..173616381f62 100644
--- a/drivers/media/pci/intel/ipu6/ipu6-bus.c
+++ b/drivers/media/pci/intel/ipu6/ipu6-bus.c
@@ -90,7 +90,7 @@ ipu6_bus_initialize_device(struct pci_dev *pdev, struct device *parent,
struct ipu6_device *isp = pci_get_drvdata(pdev);
int ret;
- adev = kzalloc_obj(*adev, GFP_KERNEL);
+ adev = kzalloc_obj(*adev);
if (!adev)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/media/pci/intel/ipu6/ipu6-buttress.c b/drivers/media/pci/intel/ipu6/ipu6-buttress.c
index 8b90ecf49e45..e0ecb4c8b081 100644
--- a/drivers/media/pci/intel/ipu6/ipu6-buttress.c
+++ b/drivers/media/pci/intel/ipu6/ipu6-buttress.c
@@ -552,7 +552,7 @@ int ipu6_buttress_map_fw_image(struct ipu6_bus_device *sys,
n_pages = PFN_UP(fw->size);
- pages = kmalloc_objs(*pages, n_pages, GFP_KERNEL);
+ pages = kmalloc_objs(*pages, n_pages);
if (!pages)
return -ENOMEM;
diff --git a/drivers/media/pci/intel/ipu6/ipu6-dma.c b/drivers/media/pci/intel/ipu6/ipu6-dma.c
index cefb16040c21..fdcdb15b073c 100644
--- a/drivers/media/pci/intel/ipu6/ipu6-dma.c
+++ b/drivers/media/pci/intel/ipu6/ipu6-dma.c
@@ -164,7 +164,7 @@ void *ipu6_dma_alloc(struct ipu6_bus_device *sys, size_t size,
unsigned int i;
int ret;
- info = kzalloc_obj(*info, GFP_KERNEL);
+ info = kzalloc_obj(*info);
if (!info)
return NULL;
diff --git a/drivers/media/pci/intel/ipu6/ipu6-fw-com.c b/drivers/media/pci/intel/ipu6/ipu6-fw-com.c
index 13ee09f6d32a..51567c5fc139 100644
--- a/drivers/media/pci/intel/ipu6/ipu6-fw-com.c
+++ b/drivers/media/pci/intel/ipu6/ipu6-fw-com.c
@@ -170,7 +170,7 @@ void *ipu6_fw_com_prepare(struct ipu6_fw_com_cfg *cfg,
if (!cfg || !cfg->cell_start || !cfg->cell_ready)
return NULL;
- ctx = kzalloc_obj(*ctx, GFP_KERNEL);
+ ctx = kzalloc_obj(*ctx);
if (!ctx)
return NULL;
ctx->dmem_addr = base + cfg->dmem_addr + REGMEM_OFFSET;
diff --git a/drivers/media/pci/intel/ipu6/ipu6-mmu.c b/drivers/media/pci/intel/ipu6/ipu6-mmu.c
index 9eadde7142a3..0e6dca36b6ba 100644
--- a/drivers/media/pci/intel/ipu6/ipu6-mmu.c
+++ b/drivers/media/pci/intel/ipu6/ipu6-mmu.c
@@ -549,7 +549,7 @@ static struct ipu6_mmu_info *ipu6_mmu_alloc(struct ipu6_device *isp)
struct ipu6_mmu_info *mmu_info;
int ret;
- mmu_info = kzalloc_obj(*mmu_info, GFP_KERNEL);
+ mmu_info = kzalloc_obj(*mmu_info);
if (!mmu_info)
return NULL;
@@ -613,7 +613,7 @@ static struct ipu6_dma_mapping *alloc_dma_mapping(struct ipu6_device *isp)
{
struct ipu6_dma_mapping *dmap;
- dmap = kzalloc_obj(*dmap, GFP_KERNEL);
+ dmap = kzalloc_obj(*dmap);
if (!dmap)
return NULL;
diff --git a/drivers/media/pci/intel/ipu6/ipu6.c b/drivers/media/pci/intel/ipu6/ipu6.c
index 57fe13ebb621..34f67f4f1bb5 100644
--- a/drivers/media/pci/intel/ipu6/ipu6.c
+++ b/drivers/media/pci/intel/ipu6/ipu6.c
@@ -381,7 +381,7 @@ ipu6_isys_init(struct pci_dev *pdev, struct device *parent,
return ERR_PTR(ret);
}
- pdata = kzalloc_obj(*pdata, GFP_KERNEL);
+ pdata = kzalloc_obj(*pdata);
if (!pdata)
return ERR_PTR(-ENOMEM);
@@ -425,7 +425,7 @@ ipu6_psys_init(struct pci_dev *pdev, struct device *parent,
struct ipu6_psys_pdata *pdata;
int ret;
- pdata = kzalloc_obj(*pdata, GFP_KERNEL);
+ pdata = kzalloc_obj(*pdata);
if (!pdata)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/media/pci/ivtv/ivtv-alsa-main.c b/drivers/media/pci/ivtv/ivtv-alsa-main.c
index 05d499241c02..59573debd19e 100644
--- a/drivers/media/pci/ivtv/ivtv-alsa-main.c
+++ b/drivers/media/pci/ivtv/ivtv-alsa-main.c
@@ -74,7 +74,7 @@ static int snd_ivtv_card_create(struct v4l2_device *v4l2_dev,
struct snd_card *sc,
struct snd_ivtv_card **itvsc)
{
- *itvsc = kzalloc_obj(struct snd_ivtv_card, GFP_KERNEL);
+ *itvsc = kzalloc_obj(struct snd_ivtv_card);
if (*itvsc == NULL)
return -ENOMEM;
diff --git a/drivers/media/pci/ivtv/ivtv-driver.c b/drivers/media/pci/ivtv/ivtv-driver.c
index 9d0d4faf9867..e0091a8e5c88 100644
--- a/drivers/media/pci/ivtv/ivtv-driver.c
+++ b/drivers/media/pci/ivtv/ivtv-driver.c
@@ -953,7 +953,7 @@ static int ivtv_probe(struct pci_dev *pdev, const struct pci_device_id *pci_id)
int vbi_buf_size;
struct ivtv *itv;
- itv = kzalloc_obj(struct ivtv, GFP_KERNEL);
+ itv = kzalloc_obj(struct ivtv);
if (itv == NULL)
return -ENOMEM;
itv->pdev = pdev;
diff --git a/drivers/media/pci/ivtv/ivtv-fileops.c b/drivers/media/pci/ivtv/ivtv-fileops.c
index 87c0ef449beb..e7fed9698758 100644
--- a/drivers/media/pci/ivtv/ivtv-fileops.c
+++ b/drivers/media/pci/ivtv/ivtv-fileops.c
@@ -990,7 +990,7 @@ static int ivtv_open(struct file *filp)
}
/* Allocate memory */
- item = kzalloc_obj(struct ivtv_open_id, GFP_KERNEL);
+ item = kzalloc_obj(struct ivtv_open_id);
if (NULL == item) {
IVTV_DEBUG_WARN("nomem on v4l2 open\n");
return -ENOMEM;
diff --git a/drivers/media/pci/mantis/hopper_cards.c b/drivers/media/pci/mantis/hopper_cards.c
index 132b5e21868b..050068308c10 100644
--- a/drivers/media/pci/mantis/hopper_cards.c
+++ b/drivers/media/pci/mantis/hopper_cards.c
@@ -149,7 +149,7 @@ static int hopper_pci_probe(struct pci_dev *pdev,
struct mantis_hwconfig *config;
int err;
- mantis = kzalloc_obj(*mantis, GFP_KERNEL);
+ mantis = kzalloc_obj(*mantis);
if (!mantis) {
err = -ENOMEM;
goto fail0;
diff --git a/drivers/media/pci/mantis/mantis_ca.c b/drivers/media/pci/mantis/mantis_ca.c
index a0998b16ba9e..96fee641d16e 100644
--- a/drivers/media/pci/mantis/mantis_ca.c
+++ b/drivers/media/pci/mantis/mantis_ca.c
@@ -137,7 +137,7 @@ int mantis_ca_init(struct mantis_pci *mantis)
int ca_flags = 0, result;
dprintk(MANTIS_DEBUG, 1, "Initializing Mantis CA");
- ca = kzalloc_obj(struct mantis_ca, GFP_KERNEL);
+ ca = kzalloc_obj(struct mantis_ca);
if (!ca) {
dprintk(MANTIS_ERROR, 1, "Out of memory!, exiting ..");
result = -ENOMEM;
diff --git a/drivers/media/pci/mantis/mantis_cards.c b/drivers/media/pci/mantis/mantis_cards.c
index 3c46e1db8e4a..5625260b6aec 100644
--- a/drivers/media/pci/mantis/mantis_cards.c
+++ b/drivers/media/pci/mantis/mantis_cards.c
@@ -158,7 +158,7 @@ static int mantis_pci_probe(struct pci_dev *pdev,
struct mantis_hwconfig *config;
int err;
- mantis = kzalloc_obj(*mantis, GFP_KERNEL);
+ mantis = kzalloc_obj(*mantis);
if (!mantis)
return -ENOMEM;
diff --git a/drivers/media/pci/mgb4/mgb4_core.c b/drivers/media/pci/mgb4/mgb4_core.c
index cd23758fb9b4..a7351a469386 100644
--- a/drivers/media/pci/mgb4/mgb4_core.c
+++ b/drivers/media/pci/mgb4/mgb4_core.c
@@ -522,7 +522,7 @@ static int mgb4_probe(struct pci_dev *pdev, const struct pci_device_id *id)
};
int irqs = pci_msix_vec_count(pdev);
- mgbdev = kzalloc_obj(*mgbdev, GFP_KERNEL);
+ mgbdev = kzalloc_obj(*mgbdev);
if (!mgbdev)
return -ENOMEM;
diff --git a/drivers/media/pci/mgb4/mgb4_vin.c b/drivers/media/pci/mgb4/mgb4_vin.c
index 815c87b9210f..74fb00c4a408 100644
--- a/drivers/media/pci/mgb4/mgb4_vin.c
+++ b/drivers/media/pci/mgb4/mgb4_vin.c
@@ -946,7 +946,7 @@ struct mgb4_vin_dev *mgb4_vin_create(struct mgb4_dev *mgbdev, int id)
struct device *dev = &pdev->dev;
int vin_irq, err_irq;
- vindev = kzalloc_obj(*vindev, GFP_KERNEL);
+ vindev = kzalloc_obj(*vindev);
if (!vindev)
return NULL;
diff --git a/drivers/media/pci/mgb4/mgb4_vout.c b/drivers/media/pci/mgb4/mgb4_vout.c
index cd5a36a41333..7725bcd55e4c 100644
--- a/drivers/media/pci/mgb4/mgb4_vout.c
+++ b/drivers/media/pci/mgb4/mgb4_vout.c
@@ -761,7 +761,7 @@ struct mgb4_vout_dev *mgb4_vout_create(struct mgb4_dev *mgbdev, int id)
struct pci_dev *pdev = mgbdev->pdev;
struct device *dev = &pdev->dev;
- voutdev = kzalloc_obj(*voutdev, GFP_KERNEL);
+ voutdev = kzalloc_obj(*voutdev);
if (!voutdev)
return NULL;
diff --git a/drivers/media/pci/netup_unidvb/netup_unidvb_core.c b/drivers/media/pci/netup_unidvb/netup_unidvb_core.c
index 08af6717b1c9..ec08023b5d5e 100644
--- a/drivers/media/pci/netup_unidvb/netup_unidvb_core.c
+++ b/drivers/media/pci/netup_unidvb/netup_unidvb_core.c
@@ -799,7 +799,7 @@ static int netup_unidvb_initdev(struct pci_dev *pci_dev,
}
/* allocate device context */
- ndev = kzalloc_obj(*ndev, GFP_KERNEL);
+ ndev = kzalloc_obj(*ndev);
if (!ndev)
goto dev_alloc_err;
diff --git a/drivers/media/pci/pluto2/pluto2.c b/drivers/media/pci/pluto2/pluto2.c
index 38bd167e821d..22c2222d5c4d 100644
--- a/drivers/media/pci/pluto2/pluto2.c
+++ b/drivers/media/pci/pluto2/pluto2.c
@@ -582,7 +582,7 @@ static int pluto2_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
struct dmx_demux *dmx;
int ret = -ENOMEM;
- pluto = kzalloc_obj(struct pluto, GFP_KERNEL);
+ pluto = kzalloc_obj(struct pluto);
if (!pluto)
goto out;
diff --git a/drivers/media/pci/pt1/pt1.c b/drivers/media/pci/pt1/pt1.c
index 21a9a3166588..7cce6576b4cb 100644
--- a/drivers/media/pci/pt1/pt1.c
+++ b/drivers/media/pci/pt1/pt1.c
@@ -833,7 +833,7 @@ pt1_alloc_adapter(struct pt1 *pt1)
struct dmxdev *dmxdev;
int ret;
- adap = kzalloc_obj(struct pt1_adapter, GFP_KERNEL);
+ adap = kzalloc_obj(struct pt1_adapter);
if (!adap) {
ret = -ENOMEM;
goto err;
@@ -1356,7 +1356,7 @@ static int pt1_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
goto err_pci_release_regions;
}
- pt1 = kzalloc_obj(struct pt1, GFP_KERNEL);
+ pt1 = kzalloc_obj(struct pt1);
if (!pt1) {
ret = -ENOMEM;
goto err_pci_iounmap;
diff --git a/drivers/media/pci/pt3/pt3.c b/drivers/media/pci/pt3/pt3.c
index f0fb92017e8f..753161889092 100644
--- a/drivers/media/pci/pt3/pt3.c
+++ b/drivers/media/pci/pt3/pt3.c
@@ -529,7 +529,7 @@ static int pt3_alloc_adapter(struct pt3_board *pt3, int index)
struct pt3_adapter *adap;
struct dvb_adapter *da;
- adap = kzalloc_obj(*adap, GFP_KERNEL);
+ adap = kzalloc_obj(*adap);
if (!adap)
return -ENOMEM;
diff --git a/drivers/media/pci/saa7134/saa7134-alsa.c b/drivers/media/pci/saa7134/saa7134-alsa.c
index ad1a640d7f76..147985bb0261 100644
--- a/drivers/media/pci/saa7134/saa7134-alsa.c
+++ b/drivers/media/pci/saa7134/saa7134-alsa.c
@@ -816,7 +816,7 @@ static int snd_card_saa7134_capture_open(struct snd_pcm_substream * substream)
mutex_unlock(&dev->dmasound.lock);
- pcm = kzalloc_obj(*pcm, GFP_KERNEL);
+ pcm = kzalloc_obj(*pcm);
if (pcm == NULL)
return -ENOMEM;
diff --git a/drivers/media/pci/saa7134/saa7134-core.c b/drivers/media/pci/saa7134/saa7134-core.c
index 5acad9554a61..2f5b258d682b 100644
--- a/drivers/media/pci/saa7134/saa7134-core.c
+++ b/drivers/media/pci/saa7134/saa7134-core.c
@@ -1010,7 +1010,7 @@ static int saa7134_initdev(struct pci_dev *pci_dev,
if (saa7134_devcount == SAA7134_MAXBOARDS)
return -ENOMEM;
- dev = kzalloc_obj(*dev, GFP_KERNEL);
+ dev = kzalloc_obj(*dev);
if (NULL == dev)
return -ENOMEM;
@@ -1018,7 +1018,7 @@ static int saa7134_initdev(struct pci_dev *pci_dev,
sprintf(dev->name, "saa%x[%d]", pci_dev->device, dev->nr);
#ifdef CONFIG_MEDIA_CONTROLLER
- dev->media_dev = kzalloc_obj(*dev->media_dev, GFP_KERNEL);
+ dev->media_dev = kzalloc_obj(*dev->media_dev);
if (!dev->media_dev) {
err = -ENOMEM;
goto err_free_dev;
diff --git a/drivers/media/pci/saa7134/saa7134-go7007.c b/drivers/media/pci/saa7134/saa7134-go7007.c
index 05f9606b9012..1f4d771793a2 100644
--- a/drivers/media/pci/saa7134/saa7134-go7007.c
+++ b/drivers/media/pci/saa7134/saa7134-go7007.c
@@ -414,7 +414,7 @@ static int saa7134_go7007_init(struct saa7134_dev *dev)
if (go == NULL)
return -ENOMEM;
- saa = kzalloc_obj(struct saa7134_go7007, GFP_KERNEL);
+ saa = kzalloc_obj(struct saa7134_go7007);
if (saa == NULL) {
kfree(go);
return -ENOMEM;
diff --git a/drivers/media/pci/saa7134/saa7134-input.c b/drivers/media/pci/saa7134/saa7134-input.c
index 22fbcc2cb585..5b7101415780 100644
--- a/drivers/media/pci/saa7134/saa7134-input.c
+++ b/drivers/media/pci/saa7134/saa7134-input.c
@@ -768,7 +768,7 @@ int saa7134_input_init1(struct saa7134_dev *dev)
return -ENODEV;
}
- ir = kzalloc_obj(*ir, GFP_KERNEL);
+ ir = kzalloc_obj(*ir);
rc = rc_allocate_device(RC_DRIVER_SCANCODE);
if (!ir || !rc) {
err = -ENOMEM;
diff --git a/drivers/media/pci/saa7146/hexium_gemini.c b/drivers/media/pci/saa7146/hexium_gemini.c
index 371beecd92e1..1eef4e102972 100644
--- a/drivers/media/pci/saa7146/hexium_gemini.c
+++ b/drivers/media/pci/saa7146/hexium_gemini.c
@@ -250,7 +250,7 @@ static int hexium_attach(struct saa7146_dev *dev, struct saa7146_pci_extension_d
DEB_EE("\n");
- hexium = kzalloc_obj(*hexium, GFP_KERNEL);
+ hexium = kzalloc_obj(*hexium);
if (!hexium)
return -ENOMEM;
diff --git a/drivers/media/pci/saa7146/hexium_orion.c b/drivers/media/pci/saa7146/hexium_orion.c
index f713d543971e..6f1b4bff7596 100644
--- a/drivers/media/pci/saa7146/hexium_orion.c
+++ b/drivers/media/pci/saa7146/hexium_orion.c
@@ -209,7 +209,7 @@ static int hexium_probe(struct saa7146_dev *dev)
return -EFAULT;
}
- hexium = kzalloc_obj(*hexium, GFP_KERNEL);
+ hexium = kzalloc_obj(*hexium);
if (!hexium)
return -ENOMEM;
diff --git a/drivers/media/pci/saa7146/mxb.c b/drivers/media/pci/saa7146/mxb.c
index 1999d45f2986..d931b4e3052f 100644
--- a/drivers/media/pci/saa7146/mxb.c
+++ b/drivers/media/pci/saa7146/mxb.c
@@ -226,7 +226,7 @@ static int mxb_probe(struct saa7146_dev *dev)
V4L2_CID_AUDIO_MUTE, 0, 1, 1, 1);
if (hdl->error)
return hdl->error;
- mxb = kzalloc_obj(struct mxb, GFP_KERNEL);
+ mxb = kzalloc_obj(struct mxb);
if (mxb == NULL) {
DEB_D("not enough kernel memory\n");
return -ENOMEM;
diff --git a/drivers/media/pci/saa7164/saa7164-buffer.c b/drivers/media/pci/saa7164/saa7164-buffer.c
index 9d1fa04990f7..1f961bdfc041 100644
--- a/drivers/media/pci/saa7164/saa7164-buffer.c
+++ b/drivers/media/pci/saa7164/saa7164-buffer.c
@@ -68,7 +68,7 @@ struct saa7164_buffer *saa7164_buffer_alloc(struct saa7164_port *port,
goto ret;
}
- buf = kzalloc_obj(*buf, GFP_KERNEL);
+ buf = kzalloc_obj(*buf);
if (!buf)
goto ret;
@@ -252,7 +252,7 @@ struct saa7164_user_buffer *saa7164_buffer_alloc_user(struct saa7164_dev *dev,
{
struct saa7164_user_buffer *buf;
- buf = kzalloc_obj(*buf, GFP_KERNEL);
+ buf = kzalloc_obj(*buf);
if (!buf)
return NULL;
diff --git a/drivers/media/pci/saa7164/saa7164-core.c b/drivers/media/pci/saa7164/saa7164-core.c
index eac9bc9f640c..74406d5ea0a5 100644
--- a/drivers/media/pci/saa7164/saa7164-core.c
+++ b/drivers/media/pci/saa7164/saa7164-core.c
@@ -1238,7 +1238,7 @@ static int saa7164_initdev(struct pci_dev *pci_dev,
int err, i;
u32 version;
- dev = kzalloc_obj(*dev, GFP_KERNEL);
+ dev = kzalloc_obj(*dev);
if (NULL == dev)
return -ENOMEM;
diff --git a/drivers/media/pci/saa7164/saa7164-encoder.c b/drivers/media/pci/saa7164/saa7164-encoder.c
index cae31f11d076..64380741b984 100644
--- a/drivers/media/pci/saa7164/saa7164-encoder.c
+++ b/drivers/media/pci/saa7164/saa7164-encoder.c
@@ -719,7 +719,7 @@ static int fops_open(struct file *file)
dprintk(DBGLVL_ENC, "%s()\n", __func__);
/* allocate + initialize per filehandle data */
- fh = kzalloc_obj(*fh, GFP_KERNEL);
+ fh = kzalloc_obj(*fh);
if (NULL == fh)
return -ENOMEM;
diff --git a/drivers/media/pci/saa7164/saa7164-vbi.c b/drivers/media/pci/saa7164/saa7164-vbi.c
index fcb9f99890e5..bfa6ee295a22 100644
--- a/drivers/media/pci/saa7164/saa7164-vbi.c
+++ b/drivers/media/pci/saa7164/saa7164-vbi.c
@@ -422,7 +422,7 @@ static int fops_open(struct file *file)
dprintk(DBGLVL_VBI, "%s()\n", __func__);
/* allocate + initialize per filehandle data */
- fh = kzalloc_obj(*fh, GFP_KERNEL);
+ fh = kzalloc_obj(*fh);
if (NULL == fh)
return -ENOMEM;
diff --git a/drivers/media/pci/smipcie/smipcie-main.c b/drivers/media/pci/smipcie/smipcie-main.c
index 5bfba2721231..387c29958c98 100644
--- a/drivers/media/pci/smipcie/smipcie-main.c
+++ b/drivers/media/pci/smipcie/smipcie-main.c
@@ -946,7 +946,7 @@ static int smi_probe(struct pci_dev *pdev, const struct pci_device_id *id)
if (pci_enable_device(pdev) < 0)
return -ENODEV;
- dev = kzalloc_obj(struct smi_dev, GFP_KERNEL);
+ dev = kzalloc_obj(struct smi_dev);
if (!dev) {
ret = -ENOMEM;
goto err_pci_disable_device;
diff --git a/drivers/media/pci/solo6x10/solo6x10-core.c b/drivers/media/pci/solo6x10/solo6x10-core.c
index 78335a6838c6..11cddf4b4312 100644
--- a/drivers/media/pci/solo6x10/solo6x10-core.c
+++ b/drivers/media/pci/solo6x10/solo6x10-core.c
@@ -449,7 +449,7 @@ static int solo_pci_probe(struct pci_dev *pdev, const struct pci_device_id *id)
int ret;
u8 chip_id;
- solo_dev = kzalloc_obj(*solo_dev, GFP_KERNEL);
+ solo_dev = kzalloc_obj(*solo_dev);
if (solo_dev == NULL)
return -ENOMEM;
diff --git a/drivers/media/pci/solo6x10/solo6x10-g723.c b/drivers/media/pci/solo6x10/solo6x10-g723.c
index 5906fd47b583..e41b8d90a30e 100644
--- a/drivers/media/pci/solo6x10/solo6x10-g723.c
+++ b/drivers/media/pci/solo6x10/solo6x10-g723.c
@@ -120,7 +120,7 @@ static int snd_solo_pcm_open(struct snd_pcm_substream *ss)
struct solo_dev *solo_dev = snd_pcm_substream_chip(ss);
struct solo_snd_pcm *solo_pcm;
- solo_pcm = kzalloc_obj(*solo_pcm, GFP_KERNEL);
+ solo_pcm = kzalloc_obj(*solo_pcm);
if (solo_pcm == NULL)
goto oom;
diff --git a/drivers/media/pci/solo6x10/solo6x10-v4l2-enc.c b/drivers/media/pci/solo6x10/solo6x10-v4l2-enc.c
index d7168b9c9e61..91b5c4161930 100644
--- a/drivers/media/pci/solo6x10/solo6x10-v4l2-enc.c
+++ b/drivers/media/pci/solo6x10/solo6x10-v4l2-enc.c
@@ -1208,7 +1208,7 @@ static struct solo_enc_dev *solo_enc_alloc(struct solo_dev *solo_dev,
struct v4l2_ctrl_handler *hdl;
int ret;
- solo_enc = kzalloc_obj(*solo_enc, GFP_KERNEL);
+ solo_enc = kzalloc_obj(*solo_enc);
if (!solo_enc)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/media/pci/ttpci/budget-av.c b/drivers/media/pci/ttpci/budget-av.c
index 482e71c0fdcc..55542cfbc6bb 100644
--- a/drivers/media/pci/ttpci/budget-av.c
+++ b/drivers/media/pci/ttpci/budget-av.c
@@ -1437,7 +1437,7 @@ static int budget_av_attach(struct saa7146_dev *dev, struct saa7146_pci_extensio
dprintk(2, "dev: %p\n", dev);
- budget_av = kzalloc_obj(struct budget_av, GFP_KERNEL);
+ budget_av = kzalloc_obj(struct budget_av);
if (!budget_av)
return -ENOMEM;
diff --git a/drivers/media/pci/ttpci/budget-ci.c b/drivers/media/pci/ttpci/budget-ci.c
index 86edb4310366..3709c0fb23b0 100644
--- a/drivers/media/pci/ttpci/budget-ci.c
+++ b/drivers/media/pci/ttpci/budget-ci.c
@@ -1456,7 +1456,7 @@ static int budget_ci_attach(struct saa7146_dev *dev, struct saa7146_pci_extensio
struct budget_ci *budget_ci;
int err;
- budget_ci = kzalloc_obj(struct budget_ci, GFP_KERNEL);
+ budget_ci = kzalloc_obj(struct budget_ci);
if (!budget_ci) {
err = -ENOMEM;
goto out1;
diff --git a/drivers/media/pci/ttpci/budget.c b/drivers/media/pci/ttpci/budget.c
index ebdc6d2bce4e..95370156aff5 100644
--- a/drivers/media/pci/ttpci/budget.c
+++ b/drivers/media/pci/ttpci/budget.c
@@ -788,7 +788,7 @@ static int budget_attach(struct saa7146_dev *dev, struct saa7146_pci_extension_d
struct budget *budget = NULL;
int err;
- budget = kmalloc_obj(struct budget, GFP_KERNEL);
+ budget = kmalloc_obj(struct budget);
if (budget == NULL)
return -ENOMEM;
diff --git a/drivers/media/pci/tw686x/tw686x-core.c b/drivers/media/pci/tw686x/tw686x-core.c
index bcf93f4a5c83..101c7ccc6fd0 100644
--- a/drivers/media/pci/tw686x/tw686x-core.c
+++ b/drivers/media/pci/tw686x/tw686x-core.c
@@ -243,7 +243,7 @@ static int tw686x_probe(struct pci_dev *pci_dev,
struct tw686x_dev *dev;
int err;
- dev = kzalloc_obj(*dev, GFP_KERNEL);
+ dev = kzalloc_obj(*dev);
if (!dev)
return -ENOMEM;
dev->type = pci_id->driver_data;
diff --git a/drivers/media/pci/zoran/videocodec.c b/drivers/media/pci/zoran/videocodec.c
index 2874247ad300..85fe60065b4d 100644
--- a/drivers/media/pci/zoran/videocodec.c
+++ b/drivers/media/pci/zoran/videocodec.c
@@ -73,7 +73,7 @@ struct videocodec *videocodec_attach(struct videocodec_master *master)
res = codec->setup(codec);
if (res == 0) {
zrdev_dbg(zr, "%s: '%s'\n", __func__, codec->name);
- ptr = kzalloc_obj(*ptr, GFP_KERNEL);
+ ptr = kzalloc_obj(*ptr);
if (!ptr)
goto out_kfree;
ptr->codec = codec;
@@ -180,7 +180,7 @@ int videocodec_register(const struct videocodec *codec)
"videocodec: register '%s', type: %x, flags %lx, magic %lx\n",
codec->name, codec->type, codec->flags, codec->magic);
- ptr = kzalloc_obj(*ptr, GFP_KERNEL);
+ ptr = kzalloc_obj(*ptr);
if (!ptr)
return -ENOMEM;
ptr->codec = codec;
diff --git a/drivers/media/pci/zoran/zr36016.c b/drivers/media/pci/zoran/zr36016.c
index 4c6a0a00578b..bb2d92743229 100644
--- a/drivers/media/pci/zoran/zr36016.c
+++ b/drivers/media/pci/zoran/zr36016.c
@@ -344,7 +344,7 @@ static int zr36016_setup(struct videocodec *codec)
return -ENOSPC;
}
//mem structure init
- ptr = kzalloc_obj(*ptr, GFP_KERNEL);
+ ptr = kzalloc_obj(*ptr);
codec->data = ptr;
if (!ptr)
return -ENOMEM;
diff --git a/drivers/media/pci/zoran/zr36050.c b/drivers/media/pci/zoran/zr36050.c
index 701e4ef7ec22..eac4a6c32e93 100644
--- a/drivers/media/pci/zoran/zr36050.c
+++ b/drivers/media/pci/zoran/zr36050.c
@@ -741,7 +741,7 @@ static int zr36050_setup(struct videocodec *codec)
return -ENOSPC;
}
//mem structure init
- ptr = kzalloc_obj(*ptr, GFP_KERNEL);
+ ptr = kzalloc_obj(*ptr);
codec->data = ptr;
if (!ptr)
return -ENOMEM;
diff --git a/drivers/media/pci/zoran/zr36060.c b/drivers/media/pci/zoran/zr36060.c
index ddd822e4495a..c383dcddf7cd 100644
--- a/drivers/media/pci/zoran/zr36060.c
+++ b/drivers/media/pci/zoran/zr36060.c
@@ -796,7 +796,7 @@ static int zr36060_setup(struct videocodec *codec)
return -ENOSPC;
}
//mem structure init
- ptr = kzalloc_obj(*ptr, GFP_KERNEL);
+ ptr = kzalloc_obj(*ptr);
codec->data = ptr;
if (!ptr)
return -ENOMEM;
diff --git a/drivers/media/platform/allegro-dvt/allegro-core.c b/drivers/media/platform/allegro-dvt/allegro-core.c
index a6589cd6359e..eac3bc9af990 100644
--- a/drivers/media/platform/allegro-dvt/allegro-core.c
+++ b/drivers/media/platform/allegro-dvt/allegro-core.c
@@ -967,7 +967,7 @@ static int allegro_mbox_notify(struct allegro_mbox *mbox)
u32 *tmp;
int err;
- msg = kmalloc_obj(*msg, GFP_KERNEL);
+ msg = kmalloc_obj(*msg);
if (!msg)
return -ENOMEM;
@@ -1551,7 +1551,7 @@ static int allocate_buffers_internal(struct allegro_channel *channel,
struct allegro_buffer *buffer, *tmp;
for (i = 0; i < n; i++) {
- buffer = kmalloc_obj(*buffer, GFP_KERNEL);
+ buffer = kmalloc_obj(*buffer);
if (!buffer) {
err = -ENOMEM;
goto err;
@@ -1632,7 +1632,7 @@ static ssize_t allegro_h264_write_sps(struct allegro_channel *channel,
unsigned int cpb_size;
unsigned int cpb_size_scale;
- sps = kzalloc_obj(*sps, GFP_KERNEL);
+ sps = kzalloc_obj(*sps);
if (!sps)
return -ENOMEM;
@@ -1729,7 +1729,7 @@ static ssize_t allegro_h264_write_pps(struct allegro_channel *channel,
struct nal_h264_pps *pps;
ssize_t size;
- pps = kzalloc_obj(*pps, GFP_KERNEL);
+ pps = kzalloc_obj(*pps);
if (!pps)
return -ENOMEM;
@@ -1780,7 +1780,7 @@ static ssize_t allegro_hevc_write_vps(struct allegro_channel *channel,
s32 level = v4l2_ctrl_g_ctrl(channel->mpeg_video_hevc_level);
s32 tier = v4l2_ctrl_g_ctrl(channel->mpeg_video_hevc_tier);
- vps = kzalloc_obj(*vps, GFP_KERNEL);
+ vps = kzalloc_obj(*vps);
if (!vps)
return -ENOMEM;
@@ -1822,7 +1822,7 @@ static ssize_t allegro_hevc_write_sps(struct allegro_channel *channel,
s32 level = v4l2_ctrl_g_ctrl(channel->mpeg_video_hevc_level);
s32 tier = v4l2_ctrl_g_ctrl(channel->mpeg_video_hevc_tier);
- sps = kzalloc_obj(*sps, GFP_KERNEL);
+ sps = kzalloc_obj(*sps);
if (!sps)
return -ENOMEM;
@@ -1929,7 +1929,7 @@ static ssize_t allegro_hevc_write_pps(struct allegro_channel *channel,
ssize_t size;
int i;
- pps = kzalloc_obj(*pps, GFP_KERNEL);
+ pps = kzalloc_obj(*pps);
if (!pps)
return -ENOMEM;
diff --git a/drivers/media/platform/amlogic/meson-ge2d/ge2d.c b/drivers/media/platform/amlogic/meson-ge2d/ge2d.c
index 0b499ed7795f..c5dc03905ce0 100644
--- a/drivers/media/platform/amlogic/meson-ge2d/ge2d.c
+++ b/drivers/media/platform/amlogic/meson-ge2d/ge2d.c
@@ -834,7 +834,7 @@ static int ge2d_open(struct file *file)
struct ge2d_ctx *ctx = NULL;
int ret = 0;
- ctx = kzalloc_obj(*ctx, GFP_KERNEL);
+ ctx = kzalloc_obj(*ctx);
if (!ctx)
return -ENOMEM;
ctx->ge2d = ge2d;
diff --git a/drivers/media/platform/amphion/vdec.c b/drivers/media/platform/amphion/vdec.c
index 3302994dbf3f..a9f0521f2e1a 100644
--- a/drivers/media/platform/amphion/vdec.c
+++ b/drivers/media/platform/amphion/vdec.c
@@ -1927,11 +1927,11 @@ static int vdec_open(struct file *file)
struct vdec_t *vdec;
int ret;
- inst = kzalloc_obj(*inst, GFP_KERNEL);
+ inst = kzalloc_obj(*inst);
if (!inst)
return -ENOMEM;
- vdec = kzalloc_obj(*vdec, GFP_KERNEL);
+ vdec = kzalloc_obj(*vdec);
if (!vdec) {
kfree(inst);
return -ENOMEM;
diff --git a/drivers/media/platform/amphion/venc.c b/drivers/media/platform/amphion/venc.c
index 4f13566fed49..0b3d58b9f2f7 100644
--- a/drivers/media/platform/amphion/venc.c
+++ b/drivers/media/platform/amphion/venc.c
@@ -858,7 +858,7 @@ static int venc_frame_encoded(struct vpu_inst *inst, void *arg)
if (!info)
return -EINVAL;
venc = inst->priv;
- frame = kzalloc_obj(*frame, GFP_KERNEL);
+ frame = kzalloc_obj(*frame);
if (!frame)
return -ENOMEM;
@@ -1307,11 +1307,11 @@ static int venc_open(struct file *file)
struct venc_t *venc;
int ret;
- inst = kzalloc_obj(*inst, GFP_KERNEL);
+ inst = kzalloc_obj(*inst);
if (!inst)
return -ENOMEM;
- venc = kzalloc_obj(*venc, GFP_KERNEL);
+ venc = kzalloc_obj(*venc);
if (!venc) {
kfree(inst);
return -ENOMEM;
diff --git a/drivers/media/platform/amphion/vpu_cmds.c b/drivers/media/platform/amphion/vpu_cmds.c
index 00eda558a739..615680f1cb94 100644
--- a/drivers/media/platform/amphion/vpu_cmds.c
+++ b/drivers/media/platform/amphion/vpu_cmds.c
@@ -83,11 +83,11 @@ static struct vpu_cmd_t *vpu_alloc_cmd(struct vpu_inst *inst, u32 id, void *data
int i;
int ret;
- cmd = kzalloc_obj(*cmd, GFP_KERNEL);
+ cmd = kzalloc_obj(*cmd);
if (!cmd)
return NULL;
- cmd->pkt = kzalloc_obj(*cmd->pkt, GFP_KERNEL);
+ cmd->pkt = kzalloc_obj(*cmd->pkt);
if (!cmd->pkt) {
kfree(cmd);
return NULL;
diff --git a/drivers/media/platform/broadcom/bcm2835-unicam.c b/drivers/media/platform/broadcom/bcm2835-unicam.c
index 9d00ea315763..53a342853be6 100644
--- a/drivers/media/platform/broadcom/bcm2835-unicam.c
+++ b/drivers/media/platform/broadcom/bcm2835-unicam.c
@@ -2642,7 +2642,7 @@ static int unicam_probe(struct platform_device *pdev)
struct unicam_device *unicam;
int ret;
- unicam = kzalloc_obj(*unicam, GFP_KERNEL);
+ unicam = kzalloc_obj(*unicam);
if (!unicam)
return -ENOMEM;
diff --git a/drivers/media/platform/cadence/cdns-csi2rx.c b/drivers/media/platform/cadence/cdns-csi2rx.c
index df299f29756f..cde690c6fdee 100644
--- a/drivers/media/platform/cadence/cdns-csi2rx.c
+++ b/drivers/media/platform/cadence/cdns-csi2rx.c
@@ -824,7 +824,7 @@ static int csi2rx_probe(struct platform_device *pdev)
unsigned int i;
int ret;
- csi2rx = kzalloc_obj(*csi2rx, GFP_KERNEL);
+ csi2rx = kzalloc_obj(*csi2rx);
if (!csi2rx)
return -ENOMEM;
platform_set_drvdata(pdev, csi2rx);
diff --git a/drivers/media/platform/cadence/cdns-csi2tx.c b/drivers/media/platform/cadence/cdns-csi2tx.c
index 80aefdbe259b..629b0fa838a2 100644
--- a/drivers/media/platform/cadence/cdns-csi2tx.c
+++ b/drivers/media/platform/cadence/cdns-csi2tx.c
@@ -573,7 +573,7 @@ static int csi2tx_probe(struct platform_device *pdev)
unsigned int i;
int ret;
- csi2tx = kzalloc_obj(*csi2tx, GFP_KERNEL);
+ csi2tx = kzalloc_obj(*csi2tx);
if (!csi2tx)
return -ENOMEM;
platform_set_drvdata(pdev, csi2tx);
diff --git a/drivers/media/platform/chips-media/coda/coda-bit.c b/drivers/media/platform/chips-media/coda/coda-bit.c
index aab26194ad1b..b0559303c40f 100644
--- a/drivers/media/platform/chips-media/coda/coda-bit.c
+++ b/drivers/media/platform/chips-media/coda/coda-bit.c
@@ -397,7 +397,7 @@ void coda_fill_bitstream(struct coda_ctx *ctx, struct list_head *buffer_list)
*/
src_buf = v4l2_m2m_src_buf_remove(ctx->fh.m2m_ctx);
- meta = kmalloc_obj(*meta, GFP_KERNEL);
+ meta = kmalloc_obj(*meta);
if (meta) {
meta->sequence = src_buf->sequence;
meta->timecode = src_buf->timecode;
diff --git a/drivers/media/platform/chips-media/coda/coda-common.c b/drivers/media/platform/chips-media/coda/coda-common.c
index fea7682b2217..be37ea568bfe 100644
--- a/drivers/media/platform/chips-media/coda/coda-common.c
+++ b/drivers/media/platform/chips-media/coda/coda-common.c
@@ -2606,7 +2606,7 @@ static int coda_open(struct file *file)
int ret;
int idx;
- ctx = kzalloc_obj(*ctx, GFP_KERNEL);
+ ctx = kzalloc_obj(*ctx);
if (!ctx)
return -ENOMEM;
diff --git a/drivers/media/platform/chips-media/coda/coda-jpeg.c b/drivers/media/platform/chips-media/coda/coda-jpeg.c
index 487d08491a42..835225383aa1 100644
--- a/drivers/media/platform/chips-media/coda/coda-jpeg.c
+++ b/drivers/media/platform/chips-media/coda/coda-jpeg.c
@@ -355,7 +355,7 @@ int coda_jpeg_decode_header(struct coda_ctx *ctx, struct vb2_buffer *vb)
}
huff_tab = ctx->params.jpeg_huff_tab;
if (!huff_tab) {
- huff_tab = kzalloc_obj(struct coda_huff_tab, GFP_KERNEL);
+ huff_tab = kzalloc_obj(struct coda_huff_tab);
if (!huff_tab)
return -ENOMEM;
ctx->params.jpeg_huff_tab = huff_tab;
@@ -593,7 +593,7 @@ static int coda9_jpeg_gen_enc_huff_tab(struct coda_ctx *ctx, int tab_num,
};
int ret = -EINVAL;
- huff = kzalloc_obj(*huff, GFP_KERNEL);
+ huff = kzalloc_obj(*huff);
if (!huff)
return -ENOMEM;
@@ -723,7 +723,7 @@ static int coda9_jpeg_load_huff_tab(struct coda_ctx *ctx)
int i, j;
int ret;
- huff = kzalloc_obj(*huff, GFP_KERNEL);
+ huff = kzalloc_obj(*huff);
if (!huff)
return -ENOMEM;
diff --git a/drivers/media/platform/chips-media/coda/imx-vdoa.c b/drivers/media/platform/chips-media/coda/imx-vdoa.c
index 2e85043a7f01..be874f18a365 100644
--- a/drivers/media/platform/chips-media/coda/imx-vdoa.c
+++ b/drivers/media/platform/chips-media/coda/imx-vdoa.c
@@ -201,7 +201,7 @@ struct vdoa_ctx *vdoa_context_create(struct vdoa_data *vdoa)
struct vdoa_ctx *ctx;
int err;
- ctx = kzalloc_obj(*ctx, GFP_KERNEL);
+ ctx = kzalloc_obj(*ctx);
if (!ctx)
return NULL;
diff --git a/drivers/media/platform/chips-media/wave5/wave5-vpu-dec.c b/drivers/media/platform/chips-media/wave5/wave5-vpu-dec.c
index 097ab7f595b0..80e1831a42e0 100644
--- a/drivers/media/platform/chips-media/wave5/wave5-vpu-dec.c
+++ b/drivers/media/platform/chips-media/wave5/wave5-vpu-dec.c
@@ -1822,7 +1822,7 @@ static int wave5_vpu_open_dec(struct file *filp)
struct v4l2_m2m_ctx *m2m_ctx;
int ret = 0;
- inst = kzalloc_obj(*inst, GFP_KERNEL);
+ inst = kzalloc_obj(*inst);
if (!inst)
return -ENOMEM;
@@ -1834,7 +1834,7 @@ static int wave5_vpu_open_dec(struct file *filp)
mutex_init(&inst->feed_lock);
INIT_LIST_HEAD(&inst->avail_src_bufs);
- inst->codec_info = kzalloc_obj(*inst->codec_info, GFP_KERNEL);
+ inst->codec_info = kzalloc_obj(*inst->codec_info);
if (!inst->codec_info) {
kfree(inst);
return -ENOMEM;
diff --git a/drivers/media/platform/chips-media/wave5/wave5-vpu-enc.c b/drivers/media/platform/chips-media/wave5/wave5-vpu-enc.c
index f9373ed9a97b..7613fcdbafed 100644
--- a/drivers/media/platform/chips-media/wave5/wave5-vpu-enc.c
+++ b/drivers/media/platform/chips-media/wave5/wave5-vpu-enc.c
@@ -1571,7 +1571,7 @@ static int wave5_vpu_open_enc(struct file *filp)
struct v4l2_ctrl_handler *v4l2_ctrl_hdl;
int ret = 0;
- inst = kzalloc_obj(*inst, GFP_KERNEL);
+ inst = kzalloc_obj(*inst);
if (!inst)
return -ENOMEM;
v4l2_ctrl_hdl = &inst->v4l2_ctrl_hdl;
@@ -1580,7 +1580,7 @@ static int wave5_vpu_open_enc(struct file *filp)
inst->type = VPU_INST_TYPE_ENC;
inst->ops = &wave5_vpu_enc_inst_ops;
- inst->codec_info = kzalloc_obj(*inst->codec_info, GFP_KERNEL);
+ inst->codec_info = kzalloc_obj(*inst->codec_info);
if (!inst->codec_info) {
kfree(inst);
return -ENOMEM;
diff --git a/drivers/media/platform/imagination/e5010-jpeg-enc.c b/drivers/media/platform/imagination/e5010-jpeg-enc.c
index 803470d12bdb..42ad9ee3993b 100644
--- a/drivers/media/platform/imagination/e5010-jpeg-enc.c
+++ b/drivers/media/platform/imagination/e5010-jpeg-enc.c
@@ -728,7 +728,7 @@ static int e5010_open(struct file *file)
struct e5010_context *ctx;
int ret = 0;
- ctx = kzalloc_obj(*ctx, GFP_KERNEL);
+ ctx = kzalloc_obj(*ctx);
if (!ctx)
return -ENOMEM;
diff --git a/drivers/media/platform/intel/pxa_camera.c b/drivers/media/platform/intel/pxa_camera.c
index dbd465708f6f..2269d852ab0e 100644
--- a/drivers/media/platform/intel/pxa_camera.c
+++ b/drivers/media/platform/intel/pxa_camera.c
@@ -741,7 +741,7 @@ static struct pxa_camera_format_xlate *pxa_mbus_build_fmts_xlate(
if (!fmts)
return ERR_PTR(-ENXIO);
- user_formats = kzalloc_objs(*user_formats, fmts + 1, GFP_KERNEL);
+ user_formats = kzalloc_objs(*user_formats, fmts + 1);
if (!user_formats)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/media/platform/m2m-deinterlace.c b/drivers/media/platform/m2m-deinterlace.c
index 568193243869..1d0e70eaea3d 100644
--- a/drivers/media/platform/m2m-deinterlace.c
+++ b/drivers/media/platform/m2m-deinterlace.c
@@ -835,7 +835,7 @@ static int deinterlace_open(struct file *file)
struct deinterlace_dev *pcdev = video_drvdata(file);
struct deinterlace_ctx *ctx = NULL;
- ctx = kzalloc_obj(*ctx, GFP_KERNEL);
+ ctx = kzalloc_obj(*ctx);
if (!ctx)
return -ENOMEM;
diff --git a/drivers/media/platform/marvell/cafe-driver.c b/drivers/media/platform/marvell/cafe-driver.c
index a447099b40cc..632c15572aa8 100644
--- a/drivers/media/platform/marvell/cafe-driver.c
+++ b/drivers/media/platform/marvell/cafe-driver.c
@@ -327,7 +327,7 @@ static int cafe_smbus_setup(struct cafe_camera *cam)
struct i2c_adapter *adap;
int ret;
- adap = kzalloc_obj(*adap, GFP_KERNEL);
+ adap = kzalloc_obj(*adap);
if (adap == NULL)
return -ENOMEM;
adap->owner = THIS_MODULE;
@@ -485,7 +485,7 @@ static int cafe_pci_probe(struct pci_dev *pdev,
* Start putting together one of our big camera structures.
*/
ret = -ENOMEM;
- cam = kzalloc_obj(struct cafe_camera, GFP_KERNEL);
+ cam = kzalloc_obj(struct cafe_camera);
if (cam == NULL)
goto out;
pci_set_drvdata(pdev, cam);
diff --git a/drivers/media/platform/mediatek/jpeg/mtk_jpeg_core.c b/drivers/media/platform/mediatek/jpeg/mtk_jpeg_core.c
index 7a506b1f03da..c01124a349f6 100644
--- a/drivers/media/platform/mediatek/jpeg/mtk_jpeg_core.c
+++ b/drivers/media/platform/mediatek/jpeg/mtk_jpeg_core.c
@@ -1151,7 +1151,7 @@ static int mtk_jpeg_open(struct file *file)
struct mtk_jpeg_ctx *ctx;
int ret = 0;
- ctx = kzalloc_obj(*ctx, GFP_KERNEL);
+ ctx = kzalloc_obj(*ctx);
if (!ctx)
return -ENOMEM;
diff --git a/drivers/media/platform/mediatek/mdp/mtk_mdp_m2m.c b/drivers/media/platform/mediatek/mdp/mtk_mdp_m2m.c
index e069e326d2bd..d2813890cceb 100644
--- a/drivers/media/platform/mediatek/mdp/mtk_mdp_m2m.c
+++ b/drivers/media/platform/mediatek/mdp/mtk_mdp_m2m.c
@@ -1053,7 +1053,7 @@ static int mtk_mdp_m2m_open(struct file *file)
int ret;
struct v4l2_format default_format;
- ctx = kzalloc_obj(*ctx, GFP_KERNEL);
+ ctx = kzalloc_obj(*ctx);
if (!ctx)
return -ENOMEM;
diff --git a/drivers/media/platform/mediatek/mdp3/mtk-mdp3-cmdq.c b/drivers/media/platform/mediatek/mdp3/mtk-mdp3-cmdq.c
index d4dd2cad0d7f..d30a05782ab9 100644
--- a/drivers/media/platform/mediatek/mdp3/mtk-mdp3-cmdq.c
+++ b/drivers/media/platform/mediatek/mdp3/mtk-mdp3-cmdq.c
@@ -564,7 +564,7 @@ static struct mdp_cmdq_cmd *mdp_cmdq_prepare(struct mdp_dev *mdp,
goto err_uninit;
}
- cmd = kzalloc_obj(*cmd, GFP_KERNEL);
+ cmd = kzalloc_obj(*cmd);
if (!cmd) {
ret = -ENOMEM;
goto err_uninit;
@@ -583,13 +583,13 @@ static struct mdp_cmdq_cmd *mdp_cmdq_prepare(struct mdp_dev *mdp,
goto err_destroy_pkt;
}
- comps = kzalloc_objs(*comps, num_comp, GFP_KERNEL);
+ comps = kzalloc_objs(*comps, num_comp);
if (!comps) {
ret = -ENOMEM;
goto err_destroy_pkt;
}
- path = kzalloc_obj(*path, GFP_KERNEL);
+ path = kzalloc_obj(*path);
if (!path) {
ret = -ENOMEM;
goto err_free_comps;
diff --git a/drivers/media/platform/mediatek/mdp3/mtk-mdp3-core.c b/drivers/media/platform/mediatek/mdp3/mtk-mdp3-core.c
index 978bf12cc1d0..8f4da4cf55d2 100644
--- a/drivers/media/platform/mediatek/mdp3/mtk-mdp3-core.c
+++ b/drivers/media/platform/mediatek/mdp3/mtk-mdp3-core.c
@@ -221,7 +221,7 @@ static int mdp_probe(struct platform_device *pdev)
struct resource *res;
int ret, i, mutex_id;
- mdp = kzalloc_obj(*mdp, GFP_KERNEL);
+ mdp = kzalloc_obj(*mdp);
if (!mdp) {
ret = -ENOMEM;
goto err_return;
diff --git a/drivers/media/platform/mediatek/mdp3/mtk-mdp3-m2m.c b/drivers/media/platform/mediatek/mdp3/mtk-mdp3-m2m.c
index bb8f70a42f32..ad3ae89c231c 100644
--- a/drivers/media/platform/mediatek/mdp3/mtk-mdp3-m2m.c
+++ b/drivers/media/platform/mediatek/mdp3/mtk-mdp3-m2m.c
@@ -568,7 +568,7 @@ static int mdp_m2m_open(struct file *file)
struct v4l2_format default_format = {};
const struct mdp_limit *limit = mdp->mdp_data->def_limit;
- ctx = kzalloc_obj(*ctx, GFP_KERNEL);
+ ctx = kzalloc_obj(*ctx);
if (!ctx)
return -ENOMEM;
diff --git a/drivers/media/platform/mediatek/vcodec/common/mtk_vcodec_dbgfs.c b/drivers/media/platform/mediatek/vcodec/common/mtk_vcodec_dbgfs.c
index c4566eb52db8..2da11521fc7b 100644
--- a/drivers/media/platform/mediatek/vcodec/common/mtk_vcodec_dbgfs.c
+++ b/drivers/media/platform/mediatek/vcodec/common/mtk_vcodec_dbgfs.c
@@ -149,7 +149,7 @@ void mtk_vcodec_dbgfs_create(struct mtk_vcodec_dec_ctx *ctx)
struct mtk_vcodec_dbgfs_inst *dbgfs_inst;
struct mtk_vcodec_dec_dev *vcodec_dev = ctx->dev;
- dbgfs_inst = kzalloc_obj(*dbgfs_inst, GFP_KERNEL);
+ dbgfs_inst = kzalloc_obj(*dbgfs_inst);
if (!dbgfs_inst)
return;
diff --git a/drivers/media/platform/mediatek/vcodec/decoder/mtk_vcodec_dec_drv.c b/drivers/media/platform/mediatek/vcodec/decoder/mtk_vcodec_dec_drv.c
index 066bb304a34c..e936ed8dffba 100644
--- a/drivers/media/platform/mediatek/vcodec/decoder/mtk_vcodec_dec_drv.c
+++ b/drivers/media/platform/mediatek/vcodec/decoder/mtk_vcodec_dec_drv.c
@@ -200,7 +200,7 @@ static int fops_vcodec_open(struct file *file)
struct vb2_queue *src_vq;
unsigned long flags;
- ctx = kzalloc_obj(*ctx, GFP_KERNEL);
+ ctx = kzalloc_obj(*ctx);
if (!ctx)
return -ENOMEM;
diff --git a/drivers/media/platform/mediatek/vcodec/decoder/mtk_vcodec_dec_stateless.c b/drivers/media/platform/mediatek/vcodec/decoder/mtk_vcodec_dec_stateless.c
index 85b88aa45f5b..ab1894fba0d9 100644
--- a/drivers/media/platform/mediatek/vcodec/decoder/mtk_vcodec_dec_stateless.c
+++ b/drivers/media/platform/mediatek/vcodec/decoder/mtk_vcodec_dec_stateless.c
@@ -735,7 +735,7 @@ static struct media_request *fops_media_request_alloc(struct media_device *mdev)
{
struct mtk_vcodec_dec_request *req;
- req = kzalloc_obj(*req, GFP_KERNEL);
+ req = kzalloc_obj(*req);
return &req->req;
}
diff --git a/drivers/media/platform/mediatek/vcodec/decoder/vdec/vdec_av1_req_lat_if.c b/drivers/media/platform/mediatek/vcodec/decoder/vdec/vdec_av1_req_lat_if.c
index a3ea4d2a9fb0..2d622e85f827 100644
--- a/drivers/media/platform/mediatek/vcodec/decoder/vdec/vdec_av1_req_lat_if.c
+++ b/drivers/media/platform/mediatek/vcodec/decoder/vdec/vdec_av1_req_lat_if.c
@@ -1879,7 +1879,7 @@ static int vdec_av1_slice_init(struct mtk_vcodec_dec_ctx *ctx)
struct vdec_av1_slice_init_vsi *vsi;
int ret;
- instance = kzalloc_obj(*instance, GFP_KERNEL);
+ instance = kzalloc_obj(*instance);
if (!instance)
return -ENOMEM;
diff --git a/drivers/media/platform/mediatek/vcodec/decoder/vdec/vdec_h264_if.c b/drivers/media/platform/mediatek/vcodec/decoder/vdec/vdec_h264_if.c
index a754b96ae84b..a95327388f57 100644
--- a/drivers/media/platform/mediatek/vcodec/decoder/vdec/vdec_h264_if.c
+++ b/drivers/media/platform/mediatek/vcodec/decoder/vdec/vdec_h264_if.c
@@ -270,7 +270,7 @@ static int vdec_h264_init(struct mtk_vcodec_dec_ctx *ctx)
struct vdec_h264_inst *inst = NULL;
int err;
- inst = kzalloc_obj(*inst, GFP_KERNEL);
+ inst = kzalloc_obj(*inst);
if (!inst)
return -ENOMEM;
diff --git a/drivers/media/platform/mediatek/vcodec/decoder/vdec/vdec_h264_req_if.c b/drivers/media/platform/mediatek/vcodec/decoder/vdec/vdec_h264_req_if.c
index 9cf7ff35731e..1f691cd2f4c3 100644
--- a/drivers/media/platform/mediatek/vcodec/decoder/vdec/vdec_h264_req_if.c
+++ b/drivers/media/platform/mediatek/vcodec/decoder/vdec/vdec_h264_req_if.c
@@ -273,7 +273,7 @@ static int vdec_h264_slice_init(struct mtk_vcodec_dec_ctx *ctx)
struct vdec_h264_slice_inst *inst;
int err;
- inst = kzalloc_obj(*inst, GFP_KERNEL);
+ inst = kzalloc_obj(*inst);
if (!inst)
return -ENOMEM;
diff --git a/drivers/media/platform/mediatek/vcodec/decoder/vdec/vdec_h264_req_multi_if.c b/drivers/media/platform/mediatek/vcodec/decoder/vdec/vdec_h264_req_multi_if.c
index d761e70f5933..10359ce9b934 100644
--- a/drivers/media/platform/mediatek/vcodec/decoder/vdec/vdec_h264_req_multi_if.c
+++ b/drivers/media/platform/mediatek/vcodec/decoder/vdec/vdec_h264_req_multi_if.c
@@ -1208,7 +1208,7 @@ static int vdec_h264_slice_init(struct mtk_vcodec_dec_ctx *ctx)
int err, vsi_size;
unsigned char *temp;
- inst = kzalloc_obj(*inst, GFP_KERNEL);
+ inst = kzalloc_obj(*inst);
if (!inst)
return -ENOMEM;
diff --git a/drivers/media/platform/mediatek/vcodec/decoder/vdec/vdec_hevc_req_multi_if.c b/drivers/media/platform/mediatek/vcodec/decoder/vdec/vdec_hevc_req_multi_if.c
index 1c925deaa721..02f39954a4c2 100644
--- a/drivers/media/platform/mediatek/vcodec/decoder/vdec/vdec_hevc_req_multi_if.c
+++ b/drivers/media/platform/mediatek/vcodec/decoder/vdec/vdec_hevc_req_multi_if.c
@@ -858,7 +858,7 @@ static int vdec_hevc_slice_init(struct mtk_vcodec_dec_ctx *ctx)
struct vdec_hevc_slice_inst *inst;
int err, vsi_size;
- inst = kzalloc_obj(*inst, GFP_KERNEL);
+ inst = kzalloc_obj(*inst);
if (!inst)
return -ENOMEM;
diff --git a/drivers/media/platform/mediatek/vcodec/decoder/vdec/vdec_vp8_if.c b/drivers/media/platform/mediatek/vcodec/decoder/vdec/vdec_vp8_if.c
index af5bd3c24729..fd15d462b168 100644
--- a/drivers/media/platform/mediatek/vcodec/decoder/vdec/vdec_vp8_if.c
+++ b/drivers/media/platform/mediatek/vcodec/decoder/vdec/vdec_vp8_if.c
@@ -390,7 +390,7 @@ static int vdec_vp8_init(struct mtk_vcodec_dec_ctx *ctx)
struct vdec_vp8_inst *inst;
int err;
- inst = kzalloc_obj(*inst, GFP_KERNEL);
+ inst = kzalloc_obj(*inst);
if (!inst)
return -ENOMEM;
diff --git a/drivers/media/platform/mediatek/vcodec/decoder/vdec/vdec_vp8_req_if.c b/drivers/media/platform/mediatek/vcodec/decoder/vdec/vdec_vp8_req_if.c
index 27d6af7836b9..391e789a5a13 100644
--- a/drivers/media/platform/mediatek/vcodec/decoder/vdec/vdec_vp8_req_if.c
+++ b/drivers/media/platform/mediatek/vcodec/decoder/vdec/vdec_vp8_req_if.c
@@ -275,7 +275,7 @@ static int vdec_vp8_slice_init(struct mtk_vcodec_dec_ctx *ctx)
struct vdec_vp8_slice_inst *inst;
int err;
- inst = kzalloc_obj(*inst, GFP_KERNEL);
+ inst = kzalloc_obj(*inst);
if (!inst)
return -ENOMEM;
diff --git a/drivers/media/platform/mediatek/vcodec/decoder/vdec/vdec_vp9_req_lat_if.c b/drivers/media/platform/mediatek/vcodec/decoder/vdec/vdec_vp9_req_lat_if.c
index 1b4bc0f60b8b..adbacabdbebc 100644
--- a/drivers/media/platform/mediatek/vcodec/decoder/vdec/vdec_vp9_req_lat_if.c
+++ b/drivers/media/platform/mediatek/vcodec/decoder/vdec/vdec_vp9_req_lat_if.c
@@ -1848,7 +1848,7 @@ static int vdec_vp9_slice_init(struct mtk_vcodec_dec_ctx *ctx)
struct vdec_vp9_slice_init_vsi *vsi;
int ret;
- instance = kzalloc_obj(*instance, GFP_KERNEL);
+ instance = kzalloc_obj(*instance);
if (!instance)
return -ENOMEM;
diff --git a/drivers/media/platform/mediatek/vcodec/encoder/mtk_vcodec_enc_drv.c b/drivers/media/platform/mediatek/vcodec/encoder/mtk_vcodec_enc_drv.c
index c02cdb7acd63..c977ed0c09b6 100644
--- a/drivers/media/platform/mediatek/vcodec/encoder/mtk_vcodec_enc_drv.c
+++ b/drivers/media/platform/mediatek/vcodec/encoder/mtk_vcodec_enc_drv.c
@@ -119,7 +119,7 @@ static int fops_vcodec_open(struct file *file)
struct vb2_queue *src_vq;
unsigned long flags;
- ctx = kzalloc_obj(*ctx, GFP_KERNEL);
+ ctx = kzalloc_obj(*ctx);
if (!ctx)
return -ENOMEM;
diff --git a/drivers/media/platform/mediatek/vcodec/encoder/venc/venc_h264_if.c b/drivers/media/platform/mediatek/vcodec/encoder/venc/venc_h264_if.c
index d7630d9ae305..d2f4d732d2f7 100644
--- a/drivers/media/platform/mediatek/vcodec/encoder/venc/venc_h264_if.c
+++ b/drivers/media/platform/mediatek/vcodec/encoder/venc/venc_h264_if.c
@@ -588,7 +588,7 @@ static int h264_enc_init(struct mtk_vcodec_enc_ctx *ctx)
int ret = 0;
struct venc_h264_inst *inst;
- inst = kzalloc_obj(*inst, GFP_KERNEL);
+ inst = kzalloc_obj(*inst);
if (!inst)
return -ENOMEM;
diff --git a/drivers/media/platform/mediatek/vcodec/encoder/venc/venc_vp8_if.c b/drivers/media/platform/mediatek/vcodec/encoder/venc/venc_vp8_if.c
index b85b177ebcce..f739fd5fafcc 100644
--- a/drivers/media/platform/mediatek/vcodec/encoder/venc/venc_vp8_if.c
+++ b/drivers/media/platform/mediatek/vcodec/encoder/venc/venc_vp8_if.c
@@ -316,7 +316,7 @@ static int vp8_enc_init(struct mtk_vcodec_enc_ctx *ctx)
int ret = 0;
struct venc_vp8_inst *inst;
- inst = kzalloc_obj(*inst, GFP_KERNEL);
+ inst = kzalloc_obj(*inst);
if (!inst)
return -ENOMEM;
diff --git a/drivers/media/platform/nuvoton/npcm-video.c b/drivers/media/platform/nuvoton/npcm-video.c
index eccd92774344..b2a562e1ee1c 100644
--- a/drivers/media/platform/nuvoton/npcm-video.c
+++ b/drivers/media/platform/nuvoton/npcm-video.c
@@ -411,7 +411,7 @@ static unsigned int npcm_video_add_rect(struct npcm_video *video,
struct rect_list *list = NULL;
struct v4l2_rect *r;
- list = kzalloc_obj(*list, GFP_KERNEL);
+ list = kzalloc_obj(*list);
if (!list)
return 0;
@@ -466,7 +466,7 @@ static struct rect_list *npcm_video_new_rect(struct npcm_video *video,
struct rect_list *list = NULL;
struct v4l2_rect *r;
- list = kzalloc_obj(*list, GFP_KERNEL);
+ list = kzalloc_obj(*list);
if (!list)
return NULL;
@@ -1733,7 +1733,7 @@ static int npcm_video_init(struct npcm_video *video)
static int npcm_video_probe(struct platform_device *pdev)
{
- struct npcm_video *video = kzalloc_obj(*video, GFP_KERNEL);
+ struct npcm_video *video = kzalloc_obj(*video);
int rc;
void __iomem *regs;
diff --git a/drivers/media/platform/nvidia/tegra-vde/dmabuf-cache.c b/drivers/media/platform/nvidia/tegra-vde/dmabuf-cache.c
index 4e4b8c09d5be..7752064be783 100644
--- a/drivers/media/platform/nvidia/tegra-vde/dmabuf-cache.c
+++ b/drivers/media/platform/nvidia/tegra-vde/dmabuf-cache.c
@@ -115,7 +115,7 @@ int tegra_vde_dmabuf_cache_map(struct tegra_vde *vde,
goto err_unmap;
}
- entry = kzalloc_obj(*entry, GFP_KERNEL);
+ entry = kzalloc_obj(*entry);
if (!entry) {
err = -ENOMEM;
goto err_unmap;
diff --git a/drivers/media/platform/nvidia/tegra-vde/vde.c b/drivers/media/platform/nvidia/tegra-vde/vde.c
index a1d4a1ab12f9..2b3898828304 100644
--- a/drivers/media/platform/nvidia/tegra-vde/vde.c
+++ b/drivers/media/platform/nvidia/tegra-vde/vde.c
@@ -61,7 +61,7 @@ int tegra_vde_alloc_bo(struct tegra_vde *vde,
struct tegra_vde_bo *bo;
int err;
- bo = kzalloc_obj(*bo, GFP_KERNEL);
+ bo = kzalloc_obj(*bo);
if (!bo)
return -ENOMEM;
diff --git a/drivers/media/platform/nxp/dw100/dw100.c b/drivers/media/platform/nxp/dw100/dw100.c
index cf20f1ffc1d1..bdebbe3f4198 100644
--- a/drivers/media/platform/nxp/dw100/dw100.c
+++ b/drivers/media/platform/nxp/dw100/dw100.c
@@ -601,7 +601,7 @@ static int dw100_open(struct file *file)
struct v4l2_pix_format_mplane *pix_fmt;
int ret, i;
- ctx = kzalloc_obj(*ctx, GFP_KERNEL);
+ ctx = kzalloc_obj(*ctx);
if (!ctx)
return -ENOMEM;
diff --git a/drivers/media/platform/nxp/imx-jpeg/mxc-jpeg.c b/drivers/media/platform/nxp/imx-jpeg/mxc-jpeg.c
index 100320ddf545..b442dcba02e7 100644
--- a/drivers/media/platform/nxp/imx-jpeg/mxc-jpeg.c
+++ b/drivers/media/platform/nxp/imx-jpeg/mxc-jpeg.c
@@ -2200,7 +2200,7 @@ static int mxc_jpeg_open(struct file *file)
struct mxc_jpeg_ctx *ctx;
int ret = 0;
- ctx = kzalloc_obj(*ctx, GFP_KERNEL);
+ ctx = kzalloc_obj(*ctx);
if (!ctx)
return -ENOMEM;
diff --git a/drivers/media/platform/nxp/imx-pxp.c b/drivers/media/platform/nxp/imx-pxp.c
index ad31a3459b94..740fcd8fb952 100644
--- a/drivers/media/platform/nxp/imx-pxp.c
+++ b/drivers/media/platform/nxp/imx-pxp.c
@@ -1646,7 +1646,7 @@ static int pxp_open(struct file *file)
if (mutex_lock_interruptible(&dev->dev_mutex))
return -ERESTARTSYS;
- ctx = kzalloc_obj(*ctx, GFP_KERNEL);
+ ctx = kzalloc_obj(*ctx);
if (!ctx) {
rc = -ENOMEM;
goto open_unlock;
diff --git a/drivers/media/platform/nxp/imx8-isi/imx8-isi-crossbar.c b/drivers/media/platform/nxp/imx8-isi/imx8-isi-crossbar.c
index 2cd014a79006..605a45124103 100644
--- a/drivers/media/platform/nxp/imx8-isi/imx8-isi-crossbar.c
+++ b/drivers/media/platform/nxp/imx8-isi/imx8-isi-crossbar.c
@@ -189,7 +189,7 @@ static int mxc_isi_crossbar_init_state(struct v4l2_subdev *sd,
* pipelines by default.
*/
routing.num_routes = min(xbar->num_sinks - 1, xbar->num_sources);
- routes = kzalloc_objs(*routes, routing.num_routes, GFP_KERNEL);
+ routes = kzalloc_objs(*routes, routing.num_routes);
if (!routes)
return -ENOMEM;
@@ -454,11 +454,11 @@ int mxc_isi_crossbar_init(struct mxc_isi_dev *isi)
xbar->num_sources = isi->pdata->num_channels;
num_pads = xbar->num_sinks + xbar->num_sources;
- xbar->pads = kzalloc_objs(*xbar->pads, num_pads, GFP_KERNEL);
+ xbar->pads = kzalloc_objs(*xbar->pads, num_pads);
if (!xbar->pads)
return -ENOMEM;
- xbar->inputs = kzalloc_objs(*xbar->inputs, xbar->num_sinks, GFP_KERNEL);
+ xbar->inputs = kzalloc_objs(*xbar->inputs, xbar->num_sinks);
if (!xbar->inputs) {
ret = -ENOMEM;
goto err_free;
diff --git a/drivers/media/platform/nxp/imx8-isi/imx8-isi-m2m.c b/drivers/media/platform/nxp/imx8-isi/imx8-isi-m2m.c
index e6ad1044b954..a39ad7a1ab18 100644
--- a/drivers/media/platform/nxp/imx8-isi/imx8-isi-m2m.c
+++ b/drivers/media/platform/nxp/imx8-isi/imx8-isi-m2m.c
@@ -624,7 +624,7 @@ static int mxc_isi_m2m_open(struct file *file)
struct mxc_isi_m2m_ctx *ctx;
int ret;
- ctx = kzalloc_obj(*ctx, GFP_KERNEL);
+ ctx = kzalloc_obj(*ctx);
if (!ctx)
return -ENOMEM;
diff --git a/drivers/media/platform/nxp/mx2_emmaprp.c b/drivers/media/platform/nxp/mx2_emmaprp.c
index 8f588688f049..d51a62100778 100644
--- a/drivers/media/platform/nxp/mx2_emmaprp.c
+++ b/drivers/media/platform/nxp/mx2_emmaprp.c
@@ -718,7 +718,7 @@ static int emmaprp_open(struct file *file)
struct emmaprp_dev *pcdev = video_drvdata(file);
struct emmaprp_ctx *ctx;
- ctx = kzalloc_obj(*ctx, GFP_KERNEL);
+ ctx = kzalloc_obj(*ctx);
if (!ctx)
return -ENOMEM;
diff --git a/drivers/media/platform/qcom/iris/iris_buffer.c b/drivers/media/platform/qcom/iris/iris_buffer.c
index f0fdba0ae987..9151f43bc6b9 100644
--- a/drivers/media/platform/qcom/iris/iris_buffer.c
+++ b/drivers/media/platform/qcom/iris/iris_buffer.c
@@ -342,7 +342,7 @@ static int iris_create_internal_buffer(struct iris_inst *inst,
if (!buffers->size)
return 0;
- buffer = kzalloc_obj(*buffer, GFP_KERNEL);
+ buffer = kzalloc_obj(*buffer);
if (!buffer)
return -ENOMEM;
diff --git a/drivers/media/platform/qcom/iris/iris_hfi_gen1_command.c b/drivers/media/platform/qcom/iris/iris_hfi_gen1_command.c
index abffd20cf25b..e42d17653c2c 100644
--- a/drivers/media/platform/qcom/iris/iris_hfi_gen1_command.c
+++ b/drivers/media/platform/qcom/iris/iris_hfi_gen1_command.c
@@ -1087,5 +1087,5 @@ void iris_hfi_gen1_command_ops_init(struct iris_core *core)
struct iris_inst *iris_hfi_gen1_get_instance(void)
{
- return kzalloc_obj(struct iris_inst, GFP_KERNEL);
+ return kzalloc_obj(struct iris_inst);
}
diff --git a/drivers/media/platform/qcom/iris/iris_hfi_gen2_command.c b/drivers/media/platform/qcom/iris/iris_hfi_gen2_command.c
index d45cecd5e544..30bfd90d423b 100644
--- a/drivers/media/platform/qcom/iris/iris_hfi_gen2_command.c
+++ b/drivers/media/platform/qcom/iris/iris_hfi_gen2_command.c
@@ -1329,7 +1329,7 @@ struct iris_inst *iris_hfi_gen2_get_instance(void)
struct iris_inst_hfi_gen2 *out;
/* The allocation is intentionally larger than struct iris_inst. */
- out = kzalloc_obj(*out, GFP_KERNEL);
+ out = kzalloc_obj(*out);
return &out->inst;
}
diff --git a/drivers/media/platform/qcom/iris/iris_vdec.c b/drivers/media/platform/qcom/iris/iris_vdec.c
index 3cfbdc04d3a9..719217399a30 100644
--- a/drivers/media/platform/qcom/iris/iris_vdec.c
+++ b/drivers/media/platform/qcom/iris/iris_vdec.c
@@ -21,8 +21,8 @@ int iris_vdec_inst_init(struct iris_inst *inst)
struct iris_core *core = inst->core;
struct v4l2_format *f;
- inst->fmt_src = kzalloc_obj(*inst->fmt_src, GFP_KERNEL);
- inst->fmt_dst = kzalloc_obj(*inst->fmt_dst, GFP_KERNEL);
+ inst->fmt_src = kzalloc_obj(*inst->fmt_src);
+ inst->fmt_dst = kzalloc_obj(*inst->fmt_dst);
inst->fw_min_count = MIN_BUFFERS;
diff --git a/drivers/media/platform/qcom/iris/iris_venc.c b/drivers/media/platform/qcom/iris/iris_venc.c
index d3531a3cc2a2..aa27b22704eb 100644
--- a/drivers/media/platform/qcom/iris/iris_venc.c
+++ b/drivers/media/platform/qcom/iris/iris_venc.c
@@ -19,8 +19,8 @@ int iris_venc_inst_init(struct iris_inst *inst)
struct iris_core *core = inst->core;
struct v4l2_format *f;
- inst->fmt_src = kzalloc_obj(*inst->fmt_src, GFP_KERNEL);
- inst->fmt_dst = kzalloc_obj(*inst->fmt_dst, GFP_KERNEL);
+ inst->fmt_src = kzalloc_obj(*inst->fmt_src);
+ inst->fmt_dst = kzalloc_obj(*inst->fmt_dst);
if (!inst->fmt_src || !inst->fmt_dst) {
kfree(inst->fmt_src);
kfree(inst->fmt_dst);
diff --git a/drivers/media/platform/qcom/venus/core.c b/drivers/media/platform/qcom/venus/core.c
index db3536956131..7e639760c41d 100644
--- a/drivers/media/platform/qcom/venus/core.c
+++ b/drivers/media/platform/qcom/venus/core.c
@@ -213,7 +213,7 @@ static int venus_enumerate_codecs(struct venus_core *core, u32 type)
if (core->res->hfi_version != HFI_VERSION_1XX)
return 0;
- inst = kzalloc_obj(*inst, GFP_KERNEL);
+ inst = kzalloc_obj(*inst);
if (!inst)
return -ENOMEM;
@@ -329,7 +329,7 @@ static int venus_add_dynamic_nodes(struct venus_core *core)
struct device *dev = core->dev;
int ret;
- core->ocs = kmalloc_obj(*core->ocs, GFP_KERNEL);
+ core->ocs = kmalloc_obj(*core->ocs);
if (!core->ocs)
return -ENOMEM;
diff --git a/drivers/media/platform/qcom/venus/helpers.c b/drivers/media/platform/qcom/venus/helpers.c
index f4223470f0dd..747c388fe25f 100644
--- a/drivers/media/platform/qcom/venus/helpers.c
+++ b/drivers/media/platform/qcom/venus/helpers.c
@@ -192,7 +192,7 @@ int venus_helper_alloc_dpb_bufs(struct venus_inst *inst)
count = hfi_bufreq_get_count_min(&bufreq, ver);
for (i = 0; i < count; i++) {
- buf = kzalloc_obj(*buf, GFP_KERNEL);
+ buf = kzalloc_obj(*buf);
if (!buf) {
ret = -ENOMEM;
goto fail;
@@ -248,7 +248,7 @@ static int intbufs_set_buffer(struct venus_inst *inst, u32 type)
return 0;
for (i = 0; i < bufreq.count_actual; i++) {
- buf = kzalloc_obj(*buf, GFP_KERNEL);
+ buf = kzalloc_obj(*buf);
if (!buf) {
ret = -ENOMEM;
goto fail;
diff --git a/drivers/media/platform/qcom/venus/hfi_venus.c b/drivers/media/platform/qcom/venus/hfi_venus.c
index a6cf17e379f7..bd82066bb6e7 100644
--- a/drivers/media/platform/qcom/venus/hfi_venus.c
+++ b/drivers/media/platform/qcom/venus/hfi_venus.c
@@ -1702,7 +1702,7 @@ int venus_hfi_create(struct venus_core *core)
struct venus_hfi_device *hdev;
int ret;
- hdev = kzalloc_obj(*hdev, GFP_KERNEL);
+ hdev = kzalloc_obj(*hdev);
if (!hdev)
return -ENOMEM;
diff --git a/drivers/media/platform/qcom/venus/vdec.c b/drivers/media/platform/qcom/venus/vdec.c
index 3f46e2d8ccce..daa8f56610c7 100644
--- a/drivers/media/platform/qcom/venus/vdec.c
+++ b/drivers/media/platform/qcom/venus/vdec.c
@@ -1684,7 +1684,7 @@ static int vdec_open(struct file *file)
struct venus_inst *inst;
int ret;
- inst = kzalloc_obj(*inst, GFP_KERNEL);
+ inst = kzalloc_obj(*inst);
if (!inst)
return -ENOMEM;
diff --git a/drivers/media/platform/qcom/venus/venc.c b/drivers/media/platform/qcom/venus/venc.c
index 32185f29eee5..bf53267cb68d 100644
--- a/drivers/media/platform/qcom/venus/venc.c
+++ b/drivers/media/platform/qcom/venus/venc.c
@@ -1466,7 +1466,7 @@ static int venc_open(struct file *file)
struct venus_inst *inst;
int ret;
- inst = kzalloc_obj(*inst, GFP_KERNEL);
+ inst = kzalloc_obj(*inst);
if (!inst)
return -ENOMEM;
diff --git a/drivers/media/platform/raspberrypi/rp1-cfe/cfe.c b/drivers/media/platform/raspberrypi/rp1-cfe/cfe.c
index a02a966d9c3b..8375ed3e97b9 100644
--- a/drivers/media/platform/raspberrypi/rp1-cfe/cfe.c
+++ b/drivers/media/platform/raspberrypi/rp1-cfe/cfe.c
@@ -2279,7 +2279,7 @@ static int cfe_probe(struct platform_device *pdev)
char debugfs_name[32];
int ret;
- cfe = kzalloc_obj(*cfe, GFP_KERNEL);
+ cfe = kzalloc_obj(*cfe);
if (!cfe)
return -ENOMEM;
diff --git a/drivers/media/platform/renesas/rcar-vin/rcar-core.c b/drivers/media/platform/renesas/rcar-vin/rcar-core.c
index 36421defa598..c8d564aa1eba 100644
--- a/drivers/media/platform/renesas/rcar-vin/rcar-core.c
+++ b/drivers/media/platform/renesas/rcar-vin/rcar-core.c
@@ -128,7 +128,7 @@ static int rvin_group_get(struct rvin_dev *vin,
group = rvin_group_data;
kref_get(&group->refcount);
} else {
- group = kzalloc_obj(*group, GFP_KERNEL);
+ group = kzalloc_obj(*group);
if (!group) {
ret = -ENOMEM;
goto err_group;
diff --git a/drivers/media/platform/renesas/rcar_fdp1.c b/drivers/media/platform/renesas/rcar_fdp1.c
index 791cff4a48ea..013e0666170a 100644
--- a/drivers/media/platform/renesas/rcar_fdp1.c
+++ b/drivers/media/platform/renesas/rcar_fdp1.c
@@ -2078,7 +2078,7 @@ static int fdp1_open(struct file *file)
if (mutex_lock_interruptible(&fdp1->dev_mutex))
return -ERESTARTSYS;
- ctx = kzalloc_obj(*ctx, GFP_KERNEL);
+ ctx = kzalloc_obj(*ctx);
if (!ctx) {
ret = -ENOMEM;
goto done;
diff --git a/drivers/media/platform/renesas/rcar_jpu.c b/drivers/media/platform/renesas/rcar_jpu.c
index 3a3aa6bba9d2..93d54325e420 100644
--- a/drivers/media/platform/renesas/rcar_jpu.c
+++ b/drivers/media/platform/renesas/rcar_jpu.c
@@ -1212,7 +1212,7 @@ static int jpu_open(struct file *file)
struct jpu_ctx *ctx;
int ret;
- ctx = kzalloc_obj(*ctx, GFP_KERNEL);
+ ctx = kzalloc_obj(*ctx);
if (!ctx)
return -ENOMEM;
diff --git a/drivers/media/platform/renesas/renesas-ceu.c b/drivers/media/platform/renesas/renesas-ceu.c
index a827a4cf6826..65f7659a9e02 100644
--- a/drivers/media/platform/renesas/renesas-ceu.c
+++ b/drivers/media/platform/renesas/renesas-ceu.c
@@ -1616,7 +1616,7 @@ static int ceu_probe(struct platform_device *pdev)
int num_subdevs;
int ret;
- ceudev = kzalloc_obj(*ceudev, GFP_KERNEL);
+ ceudev = kzalloc_obj(*ceudev);
if (!ceudev)
return -ENOMEM;
diff --git a/drivers/media/platform/renesas/vsp1/vsp1_dl.c b/drivers/media/platform/renesas/vsp1/vsp1_dl.c
index f6b5623bf7d5..6c5578d9d2de 100644
--- a/drivers/media/platform/renesas/vsp1/vsp1_dl.c
+++ b/drivers/media/platform/renesas/vsp1/vsp1_dl.c
@@ -259,7 +259,7 @@ vsp1_dl_body_pool_create(struct vsp1_device *vsp1, unsigned int num_bodies,
size_t dlb_size;
unsigned int i;
- pool = kzalloc_obj(*pool, GFP_KERNEL);
+ pool = kzalloc_obj(*pool);
if (!pool)
return NULL;
@@ -274,7 +274,7 @@ vsp1_dl_body_pool_create(struct vsp1_device *vsp1, unsigned int num_bodies,
dlb_size = num_entries * sizeof(struct vsp1_dl_entry) + extra_size;
pool->size = dlb_size * num_bodies;
- pool->bodies = kzalloc_objs(*pool->bodies, num_bodies, GFP_KERNEL);
+ pool->bodies = kzalloc_objs(*pool->bodies, num_bodies);
if (!pool->bodies) {
kfree(pool);
return NULL;
@@ -434,7 +434,7 @@ vsp1_dl_cmd_pool_create(struct vsp1_device *vsp1, enum vsp1_extcmd_type type,
unsigned int i;
size_t cmd_size;
- pool = kzalloc_obj(*pool, GFP_KERNEL);
+ pool = kzalloc_obj(*pool);
if (!pool)
return NULL;
@@ -443,7 +443,7 @@ vsp1_dl_cmd_pool_create(struct vsp1_device *vsp1, enum vsp1_extcmd_type type,
spin_lock_init(&pool->lock);
INIT_LIST_HEAD(&pool->free);
- pool->cmds = kzalloc_objs(*pool->cmds, num_cmds, GFP_KERNEL);
+ pool->cmds = kzalloc_objs(*pool->cmds, num_cmds);
if (!pool->cmds) {
kfree(pool);
return NULL;
@@ -557,7 +557,7 @@ static struct vsp1_dl_list *vsp1_dl_list_alloc(struct vsp1_dl_manager *dlm)
struct vsp1_dl_list *dl;
size_t header_offset;
- dl = kzalloc_obj(*dl, GFP_KERNEL);
+ dl = kzalloc_obj(*dl);
if (!dl)
return NULL;
diff --git a/drivers/media/platform/renesas/vsp1/vsp1_video.c b/drivers/media/platform/renesas/vsp1/vsp1_video.c
index e1f1c2a933ab..706684f9b86a 100644
--- a/drivers/media/platform/renesas/vsp1/vsp1_video.c
+++ b/drivers/media/platform/renesas/vsp1/vsp1_video.c
@@ -565,7 +565,7 @@ static struct vsp1_pipeline *vsp1_video_pipeline_get(struct vsp1_video *video)
* when the last reference is released.
*/
if (!video->rwpf->entity.pipe) {
- pipe = kzalloc_obj(*pipe, GFP_KERNEL);
+ pipe = kzalloc_obj(*pipe);
if (!pipe)
return ERR_PTR(-ENOMEM);
@@ -1074,7 +1074,7 @@ static int vsp1_video_open(struct file *file)
struct v4l2_fh *vfh;
int ret = 0;
- vfh = kzalloc_obj(*vfh, GFP_KERNEL);
+ vfh = kzalloc_obj(*vfh);
if (vfh == NULL)
return -ENOMEM;
diff --git a/drivers/media/platform/rockchip/rga/rga.c b/drivers/media/platform/rockchip/rga/rga.c
index 736072635ed5..fea63b94c5f3 100644
--- a/drivers/media/platform/rockchip/rga/rga.c
+++ b/drivers/media/platform/rockchip/rga/rga.c
@@ -370,7 +370,7 @@ static int rga_open(struct file *file)
struct rga_ctx *ctx = NULL;
int ret = 0;
- ctx = kzalloc_obj(*ctx, GFP_KERNEL);
+ ctx = kzalloc_obj(*ctx);
if (!ctx)
return -ENOMEM;
ctx->rga = rga;
diff --git a/drivers/media/platform/rockchip/rkvdec/rkvdec-h264.c b/drivers/media/platform/rockchip/rkvdec/rkvdec-h264.c
index 377607c94092..d3202cecb988 100644
--- a/drivers/media/platform/rockchip/rkvdec/rkvdec-h264.c
+++ b/drivers/media/platform/rockchip/rkvdec/rkvdec-h264.c
@@ -375,7 +375,7 @@ static int rkvdec_h264_start(struct rkvdec_ctx *ctx)
if (ret)
return ret;
- h264_ctx = kzalloc_obj(*h264_ctx, GFP_KERNEL);
+ h264_ctx = kzalloc_obj(*h264_ctx);
if (!h264_ctx)
return -ENOMEM;
diff --git a/drivers/media/platform/rockchip/rkvdec/rkvdec-hevc.c b/drivers/media/platform/rockchip/rkvdec/rkvdec-hevc.c
index abb695ebe258..ac8b825d080a 100644
--- a/drivers/media/platform/rockchip/rkvdec/rkvdec-hevc.c
+++ b/drivers/media/platform/rockchip/rkvdec/rkvdec-hevc.c
@@ -528,7 +528,7 @@ static int rkvdec_hevc_start(struct rkvdec_ctx *ctx)
struct rkvdec_hevc_priv_tbl *priv_tbl;
struct rkvdec_hevc_ctx *hevc_ctx;
- hevc_ctx = kzalloc_obj(*hevc_ctx, GFP_KERNEL);
+ hevc_ctx = kzalloc_obj(*hevc_ctx);
if (!hevc_ctx)
return -ENOMEM;
diff --git a/drivers/media/platform/rockchip/rkvdec/rkvdec-vdpu381-h264.c b/drivers/media/platform/rockchip/rkvdec/rkvdec-vdpu381-h264.c
index 218377f91a0b..b961fddc8583 100644
--- a/drivers/media/platform/rockchip/rkvdec/rkvdec-vdpu381-h264.c
+++ b/drivers/media/platform/rockchip/rkvdec/rkvdec-vdpu381-h264.c
@@ -383,7 +383,7 @@ static int rkvdec_h264_start(struct rkvdec_ctx *ctx)
if (ret)
return ret;
- h264_ctx = kzalloc_obj(*h264_ctx, GFP_KERNEL);
+ h264_ctx = kzalloc_obj(*h264_ctx);
if (!h264_ctx)
return -ENOMEM;
diff --git a/drivers/media/platform/rockchip/rkvdec/rkvdec-vdpu381-hevc.c b/drivers/media/platform/rockchip/rkvdec/rkvdec-vdpu381-hevc.c
index b5f20c8d4285..fe6414a17551 100644
--- a/drivers/media/platform/rockchip/rkvdec/rkvdec-vdpu381-hevc.c
+++ b/drivers/media/platform/rockchip/rkvdec/rkvdec-vdpu381-hevc.c
@@ -551,7 +551,7 @@ static int rkvdec_hevc_start(struct rkvdec_ctx *ctx)
if (ret)
return ret;
- hevc_ctx = kzalloc_obj(*hevc_ctx, GFP_KERNEL);
+ hevc_ctx = kzalloc_obj(*hevc_ctx);
if (!hevc_ctx)
return -ENOMEM;
diff --git a/drivers/media/platform/rockchip/rkvdec/rkvdec-vdpu383-h264.c b/drivers/media/platform/rockchip/rkvdec/rkvdec-vdpu383-h264.c
index bb53163efe41..97f1efde2e47 100644
--- a/drivers/media/platform/rockchip/rkvdec/rkvdec-vdpu383-h264.c
+++ b/drivers/media/platform/rockchip/rkvdec/rkvdec-vdpu383-h264.c
@@ -447,7 +447,7 @@ static int rkvdec_h264_start(struct rkvdec_ctx *ctx)
if (ret)
return ret;
- h264_ctx = kzalloc_obj(*h264_ctx, GFP_KERNEL);
+ h264_ctx = kzalloc_obj(*h264_ctx);
if (!h264_ctx)
return -ENOMEM;
diff --git a/drivers/media/platform/rockchip/rkvdec/rkvdec-vdpu383-hevc.c b/drivers/media/platform/rockchip/rkvdec/rkvdec-vdpu383-hevc.c
index 0e5a58e48608..96d938ee70b0 100644
--- a/drivers/media/platform/rockchip/rkvdec/rkvdec-vdpu383-hevc.c
+++ b/drivers/media/platform/rockchip/rkvdec/rkvdec-vdpu383-hevc.c
@@ -559,7 +559,7 @@ static int rkvdec_hevc_start(struct rkvdec_ctx *ctx)
if (ret)
return ret;
- hevc_ctx = kzalloc_obj(*hevc_ctx, GFP_KERNEL);
+ hevc_ctx = kzalloc_obj(*hevc_ctx);
if (!hevc_ctx)
return -ENOMEM;
diff --git a/drivers/media/platform/rockchip/rkvdec/rkvdec-vp9.c b/drivers/media/platform/rockchip/rkvdec/rkvdec-vp9.c
index 1e66333e4589..e4cdd2122873 100644
--- a/drivers/media/platform/rockchip/rkvdec/rkvdec-vp9.c
+++ b/drivers/media/platform/rockchip/rkvdec/rkvdec-vp9.c
@@ -971,7 +971,7 @@ static int rkvdec_vp9_start(struct rkvdec_ctx *ctx)
unsigned char *count_tbl;
int ret;
- vp9_ctx = kzalloc_obj(*vp9_ctx, GFP_KERNEL);
+ vp9_ctx = kzalloc_obj(*vp9_ctx);
if (!vp9_ctx)
return -ENOMEM;
diff --git a/drivers/media/platform/rockchip/rkvdec/rkvdec.c b/drivers/media/platform/rockchip/rkvdec/rkvdec.c
index 2d4493434077..1d1e9bfef8e9 100644
--- a/drivers/media/platform/rockchip/rkvdec/rkvdec.c
+++ b/drivers/media/platform/rockchip/rkvdec/rkvdec.c
@@ -1282,7 +1282,7 @@ static int rkvdec_open(struct file *filp)
struct rkvdec_ctx *ctx;
int ret;
- ctx = kzalloc_obj(*ctx, GFP_KERNEL);
+ ctx = kzalloc_obj(*ctx);
if (!ctx)
return -ENOMEM;
diff --git a/drivers/media/platform/samsung/exynos-gsc/gsc-m2m.c b/drivers/media/platform/samsung/exynos-gsc/gsc-m2m.c
index 9d15a2115c23..3c7cc00c9803 100644
--- a/drivers/media/platform/samsung/exynos-gsc/gsc-m2m.c
+++ b/drivers/media/platform/samsung/exynos-gsc/gsc-m2m.c
@@ -612,7 +612,7 @@ static int gsc_m2m_open(struct file *file)
if (mutex_lock_interruptible(&gsc->lock))
return -ERESTARTSYS;
- ctx = kzalloc_obj(*ctx, GFP_KERNEL);
+ ctx = kzalloc_obj(*ctx);
if (!ctx) {
ret = -ENOMEM;
goto unlock;
diff --git a/drivers/media/platform/samsung/exynos4-is/fimc-capture.c b/drivers/media/platform/samsung/exynos4-is/fimc-capture.c
index 0b8327e4a875..d85811f4b8c5 100644
--- a/drivers/media/platform/samsung/exynos4-is/fimc-capture.c
+++ b/drivers/media/platform/samsung/exynos4-is/fimc-capture.c
@@ -1718,7 +1718,7 @@ static int fimc_register_capture_device(struct fimc_dev *fimc,
struct fimc_ctx *ctx;
int ret = -ENOMEM;
- ctx = kzalloc_obj(*ctx, GFP_KERNEL);
+ ctx = kzalloc_obj(*ctx);
if (!ctx)
return -ENOMEM;
diff --git a/drivers/media/platform/samsung/exynos4-is/fimc-m2m.c b/drivers/media/platform/samsung/exynos4-is/fimc-m2m.c
index 2aa9c22df72b..81deafecf1d7 100644
--- a/drivers/media/platform/samsung/exynos4-is/fimc-m2m.c
+++ b/drivers/media/platform/samsung/exynos4-is/fimc-m2m.c
@@ -616,7 +616,7 @@ static int fimc_m2m_open(struct file *file)
if (test_bit(ST_CAPT_BUSY, &fimc->state))
goto unlock;
- ctx = kzalloc_obj(*ctx, GFP_KERNEL);
+ ctx = kzalloc_obj(*ctx);
if (!ctx) {
ret = -ENOMEM;
goto unlock;
diff --git a/drivers/media/platform/samsung/exynos4-is/media-dev.c b/drivers/media/platform/samsung/exynos4-is/media-dev.c
index 56d8b7cd3b5a..2e08c4435859 100644
--- a/drivers/media/platform/samsung/exynos4-is/media-dev.c
+++ b/drivers/media/platform/samsung/exynos4-is/media-dev.c
@@ -373,7 +373,7 @@ static struct exynos_media_pipeline *fimc_md_pipeline_create(
{
struct fimc_pipeline *p;
- p = kzalloc_obj(*p, GFP_KERNEL);
+ p = kzalloc_obj(*p);
if (!p)
return NULL;
diff --git a/drivers/media/platform/samsung/s5p-g2d/g2d.c b/drivers/media/platform/samsung/s5p-g2d/g2d.c
index a1d6315d8c4a..a18b13db19d5 100644
--- a/drivers/media/platform/samsung/s5p-g2d/g2d.c
+++ b/drivers/media/platform/samsung/s5p-g2d/g2d.c
@@ -237,7 +237,7 @@ static int g2d_open(struct file *file)
struct g2d_ctx *ctx = NULL;
int ret = 0;
- ctx = kzalloc_obj(*ctx, GFP_KERNEL);
+ ctx = kzalloc_obj(*ctx);
if (!ctx)
return -ENOMEM;
ctx->dev = dev;
diff --git a/drivers/media/platform/samsung/s5p-jpeg/jpeg-core.c b/drivers/media/platform/samsung/s5p-jpeg/jpeg-core.c
index 68250d7bb02d..fdc9d7e0be66 100644
--- a/drivers/media/platform/samsung/s5p-jpeg/jpeg-core.c
+++ b/drivers/media/platform/samsung/s5p-jpeg/jpeg-core.c
@@ -953,7 +953,7 @@ static int s5p_jpeg_open(struct file *file)
struct s5p_jpeg_fmt *out_fmt, *cap_fmt;
int ret = 0;
- ctx = kzalloc_obj(*ctx, GFP_KERNEL);
+ ctx = kzalloc_obj(*ctx);
if (!ctx)
return -ENOMEM;
diff --git a/drivers/media/platform/samsung/s5p-mfc/s5p_mfc.c b/drivers/media/platform/samsung/s5p-mfc/s5p_mfc.c
index e79441f01a51..32eb402d439c 100644
--- a/drivers/media/platform/samsung/s5p-mfc/s5p_mfc.c
+++ b/drivers/media/platform/samsung/s5p-mfc/s5p_mfc.c
@@ -794,7 +794,7 @@ static int s5p_mfc_open(struct file *file)
}
dev->num_inst++; /* It is guarded by mfc_mutex in vfd */
/* Allocate memory for context */
- ctx = kzalloc_obj(*ctx, GFP_KERNEL);
+ ctx = kzalloc_obj(*ctx);
if (!ctx) {
ret = -ENOMEM;
goto err_alloc;
diff --git a/drivers/media/platform/st/sti/bdisp/bdisp-v4l2.c b/drivers/media/platform/st/sti/bdisp/bdisp-v4l2.c
index 6f7b3f0db48e..ee6d686cba49 100644
--- a/drivers/media/platform/st/sti/bdisp/bdisp-v4l2.c
+++ b/drivers/media/platform/st/sti/bdisp/bdisp-v4l2.c
@@ -583,7 +583,7 @@ static int bdisp_open(struct file *file)
return -ERESTARTSYS;
/* Allocate memory for both context and node */
- ctx = kzalloc_obj(*ctx, GFP_KERNEL);
+ ctx = kzalloc_obj(*ctx);
if (!ctx) {
ret = -ENOMEM;
goto unlock;
diff --git a/drivers/media/platform/st/sti/delta/delta-mjpeg-dec.c b/drivers/media/platform/st/sti/delta/delta-mjpeg-dec.c
index ed05feac6944..58a529ed8d95 100644
--- a/drivers/media/platform/st/sti/delta/delta-mjpeg-dec.c
+++ b/drivers/media/platform/st/sti/delta/delta-mjpeg-dec.c
@@ -324,7 +324,7 @@ static int delta_mjpeg_open(struct delta_ctx *pctx)
{
struct delta_mjpeg_ctx *ctx;
- ctx = kzalloc_obj(*ctx, GFP_KERNEL);
+ ctx = kzalloc_obj(*ctx);
if (!ctx)
return -ENOMEM;
pctx->priv = ctx;
diff --git a/drivers/media/platform/st/sti/delta/delta-v4l2.c b/drivers/media/platform/st/sti/delta/delta-v4l2.c
index b3fb25bd0f60..7dd27de37b78 100644
--- a/drivers/media/platform/st/sti/delta/delta-v4l2.c
+++ b/drivers/media/platform/st/sti/delta/delta-v4l2.c
@@ -164,7 +164,7 @@ static void delta_push_dts(struct delta_ctx *ctx, u64 val)
{
struct delta_dts *dts;
- dts = kzalloc_obj(*dts, GFP_KERNEL);
+ dts = kzalloc_obj(*dts);
if (!dts)
return;
@@ -1629,7 +1629,7 @@ static int delta_open(struct file *file)
mutex_lock(&delta->lock);
- ctx = kzalloc_obj(*ctx, GFP_KERNEL);
+ ctx = kzalloc_obj(*ctx);
if (!ctx) {
ret = -ENOMEM;
goto err;
diff --git a/drivers/media/platform/st/sti/hva/hva-v4l2.c b/drivers/media/platform/st/sti/hva/hva-v4l2.c
index 4b2100b7242b..645e4f155dd0 100644
--- a/drivers/media/platform/st/sti/hva/hva-v4l2.c
+++ b/drivers/media/platform/st/sti/hva/hva-v4l2.c
@@ -1165,7 +1165,7 @@ static int hva_open(struct file *file)
struct hva_ctx *ctx;
int ret;
- ctx = kzalloc_obj(*ctx, GFP_KERNEL);
+ ctx = kzalloc_obj(*ctx);
if (!ctx) {
ret = -ENOMEM;
goto out;
diff --git a/drivers/media/platform/st/stm32/dma2d/dma2d.c b/drivers/media/platform/st/stm32/dma2d/dma2d.c
index fb11794c6b17..a3ad19256859 100644
--- a/drivers/media/platform/st/stm32/dma2d/dma2d.c
+++ b/drivers/media/platform/st/stm32/dma2d/dma2d.c
@@ -280,7 +280,7 @@ static int dma2d_open(struct file *file)
struct dma2d_ctx *ctx = NULL;
int ret = 0;
- ctx = kzalloc_obj(*ctx, GFP_KERNEL);
+ ctx = kzalloc_obj(*ctx);
if (!ctx)
return -ENOMEM;
ctx->dev = dev;
diff --git a/drivers/media/platform/st/stm32/stm32-dcmipp/dcmipp-bytecap.c b/drivers/media/platform/st/stm32/stm32-dcmipp/dcmipp-bytecap.c
index ccf3c19883c0..a42f43d19f9e 100644
--- a/drivers/media/platform/st/stm32/stm32-dcmipp/dcmipp-bytecap.c
+++ b/drivers/media/platform/st/stm32/stm32-dcmipp/dcmipp-bytecap.c
@@ -867,7 +867,7 @@ struct dcmipp_ent_device *dcmipp_bytecap_ent_init(struct device *dev,
int ret = 0;
/* Allocate the dcmipp_bytecap_device struct */
- vcap = kzalloc_obj(*vcap, GFP_KERNEL);
+ vcap = kzalloc_obj(*vcap);
if (!vcap)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/media/platform/st/stm32/stm32-dcmipp/dcmipp-byteproc.c b/drivers/media/platform/st/stm32/stm32-dcmipp/dcmipp-byteproc.c
index 4704cc4d6111..0c7aeb0888f6 100644
--- a/drivers/media/platform/st/stm32/stm32-dcmipp/dcmipp-byteproc.c
+++ b/drivers/media/platform/st/stm32/stm32-dcmipp/dcmipp-byteproc.c
@@ -581,7 +581,7 @@ dcmipp_byteproc_ent_init(struct device *dev, const char *entity_name,
int ret;
/* Allocate the byteproc struct */
- byteproc = kzalloc_obj(*byteproc, GFP_KERNEL);
+ byteproc = kzalloc_obj(*byteproc);
if (!byteproc)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/media/platform/st/stm32/stm32-dcmipp/dcmipp-common.c b/drivers/media/platform/st/stm32/stm32-dcmipp/dcmipp-common.c
index f6e83e72c940..99bcb2a71f77 100644
--- a/drivers/media/platform/st/stm32/stm32-dcmipp/dcmipp-common.c
+++ b/drivers/media/platform/st/stm32/stm32-dcmipp/dcmipp-common.c
@@ -20,7 +20,7 @@ struct media_pad *dcmipp_pads_init(u16 num_pads, const unsigned long *pads_flags
unsigned int i;
/* Allocate memory for the pads */
- pads = kzalloc_objs(*pads, num_pads, GFP_KERNEL);
+ pads = kzalloc_objs(*pads, num_pads);
if (!pads)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/media/platform/st/stm32/stm32-dcmipp/dcmipp-input.c b/drivers/media/platform/st/stm32/stm32-dcmipp/dcmipp-input.c
index ac19ed966521..7d3f5857cbfe 100644
--- a/drivers/media/platform/st/stm32/stm32-dcmipp/dcmipp-input.c
+++ b/drivers/media/platform/st/stm32/stm32-dcmipp/dcmipp-input.c
@@ -527,7 +527,7 @@ struct dcmipp_ent_device *dcmipp_inp_ent_init(struct device *dev,
int ret;
/* Allocate the inp struct */
- inp = kzalloc_obj(*inp, GFP_KERNEL);
+ inp = kzalloc_obj(*inp);
if (!inp)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/media/platform/sunxi/sun8i-di/sun8i-di.c b/drivers/media/platform/sunxi/sun8i-di/sun8i-di.c
index a2e4dae765ee..f4075576ef1d 100644
--- a/drivers/media/platform/sunxi/sun8i-di/sun8i-di.c
+++ b/drivers/media/platform/sunxi/sun8i-di/sun8i-di.c
@@ -709,7 +709,7 @@ static int deinterlace_open(struct file *file)
if (mutex_lock_interruptible(&dev->dev_mutex))
return -ERESTARTSYS;
- ctx = kzalloc_obj(*ctx, GFP_KERNEL);
+ ctx = kzalloc_obj(*ctx);
if (!ctx) {
mutex_unlock(&dev->dev_mutex);
return -ENOMEM;
diff --git a/drivers/media/platform/sunxi/sun8i-rotate/sun8i_rotate.c b/drivers/media/platform/sunxi/sun8i-rotate/sun8i_rotate.c
index 05b51e5fc01f..12e438c678f9 100644
--- a/drivers/media/platform/sunxi/sun8i-rotate/sun8i_rotate.c
+++ b/drivers/media/platform/sunxi/sun8i-rotate/sun8i_rotate.c
@@ -642,7 +642,7 @@ static int rotate_open(struct file *file)
if (mutex_lock_interruptible(&dev->dev_mutex))
return -ERESTARTSYS;
- ctx = kzalloc_obj(*ctx, GFP_KERNEL);
+ ctx = kzalloc_obj(*ctx);
if (!ctx) {
mutex_unlock(&dev->dev_mutex);
return -ENOMEM;
diff --git a/drivers/media/platform/ti/cal/cal.c b/drivers/media/platform/ti/cal/cal.c
index c0883b948cbc..b7e77b6b8950 100644
--- a/drivers/media/platform/ti/cal/cal.c
+++ b/drivers/media/platform/ti/cal/cal.c
@@ -1012,7 +1012,7 @@ static struct cal_ctx *cal_ctx_create(struct cal_dev *cal, int inst)
struct cal_ctx *ctx;
int ret;
- ctx = kzalloc_obj(*ctx, GFP_KERNEL);
+ ctx = kzalloc_obj(*ctx);
if (!ctx)
return NULL;
diff --git a/drivers/media/platform/ti/davinci/vpif.c b/drivers/media/platform/ti/davinci/vpif.c
index f0d724efb494..cc0b0b8cdb89 100644
--- a/drivers/media/platform/ti/davinci/vpif.c
+++ b/drivers/media/platform/ti/davinci/vpif.c
@@ -450,7 +450,7 @@ static int vpif_probe(struct platform_device *pdev)
if (IS_ERR(vpif_base))
return PTR_ERR(vpif_base);
- data = kzalloc_obj(*data, GFP_KERNEL);
+ data = kzalloc_obj(*data);
if (!data)
return -ENOMEM;
@@ -482,7 +482,7 @@ static int vpif_probe(struct platform_device *pdev)
res_irq = DEFINE_RES_IRQ_NAMED(irq, of_node_full_name(pdev->dev.of_node));
res_irq.flags |= irq_get_trigger_type(irq);
- pdev_capture = kzalloc_obj(*pdev_capture, GFP_KERNEL);
+ pdev_capture = kzalloc_obj(*pdev_capture);
if (!pdev_capture) {
ret = -ENOMEM;
goto err_put_rpm;
@@ -501,7 +501,7 @@ static int vpif_probe(struct platform_device *pdev)
if (ret)
goto err_put_pdev_capture;
- pdev_display = kzalloc_obj(*pdev_display, GFP_KERNEL);
+ pdev_display = kzalloc_obj(*pdev_display);
if (!pdev_display) {
ret = -ENOMEM;
goto err_del_pdev_capture;
diff --git a/drivers/media/platform/ti/davinci/vpif_capture.c b/drivers/media/platform/ti/davinci/vpif_capture.c
index 6b7d19a7529a..15df3ea2f77e 100644
--- a/drivers/media/platform/ti/davinci/vpif_capture.c
+++ b/drivers/media/platform/ti/davinci/vpif_capture.c
@@ -1335,7 +1335,7 @@ static int initialize_vpif(void)
/* Allocate memory for six channel objects */
for (i = 0; i < VPIF_CAPTURE_MAX_DEVICES; i++) {
- vpif_obj.dev[i] = kzalloc_obj(*vpif_obj.dev[i], GFP_KERNEL);
+ vpif_obj.dev[i] = kzalloc_obj(*vpif_obj.dev[i]);
/* If memory allocation fails, return error */
if (!vpif_obj.dev[i]) {
free_channel_objects_index = i;
@@ -1650,7 +1650,7 @@ static int vpif_probe(struct platform_device *pdev)
vpif_obj.config = pdev->dev.platform_data;
subdev_count = vpif_obj.config->subdev_count;
- vpif_obj.sd = kzalloc_objs(*vpif_obj.sd, subdev_count, GFP_KERNEL);
+ vpif_obj.sd = kzalloc_objs(*vpif_obj.sd, subdev_count);
if (!vpif_obj.sd) {
err = -ENOMEM;
goto probe_subdev_out;
diff --git a/drivers/media/platform/ti/davinci/vpif_display.c b/drivers/media/platform/ti/davinci/vpif_display.c
index b8349ebcde33..08877ae1513a 100644
--- a/drivers/media/platform/ti/davinci/vpif_display.c
+++ b/drivers/media/platform/ti/davinci/vpif_display.c
@@ -1089,7 +1089,7 @@ static int initialize_vpif(void)
/* Allocate memory for six channel objects */
for (i = 0; i < VPIF_DISPLAY_MAX_DEVICES; i++) {
vpif_obj.dev[i] =
- kzalloc_obj(struct channel_obj, GFP_KERNEL);
+ kzalloc_obj(struct channel_obj);
/* If memory allocation fails, return error */
if (!vpif_obj.dev[i]) {
free_channel_objects_index = i;
@@ -1264,7 +1264,7 @@ static int vpif_probe(struct platform_device *pdev)
vpif_obj.config = pdev->dev.platform_data;
subdev_count = vpif_obj.config->subdev_count;
subdevdata = vpif_obj.config->subdevinfo;
- vpif_obj.sd = kzalloc_objs(*vpif_obj.sd, subdev_count, GFP_KERNEL);
+ vpif_obj.sd = kzalloc_objs(*vpif_obj.sd, subdev_count);
if (!vpif_obj.sd) {
err = -ENOMEM;
goto vpif_unregister;
diff --git a/drivers/media/platform/ti/omap/omap_vout.c b/drivers/media/platform/ti/omap/omap_vout.c
index b88c78d724d6..8d0319a37ba8 100644
--- a/drivers/media/platform/ti/omap/omap_vout.c
+++ b/drivers/media/platform/ti/omap/omap_vout.c
@@ -1452,7 +1452,7 @@ static int __init omap_vout_create_video_devices(struct platform_device *pdev)
for (k = 0; k < pdev->num_resources; k++) {
- vout = kzalloc_obj(struct omap_vout_device, GFP_KERNEL);
+ vout = kzalloc_obj(struct omap_vout_device);
if (!vout) {
dev_err(&pdev->dev, ": could not allocate memory\n");
return -ENOMEM;
@@ -1611,7 +1611,7 @@ static int __init omap_vout_probe(struct platform_device *pdev)
goto err_dss_init;
}
- vid_dev = kzalloc_obj(struct omap2video_device, GFP_KERNEL);
+ vid_dev = kzalloc_obj(struct omap2video_device);
if (vid_dev == NULL) {
ret = -ENOMEM;
goto err_dss_init;
diff --git a/drivers/media/platform/ti/omap3isp/isp.c b/drivers/media/platform/ti/omap3isp/isp.c
index 23a433455459..8214f8ef2da8 100644
--- a/drivers/media/platform/ti/omap3isp/isp.c
+++ b/drivers/media/platform/ti/omap3isp/isp.c
@@ -2231,7 +2231,7 @@ static int isp_probe(struct platform_device *pdev)
int ret;
int i, m;
- isp = kzalloc_obj(*isp, GFP_KERNEL);
+ isp = kzalloc_obj(*isp);
if (!isp) {
dev_err(&pdev->dev, "could not allocate memory\n");
return -ENOMEM;
diff --git a/drivers/media/platform/ti/omap3isp/ispccdc.c b/drivers/media/platform/ti/omap3isp/ispccdc.c
index 2e2daadbd575..4708b6303493 100644
--- a/drivers/media/platform/ti/omap3isp/ispccdc.c
+++ b/drivers/media/platform/ti/omap3isp/ispccdc.c
@@ -419,7 +419,7 @@ static int ccdc_lsc_config(struct isp_ccdc_device *ccdc,
return -EINVAL;
}
- req = kzalloc_obj(*req, GFP_KERNEL);
+ req = kzalloc_obj(*req);
if (req == NULL)
return -ENOMEM;
diff --git a/drivers/media/platform/ti/omap3isp/isph3a_aewb.c b/drivers/media/platform/ti/omap3isp/isph3a_aewb.c
index 1da1b71773bb..6674718dffc8 100644
--- a/drivers/media/platform/ti/omap3isp/isph3a_aewb.c
+++ b/drivers/media/platform/ti/omap3isp/isph3a_aewb.c
@@ -291,7 +291,7 @@ int omap3isp_h3a_aewb_init(struct isp_device *isp)
struct omap3isp_h3a_aewb_config *aewb_recover_cfg = NULL;
int ret;
- aewb_cfg = kzalloc_obj(*aewb_cfg, GFP_KERNEL);
+ aewb_cfg = kzalloc_obj(*aewb_cfg);
if (!aewb_cfg)
return -ENOMEM;
@@ -301,7 +301,7 @@ int omap3isp_h3a_aewb_init(struct isp_device *isp)
aewb->isp = isp;
/* Set recover state configuration */
- aewb_recover_cfg = kzalloc_obj(*aewb_recover_cfg, GFP_KERNEL);
+ aewb_recover_cfg = kzalloc_obj(*aewb_recover_cfg);
if (!aewb_recover_cfg) {
dev_err(aewb->isp->dev,
"AEWB: cannot allocate memory for recover configuration.\n");
diff --git a/drivers/media/platform/ti/omap3isp/isph3a_af.c b/drivers/media/platform/ti/omap3isp/isph3a_af.c
index ff806d162529..52fb4122a3b4 100644
--- a/drivers/media/platform/ti/omap3isp/isph3a_af.c
+++ b/drivers/media/platform/ti/omap3isp/isph3a_af.c
@@ -354,7 +354,7 @@ int omap3isp_h3a_af_init(struct isp_device *isp)
struct omap3isp_h3a_af_config *af_recover_cfg = NULL;
int ret;
- af_cfg = kzalloc_obj(*af_cfg, GFP_KERNEL);
+ af_cfg = kzalloc_obj(*af_cfg);
if (af_cfg == NULL)
return -ENOMEM;
@@ -364,7 +364,7 @@ int omap3isp_h3a_af_init(struct isp_device *isp)
af->isp = isp;
/* Set recover state configuration */
- af_recover_cfg = kzalloc_obj(*af_recover_cfg, GFP_KERNEL);
+ af_recover_cfg = kzalloc_obj(*af_recover_cfg);
if (!af_recover_cfg) {
dev_err(af->isp->dev,
"AF: cannot allocate memory for recover configuration.\n");
diff --git a/drivers/media/platform/ti/omap3isp/isphist.c b/drivers/media/platform/ti/omap3isp/isphist.c
index 8459fd9d5fc4..fbfdcbfdb050 100644
--- a/drivers/media/platform/ti/omap3isp/isphist.c
+++ b/drivers/media/platform/ti/omap3isp/isphist.c
@@ -477,7 +477,7 @@ int omap3isp_hist_init(struct isp_device *isp)
struct omap3isp_hist_config *hist_cfg;
int ret;
- hist_cfg = kzalloc_obj(*hist_cfg, GFP_KERNEL);
+ hist_cfg = kzalloc_obj(*hist_cfg);
if (hist_cfg == NULL)
return -ENOMEM;
diff --git a/drivers/media/platform/ti/omap3isp/ispstat.c b/drivers/media/platform/ti/omap3isp/ispstat.c
index ad34cc2c6f05..63faa3d305dc 100644
--- a/drivers/media/platform/ti/omap3isp/ispstat.c
+++ b/drivers/media/platform/ti/omap3isp/ispstat.c
@@ -1047,7 +1047,7 @@ int omap3isp_stat_init(struct ispstat *stat, const char *name,
{
int ret;
- stat->buf = kzalloc_objs(*stat->buf, STAT_MAX_BUFS, GFP_KERNEL);
+ stat->buf = kzalloc_objs(*stat->buf, STAT_MAX_BUFS);
if (!stat->buf)
return -ENOMEM;
diff --git a/drivers/media/platform/ti/omap3isp/ispvideo.c b/drivers/media/platform/ti/omap3isp/ispvideo.c
index f2a48387d158..64e76e3576a8 100644
--- a/drivers/media/platform/ti/omap3isp/ispvideo.c
+++ b/drivers/media/platform/ti/omap3isp/ispvideo.c
@@ -1371,7 +1371,7 @@ static int isp_video_open(struct file *file)
struct vb2_queue *queue;
int ret = 0;
- handle = kzalloc_obj(*handle, GFP_KERNEL);
+ handle = kzalloc_obj(*handle);
if (handle == NULL)
return -ENOMEM;
diff --git a/drivers/media/platform/ti/vpe/vip.c b/drivers/media/platform/ti/vpe/vip.c
index 33805f3b0a81..a4b616a5ece7 100644
--- a/drivers/media/platform/ti/vpe/vip.c
+++ b/drivers/media/platform/ti/vpe/vip.c
@@ -3035,7 +3035,7 @@ static int alloc_stream(struct vip_port *port, int stream_id, int vfl_type)
struct list_head *pos, *tmp;
int ret, i;
- stream = kzalloc_obj(*stream, GFP_KERNEL);
+ stream = kzalloc_obj(*stream);
if (!stream)
return -ENOMEM;
diff --git a/drivers/media/platform/ti/vpe/vpe.c b/drivers/media/platform/ti/vpe/vpe.c
index 5effa0558f0f..a7e5a85e72a1 100644
--- a/drivers/media/platform/ti/vpe/vpe.c
+++ b/drivers/media/platform/ti/vpe/vpe.c
@@ -2272,7 +2272,7 @@ static int vpe_open(struct file *file)
vpe_dbg(dev, "vpe_open\n");
- ctx = kzalloc_obj(*ctx, GFP_KERNEL);
+ ctx = kzalloc_obj(*ctx);
if (!ctx)
return -ENOMEM;
diff --git a/drivers/media/platform/verisilicon/hantro_drv.c b/drivers/media/platform/verisilicon/hantro_drv.c
index 0a14970f0472..2e81877f640f 100644
--- a/drivers/media/platform/verisilicon/hantro_drv.c
+++ b/drivers/media/platform/verisilicon/hantro_drv.c
@@ -640,7 +640,7 @@ static int hantro_open(struct file *filp)
* helper functions used here.
*/
- ctx = kzalloc_obj(*ctx, GFP_KERNEL);
+ ctx = kzalloc_obj(*ctx);
if (!ctx)
return -ENOMEM;
diff --git a/drivers/media/platform/via/via-camera.c b/drivers/media/platform/via/via-camera.c
index fe8d94906e37..1b81acba7da0 100644
--- a/drivers/media/platform/via/via-camera.c
+++ b/drivers/media/platform/via/via-camera.c
@@ -1164,7 +1164,7 @@ static int viacam_probe(struct platform_device *pdev)
/*
* Basic structure initialization.
*/
- cam = kzalloc_obj(struct via_camera, GFP_KERNEL);
+ cam = kzalloc_obj(struct via_camera);
if (cam == NULL)
return -ENOMEM;
via_cam_info = cam;
diff --git a/drivers/media/radio/dsbr100.c b/drivers/media/radio/dsbr100.c
index dab1deea05ea..b8e0835a1998 100644
--- a/drivers/media/radio/dsbr100.c
+++ b/drivers/media/radio/dsbr100.c
@@ -338,7 +338,7 @@ static int usb_dsbr100_probe(struct usb_interface *intf,
struct v4l2_device *v4l2_dev;
int retval;
- radio = kzalloc_obj(struct dsbr100_device, GFP_KERNEL);
+ radio = kzalloc_obj(struct dsbr100_device);
if (!radio)
return -ENOMEM;
diff --git a/drivers/media/radio/radio-aimslab.c b/drivers/media/radio/radio-aimslab.c
index 5a477ac9487b..1395f76b01dd 100644
--- a/drivers/media/radio/radio-aimslab.c
+++ b/drivers/media/radio/radio-aimslab.c
@@ -67,7 +67,7 @@ struct rtrack {
static struct radio_isa_card *rtrack_alloc(void)
{
- struct rtrack *rt = kzalloc_obj(struct rtrack, GFP_KERNEL);
+ struct rtrack *rt = kzalloc_obj(struct rtrack);
if (rt)
rt->curvol = 0xff;
diff --git a/drivers/media/radio/radio-aztech.c b/drivers/media/radio/radio-aztech.c
index 4e4721ed61e7..175ef2b0c6f4 100644
--- a/drivers/media/radio/radio-aztech.c
+++ b/drivers/media/radio/radio-aztech.c
@@ -82,7 +82,7 @@ static void aztech_set_pins(void *handle, u8 pins)
static struct radio_isa_card *aztech_alloc(void)
{
- struct aztech *az = kzalloc_obj(*az, GFP_KERNEL);
+ struct aztech *az = kzalloc_obj(*az);
return az ? &az->isa : NULL;
}
diff --git a/drivers/media/radio/radio-gemtek.c b/drivers/media/radio/radio-gemtek.c
index 5f2637ffabae..3d1d0b46195b 100644
--- a/drivers/media/radio/radio-gemtek.c
+++ b/drivers/media/radio/radio-gemtek.c
@@ -179,7 +179,7 @@ static unsigned long gemtek_convfreq(unsigned long freq)
static struct radio_isa_card *gemtek_alloc(void)
{
- struct gemtek *gt = kzalloc_obj(*gt, GFP_KERNEL);
+ struct gemtek *gt = kzalloc_obj(*gt);
if (gt)
gt->muted = true;
diff --git a/drivers/media/radio/radio-keene.c b/drivers/media/radio/radio-keene.c
index a26da2e9fbab..8cfef3a778cf 100644
--- a/drivers/media/radio/radio-keene.c
+++ b/drivers/media/radio/radio-keene.c
@@ -311,7 +311,7 @@ static int usb_keene_probe(struct usb_interface *intf,
if (dev->product && strcmp(dev->product, "B-LINK USB Audio "))
return -ENODEV;
- radio = kzalloc_obj(struct keene_device, GFP_KERNEL);
+ radio = kzalloc_obj(struct keene_device);
if (radio)
radio->buffer = kmalloc(BUFFER_LENGTH, GFP_KERNEL);
diff --git a/drivers/media/radio/radio-ma901.c b/drivers/media/radio/radio-ma901.c
index e768c40ab73d..11c5d103c4c5 100644
--- a/drivers/media/radio/radio-ma901.c
+++ b/drivers/media/radio/radio-ma901.c
@@ -346,7 +346,7 @@ static int usb_ma901radio_probe(struct usb_interface *intf,
|| strncmp(dev->manufacturer, "www.masterkit.ru", 16) != 0))
return -ENODEV;
- radio = kzalloc_obj(struct ma901radio_device, GFP_KERNEL);
+ radio = kzalloc_obj(struct ma901radio_device);
if (!radio) {
dev_err(&intf->dev, "kzalloc for ma901radio_device failed\n");
retval = -ENOMEM;
diff --git a/drivers/media/radio/radio-maxiradio.c b/drivers/media/radio/radio-maxiradio.c
index cfa0568791fd..8ab1dacf89aa 100644
--- a/drivers/media/radio/radio-maxiradio.c
+++ b/drivers/media/radio/radio-maxiradio.c
@@ -122,7 +122,7 @@ static int maxiradio_probe(struct pci_dev *pdev,
struct v4l2_device *v4l2_dev;
int retval = -ENOMEM;
- dev = kzalloc_obj(*dev, GFP_KERNEL);
+ dev = kzalloc_obj(*dev);
if (dev == NULL) {
dev_err(&pdev->dev, "not enough memory\n");
return -ENOMEM;
diff --git a/drivers/media/radio/radio-mr800.c b/drivers/media/radio/radio-mr800.c
index 2e74f915c873..d5a6053e1d53 100644
--- a/drivers/media/radio/radio-mr800.c
+++ b/drivers/media/radio/radio-mr800.c
@@ -501,7 +501,7 @@ static int usb_amradio_probe(struct usb_interface *intf,
struct amradio_device *radio;
int retval;
- radio = kzalloc_obj(struct amradio_device, GFP_KERNEL);
+ radio = kzalloc_obj(struct amradio_device);
if (!radio) {
dev_err(&intf->dev, "kmalloc for amradio_device failed\n");
diff --git a/drivers/media/radio/radio-raremono.c b/drivers/media/radio/radio-raremono.c
index 45b491ad1601..6aa7c09780f4 100644
--- a/drivers/media/radio/radio-raremono.c
+++ b/drivers/media/radio/radio-raremono.c
@@ -301,7 +301,7 @@ static int usb_raremono_probe(struct usb_interface *intf,
struct raremono_device *radio;
int retval = 0;
- radio = kzalloc_obj(*radio, GFP_KERNEL);
+ radio = kzalloc_obj(*radio);
if (!radio)
return -ENOMEM;
radio->buffer = kmalloc(BUFFER_LENGTH, GFP_KERNEL);
diff --git a/drivers/media/radio/radio-rtrack2.c b/drivers/media/radio/radio-rtrack2.c
index 1e24e2d9cbbc..2891446901a0 100644
--- a/drivers/media/radio/radio-rtrack2.c
+++ b/drivers/media/radio/radio-rtrack2.c
@@ -47,7 +47,7 @@ MODULE_PARM_DESC(radio_nr, "Radio device numbers");
static struct radio_isa_card *rtrack2_alloc(void)
{
- return kzalloc_obj(struct radio_isa_card, GFP_KERNEL);
+ return kzalloc_obj(struct radio_isa_card);
}
static void zero(struct radio_isa_card *isa)
diff --git a/drivers/media/radio/radio-sf16fmr2.c b/drivers/media/radio/radio-sf16fmr2.c
index cdd489ca2d9a..2cc91e576fcd 100644
--- a/drivers/media/radio/radio-sf16fmr2.c
+++ b/drivers/media/radio/radio-sf16fmr2.c
@@ -252,7 +252,7 @@ static int fmr2_probe(struct fmr2 *fmr2, struct device *pdev, int io)
static int fmr2_isa_match(struct device *pdev, unsigned int ndev)
{
- struct fmr2 *fmr2 = kzalloc_obj(*fmr2, GFP_KERNEL);
+ struct fmr2 *fmr2 = kzalloc_obj(*fmr2);
if (!fmr2)
return 0;
@@ -269,7 +269,7 @@ static int fmr2_isa_match(struct device *pdev, unsigned int ndev)
static int fmr2_pnp_probe(struct pnp_dev *pdev, const struct pnp_device_id *id)
{
int ret;
- struct fmr2 *fmr2 = kzalloc_obj(*fmr2, GFP_KERNEL);
+ struct fmr2 *fmr2 = kzalloc_obj(*fmr2);
if (!fmr2)
return -ENOMEM;
diff --git a/drivers/media/radio/radio-shark.c b/drivers/media/radio/radio-shark.c
index 381196d6c675..c1f356c5f41e 100644
--- a/drivers/media/radio/radio-shark.c
+++ b/drivers/media/radio/radio-shark.c
@@ -327,7 +327,7 @@ static int usb_shark_probe(struct usb_interface *intf,
return -EINVAL;
}
- shark = kzalloc_obj(struct shark_device, GFP_KERNEL);
+ shark = kzalloc_obj(struct shark_device);
if (!shark)
return retval;
diff --git a/drivers/media/radio/radio-shark2.c b/drivers/media/radio/radio-shark2.c
index 9e1d00d6bac1..7cc173e21074 100644
--- a/drivers/media/radio/radio-shark2.c
+++ b/drivers/media/radio/radio-shark2.c
@@ -293,7 +293,7 @@ static int usb_shark_probe(struct usb_interface *intf,
return -EINVAL;
}
- shark = kzalloc_obj(struct shark_device, GFP_KERNEL);
+ shark = kzalloc_obj(struct shark_device);
if (!shark)
return retval;
diff --git a/drivers/media/radio/radio-tea5764.c b/drivers/media/radio/radio-tea5764.c
index ec953b8cb7ab..156cca2866aa 100644
--- a/drivers/media/radio/radio-tea5764.c
+++ b/drivers/media/radio/radio-tea5764.c
@@ -420,7 +420,7 @@ static int tea5764_i2c_probe(struct i2c_client *client)
int ret;
PDEBUG("probe");
- radio = kzalloc_obj(struct tea5764_device, GFP_KERNEL);
+ radio = kzalloc_obj(struct tea5764_device);
if (!radio)
return -ENOMEM;
diff --git a/drivers/media/radio/radio-terratec.c b/drivers/media/radio/radio-terratec.c
index a160bcc2643f..9231a19d5544 100644
--- a/drivers/media/radio/radio-terratec.c
+++ b/drivers/media/radio/radio-terratec.c
@@ -56,7 +56,7 @@ MODULE_PARM_DESC(radio_nr, "Radio device number");
static struct radio_isa_card *terratec_alloc(void)
{
- return kzalloc_obj(struct radio_isa_card, GFP_KERNEL);
+ return kzalloc_obj(struct radio_isa_card);
}
static int terratec_s_mute_volume(struct radio_isa_card *isa, bool mute, int vol)
diff --git a/drivers/media/radio/radio-trust.c b/drivers/media/radio/radio-trust.c
index 31d5e5efafaa..c7b30d430a70 100644
--- a/drivers/media/radio/radio-trust.c
+++ b/drivers/media/radio/radio-trust.c
@@ -55,7 +55,7 @@ struct trust {
static struct radio_isa_card *trust_alloc(void)
{
- struct trust *tr = kzalloc_obj(*tr, GFP_KERNEL);
+ struct trust *tr = kzalloc_obj(*tr);
return tr ? &tr->isa : NULL;
}
diff --git a/drivers/media/radio/radio-typhoon.c b/drivers/media/radio/radio-typhoon.c
index 4c49d9103135..3454c9a6fda3 100644
--- a/drivers/media/radio/radio-typhoon.c
+++ b/drivers/media/radio/radio-typhoon.c
@@ -75,7 +75,7 @@ struct typhoon {
static struct radio_isa_card *typhoon_alloc(void)
{
- struct typhoon *ty = kzalloc_obj(*ty, GFP_KERNEL);
+ struct typhoon *ty = kzalloc_obj(*ty);
return ty ? &ty->isa : NULL;
}
diff --git a/drivers/media/radio/radio-zoltrix.c b/drivers/media/radio/radio-zoltrix.c
index cf1a823e0aa9..b92b249737a4 100644
--- a/drivers/media/radio/radio-zoltrix.c
+++ b/drivers/media/radio/radio-zoltrix.c
@@ -79,7 +79,7 @@ struct zoltrix {
static struct radio_isa_card *zoltrix_alloc(void)
{
- struct zoltrix *zol = kzalloc_obj(*zol, GFP_KERNEL);
+ struct zoltrix *zol = kzalloc_obj(*zol);
return zol ? &zol->isa : NULL;
}
diff --git a/drivers/media/radio/saa7706h.c b/drivers/media/radio/saa7706h.c
index 71850c3b02a4..9572a866defb 100644
--- a/drivers/media/radio/saa7706h.c
+++ b/drivers/media/radio/saa7706h.c
@@ -344,7 +344,7 @@ static int saa7706h_probe(struct i2c_client *client)
v4l_info(client, "chip found @ 0x%02x (%s)\n",
client->addr << 1, client->adapter->name);
- state = kzalloc_obj(struct saa7706h_state, GFP_KERNEL);
+ state = kzalloc_obj(struct saa7706h_state);
if (state == NULL)
return -ENOMEM;
sd = &state->sd;
diff --git a/drivers/media/radio/si470x/radio-si470x-usb.c b/drivers/media/radio/si470x/radio-si470x-usb.c
index 79208c0b5c4a..318b5f6d4202 100644
--- a/drivers/media/radio/si470x/radio-si470x-usb.c
+++ b/drivers/media/radio/si470x/radio-si470x-usb.c
@@ -570,7 +570,7 @@ static int si470x_usb_driver_probe(struct usb_interface *intf,
unsigned char version_warning = 0;
/* private data allocation and initialization */
- radio = kzalloc_obj(struct si470x_device, GFP_KERNEL);
+ radio = kzalloc_obj(struct si470x_device);
if (!radio) {
retval = -ENOMEM;
goto err_initial;
diff --git a/drivers/media/radio/si4713/radio-usb-si4713.c b/drivers/media/radio/si4713/radio-usb-si4713.c
index a4bfda695413..6e6764143e21 100644
--- a/drivers/media/radio/si4713/radio-usb-si4713.c
+++ b/drivers/media/radio/si4713/radio-usb-si4713.c
@@ -420,7 +420,7 @@ static int usb_si4713_probe(struct usb_interface *intf,
id->idVendor, id->idProduct);
/* Initialize local device structure */
- radio = kzalloc_obj(struct si4713_usb_device, GFP_KERNEL);
+ radio = kzalloc_obj(struct si4713_usb_device);
if (radio)
radio->buffer = kmalloc(BUFFER_LENGTH, GFP_KERNEL);
diff --git a/drivers/media/radio/tef6862.c b/drivers/media/radio/tef6862.c
index 7f95498a5551..3a6d7926e856 100644
--- a/drivers/media/radio/tef6862.c
+++ b/drivers/media/radio/tef6862.c
@@ -153,7 +153,7 @@ static int tef6862_probe(struct i2c_client *client)
v4l_info(client, "chip found @ 0x%02x (%s)\n",
client->addr << 1, client->adapter->name);
- state = kzalloc_obj(struct tef6862_state, GFP_KERNEL);
+ state = kzalloc_obj(struct tef6862_state);
if (state == NULL)
return -ENOMEM;
state->freq = TEF6862_LO_FREQ;
diff --git a/drivers/media/rc/ati_remote.c b/drivers/media/rc/ati_remote.c
index 6bde5c913e99..78abe810a88e 100644
--- a/drivers/media/rc/ati_remote.c
+++ b/drivers/media/rc/ati_remote.c
@@ -839,7 +839,7 @@ static int ati_remote_probe(struct usb_interface *interface,
return -ENODEV;
}
- ati_remote = kzalloc_obj(struct ati_remote, GFP_KERNEL);
+ ati_remote = kzalloc_obj(struct ati_remote);
rc_dev = rc_allocate_device(RC_DRIVER_SCANCODE);
if (!ati_remote || !rc_dev)
goto exit_free_dev_rdev;
diff --git a/drivers/media/rc/ene_ir.c b/drivers/media/rc/ene_ir.c
index 6e61173ba233..f8120605501a 100644
--- a/drivers/media/rc/ene_ir.c
+++ b/drivers/media/rc/ene_ir.c
@@ -993,7 +993,7 @@ static int ene_probe(struct pnp_dev *pnp_dev, const struct pnp_device_id *id)
struct ene_device *dev;
/* allocate memory */
- dev = kzalloc_obj(struct ene_device, GFP_KERNEL);
+ dev = kzalloc_obj(struct ene_device);
rdev = rc_allocate_device(RC_DRIVER_IR_RAW);
if (!dev || !rdev)
goto exit_free_dev_rdev;
diff --git a/drivers/media/rc/fintek-cir.c b/drivers/media/rc/fintek-cir.c
index 92a38d04d979..f7cfa8a073eb 100644
--- a/drivers/media/rc/fintek-cir.c
+++ b/drivers/media/rc/fintek-cir.c
@@ -465,7 +465,7 @@ static int fintek_probe(struct pnp_dev *pdev, const struct pnp_device_id *dev_id
struct rc_dev *rdev;
int ret = -ENOMEM;
- fintek = kzalloc_obj(struct fintek_dev, GFP_KERNEL);
+ fintek = kzalloc_obj(struct fintek_dev);
if (!fintek)
return ret;
diff --git a/drivers/media/rc/iguanair.c b/drivers/media/rc/iguanair.c
index bb5bd62c8645..c508f2536243 100644
--- a/drivers/media/rc/iguanair.c
+++ b/drivers/media/rc/iguanair.c
@@ -392,7 +392,7 @@ static int iguanair_probe(struct usb_interface *intf,
if (idesc->desc.bNumEndpoints < 2)
return -ENODEV;
- ir = kzalloc_obj(*ir, GFP_KERNEL);
+ ir = kzalloc_obj(*ir);
rc = rc_allocate_device(RC_DRIVER_IR_RAW);
if (!ir || !rc) {
ret = -ENOMEM;
diff --git a/drivers/media/rc/imon.c b/drivers/media/rc/imon.c
index 0cb2ad180728..7e92161105d5 100644
--- a/drivers/media/rc/imon.c
+++ b/drivers/media/rc/imon.c
@@ -614,7 +614,7 @@ static int send_packet(struct imon_context *ictx)
ictx->tx_urb->actual_length = 0;
} else {
/* fill request into kmalloc'ed space: */
- control_req = kmalloc_obj(*control_req, GFP_KERNEL);
+ control_req = kmalloc_obj(*control_req);
if (control_req == NULL)
return -ENOMEM;
@@ -2233,7 +2233,7 @@ static struct imon_context *imon_init_intf0(struct usb_interface *intf,
struct usb_host_interface *iface_desc;
int ret = -ENOMEM;
- ictx = kzalloc_obj(*ictx, GFP_KERNEL);
+ ictx = kzalloc_obj(*ictx);
if (!ictx)
goto exit;
diff --git a/drivers/media/rc/ir_toy.c b/drivers/media/rc/ir_toy.c
index cf3b27817131..d6472de5da87 100644
--- a/drivers/media/rc/ir_toy.c
+++ b/drivers/media/rc/ir_toy.c
@@ -418,7 +418,7 @@ static int irtoy_probe(struct usb_interface *intf,
return -ENODEV;
}
- irtoy = kzalloc_obj(*irtoy, GFP_KERNEL);
+ irtoy = kzalloc_obj(*irtoy);
if (!irtoy)
return -ENOMEM;
diff --git a/drivers/media/rc/ite-cir.c b/drivers/media/rc/ite-cir.c
index 448f5c5db616..bf544517c67a 100644
--- a/drivers/media/rc/ite-cir.c
+++ b/drivers/media/rc/ite-cir.c
@@ -1304,7 +1304,7 @@ static int ite_probe(struct pnp_dev *pdev, const struct pnp_device_id
int model_no;
int io_rsrc_no;
- itdev = kzalloc_obj(struct ite_dev, GFP_KERNEL);
+ itdev = kzalloc_obj(struct ite_dev);
if (!itdev)
return ret;
diff --git a/drivers/media/rc/lirc_dev.c b/drivers/media/rc/lirc_dev.c
index 735b0630b172..183f1939b941 100644
--- a/drivers/media/rc/lirc_dev.c
+++ b/drivers/media/rc/lirc_dev.c
@@ -128,7 +128,7 @@ static int lirc_open(struct inode *inode, struct file *file)
{
struct rc_dev *dev = container_of(inode->i_cdev, struct rc_dev,
lirc_cdev);
- struct lirc_fh *fh = kzalloc_obj(*fh, GFP_KERNEL);
+ struct lirc_fh *fh = kzalloc_obj(*fh);
unsigned long flags;
int retval;
@@ -267,7 +267,7 @@ static ssize_t lirc_transmit(struct file *file, const char __user *buf,
goto out_unlock;
}
- raw = kmalloc_objs(*raw, LIRCBUF_SIZE, GFP_KERNEL);
+ raw = kmalloc_objs(*raw, LIRCBUF_SIZE);
if (!raw) {
ret = -ENOMEM;
goto out_unlock;
diff --git a/drivers/media/rc/mceusb.c b/drivers/media/rc/mceusb.c
index d35fff006ac9..ed55e9ec3c57 100644
--- a/drivers/media/rc/mceusb.c
+++ b/drivers/media/rc/mceusb.c
@@ -1715,7 +1715,7 @@ static int mceusb_dev_probe(struct usb_interface *intf,
pipe = usb_rcvbulkpipe(dev, ep_in->bEndpointAddress);
maxp = usb_maxpacket(dev, pipe);
- ir = kzalloc_obj(struct mceusb_dev, GFP_KERNEL);
+ ir = kzalloc_obj(struct mceusb_dev);
if (!ir)
goto mem_alloc_fail;
diff --git a/drivers/media/rc/nuvoton-cir.c b/drivers/media/rc/nuvoton-cir.c
index 4cf74ac2d76c..4e5a0c8dc9a0 100644
--- a/drivers/media/rc/nuvoton-cir.c
+++ b/drivers/media/rc/nuvoton-cir.c
@@ -639,7 +639,7 @@ static int nvt_ir_raw_set_wakeup_filter(struct rc_dev *dev,
if (!sc_filter->mask)
return 0;
- raw = kmalloc_objs(*raw, WAKEUP_MAX_SIZE, GFP_KERNEL);
+ raw = kmalloc_objs(*raw, WAKEUP_MAX_SIZE);
if (!raw)
return -ENOMEM;
diff --git a/drivers/media/rc/rc-ir-raw.c b/drivers/media/rc/rc-ir-raw.c
index d1f8bb6af874..2e269ef5e26b 100644
--- a/drivers/media/rc/rc-ir-raw.c
+++ b/drivers/media/rc/rc-ir-raw.c
@@ -615,7 +615,7 @@ int ir_raw_event_prepare(struct rc_dev *dev)
if (!dev)
return -EINVAL;
- dev->raw = kzalloc_obj(*dev->raw, GFP_KERNEL);
+ dev->raw = kzalloc_obj(*dev->raw);
if (!dev->raw)
return -ENOMEM;
diff --git a/drivers/media/rc/rc-loopback.c b/drivers/media/rc/rc-loopback.c
index 959a1167d376..78ac09b3cbd3 100644
--- a/drivers/media/rc/rc-loopback.c
+++ b/drivers/media/rc/rc-loopback.c
@@ -185,7 +185,7 @@ static int loop_set_wakeup_filter(struct rc_dev *dev,
return 0;
/* encode the specified filter and loop it back */
- raw = kmalloc_objs(*raw, max, GFP_KERNEL);
+ raw = kmalloc_objs(*raw, max);
if (!raw)
return -ENOMEM;
diff --git a/drivers/media/rc/rc-main.c b/drivers/media/rc/rc-main.c
index b67af602fbe6..821607504008 100644
--- a/drivers/media/rc/rc-main.c
+++ b/drivers/media/rc/rc-main.c
@@ -1701,7 +1701,7 @@ struct rc_dev *rc_allocate_device(enum rc_driver_type type)
{
struct rc_dev *dev;
- dev = kzalloc_obj(*dev, GFP_KERNEL);
+ dev = kzalloc_obj(*dev);
if (!dev)
return NULL;
diff --git a/drivers/media/rc/redrat3.c b/drivers/media/rc/redrat3.c
index 2471bb4d66b8..3b917a2a8918 100644
--- a/drivers/media/rc/redrat3.c
+++ b/drivers/media/rc/redrat3.c
@@ -502,7 +502,7 @@ static int redrat3_set_timeout(struct rc_dev *rc_dev, unsigned int timeoutus)
__be32 *timeout;
int ret;
- timeout = kmalloc_obj(*timeout, GFP_KERNEL);
+ timeout = kmalloc_obj(*timeout);
if (!timeout)
return -ENOMEM;
@@ -768,11 +768,11 @@ static int redrat3_transmit_ir(struct rc_dev *rcdev, unsigned *txbuf,
/* rr3 will disable rc detector on transmit */
rr3->transmitting = true;
- sample_lens = kzalloc_objs(*sample_lens, RR3_DRIVER_MAXLENS, GFP_KERNEL);
+ sample_lens = kzalloc_objs(*sample_lens, RR3_DRIVER_MAXLENS);
if (!sample_lens)
return -ENOMEM;
- irdata = kzalloc_obj(*irdata, GFP_KERNEL);
+ irdata = kzalloc_obj(*irdata);
if (!irdata) {
ret = -ENOMEM;
goto out;
@@ -1020,7 +1020,7 @@ static int redrat3_dev_probe(struct usb_interface *intf,
}
/* allocate memory for our device state and initialize it */
- rr3 = kzalloc_obj(*rr3, GFP_KERNEL);
+ rr3 = kzalloc_obj(*rr3);
if (!rr3)
goto no_endpoints;
diff --git a/drivers/media/rc/streamzap.c b/drivers/media/rc/streamzap.c
index 38e0db1b4964..5a18603f9a95 100644
--- a/drivers/media/rc/streamzap.c
+++ b/drivers/media/rc/streamzap.c
@@ -285,7 +285,7 @@ static int streamzap_probe(struct usb_interface *intf,
int pipe, maxp;
/* Allocate space for device driver specific data */
- sz = kzalloc_obj(struct streamzap_ir, GFP_KERNEL);
+ sz = kzalloc_obj(struct streamzap_ir);
if (!sz)
return -ENOMEM;
diff --git a/drivers/media/rc/ttusbir.c b/drivers/media/rc/ttusbir.c
index 8b70c1e809ed..110a46900114 100644
--- a/drivers/media/rc/ttusbir.c
+++ b/drivers/media/rc/ttusbir.c
@@ -187,7 +187,7 @@ static int ttusbir_probe(struct usb_interface *intf,
int i, j, ret;
int altsetting = -1;
- tt = kzalloc_obj(*tt, GFP_KERNEL);
+ tt = kzalloc_obj(*tt);
rc = rc_allocate_device(RC_DRIVER_IR_RAW);
if (!tt || !rc) {
ret = -ENOMEM;
diff --git a/drivers/media/rc/winbond-cir.c b/drivers/media/rc/winbond-cir.c
index 875ead5240a5..515469dd82d4 100644
--- a/drivers/media/rc/winbond-cir.c
+++ b/drivers/media/rc/winbond-cir.c
@@ -1017,7 +1017,7 @@ wbcir_probe(struct pnp_dev *device, const struct pnp_device_id *dev_id)
return -ENODEV;
}
- data = kzalloc_obj(*data, GFP_KERNEL);
+ data = kzalloc_obj(*data);
if (!data) {
err = -ENOMEM;
goto exit;
diff --git a/drivers/media/rc/xbox_remote.c b/drivers/media/rc/xbox_remote.c
index 79c3bfe60437..3e3da70cf8da 100644
--- a/drivers/media/rc/xbox_remote.c
+++ b/drivers/media/rc/xbox_remote.c
@@ -213,7 +213,7 @@ static int xbox_remote_probe(struct usb_interface *interface,
return -ENODEV;
}
- xbox_remote = kzalloc_obj(*xbox_remote, GFP_KERNEL);
+ xbox_remote = kzalloc_obj(*xbox_remote);
rc_dev = rc_allocate_device(RC_DRIVER_SCANCODE);
if (!xbox_remote || !rc_dev)
goto exit_free_dev_rdev;
diff --git a/drivers/media/spi/cxd2880-spi.c b/drivers/media/spi/cxd2880-spi.c
index 352ff42b9121..36207940b689 100644
--- a/drivers/media/spi/cxd2880-spi.c
+++ b/drivers/media/spi/cxd2880-spi.c
@@ -516,7 +516,7 @@ cxd2880_spi_probe(struct spi_device *spi)
return -EINVAL;
}
- dvb_spi = kzalloc_obj(struct cxd2880_dvb_spi, GFP_KERNEL);
+ dvb_spi = kzalloc_obj(struct cxd2880_dvb_spi);
if (!dvb_spi)
return -ENOMEM;
diff --git a/drivers/media/test-drivers/vicodec/vicodec-core.c b/drivers/media/test-drivers/vicodec/vicodec-core.c
index d3d4bb41c8ea..318e8330f16a 100644
--- a/drivers/media/test-drivers/vicodec/vicodec-core.c
+++ b/drivers/media/test-drivers/vicodec/vicodec-core.c
@@ -1836,7 +1836,7 @@ static int vicodec_open(struct file *file)
if (mutex_lock_interruptible(vfd->lock))
return -ERESTARTSYS;
- ctx = kzalloc_obj(*ctx, GFP_KERNEL);
+ ctx = kzalloc_obj(*ctx);
if (!ctx) {
rc = -ENOMEM;
goto open_unlock;
@@ -2105,7 +2105,7 @@ static int vicodec_probe(struct platform_device *pdev)
struct vicodec_dev *dev;
int ret;
- dev = kzalloc_obj(*dev, GFP_KERNEL);
+ dev = kzalloc_obj(*dev);
if (!dev)
return -ENOMEM;
diff --git a/drivers/media/test-drivers/vidtv/vidtv_bridge.c b/drivers/media/test-drivers/vidtv/vidtv_bridge.c
index 03bb7c79df47..b6203e10e37a 100644
--- a/drivers/media/test-drivers/vidtv/vidtv_bridge.c
+++ b/drivers/media/test-drivers/vidtv/vidtv_bridge.c
@@ -490,7 +490,7 @@ static int vidtv_bridge_probe(struct platform_device *pdev)
struct vidtv_dvb *dvb;
int ret;
- dvb = kzalloc_obj(*dvb, GFP_KERNEL);
+ dvb = kzalloc_obj(*dvb);
if (!dvb)
return -ENOMEM;
diff --git a/drivers/media/test-drivers/vidtv/vidtv_channel.c b/drivers/media/test-drivers/vidtv/vidtv_channel.c
index 4ba65853c3ed..da20657adc74 100644
--- a/drivers/media/test-drivers/vidtv/vidtv_channel.c
+++ b/drivers/media/test-drivers/vidtv/vidtv_channel.c
@@ -67,7 +67,7 @@ struct vidtv_channel
const u16 s302m_beethoven_event_id = 1;
struct vidtv_channel *s302m;
- s302m = kzalloc_obj(*s302m, GFP_KERNEL);
+ s302m = kzalloc_obj(*s302m);
if (!s302m)
return NULL;
@@ -389,7 +389,7 @@ static struct vidtv_psi_desc_service_list_entry
s_desc = (struct vidtv_psi_desc_service *)desc;
- curr_e = kzalloc_obj(*curr_e, GFP_KERNEL);
+ curr_e = kzalloc_obj(*curr_e);
if (!curr_e) {
vidtv_channel_destroy_service_list(head_e);
return NULL;
diff --git a/drivers/media/test-drivers/vidtv/vidtv_demod.c b/drivers/media/test-drivers/vidtv/vidtv_demod.c
index 31ee6d706744..c382e9e94c32 100644
--- a/drivers/media/test-drivers/vidtv/vidtv_demod.c
+++ b/drivers/media/test-drivers/vidtv/vidtv_demod.c
@@ -418,7 +418,7 @@ static int vidtv_demod_i2c_probe(struct i2c_client *client)
struct vidtv_demod_state *state;
/* allocate memory for the internal state */
- state = kzalloc_obj(*state, GFP_KERNEL);
+ state = kzalloc_obj(*state);
if (!state)
return -ENOMEM;
diff --git a/drivers/media/test-drivers/vidtv/vidtv_mux.c b/drivers/media/test-drivers/vidtv/vidtv_mux.c
index 01bed6d82437..403fbedb8663 100644
--- a/drivers/media/test-drivers/vidtv/vidtv_mux.c
+++ b/drivers/media/test-drivers/vidtv/vidtv_mux.c
@@ -50,7 +50,7 @@ static struct vidtv_mux_pid_ctx
if (ctx)
return ctx;
- ctx = kzalloc_obj(*ctx, GFP_KERNEL);
+ ctx = kzalloc_obj(*ctx);
if (!ctx)
return NULL;
@@ -480,7 +480,7 @@ struct vidtv_mux *vidtv_mux_init(struct dvb_frontend *fe,
{
struct vidtv_mux *m;
- m = kzalloc_obj(*m, GFP_KERNEL);
+ m = kzalloc_obj(*m);
if (!m)
return NULL;
diff --git a/drivers/media/test-drivers/vidtv/vidtv_psi.c b/drivers/media/test-drivers/vidtv/vidtv_psi.c
index 2cd3f5d7c142..62efe93061ab 100644
--- a/drivers/media/test-drivers/vidtv/vidtv_psi.c
+++ b/drivers/media/test-drivers/vidtv/vidtv_psi.c
@@ -285,7 +285,7 @@ struct vidtv_psi_desc_service *vidtv_psi_service_desc_init(struct vidtv_psi_desc
u32 service_name_len = service_name ? strlen(service_name) : 0;
u32 provider_name_len = provider_name ? strlen(provider_name) : 0;
- desc = kzalloc_obj(*desc, GFP_KERNEL);
+ desc = kzalloc_obj(*desc);
if (!desc)
return NULL;
@@ -360,7 +360,7 @@ struct vidtv_psi_desc_network_name
u32 network_name_len = network_name ? strlen(network_name) : 0;
struct vidtv_psi_desc_network_name *desc;
- desc = kzalloc_obj(*desc, GFP_KERNEL);
+ desc = kzalloc_obj(*desc);
if (!desc)
return NULL;
@@ -390,14 +390,14 @@ struct vidtv_psi_desc_service_list
struct vidtv_psi_desc_service_list *desc;
u16 length = 0;
- desc = kzalloc_obj(*desc, GFP_KERNEL);
+ desc = kzalloc_obj(*desc);
if (!desc)
return NULL;
desc->type = SERVICE_LIST_DESCRIPTOR;
while (entry) {
- curr_e = kzalloc_obj(*curr_e, GFP_KERNEL);
+ curr_e = kzalloc_obj(*curr_e);
if (!curr_e) {
while (head_e) {
curr_e = head_e;
@@ -441,7 +441,7 @@ struct vidtv_psi_desc_short_event
struct vidtv_psi_desc_short_event *desc;
u32 text_len = text ? strlen(text) : 0;
- desc = kzalloc_obj(*desc, GFP_KERNEL);
+ desc = kzalloc_obj(*desc);
if (!desc)
return NULL;
@@ -895,7 +895,7 @@ vidtv_psi_pat_program_init(struct vidtv_psi_table_pat_program *head,
struct vidtv_psi_table_pat_program *program;
const u16 RESERVED = 0x07;
- program = kzalloc_obj(*program, GFP_KERNEL);
+ program = kzalloc_obj(*program);
if (!program)
return NULL;
@@ -967,7 +967,7 @@ struct vidtv_psi_table_pat *vidtv_psi_pat_table_init(u16 transport_stream_id)
const u16 ZERO = 0x0;
const u16 ONES = 0x03;
- pat = kzalloc_obj(*pat, GFP_KERNEL);
+ pat = kzalloc_obj(*pat);
if (!pat)
return NULL;
@@ -1067,7 +1067,7 @@ vidtv_psi_pmt_stream_init(struct vidtv_psi_table_pmt_stream *head,
const u16 ZERO = 0x0;
u16 desc_loop_len;
- stream = kzalloc_obj(*stream, GFP_KERNEL);
+ stream = kzalloc_obj(*stream);
if (!stream)
return NULL;
@@ -1153,7 +1153,7 @@ struct vidtv_psi_table_pmt *vidtv_psi_pmt_table_init(u16 program_number,
const u16 ZERO = 0x0;
u16 desc_loop_len;
- pmt = kzalloc_obj(*pmt, GFP_KERNEL);
+ pmt = kzalloc_obj(*pmt);
if (!pmt)
return NULL;
@@ -1298,7 +1298,7 @@ struct vidtv_psi_table_sdt *vidtv_psi_sdt_table_init(u16 network_id,
const u16 ONES = 0x03;
const u16 ONE = 0x1;
- sdt = kzalloc_obj(*sdt, GFP_KERNEL);
+ sdt = kzalloc_obj(*sdt);
if (!sdt)
return NULL;
@@ -1438,7 +1438,7 @@ struct vidtv_psi_table_sdt_service
{
struct vidtv_psi_table_sdt_service *service;
- service = kzalloc_obj(*service, GFP_KERNEL);
+ service = kzalloc_obj(*service);
if (!service)
return NULL;
@@ -1621,11 +1621,11 @@ struct vidtv_psi_table_nit
const u16 ONES = 0x03;
const u16 ONE = 0x1;
- nit = kzalloc_obj(*nit, GFP_KERNEL);
+ nit = kzalloc_obj(*nit);
if (!nit)
return NULL;
- transport = kzalloc_obj(*transport, GFP_KERNEL);
+ transport = kzalloc_obj(*transport);
if (!transport)
goto free_nit;
@@ -1856,7 +1856,7 @@ struct vidtv_psi_table_eit
const u16 ONE = 0x1;
const u16 ONES = 0x03;
- eit = kzalloc_obj(*eit, GFP_KERNEL);
+ eit = kzalloc_obj(*eit);
if (!eit)
return NULL;
@@ -1981,7 +1981,7 @@ struct vidtv_psi_table_eit_event
int mjd, l;
__be16 mjd_be;
- e = kzalloc_obj(*e, GFP_KERNEL);
+ e = kzalloc_obj(*e);
if (!e)
return NULL;
diff --git a/drivers/media/test-drivers/vidtv/vidtv_s302m.c b/drivers/media/test-drivers/vidtv/vidtv_s302m.c
index 1a2ffcf0796f..581497644940 100644
--- a/drivers/media/test-drivers/vidtv/vidtv_s302m.c
+++ b/drivers/media/test-drivers/vidtv/vidtv_s302m.c
@@ -148,7 +148,7 @@ static struct vidtv_access_unit *vidtv_s302m_access_unit_init(struct vidtv_acces
{
struct vidtv_access_unit *au;
- au = kzalloc_obj(*au, GFP_KERNEL);
+ au = kzalloc_obj(*au);
if (!au)
return NULL;
@@ -445,7 +445,7 @@ struct vidtv_encoder
struct vidtv_s302m_ctx *ctx;
struct vidtv_encoder *e;
- e = kzalloc_obj(*e, GFP_KERNEL);
+ e = kzalloc_obj(*e);
if (!e)
return NULL;
diff --git a/drivers/media/test-drivers/vidtv/vidtv_tuner.c b/drivers/media/test-drivers/vidtv/vidtv_tuner.c
index 735eb3b6824d..ee55df4029bc 100644
--- a/drivers/media/test-drivers/vidtv/vidtv_tuner.c
+++ b/drivers/media/test-drivers/vidtv/vidtv_tuner.c
@@ -396,7 +396,7 @@ static int vidtv_tuner_i2c_probe(struct i2c_client *client)
struct dvb_frontend *fe = config->fe;
struct vidtv_tuner_dev *tuner_dev = NULL;
- tuner_dev = kzalloc_obj(*tuner_dev, GFP_KERNEL);
+ tuner_dev = kzalloc_obj(*tuner_dev);
if (!tuner_dev)
return -ENOMEM;
diff --git a/drivers/media/test-drivers/vim2m.c b/drivers/media/test-drivers/vim2m.c
index ae091cb67794..bb2dd11eef0e 100644
--- a/drivers/media/test-drivers/vim2m.c
+++ b/drivers/media/test-drivers/vim2m.c
@@ -1365,7 +1365,7 @@ static int vim2m_open(struct file *file)
if (mutex_lock_interruptible(&dev->dev_mutex))
return -ERESTARTSYS;
- ctx = kzalloc_obj(*ctx, GFP_KERNEL);
+ ctx = kzalloc_obj(*ctx);
if (!ctx) {
rc = -ENOMEM;
goto open_unlock;
@@ -1492,7 +1492,7 @@ static int vim2m_probe(struct platform_device *pdev)
struct video_device *vfd;
int ret;
- dev = kzalloc_obj(*dev, GFP_KERNEL);
+ dev = kzalloc_obj(*dev);
if (!dev)
return -ENOMEM;
diff --git a/drivers/media/test-drivers/vimc/vimc-capture.c b/drivers/media/test-drivers/vimc/vimc-capture.c
index e8a91f78a484..e0c6bc9f8f20 100644
--- a/drivers/media/test-drivers/vimc/vimc-capture.c
+++ b/drivers/media/test-drivers/vimc/vimc-capture.c
@@ -397,7 +397,7 @@ static struct vimc_ent_device *vimc_capture_add(struct vimc_device *vimc,
int ret;
/* Allocate the vimc_capture_device struct */
- vcapture = kzalloc_obj(*vcapture, GFP_KERNEL);
+ vcapture = kzalloc_obj(*vcapture);
if (!vcapture)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/media/test-drivers/vimc/vimc-core.c b/drivers/media/test-drivers/vimc/vimc-core.c
index 7267766662fa..c2078ea93462 100644
--- a/drivers/media/test-drivers/vimc/vimc-core.c
+++ b/drivers/media/test-drivers/vimc/vimc-core.c
@@ -354,7 +354,7 @@ static int vimc_probe(struct platform_device *pdev)
if (vimc_allocator == VIMC_ALLOCATOR_DMA_CONTIG)
dma_coerce_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(32));
- vimc = kzalloc_obj(*vimc, GFP_KERNEL);
+ vimc = kzalloc_obj(*vimc);
if (!vimc)
return -ENOMEM;
diff --git a/drivers/media/test-drivers/vimc/vimc-debayer.c b/drivers/media/test-drivers/vimc/vimc-debayer.c
index 9f86944a04a5..0c2e715a8a16 100644
--- a/drivers/media/test-drivers/vimc/vimc-debayer.c
+++ b/drivers/media/test-drivers/vimc/vimc-debayer.c
@@ -564,7 +564,7 @@ static struct vimc_ent_device *vimc_debayer_add(struct vimc_device *vimc,
int ret;
/* Allocate the vdebayer struct */
- vdebayer = kzalloc_obj(*vdebayer, GFP_KERNEL);
+ vdebayer = kzalloc_obj(*vdebayer);
if (!vdebayer)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/media/test-drivers/vimc/vimc-lens.c b/drivers/media/test-drivers/vimc/vimc-lens.c
index 9b7909ded8d6..a08fa3d5c52c 100644
--- a/drivers/media/test-drivers/vimc/vimc-lens.c
+++ b/drivers/media/test-drivers/vimc/vimc-lens.c
@@ -54,7 +54,7 @@ static struct vimc_ent_device *vimc_lens_add(struct vimc_device *vimc,
int ret;
/* Allocate the vlens struct */
- vlens = kzalloc_obj(*vlens, GFP_KERNEL);
+ vlens = kzalloc_obj(*vlens);
if (!vlens)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/media/test-drivers/vimc/vimc-scaler.c b/drivers/media/test-drivers/vimc/vimc-scaler.c
index eb0a45944e4f..e2037c67e423 100644
--- a/drivers/media/test-drivers/vimc/vimc-scaler.c
+++ b/drivers/media/test-drivers/vimc/vimc-scaler.c
@@ -392,7 +392,7 @@ static struct vimc_ent_device *vimc_scaler_add(struct vimc_device *vimc,
int ret;
/* Allocate the vscaler struct */
- vscaler = kzalloc_obj(*vscaler, GFP_KERNEL);
+ vscaler = kzalloc_obj(*vscaler);
if (!vscaler)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/media/test-drivers/vimc/vimc-sensor.c b/drivers/media/test-drivers/vimc/vimc-sensor.c
index e53d28e59ac3..69e714d4f228 100644
--- a/drivers/media/test-drivers/vimc/vimc-sensor.c
+++ b/drivers/media/test-drivers/vimc/vimc-sensor.c
@@ -382,7 +382,7 @@ static struct vimc_ent_device *vimc_sensor_add(struct vimc_device *vimc,
int ret;
/* Allocate the vsensor struct */
- vsensor = kzalloc_obj(*vsensor, GFP_KERNEL);
+ vsensor = kzalloc_obj(*vsensor);
if (!vsensor)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/media/test-drivers/visl/visl-core.c b/drivers/media/test-drivers/visl/visl-core.c
index 5ef662fa6cfa..127ab18bce99 100644
--- a/drivers/media/test-drivers/visl/visl-core.c
+++ b/drivers/media/test-drivers/visl/visl-core.c
@@ -332,7 +332,7 @@ static int visl_open(struct file *file)
if (mutex_lock_interruptible(&dev->dev_mutex))
return -ERESTARTSYS;
- ctx = kzalloc_obj(*ctx, GFP_KERNEL);
+ ctx = kzalloc_obj(*ctx);
if (!ctx) {
rc = -ENOMEM;
goto unlock;
@@ -437,7 +437,7 @@ static int visl_probe(struct platform_device *pdev)
int ret;
int rc;
- dev = kzalloc_obj(*dev, GFP_KERNEL);
+ dev = kzalloc_obj(*dev);
if (!dev)
return -ENOMEM;
diff --git a/drivers/media/test-drivers/visl/visl-debugfs.c b/drivers/media/test-drivers/visl/visl-debugfs.c
index 8cb75c63aca6..dd0ca5d8126c 100644
--- a/drivers/media/test-drivers/visl/visl-debugfs.c
+++ b/drivers/media/test-drivers/visl/visl-debugfs.c
@@ -45,7 +45,7 @@ void visl_trace_bitstream(struct visl_ctx *ctx, struct visl_run *run)
struct dentry *dentry;
char name[32];
- blob = kzalloc_obj(*blob, GFP_KERNEL);
+ blob = kzalloc_obj(*blob);
if (!blob)
return;
diff --git a/drivers/media/test-drivers/vivid/vivid-core.c b/drivers/media/test-drivers/vivid/vivid-core.c
index 5d73701f9080..c8bf9b4d406c 100644
--- a/drivers/media/test-drivers/vivid/vivid-core.c
+++ b/drivers/media/test-drivers/vivid/vivid-core.c
@@ -1814,7 +1814,7 @@ static int vivid_create_instance(struct platform_device *pdev, int inst)
int i;
/* allocate main vivid state structure */
- dev = kzalloc_obj(*dev, GFP_KERNEL);
+ dev = kzalloc_obj(*dev);
if (!dev)
return -ENOMEM;
diff --git a/drivers/media/tuners/e4000.c b/drivers/media/tuners/e4000.c
index 3c2d90fe4349..b83f37a77224 100644
--- a/drivers/media/tuners/e4000.c
+++ b/drivers/media/tuners/e4000.c
@@ -621,7 +621,7 @@ static int e4000_probe(struct i2c_client *client)
.val_bits = 8,
};
- dev = kzalloc_obj(*dev, GFP_KERNEL);
+ dev = kzalloc_obj(*dev);
if (!dev) {
ret = -ENOMEM;
goto err;
diff --git a/drivers/media/tuners/fc0011.c b/drivers/media/tuners/fc0011.c
index e982c1834fe4..33a283adad51 100644
--- a/drivers/media/tuners/fc0011.c
+++ b/drivers/media/tuners/fc0011.c
@@ -485,7 +485,7 @@ struct dvb_frontend *fc0011_attach(struct dvb_frontend *fe,
{
struct fc0011_priv *priv;
- priv = kzalloc_obj(struct fc0011_priv, GFP_KERNEL);
+ priv = kzalloc_obj(struct fc0011_priv);
if (!priv)
return NULL;
diff --git a/drivers/media/tuners/fc0012.c b/drivers/media/tuners/fc0012.c
index efe0fd2f4673..89317c88e94a 100644
--- a/drivers/media/tuners/fc0012.c
+++ b/drivers/media/tuners/fc0012.c
@@ -435,7 +435,7 @@ struct dvb_frontend *fc0012_attach(struct dvb_frontend *fe,
if (fe->ops.i2c_gate_ctrl)
fe->ops.i2c_gate_ctrl(fe, 1);
- priv = kzalloc_obj(struct fc0012_priv, GFP_KERNEL);
+ priv = kzalloc_obj(struct fc0012_priv);
if (!priv) {
ret = -ENOMEM;
dev_err(&i2c->dev, "%s: kzalloc() failed\n", KBUILD_MODNAME);
diff --git a/drivers/media/tuners/fc0013.c b/drivers/media/tuners/fc0013.c
index d0049a302689..70815abdee96 100644
--- a/drivers/media/tuners/fc0013.c
+++ b/drivers/media/tuners/fc0013.c
@@ -526,7 +526,7 @@ struct dvb_frontend *fc0013_attach(struct dvb_frontend *fe,
{
struct fc0013_priv *priv = NULL;
- priv = kzalloc_obj(struct fc0013_priv, GFP_KERNEL);
+ priv = kzalloc_obj(struct fc0013_priv);
if (priv == NULL)
return NULL;
diff --git a/drivers/media/tuners/fc2580.c b/drivers/media/tuners/fc2580.c
index 992e716a0703..75087d9b224f 100644
--- a/drivers/media/tuners/fc2580.c
+++ b/drivers/media/tuners/fc2580.c
@@ -518,7 +518,7 @@ static int fc2580_probe(struct i2c_client *client)
.val_bits = 8,
};
- dev = kzalloc_obj(*dev, GFP_KERNEL);
+ dev = kzalloc_obj(*dev);
if (!dev) {
ret = -ENOMEM;
goto err;
diff --git a/drivers/media/tuners/it913x.c b/drivers/media/tuners/it913x.c
index a78ce6c76b9c..22e29913d904 100644
--- a/drivers/media/tuners/it913x.c
+++ b/drivers/media/tuners/it913x.c
@@ -385,7 +385,7 @@ static int it913x_probe(struct platform_device *pdev)
int ret;
char *chip_ver_str;
- dev = kzalloc_obj(struct it913x_dev, GFP_KERNEL);
+ dev = kzalloc_obj(struct it913x_dev);
if (dev == NULL) {
ret = -ENOMEM;
dev_err(&pdev->dev, "kzalloc() failed\n");
diff --git a/drivers/media/tuners/m88rs6000t.c b/drivers/media/tuners/m88rs6000t.c
index 16144f4b363e..0a724cdf0f6d 100644
--- a/drivers/media/tuners/m88rs6000t.c
+++ b/drivers/media/tuners/m88rs6000t.c
@@ -612,7 +612,7 @@ static int m88rs6000t_probe(struct i2c_client *client)
{0x75, 0xFC},
};
- dev = kzalloc_obj(*dev, GFP_KERNEL);
+ dev = kzalloc_obj(*dev);
if (!dev) {
ret = -ENOMEM;
dev_err(&client->dev, "kzalloc() failed\n");
diff --git a/drivers/media/tuners/max2165.c b/drivers/media/tuners/max2165.c
index 04c25efb3baa..c070cd2161fd 100644
--- a/drivers/media/tuners/max2165.c
+++ b/drivers/media/tuners/max2165.c
@@ -394,7 +394,7 @@ struct dvb_frontend *max2165_attach(struct dvb_frontend *fe,
i2c ? i2c_adapter_id(i2c) : -1,
cfg ? cfg->i2c_address : -1);
- priv = kzalloc_obj(struct max2165_priv, GFP_KERNEL);
+ priv = kzalloc_obj(struct max2165_priv);
if (priv == NULL)
return NULL;
diff --git a/drivers/media/tuners/mc44s803.c b/drivers/media/tuners/mc44s803.c
index fb5dc3bef84f..4d5429f916ec 100644
--- a/drivers/media/tuners/mc44s803.c
+++ b/drivers/media/tuners/mc44s803.c
@@ -315,7 +315,7 @@ struct dvb_frontend *mc44s803_attach(struct dvb_frontend *fe,
reg = 0;
- priv = kzalloc_obj(struct mc44s803_priv, GFP_KERNEL);
+ priv = kzalloc_obj(struct mc44s803_priv);
if (priv == NULL)
return NULL;
diff --git a/drivers/media/tuners/msi001.c b/drivers/media/tuners/msi001.c
index 071847007e65..d7e6d64478d1 100644
--- a/drivers/media/tuners/msi001.c
+++ b/drivers/media/tuners/msi001.c
@@ -426,7 +426,7 @@ static int msi001_probe(struct spi_device *spi)
dev_dbg(&spi->dev, "\n");
- dev = kzalloc_obj(*dev, GFP_KERNEL);
+ dev = kzalloc_obj(*dev);
if (!dev) {
ret = -ENOMEM;
goto err;
diff --git a/drivers/media/tuners/mt2060.c b/drivers/media/tuners/mt2060.c
index 3ae1c4de9dd3..ef3196e6bd30 100644
--- a/drivers/media/tuners/mt2060.c
+++ b/drivers/media/tuners/mt2060.c
@@ -407,7 +407,7 @@ struct dvb_frontend * mt2060_attach(struct dvb_frontend *fe, struct i2c_adapter
struct mt2060_priv *priv = NULL;
u8 id = 0;
- priv = kzalloc_obj(struct mt2060_priv, GFP_KERNEL);
+ priv = kzalloc_obj(struct mt2060_priv);
if (priv == NULL)
return NULL;
diff --git a/drivers/media/tuners/mt2063.c b/drivers/media/tuners/mt2063.c
index 5e226618321a..3feb19fba4b2 100644
--- a/drivers/media/tuners/mt2063.c
+++ b/drivers/media/tuners/mt2063.c
@@ -2212,7 +2212,7 @@ struct dvb_frontend *mt2063_attach(struct dvb_frontend *fe,
dprintk(2, "\n");
- state = kzalloc_obj(struct mt2063_state, GFP_KERNEL);
+ state = kzalloc_obj(struct mt2063_state);
if (!state)
return NULL;
diff --git a/drivers/media/tuners/mt20xx.c b/drivers/media/tuners/mt20xx.c
index 5d89b84e4fb9..6c4333b1d9e4 100644
--- a/drivers/media/tuners/mt20xx.c
+++ b/drivers/media/tuners/mt20xx.c
@@ -596,7 +596,7 @@ struct dvb_frontend *microtune_attach(struct dvb_frontend *fe,
unsigned char buf[21];
int company_code;
- priv = kzalloc_obj(struct microtune_priv, GFP_KERNEL);
+ priv = kzalloc_obj(struct microtune_priv);
if (priv == NULL)
return NULL;
fe->tuner_priv = priv;
diff --git a/drivers/media/tuners/mt2131.c b/drivers/media/tuners/mt2131.c
index 31ada489ba27..fa59f572d515 100644
--- a/drivers/media/tuners/mt2131.c
+++ b/drivers/media/tuners/mt2131.c
@@ -248,7 +248,7 @@ struct dvb_frontend * mt2131_attach(struct dvb_frontend *fe,
dprintk(1, "%s()\n", __func__);
- priv = kzalloc_obj(struct mt2131_priv, GFP_KERNEL);
+ priv = kzalloc_obj(struct mt2131_priv);
if (priv == NULL)
return NULL;
diff --git a/drivers/media/tuners/mt2266.c b/drivers/media/tuners/mt2266.c
index 84bba08ae0a4..68111f7e7917 100644
--- a/drivers/media/tuners/mt2266.c
+++ b/drivers/media/tuners/mt2266.c
@@ -313,7 +313,7 @@ struct dvb_frontend * mt2266_attach(struct dvb_frontend *fe, struct i2c_adapter
struct mt2266_priv *priv = NULL;
u8 id = 0;
- priv = kzalloc_obj(struct mt2266_priv, GFP_KERNEL);
+ priv = kzalloc_obj(struct mt2266_priv);
if (priv == NULL)
return NULL;
diff --git a/drivers/media/tuners/mxl301rf.c b/drivers/media/tuners/mxl301rf.c
index 4cae9d2d37d2..cfc78891ce03 100644
--- a/drivers/media/tuners/mxl301rf.c
+++ b/drivers/media/tuners/mxl301rf.c
@@ -289,7 +289,7 @@ static int mxl301rf_probe(struct i2c_client *client)
struct mxl301rf_config *cfg;
struct dvb_frontend *fe;
- state = kzalloc_obj(*state, GFP_KERNEL);
+ state = kzalloc_obj(*state);
if (!state)
return -ENOMEM;
diff --git a/drivers/media/tuners/mxl5005s.c b/drivers/media/tuners/mxl5005s.c
index 5538066a57ed..ba22bf594ac7 100644
--- a/drivers/media/tuners/mxl5005s.c
+++ b/drivers/media/tuners/mxl5005s.c
@@ -4103,7 +4103,7 @@ struct dvb_frontend *mxl5005s_attach(struct dvb_frontend *fe,
struct mxl5005s_state *state = NULL;
dprintk(1, "%s()\n", __func__);
- state = kzalloc_obj(struct mxl5005s_state, GFP_KERNEL);
+ state = kzalloc_obj(struct mxl5005s_state);
if (state == NULL)
return NULL;
diff --git a/drivers/media/tuners/qm1d1b0004.c b/drivers/media/tuners/qm1d1b0004.c
index dae101ac56f1..07ad84f42c9f 100644
--- a/drivers/media/tuners/qm1d1b0004.c
+++ b/drivers/media/tuners/qm1d1b0004.c
@@ -208,7 +208,7 @@ qm1d1b0004_probe(struct i2c_client *client)
fe = cfg->fe;
i2c_set_clientdata(client, fe);
- fe->tuner_priv = kzalloc_obj(struct qm1d1b0004_state, GFP_KERNEL);
+ fe->tuner_priv = kzalloc_obj(struct qm1d1b0004_state);
if (!fe->tuner_priv) {
ret = -ENOMEM;
goto err_mem;
diff --git a/drivers/media/tuners/qm1d1c0042.c b/drivers/media/tuners/qm1d1c0042.c
index 3a9037a2a74b..db60562ad698 100644
--- a/drivers/media/tuners/qm1d1c0042.c
+++ b/drivers/media/tuners/qm1d1c0042.c
@@ -407,7 +407,7 @@ static int qm1d1c0042_probe(struct i2c_client *client)
struct qm1d1c0042_config *cfg;
struct dvb_frontend *fe;
- state = kzalloc_obj(*state, GFP_KERNEL);
+ state = kzalloc_obj(*state);
if (!state)
return -ENOMEM;
state->i2c = client;
diff --git a/drivers/media/tuners/qt1010.c b/drivers/media/tuners/qt1010.c
index 2aee4556ad53..cd6025fc95cd 100644
--- a/drivers/media/tuners/qt1010.c
+++ b/drivers/media/tuners/qt1010.c
@@ -411,7 +411,7 @@ struct dvb_frontend * qt1010_attach(struct dvb_frontend *fe,
struct qt1010_priv *priv = NULL;
u8 id;
- priv = kzalloc_obj(struct qt1010_priv, GFP_KERNEL);
+ priv = kzalloc_obj(struct qt1010_priv);
if (priv == NULL)
return NULL;
diff --git a/drivers/media/tuners/si2157.c b/drivers/media/tuners/si2157.c
index 1239206a0ac4..4ca42114da8a 100644
--- a/drivers/media/tuners/si2157.c
+++ b/drivers/media/tuners/si2157.c
@@ -884,7 +884,7 @@ static int si2157_probe(struct i2c_client *client)
struct si2157_cmd cmd;
int ret;
- dev = kzalloc_obj(*dev, GFP_KERNEL);
+ dev = kzalloc_obj(*dev);
if (!dev) {
ret = -ENOMEM;
dev_err(&client->dev, "kzalloc() failed\n");
diff --git a/drivers/media/tuners/tda18212.c b/drivers/media/tuners/tda18212.c
index 435189d37655..5f583c010408 100644
--- a/drivers/media/tuners/tda18212.c
+++ b/drivers/media/tuners/tda18212.c
@@ -186,7 +186,7 @@ static int tda18212_probe(struct i2c_client *client)
.val_bits = 8,
};
- dev = kzalloc_obj(*dev, GFP_KERNEL);
+ dev = kzalloc_obj(*dev);
if (dev == NULL) {
ret = -ENOMEM;
dev_err(&client->dev, "kzalloc() failed\n");
diff --git a/drivers/media/tuners/tda18218.c b/drivers/media/tuners/tda18218.c
index f3b54e815657..503af47a8e62 100644
--- a/drivers/media/tuners/tda18218.c
+++ b/drivers/media/tuners/tda18218.c
@@ -292,7 +292,7 @@ struct dvb_frontend *tda18218_attach(struct dvb_frontend *fe,
0x8a, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf6, 0xf6
};
- priv = kzalloc_obj(struct tda18218_priv, GFP_KERNEL);
+ priv = kzalloc_obj(struct tda18218_priv);
if (priv == NULL)
return NULL;
diff --git a/drivers/media/tuners/tda18250.c b/drivers/media/tuners/tda18250.c
index 4e77ebc10114..caaf5e0d0c9b 100644
--- a/drivers/media/tuners/tda18250.c
+++ b/drivers/media/tuners/tda18250.c
@@ -769,7 +769,7 @@ static int tda18250_probe(struct i2c_client *client)
.volatile_table = &tda18250_volatile_table,
};
- dev = kzalloc_obj(*dev, GFP_KERNEL);
+ dev = kzalloc_obj(*dev);
if (!dev) {
ret = -ENOMEM;
goto err;
diff --git a/drivers/media/tuners/tda827x.c b/drivers/media/tuners/tda827x.c
index adc00ee687a1..0ac40f1f13a7 100644
--- a/drivers/media/tuners/tda827x.c
+++ b/drivers/media/tuners/tda827x.c
@@ -873,7 +873,7 @@ struct dvb_frontend *tda827x_attach(struct dvb_frontend *fe, int addr,
struct tda827x_priv *priv = NULL;
dprintk("%s:\n", __func__);
- priv = kzalloc_obj(struct tda827x_priv, GFP_KERNEL);
+ priv = kzalloc_obj(struct tda827x_priv);
if (priv == NULL)
return NULL;
diff --git a/drivers/media/tuners/tda8290.c b/drivers/media/tuners/tda8290.c
index f15dca8f5b08..9ff0aa8cb80c 100644
--- a/drivers/media/tuners/tda8290.c
+++ b/drivers/media/tuners/tda8290.c
@@ -734,7 +734,7 @@ struct dvb_frontend *tda829x_attach(struct dvb_frontend *fe,
struct tda8290_priv *priv = NULL;
char *name;
- priv = kzalloc_obj(struct tda8290_priv, GFP_KERNEL);
+ priv = kzalloc_obj(struct tda8290_priv);
if (priv == NULL)
return NULL;
fe->analog_demod_priv = priv;
diff --git a/drivers/media/tuners/tea5761.c b/drivers/media/tuners/tea5761.c
index 1e3ea4fd7013..3abe7745e80b 100644
--- a/drivers/media/tuners/tea5761.c
+++ b/drivers/media/tuners/tea5761.c
@@ -315,7 +315,7 @@ struct dvb_frontend *tea5761_attach(struct dvb_frontend *fe,
if (tea5761_autodetection(i2c_adap, i2c_addr) != 0)
return NULL;
- priv = kzalloc_obj(struct tea5761_priv, GFP_KERNEL);
+ priv = kzalloc_obj(struct tea5761_priv);
if (priv == NULL)
return NULL;
fe->tuner_priv = priv;
diff --git a/drivers/media/tuners/tea5767.c b/drivers/media/tuners/tea5767.c
index 81deab8f2b20..97ad85c16775 100644
--- a/drivers/media/tuners/tea5767.c
+++ b/drivers/media/tuners/tea5767.c
@@ -441,7 +441,7 @@ struct dvb_frontend *tea5767_attach(struct dvb_frontend *fe,
{
struct tea5767_priv *priv = NULL;
- priv = kzalloc_obj(struct tea5767_priv, GFP_KERNEL);
+ priv = kzalloc_obj(struct tea5767_priv);
if (priv == NULL)
return NULL;
fe->tuner_priv = priv;
diff --git a/drivers/media/tuners/tua9001.c b/drivers/media/tuners/tua9001.c
index 59bd15ba6280..c0aed1b441e2 100644
--- a/drivers/media/tuners/tua9001.c
+++ b/drivers/media/tuners/tua9001.c
@@ -178,7 +178,7 @@ static int tua9001_probe(struct i2c_client *client)
.val_bits = 16,
};
- dev = kzalloc_obj(*dev, GFP_KERNEL);
+ dev = kzalloc_obj(*dev);
if (!dev) {
ret = -ENOMEM;
goto err;
diff --git a/drivers/media/tuners/tuner-i2c.h b/drivers/media/tuners/tuner-i2c.h
index ce9a065cde04..4efc825eda9b 100644
--- a/drivers/media/tuners/tuner-i2c.h
+++ b/drivers/media/tuners/tuner-i2c.h
@@ -132,7 +132,7 @@ static inline int tuner_i2c_xfer_send_recv(struct tuner_i2c_props *props,
} \
} \
if (0 == __ret) { \
- state = kzalloc_obj(type, GFP_KERNEL); \
+ state = kzalloc_obj(type); \
if (NULL == state) \
goto __fail; \
state->i2c_props.addr = i2caddr; \
diff --git a/drivers/media/tuners/xc2028.c b/drivers/media/tuners/xc2028.c
index f0f99142941f..27b18ab0d44f 100644
--- a/drivers/media/tuners/xc2028.c
+++ b/drivers/media/tuners/xc2028.c
@@ -332,7 +332,7 @@ static int load_all_firmwares(struct dvb_frontend *fe,
n_array, priv->fname, name,
priv->firm_version >> 8, priv->firm_version & 0xff);
- priv->firm = kzalloc_objs(*priv->firm, n_array, GFP_KERNEL);
+ priv->firm = kzalloc_objs(*priv->firm, n_array);
if (priv->firm == NULL) {
tuner_err("Not enough memory to load firmware file.\n");
rc = -ENOMEM;
diff --git a/drivers/media/tuners/xc4000.c b/drivers/media/tuners/xc4000.c
index 674e863839c9..900c5f2438fc 100644
--- a/drivers/media/tuners/xc4000.c
+++ b/drivers/media/tuners/xc4000.c
@@ -763,7 +763,7 @@ static int xc4000_fwupload(struct dvb_frontend *fe)
n_array, fname, name,
priv->firm_version >> 8, priv->firm_version & 0xff);
- priv->firm = kzalloc_objs(*priv->firm, n_array, GFP_KERNEL);
+ priv->firm = kzalloc_objs(*priv->firm, n_array);
if (priv->firm == NULL) {
printk(KERN_ERR "Not enough memory to load firmware file.\n");
rc = -ENOMEM;
diff --git a/drivers/media/usb/airspy/airspy.c b/drivers/media/usb/airspy/airspy.c
index 1751a67842bc..8f6b721ba107 100644
--- a/drivers/media/usb/airspy/airspy.c
+++ b/drivers/media/usb/airspy/airspy.c
@@ -968,7 +968,7 @@ static int airspy_probe(struct usb_interface *intf,
buf = NULL;
ret = -ENOMEM;
- s = kzalloc_obj(struct airspy, GFP_KERNEL);
+ s = kzalloc_obj(struct airspy);
if (s == NULL) {
dev_err(&intf->dev, "Could not allocate memory for state\n");
return -ENOMEM;
diff --git a/drivers/media/usb/as102/as102_fw.c b/drivers/media/usb/as102/as102_fw.c
index 6c14b2754b83..d2d432789f55 100644
--- a/drivers/media/usb/as102/as102_fw.c
+++ b/drivers/media/usb/as102/as102_fw.c
@@ -96,7 +96,7 @@ static int as102_firmware_upload(struct as10x_bus_adapter_t *bus_adap,
int total_read_bytes = 0, errno = 0;
unsigned char addr_has_changed = 0;
- fw_pkt = kmalloc_obj(*fw_pkt, GFP_KERNEL);
+ fw_pkt = kmalloc_obj(*fw_pkt);
if (!fw_pkt)
return -ENOMEM;
diff --git a/drivers/media/usb/as102/as102_usb_drv.c b/drivers/media/usb/as102/as102_usb_drv.c
index 594dde4578ce..8e480ab78f9b 100644
--- a/drivers/media/usb/as102/as102_usb_drv.c
+++ b/drivers/media/usb/as102/as102_usb_drv.c
@@ -345,7 +345,7 @@ static int as102_usb_probe(struct usb_interface *intf,
return -EINVAL;
}
- as102_dev = kzalloc_obj(struct as102_dev_t, GFP_KERNEL);
+ as102_dev = kzalloc_obj(struct as102_dev_t);
if (as102_dev == NULL)
return -ENOMEM;
diff --git a/drivers/media/usb/au0828/au0828-core.c b/drivers/media/usb/au0828/au0828-core.c
index d99f32d5d06f..445cbeb7abae 100644
--- a/drivers/media/usb/au0828/au0828-core.c
+++ b/drivers/media/usb/au0828/au0828-core.c
@@ -670,7 +670,7 @@ static int au0828_usb_probe(struct usb_interface *interface,
return -ENODEV;
}
- dev = kzalloc_obj(*dev, GFP_KERNEL);
+ dev = kzalloc_obj(*dev);
if (dev == NULL) {
pr_err("%s() Unable to allocate memory\n", __func__);
return -ENOMEM;
diff --git a/drivers/media/usb/au0828/au0828-input.c b/drivers/media/usb/au0828/au0828-input.c
index 9de5e7fdbbef..7dec1a360da6 100644
--- a/drivers/media/usb/au0828/au0828-input.c
+++ b/drivers/media/usb/au0828/au0828-input.c
@@ -283,7 +283,7 @@ int au0828_rc_register(struct au0828_dev *dev)
if (!i2c_rc_dev_addr)
return -ENODEV;
- ir = kzalloc_obj(*ir, GFP_KERNEL);
+ ir = kzalloc_obj(*ir);
rc = rc_allocate_device(RC_DRIVER_IR_RAW);
if (!ir || !rc)
goto error;
diff --git a/drivers/media/usb/cx231xx/cx231xx-cards.c b/drivers/media/usb/cx231xx/cx231xx-cards.c
index 00029ea23c63..b64a37d1acf4 100644
--- a/drivers/media/usb/cx231xx/cx231xx-cards.c
+++ b/drivers/media/usb/cx231xx/cx231xx-cards.c
@@ -1295,7 +1295,7 @@ void cx231xx_card_setup(struct cx231xx *dev)
u8 eeprom[256];
struct i2c_client client;
};
- struct eeprom *e = kzalloc_obj(*e, GFP_KERNEL);
+ struct eeprom *e = kzalloc_obj(*e);
if (e == NULL) {
dev_err(dev->dev,
@@ -1381,7 +1381,7 @@ static int cx231xx_media_device_init(struct cx231xx *dev,
#ifdef CONFIG_MEDIA_CONTROLLER
struct media_device *mdev;
- mdev = kzalloc_obj(*mdev, GFP_KERNEL);
+ mdev = kzalloc_obj(*mdev);
if (!mdev)
return -ENOMEM;
diff --git a/drivers/media/usb/cx231xx/cx231xx-dvb.c b/drivers/media/usb/cx231xx/cx231xx-dvb.c
index 913d53abd0e4..472a4405a105 100644
--- a/drivers/media/usb/cx231xx/cx231xx-dvb.c
+++ b/drivers/media/usb/cx231xx/cx231xx-dvb.c
@@ -627,7 +627,7 @@ static int dvb_init(struct cx231xx *dev)
return 0;
}
- dvb = kzalloc_obj(struct cx231xx_dvb, GFP_KERNEL);
+ dvb = kzalloc_obj(struct cx231xx_dvb);
if (dvb == NULL) {
dev_info(dev->dev,
diff --git a/drivers/media/usb/dvb-usb-v2/dvb_usb_core.c b/drivers/media/usb/dvb-usb-v2/dvb_usb_core.c
index acbc951dbdc0..600cff8a4abd 100644
--- a/drivers/media/usb/dvb-usb-v2/dvb_usb_core.c
+++ b/drivers/media/usb/dvb-usb-v2/dvb_usb_core.c
@@ -392,7 +392,7 @@ static int dvb_usbv2_media_device_init(struct dvb_usb_adapter *adap)
struct dvb_usb_device *d = adap_to_d(adap);
struct usb_device *udev = d->udev;
- mdev = kzalloc_obj(*mdev, GFP_KERNEL);
+ mdev = kzalloc_obj(*mdev);
if (!mdev)
return -ENOMEM;
@@ -904,7 +904,7 @@ int dvb_usbv2_probe(struct usb_interface *intf,
goto err;
}
- d = kzalloc_obj(struct dvb_usb_device, GFP_KERNEL);
+ d = kzalloc_obj(struct dvb_usb_device);
if (!d) {
dev_err(&udev->dev, "%s: kzalloc() failed\n", KBUILD_MODNAME);
ret = -ENOMEM;
diff --git a/drivers/media/usb/dvb-usb-v2/mxl111sf-demod.c b/drivers/media/usb/dvb-usb-v2/mxl111sf-demod.c
index 4811f4d1ac87..0b184080565a 100644
--- a/drivers/media/usb/dvb-usb-v2/mxl111sf-demod.c
+++ b/drivers/media/usb/dvb-usb-v2/mxl111sf-demod.c
@@ -577,7 +577,7 @@ struct dvb_frontend *mxl111sf_demod_attach(struct mxl111sf_state *mxl_state,
mxl_dbg("()");
- state = kzalloc_obj(struct mxl111sf_demod_state, GFP_KERNEL);
+ state = kzalloc_obj(struct mxl111sf_demod_state);
if (state == NULL)
return NULL;
diff --git a/drivers/media/usb/dvb-usb-v2/mxl111sf-tuner.c b/drivers/media/usb/dvb-usb-v2/mxl111sf-tuner.c
index 0cc78fd8e916..cdae66b834a7 100644
--- a/drivers/media/usb/dvb-usb-v2/mxl111sf-tuner.c
+++ b/drivers/media/usb/dvb-usb-v2/mxl111sf-tuner.c
@@ -482,7 +482,7 @@ struct dvb_frontend *mxl111sf_tuner_attach(struct dvb_frontend *fe,
mxl_dbg("()");
- state = kzalloc_obj(struct mxl111sf_tuner_state, GFP_KERNEL);
+ state = kzalloc_obj(struct mxl111sf_tuner_state);
if (state == NULL)
return NULL;
diff --git a/drivers/media/usb/dvb-usb/af9005-fe.c b/drivers/media/usb/dvb-usb/af9005-fe.c
index b6fb72c97aef..7f237dfecc3b 100644
--- a/drivers/media/usb/dvb-usb/af9005-fe.c
+++ b/drivers/media/usb/dvb-usb/af9005-fe.c
@@ -1423,7 +1423,7 @@ struct dvb_frontend *af9005_fe_attach(struct dvb_usb_device *d)
struct af9005_fe_state *state = NULL;
/* allocate memory for the internal state */
- state = kzalloc_obj(struct af9005_fe_state, GFP_KERNEL);
+ state = kzalloc_obj(struct af9005_fe_state);
if (state == NULL)
goto error;
diff --git a/drivers/media/usb/dvb-usb/dtt200u-fe.c b/drivers/media/usb/dvb-usb/dtt200u-fe.c
index 30d2e6d46b5b..7d827ea83937 100644
--- a/drivers/media/usb/dvb-usb/dtt200u-fe.c
+++ b/drivers/media/usb/dvb-usb/dtt200u-fe.c
@@ -206,7 +206,7 @@ struct dvb_frontend* dtt200u_fe_attach(struct dvb_usb_device *d)
struct dtt200u_fe_state* state = NULL;
/* allocate memory for the internal state */
- state = kzalloc_obj(struct dtt200u_fe_state, GFP_KERNEL);
+ state = kzalloc_obj(struct dtt200u_fe_state);
if (state == NULL)
goto error;
diff --git a/drivers/media/usb/dvb-usb/dvb-usb-dvb.c b/drivers/media/usb/dvb-usb/dvb-usb-dvb.c
index 94e1e7ce278d..029dad86a059 100644
--- a/drivers/media/usb/dvb-usb/dvb-usb-dvb.c
+++ b/drivers/media/usb/dvb-usb/dvb-usb-dvb.c
@@ -103,7 +103,7 @@ static int dvb_usb_media_device_init(struct dvb_usb_adapter *adap)
struct dvb_usb_device *d = adap->dev;
struct usb_device *udev = d->udev;
- mdev = kzalloc_obj(*mdev, GFP_KERNEL);
+ mdev = kzalloc_obj(*mdev);
if (!mdev)
return -ENOMEM;
diff --git a/drivers/media/usb/dvb-usb/dvb-usb-init.c b/drivers/media/usb/dvb-usb/dvb-usb-init.c
index 656401276d09..6d2672bcc69b 100644
--- a/drivers/media/usb/dvb-usb/dvb-usb-init.c
+++ b/drivers/media/usb/dvb-usb/dvb-usb-init.c
@@ -278,7 +278,7 @@ int dvb_usb_device_init(struct usb_interface *intf,
if (du != NULL)
*du = NULL;
- d = kzalloc_obj(*d, GFP_KERNEL);
+ d = kzalloc_obj(*d);
if (!d) {
err("no memory for 'struct dvb_usb_device'");
return -ENOMEM;
diff --git a/drivers/media/usb/em28xx/em28xx-audio.c b/drivers/media/usb/em28xx/em28xx-audio.c
index ca8432d47301..ccff6be5599e 100644
--- a/drivers/media/usb/em28xx/em28xx-audio.c
+++ b/drivers/media/usb/em28xx/em28xx-audio.c
@@ -750,7 +750,7 @@ static int em28xx_audio_urb_init(struct em28xx *dev)
if (!dev->adev.transfer_buffer)
return -ENOMEM;
- dev->adev.urb = kzalloc_objs(*dev->adev.urb, num_urb, GFP_KERNEL);
+ dev->adev.urb = kzalloc_objs(*dev->adev.urb, num_urb);
if (!dev->adev.urb) {
kfree(dev->adev.transfer_buffer);
return -ENOMEM;
diff --git a/drivers/media/usb/em28xx/em28xx-cards.c b/drivers/media/usb/em28xx/em28xx-cards.c
index 2fa43caaa968..59a2e4db75b7 100644
--- a/drivers/media/usb/em28xx/em28xx-cards.c
+++ b/drivers/media/usb/em28xx/em28xx-cards.c
@@ -3488,7 +3488,7 @@ static int em28xx_media_device_init(struct em28xx *dev,
#ifdef CONFIG_MEDIA_CONTROLLER
struct media_device *mdev;
- mdev = kzalloc_obj(*mdev, GFP_KERNEL);
+ mdev = kzalloc_obj(*mdev);
if (!mdev)
return -ENOMEM;
@@ -3905,7 +3905,7 @@ static int em28xx_usb_probe(struct usb_interface *intf,
}
/* allocate memory for our device state and initialize it */
- dev = kzalloc_obj(*dev, GFP_KERNEL);
+ dev = kzalloc_obj(*dev);
if (!dev) {
retval = -ENOMEM;
goto err;
diff --git a/drivers/media/usb/em28xx/em28xx-dvb.c b/drivers/media/usb/em28xx/em28xx-dvb.c
index c6151d2a21a6..2eb9a88e595e 100644
--- a/drivers/media/usb/em28xx/em28xx-dvb.c
+++ b/drivers/media/usb/em28xx/em28xx-dvb.c
@@ -1500,7 +1500,7 @@ static int em28xx_dvb_init(struct em28xx *dev)
dev_info(&dev->intf->dev, "Binding DVB extension\n");
- dvb = kzalloc_obj(*dvb, GFP_KERNEL);
+ dvb = kzalloc_obj(*dvb);
if (!dvb)
return -ENOMEM;
diff --git a/drivers/media/usb/em28xx/em28xx-input.c b/drivers/media/usb/em28xx/em28xx-input.c
index f8de173affd5..20fdd59b5518 100644
--- a/drivers/media/usb/em28xx/em28xx-input.c
+++ b/drivers/media/usb/em28xx/em28xx-input.c
@@ -724,7 +724,7 @@ static int em28xx_ir_init(struct em28xx *dev)
dev_info(&dev->intf->dev, "Registering input extension\n");
- ir = kzalloc_obj(*ir, GFP_KERNEL);
+ ir = kzalloc_obj(*ir);
if (!ir)
goto ref_put;
rc = rc_allocate_device(RC_DRIVER_SCANCODE);
@@ -765,7 +765,7 @@ static int em28xx_ir_init(struct em28xx *dev)
goto error;
}
- ir->i2c_client = kzalloc_obj(*ir->i2c_client, GFP_KERNEL);
+ ir->i2c_client = kzalloc_obj(*ir->i2c_client);
if (!ir->i2c_client)
goto error;
ir->i2c_client->adapter = &ir->dev->i2c_adap[dev->def_i2c_bus];
diff --git a/drivers/media/usb/em28xx/em28xx-video.c b/drivers/media/usb/em28xx/em28xx-video.c
index ca88b6b13724..b0c184f237a7 100644
--- a/drivers/media/usb/em28xx/em28xx-video.c
+++ b/drivers/media/usb/em28xx/em28xx-video.c
@@ -2529,7 +2529,7 @@ static int em28xx_v4l2_init(struct em28xx *dev)
mutex_lock(&dev->lock);
- v4l2 = kzalloc_obj(*v4l2, GFP_KERNEL);
+ v4l2 = kzalloc_obj(*v4l2);
if (!v4l2) {
mutex_unlock(&dev->lock);
return -ENOMEM;
diff --git a/drivers/media/usb/go7007/go7007-driver.c b/drivers/media/usb/go7007/go7007-driver.c
index 77f4d9a249ea..25b3ee25aaa4 100644
--- a/drivers/media/usb/go7007/go7007-driver.c
+++ b/drivers/media/usb/go7007/go7007-driver.c
@@ -694,7 +694,7 @@ struct go7007 *go7007_alloc(const struct go7007_board_info *board,
{
struct go7007 *go;
- go = kzalloc_obj(struct go7007, GFP_KERNEL);
+ go = kzalloc_obj(struct go7007);
if (go == NULL)
return NULL;
go->dev = dev;
diff --git a/drivers/media/usb/go7007/go7007-usb.c b/drivers/media/usb/go7007/go7007-usb.c
index 8a42aaac9cba..c0cb92fa6ab9 100644
--- a/drivers/media/usb/go7007/go7007-usb.c
+++ b/drivers/media/usb/go7007/go7007-usb.c
@@ -1115,7 +1115,7 @@ static int go7007_usb_probe(struct usb_interface *intf,
if (go == NULL)
return -ENOMEM;
- usb = kzalloc_obj(struct go7007_usb, GFP_KERNEL);
+ usb = kzalloc_obj(struct go7007_usb);
if (usb == NULL) {
kfree(go);
return -ENOMEM;
diff --git a/drivers/media/usb/go7007/s2250-board.c b/drivers/media/usb/go7007/s2250-board.c
index 23f577b0cfbf..567f851d5896 100644
--- a/drivers/media/usb/go7007/s2250-board.c
+++ b/drivers/media/usb/go7007/s2250-board.c
@@ -509,7 +509,7 @@ static int s2250_probe(struct i2c_client *client)
if (IS_ERR(audio))
return PTR_ERR(audio);
- state = kzalloc_obj(struct s2250, GFP_KERNEL);
+ state = kzalloc_obj(struct s2250);
if (state == NULL) {
i2c_unregister_device(audio);
return -ENOMEM;
diff --git a/drivers/media/usb/go7007/snd-go7007.c b/drivers/media/usb/go7007/snd-go7007.c
index c294c9486611..e4b9f37be77b 100644
--- a/drivers/media/usb/go7007/snd-go7007.c
+++ b/drivers/media/usb/go7007/snd-go7007.c
@@ -207,7 +207,7 @@ int go7007_snd_init(struct go7007 *go)
dev++;
return -ENOENT;
}
- gosnd = kmalloc_obj(struct go7007_snd, GFP_KERNEL);
+ gosnd = kmalloc_obj(struct go7007_snd);
if (gosnd == NULL)
return -ENOMEM;
spin_lock_init(&gosnd->lock);
diff --git a/drivers/media/usb/gspca/stv06xx/stv06xx_hdcs.c b/drivers/media/usb/gspca/stv06xx/stv06xx_hdcs.c
index ecb73b0b186b..bd0c62a926b9 100644
--- a/drivers/media/usb/gspca/stv06xx/stv06xx_hdcs.c
+++ b/drivers/media/usb/gspca/stv06xx/stv06xx_hdcs.c
@@ -368,7 +368,7 @@ static int hdcs_probe_1x00(struct sd *sd)
sd->gspca_dev.cam.cam_mode = hdcs1x00_mode;
sd->gspca_dev.cam.nmodes = ARRAY_SIZE(hdcs1x00_mode);
- hdcs = kmalloc_obj(struct hdcs, GFP_KERNEL);
+ hdcs = kmalloc_obj(struct hdcs);
if (!hdcs)
return -ENOMEM;
@@ -425,7 +425,7 @@ static int hdcs_probe_1020(struct sd *sd)
sd->gspca_dev.cam.cam_mode = hdcs1020_mode;
sd->gspca_dev.cam.nmodes = ARRAY_SIZE(hdcs1020_mode);
- hdcs = kmalloc_obj(struct hdcs, GFP_KERNEL);
+ hdcs = kmalloc_obj(struct hdcs);
if (!hdcs)
return -ENOMEM;
diff --git a/drivers/media/usb/gspca/stv06xx/stv06xx_pb0100.c b/drivers/media/usb/gspca/stv06xx/stv06xx_pb0100.c
index 984e6283ce83..d30a76df52cf 100644
--- a/drivers/media/usb/gspca/stv06xx/stv06xx_pb0100.c
+++ b/drivers/media/usb/gspca/stv06xx/stv06xx_pb0100.c
@@ -126,7 +126,7 @@ static int pb0100_init_controls(struct sd *sd)
.def = 1,
};
- ctrls = kzalloc_obj(*ctrls, GFP_KERNEL);
+ ctrls = kzalloc_obj(*ctrls);
if (!ctrls)
return -ENOMEM;
diff --git a/drivers/media/usb/hackrf/hackrf.c b/drivers/media/usb/hackrf/hackrf.c
index 599ebcad2bcc..94d356fba612 100644
--- a/drivers/media/usb/hackrf/hackrf.c
+++ b/drivers/media/usb/hackrf/hackrf.c
@@ -1348,7 +1348,7 @@ static int hackrf_probe(struct usb_interface *intf,
int ret;
u8 u8tmp, buf[BUF_SIZE];
- dev = kzalloc_obj(*dev, GFP_KERNEL);
+ dev = kzalloc_obj(*dev);
if (!dev) {
ret = -ENOMEM;
goto err;
diff --git a/drivers/media/usb/hdpvr/hdpvr-core.c b/drivers/media/usb/hdpvr/hdpvr-core.c
index eba330e00fb7..d42336836b18 100644
--- a/drivers/media/usb/hdpvr/hdpvr-core.c
+++ b/drivers/media/usb/hdpvr/hdpvr-core.c
@@ -276,7 +276,7 @@ static int hdpvr_probe(struct usb_interface *interface,
int retval = -ENOMEM;
/* allocate memory for our device state and initialize it */
- dev = kzalloc_obj(*dev, GFP_KERNEL);
+ dev = kzalloc_obj(*dev);
if (!dev) {
dev_err(&interface->dev, "Out of memory\n");
goto error;
diff --git a/drivers/media/usb/hdpvr/hdpvr-video.c b/drivers/media/usb/hdpvr/hdpvr-video.c
index 54c0484a14d8..4290b2367fa3 100644
--- a/drivers/media/usb/hdpvr/hdpvr-video.c
+++ b/drivers/media/usb/hdpvr/hdpvr-video.c
@@ -147,7 +147,7 @@ int hdpvr_alloc_buffers(struct hdpvr_device *dev, uint count)
for (i = 0; i < count; i++) {
- buf = kzalloc_obj(struct hdpvr_buffer, GFP_KERNEL);
+ buf = kzalloc_obj(struct hdpvr_buffer);
if (!buf) {
v4l2_err(&dev->v4l2_dev, "cannot allocate buffer\n");
goto exit;
@@ -379,7 +379,7 @@ static int hdpvr_stop_streaming(struct hdpvr_device *dev)
static int hdpvr_open(struct file *file)
{
- struct hdpvr_fh *fh = kzalloc_obj(*fh, GFP_KERNEL);
+ struct hdpvr_fh *fh = kzalloc_obj(*fh);
if (fh == NULL)
return -ENOMEM;
diff --git a/drivers/media/usb/msi2500/msi2500.c b/drivers/media/usb/msi2500/msi2500.c
index 330955ddb703..1ff98956b680 100644
--- a/drivers/media/usb/msi2500/msi2500.c
+++ b/drivers/media/usb/msi2500/msi2500.c
@@ -1170,7 +1170,7 @@ static int msi2500_probe(struct usb_interface *intf,
.max_speed_hz = 12000000,
};
- dev = kzalloc_obj(*dev, GFP_KERNEL);
+ dev = kzalloc_obj(*dev);
if (!dev) {
ret = -ENOMEM;
goto err;
diff --git a/drivers/media/usb/pvrusb2/pvrusb2-context.c b/drivers/media/usb/pvrusb2/pvrusb2-context.c
index ca970f7f4bc0..93f5da65ead9 100644
--- a/drivers/media/usb/pvrusb2/pvrusb2-context.c
+++ b/drivers/media/usb/pvrusb2/pvrusb2-context.c
@@ -204,7 +204,7 @@ struct pvr2_context *pvr2_context_create(
void (*setup_func)(struct pvr2_context *))
{
struct pvr2_context *mp = NULL;
- mp = kzalloc_obj(*mp, GFP_KERNEL);
+ mp = kzalloc_obj(*mp);
if (!mp) goto done;
pvr2_trace(PVR2_TRACE_CTXT,"pvr2_context %p (create)",mp);
mp->setup_func = setup_func;
diff --git a/drivers/media/usb/pvrusb2/pvrusb2-dvb.c b/drivers/media/usb/pvrusb2/pvrusb2-dvb.c
index 064c11b7effe..721075989d57 100644
--- a/drivers/media/usb/pvrusb2/pvrusb2-dvb.c
+++ b/drivers/media/usb/pvrusb2/pvrusb2-dvb.c
@@ -449,7 +449,7 @@ struct pvr2_dvb_adapter *pvr2_dvb_create(struct pvr2_context *pvr)
the DVB side of the driver either. For now. */
return NULL;
}
- adap = kzalloc_obj(*adap, GFP_KERNEL);
+ adap = kzalloc_obj(*adap);
if (!adap) return adap;
pvr2_channel_init(&adap->channel, pvr);
adap->channel.check_func = pvr2_dvb_internal_check;
diff --git a/drivers/media/usb/pvrusb2/pvrusb2-hdw.c b/drivers/media/usb/pvrusb2/pvrusb2-hdw.c
index fe988c6b693f..6b7d1fd18e5d 100644
--- a/drivers/media/usb/pvrusb2/pvrusb2-hdw.c
+++ b/drivers/media/usb/pvrusb2/pvrusb2-hdw.c
@@ -2367,7 +2367,7 @@ struct pvr2_hdw *pvr2_hdw_create(struct usb_interface *intf,
goto fail;
}
- hdw = kzalloc_obj(*hdw, GFP_KERNEL);
+ hdw = kzalloc_obj(*hdw);
pvr2_trace(PVR2_TRACE_INIT,"pvr2_hdw_create: hdw=%p, type \"%s\"",
hdw,hdw_desc->description);
pvr2_trace(PVR2_TRACE_INFO, "Hardware description: %s",
diff --git a/drivers/media/usb/pvrusb2/pvrusb2-io.c b/drivers/media/usb/pvrusb2/pvrusb2-io.c
index 1341967ac666..af192aefef92 100644
--- a/drivers/media/usb/pvrusb2/pvrusb2-io.c
+++ b/drivers/media/usb/pvrusb2/pvrusb2-io.c
@@ -299,7 +299,7 @@ static int pvr2_stream_buffer_count(struct pvr2_stream *sp, unsigned int cnt)
if (scnt > sp->buffer_slot_count) {
struct pvr2_buffer **nb;
- nb = kmalloc_objs(*nb, scnt, GFP_KERNEL);
+ nb = kmalloc_objs(*nb, scnt);
if (!nb) return -ENOMEM;
if (sp->buffer_slot_count) {
memcpy(nb, sp->buffers,
@@ -311,7 +311,7 @@ static int pvr2_stream_buffer_count(struct pvr2_stream *sp, unsigned int cnt)
}
while (sp->buffer_total_count < cnt) {
struct pvr2_buffer *bp;
- bp = kmalloc_obj(*bp, GFP_KERNEL);
+ bp = kmalloc_obj(*bp);
if (!bp) return -ENOMEM;
ret = pvr2_buffer_init(bp, sp, sp->buffer_total_count);
if (ret) {
@@ -460,7 +460,7 @@ static void buffer_complete(struct urb *urb)
struct pvr2_stream *pvr2_stream_create(void)
{
struct pvr2_stream *sp;
- sp = kzalloc_obj(*sp, GFP_KERNEL);
+ sp = kzalloc_obj(*sp);
if (!sp) return sp;
pvr2_trace(PVR2_TRACE_INIT, "pvr2_stream_create: sp=%p", sp);
pvr2_stream_init(sp);
diff --git a/drivers/media/usb/pvrusb2/pvrusb2-ioread.c b/drivers/media/usb/pvrusb2/pvrusb2-ioread.c
index d397231f153d..31f9305c0212 100644
--- a/drivers/media/usb/pvrusb2/pvrusb2-ioread.c
+++ b/drivers/media/usb/pvrusb2/pvrusb2-ioread.c
@@ -73,7 +73,7 @@ static void pvr2_ioread_done(struct pvr2_ioread *cp)
struct pvr2_ioread *pvr2_ioread_create(void)
{
struct pvr2_ioread *cp;
- cp = kzalloc_obj(*cp, GFP_KERNEL);
+ cp = kzalloc_obj(*cp);
if (!cp) return NULL;
pvr2_trace(PVR2_TRACE_STRUCT,"pvr2_ioread_create id=%p",cp);
if (pvr2_ioread_init(cp) < 0) {
diff --git a/drivers/media/usb/pvrusb2/pvrusb2-sysfs.c b/drivers/media/usb/pvrusb2/pvrusb2-sysfs.c
index f2cb644ca3d7..dba43d4c24f2 100644
--- a/drivers/media/usb/pvrusb2/pvrusb2-sysfs.c
+++ b/drivers/media/usb/pvrusb2/pvrusb2-sysfs.c
@@ -289,7 +289,7 @@ static void pvr2_sysfs_add_control(struct pvr2_sysfs *sfp,int ctl_id)
cptr = pvr2_hdw_get_ctrl_by_index(sfp->channel.hdw,ctl_id);
if (!cptr) return;
- cip = kzalloc_obj(*cip, GFP_KERNEL);
+ cip = kzalloc_obj(*cip);
if (!cip) return;
pvr2_sysfs_trace("Creating pvr2_sysfs_ctl_item id=%p",cip);
@@ -411,7 +411,7 @@ static void pvr2_sysfs_add_debugifc(struct pvr2_sysfs *sfp)
struct pvr2_sysfs_debugifc *dip;
int ret;
- dip = kzalloc_obj(*dip, GFP_KERNEL);
+ dip = kzalloc_obj(*dip);
if (!dip) return;
sysfs_attr_init(&dip->attr_debugcmd.attr);
dip->attr_debugcmd.attr.name = "debugcmd";
@@ -615,7 +615,7 @@ static void class_dev_create(struct pvr2_sysfs *sfp)
usb_dev = pvr2_hdw_get_dev(sfp->channel.hdw);
if (!usb_dev) return;
- class_dev = kzalloc_obj(*class_dev, GFP_KERNEL);
+ class_dev = kzalloc_obj(*class_dev);
if (!class_dev) return;
pvr2_sysfs_trace("Creating class_dev id=%p",class_dev);
@@ -748,7 +748,7 @@ static void pvr2_sysfs_internal_check(struct pvr2_channel *chp)
void pvr2_sysfs_create(struct pvr2_context *mp)
{
struct pvr2_sysfs *sfp;
- sfp = kzalloc_obj(*sfp, GFP_KERNEL);
+ sfp = kzalloc_obj(*sfp);
if (!sfp)
return;
pvr2_trace(PVR2_TRACE_STRUCT,"Creating pvr2_sysfs id=%p",sfp);
diff --git a/drivers/media/usb/pvrusb2/pvrusb2-v4l2.c b/drivers/media/usb/pvrusb2/pvrusb2-v4l2.c
index 6fd0bfb5f699..101b2e9fbaab 100644
--- a/drivers/media/usb/pvrusb2/pvrusb2-v4l2.c
+++ b/drivers/media/usb/pvrusb2/pvrusb2-v4l2.c
@@ -944,7 +944,7 @@ static int pvr2_v4l2_open(struct file *file)
return -EIO;
}
- fhp = kzalloc_obj(*fhp, GFP_KERNEL);
+ fhp = kzalloc_obj(*fhp);
if (!fhp) {
return -ENOMEM;
}
@@ -1236,7 +1236,7 @@ struct pvr2_v4l2 *pvr2_v4l2_create(struct pvr2_context *mnp)
{
struct pvr2_v4l2 *vp;
- vp = kzalloc_obj(*vp, GFP_KERNEL);
+ vp = kzalloc_obj(*vp);
if (!vp) return vp;
pvr2_channel_init(&vp->channel,mnp);
pvr2_trace(PVR2_TRACE_STRUCT,"Creating pvr2_v4l2 id=%p",vp);
@@ -1244,12 +1244,12 @@ struct pvr2_v4l2 *pvr2_v4l2_create(struct pvr2_context *mnp)
vp->channel.check_func = pvr2_v4l2_internal_check;
/* register streams */
- vp->dev_video = kzalloc_obj(*vp->dev_video, GFP_KERNEL);
+ vp->dev_video = kzalloc_obj(*vp->dev_video);
if (!vp->dev_video) goto fail;
pvr2_v4l2_dev_init(vp->dev_video,vp,VFL_TYPE_VIDEO);
if (pvr2_hdw_get_input_available(vp->channel.mc_head->hdw) &
(1 << PVR2_CVAL_INPUT_RADIO)) {
- vp->dev_radio = kzalloc_obj(*vp->dev_radio, GFP_KERNEL);
+ vp->dev_radio = kzalloc_obj(*vp->dev_radio);
if (!vp->dev_radio) goto fail;
pvr2_v4l2_dev_init(vp->dev_radio,vp,VFL_TYPE_RADIO);
}
diff --git a/drivers/media/usb/pwc/pwc-if.c b/drivers/media/usb/pwc/pwc-if.c
index b57502237f3a..c416e2fc5754 100644
--- a/drivers/media/usb/pwc/pwc-if.c
+++ b/drivers/media/usb/pwc/pwc-if.c
@@ -1026,7 +1026,7 @@ static int usb_pwc_probe(struct usb_interface *intf, const struct usb_device_id
PWC_WARNING("Warning: more than 1 configuration available.\n");
/* Allocate structure, initialize pointers, mutexes, etc. and link it to the usb_device */
- pdev = kzalloc_obj(struct pwc_device, GFP_KERNEL);
+ pdev = kzalloc_obj(struct pwc_device);
if (pdev == NULL) {
PWC_ERROR("Oops, could not allocate memory for pwc_device.\n");
return -ENOMEM;
diff --git a/drivers/media/usb/s2255/s2255drv.c b/drivers/media/usb/s2255/s2255drv.c
index 189a356eaf34..2c02873d09b5 100644
--- a/drivers/media/usb/s2255/s2255drv.c
+++ b/drivers/media/usb/s2255/s2255drv.c
@@ -2207,7 +2207,7 @@ static int s2255_probe(struct usb_interface *interface,
int fw_size;
/* allocate memory for our device state and initialize it to zero */
- dev = kzalloc_obj(struct s2255_dev, GFP_KERNEL);
+ dev = kzalloc_obj(struct s2255_dev);
if (dev == NULL) {
s2255_dev_err(&interface->dev, "out of memory\n");
return -ENOMEM;
@@ -2221,7 +2221,7 @@ static int s2255_probe(struct usb_interface *interface,
refcount_set(&dev->num_channels, 0);
dev->pid = id->idProduct;
- dev->fw_data = kzalloc_obj(struct s2255_fw, GFP_KERNEL);
+ dev->fw_data = kzalloc_obj(struct s2255_fw);
if (!dev->fw_data)
goto errorFWDATA1;
mutex_init(&dev->lock);
diff --git a/drivers/media/usb/siano/smsusb.c b/drivers/media/usb/siano/smsusb.c
index 4d9cb4184ca2..0fdc2e0950b7 100644
--- a/drivers/media/usb/siano/smsusb.c
+++ b/drivers/media/usb/siano/smsusb.c
@@ -367,7 +367,7 @@ static void *siano_media_device_register(struct smsusb_device_t *dev,
struct sms_board *board = sms_get_board(board_id);
int ret;
- mdev = kzalloc_obj(*mdev, GFP_KERNEL);
+ mdev = kzalloc_obj(*mdev);
if (!mdev)
return NULL;
@@ -397,7 +397,7 @@ static int smsusb_init_device(struct usb_interface *intf, int board_id)
int align = 0;
/* create device object */
- dev = kzalloc_obj(struct smsusb_device_t, GFP_KERNEL);
+ dev = kzalloc_obj(struct smsusb_device_t);
if (!dev)
return -ENOMEM;
diff --git a/drivers/media/usb/stk1160/stk1160-core.c b/drivers/media/usb/stk1160/stk1160-core.c
index ec4a9e2f42ab..f9462a9ca761 100644
--- a/drivers/media/usb/stk1160/stk1160-core.c
+++ b/drivers/media/usb/stk1160/stk1160-core.c
@@ -295,7 +295,7 @@ static int stk1160_probe(struct usb_interface *interface,
return rc;
}
- dev = kzalloc_obj(struct stk1160, GFP_KERNEL);
+ dev = kzalloc_obj(struct stk1160);
if (dev == NULL) {
kfree(alt_max_pkt_size);
return -ENOMEM;
diff --git a/drivers/media/usb/ttusb-budget/dvb-ttusb-budget.c b/drivers/media/usb/ttusb-budget/dvb-ttusb-budget.c
index 9cd0ea41300c..7a4d28cc3242 100644
--- a/drivers/media/usb/ttusb-budget/dvb-ttusb-budget.c
+++ b/drivers/media/usb/ttusb-budget/dvb-ttusb-budget.c
@@ -1606,7 +1606,7 @@ static int ttusb_probe(struct usb_interface *intf, const struct usb_device_id *i
if (intf->altsetting->desc.bInterfaceNumber != 1) return -ENODEV;
- if (!(ttusb = kzalloc_obj(struct ttusb, GFP_KERNEL)))
+ if (!(ttusb = kzalloc_obj(struct ttusb)))
return -ENOMEM;
ttusb->dev = udev;
diff --git a/drivers/media/usb/ttusb-dec/ttusb_dec.c b/drivers/media/usb/ttusb-dec/ttusb_dec.c
index 24ba5c1c48d2..825a3875989d 100644
--- a/drivers/media/usb/ttusb-dec/ttusb_dec.c
+++ b/drivers/media/usb/ttusb-dec/ttusb_dec.c
@@ -1642,7 +1642,7 @@ static int ttusb_dec_probe(struct usb_interface *intf,
udev = interface_to_usbdev(intf);
- if (!(dec = kzalloc_obj(struct ttusb_dec, GFP_KERNEL))) {
+ if (!(dec = kzalloc_obj(struct ttusb_dec))) {
printk("%s: couldn't allocate memory.\n", __func__);
return -ENOMEM;
}
diff --git a/drivers/media/usb/ttusb-dec/ttusbdecfe.c b/drivers/media/usb/ttusb-dec/ttusbdecfe.c
index df4ade291db4..215221370c19 100644
--- a/drivers/media/usb/ttusb-dec/ttusbdecfe.c
+++ b/drivers/media/usb/ttusb-dec/ttusbdecfe.c
@@ -198,7 +198,7 @@ struct dvb_frontend* ttusbdecfe_dvbt_attach(const struct ttusbdecfe_config* conf
struct ttusbdecfe_state* state = NULL;
/* allocate memory for the internal state */
- state = kmalloc_obj(struct ttusbdecfe_state, GFP_KERNEL);
+ state = kmalloc_obj(struct ttusbdecfe_state);
if (state == NULL)
return NULL;
@@ -218,7 +218,7 @@ struct dvb_frontend* ttusbdecfe_dvbs_attach(const struct ttusbdecfe_config* conf
struct ttusbdecfe_state* state = NULL;
/* allocate memory for the internal state */
- state = kmalloc_obj(struct ttusbdecfe_state, GFP_KERNEL);
+ state = kmalloc_obj(struct ttusbdecfe_state);
if (state == NULL)
return NULL;
diff --git a/drivers/media/usb/usbtv/usbtv-core.c b/drivers/media/usb/usbtv/usbtv-core.c
index 12ed28253d0c..c4bfadbe63c9 100644
--- a/drivers/media/usb/usbtv/usbtv-core.c
+++ b/drivers/media/usb/usbtv/usbtv-core.c
@@ -87,7 +87,7 @@ static int usbtv_probe(struct usb_interface *intf,
size = size * usb_endpoint_maxp_mult(&ep->desc);
/* Device structure */
- usbtv = kzalloc_obj(struct usbtv, GFP_KERNEL);
+ usbtv = kzalloc_obj(struct usbtv);
if (usbtv == NULL)
return -ENOMEM;
usbtv->dev = dev;
diff --git a/drivers/media/usb/uvc/uvc_ctrl.c b/drivers/media/usb/uvc/uvc_ctrl.c
index 2c511d1d9bf9..b9a3d9257a11 100644
--- a/drivers/media/usb/uvc/uvc_ctrl.c
+++ b/drivers/media/usb/uvc/uvc_ctrl.c
@@ -600,7 +600,7 @@ static const struct uvc_control_mapping *uvc_ctrl_filter_plf_mapping(
u8 init_val;
int ret;
- buf = kmalloc_obj(*buf, GFP_KERNEL);
+ buf = kmalloc_obj(*buf);
if (!buf)
return NULL;
@@ -3339,7 +3339,7 @@ static int uvc_ctrl_init_chain(struct uvc_video_chain *chain)
if (ncontrols == 0)
continue;
- entity->controls = kzalloc_objs(*ctrl, ncontrols, GFP_KERNEL);
+ entity->controls = kzalloc_objs(*ctrl, ncontrols);
if (entity->controls == NULL)
return -ENOMEM;
entity->ncontrols = ncontrols;
diff --git a/drivers/media/usb/uvc/uvc_debugfs.c b/drivers/media/usb/uvc/uvc_debugfs.c
index 1ea4a4e82662..e8f20dd7eda4 100644
--- a/drivers/media/usb/uvc/uvc_debugfs.c
+++ b/drivers/media/usb/uvc/uvc_debugfs.c
@@ -29,7 +29,7 @@ static int uvc_debugfs_stats_open(struct inode *inode, struct file *file)
struct uvc_streaming *stream = inode->i_private;
struct uvc_debugfs_buffer *buf;
- buf = kmalloc_obj(*buf, GFP_KERNEL);
+ buf = kmalloc_obj(*buf);
if (buf == NULL)
return -ENOMEM;
diff --git a/drivers/media/usb/uvc/uvc_driver.c b/drivers/media/usb/uvc/uvc_driver.c
index 05c5f70c0a93..b0ca81d924b6 100644
--- a/drivers/media/usb/uvc/uvc_driver.c
+++ b/drivers/media/usb/uvc/uvc_driver.c
@@ -200,7 +200,7 @@ static struct uvc_streaming *uvc_stream_new(struct uvc_device *dev,
{
struct uvc_streaming *stream;
- stream = kzalloc_obj(*stream, GFP_KERNEL);
+ stream = kzalloc_obj(*stream);
if (stream == NULL)
return NULL;
@@ -1761,7 +1761,7 @@ static struct uvc_video_chain *uvc_alloc_chain(struct uvc_device *dev)
{
struct uvc_video_chain *chain;
- chain = kzalloc_obj(*chain, GFP_KERNEL);
+ chain = kzalloc_obj(*chain);
if (chain == NULL)
return NULL;
@@ -2193,7 +2193,7 @@ static int uvc_probe(struct usb_interface *intf,
int ret;
/* Allocate memory for the device and initialize it. */
- dev = kzalloc_obj(*dev, GFP_KERNEL);
+ dev = kzalloc_obj(*dev);
if (dev == NULL)
return -ENOMEM;
diff --git a/drivers/media/usb/uvc/uvc_metadata.c b/drivers/media/usb/uvc/uvc_metadata.c
index 59e2b05aaf21..0a906ae3f971 100644
--- a/drivers/media/usb/uvc/uvc_metadata.c
+++ b/drivers/media/usb/uvc/uvc_metadata.c
@@ -181,7 +181,7 @@ static int uvc_meta_detect_msxu(struct uvc_device *dev)
* USB requires buffers aligned in a special way, simplest way is to
* make sure that query_ctrl will work is to kmalloc() them.
*/
- data = kmalloc_obj(*data, GFP_KERNEL);
+ data = kmalloc_obj(*data);
if (!data)
return -ENOMEM;
diff --git a/drivers/media/usb/uvc/uvc_status.c b/drivers/media/usb/uvc/uvc_status.c
index 018d25101bb8..65f5356bebb3 100644
--- a/drivers/media/usb/uvc/uvc_status.c
+++ b/drivers/media/usb/uvc/uvc_status.c
@@ -263,7 +263,7 @@ int uvc_status_init(struct uvc_device *dev)
if (ep == NULL)
return 0;
- dev->status = kzalloc_obj(*dev->status, GFP_KERNEL);
+ dev->status = kzalloc_obj(*dev->status);
if (!dev->status)
return -ENOMEM;
diff --git a/drivers/media/usb/uvc/uvc_v4l2.c b/drivers/media/usb/uvc/uvc_v4l2.c
index 98e6c4135dfd..d5860661c115 100644
--- a/drivers/media/usb/uvc/uvc_v4l2.c
+++ b/drivers/media/usb/uvc/uvc_v4l2.c
@@ -133,7 +133,7 @@ static int uvc_ioctl_xu_ctrl_map(struct uvc_video_chain *chain,
return -EINVAL;
}
- map = kzalloc_obj(*map, GFP_KERNEL);
+ map = kzalloc_obj(*map);
if (map == NULL)
return -ENOMEM;
@@ -572,7 +572,7 @@ static int uvc_v4l2_open(struct file *file)
uvc_dbg(stream->dev, CALLS, "%s\n", __func__);
/* Create the device handle. */
- handle = kzalloc_obj(*handle, GFP_KERNEL);
+ handle = kzalloc_obj(*handle);
if (!handle)
return -ENOMEM;
diff --git a/drivers/media/usb/uvc/uvc_video.c b/drivers/media/usb/uvc/uvc_video.c
index 249a225563f9..40c76c051da2 100644
--- a/drivers/media/usb/uvc/uvc_video.c
+++ b/drivers/media/usb/uvc/uvc_video.c
@@ -682,7 +682,7 @@ static int uvc_video_clock_init(struct uvc_clock *clock)
spin_lock_init(&clock->lock);
clock->size = 32;
- clock->samples = kmalloc_objs(*clock->samples, clock->size, GFP_KERNEL);
+ clock->samples = kmalloc_objs(*clock->samples, clock->size);
if (clock->samples == NULL)
return -ENOMEM;
diff --git a/drivers/media/v4l2-core/tuner-core.c b/drivers/media/v4l2-core/tuner-core.c
index b6e7c11ef7e5..004ec4d7beea 100644
--- a/drivers/media/v4l2-core/tuner-core.c
+++ b/drivers/media/v4l2-core/tuner-core.c
@@ -633,7 +633,7 @@ static int tuner_probe(struct i2c_client *client)
int ret;
#endif
- t = kzalloc_obj(struct tuner, GFP_KERNEL);
+ t = kzalloc_obj(struct tuner);
if (NULL == t)
return -ENOMEM;
v4l2_i2c_subdev_init(&t->sd, client, &tuner_ops);
diff --git a/drivers/media/v4l2-core/v4l2-async.c b/drivers/media/v4l2-core/v4l2-async.c
index c04a0e7c6edf..888a2e213b08 100644
--- a/drivers/media/v4l2-core/v4l2-async.c
+++ b/drivers/media/v4l2-core/v4l2-async.c
@@ -779,7 +779,7 @@ int v4l2_async_subdev_endpoint_add(struct v4l2_subdev *sd,
{
struct v4l2_async_subdev_endpoint *ase;
- ase = kmalloc_obj(*ase, GFP_KERNEL);
+ ase = kmalloc_obj(*ase);
if (!ase)
return -ENOMEM;
diff --git a/drivers/media/v4l2-core/v4l2-ctrls-api.c b/drivers/media/v4l2-core/v4l2-ctrls-api.c
index 03040c8eaa79..93d8d4012d0f 100644
--- a/drivers/media/v4l2-core/v4l2-ctrls-api.c
+++ b/drivers/media/v4l2-core/v4l2-ctrls-api.c
@@ -431,7 +431,7 @@ int v4l2_g_ext_ctrls_common(struct v4l2_ctrl_handler *hdl,
return class_check(hdl, cs->which);
if (cs->count > ARRAY_SIZE(helper)) {
- helpers = kvmalloc_objs(helper[0], cs->count, GFP_KERNEL);
+ helpers = kvmalloc_objs(helper[0], cs->count);
if (!helpers)
return -ENOMEM;
}
@@ -616,7 +616,7 @@ int try_set_ext_ctrls_common(struct v4l2_fh *fh,
return class_check(hdl, cs->which);
if (cs->count > ARRAY_SIZE(helper)) {
- helpers = kvmalloc_objs(helper[0], cs->count, GFP_KERNEL);
+ helpers = kvmalloc_objs(helper[0], cs->count);
if (!helpers)
return -ENOMEM;
}
diff --git a/drivers/media/v4l2-core/v4l2-ctrls-request.c b/drivers/media/v4l2-core/v4l2-ctrls-request.c
index e6d7f731d01a..4b7e6981b8d6 100644
--- a/drivers/media/v4l2-core/v4l2-ctrls-request.c
+++ b/drivers/media/v4l2-core/v4l2-ctrls-request.c
@@ -198,7 +198,7 @@ v4l2_ctrls_find_req_obj(struct v4l2_ctrl_handler *hdl,
if (!set)
return ERR_PTR(-ENOMEM);
- new_hdl = kzalloc_obj(*new_hdl, GFP_KERNEL);
+ new_hdl = kzalloc_obj(*new_hdl);
if (!new_hdl)
return ERR_PTR(-ENOMEM);
@@ -341,7 +341,7 @@ void v4l2_ctrl_request_complete(struct media_request *req,
int ret;
/* Create a new request so the driver can return controls */
- hdl = kzalloc_obj(*hdl, GFP_KERNEL);
+ hdl = kzalloc_obj(*hdl);
if (!hdl)
return;
diff --git a/drivers/media/v4l2-core/v4l2-dev.c b/drivers/media/v4l2-core/v4l2-dev.c
index 8add56232e84..6ce623a1245a 100644
--- a/drivers/media/v4l2-core/v4l2-dev.c
+++ b/drivers/media/v4l2-core/v4l2-dev.c
@@ -146,7 +146,7 @@ static inline int devnode_find(struct video_device *vdev, int from, int to)
struct video_device *video_device_alloc(void)
{
- return kzalloc_obj(struct video_device, GFP_KERNEL);
+ return kzalloc_obj(struct video_device);
}
EXPORT_SYMBOL(video_device_alloc);
diff --git a/drivers/media/v4l2-core/v4l2-device.c b/drivers/media/v4l2-core/v4l2-device.c
index 779ae282ab11..67e3073de132 100644
--- a/drivers/media/v4l2-core/v4l2-device.c
+++ b/drivers/media/v4l2-core/v4l2-device.c
@@ -205,7 +205,7 @@ int __v4l2_device_register_subdev_nodes(struct v4l2_device *v4l2_dev,
if (sd->devnode)
continue;
- vdev = kzalloc_obj(*vdev, GFP_KERNEL);
+ vdev = kzalloc_obj(*vdev);
if (!vdev) {
err = -ENOMEM;
goto clean_up;
diff --git a/drivers/media/v4l2-core/v4l2-dv-timings.c b/drivers/media/v4l2-core/v4l2-dv-timings.c
index a6233bdab3d4..3fea06443a65 100644
--- a/drivers/media/v4l2-core/v4l2-dv-timings.c
+++ b/drivers/media/v4l2-core/v4l2-dv-timings.c
@@ -1237,7 +1237,7 @@ struct v4l2_debugfs_if *v4l2_debugfs_if_alloc(struct dentry *root, u32 if_types,
if (IS_ERR_OR_NULL(root) || !if_types || !if_read)
return NULL;
- infoframes = kzalloc_obj(*infoframes, GFP_KERNEL);
+ infoframes = kzalloc_obj(*infoframes);
if (!infoframes)
return NULL;
diff --git a/drivers/media/v4l2-core/v4l2-fh.c b/drivers/media/v4l2-core/v4l2-fh.c
index fdd247b945a3..b184bed8aca9 100644
--- a/drivers/media/v4l2-core/v4l2-fh.c
+++ b/drivers/media/v4l2-core/v4l2-fh.c
@@ -57,7 +57,7 @@ EXPORT_SYMBOL_GPL(v4l2_fh_add);
int v4l2_fh_open(struct file *filp)
{
struct video_device *vdev = video_devdata(filp);
- struct v4l2_fh *fh = kzalloc_obj(*fh, GFP_KERNEL);
+ struct v4l2_fh *fh = kzalloc_obj(*fh);
if (fh == NULL)
return -ENOMEM;
diff --git a/drivers/media/v4l2-core/v4l2-fwnode.c b/drivers/media/v4l2-core/v4l2-fwnode.c
index c3ea009b8ffb..03daa8c4ff7a 100644
--- a/drivers/media/v4l2-core/v4l2-fwnode.c
+++ b/drivers/media/v4l2-core/v4l2-fwnode.c
@@ -785,7 +785,7 @@ int v4l2_fwnode_connector_add_link(struct fwnode_handle *fwnode,
if (!connector_ep)
return -ENOTCONN;
- link = kzalloc_obj(*link, GFP_KERNEL);
+ link = kzalloc_obj(*link);
if (!link) {
err = -ENOMEM;
goto err;
@@ -1257,7 +1257,7 @@ int v4l2_async_register_subdev_sensor(struct v4l2_subdev *sd)
if (WARN_ON(!sd->dev))
return -ENODEV;
- notifier = kzalloc_obj(*notifier, GFP_KERNEL);
+ notifier = kzalloc_obj(*notifier);
if (!notifier)
return -ENOMEM;
diff --git a/drivers/media/v4l2-core/v4l2-mem2mem.c b/drivers/media/v4l2-core/v4l2-mem2mem.c
index 2c933f4644aa..a65cbb124cfe 100644
--- a/drivers/media/v4l2-core/v4l2-mem2mem.c
+++ b/drivers/media/v4l2-core/v4l2-mem2mem.c
@@ -1190,7 +1190,7 @@ struct v4l2_m2m_dev *v4l2_m2m_init(const struct v4l2_m2m_ops *m2m_ops)
if (!m2m_ops || WARN_ON(!m2m_ops->device_run))
return ERR_PTR(-EINVAL);
- m2m_dev = kzalloc_obj(*m2m_dev, GFP_KERNEL);
+ m2m_dev = kzalloc_obj(*m2m_dev);
if (!m2m_dev)
return ERR_PTR(-ENOMEM);
@@ -1238,7 +1238,7 @@ struct v4l2_m2m_ctx *v4l2_m2m_ctx_init(struct v4l2_m2m_dev *m2m_dev,
struct v4l2_m2m_queue_ctx *out_q_ctx, *cap_q_ctx;
int ret;
- m2m_ctx = kzalloc_obj(*m2m_ctx, GFP_KERNEL);
+ m2m_ctx = kzalloc_obj(*m2m_ctx);
if (!m2m_ctx)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/media/v4l2-core/v4l2-subdev.c b/drivers/media/v4l2-core/v4l2-subdev.c
index c358cb40b829..10007cd842cb 100644
--- a/drivers/media/v4l2-core/v4l2-subdev.c
+++ b/drivers/media/v4l2-core/v4l2-subdev.c
@@ -99,7 +99,7 @@ static int subdev_open(struct file *file)
struct v4l2_subdev_fh *subdev_fh;
int ret;
- subdev_fh = kzalloc_obj(*subdev_fh, GFP_KERNEL);
+ subdev_fh = kzalloc_obj(*subdev_fh);
if (subdev_fh == NULL)
return -ENOMEM;
@@ -1606,7 +1606,7 @@ __v4l2_subdev_state_alloc(struct v4l2_subdev *sd, const char *lock_name,
struct v4l2_subdev_state *state;
int ret;
- state = kzalloc_obj(*state, GFP_KERNEL);
+ state = kzalloc_obj(*state);
if (!state)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/memory/samsung/exynos-srom.c b/drivers/memory/samsung/exynos-srom.c
index 1863c85642dd..fcef4aed0292 100644
--- a/drivers/memory/samsung/exynos-srom.c
+++ b/drivers/memory/samsung/exynos-srom.c
@@ -54,7 +54,7 @@ exynos_srom_alloc_reg_dump(const unsigned long *rdump,
struct exynos_srom_reg_dump *rd;
unsigned int i;
- rd = kzalloc_objs(*rd, nr_rdump, GFP_KERNEL);
+ rd = kzalloc_objs(*rd, nr_rdump);
if (!rd)
return NULL;
diff --git a/drivers/memory/tegra/tegra124-emc.c b/drivers/memory/tegra/tegra124-emc.c
index 68496f9012ff..ff26815e51f1 100644
--- a/drivers/memory/tegra/tegra124-emc.c
+++ b/drivers/memory/tegra/tegra124-emc.c
@@ -1291,7 +1291,7 @@ emc_of_icc_xlate_extended(const struct of_phandle_args *spec, void *data)
if (node->id != TEGRA_ICC_EMEM)
continue;
- ndata = kzalloc_obj(*ndata, GFP_KERNEL);
+ ndata = kzalloc_obj(*ndata);
if (!ndata)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/memory/tegra/tegra124.c b/drivers/memory/tegra/tegra124.c
index 965bfab127f5..991d4f7bc070 100644
--- a/drivers/memory/tegra/tegra124.c
+++ b/drivers/memory/tegra/tegra124.c
@@ -1182,7 +1182,7 @@ tegra124_mc_of_icc_xlate_extended(const struct of_phandle_args *spec, void *data
if (node->id != idx)
continue;
- ndata = kzalloc_obj(*ndata, GFP_KERNEL);
+ ndata = kzalloc_obj(*ndata);
if (!ndata)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/memory/tegra/tegra20-emc.c b/drivers/memory/tegra/tegra20-emc.c
index 48a546315d1c..a1fadefee7fd 100644
--- a/drivers/memory/tegra/tegra20-emc.c
+++ b/drivers/memory/tegra/tegra20-emc.c
@@ -958,7 +958,7 @@ emc_of_icc_xlate_extended(const struct of_phandle_args *spec, void *data)
if (node->id != TEGRA_ICC_EMEM)
continue;
- ndata = kzalloc_obj(*ndata, GFP_KERNEL);
+ ndata = kzalloc_obj(*ndata);
if (!ndata)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/memory/tegra/tegra20.c b/drivers/memory/tegra/tegra20.c
index 40bee3ff4a45..4748113bfe9d 100644
--- a/drivers/memory/tegra/tegra20.c
+++ b/drivers/memory/tegra/tegra20.c
@@ -401,7 +401,7 @@ tegra20_mc_of_icc_xlate_extended(const struct of_phandle_args *spec, void *data)
if (node->id != idx)
continue;
- ndata = kzalloc_obj(*ndata, GFP_KERNEL);
+ ndata = kzalloc_obj(*ndata);
if (!ndata)
return ERR_PTR(-ENOMEM);
@@ -615,7 +615,7 @@ static int tegra20_mc_stats_show(struct seq_file *s, void *unused)
struct tegra20_mc_client_stat *stats;
unsigned int i;
- stats = kzalloc_objs(*stats, mc->soc->num_clients + 1, GFP_KERNEL);
+ stats = kzalloc_objs(*stats, mc->soc->num_clients + 1);
if (!stats)
return -ENOMEM;
diff --git a/drivers/memory/tegra/tegra30-emc.c b/drivers/memory/tegra/tegra30-emc.c
index 8226cadc1f8f..606106dd2b32 100644
--- a/drivers/memory/tegra/tegra30-emc.c
+++ b/drivers/memory/tegra/tegra30-emc.c
@@ -1476,7 +1476,7 @@ emc_of_icc_xlate_extended(const struct of_phandle_args *spec, void *data)
if (node->id != TEGRA_ICC_EMEM)
continue;
- ndata = kzalloc_obj(*ndata, GFP_KERNEL);
+ ndata = kzalloc_obj(*ndata);
if (!ndata)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/memory/tegra/tegra30.c b/drivers/memory/tegra/tegra30.c
index d9f255da5c0e..a6bcde4b92c0 100644
--- a/drivers/memory/tegra/tegra30.c
+++ b/drivers/memory/tegra/tegra30.c
@@ -1344,7 +1344,7 @@ tegra30_mc_of_icc_xlate_extended(const struct of_phandle_args *spec, void *data)
if (node->id != idx)
continue;
- ndata = kzalloc_obj(*ndata, GFP_KERNEL);
+ ndata = kzalloc_obj(*ndata);
if (!ndata)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/memstick/core/memstick.c b/drivers/memstick/core/memstick.c
index d3641ba53bc9..e03989c4e99e 100644
--- a/drivers/memstick/core/memstick.c
+++ b/drivers/memstick/core/memstick.c
@@ -380,7 +380,7 @@ EXPORT_SYMBOL(memstick_set_rw_addr);
static struct memstick_dev *memstick_alloc_card(struct memstick_host *host)
{
- struct memstick_dev *card = kzalloc_obj(struct memstick_dev, GFP_KERNEL);
+ struct memstick_dev *card = kzalloc_obj(struct memstick_dev);
struct memstick_dev *old_card = host->card;
struct ms_id_register id_reg;
diff --git a/drivers/memstick/core/ms_block.c b/drivers/memstick/core/ms_block.c
index 6835849bf309..a01fe313558e 100644
--- a/drivers/memstick/core/ms_block.c
+++ b/drivers/memstick/core/ms_block.c
@@ -1203,7 +1203,7 @@ static int msb_read_boot_blocks(struct msb_data *msb)
dbg_verbose("Start of a scan for the boot blocks");
if (!msb->boot_page) {
- page = kmalloc_objs(struct ms_boot_page, 2, GFP_KERNEL);
+ page = kmalloc_objs(struct ms_boot_page, 2);
if (!page)
return -ENOMEM;
@@ -2150,7 +2150,7 @@ static int msb_probe(struct memstick_dev *card)
struct msb_data *msb;
int rc = 0;
- msb = kzalloc_obj(struct msb_data, GFP_KERNEL);
+ msb = kzalloc_obj(struct msb_data);
if (!msb)
return -ENOMEM;
memstick_set_drvdata(card, msb);
@@ -2224,7 +2224,7 @@ static int msb_resume(struct memstick_dev *card)
#endif
mutex_lock(&card->host->lock);
- new_msb = kzalloc_obj(struct msb_data, GFP_KERNEL);
+ new_msb = kzalloc_obj(struct msb_data);
if (!new_msb)
goto out;
diff --git a/drivers/memstick/core/mspro_block.c b/drivers/memstick/core/mspro_block.c
index 57c2b28f88bd..1cd061bb89d9 100644
--- a/drivers/memstick/core/mspro_block.c
+++ b/drivers/memstick/core/mspro_block.c
@@ -954,7 +954,7 @@ static int mspro_block_read_attributes(struct memstick_dev *card)
}
for (cnt = 0; cnt < attr_count; ++cnt) {
- s_attr = kzalloc_obj(struct mspro_sys_attr, GFP_KERNEL);
+ s_attr = kzalloc_obj(struct mspro_sys_attr);
if (!s_attr) {
rc = -ENOMEM;
goto out_free_buffer;
@@ -1210,7 +1210,7 @@ static int mspro_block_probe(struct memstick_dev *card)
struct mspro_block_data *msb;
int rc = 0;
- msb = kzalloc_obj(struct mspro_block_data, GFP_KERNEL);
+ msb = kzalloc_obj(struct mspro_block_data);
if (!msb)
return -ENOMEM;
memstick_set_drvdata(card, msb);
@@ -1297,7 +1297,7 @@ static int mspro_block_resume(struct memstick_dev *card)
unsigned char cnt;
mutex_lock(&host->lock);
- new_msb = kzalloc_obj(struct mspro_block_data, GFP_KERNEL);
+ new_msb = kzalloc_obj(struct mspro_block_data);
if (!new_msb) {
rc = -ENOMEM;
goto out_unlock;
diff --git a/drivers/message/fusion/mptbase.c b/drivers/message/fusion/mptbase.c
index de771eb6facd..3a431ffd3e2e 100644
--- a/drivers/message/fusion/mptbase.c
+++ b/drivers/message/fusion/mptbase.c
@@ -1771,7 +1771,7 @@ mpt_attach(struct pci_dev *pdev, const struct pci_device_id *id)
struct proc_dir_entry *dent;
#endif
- ioc = kzalloc_obj(MPT_ADAPTER, GFP_KERNEL);
+ ioc = kzalloc_obj(MPT_ADAPTER);
if (ioc == NULL) {
printk(KERN_ERR MYNAM ": ERROR - Insufficient memory to add adapter!\n");
return -ENOMEM;
@@ -5700,7 +5700,7 @@ mpt_inactive_raid_volumes(MPT_ADAPTER *ioc, u8 channel, u8 id)
buffer->PhysDisk[i].PhysDiskNum, &phys_disk) != 0)
continue;
- if ((component_info = kmalloc_obj(*component_info, GFP_KERNEL)) == NULL)
+ if ((component_info = kmalloc_obj(*component_info)) == NULL)
continue;
component_info->volumeID = id;
diff --git a/drivers/message/fusion/mptfc.c b/drivers/message/fusion/mptfc.c
index b65bc679106a..b55deb988ad9 100644
--- a/drivers/message/fusion/mptfc.c
+++ b/drivers/message/fusion/mptfc.c
@@ -484,7 +484,7 @@ mptfc_register_dev(MPT_ADAPTER *ioc, int channel, FCDevicePage0_t *pg0)
}
}
if (new_ri) { /* allocate one */
- ri = kzalloc_obj(struct mptfc_rport_info, GFP_KERNEL);
+ ri = kzalloc_obj(struct mptfc_rport_info);
if (!ri)
return;
list_add_tail(&ri->list, &ioc->fc_rports);
@@ -572,7 +572,7 @@ mptfc_target_alloc(struct scsi_target *starget)
struct mptfc_rport_info *ri;
int rc;
- vtarget = kzalloc_obj(VirtTarget, GFP_KERNEL);
+ vtarget = kzalloc_obj(VirtTarget);
if (!vtarget)
return -ENOMEM;
starget->hostdata = vtarget;
@@ -650,7 +650,7 @@ mptfc_sdev_init(struct scsi_device *sdev)
hd = shost_priv(sdev->host);
ioc = hd->ioc;
- vdevice = kzalloc_obj(VirtDevice, GFP_KERNEL);
+ vdevice = kzalloc_obj(VirtDevice);
if (!vdevice) {
printk(MYIOC_s_ERR_FMT "sdev_init kmalloc(%zd) FAILED!\n",
ioc->name, sizeof(VirtDevice));
diff --git a/drivers/message/fusion/mptlan.c b/drivers/message/fusion/mptlan.c
index 0da0d472aaff..a4d0184eeda0 100644
--- a/drivers/message/fusion/mptlan.c
+++ b/drivers/message/fusion/mptlan.c
@@ -391,7 +391,7 @@ mpt_lan_open(struct net_device *dev)
"a moment.\n");
}
- priv->mpt_txfidx = kmalloc_objs(int, priv->tx_max_out, GFP_KERNEL);
+ priv->mpt_txfidx = kmalloc_objs(int, priv->tx_max_out);
if (priv->mpt_txfidx == NULL)
goto out;
priv->mpt_txfidx_tail = -1;
@@ -405,7 +405,7 @@ mpt_lan_open(struct net_device *dev)
dlprintk((KERN_INFO MYNAM "@lo: Finished initializing SendCtl\n"));
- priv->mpt_rxfidx = kmalloc_objs(int, priv->max_buckets_out, GFP_KERNEL);
+ priv->mpt_rxfidx = kmalloc_objs(int, priv->max_buckets_out);
if (priv->mpt_rxfidx == NULL)
goto out_SendCtl;
priv->mpt_rxfidx_tail = -1;
diff --git a/drivers/message/fusion/mptsas.c b/drivers/message/fusion/mptsas.c
index 0b9e787ae3d5..82719241e4c1 100644
--- a/drivers/message/fusion/mptsas.c
+++ b/drivers/message/fusion/mptsas.c
@@ -603,7 +603,7 @@ mptsas_add_device_component(MPT_ADAPTER *ioc, u8 channel, u8 id,
}
}
- sas_info = kzalloc_obj(struct mptsas_device_info, GFP_KERNEL);
+ sas_info = kzalloc_obj(struct mptsas_device_info);
if (!sas_info)
goto out;
@@ -756,7 +756,7 @@ mptsas_add_device_component_starget_ir(MPT_ADAPTER *ioc,
}
}
- sas_info = kzalloc_obj(struct mptsas_device_info, GFP_KERNEL);
+ sas_info = kzalloc_obj(struct mptsas_device_info);
if (sas_info) {
sas_info->fw.id = starget->id;
sas_info->os.id = starget->id;
@@ -1751,7 +1751,7 @@ mptsas_target_alloc(struct scsi_target *starget)
int i;
MPT_ADAPTER *ioc = hd->ioc;
- vtarget = kzalloc_obj(VirtTarget, GFP_KERNEL);
+ vtarget = kzalloc_obj(VirtTarget);
if (!vtarget)
return -ENOMEM;
@@ -1878,7 +1878,7 @@ mptsas_sdev_init(struct scsi_device *sdev)
int i;
MPT_ADAPTER *ioc = hd->ioc;
- vdevice = kzalloc_obj(VirtDevice, GFP_KERNEL);
+ vdevice = kzalloc_obj(VirtDevice);
if (!vdevice) {
printk(MYIOC_s_ERR_FMT "sdev_init kzalloc(%zd) FAILED!\n",
ioc->name, sizeof(VirtDevice));
@@ -3309,7 +3309,7 @@ mptsas_probe_hba_phys(MPT_ADAPTER *ioc)
struct mptsas_portinfo *port_info, *hba;
int error = -ENOMEM, i;
- hba = kzalloc_obj(struct mptsas_portinfo, GFP_KERNEL);
+ hba = kzalloc_obj(struct mptsas_portinfo);
if (! hba)
goto out;
@@ -3444,7 +3444,7 @@ mptsas_expander_event_add(MPT_ADAPTER *ioc,
int i;
__le64 sas_address;
- port_info = kzalloc_obj(struct mptsas_portinfo, GFP_KERNEL);
+ port_info = kzalloc_obj(struct mptsas_portinfo);
BUG_ON(!port_info);
port_info->num_phys = (expander_data->NumPhys) ?
expander_data->NumPhys : 1;
@@ -3677,7 +3677,7 @@ mptsas_expander_add(MPT_ADAPTER *ioc, u16 handle)
MPI_SAS_EXPAND_PGAD_FORM_SHIFT), handle)))
return NULL;
- port_info = kzalloc_obj(struct mptsas_portinfo, GFP_KERNEL);
+ port_info = kzalloc_obj(struct mptsas_portinfo);
if (!port_info) {
dfailprintk(ioc, printk(MYIOC_s_ERR_FMT
"%s: exit at line=%d\n", ioc->name,
@@ -3945,7 +3945,7 @@ mptsas_probe_expanders(MPT_ADAPTER *ioc)
continue;
}
- port_info = kzalloc_obj(struct mptsas_portinfo, GFP_KERNEL);
+ port_info = kzalloc_obj(struct mptsas_portinfo);
if (!port_info) {
dfailprintk(ioc, printk(MYIOC_s_ERR_FMT
"%s: exit at line=%d\n", ioc->name,
diff --git a/drivers/message/fusion/mptspi.c b/drivers/message/fusion/mptspi.c
index 62cf9d582386..56892b1f3de2 100644
--- a/drivers/message/fusion/mptspi.c
+++ b/drivers/message/fusion/mptspi.c
@@ -405,7 +405,7 @@ static int mptspi_target_alloc(struct scsi_target *starget)
return -ENODEV;
ioc = hd->ioc;
- vtarget = kzalloc_obj(VirtTarget, GFP_KERNEL);
+ vtarget = kzalloc_obj(VirtTarget);
if (!vtarget)
return -ENOMEM;
@@ -725,7 +725,7 @@ static int mptspi_sdev_init(struct scsi_device *sdev)
mptscsih_is_phys_disk(ioc, 0, sdev->id) == 0)
return -ENXIO;
- vdevice = kzalloc_obj(VirtDevice, GFP_KERNEL);
+ vdevice = kzalloc_obj(VirtDevice);
if (!vdevice) {
printk(MYIOC_s_ERR_FMT "sdev_init kmalloc(%zd) FAILED!\n",
ioc->name, sizeof(VirtDevice));
diff --git a/drivers/mfd/cros_ec_dev.c b/drivers/mfd/cros_ec_dev.c
index 777cb2a24983..39430dd44e30 100644
--- a/drivers/mfd/cros_ec_dev.c
+++ b/drivers/mfd/cros_ec_dev.c
@@ -188,7 +188,7 @@ static int ec_device_probe(struct platform_device *pdev)
struct device_node *node;
struct device *dev = &pdev->dev;
struct cros_ec_platform *ec_platform = dev_get_platdata(dev);
- struct cros_ec_dev *ec = kzalloc_obj(*ec, GFP_KERNEL);
+ struct cros_ec_dev *ec = kzalloc_obj(*ec);
struct ec_response_pchg_count pchg_count;
int i;
diff --git a/drivers/mfd/dln2.c b/drivers/mfd/dln2.c
index eb70156e5abf..d12510e391c8 100644
--- a/drivers/mfd/dln2.c
+++ b/drivers/mfd/dln2.c
@@ -125,7 +125,7 @@ int dln2_register_event_cb(struct platform_device *pdev, u16 id,
unsigned long flags;
int ret = 0;
- entry = kzalloc_obj(*entry, GFP_KERNEL);
+ entry = kzalloc_obj(*entry);
if (!entry)
return -ENOMEM;
@@ -778,7 +778,7 @@ static int dln2_probe(struct usb_interface *interface,
if (ret)
return ret;
- dln2 = kzalloc_obj(*dln2, GFP_KERNEL);
+ dln2 = kzalloc_obj(*dln2);
if (!dln2)
return -ENOMEM;
diff --git a/drivers/mfd/ezx-pcap.c b/drivers/mfd/ezx-pcap.c
index d98a02a073ac..24ca140d6a48 100644
--- a/drivers/mfd/ezx-pcap.c
+++ b/drivers/mfd/ezx-pcap.c
@@ -302,7 +302,7 @@ int pcap_adc_async(struct pcap_chip *pcap, u8 bank, u32 flags, u8 ch[],
unsigned long irq_flags;
/* This will be freed after we have a result */
- req = kmalloc_obj(struct pcap_adc_request, GFP_KERNEL);
+ req = kmalloc_obj(struct pcap_adc_request);
if (!req)
return -ENOMEM;
diff --git a/drivers/mfd/sm501.c b/drivers/mfd/sm501.c
index ae6af552f6d2..0ee6d8940e69 100644
--- a/drivers/mfd/sm501.c
+++ b/drivers/mfd/sm501.c
@@ -1335,7 +1335,7 @@ static int sm501_plat_probe(struct platform_device *dev)
struct sm501_devdata *sm;
int ret;
- sm = kzalloc_obj(*sm, GFP_KERNEL);
+ sm = kzalloc_obj(*sm);
if (!sm) {
ret = -ENOMEM;
goto err1;
@@ -1518,7 +1518,7 @@ static int sm501_pci_probe(struct pci_dev *dev,
struct sm501_devdata *sm;
int err;
- sm = kzalloc_obj(*sm, GFP_KERNEL);
+ sm = kzalloc_obj(*sm);
if (!sm) {
err = -ENOMEM;
goto err1;
diff --git a/drivers/mfd/syscon.c b/drivers/mfd/syscon.c
index 6bf0bcf49ff4..21a7fcdd2737 100644
--- a/drivers/mfd/syscon.c
+++ b/drivers/mfd/syscon.c
@@ -51,7 +51,7 @@ static struct syscon *of_syscon_register(struct device_node *np, bool check_res)
WARN_ON(!mutex_is_locked(&syscon_list_lock));
- struct syscon *syscon __free(kfree) = kzalloc_obj(*syscon, GFP_KERNEL);
+ struct syscon *syscon __free(kfree) = kzalloc_obj(*syscon);
if (!syscon)
return ERR_PTR(-ENOMEM);
@@ -212,7 +212,7 @@ int of_syscon_register_regmap(struct device_node *np, struct regmap *regmap)
if (!np || !regmap)
return -EINVAL;
- syscon = kzalloc_obj(*syscon, GFP_KERNEL);
+ syscon = kzalloc_obj(*syscon);
if (!syscon)
return -ENOMEM;
diff --git a/drivers/mfd/timberdale.c b/drivers/mfd/timberdale.c
index b44af8ca1360..c0a3bc936381 100644
--- a/drivers/mfd/timberdale.c
+++ b/drivers/mfd/timberdale.c
@@ -649,7 +649,7 @@ static int timb_probe(struct pci_dev *dev,
struct msix_entry *msix_entries = NULL;
u8 ip_setup;
- priv = kzalloc_obj(*priv, GFP_KERNEL);
+ priv = kzalloc_obj(*priv);
if (!priv)
return -ENOMEM;
diff --git a/drivers/mfd/twl4030-irq.c b/drivers/mfd/twl4030-irq.c
index 4def9eeb964f..06809f68b007 100644
--- a/drivers/mfd/twl4030-irq.c
+++ b/drivers/mfd/twl4030-irq.c
@@ -631,7 +631,7 @@ int twl4030_sih_setup(struct device *dev, int module, int irq_base)
return status;
}
- agent = kzalloc_obj(*agent, GFP_KERNEL);
+ agent = kzalloc_obj(*agent);
if (!agent)
return -ENOMEM;
diff --git a/drivers/mfd/ucb1x00-core.c b/drivers/mfd/ucb1x00-core.c
index b2f304984505..16f64e2b2f77 100644
--- a/drivers/mfd/ucb1x00-core.c
+++ b/drivers/mfd/ucb1x00-core.c
@@ -395,7 +395,7 @@ static int ucb1x00_add_dev(struct ucb1x00 *ucb, struct ucb1x00_driver *drv)
struct ucb1x00_dev *dev;
int ret;
- dev = kmalloc_obj(struct ucb1x00_dev, GFP_KERNEL);
+ dev = kmalloc_obj(struct ucb1x00_dev);
if (!dev)
return -ENOMEM;
@@ -513,7 +513,7 @@ static int ucb1x00_probe(struct mcp *mcp)
goto out;
}
- ucb = kzalloc_obj(struct ucb1x00, GFP_KERNEL);
+ ucb = kzalloc_obj(struct ucb1x00);
ret = -ENOMEM;
if (!ucb)
goto out;
diff --git a/drivers/mfd/ucb1x00-ts.c b/drivers/mfd/ucb1x00-ts.c
index ff1b018969d5..39fe187eea1f 100644
--- a/drivers/mfd/ucb1x00-ts.c
+++ b/drivers/mfd/ucb1x00-ts.c
@@ -367,7 +367,7 @@ static int ucb1x00_ts_add(struct ucb1x00_dev *dev)
struct input_dev *idev;
int err;
- ts = kzalloc_obj(struct ucb1x00_ts, GFP_KERNEL);
+ ts = kzalloc_obj(struct ucb1x00_ts);
idev = input_allocate_device();
if (!ts || !idev) {
err = -ENOMEM;
diff --git a/drivers/mfd/viperboard.c b/drivers/mfd/viperboard.c
index 7c0b1ae0c6bc..f964bcfa0796 100644
--- a/drivers/mfd/viperboard.c
+++ b/drivers/mfd/viperboard.c
@@ -53,7 +53,7 @@ static int vprbrd_probe(struct usb_interface *interface,
int pipe, ret;
/* allocate memory for our device state and initialize it */
- vb = kzalloc_obj(*vb, GFP_KERNEL);
+ vb = kzalloc_obj(*vb);
if (!vb)
return -ENOMEM;
diff --git a/drivers/mfd/wm831x-auxadc.c b/drivers/mfd/wm831x-auxadc.c
index 5db027c904ad..744e1d161c5a 100644
--- a/drivers/mfd/wm831x-auxadc.c
+++ b/drivers/mfd/wm831x-auxadc.c
@@ -35,7 +35,7 @@ static int wm831x_auxadc_read_irq(struct wm831x *wm831x,
int ret;
bool ena = false;
- req = kzalloc_obj(*req, GFP_KERNEL);
+ req = kzalloc_obj(*req);
if (!req)
return -ENOMEM;
diff --git a/drivers/misc/ad525x_dpot.c b/drivers/misc/ad525x_dpot.c
index 8024378b4e61..57bead9fba1b 100644
--- a/drivers/misc/ad525x_dpot.c
+++ b/drivers/misc/ad525x_dpot.c
@@ -686,7 +686,7 @@ int ad_dpot_probe(struct device *dev,
struct dpot_data *data;
int i, err = 0;
- data = kzalloc_obj(struct dpot_data, GFP_KERNEL);
+ data = kzalloc_obj(struct dpot_data);
if (!data) {
err = -ENOMEM;
goto exit;
diff --git a/drivers/misc/altera-stapl/altera.c b/drivers/misc/altera-stapl/altera.c
index 334117d3a214..cf71f8e5448f 100644
--- a/drivers/misc/altera-stapl/altera.c
+++ b/drivers/misc/altera-stapl/altera.c
@@ -290,13 +290,13 @@ static int altera_execute(struct altera_state *astate,
if (sym_count <= 0)
goto exit_done;
- vars = kzalloc_objs(long, sym_count, GFP_KERNEL);
+ vars = kzalloc_objs(long, sym_count);
if (vars == NULL)
status = -ENOMEM;
if (status == 0) {
- var_size = kzalloc_objs(s32, sym_count, GFP_KERNEL);
+ var_size = kzalloc_objs(s32, sym_count);
if (var_size == NULL)
status = -ENOMEM;
@@ -2342,7 +2342,7 @@ static int altera_get_act_info(u8 *p,
(p[proc_table + (13 * act_proc_id) + 8] & 0x03);
procptr =
- kzalloc_obj(struct altera_procinfo, GFP_KERNEL);
+ kzalloc_obj(struct altera_procinfo);
if (procptr == NULL)
status = -ENOMEM;
@@ -2398,7 +2398,7 @@ int altera_init(struct altera_config *config, const struct firmware *fw)
retval = -ENOMEM;
goto free_key;
}
- astate = kzalloc_obj(struct altera_state, GFP_KERNEL);
+ astate = kzalloc_obj(struct altera_state);
if (!astate) {
retval = -ENOMEM;
goto free_value;
diff --git a/drivers/misc/apds9802als.c b/drivers/misc/apds9802als.c
index 26d5e002dfa4..fc504bd8d916 100644
--- a/drivers/misc/apds9802als.c
+++ b/drivers/misc/apds9802als.c
@@ -217,7 +217,7 @@ static int apds9802als_probe(struct i2c_client *client)
int res;
struct als_data *data;
- data = kzalloc_obj(struct als_data, GFP_KERNEL);
+ data = kzalloc_obj(struct als_data);
if (data == NULL) {
dev_err(&client->dev, "Memory allocation failed\n");
return -ENOMEM;
diff --git a/drivers/misc/apds990x.c b/drivers/misc/apds990x.c
index b057e659135f..b69c3a1c94d1 100644
--- a/drivers/misc/apds990x.c
+++ b/drivers/misc/apds990x.c
@@ -1055,7 +1055,7 @@ static int apds990x_probe(struct i2c_client *client)
struct apds990x_chip *chip;
int err;
- chip = kzalloc_obj(*chip, GFP_KERNEL);
+ chip = kzalloc_obj(*chip);
if (!chip)
return -ENOMEM;
diff --git a/drivers/misc/bcm-vk/bcm_vk_dev.c b/drivers/misc/bcm-vk/bcm_vk_dev.c
index cdcf334f0ede..5773ffb46f0f 100644
--- a/drivers/misc/bcm-vk/bcm_vk_dev.c
+++ b/drivers/misc/bcm-vk/bcm_vk_dev.c
@@ -1289,7 +1289,7 @@ static int bcm_vk_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
u32 boot_status;
/* allocate vk structure which is tied to kref for freeing */
- vk = kzalloc_obj(*vk, GFP_KERNEL);
+ vk = kzalloc_obj(*vk);
if (!vk)
return -ENOMEM;
diff --git a/drivers/misc/bcm-vk/bcm_vk_sg.c b/drivers/misc/bcm-vk/bcm_vk_sg.c
index bd8c726fdc0f..8662bb865129 100644
--- a/drivers/misc/bcm-vk/bcm_vk_sg.c
+++ b/drivers/misc/bcm-vk/bcm_vk_sg.c
@@ -60,7 +60,7 @@ static int bcm_vk_dma_alloc(struct device *dev,
dma->nr_pages = last - first + 1;
/* Allocate DMA pages */
- dma->pages = kmalloc_objs(struct page *, dma->nr_pages, GFP_KERNEL);
+ dma->pages = kmalloc_objs(struct page *, dma->nr_pages);
if (!dma->pages)
return -ENOMEM;
diff --git a/drivers/misc/c2port/core.c b/drivers/misc/c2port/core.c
index 707871bc4a50..54742e849d33 100644
--- a/drivers/misc/c2port/core.c
+++ b/drivers/misc/c2port/core.c
@@ -912,7 +912,7 @@ struct c2port_device *c2port_device_register(char *name,
unlikely(!ops->c2d_get) || unlikely(!ops->c2d_set))
return ERR_PTR(-EINVAL);
- c2dev = kzalloc_obj(struct c2port_device, GFP_KERNEL);
+ c2dev = kzalloc_obj(struct c2port_device);
if (unlikely(!c2dev))
return ERR_PTR(-ENOMEM);
diff --git a/drivers/misc/cardreader/rtsx_pcr.c b/drivers/misc/cardreader/rtsx_pcr.c
index d7211b305918..2b6a994c6fe1 100644
--- a/drivers/misc/cardreader/rtsx_pcr.c
+++ b/drivers/misc/cardreader/rtsx_pcr.c
@@ -1385,7 +1385,7 @@ static int rtsx_pci_init_chip(struct rtsx_pcr *pcr)
pcr_dbg(pcr, "PID: 0x%04x, IC version: 0x%02x\n",
PCI_PID(pcr), pcr->ic_version);
- pcr->slots = kzalloc_objs(struct rtsx_slot, pcr->num_slots, GFP_KERNEL);
+ pcr->slots = kzalloc_objs(struct rtsx_slot, pcr->num_slots);
if (!pcr->slots)
return -ENOMEM;
@@ -1493,13 +1493,13 @@ static int rtsx_pci_probe(struct pci_dev *pcidev,
if (ret)
goto disable;
- pcr = kzalloc_obj(*pcr, GFP_KERNEL);
+ pcr = kzalloc_obj(*pcr);
if (!pcr) {
ret = -ENOMEM;
goto release_pci;
}
- handle = kzalloc_obj(*handle, GFP_KERNEL);
+ handle = kzalloc_obj(*handle);
if (!handle) {
ret = -ENOMEM;
goto free_pcr;
diff --git a/drivers/misc/cs5535-mfgpt.c b/drivers/misc/cs5535-mfgpt.c
index f0bfc6210dab..cdd0e7bda68d 100644
--- a/drivers/misc/cs5535-mfgpt.c
+++ b/drivers/misc/cs5535-mfgpt.c
@@ -187,7 +187,7 @@ struct cs5535_mfgpt_timer *cs5535_mfgpt_alloc_timer(int timer_nr, int domain)
if (timer_nr < 0)
goto done;
- timer = kmalloc_obj(*timer, GFP_KERNEL);
+ timer = kmalloc_obj(*timer);
if (!timer) {
/* aw hell */
spin_lock_irqsave(&mfgpt->lock, flags);
diff --git a/drivers/misc/eeprom/max6875.c b/drivers/misc/eeprom/max6875.c
index dae682d8c4a7..5731d2dc8a57 100644
--- a/drivers/misc/eeprom/max6875.c
+++ b/drivers/misc/eeprom/max6875.c
@@ -144,7 +144,7 @@ static int max6875_probe(struct i2c_client *client)
if (client->addr & 1)
return -ENODEV;
- data = kzalloc_obj(struct max6875_data, GFP_KERNEL);
+ data = kzalloc_obj(struct max6875_data);
if (!data)
return -ENOMEM;
diff --git a/drivers/misc/fastrpc.c b/drivers/misc/fastrpc.c
index d212649fe7f9..fcf3a702bdf8 100644
--- a/drivers/misc/fastrpc.c
+++ b/drivers/misc/fastrpc.c
@@ -424,7 +424,7 @@ static int __fastrpc_buf_alloc(struct fastrpc_user *fl, struct device *dev,
{
struct fastrpc_buf *buf;
- buf = kzalloc_obj(*buf, GFP_KERNEL);
+ buf = kzalloc_obj(*buf);
if (!buf)
return -ENOMEM;
@@ -600,7 +600,7 @@ static struct fastrpc_invoke_ctx *fastrpc_context_alloc(
unsigned long flags;
int ret;
- ctx = kzalloc_obj(*ctx, GFP_KERNEL);
+ ctx = kzalloc_obj(*ctx);
if (!ctx)
return ERR_PTR(-ENOMEM);
@@ -611,7 +611,7 @@ static struct fastrpc_invoke_ctx *fastrpc_context_alloc(
REMOTE_SCALARS_OUTBUFS(sc);
if (ctx->nscalars) {
- ctx->maps = kzalloc_objs(*ctx->maps, ctx->nscalars, GFP_KERNEL);
+ ctx->maps = kzalloc_objs(*ctx->maps, ctx->nscalars);
if (!ctx->maps) {
kfree(ctx);
return ERR_PTR(-ENOMEM);
@@ -704,7 +704,7 @@ static int fastrpc_dma_buf_attach(struct dma_buf *dmabuf,
struct fastrpc_buf *buffer = dmabuf->priv;
int ret;
- a = kzalloc_obj(*a, GFP_KERNEL);
+ a = kzalloc_obj(*a);
if (!a)
return -ENOMEM;
@@ -786,7 +786,7 @@ static int fastrpc_map_attach(struct fastrpc_user *fl, int fd,
struct scatterlist *sgl = NULL;
int err = 0, sgl_index = 0;
- map = kzalloc_obj(*map, GFP_KERNEL);
+ map = kzalloc_obj(*map);
if (!map)
return -ENOMEM;
@@ -1432,7 +1432,7 @@ static int fastrpc_init_create_process(struct fastrpc_user *fl,
u32 sc;
bool unsigned_module = false;
- args = kzalloc_objs(*args, FASTRPC_CREATE_PROCESS_NARGS, GFP_KERNEL);
+ args = kzalloc_objs(*args, FASTRPC_CREATE_PROCESS_NARGS);
if (!args)
return -ENOMEM;
@@ -1627,7 +1627,7 @@ static int fastrpc_device_open(struct inode *inode, struct file *filp)
fdevice = miscdev_to_fdevice(filp->private_data);
cctx = fdevice->cctx;
- fl = kzalloc_obj(*fl, GFP_KERNEL);
+ fl = kzalloc_obj(*fl);
if (!fl)
return -ENOMEM;
@@ -1734,7 +1734,7 @@ static int fastrpc_invoke(struct fastrpc_user *fl, char __user *argp)
/* nscalars is truncated here to max supported value */
nscalars = REMOTE_SCALARS_LENGTH(inv.sc);
if (nscalars) {
- args = kzalloc_objs(*args, nscalars, GFP_KERNEL);
+ args = kzalloc_objs(*args, nscalars);
if (!args)
return -ENOMEM;
@@ -2371,7 +2371,7 @@ static int fastrpc_rpmsg_probe(struct rpmsg_device *rpdev)
else if (!qcom_scm_is_available())
return -EPROBE_DEFER;
- data = kzalloc_obj(*data, GFP_KERNEL);
+ data = kzalloc_obj(*data);
if (!data)
return -ENOMEM;
diff --git a/drivers/misc/genwqe/card_base.c b/drivers/misc/genwqe/card_base.c
index 75b970d1012e..86bfa82723ff 100644
--- a/drivers/misc/genwqe/card_base.c
+++ b/drivers/misc/genwqe/card_base.c
@@ -141,7 +141,7 @@ static struct genwqe_dev *genwqe_dev_alloc(void)
if (i >= GENWQE_CARD_NO_MAX)
return ERR_PTR(-ENODEV);
- cd = kzalloc_obj(struct genwqe_dev, GFP_KERNEL);
+ cd = kzalloc_obj(struct genwqe_dev);
if (!cd)
return ERR_PTR(-ENOMEM);
@@ -403,7 +403,7 @@ static int genwqe_ffdc_buffs_alloc(struct genwqe_dev *cd)
/* currently support only the debug units mentioned here */
cd->ffdc[type].entries = e;
cd->ffdc[type].regs =
- kmalloc_objs(struct genwqe_reg, e, GFP_KERNEL);
+ kmalloc_objs(struct genwqe_reg, e);
/*
* regs == NULL is ok, the using code treats this as no regs,
* Printing warning is ok in this case.
diff --git a/drivers/misc/genwqe/card_ddcb.c b/drivers/misc/genwqe/card_ddcb.c
index 87286ad04a4b..63c7a25a055f 100644
--- a/drivers/misc/genwqe/card_ddcb.c
+++ b/drivers/misc/genwqe/card_ddcb.c
@@ -194,7 +194,7 @@ struct genwqe_ddcb_cmd *ddcb_requ_alloc(void)
{
struct ddcb_requ *req;
- req = kzalloc_obj(*req, GFP_KERNEL);
+ req = kzalloc_obj(*req);
if (!req)
return NULL;
diff --git a/drivers/misc/genwqe/card_debugfs.c b/drivers/misc/genwqe/card_debugfs.c
index 7fc0dce42aa7..53cc17306b22 100644
--- a/drivers/misc/genwqe/card_debugfs.c
+++ b/drivers/misc/genwqe/card_debugfs.c
@@ -53,7 +53,7 @@ static int curr_dbg_uidn_show(struct seq_file *s, void *unused, int uid)
if (entries == 0)
return 0;
- regs = kzalloc_objs(*regs, entries, GFP_KERNEL);
+ regs = kzalloc_objs(*regs, entries);
if (regs == NULL)
return -ENOMEM;
@@ -122,7 +122,7 @@ static int curr_regs_show(struct seq_file *s, void *unused)
unsigned int i;
struct genwqe_reg *regs;
- regs = kzalloc_objs(*regs, GENWQE_FFDC_REGS, GFP_KERNEL);
+ regs = kzalloc_objs(*regs, GENWQE_FFDC_REGS);
if (regs == NULL)
return -ENOMEM;
diff --git a/drivers/misc/genwqe/card_dev.c b/drivers/misc/genwqe/card_dev.c
index 9b5458c10053..5a07e8403e97 100644
--- a/drivers/misc/genwqe/card_dev.c
+++ b/drivers/misc/genwqe/card_dev.c
@@ -301,7 +301,7 @@ static int genwqe_open(struct inode *inode, struct file *filp)
struct genwqe_dev *cd;
struct genwqe_file *cfile;
- cfile = kzalloc_obj(*cfile, GFP_KERNEL);
+ cfile = kzalloc_obj(*cfile);
if (cfile == NULL)
return -ENOMEM;
@@ -446,7 +446,7 @@ static int genwqe_mmap(struct file *filp, struct vm_area_struct *vma)
if (get_order(vsize) > MAX_PAGE_ORDER)
return -ENOMEM;
- dma_map = kzalloc_obj(struct dma_mapping, GFP_KERNEL);
+ dma_map = kzalloc_obj(struct dma_mapping);
if (dma_map == NULL)
return -ENOMEM;
@@ -783,7 +783,7 @@ static int genwqe_pin_mem(struct genwqe_file *cfile, struct genwqe_mem *m)
map_addr = (m->addr & PAGE_MASK);
map_size = round_up(m->size + (m->addr & ~PAGE_MASK), PAGE_SIZE);
- dma_map = kzalloc_obj(struct dma_mapping, GFP_KERNEL);
+ dma_map = kzalloc_obj(struct dma_mapping);
if (dma_map == NULL)
return -ENOMEM;
diff --git a/drivers/misc/hpilo.c b/drivers/misc/hpilo.c
index 174cabc7307f..ff3f03ea577e 100644
--- a/drivers/misc/hpilo.c
+++ b/drivers/misc/hpilo.c
@@ -570,7 +570,7 @@ static int ilo_open(struct inode *ip, struct file *fp)
hw = container_of(ip->i_cdev, struct ilo_hwinfo, cdev);
/* new ccb allocation */
- data = kzalloc_obj(*data, GFP_KERNEL);
+ data = kzalloc_obj(*data);
if (!data)
return -ENOMEM;
@@ -798,7 +798,7 @@ static int ilo_probe(struct pci_dev *pdev,
/* track global allocations for this device */
error = -ENOMEM;
- ilo_hw = kzalloc_obj(*ilo_hw, GFP_KERNEL);
+ ilo_hw = kzalloc_obj(*ilo_hw);
if (!ilo_hw)
goto out;
diff --git a/drivers/misc/ibmasm/command.c b/drivers/misc/ibmasm/command.c
index 9e4f45be78d7..6b037675ff45 100644
--- a/drivers/misc/ibmasm/command.c
+++ b/drivers/misc/ibmasm/command.c
@@ -24,7 +24,7 @@ struct command *ibmasm_new_command(struct service_processor *sp, size_t buffer_s
if (buffer_size > IBMASM_CMD_MAX_BUFFER_SIZE)
return NULL;
- cmd = kzalloc_obj(struct command, GFP_KERNEL);
+ cmd = kzalloc_obj(struct command);
if (cmd == NULL)
return NULL;
diff --git a/drivers/misc/ibmasm/event.c b/drivers/misc/ibmasm/event.c
index 41aabfcd256f..3990bf2b1728 100644
--- a/drivers/misc/ibmasm/event.c
+++ b/drivers/misc/ibmasm/event.c
@@ -139,7 +139,7 @@ int ibmasm_event_buffer_init(struct service_processor *sp)
struct ibmasm_event *event;
int i;
- buffer = kmalloc_obj(struct event_buffer, GFP_KERNEL);
+ buffer = kmalloc_obj(struct event_buffer);
if (!buffer)
return -ENOMEM;
diff --git a/drivers/misc/ibmasm/ibmasmfs.c b/drivers/misc/ibmasm/ibmasmfs.c
index f203bc3e8068..f68a8957b98f 100644
--- a/drivers/misc/ibmasm/ibmasmfs.c
+++ b/drivers/misc/ibmasm/ibmasmfs.c
@@ -235,7 +235,7 @@ static int command_file_open(struct inode *inode, struct file *file)
if (!inode->i_private)
return -ENODEV;
- command_data = kmalloc_obj(struct ibmasmfs_command_data, GFP_KERNEL);
+ command_data = kmalloc_obj(struct ibmasmfs_command_data);
if (!command_data)
return -ENOMEM;
@@ -344,7 +344,7 @@ static int event_file_open(struct inode *inode, struct file *file)
sp = inode->i_private;
- event_data = kmalloc_obj(struct ibmasmfs_event_data, GFP_KERNEL);
+ event_data = kmalloc_obj(struct ibmasmfs_event_data);
if (!event_data)
return -ENOMEM;
@@ -430,7 +430,7 @@ static int r_heartbeat_file_open(struct inode *inode, struct file *file)
if (!inode->i_private)
return -ENODEV;
- rhbeat = kmalloc_obj(struct ibmasmfs_heartbeat_data, GFP_KERNEL);
+ rhbeat = kmalloc_obj(struct ibmasmfs_heartbeat_data);
if (!rhbeat)
return -ENOMEM;
diff --git a/drivers/misc/ibmasm/module.c b/drivers/misc/ibmasm/module.c
index ea625673826b..4509c15a76a8 100644
--- a/drivers/misc/ibmasm/module.c
+++ b/drivers/misc/ibmasm/module.c
@@ -64,7 +64,7 @@ static int ibmasm_init_one(struct pci_dev *pdev, const struct pci_device_id *id)
/* vnc client won't work without bus-mastering */
pci_set_master(pdev);
- sp = kzalloc_obj(struct service_processor, GFP_KERNEL);
+ sp = kzalloc_obj(struct service_processor);
if (sp == NULL) {
dev_err(&pdev->dev, "Failed to allocate memory\n");
result = -ENOMEM;
diff --git a/drivers/misc/ibmvmc.c b/drivers/misc/ibmvmc.c
index 78ecc28f00fb..beb18c34f20d 100644
--- a/drivers/misc/ibmvmc.c
+++ b/drivers/misc/ibmvmc.c
@@ -830,7 +830,7 @@ static int ibmvmc_open(struct inode *inode, struct file *file)
(unsigned long)inode, (unsigned long)file,
ibmvmc.state);
- session = kzalloc_obj(*session, GFP_KERNEL);
+ session = kzalloc_obj(*session);
if (!session)
return -ENOMEM;
diff --git a/drivers/misc/ics932s401.c b/drivers/misc/ics932s401.c
index df4d36fe46ac..015710762a65 100644
--- a/drivers/misc/ics932s401.c
+++ b/drivers/misc/ics932s401.c
@@ -433,7 +433,7 @@ static int ics932s401_probe(struct i2c_client *client)
struct ics932s401_data *data;
int err;
- data = kzalloc_obj(struct ics932s401_data, GFP_KERNEL);
+ data = kzalloc_obj(struct ics932s401_data);
if (!data) {
err = -ENOMEM;
goto exit;
diff --git a/drivers/misc/isl29003.c b/drivers/misc/isl29003.c
index ea56dde9183d..95480e16ae5f 100644
--- a/drivers/misc/isl29003.c
+++ b/drivers/misc/isl29003.c
@@ -383,7 +383,7 @@ static int isl29003_probe(struct i2c_client *client)
if (!i2c_check_functionality(adapter, I2C_FUNC_SMBUS_BYTE))
return -EIO;
- data = kzalloc_obj(struct isl29003_data, GFP_KERNEL);
+ data = kzalloc_obj(struct isl29003_data);
if (!data)
return -ENOMEM;
diff --git a/drivers/misc/keba/cp500.c b/drivers/misc/keba/cp500.c
index 6039a718d92f..6c65fbf22e75 100644
--- a/drivers/misc/keba/cp500.c
+++ b/drivers/misc/keba/cp500.c
@@ -335,7 +335,7 @@ static int cp500_register_i2c(struct cp500 *cp500)
{
int ret;
- cp500->i2c = kzalloc_obj(*cp500->i2c, GFP_KERNEL);
+ cp500->i2c = kzalloc_obj(*cp500->i2c);
if (!cp500->i2c)
return -ENOMEM;
@@ -386,7 +386,7 @@ static int cp500_register_spi(struct cp500 *cp500, u8 esc_type)
int info_size;
int ret;
- cp500->spi = kzalloc_obj(*cp500->spi, GFP_KERNEL);
+ cp500->spi = kzalloc_obj(*cp500->spi);
if (!cp500->spi)
return -ENOMEM;
@@ -443,7 +443,7 @@ static int cp500_register_fan(struct cp500 *cp500)
{
int ret;
- cp500->fan = kzalloc_obj(*cp500->fan, GFP_KERNEL);
+ cp500->fan = kzalloc_obj(*cp500->fan);
if (!cp500->fan)
return -ENOMEM;
@@ -491,7 +491,7 @@ static int cp500_register_batt(struct cp500 *cp500)
{
int ret;
- cp500->batt = kzalloc_obj(*cp500->batt, GFP_KERNEL);
+ cp500->batt = kzalloc_obj(*cp500->batt);
if (!cp500->batt)
return -ENOMEM;
@@ -541,7 +541,7 @@ static int cp500_register_uart(struct cp500 *cp500,
{
int ret;
- *uart = kzalloc_obj(**uart, GFP_KERNEL);
+ *uart = kzalloc_obj(**uart);
if (!*uart)
return -ENOMEM;
diff --git a/drivers/misc/lan966x_pci.c b/drivers/misc/lan966x_pci.c
index 6245ea993d1b..0bb90c0943bf 100644
--- a/drivers/misc/lan966x_pci.c
+++ b/drivers/misc/lan966x_pci.c
@@ -58,7 +58,7 @@ static struct pci_dev_intr_ctrl *pci_dev_create_intr_ctrl(struct pci_dev *pdev)
if (!fwnode)
return ERR_PTR(-ENODEV);
- intr_ctrl = kmalloc_obj(*intr_ctrl, GFP_KERNEL);
+ intr_ctrl = kmalloc_obj(*intr_ctrl);
if (!intr_ctrl)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/misc/lis3lv02d/lis3lv02d.c b/drivers/misc/lis3lv02d/lis3lv02d.c
index f5adec86ca28..9c68f8b1d5d6 100644
--- a/drivers/misc/lis3lv02d/lis3lv02d.c
+++ b/drivers/misc/lis3lv02d/lis3lv02d.c
@@ -952,7 +952,7 @@ int lis3lv02d_init_dt(struct lis3lv02d *lis3)
if (!lis3->of_node)
return 0;
- pdata = kzalloc_obj(*pdata, GFP_KERNEL);
+ pdata = kzalloc_obj(*pdata);
if (!pdata)
return -ENOMEM;
diff --git a/drivers/misc/lkdtm/bugs.c b/drivers/misc/lkdtm/bugs.c
index 6de369f0ccd2..6b39ee357cef 100644
--- a/drivers/misc/lkdtm/bugs.c
+++ b/drivers/misc/lkdtm/bugs.c
@@ -533,7 +533,7 @@ static void lkdtm_PTR_BOUNDS(void)
{
struct lkdtm_cb_ptr *inst;
- inst = kzalloc_obj(*inst, GFP_KERNEL);
+ inst = kzalloc_obj(*inst);
if (!inst) {
pr_err("FAIL: could not allocate struct lkdtm_cb_ptr!\n");
return;
@@ -547,7 +547,7 @@ static void lkdtm_PTR_BOUNDS(void)
inst->len = element_count;
/* Double element_count */
- inst->extra = kzalloc_objs(*inst->extra, element_count * 2, GFP_KERNEL);
+ inst->extra = kzalloc_objs(*inst->extra, element_count * 2);
inst->nr_extra = element_count * 2;
pr_info("Pointer access within bounds ...\n");
diff --git a/drivers/misc/mei/bus.c b/drivers/misc/mei/bus.c
index fb311b6633d6..f739dbcdb04c 100644
--- a/drivers/misc/mei/bus.c
+++ b/drivers/misc/mei/bus.c
@@ -1363,7 +1363,7 @@ static struct mei_cl_device *mei_cl_bus_dev_alloc(struct mei_device *bus,
struct mei_cl_device *cldev;
struct mei_cl *cl;
- cldev = kzalloc_obj(*cldev, GFP_KERNEL);
+ cldev = kzalloc_obj(*cldev);
if (!cldev)
return NULL;
diff --git a/drivers/misc/mei/client.c b/drivers/misc/mei/client.c
index 2ad20921ffb7..643b0039cc72 100644
--- a/drivers/misc/mei/client.c
+++ b/drivers/misc/mei/client.c
@@ -370,7 +370,7 @@ static struct mei_cl_cb *mei_io_cb_init(struct mei_cl *cl,
{
struct mei_cl_cb *cb;
- cb = kzalloc_obj(*cb, GFP_KERNEL);
+ cb = kzalloc_obj(*cb);
if (!cb)
return NULL;
@@ -605,7 +605,7 @@ struct mei_cl *mei_cl_allocate(struct mei_device *dev)
{
struct mei_cl *cl;
- cl = kmalloc_obj(*cl, GFP_KERNEL);
+ cl = kmalloc_obj(*cl);
if (!cl)
return NULL;
@@ -1273,7 +1273,7 @@ struct mei_cl_vtag *mei_cl_vtag_alloc(struct file *fp, u8 vtag)
{
struct mei_cl_vtag *cl_vtag;
- cl_vtag = kzalloc_obj(*cl_vtag, GFP_KERNEL);
+ cl_vtag = kzalloc_obj(*cl_vtag);
if (!cl_vtag)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/misc/mei/gsc_proxy/mei_gsc_proxy.c b/drivers/misc/mei/gsc_proxy/mei_gsc_proxy.c
index 00467dc56b9b..a5a15a62a356 100644
--- a/drivers/misc/mei/gsc_proxy/mei_gsc_proxy.c
+++ b/drivers/misc/mei/gsc_proxy/mei_gsc_proxy.c
@@ -141,7 +141,7 @@ static int mei_gsc_proxy_probe(struct mei_cl_device *cldev,
goto enable_err_exit;
}
- comp_master = kzalloc_obj(*comp_master, GFP_KERNEL);
+ comp_master = kzalloc_obj(*comp_master);
if (!comp_master) {
ret = -ENOMEM;
goto err_exit;
diff --git a/drivers/misc/mei/hbm.c b/drivers/misc/mei/hbm.c
index 19db57456f2c..a864ac7121b2 100644
--- a/drivers/misc/mei/hbm.c
+++ b/drivers/misc/mei/hbm.c
@@ -409,7 +409,7 @@ static int mei_hbm_me_cl_add(struct mei_device *dev,
mei_me_cl_rm_by_uuid(dev, uuid);
- me_cl = kzalloc_obj(*me_cl, GFP_KERNEL);
+ me_cl = kzalloc_obj(*me_cl);
if (!me_cl)
return -ENOMEM;
diff --git a/drivers/misc/mei/hdcp/mei_hdcp.c b/drivers/misc/mei/hdcp/mei_hdcp.c
index 68cb4da376f9..d498ef5c2dc4 100644
--- a/drivers/misc/mei/hdcp/mei_hdcp.c
+++ b/drivers/misc/mei/hdcp/mei_hdcp.c
@@ -819,7 +819,7 @@ static int mei_hdcp_probe(struct mei_cl_device *cldev,
goto enable_err_exit;
}
- comp_arbiter = kzalloc_obj(*comp_arbiter, GFP_KERNEL);
+ comp_arbiter = kzalloc_obj(*comp_arbiter);
if (!comp_arbiter) {
ret = -ENOMEM;
goto err_exit;
diff --git a/drivers/misc/mei/pxp/mei_pxp.c b/drivers/misc/mei/pxp/mei_pxp.c
index b79573c32a4d..7c2629e12819 100644
--- a/drivers/misc/mei/pxp/mei_pxp.c
+++ b/drivers/misc/mei/pxp/mei_pxp.c
@@ -273,7 +273,7 @@ static int mei_pxp_probe(struct mei_cl_device *cldev,
goto enable_err_exit;
}
- comp_master = kzalloc_obj(*comp_master, GFP_KERNEL);
+ comp_master = kzalloc_obj(*comp_master);
if (!comp_master) {
ret = -ENOMEM;
goto err_exit;
diff --git a/drivers/misc/mei/vsc-fw-loader.c b/drivers/misc/mei/vsc-fw-loader.c
index dc32510c9ddb..7b347248921d 100644
--- a/drivers/misc/mei/vsc-fw-loader.c
+++ b/drivers/misc/mei/vsc-fw-loader.c
@@ -721,7 +721,7 @@ int vsc_tp_init(struct vsc_tp *tp, struct device *dev)
void *rx_buf __free(kfree) = NULL;
int ret;
- fw_loader = kzalloc_obj(*fw_loader, GFP_KERNEL);
+ fw_loader = kzalloc_obj(*fw_loader);
if (!fw_loader)
return -ENOMEM;
diff --git a/drivers/misc/ntsync.c b/drivers/misc/ntsync.c
index 727d9bbe1a29..ce217b1c3fdd 100644
--- a/drivers/misc/ntsync.c
+++ b/drivers/misc/ntsync.c
@@ -705,7 +705,7 @@ static struct ntsync_obj *ntsync_alloc_obj(struct ntsync_device *dev,
{
struct ntsync_obj *obj;
- obj = kzalloc_obj(*obj, GFP_KERNEL);
+ obj = kzalloc_obj(*obj);
if (!obj)
return NULL;
obj->type = type;
@@ -1145,7 +1145,7 @@ static int ntsync_char_open(struct inode *inode, struct file *file)
{
struct ntsync_device *dev;
- dev = kzalloc_obj(*dev, GFP_KERNEL);
+ dev = kzalloc_obj(*dev);
if (!dev)
return -ENOMEM;
diff --git a/drivers/misc/ocxl/afu_irq.c b/drivers/misc/ocxl/afu_irq.c
index 3969fc9d58e2..ade7913a35e1 100644
--- a/drivers/misc/ocxl/afu_irq.c
+++ b/drivers/misc/ocxl/afu_irq.c
@@ -107,7 +107,7 @@ int ocxl_afu_irq_alloc(struct ocxl_context *ctx, int *irq_id)
struct afu_irq *irq;
int rc;
- irq = kzalloc_obj(struct afu_irq, GFP_KERNEL);
+ irq = kzalloc_obj(struct afu_irq);
if (!irq)
return -ENOMEM;
diff --git a/drivers/misc/ocxl/context.c b/drivers/misc/ocxl/context.c
index 3ca1c442fb39..33f25be46247 100644
--- a/drivers/misc/ocxl/context.c
+++ b/drivers/misc/ocxl/context.c
@@ -10,7 +10,7 @@ int ocxl_context_alloc(struct ocxl_context **context, struct ocxl_afu *afu,
int pasid;
struct ocxl_context *ctx;
- ctx = kzalloc_obj(*ctx, GFP_KERNEL);
+ ctx = kzalloc_obj(*ctx);
if (!ctx)
return -ENOMEM;
diff --git a/drivers/misc/ocxl/core.c b/drivers/misc/ocxl/core.c
index 608ac6a2d855..92466b7fa954 100644
--- a/drivers/misc/ocxl/core.c
+++ b/drivers/misc/ocxl/core.c
@@ -17,7 +17,7 @@ static struct ocxl_afu *alloc_afu(struct ocxl_fn *fn)
{
struct ocxl_afu *afu;
- afu = kzalloc_obj(struct ocxl_afu, GFP_KERNEL);
+ afu = kzalloc_obj(struct ocxl_afu);
if (!afu)
return NULL;
@@ -300,7 +300,7 @@ static struct ocxl_fn *alloc_function(void)
{
struct ocxl_fn *fn;
- fn = kzalloc_obj(struct ocxl_fn, GFP_KERNEL);
+ fn = kzalloc_obj(struct ocxl_fn);
if (!fn)
return NULL;
diff --git a/drivers/misc/ocxl/file.c b/drivers/misc/ocxl/file.c
index fc03b82c3eb6..1abbde33e974 100644
--- a/drivers/misc/ocxl/file.c
+++ b/drivers/misc/ocxl/file.c
@@ -526,7 +526,7 @@ int ocxl_file_register_afu(struct ocxl_afu *afu)
struct ocxl_fn *fn = afu->fn;
struct pci_dev *pci_dev = to_pci_dev(fn->dev.parent);
- info = kzalloc_obj(*info, GFP_KERNEL);
+ info = kzalloc_obj(*info);
if (info == NULL)
return -ENOMEM;
diff --git a/drivers/misc/ocxl/link.c b/drivers/misc/ocxl/link.c
index c413d065abe7..7749dcd16117 100644
--- a/drivers/misc/ocxl/link.c
+++ b/drivers/misc/ocxl/link.c
@@ -345,7 +345,7 @@ static int alloc_spa(struct pci_dev *dev, struct ocxl_link *link)
{
struct spa *spa;
- spa = kzalloc_obj(struct spa, GFP_KERNEL);
+ spa = kzalloc_obj(struct spa);
if (!spa)
return -ENOMEM;
@@ -387,7 +387,7 @@ static int alloc_link(struct pci_dev *dev, int PE_mask, struct ocxl_link **out_l
struct ocxl_link *link;
int rc;
- link = kzalloc_obj(struct ocxl_link, GFP_KERNEL);
+ link = kzalloc_obj(struct ocxl_link);
if (!link)
return -ENOMEM;
@@ -559,7 +559,7 @@ int ocxl_link_add_pe(void *link_handle, int pasid, u32 pidr, u32 tidr,
goto unlock;
}
- pe_data = kmalloc_obj(*pe_data, GFP_KERNEL);
+ pe_data = kmalloc_obj(*pe_data);
if (!pe_data) {
rc = -ENOMEM;
goto unlock;
diff --git a/drivers/misc/ocxl/pasid.c b/drivers/misc/ocxl/pasid.c
index 677870f49290..c9a50eb926da 100644
--- a/drivers/misc/ocxl/pasid.c
+++ b/drivers/misc/ocxl/pasid.c
@@ -28,7 +28,7 @@ static int range_alloc(struct list_head *head, u32 size, int max_id,
struct id_range *cur, *new;
int rc, last_end;
- new = kmalloc_obj(struct id_range, GFP_KERNEL);
+ new = kmalloc_obj(struct id_range);
if (!new)
return -ENOMEM;
diff --git a/drivers/misc/pch_phub.c b/drivers/misc/pch_phub.c
index c69a88a09332..fd147fd2800f 100644
--- a/drivers/misc/pch_phub.c
+++ b/drivers/misc/pch_phub.c
@@ -666,7 +666,7 @@ static int pch_phub_probe(struct pci_dev *pdev,
int ret;
struct pch_phub_reg *chip;
- chip = kzalloc_obj(struct pch_phub_reg, GFP_KERNEL);
+ chip = kzalloc_obj(struct pch_phub_reg);
if (chip == NULL)
return -ENOMEM;
diff --git a/drivers/misc/phantom.c b/drivers/misc/phantom.c
index cb7f7d9243d3..34a5054a6b40 100644
--- a/drivers/misc/phantom.c
+++ b/drivers/misc/phantom.c
@@ -362,7 +362,7 @@ static int phantom_probe(struct pci_dev *pdev,
}
retval = -ENOMEM;
- pht = kzalloc_obj(*pht, GFP_KERNEL);
+ pht = kzalloc_obj(*pht);
if (pht == NULL) {
dev_err(&pdev->dev, "unable to allocate device\n");
goto err_reg;
diff --git a/drivers/misc/rpmb-core.c b/drivers/misc/rpmb-core.c
index 2bd557665d1a..ecf14acf230a 100644
--- a/drivers/misc/rpmb-core.c
+++ b/drivers/misc/rpmb-core.c
@@ -161,7 +161,7 @@ struct rpmb_dev *rpmb_dev_register(struct device *dev,
!descr->dev_id_len)
return ERR_PTR(-EINVAL);
- rdev = kzalloc_obj(*rdev, GFP_KERNEL);
+ rdev = kzalloc_obj(*rdev);
if (!rdev)
return ERR_PTR(-ENOMEM);
rdev->descr = *descr;
diff --git a/drivers/misc/sgi-gru/grumain.c b/drivers/misc/sgi-gru/grumain.c
index 171d38913dcf..8d749f345246 100644
--- a/drivers/misc/sgi-gru/grumain.c
+++ b/drivers/misc/sgi-gru/grumain.c
@@ -356,7 +356,7 @@ struct gru_vma_data *gru_alloc_vma_data(struct vm_area_struct *vma, int tsid)
{
struct gru_vma_data *vdata = NULL;
- vdata = kmalloc_obj(*vdata, GFP_KERNEL);
+ vdata = kmalloc_obj(*vdata);
if (!vdata)
return NULL;
diff --git a/drivers/misc/sgi-gru/grutlbpurge.c b/drivers/misc/sgi-gru/grutlbpurge.c
index 1bb07781a105..a8121d40be68 100644
--- a/drivers/misc/sgi-gru/grutlbpurge.c
+++ b/drivers/misc/sgi-gru/grutlbpurge.c
@@ -237,7 +237,7 @@ static struct mmu_notifier *gru_alloc_notifier(struct mm_struct *mm)
{
struct gru_mm_struct *gms;
- gms = kzalloc_obj(*gms, GFP_KERNEL);
+ gms = kzalloc_obj(*gms);
if (!gms)
return ERR_PTR(-ENOMEM);
STAT(gms_alloc);
diff --git a/drivers/misc/sgi-xp/xpc_uv.c b/drivers/misc/sgi-xp/xpc_uv.c
index ccd3047580c5..f23ec2bb03bf 100644
--- a/drivers/misc/sgi-xp/xpc_uv.c
+++ b/drivers/misc/sgi-xp/xpc_uv.c
@@ -147,7 +147,7 @@ xpc_create_gru_mq_uv(unsigned int mq_size, int cpu, char *irq_name,
struct xpc_gru_mq_uv *mq;
struct uv_IO_APIC_route_entry *mmr_value;
- mq = kmalloc_obj(struct xpc_gru_mq_uv, GFP_KERNEL);
+ mq = kmalloc_obj(struct xpc_gru_mq_uv);
if (mq == NULL) {
dev_err(xpc_part, "xpc_create_gru_mq_uv() failed to kmalloc() "
"a xpc_gru_mq_uv structure\n");
@@ -155,7 +155,7 @@ xpc_create_gru_mq_uv(unsigned int mq_size, int cpu, char *irq_name,
goto out_0;
}
- mq->gru_mq_desc = kzalloc_obj(struct gru_message_queue_desc, GFP_KERNEL);
+ mq->gru_mq_desc = kzalloc_obj(struct gru_message_queue_desc);
if (mq->gru_mq_desc == NULL) {
dev_err(xpc_part, "xpc_create_gru_mq_uv() failed to kmalloc() "
"a gru_message_queue_desc structure\n");
diff --git a/drivers/misc/sram.c b/drivers/misc/sram.c
index 39b38d639638..1919d24c8236 100644
--- a/drivers/misc/sram.c
+++ b/drivers/misc/sram.c
@@ -191,7 +191,7 @@ static int sram_reserve_regions(struct sram_dev *sram, struct resource *res)
* after the reserved blocks from the dt are processed.
*/
nblocks = (np) ? of_get_available_child_count(np) + 1 : 1;
- rblocks = kzalloc_objs(*rblocks, nblocks, GFP_KERNEL);
+ rblocks = kzalloc_objs(*rblocks, nblocks);
if (!rblocks)
return -ENOMEM;
diff --git a/drivers/misc/tifm_core.c b/drivers/misc/tifm_core.c
index 96ad091089a7..1a49483297a9 100644
--- a/drivers/misc/tifm_core.c
+++ b/drivers/misc/tifm_core.c
@@ -252,7 +252,7 @@ struct tifm_dev *tifm_alloc_device(struct tifm_adapter *fm, unsigned int id,
if (!tifm_media_type_name(type, 0))
return sock;
- sock = kzalloc_obj(struct tifm_dev, GFP_KERNEL);
+ sock = kzalloc_obj(struct tifm_dev);
if (sock) {
spin_lock_init(&sock->lock);
sock->type = type;
diff --git a/drivers/misc/tsl2550.c b/drivers/misc/tsl2550.c
index 8f592afe1a32..03f19eda641e 100644
--- a/drivers/misc/tsl2550.c
+++ b/drivers/misc/tsl2550.c
@@ -343,7 +343,7 @@ static int tsl2550_probe(struct i2c_client *client)
goto exit;
}
- data = kzalloc_obj(struct tsl2550_data, GFP_KERNEL);
+ data = kzalloc_obj(struct tsl2550_data);
if (!data) {
err = -ENOMEM;
goto exit;
diff --git a/drivers/misc/uacce/uacce.c b/drivers/misc/uacce/uacce.c
index 55735335ce12..45521d4a56d1 100644
--- a/drivers/misc/uacce/uacce.c
+++ b/drivers/misc/uacce/uacce.c
@@ -158,7 +158,7 @@ static int uacce_fops_open(struct inode *inode, struct file *filep)
if (!uacce)
return -ENODEV;
- q = kzalloc_obj(struct uacce_queue, GFP_KERNEL);
+ q = kzalloc_obj(struct uacce_queue);
if (!q)
return -ENOMEM;
@@ -251,7 +251,7 @@ static int uacce_fops_mmap(struct file *filep, struct vm_area_struct *vma)
else
return -EINVAL;
- qfr = kzalloc_obj(*qfr, GFP_KERNEL);
+ qfr = kzalloc_obj(*qfr);
if (!qfr)
return -ENOMEM;
@@ -506,7 +506,7 @@ struct uacce_device *uacce_alloc(struct device *parent,
struct uacce_device *uacce;
int ret;
- uacce = kzalloc_obj(struct uacce_device, GFP_KERNEL);
+ uacce = kzalloc_obj(struct uacce_device);
if (!uacce)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/misc/vmw_balloon.c b/drivers/misc/vmw_balloon.c
index 5ae13779bd1a..3edb934dd7fd 100644
--- a/drivers/misc/vmw_balloon.c
+++ b/drivers/misc/vmw_balloon.c
@@ -1616,7 +1616,7 @@ static int vmballoon_enable_stats(struct vmballoon *b)
if (b->stats)
goto out;
- b->stats = kzalloc_obj(*b->stats, GFP_KERNEL);
+ b->stats = kzalloc_obj(*b->stats);
if (!b->stats) {
/* allocation failed */
diff --git a/drivers/misc/vmw_vmci/vmci_context.c b/drivers/misc/vmw_vmci/vmci_context.c
index 0a87d5430385..19ca00feed6e 100644
--- a/drivers/misc/vmw_vmci/vmci_context.c
+++ b/drivers/misc/vmw_vmci/vmci_context.c
@@ -104,7 +104,7 @@ struct vmci_ctx *vmci_ctx_create(u32 cid, u32 priv_flags,
goto err_out;
}
- context = kzalloc_obj(*context, GFP_KERNEL);
+ context = kzalloc_obj(*context);
if (!context) {
pr_warn("Failed to allocate memory for VMCI context\n");
error = -ENOMEM;
@@ -294,7 +294,7 @@ int vmci_ctx_enqueue_datagram(u32 cid, struct vmci_datagram *dg)
}
/* Allocate guest call entry and add it to the target VM's queue. */
- dq_entry = kmalloc_obj(*dq_entry, GFP_KERNEL);
+ dq_entry = kmalloc_obj(*dq_entry);
if (dq_entry == NULL) {
pr_warn("Failed to allocate memory for datagram\n");
vmci_ctx_put(context);
@@ -598,7 +598,7 @@ int vmci_ctx_add_notification(u32 context_id, u32 remote_cid)
goto out;
}
- notifier = kmalloc_obj(struct vmci_handle_list, GFP_KERNEL);
+ notifier = kmalloc_obj(struct vmci_handle_list);
if (!notifier) {
result = VMCI_ERROR_NO_MEM;
goto out;
diff --git a/drivers/misc/vmw_vmci/vmci_datagram.c b/drivers/misc/vmw_vmci/vmci_datagram.c
index 1a276717e20a..6193a22c3ab5 100644
--- a/drivers/misc/vmw_vmci/vmci_datagram.c
+++ b/drivers/misc/vmw_vmci/vmci_datagram.c
@@ -71,7 +71,7 @@ static int dg_create_handle(u32 resource_id,
handle = vmci_make_handle(context_id, resource_id);
- entry = kmalloc_obj(*entry, GFP_KERNEL);
+ entry = kmalloc_obj(*entry);
if (!entry) {
pr_warn("Failed allocating memory for datagram entry\n");
return VMCI_ERROR_NO_MEM;
diff --git a/drivers/misc/vmw_vmci/vmci_doorbell.c b/drivers/misc/vmw_vmci/vmci_doorbell.c
index c2db2d4ab7f6..30303e0f5f68 100644
--- a/drivers/misc/vmw_vmci/vmci_doorbell.c
+++ b/drivers/misc/vmw_vmci/vmci_doorbell.c
@@ -402,7 +402,7 @@ int vmci_doorbell_create(struct vmci_handle *handle,
priv_flags & ~VMCI_PRIVILEGE_ALL_FLAGS)
return VMCI_ERROR_INVALID_ARGS;
- entry = kmalloc_obj(*entry, GFP_KERNEL);
+ entry = kmalloc_obj(*entry);
if (entry == NULL) {
pr_warn("Failed allocating memory for datagram entry\n");
return VMCI_ERROR_NO_MEM;
diff --git a/drivers/misc/vmw_vmci/vmci_event.c b/drivers/misc/vmw_vmci/vmci_event.c
index 85dc12860f17..fffe068a26eb 100644
--- a/drivers/misc/vmw_vmci/vmci_event.c
+++ b/drivers/misc/vmw_vmci/vmci_event.c
@@ -151,7 +151,7 @@ int vmci_event_subscribe(u32 event,
return VMCI_ERROR_INVALID_ARGS;
}
- sub = kzalloc_obj(*sub, GFP_KERNEL);
+ sub = kzalloc_obj(*sub);
if (!sub)
return VMCI_ERROR_NO_MEM;
diff --git a/drivers/misc/vmw_vmci/vmci_host.c b/drivers/misc/vmw_vmci/vmci_host.c
index 88fea05203d5..b71ca1bf0a20 100644
--- a/drivers/misc/vmw_vmci/vmci_host.c
+++ b/drivers/misc/vmw_vmci/vmci_host.c
@@ -120,7 +120,7 @@ static int vmci_host_open(struct inode *inode, struct file *filp)
{
struct vmci_host_dev *vmci_host_dev;
- vmci_host_dev = kzalloc_obj(struct vmci_host_dev, GFP_KERNEL);
+ vmci_host_dev = kzalloc_obj(struct vmci_host_dev);
if (vmci_host_dev == NULL)
return -ENOMEM;
diff --git a/drivers/misc/vmw_vmci/vmci_queue_pair.c b/drivers/misc/vmw_vmci/vmci_queue_pair.c
index d2a7f79f4e8d..872aad355dbe 100644
--- a/drivers/misc/vmw_vmci/vmci_queue_pair.c
+++ b/drivers/misc/vmw_vmci/vmci_queue_pair.c
@@ -895,7 +895,7 @@ qp_guest_endpoint_create(struct vmci_handle handle,
handle = vmci_make_handle(context_id, VMCI_INVALID_ID);
}
- entry = kzalloc_obj(*entry, GFP_KERNEL);
+ entry = kzalloc_obj(*entry);
if (entry) {
entry->qp.peer = peer;
entry->qp.flags = flags;
@@ -2722,7 +2722,7 @@ int vmci_qpair_alloc(struct vmci_qp **qpair,
return VMCI_ERROR_INVALID_ARGS;
}
- my_qpair = kzalloc_obj(*my_qpair, GFP_KERNEL);
+ my_qpair = kzalloc_obj(*my_qpair);
if (!my_qpair)
return VMCI_ERROR_NO_MEM;
diff --git a/drivers/mmc/core/block.c b/drivers/mmc/core/block.c
index b39cd61cea44..05ee76cb0a08 100644
--- a/drivers/mmc/core/block.c
+++ b/drivers/mmc/core/block.c
@@ -422,7 +422,7 @@ static struct mmc_blk_ioc_data *mmc_blk_ioctl_copy_from_user(
struct mmc_blk_ioc_data *idata;
int err;
- idata = kzalloc_obj(*idata, GFP_KERNEL);
+ idata = kzalloc_obj(*idata);
if (!idata) {
err = -ENOMEM;
goto out;
@@ -737,7 +737,7 @@ static int mmc_blk_ioctl_multi_cmd(struct mmc_blk_data *md,
return -EINVAL;
n = num_of_cmds;
- idata = kzalloc_objs(*idata, n, GFP_KERNEL);
+ idata = kzalloc_objs(*idata, n);
if (!idata)
return -ENOMEM;
@@ -2562,7 +2562,7 @@ static struct mmc_blk_data *mmc_blk_alloc_req(struct mmc_card *card,
return ERR_PTR(devidx);
}
- md = kzalloc_obj(*md, GFP_KERNEL);
+ md = kzalloc_obj(*md);
if (!md) {
ret = -ENOMEM;
goto out;
@@ -2794,12 +2794,12 @@ static struct mmc_blk_ioc_data **alloc_idata(struct mmc_rpmb_data *rpmb,
struct mmc_blk_ioc_data **idata;
unsigned int n;
- idata = kzalloc_objs(*idata, cmd_count, GFP_KERNEL);
+ idata = kzalloc_objs(*idata, cmd_count);
if (!idata)
return NULL;
for (n = 0; n < cmd_count; n++) {
- idata[n] = kzalloc_objs(**idata, 1, GFP_KERNEL);
+ idata[n] = kzalloc_objs(**idata, 1);
if (!idata[n]) {
free_idata(idata, n);
return NULL;
@@ -2942,7 +2942,7 @@ static int mmc_blk_alloc_rpmb_part(struct mmc_card *card,
if (devidx < 0)
return devidx;
- rpmb = kzalloc_obj(*rpmb, GFP_KERNEL);
+ rpmb = kzalloc_obj(*rpmb);
if (!rpmb) {
ida_free(&mmc_rpmb_ida, devidx);
return -ENOMEM;
diff --git a/drivers/mmc/core/bus.c b/drivers/mmc/core/bus.c
index 740b082da3e2..be5cf338bdeb 100644
--- a/drivers/mmc/core/bus.c
+++ b/drivers/mmc/core/bus.c
@@ -279,7 +279,7 @@ struct mmc_card *mmc_alloc_card(struct mmc_host *host, const struct device_type
{
struct mmc_card *card;
- card = kzalloc_obj(struct mmc_card, GFP_KERNEL);
+ card = kzalloc_obj(struct mmc_card);
if (!card)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/mmc/core/mmc_test.c b/drivers/mmc/core/mmc_test.c
index 70cc83a8a1ee..43fdb67d5407 100644
--- a/drivers/mmc/core/mmc_test.c
+++ b/drivers/mmc/core/mmc_test.c
@@ -348,11 +348,11 @@ static struct mmc_test_mem *mmc_test_alloc_mem(unsigned long min_sz,
if (max_segs > max_page_cnt)
max_segs = max_page_cnt;
- mem = kzalloc_obj(*mem, GFP_KERNEL);
+ mem = kzalloc_obj(*mem);
if (!mem)
return NULL;
- mem->arr = kzalloc_objs(*mem->arr, max_segs, GFP_KERNEL);
+ mem->arr = kzalloc_objs(*mem->arr, max_segs);
if (!mem->arr)
goto out_free;
@@ -533,7 +533,7 @@ static void mmc_test_save_transfer_result(struct mmc_test_card *test,
if (!test->gr)
return;
- tr = kmalloc_obj(*tr, GFP_KERNEL);
+ tr = kmalloc_obj(*tr);
if (!tr)
return;
@@ -765,7 +765,7 @@ static void mmc_test_req_reset(struct mmc_test_req *rq)
static struct mmc_test_req *mmc_test_req_alloc(void)
{
- struct mmc_test_req *rq = kmalloc_obj(*rq, GFP_KERNEL);
+ struct mmc_test_req *rq = kmalloc_obj(*rq);
if (rq)
mmc_test_req_reset(rq);
@@ -1570,13 +1570,13 @@ static int mmc_test_area_init(struct mmc_test_card *test, int erase, int fill)
if (!t->mem)
return -ENOMEM;
- t->sg = kmalloc_objs(*t->sg, t->max_segs, GFP_KERNEL);
+ t->sg = kmalloc_objs(*t->sg, t->max_segs);
if (!t->sg) {
ret = -ENOMEM;
goto out_free;
}
- t->sg_areq = kmalloc_objs(*t->sg_areq, t->max_segs, GFP_KERNEL);
+ t->sg_areq = kmalloc_objs(*t->sg_areq, t->max_segs);
if (!t->sg_areq) {
ret = -ENOMEM;
goto out_free;
@@ -2967,7 +2967,7 @@ static void mmc_test_run(struct mmc_test_card *test, int testcase)
}
}
- gr = kzalloc_obj(*gr, GFP_KERNEL);
+ gr = kzalloc_obj(*gr);
if (gr) {
INIT_LIST_HEAD(&gr->tr_lst);
@@ -3099,7 +3099,7 @@ static ssize_t mtf_test_write(struct file *file, const char __user *buf,
if (ret)
return ret;
- test = kzalloc_obj(*test, GFP_KERNEL);
+ test = kzalloc_obj(*test);
if (!test)
return -ENOMEM;
@@ -3188,7 +3188,7 @@ static int __mmc_test_register_dbgfs_file(struct mmc_card *card,
file = debugfs_create_file(name, mode, card->debugfs_root,
card, fops);
- df = kmalloc_obj(*df, GFP_KERNEL);
+ df = kmalloc_obj(*df);
if (!df) {
debugfs_remove(file);
return -ENOMEM;
diff --git a/drivers/mmc/core/sdio_bus.c b/drivers/mmc/core/sdio_bus.c
index 060da5c4ea75..4b07098c33c3 100644
--- a/drivers/mmc/core/sdio_bus.c
+++ b/drivers/mmc/core/sdio_bus.c
@@ -337,7 +337,7 @@ struct sdio_func *sdio_alloc_func(struct mmc_card *card)
{
struct sdio_func *func;
- func = kzalloc_obj(struct sdio_func, GFP_KERNEL);
+ func = kzalloc_obj(struct sdio_func);
if (!func)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/mmc/core/sdio_uart.c b/drivers/mmc/core/sdio_uart.c
index a37d91347931..7fd5dedf3ac0 100644
--- a/drivers/mmc/core/sdio_uart.c
+++ b/drivers/mmc/core/sdio_uart.c
@@ -1021,7 +1021,7 @@ static int sdio_uart_probe(struct sdio_func *func,
struct sdio_uart_port *port;
int ret;
- port = kzalloc_obj(struct sdio_uart_port, GFP_KERNEL);
+ port = kzalloc_obj(struct sdio_uart_port);
if (!port)
return -ENOMEM;
diff --git a/drivers/mmc/host/dw_mmc-rockchip.c b/drivers/mmc/host/dw_mmc-rockchip.c
index 2a2aee4054f7..4e3423a19bdf 100644
--- a/drivers/mmc/host/dw_mmc-rockchip.c
+++ b/drivers/mmc/host/dw_mmc-rockchip.c
@@ -306,7 +306,7 @@ static int dw_mci_rk3288_execute_tuning(struct dw_mci_slot *slot, u32 opcode)
return -EIO;
}
- ranges = kmalloc_objs(*ranges, priv->num_phases / 2 + 1, GFP_KERNEL);
+ ranges = kmalloc_objs(*ranges, priv->num_phases / 2 + 1);
if (!ranges)
return -ENOMEM;
diff --git a/drivers/mmc/host/dw_mmc.c b/drivers/mmc/host/dw_mmc.c
index 1e0c3904cded..07eb9f23b9d6 100644
--- a/drivers/mmc/host/dw_mmc.c
+++ b/drivers/mmc/host/dw_mmc.c
@@ -834,7 +834,7 @@ static int dw_mci_edmac_start_dma(struct dw_mci *host,
static int dw_mci_edmac_init(struct dw_mci *host)
{
/* Request external dma channel */
- host->dms = kzalloc_obj(struct dw_mci_dma_slave, GFP_KERNEL);
+ host->dms = kzalloc_obj(struct dw_mci_dma_slave);
if (!host->dms)
return -ENOMEM;
diff --git a/drivers/mmc/host/mmc_spi.c b/drivers/mmc/host/mmc_spi.c
index 8ab52b4de02e..b471a7795b4d 100644
--- a/drivers/mmc/host/mmc_spi.c
+++ b/drivers/mmc/host/mmc_spi.c
@@ -1236,7 +1236,7 @@ static int mmc_spi_probe(struct spi_device *spi)
}
/* Preallocate buffers */
- host->data = kmalloc_obj(*host->data, GFP_KERNEL);
+ host->data = kmalloc_obj(*host->data);
if (!host->data)
goto fail_nobuf1;
diff --git a/drivers/mmc/host/of_mmc_spi.c b/drivers/mmc/host/of_mmc_spi.c
index d3137d23533c..8131a1703f28 100644
--- a/drivers/mmc/host/of_mmc_spi.c
+++ b/drivers/mmc/host/of_mmc_spi.c
@@ -57,7 +57,7 @@ struct mmc_spi_platform_data *mmc_spi_get_pdata(struct spi_device *spi)
if (dev->platform_data || !dev_fwnode(dev))
return dev->platform_data;
- oms = kzalloc_obj(*oms, GFP_KERNEL);
+ oms = kzalloc_obj(*oms);
if (!oms)
return NULL;
diff --git a/drivers/mmc/host/ushc.c b/drivers/mmc/host/ushc.c
index 6a4274bac5c0..7e8af5a06ac9 100644
--- a/drivers/mmc/host/ushc.c
+++ b/drivers/mmc/host/ushc.c
@@ -462,7 +462,7 @@ static int ushc_probe(struct usb_interface *intf, const struct usb_device_id *id
ret = -ENOMEM;
goto err;
}
- ushc->int_data = kzalloc_obj(struct ushc_int_data, GFP_KERNEL);
+ ushc->int_data = kzalloc_obj(struct ushc_int_data);
if (ushc->int_data == NULL) {
ret = -ENOMEM;
goto err;
@@ -479,7 +479,7 @@ static int ushc_probe(struct usb_interface *intf, const struct usb_device_id *id
ret = -ENOMEM;
goto err;
}
- ushc->cbw = kzalloc_obj(struct ushc_cbw, GFP_KERNEL);
+ ushc->cbw = kzalloc_obj(struct ushc_cbw);
if (ushc->cbw == NULL) {
ret = -ENOMEM;
goto err;
@@ -501,7 +501,7 @@ static int ushc_probe(struct usb_interface *intf, const struct usb_device_id *id
ret = -ENOMEM;
goto err;
}
- ushc->csw = kzalloc_obj(struct ushc_csw, GFP_KERNEL);
+ ushc->csw = kzalloc_obj(struct ushc_csw);
if (ushc->csw == NULL) {
ret = -ENOMEM;
goto err;
diff --git a/drivers/most/configfs.c b/drivers/most/configfs.c
index 03b977a4c070..8f5158d95bc3 100644
--- a/drivers/most/configfs.c
+++ b/drivers/most/configfs.c
@@ -426,7 +426,7 @@ static struct config_item *most_common_make_item(struct config_group *group,
struct mdev_link *mdev_link;
struct most_common *mc = to_most_common(group->cg_subsys);
- mdev_link = kzalloc_obj(*mdev_link, GFP_KERNEL);
+ mdev_link = kzalloc_obj(*mdev_link);
if (!mdev_link)
return ERR_PTR(-ENOMEM);
@@ -526,7 +526,7 @@ static struct config_item *most_snd_grp_make_item(struct config_group *group,
{
struct mdev_link *mdev_link;
- mdev_link = kzalloc_obj(*mdev_link, GFP_KERNEL);
+ mdev_link = kzalloc_obj(*mdev_link);
if (!mdev_link)
return ERR_PTR(-ENOMEM);
@@ -607,7 +607,7 @@ static struct config_group *most_sound_make_group(struct config_group *group,
}
if (!try_module_get(ms->mod))
return ERR_PTR(-ENOLCK);
- most = kzalloc_obj(*most, GFP_KERNEL);
+ most = kzalloc_obj(*most);
if (!most) {
module_put(ms->mod);
return ERR_PTR(-ENOMEM);
diff --git a/drivers/most/core.c b/drivers/most/core.c
index 3bbe8bed402a..c2616da8bceb 100644
--- a/drivers/most/core.c
+++ b/drivers/most/core.c
@@ -880,7 +880,7 @@ static int arm_mbo_chain(struct most_channel *c, int dir,
atomic_set(&c->mbo_nq_level, 0);
for (i = 0; i < c->cfg.num_buffers; i++) {
- mbo = kzalloc_obj(*mbo, GFP_KERNEL);
+ mbo = kzalloc_obj(*mbo);
if (!mbo)
goto flush_fifos;
@@ -1300,7 +1300,7 @@ int most_register_interface(struct most_interface *iface)
return id;
}
- iface->p = kzalloc_obj(*iface->p, GFP_KERNEL);
+ iface->p = kzalloc_obj(*iface->p);
if (!iface->p) {
ida_free(&mdev_id, id);
put_device(iface->dev);
@@ -1324,7 +1324,7 @@ int most_register_interface(struct most_interface *iface)
for (i = 0; i < iface->num_channels; i++) {
const char *name_suffix = iface->channel_vector[i].name_suffix;
- c = kzalloc_obj(*c, GFP_KERNEL);
+ c = kzalloc_obj(*c);
if (!c)
goto err_free_resources;
if (!name_suffix)
diff --git a/drivers/most/most_cdev.c b/drivers/most/most_cdev.c
index 87f770b03466..b31dc824466f 100644
--- a/drivers/most/most_cdev.c
+++ b/drivers/most/most_cdev.c
@@ -429,7 +429,7 @@ static int comp_probe(struct most_interface *iface, int channel_id,
if (current_minor < 0)
return current_minor;
- c = kzalloc_obj(*c, GFP_KERNEL);
+ c = kzalloc_obj(*c);
if (!c) {
retval = -ENOMEM;
goto err_remove_ida;
diff --git a/drivers/most/most_snd.c b/drivers/most/most_snd.c
index ffd51f2d0d9b..68b9e6c64033 100644
--- a/drivers/most/most_snd.c
+++ b/drivers/most/most_snd.c
@@ -542,7 +542,7 @@ static int audio_probe_channel(struct most_interface *iface, int channel_id,
adpt->pcm_dev_idx++;
goto skip_adpt_alloc;
}
- adpt = kzalloc_obj(*adpt, GFP_KERNEL);
+ adpt = kzalloc_obj(*adpt);
if (!adpt)
return -ENOMEM;
@@ -574,7 +574,7 @@ static int audio_probe_channel(struct most_interface *iface, int channel_id,
capture_count = 1;
direction = SNDRV_PCM_STREAM_CAPTURE;
}
- channel = kzalloc_obj(*channel, GFP_KERNEL);
+ channel = kzalloc_obj(*channel);
if (!channel) {
ret = -ENOMEM;
goto err_free_adpt;
diff --git a/drivers/most/most_usb.c b/drivers/most/most_usb.c
index 0c61d023ac0a..d2c0875727a3 100644
--- a/drivers/most/most_usb.c
+++ b/drivers/most/most_usb.c
@@ -142,7 +142,7 @@ static inline int drci_rd_reg(struct usb_device *dev, u16 reg, u16 *buf)
__le16 *dma_buf;
u8 req_type = USB_DIR_IN | USB_TYPE_VENDOR | USB_RECIP_DEVICE;
- dma_buf = kzalloc_obj(*dma_buf, GFP_KERNEL);
+ dma_buf = kzalloc_obj(*dma_buf);
if (!dma_buf)
return -ENOMEM;
@@ -960,7 +960,7 @@ hdm_probe(struct usb_interface *interface, const struct usb_device_id *id)
struct usb_endpoint_descriptor *ep_desc;
int ret = -ENOMEM;
- mdev = kzalloc_obj(*mdev, GFP_KERNEL);
+ mdev = kzalloc_obj(*mdev);
if (!mdev)
return -ENOMEM;
@@ -1000,11 +1000,11 @@ hdm_probe(struct usb_interface *interface, const struct usb_device_id *id)
mdev->dev.init_name = mdev->description;
mdev->dev.parent = &interface->dev;
mdev->dev.release = release_mdev;
- mdev->conf = kzalloc_objs(*mdev->conf, num_endpoints, GFP_KERNEL);
+ mdev->conf = kzalloc_objs(*mdev->conf, num_endpoints);
if (!mdev->conf)
goto err_free_mdev;
- mdev->cap = kzalloc_objs(*mdev->cap, num_endpoints, GFP_KERNEL);
+ mdev->cap = kzalloc_objs(*mdev->cap, num_endpoints);
if (!mdev->cap)
goto err_free_conf;
@@ -1015,7 +1015,7 @@ hdm_probe(struct usb_interface *interface, const struct usb_device_id *id)
goto err_free_cap;
mdev->busy_urbs =
- kzalloc_objs(*mdev->busy_urbs, num_endpoints, GFP_KERNEL);
+ kzalloc_objs(*mdev->busy_urbs, num_endpoints);
if (!mdev->busy_urbs)
goto err_free_ep_address;
@@ -1064,7 +1064,7 @@ hdm_probe(struct usb_interface *interface, const struct usb_device_id *id)
if (le16_to_cpu(usb_dev->descriptor.idProduct) == USB_DEV_ID_OS81118 ||
le16_to_cpu(usb_dev->descriptor.idProduct) == USB_DEV_ID_OS81119 ||
le16_to_cpu(usb_dev->descriptor.idProduct) == USB_DEV_ID_OS81210) {
- mdev->dci = kzalloc_obj(*mdev->dci, GFP_KERNEL);
+ mdev->dci = kzalloc_obj(*mdev->dci);
if (!mdev->dci) {
mutex_unlock(&mdev->io_mutex);
most_deregister_interface(&mdev->iface);
diff --git a/drivers/mtd/chips/cfi_cmdset_0001.c b/drivers/mtd/chips/cfi_cmdset_0001.c
index 9a54e390cd44..277a03924b2f 100644
--- a/drivers/mtd/chips/cfi_cmdset_0001.c
+++ b/drivers/mtd/chips/cfi_cmdset_0001.c
@@ -501,7 +501,7 @@ struct mtd_info *cfi_cmdset_0001(struct map_info *map, int primary)
struct mtd_info *mtd;
int i;
- mtd = kzalloc_obj(*mtd, GFP_KERNEL);
+ mtd = kzalloc_obj(*mtd);
if (!mtd)
return NULL;
mtd->priv = map;
diff --git a/drivers/mtd/chips/cfi_cmdset_0002.c b/drivers/mtd/chips/cfi_cmdset_0002.c
index efb3ba02432e..63294a99d8fc 100644
--- a/drivers/mtd/chips/cfi_cmdset_0002.c
+++ b/drivers/mtd/chips/cfi_cmdset_0002.c
@@ -604,7 +604,7 @@ struct mtd_info *cfi_cmdset_0002(struct map_info *map, int primary)
struct mtd_info *mtd;
int i;
- mtd = kzalloc_obj(*mtd, GFP_KERNEL);
+ mtd = kzalloc_obj(*mtd);
if (!mtd)
return NULL;
mtd->priv = map;
@@ -2818,7 +2818,7 @@ static int __maybe_unused cfi_ppb_unlock(struct mtd_info *mtd, loff_t ofs,
for (i = 0; i < mtd->numeraseregions; i++)
max_sectors += regions[i].numblocks;
- sect = kzalloc_objs(struct ppb_lock, max_sectors, GFP_KERNEL);
+ sect = kzalloc_objs(struct ppb_lock, max_sectors);
if (!sect)
return -ENOMEM;
diff --git a/drivers/mtd/chips/cfi_cmdset_0020.c b/drivers/mtd/chips/cfi_cmdset_0020.c
index 5665d3b72da1..a0e7d8a960c5 100644
--- a/drivers/mtd/chips/cfi_cmdset_0020.c
+++ b/drivers/mtd/chips/cfi_cmdset_0020.c
@@ -172,7 +172,7 @@ static struct mtd_info *cfi_staa_setup(struct map_info *map)
int i,j;
unsigned long devsize = (1<<cfi->cfiq->DevSize) * cfi->interleave;
- mtd = kzalloc_obj(*mtd, GFP_KERNEL);
+ mtd = kzalloc_obj(*mtd);
//printk(KERN_DEBUG "number of CFI chips: %d\n", cfi->numchips);
if (!mtd) {
diff --git a/drivers/mtd/chips/map_absent.c b/drivers/mtd/chips/map_absent.c
index 6a9bd84a6def..1804a44b3eab 100644
--- a/drivers/mtd/chips/map_absent.c
+++ b/drivers/mtd/chips/map_absent.c
@@ -46,7 +46,7 @@ static struct mtd_info *map_absent_probe(struct map_info *map)
{
struct mtd_info *mtd;
- mtd = kzalloc_obj(*mtd, GFP_KERNEL);
+ mtd = kzalloc_obj(*mtd);
if (!mtd) {
return NULL;
}
diff --git a/drivers/mtd/chips/map_ram.c b/drivers/mtd/chips/map_ram.c
index f94d20672423..2dde70e742c5 100644
--- a/drivers/mtd/chips/map_ram.c
+++ b/drivers/mtd/chips/map_ram.c
@@ -57,7 +57,7 @@ static struct mtd_info *map_ram_probe(struct map_info *map)
#endif
/* OK. It seems to be RAM. */
- mtd = kzalloc_obj(*mtd, GFP_KERNEL);
+ mtd = kzalloc_obj(*mtd);
if (!mtd)
return NULL;
diff --git a/drivers/mtd/chips/map_rom.c b/drivers/mtd/chips/map_rom.c
index 644ef8d62cc8..dbc34e886b57 100644
--- a/drivers/mtd/chips/map_rom.c
+++ b/drivers/mtd/chips/map_rom.c
@@ -45,7 +45,7 @@ static struct mtd_info *map_rom_probe(struct map_info *map)
{
struct mtd_info *mtd;
- mtd = kzalloc_obj(*mtd, GFP_KERNEL);
+ mtd = kzalloc_obj(*mtd);
if (!mtd)
return NULL;
diff --git a/drivers/mtd/devices/block2mtd.c b/drivers/mtd/devices/block2mtd.c
index 41b1c1348efe..03e80b2c4f5a 100644
--- a/drivers/mtd/devices/block2mtd.c
+++ b/drivers/mtd/devices/block2mtd.c
@@ -271,7 +271,7 @@ static struct block2mtd_dev *add_device(char *devname, int erase_size,
if (!devname)
return NULL;
- dev = kzalloc_obj(struct block2mtd_dev, GFP_KERNEL);
+ dev = kzalloc_obj(struct block2mtd_dev);
if (!dev)
return NULL;
diff --git a/drivers/mtd/devices/docg3.c b/drivers/mtd/devices/docg3.c
index 8db760b2c900..33050a2a80f7 100644
--- a/drivers/mtd/devices/docg3.c
+++ b/drivers/mtd/devices/docg3.c
@@ -1810,10 +1810,10 @@ doc_probe_device(struct docg3_cascade *cascade, int floor, struct device *dev)
struct mtd_info *mtd;
ret = -ENOMEM;
- docg3 = kzalloc_obj(struct docg3, GFP_KERNEL);
+ docg3 = kzalloc_obj(struct docg3);
if (!docg3)
goto nomem1;
- mtd = kzalloc_obj(struct mtd_info, GFP_KERNEL);
+ mtd = kzalloc_obj(struct mtd_info);
if (!mtd)
goto nomem2;
mtd->priv = docg3;
diff --git a/drivers/mtd/devices/ms02-nv.c b/drivers/mtd/devices/ms02-nv.c
index 0a5d6ca1fe2f..453b3e05feb7 100644
--- a/drivers/mtd/devices/ms02-nv.c
+++ b/drivers/mtd/devices/ms02-nv.c
@@ -117,7 +117,7 @@ static int __init ms02nv_init_one(ulong addr)
int ret = -ENODEV;
/* The module decodes 8MiB of address space. */
- mod_res = kzalloc_obj(*mod_res, GFP_KERNEL);
+ mod_res = kzalloc_obj(*mod_res);
if (!mod_res)
return -ENOMEM;
@@ -138,10 +138,10 @@ static int __init ms02nv_init_one(ulong addr)
}
ret = -ENOMEM;
- mtd = kzalloc_obj(*mtd, GFP_KERNEL);
+ mtd = kzalloc_obj(*mtd);
if (!mtd)
goto err_out_mod_res_rel;
- mp = kzalloc_obj(*mp, GFP_KERNEL);
+ mp = kzalloc_obj(*mp);
if (!mp)
goto err_out_mtd;
@@ -149,7 +149,7 @@ static int __init ms02nv_init_one(ulong addr)
mp->resource.module = mod_res;
/* Firmware's diagnostic NVRAM area. */
- diag_res = kzalloc_obj(*diag_res, GFP_KERNEL);
+ diag_res = kzalloc_obj(*diag_res);
if (!diag_res)
goto err_out_mp;
@@ -162,7 +162,7 @@ static int __init ms02nv_init_one(ulong addr)
mp->resource.diag_ram = diag_res;
/* User-available general-purpose NVRAM area. */
- user_res = kzalloc_obj(*user_res, GFP_KERNEL);
+ user_res = kzalloc_obj(*user_res);
if (!user_res)
goto err_out_diag_res;
@@ -175,7 +175,7 @@ static int __init ms02nv_init_one(ulong addr)
mp->resource.user_ram = user_res;
/* Control and status register. */
- csr_res = kzalloc_obj(*csr_res, GFP_KERNEL);
+ csr_res = kzalloc_obj(*csr_res);
if (!csr_res)
goto err_out_user_res;
diff --git a/drivers/mtd/devices/mtd_dataflash.c b/drivers/mtd/devices/mtd_dataflash.c
index 3eebca290f50..e766258d76f7 100644
--- a/drivers/mtd/devices/mtd_dataflash.c
+++ b/drivers/mtd/devices/mtd_dataflash.c
@@ -627,7 +627,7 @@ static int add_dataflash_otp(struct spi_device *spi, char *name, int nr_pages,
char *otp_tag = "";
int err = 0;
- priv = kzalloc_obj(*priv, GFP_KERNEL);
+ priv = kzalloc_obj(*priv);
if (!priv)
return -ENOMEM;
diff --git a/drivers/mtd/devices/mtd_intel_dg.c b/drivers/mtd/devices/mtd_intel_dg.c
index ed5a07459012..c4c736ead0e5 100644
--- a/drivers/mtd/devices/mtd_intel_dg.c
+++ b/drivers/mtd/devices/mtd_intel_dg.c
@@ -720,7 +720,7 @@ static int intel_dg_nvm_init_mtd(struct intel_dg_nvm *nvm, struct device *device
nvm->mtd.erasesize = SZ_4K; /* 4K bytes granularity */
nvm->mtd.size = nvm->size;
- parts = kzalloc_objs(*parts, nvm->nregions, GFP_KERNEL);
+ parts = kzalloc_objs(*parts, nvm->nregions);
if (!parts)
return -ENOMEM;
diff --git a/drivers/mtd/devices/mtdram.c b/drivers/mtd/devices/mtdram.c
index 5418cfcfb1d9..3fff3cdd9834 100644
--- a/drivers/mtd/devices/mtdram.c
+++ b/drivers/mtd/devices/mtdram.c
@@ -158,7 +158,7 @@ static int __init init_mtdram(void)
return -EINVAL;
/* Allocate some memory */
- mtd_info = kmalloc_obj(struct mtd_info, GFP_KERNEL);
+ mtd_info = kmalloc_obj(struct mtd_info);
if (!mtd_info)
return -ENOMEM;
diff --git a/drivers/mtd/devices/phram.c b/drivers/mtd/devices/phram.c
index d35f43dec8e3..b42cadcd76b1 100644
--- a/drivers/mtd/devices/phram.c
+++ b/drivers/mtd/devices/phram.c
@@ -130,7 +130,7 @@ static int register_device(struct platform_device *pdev, const char *name,
struct phram_mtd_list *new;
int ret = -ENOMEM;
- new = kzalloc_obj(*new, GFP_KERNEL);
+ new = kzalloc_obj(*new);
if (!new)
goto out0;
diff --git a/drivers/mtd/devices/pmc551.c b/drivers/mtd/devices/pmc551.c
index 1d793bf7ad71..dc0ebfeb846e 100644
--- a/drivers/mtd/devices/pmc551.c
+++ b/drivers/mtd/devices/pmc551.c
@@ -715,11 +715,11 @@ static int __init init_pmc551(void)
msize = length;
}
- mtd = kzalloc_obj(struct mtd_info, GFP_KERNEL);
+ mtd = kzalloc_obj(struct mtd_info);
if (!mtd)
break;
- priv = kzalloc_obj(struct mypriv, GFP_KERNEL);
+ priv = kzalloc_obj(struct mypriv);
if (!priv) {
kfree(mtd);
break;
diff --git a/drivers/mtd/devices/slram.c b/drivers/mtd/devices/slram.c
index 1ac94e837f26..69cb63d99f57 100644
--- a/drivers/mtd/devices/slram.c
+++ b/drivers/mtd/devices/slram.c
@@ -135,17 +135,17 @@ static int register_device(char *name, unsigned long start, unsigned long length
curmtd = &(*curmtd)->next;
}
- *curmtd = kmalloc_obj(slram_mtd_list_t, GFP_KERNEL);
+ *curmtd = kmalloc_obj(slram_mtd_list_t);
if (!(*curmtd)) {
E("slram: Cannot allocate new MTD device.\n");
return(-ENOMEM);
}
- (*curmtd)->mtdinfo = kzalloc_obj(struct mtd_info, GFP_KERNEL);
+ (*curmtd)->mtdinfo = kzalloc_obj(struct mtd_info);
(*curmtd)->next = NULL;
if ((*curmtd)->mtdinfo) {
(*curmtd)->mtdinfo->priv =
- kzalloc_obj(slram_priv_t, GFP_KERNEL);
+ kzalloc_obj(slram_priv_t);
if (!(*curmtd)->mtdinfo->priv) {
kfree((*curmtd)->mtdinfo);
diff --git a/drivers/mtd/ftl.c b/drivers/mtd/ftl.c
index bc372a0c040d..9b8d40d7aa37 100644
--- a/drivers/mtd/ftl.c
+++ b/drivers/mtd/ftl.c
@@ -201,7 +201,7 @@ static int build_maps(partition_t *part)
/* Set up erase unit maps */
part->DataUnits = le16_to_cpu(part->header.NumEraseUnits) -
part->header.NumTransferUnits;
- part->EUNInfo = kmalloc_objs(struct eun_info_t, part->DataUnits, GFP_KERNEL);
+ part->EUNInfo = kmalloc_objs(struct eun_info_t, part->DataUnits);
if (!part->EUNInfo)
goto out;
for (i = 0; i < part->DataUnits; i++)
@@ -337,7 +337,7 @@ static int erase_xfer(partition_t *part,
/* Is there a free erase slot? Always in MTD. */
- erase=kmalloc_obj(struct erase_info, GFP_KERNEL);
+ erase=kmalloc_obj(struct erase_info);
if (!erase)
return -ENOMEM;
@@ -1005,7 +1005,7 @@ static void ftl_add_mtd(struct mtd_blktrans_ops *tr, struct mtd_info *mtd)
{
partition_t *partition;
- partition = kzalloc_obj(partition_t, GFP_KERNEL);
+ partition = kzalloc_obj(partition_t);
if (!partition) {
printk(KERN_WARNING "No memory to scan for FTL on %s\n",
diff --git a/drivers/mtd/inftlcore.c b/drivers/mtd/inftlcore.c
index cde1e3f52a49..1fb924a47227 100644
--- a/drivers/mtd/inftlcore.c
+++ b/drivers/mtd/inftlcore.c
@@ -52,7 +52,7 @@ static void inftl_add_mtd(struct mtd_blktrans_ops *tr, struct mtd_info *mtd)
pr_debug("INFTL: add_mtd for %s\n", mtd->name);
- inftl = kzalloc_obj(*inftl, GFP_KERNEL);
+ inftl = kzalloc_obj(*inftl);
if (!inftl)
return;
diff --git a/drivers/mtd/lpddr/lpddr_cmds.c b/drivers/mtd/lpddr/lpddr_cmds.c
index 97f960af44b4..a4167ee5e415 100644
--- a/drivers/mtd/lpddr/lpddr_cmds.c
+++ b/drivers/mtd/lpddr/lpddr_cmds.c
@@ -41,7 +41,7 @@ struct mtd_info *lpddr_cmdset(struct map_info *map)
int numchips;
int i, j;
- mtd = kzalloc_obj(*mtd, GFP_KERNEL);
+ mtd = kzalloc_obj(*mtd);
if (!mtd)
return NULL;
mtd->priv = map;
@@ -65,7 +65,7 @@ struct mtd_info *lpddr_cmdset(struct map_info *map)
mtd->erasesize = 1 << lpddr->qinfo->UniformBlockSizeShift;
mtd->writesize = 1 << lpddr->qinfo->BufSizeShift;
- shared = kmalloc_objs(struct flchip_shared, lpddr->numchips, GFP_KERNEL);
+ shared = kmalloc_objs(struct flchip_shared, lpddr->numchips);
if (!shared) {
kfree(mtd);
return NULL;
diff --git a/drivers/mtd/lpddr/qinfo_probe.c b/drivers/mtd/lpddr/qinfo_probe.c
index 9339da9f09a1..de05fe31754a 100644
--- a/drivers/mtd/lpddr/qinfo_probe.c
+++ b/drivers/mtd/lpddr/qinfo_probe.c
@@ -120,7 +120,7 @@ static int lpddr_pfow_present(struct map_info *map, struct lpddr_private *lpddr)
static int lpddr_chip_setup(struct map_info *map, struct lpddr_private *lpddr)
{
- lpddr->qinfo = kzalloc_obj(struct qinfo_chip, GFP_KERNEL);
+ lpddr->qinfo = kzalloc_obj(struct qinfo_chip);
if (!lpddr->qinfo)
return 0;
diff --git a/drivers/mtd/maps/amd76xrom.c b/drivers/mtd/maps/amd76xrom.c
index 1825f8e2898f..95f9b99ce5fc 100644
--- a/drivers/mtd/maps/amd76xrom.c
+++ b/drivers/mtd/maps/amd76xrom.c
@@ -188,7 +188,7 @@ static int amd76xrom_init_one(struct pci_dev *pdev,
int i;
if (!map) {
- map = kmalloc_obj(*map, GFP_KERNEL);
+ map = kmalloc_obj(*map);
if (!map)
goto out;
}
diff --git a/drivers/mtd/maps/ck804xrom.c b/drivers/mtd/maps/ck804xrom.c
index 0ac4b26b1dd7..5e44134caa8e 100644
--- a/drivers/mtd/maps/ck804xrom.c
+++ b/drivers/mtd/maps/ck804xrom.c
@@ -218,7 +218,7 @@ static int __init ck804xrom_init_one(struct pci_dev *pdev,
int i;
if (!map) {
- map = kmalloc_obj(*map, GFP_KERNEL);
+ map = kmalloc_obj(*map);
if (!map)
goto out;
}
diff --git a/drivers/mtd/maps/esb2rom.c b/drivers/mtd/maps/esb2rom.c
index 14d050a5629f..fc7f2c3a62b0 100644
--- a/drivers/mtd/maps/esb2rom.c
+++ b/drivers/mtd/maps/esb2rom.c
@@ -278,7 +278,7 @@ static int __init esb2rom_init_one(struct pci_dev *pdev,
int i;
if (!map) {
- map = kmalloc_obj(*map, GFP_KERNEL);
+ map = kmalloc_obj(*map);
if (!map)
goto out;
}
diff --git a/drivers/mtd/maps/ichxrom.c b/drivers/mtd/maps/ichxrom.c
index b940beb70b65..6608b782149b 100644
--- a/drivers/mtd/maps/ichxrom.c
+++ b/drivers/mtd/maps/ichxrom.c
@@ -212,7 +212,7 @@ static int __init ichxrom_init_one(struct pci_dev *pdev,
int i;
if (!map) {
- map = kmalloc_obj(*map, GFP_KERNEL);
+ map = kmalloc_obj(*map);
if (!map)
goto out;
}
diff --git a/drivers/mtd/maps/pci.c b/drivers/mtd/maps/pci.c
index b70b8edceb1b..4a84ca8aed40 100644
--- a/drivers/mtd/maps/pci.c
+++ b/drivers/mtd/maps/pci.c
@@ -264,7 +264,7 @@ static int mtd_pci_probe(struct pci_dev *dev, const struct pci_device_id *id)
if (err)
goto out;
- map = kmalloc_obj(*map, GFP_KERNEL);
+ map = kmalloc_obj(*map);
err = -ENOMEM;
if (!map)
goto release;
diff --git a/drivers/mtd/maps/pcmciamtd.c b/drivers/mtd/maps/pcmciamtd.c
index 8b7192ff6f04..a2e5a63e5d18 100644
--- a/drivers/mtd/maps/pcmciamtd.c
+++ b/drivers/mtd/maps/pcmciamtd.c
@@ -674,7 +674,7 @@ static int pcmciamtd_probe(struct pcmcia_device *link)
struct pcmciamtd_dev *dev;
/* Create new memory card device */
- dev = kzalloc_obj(*dev, GFP_KERNEL);
+ dev = kzalloc_obj(*dev);
if (!dev) return -ENOMEM;
pr_debug("dev=0x%p\n", dev);
diff --git a/drivers/mtd/maps/pismo.c b/drivers/mtd/maps/pismo.c
index 30b95fd3352d..b0310fddcaa3 100644
--- a/drivers/mtd/maps/pismo.c
+++ b/drivers/mtd/maps/pismo.c
@@ -218,7 +218,7 @@ static int pismo_probe(struct i2c_client *client)
return -EIO;
}
- pismo = kzalloc_obj(*pismo, GFP_KERNEL);
+ pismo = kzalloc_obj(*pismo);
if (!pismo)
return -ENOMEM;
diff --git a/drivers/mtd/maps/plat-ram.c b/drivers/mtd/maps/plat-ram.c
index d0f9b81ad7c5..816111031cf1 100644
--- a/drivers/mtd/maps/plat-ram.c
+++ b/drivers/mtd/maps/plat-ram.c
@@ -109,7 +109,7 @@ static int platram_probe(struct platform_device *pdev)
pdata = dev_get_platdata(&pdev->dev);
- info = kzalloc_obj(*info, GFP_KERNEL);
+ info = kzalloc_obj(*info);
if (info == NULL) {
err = -ENOMEM;
goto exit_error;
diff --git a/drivers/mtd/maps/pxa2xx-flash.c b/drivers/mtd/maps/pxa2xx-flash.c
index 5ad7ae7a311c..bc303a9909d4 100644
--- a/drivers/mtd/maps/pxa2xx-flash.c
+++ b/drivers/mtd/maps/pxa2xx-flash.c
@@ -51,7 +51,7 @@ static int pxa2xx_flash_probe(struct platform_device *pdev)
if (!res)
return -ENODEV;
- info = kzalloc_obj(struct pxa2xx_flash_info, GFP_KERNEL);
+ info = kzalloc_obj(struct pxa2xx_flash_info);
if (!info)
return -ENOMEM;
diff --git a/drivers/mtd/maps/sa1100-flash.c b/drivers/mtd/maps/sa1100-flash.c
index ed69df084352..8a1a0f0365ca 100644
--- a/drivers/mtd/maps/sa1100-flash.c
+++ b/drivers/mtd/maps/sa1100-flash.c
@@ -222,7 +222,7 @@ static struct sa_info *sa1100_setup_mtd(struct platform_device *pdev,
} else if (info->num_subdev > 1) {
struct mtd_info **cdev;
- cdev = kmalloc_objs(*cdev, nr, GFP_KERNEL);
+ cdev = kmalloc_objs(*cdev, nr);
if (!cdev) {
ret = -ENOMEM;
goto err;
diff --git a/drivers/mtd/maps/sun_uflash.c b/drivers/mtd/maps/sun_uflash.c
index aebbf2931f1c..cac780cd23f9 100644
--- a/drivers/mtd/maps/sun_uflash.c
+++ b/drivers/mtd/maps/sun_uflash.c
@@ -61,7 +61,7 @@ static int uflash_devinit(struct platform_device *op, struct device_node *dp)
return -ENODEV;
}
- up = kzalloc_obj(struct uflash_dev, GFP_KERNEL);
+ up = kzalloc_obj(struct uflash_dev);
if (!up)
return -ENOMEM;
diff --git a/drivers/mtd/maps/vmu-flash.c b/drivers/mtd/maps/vmu-flash.c
index bd4ebcde51db..75e06d249ce9 100644
--- a/drivers/mtd/maps/vmu-flash.c
+++ b/drivers/mtd/maps/vmu-flash.c
@@ -73,7 +73,7 @@ static struct vmu_block *ofs_to_block(unsigned long src_ofs,
if (num > card->parts[partition].numblocks)
goto failed;
- vblock = kmalloc_obj(struct vmu_block, GFP_KERNEL);
+ vblock = kmalloc_obj(struct vmu_block);
if (!vblock)
goto failed;
@@ -539,7 +539,7 @@ static void vmu_queryblocks(struct mapleq *mq)
mtd_cur->_sync = vmu_flash_sync;
mtd_cur->writesize = card->blocklen;
- mpart = kmalloc_obj(struct mdev_part, GFP_KERNEL);
+ mpart = kmalloc_obj(struct mdev_part);
if (!mpart)
goto fail_mpart;
@@ -548,7 +548,7 @@ static void vmu_queryblocks(struct mapleq *mq)
mtd_cur->priv = mpart;
mtd_cur->owner = THIS_MODULE;
- pcache = kzalloc_obj(struct vmu_cache, GFP_KERNEL);
+ pcache = kzalloc_obj(struct vmu_cache);
if (!pcache)
goto fail_cache_create;
part_cur->pcache = pcache;
@@ -609,7 +609,7 @@ static int vmu_connect(struct maple_device *mdev)
basic_flash_data = be32_to_cpu(mdev->devinfo.function_data[c - 1]);
- card = kmalloc_obj(struct memcard, GFP_KERNEL);
+ card = kmalloc_obj(struct memcard);
if (!card) {
error = -ENOMEM;
goto fail_nomem;
@@ -627,13 +627,13 @@ static int vmu_connect(struct maple_device *mdev)
* Not sure there are actually any multi-partition devices in the
* real world, but the hardware supports them, so, so will we
*/
- card->parts = kmalloc_objs(struct vmupart, card->partitions, GFP_KERNEL);
+ card->parts = kmalloc_objs(struct vmupart, card->partitions);
if (!card->parts) {
error = -ENOMEM;
goto fail_partitions;
}
- card->mtd = kmalloc_objs(struct mtd_info, card->partitions, GFP_KERNEL);
+ card->mtd = kmalloc_objs(struct mtd_info, card->partitions);
if (!card->mtd) {
error = -ENOMEM;
goto fail_mtd_info;
diff --git a/drivers/mtd/mtd_blkdevs.c b/drivers/mtd/mtd_blkdevs.c
index 470a838cbab7..4d2e7b7774e9 100644
--- a/drivers/mtd/mtd_blkdevs.c
+++ b/drivers/mtd/mtd_blkdevs.c
@@ -324,7 +324,7 @@ int add_mtd_blktrans_dev(struct mtd_blktrans_dev *new)
new->readonly = 1;
ret = -ENOMEM;
- new->tag_set = kzalloc_obj(*new->tag_set, GFP_KERNEL);
+ new->tag_set = kzalloc_obj(*new->tag_set);
if (!new->tag_set)
goto out_list_del;
diff --git a/drivers/mtd/mtdblock.c b/drivers/mtd/mtdblock.c
index 80614f218228..c9143711fa39 100644
--- a/drivers/mtd/mtdblock.c
+++ b/drivers/mtd/mtdblock.c
@@ -316,7 +316,7 @@ static int mtdblock_flush(struct mtd_blktrans_dev *dev)
static void mtdblock_add_mtd(struct mtd_blktrans_ops *tr, struct mtd_info *mtd)
{
- struct mtdblk_dev *dev = kzalloc_obj(*dev, GFP_KERNEL);
+ struct mtdblk_dev *dev = kzalloc_obj(*dev);
if (!dev)
return;
diff --git a/drivers/mtd/mtdblock_ro.c b/drivers/mtd/mtdblock_ro.c
index e82f27eec5ae..e564521d6911 100644
--- a/drivers/mtd/mtdblock_ro.c
+++ b/drivers/mtd/mtdblock_ro.c
@@ -36,7 +36,7 @@ static int mtdblock_writesect(struct mtd_blktrans_dev *dev,
static void mtdblock_add_mtd(struct mtd_blktrans_ops *tr, struct mtd_info *mtd)
{
- struct mtd_blktrans_dev *dev = kzalloc_obj(*dev, GFP_KERNEL);
+ struct mtd_blktrans_dev *dev = kzalloc_obj(*dev);
if (!dev)
return;
diff --git a/drivers/mtd/mtdchar.c b/drivers/mtd/mtdchar.c
index 35b31fea77f3..55a43682c567 100644
--- a/drivers/mtd/mtdchar.c
+++ b/drivers/mtd/mtdchar.c
@@ -72,7 +72,7 @@ static int mtdchar_open(struct inode *inode, struct file *file)
goto out1;
}
- mfi = kzalloc_obj(*mfi, GFP_KERNEL);
+ mfi = kzalloc_obj(*mfi);
if (!mfi) {
ret = -ENOMEM;
goto out1;
@@ -923,7 +923,7 @@ static int mtdchar_ioctl(struct file *file, u_int cmd, u_long arg)
{
struct erase_info *erase;
- erase=kzalloc_obj(struct erase_info, GFP_KERNEL);
+ erase=kzalloc_obj(struct erase_info);
if (!erase)
ret = -ENOMEM;
else {
@@ -1162,7 +1162,7 @@ static int mtdchar_ioctl(struct file *file, u_int cmd, u_long arg)
if (!master->ooblayout)
return -EOPNOTSUPP;
- usrlay = kmalloc_obj(*usrlay, GFP_KERNEL);
+ usrlay = kmalloc_obj(*usrlay);
if (!usrlay)
return -ENOMEM;
diff --git a/drivers/mtd/mtdconcat.c b/drivers/mtd/mtdconcat.c
index c4145ba218df..4ea98e398b30 100644
--- a/drivers/mtd/mtdconcat.c
+++ b/drivers/mtd/mtdconcat.c
@@ -416,7 +416,7 @@ static int concat_erase(struct mtd_info *mtd, struct erase_info *instr)
}
/* make a local copy of instr to avoid modifying the caller's struct */
- erase = kmalloc_obj(struct erase_info, GFP_KERNEL);
+ erase = kmalloc_obj(struct erase_info);
if (!erase)
return -ENOMEM;
diff --git a/drivers/mtd/mtdpart.c b/drivers/mtd/mtdpart.c
index 2c0be153a96e..e016cfbc7224 100644
--- a/drivers/mtd/mtdpart.c
+++ b/drivers/mtd/mtdpart.c
@@ -53,7 +53,7 @@ static struct mtd_info *allocate_partition(struct mtd_info *parent,
u64 tmp;
/* allocate the partition structure */
- child = kzalloc_obj(*child, GFP_KERNEL);
+ child = kzalloc_obj(*child);
name = kstrdup(part->name, GFP_KERNEL);
if (!name || !child) {
printk(KERN_ERR"memory allocation error while creating partitions for \"%s\"\n",
diff --git a/drivers/mtd/mtdswap.c b/drivers/mtd/mtdswap.c
index a2d072da1bbe..866933fc8426 100644
--- a/drivers/mtd/mtdswap.c
+++ b/drivers/mtd/mtdswap.c
@@ -1413,11 +1413,11 @@ static void mtdswap_add_mtd(struct mtd_blktrans_ops *tr, struct mtd_info *mtd)
"%u spare, %u bad blocks\n",
MTDSWAP_PREFIX, part, swap_size / 1024, spare_cnt, bad_blocks);
- d = kzalloc_obj(struct mtdswap_dev, GFP_KERNEL);
+ d = kzalloc_obj(struct mtdswap_dev);
if (!d)
return;
- mbd_dev = kzalloc_obj(struct mtd_blktrans_dev, GFP_KERNEL);
+ mbd_dev = kzalloc_obj(struct mtd_blktrans_dev);
if (!mbd_dev) {
kfree(d);
return;
diff --git a/drivers/mtd/nand/ecc-sw-bch.c b/drivers/mtd/nand/ecc-sw-bch.c
index 8ed20f176521..26d5f3f10964 100644
--- a/drivers/mtd/nand/ecc-sw-bch.c
+++ b/drivers/mtd/nand/ecc-sw-bch.c
@@ -227,7 +227,7 @@ int nand_ecc_sw_bch_init_ctx(struct nand_device *nand)
return -EINVAL;
}
- engine_conf = kzalloc_obj(*engine_conf, GFP_KERNEL);
+ engine_conf = kzalloc_obj(*engine_conf);
if (!engine_conf)
return -ENOMEM;
diff --git a/drivers/mtd/nand/ecc-sw-hamming.c b/drivers/mtd/nand/ecc-sw-hamming.c
index 65fe971a409d..460acc1029c3 100644
--- a/drivers/mtd/nand/ecc-sw-hamming.c
+++ b/drivers/mtd/nand/ecc-sw-hamming.c
@@ -496,7 +496,7 @@ int nand_ecc_sw_hamming_init_ctx(struct nand_device *nand)
if (conf->step_size != 256 && conf->step_size != 512)
conf->step_size = 256;
- engine_conf = kzalloc_obj(*engine_conf, GFP_KERNEL);
+ engine_conf = kzalloc_obj(*engine_conf);
if (!engine_conf)
return -ENOMEM;
diff --git a/drivers/mtd/nand/onenand/generic.c b/drivers/mtd/nand/onenand/generic.c
index 69ca617985c8..3191904ced14 100644
--- a/drivers/mtd/nand/onenand/generic.c
+++ b/drivers/mtd/nand/onenand/generic.c
@@ -37,7 +37,7 @@ static int generic_onenand_probe(struct platform_device *pdev)
unsigned long size = resource_size(res);
int err;
- info = kzalloc_obj(struct onenand_info, GFP_KERNEL);
+ info = kzalloc_obj(struct onenand_info);
if (!info)
return -ENOMEM;
diff --git a/drivers/mtd/nand/onenand/onenand_bbt.c b/drivers/mtd/nand/onenand/onenand_bbt.c
index 380e5051595f..012163fb6add 100644
--- a/drivers/mtd/nand/onenand/onenand_bbt.c
+++ b/drivers/mtd/nand/onenand/onenand_bbt.c
@@ -231,7 +231,7 @@ int onenand_default_bbt(struct mtd_info *mtd)
struct onenand_chip *this = mtd->priv;
struct bbm_info *bbm;
- this->bbm = kzalloc_obj(struct bbm_info, GFP_KERNEL);
+ this->bbm = kzalloc_obj(struct bbm_info);
if (!this->bbm)
return -ENOMEM;
diff --git a/drivers/mtd/nand/qpic_common.c b/drivers/mtd/nand/qpic_common.c
index 0acd6c65f326..4f3e4dd766da 100644
--- a/drivers/mtd/nand/qpic_common.c
+++ b/drivers/mtd/nand/qpic_common.c
@@ -156,7 +156,7 @@ int qcom_prepare_bam_async_desc(struct qcom_nand_controller *nandc,
enum dma_transfer_direction dir_eng;
struct dma_async_tx_descriptor *dma_desc;
- desc = kzalloc_obj(*desc, GFP_KERNEL);
+ desc = kzalloc_obj(*desc);
if (!desc)
return -ENOMEM;
@@ -364,7 +364,7 @@ int qcom_prep_adm_dma_desc(struct qcom_nand_controller *nandc, bool read,
struct scatterlist *sgl;
int ret;
- desc = kzalloc_obj(*desc, GFP_KERNEL);
+ desc = kzalloc_obj(*desc);
if (!desc)
return -ENOMEM;
diff --git a/drivers/mtd/nand/raw/au1550nd.c b/drivers/mtd/nand/raw/au1550nd.c
index 6b09eb643ed2..f1e99197ab84 100644
--- a/drivers/mtd/nand/raw/au1550nd.c
+++ b/drivers/mtd/nand/raw/au1550nd.c
@@ -266,7 +266,7 @@ static int au1550nd_probe(struct platform_device *pdev)
return -ENODEV;
}
- ctx = kzalloc_obj(*ctx, GFP_KERNEL);
+ ctx = kzalloc_obj(*ctx);
if (!ctx)
return -ENOMEM;
diff --git a/drivers/mtd/nand/raw/cafe_nand.c b/drivers/mtd/nand/raw/cafe_nand.c
index b05a41ce2e35..65a36d5de742 100644
--- a/drivers/mtd/nand/raw/cafe_nand.c
+++ b/drivers/mtd/nand/raw/cafe_nand.c
@@ -678,7 +678,7 @@ static int cafe_nand_probe(struct pci_dev *pdev,
pci_set_master(pdev);
- cafe = kzalloc_obj(*cafe, GFP_KERNEL);
+ cafe = kzalloc_obj(*cafe);
if (!cafe) {
err = -ENOMEM;
goto out_disable_device;
diff --git a/drivers/mtd/nand/raw/cs553x_nand.c b/drivers/mtd/nand/raw/cs553x_nand.c
index ca2a7e16b5d8..0b872b1e3b04 100644
--- a/drivers/mtd/nand/raw/cs553x_nand.c
+++ b/drivers/mtd/nand/raw/cs553x_nand.c
@@ -273,7 +273,7 @@ static int __init cs553x_init_one(int cs, int mmio, unsigned long adr)
}
/* Allocate memory for MTD device structure and private data */
- controller = kzalloc_obj(*controller, GFP_KERNEL);
+ controller = kzalloc_obj(*controller);
if (!controller) {
err = -ENOMEM;
goto out;
diff --git a/drivers/mtd/nand/raw/fsl_elbc_nand.c b/drivers/mtd/nand/raw/fsl_elbc_nand.c
index fdca096d74ba..c655d27bc4cc 100644
--- a/drivers/mtd/nand/raw/fsl_elbc_nand.c
+++ b/drivers/mtd/nand/raw/fsl_elbc_nand.c
@@ -895,13 +895,13 @@ static int fsl_elbc_nand_probe(struct platform_device *pdev)
return -ENODEV;
}
- priv = kzalloc_obj(*priv, GFP_KERNEL);
+ priv = kzalloc_obj(*priv);
if (!priv)
return -ENOMEM;
mutex_lock(&fsl_elbc_nand_mutex);
if (!fsl_lbc_ctrl_dev->nand) {
- elbc_fcm_ctrl = kzalloc_obj(*elbc_fcm_ctrl, GFP_KERNEL);
+ elbc_fcm_ctrl = kzalloc_obj(*elbc_fcm_ctrl);
if (!elbc_fcm_ctrl) {
mutex_unlock(&fsl_elbc_nand_mutex);
ret = -ENOMEM;
diff --git a/drivers/mtd/nand/raw/fsl_ifc_nand.c b/drivers/mtd/nand/raw/fsl_ifc_nand.c
index 6eb507f6a204..dd88b22a91bd 100644
--- a/drivers/mtd/nand/raw/fsl_ifc_nand.c
+++ b/drivers/mtd/nand/raw/fsl_ifc_nand.c
@@ -1018,7 +1018,7 @@ static int fsl_ifc_nand_probe(struct platform_device *dev)
mutex_lock(&fsl_ifc_nand_mutex);
if (!fsl_ifc_ctrl_dev->nand) {
- ifc_nand_ctrl = kzalloc_obj(*ifc_nand_ctrl, GFP_KERNEL);
+ ifc_nand_ctrl = kzalloc_obj(*ifc_nand_ctrl);
if (!ifc_nand_ctrl) {
mutex_unlock(&fsl_ifc_nand_mutex);
return -ENOMEM;
diff --git a/drivers/mtd/nand/raw/nand_base.c b/drivers/mtd/nand/raw/nand_base.c
index 29f603fb2d8f..770c26f9c6ce 100644
--- a/drivers/mtd/nand/raw/nand_base.c
+++ b/drivers/mtd/nand/raw/nand_base.c
@@ -1062,7 +1062,7 @@ static int nand_choose_interface_config(struct nand_chip *chip)
if (!nand_controller_can_setup_interface(chip))
return 0;
- iface = kzalloc_obj(*iface, GFP_KERNEL);
+ iface = kzalloc_obj(*iface);
if (!iface)
return -ENOMEM;
diff --git a/drivers/mtd/nand/raw/nand_bbt.c b/drivers/mtd/nand/raw/nand_bbt.c
index 5e500bf2a3c2..b0e7592a2ab7 100644
--- a/drivers/mtd/nand/raw/nand_bbt.c
+++ b/drivers/mtd/nand/raw/nand_bbt.c
@@ -1375,7 +1375,7 @@ static int nand_create_badblock_pattern(struct nand_chip *this)
pr_warn("Bad block pattern already allocated; not replacing\n");
return -EINVAL;
}
- bd = kzalloc_obj(*bd, GFP_KERNEL);
+ bd = kzalloc_obj(*bd);
if (!bd)
return -ENOMEM;
bd->options = this->bbt_options & BADBLOCK_SCAN_MASK;
diff --git a/drivers/mtd/nand/raw/nand_hynix.c b/drivers/mtd/nand/raw/nand_hynix.c
index 12f4e5d1038e..0510ceff591d 100644
--- a/drivers/mtd/nand/raw/nand_hynix.c
+++ b/drivers/mtd/nand/raw/nand_hynix.c
@@ -705,7 +705,7 @@ static int hynix_nand_init(struct nand_chip *chip)
else
chip->options |= NAND_BBM_FIRSTPAGE | NAND_BBM_SECONDPAGE;
- hynix = kzalloc_obj(*hynix, GFP_KERNEL);
+ hynix = kzalloc_obj(*hynix);
if (!hynix)
return -ENOMEM;
diff --git a/drivers/mtd/nand/raw/nand_jedec.c b/drivers/mtd/nand/raw/nand_jedec.c
index 8b2725863fbf..b523bf65746b 100644
--- a/drivers/mtd/nand/raw/nand_jedec.c
+++ b/drivers/mtd/nand/raw/nand_jedec.c
@@ -42,7 +42,7 @@ int nand_jedec_detect(struct nand_chip *chip)
return 0;
/* JEDEC chip: allocate a buffer to hold its parameter page */
- p = kzalloc_obj(*p, GFP_KERNEL);
+ p = kzalloc_obj(*p);
if (!p)
return -ENOMEM;
diff --git a/drivers/mtd/nand/raw/nand_micron.c b/drivers/mtd/nand/raw/nand_micron.c
index b97a2bd606ae..8807b8aade41 100644
--- a/drivers/mtd/nand/raw/nand_micron.c
+++ b/drivers/mtd/nand/raw/nand_micron.c
@@ -484,7 +484,7 @@ static int micron_nand_init(struct nand_chip *chip)
int ondie;
int ret;
- micron = kzalloc_obj(*micron, GFP_KERNEL);
+ micron = kzalloc_obj(*micron);
if (!micron)
return -ENOMEM;
diff --git a/drivers/mtd/nand/raw/nand_onfi.c b/drivers/mtd/nand/raw/nand_onfi.c
index c4e7304372f1..cd3ad373883e 100644
--- a/drivers/mtd/nand/raw/nand_onfi.c
+++ b/drivers/mtd/nand/raw/nand_onfi.c
@@ -306,7 +306,7 @@ int nand_onfi_detect(struct nand_chip *chip)
if (le16_to_cpu(p->opt_cmd) & ONFI_OPT_CMD_READ_CACHE)
chip->parameters.supports_read_cache = true;
- onfi = kzalloc_obj(*onfi, GFP_KERNEL);
+ onfi = kzalloc_obj(*onfi);
if (!onfi) {
ret = -ENOMEM;
goto free_model;
diff --git a/drivers/mtd/nand/raw/nandsim.c b/drivers/mtd/nand/raw/nandsim.c
index 4e7ea6c11a15..fe968037f75a 100644
--- a/drivers/mtd/nand/raw/nandsim.c
+++ b/drivers/mtd/nand/raw/nandsim.c
@@ -851,7 +851,7 @@ static int ns_parse_weakblocks(void)
}
if (*w == ',')
w += 1;
- wb = kzalloc_obj(*wb, GFP_KERNEL);
+ wb = kzalloc_obj(*wb);
if (!wb) {
NS_ERR("unable to allocate memory.\n");
return -ENOMEM;
@@ -902,7 +902,7 @@ static int ns_parse_weakpages(void)
}
if (*w == ',')
w += 1;
- wp = kzalloc_obj(*wp, GFP_KERNEL);
+ wp = kzalloc_obj(*wp);
if (!wp) {
NS_ERR("unable to allocate memory.\n");
return -ENOMEM;
@@ -953,7 +953,7 @@ static int ns_parse_gravepages(void)
}
if (*g == ',')
g += 1;
- gp = kzalloc_obj(*gp, GFP_KERNEL);
+ gp = kzalloc_obj(*gp);
if (!gp) {
NS_ERR("unable to allocate memory.\n");
return -ENOMEM;
@@ -2268,7 +2268,7 @@ static int __init ns_init_module(void)
return -EINVAL;
}
- ns = kzalloc_obj(struct nandsim, GFP_KERNEL);
+ ns = kzalloc_obj(struct nandsim);
if (!ns) {
NS_ERR("unable to allocate core structures.\n");
return -ENOMEM;
diff --git a/drivers/mtd/nand/raw/pasemi_nand.c b/drivers/mtd/nand/raw/pasemi_nand.c
index 05d3e58c50dc..09409b703d93 100644
--- a/drivers/mtd/nand/raw/pasemi_nand.c
+++ b/drivers/mtd/nand/raw/pasemi_nand.c
@@ -113,7 +113,7 @@ static int pasemi_nand_probe(struct platform_device *ofdev)
dev_dbg(dev, "pasemi_nand at %pR\n", &res);
/* Allocate memory for MTD device structure and private data */
- ddata = kzalloc_obj(*ddata, GFP_KERNEL);
+ ddata = kzalloc_obj(*ddata);
if (!ddata) {
err = -ENOMEM;
goto out;
diff --git a/drivers/mtd/nand/raw/r852.c b/drivers/mtd/nand/raw/r852.c
index 24e702919b87..8a5572b30893 100644
--- a/drivers/mtd/nand/raw/r852.c
+++ b/drivers/mtd/nand/raw/r852.c
@@ -867,7 +867,7 @@ static int r852_probe(struct pci_dev *pci_dev, const struct pci_device_id *id)
error = -ENOMEM;
/* init nand chip, but register it only on card insert */
- chip = kzalloc_obj(struct nand_chip, GFP_KERNEL);
+ chip = kzalloc_obj(struct nand_chip);
if (!chip)
goto error4;
@@ -883,7 +883,7 @@ static int r852_probe(struct pci_dev *pci_dev, const struct pci_device_id *id)
chip->legacy.write_buf = r852_write_buf;
/* init our device structure */
- dev = kzalloc_obj(struct r852_device, GFP_KERNEL);
+ dev = kzalloc_obj(struct r852_device);
if (!dev)
goto error5;
diff --git a/drivers/mtd/nand/raw/sharpsl.c b/drivers/mtd/nand/raw/sharpsl.c
index d74097783036..4154ab74f169 100644
--- a/drivers/mtd/nand/raw/sharpsl.c
+++ b/drivers/mtd/nand/raw/sharpsl.c
@@ -132,7 +132,7 @@ static int sharpsl_nand_probe(struct platform_device *pdev)
}
/* Allocate memory for MTD device structure and private data */
- sharpsl = kzalloc_obj(struct sharpsl_nand, GFP_KERNEL);
+ sharpsl = kzalloc_obj(struct sharpsl_nand);
if (!sharpsl)
return -ENOMEM;
diff --git a/drivers/mtd/nand/raw/txx9ndfmc.c b/drivers/mtd/nand/raw/txx9ndfmc.c
index e49c38abef68..4cc6e91dbc23 100644
--- a/drivers/mtd/nand/raw/txx9ndfmc.c
+++ b/drivers/mtd/nand/raw/txx9ndfmc.c
@@ -319,7 +319,7 @@ static int txx9ndfmc_probe(struct platform_device *dev)
if (!(plat->ch_mask & (1 << i)))
continue;
- txx9_priv = kzalloc_obj(struct txx9ndfmc_priv, GFP_KERNEL);
+ txx9_priv = kzalloc_obj(struct txx9ndfmc_priv);
if (!txx9_priv)
continue;
chip = &txx9_priv->chip;
diff --git a/drivers/mtd/nand/spi/core.c b/drivers/mtd/nand/spi/core.c
index 86dee7d13a38..8aa3753aaaa1 100644
--- a/drivers/mtd/nand/spi/core.c
+++ b/drivers/mtd/nand/spi/core.c
@@ -350,7 +350,7 @@ static int spinand_ondie_ecc_init_ctx(struct nand_device *nand)
nand->ecc.ctx.conf.step_size = nand->ecc.requirements.step_size;
nand->ecc.ctx.conf.strength = nand->ecc.requirements.strength;
- engine_conf = kzalloc_obj(*engine_conf, GFP_KERNEL);
+ engine_conf = kzalloc_obj(*engine_conf);
if (!engine_conf)
return -ENOMEM;
diff --git a/drivers/mtd/nand/spi/gigadevice.c b/drivers/mtd/nand/spi/gigadevice.c
index 137571093ec0..a6d6d6e0cc37 100644
--- a/drivers/mtd/nand/spi/gigadevice.c
+++ b/drivers/mtd/nand/spi/gigadevice.c
@@ -642,7 +642,7 @@ static int gd5fxgm9_spinand_init(struct spinand_device *spinand)
{
struct gigadevice_priv *priv;
- priv = kzalloc_obj(*priv, GFP_KERNEL);
+ priv = kzalloc_obj(*priv);
if (!priv)
return -ENOMEM;
diff --git a/drivers/mtd/nand/spi/macronix.c b/drivers/mtd/nand/spi/macronix.c
index 2e6b9be9c58b..67cafa1bb8ef 100644
--- a/drivers/mtd/nand/spi/macronix.c
+++ b/drivers/mtd/nand/spi/macronix.c
@@ -499,7 +499,7 @@ static int macronix_spinand_init(struct spinand_device *spinand)
{
struct macronix_priv *priv;
- priv = kzalloc_obj(*priv, GFP_KERNEL);
+ priv = kzalloc_obj(*priv);
if (!priv)
return -ENOMEM;
diff --git a/drivers/mtd/nftlcore.c b/drivers/mtd/nftlcore.c
index 9f3c193fb0c4..6b29b9c7a6a6 100644
--- a/drivers/mtd/nftlcore.c
+++ b/drivers/mtd/nftlcore.c
@@ -45,7 +45,7 @@ static void nftl_add_mtd(struct mtd_blktrans_ops *tr, struct mtd_info *mtd)
pr_debug("NFTL: add_mtd for %s\n", mtd->name);
- nftl = kzalloc_obj(struct NFTLrecord, GFP_KERNEL);
+ nftl = kzalloc_obj(struct NFTLrecord);
if (!nftl)
return;
diff --git a/drivers/mtd/parsers/brcm_u-boot.c b/drivers/mtd/parsers/brcm_u-boot.c
index 168cd629c277..cd78e432f1de 100644
--- a/drivers/mtd/parsers/brcm_u-boot.c
+++ b/drivers/mtd/parsers/brcm_u-boot.c
@@ -37,7 +37,7 @@ static int brcm_u_boot_parse(struct mtd_info *mtd,
int err;
int i = 0;
- parts = kzalloc_objs(*parts, BRCM_U_BOOT_MAX_PARTS, GFP_KERNEL);
+ parts = kzalloc_objs(*parts, BRCM_U_BOOT_MAX_PARTS);
if (!parts)
return -ENOMEM;
diff --git a/drivers/mtd/parsers/ofpart_core.c b/drivers/mtd/parsers/ofpart_core.c
index 02cf6a539e3f..0029bda165bd 100644
--- a/drivers/mtd/parsers/ofpart_core.c
+++ b/drivers/mtd/parsers/ofpart_core.c
@@ -102,7 +102,7 @@ static int parse_fixed_partitions(struct mtd_info *master,
return 0;
}
- parts = kzalloc_objs(*parts, nr_parts, GFP_KERNEL);
+ parts = kzalloc_objs(*parts, nr_parts);
if (!parts) {
if (dedicated)
of_node_put(ofpart_node);
@@ -249,7 +249,7 @@ static int parse_ofoldpart_partitions(struct mtd_info *master,
nr_parts = plen / sizeof(part[0]);
- parts = kzalloc_objs(*parts, nr_parts, GFP_KERNEL);
+ parts = kzalloc_objs(*parts, nr_parts);
if (!parts)
return -ENOMEM;
diff --git a/drivers/mtd/parsers/qcomsmempart.c b/drivers/mtd/parsers/qcomsmempart.c
index dd595387946b..d4fdc46a0073 100644
--- a/drivers/mtd/parsers/qcomsmempart.c
+++ b/drivers/mtd/parsers/qcomsmempart.c
@@ -123,7 +123,7 @@ static int parse_qcomsmem_part(struct mtd_info *mtd,
numparts++;
}
- parts = kzalloc_objs(*parts, numparts, GFP_KERNEL);
+ parts = kzalloc_objs(*parts, numparts);
if (!parts)
return -ENOMEM;
diff --git a/drivers/mtd/parsers/redboot.c b/drivers/mtd/parsers/redboot.c
index 4f3f5145ea83..558905160ddb 100644
--- a/drivers/mtd/parsers/redboot.c
+++ b/drivers/mtd/parsers/redboot.c
@@ -203,7 +203,7 @@ static int parse_redboot_partitions(struct mtd_info *master,
if (!redboot_checksum(&buf[i]))
break;
- new_fl = kmalloc_obj(struct fis_list, GFP_KERNEL);
+ new_fl = kmalloc_obj(struct fis_list);
namelen += strlen(buf[i].name) + 1;
if (!new_fl) {
ret = -ENOMEM;
diff --git a/drivers/mtd/parsers/scpart.c b/drivers/mtd/parsers/scpart.c
index 84b89499b200..87432dc99265 100644
--- a/drivers/mtd/parsers/scpart.c
+++ b/drivers/mtd/parsers/scpart.c
@@ -80,7 +80,7 @@ static int scpart_scan_partmap(struct mtd_info *master, loff_t partmap_offs,
if (cnt > 0) {
int bytes = cnt * sizeof(*pdesc);
- pdesc = kzalloc_objs(*pdesc, cnt, GFP_KERNEL);
+ pdesc = kzalloc_objs(*pdesc, cnt);
if (!pdesc) {
res = -ENOMEM;
goto free;
diff --git a/drivers/mtd/parsers/tplink_safeloader.c b/drivers/mtd/parsers/tplink_safeloader.c
index 3a4e9b84277f..b770f41ef874 100644
--- a/drivers/mtd/parsers/tplink_safeloader.c
+++ b/drivers/mtd/parsers/tplink_safeloader.c
@@ -82,7 +82,7 @@ static int mtd_parser_tplink_safeloader_parse(struct mtd_info *mtd,
int idx;
int err;
- parts = kzalloc_objs(*parts, TPLINK_SAFELOADER_MAX_PARTS, GFP_KERNEL);
+ parts = kzalloc_objs(*parts, TPLINK_SAFELOADER_MAX_PARTS);
if (!parts) {
err = -ENOMEM;
goto err_out;
diff --git a/drivers/mtd/rfd_ftl.c b/drivers/mtd/rfd_ftl.c
index f7d5591e8858..3199453b3bc9 100644
--- a/drivers/mtd/rfd_ftl.c
+++ b/drivers/mtd/rfd_ftl.c
@@ -270,7 +270,7 @@ static int erase_block(struct partition *part, int block)
struct erase_info *erase;
int rc;
- erase = kmalloc_obj(struct erase_info, GFP_KERNEL);
+ erase = kmalloc_obj(struct erase_info);
if (!erase)
return -ENOMEM;
@@ -752,7 +752,7 @@ static void rfd_ftl_add_mtd(struct mtd_blktrans_ops *tr, struct mtd_info *mtd)
mtd->size > UINT_MAX)
return;
- part = kzalloc_obj(struct partition, GFP_KERNEL);
+ part = kzalloc_obj(struct partition);
if (!part)
return;
diff --git a/drivers/mtd/sm_ftl.c b/drivers/mtd/sm_ftl.c
index 5da82a4612b6..512012fd39f8 100644
--- a/drivers/mtd/sm_ftl.c
+++ b/drivers/mtd/sm_ftl.c
@@ -64,7 +64,7 @@ static struct attribute_group *sm_create_sysfs_attributes(struct sm_ftl *ftl)
/* Initialize sysfs attributes */
vendor_attribute =
- kzalloc_obj(struct sm_sysfs_attribute, GFP_KERNEL);
+ kzalloc_obj(struct sm_sysfs_attribute);
if (!vendor_attribute)
goto error2;
@@ -85,7 +85,7 @@ static struct attribute_group *sm_create_sysfs_attributes(struct sm_ftl *ftl)
attributes[0] = &vendor_attribute->dev_attr.attr;
/* Finally create the attribute group */
- attr_group = kzalloc_obj(struct attribute_group, GFP_KERNEL);
+ attr_group = kzalloc_obj(struct attribute_group);
if (!attr_group)
goto error4;
attr_group->attrs = attributes;
@@ -1134,7 +1134,7 @@ static void sm_add_mtd(struct mtd_blktrans_ops *tr, struct mtd_info *mtd)
struct sm_ftl *ftl;
/* Allocate & initialize our private structure */
- ftl = kzalloc_obj(struct sm_ftl, GFP_KERNEL);
+ ftl = kzalloc_obj(struct sm_ftl);
if (!ftl)
goto error1;
@@ -1156,7 +1156,7 @@ static void sm_add_mtd(struct mtd_blktrans_ops *tr, struct mtd_info *mtd)
goto error2;
/* Allocate zone array, it will be initialized on demand */
- ftl->zones = kzalloc_objs(struct ftl_zone, ftl->zone_count, GFP_KERNEL);
+ ftl->zones = kzalloc_objs(struct ftl_zone, ftl->zone_count);
if (!ftl->zones)
goto error3;
@@ -1170,7 +1170,7 @@ static void sm_add_mtd(struct mtd_blktrans_ops *tr, struct mtd_info *mtd)
/* Allocate upper layer structure and initialize it */
- trans = kzalloc_obj(struct mtd_blktrans_dev, GFP_KERNEL);
+ trans = kzalloc_obj(struct mtd_blktrans_dev);
if (!trans)
goto error5;
diff --git a/drivers/mtd/spi-nor/core.c b/drivers/mtd/spi-nor/core.c
index d48170eceec6..8ffeb41c3e08 100644
--- a/drivers/mtd/spi-nor/core.c
+++ b/drivers/mtd/spi-nor/core.c
@@ -1553,7 +1553,7 @@ spi_nor_init_erase_cmd(const struct spi_nor_erase_region *region,
{
struct spi_nor_erase_command *cmd;
- cmd = kmalloc_obj(*cmd, GFP_KERNEL);
+ cmd = kmalloc_obj(*cmd);
if (!cmd)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/mtd/spi-nor/sfdp.c b/drivers/mtd/spi-nor/sfdp.c
index 1514f21c8557..4600983cb579 100644
--- a/drivers/mtd/spi-nor/sfdp.c
+++ b/drivers/mtd/spi-nor/sfdp.c
@@ -760,7 +760,7 @@ static const u32 *spi_nor_get_map_in_use(struct spi_nor *nor, const u32 *smpt,
u8 read_data_mask, map_id;
/* Use a kmalloc'ed bounce buffer to guarantee it is DMA-able. */
- buf = kmalloc_obj(*buf, GFP_KERNEL);
+ buf = kmalloc_obj(*buf);
if (!buf)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/mtd/ssfdc.c b/drivers/mtd/ssfdc.c
index b4e9a1c11c54..4a5225699a54 100644
--- a/drivers/mtd/ssfdc.c
+++ b/drivers/mtd/ssfdc.c
@@ -295,7 +295,7 @@ static void ssfdcr_add_mtd(struct mtd_blktrans_ops *tr, struct mtd_info *mtd)
if (cis_sector == -1)
return;
- ssfdc = kzalloc_obj(*ssfdc, GFP_KERNEL);
+ ssfdc = kzalloc_obj(*ssfdc);
if (!ssfdc)
return;
diff --git a/drivers/mtd/tests/stresstest.c b/drivers/mtd/tests/stresstest.c
index ec5d7bd93b77..944f960a4bbf 100644
--- a/drivers/mtd/tests/stresstest.c
+++ b/drivers/mtd/tests/stresstest.c
@@ -178,7 +178,7 @@ static int __init mtd_stresstest_init(void)
err = -ENOMEM;
readbuf = vmalloc(bufsize);
writebuf = vmalloc(bufsize);
- offsets = kmalloc_objs(int, ebcnt, GFP_KERNEL);
+ offsets = kmalloc_objs(int, ebcnt);
if (!readbuf || !writebuf || !offsets)
goto out;
for (i = 0; i < ebcnt; i++)
diff --git a/drivers/mtd/ubi/attach.c b/drivers/mtd/ubi/attach.c
index 9823e0bd7a51..0fa115cbf3ad 100644
--- a/drivers/mtd/ubi/attach.c
+++ b/drivers/mtd/ubi/attach.c
@@ -131,7 +131,7 @@ static struct ubi_ainf_volume *find_or_add_av(struct ubi_attach_info *ai,
return NULL;
/* The volume is absent - add it */
- av = kzalloc_obj(*av, GFP_KERNEL);
+ av = kzalloc_obj(*av);
if (!av)
return ERR_PTR(-ENOMEM);
@@ -1451,7 +1451,7 @@ static struct ubi_attach_info *alloc_ai(const char *slab_name)
{
struct ubi_attach_info *ai;
- ai = kzalloc_obj(struct ubi_attach_info, GFP_KERNEL);
+ ai = kzalloc_obj(struct ubi_attach_info);
if (!ai)
return ai;
diff --git a/drivers/mtd/ubi/block.c b/drivers/mtd/ubi/block.c
index 4428486fb287..8880a783c3bc 100644
--- a/drivers/mtd/ubi/block.c
+++ b/drivers/mtd/ubi/block.c
@@ -368,7 +368,7 @@ int ubiblock_create(struct ubi_volume_info *vi)
goto out_unlock;
}
- dev = kzalloc_obj(struct ubiblock, GFP_KERNEL);
+ dev = kzalloc_obj(struct ubiblock);
if (!dev) {
ret = -ENOMEM;
goto out_unlock;
diff --git a/drivers/mtd/ubi/build.c b/drivers/mtd/ubi/build.c
index d7493b61bee4..674ad87809df 100644
--- a/drivers/mtd/ubi/build.c
+++ b/drivers/mtd/ubi/build.c
@@ -930,7 +930,7 @@ int ubi_attach_mtd_dev(struct mtd_info *mtd, int ubi_num,
}
}
- ubi = kzalloc_obj(struct ubi_device, GFP_KERNEL);
+ ubi = kzalloc_obj(struct ubi_device);
if (!ubi)
return -ENOMEM;
diff --git a/drivers/mtd/ubi/cdev.c b/drivers/mtd/ubi/cdev.c
index 0b233b6a2d9c..fd39030dbf89 100644
--- a/drivers/mtd/ubi/cdev.c
+++ b/drivers/mtd/ubi/cdev.c
@@ -727,7 +727,7 @@ static int rename_volumes(struct ubi_device *ubi,
int name_len = req->ents[i].name_len;
const char *name = req->ents[i].name;
- re = kzalloc_obj(struct ubi_rename_entry, GFP_KERNEL);
+ re = kzalloc_obj(struct ubi_rename_entry);
if (!re) {
err = -ENOMEM;
goto out_free;
@@ -801,7 +801,7 @@ static int rename_volumes(struct ubi_device *ubi,
goto out_free;
}
- re1 = kzalloc_obj(struct ubi_rename_entry, GFP_KERNEL);
+ re1 = kzalloc_obj(struct ubi_rename_entry);
if (!re1) {
err = -ENOMEM;
ubi_close_volume(desc);
@@ -1007,7 +1007,7 @@ static long ubi_cdev_ioctl(struct file *file, unsigned int cmd,
struct ubi_rnvol_req *req;
dbg_gen("re-name volumes");
- req = kmalloc_obj(struct ubi_rnvol_req, GFP_KERNEL);
+ req = kmalloc_obj(struct ubi_rnvol_req);
if (!req) {
err = -ENOMEM;
break;
diff --git a/drivers/mtd/ubi/eba.c b/drivers/mtd/ubi/eba.c
index dbc448e2b7a6..35e047392d4a 100644
--- a/drivers/mtd/ubi/eba.c
+++ b/drivers/mtd/ubi/eba.c
@@ -124,11 +124,11 @@ struct ubi_eba_table *ubi_eba_create_table(struct ubi_volume *vol,
int err = -ENOMEM;
int i;
- tbl = kzalloc_obj(*tbl, GFP_KERNEL);
+ tbl = kzalloc_obj(*tbl);
if (!tbl)
return ERR_PTR(-ENOMEM);
- tbl->entries = kmalloc_objs(*tbl->entries, nentries, GFP_KERNEL);
+ tbl->entries = kmalloc_objs(*tbl->entries, nentries);
if (!tbl->entries)
goto err;
@@ -1535,11 +1535,11 @@ int self_check_eba(struct ubi_device *ubi, struct ubi_attach_info *ai_fastmap,
num_volumes = ubi->vtbl_slots + UBI_INT_VOL_COUNT;
- scan_eba = kmalloc_objs(*scan_eba, num_volumes, GFP_KERNEL);
+ scan_eba = kmalloc_objs(*scan_eba, num_volumes);
if (!scan_eba)
return -ENOMEM;
- fm_eba = kmalloc_objs(*fm_eba, num_volumes, GFP_KERNEL);
+ fm_eba = kmalloc_objs(*fm_eba, num_volumes);
if (!fm_eba) {
kfree(scan_eba);
return -ENOMEM;
diff --git a/drivers/mtd/ubi/fastmap.c b/drivers/mtd/ubi/fastmap.c
index 30953ff2ff52..3bce1b4d8464 100644
--- a/drivers/mtd/ubi/fastmap.c
+++ b/drivers/mtd/ubi/fastmap.c
@@ -889,13 +889,13 @@ int ubi_scan_fastmap(struct ubi_device *ubi, struct ubi_attach_info *ai,
down_write(&ubi->fm_protect);
memset(ubi->fm_buf, 0, ubi->fm_size);
- fmsb = kmalloc_obj(*fmsb, GFP_KERNEL);
+ fmsb = kmalloc_obj(*fmsb);
if (!fmsb) {
ret = -ENOMEM;
goto out;
}
- fm = kzalloc_obj(*fm, GFP_KERNEL);
+ fm = kzalloc_obj(*fm);
if (!fm) {
ret = -ENOMEM;
kfree(fmsb);
diff --git a/drivers/mtd/ubi/gluebi.c b/drivers/mtd/ubi/gluebi.c
index e56b4172264c..e3891ae82dfa 100644
--- a/drivers/mtd/ubi/gluebi.c
+++ b/drivers/mtd/ubi/gluebi.c
@@ -281,7 +281,7 @@ static int gluebi_create(struct ubi_device_info *di,
struct gluebi_device *gluebi, *g;
struct mtd_info *mtd;
- gluebi = kzalloc_obj(struct gluebi_device, GFP_KERNEL);
+ gluebi = kzalloc_obj(struct gluebi_device);
if (!gluebi)
return -ENOMEM;
diff --git a/drivers/mtd/ubi/kapi.c b/drivers/mtd/ubi/kapi.c
index 7cc239245e42..9626990f67cb 100644
--- a/drivers/mtd/ubi/kapi.c
+++ b/drivers/mtd/ubi/kapi.c
@@ -140,7 +140,7 @@ struct ubi_volume_desc *ubi_open_volume(int ubi_num, int vol_id, int mode)
goto out_put_ubi;
}
- desc = kmalloc_obj(struct ubi_volume_desc, GFP_KERNEL);
+ desc = kmalloc_obj(struct ubi_volume_desc);
if (!desc) {
err = -ENOMEM;
goto out_put_ubi;
diff --git a/drivers/mtd/ubi/nvmem.c b/drivers/mtd/ubi/nvmem.c
index bc2cfb355d5c..2dade9727cf2 100644
--- a/drivers/mtd/ubi/nvmem.c
+++ b/drivers/mtd/ubi/nvmem.c
@@ -75,7 +75,7 @@ static int ubi_nvmem_add(struct ubi_volume_info *vi)
WARN_ON_ONCE(vi->size <= 0))
return -EINVAL;
- unv = kzalloc_obj(struct ubi_nvmem, GFP_KERNEL);
+ unv = kzalloc_obj(struct ubi_nvmem);
if (!unv)
return -ENOMEM;
diff --git a/drivers/mtd/ubi/vmt.c b/drivers/mtd/ubi/vmt.c
index ffec2c649698..50192b95b6e4 100644
--- a/drivers/mtd/ubi/vmt.c
+++ b/drivers/mtd/ubi/vmt.c
@@ -172,7 +172,7 @@ int ubi_create_volume(struct ubi_device *ubi, struct ubi_mkvol_req *req)
if (ubi->ro_mode)
return -EROFS;
- vol = kzalloc_obj(struct ubi_volume, GFP_KERNEL);
+ vol = kzalloc_obj(struct ubi_volume);
if (!vol)
return -ENOMEM;
diff --git a/drivers/mtd/ubi/vtbl.c b/drivers/mtd/ubi/vtbl.c
index 74427a03e896..06d87a3013a5 100644
--- a/drivers/mtd/ubi/vtbl.c
+++ b/drivers/mtd/ubi/vtbl.c
@@ -531,7 +531,7 @@ static int init_volumes(struct ubi_device *ubi,
if (be32_to_cpu(vtbl[i].reserved_pebs) == 0)
continue; /* Empty record */
- vol = kzalloc_obj(struct ubi_volume, GFP_KERNEL);
+ vol = kzalloc_obj(struct ubi_volume);
if (!vol)
return -ENOMEM;
@@ -623,7 +623,7 @@ static int init_volumes(struct ubi_device *ubi,
}
/* And add the layout volume */
- vol = kzalloc_obj(struct ubi_volume, GFP_KERNEL);
+ vol = kzalloc_obj(struct ubi_volume);
if (!vol)
return -ENOMEM;
diff --git a/drivers/mux/core.c b/drivers/mux/core.c
index 236e4f02f38e..f09ee8782e3d 100644
--- a/drivers/mux/core.c
+++ b/drivers/mux/core.c
@@ -681,7 +681,7 @@ static struct mux_state *mux_state_get(struct device *dev, const char *mux_name)
{
struct mux_state *mstate;
- mstate = kzalloc_obj(*mstate, GFP_KERNEL);
+ mstate = kzalloc_obj(*mstate);
if (!mstate)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/net/arcnet/com20020_cs.c b/drivers/net/arcnet/com20020_cs.c
index a6d9207cfc16..5c3c91677b62 100644
--- a/drivers/net/arcnet/com20020_cs.c
+++ b/drivers/net/arcnet/com20020_cs.c
@@ -119,7 +119,7 @@ static int com20020_probe(struct pcmcia_device *p_dev)
dev_dbg(&p_dev->dev, "com20020_attach()\n");
/* Create new network device */
- info = kzalloc_obj(*info, GFP_KERNEL);
+ info = kzalloc_obj(*info);
if (!info)
goto fail_alloc_info;
diff --git a/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_main.c
index cddcbb5883c6..c9bf8ec00a36 100644
--- a/drivers/net/bonding/bond_main.c
+++ b/drivers/net/bonding/bond_main.c
@@ -491,7 +491,7 @@ static int bond_ipsec_add_sa(struct net_device *bond_dev,
goto out;
}
- ipsec = kmalloc_obj(*ipsec, GFP_KERNEL);
+ ipsec = kmalloc_obj(*ipsec);
if (!ipsec) {
err = -ENOMEM;
goto out;
@@ -1387,7 +1387,7 @@ static inline int slave_enable_netpoll(struct slave *slave)
struct netpoll *np;
int err = 0;
- np = kzalloc_obj(*np, GFP_KERNEL);
+ np = kzalloc_obj(*np);
err = -ENOMEM;
if (!np)
goto out;
@@ -1711,7 +1711,7 @@ static struct slave *bond_alloc_slave(struct bonding *bond,
{
struct slave *slave = NULL;
- slave = kzalloc_obj(*slave, GFP_KERNEL);
+ slave = kzalloc_obj(*slave);
if (!slave)
return NULL;
diff --git a/drivers/net/can/ctucanfd/ctucanfd_pci.c b/drivers/net/can/ctucanfd/ctucanfd_pci.c
index 2d731a6f0be0..7b847b667973 100644
--- a/drivers/net/can/ctucanfd/ctucanfd_pci.c
+++ b/drivers/net/can/ctucanfd/ctucanfd_pci.c
@@ -153,7 +153,7 @@ static int ctucan_pci_probe(struct pci_dev *pdev,
ntxbufs = 4;
- bdata = kzalloc_obj(*bdata, GFP_KERNEL);
+ bdata = kzalloc_obj(*bdata);
if (!bdata) {
ret = -ENOMEM;
goto err_pci_iounmap_bar0;
diff --git a/drivers/net/can/grcan.c b/drivers/net/can/grcan.c
index 56758ddf939b..ce12fa6df56d 100644
--- a/drivers/net/can/grcan.c
+++ b/drivers/net/can/grcan.c
@@ -1054,7 +1054,7 @@ static int grcan_open(struct net_device *dev)
return err;
}
- priv->echo_skb = kzalloc_objs(*priv->echo_skb, dma->tx.size, GFP_KERNEL);
+ priv->echo_skb = kzalloc_objs(*priv->echo_skb, dma->tx.size);
if (!priv->echo_skb) {
err = -ENOMEM;
goto exit_free_dma_buffers;
diff --git a/drivers/net/can/sja1000/ems_pci.c b/drivers/net/can/sja1000/ems_pci.c
index c4716df2e00f..986fc8786fac 100644
--- a/drivers/net/can/sja1000/ems_pci.c
+++ b/drivers/net/can/sja1000/ems_pci.c
@@ -260,7 +260,7 @@ static int ems_pci_add_card(struct pci_dev *pdev,
}
/* Allocating card structures to hold addresses, ... */
- card = kzalloc_obj(*card, GFP_KERNEL);
+ card = kzalloc_obj(*card);
if (!card) {
pci_disable_device(pdev);
return -ENOMEM;
diff --git a/drivers/net/can/sja1000/ems_pcmcia.c b/drivers/net/can/sja1000/ems_pcmcia.c
index fad4c51767ed..3cae1cd1a104 100644
--- a/drivers/net/can/sja1000/ems_pcmcia.c
+++ b/drivers/net/can/sja1000/ems_pcmcia.c
@@ -165,7 +165,7 @@ static int ems_pcmcia_add_card(struct pcmcia_device *pdev, unsigned long base)
int err, i;
/* Allocating card structures to hold addresses, ... */
- card = kzalloc_obj(struct ems_pcmcia_card, GFP_KERNEL);
+ card = kzalloc_obj(struct ems_pcmcia_card);
if (!card)
return -ENOMEM;
diff --git a/drivers/net/can/sja1000/peak_pci.c b/drivers/net/can/sja1000/peak_pci.c
index 4ab825636092..4cc4a1581dd1 100644
--- a/drivers/net/can/sja1000/peak_pci.c
+++ b/drivers/net/can/sja1000/peak_pci.c
@@ -452,7 +452,7 @@ static int peak_pciec_probe(struct pci_dev *pdev, struct net_device *dev)
/* channel is the first one: do the init part */
} else {
/* create the bit banging I2C adapter structure */
- card = kzalloc_obj(*card, GFP_KERNEL);
+ card = kzalloc_obj(*card);
if (!card)
return -ENOMEM;
diff --git a/drivers/net/can/sja1000/peak_pcmcia.c b/drivers/net/can/sja1000/peak_pcmcia.c
index 04b37c746620..42a77d435b39 100644
--- a/drivers/net/can/sja1000/peak_pcmcia.c
+++ b/drivers/net/can/sja1000/peak_pcmcia.c
@@ -650,7 +650,7 @@ static int pcan_probe(struct pcmcia_device *pdev)
goto probe_err_1;
}
- card = kzalloc_obj(struct pcan_pccard, GFP_KERNEL);
+ card = kzalloc_obj(struct pcan_pccard);
if (!card) {
err = -ENOMEM;
goto probe_err_2;
diff --git a/drivers/net/can/sja1000/plx_pci.c b/drivers/net/can/sja1000/plx_pci.c
index d1c9427f6a5d..08183833c9bc 100644
--- a/drivers/net/can/sja1000/plx_pci.c
+++ b/drivers/net/can/sja1000/plx_pci.c
@@ -629,7 +629,7 @@ static int plx_pci_add_card(struct pci_dev *pdev,
ci->name, PCI_SLOT(pdev->devfn));
/* Allocate card structures to hold addresses, ... */
- card = kzalloc_obj(*card, GFP_KERNEL);
+ card = kzalloc_obj(*card);
if (!card) {
pci_disable_device(pdev);
return -ENOMEM;
diff --git a/drivers/net/can/softing/softing_cs.c b/drivers/net/can/softing/softing_cs.c
index c37390fa7e6a..3cea14cf055a 100644
--- a/drivers/net/can/softing/softing_cs.c
+++ b/drivers/net/can/softing/softing_cs.c
@@ -256,7 +256,7 @@ static int softingcs_probe(struct pcmcia_device *pcmcia)
}
/* create softing platform device */
- dev = kzalloc_obj(*dev, GFP_KERNEL);
+ dev = kzalloc_obj(*dev);
if (!dev) {
ret = -ENOMEM;
goto mem_failed;
diff --git a/drivers/net/can/softing/softing_main.c b/drivers/net/can/softing/softing_main.c
index 4872f636e367..519ab3097f86 100644
--- a/drivers/net/can/softing/softing_main.c
+++ b/drivers/net/can/softing/softing_main.c
@@ -767,7 +767,7 @@ static int softing_pdev_probe(struct platform_device *pdev)
return -EINVAL;
}
- card = kzalloc_obj(*card, GFP_KERNEL);
+ card = kzalloc_obj(*card);
if (!card)
return -ENOMEM;
card->pdat = pdat;
diff --git a/drivers/net/can/spi/mcp251xfd/mcp251xfd-core.c b/drivers/net/can/spi/mcp251xfd/mcp251xfd-core.c
index 6ef8a3fa2f1e..9c86df08c2c5 100644
--- a/drivers/net/can/spi/mcp251xfd/mcp251xfd-core.c
+++ b/drivers/net/can/spi/mcp251xfd/mcp251xfd-core.c
@@ -1961,11 +1961,11 @@ mcp251xfd_register_get_dev_id(const struct mcp251xfd_priv *priv, u32 *dev_id,
struct spi_transfer xfer[2] = { };
int err;
- buf_rx = kzalloc_obj(*buf_rx, GFP_KERNEL);
+ buf_rx = kzalloc_obj(*buf_rx);
if (!buf_rx)
return -ENOMEM;
- buf_tx = kzalloc_obj(*buf_tx, GFP_KERNEL);
+ buf_tx = kzalloc_obj(*buf_tx);
if (!buf_tx) {
err = -ENOMEM;
goto out_kfree_buf_rx;
diff --git a/drivers/net/can/usb/esd_usb.c b/drivers/net/can/usb/esd_usb.c
index 029a321bac10..2892a68f510a 100644
--- a/drivers/net/can/usb/esd_usb.c
+++ b/drivers/net/can/usb/esd_usb.c
@@ -726,7 +726,7 @@ static int esd_usb_start(struct esd_usb_net_priv *priv)
union esd_usb_msg *msg;
int err, i;
- msg = kmalloc_obj(*msg, GFP_KERNEL);
+ msg = kmalloc_obj(*msg);
if (!msg) {
err = -ENOMEM;
goto out;
@@ -962,7 +962,7 @@ static int esd_usb_stop(struct esd_usb_net_priv *priv)
int err;
int i;
- msg = kmalloc_obj(*msg, GFP_KERNEL);
+ msg = kmalloc_obj(*msg);
if (!msg)
return -ENOMEM;
@@ -1068,7 +1068,7 @@ static int esd_usb_2_set_bittiming(struct net_device *netdev)
if (priv->can.ctrlmode & CAN_CTRLMODE_3_SAMPLES)
canbtr |= ESD_USB_TRIPLE_SAMPLES;
- msg = kmalloc_obj(*msg, GFP_KERNEL);
+ msg = kmalloc_obj(*msg);
if (!msg)
return -ENOMEM;
@@ -1130,7 +1130,7 @@ static int esd_usb_3_set_bittiming(struct net_device *netdev)
u16 flags = 0;
int err;
- msg = kmalloc_obj(*msg, GFP_KERNEL);
+ msg = kmalloc_obj(*msg);
if (!msg)
return -ENOMEM;
@@ -1302,7 +1302,7 @@ static int esd_usb_probe(struct usb_interface *intf,
union esd_usb_msg *msg;
int i, err;
- dev = kzalloc_obj(*dev, GFP_KERNEL);
+ dev = kzalloc_obj(*dev);
if (!dev) {
err = -ENOMEM;
goto done;
@@ -1314,7 +1314,7 @@ static int esd_usb_probe(struct usb_interface *intf,
usb_set_intfdata(intf, dev);
- msg = kmalloc_obj(*msg, GFP_KERNEL);
+ msg = kmalloc_obj(*msg);
if (!msg) {
err = -ENOMEM;
goto free_msg;
diff --git a/drivers/net/can/usb/f81604.c b/drivers/net/can/usb/f81604.c
index 435c7d878138..76578063ac82 100644
--- a/drivers/net/can/usb/f81604.c
+++ b/drivers/net/can/usb/f81604.c
@@ -678,7 +678,7 @@ static int f81604_register_urbs(struct f81604_port_priv *priv)
break;
}
- frame = kmalloc_obj(*frame, GFP_KERNEL);
+ frame = kmalloc_obj(*frame);
if (!frame) {
usb_free_urb(rx_urb);
ret = -ENOMEM;
@@ -717,7 +717,7 @@ static int f81604_register_urbs(struct f81604_port_priv *priv)
goto error;
}
- int_data = kmalloc_obj(*int_data, GFP_KERNEL);
+ int_data = kmalloc_obj(*int_data);
if (!int_data) {
usb_free_urb(int_urb);
ret = -ENOMEM;
diff --git a/drivers/net/can/usb/kvaser_usb/kvaser_usb_hydra.c b/drivers/net/can/usb/kvaser_usb/kvaser_usb_hydra.c
index e765210626ce..e09d663e362f 100644
--- a/drivers/net/can/usb/kvaser_usb/kvaser_usb_hydra.c
+++ b/drivers/net/can/usb/kvaser_usb/kvaser_usb_hydra.c
@@ -580,7 +580,7 @@ static int kvaser_usb_hydra_send_simple_cmd(struct kvaser_usb *dev,
size_t cmd_len;
int err;
- cmd = kzalloc_obj(*cmd, GFP_KERNEL);
+ cmd = kzalloc_obj(*cmd);
if (!cmd)
return -ENOMEM;
@@ -742,7 +742,7 @@ static int kvaser_usb_hydra_map_channel(struct kvaser_usb *dev, u16 transid,
struct kvaser_cmd *cmd;
int err;
- cmd = kzalloc_obj(*cmd, GFP_KERNEL);
+ cmd = kzalloc_obj(*cmd);
if (!cmd)
return -ENOMEM;
@@ -784,7 +784,7 @@ static int kvaser_usb_hydra_get_single_capability(struct kvaser_usb *dev,
int err;
int i;
- cmd = kzalloc_obj(*cmd, GFP_KERNEL);
+ cmd = kzalloc_obj(*cmd);
if (!cmd)
return -ENOMEM;
@@ -1610,7 +1610,7 @@ static int kvaser_usb_hydra_get_busparams(struct kvaser_usb_net_priv *priv,
if (!hydra)
return -EINVAL;
- cmd = kzalloc_objs(struct kvaser_cmd, 1, GFP_KERNEL);
+ cmd = kzalloc_objs(struct kvaser_cmd, 1);
if (!cmd)
return -ENOMEM;
@@ -1655,7 +1655,7 @@ static int kvaser_usb_hydra_set_bittiming(const struct net_device *netdev,
size_t cmd_len;
int err;
- cmd = kzalloc_obj(*cmd, GFP_KERNEL);
+ cmd = kzalloc_obj(*cmd);
if (!cmd)
return -ENOMEM;
@@ -1685,7 +1685,7 @@ static int kvaser_usb_hydra_set_data_bittiming(const struct net_device *netdev,
size_t cmd_len;
int err;
- cmd = kzalloc_obj(*cmd, GFP_KERNEL);
+ cmd = kzalloc_obj(*cmd);
if (!cmd)
return -ENOMEM;
@@ -1842,7 +1842,7 @@ static int kvaser_usb_hydra_get_software_details(struct kvaser_usb *dev)
u32 fw_version;
struct kvaser_usb_dev_card_data *card_data = &dev->card_data;
- cmd = kzalloc_obj(*cmd, GFP_KERNEL);
+ cmd = kzalloc_obj(*cmd);
if (!cmd)
return -ENOMEM;
@@ -1985,7 +1985,7 @@ static int kvaser_usb_hydra_set_led(struct kvaser_usb_net_priv *priv,
size_t cmd_len;
int ret;
- cmd = kzalloc_obj(*cmd, GFP_KERNEL);
+ cmd = kzalloc_obj(*cmd);
if (!cmd)
return -ENOMEM;
@@ -2021,7 +2021,7 @@ static int kvaser_usb_hydra_set_opt_mode(const struct kvaser_usb_net_priv *priv)
return -EINVAL;
}
- cmd = kzalloc_obj(*cmd, GFP_KERNEL);
+ cmd = kzalloc_obj(*cmd);
if (!cmd)
return -ENOMEM;
diff --git a/drivers/net/can/usb/kvaser_usb/kvaser_usb_leaf.c b/drivers/net/can/usb/kvaser_usb/kvaser_usb_leaf.c
index 8e32d98ab0a3..fd191ec5738b 100644
--- a/drivers/net/can/usb/kvaser_usb/kvaser_usb_leaf.c
+++ b/drivers/net/can/usb/kvaser_usb/kvaser_usb_leaf.c
@@ -723,7 +723,7 @@ static int kvaser_usb_leaf_send_simple_cmd(const struct kvaser_usb *dev,
struct kvaser_cmd *cmd;
int rc;
- cmd = kmalloc_obj(*cmd, GFP_KERNEL);
+ cmd = kmalloc_obj(*cmd);
if (!cmd)
return -ENOMEM;
@@ -873,7 +873,7 @@ static int kvaser_usb_leaf_get_single_capability(struct kvaser_usb *dev,
int err;
int i;
- cmd = kzalloc_obj(*cmd, GFP_KERNEL);
+ cmd = kzalloc_obj(*cmd);
if (!cmd)
return -ENOMEM;
@@ -970,7 +970,7 @@ static int kvaser_usb_leaf_set_led(struct kvaser_usb_net_priv *priv,
struct kvaser_cmd *cmd;
int ret;
- cmd = kzalloc_obj(*cmd, GFP_KERNEL);
+ cmd = kzalloc_obj(*cmd);
if (!cmd)
return -ENOMEM;
@@ -1752,7 +1752,7 @@ static int kvaser_usb_leaf_set_opt_mode(const struct kvaser_usb_net_priv *priv)
struct kvaser_cmd *cmd;
int rc;
- cmd = kzalloc_obj(*cmd, GFP_KERNEL);
+ cmd = kzalloc_obj(*cmd);
if (!cmd)
return -ENOMEM;
@@ -1824,7 +1824,7 @@ static int kvaser_usb_leaf_flush_queue(struct kvaser_usb_net_priv *priv)
struct kvaser_cmd *cmd;
int rc;
- cmd = kzalloc_obj(*cmd, GFP_KERNEL);
+ cmd = kzalloc_obj(*cmd);
if (!cmd)
return -ENOMEM;
@@ -1881,7 +1881,7 @@ static int kvaser_usb_leaf_set_bittiming(const struct net_device *netdev,
struct kvaser_cmd *cmd;
int rc;
- cmd = kmalloc_obj(*cmd, GFP_KERNEL);
+ cmd = kmalloc_obj(*cmd);
if (!cmd)
return -ENOMEM;
diff --git a/drivers/net/can/usb/nct6694_canfd.c b/drivers/net/can/usb/nct6694_canfd.c
index de60c2d1cdd1..e5f7f8849a73 100644
--- a/drivers/net/can/usb/nct6694_canfd.c
+++ b/drivers/net/can/usb/nct6694_canfd.c
@@ -527,7 +527,7 @@ static int nct6694_canfd_start(struct net_device *ndev)
u32 en_tdc;
int ret;
- setting = kzalloc_obj(*setting, GFP_KERNEL);
+ setting = kzalloc_obj(*setting);
if (!setting)
return -ENOMEM;
@@ -596,7 +596,7 @@ static void nct6694_canfd_stop(struct net_device *ndev)
* mode allows the device to monitor bus activity without actively
* participating in communication.
*/
- setting = kzalloc_obj(*setting, GFP_KERNEL);
+ setting = kzalloc_obj(*setting);
if (!setting)
return;
@@ -707,7 +707,7 @@ static int nct6694_canfd_get_clock(struct nct6694_canfd_priv *priv)
};
int ret;
- info = kzalloc_obj(*info, GFP_KERNEL);
+ info = kzalloc_obj(*info);
if (!info)
return -ENOMEM;
diff --git a/drivers/net/can/usb/peak_usb/pcan_usb_fd.c b/drivers/net/can/usb/peak_usb/pcan_usb_fd.c
index fbdc9b644241..eb4f5884ad73 100644
--- a/drivers/net/can/usb/peak_usb/pcan_usb_fd.c
+++ b/drivers/net/can/usb/peak_usb/pcan_usb_fd.c
@@ -939,7 +939,7 @@ static int pcan_usb_fd_init(struct peak_usb_device *dev)
/* do this for 1st channel only */
if (!dev->prev_siblings) {
/* allocate netdevices common structure attached to first one */
- pdev->usb_if = kzalloc_obj(*pdev->usb_if, GFP_KERNEL);
+ pdev->usb_if = kzalloc_obj(*pdev->usb_if);
if (!pdev->usb_if)
goto err_out;
diff --git a/drivers/net/can/usb/peak_usb/pcan_usb_pro.c b/drivers/net/can/usb/peak_usb/pcan_usb_pro.c
index db5d43bd4220..4bfa8d0fbb32 100644
--- a/drivers/net/can/usb/peak_usb/pcan_usb_pro.c
+++ b/drivers/net/can/usb/peak_usb/pcan_usb_pro.c
@@ -870,9 +870,9 @@ static int pcan_usb_pro_init(struct peak_usb_device *dev)
/* do this for 1st channel only */
if (!dev->prev_siblings) {
/* allocate netdevices common structure attached to first one */
- usb_if = kzalloc_obj(struct pcan_usb_pro_interface, GFP_KERNEL);
- fi = kmalloc_obj(struct pcan_usb_pro_fwinfo, GFP_KERNEL);
- bi = kmalloc_obj(struct pcan_usb_pro_blinfo, GFP_KERNEL);
+ usb_if = kzalloc_obj(struct pcan_usb_pro_interface);
+ fi = kmalloc_obj(struct pcan_usb_pro_fwinfo);
+ bi = kmalloc_obj(struct pcan_usb_pro_blinfo);
if (!usb_if || !fi || !bi) {
err = -ENOMEM;
goto err_out;
diff --git a/drivers/net/dsa/bcm_sf2_cfp.c b/drivers/net/dsa/bcm_sf2_cfp.c
index 8df91e4c1237..50d3a818eb1b 100644
--- a/drivers/net/dsa/bcm_sf2_cfp.c
+++ b/drivers/net/dsa/bcm_sf2_cfp.c
@@ -950,7 +950,7 @@ static int bcm_sf2_cfp_rule_set(struct dsa_switch *ds, int port,
if (ret == 0)
return -EEXIST;
- rule = kzalloc_obj(*rule, GFP_KERNEL);
+ rule = kzalloc_obj(*rule);
if (!rule)
return -ENOMEM;
diff --git a/drivers/net/dsa/hirschmann/hellcreek.c b/drivers/net/dsa/hirschmann/hellcreek.c
index 1e1917eafd7a..b369c1cc89e8 100644
--- a/drivers/net/dsa/hirschmann/hellcreek.c
+++ b/drivers/net/dsa/hirschmann/hellcreek.c
@@ -1265,7 +1265,7 @@ static int hellcreek_devlink_region_vlan_snapshot(struct devlink *dl,
struct hellcreek *hellcreek = ds->priv;
int i;
- table = kzalloc_objs(*entry, VLAN_N_VID, GFP_KERNEL);
+ table = kzalloc_objs(*entry, VLAN_N_VID);
if (!table)
return -ENOMEM;
@@ -1293,7 +1293,7 @@ static int hellcreek_devlink_region_fdb_snapshot(struct devlink *dl,
struct hellcreek *hellcreek = ds->priv;
size_t i;
- table = kzalloc_objs(*entry, hellcreek->fdb_entries, GFP_KERNEL);
+ table = kzalloc_objs(*entry, hellcreek->fdb_entries);
if (!table)
return -ENOMEM;
diff --git a/drivers/net/dsa/microchip/ksz9477_acl.c b/drivers/net/dsa/microchip/ksz9477_acl.c
index efd1da08bb45..d3e974602193 100644
--- a/drivers/net/dsa/microchip/ksz9477_acl.c
+++ b/drivers/net/dsa/microchip/ksz9477_acl.c
@@ -1060,7 +1060,7 @@ int ksz9477_port_acl_init(struct ksz_device *dev, int port)
struct ksz9477_acl_priv *acl;
int ret, i;
- acl = kzalloc_obj(*acl, GFP_KERNEL);
+ acl = kzalloc_obj(*acl);
if (!acl)
return -ENOMEM;
diff --git a/drivers/net/dsa/microchip/ksz_common.c b/drivers/net/dsa/microchip/ksz_common.c
index ddcbb1be4818..c517478cc476 100644
--- a/drivers/net/dsa/microchip/ksz_common.c
+++ b/drivers/net/dsa/microchip/ksz_common.c
@@ -4835,7 +4835,7 @@ int ksz_switch_macaddr_get(struct dsa_switch *ds, int port,
return 0;
}
- switch_macaddr = kzalloc_obj(*switch_macaddr, GFP_KERNEL);
+ switch_macaddr = kzalloc_obj(*switch_macaddr);
if (!switch_macaddr)
return -ENOMEM;
diff --git a/drivers/net/dsa/mv88e6xxx/chip.c b/drivers/net/dsa/mv88e6xxx/chip.c
index 7a43110e74b7..6fcd7181116a 100644
--- a/drivers/net/dsa/mv88e6xxx/chip.c
+++ b/drivers/net/dsa/mv88e6xxx/chip.c
@@ -2024,7 +2024,7 @@ static int mv88e6xxx_mst_get(struct mv88e6xxx_chip *chip, struct net_device *br,
if (err)
goto err;
- mst = kzalloc_obj(*mst, GFP_KERNEL);
+ mst = kzalloc_obj(*mst);
if (!mst) {
err = -ENOMEM;
goto err;
diff --git a/drivers/net/dsa/mv88e6xxx/pcs-6185.c b/drivers/net/dsa/mv88e6xxx/pcs-6185.c
index 176480cdee5a..7e52cb88554e 100644
--- a/drivers/net/dsa/mv88e6xxx/pcs-6185.c
+++ b/drivers/net/dsa/mv88e6xxx/pcs-6185.c
@@ -131,7 +131,7 @@ static int mv88e6185_pcs_init(struct mv88e6xxx_chip *chip, int port)
dev = chip->dev;
- mpcs = kzalloc_obj(*mpcs, GFP_KERNEL);
+ mpcs = kzalloc_obj(*mpcs);
if (!mpcs)
return -ENOMEM;
diff --git a/drivers/net/dsa/mv88e6xxx/pcs-6352.c b/drivers/net/dsa/mv88e6xxx/pcs-6352.c
index ecd8b5efccf6..9ebf0f89f817 100644
--- a/drivers/net/dsa/mv88e6xxx/pcs-6352.c
+++ b/drivers/net/dsa/mv88e6xxx/pcs-6352.c
@@ -267,7 +267,7 @@ static struct marvell_c22_pcs *marvell_c22_pcs_alloc(struct device *dev,
{
struct marvell_c22_pcs *mpcs;
- mpcs = kzalloc_obj(*mpcs, GFP_KERNEL);
+ mpcs = kzalloc_obj(*mpcs);
if (!mpcs)
return NULL;
diff --git a/drivers/net/dsa/mv88e6xxx/pcs-639x.c b/drivers/net/dsa/mv88e6xxx/pcs-639x.c
index c7728b00297d..a5fd187a7bf3 100644
--- a/drivers/net/dsa/mv88e6xxx/pcs-639x.c
+++ b/drivers/net/dsa/mv88e6xxx/pcs-639x.c
@@ -67,7 +67,7 @@ mv88e639x_pcs_alloc(struct device *dev, struct mii_bus *bus, unsigned int addr,
{
struct mv88e639x_pcs *mpcs;
- mpcs = kzalloc_obj(*mpcs, GFP_KERNEL);
+ mpcs = kzalloc_obj(*mpcs);
if (!mpcs)
return NULL;
diff --git a/drivers/net/dsa/ocelot/felix.c b/drivers/net/dsa/ocelot/felix.c
index 1587dd33a557..0904323b016d 100644
--- a/drivers/net/dsa/ocelot/felix.c
+++ b/drivers/net/dsa/ocelot/felix.c
@@ -109,7 +109,7 @@ static int felix_tag_8021q_vlan_add_rx(struct dsa_switch *ds, int port,
key_length = ocelot->vcap[VCAP_ES0].keys[VCAP_ES0_IGR_PORT].length;
- outer_tagging_rule = kzalloc_obj(struct ocelot_vcap_filter, GFP_KERNEL);
+ outer_tagging_rule = kzalloc_obj(struct ocelot_vcap_filter);
if (!outer_tagging_rule)
return -ENOMEM;
@@ -177,11 +177,11 @@ static int felix_tag_8021q_vlan_add_tx(struct dsa_switch *ds, int port,
unsigned long cookie;
int err;
- untagging_rule = kzalloc_obj(struct ocelot_vcap_filter, GFP_KERNEL);
+ untagging_rule = kzalloc_obj(struct ocelot_vcap_filter);
if (!untagging_rule)
return -ENOMEM;
- redirect_rule = kzalloc_obj(struct ocelot_vcap_filter, GFP_KERNEL);
+ redirect_rule = kzalloc_obj(struct ocelot_vcap_filter);
if (!redirect_rule) {
kfree(untagging_rule);
return -ENOMEM;
diff --git a/drivers/net/dsa/ocelot/felix_vsc9959.c b/drivers/net/dsa/ocelot/felix_vsc9959.c
index 86b9a24d3e33..8387dd208adb 100644
--- a/drivers/net/dsa/ocelot/felix_vsc9959.c
+++ b/drivers/net/dsa/ocelot/felix_vsc9959.c
@@ -2201,7 +2201,7 @@ static int vsc9959_psfp_sgi_table_add(struct ocelot *ocelot,
return 0;
}
- tmp = kzalloc_obj(*tmp, GFP_KERNEL);
+ tmp = kzalloc_obj(*tmp);
if (!tmp)
return -ENOMEM;
diff --git a/drivers/net/dsa/sja1105/sja1105_flower.c b/drivers/net/dsa/sja1105/sja1105_flower.c
index c91f7371471c..fba926f85b47 100644
--- a/drivers/net/dsa/sja1105/sja1105_flower.c
+++ b/drivers/net/dsa/sja1105/sja1105_flower.c
@@ -41,7 +41,7 @@ static int sja1105_setup_bcast_policer(struct sja1105_private *priv,
int rc;
if (!rule) {
- rule = kzalloc_obj(*rule, GFP_KERNEL);
+ rule = kzalloc_obj(*rule);
if (!rule)
return -ENOMEM;
@@ -112,7 +112,7 @@ static int sja1105_setup_tc_policer(struct sja1105_private *priv,
int rc;
if (!rule) {
- rule = kzalloc_obj(*rule, GFP_KERNEL);
+ rule = kzalloc_obj(*rule);
if (!rule)
return -ENOMEM;
diff --git a/drivers/net/dsa/sja1105/sja1105_vl.c b/drivers/net/dsa/sja1105/sja1105_vl.c
index 7ec1ce5edf07..7dd544fe26c6 100644
--- a/drivers/net/dsa/sja1105/sja1105_vl.c
+++ b/drivers/net/dsa/sja1105/sja1105_vl.c
@@ -16,7 +16,7 @@ static int sja1105_insert_gate_entry(struct sja1105_gating_config *gating_cfg,
struct sja1105_gate_entry *e;
int rc;
- e = kzalloc_obj(*e, GFP_KERNEL);
+ e = kzalloc_obj(*e);
if (!e)
return -ENOMEM;
@@ -524,7 +524,7 @@ int sja1105_vl_redirect(struct sja1105_private *priv, int port,
}
if (!rule) {
- rule = kzalloc_obj(*rule, GFP_KERNEL);
+ rule = kzalloc_obj(*rule);
if (!rule)
return -ENOMEM;
@@ -622,7 +622,7 @@ int sja1105_vl_gate(struct sja1105_private *priv, int port,
}
if (!rule) {
- rule = kzalloc_obj(*rule, GFP_KERNEL);
+ rule = kzalloc_obj(*rule);
if (!rule)
return -ENOMEM;
diff --git a/drivers/net/dsa/vitesse-vsc73xx-core.c b/drivers/net/dsa/vitesse-vsc73xx-core.c
index a2feb30843b6..6f586d3da9d4 100644
--- a/drivers/net/dsa/vitesse-vsc73xx-core.c
+++ b/drivers/net/dsa/vitesse-vsc73xx-core.c
@@ -1664,7 +1664,7 @@ static int vsc73xx_port_vlan_add(struct dsa_switch *ds, int port,
vsc73xx_vlan = vsc73xx_bridge_vlan_find(vsc, vlan->vid);
if (!vsc73xx_vlan) {
- vsc73xx_vlan = kzalloc_obj(*vsc73xx_vlan, GFP_KERNEL);
+ vsc73xx_vlan = kzalloc_obj(*vsc73xx_vlan);
if (!vsc73xx_vlan)
return -ENOMEM;
diff --git a/drivers/net/eql.c b/drivers/net/eql.c
index 3fccbe2a63a0..06083b9841ba 100644
--- a/drivers/net/eql.c
+++ b/drivers/net/eql.c
@@ -425,7 +425,7 @@ static int eql_enslave(struct net_device *master_dev, slaving_request_t __user *
if ((master_dev->flags & IFF_UP) == IFF_UP) {
/* slave is not a master & not already a slave: */
if (!eql_is_master(slave_dev) && !eql_is_slave(slave_dev)) {
- slave_t *s = kzalloc_obj(*s, GFP_KERNEL);
+ slave_t *s = kzalloc_obj(*s);
equalizer_t *eql = netdev_priv(master_dev);
int ret;
diff --git a/drivers/net/ethernet/agere/et131x.c b/drivers/net/ethernet/agere/et131x.c
index 30cc8acd2b8c..0f6e5373029a 100644
--- a/drivers/net/ethernet/agere/et131x.c
+++ b/drivers/net/ethernet/agere/et131x.c
@@ -1866,10 +1866,10 @@ static int et131x_rx_dma_memory_alloc(struct et131x_adapter *adapter)
struct fbr_lookup *fbr;
/* Alloc memory for the lookup table */
- rx_ring->fbr[0] = kzalloc_obj(*fbr, GFP_KERNEL);
+ rx_ring->fbr[0] = kzalloc_obj(*fbr);
if (rx_ring->fbr[0] == NULL)
return -ENOMEM;
- rx_ring->fbr[1] = kzalloc_obj(*fbr, GFP_KERNEL);
+ rx_ring->fbr[1] = kzalloc_obj(*fbr);
if (rx_ring->fbr[1] == NULL)
return -ENOMEM;
diff --git a/drivers/net/ethernet/airoha/airoha_npu.c b/drivers/net/ethernet/airoha/airoha_npu.c
index 84090dee9814..17dbdc832533 100644
--- a/drivers/net/ethernet/airoha/airoha_npu.c
+++ b/drivers/net/ethernet/airoha/airoha_npu.c
@@ -333,7 +333,7 @@ static int airoha_npu_ppe_init(struct airoha_npu *npu)
struct ppe_mbox_data *ppe_data;
int err;
- ppe_data = kzalloc_obj(*ppe_data, GFP_KERNEL);
+ ppe_data = kzalloc_obj(*ppe_data);
if (!ppe_data)
return -ENOMEM;
@@ -354,7 +354,7 @@ static int airoha_npu_ppe_deinit(struct airoha_npu *npu)
struct ppe_mbox_data *ppe_data;
int err;
- ppe_data = kzalloc_obj(*ppe_data, GFP_KERNEL);
+ ppe_data = kzalloc_obj(*ppe_data);
if (!ppe_data)
return -ENOMEM;
@@ -375,7 +375,7 @@ static int airoha_npu_ppe_flush_sram_entries(struct airoha_npu *npu,
struct ppe_mbox_data *ppe_data;
int err;
- ppe_data = kzalloc_obj(*ppe_data, GFP_KERNEL);
+ ppe_data = kzalloc_obj(*ppe_data);
if (!ppe_data)
return -ENOMEM;
diff --git a/drivers/net/ethernet/airoha/airoha_ppe.c b/drivers/net/ethernet/airoha/airoha_ppe.c
index a0f4c6e33bfc..42dbe8f93231 100644
--- a/drivers/net/ethernet/airoha/airoha_ppe.c
+++ b/drivers/net/ethernet/airoha/airoha_ppe.c
@@ -1173,7 +1173,7 @@ static int airoha_ppe_flow_offload_replace(struct airoha_eth *eth,
return err;
}
- e = kzalloc_obj(*e, GFP_KERNEL);
+ e = kzalloc_obj(*e);
if (!e)
return -ENOMEM;
diff --git a/drivers/net/ethernet/alacritech/slicoss.c b/drivers/net/ethernet/alacritech/slicoss.c
index 808ee88dcdc8..c1949ca060ca 100644
--- a/drivers/net/ethernet/alacritech/slicoss.c
+++ b/drivers/net/ethernet/alacritech/slicoss.c
@@ -845,7 +845,7 @@ static int slic_init_tx_queue(struct slic_device *sdev)
txq->put_idx = 0;
txq->done_idx = 0;
- txq->txbuffs = kzalloc_objs(*buff, txq->len, GFP_KERNEL);
+ txq->txbuffs = kzalloc_objs(*buff, txq->len);
if (!txq->txbuffs)
return -ENOMEM;
@@ -922,7 +922,7 @@ static int slic_init_rx_queue(struct slic_device *sdev)
rxq->done_idx = 0;
rxq->put_idx = 0;
- buff = kzalloc_objs(*buff, rxq->len, GFP_KERNEL);
+ buff = kzalloc_objs(*buff, rxq->len);
if (!buff)
return -ENOMEM;
diff --git a/drivers/net/ethernet/alteon/acenic.c b/drivers/net/ethernet/alteon/acenic.c
index 81f57bc6b3a2..455ee8930824 100644
--- a/drivers/net/ethernet/alteon/acenic.c
+++ b/drivers/net/ethernet/alteon/acenic.c
@@ -1149,7 +1149,7 @@ static int ace_init(struct net_device *dev)
/*
* Get the memory for the skb rings.
*/
- if (!(ap->skb = kzalloc_obj(struct ace_skb, GFP_KERNEL))) {
+ if (!(ap->skb = kzalloc_obj(struct ace_skb))) {
ecode = -EAGAIN;
goto init_error;
}
diff --git a/drivers/net/ethernet/altera/altera_tse_main.c b/drivers/net/ethernet/altera/altera_tse_main.c
index 2893fbaa51ca..4342e2d026f8 100644
--- a/drivers/net/ethernet/altera/altera_tse_main.c
+++ b/drivers/net/ethernet/altera/altera_tse_main.c
@@ -258,12 +258,12 @@ static int alloc_init_skbufs(struct altera_tse_private *priv)
int i;
/* Create Rx ring buffer */
- priv->rx_ring = kzalloc_objs(struct tse_buffer, rx_descs, GFP_KERNEL);
+ priv->rx_ring = kzalloc_objs(struct tse_buffer, rx_descs);
if (!priv->rx_ring)
goto err_rx_ring;
/* Create Tx ring buffer */
- priv->tx_ring = kzalloc_objs(struct tse_buffer, tx_descs, GFP_KERNEL);
+ priv->tx_ring = kzalloc_objs(struct tse_buffer, tx_descs);
if (!priv->tx_ring)
goto err_tx_ring;
diff --git a/drivers/net/ethernet/amd/pcnet32.c b/drivers/net/ethernet/amd/pcnet32.c
index e0705a54366b..58dc56671fb4 100644
--- a/drivers/net/ethernet/amd/pcnet32.c
+++ b/drivers/net/ethernet/amd/pcnet32.c
@@ -2035,11 +2035,11 @@ static int pcnet32_alloc_ring(struct net_device *dev, const char *name)
return -ENOMEM;
}
- lp->tx_dma_addr = kzalloc_objs(dma_addr_t, lp->tx_ring_size, GFP_KERNEL);
+ lp->tx_dma_addr = kzalloc_objs(dma_addr_t, lp->tx_ring_size);
if (!lp->tx_dma_addr)
return -ENOMEM;
- lp->rx_dma_addr = kzalloc_objs(dma_addr_t, lp->rx_ring_size, GFP_KERNEL);
+ lp->rx_dma_addr = kzalloc_objs(dma_addr_t, lp->rx_ring_size);
if (!lp->rx_dma_addr)
return -ENOMEM;
diff --git a/drivers/net/ethernet/amd/pds_core/auxbus.c b/drivers/net/ethernet/amd/pds_core/auxbus.c
index 6f0ffdf14e96..73b3481220b1 100644
--- a/drivers/net/ethernet/amd/pds_core/auxbus.c
+++ b/drivers/net/ethernet/amd/pds_core/auxbus.c
@@ -140,7 +140,7 @@ static struct pds_auxiliary_dev *pdsc_auxbus_dev_register(struct pdsc *cf,
struct pds_auxiliary_dev *padev;
int err;
- padev = kzalloc_obj(*padev, GFP_KERNEL);
+ padev = kzalloc_obj(*padev);
if (!padev)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/net/ethernet/amd/pds_core/dev.c b/drivers/net/ethernet/amd/pds_core/dev.c
index 6ae27bfb3375..2e1d0d01d03a 100644
--- a/drivers/net/ethernet/amd/pds_core/dev.c
+++ b/drivers/net/ethernet/amd/pds_core/dev.c
@@ -359,7 +359,7 @@ int pdsc_dev_init(struct pdsc *pdsc)
nintrs = min_t(unsigned int, num_online_cpus(), nintrs);
/* Get intr_info struct array for tracking */
- pdsc->intr_info = kzalloc_objs(*pdsc->intr_info, nintrs, GFP_KERNEL);
+ pdsc->intr_info = kzalloc_objs(*pdsc->intr_info, nintrs);
if (!pdsc->intr_info)
return -ENOMEM;
diff --git a/drivers/net/ethernet/amd/pds_core/main.c b/drivers/net/ethernet/amd/pds_core/main.c
index 743b154d2a88..22db78343eb0 100644
--- a/drivers/net/ethernet/amd/pds_core/main.c
+++ b/drivers/net/ethernet/amd/pds_core/main.c
@@ -146,7 +146,7 @@ static int pdsc_sriov_configure(struct pci_dev *pdev, int num_vfs)
int ret = 0;
if (num_vfs > 0) {
- pdsc->vfs = kzalloc_objs(struct pdsc_vf, num_vfs, GFP_KERNEL);
+ pdsc->vfs = kzalloc_objs(struct pdsc_vf, num_vfs);
if (!pdsc->vfs)
return -ENOMEM;
pdsc->num_vfs = num_vfs;
diff --git a/drivers/net/ethernet/amd/xgbe/xgbe-selftest.c b/drivers/net/ethernet/amd/xgbe/xgbe-selftest.c
index 488f96bec1e7..cfdbd4639a1e 100644
--- a/drivers/net/ethernet/amd/xgbe/xgbe-selftest.c
+++ b/drivers/net/ethernet/amd/xgbe/xgbe-selftest.c
@@ -112,7 +112,7 @@ static int __xgbe_test_loopback(struct xgbe_prv_data *pdata,
struct sk_buff *skb = NULL;
int ret = 0;
- tdata = kzalloc_obj(*tdata, GFP_KERNEL);
+ tdata = kzalloc_obj(*tdata);
if (!tdata)
return -ENOMEM;
diff --git a/drivers/net/ethernet/apm/xgene-v2/main.c b/drivers/net/ethernet/apm/xgene-v2/main.c
index b88764615994..2b2de6e2bc5b 100644
--- a/drivers/net/ethernet/apm/xgene-v2/main.c
+++ b/drivers/net/ethernet/apm/xgene-v2/main.c
@@ -405,7 +405,7 @@ static struct xge_desc_ring *xge_create_desc_ring(struct net_device *ndev)
struct xge_desc_ring *ring;
u16 size;
- ring = kzalloc_obj(*ring, GFP_KERNEL);
+ ring = kzalloc_obj(*ring);
if (!ring)
return NULL;
diff --git a/drivers/net/ethernet/aquantia/atlantic/aq_filters.c b/drivers/net/ethernet/aquantia/atlantic/aq_filters.c
index 4f0b66917ce0..e419c73b32ce 100644
--- a/drivers/net/ethernet/aquantia/atlantic/aq_filters.c
+++ b/drivers/net/ethernet/aquantia/atlantic/aq_filters.c
@@ -688,7 +688,7 @@ int aq_add_rxnfc_rule(struct aq_nic_s *aq_nic, const struct ethtool_rxnfc *cmd)
if (err)
goto err_exit;
- aq_rx_fltr = kzalloc_obj(*aq_rx_fltr, GFP_KERNEL);
+ aq_rx_fltr = kzalloc_obj(*aq_rx_fltr);
if (unlikely(!aq_rx_fltr)) {
err = -ENOMEM;
goto err_exit;
diff --git a/drivers/net/ethernet/aquantia/atlantic/aq_macsec.c b/drivers/net/ethernet/aquantia/atlantic/aq_macsec.c
index a47d5ec74b94..3ca072360ec7 100644
--- a/drivers/net/ethernet/aquantia/atlantic/aq_macsec.c
+++ b/drivers/net/ethernet/aquantia/atlantic/aq_macsec.c
@@ -1462,7 +1462,7 @@ int aq_macsec_init(struct aq_nic_s *nic)
if (!(caps_lo & BIT(CAPS_LO_MACSEC)))
return 0;
- nic->macsec_cfg = kzalloc_obj(*cfg, GFP_KERNEL);
+ nic->macsec_cfg = kzalloc_obj(*cfg);
if (!nic->macsec_cfg)
return -ENOMEM;
diff --git a/drivers/net/ethernet/aquantia/atlantic/aq_pci_func.c b/drivers/net/ethernet/aquantia/atlantic/aq_pci_func.c
index 05d656fb4a27..e9e38af680c3 100644
--- a/drivers/net/ethernet/aquantia/atlantic/aq_pci_func.c
+++ b/drivers/net/ethernet/aquantia/atlantic/aq_pci_func.c
@@ -244,7 +244,7 @@ static int aq_pci_probe(struct pci_dev *pdev,
if (err)
goto err_ioremap;
- self->aq_hw = kzalloc_obj(*self->aq_hw, GFP_KERNEL);
+ self->aq_hw = kzalloc_obj(*self->aq_hw);
if (!self->aq_hw) {
err = -ENOMEM;
goto err_ioremap;
diff --git a/drivers/net/ethernet/aquantia/atlantic/aq_ptp.c b/drivers/net/ethernet/aquantia/atlantic/aq_ptp.c
index 83216657d1d8..05af57750b6a 100644
--- a/drivers/net/ethernet/aquantia/atlantic/aq_ptp.c
+++ b/drivers/net/ethernet/aquantia/atlantic/aq_ptp.c
@@ -1183,7 +1183,7 @@ int aq_ptp_init(struct aq_nic_s *aq_nic, unsigned int idx_vec)
aq_ptp_offset_init(&mbox.info.ptp_offset);
- aq_ptp = kzalloc_obj(*aq_ptp, GFP_KERNEL);
+ aq_ptp = kzalloc_obj(*aq_ptp);
if (!aq_ptp) {
err = -ENOMEM;
goto err_exit;
diff --git a/drivers/net/ethernet/aquantia/atlantic/aq_ring.c b/drivers/net/ethernet/aquantia/atlantic/aq_ring.c
index 62478c605503..e270327e47fd 100644
--- a/drivers/net/ethernet/aquantia/atlantic/aq_ring.c
+++ b/drivers/net/ethernet/aquantia/atlantic/aq_ring.c
@@ -138,7 +138,7 @@ static int aq_ring_alloc(struct aq_ring_s *self,
int err = 0;
self->buff_ring =
- kzalloc_objs(struct aq_ring_buff_s, self->size, GFP_KERNEL);
+ kzalloc_objs(struct aq_ring_buff_s, self->size);
if (!self->buff_ring) {
err = -ENOMEM;
diff --git a/drivers/net/ethernet/aquantia/atlantic/aq_vec.c b/drivers/net/ethernet/aquantia/atlantic/aq_vec.c
index 90eaf11076d2..2f9033ceed8c 100644
--- a/drivers/net/ethernet/aquantia/atlantic/aq_vec.c
+++ b/drivers/net/ethernet/aquantia/atlantic/aq_vec.c
@@ -104,7 +104,7 @@ struct aq_vec_s *aq_vec_alloc(struct aq_nic_s *aq_nic, unsigned int idx,
{
struct aq_vec_s *self = NULL;
- self = kzalloc_obj(*self, GFP_KERNEL);
+ self = kzalloc_obj(*self);
if (!self)
goto err_exit;
diff --git a/drivers/net/ethernet/atheros/ag71xx.c b/drivers/net/ethernet/atheros/ag71xx.c
index 13e3bd7fe82b..a5ab99474179 100644
--- a/drivers/net/ethernet/atheros/ag71xx.c
+++ b/drivers/net/ethernet/atheros/ag71xx.c
@@ -1305,7 +1305,7 @@ static int ag71xx_rings_init(struct ag71xx *ag)
ring_size = BIT(tx->order) + BIT(rx->order);
tx_size = BIT(tx->order);
- tx->buf = kzalloc_objs(*tx->buf, ring_size, GFP_KERNEL);
+ tx->buf = kzalloc_objs(*tx->buf, ring_size);
if (!tx->buf)
return -ENOMEM;
diff --git a/drivers/net/ethernet/atheros/alx/main.c b/drivers/net/ethernet/atheros/alx/main.c
index 9b1923055293..ab262e66f986 100644
--- a/drivers/net/ethernet/atheros/alx/main.c
+++ b/drivers/net/ethernet/atheros/alx/main.c
@@ -616,7 +616,7 @@ static int alx_set_mac_address(struct net_device *netdev, void *data)
static int alx_alloc_tx_ring(struct alx_priv *alx, struct alx_tx_queue *txq,
int offset)
{
- txq->bufs = kzalloc_objs(struct alx_buffer, txq->count, GFP_KERNEL);
+ txq->bufs = kzalloc_objs(struct alx_buffer, txq->count);
if (!txq->bufs)
return -ENOMEM;
@@ -630,7 +630,7 @@ static int alx_alloc_tx_ring(struct alx_priv *alx, struct alx_tx_queue *txq,
static int alx_alloc_rx_ring(struct alx_priv *alx, struct alx_rx_queue *rxq,
int offset)
{
- rxq->bufs = kzalloc_objs(struct alx_buffer, rxq->count, GFP_KERNEL);
+ rxq->bufs = kzalloc_objs(struct alx_buffer, rxq->count);
if (!rxq->bufs)
return -ENOMEM;
@@ -746,7 +746,7 @@ static int alx_alloc_napis(struct alx_priv *alx)
/* allocate alx_napi structures */
for (i = 0; i < alx->num_napi; i++) {
- np = kzalloc_obj(struct alx_napi, GFP_KERNEL);
+ np = kzalloc_obj(struct alx_napi);
if (!np)
goto err_out;
@@ -758,7 +758,7 @@ static int alx_alloc_napis(struct alx_priv *alx)
/* allocate tx queues */
for (i = 0; i < alx->num_txq; i++) {
np = alx->qnapi[i];
- txq = kzalloc_obj(*txq, GFP_KERNEL);
+ txq = kzalloc_obj(*txq);
if (!txq)
goto err_out;
@@ -775,7 +775,7 @@ static int alx_alloc_napis(struct alx_priv *alx)
/* allocate rx queues */
np = alx->qnapi[0];
- rxq = kzalloc_obj(*rxq, GFP_KERNEL);
+ rxq = kzalloc_obj(*rxq);
if (!rxq)
goto err_out;
diff --git a/drivers/net/ethernet/broadcom/bcm4908_enet.c b/drivers/net/ethernet/broadcom/bcm4908_enet.c
index fa1fd5667596..fd2715f84af9 100644
--- a/drivers/net/ethernet/broadcom/bcm4908_enet.c
+++ b/drivers/net/ethernet/broadcom/bcm4908_enet.c
@@ -181,7 +181,7 @@ static int bcm4908_dma_alloc_buf_descs(struct bcm4908_enet *enet,
goto err_free_buf_descs;
}
- ring->slots = kzalloc_objs(*ring->slots, ring->length, GFP_KERNEL);
+ ring->slots = kzalloc_objs(*ring->slots, ring->length);
if (!ring->slots)
goto err_free_buf_descs;
diff --git a/drivers/net/ethernet/broadcom/bcmsysport.c b/drivers/net/ethernet/broadcom/bcmsysport.c
index f81392cbedd1..3594496dd5a6 100644
--- a/drivers/net/ethernet/broadcom/bcmsysport.c
+++ b/drivers/net/ethernet/broadcom/bcmsysport.c
@@ -1486,7 +1486,7 @@ static int bcm_sysport_init_tx_ring(struct bcm_sysport_priv *priv,
/* Simple descriptors partitioning for now */
size = 256;
- ring->cbs = kzalloc_objs(struct bcm_sysport_cb, size, GFP_KERNEL);
+ ring->cbs = kzalloc_objs(struct bcm_sysport_cb, size);
if (!ring->cbs) {
netif_err(priv, hw, priv->netdev, "CB allocation failed\n");
return -ENOMEM;
diff --git a/drivers/net/ethernet/broadcom/bnge/bnge_auxr.c b/drivers/net/ethernet/broadcom/bnge/bnge_auxr.c
index d530046e027d..b942076762ef 100644
--- a/drivers/net/ethernet/broadcom/bnge/bnge_auxr.c
+++ b/drivers/net/ethernet/broadcom/bnge/bnge_auxr.c
@@ -210,7 +210,7 @@ void bnge_rdma_aux_device_init(struct bnge_dev *bd)
if (!bnge_is_roce_en(bd))
return;
- aux_priv = kzalloc_obj(*aux_priv, GFP_KERNEL);
+ aux_priv = kzalloc_obj(*aux_priv);
if (!aux_priv)
goto exit;
@@ -235,13 +235,13 @@ void bnge_rdma_aux_device_init(struct bnge_dev *bd)
}
bd->aux_priv = aux_priv;
- auxr_dev = kzalloc_obj(*auxr_dev, GFP_KERNEL);
+ auxr_dev = kzalloc_obj(*auxr_dev);
if (!auxr_dev)
goto aux_dev_uninit;
aux_priv->auxr_dev = auxr_dev;
- auxr_info = kzalloc_obj(*auxr_info, GFP_KERNEL);
+ auxr_info = kzalloc_obj(*auxr_info);
if (!auxr_info)
goto aux_dev_uninit;
diff --git a/drivers/net/ethernet/broadcom/bnge/bnge_hwrm.c b/drivers/net/ethernet/broadcom/bnge/bnge_hwrm.c
index cf6e503d63a6..80231286d29a 100644
--- a/drivers/net/ethernet/broadcom/bnge/bnge_hwrm.c
+++ b/drivers/net/ethernet/broadcom/bnge/bnge_hwrm.c
@@ -229,7 +229,7 @@ bnge_hwrm_create_token(struct bnge_dev *bd, enum bnge_hwrm_chnl dst)
{
struct bnge_hwrm_wait_token *token;
- token = kzalloc_obj(*token, GFP_KERNEL);
+ token = kzalloc_obj(*token);
if (!token)
return NULL;
diff --git a/drivers/net/ethernet/broadcom/bnge/bnge_hwrm_lib.c b/drivers/net/ethernet/broadcom/bnge/bnge_hwrm_lib.c
index 579943445b24..c46da3413417 100644
--- a/drivers/net/ethernet/broadcom/bnge/bnge_hwrm_lib.c
+++ b/drivers/net/ethernet/broadcom/bnge/bnge_hwrm_lib.c
@@ -242,7 +242,7 @@ static int bnge_alloc_all_ctx_pg_info(struct bnge_dev *bd, int ctx_max)
if (ctxm->instance_bmap)
n = hweight32(ctxm->instance_bmap);
- ctxm->pg_info = kzalloc_objs(*ctxm->pg_info, n, GFP_KERNEL);
+ ctxm->pg_info = kzalloc_objs(*ctxm->pg_info, n);
if (!ctxm->pg_info)
return -ENOMEM;
}
@@ -269,7 +269,7 @@ int bnge_hwrm_func_backing_store_qcaps(struct bnge_dev *bd)
if (rc)
return rc;
- ctx = kzalloc_obj(*ctx, GFP_KERNEL);
+ ctx = kzalloc_obj(*ctx);
if (!ctx)
return -ENOMEM;
bd->ctx = ctx;
diff --git a/drivers/net/ethernet/broadcom/bnge/bnge_netdev.c b/drivers/net/ethernet/broadcom/bnge/bnge_netdev.c
index 74b552ee1796..8c099682d3db 100644
--- a/drivers/net/ethernet/broadcom/bnge/bnge_netdev.c
+++ b/drivers/net/ethernet/broadcom/bnge/bnge_netdev.c
@@ -127,11 +127,11 @@ static void bnge_free_cp_desc_arr(struct bnge_cp_ring_info *cpr)
static int bnge_alloc_nq_desc_arr(struct bnge_nq_ring_info *nqr, int n)
{
- nqr->desc_ring = kzalloc_objs(*nqr->desc_ring, n, GFP_KERNEL);
+ nqr->desc_ring = kzalloc_objs(*nqr->desc_ring, n);
if (!nqr->desc_ring)
return -ENOMEM;
- nqr->desc_mapping = kzalloc_objs(*nqr->desc_mapping, n, GFP_KERNEL);
+ nqr->desc_mapping = kzalloc_objs(*nqr->desc_mapping, n);
if (!nqr->desc_mapping)
goto err_free_desc_ring;
return 0;
@@ -144,11 +144,11 @@ static int bnge_alloc_nq_desc_arr(struct bnge_nq_ring_info *nqr, int n)
static int bnge_alloc_cp_desc_arr(struct bnge_cp_ring_info *cpr, int n)
{
- cpr->desc_ring = kzalloc_objs(*cpr->desc_ring, n, GFP_KERNEL);
+ cpr->desc_ring = kzalloc_objs(*cpr->desc_ring, n);
if (!cpr->desc_ring)
return -ENOMEM;
- cpr->desc_mapping = kzalloc_objs(*cpr->desc_mapping, n, GFP_KERNEL);
+ cpr->desc_mapping = kzalloc_objs(*cpr->desc_mapping, n);
if (!cpr->desc_mapping)
goto err_free_desc_ring;
return 0;
@@ -287,7 +287,7 @@ static int bnge_alloc_nq_tree(struct bnge_net *bn)
tx = 1;
}
- nqr->cp_ring_arr = kzalloc_objs(*cpr, cp_count, GFP_KERNEL);
+ nqr->cp_ring_arr = kzalloc_objs(*cpr, cp_count);
if (!nqr->cp_ring_arr) {
rc = -ENOMEM;
goto err_free_nq_tree;
@@ -517,7 +517,7 @@ static int bnge_alloc_tpa_info(struct bnge_net *bn)
for (j = 0; j < bn->max_tpa; j++) {
struct rx_agg_cmp *agg;
- agg = kzalloc_objs(*agg, MAX_SKB_FRAGS, GFP_KERNEL);
+ agg = kzalloc_objs(*agg, MAX_SKB_FRAGS);
if (!agg)
goto err_free_tpa_info;
rxr->rx_tpa[j].agg_arr = agg;
diff --git a/drivers/net/ethernet/broadcom/bnge/bnge_resc.c b/drivers/net/ethernet/broadcom/bnge/bnge_resc.c
index 155b48cd2af8..0e94f092813e 100644
--- a/drivers/net/ethernet/broadcom/bnge/bnge_resc.c
+++ b/drivers/net/ethernet/broadcom/bnge/bnge_resc.c
@@ -389,7 +389,7 @@ int bnge_alloc_irqs(struct bnge_dev *bd)
num_entries = irqs_demand;
if (pci_msix_can_alloc_dyn(bd->pdev))
num_entries = max;
- bd->irq_tbl = kzalloc_objs(*bd->irq_tbl, num_entries, GFP_KERNEL);
+ bd->irq_tbl = kzalloc_objs(*bd->irq_tbl, num_entries);
if (!bd->irq_tbl) {
rc = -ENOMEM;
goto err_free_irqs;
diff --git a/drivers/net/ethernet/broadcom/bnge/bnge_rmem.c b/drivers/net/ethernet/broadcom/bnge/bnge_rmem.c
index fb89737b481d..2950a804fa02 100644
--- a/drivers/net/ethernet/broadcom/bnge/bnge_rmem.c
+++ b/drivers/net/ethernet/broadcom/bnge/bnge_rmem.c
@@ -170,7 +170,7 @@ static int bnge_alloc_ctx_pg_tbls(struct bnge_dev *bd,
for (i = 0; i < nr_tbls; i++) {
struct bnge_ctx_pg_info *pg_tbl;
- pg_tbl = kzalloc_obj(*pg_tbl, GFP_KERNEL);
+ pg_tbl = kzalloc_obj(*pg_tbl);
if (!pg_tbl)
return -ENOMEM;
ctx_pg->ctx_pg_tbl[i] = pg_tbl;
diff --git a/drivers/net/ethernet/broadcom/bnx2.c b/drivers/net/ethernet/broadcom/bnx2.c
index 97aafe021477..f5722e929833 100644
--- a/drivers/net/ethernet/broadcom/bnx2.c
+++ b/drivers/net/ethernet/broadcom/bnx2.c
@@ -8084,7 +8084,7 @@ bnx2_init_board(struct pci_dev *pdev, struct net_device *dev)
bp->phy_flags = 0;
bp->temp_stats_blk =
- kzalloc_obj(struct statistics_block, GFP_KERNEL);
+ kzalloc_obj(struct statistics_block);
if (!bp->temp_stats_blk) {
rc = -ENOMEM;
diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c
index ea0fc6add87d..942a33ae55ee 100644
--- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c
+++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c
@@ -4598,7 +4598,7 @@ static int bnx2x_alloc_fp_mem_at(struct bnx2x *bp, int index)
if (!skip_rx_queue(bp, index)) {
/* fastpath rx rings: rx_buf rx_desc rx_comp */
bnx2x_fp(bp, index, rx_buf_ring) =
- kzalloc_objs(struct sw_rx_bd, NUM_RX_BD, GFP_KERNEL);
+ kzalloc_objs(struct sw_rx_bd, NUM_RX_BD);
if (!bnx2x_fp(bp, index, rx_buf_ring))
goto alloc_mem_err;
bnx2x_fp(bp, index, rx_desc_ring) =
@@ -4616,7 +4616,7 @@ static int bnx2x_alloc_fp_mem_at(struct bnx2x *bp, int index)
/* SGE ring */
bnx2x_fp(bp, index, rx_page_ring) =
- kzalloc_objs(struct sw_rx_page, NUM_RX_SGE, GFP_KERNEL);
+ kzalloc_objs(struct sw_rx_page, NUM_RX_SGE);
if (!bnx2x_fp(bp, index, rx_page_ring))
goto alloc_mem_err;
bnx2x_fp(bp, index, rx_sge_ring) =
@@ -4746,7 +4746,7 @@ int bnx2x_alloc_mem_bp(struct bnx2x *bp)
bp->fp_array_size = fp_array_size;
BNX2X_DEV_INFO("fp_array_size %d\n", bp->fp_array_size);
- fp = kzalloc_objs(*fp, bp->fp_array_size, GFP_KERNEL);
+ fp = kzalloc_objs(*fp, bp->fp_array_size);
if (!fp)
goto alloc_err;
for (i = 0; i < bp->fp_array_size; i++) {
@@ -4783,13 +4783,13 @@ int bnx2x_alloc_mem_bp(struct bnx2x *bp)
goto alloc_err;
/* msix table */
- tbl = kzalloc_objs(*tbl, msix_table_size, GFP_KERNEL);
+ tbl = kzalloc_objs(*tbl, msix_table_size);
if (!tbl)
goto alloc_err;
bp->msix_table = tbl;
/* ilt */
- ilt = kzalloc_obj(*ilt, GFP_KERNEL);
+ ilt = kzalloc_obj(*ilt);
if (!ilt)
goto alloc_err;
bp->ilt = ilt;
diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
index 745b023e2e08..8120cafdad2f 100644
--- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
+++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
@@ -6577,7 +6577,7 @@ static int bnx2x_gunzip_init(struct bnx2x *bp)
if (bp->gunzip_buf == NULL)
goto gunzip_nomem1;
- bp->strm = kmalloc_obj(*bp->strm, GFP_KERNEL);
+ bp->strm = kmalloc_obj(*bp->strm);
if (bp->strm == NULL)
goto gunzip_nomem2;
@@ -10660,7 +10660,7 @@ static int bnx2x_prev_mark_path(struct bnx2x *bp, bool after_undi)
up(&bnx2x_prev_sem);
/* Create an entry for this path and add it */
- tmp_list = kmalloc_obj(struct bnx2x_prev_path_list, GFP_KERNEL);
+ tmp_list = kmalloc_obj(struct bnx2x_prev_path_list);
if (!tmp_list) {
BNX2X_ERR("Failed to allocate 'bnx2x_prev_path_list'\n");
return -ENOMEM;
@@ -12954,7 +12954,7 @@ static int bnx2x_vlan_rx_add_vid(struct net_device *dev, __be16 proto, u16 vid)
DP(NETIF_MSG_IFUP, "Adding VLAN %d\n", vid);
- vlan = kmalloc_obj(*vlan, GFP_KERNEL);
+ vlan = kmalloc_obj(*vlan);
if (!vlan)
return -ENOMEM;
@@ -14841,7 +14841,7 @@ static int bnx2x_get_fc_npiv(struct net_device *dev,
DP(BNX2X_MSG_MCP, "About to read the FC-NPIV table\n");
- tbl = kmalloc_obj(*tbl, GFP_KERNEL);
+ tbl = kmalloc_obj(*tbl);
if (!tbl) {
BNX2X_ERR("Failed to allocate fc_npiv table\n");
goto out;
diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sriov.c b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sriov.c
index 5aeb5b6a64b5..605a7853e0cf 100644
--- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sriov.c
+++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sriov.c
@@ -1218,7 +1218,7 @@ int bnx2x_iov_init_one(struct bnx2x *bp, int int_mode_param,
}
/* allocate the vfs database */
- bp->vfdb = kzalloc_obj(*(bp->vfdb), GFP_KERNEL);
+ bp->vfdb = kzalloc_obj(*(bp->vfdb));
if (!bp->vfdb) {
BNX2X_ERR("failed to allocate vf database\n");
err = -ENOMEM;
diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt.c b/drivers/net/ethernet/broadcom/bnxt/bnxt.c
index ad5035cd8ac3..37c02ed32ad5 100644
--- a/drivers/net/ethernet/broadcom/bnxt/bnxt.c
+++ b/drivers/net/ethernet/broadcom/bnxt/bnxt.c
@@ -3760,12 +3760,12 @@ static int bnxt_alloc_one_tpa_info(struct bnxt *bp,
if (!(bp->flags & BNXT_FLAG_CHIP_P5_PLUS))
return 0;
for (i = 0; i < bp->max_tpa; i++) {
- agg = kzalloc_objs(*agg, MAX_SKB_FRAGS, GFP_KERNEL);
+ agg = kzalloc_objs(*agg, MAX_SKB_FRAGS);
if (!agg)
return -ENOMEM;
rxr->rx_tpa[i].agg_arr = agg;
}
- rxr->rx_tpa_idx_map = kzalloc_obj(*rxr->rx_tpa_idx_map, GFP_KERNEL);
+ rxr->rx_tpa_idx_map = kzalloc_obj(*rxr->rx_tpa_idx_map);
if (!rxr->rx_tpa_idx_map)
return -ENOMEM;
@@ -4080,7 +4080,7 @@ static void bnxt_free_cp_arrays(struct bnxt_cp_ring_info *cpr)
static int bnxt_alloc_cp_arrays(struct bnxt_cp_ring_info *cpr, int n)
{
- cpr->cp_desc_ring = kzalloc_objs(*cpr->cp_desc_ring, n, GFP_KERNEL);
+ cpr->cp_desc_ring = kzalloc_objs(*cpr->cp_desc_ring, n);
if (!cpr->cp_desc_ring)
return -ENOMEM;
cpr->cp_desc_mapping = kzalloc_objs(*cpr->cp_desc_mapping, n,
@@ -4231,7 +4231,7 @@ static int bnxt_alloc_cp_rings(struct bnxt *bp)
tx = 1;
}
- cpr->cp_ring_arr = kzalloc_objs(*cpr, cp_count, GFP_KERNEL);
+ cpr->cp_ring_arr = kzalloc_objs(*cpr, cp_count);
if (!cpr->cp_ring_arr)
return -ENOMEM;
cpr->cp_ring_count = cp_count;
@@ -5245,7 +5245,7 @@ static int bnxt_alloc_stats(struct bnxt *bp)
struct bnxt_napi *bnapi = bp->bnapi[i];
struct bnxt_cp_ring_info *cpr = &bnapi->cp_ring;
- cpr->sw_stats = kzalloc_obj(*cpr->sw_stats, GFP_KERNEL);
+ cpr->sw_stats = kzalloc_obj(*cpr->sw_stats);
if (!cpr->sw_stats)
return -ENOMEM;
@@ -8650,7 +8650,7 @@ static int bnxt_alloc_all_ctx_pg_info(struct bnxt *bp, int ctx_max)
if (ctxm->instance_bmap)
n = hweight32(ctxm->instance_bmap);
- ctxm->pg_info = kzalloc_objs(*ctxm->pg_info, n, GFP_KERNEL);
+ ctxm->pg_info = kzalloc_objs(*ctxm->pg_info, n);
if (!ctxm->pg_info)
return -ENOMEM;
}
@@ -8677,7 +8677,7 @@ static int bnxt_hwrm_func_backing_store_qcaps_v2(struct bnxt *bp)
return rc;
if (!ctx) {
- ctx = kzalloc_obj(*ctx, GFP_KERNEL);
+ ctx = kzalloc_obj(*ctx);
if (!ctx)
return -ENOMEM;
bp->ctx = ctx;
@@ -8764,7 +8764,7 @@ static int bnxt_hwrm_func_backing_store_qcaps(struct bnxt *bp)
ctx = bp->ctx;
if (!ctx) {
- ctx = kzalloc_obj(*ctx, GFP_KERNEL);
+ ctx = kzalloc_obj(*ctx);
if (!ctx) {
rc = -ENOMEM;
goto ctx_err;
@@ -9055,7 +9055,7 @@ static int bnxt_alloc_ctx_pg_tbls(struct bnxt *bp,
for (i = 0; i < nr_tbls; i++) {
struct bnxt_ctx_pg_info *pg_tbl;
- pg_tbl = kzalloc_obj(*pg_tbl, GFP_KERNEL);
+ pg_tbl = kzalloc_obj(*pg_tbl);
if (!pg_tbl)
return -ENOMEM;
ctx_pg->ctx_pg_tbl[i] = pg_tbl;
@@ -9564,7 +9564,7 @@ static int bnxt_alloc_crash_dump_mem(struct bnxt *bp)
if (bp->fw_crash_mem)
bnxt_free_ctx_pg_tbls(bp, bp->fw_crash_mem);
else
- bp->fw_crash_mem = kzalloc_obj(*bp->fw_crash_mem, GFP_KERNEL);
+ bp->fw_crash_mem = kzalloc_obj(*bp->fw_crash_mem);
if (!bp->fw_crash_mem)
return -ENOMEM;
@@ -9671,7 +9671,7 @@ static int __bnxt_hwrm_ptp_qcfg(struct bnxt *bp)
goto exit;
}
if (!ptp) {
- ptp = kzalloc_obj(*ptp, GFP_KERNEL);
+ ptp = kzalloc_obj(*ptp);
if (!ptp) {
rc = -ENOMEM;
goto exit;
@@ -9943,7 +9943,7 @@ static int __bnxt_alloc_fw_health(struct bnxt *bp)
if (bp->fw_health)
return 0;
- bp->fw_health = kzalloc_obj(*bp->fw_health, GFP_KERNEL);
+ bp->fw_health = kzalloc_obj(*bp->fw_health);
if (!bp->fw_health)
return -ENOMEM;
@@ -11454,7 +11454,7 @@ static int bnxt_init_int_mode(struct bnxt *bp)
tbl_size = total_vecs;
if (pci_msix_can_alloc_dyn(bp->pdev))
tbl_size = max;
- bp->irq_tbl = kzalloc_objs(*bp->irq_tbl, tbl_size, GFP_KERNEL);
+ bp->irq_tbl = kzalloc_objs(*bp->irq_tbl, tbl_size);
if (bp->irq_tbl) {
for (i = 0; i < total_vecs; i++)
bp->irq_tbl[i].vector = pci_irq_vector(bp->pdev, i);
@@ -12951,7 +12951,7 @@ static int bnxt_set_xps_mapping(struct bnxt *bp)
cpumask_t *q_map;
int rc = 0;
- q_map = kzalloc_objs(*q_map, bp->tx_nr_rings_per_tc, GFP_KERNEL);
+ q_map = kzalloc_objs(*q_map, bp->tx_nr_rings_per_tc);
if (!q_map)
return -ENOMEM;
diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt_dcb.c b/drivers/net/ethernet/broadcom/bnxt/bnxt_dcb.c
index 00e3ef076d93..1ad2143d0e56 100644
--- a/drivers/net/ethernet/broadcom/bnxt/bnxt_dcb.c
+++ b/drivers/net/ethernet/broadcom/bnxt/bnxt_dcb.c
@@ -529,7 +529,7 @@ static int bnxt_dcbnl_ieee_getets(struct net_device *dev, struct ieee_ets *ets)
if (bp->dcbx_cap & DCB_CAP_DCBX_HOST)
return 0;
- my_ets = kzalloc_obj(*my_ets, GFP_KERNEL);
+ my_ets = kzalloc_obj(*my_ets);
if (!my_ets)
return -ENOMEM;
rc = bnxt_hwrm_queue_cos2bw_qcfg(bp, my_ets);
@@ -568,7 +568,7 @@ static int bnxt_dcbnl_ieee_setets(struct net_device *dev, struct ieee_ets *ets)
rc = bnxt_ets_validate(bp, ets, &max_tc);
if (!rc) {
if (!my_ets) {
- my_ets = kzalloc_obj(*my_ets, GFP_KERNEL);
+ my_ets = kzalloc_obj(*my_ets);
if (!my_ets)
return -ENOMEM;
/* initialize PRI2TC mappings to invalid value */
@@ -604,7 +604,7 @@ static int bnxt_dcbnl_ieee_getpfc(struct net_device *dev, struct ieee_pfc *pfc)
if (bp->dcbx_cap & DCB_CAP_DCBX_HOST)
return 0;
- my_pfc = kzalloc_obj(*my_pfc, GFP_KERNEL);
+ my_pfc = kzalloc_obj(*my_pfc);
if (!my_pfc)
return 0;
bp->ieee_pfc = my_pfc;
@@ -642,7 +642,7 @@ static int bnxt_dcbnl_ieee_setpfc(struct net_device *dev, struct ieee_pfc *pfc)
return -EINVAL;
if (!my_pfc) {
- my_pfc = kzalloc_obj(*my_pfc, GFP_KERNEL);
+ my_pfc = kzalloc_obj(*my_pfc);
if (!my_pfc)
return -ENOMEM;
bp->ieee_pfc = my_pfc;
diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c b/drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c
index e7455ef8984a..ba47e8294fff 100644
--- a/drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c
+++ b/drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c
@@ -1371,7 +1371,7 @@ static int bnxt_add_ntuple_cls_rule(struct bnxt *bp,
return -EOPNOTSUPP;
}
- new_fltr = kzalloc_obj(*new_fltr, GFP_KERNEL);
+ new_fltr = kzalloc_obj(*new_fltr);
if (!new_fltr)
return -ENOMEM;
@@ -5485,7 +5485,7 @@ void bnxt_ethtool_init(struct bnxt *bp)
test_info = bp->test_info;
if (!test_info) {
- test_info = kzalloc_obj(*bp->test_info, GFP_KERNEL);
+ test_info = kzalloc_obj(*bp->test_info);
if (!test_info)
return;
bp->test_info = test_info;
diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt_hwrm.c b/drivers/net/ethernet/broadcom/bnxt/bnxt_hwrm.c
index fcb4edb24012..5bfabdca7d0e 100644
--- a/drivers/net/ethernet/broadcom/bnxt/bnxt_hwrm.c
+++ b/drivers/net/ethernet/broadcom/bnxt/bnxt_hwrm.c
@@ -371,7 +371,7 @@ __hwrm_acquire_token(struct bnxt *bp, enum bnxt_hwrm_chnl dst)
{
struct bnxt_hwrm_wait_token *token;
- token = kzalloc_obj(*token, GFP_KERNEL);
+ token = kzalloc_obj(*token);
if (!token)
return NULL;
diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt_sriov.c b/drivers/net/ethernet/broadcom/bnxt/bnxt_sriov.c
index d0f5f2ad5b26..7f9829287c49 100644
--- a/drivers/net/ethernet/broadcom/bnxt/bnxt_sriov.c
+++ b/drivers/net/ethernet/broadcom/bnxt/bnxt_sriov.c
@@ -459,7 +459,7 @@ static int bnxt_alloc_vf_resources(struct bnxt *bp, int num_vfs)
struct pci_dev *pdev = bp->pdev;
u32 nr_pages, size, i, j, k = 0;
- bp->pf.vf = kzalloc_objs(struct bnxt_vf_info, num_vfs, GFP_KERNEL);
+ bp->pf.vf = kzalloc_objs(struct bnxt_vf_info, num_vfs);
if (!bp->pf.vf)
return -ENOMEM;
diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt_tc.c b/drivers/net/ethernet/broadcom/bnxt/bnxt_tc.c
index c678305d588c..c6b4a14c0e6e 100644
--- a/drivers/net/ethernet/broadcom/bnxt/bnxt_tc.c
+++ b/drivers/net/ethernet/broadcom/bnxt/bnxt_tc.c
@@ -977,7 +977,7 @@ bnxt_tc_get_l2_node(struct bnxt *bp, struct rhashtable *l2_table,
l2_node = rhashtable_lookup_fast(l2_table, l2_key, ht_params);
if (!l2_node) {
- l2_node = kzalloc_obj(*l2_node, GFP_KERNEL);
+ l2_node = kzalloc_obj(*l2_node);
if (!l2_node) {
rc = -ENOMEM;
return NULL;
@@ -1128,7 +1128,7 @@ bnxt_tc_get_tunnel_node(struct bnxt *bp, struct rhashtable *tunnel_table,
tunnel_node = rhashtable_lookup_fast(tunnel_table, tun_key, *ht_params);
if (!tunnel_node) {
- tunnel_node = kzalloc_obj(*tunnel_node, GFP_KERNEL);
+ tunnel_node = kzalloc_obj(*tunnel_node);
if (!tunnel_node) {
rc = -ENOMEM;
goto err;
@@ -1535,7 +1535,7 @@ static int bnxt_tc_add_flow(struct bnxt *bp, u16 src_fid,
int rc;
/* allocate memory for the new flow and it's node */
- new_node = kzalloc_obj(*new_node, GFP_KERNEL);
+ new_node = kzalloc_obj(*new_node);
if (!new_node) {
rc = -ENOMEM;
goto done;
@@ -1915,7 +1915,7 @@ static int bnxt_tc_setup_indr_block(struct net_device *netdev, struct Qdisc *sch
switch (f->command) {
case FLOW_BLOCK_BIND:
- cb_priv = kmalloc_obj(*cb_priv, GFP_KERNEL);
+ cb_priv = kmalloc_obj(*cb_priv);
if (!cb_priv)
return -ENOMEM;
@@ -2018,7 +2018,7 @@ int bnxt_init_tc(struct bnxt *bp)
if (bp->hwrm_spec_code < 0x10803)
return 0;
- tc_info = kzalloc_obj(*tc_info, GFP_KERNEL);
+ tc_info = kzalloc_obj(*tc_info);
if (!tc_info)
return -ENOMEM;
mutex_init(&tc_info->lock);
diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt_ulp.c b/drivers/net/ethernet/broadcom/bnxt/bnxt_ulp.c
index ca95f6e70dde..e0b9b55c0d3c 100644
--- a/drivers/net/ethernet/broadcom/bnxt/bnxt_ulp.c
+++ b/drivers/net/ethernet/broadcom/bnxt/bnxt_ulp.c
@@ -479,7 +479,7 @@ void bnxt_rdma_aux_device_init(struct bnxt *bp)
if (!(bp->flags & BNXT_FLAG_ROCE_CAP))
return;
- aux_priv = kzalloc_obj(*bp->aux_priv, GFP_KERNEL);
+ aux_priv = kzalloc_obj(*bp->aux_priv);
if (!aux_priv)
goto exit;
@@ -509,13 +509,13 @@ void bnxt_rdma_aux_device_init(struct bnxt *bp)
* any error unwinding will need to include a call to
* auxiliary_device_uninit.
*/
- edev = kzalloc_obj(*edev, GFP_KERNEL);
+ edev = kzalloc_obj(*edev);
if (!edev)
goto aux_dev_uninit;
aux_priv->edev = edev;
- ulp = kzalloc_obj(*ulp, GFP_KERNEL);
+ ulp = kzalloc_obj(*ulp);
if (!ulp)
goto aux_dev_uninit;
diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt_vfr.c b/drivers/net/ethernet/broadcom/bnxt/bnxt_vfr.c
index d0a67616f927..18e33144f345 100644
--- a/drivers/net/ethernet/broadcom/bnxt/bnxt_vfr.c
+++ b/drivers/net/ethernet/broadcom/bnxt/bnxt_vfr.c
@@ -496,7 +496,7 @@ int bnxt_vf_reps_create(struct bnxt *bp)
if (!(bp->flags & BNXT_FLAG_DSN_VALID))
return -ENODEV;
- bp->vf_reps = kzalloc_objs(vf_rep, num_vfs, GFP_KERNEL);
+ bp->vf_reps = kzalloc_objs(vf_rep, num_vfs);
if (!bp->vf_reps)
return -ENOMEM;
diff --git a/drivers/net/ethernet/broadcom/cnic.c b/drivers/net/ethernet/broadcom/cnic.c
index bd4238737fef..7fb78df3d8ab 100644
--- a/drivers/net/ethernet/broadcom/cnic.c
+++ b/drivers/net/ethernet/broadcom/cnic.c
@@ -1208,7 +1208,7 @@ static int cnic_alloc_bnx2x_context(struct cnic_dev *dev)
if (blks > cp->ethdev->ctx_tbl_len)
return -ENOMEM;
- cp->ctx_arr = kzalloc_objs(struct cnic_ctx, blks, GFP_KERNEL);
+ cp->ctx_arr = kzalloc_objs(struct cnic_ctx, blks);
if (cp->ctx_arr == NULL)
return -ENOMEM;
diff --git a/drivers/net/ethernet/brocade/bna/bnad.c b/drivers/net/ethernet/brocade/bna/bnad.c
index ec3750f055b8..5018cc5f6393 100644
--- a/drivers/net/ethernet/brocade/bna/bnad.c
+++ b/drivers/net/ethernet/brocade/bna/bnad.c
@@ -2640,7 +2640,7 @@ bnad_enable_msix(struct bnad *bnad)
return;
bnad->msix_table =
- kzalloc_objs(struct msix_entry, bnad->msix_num, GFP_KERNEL);
+ kzalloc_objs(struct msix_entry, bnad->msix_num);
if (!bnad->msix_table)
goto intx_mode;
diff --git a/drivers/net/ethernet/brocade/bna/bnad_debugfs.c b/drivers/net/ethernet/brocade/bna/bnad_debugfs.c
index 8a2eb4504760..ba3c1033a0b0 100644
--- a/drivers/net/ethernet/brocade/bna/bnad_debugfs.c
+++ b/drivers/net/ethernet/brocade/bna/bnad_debugfs.c
@@ -45,7 +45,7 @@ bnad_debugfs_open_fwtrc(struct inode *inode, struct file *file)
unsigned long flags;
int rc;
- fw_debug = kzalloc_obj(struct bnad_debug_info, GFP_KERNEL);
+ fw_debug = kzalloc_obj(struct bnad_debug_info);
if (!fw_debug)
return -ENOMEM;
@@ -85,7 +85,7 @@ bnad_debugfs_open_fwsave(struct inode *inode, struct file *file)
unsigned long flags;
int rc;
- fw_debug = kzalloc_obj(struct bnad_debug_info, GFP_KERNEL);
+ fw_debug = kzalloc_obj(struct bnad_debug_info);
if (!fw_debug)
return -ENOMEM;
@@ -122,7 +122,7 @@ bnad_debugfs_open_reg(struct inode *inode, struct file *file)
{
struct bnad_debug_info *reg_debug;
- reg_debug = kzalloc_obj(struct bnad_debug_info, GFP_KERNEL);
+ reg_debug = kzalloc_obj(struct bnad_debug_info);
if (!reg_debug)
return -ENOMEM;
@@ -185,7 +185,7 @@ bnad_debugfs_open_drvinfo(struct inode *inode, struct file *file)
struct bnad_debug_info *drv_info;
int rc;
- drv_info = kzalloc_obj(struct bnad_debug_info, GFP_KERNEL);
+ drv_info = kzalloc_obj(struct bnad_debug_info);
if (!drv_info)
return -ENOMEM;
diff --git a/drivers/net/ethernet/brocade/bna/bnad_ethtool.c b/drivers/net/ethernet/brocade/bna/bnad_ethtool.c
index 446234e3ca53..466e2ea7a740 100644
--- a/drivers/net/ethernet/brocade/bna/bnad_ethtool.c
+++ b/drivers/net/ethernet/brocade/bna/bnad_ethtool.c
@@ -285,7 +285,7 @@ bnad_get_drvinfo(struct net_device *netdev, struct ethtool_drvinfo *drvinfo)
strscpy(drvinfo->driver, BNAD_NAME, sizeof(drvinfo->driver));
- ioc_attr = kzalloc_obj(*ioc_attr, GFP_KERNEL);
+ ioc_attr = kzalloc_obj(*ioc_attr);
if (ioc_attr) {
spin_lock_irqsave(&bnad->bna_lock, flags);
bfa_nw_ioc_get_attr(&bnad->bna.ioceth.ioc, ioc_attr);
@@ -900,7 +900,7 @@ bnad_get_flash_partition_by_offset(struct bnad *bnad, u32 offset,
u32 i, flash_part = 0, ret;
unsigned long flags = 0;
- flash_attr = kzalloc_obj(struct bfa_flash_attr, GFP_KERNEL);
+ flash_attr = kzalloc_obj(struct bfa_flash_attr);
if (!flash_attr)
return 0;
diff --git a/drivers/net/ethernet/cadence/macb_main.c b/drivers/net/ethernet/cadence/macb_main.c
index 86f516563db6..5bc35f651ebd 100644
--- a/drivers/net/ethernet/cadence/macb_main.c
+++ b/drivers/net/ethernet/cadence/macb_main.c
@@ -3734,7 +3734,7 @@ static int gem_add_flow_filter(struct net_device *netdev,
int ret = -EINVAL;
bool added = false;
- newfs = kmalloc_obj(*newfs, GFP_KERNEL);
+ newfs = kmalloc_obj(*newfs);
if (newfs == NULL)
return -ENOMEM;
memcpy(&newfs->fs, fs, sizeof(newfs->fs));
diff --git a/drivers/net/ethernet/cavium/liquidio/lio_core.c b/drivers/net/ethernet/cavium/liquidio/lio_core.c
index baccb0169068..a74d0205efda 100644
--- a/drivers/net/ethernet/cavium/liquidio/lio_core.c
+++ b/drivers/net/ethernet/cavium/liquidio/lio_core.c
@@ -89,12 +89,12 @@ int lio_setup_glists(struct octeon_device *oct, struct lio *lio, int num_iqs)
int i, j;
lio->glist_lock =
- kzalloc_objs(*lio->glist_lock, num_iqs, GFP_KERNEL);
+ kzalloc_objs(*lio->glist_lock, num_iqs);
if (!lio->glist_lock)
return -ENOMEM;
lio->glist =
- kzalloc_objs(*lio->glist, num_iqs, GFP_KERNEL);
+ kzalloc_objs(*lio->glist, num_iqs);
if (!lio->glist) {
kfree(lio->glist_lock);
lio->glist_lock = NULL;
@@ -138,7 +138,7 @@ int lio_setup_glists(struct octeon_device *oct, struct lio *lio, int num_iqs)
g = kzalloc_node(sizeof(*g), GFP_KERNEL,
numa_node);
if (!g)
- g = kzalloc_obj(*g, GFP_KERNEL);
+ g = kzalloc_obj(*g);
if (!g)
break;
diff --git a/drivers/net/ethernet/cavium/liquidio/octeon_device.c b/drivers/net/ethernet/cavium/liquidio/octeon_device.c
index e61f18467a15..e98118e7b9fd 100644
--- a/drivers/net/ethernet/cavium/liquidio/octeon_device.c
+++ b/drivers/net/ethernet/cavium/liquidio/octeon_device.c
@@ -1164,7 +1164,7 @@ octeon_register_dispatch_fn(struct octeon_device *oct,
dev_dbg(&oct->pci_dev->dev,
"Adding opcode to dispatch list linked list\n");
- dispatch = kmalloc_obj(*dispatch, GFP_KERNEL);
+ dispatch = kmalloc_obj(*dispatch);
if (!dispatch)
return 1;
diff --git a/drivers/net/ethernet/cavium/thunder/nicvf_main.c b/drivers/net/ethernet/cavium/thunder/nicvf_main.c
index 7ef2a9f606a1..1c183827cb9e 100644
--- a/drivers/net/ethernet/cavium/thunder/nicvf_main.c
+++ b/drivers/net/ethernet/cavium/thunder/nicvf_main.c
@@ -1465,7 +1465,7 @@ int nicvf_open(struct net_device *netdev)
/* Register NAPI handler for processing CQEs */
for (qidx = 0; qidx < qs->cq_cnt; qidx++) {
- cq_poll = kzalloc_obj(*cq_poll, GFP_KERNEL);
+ cq_poll = kzalloc_obj(*cq_poll);
if (!cq_poll) {
err = -ENOMEM;
goto napi_del;
diff --git a/drivers/net/ethernet/cavium/thunder/nicvf_queues.c b/drivers/net/ethernet/cavium/thunder/nicvf_queues.c
index 12bea0b6a4e6..062ac4a5fa12 100644
--- a/drivers/net/ethernet/cavium/thunder/nicvf_queues.c
+++ b/drivers/net/ethernet/cavium/thunder/nicvf_queues.c
@@ -289,7 +289,7 @@ static int nicvf_init_rbdr(struct nicvf *nic, struct rbdr *rbdr,
rbdr->is_xdp = true;
}
rbdr->pgcnt = roundup_pow_of_two(rbdr->pgcnt);
- rbdr->pgcache = kzalloc_objs(*rbdr->pgcache, rbdr->pgcnt, GFP_KERNEL);
+ rbdr->pgcache = kzalloc_objs(*rbdr->pgcache, rbdr->pgcnt);
if (!rbdr->pgcache)
return -ENOMEM;
rbdr->pgidx = 0;
diff --git a/drivers/net/ethernet/cavium/thunder/thunder_bgx.c b/drivers/net/ethernet/cavium/thunder/thunder_bgx.c
index 87723e4140b0..b6303999902f 100644
--- a/drivers/net/ethernet/cavium/thunder/thunder_bgx.c
+++ b/drivers/net/ethernet/cavium/thunder/thunder_bgx.c
@@ -1086,7 +1086,7 @@ static int bgx_lmac_enable(struct bgx *bgx, u8 lmacid)
/* actual number of filters available to exact LMAC */
lmac->dmacs_count = (RX_DMAC_COUNT / bgx->lmac_count);
- lmac->dmacs = kzalloc_objs(*lmac->dmacs, lmac->dmacs_count, GFP_KERNEL);
+ lmac->dmacs = kzalloc_objs(*lmac->dmacs, lmac->dmacs_count);
if (!lmac->dmacs)
return -ENOMEM;
diff --git a/drivers/net/ethernet/chelsio/cxgb/espi.c b/drivers/net/ethernet/chelsio/cxgb/espi.c
index a7dd518b6ea9..282409fefd39 100644
--- a/drivers/net/ethernet/chelsio/cxgb/espi.c
+++ b/drivers/net/ethernet/chelsio/cxgb/espi.c
@@ -280,7 +280,7 @@ void t1_espi_destroy(struct peespi *espi)
struct peespi *t1_espi_create(adapter_t *adapter)
{
- struct peespi *espi = kzalloc_obj(*espi, GFP_KERNEL);
+ struct peespi *espi = kzalloc_obj(*espi);
if (espi)
espi->adapter = adapter;
diff --git a/drivers/net/ethernet/chelsio/cxgb/mv88e1xxx.c b/drivers/net/ethernet/chelsio/cxgb/mv88e1xxx.c
index 4c4a43828110..dc412801bd31 100644
--- a/drivers/net/ethernet/chelsio/cxgb/mv88e1xxx.c
+++ b/drivers/net/ethernet/chelsio/cxgb/mv88e1xxx.c
@@ -358,7 +358,7 @@ static struct cphy *mv88e1xxx_phy_create(struct net_device *dev, int phy_addr,
const struct mdio_ops *mdio_ops)
{
struct adapter *adapter = netdev_priv(dev);
- struct cphy *cphy = kzalloc_obj(*cphy, GFP_KERNEL);
+ struct cphy *cphy = kzalloc_obj(*cphy);
if (!cphy)
return NULL;
diff --git a/drivers/net/ethernet/chelsio/cxgb/mv88x201x.c b/drivers/net/ethernet/chelsio/cxgb/mv88x201x.c
index 8c3d3250b72c..c378c9b2156c 100644
--- a/drivers/net/ethernet/chelsio/cxgb/mv88x201x.c
+++ b/drivers/net/ethernet/chelsio/cxgb/mv88x201x.c
@@ -203,7 +203,7 @@ static struct cphy *mv88x201x_phy_create(struct net_device *dev, int phy_addr,
const struct mdio_ops *mdio_ops)
{
u32 val;
- struct cphy *cphy = kzalloc_obj(*cphy, GFP_KERNEL);
+ struct cphy *cphy = kzalloc_obj(*cphy);
if (!cphy)
return NULL;
diff --git a/drivers/net/ethernet/chelsio/cxgb/my3126.c b/drivers/net/ethernet/chelsio/cxgb/my3126.c
index 9d29f0767dcb..bd1eb3a7bb33 100644
--- a/drivers/net/ethernet/chelsio/cxgb/my3126.c
+++ b/drivers/net/ethernet/chelsio/cxgb/my3126.c
@@ -171,7 +171,7 @@ static const struct cphy_ops my3126_ops = {
static struct cphy *my3126_phy_create(struct net_device *dev,
int phy_addr, const struct mdio_ops *mdio_ops)
{
- struct cphy *cphy = kzalloc_obj(*cphy, GFP_KERNEL);
+ struct cphy *cphy = kzalloc_obj(*cphy);
if (!cphy)
return NULL;
diff --git a/drivers/net/ethernet/chelsio/cxgb/sge.c b/drivers/net/ethernet/chelsio/cxgb/sge.c
index 21d7f84af72e..d8fca697874a 100644
--- a/drivers/net/ethernet/chelsio/cxgb/sge.c
+++ b/drivers/net/ethernet/chelsio/cxgb/sge.c
@@ -366,7 +366,7 @@ static int tx_sched_init(struct sge *sge)
struct sched *s;
int i;
- s = kzalloc_obj(struct sched, GFP_KERNEL);
+ s = kzalloc_obj(struct sched);
if (!s)
return -ENOMEM;
@@ -2095,7 +2095,7 @@ static void espibug_workaround(struct timer_list *t)
*/
struct sge *t1_sge_create(struct adapter *adapter, struct sge_params *p)
{
- struct sge *sge = kzalloc_obj(*sge, GFP_KERNEL);
+ struct sge *sge = kzalloc_obj(*sge);
int i;
if (!sge)
diff --git a/drivers/net/ethernet/chelsio/cxgb/tp.c b/drivers/net/ethernet/chelsio/cxgb/tp.c
index 66dfe57b9f01..0d741e374f71 100644
--- a/drivers/net/ethernet/chelsio/cxgb/tp.c
+++ b/drivers/net/ethernet/chelsio/cxgb/tp.c
@@ -58,7 +58,7 @@ void t1_tp_destroy(struct petp *tp)
struct petp *t1_tp_create(adapter_t *adapter, struct tp_params *p)
{
- struct petp *tp = kzalloc_obj(*tp, GFP_KERNEL);
+ struct petp *tp = kzalloc_obj(*tp);
if (!tp)
return NULL;
diff --git a/drivers/net/ethernet/chelsio/cxgb3/cxgb3_main.c b/drivers/net/ethernet/chelsio/cxgb3/cxgb3_main.c
index ce9880805a42..88b6d76817e9 100644
--- a/drivers/net/ethernet/chelsio/cxgb3/cxgb3_main.c
+++ b/drivers/net/ethernet/chelsio/cxgb3/cxgb3_main.c
@@ -3242,7 +3242,7 @@ static int init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
mmio_len = pci_resource_len(pdev, 0);
ai = t3_get_adapter_info(ent->driver_data);
- adapter = kzalloc_obj(*adapter, GFP_KERNEL);
+ adapter = kzalloc_obj(*adapter);
if (!adapter) {
err = -ENOMEM;
goto out_release_regions;
diff --git a/drivers/net/ethernet/chelsio/cxgb3/cxgb3_offload.c b/drivers/net/ethernet/chelsio/cxgb3/cxgb3_offload.c
index cf8916f4e3d6..1e544047fa3a 100644
--- a/drivers/net/ethernet/chelsio/cxgb3/cxgb3_offload.c
+++ b/drivers/net/ethernet/chelsio/cxgb3/cxgb3_offload.c
@@ -1185,7 +1185,7 @@ int cxgb3_offload_activate(struct adapter *adapter)
unsigned int l2t_capacity;
struct l2t_data *l2td;
- t = kzalloc_obj(*t, GFP_KERNEL);
+ t = kzalloc_obj(*t);
if (!t)
return -ENOMEM;
diff --git a/drivers/net/ethernet/chelsio/cxgb4/clip_tbl.c b/drivers/net/ethernet/chelsio/cxgb4/clip_tbl.c
index fb958857bfd6..0549265807a1 100644
--- a/drivers/net/ethernet/chelsio/cxgb4/clip_tbl.c
+++ b/drivers/net/ethernet/chelsio/cxgb4/clip_tbl.c
@@ -301,7 +301,7 @@ struct clip_tbl *t4_init_clip_tbl(unsigned int clipt_start,
for (i = 0; i < ctbl->clipt_size; ++i)
INIT_LIST_HEAD(&ctbl->hash_list[i]);
- cl_list = kvzalloc_objs(struct clip_entry, clipt_size, GFP_KERNEL);
+ cl_list = kvzalloc_objs(struct clip_entry, clipt_size);
if (!cl_list) {
kvfree(ctbl);
return NULL;
diff --git a/drivers/net/ethernet/chelsio/cxgb4/cxgb4_debugfs.c b/drivers/net/ethernet/chelsio/cxgb4/cxgb4_debugfs.c
index 6e2e5644b825..f521737d1275 100644
--- a/drivers/net/ethernet/chelsio/cxgb4/cxgb4_debugfs.c
+++ b/drivers/net/ethernet/chelsio/cxgb4/cxgb4_debugfs.c
@@ -860,7 +860,7 @@ static int cctrl_tbl_show(struct seq_file *seq, void *v)
u16 (*incr)[NCCTRL_WIN];
struct adapter *adap = seq->private;
- incr = kmalloc_objs(*incr, NMTUS, GFP_KERNEL);
+ incr = kmalloc_objs(*incr, NMTUS);
if (!incr)
return -ENOMEM;
diff --git a/drivers/net/ethernet/chelsio/cxgb4/cxgb4_ethtool.c b/drivers/net/ethernet/chelsio/cxgb4/cxgb4_ethtool.c
index 3c66db1f765a..7db3dbc488a7 100644
--- a/drivers/net/ethernet/chelsio/cxgb4/cxgb4_ethtool.c
+++ b/drivers/net/ethernet/chelsio/cxgb4/cxgb4_ethtool.c
@@ -2250,7 +2250,7 @@ int cxgb4_init_ethtool_filters(struct adapter *adap)
u32 nentries, i;
int ret;
- eth_filter = kzalloc_obj(*eth_filter, GFP_KERNEL);
+ eth_filter = kzalloc_obj(*eth_filter);
if (!eth_filter)
return -ENOMEM;
diff --git a/drivers/net/ethernet/chelsio/cxgb4/cxgb4_filter.c b/drivers/net/ethernet/chelsio/cxgb4/cxgb4_filter.c
index dad0e72a52ab..657d96b9e2f6 100644
--- a/drivers/net/ethernet/chelsio/cxgb4/cxgb4_filter.c
+++ b/drivers/net/ethernet/chelsio/cxgb4/cxgb4_filter.c
@@ -1389,7 +1389,7 @@ static int cxgb4_set_hash_filter(struct net_device *dev,
if (iq < 0)
return iq;
- f = kzalloc_obj(*f, GFP_KERNEL);
+ f = kzalloc_obj(*f);
if (!f)
return -ENOMEM;
diff --git a/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c b/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c
index 20eeb4deab49..701936b28167 100644
--- a/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c
+++ b/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c
@@ -478,7 +478,7 @@ int cxgb4_change_mac(struct port_info *pi, unsigned int viid,
goto set_hash;
}
}
- new_entry = kzalloc_obj(*new_entry, GFP_KERNEL);
+ new_entry = kzalloc_obj(*new_entry);
if (!new_entry)
return -ENOMEM;
ether_addr_copy(new_entry->addr, addr);
@@ -1330,7 +1330,7 @@ static int cxgb4_port_mirror_alloc_queues(struct net_device *dev)
if (s->mirror_rxq[pi->port_id])
return 0;
- mirror_rxq = kzalloc_objs(*mirror_rxq, pi->nmirrorqsets, GFP_KERNEL);
+ mirror_rxq = kzalloc_objs(*mirror_rxq, pi->nmirrorqsets);
if (!mirror_rxq)
return -ENOMEM;
@@ -4057,7 +4057,7 @@ static int adap_config_hma(struct adapter *adapter)
page_size = HMA_PAGE_SIZE;
page_order = HMA_PAGE_ORDER;
- adapter->hma.sgt = kzalloc_obj(*adapter->hma.sgt, GFP_KERNEL);
+ adapter->hma.sgt = kzalloc_obj(*adapter->hma.sgt);
if (unlikely(!adapter->hma.sgt)) {
dev_err(adapter->pdev_dev, "HMA SG table allocation failed\n");
return -ENOMEM;
@@ -4097,7 +4097,7 @@ static int adap_config_hma(struct adapter *adapter)
}
adapter->hma.flags |= HMA_DMA_MAPPED_FLAG;
- adapter->hma.phy_addr = kzalloc_objs(dma_addr_t, sgt->nents, GFP_KERNEL);
+ adapter->hma.phy_addr = kzalloc_objs(dma_addr_t, sgt->nents);
if (unlikely(!adapter->hma.phy_addr))
goto free_hma;
@@ -4811,7 +4811,7 @@ static int adap_init0(struct adapter *adap, int vpd_skip)
/* allocate memory to read the header of the firmware on the
* card
*/
- card_fw = kvzalloc_obj(*card_fw, GFP_KERNEL);
+ card_fw = kvzalloc_obj(*card_fw);
if (!card_fw) {
ret = -ENOMEM;
goto bye;
@@ -5835,7 +5835,7 @@ static int alloc_msix_info(struct adapter *adap, u32 num_vec)
{
struct msix_info *msix_info;
- msix_info = kzalloc_objs(*msix_info, num_vec, GFP_KERNEL);
+ msix_info = kzalloc_objs(*msix_info, num_vec);
if (!msix_info)
return -ENOMEM;
@@ -5934,7 +5934,7 @@ static int enable_msix(struct adapter *adap)
want += EXTRA_VECS;
need += EXTRA_VECS;
- entries = kmalloc_objs(*entries, want, GFP_KERNEL);
+ entries = kmalloc_objs(*entries, want);
if (!entries)
return -ENOMEM;
@@ -6604,7 +6604,7 @@ static int init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
goto out_disable_device;
}
- adapter = kzalloc_obj(*adapter, GFP_KERNEL);
+ adapter = kzalloc_obj(*adapter);
if (!adapter) {
err = -ENOMEM;
goto out_unmap_bar0;
diff --git a/drivers/net/ethernet/chelsio/cxgb4/cxgb4_tc_flower.c b/drivers/net/ethernet/chelsio/cxgb4/cxgb4_tc_flower.c
index 79db92f3ba62..3307e5042681 100644
--- a/drivers/net/ethernet/chelsio/cxgb4/cxgb4_tc_flower.c
+++ b/drivers/net/ethernet/chelsio/cxgb4/cxgb4_tc_flower.c
@@ -145,7 +145,7 @@ static void cxgb4_action_natmode_tweak(struct ch_filter_specification *fs,
static struct ch_tc_flower_entry *allocate_flower_entry(void)
{
- struct ch_tc_flower_entry *new = kzalloc_obj(*new, GFP_KERNEL);
+ struct ch_tc_flower_entry *new = kzalloc_obj(*new);
if (new)
spin_lock_init(&new->lock);
return new;
diff --git a/drivers/net/ethernet/chelsio/cxgb4/cxgb4_tc_matchall.c b/drivers/net/ethernet/chelsio/cxgb4/cxgb4_tc_matchall.c
index 4d53744b2130..104d92a3db28 100644
--- a/drivers/net/ethernet/chelsio/cxgb4/cxgb4_tc_matchall.c
+++ b/drivers/net/ethernet/chelsio/cxgb4/cxgb4_tc_matchall.c
@@ -531,7 +531,7 @@ int cxgb4_init_tc_matchall(struct adapter *adap)
struct cxgb4_tc_matchall *tc_matchall;
int ret;
- tc_matchall = kzalloc_obj(*tc_matchall, GFP_KERNEL);
+ tc_matchall = kzalloc_obj(*tc_matchall);
if (!tc_matchall)
return -ENOMEM;
diff --git a/drivers/net/ethernet/chelsio/cxgb4/cxgb4_tc_mqprio.c b/drivers/net/ethernet/chelsio/cxgb4/cxgb4_tc_mqprio.c
index 9d07540e2955..724cd8be1003 100644
--- a/drivers/net/ethernet/chelsio/cxgb4/cxgb4_tc_mqprio.c
+++ b/drivers/net/ethernet/chelsio/cxgb4/cxgb4_tc_mqprio.c
@@ -100,7 +100,7 @@ static int cxgb4_init_eosw_txq(struct net_device *dev,
memset(eosw_txq, 0, sizeof(*eosw_txq));
- ring = kzalloc_objs(*ring, CXGB4_EOSW_TXQ_DEFAULT_DESC_NUM, GFP_KERNEL);
+ ring = kzalloc_objs(*ring, CXGB4_EOSW_TXQ_DEFAULT_DESC_NUM);
if (!ring)
return -ENOMEM;
@@ -654,7 +654,7 @@ int cxgb4_init_tc_mqprio(struct adapter *adap)
int ret = 0;
u8 i;
- tc_mqprio = kzalloc_obj(*tc_mqprio, GFP_KERNEL);
+ tc_mqprio = kzalloc_obj(*tc_mqprio);
if (!tc_mqprio)
return -ENOMEM;
diff --git a/drivers/net/ethernet/chelsio/cxgb4/cxgb4_uld.c b/drivers/net/ethernet/chelsio/cxgb4/cxgb4_uld.c
index c1fe70fc3286..1b91c3448f22 100644
--- a/drivers/net/ethernet/chelsio/cxgb4/cxgb4_uld.c
+++ b/drivers/net/ethernet/chelsio/cxgb4/cxgb4_uld.c
@@ -241,7 +241,7 @@ static int cfg_queues_uld(struct adapter *adap, unsigned int uld_type,
struct sge_uld_rxq_info *rxq_info;
int i, nrxq, ciq_size;
- rxq_info = kzalloc_obj(*rxq_info, GFP_KERNEL);
+ rxq_info = kzalloc_obj(*rxq_info);
if (!rxq_info)
return -ENOMEM;
@@ -269,7 +269,7 @@ static int cfg_queues_uld(struct adapter *adap, unsigned int uld_type,
}
nrxq = rxq_info->nrxq + rxq_info->nciq; /* total rxq's */
- rxq_info->uldrxq = kzalloc_objs(struct sge_ofld_rxq, nrxq, GFP_KERNEL);
+ rxq_info->uldrxq = kzalloc_objs(struct sge_ofld_rxq, nrxq);
if (!rxq_info->uldrxq) {
kfree(rxq_info);
return -ENOMEM;
@@ -471,7 +471,7 @@ setup_sge_txq_uld(struct adapter *adap, unsigned int uld_type,
(atomic_inc_return(&txq_info->users) > 1))
return 0;
- txq_info = kzalloc_obj(*txq_info, GFP_KERNEL);
+ txq_info = kzalloc_obj(*txq_info);
if (!txq_info)
return -ENOMEM;
if (uld_type == CXGB4_ULD_CRYPTO) {
@@ -524,7 +524,7 @@ int t4_uld_mem_alloc(struct adapter *adap)
{
struct sge *s = &adap->sge;
- adap->uld = kzalloc_objs(*adap->uld, CXGB4_ULD_MAX, GFP_KERNEL);
+ adap->uld = kzalloc_objs(*adap->uld, CXGB4_ULD_MAX);
if (!adap->uld)
return -ENOMEM;
@@ -802,7 +802,7 @@ void cxgb4_register_uld(enum cxgb4_uld type,
if (type >= CXGB4_ULD_MAX)
return;
- uld_entry = kzalloc_obj(*uld_entry, GFP_KERNEL);
+ uld_entry = kzalloc_obj(*uld_entry);
if (!uld_entry)
return;
diff --git a/drivers/net/ethernet/chelsio/cxgb4/sched.c b/drivers/net/ethernet/chelsio/cxgb4/sched.c
index 8e73a5c49529..28b1d5b2bcab 100644
--- a/drivers/net/ethernet/chelsio/cxgb4/sched.c
+++ b/drivers/net/ethernet/chelsio/cxgb4/sched.c
@@ -225,7 +225,7 @@ static int t4_sched_queue_bind(struct port_info *pi, struct ch_sched_queue *p)
if (p->queue < 0 || p->queue >= pi->nqsets)
return -ERANGE;
- qe = kvzalloc_obj(struct sched_queue_entry, GFP_KERNEL);
+ qe = kvzalloc_obj(struct sched_queue_entry);
if (!qe)
return -ENOMEM;
@@ -294,7 +294,7 @@ static int t4_sched_flowc_bind(struct port_info *pi, struct ch_sched_flowc *p)
if (p->tid < 0 || p->tid >= adap->tids.neotids)
return -ERANGE;
- fe = kvzalloc_obj(*fe, GFP_KERNEL);
+ fe = kvzalloc_obj(*fe);
if (!fe)
return -ENOMEM;
diff --git a/drivers/net/ethernet/chelsio/cxgb4/srq.c b/drivers/net/ethernet/chelsio/cxgb4/srq.c
index 1f7e2dece66c..2a110494c363 100644
--- a/drivers/net/ethernet/chelsio/cxgb4/srq.c
+++ b/drivers/net/ethernet/chelsio/cxgb4/srq.c
@@ -40,7 +40,7 @@ struct srq_data *t4_init_srq(int srq_size)
{
struct srq_data *s;
- s = kvzalloc_obj(*s, GFP_KERNEL);
+ s = kvzalloc_obj(*s);
if (!s)
return NULL;
diff --git a/drivers/net/ethernet/chelsio/cxgb4vf/cxgb4vf_main.c b/drivers/net/ethernet/chelsio/cxgb4vf/cxgb4vf_main.c
index 592f736f6c85..9eaa9aadee33 100644
--- a/drivers/net/ethernet/chelsio/cxgb4vf/cxgb4vf_main.c
+++ b/drivers/net/ethernet/chelsio/cxgb4vf/cxgb4vf_main.c
@@ -288,7 +288,7 @@ static int cxgb4vf_change_mac(struct port_info *pi, unsigned int viid,
goto set_hash;
}
}
- new_entry = kzalloc_obj(*new_entry, GFP_KERNEL);
+ new_entry = kzalloc_obj(*new_entry);
if (!new_entry)
return -ENOMEM;
ether_addr_copy(new_entry->addr, addr);
@@ -2935,7 +2935,7 @@ static int cxgb4vf_pci_probe(struct pci_dev *pdev,
/*
* Allocate our adapter data structure and attach it to the device.
*/
- adapter = kzalloc_obj(*adapter, GFP_KERNEL);
+ adapter = kzalloc_obj(*adapter);
if (!adapter) {
err = -ENOMEM;
goto err_release_regions;
diff --git a/drivers/net/ethernet/chelsio/inline_crypto/ch_ipsec/chcr_ipsec.c b/drivers/net/ethernet/chelsio/inline_crypto/ch_ipsec/chcr_ipsec.c
index e89150c0f2c7..efbe07a3ba07 100644
--- a/drivers/net/ethernet/chelsio/inline_crypto/ch_ipsec/chcr_ipsec.c
+++ b/drivers/net/ethernet/chelsio/inline_crypto/ch_ipsec/chcr_ipsec.c
@@ -104,7 +104,7 @@ static void *ch_ipsec_uld_add(const struct cxgb4_lld_info *infop)
pr_info_once("%s - version %s\n", CHIPSEC_DRV_DESC,
CHIPSEC_DRV_VERSION);
- u_ctx = kzalloc_obj(*u_ctx, GFP_KERNEL);
+ u_ctx = kzalloc_obj(*u_ctx);
if (!u_ctx) {
u_ctx = ERR_PTR(-ENOMEM);
goto out;
@@ -295,7 +295,7 @@ static int ch_ipsec_xfrm_add_state(struct net_device *dev,
return -ENODEV;
}
- sa_entry = kzalloc_obj(*sa_entry, GFP_KERNEL);
+ sa_entry = kzalloc_obj(*sa_entry);
if (!sa_entry) {
res = -ENOMEM;
module_put(THIS_MODULE);
diff --git a/drivers/net/ethernet/chelsio/inline_crypto/ch_ktls/chcr_ktls.c b/drivers/net/ethernet/chelsio/inline_crypto/ch_ktls/chcr_ktls.c
index eb53e3a3ccf9..f5acd4be1e69 100644
--- a/drivers/net/ethernet/chelsio/inline_crypto/ch_ktls/chcr_ktls.c
+++ b/drivers/net/ethernet/chelsio/inline_crypto/ch_ktls/chcr_ktls.c
@@ -442,7 +442,7 @@ static int chcr_ktls_dev_add(struct net_device *netdev, struct sock *sk,
if (u_ctx && u_ctx->detach)
goto out;
- tx_info = kvzalloc_obj(*tx_info, GFP_KERNEL);
+ tx_info = kvzalloc_obj(*tx_info);
if (!tx_info)
goto out;
@@ -2117,7 +2117,7 @@ static void *chcr_ktls_uld_add(const struct cxgb4_lld_info *lldi)
pr_info_once("%s - version %s\n", CHCR_KTLS_DRV_DESC,
CHCR_KTLS_DRV_VERSION);
- u_ctx = kzalloc_obj(*u_ctx, GFP_KERNEL);
+ u_ctx = kzalloc_obj(*u_ctx);
if (!u_ctx) {
u_ctx = ERR_PTR(-ENOMEM);
goto out;
diff --git a/drivers/net/ethernet/chelsio/inline_crypto/chtls/chtls_cm.c b/drivers/net/ethernet/chelsio/inline_crypto/chtls/chtls_cm.c
index caa46c191268..0e3e5cf52c2c 100644
--- a/drivers/net/ethernet/chelsio/inline_crypto/chtls/chtls_cm.c
+++ b/drivers/net/ethernet/chelsio/inline_crypto/chtls/chtls_cm.c
@@ -548,7 +548,7 @@ static struct listen_info *listen_hash_add(struct chtls_dev *cdev,
struct sock *sk,
unsigned int stid)
{
- struct listen_info *p = kmalloc_obj(*p, GFP_KERNEL);
+ struct listen_info *p = kmalloc_obj(*p);
if (p) {
int key = listen_hashfn(sk);
@@ -666,7 +666,7 @@ int chtls_listen_start(struct chtls_dev *cdev, struct sock *sk)
if (listen_hash_find(cdev, sk) >= 0) /* already have it */
return -EADDRINUSE;
- ctx = kmalloc_obj(*ctx, GFP_KERNEL);
+ ctx = kmalloc_obj(*ctx);
if (!ctx)
return -ENOMEM;
diff --git a/drivers/net/ethernet/chelsio/inline_crypto/chtls/chtls_main.c b/drivers/net/ethernet/chelsio/inline_crypto/chtls/chtls_main.c
index 511ca3bfce3f..2570575434f9 100644
--- a/drivers/net/ethernet/chelsio/inline_crypto/chtls/chtls_main.c
+++ b/drivers/net/ethernet/chelsio/inline_crypto/chtls/chtls_main.c
@@ -95,7 +95,7 @@ static int chtls_start_listen(struct chtls_dev *cdev, struct sock *sk)
return -EADDRNOTAVAIL;
sk->sk_backlog_rcv = listen_backlog_rcv;
- clisten = kmalloc_obj(*clisten, GFP_KERNEL);
+ clisten = kmalloc_obj(*clisten);
if (!clisten)
return -ENOMEM;
clisten->cdev = cdev;
@@ -114,7 +114,7 @@ static void chtls_stop_listen(struct chtls_dev *cdev, struct sock *sk)
if (sk->sk_protocol != IPPROTO_TCP)
return;
- clisten = kmalloc_obj(*clisten, GFP_KERNEL);
+ clisten = kmalloc_obj(*clisten);
if (!clisten)
return;
clisten->cdev = cdev;
@@ -238,11 +238,11 @@ static void *chtls_uld_add(const struct cxgb4_lld_info *info)
struct chtls_dev *cdev;
int i, j;
- cdev = kzalloc_obj(*cdev, GFP_KERNEL);
+ cdev = kzalloc_obj(*cdev);
if (!cdev)
goto out;
- lldi = kzalloc_obj(*lldi, GFP_KERNEL);
+ lldi = kzalloc_obj(*lldi);
if (!lldi)
goto out_lldi;
diff --git a/drivers/net/ethernet/cisco/enic/enic_main.c b/drivers/net/ethernet/cisco/enic/enic_main.c
index 14dc4c5aa825..2b812dd1b9ce 100644
--- a/drivers/net/ethernet/cisco/enic/enic_main.c
+++ b/drivers/net/ethernet/cisco/enic/enic_main.c
@@ -2456,15 +2456,15 @@ static void enic_free_enic_resources(struct enic *enic)
static int enic_alloc_enic_resources(struct enic *enic)
{
- enic->wq = kzalloc_objs(struct enic_wq, enic->wq_avail, GFP_KERNEL);
+ enic->wq = kzalloc_objs(struct enic_wq, enic->wq_avail);
if (!enic->wq)
goto free_queues;
- enic->rq = kzalloc_objs(struct enic_rq, enic->rq_avail, GFP_KERNEL);
+ enic->rq = kzalloc_objs(struct enic_rq, enic->rq_avail);
if (!enic->rq)
goto free_queues;
- enic->cq = kzalloc_objs(struct vnic_cq, enic->cq_avail, GFP_KERNEL);
+ enic->cq = kzalloc_objs(struct vnic_cq, enic->cq_avail);
if (!enic->cq)
goto free_queues;
@@ -2737,7 +2737,7 @@ static int enic_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
#endif
/* Allocate structure for port profiles */
- enic->pp = kzalloc_objs(*enic->pp, num_pps, GFP_KERNEL);
+ enic->pp = kzalloc_objs(*enic->pp, num_pps);
if (!enic->pp) {
err = -ENOMEM;
goto err_out_disable_sriov_pp;
diff --git a/drivers/net/ethernet/cisco/enic/vnic_dev.c b/drivers/net/ethernet/cisco/enic/vnic_dev.c
index 5a8a49f8c44f..c72452749f5e 100644
--- a/drivers/net/ethernet/cisco/enic/vnic_dev.c
+++ b/drivers/net/ethernet/cisco/enic/vnic_dev.c
@@ -371,7 +371,7 @@ static int vnic_dev_init_devcmd2(struct vnic_dev *vdev)
if (vdev->devcmd2)
return 0;
- vdev->devcmd2 = kzalloc_obj(*vdev->devcmd2, GFP_KERNEL);
+ vdev->devcmd2 = kzalloc_obj(*vdev->devcmd2);
if (!vdev->devcmd2)
return -ENOMEM;
@@ -1053,7 +1053,7 @@ struct vnic_dev *vnic_dev_register(struct vnic_dev *vdev,
unsigned int num_bars)
{
if (!vdev) {
- vdev = kzalloc_obj(struct vnic_dev, GFP_KERNEL);
+ vdev = kzalloc_obj(struct vnic_dev);
if (!vdev)
return NULL;
}
diff --git a/drivers/net/ethernet/cortina/gemini.c b/drivers/net/ethernet/cortina/gemini.c
index d5608611cee8..4824232f4890 100644
--- a/drivers/net/ethernet/cortina/gemini.c
+++ b/drivers/net/ethernet/cortina/gemini.c
@@ -554,7 +554,7 @@ static int gmac_setup_txqs(struct net_device *netdev)
rwptr_reg = port->dma_base + GMAC_SW_TX_QUEUE0_PTR_REG;
- skb_tab = kzalloc_objs(*skb_tab, len, GFP_KERNEL);
+ skb_tab = kzalloc_objs(*skb_tab, len);
if (!skb_tab)
return -ENOMEM;
@@ -940,7 +940,7 @@ static int geth_setup_freeq(struct gemini_ethernet *geth)
}
/* Allocate a mapping to page look-up index */
- geth->freeq_pages = kzalloc_objs(*geth->freeq_pages, pages, GFP_KERNEL);
+ geth->freeq_pages = kzalloc_objs(*geth->freeq_pages, pages);
if (!geth->freeq_pages)
goto err_freeq;
geth->num_freeq_pages = pages;
diff --git a/drivers/net/ethernet/emulex/benet/be_main.c b/drivers/net/ethernet/emulex/benet/be_main.c
index fb9c9d8bc659..4940b40f472d 100644
--- a/drivers/net/ethernet/emulex/benet/be_main.c
+++ b/drivers/net/ethernet/emulex/benet/be_main.c
@@ -4207,7 +4207,7 @@ static int be_vf_setup_init(struct be_adapter *adapter)
struct be_vf_cfg *vf_cfg;
int vf;
- adapter->vf_cfg = kzalloc_objs(*vf_cfg, adapter->num_vfs, GFP_KERNEL);
+ adapter->vf_cfg = kzalloc_objs(*vf_cfg, adapter->num_vfs);
if (!adapter->vf_cfg)
return -ENOMEM;
diff --git a/drivers/net/ethernet/engleder/tsnep_rxnfc.c b/drivers/net/ethernet/engleder/tsnep_rxnfc.c
index 9342dff7a073..43c550d3983c 100644
--- a/drivers/net/ethernet/engleder/tsnep_rxnfc.c
+++ b/drivers/net/ethernet/engleder/tsnep_rxnfc.c
@@ -231,7 +231,7 @@ int tsnep_rxnfc_add_rule(struct tsnep_adapter *adapter,
return -EINVAL;
}
- rule = kzalloc_obj(*rule, GFP_KERNEL);
+ rule = kzalloc_obj(*rule);
if (!rule)
return -ENOMEM;
diff --git a/drivers/net/ethernet/freescale/dpaa/dpaa_ethtool.c b/drivers/net/ethernet/freescale/dpaa/dpaa_ethtool.c
index 0071d9538661..f2c3c5f3b461 100644
--- a/drivers/net/ethernet/freescale/dpaa/dpaa_ethtool.c
+++ b/drivers/net/ethernet/freescale/dpaa/dpaa_ethtool.c
@@ -421,7 +421,7 @@ static int dpaa_set_coalesce(struct net_device *dev,
bool *needs_revert;
int cpu, res;
- needs_revert = kzalloc_objs(bool, num_possible_cpus(), GFP_KERNEL);
+ needs_revert = kzalloc_objs(bool, num_possible_cpus());
if (!needs_revert)
return -ENOMEM;
diff --git a/drivers/net/ethernet/freescale/dpaa2/dpaa2-eth-devlink.c b/drivers/net/ethernet/freescale/dpaa2/dpaa2-eth-devlink.c
index 0db00bebb268..b65bc54ffc03 100644
--- a/drivers/net/ethernet/freescale/dpaa2/dpaa2-eth-devlink.c
+++ b/drivers/net/ethernet/freescale/dpaa2/dpaa2-eth-devlink.c
@@ -237,7 +237,7 @@ int dpaa2_eth_dl_traps_register(struct dpaa2_eth_priv *priv)
struct device *dev = net_dev->dev.parent;
int err;
- dpaa2_eth_trap_data = kzalloc_obj(*dpaa2_eth_trap_data, GFP_KERNEL);
+ dpaa2_eth_trap_data = kzalloc_obj(*dpaa2_eth_trap_data);
if (!dpaa2_eth_trap_data)
return -ENOMEM;
priv->trap_data = dpaa2_eth_trap_data;
diff --git a/drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.c b/drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.c
index 70691bf85e2d..9335703768a9 100644
--- a/drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.c
+++ b/drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.c
@@ -3125,7 +3125,7 @@ static struct dpaa2_eth_channel *dpaa2_eth_alloc_channel(struct dpaa2_eth_priv *
struct device *dev = priv->net_dev->dev.parent;
int err;
- channel = kzalloc_obj(*channel, GFP_KERNEL);
+ channel = kzalloc_obj(*channel);
if (!channel)
return NULL;
@@ -3392,7 +3392,7 @@ struct dpaa2_eth_bp *dpaa2_eth_allocate_dpbp(struct dpaa2_eth_priv *priv)
return ERR_PTR(err);
}
- bp = kzalloc_obj(*bp, GFP_KERNEL);
+ bp = kzalloc_obj(*bp);
if (!bp) {
err = -ENOMEM;
goto err_alloc;
@@ -4673,7 +4673,7 @@ static int dpaa2_eth_connect_mac(struct dpaa2_eth_priv *priv)
goto out_put_device;
}
- mac = kzalloc_obj(struct dpaa2_mac, GFP_KERNEL);
+ mac = kzalloc_obj(struct dpaa2_mac);
if (!mac) {
err = -ENOMEM;
goto out_put_device;
diff --git a/drivers/net/ethernet/freescale/dpaa2/dpaa2-switch-flower.c b/drivers/net/ethernet/freescale/dpaa2/dpaa2-switch-flower.c
index 388f81713f1e..5b0f0ac1518a 100644
--- a/drivers/net/ethernet/freescale/dpaa2/dpaa2-switch-flower.c
+++ b/drivers/net/ethernet/freescale/dpaa2/dpaa2-switch-flower.c
@@ -505,7 +505,7 @@ dpaa2_switch_cls_flower_replace_acl(struct dpaa2_switch_filter_block *block,
return -ENOMEM;
}
- acl_entry = kzalloc_obj(*acl_entry, GFP_KERNEL);
+ acl_entry = kzalloc_obj(*acl_entry);
if (!acl_entry)
return -ENOMEM;
@@ -633,7 +633,7 @@ dpaa2_switch_cls_flower_replace_mirror(struct dpaa2_switch_filter_block *block,
}
}
- mirror_entry = kzalloc_obj(*mirror_entry, GFP_KERNEL);
+ mirror_entry = kzalloc_obj(*mirror_entry);
if (!mirror_entry)
return -ENOMEM;
@@ -708,7 +708,7 @@ dpaa2_switch_cls_matchall_replace_acl(struct dpaa2_switch_filter_block *block,
return -ENOMEM;
}
- acl_entry = kzalloc_obj(*acl_entry, GFP_KERNEL);
+ acl_entry = kzalloc_obj(*acl_entry);
if (!acl_entry)
return -ENOMEM;
@@ -780,7 +780,7 @@ dpaa2_switch_cls_matchall_replace_mirror(struct dpaa2_switch_filter_block *block
}
}
- mirror_entry = kzalloc_obj(*mirror_entry, GFP_KERNEL);
+ mirror_entry = kzalloc_obj(*mirror_entry);
if (!mirror_entry)
return -ENOMEM;
diff --git a/drivers/net/ethernet/freescale/dpaa2/dpaa2-switch.c b/drivers/net/ethernet/freescale/dpaa2/dpaa2-switch.c
index 2b0cac347fec..b91687c55a65 100644
--- a/drivers/net/ethernet/freescale/dpaa2/dpaa2-switch.c
+++ b/drivers/net/ethernet/freescale/dpaa2/dpaa2-switch.c
@@ -1456,7 +1456,7 @@ static int dpaa2_switch_port_connect_mac(struct ethsw_port_priv *port_priv)
goto out_put_device;
}
- mac = kzalloc_obj(*mac, GFP_KERNEL);
+ mac = kzalloc_obj(*mac);
if (!mac) {
err = -ENOMEM;
goto out_put_device;
@@ -3385,7 +3385,7 @@ static int dpaa2_switch_probe(struct fsl_mc_device *sw_dev)
int i, err;
/* Allocate switch core*/
- ethsw = kzalloc_obj(*ethsw, GFP_KERNEL);
+ ethsw = kzalloc_obj(*ethsw);
if (!ethsw)
return -ENOMEM;
diff --git a/drivers/net/ethernet/freescale/enetc/enetc.c b/drivers/net/ethernet/freescale/enetc/enetc.c
index d6575a446adf..c220dfdbadfe 100644
--- a/drivers/net/ethernet/freescale/enetc/enetc.c
+++ b/drivers/net/ethernet/freescale/enetc/enetc.c
@@ -2268,7 +2268,7 @@ enetc_alloc_tx_resources(struct enetc_ndev_priv *priv)
struct enetc_bdr_resource *tx_res;
int i, err;
- tx_res = kzalloc_objs(*tx_res, priv->num_tx_rings, GFP_KERNEL);
+ tx_res = kzalloc_objs(*tx_res, priv->num_tx_rings);
if (!tx_res)
return ERR_PTR(-ENOMEM);
@@ -2340,7 +2340,7 @@ enetc_alloc_rx_resources(struct enetc_ndev_priv *priv, bool extended)
struct enetc_bdr_resource *rx_res;
int i, err;
- rx_res = kzalloc_objs(*rx_res, priv->num_rx_rings, GFP_KERNEL);
+ rx_res = kzalloc_objs(*rx_res, priv->num_rx_rings);
if (!rx_res)
return ERR_PTR(-ENOMEM);
@@ -2469,7 +2469,7 @@ static int enetc_setup_default_rss_table(struct enetc_si *si, int num_groups)
int *rss_table;
int i;
- rss_table = kmalloc_objs(*rss_table, si->num_rss, GFP_KERNEL);
+ rss_table = kmalloc_objs(*rss_table, si->num_rss);
if (!rss_table)
return -ENOMEM;
diff --git a/drivers/net/ethernet/freescale/enetc/enetc_pf.c b/drivers/net/ethernet/freescale/enetc/enetc_pf.c
index eb3a50a94df7..43b0af59d044 100644
--- a/drivers/net/ethernet/freescale/enetc/enetc_pf.c
+++ b/drivers/net/ethernet/freescale/enetc/enetc_pf.c
@@ -814,7 +814,7 @@ static int enetc_init_port_rss_memory(struct enetc_si *si)
if (!num_rss)
return 0;
- rss_table = kzalloc_objs(*rss_table, num_rss, GFP_KERNEL);
+ rss_table = kzalloc_objs(*rss_table, num_rss);
if (!rss_table)
return -ENOMEM;
diff --git a/drivers/net/ethernet/freescale/enetc/enetc_ptp.c b/drivers/net/ethernet/freescale/enetc/enetc_ptp.c
index dbf35abea7f7..162cbc801730 100644
--- a/drivers/net/ethernet/freescale/enetc/enetc_ptp.c
+++ b/drivers/net/ethernet/freescale/enetc/enetc_ptp.c
@@ -53,7 +53,7 @@ static int enetc_ptp_probe(struct pci_dev *pdev,
pci_set_master(pdev);
- ptp_qoriq = kzalloc_obj(*ptp_qoriq, GFP_KERNEL);
+ ptp_qoriq = kzalloc_obj(*ptp_qoriq);
if (!ptp_qoriq) {
err = -ENOMEM;
goto err_alloc_ptp;
diff --git a/drivers/net/ethernet/freescale/enetc/enetc_qos.c b/drivers/net/ethernet/freescale/enetc/enetc_qos.c
index 6ff65108cc97..7b17bca24f26 100644
--- a/drivers/net/ethernet/freescale/enetc/enetc_qos.c
+++ b/drivers/net/ethernet/freescale/enetc/enetc_qos.c
@@ -1153,7 +1153,7 @@ static int enetc_psfp_parse_clsflower(struct enetc_ndev_priv *priv,
if (!entryg)
return -EINVAL;
- filter = kzalloc_obj(*filter, GFP_KERNEL);
+ filter = kzalloc_obj(*filter);
if (!filter)
return -ENOMEM;
@@ -1266,7 +1266,7 @@ static int enetc_psfp_parse_clsflower(struct enetc_ndev_priv *priv,
filter->sgi_index = sgi->index;
- sfi = kzalloc_obj(*sfi, GFP_KERNEL);
+ sfi = kzalloc_obj(*sfi);
if (!sfi) {
err = -ENOMEM;
goto free_gate;
@@ -1283,7 +1283,7 @@ static int enetc_psfp_parse_clsflower(struct enetc_ndev_priv *priv,
goto free_sfi;
if (entryp->police.burst) {
- fmi = kzalloc_obj(*fmi, GFP_KERNEL);
+ fmi = kzalloc_obj(*fmi);
if (!fmi) {
err = -ENOMEM;
goto free_sfi;
diff --git a/drivers/net/ethernet/freescale/fec_main.c b/drivers/net/ethernet/freescale/fec_main.c
index c43539d4bab0..f89aa94ce020 100644
--- a/drivers/net/ethernet/freescale/fec_main.c
+++ b/drivers/net/ethernet/freescale/fec_main.c
@@ -3952,7 +3952,7 @@ static int fec_enet_alloc_queue(struct net_device *ndev)
struct fec_enet_priv_tx_q *txq;
for (i = 0; i < fep->num_tx_queues; i++) {
- txq = kzalloc_obj(*txq, GFP_KERNEL);
+ txq = kzalloc_obj(*txq);
if (!txq) {
ret = -ENOMEM;
goto alloc_failed;
@@ -3975,7 +3975,7 @@ static int fec_enet_alloc_queue(struct net_device *ndev)
}
for (i = 0; i < fep->num_rx_queues; i++) {
- fep->rx_queue[i] = kzalloc_obj(*fep->rx_queue[i], GFP_KERNEL);
+ fep->rx_queue[i] = kzalloc_obj(*fep->rx_queue[i]);
if (!fep->rx_queue[i]) {
ret = -ENOMEM;
goto alloc_failed;
@@ -4425,7 +4425,7 @@ fec_alloc_new_rxq_xsk(struct fec_enet_private *fep, int queue,
union fec_rx_buffer *buf;
int i;
- rxq = kzalloc_obj(*rxq, GFP_KERNEL);
+ rxq = kzalloc_obj(*rxq);
if (!rxq)
return NULL;
@@ -4466,7 +4466,7 @@ fec_alloc_new_rxq_pp(struct fec_enet_private *fep, int queue)
union fec_rx_buffer *buf;
int i = 0;
- rxq = kzalloc_obj(*rxq, GFP_KERNEL);
+ rxq = kzalloc_obj(*rxq);
if (!rxq)
return NULL;
diff --git a/drivers/net/ethernet/freescale/fec_mpc52xx_phy.c b/drivers/net/ethernet/freescale/fec_mpc52xx_phy.c
index f182480909f1..d48a1c4d0431 100644
--- a/drivers/net/ethernet/freescale/fec_mpc52xx_phy.c
+++ b/drivers/net/ethernet/freescale/fec_mpc52xx_phy.c
@@ -74,7 +74,7 @@ static int mpc52xx_fec_mdio_probe(struct platform_device *of)
bus = mdiobus_alloc();
if (bus == NULL)
return -ENOMEM;
- priv = kzalloc_obj(*priv, GFP_KERNEL);
+ priv = kzalloc_obj(*priv);
if (priv == NULL) {
err = -ENOMEM;
goto out_free;
diff --git a/drivers/net/ethernet/freescale/fman/fman.c b/drivers/net/ethernet/freescale/fman/fman.c
index b8d603fb70dc..013273a2de32 100644
--- a/drivers/net/ethernet/freescale/fman/fman.c
+++ b/drivers/net/ethernet/freescale/fman/fman.c
@@ -1688,12 +1688,12 @@ static int fman_config(struct fman *fman)
base_addr = fman->dts_params.base_addr;
- fman->state = kzalloc_obj(*fman->state, GFP_KERNEL);
+ fman->state = kzalloc_obj(*fman->state);
if (!fman->state)
goto err_fm_state;
/* Allocate the FM driver's parameters structure */
- fman->cfg = kzalloc_obj(*fman->cfg, GFP_KERNEL);
+ fman->cfg = kzalloc_obj(*fman->cfg);
if (!fman->cfg)
goto err_fm_drv;
@@ -2697,7 +2697,7 @@ static struct fman *read_dts_node(struct platform_device *of_dev)
struct clk *clk;
u32 clk_rate;
- fman = kzalloc_obj(*fman, GFP_KERNEL);
+ fman = kzalloc_obj(*fman);
if (!fman)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/net/ethernet/freescale/fman/fman_dtsec.c b/drivers/net/ethernet/freescale/fman/fman_dtsec.c
index 12d739808f16..fe35703c509e 100644
--- a/drivers/net/ethernet/freescale/fman/fman_dtsec.c
+++ b/drivers/net/ethernet/freescale/fman/fman_dtsec.c
@@ -1348,12 +1348,12 @@ static struct fman_mac *dtsec_config(struct mac_device *mac_dev,
struct dtsec_cfg *dtsec_drv_param;
/* allocate memory for the UCC GETH data structure. */
- dtsec = kzalloc_obj(*dtsec, GFP_KERNEL);
+ dtsec = kzalloc_obj(*dtsec);
if (!dtsec)
return NULL;
/* allocate memory for the d_tsec driver parameters data structure. */
- dtsec_drv_param = kzalloc_obj(*dtsec_drv_param, GFP_KERNEL);
+ dtsec_drv_param = kzalloc_obj(*dtsec_drv_param);
if (!dtsec_drv_param)
goto err_dtsec;
diff --git a/drivers/net/ethernet/freescale/fman/fman_keygen.c b/drivers/net/ethernet/freescale/fman/fman_keygen.c
index f4b83b5eb018..74641348d49a 100644
--- a/drivers/net/ethernet/freescale/fman/fman_keygen.c
+++ b/drivers/net/ethernet/freescale/fman/fman_keygen.c
@@ -629,7 +629,7 @@ struct fman_keygen *keygen_init(struct fman_kg_regs __iomem *keygen_regs)
int i;
/* Allocate memory for KeyGen driver */
- keygen = kzalloc_obj(*keygen, GFP_KERNEL);
+ keygen = kzalloc_obj(*keygen);
if (!keygen)
return NULL;
diff --git a/drivers/net/ethernet/freescale/fman/fman_mac.h b/drivers/net/ethernet/freescale/fman/fman_mac.h
index 83d53f33abc2..85444f6f8f9d 100644
--- a/drivers/net/ethernet/freescale/fman/fman_mac.h
+++ b/drivers/net/ethernet/freescale/fman/fman_mac.h
@@ -224,13 +224,13 @@ static inline struct eth_hash_t *alloc_hash_table(u16 size)
struct eth_hash_t *hash;
/* Allocate address hash table */
- hash = kmalloc_obj(*hash, GFP_KERNEL);
+ hash = kmalloc_obj(*hash);
if (!hash)
return NULL;
hash->size = size;
- hash->lsts = kmalloc_objs(struct list_head, hash->size, GFP_KERNEL);
+ hash->lsts = kmalloc_objs(struct list_head, hash->size);
if (!hash->lsts) {
kfree(hash);
return NULL;
diff --git a/drivers/net/ethernet/freescale/fman/fman_memac.c b/drivers/net/ethernet/freescale/fman/fman_memac.c
index f9461bba1a66..e2d8c58deef0 100644
--- a/drivers/net/ethernet/freescale/fman/fman_memac.c
+++ b/drivers/net/ethernet/freescale/fman/fman_memac.c
@@ -1086,12 +1086,12 @@ static struct fman_mac *memac_config(struct mac_device *mac_dev,
struct memac_cfg *memac_drv_param;
/* allocate memory for the m_emac data structure */
- memac = kzalloc_obj(*memac, GFP_KERNEL);
+ memac = kzalloc_obj(*memac);
if (!memac)
return NULL;
/* allocate memory for the m_emac driver parameters data structure */
- memac_drv_param = kzalloc_obj(*memac_drv_param, GFP_KERNEL);
+ memac_drv_param = kzalloc_obj(*memac_drv_param);
if (!memac_drv_param) {
memac_free(memac);
return NULL;
diff --git a/drivers/net/ethernet/freescale/fman/fman_muram.c b/drivers/net/ethernet/freescale/fman/fman_muram.c
index eb85c54c9408..6ac7c2b0cb19 100644
--- a/drivers/net/ethernet/freescale/fman/fman_muram.c
+++ b/drivers/net/ethernet/freescale/fman/fman_muram.c
@@ -40,7 +40,7 @@ struct muram_info *fman_muram_init(phys_addr_t base, size_t size)
void __iomem *vaddr;
int ret;
- muram = kzalloc_obj(*muram, GFP_KERNEL);
+ muram = kzalloc_obj(*muram);
if (!muram)
return NULL;
diff --git a/drivers/net/ethernet/freescale/fman/fman_port.c b/drivers/net/ethernet/freescale/fman/fman_port.c
index a3e8c77dbb57..1b8fef69114e 100644
--- a/drivers/net/ethernet/freescale/fman/fman_port.c
+++ b/drivers/net/ethernet/freescale/fman/fman_port.c
@@ -1297,7 +1297,7 @@ int fman_port_config(struct fman_port *port, struct fman_port_params *params)
int err;
/* Allocate the FM driver's parameters structure */
- port->cfg = kzalloc_obj(*port->cfg, GFP_KERNEL);
+ port->cfg = kzalloc_obj(*port->cfg);
if (!port->cfg)
return -EINVAL;
@@ -1753,7 +1753,7 @@ static int fman_port_probe(struct platform_device *of_dev)
u16 port_speed;
u8 port_id;
- port = kzalloc_obj(*port, GFP_KERNEL);
+ port = kzalloc_obj(*port);
if (!port)
return -ENOMEM;
diff --git a/drivers/net/ethernet/freescale/fman/fman_tgec.c b/drivers/net/ethernet/freescale/fman/fman_tgec.c
index 05edac07ba6c..23db0bc6656c 100644
--- a/drivers/net/ethernet/freescale/fman/fman_tgec.c
+++ b/drivers/net/ethernet/freescale/fman/fman_tgec.c
@@ -711,12 +711,12 @@ static struct fman_mac *tgec_config(struct mac_device *mac_dev,
struct tgec_cfg *cfg;
/* allocate memory for the UCC GETH data structure. */
- tgec = kzalloc_obj(*tgec, GFP_KERNEL);
+ tgec = kzalloc_obj(*tgec);
if (!tgec)
return NULL;
/* allocate memory for the 10G MAC driver parameters data structure. */
- cfg = kzalloc_obj(*cfg, GFP_KERNEL);
+ cfg = kzalloc_obj(*cfg);
if (!cfg) {
tgec_free(tgec);
return NULL;
diff --git a/drivers/net/ethernet/freescale/fs_enet/fs_enet-main.c b/drivers/net/ethernet/freescale/fs_enet/fs_enet-main.c
index 3ba98561f566..2cbcc29408e3 100644
--- a/drivers/net/ethernet/freescale/fs_enet/fs_enet-main.c
+++ b/drivers/net/ethernet/freescale/fs_enet/fs_enet-main.c
@@ -866,7 +866,7 @@ static int fs_enet_probe(struct platform_device *ofdev)
if (!ops)
return -EINVAL;
- fpi = kzalloc_obj(*fpi, GFP_KERNEL);
+ fpi = kzalloc_obj(*fpi);
if (!fpi)
return -ENOMEM;
diff --git a/drivers/net/ethernet/freescale/fs_enet/mii-bitbang.c b/drivers/net/ethernet/freescale/fs_enet/mii-bitbang.c
index 2a27dc0b5653..33a3eef41723 100644
--- a/drivers/net/ethernet/freescale/fs_enet/mii-bitbang.c
+++ b/drivers/net/ethernet/freescale/fs_enet/mii-bitbang.c
@@ -152,7 +152,7 @@ static int fs_enet_mdio_probe(struct platform_device *ofdev)
struct bb_info *bitbang;
int ret = -ENOMEM;
- bitbang = kzalloc_obj(struct bb_info, GFP_KERNEL);
+ bitbang = kzalloc_obj(struct bb_info);
if (!bitbang)
goto out;
diff --git a/drivers/net/ethernet/freescale/fs_enet/mii-fec.c b/drivers/net/ethernet/freescale/fs_enet/mii-fec.c
index 512e897cea08..4774dc49c331 100644
--- a/drivers/net/ethernet/freescale/fs_enet/mii-fec.c
+++ b/drivers/net/ethernet/freescale/fs_enet/mii-fec.c
@@ -108,7 +108,7 @@ static int fs_enet_mdio_probe(struct platform_device *ofdev)
if (!new_bus)
goto out;
- fec = kzalloc_obj(struct fec_info, GFP_KERNEL);
+ fec = kzalloc_obj(struct fec_info);
if (!fec)
goto out_mii;
diff --git a/drivers/net/ethernet/freescale/gianfar.c b/drivers/net/ethernet/freescale/gianfar.c
index a58cd09b4c0d..a363817993ab 100644
--- a/drivers/net/ethernet/freescale/gianfar.c
+++ b/drivers/net/ethernet/freescale/gianfar.c
@@ -507,7 +507,7 @@ static int gfar_parse_group(struct device_node *np,
int i;
for (i = 0; i < GFAR_NUM_IRQS; i++) {
- grp->irqinfo[i] = kzalloc_obj(struct gfar_irqinfo, GFP_KERNEL);
+ grp->irqinfo[i] = kzalloc_obj(struct gfar_irqinfo);
if (!grp->irqinfo[i])
return -ENOMEM;
}
diff --git a/drivers/net/ethernet/freescale/gianfar_ethtool.c b/drivers/net/ethernet/freescale/gianfar_ethtool.c
index 528a0717084c..e8edef6505bf 100644
--- a/drivers/net/ethernet/freescale/gianfar_ethtool.c
+++ b/drivers/net/ethernet/freescale/gianfar_ethtool.c
@@ -1241,7 +1241,7 @@ static int gfar_process_filer_changes(struct gfar_private *priv)
s32 ret = 0;
/* So index is set to zero, too! */
- tab = kzalloc_obj(*tab, GFP_KERNEL);
+ tab = kzalloc_obj(*tab);
if (tab == NULL)
return -ENOMEM;
@@ -1293,7 +1293,7 @@ static int gfar_add_cls(struct gfar_private *priv,
struct ethtool_flow_spec_container *temp, *comp;
int ret = 0;
- temp = kmalloc_obj(*temp, GFP_KERNEL);
+ temp = kmalloc_obj(*temp);
if (temp == NULL)
return -ENOMEM;
memcpy(&temp->fs, flow, sizeof(temp->fs));
diff --git a/drivers/net/ethernet/freescale/ucc_geth.c b/drivers/net/ethernet/freescale/ucc_geth.c
index b1ced6432f26..684094118117 100644
--- a/drivers/net/ethernet/freescale/ucc_geth.c
+++ b/drivers/net/ethernet/freescale/ucc_geth.c
@@ -2677,7 +2677,7 @@ static int ucc_geth_startup(struct ucc_geth_private *ugeth)
* allocated resources can be released when the channel is freed.
*/
if (!(ugeth->p_init_enet_param_shadow =
- kzalloc_obj(struct ucc_geth_init_pram, GFP_KERNEL))) {
+ kzalloc_obj(struct ucc_geth_init_pram))) {
if (netif_msg_ifup(ugeth))
pr_err("Can not allocate memory for p_UccInitEnetParamShadows\n");
return -ENOMEM;
diff --git a/drivers/net/ethernet/fungible/funcore/fun_dev.c b/drivers/net/ethernet/fungible/funcore/fun_dev.c
index 1c1e66068fed..a62ae88800f7 100644
--- a/drivers/net/ethernet/fungible/funcore/fun_dev.c
+++ b/drivers/net/ethernet/fungible/funcore/fun_dev.c
@@ -210,7 +210,7 @@ static int fun_init_cmd_ctx(struct fun_dev *fdev, unsigned int ntags)
{
unsigned int i;
- fdev->cmd_ctx = kvzalloc_objs(*fdev->cmd_ctx, ntags, GFP_KERNEL);
+ fdev->cmd_ctx = kvzalloc_objs(*fdev->cmd_ctx, ntags);
if (!fdev->cmd_ctx)
return -ENOMEM;
diff --git a/drivers/net/ethernet/fungible/funcore/fun_queue.c b/drivers/net/ethernet/fungible/funcore/fun_queue.c
index 200983145606..0eca751a9534 100644
--- a/drivers/net/ethernet/fungible/funcore/fun_queue.c
+++ b/drivers/net/ethernet/fungible/funcore/fun_queue.c
@@ -405,7 +405,7 @@ void fun_free_queue(struct fun_queue *funq)
struct fun_queue *fun_alloc_queue(struct fun_dev *fdev, int qid,
const struct fun_queue_alloc_req *req)
{
- struct fun_queue *funq = kzalloc_obj(*funq, GFP_KERNEL);
+ struct fun_queue *funq = kzalloc_obj(*funq);
if (!funq)
return NULL;
diff --git a/drivers/net/ethernet/fungible/funeth/funeth_main.c b/drivers/net/ethernet/fungible/funeth/funeth_main.c
index 2255f203674a..bad8276d26b0 100644
--- a/drivers/net/ethernet/fungible/funeth/funeth_main.c
+++ b/drivers/net/ethernet/fungible/funeth/funeth_main.c
@@ -424,7 +424,7 @@ static struct funeth_txq **alloc_xdpqs(struct net_device *dev, unsigned int nqs,
unsigned int i;
int err;
- xdpqs = kzalloc_objs(*xdpqs, nqs, GFP_KERNEL);
+ xdpqs = kzalloc_objs(*xdpqs, nqs);
if (!xdpqs)
return ERR_PTR(-ENOMEM);
@@ -486,7 +486,7 @@ static int fun_alloc_rings(struct net_device *netdev, struct fun_qset *qset)
if (err)
return err;
- rxqs = kzalloc_objs(*rxqs, qset->ntxqs + qset->nrxqs, GFP_KERNEL);
+ rxqs = kzalloc_objs(*rxqs, qset->ntxqs + qset->nrxqs);
if (!rxqs)
return -ENOMEM;
@@ -1175,7 +1175,7 @@ static int fun_init_vports(struct fun_ethdev *ed, unsigned int n)
if (ed->num_vports)
return -EINVAL;
- ed->vport_info = kvzalloc_objs(*ed->vport_info, n, GFP_KERNEL);
+ ed->vport_info = kvzalloc_objs(*ed->vport_info, n);
if (!ed->vport_info)
return -ENOMEM;
ed->num_vports = n;
@@ -1833,7 +1833,7 @@ static int fun_create_ports(struct fun_ethdev *ed, unsigned int nports)
return -EINVAL;
}
- ed->netdevs = kzalloc_objs(*ed->netdevs, nports, GFP_KERNEL);
+ ed->netdevs = kzalloc_objs(*ed->netdevs, nports);
if (!ed->netdevs)
return -ENOMEM;
diff --git a/drivers/net/ethernet/google/gve/gve_ethtool.c b/drivers/net/ethernet/google/gve/gve_ethtool.c
index a2b5aeee0831..08f55f437c99 100644
--- a/drivers/net/ethernet/google/gve/gve_ethtool.c
+++ b/drivers/net/ethernet/google/gve/gve_ethtool.c
@@ -185,7 +185,7 @@ gve_get_ethtool_stats(struct net_device *netdev,
if (!gve_rx_was_added_to_block(priv, ring))
num_stopped_rxqs++;
}
- tx_qid_to_stats_idx = kmalloc_objs(int, num_tx_queues, GFP_KERNEL);
+ tx_qid_to_stats_idx = kmalloc_objs(int, num_tx_queues);
if (!tx_qid_to_stats_idx) {
kfree(rx_qid_to_stats_idx);
return;
diff --git a/drivers/net/ethernet/google/gve/gve_flow_rule.c b/drivers/net/ethernet/google/gve/gve_flow_rule.c
index f97b124b1c6a..2c80cda28ef3 100644
--- a/drivers/net/ethernet/google/gve/gve_flow_rule.c
+++ b/drivers/net/ethernet/google/gve/gve_flow_rule.c
@@ -269,7 +269,7 @@ int gve_add_flow_rule(struct gve_priv *priv, struct ethtool_rxnfc *cmd)
if (!priv->max_flow_rules)
return -EOPNOTSUPP;
- rule = kvzalloc_obj(*rule, GFP_KERNEL);
+ rule = kvzalloc_obj(*rule);
if (!rule)
return -ENOMEM;
diff --git a/drivers/net/ethernet/google/gve/gve_main.c b/drivers/net/ethernet/google/gve/gve_main.c
index 75c4748f9de2..4eebbeb29bee 100644
--- a/drivers/net/ethernet/google/gve/gve_main.c
+++ b/drivers/net/ethernet/google/gve/gve_main.c
@@ -1090,17 +1090,17 @@ struct gve_queue_page_list *gve_alloc_queue_page_list(struct gve_priv *priv,
int err;
int i;
- qpl = kvzalloc_obj(*qpl, GFP_KERNEL);
+ qpl = kvzalloc_obj(*qpl);
if (!qpl)
return NULL;
qpl->id = id;
qpl->num_entries = 0;
- qpl->pages = kvzalloc_objs(*qpl->pages, pages, GFP_KERNEL);
+ qpl->pages = kvzalloc_objs(*qpl->pages, pages);
if (!qpl->pages)
goto abort;
- qpl->page_buses = kvzalloc_objs(*qpl->page_buses, pages, GFP_KERNEL);
+ qpl->page_buses = kvzalloc_objs(*qpl->page_buses, pages);
if (!qpl->page_buses)
goto abort;
diff --git a/drivers/net/ethernet/google/gve/gve_ptp.c b/drivers/net/ethernet/google/gve/gve_ptp.c
index eb836ebcbd60..06b1cf4a5efc 100644
--- a/drivers/net/ethernet/google/gve/gve_ptp.c
+++ b/drivers/net/ethernet/google/gve/gve_ptp.c
@@ -70,7 +70,7 @@ static int gve_ptp_init(struct gve_priv *priv)
struct gve_ptp *ptp;
int err;
- priv->ptp = kzalloc_obj(*priv->ptp, GFP_KERNEL);
+ priv->ptp = kzalloc_obj(*priv->ptp);
if (!priv->ptp)
return -ENOMEM;
diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_debugfs.c b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_debugfs.c
index 5a7ce1eea30c..3dab3a271aa6 100644
--- a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_debugfs.c
+++ b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_debugfs.c
@@ -800,7 +800,7 @@ hclge_dbg_dump_reg_tqp(struct hclge_dev *hdev,
if (ret)
return ret;
- desc_src = kzalloc_objs(struct hclge_desc, bd_num, GFP_KERNEL);
+ desc_src = kzalloc_objs(struct hclge_desc, bd_num);
if (!desc_src)
return -ENOMEM;
@@ -852,7 +852,7 @@ hclge_dbg_dump_reg_common(struct hclge_dev *hdev,
if (ret)
return ret;
- desc_src = kzalloc_objs(struct hclge_desc, bd_num, GFP_KERNEL);
+ desc_src = kzalloc_objs(struct hclge_desc, bd_num);
if (!desc_src)
return -ENOMEM;
@@ -2278,7 +2278,7 @@ static int hclge_dbg_get_imp_stats_info(struct seq_file *s, void *data)
return -EINVAL;
}
- desc_src = kzalloc_objs(struct hclge_desc, bd_num, GFP_KERNEL);
+ desc_src = kzalloc_objs(struct hclge_desc, bd_num);
if (!desc_src)
return -ENOMEM;
diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_err.c b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_err.c
index 02d21c5e8e0e..dac051e798da 100644
--- a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_err.c
+++ b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_err.c
@@ -2481,7 +2481,7 @@ static int hclge_handle_all_ras_errors(struct hclge_dev *hdev)
return ret;
bd_num = max_t(u32, mpf_bd_num, pf_bd_num);
- desc = kzalloc_objs(struct hclge_desc, bd_num, GFP_KERNEL);
+ desc = kzalloc_objs(struct hclge_desc, bd_num);
if (!desc)
return -ENOMEM;
@@ -3038,7 +3038,7 @@ static int hclge_handle_all_hw_msix_error(struct hclge_dev *hdev,
goto out;
bd_num = max_t(u32, mpf_bd_num, pf_bd_num);
- desc = kzalloc_objs(struct hclge_desc, bd_num, GFP_KERNEL);
+ desc = kzalloc_objs(struct hclge_desc, bd_num);
if (!desc)
return -ENOMEM;
@@ -3127,7 +3127,7 @@ void hclge_handle_all_hns_hw_errors(struct hnae3_ae_dev *ae_dev)
return;
bd_num = max_t(u32, mpf_bd_num, pf_bd_num);
- desc = kzalloc_objs(struct hclge_desc, bd_num, GFP_KERNEL);
+ desc = kzalloc_objs(struct hclge_desc, bd_num);
if (!desc)
return;
diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c
index 80aa566ad31f..dd4045c773d4 100644
--- a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c
+++ b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c
@@ -2418,7 +2418,7 @@ int hclge_buffer_alloc(struct hclge_dev *hdev)
struct hclge_pkt_buf_alloc *pkt_buf;
int ret;
- pkt_buf = kzalloc_obj(*pkt_buf, GFP_KERNEL);
+ pkt_buf = kzalloc_obj(*pkt_buf);
if (!pkt_buf)
return -ENOMEM;
@@ -6582,7 +6582,7 @@ static int hclge_add_fd_entry(struct hnae3_handle *handle,
if (ret)
return ret;
- rule = kzalloc_obj(*rule, GFP_KERNEL);
+ rule = kzalloc_obj(*rule);
if (!rule)
return -ENOMEM;
@@ -7410,7 +7410,7 @@ static int hclge_add_cls_flower(struct hnae3_handle *handle,
return ret;
}
- rule = kzalloc_obj(*rule, GFP_KERNEL);
+ rule = kzalloc_obj(*rule);
if (!rule)
return -ENOMEM;
@@ -10093,7 +10093,7 @@ static void hclge_add_vport_vlan_table(struct hclge_vport *vport, u16 vlan_id,
}
}
- vlan = kzalloc_obj(*vlan, GFP_KERNEL);
+ vlan = kzalloc_obj(*vlan);
if (!vlan) {
mutex_unlock(&hdev->vport_lock);
return;
diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_mbx.c b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_mbx.c
index 7801c39df38d..30e38cb4843a 100644
--- a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_mbx.c
+++ b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_mbx.c
@@ -212,7 +212,7 @@ static int hclge_get_ring_chain_from_mbx(
cur_chain = ring_chain;
for (i = 1; i < ring_num; i++) {
- new_chain = kzalloc_obj(*new_chain, GFP_KERNEL);
+ new_chain = kzalloc_obj(*new_chain);
if (!new_chain)
goto err;
diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_regs.c b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_regs.c
index 3bd3195d789e..85bac9b27b98 100644
--- a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_regs.c
+++ b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_regs.c
@@ -190,7 +190,7 @@ static int hclge_get_32_bit_regs(struct hclge_dev *hdev, u32 regs_num,
nodata_num = HCLGE_32_BIT_DESC_NODATA_LEN;
cmd_num = DIV_ROUND_UP(regs_num + nodata_num,
HCLGE_32_BIT_REG_RTN_DATANUM);
- desc = kzalloc_objs(struct hclge_desc, cmd_num, GFP_KERNEL);
+ desc = kzalloc_objs(struct hclge_desc, cmd_num);
if (!desc)
return -ENOMEM;
@@ -244,7 +244,7 @@ static int hclge_get_64_bit_regs(struct hclge_dev *hdev, u32 regs_num,
nodata_len = HCLGE_64_BIT_DESC_NODATA_LEN;
cmd_num = DIV_ROUND_UP(regs_num + nodata_len,
HCLGE_64_BIT_REG_RTN_DATANUM);
- desc = kzalloc_objs(struct hclge_desc, cmd_num, GFP_KERNEL);
+ desc = kzalloc_objs(struct hclge_desc, cmd_num);
if (!desc)
return -ENOMEM;
@@ -394,7 +394,7 @@ static int hclge_get_dfx_reg_len(struct hclge_dev *hdev, int *len)
int ret;
u32 i;
- bd_num_list = kzalloc_objs(int, dfx_reg_type_num, GFP_KERNEL);
+ bd_num_list = kzalloc_objs(int, dfx_reg_type_num);
if (!bd_num_list)
return -ENOMEM;
@@ -455,7 +455,7 @@ static int hclge_get_dfx_reg(struct hclge_dev *hdev, void *data)
int ret;
u32 i;
- bd_num_list = kzalloc_objs(int, dfx_reg_type_num, GFP_KERNEL);
+ bd_num_list = kzalloc_objs(int, dfx_reg_type_num);
if (!bd_num_list)
return -ENOMEM;
diff --git a/drivers/net/ethernet/huawei/hinic/hinic_debugfs.c b/drivers/net/ethernet/huawei/hinic/hinic_debugfs.c
index 39ceba2820bf..bd23c4888a0f 100644
--- a/drivers/net/ethernet/huawei/hinic/hinic_debugfs.c
+++ b/drivers/net/ethernet/huawei/hinic/hinic_debugfs.c
@@ -88,7 +88,7 @@ static int hinic_dbg_get_func_table(struct hinic_dev *nic_dev, int idx)
int ret = ~0;
int err;
- read_data = kzalloc_obj(*read_data, GFP_KERNEL);
+ read_data = kzalloc_obj(*read_data);
if (!read_data)
return ~0;
@@ -182,7 +182,7 @@ static int create_dbg_files(struct hinic_dev *dev, enum hinic_dbg_type type, voi
struct hinic_debug_priv *tmp;
int i;
- tmp = kzalloc_obj(*tmp, GFP_KERNEL);
+ tmp = kzalloc_obj(*tmp);
if (!tmp)
return -ENOMEM;
diff --git a/drivers/net/ethernet/huawei/hinic/hinic_devlink.c b/drivers/net/ethernet/huawei/hinic/hinic_devlink.c
index f4d34fdbc014..c977c43e5d5a 100644
--- a/drivers/net/ethernet/huawei/hinic/hinic_devlink.c
+++ b/drivers/net/ethernet/huawei/hinic/hinic_devlink.c
@@ -130,7 +130,7 @@ static int hinic_flash_fw(struct hinic_devlink_priv *priv, const u8 *data,
int total_len_flag = 0;
int err;
- fw_update_msg = kzalloc_obj(*fw_update_msg, GFP_KERNEL);
+ fw_update_msg = kzalloc_obj(*fw_update_msg);
if (!fw_update_msg)
return -ENOMEM;
diff --git a/drivers/net/ethernet/huawei/hinic/hinic_ethtool.c b/drivers/net/ethernet/huawei/hinic/hinic_ethtool.c
index d4787347d0c5..a8b129ce1b7e 100644
--- a/drivers/net/ethernet/huawei/hinic/hinic_ethtool.c
+++ b/drivers/net/ethernet/huawei/hinic/hinic_ethtool.c
@@ -1392,7 +1392,7 @@ static void hinic_get_ethtool_stats(struct net_device *netdev,
sizeof(u64)) ? *(u64 *)p : *(u32 *)p;
}
- port_stats = kzalloc_obj(*port_stats, GFP_KERNEL);
+ port_stats = kzalloc_obj(*port_stats);
if (!port_stats) {
memset(&data[i], 0,
ARRAY_SIZE(hinic_port_stats) * sizeof(*data));
diff --git a/drivers/net/ethernet/huawei/hinic/hinic_hw_mbox.c b/drivers/net/ethernet/huawei/hinic/hinic_hw_mbox.c
index f8aef328f8c0..2784127327e6 100644
--- a/drivers/net/ethernet/huawei/hinic/hinic_hw_mbox.c
+++ b/drivers/net/ethernet/huawei/hinic/hinic_hw_mbox.c
@@ -487,7 +487,7 @@ static void recv_mbox_handler(struct hinic_mbox_func_to_func *func_to_func,
if (!rcv_mbox_temp->buf_out)
goto err_alloc_rcv_mbox_buf;
- mbox_work = kzalloc_obj(*mbox_work, GFP_KERNEL);
+ mbox_work = kzalloc_obj(*mbox_work);
if (!mbox_work)
goto err_alloc_mbox_work;
@@ -603,7 +603,7 @@ static bool check_vf_mbox_random_id(struct hinic_mbox_func_to_func *func_to_func
"The mailbox random id(0x%x) of func_id(0x%x) doesn't match with pf reservation(0x%x)\n",
random_id, src, func_to_func->vf_mbx_rand_id[src]);
- mbox_work = kzalloc_obj(*mbox_work, GFP_KERNEL);
+ mbox_work = kzalloc_obj(*mbox_work);
if (!mbox_work)
return false;
@@ -1402,7 +1402,7 @@ int hinic_func_to_func_init(struct hinic_hwdev *hwdev)
int err;
pfhwdev = container_of(hwdev, struct hinic_pfhwdev, hwdev);
- func_to_func = kzalloc_obj(*func_to_func, GFP_KERNEL);
+ func_to_func = kzalloc_obj(*func_to_func);
if (!func_to_func)
return -ENOMEM;
diff --git a/drivers/net/ethernet/huawei/hinic/hinic_hw_mgmt.c b/drivers/net/ethernet/huawei/hinic/hinic_hw_mgmt.c
index 8bda0a26a345..1a59fcc482d8 100644
--- a/drivers/net/ethernet/huawei/hinic/hinic_hw_mgmt.c
+++ b/drivers/net/ethernet/huawei/hinic/hinic_hw_mgmt.c
@@ -441,7 +441,7 @@ static void mgmt_recv_msg_handler(struct hinic_pf_to_mgmt *pf_to_mgmt,
{
struct hinic_mgmt_msg_handle_work *mgmt_work = NULL;
- mgmt_work = kzalloc_obj(*mgmt_work, GFP_KERNEL);
+ mgmt_work = kzalloc_obj(*mgmt_work);
if (!mgmt_work)
return;
diff --git a/drivers/net/ethernet/huawei/hinic/hinic_port.c b/drivers/net/ethernet/huawei/hinic/hinic_port.c
index 868e666cc392..7bb6eb2a8917 100644
--- a/drivers/net/ethernet/huawei/hinic/hinic_port.c
+++ b/drivers/net/ethernet/huawei/hinic/hinic_port.c
@@ -1032,7 +1032,7 @@ int hinic_get_phy_port_stats(struct hinic_dev *nic_dev,
struct pci_dev *pdev = hwif->pdev;
int err;
- port_stats = kzalloc_obj(*port_stats, GFP_KERNEL);
+ port_stats = kzalloc_obj(*port_stats);
if (!port_stats)
return -ENOMEM;
diff --git a/drivers/net/ethernet/huawei/hinic3/hinic3_cmdq.c b/drivers/net/ethernet/huawei/hinic3/hinic3_cmdq.c
index ab38da085ae5..11b16799103d 100644
--- a/drivers/net/ethernet/huawei/hinic3/hinic3_cmdq.c
+++ b/drivers/net/ethernet/huawei/hinic3/hinic3_cmdq.c
@@ -738,7 +738,7 @@ static int init_cmdqs(struct hinic3_hwdev *hwdev)
{
struct hinic3_cmdqs *cmdqs;
- cmdqs = kzalloc_obj(*cmdqs, GFP_KERNEL);
+ cmdqs = kzalloc_obj(*cmdqs);
if (!cmdqs)
return -ENOMEM;
diff --git a/drivers/net/ethernet/huawei/hinic3/hinic3_eqs.c b/drivers/net/ethernet/huawei/hinic3/hinic3_eqs.c
index 78f50dc6513a..13a0c6b07660 100644
--- a/drivers/net/ethernet/huawei/hinic3/hinic3_eqs.c
+++ b/drivers/net/ethernet/huawei/hinic3/hinic3_eqs.c
@@ -648,7 +648,7 @@ int hinic3_aeqs_init(struct hinic3_hwdev *hwdev, u16 num_aeqs,
u16 q_id;
int err;
- aeqs = kzalloc_obj(*aeqs, GFP_KERNEL);
+ aeqs = kzalloc_obj(*aeqs);
if (!aeqs)
return -ENOMEM;
@@ -720,7 +720,7 @@ int hinic3_ceqs_init(struct hinic3_hwdev *hwdev, u16 num_ceqs,
u16 q_id;
int err;
- ceqs = kzalloc_obj(*ceqs, GFP_KERNEL);
+ ceqs = kzalloc_obj(*ceqs);
if (!ceqs)
return -ENOMEM;
diff --git a/drivers/net/ethernet/huawei/hinic3/hinic3_hw_cfg.c b/drivers/net/ethernet/huawei/hinic3/hinic3_hw_cfg.c
index c65dec383535..ca60cf4b6282 100644
--- a/drivers/net/ethernet/huawei/hinic3/hinic3_hw_cfg.c
+++ b/drivers/net/ethernet/huawei/hinic3/hinic3_hw_cfg.c
@@ -86,7 +86,7 @@ static int hinic3_init_irq_info(struct hinic3_hwdev *hwdev)
}
irq_info = &cfg_mgmt->irq_info;
- irq_info->irq = kzalloc_objs(struct hinic3_irq, intr_num, GFP_KERNEL);
+ irq_info->irq = kzalloc_objs(struct hinic3_irq, intr_num);
if (!irq_info->irq)
return -ENOMEM;
@@ -129,7 +129,7 @@ int hinic3_init_cfg_mgmt(struct hinic3_hwdev *hwdev)
struct hinic3_cfg_mgmt_info *cfg_mgmt;
int err;
- cfg_mgmt = kzalloc_obj(*cfg_mgmt, GFP_KERNEL);
+ cfg_mgmt = kzalloc_obj(*cfg_mgmt);
if (!cfg_mgmt)
return -ENOMEM;
diff --git a/drivers/net/ethernet/huawei/hinic3/hinic3_hwdev.c b/drivers/net/ethernet/huawei/hinic3/hinic3_hwdev.c
index f0b402b792b9..0074d0c6dbaf 100644
--- a/drivers/net/ethernet/huawei/hinic3/hinic3_hwdev.c
+++ b/drivers/net/ethernet/huawei/hinic3/hinic3_hwdev.c
@@ -528,7 +528,7 @@ int hinic3_init_hwdev(struct pci_dev *pdev)
struct hinic3_hwdev *hwdev;
int err;
- hwdev = kzalloc_obj(*hwdev, GFP_KERNEL);
+ hwdev = kzalloc_obj(*hwdev);
if (!hwdev)
return -ENOMEM;
diff --git a/drivers/net/ethernet/huawei/hinic3/hinic3_hwif.c b/drivers/net/ethernet/huawei/hinic3/hinic3_hwif.c
index c1eeedbe0c15..771883174b3b 100644
--- a/drivers/net/ethernet/huawei/hinic3/hinic3_hwif.c
+++ b/drivers/net/ethernet/huawei/hinic3/hinic3_hwif.c
@@ -432,7 +432,7 @@ int hinic3_init_hwif(struct hinic3_hwdev *hwdev)
u32 attr1, attr4, attr5;
int err;
- hwif = kzalloc_obj(*hwif, GFP_KERNEL);
+ hwif = kzalloc_obj(*hwif);
if (!hwif)
return -ENOMEM;
diff --git a/drivers/net/ethernet/huawei/hinic3/hinic3_lld.c b/drivers/net/ethernet/huawei/hinic3/hinic3_lld.c
index b5d026c95d39..a8b89eeed753 100644
--- a/drivers/net/ethernet/huawei/hinic3/hinic3_lld.c
+++ b/drivers/net/ethernet/huawei/hinic3/hinic3_lld.c
@@ -60,7 +60,7 @@ static struct hinic3_adev *hinic3_add_one_adev(struct hinic3_hwdev *hwdev,
const char *svc_name;
int ret;
- hadev = kzalloc_obj(*hadev, GFP_KERNEL);
+ hadev = kzalloc_obj(*hadev);
if (!hadev)
return NULL;
@@ -250,7 +250,7 @@ static int hinic3_pci_init(struct pci_dev *pdev)
struct hinic3_pcidev *pci_adapter;
int err;
- pci_adapter = kzalloc_obj(*pci_adapter, GFP_KERNEL);
+ pci_adapter = kzalloc_obj(*pci_adapter);
if (!pci_adapter)
return -ENOMEM;
diff --git a/drivers/net/ethernet/huawei/hinic3/hinic3_mbox.c b/drivers/net/ethernet/huawei/hinic3/hinic3_mbox.c
index 8c7bb38cc57d..826fa8879a11 100644
--- a/drivers/net/ethernet/huawei/hinic3/hinic3_mbox.c
+++ b/drivers/net/ethernet/huawei/hinic3/hinic3_mbox.c
@@ -320,7 +320,7 @@ static int hinic3_init_func_mbox_msg_channel(struct hinic3_hwdev *hwdev)
int err;
mbox = hwdev->mbox;
- mbox->func_msg = kzalloc_obj(*mbox->func_msg, GFP_KERNEL);
+ mbox->func_msg = kzalloc_obj(*mbox->func_msg);
if (!mbox->func_msg)
return -ENOMEM;
@@ -412,7 +412,7 @@ int hinic3_init_mbox(struct hinic3_hwdev *hwdev)
struct hinic3_mbox *mbox;
int err;
- mbox = kzalloc_obj(*mbox, GFP_KERNEL);
+ mbox = kzalloc_obj(*mbox);
if (!mbox)
return -ENOMEM;
diff --git a/drivers/net/ethernet/huawei/hinic3/hinic3_mgmt.c b/drivers/net/ethernet/huawei/hinic3/hinic3_mgmt.c
index 29422ac14bb8..71c6a064d054 100644
--- a/drivers/net/ethernet/huawei/hinic3/hinic3_mgmt.c
+++ b/drivers/net/ethernet/huawei/hinic3/hinic3_mgmt.c
@@ -120,7 +120,7 @@ static void hinic3_init_mgmt_msg_work(struct hinic3_msg_pf_to_mgmt *pf_to_mgmt,
{
struct mgmt_msg_handle_work *mgmt_work;
- mgmt_work = kmalloc_obj(*mgmt_work, GFP_KERNEL);
+ mgmt_work = kmalloc_obj(*mgmt_work);
if (!mgmt_work)
return;
@@ -252,7 +252,7 @@ int hinic3_pf_to_mgmt_init(struct hinic3_hwdev *hwdev)
struct hinic3_msg_pf_to_mgmt *pf_to_mgmt;
int err;
- pf_to_mgmt = kzalloc_obj(*pf_to_mgmt, GFP_KERNEL);
+ pf_to_mgmt = kzalloc_obj(*pf_to_mgmt);
if (!pf_to_mgmt)
return -ENOMEM;
diff --git a/drivers/net/ethernet/huawei/hinic3/hinic3_nic_io.c b/drivers/net/ethernet/huawei/hinic3/hinic3_nic_io.c
index 0ded1000b369..87e736adba02 100644
--- a/drivers/net/ethernet/huawei/hinic3/hinic3_nic_io.c
+++ b/drivers/net/ethernet/huawei/hinic3/hinic3_nic_io.c
@@ -212,7 +212,7 @@ int hinic3_init_nic_io(struct hinic3_nic_dev *nic_dev)
struct hinic3_nic_io *nic_io;
int err;
- nic_io = kzalloc_obj(*nic_io, GFP_KERNEL);
+ nic_io = kzalloc_obj(*nic_io);
if (!nic_io)
return -ENOMEM;
@@ -408,13 +408,13 @@ int hinic3_alloc_qps(struct hinic3_nic_dev *nic_dev,
if (qp_params->num_qps > nic_io->max_qps || !qp_params->num_qps)
return -EINVAL;
- sqs = kzalloc_objs(*sqs, qp_params->num_qps, GFP_KERNEL);
+ sqs = kzalloc_objs(*sqs, qp_params->num_qps);
if (!sqs) {
err = -ENOMEM;
goto err_out;
}
- rqs = kzalloc_objs(*rqs, qp_params->num_qps, GFP_KERNEL);
+ rqs = kzalloc_objs(*rqs, qp_params->num_qps);
if (!rqs) {
err = -ENOMEM;
goto err_free_sqs;
diff --git a/drivers/net/ethernet/huawei/hinic3/hinic3_rx.c b/drivers/net/ethernet/huawei/hinic3/hinic3_rx.c
index f2d43beab444..fa3e6b3488fd 100644
--- a/drivers/net/ethernet/huawei/hinic3/hinic3_rx.c
+++ b/drivers/net/ethernet/huawei/hinic3/hinic3_rx.c
@@ -66,7 +66,7 @@ int hinic3_alloc_rxqs(struct net_device *netdev)
struct hinic3_rxq *rxq;
u16 q_id;
- nic_dev->rxqs = kzalloc_objs(*nic_dev->rxqs, num_rxqs, GFP_KERNEL);
+ nic_dev->rxqs = kzalloc_objs(*nic_dev->rxqs, num_rxqs);
if (!nic_dev->rxqs)
return -ENOMEM;
diff --git a/drivers/net/ethernet/huawei/hinic3/hinic3_tx.c b/drivers/net/ethernet/huawei/hinic3/hinic3_tx.c
index 8c988df8963e..3bef50ca4432 100644
--- a/drivers/net/ethernet/huawei/hinic3/hinic3_tx.c
+++ b/drivers/net/ethernet/huawei/hinic3/hinic3_tx.c
@@ -48,7 +48,7 @@ int hinic3_alloc_txqs(struct net_device *netdev)
struct pci_dev *pdev = nic_dev->pdev;
struct hinic3_txq *txq;
- nic_dev->txqs = kzalloc_objs(*nic_dev->txqs, num_txqs, GFP_KERNEL);
+ nic_dev->txqs = kzalloc_objs(*nic_dev->txqs, num_txqs);
if (!nic_dev->txqs)
return -ENOMEM;
diff --git a/drivers/net/ethernet/ibm/ehea/ehea_main.c b/drivers/net/ethernet/ibm/ehea/ehea_main.c
index a2d7f5468590..ff67c4fd66a3 100644
--- a/drivers/net/ethernet/ibm/ehea/ehea_main.c
+++ b/drivers/net/ethernet/ibm/ehea/ehea_main.c
@@ -173,7 +173,7 @@ static void ehea_update_firmware_handles(void)
num_portres * EHEA_NUM_PORTRES_FW_HANDLES;
if (num_fw_handles) {
- arr = kzalloc_objs(*arr, num_fw_handles, GFP_KERNEL);
+ arr = kzalloc_objs(*arr, num_fw_handles);
if (!arr)
goto out; /* Keep the existing array */
} else
@@ -1487,7 +1487,7 @@ static int ehea_init_port_res(struct ehea_port *port, struct ehea_port_res *pr,
pr->send_cq->attr.act_nr_of_cqes,
pr->recv_cq->attr.act_nr_of_cqes);
- init_attr = kzalloc_obj(*init_attr, GFP_KERNEL);
+ init_attr = kzalloc_obj(*init_attr);
if (!init_attr) {
ret = -ENOMEM;
pr_err("no mem for ehea_qp_init_attr\n");
@@ -2968,7 +2968,7 @@ static struct ehea_port *ehea_setup_single_port(struct ehea_adapter *adapter,
port->msg_enable = netif_msg_init(msg_level, EHEA_MSG_DEFAULT);
- port->mc_list = kzalloc_obj(struct ehea_mc_list, GFP_KERNEL);
+ port->mc_list = kzalloc_obj(struct ehea_mc_list);
if (!port->mc_list) {
ret = -ENOMEM;
goto out_free_ethdev;
diff --git a/drivers/net/ethernet/ibm/ehea/ehea_qmr.c b/drivers/net/ethernet/ibm/ehea/ehea_qmr.c
index e9d51e65efe8..60629a0032b2 100644
--- a/drivers/net/ethernet/ibm/ehea/ehea_qmr.c
+++ b/drivers/net/ethernet/ibm/ehea/ehea_qmr.c
@@ -114,7 +114,7 @@ struct ehea_cq *ehea_create_cq(struct ehea_adapter *adapter,
int ret;
void *vpage;
- cq = kzalloc_obj(*cq, GFP_KERNEL);
+ cq = kzalloc_obj(*cq);
if (!cq)
goto out_nomem;
@@ -235,7 +235,7 @@ struct ehea_eq *ehea_create_eq(struct ehea_adapter *adapter,
void *vpage;
struct ehea_eq *eq;
- eq = kzalloc_obj(*eq, GFP_KERNEL);
+ eq = kzalloc_obj(*eq);
if (!eq)
return NULL;
@@ -404,7 +404,7 @@ struct ehea_qp *ehea_create_qp(struct ehea_adapter *adapter,
u32 wqe_size_in_bytes_rq2, wqe_size_in_bytes_rq3;
- qp = kzalloc_obj(*qp, GFP_KERNEL);
+ qp = kzalloc_obj(*qp);
if (!qp)
return NULL;
@@ -542,7 +542,7 @@ static inline int ehea_init_top_bmap(struct ehea_top_bmap *ehea_top_bmap,
{
if (!ehea_top_bmap->dir[dir]) {
ehea_top_bmap->dir[dir] =
- kzalloc_obj(struct ehea_dir_bmap, GFP_KERNEL);
+ kzalloc_obj(struct ehea_dir_bmap);
if (!ehea_top_bmap->dir[dir])
return -ENOMEM;
}
@@ -553,7 +553,7 @@ static inline int ehea_init_bmap(struct ehea_bmap *ehea_bmap, int top, int dir)
{
if (!ehea_bmap->top[top]) {
ehea_bmap->top[top] =
- kzalloc_obj(struct ehea_top_bmap, GFP_KERNEL);
+ kzalloc_obj(struct ehea_top_bmap);
if (!ehea_bmap->top[top])
return -ENOMEM;
}
@@ -613,7 +613,7 @@ static int ehea_update_busmap(unsigned long pfn, unsigned long nr_pages, int add
return 0;
if (!ehea_bmap) {
- ehea_bmap = kzalloc_obj(struct ehea_bmap, GFP_KERNEL);
+ ehea_bmap = kzalloc_obj(struct ehea_bmap);
if (!ehea_bmap)
return -ENOMEM;
}
diff --git a/drivers/net/ethernet/ibm/ibmveth.c b/drivers/net/ethernet/ibm/ibmveth.c
index 3108bf50576f..4d6b9e83e341 100644
--- a/drivers/net/ethernet/ibm/ibmveth.c
+++ b/drivers/net/ethernet/ibm/ibmveth.c
@@ -169,7 +169,7 @@ static int ibmveth_alloc_buffer_pool(struct ibmveth_buff_pool *pool)
if (!pool->free_map)
return -1;
- pool->dma_addr = kzalloc_objs(dma_addr_t, pool->size, GFP_KERNEL);
+ pool->dma_addr = kzalloc_objs(dma_addr_t, pool->size);
if (!pool->dma_addr) {
kfree(pool->free_map);
pool->free_map = NULL;
diff --git a/drivers/net/ethernet/ibm/ibmvnic.c b/drivers/net/ethernet/ibm/ibmvnic.c
index 1241be315d58..2aeea250a49b 100644
--- a/drivers/net/ethernet/ibm/ibmvnic.c
+++ b/drivers/net/ethernet/ibm/ibmvnic.c
@@ -1117,7 +1117,7 @@ static int init_rx_pools(struct net_device *netdev)
rx_pool->index = i;
rx_pool->buff_size = ALIGN(buff_size, L1_CACHE_BYTES);
- rx_pool->free_map = kzalloc_objs(int, rx_pool->size, GFP_KERNEL);
+ rx_pool->free_map = kzalloc_objs(int, rx_pool->size);
if (!rx_pool->free_map) {
dev_err(dev, "Couldn't alloc free_map %d\n", i);
rc = -ENOMEM;
@@ -1243,7 +1243,7 @@ static int init_one_tx_pool(struct net_device *netdev,
if (!tx_pool->tx_buff)
return -ENOMEM;
- tx_pool->free_map = kzalloc_objs(int, pool_size, GFP_KERNEL);
+ tx_pool->free_map = kzalloc_objs(int, pool_size);
if (!tx_pool->free_map) {
kfree(tx_pool->tx_buff);
tx_pool->tx_buff = NULL;
@@ -1853,7 +1853,7 @@ static int init_resources(struct ibmvnic_adapter *adapter)
if (rc)
return rc;
- adapter->vpd = kzalloc_obj(*adapter->vpd, GFP_KERNEL);
+ adapter->vpd = kzalloc_obj(*adapter->vpd);
if (!adapter->vpd)
return -ENOMEM;
@@ -4049,7 +4049,7 @@ static struct ibmvnic_sub_crq_queue *init_sub_crq_queue(struct ibmvnic_adapter
struct ibmvnic_sub_crq_queue *scrq;
int rc;
- scrq = kzalloc_obj(*scrq, GFP_KERNEL);
+ scrq = kzalloc_obj(*scrq);
if (!scrq)
return NULL;
@@ -4441,7 +4441,7 @@ static int init_sub_crqs(struct ibmvnic_adapter *adapter)
total_queues = adapter->req_tx_queues + adapter->req_rx_queues;
- allqueues = kzalloc_objs(*allqueues, total_queues, GFP_KERNEL);
+ allqueues = kzalloc_objs(*allqueues, total_queues);
if (!allqueues)
return -ENOMEM;
diff --git a/drivers/net/ethernet/intel/e100.c b/drivers/net/ethernet/intel/e100.c
index 321a15a220a6..9074b558de35 100644
--- a/drivers/net/ethernet/intel/e100.c
+++ b/drivers/net/ethernet/intel/e100.c
@@ -2156,7 +2156,7 @@ static int e100_rx_alloc_list(struct nic *nic)
nic->rx_to_use = nic->rx_to_clean = NULL;
nic->ru_running = RU_UNINITIALIZED;
- if (!(nic->rxs = kzalloc_objs(struct rx, count, GFP_KERNEL)))
+ if (!(nic->rxs = kzalloc_objs(struct rx, count)))
return -ENOMEM;
for (rx = nic->rxs, i = 0; i < count; rx++, i++) {
diff --git a/drivers/net/ethernet/intel/i40e/i40e_client.c b/drivers/net/ethernet/intel/i40e/i40e_client.c
index dacebf773adf..906b8c01f8bc 100644
--- a/drivers/net/ethernet/intel/i40e/i40e_client.c
+++ b/drivers/net/ethernet/intel/i40e/i40e_client.c
@@ -291,7 +291,7 @@ static int i40e_register_auxiliary_dev(struct i40e_info *ldev, const char *name)
struct auxiliary_device *aux_dev;
int ret;
- i40e_aux_dev = kzalloc_obj(*i40e_aux_dev, GFP_KERNEL);
+ i40e_aux_dev = kzalloc_obj(*i40e_aux_dev);
if (!i40e_aux_dev)
return -ENOMEM;
@@ -337,7 +337,7 @@ static void i40e_client_add_instance(struct i40e_pf *pf)
struct i40e_client_instance *cdev = NULL;
struct netdev_hw_addr *mac = NULL;
- cdev = kzalloc_obj(*cdev, GFP_KERNEL);
+ cdev = kzalloc_obj(*cdev);
if (!cdev)
return;
@@ -466,7 +466,7 @@ int i40e_lan_add_device(struct i40e_pf *pf)
goto out;
}
}
- ldev = kzalloc_obj(*ldev, GFP_KERNEL);
+ ldev = kzalloc_obj(*ldev);
if (!ldev) {
ret = -ENOMEM;
goto out;
diff --git a/drivers/net/ethernet/intel/i40e/i40e_debugfs.c b/drivers/net/ethernet/intel/i40e/i40e_debugfs.c
index 8056fa9d9cf2..7b9aa330e220 100644
--- a/drivers/net/ethernet/intel/i40e/i40e_debugfs.c
+++ b/drivers/net/ethernet/intel/i40e/i40e_debugfs.c
@@ -1228,7 +1228,7 @@ static ssize_t i40e_dbg_command_write(struct file *filp,
struct libie_aq_desc *desc;
int ret;
- desc = kzalloc_obj(*desc, GFP_KERNEL);
+ desc = kzalloc_obj(*desc);
if (!desc)
goto command_write_done;
cnt = sscanf(&cmd_buf[11],
@@ -1276,7 +1276,7 @@ static ssize_t i40e_dbg_command_write(struct file *filp,
u8 *buff;
int ret;
- desc = kzalloc_obj(*desc, GFP_KERNEL);
+ desc = kzalloc_obj(*desc);
if (!desc)
goto command_write_done;
cnt = sscanf(&cmd_buf[20],
diff --git a/drivers/net/ethernet/intel/i40e/i40e_ethtool.c b/drivers/net/ethernet/intel/i40e/i40e_ethtool.c
index 3ddc29db8dc5..4b299142e4b9 100644
--- a/drivers/net/ethernet/intel/i40e/i40e_ethtool.c
+++ b/drivers/net/ethernet/intel/i40e/i40e_ethtool.c
@@ -3976,7 +3976,7 @@ static int i40e_add_flex_offset(struct list_head *flex_pit_list,
{
struct i40e_flex_pit *new_pit, *entry;
- new_pit = kzalloc_obj(*entry, GFP_KERNEL);
+ new_pit = kzalloc_obj(*entry);
if (!new_pit)
return -ENOMEM;
@@ -4867,7 +4867,7 @@ static int i40e_add_fdir_ethtool(struct i40e_vsi *vsi,
q_index = ring;
}
- input = kzalloc_obj(*input, GFP_KERNEL);
+ input = kzalloc_obj(*input);
if (!input)
return -ENOMEM;
diff --git a/drivers/net/ethernet/intel/i40e/i40e_main.c b/drivers/net/ethernet/intel/i40e/i40e_main.c
index 05dc5ddc918c..7b9e147d7365 100644
--- a/drivers/net/ethernet/intel/i40e/i40e_main.c
+++ b/drivers/net/ethernet/intel/i40e/i40e_main.c
@@ -6686,7 +6686,7 @@ static int i40e_configure_queue_channels(struct i40e_vsi *vsi)
vsi->tc_seid_map[0] = vsi->seid;
for (i = 1; i < I40E_MAX_TRAFFIC_CLASS; i++) {
if (vsi->tc_config.enabled_tc & BIT(i)) {
- ch = kzalloc_obj(*ch, GFP_KERNEL);
+ ch = kzalloc_obj(*ch);
if (!ch) {
ret = -ENOMEM;
goto err_free;
@@ -7962,7 +7962,7 @@ static int i40e_setup_macvlans(struct i40e_vsi *vsi, u16 macvlan_cnt, u16 qcnt,
/* Create channels for macvlans */
INIT_LIST_HEAD(&vsi->macvlan_list);
for (i = 0; i < macvlan_cnt; i++) {
- ch = kzalloc_obj(*ch, GFP_KERNEL);
+ ch = kzalloc_obj(*ch);
if (!ch) {
ret = -ENOMEM;
goto err_free;
@@ -8074,7 +8074,7 @@ static void *i40e_fwd_add(struct net_device *netdev, struct net_device *vdev)
return ERR_PTR(-EBUSY);
/* create the fwd struct */
- fwd = kzalloc_obj(*fwd, GFP_KERNEL);
+ fwd = kzalloc_obj(*fwd);
if (!fwd)
return ERR_PTR(-ENOMEM);
@@ -8835,7 +8835,7 @@ static int i40e_configure_clsflower(struct i40e_vsi *vsi,
clear_bit(I40E_FLAG_FD_SB_TO_CLOUD_FILTER, vsi->back->flags);
}
- filter = kzalloc_obj(*filter, GFP_KERNEL);
+ filter = kzalloc_obj(*filter);
if (!filter)
return -ENOMEM;
@@ -11540,7 +11540,7 @@ static int i40e_vsi_mem_alloc(struct i40e_pf *pf, enum i40e_vsi_type type)
}
pf->next_vsi = ++i;
- vsi = kzalloc_obj(*vsi, GFP_KERNEL);
+ vsi = kzalloc_obj(*vsi);
if (!vsi) {
ret = -ENOMEM;
goto unlock_pf;
@@ -11711,7 +11711,7 @@ static int i40e_alloc_rings(struct i40e_vsi *vsi)
/* Set basic values in the rings to be used later during open() */
for (i = 0; i < vsi->alloc_queue_pairs; i++) {
/* allocate space for both Tx and Rx in one shot */
- ring = kzalloc_objs(struct i40e_ring, qpv, GFP_KERNEL);
+ ring = kzalloc_objs(struct i40e_ring, qpv);
if (!ring)
goto err_out;
@@ -11914,7 +11914,7 @@ static int i40e_init_msix(struct i40e_pf *pf)
"Calculation of remaining vectors underflowed. This is an accounting bug when determining total MSI-X vectors.\n");
v_budget += pf->num_lan_msix;
- pf->msix_entries = kzalloc_objs(struct msix_entry, v_budget, GFP_KERNEL);
+ pf->msix_entries = kzalloc_objs(struct msix_entry, v_budget);
if (!pf->msix_entries)
return -ENOMEM;
@@ -12027,7 +12027,7 @@ static int i40e_vsi_alloc_q_vector(struct i40e_vsi *vsi, int v_idx)
struct i40e_q_vector *q_vector;
/* allocate q_vector */
- q_vector = kzalloc_obj(struct i40e_q_vector, GFP_KERNEL);
+ q_vector = kzalloc_obj(struct i40e_q_vector);
if (!q_vector)
return -ENOMEM;
@@ -14580,7 +14580,7 @@ static int i40e_veb_mem_alloc(struct i40e_pf *pf)
goto err_alloc_veb; /* out of VEB slots! */
}
- veb = kzalloc_obj(*veb, GFP_KERNEL);
+ veb = kzalloc_obj(*veb);
if (!veb) {
ret = -ENOMEM;
goto err_alloc_veb;
@@ -15440,7 +15440,7 @@ static int i40e_init_recovery_mode(struct i40e_pf *pf, struct i40e_hw *hw)
pf->num_alloc_vsi = pf->hw.func_caps.num_vsis;
/* Set up the vsi struct and our local tracking of the MAIN PF vsi. */
- pf->vsi = kzalloc_objs(struct i40e_vsi *, pf->num_alloc_vsi, GFP_KERNEL);
+ pf->vsi = kzalloc_objs(struct i40e_vsi *, pf->num_alloc_vsi);
if (!pf->vsi) {
err = -ENOMEM;
goto err_switch_setup;
@@ -15863,7 +15863,7 @@ static int i40e_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
}
/* Set up the *vsi struct and our local tracking of the MAIN PF vsi. */
- pf->vsi = kzalloc_objs(struct i40e_vsi *, pf->num_alloc_vsi, GFP_KERNEL);
+ pf->vsi = kzalloc_objs(struct i40e_vsi *, pf->num_alloc_vsi);
if (!pf->vsi) {
err = -ENOMEM;
goto err_switch_setup;
diff --git a/drivers/net/ethernet/intel/i40e/i40e_ptp.c b/drivers/net/ethernet/intel/i40e/i40e_ptp.c
index 416b42743439..e3517490510f 100644
--- a/drivers/net/ethernet/intel/i40e/i40e_ptp.c
+++ b/drivers/net/ethernet/intel/i40e/i40e_ptp.c
@@ -1132,7 +1132,7 @@ int i40e_ptp_alloc_pins(struct i40e_pf *pf)
return 0;
pf->ptp_pins =
- kzalloc_obj(struct i40e_ptp_pins_settings, GFP_KERNEL);
+ kzalloc_obj(struct i40e_ptp_pins_settings);
if (!pf->ptp_pins) {
dev_warn(&pf->pdev->dev, "Cannot allocate memory for PTP pins structure.\n");
diff --git a/drivers/net/ethernet/intel/i40e/i40e_txrx.c b/drivers/net/ethernet/intel/i40e/i40e_txrx.c
index f89927bfa9d1..34db7d8866b0 100644
--- a/drivers/net/ethernet/intel/i40e/i40e_txrx.c
+++ b/drivers/net/ethernet/intel/i40e/i40e_txrx.c
@@ -1572,7 +1572,7 @@ int i40e_setup_rx_descriptors(struct i40e_ring *rx_ring)
rx_ring->xdp_prog = rx_ring->vsi->xdp_prog;
rx_ring->rx_bi =
- kzalloc_objs(*rx_ring->rx_bi, rx_ring->count, GFP_KERNEL);
+ kzalloc_objs(*rx_ring->rx_bi, rx_ring->count);
if (!rx_ring->rx_bi)
return -ENOMEM;
diff --git a/drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c b/drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c
index fb4560cc42f4..fdf40f8fb239 100644
--- a/drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c
+++ b/drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c
@@ -1844,7 +1844,7 @@ int i40e_alloc_vfs(struct i40e_pf *pf, u16 num_alloc_vfs)
}
}
/* allocate memory */
- vfs = kzalloc_objs(struct i40e_vf, num_alloc_vfs, GFP_KERNEL);
+ vfs = kzalloc_objs(struct i40e_vf, num_alloc_vfs);
if (!vfs) {
ret = -ENOMEM;
goto err_alloc;
@@ -3956,7 +3956,7 @@ static int i40e_vc_add_cloud_filter(struct i40e_vf *vf, u8 *msg)
goto err_out;
}
- cfilter = kzalloc_obj(*cfilter, GFP_KERNEL);
+ cfilter = kzalloc_obj(*cfilter);
if (!cfilter) {
aq_ret = -ENOMEM;
goto err_out;
diff --git a/drivers/net/ethernet/intel/iavf/iavf_ethtool.c b/drivers/net/ethernet/intel/iavf/iavf_ethtool.c
index e0163e2e022b..f3a1b2fb9bf8 100644
--- a/drivers/net/ethernet/intel/iavf/iavf_ethtool.c
+++ b/drivers/net/ethernet/intel/iavf/iavf_ethtool.c
@@ -1276,7 +1276,7 @@ static int iavf_add_fdir_ethtool(struct iavf_adapter *adapter, struct ethtool_rx
}
spin_unlock_bh(&adapter->fdir_fltr_lock);
- fltr = kzalloc_obj(*fltr, GFP_KERNEL);
+ fltr = kzalloc_obj(*fltr);
if (!fltr)
return -ENOMEM;
@@ -1519,7 +1519,7 @@ iavf_set_rxfh_fields(struct net_device *netdev,
if (hash_flds == IAVF_ADV_RSS_HASH_INVALID)
return -EINVAL;
- rss_new = kzalloc_obj(*rss_new, GFP_KERNEL);
+ rss_new = kzalloc_obj(*rss_new);
if (!rss_new)
return -ENOMEM;
diff --git a/drivers/net/ethernet/intel/iavf/iavf_main.c b/drivers/net/ethernet/intel/iavf/iavf_main.c
index 5ee145d9dd0b..9841c65f3790 100644
--- a/drivers/net/ethernet/intel/iavf/iavf_main.c
+++ b/drivers/net/ethernet/intel/iavf/iavf_main.c
@@ -1812,7 +1812,7 @@ static int iavf_alloc_q_vectors(struct iavf_adapter *adapter)
struct iavf_q_vector *q_vector;
num_q_vectors = adapter->num_msix_vectors - NONQ_VECS;
- adapter->q_vectors = kzalloc_objs(*q_vector, num_q_vectors, GFP_KERNEL);
+ adapter->q_vectors = kzalloc_objs(*q_vector, num_q_vectors);
if (!adapter->q_vectors)
return -ENOMEM;
@@ -4118,7 +4118,7 @@ static int iavf_configure_clsflower(struct iavf_adapter *adapter,
return -EINVAL;
}
- filter = kzalloc_obj(*filter, GFP_KERNEL);
+ filter = kzalloc_obj(*filter);
if (!filter)
return -ENOMEM;
filter->cookie = cls_flower->cookie;
@@ -4233,7 +4233,7 @@ static int iavf_add_cls_u32(struct iavf_adapter *adapter,
return -EOPNOTSUPP;
}
- fltr = kzalloc_obj(*fltr, GFP_KERNEL);
+ fltr = kzalloc_obj(*fltr);
if (!fltr)
return -ENOMEM;
diff --git a/drivers/net/ethernet/intel/ice/devlink/devlink.c b/drivers/net/ethernet/intel/ice/devlink/devlink.c
index 38081776ce65..6c72bd15db6d 100644
--- a/drivers/net/ethernet/intel/ice/devlink/devlink.c
+++ b/drivers/net/ethernet/intel/ice/devlink/devlink.c
@@ -285,7 +285,7 @@ static int ice_devlink_info_get(struct devlink *devlink,
return err;
}
- ctx = kzalloc_obj(*ctx, GFP_KERNEL);
+ ctx = kzalloc_obj(*ctx);
if (!ctx)
return -ENOMEM;
diff --git a/drivers/net/ethernet/intel/ice/devlink/port.c b/drivers/net/ethernet/intel/ice/devlink/port.c
index ce830213e73a..0a0bd9019cfb 100644
--- a/drivers/net/ethernet/intel/ice/devlink/port.c
+++ b/drivers/net/ethernet/intel/ice/devlink/port.c
@@ -921,7 +921,7 @@ ice_alloc_dynamic_port(struct ice_pf *pf,
if (err)
return err;
- dyn_port = kzalloc_obj(*dyn_port, GFP_KERNEL);
+ dyn_port = kzalloc_obj(*dyn_port);
if (!dyn_port) {
err = -ENOMEM;
goto unroll_reserve_sf_num;
diff --git a/drivers/net/ethernet/intel/ice/ice_adapter.c b/drivers/net/ethernet/intel/ice/ice_adapter.c
index d5b857b07f21..cbb57060bd56 100644
--- a/drivers/net/ethernet/intel/ice/ice_adapter.c
+++ b/drivers/net/ethernet/intel/ice/ice_adapter.c
@@ -55,7 +55,7 @@ static struct ice_adapter *ice_adapter_new(struct pci_dev *pdev)
{
struct ice_adapter *adapter;
- adapter = kzalloc_obj(*adapter, GFP_KERNEL);
+ adapter = kzalloc_obj(*adapter);
if (!adapter)
return NULL;
diff --git a/drivers/net/ethernet/intel/ice/ice_arfs.c b/drivers/net/ethernet/intel/ice/ice_arfs.c
index fe9b40654df2..7f2bef053703 100644
--- a/drivers/net/ethernet/intel/ice/ice_arfs.c
+++ b/drivers/net/ethernet/intel/ice/ice_arfs.c
@@ -534,7 +534,7 @@ static int ice_init_arfs_cntrs(struct ice_vsi *vsi)
if (!vsi || vsi->type != ICE_VSI_PF)
return -EINVAL;
- vsi->arfs_fltr_cntrs = kzalloc_obj(*vsi->arfs_fltr_cntrs, GFP_KERNEL);
+ vsi->arfs_fltr_cntrs = kzalloc_obj(*vsi->arfs_fltr_cntrs);
if (!vsi->arfs_fltr_cntrs)
return -ENOMEM;
diff --git a/drivers/net/ethernet/intel/ice/ice_base.c b/drivers/net/ethernet/intel/ice/ice_base.c
index 35089e80e810..eb77dfa934aa 100644
--- a/drivers/net/ethernet/intel/ice/ice_base.c
+++ b/drivers/net/ethernet/intel/ice/ice_base.c
@@ -107,7 +107,7 @@ static int ice_vsi_alloc_q_vector(struct ice_vsi *vsi, u16 v_idx)
int err;
/* allocate q_vector */
- q_vector = kzalloc_obj(*q_vector, GFP_KERNEL);
+ q_vector = kzalloc_obj(*q_vector);
if (!q_vector)
return -ENOMEM;
diff --git a/drivers/net/ethernet/intel/ice/ice_common.c b/drivers/net/ethernet/intel/ice/ice_common.c
index 651cd5476f88..9bb07355bf28 100644
--- a/drivers/net/ethernet/intel/ice/ice_common.c
+++ b/drivers/net/ethernet/intel/ice/ice_common.c
@@ -1067,7 +1067,7 @@ int ice_init_hw(struct ice_hw *hw)
if (status)
goto err_unroll_sched;
- pcaps = kzalloc_obj(*pcaps, GFP_KERNEL);
+ pcaps = kzalloc_obj(*pcaps);
if (!pcaps) {
status = -ENOMEM;
goto err_unroll_sched;
@@ -3630,7 +3630,7 @@ int ice_update_link_info(struct ice_port_info *pi)
if (li->link_info & ICE_AQ_MEDIA_AVAILABLE) {
struct ice_aqc_get_phy_caps_data *pcaps __free(kfree) = NULL;
- pcaps = kzalloc_obj(*pcaps, GFP_KERNEL);
+ pcaps = kzalloc_obj(*pcaps);
if (!pcaps)
return -ENOMEM;
@@ -3881,7 +3881,7 @@ ice_set_fc(struct ice_port_info *pi, u8 *aq_failures, bool ena_auto_link_update)
*aq_failures = 0;
hw = pi->hw;
- pcaps = kzalloc_obj(*pcaps, GFP_KERNEL);
+ pcaps = kzalloc_obj(*pcaps);
if (!pcaps)
return -ENOMEM;
@@ -4020,7 +4020,7 @@ ice_cfg_phy_fec(struct ice_port_info *pi, struct ice_aqc_set_phy_cfg_data *cfg,
hw = pi->hw;
- pcaps = kzalloc_obj(*pcaps, GFP_KERNEL);
+ pcaps = kzalloc_obj(*pcaps);
if (!pcaps)
return -ENOMEM;
@@ -4358,7 +4358,7 @@ int ice_get_phy_lane_number(struct ice_hw *hw)
hw->device_id == ICE_DEV_ID_E825C_SGMII)
return hw->pf_id;
- options = kzalloc_objs(*options, ICE_AQC_PORT_OPT_MAX, GFP_KERNEL);
+ options = kzalloc_objs(*options, ICE_AQC_PORT_OPT_MAX);
if (!options)
return -ENOMEM;
diff --git a/drivers/net/ethernet/intel/ice/ice_dcb_lib.c b/drivers/net/ethernet/intel/ice/ice_dcb_lib.c
index 9d0e71598948..bd77f1c001ee 100644
--- a/drivers/net/ethernet/intel/ice/ice_dcb_lib.c
+++ b/drivers/net/ethernet/intel/ice/ice_dcb_lib.c
@@ -399,7 +399,7 @@ int ice_pf_dcb_cfg(struct ice_pf *pf, struct ice_dcbx_cfg *new_cfg, bool locked)
}
/* Notify AUX drivers about impending change to TCs */
- event = kzalloc_obj(*event, GFP_KERNEL);
+ event = kzalloc_obj(*event);
if (!event) {
ret = -ENOMEM;
goto free_cfg;
@@ -575,7 +575,7 @@ void ice_dcb_rebuild(struct ice_pf *pf)
dcb_error:
dev_err(dev, "Disabling DCB until new settings occur\n");
- err_cfg = kzalloc_obj(*err_cfg, GFP_KERNEL);
+ err_cfg = kzalloc_obj(*err_cfg);
if (!err_cfg) {
mutex_unlock(&pf->tc_mutex);
return;
@@ -641,7 +641,7 @@ int ice_dcb_sw_dflt_cfg(struct ice_pf *pf, bool ets_willing, bool locked)
hw = &pf->hw;
pi = hw->port_info;
- dcbcfg = kzalloc_obj(*dcbcfg, GFP_KERNEL);
+ dcbcfg = kzalloc_obj(*dcbcfg);
if (!dcbcfg)
return -ENOMEM;
@@ -791,7 +791,7 @@ void ice_pf_dcb_recfg(struct ice_pf *pf, bool locked)
privd = cdev->iidc_priv;
ice_setup_dcb_qos_info(pf, &privd->qos_info);
/* Notify the AUX drivers that TC change is finished */
- event = kzalloc_obj(*event, GFP_KERNEL);
+ event = kzalloc_obj(*event);
if (!event)
return;
diff --git a/drivers/net/ethernet/intel/ice/ice_dpll.c b/drivers/net/ethernet/intel/ice/ice_dpll.c
index 23bbfcbca490..62f75701d652 100644
--- a/drivers/net/ethernet/intel/ice/ice_dpll.c
+++ b/drivers/net/ethernet/intel/ice/ice_dpll.c
@@ -3276,7 +3276,7 @@ static int ice_dpll_pin_notify(struct notifier_block *nb, unsigned long action,
if (pin->fwnode != info->fwnode)
return NOTIFY_DONE; /* Not this pin */
- work = kzalloc_obj(*work, GFP_KERNEL);
+ work = kzalloc_obj(*work);
if (!work)
return NOTIFY_DONE;
@@ -4145,7 +4145,7 @@ static int ice_dpll_init_info_e825c(struct ice_pf *pf)
d->clock_id = ice_generate_clock_id(pf);
d->num_inputs = ICE_SYNCE_CLK_NUM;
- d->inputs = kzalloc_objs(*d->inputs, d->num_inputs, GFP_KERNEL);
+ d->inputs = kzalloc_objs(*d->inputs, d->num_inputs);
if (!d->inputs)
return -ENOMEM;
diff --git a/drivers/net/ethernet/intel/ice/ice_eswitch_br.c b/drivers/net/ethernet/intel/ice/ice_eswitch_br.c
index e043e8ddbc9d..1d8a6b95ccda 100644
--- a/drivers/net/ethernet/intel/ice/ice_eswitch_br.c
+++ b/drivers/net/ethernet/intel/ice/ice_eswitch_br.c
@@ -129,7 +129,7 @@ ice_eswitch_br_fwd_rule_create(struct ice_hw *hw, int vsi_idx, int port_type,
lkups_cnt = ice_eswitch_br_get_lkups_cnt(vid);
- rule = kzalloc_obj(*rule, GFP_KERNEL);
+ rule = kzalloc_obj(*rule);
if (!rule)
return ERR_PTR(-ENOMEM);
@@ -190,7 +190,7 @@ ice_eswitch_br_guard_rule_create(struct ice_hw *hw, u16 vsi_idx,
lkups_cnt = ice_eswitch_br_get_lkups_cnt(vid);
- rule = kzalloc_obj(*rule, GFP_KERNEL);
+ rule = kzalloc_obj(*rule);
if (!rule)
goto err_exit;
@@ -233,7 +233,7 @@ ice_eswitch_br_flow_create(struct device *dev, struct ice_hw *hw, int vsi_idx,
struct ice_esw_br_flow *flow;
int err;
- flow = kzalloc_obj(*flow, GFP_KERNEL);
+ flow = kzalloc_obj(*flow);
if (!flow)
return ERR_PTR(-ENOMEM);
@@ -418,7 +418,7 @@ ice_eswitch_br_fdb_entry_create(struct net_device *netdev,
if (fdb_entry)
ice_eswitch_br_fdb_entry_notify_and_cleanup(bridge, fdb_entry);
- fdb_entry = kzalloc_obj(*fdb_entry, GFP_KERNEL);
+ fdb_entry = kzalloc_obj(*fdb_entry);
if (!fdb_entry) {
err = -ENOMEM;
goto err_exit;
@@ -698,7 +698,7 @@ ice_eswitch_br_vlan_create(u16 vid, u16 flags, struct ice_esw_br_port *port)
struct ice_esw_br_vlan *vlan;
int err;
- vlan = kzalloc_obj(*vlan, GFP_KERNEL);
+ vlan = kzalloc_obj(*vlan);
if (!vlan)
return ERR_PTR(-ENOMEM);
@@ -916,7 +916,7 @@ ice_eswitch_br_port_init(struct ice_esw_br *bridge)
{
struct ice_esw_br_port *br_port;
- br_port = kzalloc_obj(*br_port, GFP_KERNEL);
+ br_port = kzalloc_obj(*br_port);
if (!br_port)
return ERR_PTR(-ENOMEM);
@@ -1013,7 +1013,7 @@ ice_eswitch_br_init(struct ice_esw_br_offloads *br_offloads, int ifindex)
struct ice_esw_br *bridge;
int err;
- bridge = kzalloc_obj(*bridge, GFP_KERNEL);
+ bridge = kzalloc_obj(*bridge);
if (!bridge)
return ERR_PTR(-ENOMEM);
@@ -1217,7 +1217,7 @@ ice_eswitch_br_offloads_alloc(struct ice_pf *pf)
if (pf->eswitch.br_offloads)
return ERR_PTR(-EEXIST);
- br_offloads = kzalloc_obj(*br_offloads, GFP_KERNEL);
+ br_offloads = kzalloc_obj(*br_offloads);
if (!br_offloads)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/net/ethernet/intel/ice/ice_ethtool.c b/drivers/net/ethernet/intel/ice/ice_ethtool.c
index 4cce51840369..0ea64b330614 100644
--- a/drivers/net/ethernet/intel/ice/ice_ethtool.c
+++ b/drivers/net/ethernet/intel/ice/ice_ethtool.c
@@ -1652,7 +1652,7 @@ ice_get_fecparam(struct net_device *netdev, struct ethtool_fecparam *fecparam)
break;
}
- caps = kzalloc_obj(*caps, GFP_KERNEL);
+ caps = kzalloc_obj(*caps);
if (!caps)
return -ENOMEM;
@@ -2364,7 +2364,7 @@ ice_get_link_ksettings(struct net_device *netdev,
/* flow control is symmetric and always supported */
ethtool_link_ksettings_add_link_mode(ks, supported, Pause);
- caps = kzalloc_obj(*caps, GFP_KERNEL);
+ caps = kzalloc_obj(*caps);
if (!caps)
return -ENOMEM;
@@ -2629,7 +2629,7 @@ ice_set_link_ksettings(struct net_device *netdev,
pi->phy.link_info.link_info & ICE_AQ_LINK_UP)
return -EOPNOTSUPP;
- phy_caps = kzalloc_obj(*phy_caps, GFP_KERNEL);
+ phy_caps = kzalloc_obj(*phy_caps);
if (!phy_caps)
return -ENOMEM;
@@ -3265,7 +3265,7 @@ ice_set_ringparam(struct net_device *netdev, struct ethtool_ringparam *ring,
netdev_info(netdev, "Changing Tx descriptor count from %d to %d\n",
vsi->tx_rings[0]->count, new_tx_cnt);
- tx_rings = kzalloc_objs(*tx_rings, vsi->num_txq, GFP_KERNEL);
+ tx_rings = kzalloc_objs(*tx_rings, vsi->num_txq);
if (!tx_rings) {
err = -ENOMEM;
goto done;
@@ -3295,7 +3295,7 @@ ice_set_ringparam(struct net_device *netdev, struct ethtool_ringparam *ring,
netdev_info(netdev, "Changing XDP descriptor count from %d to %d\n",
vsi->xdp_rings[0]->count, new_tx_cnt);
- xdp_rings = kzalloc_objs(*xdp_rings, vsi->num_xdp_txq, GFP_KERNEL);
+ xdp_rings = kzalloc_objs(*xdp_rings, vsi->num_xdp_txq);
if (!xdp_rings) {
err = -ENOMEM;
goto free_tx;
@@ -3325,7 +3325,7 @@ ice_set_ringparam(struct net_device *netdev, struct ethtool_ringparam *ring,
netdev_info(netdev, "Changing Rx descriptor count from %d to %d\n",
vsi->rx_rings[0]->count, new_rx_cnt);
- rx_rings = kzalloc_objs(*rx_rings, vsi->num_rxq, GFP_KERNEL);
+ rx_rings = kzalloc_objs(*rx_rings, vsi->num_rxq);
if (!rx_rings) {
err = -ENOMEM;
goto done;
@@ -3445,7 +3445,7 @@ ice_get_pauseparam(struct net_device *netdev, struct ethtool_pauseparam *pause)
dcbx_cfg = &pi->qos_cfg.local_dcbx_cfg;
- pcaps = kzalloc_obj(*pcaps, GFP_KERNEL);
+ pcaps = kzalloc_obj(*pcaps);
if (!pcaps)
return;
@@ -3511,7 +3511,7 @@ ice_set_pauseparam(struct net_device *netdev, struct ethtool_pauseparam *pause)
* so compare pause->autoneg with SW configured to prevent the user from
* using set pause param to chance autoneg.
*/
- pcaps = kzalloc_obj(*pcaps, GFP_KERNEL);
+ pcaps = kzalloc_obj(*pcaps);
if (!pcaps)
return -ENOMEM;
diff --git a/drivers/net/ethernet/intel/ice/ice_flex_pipe.c b/drivers/net/ethernet/intel/ice/ice_flex_pipe.c
index 28516878fa53..bb1d12f952cf 100644
--- a/drivers/net/ethernet/intel/ice/ice_flex_pipe.c
+++ b/drivers/net/ethernet/intel/ice/ice_flex_pipe.c
@@ -3734,7 +3734,7 @@ ice_adj_prof_priorities(struct ice_hw *hw, enum ice_block blk, u16 vsig,
int status = 0;
u16 idx;
- attr_used = kzalloc_objs(*attr_used, ICE_MAX_PTG_ATTRS, GFP_KERNEL);
+ attr_used = kzalloc_objs(*attr_used, ICE_MAX_PTG_ATTRS);
if (!attr_used)
return -ENOMEM;
@@ -4021,7 +4021,7 @@ ice_find_prof_vsig(struct ice_hw *hw, enum ice_block blk, u64 hdl, u16 *vsig)
INIT_LIST_HEAD(&lst);
- t = kzalloc_obj(*t, GFP_KERNEL);
+ t = kzalloc_obj(*t);
if (!t)
return false;
diff --git a/drivers/net/ethernet/intel/ice/ice_flow.c b/drivers/net/ethernet/intel/ice/ice_flow.c
index 51f718020073..121552c644cd 100644
--- a/drivers/net/ethernet/intel/ice/ice_flow.c
+++ b/drivers/net/ethernet/intel/ice/ice_flow.c
@@ -1468,7 +1468,7 @@ ice_flow_add_prof_sync(struct ice_hw *hw, enum ice_block blk,
if (prof_id >= ids->count)
return -ENOSPC;
- params = kzalloc_obj(*params, GFP_KERNEL);
+ params = kzalloc_obj(*params);
if (!params)
return -ENOMEM;
@@ -1661,7 +1661,7 @@ ice_flow_set_parser_prof(struct ice_hw *hw, u16 dest_vsi, u16 fdir_vsi,
int status;
int i, idx;
- params = kzalloc_obj(*params, GFP_KERNEL);
+ params = kzalloc_obj(*params);
if (!params)
return -ENOMEM;
@@ -2552,7 +2552,7 @@ ice_add_rss_cfg_sync(struct ice_hw *hw, u16 vsi_handle,
segs_cnt = (cfg->hdr_type == ICE_RSS_OUTER_HEADERS) ?
ICE_FLOW_SEG_SINGLE : ICE_FLOW_SEG_MAX;
- segs = kzalloc_objs(*segs, segs_cnt, GFP_KERNEL);
+ segs = kzalloc_objs(*segs, segs_cnt);
if (!segs)
return -ENOMEM;
@@ -2699,7 +2699,7 @@ ice_rem_rss_cfg_sync(struct ice_hw *hw, u16 vsi_handle,
segs_cnt = (cfg->hdr_type == ICE_RSS_OUTER_HEADERS) ?
ICE_FLOW_SEG_SINGLE : ICE_FLOW_SEG_MAX;
- segs = kzalloc_objs(*segs, segs_cnt, GFP_KERNEL);
+ segs = kzalloc_objs(*segs, segs_cnt);
if (!segs)
return -ENOMEM;
diff --git a/drivers/net/ethernet/intel/ice/ice_fw_update.c b/drivers/net/ethernet/intel/ice/ice_fw_update.c
index b67fde32577a..c143e546dd8c 100644
--- a/drivers/net/ethernet/intel/ice/ice_fw_update.c
+++ b/drivers/net/ethernet/intel/ice/ice_fw_update.c
@@ -862,7 +862,7 @@ int ice_get_pending_updates(struct ice_pf *pf, u8 *pending,
struct ice_hw *hw = &pf->hw;
int err;
- dev_caps = kzalloc_obj(*dev_caps, GFP_KERNEL);
+ dev_caps = kzalloc_obj(*dev_caps);
if (!dev_caps)
return -ENOMEM;
diff --git a/drivers/net/ethernet/intel/ice/ice_gnss.c b/drivers/net/ethernet/intel/ice/ice_gnss.c
index e81d46412043..8fd954f1ebd6 100644
--- a/drivers/net/ethernet/intel/ice/ice_gnss.c
+++ b/drivers/net/ethernet/intel/ice/ice_gnss.c
@@ -174,7 +174,7 @@ static struct gnss_serial *ice_gnss_struct_init(struct ice_pf *pf)
struct kthread_worker *kworker;
struct gnss_serial *gnss;
- gnss = kzalloc_obj(*gnss, GFP_KERNEL);
+ gnss = kzalloc_obj(*gnss);
if (!gnss)
return NULL;
diff --git a/drivers/net/ethernet/intel/ice/ice_idc.c b/drivers/net/ethernet/intel/ice/ice_idc.c
index 5487edc36260..3572b0e1d49f 100644
--- a/drivers/net/ethernet/intel/ice/ice_idc.c
+++ b/drivers/net/ethernet/intel/ice/ice_idc.c
@@ -308,7 +308,7 @@ int ice_plug_aux_dev(struct ice_pf *pf)
if (!cdev)
return -ENODEV;
- iadev = kzalloc_obj(*iadev, GFP_KERNEL);
+ iadev = kzalloc_obj(*iadev);
if (!iadev)
return -ENOMEM;
@@ -376,13 +376,13 @@ int ice_init_rdma(struct ice_pf *pf)
return 0;
}
- cdev = kzalloc_obj(*cdev, GFP_KERNEL);
+ cdev = kzalloc_obj(*cdev);
if (!cdev)
return -ENOMEM;
pf->cdev_info = cdev;
- privd = kzalloc_obj(*privd, GFP_KERNEL);
+ privd = kzalloc_obj(*privd);
if (!privd) {
ret = -ENOMEM;
goto err_privd_alloc;
diff --git a/drivers/net/ethernet/intel/ice/ice_irq.c b/drivers/net/ethernet/intel/ice/ice_irq.c
index 3864fdcdeae0..cd59579568b7 100644
--- a/drivers/net/ethernet/intel/ice/ice_irq.c
+++ b/drivers/net/ethernet/intel/ice/ice_irq.c
@@ -81,7 +81,7 @@ static struct ice_irq_entry *ice_get_irq_res(struct ice_pf *pf,
unsigned int index;
int ret;
- entry = kzalloc_obj(*entry, GFP_KERNEL);
+ entry = kzalloc_obj(*entry);
if (!entry)
return NULL;
diff --git a/drivers/net/ethernet/intel/ice/ice_lag.c b/drivers/net/ethernet/intel/ice/ice_lag.c
index af285bba3b1a..310e8fe2925c 100644
--- a/drivers/net/ethernet/intel/ice/ice_lag.c
+++ b/drivers/net/ethernet/intel/ice/ice_lag.c
@@ -2310,7 +2310,7 @@ ice_lag_event_handler(struct notifier_block *notif_blk, unsigned long event,
return NOTIFY_DONE;
/* This memory will be freed at the end of ice_lag_process_event */
- lag_work = kzalloc_obj(*lag_work, GFP_KERNEL);
+ lag_work = kzalloc_obj(*lag_work);
if (!lag_work)
return -ENOMEM;
@@ -2577,7 +2577,7 @@ int ice_init_lag(struct ice_pf *pf)
if (!ice_is_feature_supported(pf, ICE_F_SRIOV_LAG))
return 0;
- pf->lag = kzalloc_obj(*lag, GFP_KERNEL);
+ pf->lag = kzalloc_obj(*lag);
if (!pf->lag)
return -ENOMEM;
lag = pf->lag;
diff --git a/drivers/net/ethernet/intel/ice/ice_lib.c b/drivers/net/ethernet/intel/ice/ice_lib.c
index c5695b2e2319..bd0134b6e920 100644
--- a/drivers/net/ethernet/intel/ice/ice_lib.c
+++ b/drivers/net/ethernet/intel/ice/ice_lib.c
@@ -290,7 +290,7 @@ static void ice_vsi_delete_from_hw(struct ice_vsi *vsi)
int status;
ice_fltr_remove_all(vsi);
- ctxt = kzalloc_obj(*ctxt, GFP_KERNEL);
+ ctxt = kzalloc_obj(*ctxt);
if (!ctxt)
return;
@@ -396,7 +396,7 @@ static int ice_vsi_alloc_ring_stats(struct ice_vsi *vsi)
ring_stats = tx_ring_stats[i];
if (!ring_stats) {
- ring_stats = kzalloc_obj(*ring_stats, GFP_KERNEL);
+ ring_stats = kzalloc_obj(*ring_stats);
if (!ring_stats)
goto err_out;
@@ -417,7 +417,7 @@ static int ice_vsi_alloc_ring_stats(struct ice_vsi *vsi)
ring_stats = rx_ring_stats[i];
if (!ring_stats) {
- ring_stats = kzalloc_obj(*ring_stats, GFP_KERNEL);
+ ring_stats = kzalloc_obj(*ring_stats);
if (!ring_stats)
goto err_out;
@@ -533,7 +533,7 @@ static int ice_vsi_alloc_stat_arrays(struct ice_vsi *vsi)
/* realloc will happen in rebuild path */
return 0;
- vsi_stat = kzalloc_obj(*vsi_stat, GFP_KERNEL);
+ vsi_stat = kzalloc_obj(*vsi_stat);
if (!vsi_stat)
return -ENOMEM;
@@ -1239,7 +1239,7 @@ static int ice_vsi_init(struct ice_vsi *vsi, u32 vsi_flags)
int ret = 0;
dev = ice_pf_to_dev(pf);
- ctxt = kzalloc_obj(*ctxt, GFP_KERNEL);
+ ctxt = kzalloc_obj(*ctxt);
if (!ctxt)
return -ENOMEM;
@@ -1403,7 +1403,7 @@ static int ice_vsi_alloc_rings(struct ice_vsi *vsi)
struct ice_tx_ring *ring;
/* allocate with kzalloc(), free with kfree_rcu() */
- ring = kzalloc_obj(*ring, GFP_KERNEL);
+ ring = kzalloc_obj(*ring);
if (!ring)
goto err_out;
@@ -1427,7 +1427,7 @@ static int ice_vsi_alloc_rings(struct ice_vsi *vsi)
struct ice_rx_ring *ring;
/* allocate with kzalloc(), free with kfree_rcu() */
- ring = kzalloc_obj(*ring, GFP_KERNEL);
+ ring = kzalloc_obj(*ring);
if (!ring)
goto err_out;
@@ -3387,7 +3387,7 @@ int ice_vsi_cfg_tc(struct ice_vsi *vsi, u8 ena_tc)
vsi->tc_cfg.ena_tc = ena_tc;
vsi->tc_cfg.numtc = num_tc;
- ctx = kzalloc_obj(*ctx, GFP_KERNEL);
+ ctx = kzalloc_obj(*ctx);
if (!ctx)
return -ENOMEM;
diff --git a/drivers/net/ethernet/intel/ice/ice_main.c b/drivers/net/ethernet/intel/ice/ice_main.c
index 45036a066012..ebf48feffb30 100644
--- a/drivers/net/ethernet/intel/ice/ice_main.c
+++ b/drivers/net/ethernet/intel/ice/ice_main.c
@@ -875,7 +875,7 @@ void ice_print_link_msg(struct ice_vsi *vsi, bool isup)
an = "False";
/* Get FEC mode requested based on PHY caps last SW configuration */
- caps = kzalloc_obj(*caps, GFP_KERNEL);
+ caps = kzalloc_obj(*caps);
if (!caps) {
fec_req = "Unknown";
an_advertised = "Unknown";
@@ -1951,7 +1951,7 @@ static int ice_force_phys_link_state(struct ice_vsi *vsi, bool link_up)
pi = vsi->port_info;
- pcaps = kzalloc_obj(*pcaps, GFP_KERNEL);
+ pcaps = kzalloc_obj(*pcaps);
if (!pcaps)
return -ENOMEM;
@@ -2010,7 +2010,7 @@ static int ice_init_nvm_phy_type(struct ice_port_info *pi)
struct ice_pf *pf = pi->hw->back;
int err;
- pcaps = kzalloc_obj(*pcaps, GFP_KERNEL);
+ pcaps = kzalloc_obj(*pcaps);
if (!pcaps)
return -ENOMEM;
@@ -2122,7 +2122,7 @@ static int ice_init_phy_user_cfg(struct ice_port_info *pi)
if (!(phy->link_info.link_info & ICE_AQ_MEDIA_AVAILABLE))
return -EIO;
- pcaps = kzalloc_obj(*pcaps, GFP_KERNEL);
+ pcaps = kzalloc_obj(*pcaps);
if (!pcaps)
return -ENOMEM;
@@ -2202,7 +2202,7 @@ static int ice_configure_phy(struct ice_vsi *vsi)
if (test_bit(ICE_FLAG_LINK_DOWN_ON_CLOSE_ENA, pf->flags))
return ice_force_phys_link_state(vsi, true);
- pcaps = kzalloc_obj(*pcaps, GFP_KERNEL);
+ pcaps = kzalloc_obj(*pcaps);
if (!pcaps)
return -ENOMEM;
@@ -2236,7 +2236,7 @@ static int ice_configure_phy(struct ice_vsi *vsi)
goto done;
}
- cfg = kzalloc_obj(*cfg, GFP_KERNEL);
+ cfg = kzalloc_obj(*cfg);
if (!cfg) {
err = -ENOMEM;
goto done;
@@ -2385,7 +2385,7 @@ static void ice_service_task(struct work_struct *work)
if (test_and_clear_bit(ICE_AUX_ERR_PENDING, pf->state)) {
struct iidc_rdma_event *event;
- event = kzalloc_obj(*event, GFP_KERNEL);
+ event = kzalloc_obj(*event);
if (event) {
set_bit(IIDC_RDMA_EVENT_CRIT_ERR, event->type);
/* report the entire OICR value to AUX driver */
@@ -2408,7 +2408,7 @@ static void ice_service_task(struct work_struct *work)
if (test_and_clear_bit(ICE_FLAG_MTU_CHANGED, pf->flags)) {
struct iidc_rdma_event *event;
- event = kzalloc_obj(*event, GFP_KERNEL);
+ event = kzalloc_obj(*event);
if (event) {
set_bit(IIDC_RDMA_EVENT_AFTER_MTU_CHANGE, event->type);
ice_send_event_to_aux(pf, event);
@@ -2609,11 +2609,11 @@ static int ice_xdp_alloc_setup_rings(struct ice_vsi *vsi)
struct ice_ring_stats *ring_stats;
struct ice_tx_ring *xdp_ring;
- xdp_ring = kzalloc_obj(*xdp_ring, GFP_KERNEL);
+ xdp_ring = kzalloc_obj(*xdp_ring);
if (!xdp_ring)
goto free_xdp_rings;
- ring_stats = kzalloc_obj(*ring_stats, GFP_KERNEL);
+ ring_stats = kzalloc_obj(*ring_stats);
if (!ring_stats) {
ice_free_tx_ring(xdp_ring);
goto free_xdp_rings;
@@ -4204,7 +4204,7 @@ static void ice_set_safe_mode_vlan_cfg(struct ice_pf *pf)
if (!vsi)
return;
- ctxt = kzalloc_obj(*ctxt, GFP_KERNEL);
+ ctxt = kzalloc_obj(*ctxt);
if (!ctxt)
return;
@@ -4910,7 +4910,7 @@ static int ice_init_pf_sw(struct ice_pf *pf)
int err;
/* create switch struct for the switch element created by FW on boot */
- pf->first_sw = kzalloc_obj(*pf->first_sw, GFP_KERNEL);
+ pf->first_sw = kzalloc_obj(*pf->first_sw);
if (!pf->first_sw)
return -ENOMEM;
@@ -8096,7 +8096,7 @@ int ice_set_rss_hfunc(struct ice_vsi *vsi, u8 hfunc)
hfunc != ICE_AQ_VSI_Q_OPT_RSS_HASH_SYM_TPLZ)
return -EOPNOTSUPP;
- ctx = kzalloc_obj(*ctx, GFP_KERNEL);
+ ctx = kzalloc_obj(*ctx);
if (!ctx)
return -ENOMEM;
@@ -8168,7 +8168,7 @@ static int ice_vsi_update_bridge_mode(struct ice_vsi *vsi, u16 bmode)
vsi_props = &vsi->info;
- ctxt = kzalloc_obj(*ctxt, GFP_KERNEL);
+ ctxt = kzalloc_obj(*ctxt);
if (!ctxt)
return -ENOMEM;
@@ -9142,7 +9142,7 @@ static int ice_create_q_channels(struct ice_vsi *vsi)
if (!(vsi->all_enatc & BIT(i)))
continue;
- ch = kzalloc_obj(*ch, GFP_KERNEL);
+ ch = kzalloc_obj(*ch);
if (!ch) {
ret = -ENOMEM;
goto err_free;
@@ -9573,7 +9573,7 @@ ice_indr_setup_tc_block(struct net_device *netdev, struct Qdisc *sch,
if (indr_priv)
return -EEXIST;
- indr_priv = kzalloc_obj(*indr_priv, GFP_KERNEL);
+ indr_priv = kzalloc_obj(*indr_priv);
if (!indr_priv)
return -ENOMEM;
diff --git a/drivers/net/ethernet/intel/ice/ice_parser.c b/drivers/net/ethernet/intel/ice/ice_parser.c
index 4dd3f666daa8..f8e69630fb72 100644
--- a/drivers/net/ethernet/intel/ice/ice_parser.c
+++ b/drivers/net/ethernet/intel/ice/ice_parser.c
@@ -1895,7 +1895,7 @@ static struct ice_xlt_kb *ice_xlt_kb_get(struct ice_hw *hw, u32 sect_type)
if (!seg)
return ERR_PTR(-EINVAL);
- kb = kzalloc_obj(*kb, GFP_KERNEL);
+ kb = kzalloc_obj(*kb);
if (!kb)
return ERR_PTR(-ENOMEM);
@@ -2000,7 +2000,7 @@ struct ice_parser *ice_parser_create(struct ice_hw *hw)
struct ice_parser *p;
void *err;
- p = kzalloc_obj(*p, GFP_KERNEL);
+ p = kzalloc_obj(*p);
if (!p)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/net/ethernet/intel/ice/ice_ptp.c b/drivers/net/ethernet/intel/ice/ice_ptp.c
index db2213e0e1b5..094e96219f45 100644
--- a/drivers/net/ethernet/intel/ice/ice_ptp.c
+++ b/drivers/net/ethernet/intel/ice/ice_ptp.c
@@ -706,7 +706,7 @@ ice_ptp_alloc_tx_tracker(struct ice_ptp_tx *tx)
unsigned long *in_use, *stale;
struct ice_tx_tstamp *tstamps;
- tstamps = kzalloc_objs(*tstamps, tx->len, GFP_KERNEL);
+ tstamps = kzalloc_objs(*tstamps, tx->len);
in_use = bitmap_zalloc(tx->len, GFP_KERNEL);
stale = bitmap_zalloc(tx->len, GFP_KERNEL);
diff --git a/drivers/net/ethernet/intel/ice/ice_repr.c b/drivers/net/ethernet/intel/ice/ice_repr.c
index 7bdcc0e5986b..90f99443a922 100644
--- a/drivers/net/ethernet/intel/ice/ice_repr.c
+++ b/drivers/net/ethernet/intel/ice/ice_repr.c
@@ -369,7 +369,7 @@ static struct ice_repr *ice_repr_create(struct ice_vsi *src_vsi)
struct ice_repr *repr;
int err;
- repr = kzalloc_obj(*repr, GFP_KERNEL);
+ repr = kzalloc_obj(*repr);
if (!repr)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/net/ethernet/intel/ice/ice_sf_eth.c b/drivers/net/ethernet/intel/ice/ice_sf_eth.c
index 93e62050e00a..2cf04bc6edce 100644
--- a/drivers/net/ethernet/intel/ice/ice_sf_eth.c
+++ b/drivers/net/ethernet/intel/ice/ice_sf_eth.c
@@ -273,7 +273,7 @@ ice_sf_eth_activate(struct ice_dynamic_port *dyn_port,
return err;
}
- sf_dev = kzalloc_obj(*sf_dev, GFP_KERNEL);
+ sf_dev = kzalloc_obj(*sf_dev);
if (!sf_dev) {
err = -ENOMEM;
NL_SET_ERR_MSG_MOD(extack, "Could not allocate SF memory");
diff --git a/drivers/net/ethernet/intel/ice/ice_sriov.c b/drivers/net/ethernet/intel/ice/ice_sriov.c
index 7c15d62bb14b..7e00e091756d 100644
--- a/drivers/net/ethernet/intel/ice/ice_sriov.c
+++ b/drivers/net/ethernet/intel/ice/ice_sriov.c
@@ -695,7 +695,7 @@ static int ice_create_vf_entries(struct ice_pf *pf, u16 num_vfs)
pci_read_config_word(pdev, pos + PCI_SRIOV_VF_DID, &vf_pdev_id);
for (u16 vf_id = 0; vf_id < num_vfs; vf_id++) {
- vf = kzalloc_obj(*vf, GFP_KERNEL);
+ vf = kzalloc_obj(*vf);
if (!vf) {
err = -ENOMEM;
goto err_free_entries;
diff --git a/drivers/net/ethernet/intel/ice/ice_switch.c b/drivers/net/ethernet/intel/ice/ice_switch.c
index 515e96c44bfa..bb0f990fa2c6 100644
--- a/drivers/net/ethernet/intel/ice/ice_switch.c
+++ b/drivers/net/ethernet/intel/ice/ice_switch.c
@@ -1847,7 +1847,7 @@ ice_cfg_rdma_fltr(struct ice_hw *hw, u16 vsi_handle, bool enable)
if (!cached_ctx)
return -ENOENT;
- ctx = kzalloc_obj(*ctx, GFP_KERNEL);
+ ctx = kzalloc_obj(*ctx);
if (!ctx)
return -ENOMEM;
@@ -2069,7 +2069,7 @@ ice_update_recipe_lkup_idx(struct ice_hw *hw,
u16 num_recps = ICE_MAX_NUM_RECIPES;
int status;
- rcp_list = kzalloc_objs(*rcp_list, num_recps, GFP_KERNEL);
+ rcp_list = kzalloc_objs(*rcp_list, num_recps);
if (!rcp_list)
return -ENOMEM;
@@ -2326,7 +2326,7 @@ ice_get_recp_frm_fw(struct ice_hw *hw, struct ice_sw_recipe *recps, u8 rid,
bitmap_zero(result_bm, ICE_MAX_FV_WORDS);
/* we need a buffer big enough to accommodate all the recipes */
- tmp = kzalloc_objs(*tmp, ICE_MAX_NUM_RECIPES, GFP_KERNEL);
+ tmp = kzalloc_objs(*tmp, ICE_MAX_NUM_RECIPES);
if (!tmp)
return -ENOMEM;
@@ -5096,7 +5096,7 @@ ice_add_sw_recipe(struct ice_hw *hw, struct ice_sw_recipe *rm,
if (recp_cnt > ICE_MAX_CHAIN_RECIPE_RES)
return -E2BIG;
- buf = kzalloc_objs(*buf, recp_cnt, GFP_KERNEL);
+ buf = kzalloc_objs(*buf, recp_cnt);
if (!buf)
return -ENOMEM;
@@ -5324,7 +5324,7 @@ ice_add_adv_recipe(struct ice_hw *hw, struct ice_adv_lkup_elem *lkups,
if (!lkups_cnt)
return -EINVAL;
- lkup_exts = kzalloc_obj(*lkup_exts, GFP_KERNEL);
+ lkup_exts = kzalloc_obj(*lkup_exts);
if (!lkup_exts)
return -ENOMEM;
@@ -5346,7 +5346,7 @@ ice_add_adv_recipe(struct ice_hw *hw, struct ice_adv_lkup_elem *lkups,
}
}
- rm = kzalloc_obj(*rm, GFP_KERNEL);
+ rm = kzalloc_obj(*rm);
if (!rm) {
status = -ENOMEM;
goto err_free_lkup_exts;
@@ -5530,7 +5530,7 @@ ice_dummy_packet_add_vlan(const struct ice_dummy_pkt_profile *dummy_pkt,
memcpy(pkt + etype_off + off, dummy_pkt->pkt + etype_off,
dummy_pkt->pkt_len - etype_off);
- profile = kzalloc_obj(*profile, GFP_KERNEL);
+ profile = kzalloc_obj(*profile);
if (!profile) {
kfree(offsets);
kfree(pkt);
diff --git a/drivers/net/ethernet/intel/ice/ice_tc_lib.c b/drivers/net/ethernet/intel/ice/ice_tc_lib.c
index c687da8d950d..d20357c04127 100644
--- a/drivers/net/ethernet/intel/ice/ice_tc_lib.c
+++ b/drivers/net/ethernet/intel/ice/ice_tc_lib.c
@@ -2191,7 +2191,7 @@ ice_add_tc_fltr(struct net_device *netdev, struct ice_vsi *vsi,
/* by default, set output to be INVALID */
*__fltr = NULL;
- fltr = kzalloc_obj(*fltr, GFP_KERNEL);
+ fltr = kzalloc_obj(*fltr);
if (!fltr)
return -ENOMEM;
diff --git a/drivers/net/ethernet/intel/ice/ice_txrx.c b/drivers/net/ethernet/intel/ice/ice_txrx.c
index 642b761c38a2..a5bbce68f76c 100644
--- a/drivers/net/ethernet/intel/ice/ice_txrx.c
+++ b/drivers/net/ethernet/intel/ice/ice_txrx.c
@@ -397,7 +397,7 @@ static int ice_alloc_tstamp_ring(struct ice_tx_ring *tx_ring)
struct ice_tstamp_ring *tstamp_ring;
/* allocate with kzalloc(), free with kfree_rcu() */
- tstamp_ring = kzalloc_obj(*tstamp_ring, GFP_KERNEL);
+ tstamp_ring = kzalloc_obj(*tstamp_ring);
if (!tstamp_ring)
return -ENOMEM;
diff --git a/drivers/net/ethernet/intel/ice/ice_vf_lib.c b/drivers/net/ethernet/intel/ice/ice_vf_lib.c
index dba56e317b77..c8bc952f05cd 100644
--- a/drivers/net/ethernet/intel/ice/ice_vf_lib.c
+++ b/drivers/net/ethernet/intel/ice/ice_vf_lib.c
@@ -1112,7 +1112,7 @@ static int ice_cfg_mac_antispoof(struct ice_vsi *vsi, bool enable)
struct ice_vsi_ctx *ctx;
int err;
- ctx = kzalloc_obj(*ctx, GFP_KERNEL);
+ ctx = kzalloc_obj(*ctx);
if (!ctx)
return -ENOMEM;
diff --git a/drivers/net/ethernet/intel/ice/ice_vsi_vlan_lib.c b/drivers/net/ethernet/intel/ice/ice_vsi_vlan_lib.c
index 79f18e693e04..54984966851d 100644
--- a/drivers/net/ethernet/intel/ice/ice_vsi_vlan_lib.c
+++ b/drivers/net/ethernet/intel/ice/ice_vsi_vlan_lib.c
@@ -94,7 +94,7 @@ static int ice_vsi_manage_vlan_insertion(struct ice_vsi *vsi)
struct ice_vsi_ctx *ctxt;
int err;
- ctxt = kzalloc_obj(*ctxt, GFP_KERNEL);
+ ctxt = kzalloc_obj(*ctxt);
if (!ctxt)
return -ENOMEM;
@@ -141,7 +141,7 @@ static int ice_vsi_manage_vlan_stripping(struct ice_vsi *vsi, bool ena)
if (vsi->info.port_based_inner_vlan)
return 0;
- ctxt = kzalloc_obj(*ctxt, GFP_KERNEL);
+ ctxt = kzalloc_obj(*ctxt);
if (!ctxt)
return -ENOMEM;
@@ -239,7 +239,7 @@ static int __ice_vsi_set_inner_port_vlan(struct ice_vsi *vsi, u16 pvid_info)
struct ice_vsi_ctx *ctxt;
int ret;
- ctxt = kzalloc_obj(*ctxt, GFP_KERNEL);
+ ctxt = kzalloc_obj(*ctxt);
if (!ctxt)
return -ENOMEM;
@@ -292,7 +292,7 @@ int ice_vsi_clear_inner_port_vlan(struct ice_vsi *vsi)
struct ice_vsi_ctx *ctxt;
int ret;
- ctxt = kzalloc_obj(*ctxt, GFP_KERNEL);
+ ctxt = kzalloc_obj(*ctxt);
if (!ctxt)
return -ENOMEM;
@@ -336,7 +336,7 @@ static int ice_cfg_vlan_pruning(struct ice_vsi *vsi, bool ena)
return 0;
pf = vsi->back;
- ctxt = kzalloc_obj(*ctxt, GFP_KERNEL);
+ ctxt = kzalloc_obj(*ctxt);
if (!ctxt)
return -ENOMEM;
@@ -382,7 +382,7 @@ static int ice_cfg_vlan_antispoof(struct ice_vsi *vsi, bool enable)
struct ice_vsi_ctx *ctx;
int err;
- ctx = kzalloc_obj(*ctx, GFP_KERNEL);
+ ctx = kzalloc_obj(*ctx);
if (!ctx)
return -ENOMEM;
@@ -478,7 +478,7 @@ int ice_vsi_ena_outer_stripping(struct ice_vsi *vsi, u16 tpid)
if (tpid_to_vsi_outer_vlan_type(tpid, &tag_type))
return -EINVAL;
- ctxt = kzalloc_obj(*ctxt, GFP_KERNEL);
+ ctxt = kzalloc_obj(*ctxt);
if (!ctxt)
return -ENOMEM;
@@ -529,7 +529,7 @@ int ice_vsi_dis_outer_stripping(struct ice_vsi *vsi)
if (vsi->info.port_based_outer_vlan)
return 0;
- ctxt = kzalloc_obj(*ctxt, GFP_KERNEL);
+ ctxt = kzalloc_obj(*ctxt);
if (!ctxt)
return -ENOMEM;
@@ -584,7 +584,7 @@ int ice_vsi_ena_outer_insertion(struct ice_vsi *vsi, u16 tpid)
if (tpid_to_vsi_outer_vlan_type(tpid, &tag_type))
return -EINVAL;
- ctxt = kzalloc_obj(*ctxt, GFP_KERNEL);
+ ctxt = kzalloc_obj(*ctxt);
if (!ctxt)
return -ENOMEM;
@@ -636,7 +636,7 @@ int ice_vsi_dis_outer_insertion(struct ice_vsi *vsi)
if (vsi->info.port_based_outer_vlan)
return 0;
- ctxt = kzalloc_obj(*ctxt, GFP_KERNEL);
+ ctxt = kzalloc_obj(*ctxt);
if (!ctxt)
return -ENOMEM;
@@ -694,7 +694,7 @@ __ice_vsi_set_outer_port_vlan(struct ice_vsi *vsi, u16 vlan_info, u16 tpid)
if (tpid_to_vsi_outer_vlan_type(tpid, &tag_type))
return -EINVAL;
- ctxt = kzalloc_obj(*ctxt, GFP_KERNEL);
+ ctxt = kzalloc_obj(*ctxt);
if (!ctxt)
return -ENOMEM;
@@ -767,7 +767,7 @@ int ice_vsi_clear_outer_port_vlan(struct ice_vsi *vsi)
struct ice_vsi_ctx *ctxt;
int err;
- ctxt = kzalloc_obj(*ctxt, GFP_KERNEL);
+ ctxt = kzalloc_obj(*ctxt);
if (!ctxt)
return -ENOMEM;
@@ -794,7 +794,7 @@ int ice_vsi_clear_port_vlan(struct ice_vsi *vsi)
struct ice_vsi_ctx *ctxt;
int err;
- ctxt = kzalloc_obj(*ctxt, GFP_KERNEL);
+ ctxt = kzalloc_obj(*ctxt);
if (!ctxt)
return -ENOMEM;
diff --git a/drivers/net/ethernet/intel/ice/virt/fdir.c b/drivers/net/ethernet/intel/ice/virt/fdir.c
index 8b2c882fb39c..4f1f3442e52c 100644
--- a/drivers/net/ethernet/intel/ice/virt/fdir.c
+++ b/drivers/net/ethernet/intel/ice/virt/fdir.c
@@ -875,7 +875,7 @@ ice_vc_fdir_parse_raw(struct ice_vf *vf,
if (hw->debug_mask & ICE_DBG_PARSER)
ice_parser_result_dump(hw, &rslt);
- conf->prof = kzalloc_obj(*conf->prof, GFP_KERNEL);
+ conf->prof = kzalloc_obj(*conf->prof);
if (!conf->prof) {
status = -ENOMEM;
goto err_parser_destroy;
@@ -2128,7 +2128,7 @@ int ice_vc_add_fdir_fltr(struct ice_vf *vf, u8 *msg)
goto err_exit;
}
- stat = kzalloc_obj(*stat, GFP_KERNEL);
+ stat = kzalloc_obj(*stat);
if (!stat) {
v_ret = VIRTCHNL_STATUS_ERR_NO_MEMORY;
dev_dbg(dev, "Alloc stat for VF %d failed\n", vf->vf_id);
@@ -2332,7 +2332,7 @@ int ice_vc_del_fdir_fltr(struct ice_vf *vf, u8 *msg)
goto err_exit;
}
- stat = kzalloc_obj(*stat, GFP_KERNEL);
+ stat = kzalloc_obj(*stat);
if (!stat) {
v_ret = VIRTCHNL_STATUS_ERR_NO_MEMORY;
dev_dbg(dev, "Alloc stat for VF %d failed\n", vf->vf_id);
diff --git a/drivers/net/ethernet/intel/ice/virt/rss.c b/drivers/net/ethernet/intel/ice/virt/rss.c
index 2f259b261512..960012ca91b5 100644
--- a/drivers/net/ethernet/intel/ice/virt/rss.c
+++ b/drivers/net/ethernet/intel/ice/virt/rss.c
@@ -380,7 +380,7 @@ ice_vc_rss_hash_update(struct ice_hw *hw, struct ice_vsi *vsi, u8 hash_type)
struct ice_vsi_ctx *ctx;
int ret;
- ctx = kzalloc_obj(*ctx, GFP_KERNEL);
+ ctx = kzalloc_obj(*ctx);
if (!ctx)
return -ENOMEM;
diff --git a/drivers/net/ethernet/intel/ice/virt/virtchnl.c b/drivers/net/ethernet/intel/ice/virt/virtchnl.c
index 9abfba8ae6bd..ca8018e3dd42 100644
--- a/drivers/net/ethernet/intel/ice/virt/virtchnl.c
+++ b/drivers/net/ethernet/intel/ice/virt/virtchnl.c
@@ -1658,7 +1658,7 @@ static int ice_vc_get_offload_vlan_v2_caps(struct ice_vf *vf)
goto out;
}
- caps = kzalloc_obj(*caps, GFP_KERNEL);
+ caps = kzalloc_obj(*caps);
if (!caps) {
v_ret = VIRTCHNL_STATUS_ERR_NO_MEMORY;
goto out;
@@ -2477,7 +2477,7 @@ static int ice_vc_get_phc_time(struct ice_vf *vf)
v_ret = VIRTCHNL_STATUS_SUCCESS;
- phc_time = kzalloc_obj(*phc_time, GFP_KERNEL);
+ phc_time = kzalloc_obj(*phc_time);
if (!phc_time) {
v_ret = VIRTCHNL_STATUS_ERR_NO_MEMORY;
goto err;
diff --git a/drivers/net/ethernet/intel/idpf/idpf_controlq.c b/drivers/net/ethernet/intel/idpf/idpf_controlq.c
index e3681dedc888..a964828ba46c 100644
--- a/drivers/net/ethernet/intel/idpf/idpf_controlq.c
+++ b/drivers/net/ethernet/intel/idpf/idpf_controlq.c
@@ -127,7 +127,7 @@ int idpf_ctlq_add(struct idpf_hw *hw,
bool is_rxq = false;
int err;
- cq = kzalloc_obj(*cq, GFP_KERNEL);
+ cq = kzalloc_obj(*cq);
if (!cq)
return -ENOMEM;
diff --git a/drivers/net/ethernet/intel/idpf/idpf_dev.c b/drivers/net/ethernet/intel/idpf/idpf_dev.c
index c7c38e22c975..1a0c71c95ef1 100644
--- a/drivers/net/ethernet/intel/idpf/idpf_dev.c
+++ b/drivers/net/ethernet/intel/idpf/idpf_dev.c
@@ -83,7 +83,7 @@ static int idpf_intr_reg_init(struct idpf_vport *vport,
u16 total_vecs;
total_vecs = idpf_get_reserved_vecs(vport->adapter);
- reg_vals = kzalloc_objs(struct idpf_vec_regs, total_vecs, GFP_KERNEL);
+ reg_vals = kzalloc_objs(struct idpf_vec_regs, total_vecs);
if (!reg_vals)
return -ENOMEM;
diff --git a/drivers/net/ethernet/intel/idpf/idpf_ethtool.c b/drivers/net/ethernet/intel/idpf/idpf_ethtool.c
index 8cfb09ff8ebd..cd211c559a59 100644
--- a/drivers/net/ethernet/intel/idpf/idpf_ethtool.c
+++ b/drivers/net/ethernet/intel/idpf/idpf_ethtool.c
@@ -204,7 +204,7 @@ static int idpf_add_flow_steer(struct net_device *netdev,
if (!rule)
return -ENOMEM;
- fltr = kzalloc_obj(*fltr, GFP_KERNEL);
+ fltr = kzalloc_obj(*fltr);
if (!fltr) {
err = -ENOMEM;
goto out_free_rule;
diff --git a/drivers/net/ethernet/intel/idpf/idpf_idc.c b/drivers/net/ethernet/intel/idpf/idpf_idc.c
index 42fb8659142a..bb2367ab3279 100644
--- a/drivers/net/ethernet/intel/idpf/idpf_idc.c
+++ b/drivers/net/ethernet/intel/idpf/idpf_idc.c
@@ -60,7 +60,7 @@ static int idpf_plug_vport_aux_dev(struct iidc_rdma_core_dev_info *cdev_info,
struct auxiliary_device *adev;
int ret;
- iadev = kzalloc_obj(*iadev, GFP_KERNEL);
+ iadev = kzalloc_obj(*iadev);
if (!iadev)
return -ENOMEM;
@@ -120,7 +120,7 @@ static int idpf_idc_init_aux_vport_dev(struct idpf_vport *vport)
if (!(le16_to_cpu(vport_msg->vport_flags) & VIRTCHNL2_VPORT_ENABLE_RDMA))
return 0;
- vport->vdev_info = kzalloc_obj(*vdev_info, GFP_KERNEL);
+ vport->vdev_info = kzalloc_obj(*vdev_info);
if (!vport->vdev_info)
return -ENOMEM;
@@ -198,7 +198,7 @@ static int idpf_plug_core_aux_dev(struct iidc_rdma_core_dev_info *cdev_info)
struct auxiliary_device *adev;
int ret;
- iadev = kzalloc_obj(*iadev, GFP_KERNEL);
+ iadev = kzalloc_obj(*iadev);
if (!iadev)
return -ENOMEM;
@@ -414,12 +414,12 @@ int idpf_idc_init_aux_core_dev(struct idpf_adapter *adapter,
struct iidc_rdma_priv_dev_info *privd;
int err, i;
- adapter->cdev_info = kzalloc_obj(*cdev_info, GFP_KERNEL);
+ adapter->cdev_info = kzalloc_obj(*cdev_info);
if (!adapter->cdev_info)
return -ENOMEM;
cdev_info = adapter->cdev_info;
- privd = kzalloc_obj(*privd, GFP_KERNEL);
+ privd = kzalloc_obj(*privd);
if (!privd) {
err = -ENOMEM;
goto err_privd_alloc;
diff --git a/drivers/net/ethernet/intel/idpf/idpf_lib.c b/drivers/net/ethernet/intel/idpf/idpf_lib.c
index a70f8ba7aad2..e17de31bb3bf 100644
--- a/drivers/net/ethernet/intel/idpf/idpf_lib.c
+++ b/drivers/net/ethernet/intel/idpf/idpf_lib.c
@@ -1239,7 +1239,7 @@ static struct idpf_vport *idpf_vport_alloc(struct idpf_adapter *adapter,
if (idx == IDPF_NO_FREE_SLOT)
return NULL;
- vport = kzalloc_obj(*vport, GFP_KERNEL);
+ vport = kzalloc_obj(*vport);
if (!vport)
return vport;
@@ -1248,14 +1248,14 @@ static struct idpf_vport *idpf_vport_alloc(struct idpf_adapter *adapter,
struct idpf_vport_config *vport_config;
struct idpf_q_coalesce *q_coal;
- vport_config = kzalloc_obj(*vport_config, GFP_KERNEL);
+ vport_config = kzalloc_obj(*vport_config);
if (!vport_config) {
kfree(vport);
return NULL;
}
- q_coal = kzalloc_objs(*q_coal, num_max_q, GFP_KERNEL);
+ q_coal = kzalloc_objs(*q_coal, num_max_q);
if (!q_coal) {
kfree(vport_config);
kfree(vport);
@@ -2027,7 +2027,7 @@ int idpf_initiate_soft_reset(struct idpf_vport *vport,
* error occurred, the existing vport will be untouched.
*
*/
- new_vport = kzalloc_obj(*vport, GFP_KERNEL);
+ new_vport = kzalloc_obj(*vport);
if (!new_vport)
return -ENOMEM;
diff --git a/drivers/net/ethernet/intel/idpf/idpf_main.c b/drivers/net/ethernet/intel/idpf/idpf_main.c
index be6760249dc8..0dd741dcfcdb 100644
--- a/drivers/net/ethernet/intel/idpf/idpf_main.c
+++ b/drivers/net/ethernet/intel/idpf/idpf_main.c
@@ -238,7 +238,7 @@ static int idpf_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
struct idpf_adapter *adapter;
int err;
- adapter = kzalloc_obj(*adapter, GFP_KERNEL);
+ adapter = kzalloc_obj(*adapter);
if (!adapter)
return -ENOMEM;
diff --git a/drivers/net/ethernet/intel/idpf/idpf_ptp.c b/drivers/net/ethernet/intel/idpf/idpf_ptp.c
index c098d3f66a34..eec91c4f0a75 100644
--- a/drivers/net/ethernet/intel/idpf/idpf_ptp.c
+++ b/drivers/net/ethernet/intel/idpf/idpf_ptp.c
@@ -936,7 +936,7 @@ int idpf_ptp_init(struct idpf_adapter *adapter)
return -EOPNOTSUPP;
}
- adapter->ptp = kzalloc_obj(*adapter->ptp, GFP_KERNEL);
+ adapter->ptp = kzalloc_obj(*adapter->ptp);
if (!adapter->ptp)
return -ENOMEM;
diff --git a/drivers/net/ethernet/intel/idpf/idpf_txrx.c b/drivers/net/ethernet/intel/idpf/idpf_txrx.c
index 259316af9ec5..3eeac3fa3b89 100644
--- a/drivers/net/ethernet/intel/idpf/idpf_txrx.c
+++ b/drivers/net/ethernet/intel/idpf/idpf_txrx.c
@@ -1439,7 +1439,7 @@ static int idpf_vport_init_fast_path_txqs(struct idpf_vport *vport,
struct work_struct *tstamp_task = &vport->tstamp_task;
int k = 0;
- vport->txqs = kzalloc_objs(*vport->txqs, rsrc->num_txq, GFP_KERNEL);
+ vport->txqs = kzalloc_objs(*vport->txqs, rsrc->num_txq);
if (!vport->txqs)
return -ENOMEM;
@@ -1755,7 +1755,7 @@ static int idpf_txq_group_alloc(struct idpf_vport *vport,
idpf_queue_set(FLOW_SCH_EN, q);
- q->refillq = kzalloc_obj(*q->refillq, GFP_KERNEL);
+ q->refillq = kzalloc_obj(*q->refillq);
if (!q->refillq)
goto err_alloc;
@@ -1833,7 +1833,7 @@ static int idpf_rxq_group_alloc(struct idpf_vport *vport,
for (unsigned int j = 0; j < num_rxq; j++) {
rx_qgrp->splitq.rxq_sets[j] =
- kzalloc_obj(struct idpf_rxq_set, GFP_KERNEL);
+ kzalloc_obj(struct idpf_rxq_set);
if (!rx_qgrp->splitq.rxq_sets[j]) {
err = -ENOMEM;
goto err_alloc;
diff --git a/drivers/net/ethernet/intel/idpf/idpf_vf_dev.c b/drivers/net/ethernet/intel/idpf/idpf_vf_dev.c
index 57559a2bc9dd..a07d7e808ca9 100644
--- a/drivers/net/ethernet/intel/idpf/idpf_vf_dev.c
+++ b/drivers/net/ethernet/intel/idpf/idpf_vf_dev.c
@@ -82,7 +82,7 @@ static int idpf_vf_intr_reg_init(struct idpf_vport *vport,
u16 total_vecs;
total_vecs = idpf_get_reserved_vecs(vport->adapter);
- reg_vals = kzalloc_objs(struct idpf_vec_regs, total_vecs, GFP_KERNEL);
+ reg_vals = kzalloc_objs(struct idpf_vec_regs, total_vecs);
if (!reg_vals)
return -ENOMEM;
diff --git a/drivers/net/ethernet/intel/idpf/idpf_virtchnl.c b/drivers/net/ethernet/intel/idpf/idpf_virtchnl.c
index f1a8ae9d8118..c03810c03f37 100644
--- a/drivers/net/ethernet/intel/idpf/idpf_virtchnl.c
+++ b/drivers/net/ethernet/intel/idpf/idpf_virtchnl.c
@@ -1059,7 +1059,7 @@ static int idpf_send_get_lan_memory_regions(struct idpf_adapter *adapter)
return -EINVAL;
hw = &adapter->hw;
- hw->lan_regs = kzalloc_objs(*hw->lan_regs, num_regions, GFP_KERNEL);
+ hw->lan_regs = kzalloc_objs(*hw->lan_regs, num_regions);
if (!hw->lan_regs)
return -ENOMEM;
@@ -1091,7 +1091,7 @@ static int idpf_calc_remaining_mmio_regs(struct idpf_adapter *adapter)
struct idpf_hw *hw = &adapter->hw;
hw->num_lan_regs = IDPF_MMIO_MAP_FALLBACK_MAX_REMAINING;
- hw->lan_regs = kzalloc_objs(*hw->lan_regs, hw->num_lan_regs, GFP_KERNEL);
+ hw->lan_regs = kzalloc_objs(*hw->lan_regs, hw->num_lan_regs);
if (!hw->lan_regs)
return -ENOMEM;
@@ -1844,7 +1844,7 @@ static int idpf_send_config_tx_queue_set_msg(const struct idpf_queue_set *qs)
.chunk_sz = sizeof(*qi),
};
- qi = kzalloc_objs(*qi, qs->num, GFP_KERNEL);
+ qi = kzalloc_objs(*qi, qs->num);
if (!qi)
return -ENOMEM;
@@ -2033,7 +2033,7 @@ static int idpf_send_config_rx_queue_set_msg(const struct idpf_queue_set *qs)
.chunk_sz = sizeof(*qi),
};
- qi = kzalloc_objs(*qi, qs->num, GFP_KERNEL);
+ qi = kzalloc_objs(*qi, qs->num);
if (!qi)
return -ENOMEM;
@@ -2160,7 +2160,7 @@ static int idpf_send_ena_dis_queue_set_msg(const struct idpf_queue_set *qs,
.num_chunks = qs->num,
};
- qc = kzalloc_objs(*qc, qs->num, GFP_KERNEL);
+ qc = kzalloc_objs(*qc, qs->num);
if (!qc)
return -ENOMEM;
@@ -2327,7 +2327,7 @@ idpf_send_map_unmap_queue_set_vector_msg(const struct idpf_queue_set *qs,
};
bool split;
- vqv = kzalloc_objs(*vqv, qs->num, GFP_KERNEL);
+ vqv = kzalloc_objs(*vqv, qs->num);
if (!vqv)
return -ENOMEM;
@@ -3202,11 +3202,11 @@ static int idpf_send_get_rx_ptype_msg(struct idpf_adapter *adapter)
if (!singleq_pt_lkup)
return -ENOMEM;
- splitq_pt_lkup = kzalloc_objs(*splitq_pt_lkup, max_ptype, GFP_KERNEL);
+ splitq_pt_lkup = kzalloc_objs(*splitq_pt_lkup, max_ptype);
if (!splitq_pt_lkup)
return -ENOMEM;
- get_ptype_info = kzalloc_obj(*get_ptype_info, GFP_KERNEL);
+ get_ptype_info = kzalloc_obj(*get_ptype_info);
if (!get_ptype_info)
return -ENOMEM;
diff --git a/drivers/net/ethernet/intel/idpf/idpf_virtchnl_ptp.c b/drivers/net/ethernet/intel/idpf/idpf_virtchnl_ptp.c
index 2980164ba9fb..1c4ce3ac6bbf 100644
--- a/drivers/net/ethernet/intel/idpf/idpf_virtchnl_ptp.c
+++ b/drivers/net/ethernet/intel/idpf/idpf_virtchnl_ptp.c
@@ -395,7 +395,7 @@ int idpf_ptp_get_vport_tstamps_caps(struct idpf_vport *vport)
for (u16 i = 0; i < tstamp_caps->num_entries; i++) {
__le32 offset_l, offset_h;
- ptp_tx_tstamp = kzalloc_obj(*ptp_tx_tstamp, GFP_KERNEL);
+ ptp_tx_tstamp = kzalloc_obj(*ptp_tx_tstamp);
if (!ptp_tx_tstamp) {
err = -ENOMEM;
goto err_free_ptp_tx_stamp_list;
diff --git a/drivers/net/ethernet/intel/idpf/xdp.c b/drivers/net/ethernet/intel/idpf/xdp.c
index a94bde86f84f..6ac9c6624c2a 100644
--- a/drivers/net/ethernet/intel/idpf/xdp.c
+++ b/drivers/net/ethernet/intel/idpf/xdp.c
@@ -154,7 +154,7 @@ int idpf_xdpsqs_get(const struct idpf_vport *vport)
if (!idpf_xdp_enabled(vport))
return 0;
- timers = kvzalloc_objs(*timers, vport->num_xdp_txq, GFP_KERNEL);
+ timers = kvzalloc_objs(*timers, vport->num_xdp_txq);
if (!timers)
return -ENOMEM;
diff --git a/drivers/net/ethernet/intel/igb/igb_ethtool.c b/drivers/net/ethernet/intel/igb/igb_ethtool.c
index 117d2a0ca620..f7938c1da835 100644
--- a/drivers/net/ethernet/intel/igb/igb_ethtool.c
+++ b/drivers/net/ethernet/intel/igb/igb_ethtool.c
@@ -2919,7 +2919,7 @@ static int igb_add_ethtool_nfc_entry(struct igb_adapter *adapter,
if ((fsp->flow_type & ~FLOW_EXT) != ETHER_FLOW)
return -EINVAL;
- input = kzalloc_obj(*input, GFP_KERNEL);
+ input = kzalloc_obj(*input);
if (!input)
return -ENOMEM;
diff --git a/drivers/net/ethernet/intel/igb/igb_main.c b/drivers/net/ethernet/intel/igb/igb_main.c
index 5dc97daf6ac1..223a10cae4a9 100644
--- a/drivers/net/ethernet/intel/igb/igb_main.c
+++ b/drivers/net/ethernet/intel/igb/igb_main.c
@@ -2711,7 +2711,7 @@ static int igb_configure_clsflower(struct igb_adapter *adapter,
return -EINVAL;
}
- filter = kzalloc_obj(*filter, GFP_KERNEL);
+ filter = kzalloc_obj(*filter);
if (!filter)
return -ENOMEM;
diff --git a/drivers/net/ethernet/intel/igbvf/netdev.c b/drivers/net/ethernet/intel/igbvf/netdev.c
index 72ea2e6ce15b..5d04541072b3 100644
--- a/drivers/net/ethernet/intel/igbvf/netdev.c
+++ b/drivers/net/ethernet/intel/igbvf/netdev.c
@@ -1017,7 +1017,7 @@ static void igbvf_set_interrupt_capability(struct igbvf_adapter *adapter)
int i;
/* we allocate 3 vectors, 1 for Tx, 1 for Rx, one for PF messages */
- adapter->msix_entries = kzalloc_objs(struct msix_entry, 3, GFP_KERNEL);
+ adapter->msix_entries = kzalloc_objs(struct msix_entry, 3);
if (adapter->msix_entries) {
for (i = 0; i < 3; i++)
adapter->msix_entries[i].entry = i;
@@ -1097,11 +1097,11 @@ static int igbvf_alloc_queues(struct igbvf_adapter *adapter)
{
struct net_device *netdev = adapter->netdev;
- adapter->tx_ring = kzalloc_obj(struct igbvf_ring, GFP_KERNEL);
+ adapter->tx_ring = kzalloc_obj(struct igbvf_ring);
if (!adapter->tx_ring)
return -ENOMEM;
- adapter->rx_ring = kzalloc_obj(struct igbvf_ring, GFP_KERNEL);
+ adapter->rx_ring = kzalloc_obj(struct igbvf_ring);
if (!adapter->rx_ring) {
kfree(adapter->tx_ring);
return -ENOMEM;
diff --git a/drivers/net/ethernet/intel/igc/igc_ethtool.c b/drivers/net/ethernet/intel/igc/igc_ethtool.c
index 35b74213ca8b..0122009bedd0 100644
--- a/drivers/net/ethernet/intel/igc/igc_ethtool.c
+++ b/drivers/net/ethernet/intel/igc/igc_ethtool.c
@@ -1395,7 +1395,7 @@ static int igc_ethtool_add_nfc_rule(struct igc_adapter *adapter,
return -EINVAL;
}
- rule = kzalloc_obj(*rule, GFP_KERNEL);
+ rule = kzalloc_obj(*rule);
if (!rule)
return -ENOMEM;
diff --git a/drivers/net/ethernet/intel/igc/igc_leds.c b/drivers/net/ethernet/intel/igc/igc_leds.c
index d6e011695adc..fdb9692516e8 100644
--- a/drivers/net/ethernet/intel/igc/igc_leds.c
+++ b/drivers/net/ethernet/intel/igc/igc_leds.c
@@ -268,7 +268,7 @@ int igc_led_setup(struct igc_adapter *adapter)
mutex_init(&adapter->led_mutex);
- leds = kzalloc_objs(*leds, IGC_NUM_LEDS, GFP_KERNEL);
+ leds = kzalloc_objs(*leds, IGC_NUM_LEDS);
if (!leds)
return -ENOMEM;
diff --git a/drivers/net/ethernet/intel/ixgbe/devlink/devlink.c b/drivers/net/ethernet/intel/ixgbe/devlink/devlink.c
index 165a8f12745f..b0404f37271a 100644
--- a/drivers/net/ethernet/intel/ixgbe/devlink/devlink.c
+++ b/drivers/net/ethernet/intel/ixgbe/devlink/devlink.c
@@ -318,7 +318,7 @@ static int ixgbe_devlink_info_get(struct devlink *devlink,
struct ixgbe_info_ctx *ctx;
int err;
- ctx = kmalloc_obj(*ctx, GFP_KERNEL);
+ ctx = kmalloc_obj(*ctx);
if (!ctx)
return -ENOMEM;
diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_e610.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_e610.c
index f8a4331e8fe3..52f73142ff75 100644
--- a/drivers/net/ethernet/intel/ixgbe/ixgbe_e610.c
+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_e610.c
@@ -1285,7 +1285,7 @@ int ixgbe_update_link_info(struct ixgbe_hw *hw)
if (!(li->link_info & IXGBE_ACI_MEDIA_AVAILABLE))
return 0;
- pcaps = kzalloc_obj(*pcaps, GFP_KERNEL);
+ pcaps = kzalloc_obj(*pcaps);
if (!pcaps)
return -ENOMEM;
diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_fw_update.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_fw_update.c
index c44c9bf53cc4..ffceaef8502f 100644
--- a/drivers/net/ethernet/intel/ixgbe/ixgbe_fw_update.c
+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_fw_update.c
@@ -516,7 +516,7 @@ int ixgbe_get_pending_updates(struct ixgbe_adapter *adapter, u8 *pending,
struct ixgbe_hw *hw = &adapter->hw;
int err;
- dev_caps = kzalloc_obj(*dev_caps, GFP_KERNEL);
+ dev_caps = kzalloc_obj(*dev_caps);
if (!dev_caps)
return -ENOMEM;
diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_ipsec.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_ipsec.c
index 6da3e52cea7a..bd397b3d7dea 100644
--- a/drivers/net/ethernet/intel/ixgbe/ixgbe_ipsec.c
+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_ipsec.c
@@ -1233,7 +1233,7 @@ void ixgbe_init_ipsec_offload(struct ixgbe_adapter *adapter)
if (t_dis || r_dis)
return;
- ipsec = kzalloc_obj(*ipsec, GFP_KERNEL);
+ ipsec = kzalloc_obj(*ipsec);
if (!ipsec)
goto err1;
hash_init(ipsec->rx_sa_list);
diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
index 59b3acb62134..e0e6234000bc 100644
--- a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
@@ -10272,15 +10272,15 @@ static int ixgbe_configure_clsu32(struct ixgbe_adapter *adapter,
(__force u32)cls->knode.sel->offmask)
return err;
- jump = kzalloc_obj(*jump, GFP_KERNEL);
+ jump = kzalloc_obj(*jump);
if (!jump)
return -ENOMEM;
- input = kzalloc_obj(*input, GFP_KERNEL);
+ input = kzalloc_obj(*input);
if (!input) {
err = -ENOMEM;
goto free_jump;
}
- mask = kzalloc_obj(*mask, GFP_KERNEL);
+ mask = kzalloc_obj(*mask);
if (!mask) {
err = -ENOMEM;
goto free_input;
@@ -10304,10 +10304,10 @@ static int ixgbe_configure_clsu32(struct ixgbe_adapter *adapter,
return 0;
}
- input = kzalloc_obj(*input, GFP_KERNEL);
+ input = kzalloc_obj(*input);
if (!input)
return -ENOMEM;
- mask = kzalloc_obj(*mask, GFP_KERNEL);
+ mask = kzalloc_obj(*mask);
if (!mask) {
err = -ENOMEM;
goto free_input;
@@ -10785,7 +10785,7 @@ static void *ixgbe_fwd_add(struct net_device *pdev, struct net_device *vdev)
return ERR_PTR(-ENOMEM);
}
- accel = kzalloc_obj(*accel, GFP_KERNEL);
+ accel = kzalloc_obj(*accel);
if (!accel)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_sriov.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_sriov.c
index 40dfdf62ab33..e222627b7855 100644
--- a/drivers/net/ethernet/intel/ixgbe/ixgbe_sriov.c
+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_sriov.c
@@ -37,7 +37,7 @@ static inline void ixgbe_alloc_vf_macvlans(struct ixgbe_adapter *adapter,
if (!num_vf_macvlans)
return;
- mv_list = kzalloc_objs(struct vf_macvlans, num_vf_macvlans, GFP_KERNEL);
+ mv_list = kzalloc_objs(struct vf_macvlans, num_vf_macvlans);
if (mv_list) {
for (i = 0; i < num_vf_macvlans; i++) {
mv_list[i].vf = -1;
diff --git a/drivers/net/ethernet/intel/ixgbevf/ipsec.c b/drivers/net/ethernet/intel/ixgbevf/ipsec.c
index 780ebcdbd4a7..076fd0a24858 100644
--- a/drivers/net/ethernet/intel/ixgbevf/ipsec.c
+++ b/drivers/net/ethernet/intel/ixgbevf/ipsec.c
@@ -628,7 +628,7 @@ void ixgbevf_init_ipsec_offload(struct ixgbevf_adapter *adapter)
return;
}
- ipsec = kzalloc_obj(*ipsec, GFP_KERNEL);
+ ipsec = kzalloc_obj(*ipsec);
if (!ipsec)
goto err1;
hash_init(ipsec->rx_sa_list);
diff --git a/drivers/net/ethernet/intel/libie/fwlog.c b/drivers/net/ethernet/intel/libie/fwlog.c
index 5b69a26ef2bd..5df25e5fbabd 100644
--- a/drivers/net/ethernet/intel/libie/fwlog.c
+++ b/drivers/net/ethernet/intel/libie/fwlog.c
@@ -153,7 +153,7 @@ static void libie_fwlog_realloc_rings(struct libie_fwlog *fwlog, int index)
* old rings and buffers. that way if we don't have enough
* memory then we at least have what we had before
*/
- ring.rings = kzalloc_objs(*ring.rings, ring_size, GFP_KERNEL);
+ ring.rings = kzalloc_objs(*ring.rings, ring_size);
if (!ring.rings)
return;
@@ -208,7 +208,7 @@ libie_aq_fwlog_set(struct libie_fwlog *fwlog,
int status;
int i;
- fw_modules = kzalloc_objs(*fw_modules, num_entries, GFP_KERNEL);
+ fw_modules = kzalloc_objs(*fw_modules, num_entries);
if (!fw_modules)
return -ENOMEM;
@@ -978,7 +978,7 @@ static void libie_fwlog_set_supported(struct libie_fwlog *fwlog)
fwlog->supported = false;
- cfg = kzalloc_obj(*cfg, GFP_KERNEL);
+ cfg = kzalloc_obj(*cfg);
if (!cfg)
return;
diff --git a/drivers/net/ethernet/marvell/mv643xx_eth.c b/drivers/net/ethernet/marvell/mv643xx_eth.c
index 1bc31e0b443d..f9055b3d6fb1 100644
--- a/drivers/net/ethernet/marvell/mv643xx_eth.c
+++ b/drivers/net/ethernet/marvell/mv643xx_eth.c
@@ -1967,7 +1967,7 @@ static int rxq_init(struct mv643xx_eth_private *mp, int index)
memset(rxq->rx_desc_area, 0, size);
rxq->rx_desc_area_size = size;
- rxq->rx_skb = kzalloc_objs(*rxq->rx_skb, rxq->rx_ring_size, GFP_KERNEL);
+ rxq->rx_skb = kzalloc_objs(*rxq->rx_skb, rxq->rx_ring_size);
if (rxq->rx_skb == NULL)
goto out_free;
diff --git a/drivers/net/ethernet/marvell/mvneta.c b/drivers/net/ethernet/marvell/mvneta.c
index c058df3bb85f..9ba4aef7080c 100644
--- a/drivers/net/ethernet/marvell/mvneta.c
+++ b/drivers/net/ethernet/marvell/mvneta.c
@@ -3554,7 +3554,7 @@ static int mvneta_txq_sw_init(struct mvneta_port *pp,
txq->last_desc = txq->size - 1;
- txq->buf = kmalloc_objs(*txq->buf, txq->size, GFP_KERNEL);
+ txq->buf = kmalloc_objs(*txq->buf, txq->size);
if (!txq->buf)
return -ENOMEM;
diff --git a/drivers/net/ethernet/marvell/mvpp2/mvpp2_cls.c b/drivers/net/ethernet/marvell/mvpp2/mvpp2_cls.c
index 83ba45f54180..80d15d7a5ec3 100644
--- a/drivers/net/ethernet/marvell/mvpp2/mvpp2_cls.c
+++ b/drivers/net/ethernet/marvell/mvpp2/mvpp2_cls.c
@@ -1367,7 +1367,7 @@ int mvpp2_ethtool_cls_rule_ins(struct mvpp2_port *port,
if (info->fs.location >= MVPP2_N_RFS_ENTRIES_PER_FLOW)
return -EINVAL;
- efs = kzalloc_obj(*efs, GFP_KERNEL);
+ efs = kzalloc_obj(*efs);
if (!efs)
return -ENOMEM;
@@ -1503,7 +1503,7 @@ static int mvpp22_rss_context_create(struct mvpp2_port *port, u32 *rss_ctx)
if (ctx == MVPP22_N_RSS_TABLES)
return -EINVAL;
- priv->rss_tables[ctx] = kzalloc_obj(*priv->rss_tables[ctx], GFP_KERNEL);
+ priv->rss_tables[ctx] = kzalloc_obj(*priv->rss_tables[ctx]);
if (!priv->rss_tables[ctx])
return -ENOMEM;
diff --git a/drivers/net/ethernet/marvell/mvpp2/mvpp2_debugfs.c b/drivers/net/ethernet/marvell/mvpp2/mvpp2_debugfs.c
index 2aef0c77f4d6..7adc9cd54bf6 100644
--- a/drivers/net/ethernet/marvell/mvpp2/mvpp2_debugfs.c
+++ b/drivers/net/ethernet/marvell/mvpp2/mvpp2_debugfs.c
@@ -706,7 +706,7 @@ void mvpp2_dbgfs_init(struct mvpp2 *priv, const char *name)
mvpp2_dir = debugfs_create_dir(name, mvpp2_root);
priv->dbgfs_dir = mvpp2_dir;
- priv->dbgfs_entries = kzalloc_obj(*priv->dbgfs_entries, GFP_KERNEL);
+ priv->dbgfs_entries = kzalloc_obj(*priv->dbgfs_entries);
if (!priv->dbgfs_entries)
goto err;
diff --git a/drivers/net/ethernet/marvell/octeon_ep/octep_main.c b/drivers/net/ethernet/marvell/octeon_ep/octep_main.c
index fd9abcfeb4e0..3dab841f64ff 100644
--- a/drivers/net/ethernet/marvell/octeon_ep/octep_main.c
+++ b/drivers/net/ethernet/marvell/octeon_ep/octep_main.c
@@ -1293,7 +1293,7 @@ int octep_device_setup(struct octep_device *oct)
int i, ret;
/* allocate memory for oct->conf */
- oct->conf = kzalloc_obj(*oct->conf, GFP_KERNEL);
+ oct->conf = kzalloc_obj(*oct->conf);
if (!oct->conf)
return -ENOMEM;
diff --git a/drivers/net/ethernet/marvell/octeon_ep_vf/octep_vf_main.c b/drivers/net/ethernet/marvell/octeon_ep_vf/octep_vf_main.c
index b794b517c304..4bf13cc76a9f 100644
--- a/drivers/net/ethernet/marvell/octeon_ep_vf/octep_vf_main.c
+++ b/drivers/net/ethernet/marvell/octeon_ep_vf/octep_vf_main.c
@@ -952,7 +952,7 @@ int octep_vf_device_setup(struct octep_vf_device *oct)
struct pci_dev *pdev = oct->pdev;
/* allocate memory for oct->conf */
- oct->conf = kzalloc_obj(*oct->conf, GFP_KERNEL);
+ oct->conf = kzalloc_obj(*oct->conf);
if (!oct->conf)
return -ENOMEM;
diff --git a/drivers/net/ethernet/marvell/octeontx2/af/cgx.c b/drivers/net/ethernet/marvell/octeontx2/af/cgx.c
index dc4537623578..6000795823a3 100644
--- a/drivers/net/ethernet/marvell/octeontx2/af/cgx.c
+++ b/drivers/net/ethernet/marvell/octeontx2/af/cgx.c
@@ -1725,7 +1725,7 @@ static int cgx_lmac_init(struct cgx *cgx)
cgx->lmac_count = cgx->max_lmac_per_mac;
for (i = 0; i < cgx->lmac_count; i++) {
- lmac = kzalloc_obj(struct lmac, GFP_KERNEL);
+ lmac = kzalloc_obj(struct lmac);
if (!lmac)
return -ENOMEM;
lmac->name = kcalloc(1, sizeof("cgx_fwi_xxx_yyy"), GFP_KERNEL);
diff --git a/drivers/net/ethernet/marvell/octeontx2/af/mbox.c b/drivers/net/ethernet/marvell/octeontx2/af/mbox.c
index ad62be730bbc..d343f1704d07 100644
--- a/drivers/net/ethernet/marvell/octeontx2/af/mbox.c
+++ b/drivers/net/ethernet/marvell/octeontx2/af/mbox.c
@@ -133,7 +133,7 @@ int cn20k_mbox_setup(struct otx2_mbox *mbox, struct pci_dev *pdev,
mbox->reg_base = reg_base;
mbox->pdev = pdev;
- mbox->dev = kzalloc_objs(struct otx2_mbox_dev, ndevs, GFP_KERNEL);
+ mbox->dev = kzalloc_objs(struct otx2_mbox_dev, ndevs);
if (!mbox->dev) {
otx2_mbox_destroy(mbox);
return -ENOMEM;
@@ -211,7 +211,7 @@ static int otx2_mbox_setup(struct otx2_mbox *mbox, struct pci_dev *pdev,
mbox->reg_base = reg_base;
mbox->pdev = pdev;
- mbox->dev = kzalloc_objs(struct otx2_mbox_dev, ndevs, GFP_KERNEL);
+ mbox->dev = kzalloc_objs(struct otx2_mbox_dev, ndevs);
if (!mbox->dev) {
otx2_mbox_destroy(mbox);
return -ENOMEM;
diff --git a/drivers/net/ethernet/marvell/octeontx2/af/ptp.c b/drivers/net/ethernet/marvell/octeontx2/af/ptp.c
index f38b5addd4d8..58e62e955554 100644
--- a/drivers/net/ethernet/marvell/octeontx2/af/ptp.c
+++ b/drivers/net/ethernet/marvell/octeontx2/af/ptp.c
@@ -520,7 +520,7 @@ static int ptp_probe(struct pci_dev *pdev,
struct ptp *ptp;
int err;
- ptp = kzalloc_obj(*ptp, GFP_KERNEL);
+ ptp = kzalloc_obj(*ptp);
if (!ptp) {
err = -ENOMEM;
goto error;
diff --git a/drivers/net/ethernet/marvell/octeontx2/af/rvu.c b/drivers/net/ethernet/marvell/octeontx2/af/rvu.c
index 2e3b3345a362..5b1129558e8b 100644
--- a/drivers/net/ethernet/marvell/octeontx2/af/rvu.c
+++ b/drivers/net/ethernet/marvell/octeontx2/af/rvu.c
@@ -2516,7 +2516,7 @@ static int rvu_mbox_init(struct rvu *rvu, struct mbox_wq_info *mw,
if (!pf_bmap)
return -ENOMEM;
- ng_rvu_mbox = kzalloc_obj(*ng_rvu_mbox, GFP_KERNEL);
+ ng_rvu_mbox = kzalloc_obj(*ng_rvu_mbox);
if (!ng_rvu_mbox) {
err = -ENOMEM;
goto free_bitmap;
diff --git a/drivers/net/ethernet/marvell/octeontx2/af/rvu_cgx.c b/drivers/net/ethernet/marvell/octeontx2/af/rvu_cgx.c
index b9980253dcb0..4ff3935ed3fe 100644
--- a/drivers/net/ethernet/marvell/octeontx2/af/rvu_cgx.c
+++ b/drivers/net/ethernet/marvell/octeontx2/af/rvu_cgx.c
@@ -184,7 +184,7 @@ static int rvu_cgx_send_link_info(int cgx_id, int lmac_id, struct rvu *rvu)
unsigned long flags;
int err;
- qentry = kmalloc_obj(*qentry, GFP_KERNEL);
+ qentry = kmalloc_obj(*qentry);
if (!qentry)
return -ENOMEM;
diff --git a/drivers/net/ethernet/marvell/octeontx2/af/rvu_devlink.c b/drivers/net/ethernet/marvell/octeontx2/af/rvu_devlink.c
index 71c411d8eb83..fb15c794efc9 100644
--- a/drivers/net/ethernet/marvell/octeontx2/af/rvu_devlink.c
+++ b/drivers/net/ethernet/marvell/octeontx2/af/rvu_devlink.c
@@ -494,12 +494,12 @@ static int rvu_nix_register_reporters(struct rvu_devlink *rvu_dl)
struct rvu_nix_event_ctx *nix_event_context;
struct rvu *rvu = rvu_dl->rvu;
- rvu_reporters = kzalloc_obj(*rvu_reporters, GFP_KERNEL);
+ rvu_reporters = kzalloc_obj(*rvu_reporters);
if (!rvu_reporters)
return -ENOMEM;
rvu_dl->rvu_nix_health_reporter = rvu_reporters;
- nix_event_context = kzalloc_obj(*nix_event_context, GFP_KERNEL);
+ nix_event_context = kzalloc_obj(*nix_event_context);
if (!nix_event_context)
return -ENOMEM;
@@ -1048,12 +1048,12 @@ static int rvu_npa_register_reporters(struct rvu_devlink *rvu_dl)
struct rvu_npa_event_ctx *npa_event_context;
struct rvu *rvu = rvu_dl->rvu;
- rvu_reporters = kzalloc_obj(*rvu_reporters, GFP_KERNEL);
+ rvu_reporters = kzalloc_obj(*rvu_reporters);
if (!rvu_reporters)
return -ENOMEM;
rvu_dl->rvu_npa_health_reporter = rvu_reporters;
- npa_event_context = kzalloc_obj(*npa_event_context, GFP_KERNEL);
+ npa_event_context = kzalloc_obj(*npa_event_context);
if (!npa_event_context)
return -ENOMEM;
diff --git a/drivers/net/ethernet/marvell/octeontx2/af/rvu_nix.c b/drivers/net/ethernet/marvell/octeontx2/af/rvu_nix.c
index 0964a85b536f..98dd68137a09 100644
--- a/drivers/net/ethernet/marvell/octeontx2/af/rvu_nix.c
+++ b/drivers/net/ethernet/marvell/octeontx2/af/rvu_nix.c
@@ -2455,7 +2455,7 @@ static int nix_smq_flush(struct rvu *rvu, int blkaddr,
}
/* XOFF all TL2s whose parent TL1 matches SMQ tree TL1 */
- smq_flush_ctx = kzalloc_obj(*smq_flush_ctx, GFP_KERNEL);
+ smq_flush_ctx = kzalloc_obj(*smq_flush_ctx);
if (!smq_flush_ctx)
return -ENOMEM;
nix_smq_flush_fill_ctx(rvu, blkaddr, smq, smq_flush_ctx);
@@ -3373,7 +3373,7 @@ static int nix_add_mce_list_entry(struct rvu *rvu,
mce_list = &elem->mcast_mce_list;
for (i = 0; i < num_entry; i++) {
- mce = kzalloc_obj(*mce, GFP_KERNEL);
+ mce = kzalloc_obj(*mce);
if (!mce)
goto free_mce;
@@ -3435,7 +3435,7 @@ static int nix_update_mce_list_entry(struct nix_mce_list *mce_list,
return 0;
/* Add a new one to the list, at the tail */
- mce = kzalloc_obj(*mce, GFP_KERNEL);
+ mce = kzalloc_obj(*mce);
if (!mce)
return -ENOMEM;
mce->pcifunc = pcifunc;
@@ -6420,7 +6420,7 @@ int rvu_mbox_handler_nix_mcast_grp_create(struct rvu *rvu,
return err;
mcast_grp = &nix_hw->mcast_grp;
- elem = kzalloc_obj(*elem, GFP_KERNEL);
+ elem = kzalloc_obj(*elem);
if (!elem)
return -ENOMEM;
diff --git a/drivers/net/ethernet/marvell/octeontx2/af/rvu_npc_fs.c b/drivers/net/ethernet/marvell/octeontx2/af/rvu_npc_fs.c
index 1b7dd4e771c7..1930b54e72f2 100644
--- a/drivers/net/ethernet/marvell/octeontx2/af/rvu_npc_fs.c
+++ b/drivers/net/ethernet/marvell/octeontx2/af/rvu_npc_fs.c
@@ -1297,7 +1297,7 @@ static int npc_install_flow(struct rvu *rvu, int blkaddr, u16 target,
find_rule:
rule = rvu_mcam_find_rule(mcam, entry_index);
if (!rule) {
- rule = kzalloc_obj(*rule, GFP_KERNEL);
+ rule = kzalloc_obj(*rule);
if (!rule)
return -ENOMEM;
new = true;
@@ -1741,7 +1741,7 @@ int npc_install_mcam_drop_rule(struct rvu *rvu, int mcam_idx, u16 *counter_idx,
}
/* Add this entry to mcam rules list */
- rule = kzalloc_obj(*rule, GFP_KERNEL);
+ rule = kzalloc_obj(*rule);
if (!rule)
return -ENOMEM;
diff --git a/drivers/net/ethernet/marvell/octeontx2/af/rvu_npc_hash.c b/drivers/net/ethernet/marvell/octeontx2/af/rvu_npc_hash.c
index 7ed5750435c1..906d712cef19 100644
--- a/drivers/net/ethernet/marvell/octeontx2/af/rvu_npc_hash.c
+++ b/drivers/net/ethernet/marvell/octeontx2/af/rvu_npc_hash.c
@@ -796,7 +796,7 @@ static int rvu_npc_exact_add_to_list(struct rvu *rvu, enum npc_exact_opc_type op
return -EFAULT;
}
- entry = kmalloc_obj(*entry, GFP_KERNEL);
+ entry = kmalloc_obj(*entry);
if (!entry) {
rvu_npc_exact_free_id(rvu, *seq_id);
dev_err(rvu->dev, "%s: Memory allocation failed\n", __func__);
@@ -1896,7 +1896,7 @@ int rvu_npc_exact_init(struct rvu *rvu)
/* Set capability to true */
rvu->hw->cap.npc_exact_match_enabled = true;
- table = kzalloc_obj(*table, GFP_KERNEL);
+ table = kzalloc_obj(*table);
if (!table)
return -ENOMEM;
diff --git a/drivers/net/ethernet/marvell/octeontx2/nic/cn10k_macsec.c b/drivers/net/ethernet/marvell/octeontx2/nic/cn10k_macsec.c
index 5f90f38071da..4649996dc7da 100644
--- a/drivers/net/ethernet/marvell/octeontx2/nic/cn10k_macsec.c
+++ b/drivers/net/ethernet/marvell/octeontx2/nic/cn10k_macsec.c
@@ -914,7 +914,7 @@ static struct cn10k_mcs_txsc *cn10k_mcs_create_txsc(struct otx2_nic *pfvf)
struct cn10k_mcs_txsc *txsc;
int ret;
- txsc = kzalloc_obj(*txsc, GFP_KERNEL);
+ txsc = kzalloc_obj(*txsc);
if (!txsc)
return ERR_PTR(-ENOMEM);
@@ -987,7 +987,7 @@ static struct cn10k_mcs_rxsc *cn10k_mcs_create_rxsc(struct otx2_nic *pfvf)
struct cn10k_mcs_rxsc *rxsc;
int ret;
- rxsc = kzalloc_obj(*rxsc, GFP_KERNEL);
+ rxsc = kzalloc_obj(*rxsc);
if (!rxsc)
return ERR_PTR(-ENOMEM);
@@ -1772,7 +1772,7 @@ int cn10k_mcs_init(struct otx2_nic *pfvf)
if (!test_bit(CN10K_HW_MACSEC, &pfvf->hw.cap_flag))
return 0;
- cfg = kzalloc_obj(*cfg, GFP_KERNEL);
+ cfg = kzalloc_obj(*cfg);
if (!cfg)
return -ENOMEM;
diff --git a/drivers/net/ethernet/marvell/octeontx2/nic/otx2_common.c b/drivers/net/ethernet/marvell/octeontx2/nic/otx2_common.c
index 768503b255fb..971fcab1c248 100644
--- a/drivers/net/ethernet/marvell/octeontx2/nic/otx2_common.c
+++ b/drivers/net/ethernet/marvell/octeontx2/nic/otx2_common.c
@@ -1005,7 +1005,7 @@ int otx2_sq_init(struct otx2_nic *pfvf, u16 qidx, u16 sqb_aura)
}
sq->sqe_base = sq->sqe->base;
- sq->sg = kzalloc_objs(struct sg_list, qset->sqe_cnt, GFP_KERNEL);
+ sq->sg = kzalloc_objs(struct sg_list, qset->sqe_cnt);
if (!sq->sg)
return -ENOMEM;
@@ -1585,7 +1585,7 @@ int otx2_sq_aura_pool_init(struct otx2_nic *pfvf)
sq = &qset->sq[qidx];
sq->sqb_count = 0;
- sq->sqb_ptrs = kzalloc_objs(*sq->sqb_ptrs, num_sqbs, GFP_KERNEL);
+ sq->sqb_ptrs = kzalloc_objs(*sq->sqb_ptrs, num_sqbs);
if (!sq->sqb_ptrs) {
err = -ENOMEM;
goto err_mem;
diff --git a/drivers/net/ethernet/marvell/octeontx2/nic/otx2_flows.c b/drivers/net/ethernet/marvell/octeontx2/nic/otx2_flows.c
index f61730e8d73a..12c001ee34e2 100644
--- a/drivers/net/ethernet/marvell/octeontx2/nic/otx2_flows.c
+++ b/drivers/net/ethernet/marvell/octeontx2/nic/otx2_flows.c
@@ -1063,7 +1063,7 @@ static int otx2_add_flow_with_pfmac(struct otx2_nic *pfvf,
struct otx2_flow *pf_mac;
struct ethhdr *eth_hdr;
- pf_mac = kzalloc_obj(*pf_mac, GFP_KERNEL);
+ pf_mac = kzalloc_obj(*pf_mac);
if (!pf_mac)
return -ENOMEM;
@@ -1131,7 +1131,7 @@ int otx2_add_flow(struct otx2_nic *pfvf, struct ethtool_rxnfc *nfc)
flow = otx2_find_flow(pfvf, fsp->location);
if (!flow) {
- flow = kzalloc_obj(*flow, GFP_KERNEL);
+ flow = kzalloc_obj(*flow);
if (!flow)
return -ENOMEM;
flow->location = fsp->location;
diff --git a/drivers/net/ethernet/marvell/octeontx2/nic/otx2_pf.c b/drivers/net/ethernet/marvell/octeontx2/nic/otx2_pf.c
index 333071ac7598..e8334a347960 100644
--- a/drivers/net/ethernet/marvell/octeontx2/nic/otx2_pf.c
+++ b/drivers/net/ethernet/marvell/octeontx2/nic/otx2_pf.c
@@ -1936,7 +1936,7 @@ int otx2_alloc_queue_mem(struct otx2_nic *pf)
pf->qset.cq_cnt = pf->hw.rx_queues + otx2_get_total_tx_queues(pf);
- qset->napi = kzalloc_objs(*cq_poll, pf->hw.cint_cnt, GFP_KERNEL);
+ qset->napi = kzalloc_objs(*cq_poll, pf->hw.cint_cnt);
if (!qset->napi)
return -ENOMEM;
diff --git a/drivers/net/ethernet/marvell/octeontx2/nic/otx2_ptp.c b/drivers/net/ethernet/marvell/octeontx2/nic/otx2_ptp.c
index de9b90e498cc..95b0a1e7c936 100644
--- a/drivers/net/ethernet/marvell/octeontx2/nic/otx2_ptp.c
+++ b/drivers/net/ethernet/marvell/octeontx2/nic/otx2_ptp.c
@@ -408,7 +408,7 @@ int otx2_ptp_init(struct otx2_nic *pfvf)
}
mutex_unlock(&pfvf->mbox.lock);
- ptp_ptr = kzalloc_obj(*ptp_ptr, GFP_KERNEL);
+ ptp_ptr = kzalloc_obj(*ptp_ptr);
if (!ptp_ptr) {
err = -ENOMEM;
goto error;
diff --git a/drivers/net/ethernet/marvell/octeontx2/nic/otx2_tc.c b/drivers/net/ethernet/marvell/octeontx2/nic/otx2_tc.c
index 9b569e0d6222..04fcfbdcf69b 100644
--- a/drivers/net/ethernet/marvell/octeontx2/nic/otx2_tc.c
+++ b/drivers/net/ethernet/marvell/octeontx2/nic/otx2_tc.c
@@ -1271,7 +1271,7 @@ static int otx2_tc_add_flow(struct otx2_nic *nic,
}
/* allocate memory for the new flow and it's node */
- new_node = kzalloc_obj(*new_node, GFP_KERNEL);
+ new_node = kzalloc_obj(*new_node);
if (!new_node)
return -ENOMEM;
spin_lock_init(&new_node->lock);
diff --git a/drivers/net/ethernet/marvell/octeontx2/nic/qos.c b/drivers/net/ethernet/marvell/octeontx2/nic/qos.c
index 435c176c2643..69c0911e28e9 100644
--- a/drivers/net/ethernet/marvell/octeontx2/nic/qos.c
+++ b/drivers/net/ethernet/marvell/octeontx2/nic/qos.c
@@ -407,7 +407,7 @@ otx2_qos_alloc_root(struct otx2_nic *pfvf)
{
struct otx2_qos_node *node;
- node = kzalloc_obj(*node, GFP_KERNEL);
+ node = kzalloc_obj(*node);
if (!node)
return ERR_PTR(-ENOMEM);
@@ -463,7 +463,7 @@ static int otx2_qos_alloc_txschq_node(struct otx2_nic *pfvf,
parent = node;
for (lvl = node->level - 1; lvl >= NIX_TXSCH_LVL_MDQ; lvl--) {
- txschq_node = kzalloc_obj(*txschq_node, GFP_KERNEL);
+ txschq_node = kzalloc_obj(*txschq_node);
if (!txschq_node)
goto err_out;
@@ -508,7 +508,7 @@ otx2_qos_sw_create_leaf_node(struct otx2_nic *pfvf,
struct otx2_qos_node *node;
int err;
- node = kzalloc_obj(*node, GFP_KERNEL);
+ node = kzalloc_obj(*node);
if (!node)
return ERR_PTR(-ENOMEM);
@@ -1045,7 +1045,7 @@ static int otx2_qos_root_add(struct otx2_nic *pfvf, u16 htb_maj_id, u16 htb_defc
}
/* allocate txschq queue */
- new_cfg = kzalloc_obj(*new_cfg, GFP_KERNEL);
+ new_cfg = kzalloc_obj(*new_cfg);
if (!new_cfg) {
NL_SET_ERR_MSG_MOD(extack, "Memory allocation error");
err = -ENOMEM;
@@ -1279,7 +1279,7 @@ static int otx2_qos_leaf_alloc_queue(struct otx2_nic *pfvf, u16 classid,
set_bit(prio, parent->prio_bmap);
/* read current txschq configuration */
- old_cfg = kzalloc_obj(*old_cfg, GFP_KERNEL);
+ old_cfg = kzalloc_obj(*old_cfg);
if (!old_cfg) {
NL_SET_ERR_MSG_MOD(extack, "Memory allocation error");
ret = -ENOMEM;
@@ -1308,7 +1308,7 @@ static int otx2_qos_leaf_alloc_queue(struct otx2_nic *pfvf, u16 classid,
}
/* push new txschq config to hw */
- new_cfg = kzalloc_obj(*new_cfg, GFP_KERNEL);
+ new_cfg = kzalloc_obj(*new_cfg);
if (!new_cfg) {
NL_SET_ERR_MSG_MOD(extack, "Memory allocation error");
ret = -ENOMEM;
@@ -1417,7 +1417,7 @@ static int otx2_qos_leaf_to_inner(struct otx2_nic *pfvf, u16 classid,
qid = node->qid;
/* read current txschq configuration */
- old_cfg = kzalloc_obj(*old_cfg, GFP_KERNEL);
+ old_cfg = kzalloc_obj(*old_cfg);
if (!old_cfg) {
NL_SET_ERR_MSG_MOD(extack, "Memory allocation error");
ret = -ENOMEM;
@@ -1445,7 +1445,7 @@ static int otx2_qos_leaf_to_inner(struct otx2_nic *pfvf, u16 classid,
}
/* push new txschq config to hw */
- new_cfg = kzalloc_obj(*new_cfg, GFP_KERNEL);
+ new_cfg = kzalloc_obj(*new_cfg);
if (!new_cfg) {
NL_SET_ERR_MSG_MOD(extack, "Memory allocation error");
ret = -ENOMEM;
@@ -1668,7 +1668,7 @@ static int otx2_qos_leaf_del_last(struct otx2_nic *pfvf, u16 classid, bool force
__set_bit(qid, pfvf->qos.qos_sq_bmap);
/* push new txschq config to hw */
- new_cfg = kzalloc_obj(*new_cfg, GFP_KERNEL);
+ new_cfg = kzalloc_obj(*new_cfg);
if (!new_cfg) {
NL_SET_ERR_MSG_MOD(extack, "Memory allocation error");
return -ENOMEM;
diff --git a/drivers/net/ethernet/marvell/octeontx2/nic/rep.c b/drivers/net/ethernet/marvell/octeontx2/nic/rep.c
index 7706ec417d2b..94f155ffb17f 100644
--- a/drivers/net/ethernet/marvell/octeontx2/nic/rep.c
+++ b/drivers/net/ethernet/marvell/octeontx2/nic/rep.c
@@ -40,7 +40,7 @@ static int rvu_rep_mcam_flow_init(struct rep_dev *rep)
int ent, allocated = 0;
int count;
- rep->flow_cfg = kzalloc_objs(struct otx2_flow_config, 1, GFP_KERNEL);
+ rep->flow_cfg = kzalloc_objs(struct otx2_flow_config, 1);
if (!rep->flow_cfg)
return -ENOMEM;
@@ -504,7 +504,7 @@ static int rvu_rep_napi_init(struct otx2_nic *priv,
int err = 0, qidx, vec;
char *irq_name;
- qset->napi = kzalloc_objs(*cq_poll, hw->cint_cnt, GFP_KERNEL);
+ qset->napi = kzalloc_objs(*cq_poll, hw->cint_cnt);
if (!qset->napi)
return -ENOMEM;
@@ -656,7 +656,7 @@ int rvu_rep_create(struct otx2_nic *priv, struct netlink_ext_ack *extack)
if (err)
return -ENOMEM;
- priv->reps = kzalloc_objs(struct rep_dev *, rep_cnt, GFP_KERNEL);
+ priv->reps = kzalloc_objs(struct rep_dev *, rep_cnt);
if (!priv->reps)
return -ENOMEM;
diff --git a/drivers/net/ethernet/marvell/prestera/prestera_acl.c b/drivers/net/ethernet/marvell/prestera/prestera_acl.c
index 02f113f9af9f..31fe63a0a97d 100644
--- a/drivers/net/ethernet/marvell/prestera/prestera_acl.c
+++ b/drivers/net/ethernet/marvell/prestera/prestera_acl.c
@@ -144,7 +144,7 @@ prestera_acl_ruleset_create(struct prestera_acl *acl,
if (!prestera_acl_chain_is_supported(chain_index, block->ingress))
return ERR_PTR(-EINVAL);
- ruleset = kzalloc_obj(*ruleset, GFP_KERNEL);
+ ruleset = kzalloc_obj(*ruleset);
if (!ruleset)
return ERR_PTR(-ENOMEM);
@@ -438,7 +438,7 @@ prestera_acl_rule_create(struct prestera_acl_ruleset *ruleset,
{
struct prestera_acl_rule *rule;
- rule = kzalloc_obj(*rule, GFP_KERNEL);
+ rule = kzalloc_obj(*rule);
if (!rule)
return ERR_PTR(-ENOMEM);
@@ -713,7 +713,7 @@ prestera_acl_rule_entry_create(struct prestera_acl *acl,
struct prestera_acl_rule_entry *e;
int err;
- e = kzalloc_obj(*e, GFP_KERNEL);
+ e = kzalloc_obj(*e);
if (!e)
goto err_kzalloc;
@@ -816,7 +816,7 @@ int prestera_acl_vtcam_id_get(struct prestera_acl *acl, u8 lookup, u8 dir,
}
/* vtcam not found, try to create new one */
- vtcam = kzalloc_obj(*vtcam, GFP_KERNEL);
+ vtcam = kzalloc_obj(*vtcam);
if (!vtcam)
return -ENOMEM;
@@ -880,7 +880,7 @@ int prestera_acl_init(struct prestera_switch *sw)
struct prestera_acl *acl;
int err;
- acl = kzalloc_obj(*acl, GFP_KERNEL);
+ acl = kzalloc_obj(*acl);
if (!acl)
return -ENOMEM;
diff --git a/drivers/net/ethernet/marvell/prestera/prestera_counter.c b/drivers/net/ethernet/marvell/prestera/prestera_counter.c
index c59ed115c700..89f0ac592d70 100644
--- a/drivers/net/ethernet/marvell/prestera/prestera_counter.c
+++ b/drivers/net/ethernet/marvell/prestera/prestera_counter.c
@@ -147,7 +147,7 @@ prestera_counter_block_get(struct prestera_counter *counter, u32 client)
if (block)
return block;
- block = kzalloc_obj(*block, GFP_KERNEL);
+ block = kzalloc_obj(*block);
if (!block)
return ERR_PTR(-ENOMEM);
@@ -437,11 +437,11 @@ int prestera_counter_init(struct prestera_switch *sw)
{
struct prestera_counter *counter;
- counter = kzalloc_obj(*counter, GFP_KERNEL);
+ counter = kzalloc_obj(*counter);
if (!counter)
return -ENOMEM;
- counter->block_list = kzalloc_obj(*counter->block_list, GFP_KERNEL);
+ counter->block_list = kzalloc_obj(*counter->block_list);
if (!counter->block_list) {
kfree(counter);
return -ENOMEM;
diff --git a/drivers/net/ethernet/marvell/prestera/prestera_devlink.c b/drivers/net/ethernet/marvell/prestera/prestera_devlink.c
index 981b9e835be7..5fd78abccf25 100644
--- a/drivers/net/ethernet/marvell/prestera/prestera_devlink.c
+++ b/drivers/net/ethernet/marvell/prestera/prestera_devlink.c
@@ -451,7 +451,7 @@ int prestera_devlink_traps_register(struct prestera_switch *sw)
struct prestera_trap *prestera_trap;
int err, i;
- trap_data = kzalloc_obj(*trap_data, GFP_KERNEL);
+ trap_data = kzalloc_obj(*trap_data);
if (!trap_data)
return -ENOMEM;
diff --git a/drivers/net/ethernet/marvell/prestera/prestera_flow.c b/drivers/net/ethernet/marvell/prestera/prestera_flow.c
index 21c052bfa6e8..88db1a59a57b 100644
--- a/drivers/net/ethernet/marvell/prestera/prestera_flow.c
+++ b/drivers/net/ethernet/marvell/prestera/prestera_flow.c
@@ -82,7 +82,7 @@ prestera_flow_block_create(struct prestera_switch *sw,
{
struct prestera_flow_block *block;
- block = kzalloc_obj(*block, GFP_KERNEL);
+ block = kzalloc_obj(*block);
if (!block)
return NULL;
@@ -130,7 +130,7 @@ static int prestera_flow_block_bind(struct prestera_flow_block *block,
struct prestera_flow_block_binding *binding;
int err;
- binding = kzalloc_obj(*binding, GFP_KERNEL);
+ binding = kzalloc_obj(*binding);
if (!binding)
return -ENOMEM;
diff --git a/drivers/net/ethernet/marvell/prestera/prestera_flower.c b/drivers/net/ethernet/marvell/prestera/prestera_flower.c
index 28077005efaa..58b116cabd48 100644
--- a/drivers/net/ethernet/marvell/prestera/prestera_flower.c
+++ b/drivers/net/ethernet/marvell/prestera/prestera_flower.c
@@ -495,7 +495,7 @@ int prestera_flower_tmplt_create(struct prestera_flow_block *block,
if (err)
return err;
- template = kmalloc_obj(*template, GFP_KERNEL);
+ template = kmalloc_obj(*template);
if (!template) {
err = -ENOMEM;
goto err_malloc;
diff --git a/drivers/net/ethernet/marvell/prestera/prestera_hw.c b/drivers/net/ethernet/marvell/prestera/prestera_hw.c
index e20bd0eca18d..7695cbb2ce62 100644
--- a/drivers/net/ethernet/marvell/prestera/prestera_hw.c
+++ b/drivers/net/ethernet/marvell/prestera/prestera_hw.c
@@ -2256,7 +2256,7 @@ int prestera_hw_event_handler_register(struct prestera_switch *sw,
if (eh)
return -EEXIST;
- eh = kmalloc_obj(*eh, GFP_KERNEL);
+ eh = kmalloc_obj(*eh);
if (!eh)
return -ENOMEM;
diff --git a/drivers/net/ethernet/marvell/prestera/prestera_main.c b/drivers/net/ethernet/marvell/prestera/prestera_main.c
index 0d12ed32586b..41e19e9ad28d 100644
--- a/drivers/net/ethernet/marvell/prestera/prestera_main.c
+++ b/drivers/net/ethernet/marvell/prestera/prestera_main.c
@@ -1014,7 +1014,7 @@ static int prestera_lag_init(struct prestera_switch *sw)
{
u16 id;
- sw->lags = kzalloc_objs(*sw->lags, sw->lag_max, GFP_KERNEL);
+ sw->lags = kzalloc_objs(*sw->lags, sw->lag_max);
if (!sw->lags)
return -ENOMEM;
@@ -1209,7 +1209,7 @@ prestera_mdb_entry_create(struct prestera_switch *sw,
struct prestera_flood_domain *flood_domain;
struct prestera_mdb_entry *mdb_entry;
- mdb_entry = kzalloc_obj(*mdb_entry, GFP_KERNEL);
+ mdb_entry = kzalloc_obj(*mdb_entry);
if (!mdb_entry)
goto err_mdb_alloc;
@@ -1247,7 +1247,7 @@ prestera_flood_domain_create(struct prestera_switch *sw)
{
struct prestera_flood_domain *domain;
- domain = kzalloc_obj(*domain, GFP_KERNEL);
+ domain = kzalloc_obj(*domain);
if (!domain)
return NULL;
@@ -1279,7 +1279,7 @@ prestera_flood_domain_port_create(struct prestera_flood_domain *flood_domain,
bool is_first_port_in_list = false;
int err;
- flood_domain_port = kzalloc_obj(*flood_domain_port, GFP_KERNEL);
+ flood_domain_port = kzalloc_obj(*flood_domain_port);
if (!flood_domain_port) {
err = -ENOMEM;
goto err_port_alloc;
diff --git a/drivers/net/ethernet/marvell/prestera/prestera_router.c b/drivers/net/ethernet/marvell/prestera/prestera_router.c
index a75764610eef..b036b173a308 100644
--- a/drivers/net/ethernet/marvell/prestera/prestera_router.c
+++ b/drivers/net/ethernet/marvell/prestera/prestera_router.c
@@ -485,7 +485,7 @@ __prestera_kern_neigh_cache_create(struct prestera_switch *sw,
struct prestera_kern_neigh_cache *n_cache;
int err;
- n_cache = kzalloc_obj(*n_cache, GFP_KERNEL);
+ n_cache = kzalloc_obj(*n_cache);
if (!n_cache)
goto err_kzalloc;
@@ -623,7 +623,7 @@ prestera_kern_fib_cache_create(struct prestera_switch *sw,
struct prestera_kern_fib_cache *fib_cache;
int err;
- fib_cache = kzalloc_obj(*fib_cache, GFP_KERNEL);
+ fib_cache = kzalloc_obj(*fib_cache);
if (!fib_cache)
goto err_kzalloc;
@@ -1550,7 +1550,7 @@ int prestera_router_init(struct prestera_switch *sw)
struct prestera_router *router;
int err, nhgrp_cache_bytes;
- router = kzalloc_obj(*sw->router, GFP_KERNEL);
+ router = kzalloc_obj(*sw->router);
if (!router)
return -ENOMEM;
diff --git a/drivers/net/ethernet/marvell/prestera/prestera_router_hw.c b/drivers/net/ethernet/marvell/prestera/prestera_router_hw.c
index b94e28d403e7..ccf6cf98920f 100644
--- a/drivers/net/ethernet/marvell/prestera/prestera_router_hw.c
+++ b/drivers/net/ethernet/marvell/prestera/prestera_router_hw.c
@@ -127,7 +127,7 @@ static struct prestera_vr *__prestera_vr_create(struct prestera_switch *sw,
struct prestera_vr *vr;
int err;
- vr = kzalloc_obj(*vr, GFP_KERNEL);
+ vr = kzalloc_obj(*vr);
if (!vr) {
err = -ENOMEM;
goto err_alloc_vr;
@@ -252,7 +252,7 @@ prestera_rif_entry_create(struct prestera_switch *sw,
struct prestera_rif_entry *e;
struct prestera_iface iface;
- e = kzalloc_obj(*e, GFP_KERNEL);
+ e = kzalloc_obj(*e);
if (!e)
goto err_kzalloc;
@@ -301,7 +301,7 @@ __prestera_nh_neigh_create(struct prestera_switch *sw,
struct prestera_nh_neigh *neigh;
int err;
- neigh = kzalloc_obj(*neigh, GFP_KERNEL);
+ neigh = kzalloc_obj(*neigh);
if (!neigh)
goto err_kzalloc;
@@ -397,7 +397,7 @@ __prestera_nexthop_group_create(struct prestera_switch *sw,
struct prestera_nh_neigh *nh_neigh;
int nh_cnt, err, gid;
- nh_grp = kzalloc_obj(*nh_grp, GFP_KERNEL);
+ nh_grp = kzalloc_obj(*nh_grp);
if (!nh_grp)
goto err_kzalloc;
@@ -628,7 +628,7 @@ prestera_fib_node_create(struct prestera_switch *sw,
struct prestera_vr *vr;
int err;
- fib_node = kzalloc_obj(*fib_node, GFP_KERNEL);
+ fib_node = kzalloc_obj(*fib_node);
if (!fib_node)
goto err_kzalloc;
diff --git a/drivers/net/ethernet/marvell/prestera/prestera_rxtx.c b/drivers/net/ethernet/marvell/prestera/prestera_rxtx.c
index 696625d6dcbc..c4ea247d2470 100644
--- a/drivers/net/ethernet/marvell/prestera/prestera_rxtx.c
+++ b/drivers/net/ethernet/marvell/prestera/prestera_rxtx.c
@@ -379,7 +379,7 @@ static int prestera_sdma_rx_init(struct prestera_sdma *sdma)
struct prestera_sdma_buf *head, *tail, *next, *prev;
struct prestera_rx_ring *ring = &sdma->rx_ring[q];
- ring->bufs = kmalloc_objs(*head, bnum, GFP_KERNEL);
+ ring->bufs = kmalloc_objs(*head, bnum);
if (!ring->bufs)
return -ENOMEM;
@@ -529,7 +529,7 @@ static int prestera_sdma_tx_init(struct prestera_sdma *sdma)
INIT_WORK(&sdma->tx_work, prestera_sdma_tx_recycle_work_fn);
spin_lock_init(&sdma->tx_lock);
- tx_ring->bufs = kmalloc_objs(*head, bnum, GFP_KERNEL);
+ tx_ring->bufs = kmalloc_objs(*head, bnum);
if (!tx_ring->bufs)
return -ENOMEM;
@@ -784,7 +784,7 @@ int prestera_rxtx_switch_init(struct prestera_switch *sw)
struct prestera_rxtx *rxtx;
int err;
- rxtx = kzalloc_obj(*rxtx, GFP_KERNEL);
+ rxtx = kzalloc_obj(*rxtx);
if (!rxtx)
return -ENOMEM;
diff --git a/drivers/net/ethernet/marvell/prestera/prestera_span.c b/drivers/net/ethernet/marvell/prestera/prestera_span.c
index dd86164e6a19..bb2f74524e1c 100644
--- a/drivers/net/ethernet/marvell/prestera/prestera_span.c
+++ b/drivers/net/ethernet/marvell/prestera/prestera_span.c
@@ -27,7 +27,7 @@ prestera_span_entry_create(struct prestera_port *port, u8 span_id)
{
struct prestera_span_entry *entry;
- entry = kzalloc_obj(*entry, GFP_KERNEL);
+ entry = kzalloc_obj(*entry);
if (!entry)
return ERR_PTR(-ENOMEM);
@@ -170,7 +170,7 @@ int prestera_span_init(struct prestera_switch *sw)
{
struct prestera_span *span;
- span = kzalloc_obj(*span, GFP_KERNEL);
+ span = kzalloc_obj(*span);
if (!span)
return -ENOMEM;
diff --git a/drivers/net/ethernet/marvell/prestera/prestera_switchdev.c b/drivers/net/ethernet/marvell/prestera/prestera_switchdev.c
index 1ca197fb08a6..2012d00fabec 100644
--- a/drivers/net/ethernet/marvell/prestera/prestera_switchdev.c
+++ b/drivers/net/ethernet/marvell/prestera/prestera_switchdev.c
@@ -180,7 +180,7 @@ prestera_bridge_vlan_create(struct prestera_bridge_port *br_port, u16 vid)
{
struct prestera_bridge_vlan *br_vlan;
- br_vlan = kzalloc_obj(*br_vlan, GFP_KERNEL);
+ br_vlan = kzalloc_obj(*br_vlan);
if (!br_vlan)
return NULL;
@@ -263,7 +263,7 @@ prestera_port_vlan_create(struct prestera_port *port, u16 vid, bool untagged)
if (err)
return ERR_PTR(err);
- port_vlan = kzalloc_obj(*port_vlan, GFP_KERNEL);
+ port_vlan = kzalloc_obj(*port_vlan);
if (!port_vlan) {
err = -ENOMEM;
goto err_port_vlan_alloc;
@@ -443,7 +443,7 @@ prestera_bridge_create(struct prestera_switchdev *swdev, struct net_device *dev)
return ERR_PTR(-EINVAL);
}
- bridge = kzalloc_obj(*bridge, GFP_KERNEL);
+ bridge = kzalloc_obj(*bridge);
if (!bridge)
return ERR_PTR(-ENOMEM);
@@ -562,7 +562,7 @@ prestera_bridge_port_create(struct prestera_bridge *bridge,
{
struct prestera_bridge_port *br_port;
- br_port = kzalloc_obj(*br_port, GFP_KERNEL);
+ br_port = kzalloc_obj(*br_port);
if (!br_port)
return NULL;
@@ -1498,7 +1498,7 @@ prestera_br_mdb_entry_create(struct prestera_switch *sw,
struct prestera_br_mdb_entry *br_mdb_entry;
struct prestera_mdb_entry *mdb_entry;
- br_mdb_entry = kzalloc_obj(*br_mdb_entry, GFP_KERNEL);
+ br_mdb_entry = kzalloc_obj(*br_mdb_entry);
if (!br_mdb_entry)
return NULL;
@@ -1530,7 +1530,7 @@ static int prestera_br_mdb_port_add(struct prestera_br_mdb_entry *br_mdb,
if (br_mdb_port->br_port == br_port)
return 0;
- br_mdb_port = kzalloc_obj(*br_mdb_port, GFP_KERNEL);
+ br_mdb_port = kzalloc_obj(*br_mdb_port);
if (!br_mdb_port)
return -ENOMEM;
@@ -1873,7 +1873,7 @@ int prestera_switchdev_init(struct prestera_switch *sw)
struct prestera_switchdev *swdev;
int err;
- swdev = kzalloc_obj(*swdev, GFP_KERNEL);
+ swdev = kzalloc_obj(*swdev);
if (!swdev)
return -ENOMEM;
diff --git a/drivers/net/ethernet/marvell/pxa168_eth.c b/drivers/net/ethernet/marvell/pxa168_eth.c
index a2f6622e6ff5..bbbbbba63e15 100644
--- a/drivers/net/ethernet/marvell/pxa168_eth.c
+++ b/drivers/net/ethernet/marvell/pxa168_eth.c
@@ -1024,7 +1024,7 @@ static int rxq_init(struct net_device *dev)
int rx_desc_num = pep->rx_ring_size;
/* Allocate RX skb rings */
- pep->rx_skb = kzalloc_objs(*pep->rx_skb, rx_desc_num, GFP_KERNEL);
+ pep->rx_skb = kzalloc_objs(*pep->rx_skb, rx_desc_num);
if (!pep->rx_skb)
return -ENOMEM;
@@ -1083,7 +1083,7 @@ static int txq_init(struct net_device *dev)
int size = 0, i = 0;
int tx_desc_num = pep->tx_ring_size;
- pep->tx_skb = kzalloc_objs(*pep->tx_skb, tx_desc_num, GFP_KERNEL);
+ pep->tx_skb = kzalloc_objs(*pep->tx_skb, tx_desc_num);
if (!pep->tx_skb)
return -ENOMEM;
diff --git a/drivers/net/ethernet/marvell/skge.c b/drivers/net/ethernet/marvell/skge.c
index 49942779418c..e386c8314e21 100644
--- a/drivers/net/ethernet/marvell/skge.c
+++ b/drivers/net/ethernet/marvell/skge.c
@@ -918,7 +918,7 @@ static int skge_ring_alloc(struct skge_ring *ring, void *vaddr, u32 base)
struct skge_element *e;
int i;
- ring->start = kzalloc_objs(*e, ring->count, GFP_KERNEL);
+ ring->start = kzalloc_objs(*e, ring->count);
if (!ring->start)
return -ENOMEM;
diff --git a/drivers/net/ethernet/mediatek/mtk_eth_soc.c b/drivers/net/ethernet/mediatek/mtk_eth_soc.c
index 61065fb30acb..e5e2ffa9c542 100644
--- a/drivers/net/ethernet/mediatek/mtk_eth_soc.c
+++ b/drivers/net/ethernet/mediatek/mtk_eth_soc.c
@@ -2647,7 +2647,7 @@ static int mtk_tx_alloc(struct mtk_eth *eth)
else
ring_size = soc->tx.dma_size;
- ring->buf = kzalloc_objs(*ring->buf, ring_size, GFP_KERNEL);
+ ring->buf = kzalloc_objs(*ring->buf, ring_size);
if (!ring->buf)
goto no_tx_mem;
diff --git a/drivers/net/ethernet/mediatek/mtk_ppe_offload.c b/drivers/net/ethernet/mediatek/mtk_ppe_offload.c
index bc53b08ff205..cb30108f2bf6 100644
--- a/drivers/net/ethernet/mediatek/mtk_ppe_offload.c
+++ b/drivers/net/ethernet/mediatek/mtk_ppe_offload.c
@@ -469,7 +469,7 @@ mtk_flow_offload_replace(struct mtk_eth *eth, struct flow_cls_offload *f,
if (wed_index >= 0 && (err = mtk_wed_flow_add(wed_index)) < 0)
return err;
- entry = kzalloc_obj(*entry, GFP_KERNEL);
+ entry = kzalloc_obj(*entry);
if (!entry)
return -ENOMEM;
diff --git a/drivers/net/ethernet/mediatek/mtk_wed.c b/drivers/net/ethernet/mediatek/mtk_wed.c
index 303e3945b72c..10d9beaae372 100644
--- a/drivers/net/ethernet/mediatek/mtk_wed.c
+++ b/drivers/net/ethernet/mediatek/mtk_wed.c
@@ -656,7 +656,7 @@ mtk_wed_tx_buffer_alloc(struct mtk_wed_device *dev)
}
n_pages = dev->tx_buf_ring.size / MTK_WED_BUF_PER_PAGE;
- page_list = kzalloc_objs(*page_list, n_pages, GFP_KERNEL);
+ page_list = kzalloc_objs(*page_list, n_pages);
if (!page_list)
return -ENOMEM;
@@ -780,7 +780,7 @@ mtk_wed_hwrro_buffer_alloc(struct mtk_wed_device *dev)
if (!dev->wlan.hw_rro)
return 0;
- page_list = kzalloc_objs(*page_list, n_pages, GFP_KERNEL);
+ page_list = kzalloc_objs(*page_list, n_pages);
if (!page_list)
return -ENOMEM;
@@ -2718,7 +2718,7 @@ mtk_wed_setup_tc_block(struct mtk_wed_hw *hw, struct net_device *dev,
return 0;
}
- priv = kzalloc_obj(*priv, GFP_KERNEL);
+ priv = kzalloc_obj(*priv);
if (!priv)
return -ENOMEM;
@@ -2822,7 +2822,7 @@ void mtk_wed_add_hw(struct device_node *np, struct mtk_eth *eth,
if (WARN_ON(hw_list[index]))
goto unlock;
- hw = kzalloc_obj(*hw, GFP_KERNEL);
+ hw = kzalloc_obj(*hw);
if (!hw)
goto unlock;
diff --git a/drivers/net/ethernet/mellanox/mlx4/alloc.c b/drivers/net/ethernet/mellanox/mlx4/alloc.c
index 7e4d1998fd0d..4ed63950fd9d 100644
--- a/drivers/net/ethernet/mellanox/mlx4/alloc.c
+++ b/drivers/net/ethernet/mellanox/mlx4/alloc.c
@@ -223,7 +223,7 @@ struct mlx4_zone_entry {
struct mlx4_zone_allocator *mlx4_zone_allocator_create(enum mlx4_zone_alloc_flags flags)
{
- struct mlx4_zone_allocator *zones = kmalloc_obj(*zones, GFP_KERNEL);
+ struct mlx4_zone_allocator *zones = kmalloc_obj(*zones);
if (NULL == zones)
return NULL;
@@ -247,7 +247,7 @@ int mlx4_zone_add_one(struct mlx4_zone_allocator *zone_alloc,
{
u32 mask = mlx4_bitmap_masked_value(bitmap, (u32)-1);
struct mlx4_zone_entry *it;
- struct mlx4_zone_entry *zone = kmalloc_obj(*zone, GFP_KERNEL);
+ struct mlx4_zone_entry *zone = kmalloc_obj(*zone);
if (NULL == zone)
return -ENOMEM;
@@ -642,7 +642,7 @@ static struct mlx4_db_pgdir *mlx4_alloc_db_pgdir(struct device *dma_device)
{
struct mlx4_db_pgdir *pgdir;
- pgdir = kzalloc_obj(*pgdir, GFP_KERNEL);
+ pgdir = kzalloc_obj(*pgdir);
if (!pgdir)
return NULL;
diff --git a/drivers/net/ethernet/mellanox/mlx4/cmd.c b/drivers/net/ethernet/mellanox/mlx4/cmd.c
index 150ede6eb18f..4872931eb118 100644
--- a/drivers/net/ethernet/mellanox/mlx4/cmd.c
+++ b/drivers/net/ethernet/mellanox/mlx4/cmd.c
@@ -1674,7 +1674,7 @@ static int mlx4_master_process_vhcr(struct mlx4_dev *dev, int slave,
int err = 0;
/* Create sw representation of Virtual HCR */
- vhcr = kzalloc_obj(struct mlx4_vhcr, GFP_KERNEL);
+ vhcr = kzalloc_obj(struct mlx4_vhcr);
if (!vhcr)
return -ENOMEM;
@@ -1873,7 +1873,7 @@ static int mlx4_master_immediate_activate_vlan_qos(struct mlx4_priv *priv,
vp_admin->default_vlan, vp_admin->default_qos,
vp_admin->link_state);
- work = kzalloc_obj(*work, GFP_KERNEL);
+ work = kzalloc_obj(*work);
if (!work)
return -ENOMEM;
@@ -2689,7 +2689,7 @@ struct mlx4_cmd_mailbox *mlx4_alloc_cmd_mailbox(struct mlx4_dev *dev)
{
struct mlx4_cmd_mailbox *mailbox;
- mailbox = kmalloc_obj(*mailbox, GFP_KERNEL);
+ mailbox = kmalloc_obj(*mailbox);
if (!mailbox)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/net/ethernet/mellanox/mlx4/en_ethtool.c b/drivers/net/ethernet/mellanox/mlx4/en_ethtool.c
index 2e914a254a16..4ba19470df1e 100644
--- a/drivers/net/ethernet/mellanox/mlx4/en_ethtool.c
+++ b/drivers/net/ethernet/mellanox/mlx4/en_ethtool.c
@@ -1158,7 +1158,7 @@ static int mlx4_en_set_ringparam(struct net_device *dev,
tx_size == priv->tx_ring[TX][0]->size)
return 0;
- tmp = kzalloc_obj(*tmp, GFP_KERNEL);
+ tmp = kzalloc_obj(*tmp);
if (!tmp)
return -ENOMEM;
@@ -1452,8 +1452,8 @@ static int add_ip_rule(struct mlx4_en_priv *priv,
struct mlx4_spec_list *spec_l3;
struct ethtool_usrip4_spec *l3_mask = &cmd->fs.m_u.usr_ip4_spec;
- spec_l3 = kzalloc_obj(*spec_l3, GFP_KERNEL);
- spec_l2 = kzalloc_obj(*spec_l2, GFP_KERNEL);
+ spec_l3 = kzalloc_obj(*spec_l3);
+ spec_l2 = kzalloc_obj(*spec_l2);
if (!spec_l2 || !spec_l3) {
err = -ENOMEM;
goto free_spec;
@@ -1491,9 +1491,9 @@ static int add_tcp_udp_rule(struct mlx4_en_priv *priv,
struct mlx4_spec_list *spec_l4;
struct ethtool_tcpip4_spec *l4_mask = &cmd->fs.m_u.tcp_ip4_spec;
- spec_l2 = kzalloc_obj(*spec_l2, GFP_KERNEL);
- spec_l3 = kzalloc_obj(*spec_l3, GFP_KERNEL);
- spec_l4 = kzalloc_obj(*spec_l4, GFP_KERNEL);
+ spec_l2 = kzalloc_obj(*spec_l2);
+ spec_l3 = kzalloc_obj(*spec_l3);
+ spec_l4 = kzalloc_obj(*spec_l4);
if (!spec_l2 || !spec_l3 || !spec_l4) {
err = -ENOMEM;
goto free_spec;
@@ -1564,7 +1564,7 @@ static int mlx4_en_ethtool_to_net_trans_rule(struct net_device *dev,
switch (cmd->fs.flow_type & ~(FLOW_EXT | FLOW_MAC_EXT)) {
case ETHER_FLOW:
- spec_l2 = kzalloc_obj(*spec_l2, GFP_KERNEL);
+ spec_l2 = kzalloc_obj(*spec_l2);
if (!spec_l2)
return -ENOMEM;
@@ -1833,7 +1833,7 @@ static int mlx4_en_set_channels(struct net_device *dev,
if (!channel->tx_count || !channel->rx_count)
return -EINVAL;
- tmp = kzalloc_obj(*tmp, GFP_KERNEL);
+ tmp = kzalloc_obj(*tmp);
if (!tmp)
return -ENOMEM;
diff --git a/drivers/net/ethernet/mellanox/mlx4/en_main.c b/drivers/net/ethernet/mellanox/mlx4/en_main.c
index 1374a81945b2..a106c0e1e9ad 100644
--- a/drivers/net/ethernet/mellanox/mlx4/en_main.c
+++ b/drivers/net/ethernet/mellanox/mlx4/en_main.c
@@ -271,7 +271,7 @@ static int mlx4_en_probe(struct auxiliary_device *adev,
printk_once(KERN_INFO "%s", mlx4_en_version);
- mdev = kzalloc_obj(*mdev, GFP_KERNEL);
+ mdev = kzalloc_obj(*mdev);
if (!mdev) {
err = -ENOMEM;
goto err_free_res;
diff --git a/drivers/net/ethernet/mellanox/mlx4/en_netdev.c b/drivers/net/ethernet/mellanox/mlx4/en_netdev.c
index ee1ea70cdd34..4e151865fa7b 100644
--- a/drivers/net/ethernet/mellanox/mlx4/en_netdev.c
+++ b/drivers/net/ethernet/mellanox/mlx4/en_netdev.c
@@ -99,7 +99,7 @@ int mlx4_en_alloc_tx_queue_per_tc(struct net_device *dev, u8 tc)
int port_up = 0;
int err = 0;
- tmp = kzalloc_obj(*tmp, GFP_KERNEL);
+ tmp = kzalloc_obj(*tmp);
if (!tmp)
return -ENOMEM;
@@ -1209,7 +1209,7 @@ static void mlx4_en_do_uc_filter(struct mlx4_en_priv *priv,
}
if (!found) {
- entry = kmalloc_obj(*entry, GFP_KERNEL);
+ entry = kmalloc_obj(*entry);
if (!entry) {
en_err(priv, "Failed adding MAC %pM on port:%d (out of memory)\n",
ha->addr, priv->port);
@@ -1317,7 +1317,7 @@ static int mlx4_en_set_rss_steer_rules(struct mlx4_en_priv *priv)
if (err)
goto tunnel_err;
- entry = kmalloc_obj(*entry, GFP_KERNEL);
+ entry = kmalloc_obj(*entry);
if (!entry) {
err = -ENOMEM;
goto alloc_err;
@@ -2752,7 +2752,7 @@ static int mlx4_xdp_set(struct net_device *dev, struct bpf_prog *prog)
if (!mlx4_en_check_xdp_mtu(dev, dev->mtu))
return -EOPNOTSUPP;
- tmp = kzalloc_obj(*tmp, GFP_KERNEL);
+ tmp = kzalloc_obj(*tmp);
if (!tmp)
return -ENOMEM;
@@ -3521,7 +3521,7 @@ int mlx4_en_reset_config(struct net_device *dev,
return -EINVAL;
}
- tmp = kzalloc_obj(*tmp, GFP_KERNEL);
+ tmp = kzalloc_obj(*tmp);
if (!tmp)
return -ENOMEM;
diff --git a/drivers/net/ethernet/mellanox/mlx4/en_rx.c b/drivers/net/ethernet/mellanox/mlx4/en_rx.c
index de45de8fa41b..96f97fa0f548 100644
--- a/drivers/net/ethernet/mellanox/mlx4/en_rx.c
+++ b/drivers/net/ethernet/mellanox/mlx4/en_rx.c
@@ -1094,7 +1094,7 @@ static int mlx4_en_config_rss_qp(struct mlx4_en_priv *priv, int qpn,
struct mlx4_qp_context *context;
int err = 0;
- context = kzalloc_obj(*context, GFP_KERNEL);
+ context = kzalloc_obj(*context);
if (!context)
return -ENOMEM;
@@ -1208,7 +1208,7 @@ int mlx4_en_config_rss_steer(struct mlx4_en_priv *priv)
return 0;
}
- rss_map->indir_qp = kzalloc_obj(*rss_map->indir_qp, GFP_KERNEL);
+ rss_map->indir_qp = kzalloc_obj(*rss_map->indir_qp);
if (!rss_map->indir_qp) {
err = -ENOMEM;
goto rss_err;
diff --git a/drivers/net/ethernet/mellanox/mlx4/eq.c b/drivers/net/ethernet/mellanox/mlx4/eq.c
index 9891d33c7ecb..2760db75b617 100644
--- a/drivers/net/ethernet/mellanox/mlx4/eq.c
+++ b/drivers/net/ethernet/mellanox/mlx4/eq.c
@@ -987,7 +987,7 @@ static int mlx4_create_eq(struct mlx4_dev *dev, int nent,
*/
npages = PAGE_ALIGN(eq->nent * dev->caps.eqe_size) / PAGE_SIZE;
- eq->page_list = kmalloc_objs(*eq->page_list, npages, GFP_KERNEL);
+ eq->page_list = kmalloc_objs(*eq->page_list, npages);
if (!eq->page_list)
goto err_out;
diff --git a/drivers/net/ethernet/mellanox/mlx4/icm.c b/drivers/net/ethernet/mellanox/mlx4/icm.c
index c076d26a0b12..f159eea5ad56 100644
--- a/drivers/net/ethernet/mellanox/mlx4/icm.c
+++ b/drivers/net/ethernet/mellanox/mlx4/icm.c
@@ -426,7 +426,7 @@ int mlx4_init_icm_table(struct mlx4_dev *dev, struct mlx4_icm_table *table,
return -EINVAL;
num_icm = DIV_ROUND_UP(nobj, obj_per_chunk);
- table->icm = kvzalloc_objs(*table->icm, num_icm, GFP_KERNEL);
+ table->icm = kvzalloc_objs(*table->icm, num_icm);
if (!table->icm)
return -ENOMEM;
table->virt = virt;
diff --git a/drivers/net/ethernet/mellanox/mlx4/intf.c b/drivers/net/ethernet/mellanox/mlx4/intf.c
index e1db44df72f6..2964334582ea 100644
--- a/drivers/net/ethernet/mellanox/mlx4/intf.c
+++ b/drivers/net/ethernet/mellanox/mlx4/intf.c
@@ -115,7 +115,7 @@ static struct mlx4_adev *add_adev(struct mlx4_dev *dev, int idx)
struct mlx4_adev *madev;
int ret;
- madev = kzalloc_obj(*madev, GFP_KERNEL);
+ madev = kzalloc_obj(*madev);
if (!madev)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/net/ethernet/mellanox/mlx4/main.c b/drivers/net/ethernet/mellanox/mlx4/main.c
index 2e5032658fcd..982e9866d8e0 100644
--- a/drivers/net/ethernet/mellanox/mlx4/main.c
+++ b/drivers/net/ethernet/mellanox/mlx4/main.c
@@ -867,7 +867,7 @@ static int mlx4_slave_special_qp_cap(struct mlx4_dev *dev)
struct mlx4_caps *caps = &dev->caps;
int i, err = 0;
- func_cap = kzalloc_obj(*func_cap, GFP_KERNEL);
+ func_cap = kzalloc_obj(*func_cap);
caps->spec_qps = kzalloc_objs(*caps->spec_qps, caps->num_ports,
GFP_KERNEL);
@@ -912,9 +912,9 @@ static int mlx4_slave_cap(struct mlx4_dev *dev)
struct mlx4_func_cap *func_cap;
struct mlx4_init_hca_param *hca_param;
- hca_param = kzalloc_obj(*hca_param, GFP_KERNEL);
- func_cap = kzalloc_obj(*func_cap, GFP_KERNEL);
- dev_cap = kzalloc_obj(*dev_cap, GFP_KERNEL);
+ hca_param = kzalloc_obj(*hca_param);
+ func_cap = kzalloc_obj(*func_cap);
+ dev_cap = kzalloc_obj(*dev_cap);
if (!hca_param || !func_cap || !dev_cap) {
mlx4_err(dev, "Failed to allocate memory for slave_cap\n");
err = -ENOMEM;
@@ -2324,8 +2324,8 @@ static int mlx4_init_hca(struct mlx4_dev *dev)
int err;
if (!mlx4_is_slave(dev)) {
- dev_cap = kzalloc_obj(*dev_cap, GFP_KERNEL);
- init_hca = kzalloc_obj(*init_hca, GFP_KERNEL);
+ dev_cap = kzalloc_obj(*dev_cap);
+ init_hca = kzalloc_obj(*init_hca);
if (!dev_cap || !init_hca) {
err = -ENOMEM;
@@ -2966,7 +2966,7 @@ static void mlx4_enable_msi_x(struct mlx4_dev *dev)
if (msi_x > 1)
nreq = min_t(int, nreq, msi_x);
- entries = kzalloc_objs(*entries, nreq, GFP_KERNEL);
+ entries = kzalloc_objs(*entries, nreq);
if (!entries)
goto no_msi;
@@ -3174,7 +3174,7 @@ static int mlx4_init_steering(struct mlx4_dev *dev)
int num_entries = dev->caps.num_ports;
int i, j;
- priv->steer = kzalloc_objs(struct mlx4_steer, num_entries, GFP_KERNEL);
+ priv->steer = kzalloc_objs(struct mlx4_steer, num_entries);
if (!priv->steer)
return -ENOMEM;
@@ -3295,7 +3295,7 @@ static u64 mlx4_enable_sriov(struct mlx4_dev *dev, struct pci_dev *pdev,
}
}
- dev->dev_vfs = kzalloc_objs(*dev->dev_vfs, total_vfs, GFP_KERNEL);
+ dev->dev_vfs = kzalloc_objs(*dev->dev_vfs, total_vfs);
if (NULL == dev->dev_vfs) {
mlx4_err(dev, "Failed to allocate memory for VFs\n");
goto disable_sriov;
@@ -3494,7 +3494,7 @@ static int mlx4_load_one(struct pci_dev *pdev, int pci_dev_data,
if (mlx4_is_master(dev)) {
/* when we hit the goto slave_start below, dev_cap already initialized */
if (!dev_cap) {
- dev_cap = kzalloc_obj(*dev_cap, GFP_KERNEL);
+ dev_cap = kzalloc_obj(*dev_cap);
if (!dev_cap) {
err = -ENOMEM;
@@ -4034,7 +4034,7 @@ static int mlx4_init_one(struct pci_dev *pdev, const struct pci_device_id *id)
priv = devlink_priv(devlink);
dev = &priv->dev;
- dev->persist = kzalloc_obj(*dev->persist, GFP_KERNEL);
+ dev->persist = kzalloc_obj(*dev->persist);
if (!dev->persist) {
ret = -ENOMEM;
goto err_devlink_free;
diff --git a/drivers/net/ethernet/mellanox/mlx4/mcg.c b/drivers/net/ethernet/mellanox/mlx4/mcg.c
index 7ab766a81452..791ef30053b9 100644
--- a/drivers/net/ethernet/mellanox/mlx4/mcg.c
+++ b/drivers/net/ethernet/mellanox/mlx4/mcg.c
@@ -162,7 +162,7 @@ static int new_steering_entry(struct mlx4_dev *dev, u8 port,
return -EINVAL;
s_steer = &mlx4_priv(dev)->steer[port - 1];
- new_entry = kzalloc_obj(*new_entry, GFP_KERNEL);
+ new_entry = kzalloc_obj(*new_entry);
if (!new_entry)
return -ENOMEM;
@@ -175,7 +175,7 @@ static int new_steering_entry(struct mlx4_dev *dev, u8 port,
*/
pqp = get_promisc_qp(dev, port, steer, qpn);
if (pqp) {
- dqp = kmalloc_obj(*dqp, GFP_KERNEL);
+ dqp = kmalloc_obj(*dqp);
if (!dqp) {
err = -ENOMEM;
goto out_alloc;
@@ -274,7 +274,7 @@ static int existing_steering_entry(struct mlx4_dev *dev, u8 port,
}
/* add the qp as a duplicate on this index */
- dqp = kmalloc_obj(*dqp, GFP_KERNEL);
+ dqp = kmalloc_obj(*dqp);
if (!dqp)
return -ENOMEM;
dqp->qpn = qpn;
@@ -443,7 +443,7 @@ static int add_promisc_qp(struct mlx4_dev *dev, u8 port,
goto out_mutex;
}
- pqp = kmalloc_obj(*pqp, GFP_KERNEL);
+ pqp = kmalloc_obj(*pqp);
if (!pqp) {
err = -ENOMEM;
goto out_mutex;
@@ -479,7 +479,7 @@ static int add_promisc_qp(struct mlx4_dev *dev, u8 port,
/* Entry already exists.
* Add to duplicates.
*/
- dqp = kmalloc_obj(*dqp, GFP_KERNEL);
+ dqp = kmalloc_obj(*dqp);
if (!dqp) {
err = -ENOMEM;
goto out_mailbox;
diff --git a/drivers/net/ethernet/mellanox/mlx4/pd.c b/drivers/net/ethernet/mellanox/mlx4/pd.c
index b29e067da2e2..6bf850b07d1c 100644
--- a/drivers/net/ethernet/mellanox/mlx4/pd.c
+++ b/drivers/net/ethernet/mellanox/mlx4/pd.c
@@ -189,7 +189,7 @@ int mlx4_bf_alloc(struct mlx4_dev *dev, struct mlx4_bf *bf, int node)
}
uar = kmalloc_node(sizeof(*uar), GFP_KERNEL, node);
if (!uar) {
- uar = kmalloc_obj(*uar, GFP_KERNEL);
+ uar = kmalloc_obj(*uar);
if (!uar) {
err = -ENOMEM;
goto out;
diff --git a/drivers/net/ethernet/mellanox/mlx4/profile.c b/drivers/net/ethernet/mellanox/mlx4/profile.c
index 828c14074f81..1cff4aa13284 100644
--- a/drivers/net/ethernet/mellanox/mlx4/profile.c
+++ b/drivers/net/ethernet/mellanox/mlx4/profile.c
@@ -85,7 +85,7 @@ u64 mlx4_make_profile(struct mlx4_dev *dev,
struct sysinfo si;
int i, j;
- profile = kzalloc_objs(*profile, MLX4_RES_NUM, GFP_KERNEL);
+ profile = kzalloc_objs(*profile, MLX4_RES_NUM);
if (!profile)
return -ENOMEM;
diff --git a/drivers/net/ethernet/mellanox/mlx4/qp.c b/drivers/net/ethernet/mellanox/mlx4/qp.c
index 50002356697f..436ed587b8b9 100644
--- a/drivers/net/ethernet/mellanox/mlx4/qp.c
+++ b/drivers/net/ethernet/mellanox/mlx4/qp.c
@@ -564,7 +564,7 @@ static int mlx4_create_zones(struct mlx4_dev *dev,
if (NULL == qp_table->zones)
return -ENOMEM;
- bitmap = kmalloc_obj(*bitmap, GFP_KERNEL);
+ bitmap = kmalloc_obj(*bitmap);
if (NULL == bitmap) {
err = -ENOMEM;
diff --git a/drivers/net/ethernet/mellanox/mlx4/resource_tracker.c b/drivers/net/ethernet/mellanox/mlx4/resource_tracker.c
index dba5709ff96f..870f97c79991 100644
--- a/drivers/net/ethernet/mellanox/mlx4/resource_tracker.c
+++ b/drivers/net/ethernet/mellanox/mlx4/resource_tracker.c
@@ -505,7 +505,7 @@ int mlx4_init_resource_tracker(struct mlx4_dev *dev)
int t;
priv->mfunc.master.res_tracker.slave_list =
- kzalloc_objs(struct slave_list, dev->num_slaves, GFP_KERNEL);
+ kzalloc_objs(struct slave_list, dev->num_slaves);
if (!priv->mfunc.master.res_tracker.slave_list)
return -ENOMEM;
@@ -1049,7 +1049,7 @@ static struct res_common *alloc_qp_tr(int id)
{
struct res_qp *ret;
- ret = kzalloc_obj(*ret, GFP_KERNEL);
+ ret = kzalloc_obj(*ret);
if (!ret)
return NULL;
@@ -1067,7 +1067,7 @@ static struct res_common *alloc_mtt_tr(int id, int order)
{
struct res_mtt *ret;
- ret = kzalloc_obj(*ret, GFP_KERNEL);
+ ret = kzalloc_obj(*ret);
if (!ret)
return NULL;
@@ -1083,7 +1083,7 @@ static struct res_common *alloc_mpt_tr(int id, int key)
{
struct res_mpt *ret;
- ret = kzalloc_obj(*ret, GFP_KERNEL);
+ ret = kzalloc_obj(*ret);
if (!ret)
return NULL;
@@ -1098,7 +1098,7 @@ static struct res_common *alloc_eq_tr(int id)
{
struct res_eq *ret;
- ret = kzalloc_obj(*ret, GFP_KERNEL);
+ ret = kzalloc_obj(*ret);
if (!ret)
return NULL;
@@ -1112,7 +1112,7 @@ static struct res_common *alloc_cq_tr(int id)
{
struct res_cq *ret;
- ret = kzalloc_obj(*ret, GFP_KERNEL);
+ ret = kzalloc_obj(*ret);
if (!ret)
return NULL;
@@ -1127,7 +1127,7 @@ static struct res_common *alloc_srq_tr(int id)
{
struct res_srq *ret;
- ret = kzalloc_obj(*ret, GFP_KERNEL);
+ ret = kzalloc_obj(*ret);
if (!ret)
return NULL;
@@ -1142,7 +1142,7 @@ static struct res_common *alloc_counter_tr(int id, int port)
{
struct res_counter *ret;
- ret = kzalloc_obj(*ret, GFP_KERNEL);
+ ret = kzalloc_obj(*ret);
if (!ret)
return NULL;
@@ -1157,7 +1157,7 @@ static struct res_common *alloc_xrcdn_tr(int id)
{
struct res_xrcdn *ret;
- ret = kzalloc_obj(*ret, GFP_KERNEL);
+ ret = kzalloc_obj(*ret);
if (!ret)
return NULL;
@@ -1171,7 +1171,7 @@ static struct res_common *alloc_fs_rule_tr(u64 id, int qpn)
{
struct res_fs_rule *ret;
- ret = kzalloc_obj(*ret, GFP_KERNEL);
+ ret = kzalloc_obj(*ret);
if (!ret)
return NULL;
@@ -1283,7 +1283,7 @@ static int add_res_range(struct mlx4_dev *dev, int slave, u64 base, int count,
struct mlx4_resource_tracker *tracker = &priv->mfunc.master.res_tracker;
struct rb_root *root = &tracker->res_tree[type];
- res_arr = kzalloc_objs(*res_arr, count, GFP_KERNEL);
+ res_arr = kzalloc_objs(*res_arr, count);
if (!res_arr)
return -ENOMEM;
@@ -2036,7 +2036,7 @@ static int mac_add_to_slave(struct mlx4_dev *dev, int slave, u64 mac, int port,
if (mlx4_grant_resource(dev, slave, RES_MAC, 1, port))
return -EINVAL;
- res = kzalloc_obj(*res, GFP_KERNEL);
+ res = kzalloc_obj(*res);
if (!res) {
mlx4_release_resource(dev, slave, RES_MAC, 1, port);
return -ENOMEM;
@@ -2143,7 +2143,7 @@ static int vlan_add_to_slave(struct mlx4_dev *dev, int slave, u16 vlan,
if (mlx4_grant_resource(dev, slave, RES_VLAN, 1, port))
return -EINVAL;
- res = kzalloc_obj(*res, GFP_KERNEL);
+ res = kzalloc_obj(*res);
if (!res) {
mlx4_release_resource(dev, slave, RES_VLAN, 1, port);
return -ENOMEM;
@@ -4030,7 +4030,7 @@ static int add_mcg_res(struct mlx4_dev *dev, int slave, struct res_qp *rqp,
struct res_gid *res;
int err;
- res = kzalloc_obj(*res, GFP_KERNEL);
+ res = kzalloc_obj(*res);
if (!res)
return -ENOMEM;
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/alloc.c b/drivers/net/ethernet/mellanox/mlx5/core/alloc.c
index 058b7b2497ac..202feab1558a 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/alloc.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/alloc.c
@@ -79,7 +79,7 @@ int mlx5_frag_buf_alloc_node(struct mlx5_core_dev *dev, int size,
buf->size = size;
buf->npages = DIV_ROUND_UP(size, PAGE_SIZE);
buf->page_shift = PAGE_SHIFT;
- buf->frags = kzalloc_objs(struct mlx5_buf_list, buf->npages, GFP_KERNEL);
+ buf->frags = kzalloc_objs(struct mlx5_buf_list, buf->npages);
if (!buf->frags)
goto err_out;
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/debugfs.c b/drivers/net/ethernet/mellanox/mlx5/core/debugfs.c
index f2aa14e07e92..78e19dbb9f3a 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/debugfs.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/debugfs.c
@@ -201,7 +201,7 @@ static const struct file_operations slots_fops = {
static struct mlx5_cmd_stats *
mlx5_cmdif_alloc_stats(struct xarray *stats_xa, int opcode)
{
- struct mlx5_cmd_stats *stats = kzalloc_obj(*stats, GFP_KERNEL);
+ struct mlx5_cmd_stats *stats = kzalloc_obj(*stats);
int err;
if (!stats)
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/dev.c b/drivers/net/ethernet/mellanox/mlx5/core/dev.c
index bed0b6bfba7e..4bfbf52a46b4 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/dev.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/dev.c
@@ -310,7 +310,7 @@ static struct mlx5_adev *add_adev(struct mlx5_core_dev *dev, int idx)
struct mlx5_adev *madev;
int ret;
- madev = kzalloc_obj(*madev, GFP_KERNEL);
+ madev = kzalloc_obj(*madev);
if (!madev)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/devlink.c b/drivers/net/ethernet/mellanox/mlx5/core/devlink.c
index 18cfb7655805..6698ac55a4bf 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/devlink.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/devlink.c
@@ -294,7 +294,7 @@ static int mlx5_devlink_trap_init(struct devlink *devlink, const struct devlink_
struct mlx5_core_dev *dev = devlink_priv(devlink);
struct mlx5_devlink_trap *dl_trap;
- dl_trap = kzalloc_obj(*dl_trap, GFP_KERNEL);
+ dl_trap = kzalloc_obj(*dl_trap);
if (!dl_trap)
return -ENOMEM;
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/diag/fw_tracer.c b/drivers/net/ethernet/mellanox/mlx5/core/diag/fw_tracer.c
index d2e2c9f0f340..adcc73e2a5b3 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/diag/fw_tracer.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/diag/fw_tracer.c
@@ -412,7 +412,7 @@ static struct tracer_string_format *mlx5_tracer_message_insert(struct mlx5_fw_tr
&tracer->hash[mlx5_tracer_message_hash(tracer_event->string_event.tmsn)];
struct tracer_string_format *cur_string;
- cur_string = kzalloc_obj(*cur_string, GFP_KERNEL);
+ cur_string = kzalloc_obj(*cur_string);
if (!cur_string)
return NULL;
@@ -1023,7 +1023,7 @@ struct mlx5_fw_tracer *mlx5_fw_tracer_create(struct mlx5_core_dev *dev)
return NULL;
}
- tracer = kvzalloc_obj(*tracer, GFP_KERNEL);
+ tracer = kvzalloc_obj(*tracer);
if (!tracer)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/diag/rsc_dump.c b/drivers/net/ethernet/mellanox/mlx5/core/diag/rsc_dump.c
index 9bcc2d8edc76..e770088de129 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/diag/rsc_dump.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/diag/rsc_dump.c
@@ -137,7 +137,7 @@ struct mlx5_rsc_dump_cmd *mlx5_rsc_dump_cmd_create(struct mlx5_core_dev *dev,
if (!sgmt_type && key->rsc != MLX5_SGMT_TYPE_MENU)
return ERR_PTR(-EOPNOTSUPP);
- cmd = kzalloc_obj(*cmd, GFP_KERNEL);
+ cmd = kzalloc_obj(*cmd);
if (!cmd) {
mlx5_core_err(dev, "Resource dump: Failed to allocate command\n");
return ERR_PTR(-ENOMEM);
@@ -255,7 +255,7 @@ struct mlx5_rsc_dump *mlx5_rsc_dump_create(struct mlx5_core_dev *dev)
mlx5_core_dbg(dev, "Resource dump: capability not present\n");
return NULL;
}
- rsc_dump = kzalloc_obj(*rsc_dump, GFP_KERNEL);
+ rsc_dump = kzalloc_obj(*rsc_dump);
if (!rsc_dump)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/dpll.c b/drivers/net/ethernet/mellanox/mlx5/core/dpll.c
index abb678fe3021..bce72e8d1bc3 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/dpll.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/dpll.c
@@ -433,7 +433,7 @@ static int mlx5_dpll_probe(struct auxiliary_device *adev,
if (err)
return err;
- mdpll = kzalloc_obj(*mdpll, GFP_KERNEL);
+ mdpll = kzalloc_obj(*mdpll);
if (!mdpll)
return -ENOMEM;
mdpll->mdev = mdev;
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en/fs_tt_redirect.c b/drivers/net/ethernet/mellanox/mlx5/core/en/fs_tt_redirect.c
index 8b418e8538ca..884f1dff0952 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/en/fs_tt_redirect.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en/fs_tt_redirect.c
@@ -90,7 +90,7 @@ mlx5e_fs_tt_redirect_udp_add_rule(struct mlx5e_flow_steering *fs,
if (type == FS_UDP_NUM_TYPES)
return ERR_PTR(-EINVAL);
- spec = kvzalloc_obj(*spec, GFP_KERNEL);
+ spec = kvzalloc_obj(*spec);
if (!spec)
return ERR_PTR(-ENOMEM);
@@ -150,7 +150,7 @@ static int fs_udp_create_groups(struct mlx5e_flow_table *ft, enum fs_udp_type ty
int err;
u8 *mc;
- ft->g = kzalloc_objs(*ft->g, MLX5E_FS_UDP_NUM_GROUPS, GFP_KERNEL);
+ ft->g = kzalloc_objs(*ft->g, MLX5E_FS_UDP_NUM_GROUPS);
in = kvzalloc(inlen, GFP_KERNEL);
if (!in || !ft->g) {
kfree(ft->g);
@@ -325,7 +325,7 @@ int mlx5e_fs_tt_redirect_udp_create(struct mlx5e_flow_steering *fs)
return 0;
}
- udp = kzalloc_obj(*udp, GFP_KERNEL);
+ udp = kzalloc_obj(*udp);
if (!udp)
return -ENOMEM;
mlx5e_fs_set_udp(fs, udp);
@@ -372,7 +372,7 @@ mlx5e_fs_tt_redirect_any_add_rule(struct mlx5e_flow_steering *fs,
struct mlx5_flow_spec *spec;
int err;
- spec = kvzalloc_obj(*spec, GFP_KERNEL);
+ spec = kvzalloc_obj(*spec);
if (!spec)
return ERR_PTR(-ENOMEM);
@@ -432,7 +432,7 @@ static int fs_any_create_groups(struct mlx5e_flow_table *ft)
int err;
u8 *mc;
- ft->g = kzalloc_objs(*ft->g, MLX5E_FS_UDP_NUM_GROUPS, GFP_KERNEL);
+ ft->g = kzalloc_objs(*ft->g, MLX5E_FS_UDP_NUM_GROUPS);
in = kvzalloc(inlen, GFP_KERNEL);
if (!in || !ft->g) {
kfree(ft->g);
@@ -589,7 +589,7 @@ int mlx5e_fs_tt_redirect_any_create(struct mlx5e_flow_steering *fs)
return 0;
}
- fs_any = kzalloc_obj(*fs_any, GFP_KERNEL);
+ fs_any = kzalloc_obj(*fs_any);
if (!fs_any)
return -ENOMEM;
mlx5e_fs_set_any(fs, fs_any);
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en/htb.c b/drivers/net/ethernet/mellanox/mlx5/core/en/htb.c
index c63b8022fae6..ac27f6260f99 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/en/htb.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en/htb.c
@@ -72,7 +72,7 @@ mlx5e_htb_node_create_leaf(struct mlx5e_htb *htb, u16 classid, u16 qid,
{
struct mlx5e_qos_node *node;
- node = kzalloc_obj(*node, GFP_KERNEL);
+ node = kzalloc_obj(*node);
if (!node)
return ERR_PTR(-ENOMEM);
@@ -93,7 +93,7 @@ static struct mlx5e_qos_node *mlx5e_htb_node_create_root(struct mlx5e_htb *htb)
{
struct mlx5e_qos_node *node;
- node = kzalloc_obj(*node, GFP_KERNEL);
+ node = kzalloc_obj(*node);
if (!node)
return ERR_PTR(-ENOMEM);
@@ -694,7 +694,7 @@ mlx5e_htb_node_modify(struct mlx5e_htb *htb, u16 classid, u64 rate, u64 ceil,
struct mlx5e_htb *mlx5e_htb_alloc(void)
{
- return kvzalloc_obj(struct mlx5e_htb, GFP_KERNEL);
+ return kvzalloc_obj(struct mlx5e_htb);
}
void mlx5e_htb_free(struct mlx5e_htb *htb)
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en/mapping.c b/drivers/net/ethernet/mellanox/mlx5/core/en/mapping.c
index b1a84a01a81c..4bab696b7250 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/en/mapping.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en/mapping.c
@@ -198,7 +198,7 @@ mapping_create(size_t data_size, u32 max_id, bool delayed_removal)
{
struct mapping_ctx *ctx;
- ctx = kzalloc_obj(*ctx, GFP_KERNEL);
+ ctx = kzalloc_obj(*ctx);
if (!ctx)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en/ptp.c b/drivers/net/ethernet/mellanox/mlx5/core/en/ptp.c
index 5f4a7ca15518..1b76647f3194 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/en/ptp.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en/ptp.c
@@ -883,7 +883,7 @@ int mlx5e_ptp_open(struct mlx5e_priv *priv, struct mlx5e_params *params,
c = kvzalloc_node(sizeof(*c), GFP_KERNEL, dev_to_node(mlx5_core_dma_dev(mdev)));
- cparams = kvzalloc_obj(*cparams, GFP_KERNEL);
+ cparams = kvzalloc_obj(*cparams);
if (!c || !cparams) {
err = -ENOMEM;
goto err_free;
@@ -988,7 +988,7 @@ int mlx5e_ptp_alloc_rx_fs(struct mlx5e_flow_steering *fs,
if (!mlx5e_profile_feature_cap(profile, PTP_RX))
return 0;
- ptp_fs = kzalloc_obj(*ptp_fs, GFP_KERNEL);
+ ptp_fs = kzalloc_obj(*ptp_fs);
if (!ptp_fs)
return -ENOMEM;
mlx5e_fs_set_ptp(fs, ptp_fs);
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en/qos.c b/drivers/net/ethernet/mellanox/mlx5/core/en/qos.c
index cebcff010eac..d720bcd70373 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/en/qos.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en/qos.c
@@ -99,7 +99,7 @@ int mlx5e_open_qos_sq(struct mlx5e_priv *priv, struct mlx5e_channels *chs,
if (!priv->htb_qos_sq_stats[node_qid]) {
struct mlx5e_sq_stats *stats;
- stats = kzalloc_obj(*stats, GFP_KERNEL);
+ stats = kzalloc_obj(*stats);
if (!stats)
return -ENOMEM;
@@ -115,7 +115,7 @@ int mlx5e_open_qos_sq(struct mlx5e_priv *priv, struct mlx5e_channels *chs,
c = chs->c[ix];
qos_sqs = mlx5e_state_dereference(priv, c->qos_sqs);
- sq = kzalloc_obj(*sq, GFP_KERNEL);
+ sq = kzalloc_obj(*sq);
if (!sq)
return -ENOMEM;
@@ -462,7 +462,7 @@ struct mlx5e_mqprio_rl {
struct mlx5e_mqprio_rl *mlx5e_mqprio_rl_alloc(void)
{
- return kvzalloc_obj(struct mlx5e_mqprio_rl, GFP_KERNEL);
+ return kvzalloc_obj(struct mlx5e_mqprio_rl);
}
void mlx5e_mqprio_rl_free(struct mlx5e_mqprio_rl *rl)
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en/rep/bond.c b/drivers/net/ethernet/mellanox/mlx5/core/en/rep/bond.c
index 8038deae35a7..9799bdd7d8d6 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/en/rep/bond.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en/rep/bond.c
@@ -92,7 +92,7 @@ int mlx5e_rep_bond_enslave(struct mlx5_eswitch *esw, struct net_device *netdev,
mdata = mlx5e_lookup_rep_bond_metadata(&rpriv->uplink_priv, lag_dev);
if (!mdata) {
/* First netdev becomes slave, no metadata presents the lag_dev. Create one */
- mdata = kzalloc_obj(*mdata, GFP_KERNEL);
+ mdata = kzalloc_obj(*mdata);
if (!mdata)
return -ENOMEM;
@@ -110,7 +110,7 @@ int mlx5e_rep_bond_enslave(struct mlx5_eswitch *esw, struct net_device *netdev,
mdata->metadata_reg_c_0);
}
- s_entry = kzalloc_obj(*s_entry, GFP_KERNEL);
+ s_entry = kzalloc_obj(*s_entry);
if (!s_entry) {
err = -ENOMEM;
goto entry_alloc_err;
@@ -315,7 +315,7 @@ int mlx5e_rep_bond_init(struct mlx5e_rep_priv *rpriv)
if (!mlx5_esw_acl_egress_fwd2vport_supported(priv->mdev->priv.eswitch))
goto out;
- uplink_priv->bond = kvzalloc_obj(*uplink_priv->bond, GFP_KERNEL);
+ uplink_priv->bond = kvzalloc_obj(*uplink_priv->bond);
if (!uplink_priv->bond) {
ret = -ENOMEM;
goto out;
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en/rep/neigh.c b/drivers/net/ethernet/mellanox/mlx5/core/en/rep/neigh.c
index cbfb0cc32a3b..d220b045b331 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/en/rep/neigh.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en/rep/neigh.c
@@ -376,7 +376,7 @@ int mlx5e_rep_neigh_entry_create(struct mlx5e_priv *priv,
{
int err;
- *nhe = kzalloc_obj(**nhe, GFP_KERNEL);
+ *nhe = kzalloc_obj(**nhe);
if (!*nhe)
return -ENOMEM;
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en/rep/tc.c b/drivers/net/ethernet/mellanox/mlx5/core/en/rep/tc.c
index 2dc5e139c99c..e1ebc9b2d061 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/en/rep/tc.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en/rep/tc.c
@@ -503,7 +503,7 @@ mlx5e_rep_indr_setup_block(struct net_device *netdev, struct Qdisc *sch,
if (indr_priv)
return -EEXIST;
- indr_priv = kmalloc_obj(*indr_priv, GFP_KERNEL);
+ indr_priv = kmalloc_obj(*indr_priv);
if (!indr_priv)
return -ENOMEM;
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en/rss.c b/drivers/net/ethernet/mellanox/mlx5/core/en/rss.c
index c9d141b8650b..a2ec67a122d9 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/en/rss.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en/rss.c
@@ -93,7 +93,7 @@ void mlx5e_rss_params_indir_modify_actual_size(struct mlx5e_rss *rss, u32 num_ch
int mlx5e_rss_params_indir_init(struct mlx5e_rss_params_indir *indir,
u32 actual_table_size, u32 max_table_size)
{
- indir->table = kvmalloc_objs(*indir->table, max_table_size, GFP_KERNEL);
+ indir->table = kvmalloc_objs(*indir->table, max_table_size);
if (!indir->table)
return -ENOMEM;
@@ -134,7 +134,7 @@ static struct mlx5e_rss *mlx5e_rss_init_copy(const struct mlx5e_rss *from)
struct mlx5e_rss *rss;
int err;
- rss = kvzalloc_obj(*rss, GFP_KERNEL);
+ rss = kvzalloc_obj(*rss);
if (!rss)
return ERR_PTR(-ENOMEM);
@@ -216,7 +216,7 @@ mlx5e_rss_create_tir(struct mlx5e_rss *rss, enum mlx5_traffic_types tt,
if (*tir_p)
return -EINVAL;
- tir = kvzalloc_obj(*tir, GFP_KERNEL);
+ tir = kvzalloc_obj(*tir);
if (!tir)
return -ENOMEM;
@@ -372,7 +372,7 @@ mlx5e_rss_init(struct mlx5_core_dev *mdev,
struct mlx5e_rss *rss;
int err;
- rss = kvzalloc_obj(*rss, GFP_KERNEL);
+ rss = kvzalloc_obj(*rss);
if (!rss)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en/rx_res.c b/drivers/net/ethernet/mellanox/mlx5/core/en/rx_res.c
index a9f55ffb894e..92974b11ec75 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/en/rx_res.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en/rx_res.c
@@ -325,7 +325,7 @@ static struct mlx5e_rx_res *mlx5e_rx_res_alloc(struct mlx5_core_dev *mdev, unsig
{
struct mlx5e_rx_res *rx_res;
- rx_res = kvzalloc_obj(*rx_res, GFP_KERNEL);
+ rx_res = kvzalloc_obj(*rx_res);
if (!rx_res)
return NULL;
@@ -359,7 +359,7 @@ static int mlx5e_rx_res_channels_init(struct mlx5e_rx_res *res)
if (!builder)
return -ENOMEM;
- res->channels = kvzalloc_objs(*res->channels, res->max_nch, GFP_KERNEL);
+ res->channels = kvzalloc_objs(*res->channels, res->max_nch);
if (!res->channels) {
err = -ENOMEM;
goto out;
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en/selq.c b/drivers/net/ethernet/mellanox/mlx5/core/en/selq.c
index 4598d922385a..8318a26bc263 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/en/selq.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en/selq.c
@@ -30,11 +30,11 @@ int mlx5e_selq_init(struct mlx5e_selq *selq, struct mutex *state_lock)
selq->state_lock = state_lock;
- selq->standby = kvzalloc_obj(*selq->standby, GFP_KERNEL);
+ selq->standby = kvzalloc_obj(*selq->standby);
if (!selq->standby)
return -ENOMEM;
- init_params = kvzalloc_obj(*selq->active, GFP_KERNEL);
+ init_params = kvzalloc_obj(*selq->active);
if (!init_params) {
kvfree(selq->standby);
selq->standby = NULL;
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en/tc/act_stats.c b/drivers/net/ethernet/mellanox/mlx5/core/en/tc/act_stats.c
index 45ff384b66d4..4b1c6c99c724 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/en/tc/act_stats.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en/tc/act_stats.c
@@ -36,7 +36,7 @@ mlx5e_tc_act_stats_create(void)
struct mlx5e_tc_act_stats_handle *handle;
int err;
- handle = kvzalloc_obj(*handle, GFP_KERNEL);
+ handle = kvzalloc_obj(*handle);
if (!handle)
return ERR_PTR(-ENOMEM);
@@ -67,7 +67,7 @@ mlx5e_tc_act_stats_add(struct mlx5e_tc_act_stats_handle *handle,
u64 lastused;
int err = 0;
- act_stats = kvzalloc_obj(*act_stats, GFP_KERNEL);
+ act_stats = kvzalloc_obj(*act_stats);
if (!act_stats)
return -ENOMEM;
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en/tc/ct_fs_dmfs.c b/drivers/net/ethernet/mellanox/mlx5/core/en/tc/ct_fs_dmfs.c
index e983da2574ec..52f96010f0d7 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/en/tc/ct_fs_dmfs.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en/tc/ct_fs_dmfs.c
@@ -34,7 +34,7 @@ mlx5_ct_fs_dmfs_ct_rule_add(struct mlx5_ct_fs *fs, struct mlx5_flow_spec *spec,
struct mlx5_ct_fs_dmfs_rule *dmfs_rule;
int err;
- dmfs_rule = kzalloc_obj(*dmfs_rule, GFP_KERNEL);
+ dmfs_rule = kzalloc_obj(*dmfs_rule);
if (!dmfs_rule)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en/tc/ct_fs_hmfs.c b/drivers/net/ethernet/mellanox/mlx5/core/en/tc/ct_fs_hmfs.c
index 59aa6ee5be05..822c79f2de72 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/en/tc/ct_fs_hmfs.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en/tc/ct_fs_hmfs.c
@@ -203,7 +203,7 @@ mlx5_ct_fs_hmfs_ct_rule_add(struct mlx5_ct_fs *fs, struct mlx5_flow_spec *spec,
if (!mlx5e_tc_ct_is_valid_flow_rule(fs->netdev, flow_rule))
return ERR_PTR(-EOPNOTSUPP);
- hmfs_rule = kzalloc_obj(*hmfs_rule, GFP_KERNEL);
+ hmfs_rule = kzalloc_obj(*hmfs_rule);
if (!hmfs_rule)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en/tc/ct_fs_smfs.c b/drivers/net/ethernet/mellanox/mlx5/core/en/tc/ct_fs_smfs.c
index 897d8f7ed7f2..5a2c24ef517b 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/en/tc/ct_fs_smfs.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en/tc/ct_fs_smfs.c
@@ -92,7 +92,7 @@ mlx5_ct_fs_smfs_matcher_create(struct mlx5_ct_fs *fs, struct mlx5dr_table *tbl,
struct mlx5dr_matcher *dr_matcher;
struct mlx5_flow_spec *spec;
- spec = kvzalloc_obj(*spec, GFP_KERNEL);
+ spec = kvzalloc_obj(*spec);
if (!spec)
return ERR_PTR(-ENOMEM);
@@ -234,7 +234,7 @@ mlx5_ct_fs_smfs_ct_rule_add(struct mlx5_ct_fs *fs, struct mlx5_flow_spec *spec,
if (!mlx5e_tc_ct_is_valid_flow_rule(fs->netdev, flow_rule))
return ERR_PTR(-EOPNOTSUPP);
- smfs_rule = kzalloc_obj(*smfs_rule, GFP_KERNEL);
+ smfs_rule = kzalloc_obj(*smfs_rule);
if (!smfs_rule)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en/tc/int_port.c b/drivers/net/ethernet/mellanox/mlx5/core/en/tc/int_port.c
index 11754c8ae986..7f0b7c5560fb 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/en/tc/int_port.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en/tc/int_port.c
@@ -69,7 +69,7 @@ mlx5e_int_port_create_rx_rule(struct mlx5_eswitch *esw,
struct mlx5_flow_spec *spec;
void *misc;
- spec = kvzalloc_obj(*spec, GFP_KERNEL);
+ spec = kvzalloc_obj(*spec);
if (!spec)
return ERR_PTR(-ENOMEM);
@@ -167,7 +167,7 @@ mlx5e_int_port_add(struct mlx5e_tc_int_port_priv *priv,
return ERR_PTR(-ENOSPC);
}
- int_port = kzalloc_obj(*int_port, GFP_KERNEL);
+ int_port = kzalloc_obj(*int_port);
if (!int_port)
return ERR_PTR(-ENOMEM);
@@ -313,7 +313,7 @@ mlx5e_tc_int_port_init(struct mlx5e_priv *priv)
if (!mlx5e_tc_int_port_supported(esw))
return NULL;
- int_port_priv = kzalloc_obj(*int_port_priv, GFP_KERNEL);
+ int_port_priv = kzalloc_obj(*int_port_priv);
if (!int_port_priv)
return NULL;
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en/tc/meter.c b/drivers/net/ethernet/mellanox/mlx5/core/en/tc/meter.c
index 80ddbe373f97..a62b09dddc01 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/en/tc/meter.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en/tc/meter.c
@@ -247,7 +247,7 @@ __mlx5e_flow_meter_alloc(struct mlx5e_flow_meters *flow_meters, bool alloc_aso)
int err, pos, total;
u32 id;
- meter = kzalloc_obj(*meter, GFP_KERNEL);
+ meter = kzalloc_obj(*meter);
if (!meter)
return ERR_PTR(-ENOMEM);
@@ -526,7 +526,7 @@ mlx5e_flow_meters_init(struct mlx5e_priv *priv,
return ERR_PTR(-EOPNOTSUPP);
}
- flow_meters = kzalloc_obj(*flow_meters, GFP_KERNEL);
+ flow_meters = kzalloc_obj(*flow_meters);
if (!flow_meters)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en/tc/post_act.c b/drivers/net/ethernet/mellanox/mlx5/core/en/tc/post_act.c
index 62184531b3e6..18b6c1360552 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/en/tc/post_act.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en/tc/post_act.c
@@ -42,7 +42,7 @@ mlx5e_tc_post_act_init(struct mlx5e_priv *priv, struct mlx5_fs_chains *chains,
goto err_check;
}
- post_act = kzalloc_obj(*post_act, GFP_KERNEL);
+ post_act = kzalloc_obj(*post_act);
if (!post_act) {
err = -ENOMEM;
goto err_check;
@@ -86,7 +86,7 @@ mlx5e_tc_post_act_offload(struct mlx5e_post_act *post_act,
if (IS_ERR(post_act))
return PTR_ERR(post_act);
- spec = kvzalloc_obj(*spec, GFP_KERNEL);
+ spec = kvzalloc_obj(*spec);
if (!spec)
return -ENOMEM;
@@ -117,7 +117,7 @@ mlx5e_tc_post_act_add(struct mlx5e_post_act *post_act, struct mlx5_flow_attr *po
if (IS_ERR(post_act))
return ERR_CAST(post_act);
- handle = kzalloc_obj(*handle, GFP_KERNEL);
+ handle = kzalloc_obj(*handle);
if (!handle)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en/tc/post_meter.c b/drivers/net/ethernet/mellanox/mlx5/core/en/tc/post_meter.c
index e5467a94e9dc..d03376d7bb31 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/en/tc/post_meter.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en/tc/post_meter.c
@@ -156,7 +156,7 @@ mlx5e_post_meter_rate_rules_create(struct mlx5e_priv *priv,
struct mlx5_flow_spec *spec;
int err;
- spec = kvzalloc_obj(*spec, GFP_KERNEL);
+ spec = kvzalloc_obj(*spec);
if (!spec)
return -ENOMEM;
@@ -402,7 +402,7 @@ mlx5e_post_meter_init(struct mlx5e_priv *priv,
struct mlx5e_post_meter_priv *post_meter;
int err;
- post_meter = kzalloc_obj(*post_meter, GFP_KERNEL);
+ post_meter = kzalloc_obj(*post_meter);
if (!post_meter)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en/tc/sample.c b/drivers/net/ethernet/mellanox/mlx5/core/en/tc/sample.c
index 938961520f6c..89490f687a9c 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/en/tc/sample.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en/tc/sample.c
@@ -183,7 +183,7 @@ sampler_get(struct mlx5e_tc_psample *tc_psample, u32 sample_ratio, u32 default_t
sample_ratio, default_table_id))
goto add_ref;
- sampler = kzalloc_obj(*sampler, GFP_KERNEL);
+ sampler = kzalloc_obj(*sampler);
if (!sampler) {
err = -ENOMEM;
goto err_alloc;
@@ -273,7 +273,7 @@ sample_restore_get(struct mlx5e_tc_psample *tc_psample, u32 obj_id,
if (restore->obj_id == obj_id)
goto add_ref;
- restore = kzalloc_obj(*restore, GFP_KERNEL);
+ restore = kzalloc_obj(*restore);
if (!restore) {
err = -ENOMEM;
goto err_alloc;
@@ -485,7 +485,7 @@ mlx5e_tc_sample_offload(struct mlx5e_tc_psample *tc_psample,
if (IS_ERR_OR_NULL(tc_psample))
return ERR_PTR(-EOPNOTSUPP);
- sample_flow = kzalloc_obj(*sample_flow, GFP_KERNEL);
+ sample_flow = kzalloc_obj(*sample_flow);
if (!sample_flow)
return ERR_PTR(-ENOMEM);
sample_attr = &attr->sample_attr;
@@ -619,7 +619,7 @@ mlx5e_tc_sample_init(struct mlx5_eswitch *esw, struct mlx5e_post_act *post_act)
struct mlx5e_tc_psample *tc_psample;
int err;
- tc_psample = kzalloc_obj(*tc_psample, GFP_KERNEL);
+ tc_psample = kzalloc_obj(*tc_psample);
if (!tc_psample)
return ERR_PTR(-ENOMEM);
if (IS_ERR_OR_NULL(post_act)) {
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en/tc_ct.c b/drivers/net/ethernet/mellanox/mlx5/core/en/tc_ct.c
index 2d3654faabfa..6c87a1c7db09 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/en/tc_ct.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en/tc_ct.c
@@ -812,7 +812,7 @@ mlx5_tc_ct_entry_add_rule(struct mlx5_tc_ct_priv *ct_priv,
zone_rule->nat = nat;
- spec = kvzalloc_obj(*spec, GFP_KERNEL);
+ spec = kvzalloc_obj(*spec);
if (!spec)
return -ENOMEM;
@@ -887,7 +887,7 @@ mlx5_tc_ct_entry_update_rule(struct mlx5_tc_ct_priv *ct_priv,
struct mlx5_flow_spec *spec;
int err;
- spec = kvzalloc_obj(*spec, GFP_KERNEL);
+ spec = kvzalloc_obj(*spec);
if (!spec)
return -ENOMEM;
@@ -1021,7 +1021,7 @@ mlx5_tc_ct_counter_create(struct mlx5_tc_ct_priv *ct_priv)
struct mlx5_ct_counter *counter;
int ret;
- counter = kzalloc_obj(*counter, GFP_KERNEL);
+ counter = kzalloc_obj(*counter);
if (!counter)
return ERR_PTR(-ENOMEM);
@@ -1219,7 +1219,7 @@ mlx5_tc_ct_block_flow_offload_add(struct mlx5_ct_ft *ft,
}
spin_unlock_bh(&ct_priv->ht_lock);
- entry = kzalloc_obj(*entry, GFP_KERNEL);
+ entry = kzalloc_obj(*entry);
if (!entry)
return -ENOMEM;
@@ -1620,7 +1620,7 @@ static int tc_ct_pre_ct_add_rules(struct mlx5_ct_ft *ct_ft,
u16 zone;
int err;
- spec = kvzalloc_obj(*spec, GFP_KERNEL);
+ spec = kvzalloc_obj(*spec);
if (!spec)
return -ENOMEM;
@@ -1856,7 +1856,7 @@ mlx5_tc_ct_add_ft_cb(struct mlx5_tc_ct_priv *ct_priv, u16 zone,
return ft;
}
- ft = kzalloc_obj(*ft, GFP_KERNEL);
+ ft = kzalloc_obj(*ft);
if (!ft)
return ERR_PTR(-ENOMEM);
@@ -2298,7 +2298,7 @@ mlx5_tc_ct_init(struct mlx5e_priv *priv, struct mlx5_fs_chains *chains,
if (err)
goto err_support;
- ct_priv = kzalloc_obj(*ct_priv, GFP_KERNEL);
+ ct_priv = kzalloc_obj(*ct_priv);
if (!ct_priv)
goto err_alloc;
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en/tc_tun_encap.c b/drivers/net/ethernet/mellanox/mlx5/core/en/tc_tun_encap.c
index 9a7c6df78640..bfd401bee9e8 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/en/tc_tun_encap.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en/tc_tun_encap.c
@@ -87,7 +87,7 @@ int mlx5e_tc_set_attr_rx_tun(struct mlx5e_tc_flow *flow,
void *daddr, *saddr;
u8 ip_version;
- tun_attr = kvzalloc_obj(*tun_attr, GFP_KERNEL);
+ tun_attr = kvzalloc_obj(*tun_attr);
if (!tun_attr)
return -ENOMEM;
@@ -864,7 +864,7 @@ int mlx5e_attach_encap(struct mlx5e_priv *priv,
goto attach_flow;
}
- e = kzalloc_obj(*e, GFP_KERNEL);
+ e = kzalloc_obj(*e);
if (!e) {
err = -ENOMEM;
goto out_err;
@@ -976,7 +976,7 @@ int mlx5e_attach_decap(struct mlx5e_priv *priv,
goto found;
}
- d = kzalloc_obj(*d, GFP_KERNEL);
+ d = kzalloc_obj(*d);
if (!d) {
err = -ENOMEM;
goto out_err;
@@ -1205,7 +1205,7 @@ mlx5e_route_get_create(struct mlx5e_priv *priv,
return r;
}
- r = kzalloc_obj(*r, GFP_KERNEL);
+ r = kzalloc_obj(*r);
if (!r)
return ERR_PTR(-ENOMEM);
@@ -1862,7 +1862,7 @@ struct mlx5e_tc_tun_encap *mlx5e_tc_tun_init(struct mlx5e_priv *priv)
struct mlx5e_tc_tun_encap *encap;
int err;
- encap = kvzalloc_obj(*encap, GFP_KERNEL);
+ encap = kvzalloc_obj(*encap);
if (!encap)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en/tir.c b/drivers/net/ethernet/mellanox/mlx5/core/en/tir.c
index e02f04a7b211..376ba6b29027 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/en/tir.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en/tir.c
@@ -22,7 +22,7 @@ struct mlx5e_tir_builder *mlx5e_tir_builder_alloc(bool modify)
{
struct mlx5e_tir_builder *builder;
- builder = kvzalloc_obj(*builder, GFP_KERNEL);
+ builder = kvzalloc_obj(*builder);
if (!builder)
return NULL;
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en/xsk/setup.c b/drivers/net/ethernet/mellanox/mlx5/core/en/xsk/setup.c
index bd0cf822cea9..d39f778ecd85 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/en/xsk/setup.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en/xsk/setup.c
@@ -123,7 +123,7 @@ int mlx5e_open_xsk(struct mlx5e_priv *priv, struct mlx5e_params *params,
if (!mlx5e_validate_xsk_param(params, xsk, priv->mdev))
return -EINVAL;
- cparam = kvzalloc_obj(*cparam, GFP_KERNEL);
+ cparam = kvzalloc_obj(*cparam);
if (!cparam)
return -ENOMEM;
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_accel/fs_tcp.c b/drivers/net/ethernet/mellanox/mlx5/core/en_accel/fs_tcp.c
index 64fe7921f380..e21b7c8f2e81 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/en_accel/fs_tcp.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en_accel/fs_tcp.c
@@ -82,7 +82,7 @@ struct mlx5_flow_handle *mlx5e_accel_fs_add_sk(struct mlx5e_flow_steering *fs,
struct mlx5_flow_handle *flow;
struct mlx5_flow_spec *spec;
- spec = kvzalloc_obj(*spec, GFP_KERNEL);
+ spec = kvzalloc_obj(*spec);
if (!spec)
return ERR_PTR(-ENOMEM);
@@ -186,7 +186,7 @@ static int accel_fs_tcp_create_groups(struct mlx5e_flow_table *ft,
int err;
u8 *mc;
- ft->g = kzalloc_objs(*ft->g, MLX5E_ACCEL_FS_TCP_NUM_GROUPS, GFP_KERNEL);
+ ft->g = kzalloc_objs(*ft->g, MLX5E_ACCEL_FS_TCP_NUM_GROUPS);
in = kvzalloc(inlen, GFP_KERNEL);
if (!in || !ft->g) {
kfree(ft->g);
@@ -378,7 +378,7 @@ int mlx5e_accel_fs_tcp_create(struct mlx5e_flow_steering *fs)
if (!MLX5_CAP_FLOWTABLE_NIC_RX(mlx5e_fs_get_mdev(fs), ft_field_support.outer_ip_version))
return -EOPNOTSUPP;
- accel_tcp = kzalloc_obj(*accel_tcp, GFP_KERNEL);
+ accel_tcp = kzalloc_obj(*accel_tcp);
if (!accel_tcp)
return -ENOMEM;
mlx5e_fs_set_accel_tcp(fs, accel_tcp);
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_accel/ipsec.c b/drivers/net/ethernet/mellanox/mlx5/core/en_accel/ipsec.c
index 6ae17d24e64d..415208abf10e 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/en_accel/ipsec.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en_accel/ipsec.c
@@ -712,20 +712,20 @@ static int mlx5_ipsec_create_work(struct mlx5e_ipsec_sa_entry *sa_entry)
break;
}
- work = kzalloc_obj(*work, GFP_KERNEL);
+ work = kzalloc_obj(*work);
if (!work)
return -ENOMEM;
switch (x->xso.type) {
case XFRM_DEV_OFFLOAD_CRYPTO:
- data = kzalloc_obj(*sa_entry, GFP_KERNEL);
+ data = kzalloc_obj(*sa_entry);
if (!data)
goto free_work;
INIT_WORK(&work->work, mlx5e_ipsec_modify_state);
break;
case XFRM_DEV_OFFLOAD_PACKET:
- data = kzalloc_obj(struct mlx5e_ipsec_netevent_data, GFP_KERNEL);
+ data = kzalloc_obj(struct mlx5e_ipsec_netevent_data);
if (!data)
goto free_work;
@@ -759,7 +759,7 @@ static int mlx5e_ipsec_create_dwork(struct mlx5e_ipsec_sa_entry *sa_entry)
x->lft.hard_byte_limit == XFRM_INF)
return 0;
- dwork = kzalloc_obj(*dwork, GFP_KERNEL);
+ dwork = kzalloc_obj(*dwork);
if (!dwork)
return -ENOMEM;
@@ -988,7 +988,7 @@ void mlx5e_ipsec_init(struct mlx5e_priv *priv)
return;
}
- ipsec = kzalloc_obj(*ipsec, GFP_KERNEL);
+ ipsec = kzalloc_obj(*ipsec);
if (!ipsec)
return;
@@ -1276,7 +1276,7 @@ static int mlx5e_xfrm_add_policy(struct xfrm_policy *x,
if (err)
return err;
- pol_entry = kzalloc_obj(*pol_entry, GFP_KERNEL);
+ pol_entry = kzalloc_obj(*pol_entry);
if (!pol_entry)
return -ENOMEM;
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_accel/ipsec_fs.c b/drivers/net/ethernet/mellanox/mlx5/core/en_accel/ipsec_fs.c
index 8139772387f1..197a1c6930c0 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/en_accel/ipsec_fs.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en_accel/ipsec_fs.c
@@ -208,7 +208,7 @@ static int rx_add_rule_drop_auth_trailer(struct mlx5e_ipsec_sa_entry *sa_entry,
struct mlx5_flow_spec *spec;
int err;
- spec = kvzalloc_obj(*spec, GFP_KERNEL);
+ spec = kvzalloc_obj(*spec);
if (!spec)
return -ENOMEM;
@@ -287,7 +287,7 @@ static int rx_add_rule_drop_replay(struct mlx5e_ipsec_sa_entry *sa_entry, struct
struct mlx5_flow_spec *spec;
int err;
- spec = kvzalloc_obj(*spec, GFP_KERNEL);
+ spec = kvzalloc_obj(*spec);
if (!spec)
return -ENOMEM;
@@ -347,7 +347,7 @@ static int ipsec_rx_status_drop_all_create(struct mlx5e_ipsec *ipsec,
int err = 0;
flow_group_in = kvzalloc(inlen, GFP_KERNEL);
- spec = kvzalloc_obj(*spec, GFP_KERNEL);
+ spec = kvzalloc_obj(*spec);
if (!flow_group_in || !spec) {
err = -ENOMEM;
goto err_out;
@@ -454,7 +454,7 @@ ipsec_rx_status_pass_create(struct mlx5e_ipsec *ipsec,
struct mlx5_flow_spec *spec;
int err;
- spec = kvzalloc_obj(*spec, GFP_KERNEL);
+ spec = kvzalloc_obj(*spec);
if (!spec)
return ERR_PTR(-ENOMEM);
@@ -554,7 +554,7 @@ static int ipsec_miss_create(struct mlx5_core_dev *mdev,
int err = 0;
flow_group_in = kvzalloc(inlen, GFP_KERNEL);
- spec = kvzalloc_obj(*spec, GFP_KERNEL);
+ spec = kvzalloc_obj(*spec);
if (!flow_group_in || !spec) {
err = -ENOMEM;
goto out;
@@ -1226,7 +1226,7 @@ static int ipsec_counter_rule_tx(struct mlx5_core_dev *mdev, struct mlx5e_ipsec_
struct mlx5_flow_spec *spec;
int err;
- spec = kvzalloc_obj(*spec, GFP_KERNEL);
+ spec = kvzalloc_obj(*spec);
if (!spec)
return -ENOMEM;
@@ -1962,7 +1962,7 @@ static int rx_add_rule_sa_selector(struct mlx5e_ipsec_sa_entry *sa_entry,
struct mlx5_flow_spec *spec;
int err = 0;
- spec = kvzalloc_obj(*spec, GFP_KERNEL);
+ spec = kvzalloc_obj(*spec);
if (!spec)
return -ENOMEM;
@@ -2046,7 +2046,7 @@ static int rx_add_rule(struct mlx5e_ipsec_sa_entry *sa_entry)
if (IS_ERR(rx))
return PTR_ERR(rx);
- spec = kvzalloc_obj(*spec, GFP_KERNEL);
+ spec = kvzalloc_obj(*spec);
if (!spec) {
err = -ENOMEM;
goto err_alloc;
@@ -2176,7 +2176,7 @@ static int tx_add_rule(struct mlx5e_ipsec_sa_entry *sa_entry)
if (IS_ERR(tx))
return PTR_ERR(tx);
- spec = kvzalloc_obj(*spec, GFP_KERNEL);
+ spec = kvzalloc_obj(*spec);
if (!spec) {
err = -ENOMEM;
goto err_alloc;
@@ -2267,7 +2267,7 @@ static int tx_add_policy(struct mlx5e_ipsec_pol_entry *pol_entry)
if (IS_ERR(ft))
return PTR_ERR(ft);
- spec = kvzalloc_obj(*spec, GFP_KERNEL);
+ spec = kvzalloc_obj(*spec);
if (!spec) {
err = -ENOMEM;
goto err_alloc;
@@ -2354,7 +2354,7 @@ static int rx_add_policy(struct mlx5e_ipsec_pol_entry *pol_entry)
rx = ipsec_rx(pol_entry->ipsec, attrs->addrs.family, attrs->type);
- spec = kvzalloc_obj(*spec, GFP_KERNEL);
+ spec = kvzalloc_obj(*spec);
if (!spec) {
err = -ENOMEM;
goto err_alloc;
@@ -2434,7 +2434,7 @@ static struct mlx5e_ipsec_fc *ipsec_fs_init_single_counter(struct mlx5_core_dev
struct mlx5_fc *counter;
int err;
- fc = kzalloc_obj(*fc, GFP_KERNEL);
+ fc = kzalloc_obj(*fc);
if (!fc)
return ERR_PTR(-ENOMEM);
@@ -2778,24 +2778,24 @@ int mlx5e_accel_ipsec_fs_init(struct mlx5e_ipsec *ipsec,
if (!ns_esw)
return -EOPNOTSUPP;
- ipsec->tx_esw = kzalloc_obj(*ipsec->tx_esw, GFP_KERNEL);
+ ipsec->tx_esw = kzalloc_obj(*ipsec->tx_esw);
if (!ipsec->tx_esw)
return -ENOMEM;
- ipsec->rx_esw = kzalloc_obj(*ipsec->rx_esw, GFP_KERNEL);
+ ipsec->rx_esw = kzalloc_obj(*ipsec->rx_esw);
if (!ipsec->rx_esw)
goto err_rx_esw;
}
- ipsec->tx = kzalloc_obj(*ipsec->tx, GFP_KERNEL);
+ ipsec->tx = kzalloc_obj(*ipsec->tx);
if (!ipsec->tx)
goto err_tx;
- ipsec->rx_ipv4 = kzalloc_obj(*ipsec->rx_ipv4, GFP_KERNEL);
+ ipsec->rx_ipv4 = kzalloc_obj(*ipsec->rx_ipv4);
if (!ipsec->rx_ipv4)
goto err_rx_ipv4;
- ipsec->rx_ipv6 = kzalloc_obj(*ipsec->rx_ipv6, GFP_KERNEL);
+ ipsec->rx_ipv6 = kzalloc_obj(*ipsec->rx_ipv6);
if (!ipsec->rx_ipv6)
goto err_rx_ipv6;
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_accel/ipsec_offload.c b/drivers/net/ethernet/mellanox/mlx5/core/en_accel/ipsec_offload.c
index 14d7a63f752e..33344e00719b 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/en_accel/ipsec_offload.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en_accel/ipsec_offload.c
@@ -522,7 +522,7 @@ int mlx5e_ipsec_aso_init(struct mlx5e_ipsec *ipsec)
struct device *pdev;
int err;
- aso = kzalloc_obj(*ipsec->aso, GFP_KERNEL);
+ aso = kzalloc_obj(*ipsec->aso);
if (!aso)
return -ENOMEM;
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_accel/ktls.c b/drivers/net/ethernet/mellanox/mlx5/core/en_accel/ktls.c
index ac348aacdb0d..337201f12895 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/en_accel/ktls.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en_accel/ktls.c
@@ -199,7 +199,7 @@ int mlx5e_ktls_init(struct mlx5e_priv *priv)
if (!mlx5e_is_ktls_device(priv->mdev))
return 0;
- tls = kzalloc_obj(*tls, GFP_KERNEL);
+ tls = kzalloc_obj(*tls);
if (!tls)
return -ENOMEM;
tls->mdev = priv->mdev;
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_accel/ktls_rx.c b/drivers/net/ethernet/mellanox/mlx5/core/en_accel/ktls_rx.c
index 47de07467e0c..ac8168ebb38c 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/en_accel/ktls_rx.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en_accel/ktls_rx.c
@@ -90,7 +90,7 @@ mlx5e_ktls_rx_resync_create_resp_list(void)
{
struct mlx5e_ktls_resync_resp *resp_list;
- resp_list = kvzalloc_obj(*resp_list, GFP_KERNEL);
+ resp_list = kvzalloc_obj(*resp_list);
if (!resp_list)
return ERR_PTR(-ENOMEM);
@@ -261,7 +261,7 @@ resync_post_get_progress_params(struct mlx5e_icosq *sq,
int err;
u16 pi;
- buf = kzalloc_obj(*buf, GFP_KERNEL);
+ buf = kzalloc_obj(*buf);
if (unlikely(!buf)) {
err = -ENOMEM;
goto err_out;
@@ -643,7 +643,7 @@ int mlx5e_ktls_add_rx(struct net_device *netdev, struct sock *sk,
tls_ctx = tls_get_ctx(sk);
priv = netdev_priv(netdev);
- priv_rx = kzalloc_obj(*priv_rx, GFP_KERNEL);
+ priv_rx = kzalloc_obj(*priv_rx);
if (unlikely(!priv_rx))
return -ENOMEM;
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_accel/ktls_tx.c b/drivers/net/ethernet/mellanox/mlx5/core/en_accel/ktls_tx.c
index b93f7d41a692..29769fc99c4b 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/en_accel/ktls_tx.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en_accel/ktls_tx.c
@@ -196,7 +196,7 @@ mlx5e_tls_priv_tx_init(struct mlx5_core_dev *mdev, struct mlx5e_tls_sw_stats *sw
struct mlx5e_ktls_offload_context_tx *priv_tx;
int err;
- priv_tx = kzalloc_obj(*priv_tx, GFP_KERNEL);
+ priv_tx = kzalloc_obj(*priv_tx);
if (!priv_tx)
return ERR_PTR(-ENOMEM);
@@ -360,7 +360,7 @@ static struct mlx5e_tls_tx_pool *mlx5e_tls_tx_pool_init(struct mlx5_core_dev *md
BUILD_BUG_ON(MLX5E_TLS_TX_POOL_LOW + MLX5E_TLS_TX_POOL_BULK >= MLX5E_TLS_TX_POOL_HIGH);
- pool = kvzalloc_obj(*pool, GFP_KERNEL);
+ pool = kvzalloc_obj(*pool);
if (!pool)
return NULL;
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_accel/macsec.c b/drivers/net/ethernet/mellanox/mlx5/core/en_accel/macsec.c
index 14db0a2af406..71b3a059c964 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/en_accel/macsec.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en_accel/macsec.c
@@ -165,7 +165,7 @@ static int mlx5e_macsec_aso_reg_mr(struct mlx5_core_dev *mdev, struct mlx5e_macs
dma_addr_t dma_addr;
int err;
- umr = kzalloc_obj(*umr, GFP_KERNEL);
+ umr = kzalloc_obj(*umr);
if (!umr) {
err = -ENOMEM;
return err;
@@ -530,7 +530,7 @@ static int mlx5e_macsec_add_txsa(struct macsec_context *ctx)
goto out;
}
- tx_sa = kzalloc_obj(*tx_sa, GFP_KERNEL);
+ tx_sa = kzalloc_obj(*tx_sa);
if (!tx_sa) {
err = -ENOMEM;
goto out;
@@ -701,13 +701,13 @@ static int mlx5e_macsec_add_rxsc(struct macsec_context *ctx)
goto out;
}
- rx_sc = kzalloc_obj(*rx_sc, GFP_KERNEL);
+ rx_sc = kzalloc_obj(*rx_sc);
if (!rx_sc) {
err = -ENOMEM;
goto out;
}
- sc_xarray_element = kzalloc_obj(*sc_xarray_element, GFP_KERNEL);
+ sc_xarray_element = kzalloc_obj(*sc_xarray_element);
if (!sc_xarray_element) {
err = -ENOMEM;
goto destroy_rx_sc;
@@ -912,7 +912,7 @@ static int mlx5e_macsec_add_rxsa(struct macsec_context *ctx)
goto out;
}
- rx_sa = kzalloc_obj(*rx_sa, GFP_KERNEL);
+ rx_sa = kzalloc_obj(*rx_sa);
if (!rx_sa) {
err = -ENOMEM;
goto out;
@@ -1093,7 +1093,7 @@ static int mlx5e_macsec_add_secy(struct macsec_context *ctx)
goto out;
}
- macsec_device = kzalloc_obj(*macsec_device, GFP_KERNEL);
+ macsec_device = kzalloc_obj(*macsec_device);
if (!macsec_device) {
err = -ENOMEM;
goto out;
@@ -1730,7 +1730,7 @@ int mlx5e_macsec_init(struct mlx5e_priv *priv)
return 0;
}
- macsec = kzalloc_obj(*macsec, GFP_KERNEL);
+ macsec = kzalloc_obj(*macsec);
if (!macsec)
return -ENOMEM;
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_accel/psp.c b/drivers/net/ethernet/mellanox/mlx5/core/en_accel/psp.c
index ea250eecbed1..6a50b6dec0fa 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/en_accel/psp.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en_accel/psp.c
@@ -142,7 +142,7 @@ static int accel_psp_fs_rx_err_add_rule(struct mlx5e_psp_fs *fs,
struct mlx5_flow_spec *spec;
int err = 0;
- spec = kzalloc_obj(*spec, GFP_KERNEL);
+ spec = kzalloc_obj(*spec);
if (!spec)
return -ENOMEM;
@@ -344,7 +344,7 @@ static int accel_psp_fs_rx_create_ft(struct mlx5e_psp_fs *fs,
int err = 0;
flow_group_in = kvzalloc(inlen, GFP_KERNEL);
- spec = kvzalloc_obj(*spec, GFP_KERNEL);
+ spec = kvzalloc_obj(*spec);
if (!flow_group_in || !spec) {
err = -ENOMEM;
goto out;
@@ -560,7 +560,7 @@ static int accel_psp_fs_init_rx(struct mlx5e_psp_fs *fs)
enum accel_fs_psp_type i;
int err;
- accel_psp = kzalloc_obj(*accel_psp, GFP_KERNEL);
+ accel_psp = kzalloc_obj(*accel_psp);
if (!accel_psp)
return -ENOMEM;
@@ -686,7 +686,7 @@ static int accel_psp_fs_tx_create_ft_table(struct mlx5e_psp_fs *fs)
struct mlx5_flow_group *fg;
int err = 0;
- spec = kvzalloc_obj(*spec, GFP_KERNEL);
+ spec = kvzalloc_obj(*spec);
in = kvzalloc(inlen, GFP_KERNEL);
if (!spec || !in) {
err = -ENOMEM;
@@ -815,7 +815,7 @@ static int accel_psp_fs_init_tx(struct mlx5e_psp_fs *fs)
if (!ns)
return -EOPNOTSUPP;
- tx_fs = kzalloc_obj(*tx_fs, GFP_KERNEL);
+ tx_fs = kzalloc_obj(*tx_fs);
if (!tx_fs)
return -ENOMEM;
@@ -896,7 +896,7 @@ static struct mlx5e_psp_fs *mlx5e_accel_psp_fs_init(struct mlx5e_priv *priv)
struct mlx5e_psp_fs *fs;
int err = 0;
- fs = kzalloc_obj(*fs, GFP_KERNEL);
+ fs = kzalloc_obj(*fs);
if (!fs)
return ERR_PTR(-ENOMEM);
@@ -1127,7 +1127,7 @@ int mlx5e_psp_init(struct mlx5e_priv *priv)
return 0;
}
- psp = kzalloc_obj(*psp, GFP_KERNEL);
+ psp = kzalloc_obj(*psp);
if (!psp)
return -ENOMEM;
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_arfs.c b/drivers/net/ethernet/mellanox/mlx5/core/en_arfs.c
index dbe824a62f22..c5e62d7d4908 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/en_arfs.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en_arfs.c
@@ -260,7 +260,7 @@ static int arfs_create_groups(struct mlx5e_flow_table *ft,
int err;
u8 *mc;
- ft->g = kzalloc_objs(*ft->g, MLX5E_ARFS_NUM_GROUPS, GFP_KERNEL);
+ ft->g = kzalloc_objs(*ft->g, MLX5E_ARFS_NUM_GROUPS);
if (!ft->g)
return -ENOMEM;
@@ -391,7 +391,7 @@ int mlx5e_arfs_create_tables(struct mlx5e_flow_steering *fs,
if (!ntuple)
return 0;
- arfs = kvzalloc_obj(*arfs, GFP_KERNEL);
+ arfs = kvzalloc_obj(*arfs);
if (!arfs)
return -ENOMEM;
@@ -522,7 +522,7 @@ static struct mlx5_flow_handle *arfs_add_rule(struct mlx5e_priv *priv,
struct mlx5_flow_table *ft;
int err = 0;
- spec = kvzalloc_obj(*spec, GFP_KERNEL);
+ spec = kvzalloc_obj(*spec);
if (!spec) {
priv->channel_stats[arfs_rule->rxq]->rq.arfs_err++;
err = -ENOMEM;
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_common.c b/drivers/net/ethernet/mellanox/mlx5/core/en_common.c
index 5da0a13d92f1..c2d4bae533de 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/en_common.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en_common.c
@@ -179,7 +179,7 @@ int mlx5e_create_mdev_resources(struct mlx5_core_dev *mdev, bool create_tises)
num_doorbells = min(mlx5e_get_devlink_param_num_doorbells(mdev),
mlx5e_get_max_num_channels(mdev));
- res->bfregs = kzalloc_objs(*res->bfregs, num_doorbells, GFP_KERNEL);
+ res->bfregs = kzalloc_objs(*res->bfregs, num_doorbells);
if (!res->bfregs) {
err = -ENOMEM;
goto err_destroy_mkey;
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_fs.c b/drivers/net/ethernet/mellanox/mlx5/core/en_fs.c
index 1dd5f916597b..9352e2183312 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/en_fs.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en_fs.c
@@ -295,7 +295,7 @@ static int mlx5e_add_vlan_rule(struct mlx5e_flow_steering *fs,
struct mlx5_flow_spec *spec;
int err = 0;
- spec = kvzalloc_obj(*spec, GFP_KERNEL);
+ spec = kvzalloc_obj(*spec);
if (!spec)
return -ENOMEM;
@@ -372,7 +372,7 @@ mlx5e_add_trap_rule(struct mlx5_flow_table *ft, int trap_id, int tir_num)
struct mlx5_flow_handle *rule;
struct mlx5_flow_spec *spec;
- spec = kvzalloc_obj(*spec, GFP_KERNEL);
+ spec = kvzalloc_obj(*spec);
if (!spec)
return ERR_PTR(-ENOMEM);
spec->flow_context.flags |= FLOW_CONTEXT_HAS_TAG;
@@ -754,7 +754,7 @@ static int mlx5e_add_promisc_rule(struct mlx5e_flow_steering *fs)
struct mlx5_flow_spec *spec;
int err = 0;
- spec = kvzalloc_obj(*spec, GFP_KERNEL);
+ spec = kvzalloc_obj(*spec);
if (!spec)
return -ENOMEM;
dest.type = MLX5_FLOW_DESTINATION_TYPE_FLOW_TABLE;
@@ -984,7 +984,7 @@ static int mlx5e_add_l2_flow_rule(struct mlx5e_flow_steering *fs,
u8 *mc_dmac;
u8 *mv_dmac;
- spec = kvzalloc_obj(*spec, GFP_KERNEL);
+ spec = kvzalloc_obj(*spec);
if (!spec)
return -ENOMEM;
@@ -1039,7 +1039,7 @@ static int mlx5e_create_l2_table_groups(struct mlx5e_l2_table *l2_table)
int err;
u8 *mc;
- ft->g = kzalloc_objs(*ft->g, MLX5E_NUM_L2_GROUPS, GFP_KERNEL);
+ ft->g = kzalloc_objs(*ft->g, MLX5E_NUM_L2_GROUPS);
if (!ft->g)
return -ENOMEM;
in = kvzalloc(inlen, GFP_KERNEL);
@@ -1251,7 +1251,7 @@ static int mlx5e_fs_create_vlan_table(struct mlx5e_flow_steering *fs)
if (IS_ERR(ft->t))
return PTR_ERR(ft->t);
- ft->g = kzalloc_objs(*ft->g, MLX5E_NUM_VLAN_GROUPS, GFP_KERNEL);
+ ft->g = kzalloc_objs(*ft->g, MLX5E_NUM_VLAN_GROUPS);
if (!ft->g) {
err = -ENOMEM;
goto err_destroy_vlan_table;
@@ -1394,7 +1394,7 @@ void mlx5e_destroy_flow_steering(struct mlx5e_flow_steering *fs, bool ntuple,
static int mlx5e_fs_vlan_alloc(struct mlx5e_flow_steering *fs)
{
- fs->vlan = kvzalloc_obj(*fs->vlan, GFP_KERNEL);
+ fs->vlan = kvzalloc_obj(*fs->vlan);
if (!fs->vlan)
return -ENOMEM;
return 0;
@@ -1466,7 +1466,7 @@ struct mlx5e_flow_steering *mlx5e_fs_init(const struct mlx5e_profile *profile,
struct mlx5e_flow_steering *fs;
int err;
- fs = kvzalloc_obj(*fs, GFP_KERNEL);
+ fs = kvzalloc_obj(*fs);
if (!fs)
goto err;
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_fs_ethtool.c b/drivers/net/ethernet/mellanox/mlx5/core/en_fs_ethtool.c
index d01636af3d02..aecfba7deeb0 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/en_fs_ethtool.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en_fs_ethtool.c
@@ -465,7 +465,7 @@ add_ethtool_flow_rule(struct mlx5e_priv *priv,
struct mlx5_flow_spec *spec;
int err = 0;
- spec = kvzalloc_obj(*spec, GFP_KERNEL);
+ spec = kvzalloc_obj(*spec);
if (!spec)
return ERR_PTR(-ENOMEM);
err = set_flow_attrs(spec->match_criteria, spec->match_value,
@@ -476,7 +476,7 @@ add_ethtool_flow_rule(struct mlx5e_priv *priv,
if (fs->ring_cookie == RX_CLS_FLOW_DISC) {
flow_act.action = MLX5_FLOW_CONTEXT_ACTION_DROP;
} else {
- dst = kzalloc_obj(*dst, GFP_KERNEL);
+ dst = kzalloc_obj(*dst);
if (!dst) {
err = -ENOMEM;
goto free;
@@ -541,7 +541,7 @@ static struct mlx5e_ethtool_rule *get_ethtool_rule(struct mlx5e_priv *priv,
if (eth_rule)
del_ethtool_rule(priv->fs, eth_rule);
- eth_rule = kzalloc_obj(*eth_rule, GFP_KERNEL);
+ eth_rule = kzalloc_obj(*eth_rule);
if (!eth_rule)
return ERR_PTR(-ENOMEM);
@@ -836,7 +836,7 @@ mlx5e_ethtool_get_all_flows(struct mlx5e_priv *priv,
int mlx5e_ethtool_alloc(struct mlx5e_ethtool_steering **ethtool)
{
- *ethtool = kvzalloc_obj(**ethtool, GFP_KERNEL);
+ *ethtool = kvzalloc_obj(**ethtool);
if (!*ethtool)
return -ENOMEM;
return 0;
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_main.c b/drivers/net/ethernet/mellanox/mlx5/core/en_main.c
index 41edda3d0c70..e844ffa4d6b7 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/en_main.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en_main.c
@@ -2791,7 +2791,7 @@ static int mlx5e_open_channel(struct mlx5e_priv *priv, int ix,
return err;
c = kvzalloc_node(sizeof(*c), GFP_KERNEL, cpu_to_node(cpu));
- cparam = kvzalloc_obj(*cparam, GFP_KERNEL);
+ cparam = kvzalloc_obj(*cparam);
if (!c || !cparam) {
err = -ENOMEM;
goto err_free;
@@ -2911,7 +2911,7 @@ int mlx5e_open_channels(struct mlx5e_priv *priv,
chs->num = chs->params.num_channels;
- chs->c = kzalloc_objs(struct mlx5e_channel *, chs->num, GFP_KERNEL);
+ chs->c = kzalloc_objs(struct mlx5e_channel *, chs->num);
if (!chs->c)
goto err_out;
@@ -3415,8 +3415,8 @@ int mlx5e_safe_switch_params(struct mlx5e_priv *priv,
if (!reset)
return mlx5e_switch_priv_params(priv, params, preactivate, context);
- old_chs = kzalloc_obj(*old_chs, GFP_KERNEL);
- new_chs = kzalloc_obj(*new_chs, GFP_KERNEL);
+ old_chs = kzalloc_obj(*old_chs);
+ new_chs = kzalloc_obj(*new_chs);
if (!old_chs || !new_chs) {
err = -ENOMEM;
goto err_free_chs;
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_rep.c b/drivers/net/ethernet/mellanox/mlx5/core/en_rep.c
index b0bc37669305..1db4ecb2356f 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/en_rep.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en_rep.c
@@ -476,7 +476,7 @@ static int mlx5e_sqs2vport_add_peers_rules(struct mlx5_eswitch *esw, struct mlx5
struct mlx5e_rep_sq_peer *sq_peer;
int err;
- sq_peer = kzalloc_obj(*sq_peer, GFP_KERNEL);
+ sq_peer = kzalloc_obj(*sq_peer);
if (!sq_peer)
return -ENOMEM;
@@ -521,7 +521,7 @@ static int mlx5e_sqs2vport_start(struct mlx5_eswitch *esw,
devcom_locked = true;
for (i = 0; i < sqns_num; i++) {
- rep_sq = kzalloc_obj(*rep_sq, GFP_KERNEL);
+ rep_sq = kzalloc_obj(*rep_sq);
if (!rep_sq) {
err = -ENOMEM;
goto out_err;
@@ -1621,7 +1621,7 @@ mlx5e_vport_rep_load(struct mlx5_core_dev *dev, struct mlx5_eswitch_rep *rep)
struct mlx5e_rep_priv *rpriv;
int err;
- rpriv = kvzalloc_obj(*rpriv, GFP_KERNEL);
+ rpriv = kvzalloc_obj(*rpriv);
if (!rpriv)
return -ENOMEM;
@@ -1731,7 +1731,7 @@ static int mlx5e_vport_rep_event_pair(struct mlx5_eswitch *esw,
sq_peer->peer = peer_esw;
continue;
}
- sq_peer = kzalloc_obj(*sq_peer, GFP_KERNEL);
+ sq_peer = kzalloc_obj(*sq_peer);
if (!sq_peer) {
err = -ENOMEM;
goto err_sq_alloc;
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_selftest.c b/drivers/net/ethernet/mellanox/mlx5/core/en_selftest.c
index 4066778f702d..accc26d1a872 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/en_selftest.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en_selftest.c
@@ -270,7 +270,7 @@ static int mlx5e_test_loopback(struct mlx5e_priv *priv)
return -ENODEV;
}
- lbtp = kzalloc_obj(*lbtp, GFP_KERNEL);
+ lbtp = kzalloc_obj(*lbtp);
if (!lbtp)
return -ENOMEM;
lbtp->loopback_ok = false;
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_tc.c b/drivers/net/ethernet/mellanox/mlx5/core/en_tc.c
index 761cfd2d95f1..1434b65d4746 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/en_tc.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en_tc.c
@@ -153,7 +153,7 @@ struct mlx5e_tc_table *mlx5e_tc_table_alloc(void)
{
struct mlx5e_tc_table *tc;
- tc = kvzalloc_obj(*tc, GFP_KERNEL);
+ tc = kvzalloc_obj(*tc);
return tc ? tc : ERR_PTR(-ENOMEM);
}
@@ -905,7 +905,7 @@ mlx5e_hairpin_create(struct mlx5e_priv *priv, struct mlx5_hairpin_params *params
struct mlx5_hairpin *pair;
int err;
- hp = kzalloc_obj(*hp, GFP_KERNEL);
+ hp = kzalloc_obj(*hp);
if (!hp)
return ERR_PTR(-ENOMEM);
@@ -1139,7 +1139,7 @@ static int mlx5e_hairpin_flow_add(struct mlx5e_priv *priv,
goto attach_flow;
}
- hpe = kzalloc_obj(*hpe, GFP_KERNEL);
+ hpe = kzalloc_obj(*hpe);
if (!hpe) {
mutex_unlock(&tc->hairpin_tbl_lock);
return -ENOMEM;
@@ -1794,7 +1794,7 @@ extra_split_attr_dests(struct mlx5e_tc_flow *flow,
return PTR_ERR(post_act);
attr2 = mlx5_alloc_flow_attr(mlx5e_get_flow_namespace(flow));
- parse_attr2 = kvzalloc_obj(*parse_attr, GFP_KERNEL);
+ parse_attr2 = kvzalloc_obj(*parse_attr);
if (!attr2 || !parse_attr2) {
err = -ENOMEM;
goto err_free;
@@ -2570,7 +2570,7 @@ static int parse_tunnel_attr(struct mlx5e_priv *priv,
} else if (tunnel) {
struct mlx5_flow_spec *tmp_spec;
- tmp_spec = kvzalloc_obj(*tmp_spec, GFP_KERNEL);
+ tmp_spec = kvzalloc_obj(*tmp_spec);
if (!tmp_spec) {
NL_SET_ERR_MSG_MOD(extack, "Failed to allocate memory for tunnel tmp spec");
netdev_warn(priv->netdev, "Failed to allocate memory for tunnel tmp spec");
@@ -3671,7 +3671,7 @@ mlx5e_clone_flow_attr_for_post_act(struct mlx5_flow_attr *attr,
struct mlx5_flow_attr *attr2;
attr2 = mlx5_alloc_flow_attr(ns_type);
- parse_attr = kvzalloc_obj(*parse_attr, GFP_KERNEL);
+ parse_attr = kvzalloc_obj(*parse_attr);
if (!attr2 || !parse_attr) {
kvfree(parse_attr);
kfree(attr2);
@@ -4448,8 +4448,8 @@ mlx5e_alloc_flow(struct mlx5e_priv *priv, int attr_size,
int err = -ENOMEM;
int out_index;
- flow = kzalloc_obj(*flow, GFP_KERNEL);
- parse_attr = kvzalloc_obj(*parse_attr, GFP_KERNEL);
+ flow = kzalloc_obj(*flow);
+ parse_attr = kvzalloc_obj(*parse_attr);
if (!parse_attr || !flow)
goto err_free;
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/eq.c b/drivers/net/ethernet/mellanox/mlx5/core/eq.c
index cc679500b3dc..22a637111aa2 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/eq.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/eq.c
@@ -881,7 +881,7 @@ static int comp_irq_request_sf(struct mlx5_core_dev *dev, u16 vecidx)
if (!mlx5_irq_pool_is_sf_pool(pool))
return comp_irq_request_pci(dev, vecidx);
- af_desc = kvzalloc_obj(*af_desc, GFP_KERNEL);
+ af_desc = kvzalloc_obj(*af_desc);
if (!af_desc)
return -ENOMEM;
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/esw/acl/helper.c b/drivers/net/ethernet/mellanox/mlx5/core/esw/acl/helper.c
index a95d12860fed..ba5cce706ea2 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/esw/acl/helper.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/esw/acl/helper.c
@@ -58,7 +58,7 @@ int esw_egress_acl_vlan_create(struct mlx5_eswitch *esw,
if (vport->egress.allowed_vlan)
return -EEXIST;
- spec = kvzalloc_obj(*spec, GFP_KERNEL);
+ spec = kvzalloc_obj(*spec);
if (!spec)
return -ENOMEM;
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/esw/acl/ingress_lgcy.c b/drivers/net/ethernet/mellanox/mlx5/core/esw/acl/ingress_lgcy.c
index f8ca68ea685e..4410e57acfc7 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/esw/acl/ingress_lgcy.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/esw/acl/ingress_lgcy.c
@@ -200,7 +200,7 @@ int esw_acl_ingress_lgcy_setup(struct mlx5_eswitch *esw,
"vport[%d] configure ingress rules, vlan(%d) qos(%d)\n",
vport->vport, vport->info.vlan, vport->info.qos);
- spec = kvzalloc_obj(*spec, GFP_KERNEL);
+ spec = kvzalloc_obj(*spec);
if (!spec) {
err = -ENOMEM;
goto out;
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/esw/acl/ingress_ofld.c b/drivers/net/ethernet/mellanox/mlx5/core/esw/acl/ingress_ofld.c
index 4ffaa7b4b5b1..197324788799 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/esw/acl/ingress_ofld.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/esw/acl/ingress_ofld.c
@@ -29,7 +29,7 @@ static int esw_acl_ingress_prio_tag_create(struct mlx5_eswitch *esw,
* required, allow
* Unmatched traffic is allowed by default
*/
- spec = kvzalloc_obj(*spec, GFP_KERNEL);
+ spec = kvzalloc_obj(*spec);
if (!spec)
return -ENOMEM;
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/esw/bridge.c b/drivers/net/ethernet/mellanox/mlx5/core/esw/bridge.c
index b9e9505ff76e..87b5fd349594 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/esw/bridge.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/esw/bridge.c
@@ -586,7 +586,7 @@ mlx5_esw_bridge_ingress_flow_with_esw_create(u16 vport_num, const unsigned char
struct mlx5_flow_handle *handle;
u8 *smac_v, *smac_c;
- rule_spec = kvzalloc_obj(*rule_spec, GFP_KERNEL);
+ rule_spec = kvzalloc_obj(*rule_spec);
if (!rule_spec)
return ERR_PTR(-ENOMEM);
@@ -700,7 +700,7 @@ mlx5_esw_bridge_ingress_filter_flow_create(u16 vport_num, const unsigned char *a
struct mlx5_flow_handle *handle;
u8 *smac_v, *smac_c;
- rule_spec = kvzalloc_obj(*rule_spec, GFP_KERNEL);
+ rule_spec = kvzalloc_obj(*rule_spec);
if (!rule_spec)
return ERR_PTR(-ENOMEM);
@@ -753,7 +753,7 @@ mlx5_esw_bridge_egress_flow_create(u16 vport_num, u16 esw_owner_vhca_id, const u
struct mlx5_flow_handle *handle;
u8 *dmac_v, *dmac_c;
- rule_spec = kvzalloc_obj(*rule_spec, GFP_KERNEL);
+ rule_spec = kvzalloc_obj(*rule_spec);
if (!rule_spec)
return ERR_PTR(-ENOMEM);
@@ -821,7 +821,7 @@ mlx5_esw_bridge_egress_miss_flow_create(struct mlx5_flow_table *egress_ft,
struct mlx5_flow_spec *rule_spec;
struct mlx5_flow_handle *handle;
- rule_spec = kvzalloc_obj(*rule_spec, GFP_KERNEL);
+ rule_spec = kvzalloc_obj(*rule_spec);
if (!rule_spec)
return ERR_PTR(-ENOMEM);
@@ -844,7 +844,7 @@ static struct mlx5_esw_bridge *mlx5_esw_bridge_create(struct net_device *br_netd
struct mlx5_esw_bridge *bridge;
int err;
- bridge = kvzalloc_obj(*bridge, GFP_KERNEL);
+ bridge = kvzalloc_obj(*bridge);
if (!bridge)
return ERR_PTR(-ENOMEM);
@@ -1179,7 +1179,7 @@ mlx5_esw_bridge_vlan_create(u16 vlan_proto, u16 vid, u16 flags, struct mlx5_esw_
struct mlx5_esw_bridge_vlan *vlan;
int err;
- vlan = kvzalloc_obj(*vlan, GFP_KERNEL);
+ vlan = kvzalloc_obj(*vlan);
if (!vlan)
return ERR_PTR(-ENOMEM);
@@ -1365,7 +1365,7 @@ mlx5_esw_bridge_fdb_entry_init(struct net_device *dev, u16 vport_num, u16 esw_ow
if (entry)
mlx5_esw_bridge_fdb_entry_notify_and_cleanup(entry, bridge);
- entry = kvzalloc_obj(*entry, GFP_KERNEL);
+ entry = kvzalloc_obj(*entry);
if (!entry)
return ERR_PTR(-ENOMEM);
@@ -1550,7 +1550,7 @@ static int mlx5_esw_bridge_vport_init(u16 vport_num, u16 esw_owner_vhca_id, u16
struct mlx5_esw_bridge_port *port;
int err;
- port = kvzalloc_obj(*port, GFP_KERNEL);
+ port = kvzalloc_obj(*port);
if (!port)
return -ENOMEM;
@@ -1924,7 +1924,7 @@ struct mlx5_esw_bridge_offloads *mlx5_esw_bridge_init(struct mlx5_eswitch *esw)
ASSERT_RTNL();
- br_offloads = kvzalloc_obj(*br_offloads, GFP_KERNEL);
+ br_offloads = kvzalloc_obj(*br_offloads);
if (!br_offloads)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/esw/bridge_mcast.c b/drivers/net/ethernet/mellanox/mlx5/core/esw/bridge_mcast.c
index 15e5a05f5dd8..092cd62a9137 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/esw/bridge_mcast.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/esw/bridge_mcast.c
@@ -65,11 +65,11 @@ mlx5_esw_bridge_mdb_flow_create(u16 esw_owner_vhca_id, struct mlx5_esw_bridge_md
u8 *dmac_v, *dmac_c;
unsigned long idx;
- rule_spec = kvzalloc_obj(*rule_spec, GFP_KERNEL);
+ rule_spec = kvzalloc_obj(*rule_spec);
if (!rule_spec)
return ERR_PTR(-ENOMEM);
- dests = kvzalloc_objs(*dests, num_dests, GFP_KERNEL);
+ dests = kvzalloc_objs(*dests, num_dests);
if (!dests) {
kvfree(rule_spec);
return ERR_PTR(-ENOMEM);
@@ -152,7 +152,7 @@ mlx5_esw_bridge_port_mdb_entry_init(struct mlx5_esw_bridge_port *port,
struct mlx5_esw_bridge_mdb_entry *entry;
int err;
- entry = kvzalloc_obj(*entry, GFP_KERNEL);
+ entry = kvzalloc_obj(*entry);
if (!entry)
return ERR_PTR(-ENOMEM);
@@ -516,7 +516,7 @@ mlx5_esw_bridge_mcast_flow_with_esw_create(struct mlx5_esw_bridge_port *port,
struct mlx5_flow_spec *rule_spec;
struct mlx5_flow_handle *handle;
- rule_spec = kvzalloc_obj(*rule_spec, GFP_KERNEL);
+ rule_spec = kvzalloc_obj(*rule_spec);
if (!rule_spec)
return ERR_PTR(-ENOMEM);
@@ -584,7 +584,7 @@ mlx5_esw_bridge_mcast_vlan_flow_create(u16 vlan_proto, struct mlx5_esw_bridge_po
struct mlx5_flow_spec *rule_spec;
struct mlx5_flow_handle *handle;
- rule_spec = kvzalloc_obj(*rule_spec, GFP_KERNEL);
+ rule_spec = kvzalloc_obj(*rule_spec);
if (!rule_spec)
return ERR_PTR(-ENOMEM);
@@ -656,7 +656,7 @@ mlx5_esw_bridge_mcast_fwd_flow_create(struct mlx5_esw_bridge_port *port)
struct mlx5_flow_spec *rule_spec;
struct mlx5_flow_handle *handle;
- rule_spec = kvzalloc_obj(*rule_spec, GFP_KERNEL);
+ rule_spec = kvzalloc_obj(*rule_spec);
if (!rule_spec)
return ERR_PTR(-ENOMEM);
@@ -890,7 +890,7 @@ mlx5_esw_bridge_ingress_igmp_fh_create(struct mlx5_flow_table *ingress_ft,
struct mlx5_flow_spec *rule_spec;
struct mlx5_flow_handle *handle;
- rule_spec = kvzalloc_obj(*rule_spec, GFP_KERNEL);
+ rule_spec = kvzalloc_obj(*rule_spec);
if (!rule_spec)
return ERR_PTR(-ENOMEM);
@@ -922,7 +922,7 @@ mlx5_esw_bridge_ingress_mld_fh_create(u8 type, struct mlx5_flow_table *ingress_f
struct mlx5_flow_spec *rule_spec;
struct mlx5_flow_handle *handle;
- rule_spec = kvzalloc_obj(*rule_spec, GFP_KERNEL);
+ rule_spec = kvzalloc_obj(*rule_spec);
if (!rule_spec)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/esw/devlink_port.c b/drivers/net/ethernet/mellanox/mlx5/core/esw/devlink_port.c
index 0b8bb42af33f..8bffba85f21f 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/esw/devlink_port.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/esw/devlink_port.c
@@ -70,7 +70,7 @@ int mlx5_esw_offloads_pf_vf_devlink_port_init(struct mlx5_eswitch *esw,
if (!mlx5_esw_devlink_port_supported(esw, vport_num))
return 0;
- dl_port = kzalloc_obj(*dl_port, GFP_KERNEL);
+ dl_port = kzalloc_obj(*dl_port);
if (!dl_port)
return -ENOMEM;
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/esw/indir_table.c b/drivers/net/ethernet/mellanox/mlx5/core/esw/indir_table.c
index 1a135c3e48df..b80999608f8d 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/esw/indir_table.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/esw/indir_table.c
@@ -46,7 +46,7 @@ struct mlx5_esw_indir_table {
struct mlx5_esw_indir_table *
mlx5_esw_indir_table_init(void)
{
- struct mlx5_esw_indir_table *indir = kvzalloc_obj(*indir, GFP_KERNEL);
+ struct mlx5_esw_indir_table *indir = kvzalloc_obj(*indir);
if (!indir)
return ERR_PTR(-ENOMEM);
@@ -111,7 +111,7 @@ static int mlx5_esw_indir_table_rule_get(struct mlx5_eswitch *esw,
return 0;
}
- rule = kzalloc_obj(*rule, GFP_KERNEL);
+ rule = kzalloc_obj(*rule);
if (!rule)
return -ENOMEM;
@@ -258,7 +258,7 @@ mlx5_esw_indir_table_entry_create(struct mlx5_eswitch *esw, struct mlx5_flow_att
if (!root_ns)
return ERR_PTR(-ENOENT);
- e = kzalloc_obj(*e, GFP_KERNEL);
+ e = kzalloc_obj(*e);
if (!e)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/esw/legacy.c b/drivers/net/ethernet/mellanox/mlx5/core/esw/legacy.c
index 0ee931bca98b..7c62f7938bfb 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/esw/legacy.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/esw/legacy.c
@@ -259,7 +259,7 @@ static int _mlx5_eswitch_set_vepa_locked(struct mlx5_eswitch *esw,
if (err)
return err;
- spec = kvzalloc_obj(*spec, GFP_KERNEL);
+ spec = kvzalloc_obj(*spec);
if (!spec) {
err = -ENOMEM;
goto out;
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/esw/qos.c b/drivers/net/ethernet/mellanox/mlx5/core/esw/qos.c
index 2f9e59790584..c490a0287bff 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/esw/qos.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/esw/qos.c
@@ -38,7 +38,7 @@ static struct mlx5_qos_domain *esw_qos_domain_alloc(void)
{
struct mlx5_qos_domain *qos_domain;
- qos_domain = kzalloc_obj(*qos_domain, GFP_KERNEL);
+ qos_domain = kzalloc_obj(*qos_domain);
if (!qos_domain)
return NULL;
@@ -518,7 +518,7 @@ __esw_qos_alloc_node(struct mlx5_eswitch *esw, u32 tsar_ix, enum sched_node_type
{
struct mlx5_esw_sched_node *node;
- node = kzalloc_obj(*node, GFP_KERNEL);
+ node = kzalloc_obj(*node);
if (!node)
return NULL;
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/esw/vporttbl.c b/drivers/net/ethernet/mellanox/mlx5/core/esw/vporttbl.c
index 5628182faf57..ad2b9edbc0b9 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/esw/vporttbl.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/esw/vporttbl.c
@@ -96,7 +96,7 @@ mlx5_esw_vporttbl_get(struct mlx5_eswitch *esw, struct mlx5_vport_tbl_attr *attr
goto out;
}
- e = kzalloc_obj(*e, GFP_KERNEL);
+ e = kzalloc_obj(*e);
if (!e) {
fdb = ERR_PTR(-ENOMEM);
goto err_alloc;
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/eswitch.c b/drivers/net/ethernet/mellanox/mlx5/core/eswitch.c
index d31a74ae1dd7..d3af87a94a18 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/eswitch.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/eswitch.c
@@ -221,7 +221,7 @@ __esw_fdb_set_vport_rule(struct mlx5_eswitch *esw, u16 vport, bool rx_rule,
if (rx_rule)
match_header |= MLX5_MATCH_MISC_PARAMETERS;
- spec = kvzalloc_obj(*spec, GFP_KERNEL);
+ spec = kvzalloc_obj(*spec);
if (!spec)
return NULL;
@@ -1862,7 +1862,7 @@ int mlx5_esw_vport_alloc(struct mlx5_eswitch *esw, int index, u16 vport_num)
struct mlx5_vport *vport;
int err;
- vport = kzalloc_obj(*vport, GFP_KERNEL);
+ vport = kzalloc_obj(*vport);
if (!vport)
return -ENOMEM;
@@ -2022,7 +2022,7 @@ int mlx5_eswitch_init(struct mlx5_core_dev *dev)
if (!MLX5_VPORT_MANAGER(dev) && !MLX5_ESWITCH_MANAGER(dev))
return 0;
- esw = kzalloc_obj(*esw, GFP_KERNEL);
+ esw = kzalloc_obj(*esw);
if (!esw)
return -ENOMEM;
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/eswitch_offloads.c b/drivers/net/ethernet/mellanox/mlx5/core/eswitch_offloads.c
index 1693f2dd5d6a..82d4c14fdca0 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/eswitch_offloads.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/eswitch_offloads.c
@@ -680,7 +680,7 @@ mlx5_eswitch_add_offloaded_rule(struct mlx5_eswitch *esw,
if (!esw_flow_dests_fwd_ipsec_check(esw, esw_attr))
return ERR_PTR(-EOPNOTSUPP);
- dest = kzalloc_objs(*dest, MLX5_MAX_FLOW_FWD_VPORTS + 1, GFP_KERNEL);
+ dest = kzalloc_objs(*dest, MLX5_MAX_FLOW_FWD_VPORTS + 1);
if (!dest)
return ERR_PTR(-ENOMEM);
@@ -808,7 +808,7 @@ mlx5_eswitch_add_fwd_rule(struct mlx5_eswitch *esw,
struct mlx5_flow_handle *rule;
int i, err = 0;
- dest = kzalloc_objs(*dest, MLX5_MAX_FLOW_FWD_VPORTS + 1, GFP_KERNEL);
+ dest = kzalloc_objs(*dest, MLX5_MAX_FLOW_FWD_VPORTS + 1);
if (!dest)
return ERR_PTR(-ENOMEM);
@@ -947,7 +947,7 @@ mlx5_eswitch_add_send_to_vport_rule(struct mlx5_eswitch *on_esw,
void *misc;
u16 vport;
- spec = kvzalloc_obj(*spec, GFP_KERNEL);
+ spec = kvzalloc_obj(*spec);
if (!spec) {
flow_rule = ERR_PTR(-ENOMEM);
goto out;
@@ -1044,7 +1044,7 @@ mlx5_eswitch_add_send_to_vport_meta_rule(struct mlx5_eswitch *esw, u16 vport_num
struct mlx5_flow_handle *flow_rule;
struct mlx5_flow_spec *spec;
- spec = kvzalloc_obj(*spec, GFP_KERNEL);
+ spec = kvzalloc_obj(*spec);
if (!spec)
return ERR_PTR(-ENOMEM);
@@ -1198,13 +1198,13 @@ static int esw_add_fdb_peer_miss_rules(struct mlx5_eswitch *esw,
!mlx5_core_is_ecpf_esw_manager(peer_dev))
return 0;
- spec = kvzalloc_obj(*spec, GFP_KERNEL);
+ spec = kvzalloc_obj(*spec);
if (!spec)
return -ENOMEM;
peer_miss_rules_setup(esw, peer_dev, spec, &dest);
- flows = kvzalloc_objs(*flows, peer_esw->total_vports, GFP_KERNEL);
+ flows = kvzalloc_objs(*flows, peer_esw->total_vports);
if (!flows) {
err = -ENOMEM;
goto alloc_flows_err;
@@ -1368,7 +1368,7 @@ static int esw_add_fdb_miss_rule(struct mlx5_eswitch *esw)
u8 *dmac_c;
u8 *dmac_v;
- spec = kvzalloc_obj(*spec, GFP_KERNEL);
+ spec = kvzalloc_obj(*spec);
if (!spec) {
err = -ENOMEM;
goto out;
@@ -1430,7 +1430,7 @@ esw_add_restore_rule(struct mlx5_eswitch *esw, u32 tag)
if (!mlx5_eswitch_reg_c1_loopback_supported(esw))
return ERR_PTR(-EOPNOTSUPP);
- spec = kvzalloc_obj(*spec, GFP_KERNEL);
+ spec = kvzalloc_obj(*spec);
if (!spec)
return ERR_PTR(-ENOMEM);
@@ -2148,7 +2148,7 @@ mlx5_eswitch_create_vport_rx_rule(struct mlx5_eswitch *esw, u16 vport,
struct mlx5_flow_handle *flow_rule;
struct mlx5_flow_spec *spec;
- spec = kvzalloc_obj(*spec, GFP_KERNEL);
+ spec = kvzalloc_obj(*spec);
if (!spec) {
flow_rule = ERR_PTR(-ENOMEM);
goto out;
@@ -2525,7 +2525,7 @@ int mlx5_esw_offloads_rep_add(struct mlx5_eswitch *esw,
int rep_type;
int err;
- rep = kzalloc_obj(*rep, GFP_KERNEL);
+ rep = kzalloc_obj(*rep);
if (!rep)
return -ENOMEM;
@@ -2861,7 +2861,7 @@ static int __esw_set_master_egress_rule(struct mlx5_core_dev *master,
int err = 0;
void *misc;
- spec = kvzalloc_obj(*spec, GFP_KERNEL);
+ spec = kvzalloc_obj(*spec);
if (!spec)
return -ENOMEM;
@@ -4470,7 +4470,7 @@ int mlx5_esw_vport_vhca_id_map(struct mlx5_eswitch *esw,
}
vhca_id = vport->vhca_id;
- vhca_map_entry = kmalloc_obj(*vhca_map_entry, GFP_KERNEL);
+ vhca_map_entry = kmalloc_obj(*vhca_map_entry);
if (!vhca_map_entry)
return -ENOMEM;
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/eswitch_offloads_termtbl.c b/drivers/net/ethernet/mellanox/mlx5/core/eswitch_offloads_termtbl.c
index af82232d53ef..19f65d4c4def 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/eswitch_offloads_termtbl.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/eswitch_offloads_termtbl.c
@@ -132,7 +132,7 @@ mlx5_eswitch_termtbl_get_create(struct mlx5_eswitch *esw,
if (found)
goto tt_add_ref;
- tt = kzalloc_obj(*tt, GFP_KERNEL);
+ tt = kzalloc_obj(*tt);
if (!tt) {
err = -ENOMEM;
goto tt_create_err;
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/events.c b/drivers/net/ethernet/mellanox/mlx5/core/events.c
index 23ecc8e8a219..4d7f35b96876 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/events.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/events.c
@@ -374,7 +374,7 @@ static int forward_event(struct notifier_block *nb, unsigned long event, void *d
int mlx5_events_init(struct mlx5_core_dev *dev)
{
- struct mlx5_events *events = kzalloc_obj(*events, GFP_KERNEL);
+ struct mlx5_events *events = kzalloc_obj(*events);
if (!events)
return -ENOMEM;
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/fpga/conn.c b/drivers/net/ethernet/mellanox/mlx5/core/fpga/conn.c
index 2b029dc3f0c8..3f5d16875b34 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/fpga/conn.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/fpga/conn.c
@@ -814,7 +814,7 @@ struct mlx5_fpga_conn *mlx5_fpga_conn_create(struct mlx5_fpga_device *fdev,
if (!attr->recv_cb)
return ERR_PTR(-EINVAL);
- conn = kzalloc_obj(*conn, GFP_KERNEL);
+ conn = kzalloc_obj(*conn);
if (!conn)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/fpga/core.c b/drivers/net/ethernet/mellanox/mlx5/core/fpga/core.c
index ae87ca14cae4..4f0046cf6a1a 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/fpga/core.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/fpga/core.c
@@ -59,7 +59,7 @@ static struct mlx5_fpga_device *mlx5_fpga_device_alloc(void)
{
struct mlx5_fpga_device *fdev;
- fdev = kzalloc_obj(*fdev, GFP_KERNEL);
+ fdev = kzalloc_obj(*fdev);
if (!fdev)
return NULL;
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/fs_core.c b/drivers/net/ethernet/mellanox/mlx5/core/fs_core.c
index 80950d84d07a..4678c2c93423 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/fs_core.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/fs_core.c
@@ -947,7 +947,7 @@ alloc_flow_table(struct mlx5_flow_table_attr *ft_attr, u16 vport,
struct mlx5_flow_table *ft;
int ret;
- ft = kzalloc_obj(*ft, GFP_KERNEL);
+ ft = kzalloc_obj(*ft);
if (!ft)
return ERR_PTR(-ENOMEM);
@@ -1530,7 +1530,7 @@ static struct mlx5_flow_rule *alloc_rule(struct mlx5_flow_destination *dest)
{
struct mlx5_flow_rule *rule;
- rule = kzalloc_obj(*rule, GFP_KERNEL);
+ rule = kzalloc_obj(*rule);
if (!rule)
return NULL;
@@ -2178,7 +2178,7 @@ add_rule_dup_match_fte(struct fs_fte *fte,
int i = 0;
if (!fte->dup) {
- dup = kvzalloc_obj(*dup, GFP_KERNEL);
+ dup = kvzalloc_obj(*dup);
if (!dup)
return ERR_PTR(-ENOMEM);
/* dup will be freed when the fte is freed
@@ -2471,7 +2471,7 @@ mlx5_add_flow_rules(struct mlx5_flow_table *ft,
goto unlock;
}
- gen_dest = kzalloc_objs(*dest, num_dest + 1, GFP_KERNEL);
+ gen_dest = kzalloc_objs(*dest, num_dest + 1);
if (!gen_dest) {
handle = ERR_PTR(-ENOMEM);
goto unlock;
@@ -2848,7 +2848,7 @@ static struct fs_prio *_fs_create_prio(struct mlx5_flow_namespace *ns,
{
struct fs_prio *fs_prio;
- fs_prio = kzalloc_obj(*fs_prio, GFP_KERNEL);
+ fs_prio = kzalloc_obj(*fs_prio);
if (!fs_prio)
return ERR_PTR(-ENOMEM);
@@ -2888,7 +2888,7 @@ static struct mlx5_flow_namespace *fs_create_namespace(struct fs_prio *prio,
{
struct mlx5_flow_namespace *ns;
- ns = kzalloc_obj(*ns, GFP_KERNEL);
+ ns = kzalloc_obj(*ns);
if (!ns)
return ERR_PTR(-ENOMEM);
@@ -3019,7 +3019,7 @@ static struct mlx5_flow_root_namespace
struct mlx5_flow_namespace *ns;
/* Create the root namespace */
- root_ns = kzalloc_obj(*root_ns, GFP_KERNEL);
+ root_ns = kzalloc_obj(*root_ns);
if (!root_ns)
return NULL;
@@ -3670,7 +3670,7 @@ mlx5_fs_add_vport_acl_root_ns(struct mlx5_flow_steering *steering,
if (xa_load(esw_acl_root_ns, vport_idx))
return -EEXIST;
- vport_ns = kzalloc_obj(*vport_ns, GFP_KERNEL);
+ vport_ns = kzalloc_obj(*vport_ns);
if (!vport_ns)
return -ENOMEM;
@@ -3989,7 +3989,7 @@ int mlx5_fs_core_alloc(struct mlx5_core_dev *dev)
if (err)
goto err;
- steering = kzalloc_obj(*steering, GFP_KERNEL);
+ steering = kzalloc_obj(*steering);
if (!steering) {
err = -ENOMEM;
goto err;
@@ -4030,7 +4030,7 @@ int mlx5_fs_add_rx_underlay_qpn(struct mlx5_core_dev *dev, u32 underlay_qpn)
struct mlx5_ft_underlay_qp *new_uqp;
int err = 0;
- new_uqp = kzalloc_obj(*new_uqp, GFP_KERNEL);
+ new_uqp = kzalloc_obj(*new_uqp);
if (!new_uqp)
return -ENOMEM;
@@ -4133,7 +4133,7 @@ struct mlx5_modify_hdr *mlx5_modify_header_alloc(struct mlx5_core_dev *dev,
if (!root)
return ERR_PTR(-EOPNOTSUPP);
- modify_hdr = kzalloc_obj(*modify_hdr, GFP_KERNEL);
+ modify_hdr = kzalloc_obj(*modify_hdr);
if (!modify_hdr)
return ERR_PTR(-ENOMEM);
@@ -4174,7 +4174,7 @@ struct mlx5_pkt_reformat *mlx5_packet_reformat_alloc(struct mlx5_core_dev *dev,
if (!root)
return ERR_PTR(-EOPNOTSUPP);
- pkt_reformat = kzalloc_obj(*pkt_reformat, GFP_KERNEL);
+ pkt_reformat = kzalloc_obj(*pkt_reformat);
if (!pkt_reformat)
return ERR_PTR(-ENOMEM);
@@ -4222,7 +4222,7 @@ mlx5_create_match_definer(struct mlx5_core_dev *dev,
if (!root)
return ERR_PTR(-EOPNOTSUPP);
- definer = kzalloc_obj(*definer, GFP_KERNEL);
+ definer = kzalloc_obj(*definer);
if (!definer)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/fs_counters.c b/drivers/net/ethernet/mellanox/mlx5/core/fs_counters.c
index b2b3a12493f4..653faec72da5 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/fs_counters.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/fs_counters.c
@@ -234,11 +234,11 @@ static struct mlx5_fc *mlx5_fc_single_alloc(struct mlx5_core_dev *dev)
struct mlx5_fc *counter;
int err;
- counter = kzalloc_obj(*counter, GFP_KERNEL);
+ counter = kzalloc_obj(*counter);
if (!counter)
return ERR_PTR(-ENOMEM);
- fc_bulk = kzalloc_obj(*fc_bulk, GFP_KERNEL);
+ fc_bulk = kzalloc_obj(*fc_bulk);
if (!fc_bulk) {
err = -ENOMEM;
goto free_counter;
@@ -328,7 +328,7 @@ int mlx5_init_fc_stats(struct mlx5_core_dev *dev)
{
struct mlx5_fc_stats *fc_stats;
- fc_stats = kzalloc_obj(*fc_stats, GFP_KERNEL);
+ fc_stats = kzalloc_obj(*fc_stats);
if (!fc_stats)
return -ENOMEM;
dev->priv.fc_stats = fc_stats;
@@ -572,10 +572,10 @@ mlx5_fc_local_create(u32 counter_id, u32 offset, u32 bulk_size)
struct mlx5_fc_bulk *fc_bulk;
struct mlx5_fc *counter;
- counter = kzalloc_obj(*counter, GFP_KERNEL);
+ counter = kzalloc_obj(*counter);
if (!counter)
return ERR_PTR(-ENOMEM);
- fc_bulk = kzalloc_obj(*fc_bulk, GFP_KERNEL);
+ fc_bulk = kzalloc_obj(*fc_bulk);
if (!fc_bulk) {
kfree(counter);
return ERR_PTR(-ENOMEM);
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/fs_ft_pool.c b/drivers/net/ethernet/mellanox/mlx5/core/fs_ft_pool.c
index 847e940d4d70..fbe11d5a1603 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/fs_ft_pool.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/fs_ft_pool.c
@@ -26,7 +26,7 @@ int mlx5_ft_pool_init(struct mlx5_core_dev *dev)
struct mlx5_ft_pool *ft_pool;
int i;
- ft_pool = kzalloc_obj(*ft_pool, GFP_KERNEL);
+ ft_pool = kzalloc_obj(*ft_pool);
if (!ft_pool)
return -ENOMEM;
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/fw_reset.c b/drivers/net/ethernet/mellanox/mlx5/core/fw_reset.c
index c0e23bc2d96a..07440c58713a 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/fw_reset.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/fw_reset.c
@@ -899,7 +899,7 @@ int mlx5_fw_reset_init(struct mlx5_core_dev *dev)
if (!MLX5_CAP_MCAM_REG(dev, mfrl))
return 0;
- fw_reset = kzalloc_obj(*fw_reset, GFP_KERNEL);
+ fw_reset = kzalloc_obj(*fw_reset);
if (!fw_reset)
return -ENOMEM;
fw_reset->wq = create_singlethread_workqueue("mlx5_fw_reset_events");
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/hwmon.c b/drivers/net/ethernet/mellanox/mlx5/core/hwmon.c
index ab005d7d184b..189d87bd6de4 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/hwmon.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/hwmon.c
@@ -298,7 +298,7 @@ static struct mlx5_hwmon *mlx5_hwmon_alloc(struct mlx5_core_dev *mdev)
u32 sensors_count;
int err;
- hwmon = kzalloc_obj(*mdev->hwmon, GFP_KERNEL);
+ hwmon = kzalloc_obj(*mdev->hwmon);
if (!hwmon)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/ipoib/ipoib_vlan.c b/drivers/net/ethernet/mellanox/mlx5/core/ipoib/ipoib_vlan.c
index 96a75b8ef779..4120afd097c3 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/ipoib/ipoib_vlan.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/ipoib/ipoib_vlan.c
@@ -51,7 +51,7 @@ int mlx5i_pkey_qpn_ht_init(struct net_device *netdev)
struct mlx5i_priv *ipriv = netdev_priv(netdev);
struct mlx5i_pkey_qpn_ht *qpn_htbl;
- qpn_htbl = kzalloc_obj(*qpn_htbl, GFP_KERNEL);
+ qpn_htbl = kzalloc_obj(*qpn_htbl);
if (!qpn_htbl)
return -ENOMEM;
@@ -89,7 +89,7 @@ int mlx5i_pkey_add_qpn(struct net_device *netdev, u32 qpn)
u8 key = hash_32(qpn, MLX5I_MAX_LOG_PKEY_SUP);
struct qpn_to_netdev *new_node;
- new_node = kzalloc_obj(*new_node, GFP_KERNEL);
+ new_node = kzalloc_obj(*new_node);
if (!new_node)
return -ENOMEM;
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/irq_affinity.c b/drivers/net/ethernet/mellanox/mlx5/core/irq_affinity.c
index 0be0b614938c..994fe83da4be 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/irq_affinity.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/irq_affinity.c
@@ -52,7 +52,7 @@ irq_pool_request_irq(struct mlx5_irq_pool *pool, struct irq_affinity_desc *af_de
u32 irq_index;
int err;
- auto_desc = kvzalloc_obj(*auto_desc, GFP_KERNEL);
+ auto_desc = kvzalloc_obj(*auto_desc);
if (!auto_desc)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/lag/lag.c b/drivers/net/ethernet/mellanox/mlx5/core/lag/lag.c
index 0eed75f5ccc2..c326adb0c789 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/lag/lag.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/lag/lag.c
@@ -272,7 +272,7 @@ static struct mlx5_lag *mlx5_lag_dev_alloc(struct mlx5_core_dev *dev)
struct mlx5_lag *ldev;
int err;
- ldev = kzalloc_obj(*ldev, GFP_KERNEL);
+ ldev = kzalloc_obj(*ldev);
if (!ldev)
return NULL;
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/lag/mpesw.c b/drivers/net/ethernet/mellanox/mlx5/core/lag/mpesw.c
index d3458adcc1e5..24a91e7a20e2 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/lag/mpesw.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/lag/mpesw.c
@@ -171,7 +171,7 @@ static int mlx5_lag_mpesw_queue_work(struct mlx5_core_dev *dev,
if (!ldev)
return 0;
- work = kzalloc_obj(*work, GFP_KERNEL);
+ work = kzalloc_obj(*work);
if (!work)
return -ENOMEM;
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/lag/port_sel.c b/drivers/net/ethernet/mellanox/mlx5/core/lag/port_sel.c
index 63071fcb3a51..16c7d16215c4 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/lag/port_sel.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/lag/port_sel.c
@@ -308,7 +308,7 @@ mlx5_lag_create_definer(struct mlx5_lag *ldev, enum netdev_lag_hash hash,
return ERR_PTR(-EINVAL);
dev = ldev->pf[first_idx].dev;
- lag_definer = kzalloc_obj(*lag_definer, GFP_KERNEL);
+ lag_definer = kzalloc_obj(*lag_definer);
if (!lag_definer)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/lib/aso.c b/drivers/net/ethernet/mellanox/mlx5/core/lib/aso.c
index 004077710a34..614cd57a40d7 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/lib/aso.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/lib/aso.c
@@ -311,7 +311,7 @@ struct mlx5_aso *mlx5_aso_create(struct mlx5_core_dev *mdev, u32 pdn)
struct mlx5_aso *aso;
int err;
- aso = kzalloc_obj(*aso, GFP_KERNEL);
+ aso = kzalloc_obj(*aso);
if (!aso)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/lib/clock.c b/drivers/net/ethernet/mellanox/mlx5/core/lib/clock.c
index 6067d3ac3cb8..6ccffd6bc1f3 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/lib/clock.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/lib/clock.c
@@ -1406,7 +1406,7 @@ static int mlx5_clock_alloc(struct mlx5_core_dev *mdev, bool shared)
struct mlx5_clock_priv *cpriv;
struct mlx5_clock *clock;
- cpriv = kzalloc_obj(*cpriv, GFP_KERNEL);
+ cpriv = kzalloc_obj(*cpriv);
if (!cpriv)
return -ENOMEM;
@@ -1603,7 +1603,7 @@ int mlx5_init_clock(struct mlx5_core_dev *mdev)
return 0;
}
- clock_state = kzalloc_obj(*clock_state, GFP_KERNEL);
+ clock_state = kzalloc_obj(*clock_state);
if (!clock_state)
return -ENOMEM;
clock_state->mdev = mdev;
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/lib/crypto.c b/drivers/net/ethernet/mellanox/mlx5/core/lib/crypto.c
index b47e828406f9..1c3607c5fa93 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/lib/crypto.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/lib/crypto.c
@@ -293,7 +293,7 @@ mlx5_crypto_dek_bulk_create(struct mlx5_crypto_dek_pool *pool)
int num_deks, base_obj_id;
int err;
- bulk = kzalloc_obj(*bulk, GFP_KERNEL);
+ bulk = kzalloc_obj(*bulk);
if (!bulk)
return ERR_PTR(-ENOMEM);
@@ -611,7 +611,7 @@ struct mlx5_crypto_dek *mlx5_crypto_dek_create(struct mlx5_crypto_dek_pool *dek_
int obj_offset;
int err;
- dek = kzalloc_obj(*dek, GFP_KERNEL);
+ dek = kzalloc_obj(*dek);
if (!dek)
return ERR_PTR(-ENOMEM);
@@ -683,7 +683,7 @@ mlx5_crypto_dek_pool_create(struct mlx5_core_dev *mdev, int key_purpose)
{
struct mlx5_crypto_dek_pool *pool;
- pool = kzalloc_obj(*pool, GFP_KERNEL);
+ pool = kzalloc_obj(*pool);
if (!pool)
return ERR_PTR(-ENOMEM);
@@ -748,7 +748,7 @@ struct mlx5_crypto_dek_priv *mlx5_crypto_dek_init(struct mlx5_core_dev *mdev)
if (!MLX5_CAP_CRYPTO(mdev, log_dek_max_alloc))
return NULL;
- dek_priv = kzalloc_obj(*dek_priv, GFP_KERNEL);
+ dek_priv = kzalloc_obj(*dek_priv);
if (!dek_priv)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/lib/devcom.c b/drivers/net/ethernet/mellanox/mlx5/core/lib/devcom.c
index d681c063be4e..4b5ac2db55ce 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/lib/devcom.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/lib/devcom.c
@@ -64,7 +64,7 @@ mlx5_devcom_dev_alloc(struct mlx5_core_dev *dev)
{
struct mlx5_devcom_dev *devc;
- devc = kzalloc_obj(*devc, GFP_KERNEL);
+ devc = kzalloc_obj(*devc);
if (!devc)
return NULL;
@@ -120,7 +120,7 @@ mlx5_devcom_comp_alloc(u64 id, const struct mlx5_devcom_match_attr *attr,
{
struct mlx5_devcom_comp *comp;
- comp = kzalloc_obj(*comp, GFP_KERNEL);
+ comp = kzalloc_obj(*comp);
if (!comp)
return NULL;
@@ -158,7 +158,7 @@ devcom_alloc_comp_dev(struct mlx5_devcom_dev *devc,
{
struct mlx5_devcom_comp_dev *devcom;
- devcom = kzalloc_obj(*devcom, GFP_KERNEL);
+ devcom = kzalloc_obj(*devcom);
if (!devcom)
return NULL;
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/lib/dm.c b/drivers/net/ethernet/mellanox/mlx5/core/lib/dm.c
index b6fc7ca4bcc0..c7438b727823 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/lib/dm.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/lib/dm.c
@@ -28,7 +28,7 @@ struct mlx5_dm *mlx5_dm_create(struct mlx5_core_dev *dev)
if (!(MLX5_CAP_GEN_64(dev, general_obj_types) & MLX5_GENERAL_OBJ_TYPES_CAP_SW_ICM))
return NULL;
- dm = kzalloc_obj(*dm, GFP_KERNEL);
+ dm = kzalloc_obj(*dm);
if (!dm)
return NULL;
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/lib/fs_chains.c b/drivers/net/ethernet/mellanox/mlx5/core/lib/fs_chains.c
index d8242edec30f..684cd9b5ffde 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/lib/fs_chains.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/lib/fs_chains.c
@@ -314,7 +314,7 @@ mlx5_chains_create_chain(struct mlx5_fs_chains *chains, u32 chain)
struct fs_chain *chain_s = NULL;
int err;
- chain_s = kvzalloc_obj(*chain_s, GFP_KERNEL);
+ chain_s = kvzalloc_obj(*chain_s);
if (!chain_s)
return ERR_PTR(-ENOMEM);
@@ -481,7 +481,7 @@ mlx5_chains_create_prio(struct mlx5_fs_chains *chains,
if (IS_ERR(chain_s))
return ERR_CAST(chain_s);
- prio_s = kvzalloc_obj(*prio_s, GFP_KERNEL);
+ prio_s = kvzalloc_obj(*prio_s);
flow_group_in = kvzalloc(inlen, GFP_KERNEL);
if (!prio_s || !flow_group_in) {
err = -ENOMEM;
@@ -728,7 +728,7 @@ mlx5_chains_init(struct mlx5_core_dev *dev, struct mlx5_chains_attr *attr)
struct mlx5_fs_chains *chains;
int err;
- chains = kzalloc_obj(*chains, GFP_KERNEL);
+ chains = kzalloc_obj(*chains);
if (!chains)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/lib/fs_ttc.c b/drivers/net/ethernet/mellanox/mlx5/core/lib/fs_ttc.c
index feed745cddab..14c339d02e99 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/lib/fs_ttc.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/lib/fs_ttc.c
@@ -359,7 +359,7 @@ mlx5_generate_ttc_rule(struct mlx5_core_dev *dev, struct mlx5_flow_table *ft,
struct mlx5_flow_spec *spec;
int err = 0;
- spec = kvzalloc_obj(*spec, GFP_KERNEL);
+ spec = kvzalloc_obj(*spec);
if (!spec)
return ERR_PTR(-ENOMEM);
@@ -536,7 +536,7 @@ static int mlx5_create_ttc_table_groups(struct mlx5_ttc_table *ttc,
int err;
u8 *mc;
- ttc->g = kzalloc_objs(*ttc->g, groups->num_groups, GFP_KERNEL);
+ ttc->g = kzalloc_objs(*ttc->g, groups->num_groups);
if (!ttc->g)
return -ENOMEM;
in = kvzalloc(inlen, GFP_KERNEL);
@@ -630,7 +630,7 @@ mlx5_generate_inner_ttc_rule(struct mlx5_core_dev *dev,
int err = 0;
u8 ipv;
- spec = kvzalloc_obj(*spec, GFP_KERNEL);
+ spec = kvzalloc_obj(*spec);
if (!spec)
return ERR_PTR(-ENOMEM);
@@ -713,7 +713,7 @@ static int mlx5_create_inner_ttc_table_groups(struct mlx5_ttc_table *ttc,
int err;
u8 *mc;
- ttc->g = kzalloc_objs(*ttc->g, groups->num_groups, GFP_KERNEL);
+ ttc->g = kzalloc_objs(*ttc->g, groups->num_groups);
if (!ttc->g)
return -ENOMEM;
in = kvzalloc(inlen, GFP_KERNEL);
@@ -804,7 +804,7 @@ struct mlx5_ttc_table *mlx5_create_inner_ttc_table(struct mlx5_core_dev *dev,
return ERR_PTR(-EINVAL);
}
- ttc = kvzalloc_obj(*ttc, GFP_KERNEL);
+ ttc = kvzalloc_obj(*ttc);
if (!ttc)
return ERR_PTR(-ENOMEM);
@@ -882,7 +882,7 @@ struct mlx5_ttc_table *mlx5_create_ttc_table(struct mlx5_core_dev *dev,
return ERR_PTR(-EINVAL);
}
- ttc = kvzalloc_obj(*ttc, GFP_KERNEL);
+ ttc = kvzalloc_obj(*ttc);
if (!ttc)
return ERR_PTR(-ENOMEM);
@@ -1029,7 +1029,7 @@ mlx5_ttc_create_ipsec_outer_rule(struct mlx5_ttc_table *ttc,
if (err)
return ERR_PTR(err);
- spec = kvzalloc_obj(*spec, GFP_KERNEL);
+ spec = kvzalloc_obj(*spec);
if (!spec)
return ERR_PTR(-ENOMEM);
@@ -1070,7 +1070,7 @@ mlx5_ttc_create_ipsec_inner_rule(struct mlx5_ttc_table *ttc,
if (err)
return ERR_PTR(err);
- spec = kvzalloc_obj(*spec, GFP_KERNEL);
+ spec = kvzalloc_obj(*spec);
if (!spec)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/lib/geneve.c b/drivers/net/ethernet/mellanox/mlx5/core/lib/geneve.c
index 7664a74cbf18..b90fea2b5d53 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/lib/geneve.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/lib/geneve.c
@@ -134,7 +134,7 @@ void mlx5_geneve_tlv_option_del(struct mlx5_geneve *geneve)
struct mlx5_geneve *mlx5_geneve_create(struct mlx5_core_dev *mdev)
{
- struct mlx5_geneve *geneve = kzalloc_obj(*geneve, GFP_KERNEL);
+ struct mlx5_geneve *geneve = kzalloc_obj(*geneve);
if (!geneve)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/lib/hv_vhca.c b/drivers/net/ethernet/mellanox/mlx5/core/lib/hv_vhca.c
index 6b3f906653bd..d6dc7bce855e 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/lib/hv_vhca.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/lib/hv_vhca.c
@@ -42,7 +42,7 @@ struct mlx5_hv_vhca *mlx5_hv_vhca_create(struct mlx5_core_dev *dev)
{
struct mlx5_hv_vhca *hv_vhca;
- hv_vhca = kzalloc_obj(*hv_vhca, GFP_KERNEL);
+ hv_vhca = kzalloc_obj(*hv_vhca);
if (!hv_vhca)
return ERR_PTR(-ENOMEM);
@@ -152,7 +152,7 @@ mlx5_hv_vhca_control_agent_invalidate(struct mlx5_hv_vhca_agent *agent,
u32 capabilities = 0;
int err;
- block = kzalloc_obj(*block, GFP_KERNEL);
+ block = kzalloc_obj(*block);
if (!block)
return;
@@ -273,7 +273,7 @@ mlx5_hv_vhca_agent_create(struct mlx5_hv_vhca *hv_vhca,
}
mutex_unlock(&hv_vhca->agents_lock);
- agent = kzalloc_obj(*agent, GFP_KERNEL);
+ agent = kzalloc_obj(*agent);
if (!agent)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/lib/ipsec_fs_roce.c b/drivers/net/ethernet/mellanox/mlx5/core/lib/ipsec_fs_roce.c
index ddde75bd3012..28cb670ba33e 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/lib/ipsec_fs_roce.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/lib/ipsec_fs_roce.c
@@ -139,7 +139,7 @@ ipsec_fs_roce_rx_rule_setup(struct mlx5_core_dev *mdev,
struct mlx5_flow_spec *spec;
int err = 0;
- spec = kvzalloc_obj(*spec, GFP_KERNEL);
+ spec = kvzalloc_obj(*spec);
if (!spec)
return -ENOMEM;
@@ -242,7 +242,7 @@ static int ipsec_fs_roce_tx_mpv_rule_setup(struct mlx5_core_dev *mdev,
struct mlx5_flow_spec *spec;
int err = 0;
- spec = kvzalloc_obj(*spec, GFP_KERNEL);
+ spec = kvzalloc_obj(*spec);
if (!spec)
return -ENOMEM;
@@ -850,7 +850,7 @@ struct mlx5_ipsec_fs *mlx5_ipsec_fs_roce_init(struct mlx5_core_dev *mdev,
return NULL;
}
- roce_ipsec = kzalloc_obj(*roce_ipsec, GFP_KERNEL);
+ roce_ipsec = kzalloc_obj(*roce_ipsec);
if (!roce_ipsec)
return NULL;
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/lib/macsec_fs.c b/drivers/net/ethernet/mellanox/mlx5/core/lib/macsec_fs.c
index eafd6bcf1675..efc5167493c1 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/lib/macsec_fs.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/lib/macsec_fs.c
@@ -267,7 +267,7 @@ static int macsec_fs_tx_create_crypto_table_groups(struct mlx5_macsec_flow_table
int err;
u8 *mc;
- ft->g = kzalloc_objs(*ft->g, TX_CRYPTO_TABLE_NUM_GROUPS, GFP_KERNEL);
+ ft->g = kzalloc_objs(*ft->g, TX_CRYPTO_TABLE_NUM_GROUPS);
if (!ft->g)
return -ENOMEM;
in = kvzalloc(inlen, GFP_KERNEL);
@@ -404,7 +404,7 @@ static int macsec_fs_tx_create(struct mlx5_macsec_fs *macsec_fs)
if (!ns)
return -ENOMEM;
- spec = kvzalloc_obj(*spec, GFP_KERNEL);
+ spec = kvzalloc_obj(*spec);
if (!spec)
return -ENOMEM;
@@ -713,7 +713,7 @@ static int macsec_fs_id_add(struct list_head *macsec_devices_list, u32 fs_id,
rcu_read_unlock();
}
- fs_id_iter = kzalloc_obj(*fs_id_iter, GFP_KERNEL);
+ fs_id_iter = kzalloc_obj(*fs_id_iter);
if (!fs_id_iter)
return -ENOMEM;
@@ -725,7 +725,7 @@ static int macsec_fs_id_add(struct list_head *macsec_devices_list, u32 fs_id,
}
if (!macsec_device) { /* first time adding a SA to that device */
- macsec_device = kzalloc_obj(*macsec_device, GFP_KERNEL);
+ macsec_device = kzalloc_obj(*macsec_device);
if (!macsec_device) {
err = -ENOMEM;
goto err_alloc_dev;
@@ -813,7 +813,7 @@ macsec_fs_tx_add_rule(struct mlx5_macsec_fs *macsec_fs,
tx_tables = &tx_fs->tables;
- spec = kvzalloc_obj(*spec, GFP_KERNEL);
+ spec = kvzalloc_obj(*spec);
if (!spec)
return NULL;
@@ -821,7 +821,7 @@ macsec_fs_tx_add_rule(struct mlx5_macsec_fs *macsec_fs,
if (err)
goto out_spec;
- macsec_rule = kzalloc_obj(*macsec_rule, GFP_KERNEL);
+ macsec_rule = kzalloc_obj(*macsec_rule);
if (!macsec_rule) {
macsec_fs_tx_ft_put(macsec_fs);
goto out_spec;
@@ -931,7 +931,7 @@ static int macsec_fs_tx_init(struct mlx5_macsec_fs *macsec_fs)
struct mlx5_fc *flow_counter;
int err;
- tx_fs = kzalloc_obj(*tx_fs, GFP_KERNEL);
+ tx_fs = kzalloc_obj(*tx_fs);
if (!tx_fs)
return -ENOMEM;
@@ -1055,7 +1055,7 @@ static int macsec_fs_rx_create_crypto_table_groups(struct mlx5_macsec_flow_table
int err;
u8 *mc;
- ft->g = kzalloc_objs(*ft->g, RX_CRYPTO_TABLE_NUM_GROUPS, GFP_KERNEL);
+ ft->g = kzalloc_objs(*ft->g, RX_CRYPTO_TABLE_NUM_GROUPS);
if (!ft->g)
return -ENOMEM;
@@ -1327,7 +1327,7 @@ static int macsec_fs_rx_roce_jump_to_rdma_rules_create(struct mlx5_macsec_fs *ma
struct mlx5_flow_spec *spec;
int err;
- spec = kvzalloc_obj(*spec, GFP_KERNEL);
+ spec = kvzalloc_obj(*spec);
if (!spec)
return -ENOMEM;
@@ -1510,7 +1510,7 @@ static int macsec_fs_rx_create(struct mlx5_macsec_fs *macsec_fs)
if (!ns)
return -ENOMEM;
- spec = kvzalloc_obj(*spec, GFP_KERNEL);
+ spec = kvzalloc_obj(*spec);
if (!spec)
return -ENOMEM;
@@ -1739,7 +1739,7 @@ macsec_fs_rx_add_rule(struct mlx5_macsec_fs *macsec_fs,
struct mlx5_flow_spec *spec;
int err = 0;
- spec = kvzalloc_obj(*spec, GFP_KERNEL);
+ spec = kvzalloc_obj(*spec);
if (!spec)
return NULL;
@@ -1747,7 +1747,7 @@ macsec_fs_rx_add_rule(struct mlx5_macsec_fs *macsec_fs,
if (err)
goto out_spec;
- macsec_rule = kzalloc_obj(*macsec_rule, GFP_KERNEL);
+ macsec_rule = kzalloc_obj(*macsec_rule);
if (!macsec_rule) {
macsec_fs_rx_ft_put(macsec_fs);
goto out_spec;
@@ -1847,7 +1847,7 @@ static int macsec_fs_rx_init(struct mlx5_macsec_fs *macsec_fs)
struct mlx5_fc *flow_counter;
int err;
- rx_fs = kzalloc_obj(*rx_fs, GFP_KERNEL);
+ rx_fs = kzalloc_obj(*rx_fs);
if (!rx_fs)
return -ENOMEM;
@@ -2132,11 +2132,11 @@ static int mlx5_macsec_fs_add_roce_rule_rx(struct mlx5_macsec_fs *macsec_fs, u32
struct mlx5_flow_spec *spec;
int err = 0;
- spec = kvzalloc_obj(*spec, GFP_KERNEL);
+ spec = kvzalloc_obj(*spec);
if (!spec)
return -ENOMEM;
- rx_rule = kzalloc_obj(*rx_rule, GFP_KERNEL);
+ rx_rule = kzalloc_obj(*rx_rule);
if (!rx_rule) {
err = -ENOMEM;
goto out;
@@ -2201,11 +2201,11 @@ static int mlx5_macsec_fs_add_roce_rule_tx(struct mlx5_macsec_fs *macsec_fs, u32
struct mlx5_flow_spec *spec;
int err = 0;
- spec = kvzalloc_obj(*spec, GFP_KERNEL);
+ spec = kvzalloc_obj(*spec);
if (!spec)
return -ENOMEM;
- tx_rule = kzalloc_obj(*tx_rule, GFP_KERNEL);
+ tx_rule = kzalloc_obj(*tx_rule);
if (!tx_rule) {
err = -ENOMEM;
goto out;
@@ -2361,7 +2361,7 @@ mlx5_macsec_fs_init(struct mlx5_core_dev *mdev)
struct mlx5_macsec_fs *macsec_fs;
int err;
- macsec_fs = kzalloc_obj(*macsec_fs, GFP_KERNEL);
+ macsec_fs = kzalloc_obj(*macsec_fs);
if (!macsec_fs)
return NULL;
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/lib/mpfs.c b/drivers/net/ethernet/mellanox/mlx5/core/lib/mpfs.c
index 5352f9b61415..d408a5e63209 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/lib/mpfs.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/lib/mpfs.c
@@ -103,7 +103,7 @@ int mlx5_mpfs_init(struct mlx5_core_dev *dev)
if (!MLX5_ESWITCH_MANAGER(dev) || l2table_size == 1)
return 0;
- mpfs = kzalloc_obj(*mpfs, GFP_KERNEL);
+ mpfs = kzalloc_obj(*mpfs);
if (!mpfs)
return -ENOMEM;
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/lib/sd.c b/drivers/net/ethernet/mellanox/mlx5/core/lib/sd.c
index ca99b4375b66..954942ad93c5 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/lib/sd.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/lib/sd.c
@@ -187,7 +187,7 @@ static int sd_init(struct mlx5_core_dev *dev)
return 0;
}
- sd = kzalloc_obj(*sd, GFP_KERNEL);
+ sd = kzalloc_obj(*sd);
if (!sd)
return -ENOMEM;
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/lib/st.c b/drivers/net/ethernet/mellanox/mlx5/core/lib/st.c
index 2de8a80415f1..997be91f0a13 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/lib/st.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/lib/st.c
@@ -59,7 +59,7 @@ struct mlx5_st *mlx5_st_create(struct mlx5_core_dev *dev)
if (ret)
return NULL;
- st = kzalloc_obj(*st, GFP_KERNEL);
+ st = kzalloc_obj(*st);
if (!st)
goto end;
@@ -124,7 +124,7 @@ int mlx5_st_alloc_index(struct mlx5_core_dev *dev, enum tph_mem_type mem_type,
}
}
- idx_data = kzalloc_obj(*idx_data, GFP_KERNEL);
+ idx_data = kzalloc_obj(*idx_data);
if (!idx_data) {
ret = -ENOMEM;
goto end;
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/lib/tout.c b/drivers/net/ethernet/mellanox/mlx5/core/lib/tout.c
index 5c2ebf74b6a5..d9be0d9c9a13 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/lib/tout.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/lib/tout.c
@@ -37,7 +37,7 @@ int mlx5_tout_init(struct mlx5_core_dev *dev)
{
int i;
- dev->timeouts = kmalloc_obj(*dev->timeouts, GFP_KERNEL);
+ dev->timeouts = kmalloc_obj(*dev->timeouts);
if (!dev->timeouts)
return -ENOMEM;
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/lib/vxlan.c b/drivers/net/ethernet/mellanox/mlx5/core/lib/vxlan.c
index 906d1ce3879f..c2292cab4592 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/lib/vxlan.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/lib/vxlan.c
@@ -103,7 +103,7 @@ int mlx5_vxlan_add_port(struct mlx5_vxlan *vxlan, u16 port)
struct mlx5_vxlan_port *vxlanp;
int ret;
- vxlanp = kzalloc_obj(*vxlanp, GFP_KERNEL);
+ vxlanp = kzalloc_obj(*vxlanp);
if (!vxlanp)
return -ENOMEM;
vxlanp->udp_port = port;
@@ -151,7 +151,7 @@ struct mlx5_vxlan *mlx5_vxlan_create(struct mlx5_core_dev *mdev)
if (!MLX5_CAP_ETH(mdev, tunnel_stateless_vxlan) || !mlx5_core_is_pf(mdev))
return ERR_PTR(-EOPNOTSUPP);
- vxlan = kzalloc_obj(*vxlan, GFP_KERNEL);
+ vxlan = kzalloc_obj(*vxlan);
if (!vxlan)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/main.c b/drivers/net/ethernet/mellanox/mlx5/core/main.c
index a6c838cce13c..fdc3ba20912e 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/main.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/main.c
@@ -1792,7 +1792,7 @@ static int mlx5_hca_caps_alloc(struct mlx5_core_dev *dev)
int i;
for (i = 0; i < ARRAY_SIZE(types); i++) {
- cap = kzalloc_obj(*cap, GFP_KERNEL);
+ cap = kzalloc_obj(*cap);
if (!cap)
goto err;
type = types[i];
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/pagealloc.c b/drivers/net/ethernet/mellanox/mlx5/core/pagealloc.c
index 91aa78052462..5ccb3ce98acb 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/pagealloc.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/pagealloc.c
@@ -107,7 +107,7 @@ static struct rb_root *page_root_per_function(struct mlx5_core_dev *dev, u32 fun
if (root)
return root;
- root = kzalloc_obj(*root, GFP_KERNEL);
+ root = kzalloc_obj(*root);
if (!root)
return ERR_PTR(-ENOMEM);
@@ -148,7 +148,7 @@ static int insert_page(struct mlx5_core_dev *dev, u64 addr, struct page *page, u
return -EEXIST;
}
- nfp = kzalloc_obj(*nfp, GFP_KERNEL);
+ nfp = kzalloc_obj(*nfp);
if (!nfp)
return -ENOMEM;
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/pci_irq.c b/drivers/net/ethernet/mellanox/mlx5/core/pci_irq.c
index c23d2c710256..e051b9a939ee 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/pci_irq.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/pci_irq.c
@@ -261,7 +261,7 @@ struct mlx5_irq *mlx5_irq_alloc(struct mlx5_irq_pool *pool, int i,
struct mlx5_irq *irq;
int err;
- irq = kzalloc_obj(*irq, GFP_KERNEL);
+ irq = kzalloc_obj(*irq);
if (!irq || !zalloc_cpumask_var(&irq->mask, GFP_KERNEL)) {
kfree(irq);
return ERR_PTR(-ENOMEM);
@@ -471,7 +471,7 @@ struct mlx5_irq *mlx5_ctrl_irq_request(struct mlx5_core_dev *dev)
struct irq_affinity_desc *af_desc;
struct mlx5_irq *irq;
- af_desc = kvzalloc_obj(*af_desc, GFP_KERNEL);
+ af_desc = kvzalloc_obj(*af_desc);
if (!af_desc)
return ERR_PTR(-ENOMEM);
@@ -556,7 +556,7 @@ struct mlx5_irq *mlx5_irq_request_vector(struct mlx5_core_dev *dev, u16 cpu,
struct irq_affinity_desc *af_desc;
struct mlx5_irq *irq;
- af_desc = kvzalloc_obj(*af_desc, GFP_KERNEL);
+ af_desc = kvzalloc_obj(*af_desc);
if (!af_desc)
return ERR_PTR(-ENOMEM);
@@ -578,7 +578,7 @@ static struct mlx5_irq_pool *
irq_pool_alloc(struct mlx5_core_dev *dev, int start, int size, char *name,
u32 min_threshold, u32 max_threshold)
{
- struct mlx5_irq_pool *pool = kvzalloc_obj(*pool, GFP_KERNEL);
+ struct mlx5_irq_pool *pool = kvzalloc_obj(*pool);
if (!pool)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/rdma.c b/drivers/net/ethernet/mellanox/mlx5/core/rdma.c
index aebb67a7964d..e372484960ca 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/rdma.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/rdma.c
@@ -41,7 +41,7 @@ static int mlx5_rdma_enable_roce_steering(struct mlx5_core_dev *dev)
flow_group_in = kvzalloc(inlen, GFP_KERNEL);
if (!flow_group_in)
return -ENOMEM;
- spec = kvzalloc_obj(*spec, GFP_KERNEL);
+ spec = kvzalloc_obj(*spec);
if (!spec) {
kvfree(flow_group_in);
return -ENOMEM;
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/sf/dev/dev.c b/drivers/net/ethernet/mellanox/mlx5/core/sf/dev/dev.c
index e41da4da4c4f..e75cbf333898 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/sf/dev/dev.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/sf/dev/dev.c
@@ -99,7 +99,7 @@ static void mlx5_sf_dev_add(struct mlx5_core_dev *dev, u16 sf_index, u16 fn_id,
goto add_err;
}
- sf_dev = kzalloc_obj(*sf_dev, GFP_KERNEL);
+ sf_dev = kzalloc_obj(*sf_dev);
if (!sf_dev) {
mlx5_adev_idx_free(id);
err = -ENOMEM;
@@ -280,7 +280,7 @@ static void mlx5_sf_dev_queue_active_works(struct work_struct *_work)
continue;
sw_func_id = MLX5_GET(query_vhca_state_out, out, vhca_state_context.sw_function_id);
- work_ctx = kzalloc_obj(*work_ctx, GFP_KERNEL);
+ work_ctx = kzalloc_obj(*work_ctx);
if (!work_ctx)
return;
@@ -336,7 +336,7 @@ void mlx5_sf_dev_table_create(struct mlx5_core_dev *dev)
if (!mlx5_sf_dev_supported(dev))
return;
- table = kzalloc_obj(*table, GFP_KERNEL);
+ table = kzalloc_obj(*table);
if (!table) {
err = -ENOMEM;
goto table_err;
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/sf/devlink.c b/drivers/net/ethernet/mellanox/mlx5/core/sf/devlink.c
index 894567e905b4..8503e532f423 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/sf/devlink.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/sf/devlink.c
@@ -70,7 +70,7 @@ mlx5_sf_alloc(struct mlx5_sf_table *table, struct mlx5_eswitch *esw,
goto id_err;
}
- sf = kzalloc_obj(*sf, GFP_KERNEL);
+ sf = kzalloc_obj(*sf);
if (!sf) {
err = -ENOMEM;
goto alloc_err;
@@ -509,7 +509,7 @@ int mlx5_sf_table_init(struct mlx5_core_dev *dev)
if (!mlx5_sf_table_supported(dev) || !mlx5_vhca_event_supported(dev))
return 0;
- table = kzalloc_obj(*table, GFP_KERNEL);
+ table = kzalloc_obj(*table);
if (!table)
return -ENOMEM;
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/sf/hw_table.c b/drivers/net/ethernet/mellanox/mlx5/core/sf/hw_table.c
index b50a50f7d909..049dfd431618 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/sf/hw_table.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/sf/hw_table.c
@@ -233,7 +233,7 @@ static int mlx5_sf_hw_table_hwc_init(struct mlx5_sf_hwc_table *hwc, u16 max_fn,
if (!max_fn)
return 0;
- sfs = kzalloc_objs(*sfs, max_fn, GFP_KERNEL);
+ sfs = kzalloc_objs(*sfs, max_fn);
if (!sfs)
return -ENOMEM;
@@ -298,7 +298,7 @@ int mlx5_sf_hw_table_init(struct mlx5_core_dev *dev)
if (!max_fn && !max_ext_fn)
return 0;
- table = kzalloc_obj(*table, GFP_KERNEL);
+ table = kzalloc_obj(*table);
if (!table) {
err = -ENOMEM;
goto alloc_err;
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/sf/vhca_event.c b/drivers/net/ethernet/mellanox/mlx5/core/sf/vhca_event.c
index 809643870526..9c4a559d268c 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/sf/vhca_event.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/sf/vhca_event.c
@@ -153,7 +153,7 @@ int mlx5_vhca_event_init(struct mlx5_core_dev *dev)
if (!mlx5_vhca_event_supported(dev))
return 0;
- events = kzalloc_obj(*events, GFP_KERNEL);
+ events = kzalloc_obj(*events);
if (!events)
return -ENOMEM;
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/sriov.c b/drivers/net/ethernet/mellanox/mlx5/core/sriov.c
index 143278b70a64..4af82675ffe1 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/sriov.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/sriov.c
@@ -47,7 +47,7 @@ static int sriov_restore_guids(struct mlx5_core_dev *dev, int vf, u16 func_id)
if (sriov->vfs_ctx[vf].node_guid ||
sriov->vfs_ctx[vf].port_guid ||
sriov->vfs_ctx[vf].policy != MLX5_POLICY_INVALID) {
- in = kzalloc_obj(*in, GFP_KERNEL);
+ in = kzalloc_obj(*in);
if (!in)
return -ENOMEM;
@@ -305,7 +305,7 @@ int mlx5_sriov_init(struct mlx5_core_dev *dev)
sriov->max_vfs = mlx5_get_max_vfs(dev);
sriov->num_vfs = pci_num_vf(pdev);
sriov->max_ec_vfs = mlx5_core_ec_sriov_enabled(dev) ? pci_sriov_get_totalvfs(dev->pdev) : 0;
- sriov->vfs_ctx = kzalloc_objs(*sriov->vfs_ctx, total_vfs, GFP_KERNEL);
+ sriov->vfs_ctx = kzalloc_objs(*sriov->vfs_ctx, total_vfs);
if (!sriov->vfs_ctx)
return -ENOMEM;
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/steering/hws/action.c b/drivers/net/ethernet/mellanox/mlx5/core/steering/hws/action.c
index d8a003119be5..f1b117ea1c65 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/steering/hws/action.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/steering/hws/action.c
@@ -92,7 +92,7 @@ static int hws_action_get_shared_stc_nic(struct mlx5hws_context *ctx,
return 0;
}
- shared_stc = kzalloc_obj(*shared_stc, GFP_KERNEL);
+ shared_stc = kzalloc_obj(*shared_stc);
if (!shared_stc) {
ret = -ENOMEM;
goto unlock_and_out;
@@ -632,7 +632,7 @@ hws_action_create_generic_bulk(struct mlx5hws_context *ctx,
if (!hws_action_validate_hws_action(ctx, flags))
return NULL;
- action = kzalloc_objs(*action, bulk_sz, GFP_KERNEL);
+ action = kzalloc_objs(*action, bulk_sz);
if (!action)
return NULL;
@@ -1383,7 +1383,7 @@ mlx5hws_action_create_dest_array(struct mlx5hws_context *ctx, size_t num_dest,
return NULL;
}
- dest_list = kzalloc_objs(*dest_list, num_dest, GFP_KERNEL);
+ dest_list = kzalloc_objs(*dest_list, num_dest);
if (!dest_list)
return NULL;
@@ -1477,7 +1477,7 @@ mlx5hws_action_create_insert_header(struct mlx5hws_context *ctx,
if (!action)
return NULL;
- reformat_hdrs = kzalloc_objs(*reformat_hdrs, num_of_hdrs, GFP_KERNEL);
+ reformat_hdrs = kzalloc_objs(*reformat_hdrs, num_of_hdrs);
if (!reformat_hdrs)
goto free_action;
@@ -1557,7 +1557,7 @@ hws_action_create_dest_match_range_definer(struct mlx5hws_context *ctx)
__be32 *tag;
int ret;
- definer = kzalloc_obj(*definer, GFP_KERNEL);
+ definer = kzalloc_obj(*definer);
if (!definer)
return NULL;
@@ -1600,7 +1600,7 @@ hws_action_create_dest_match_range_table(struct mlx5hws_context *ctx,
return NULL;
}
- table_ste = kzalloc_obj(*table_ste, GFP_KERNEL);
+ table_ste = kzalloc_obj(*table_ste);
if (!table_ste)
return NULL;
@@ -2019,7 +2019,7 @@ __must_hold(&ctx->ctrl_lock)
return 0;
}
- default_stc = kzalloc_obj(*default_stc, GFP_KERNEL);
+ default_stc = kzalloc_obj(*default_stc);
if (!default_stc)
return -ENOMEM;
@@ -2621,7 +2621,7 @@ mlx5hws_action_template_create(enum mlx5hws_action_type action_type[])
u8 num_actions = 0;
int i;
- at = kzalloc_obj(*at, GFP_KERNEL);
+ at = kzalloc_obj(*at);
if (!at)
return NULL;
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/steering/hws/action_ste_pool.c b/drivers/net/ethernet/mellanox/mlx5/core/steering/hws/action_ste_pool.c
index f5ab9f3c694b..6145f71442e4 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/steering/hws/action_ste_pool.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/steering/hws/action_ste_pool.c
@@ -141,7 +141,7 @@ hws_action_ste_table_alloc(struct mlx5hws_action_ste_pool_element *parent_elem)
MLX5HWS_ACTION_STE_TABLE_INIT_LOG_SZ,
MLX5HWS_ACTION_STE_TABLE_MAX_LOG_SZ);
- action_tbl = kzalloc_obj(*action_tbl, GFP_KERNEL);
+ action_tbl = kzalloc_obj(*action_tbl);
if (!action_tbl)
return ERR_PTR(-ENOMEM);
@@ -329,7 +329,7 @@ int mlx5hws_action_ste_pool_init(struct mlx5hws_context *ctx)
size_t queues = ctx->queues;
int i, err;
- pool = kzalloc_objs(*pool, queues, GFP_KERNEL);
+ pool = kzalloc_objs(*pool, queues);
if (!pool)
return -ENOMEM;
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/steering/hws/buddy.c b/drivers/net/ethernet/mellanox/mlx5/core/steering/hws/buddy.c
index 147e176b6f9a..02736ecf817d 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/steering/hws/buddy.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/steering/hws/buddy.c
@@ -54,7 +54,7 @@ struct mlx5hws_buddy_mem *mlx5hws_buddy_create(u32 max_order)
{
struct mlx5hws_buddy_mem *buddy;
- buddy = kzalloc_obj(*buddy, GFP_KERNEL);
+ buddy = kzalloc_obj(*buddy);
if (!buddy)
return NULL;
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/steering/hws/bwc.c b/drivers/net/ethernet/mellanox/mlx5/core/steering/hws/bwc.c
index 6f69b97a8c2b..8f0dd304cefa 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/steering/hws/bwc.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/steering/hws/bwc.c
@@ -334,7 +334,7 @@ mlx5hws_bwc_matcher_create(struct mlx5hws_table *table,
return NULL;
}
- bwc_matcher = kzalloc_obj(*bwc_matcher, GFP_KERNEL);
+ bwc_matcher = kzalloc_obj(*bwc_matcher);
if (!bwc_matcher)
return NULL;
@@ -483,11 +483,11 @@ mlx5hws_bwc_rule_alloc(struct mlx5hws_bwc_matcher *bwc_matcher)
{
struct mlx5hws_bwc_rule *bwc_rule;
- bwc_rule = kzalloc_obj(*bwc_rule, GFP_KERNEL);
+ bwc_rule = kzalloc_obj(*bwc_rule);
if (unlikely(!bwc_rule))
goto out_err;
- bwc_rule->rule = kzalloc_obj(*bwc_rule->rule, GFP_KERNEL);
+ bwc_rule->rule = kzalloc_obj(*bwc_rule->rule);
if (unlikely(!bwc_rule->rule))
goto free_rule;
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/steering/hws/cmd.c b/drivers/net/ethernet/mellanox/mlx5/core/steering/hws/cmd.c
index 25b8ad504acc..e624f5da96c8 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/steering/hws/cmd.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/steering/hws/cmd.c
@@ -299,7 +299,7 @@ mlx5hws_cmd_forward_tbl_create(struct mlx5_core_dev *mdev,
struct mlx5hws_cmd_forward_tbl *tbl;
int ret;
- tbl = kzalloc_obj(*tbl, GFP_KERNEL);
+ tbl = kzalloc_obj(*tbl);
if (!tbl)
return NULL;
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/steering/hws/context.c b/drivers/net/ethernet/mellanox/mlx5/core/steering/hws/context.c
index 6e5b2c1a8b0b..c1a81f78d349 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/steering/hws/context.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/steering/hws/context.c
@@ -192,7 +192,7 @@ struct mlx5hws_context *mlx5hws_context_open(struct mlx5_core_dev *mdev,
struct mlx5hws_context *ctx;
int ret;
- ctx = kzalloc_obj(*ctx, GFP_KERNEL);
+ ctx = kzalloc_obj(*ctx);
if (!ctx)
return NULL;
@@ -201,7 +201,7 @@ struct mlx5hws_context *mlx5hws_context_open(struct mlx5_core_dev *mdev,
mutex_init(&ctx->ctrl_lock);
xa_init(&ctx->peer_ctx_xa);
- ctx->caps = kzalloc_obj(*ctx->caps, GFP_KERNEL);
+ ctx->caps = kzalloc_obj(*ctx->caps);
if (!ctx->caps)
goto free_ctx;
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/steering/hws/definer.c b/drivers/net/ethernet/mellanox/mlx5/core/steering/hws/definer.c
index d5902cfa8146..bcbd86a88b6b 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/steering/hws/definer.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/steering/hws/definer.c
@@ -1688,7 +1688,7 @@ hws_definer_alloc_compressed_fc(struct mlx5hws_definer_fc *fc)
u32 fc_sz = 0;
int i;
- compressed_fc = kzalloc_objs(*compressed_fc, definer_size, GFP_KERNEL);
+ compressed_fc = kzalloc_objs(*compressed_fc, definer_size);
if (!compressed_fc)
return NULL;
@@ -1731,7 +1731,7 @@ hws_definer_alloc_fc(struct mlx5hws_context *ctx,
struct mlx5hws_definer_fc *fc;
int i;
- fc = kzalloc_objs(*fc, len, GFP_KERNEL);
+ fc = kzalloc_objs(*fc, len);
if (!fc)
return NULL;
@@ -2139,7 +2139,7 @@ int mlx5hws_definer_init_cache(struct mlx5hws_definer_cache **cache)
{
struct mlx5hws_definer_cache *new_cache;
- new_cache = kzalloc_obj(*new_cache, GFP_KERNEL);
+ new_cache = kzalloc_obj(*new_cache);
if (!new_cache)
return -ENOMEM;
@@ -2183,7 +2183,7 @@ int mlx5hws_definer_get_obj(struct mlx5hws_context *ctx,
if (ret)
return -1;
- cached_definer = kzalloc_obj(*cached_definer, GFP_KERNEL);
+ cached_definer = kzalloc_obj(*cached_definer);
if (!cached_definer)
goto free_definer_obj;
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/steering/hws/fs_hws.c b/drivers/net/ethernet/mellanox/mlx5/core/steering/hws/fs_hws.c
index d684a49900a5..11ceaa97fa4f 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/steering/hws/fs_hws.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/steering/hws/fs_hws.c
@@ -1239,7 +1239,7 @@ mlx5_fs_get_pr_encap_pool(struct mlx5_core_dev *dev, struct xarray *pr_pools,
if (pr_pool)
return pr_pool;
- pr_pool = kzalloc_obj(*pr_pool, GFP_KERNEL);
+ pr_pool = kzalloc_obj(*pr_pool);
if (!pr_pool)
return ERR_PTR(-ENOMEM);
err = mlx5_fs_hws_pr_pool_init(pr_pool, dev, size, reformat_type);
@@ -1430,7 +1430,7 @@ mlx5_fs_create_mh_pool(struct mlx5_core_dev *dev,
struct mlx5_fs_pool *pool;
int err;
- pool = kzalloc_obj(*pool, GFP_KERNEL);
+ pool = kzalloc_obj(*pool);
if (!pool)
return ERR_PTR(-ENOMEM);
err = mlx5_fs_hws_mh_pool_init(pool, dev, pattern);
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/steering/hws/fs_hws_pools.c b/drivers/net/ethernet/mellanox/mlx5/core/steering/hws/fs_hws_pools.c
index d24eb6723b85..505b25e8da7f 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/steering/hws/fs_hws_pools.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/steering/hws/fs_hws_pools.c
@@ -186,7 +186,7 @@ int mlx5_fs_hws_pr_pool_init(struct mlx5_fs_pool *pr_pool,
reformat_type != MLX5HWS_ACTION_TYP_REFORMAT_L2_TO_TNL_L2)
return -EOPNOTSUPP;
- pr_pool_ctx = kzalloc_obj(*pr_pool_ctx, GFP_KERNEL);
+ pr_pool_ctx = kzalloc_obj(*pr_pool_ctx);
if (!pr_pool_ctx)
return -ENOMEM;
pr_pool_ctx->reformat_type = reformat_type;
@@ -331,7 +331,7 @@ int mlx5_fs_hws_mh_pool_init(struct mlx5_fs_pool *fs_hws_mh_pool,
{
struct mlx5hws_action_mh_pattern *pool_pattern;
- pool_pattern = kzalloc_obj(*pool_pattern, GFP_KERNEL);
+ pool_pattern = kzalloc_obj(*pool_pattern);
if (!pool_pattern)
return -ENOMEM;
pool_pattern->data = kmemdup(pattern->data, pattern->sz, GFP_KERNEL);
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/steering/hws/matcher.c b/drivers/net/ethernet/mellanox/mlx5/core/steering/hws/matcher.c
index c78ae73e5411..663224454268 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/steering/hws/matcher.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/steering/hws/matcher.c
@@ -912,7 +912,7 @@ hws_matcher_create_col_matcher(struct mlx5hws_matcher *matcher)
!hws_matcher_requires_col_tbl(size_tx->rule.num_log))
return 0;
- col_matcher = kzalloc_obj(*matcher, GFP_KERNEL);
+ col_matcher = kzalloc_obj(*matcher);
if (!col_matcher)
return -ENOMEM;
@@ -1084,7 +1084,7 @@ hws_matcher_set_templates(struct mlx5hws_matcher *matcher,
return -EOPNOTSUPP;
}
- matcher->mt = kzalloc_objs(*matcher->mt, num_of_mt, GFP_KERNEL);
+ matcher->mt = kzalloc_objs(*matcher->mt, num_of_mt);
if (!matcher->mt)
return -ENOMEM;
@@ -1133,7 +1133,7 @@ mlx5hws_matcher_create(struct mlx5hws_table *tbl,
struct mlx5hws_matcher *matcher;
int ret;
- matcher = kzalloc_obj(*matcher, GFP_KERNEL);
+ matcher = kzalloc_obj(*matcher);
if (!matcher)
return NULL;
@@ -1179,7 +1179,7 @@ mlx5hws_match_template_create(struct mlx5hws_context *ctx,
{
struct mlx5hws_match_template *mt;
- mt = kzalloc_obj(*mt, GFP_KERNEL);
+ mt = kzalloc_obj(*mt);
if (!mt)
return NULL;
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/steering/hws/pat_arg.c b/drivers/net/ethernet/mellanox/mlx5/core/steering/hws/pat_arg.c
index 49c8f3c872d9..9af449c2b4d5 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/steering/hws/pat_arg.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/steering/hws/pat_arg.c
@@ -78,7 +78,7 @@ int mlx5hws_pat_init_pattern_cache(struct mlx5hws_pattern_cache **cache)
{
struct mlx5hws_pattern_cache *new_cache;
- new_cache = kzalloc_obj(*new_cache, GFP_KERNEL);
+ new_cache = kzalloc_obj(*new_cache);
if (!new_cache)
return -ENOMEM;
@@ -168,7 +168,7 @@ mlx5hws_pat_add_pattern_to_cache(struct mlx5hws_pattern_cache *cache,
{
struct mlx5hws_pattern_cache_item *cached_pattern;
- cached_pattern = kzalloc_obj(*cached_pattern, GFP_KERNEL);
+ cached_pattern = kzalloc_obj(*cached_pattern);
if (!cached_pattern)
return NULL;
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/steering/hws/pool.c b/drivers/net/ethernet/mellanox/mlx5/core/steering/hws/pool.c
index 4b6642642346..3a549c9db71a 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/steering/hws/pool.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/steering/hws/pool.c
@@ -41,7 +41,7 @@ hws_pool_create_one_resource(struct mlx5hws_pool *pool, u32 log_range,
u32 obj_id = 0;
int ret;
- resource = kzalloc_obj(*resource, GFP_KERNEL);
+ resource = kzalloc_obj(*resource);
if (!resource)
return NULL;
@@ -347,7 +347,7 @@ mlx5hws_pool_create(struct mlx5hws_context *ctx, struct mlx5hws_pool_attr *pool_
enum mlx5hws_db_type res_db_type;
struct mlx5hws_pool *pool;
- pool = kzalloc_obj(*pool, GFP_KERNEL);
+ pool = kzalloc_obj(*pool);
if (!pool)
return NULL;
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/steering/hws/rule.c b/drivers/net/ethernet/mellanox/mlx5/core/steering/hws/rule.c
index 3c966476479d..0d4cb2b2393b 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/steering/hws/rule.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/steering/hws/rule.c
@@ -136,7 +136,7 @@ hws_rule_save_resize_info(struct mlx5hws_rule *rule,
/* resize_info might already exist (if we're in update flow) */
if (likely(!rule->resize_info)) {
- rule->resize_info = kzalloc_obj(*rule->resize_info, GFP_KERNEL);
+ rule->resize_info = kzalloc_obj(*rule->resize_info);
if (unlikely(!rule->resize_info)) {
pr_warn("HWS: resize info isn't allocated for rule\n");
return;
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/steering/hws/send.c b/drivers/net/ethernet/mellanox/mlx5/core/steering/hws/send.c
index 4fef376d63a2..2d34fe465d13 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/steering/hws/send.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/steering/hws/send.c
@@ -701,7 +701,7 @@ static int hws_send_ring_alloc_sq(struct mlx5_core_dev *mdev,
wq->db = &wq->db[MLX5_SND_DBR];
buf_sz = queue->num_entries * MAX_WQES_PER_RULE;
- sq->dep_wqe = kzalloc_objs(*sq->dep_wqe, queue->num_entries, GFP_KERNEL);
+ sq->dep_wqe = kzalloc_objs(*sq->dep_wqe, queue->num_entries);
if (!sq->dep_wqe) {
err = -ENOMEM;
goto destroy_wq_cyc;
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/steering/hws/table.c b/drivers/net/ethernet/mellanox/mlx5/core/steering/hws/table.c
index 2bf42f5df285..bd292485a25b 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/steering/hws/table.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/steering/hws/table.c
@@ -238,7 +238,7 @@ struct mlx5hws_table *mlx5hws_table_create(struct mlx5hws_context *ctx,
return NULL;
}
- tbl = kzalloc_obj(*tbl, GFP_KERNEL);
+ tbl = kzalloc_obj(*tbl);
if (!tbl)
return NULL;
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/steering/sws/dr_action.c b/drivers/net/ethernet/mellanox/mlx5/core/steering/sws/dr_action.c
index 9889149569fe..2020b5eeb8f4 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/steering/sws/dr_action.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/steering/sws/dr_action.c
@@ -1194,14 +1194,14 @@ mlx5dr_action_create_mult_dest_tbl(struct mlx5dr_domain *dmn,
return NULL;
}
- hw_dests = kzalloc_objs(*hw_dests, num_of_dests, GFP_KERNEL);
+ hw_dests = kzalloc_objs(*hw_dests, num_of_dests);
if (!hw_dests)
return NULL;
if (unlikely(check_mul_overflow(num_of_dests, 2u, &ref_act_cnt)))
goto free_hw_dests;
- ref_actions = kzalloc_objs(*ref_actions, ref_act_cnt, GFP_KERNEL);
+ ref_actions = kzalloc_objs(*ref_actions, ref_act_cnt);
if (!ref_actions)
goto free_hw_dests;
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/steering/sws/dr_arg.c b/drivers/net/ethernet/mellanox/mlx5/core/steering/sws/dr_arg.c
index b276f9e966bc..e1f156448fb0 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/steering/sws/dr_arg.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/steering/sws/dr_arg.c
@@ -68,7 +68,7 @@ static int dr_arg_pool_alloc_objs(struct dr_arg_pool *pool)
}
for (i = 0; i < num_of_objects; i++) {
- arg_obj = kzalloc_obj(*arg_obj, GFP_KERNEL);
+ arg_obj = kzalloc_obj(*arg_obj);
if (!arg_obj) {
ret = -ENOMEM;
goto clean_arg_obj;
@@ -132,7 +132,7 @@ static struct dr_arg_pool *dr_arg_pool_create(struct mlx5dr_domain *dmn,
{
struct dr_arg_pool *pool;
- pool = kzalloc_obj(*pool, GFP_KERNEL);
+ pool = kzalloc_obj(*pool);
if (!pool)
return NULL;
@@ -235,7 +235,7 @@ mlx5dr_arg_mgr_create(struct mlx5dr_domain *dmn)
if (!mlx5dr_domain_is_support_ptrn_arg(dmn))
return NULL;
- pool_mgr = kzalloc_obj(*pool_mgr, GFP_KERNEL);
+ pool_mgr = kzalloc_obj(*pool_mgr);
if (!pool_mgr)
return NULL;
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/steering/sws/dr_dbg.c b/drivers/net/ethernet/mellanox/mlx5/core/steering/sws/dr_dbg.c
index c8904955ec54..1b08bbb7ad99 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/steering/sws/dr_dbg.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/steering/sws/dr_dbg.c
@@ -60,7 +60,7 @@ mlx5dr_dbg_dump_data_init_new_buff(struct mlx5dr_dbg_dump_data *dump_data)
{
struct mlx5dr_dbg_dump_buff *new_buff;
- new_buff = kzalloc_obj(*new_buff, GFP_KERNEL);
+ new_buff = kzalloc_obj(*new_buff);
if (!new_buff)
return NULL;
@@ -81,7 +81,7 @@ mlx5dr_dbg_create_dump_data(void)
{
struct mlx5dr_dbg_dump_data *dump_data;
- dump_data = kzalloc_obj(*dump_data, GFP_KERNEL);
+ dump_data = kzalloc_obj(*dump_data);
if (!dump_data)
return NULL;
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/steering/sws/dr_definer.c b/drivers/net/ethernet/mellanox/mlx5/core/steering/sws/dr_definer.c
index 282088205d4c..ddbb62d8ac96 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/steering/sws/dr_definer.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/steering/sws/dr_definer.c
@@ -60,7 +60,7 @@ dr_definer_create_obj(struct mlx5dr_domain *dmn, u16 format_id,
struct dr_definer_object *definer_obj;
int ret = 0;
- definer_obj = kzalloc_obj(*definer_obj, GFP_KERNEL);
+ definer_obj = kzalloc_obj(*definer_obj);
if (!definer_obj)
return NULL;
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/steering/sws/dr_domain.c b/drivers/net/ethernet/mellanox/mlx5/core/steering/sws/dr_domain.c
index 5c0a8dc6cff0..fedefb565a21 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/steering/sws/dr_domain.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/steering/sws/dr_domain.c
@@ -282,7 +282,7 @@ dr_domain_add_vport_cap(struct mlx5dr_domain *dmn, u16 vport)
struct mlx5dr_cmd_vport_cap *vport_caps;
int ret;
- vport_caps = kvzalloc_obj(*vport_caps, GFP_KERNEL);
+ vport_caps = kvzalloc_obj(*vport_caps);
if (!vport_caps)
return NULL;
@@ -467,7 +467,7 @@ mlx5dr_domain_create(struct mlx5_core_dev *mdev, enum mlx5dr_domain_type type)
if (type > MLX5DR_DOMAIN_TYPE_FDB)
return NULL;
- dmn = kzalloc_obj(*dmn, GFP_KERNEL);
+ dmn = kzalloc_obj(*dmn);
if (!dmn)
return NULL;
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/steering/sws/dr_fw.c b/drivers/net/ethernet/mellanox/mlx5/core/steering/sws/dr_fw.c
index df34beefda11..094fcd9cd770 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/steering/sws/dr_fw.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/steering/sws/dr_fw.c
@@ -13,7 +13,7 @@ mlx5dr_fw_create_recalc_cs_ft(struct mlx5dr_domain *dmn, u16 vport_num)
u64 rx_icm_addr, modify_ttl_action;
int ret;
- recalc_cs_ft = kzalloc_obj(*recalc_cs_ft, GFP_KERNEL);
+ recalc_cs_ft = kzalloc_obj(*recalc_cs_ft);
if (!recalc_cs_ft)
return NULL;
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/steering/sws/dr_icm_pool.c b/drivers/net/ethernet/mellanox/mlx5/core/steering/sws/dr_icm_pool.c
index 79f0adecc2aa..1c314df256c9 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/steering/sws/dr_icm_pool.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/steering/sws/dr_icm_pool.c
@@ -116,7 +116,7 @@ dr_icm_pool_mr_create(struct mlx5dr_icm_pool *pool)
size_t log_align_base = 0;
int err;
- icm_mr = kvzalloc_obj(*icm_mr, GFP_KERNEL);
+ icm_mr = kvzalloc_obj(*icm_mr);
if (!icm_mr)
return NULL;
@@ -269,7 +269,7 @@ static int dr_icm_buddy_create(struct mlx5dr_icm_pool *pool)
if (!icm_mr)
return -ENOMEM;
- buddy = kvzalloc_obj(*buddy, GFP_KERNEL);
+ buddy = kvzalloc_obj(*buddy);
if (!buddy)
goto free_mr;
@@ -509,7 +509,7 @@ struct mlx5dr_icm_pool *mlx5dr_icm_pool_create(struct mlx5dr_domain *dmn,
struct mlx5dr_icm_pool *pool;
u32 max_hot_size = 0;
- pool = kvzalloc_obj(*pool, GFP_KERNEL);
+ pool = kvzalloc_obj(*pool);
if (!pool)
return NULL;
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/steering/sws/dr_matcher.c b/drivers/net/ethernet/mellanox/mlx5/core/steering/sws/dr_matcher.c
index b171fdb5a622..be0c476b1113 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/steering/sws/dr_matcher.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/steering/sws/dr_matcher.c
@@ -996,7 +996,7 @@ mlx5dr_matcher_create(struct mlx5dr_table *tbl,
refcount_inc(&tbl->refcount);
- matcher = kzalloc_obj(*matcher, GFP_KERNEL);
+ matcher = kzalloc_obj(*matcher);
if (!matcher)
goto dec_ref;
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/steering/sws/dr_ptrn.c b/drivers/net/ethernet/mellanox/mlx5/core/steering/sws/dr_ptrn.c
index 094a6bea9a8a..ed7eb0f40b57 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/steering/sws/dr_ptrn.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/steering/sws/dr_ptrn.c
@@ -94,7 +94,7 @@ dr_ptrn_alloc_pattern(struct mlx5dr_ptrn_mgr *mgr,
mgr->dmn->info.caps.hdr_modify_pattern_icm_addr) /
DR_ACTION_CACHE_LINE_SIZE;
- pattern = kzalloc_obj(*pattern, GFP_KERNEL);
+ pattern = kzalloc_obj(*pattern);
if (!pattern)
goto free_chunk;
@@ -201,7 +201,7 @@ struct mlx5dr_ptrn_mgr *mlx5dr_ptrn_mgr_create(struct mlx5dr_domain *dmn)
if (!mlx5dr_domain_is_support_ptrn_arg(dmn))
return NULL;
- mgr = kzalloc_obj(*mgr, GFP_KERNEL);
+ mgr = kzalloc_obj(*mgr);
if (!mgr)
return NULL;
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/steering/sws/dr_rule.c b/drivers/net/ethernet/mellanox/mlx5/core/steering/sws/dr_rule.c
index 8d925c3e2b11..00156ceed5ea 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/steering/sws/dr_rule.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/steering/sws/dr_rule.c
@@ -593,7 +593,7 @@ static int dr_rule_add_action_members(struct mlx5dr_rule *rule,
int i;
for (i = 0; i < num_actions; i++) {
- action_mem = kvzalloc_obj(*action_mem, GFP_KERNEL);
+ action_mem = kvzalloc_obj(*action_mem);
if (!action_mem)
goto free_action_members;
@@ -1298,7 +1298,7 @@ dr_rule_create_rule(struct mlx5dr_matcher *matcher,
if (!dr_rule_verify(matcher, value, ¶m))
return NULL;
- rule = kzalloc_obj(*rule, GFP_KERNEL);
+ rule = kzalloc_obj(*rule);
if (!rule)
return NULL;
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/steering/sws/dr_send.c b/drivers/net/ethernet/mellanox/mlx5/core/steering/sws/dr_send.c
index 78d7c83a98b0..79e3c29d1044 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/steering/sws/dr_send.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/steering/sws/dr_send.c
@@ -72,7 +72,7 @@ static int dr_send_info_pool_fill(struct mlx5dr_send_info_pool *pool)
int i;
for (i = 0; i < DR_SEND_INFO_POOL_SIZE; i++) {
- pool_obj = kzalloc_obj(*pool_obj, GFP_KERNEL);
+ pool_obj = kzalloc_obj(*pool_obj);
if (!pool_obj)
goto clean_pool;
@@ -114,7 +114,7 @@ static struct mlx5dr_send_info_pool *dr_send_info_pool_create(void)
struct mlx5dr_send_info_pool *pool;
int ret;
- pool = kzalloc_obj(*pool, GFP_KERNEL);
+ pool = kzalloc_obj(*pool);
if (!pool)
return NULL;
@@ -258,7 +258,7 @@ static struct mlx5dr_qp *dr_create_rc_qp(struct mlx5_core_dev *mdev,
void *in;
int err;
- dr_qp = kzalloc_obj(*dr_qp, GFP_KERNEL);
+ dr_qp = kzalloc_obj(*dr_qp);
if (!dr_qp)
return NULL;
@@ -1063,7 +1063,7 @@ static struct mlx5dr_cq *dr_create_cq(struct mlx5_core_dev *mdev,
__be64 *pas;
u32 i;
- cq = kzalloc_obj(*cq, GFP_KERNEL);
+ cq = kzalloc_obj(*cq);
if (!cq)
return NULL;
@@ -1158,7 +1158,7 @@ static int dr_create_mkey(struct mlx5_core_dev *mdev, u32 pdn, u32 *mkey)
static struct mlx5dr_mr *dr_reg_mr(struct mlx5_core_dev *mdev,
u32 pdn, void *buf, size_t size)
{
- struct mlx5dr_mr *mr = kzalloc_obj(*mr, GFP_KERNEL);
+ struct mlx5dr_mr *mr = kzalloc_obj(*mr);
struct device *dma_device;
dma_addr_t dma_addr;
int err;
@@ -1207,7 +1207,7 @@ int mlx5dr_send_ring_alloc(struct mlx5dr_domain *dmn)
int size;
int ret;
- dmn->send_ring = kzalloc_obj(*dmn->send_ring, GFP_KERNEL);
+ dmn->send_ring = kzalloc_obj(*dmn->send_ring);
if (!dmn->send_ring)
return -ENOMEM;
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/steering/sws/dr_table.c b/drivers/net/ethernet/mellanox/mlx5/core/steering/sws/dr_table.c
index ab4c360c64e0..740aac71d4cb 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/steering/sws/dr_table.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/steering/sws/dr_table.c
@@ -255,7 +255,7 @@ struct mlx5dr_table *mlx5dr_table_create(struct mlx5dr_domain *dmn, u32 level,
refcount_inc(&dmn->refcount);
- tbl = kzalloc_obj(*tbl, GFP_KERNEL);
+ tbl = kzalloc_obj(*tbl);
if (!tbl)
goto dec_ref;
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/vport.c b/drivers/net/ethernet/mellanox/mlx5/core/vport.c
index 3b41a507ea05..4effe37fd455 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/vport.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/vport.c
@@ -832,7 +832,7 @@ int mlx5_query_hca_vport_system_image_guid(struct mlx5_core_dev *dev,
struct mlx5_hca_vport_context *rep;
int err;
- rep = kvzalloc_obj(*rep, GFP_KERNEL);
+ rep = kvzalloc_obj(*rep);
if (!rep)
return -ENOMEM;
@@ -851,7 +851,7 @@ int mlx5_query_hca_vport_node_guid(struct mlx5_core_dev *dev,
struct mlx5_hca_vport_context *rep;
int err;
- rep = kvzalloc_obj(*rep, GFP_KERNEL);
+ rep = kvzalloc_obj(*rep);
if (!rep)
return -ENOMEM;
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/wc.c b/drivers/net/ethernet/mellanox/mlx5/core/wc.c
index aa989841f375..7d3d4d739e2c 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/wc.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/wc.c
@@ -366,7 +366,7 @@ static void mlx5_core_test_wc(struct mlx5_core_dev *mdev)
if (mdev->wc_state != MLX5_WC_STATE_UNINITIALIZED)
return;
- sq = kzalloc_obj(*sq, GFP_KERNEL);
+ sq = kzalloc_obj(*sq);
if (!sq)
return;
diff --git a/drivers/net/ethernet/mellanox/mlxfw/mlxfw_mfa2.c b/drivers/net/ethernet/mellanox/mlxfw/mlxfw_mfa2.c
index b2335f56b481..002560c46150 100644
--- a/drivers/net/ethernet/mellanox/mlxfw/mlxfw_mfa2.c
+++ b/drivers/net/ethernet/mellanox/mlxfw/mlxfw_mfa2.c
@@ -267,7 +267,7 @@ struct mlxfw_mfa2_file *mlxfw_mfa2_file_init(const struct firmware *fw)
const void *first_tlv_ptr;
const void *cb_top_ptr;
- mfa2_file = kzalloc_obj(*mfa2_file, GFP_KERNEL);
+ mfa2_file = kzalloc_obj(*mfa2_file);
if (!mfa2_file)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/net/ethernet/mellanox/mlxsw/core.c b/drivers/net/ethernet/mellanox/mlxsw/core.c
index 6d2353324eda..93540e4f3a4b 100644
--- a/drivers/net/ethernet/mellanox/mlxsw/core.c
+++ b/drivers/net/ethernet/mellanox/mlxsw/core.c
@@ -2376,7 +2376,7 @@ int mlxsw_core_rx_listener_register(struct mlxsw_core *mlxsw_core,
rxl_item = __find_rx_listener_item(mlxsw_core, rxl);
if (rxl_item)
return -EEXIST;
- rxl_item = kmalloc_obj(*rxl_item, GFP_KERNEL);
+ rxl_item = kmalloc_obj(*rxl_item);
if (!rxl_item)
return -ENOMEM;
rxl_item->rxl = *rxl;
@@ -2475,7 +2475,7 @@ int mlxsw_core_event_listener_register(struct mlxsw_core *mlxsw_core,
el_item = __find_event_listener_item(mlxsw_core, el);
if (el_item)
return -EEXIST;
- el_item = kmalloc_obj(*el_item, GFP_KERNEL);
+ el_item = kmalloc_obj(*el_item);
if (!el_item)
return -ENOMEM;
el_item->mlxsw_core = mlxsw_core;
@@ -2684,7 +2684,7 @@ static int mlxsw_core_reg_access_emad(struct mlxsw_core *mlxsw_core,
struct mlxsw_reg_trans *trans;
int err;
- trans = kzalloc_obj(*trans, GFP_KERNEL);
+ trans = kzalloc_obj(*trans);
if (!trans)
return -ENOMEM;
@@ -2785,7 +2785,7 @@ int mlxsw_core_irq_event_handler_register(struct mlxsw_core *mlxsw_core,
{
struct mlxsw_core_irq_event_handler_item *item;
- item = kzalloc_obj(*item, GFP_KERNEL);
+ item = kzalloc_obj(*item);
if (!item)
return -ENOMEM;
item->cb = cb;
diff --git a/drivers/net/ethernet/mellanox/mlxsw/core_acl_flex_actions.c b/drivers/net/ethernet/mellanox/mlxsw/core_acl_flex_actions.c
index 08168f95987a..f03dffc39005 100644
--- a/drivers/net/ethernet/mellanox/mlxsw/core_acl_flex_actions.c
+++ b/drivers/net/ethernet/mellanox/mlxsw/core_acl_flex_actions.c
@@ -201,7 +201,7 @@ struct mlxsw_afa *mlxsw_afa_create(unsigned int max_acts_per_set,
struct mlxsw_afa *mlxsw_afa;
int err;
- mlxsw_afa = kzalloc_obj(*mlxsw_afa, GFP_KERNEL);
+ mlxsw_afa = kzalloc_obj(*mlxsw_afa);
if (!mlxsw_afa)
return ERR_PTR(-ENOMEM);
err = rhashtable_init(&mlxsw_afa->set_ht, &mlxsw_afa_set_ht_params);
@@ -276,7 +276,7 @@ static struct mlxsw_afa_set *mlxsw_afa_set_create(bool is_first)
{
struct mlxsw_afa_set *set;
- set = kzalloc_obj(*set, GFP_KERNEL);
+ set = kzalloc_obj(*set);
if (!set)
return NULL;
/* Need to initialize the set to pass by default */
@@ -406,7 +406,7 @@ struct mlxsw_afa_block *mlxsw_afa_block_create(struct mlxsw_afa *mlxsw_afa)
{
struct mlxsw_afa_block *block;
- block = kzalloc_obj(*block, GFP_KERNEL);
+ block = kzalloc_obj(*block);
if (!block)
return ERR_PTR(-ENOMEM);
INIT_LIST_HEAD(&block->resource_list);
@@ -560,7 +560,7 @@ mlxsw_afa_fwd_entry_create(struct mlxsw_afa *mlxsw_afa, u16 local_port)
struct mlxsw_afa_fwd_entry *fwd_entry;
int err;
- fwd_entry = kzalloc_obj(*fwd_entry, GFP_KERNEL);
+ fwd_entry = kzalloc_obj(*fwd_entry);
if (!fwd_entry)
return ERR_PTR(-ENOMEM);
fwd_entry->ht_key.local_port = local_port;
@@ -653,7 +653,7 @@ mlxsw_afa_fwd_entry_ref_create(struct mlxsw_afa_block *block, u16 local_port)
struct mlxsw_afa_fwd_entry *fwd_entry;
int err;
- fwd_entry_ref = kzalloc_obj(*fwd_entry_ref, GFP_KERNEL);
+ fwd_entry_ref = kzalloc_obj(*fwd_entry_ref);
if (!fwd_entry_ref)
return ERR_PTR(-ENOMEM);
fwd_entry = mlxsw_afa_fwd_entry_get(block->afa, local_port);
@@ -702,7 +702,7 @@ mlxsw_afa_counter_create(struct mlxsw_afa_block *block)
struct mlxsw_afa_counter *counter;
int err;
- counter = kzalloc_obj(*counter, GFP_KERNEL);
+ counter = kzalloc_obj(*counter);
if (!counter)
return ERR_PTR(-ENOMEM);
@@ -847,7 +847,7 @@ mlxsw_afa_cookie_ref_create(struct mlxsw_afa_block *block,
struct mlxsw_afa_cookie *cookie;
int err;
- cookie_ref = kzalloc_obj(*cookie_ref, GFP_KERNEL);
+ cookie_ref = kzalloc_obj(*cookie_ref);
if (!cookie_ref)
return ERR_PTR(-ENOMEM);
cookie = mlxsw_afa_cookie_get(block->afa, fa_cookie);
@@ -873,7 +873,7 @@ mlxsw_afa_policer_create(struct mlxsw_afa *mlxsw_afa, u32 fa_index,
struct mlxsw_afa_policer *policer;
int err;
- policer = kzalloc_obj(*policer, GFP_KERNEL);
+ policer = kzalloc_obj(*policer);
if (!policer)
return ERR_PTR(-ENOMEM);
@@ -974,7 +974,7 @@ mlxsw_afa_policer_ref_create(struct mlxsw_afa_block *block, u32 fa_index,
struct mlxsw_afa_policer *policer;
int err;
- policer_ref = kzalloc_obj(*policer_ref, GFP_KERNEL);
+ policer_ref = kzalloc_obj(*policer_ref);
if (!policer_ref)
return ERR_PTR(-ENOMEM);
@@ -1386,7 +1386,7 @@ mlxsw_afa_mirror_create(struct mlxsw_afa_block *block, u16 local_in_port,
struct mlxsw_afa_mirror *mirror;
int err;
- mirror = kzalloc_obj(*mirror, GFP_KERNEL);
+ mirror = kzalloc_obj(*mirror);
if (!mirror)
return ERR_PTR(-ENOMEM);
@@ -2187,7 +2187,7 @@ mlxsw_afa_sampler_create(struct mlxsw_afa_block *block, u16 local_port,
struct mlxsw_afa_sampler *sampler;
int err;
- sampler = kzalloc_obj(*sampler, GFP_KERNEL);
+ sampler = kzalloc_obj(*sampler);
if (!sampler)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/net/ethernet/mellanox/mlxsw/core_acl_flex_keys.c b/drivers/net/ethernet/mellanox/mlxsw/core_acl_flex_keys.c
index 030eefcd3eda..bbd8b61180eb 100644
--- a/drivers/net/ethernet/mellanox/mlxsw/core_acl_flex_keys.c
+++ b/drivers/net/ethernet/mellanox/mlxsw/core_acl_flex_keys.c
@@ -86,7 +86,7 @@ struct mlxsw_afk *mlxsw_afk_create(unsigned int max_blocks,
{
struct mlxsw_afk *mlxsw_afk;
- mlxsw_afk = kzalloc_obj(*mlxsw_afk, GFP_KERNEL);
+ mlxsw_afk = kzalloc_obj(*mlxsw_afk);
if (!mlxsw_afk)
return NULL;
INIT_LIST_HEAD(&mlxsw_afk->key_info_list);
@@ -262,7 +262,7 @@ static int mlxsw_afk_picker(struct mlxsw_afk *mlxsw_afk,
enum mlxsw_afk_element element;
int err;
- picker = kzalloc_objs(*picker, mlxsw_afk->blocks_count, GFP_KERNEL);
+ picker = kzalloc_objs(*picker, mlxsw_afk->blocks_count);
if (!picker)
return -ENOMEM;
diff --git a/drivers/net/ethernet/mellanox/mlxsw/core_linecard_dev.c b/drivers/net/ethernet/mellanox/mlxsw/core_linecard_dev.c
index a689c79122cf..c4816488e4d7 100644
--- a/drivers/net/ethernet/mellanox/mlxsw/core_linecard_dev.c
+++ b/drivers/net/ethernet/mellanox/mlxsw/core_linecard_dev.c
@@ -57,7 +57,7 @@ int mlxsw_linecard_bdev_add(struct mlxsw_linecard *linecard)
if (id < 0)
return id;
- linecard_bdev = kzalloc_obj(*linecard_bdev, GFP_KERNEL);
+ linecard_bdev = kzalloc_obj(*linecard_bdev);
if (!linecard_bdev) {
mlxsw_linecard_bdev_id_free(id);
return -ENOMEM;
diff --git a/drivers/net/ethernet/mellanox/mlxsw/core_linecards.c b/drivers/net/ethernet/mellanox/mlxsw/core_linecards.c
index ef13fee48b1a..f0659616ad9b 100644
--- a/drivers/net/ethernet/mellanox/mlxsw/core_linecards.c
+++ b/drivers/net/ethernet/mellanox/mlxsw/core_linecards.c
@@ -531,7 +531,7 @@ int mlxsw_linecards_event_ops_register(struct mlxsw_core *mlxsw_core,
if (!linecards)
return 0;
- item = kzalloc_obj(*item, GFP_KERNEL);
+ item = kzalloc_obj(*item);
if (!item)
return -ENOMEM;
item->event_ops = ops;
@@ -1446,7 +1446,7 @@ static int mlxsw_linecard_types_init(struct mlxsw_core *mlxsw_core,
return 0;
}
- types_info = kzalloc_obj(*types_info, GFP_KERNEL);
+ types_info = kzalloc_obj(*types_info);
if (!types_info) {
release_firmware(firmware);
return -ENOMEM;
diff --git a/drivers/net/ethernet/mellanox/mlxsw/minimal.c b/drivers/net/ethernet/mellanox/mlxsw/minimal.c
index 9871b9e1d094..6cdbac750cc6 100644
--- a/drivers/net/ethernet/mellanox/mlxsw/minimal.c
+++ b/drivers/net/ethernet/mellanox/mlxsw/minimal.c
@@ -398,7 +398,7 @@ static int mlxsw_m_linecards_init(struct mlxsw_m *mlxsw_m)
/* Add slot for main board. */
mlxsw_m->num_of_slots += 1;
- mlxsw_m->ports = kzalloc_objs(*mlxsw_m->ports, max_ports, GFP_KERNEL);
+ mlxsw_m->ports = kzalloc_objs(*mlxsw_m->ports, max_ports);
if (!mlxsw_m->ports)
return -ENOMEM;
diff --git a/drivers/net/ethernet/mellanox/mlxsw/pci.c b/drivers/net/ethernet/mellanox/mlxsw/pci.c
index 9b378e9d084d..be6b7f9508ed 100644
--- a/drivers/net/ethernet/mellanox/mlxsw/pci.c
+++ b/drivers/net/ethernet/mellanox/mlxsw/pci.c
@@ -1264,7 +1264,7 @@ static int mlxsw_pci_queue_init(struct mlxsw_pci *mlxsw_pci, char *mbox,
if (!mem_item->buf)
return -ENOMEM;
- q->elem_info = kzalloc_objs(*q->elem_info, q->count, GFP_KERNEL);
+ q->elem_info = kzalloc_objs(*q->elem_info, q->count);
if (!q->elem_info) {
err = -ENOMEM;
goto err_elem_info_alloc;
@@ -1316,7 +1316,7 @@ static int mlxsw_pci_queue_group_init(struct mlxsw_pci *mlxsw_pci, char *mbox,
int err;
queue_group = mlxsw_pci_queue_type_group_get(mlxsw_pci, q_ops->type);
- queue_group->q = kzalloc_objs(*queue_group->q, num_qs, GFP_KERNEL);
+ queue_group->q = kzalloc_objs(*queue_group->q, num_qs);
if (!queue_group->q)
return -ENOMEM;
@@ -2414,7 +2414,7 @@ static int mlxsw_pci_probe(struct pci_dev *pdev, const struct pci_device_id *id)
struct mlxsw_pci *mlxsw_pci;
int err;
- mlxsw_pci = kzalloc_obj(*mlxsw_pci, GFP_KERNEL);
+ mlxsw_pci = kzalloc_obj(*mlxsw_pci);
if (!mlxsw_pci)
return -ENOMEM;
diff --git a/drivers/net/ethernet/mellanox/mlxsw/spectrum.c b/drivers/net/ethernet/mellanox/mlxsw/spectrum.c
index dbc032ff4963..b405584fa8a0 100644
--- a/drivers/net/ethernet/mellanox/mlxsw/spectrum.c
+++ b/drivers/net/ethernet/mellanox/mlxsw/spectrum.c
@@ -972,7 +972,7 @@ mlxsw_sp_port_vlan_create(struct mlxsw_sp_port *mlxsw_sp_port, u16 vid)
if (err)
return ERR_PTR(err);
- mlxsw_sp_port_vlan = kzalloc_obj(*mlxsw_sp_port_vlan, GFP_KERNEL);
+ mlxsw_sp_port_vlan = kzalloc_obj(*mlxsw_sp_port_vlan);
if (!mlxsw_sp_port_vlan) {
err = -ENOMEM;
goto err_port_vlan_alloc;
@@ -1776,7 +1776,7 @@ static int mlxsw_sp_cpu_port_create(struct mlxsw_sp *mlxsw_sp)
struct mlxsw_sp_port *mlxsw_sp_port;
int err;
- mlxsw_sp_port = kzalloc_obj(*mlxsw_sp_port, GFP_KERNEL);
+ mlxsw_sp_port = kzalloc_obj(*mlxsw_sp_port);
if (!mlxsw_sp_port)
return -ENOMEM;
@@ -2747,7 +2747,7 @@ mlxsw_sp_sample_trigger_node_init(struct mlxsw_sp *mlxsw_sp,
struct mlxsw_sp_sample_trigger_node *trigger_node;
int err;
- trigger_node = kzalloc_obj(*trigger_node, GFP_KERNEL);
+ trigger_node = kzalloc_obj(*trigger_node);
if (!trigger_node)
return -ENOMEM;
@@ -2893,7 +2893,7 @@ mlxsw_sp_ipv6_addr_init(struct mlxsw_sp *mlxsw_sp, const struct in6_addr *addr6,
if (err)
goto err_rips_write;
- node = kzalloc_obj(*node, GFP_KERNEL);
+ node = kzalloc_obj(*node);
if (!node) {
err = -ENOMEM;
goto err_node_alloc;
diff --git a/drivers/net/ethernet/mellanox/mlxsw/spectrum_acl.c b/drivers/net/ethernet/mellanox/mlxsw/spectrum_acl.c
index aaaa586e8569..cb232accb296 100644
--- a/drivers/net/ethernet/mellanox/mlxsw/spectrum_acl.c
+++ b/drivers/net/ethernet/mellanox/mlxsw/spectrum_acl.c
@@ -318,7 +318,7 @@ mlxsw_sp_acl_rulei_create(struct mlxsw_sp_acl *acl,
struct mlxsw_sp_acl_rule_info *rulei;
int err;
- rulei = kzalloc_obj(*rulei, GFP_KERNEL);
+ rulei = kzalloc_obj(*rulei);
if (!rulei)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/net/ethernet/mellanox/mlxsw/spectrum_acl_atcam.c b/drivers/net/ethernet/mellanox/mlxsw/spectrum_acl_atcam.c
index b6e1fc77f0c0..748929287904 100644
--- a/drivers/net/ethernet/mellanox/mlxsw/spectrum_acl_atcam.c
+++ b/drivers/net/ethernet/mellanox/mlxsw/spectrum_acl_atcam.c
@@ -74,7 +74,7 @@ mlxsw_sp_acl_atcam_region_generic_init(struct mlxsw_sp_acl_atcam_region *aregion
{
struct mlxsw_sp_acl_atcam_region_generic *region_generic;
- region_generic = kzalloc_obj(*region_generic, GFP_KERNEL);
+ region_generic = kzalloc_obj(*region_generic);
if (!region_generic)
return -ENOMEM;
@@ -126,7 +126,7 @@ mlxsw_sp_acl_atcam_region_12kb_init(struct mlxsw_sp_acl_atcam_region *aregion)
return -EIO;
max_lkey_id = MLXSW_CORE_RES_GET(mlxsw_sp->core, ACL_MAX_LARGE_KEY_ID);
- region_12kb = kzalloc_obj(*region_12kb, GFP_KERNEL);
+ region_12kb = kzalloc_obj(*region_12kb);
if (!region_12kb)
return -ENOMEM;
@@ -179,7 +179,7 @@ mlxsw_sp_acl_atcam_lkey_id_create(struct mlxsw_sp_acl_atcam_region *aregion,
else
return ERR_PTR(-ENOBUFS);
- lkey_id = kzalloc_obj(*lkey_id, GFP_KERNEL);
+ lkey_id = kzalloc_obj(*lkey_id);
if (!lkey_id) {
err = -ENOMEM;
goto err_lkey_id_alloc;
diff --git a/drivers/net/ethernet/mellanox/mlxsw/spectrum_acl_erp.c b/drivers/net/ethernet/mellanox/mlxsw/spectrum_acl_erp.c
index 80307d6554a2..cbb272a96359 100644
--- a/drivers/net/ethernet/mellanox/mlxsw/spectrum_acl_erp.c
+++ b/drivers/net/ethernet/mellanox/mlxsw/spectrum_acl_erp.c
@@ -254,7 +254,7 @@ mlxsw_sp_acl_erp_generic_create(struct mlxsw_sp_acl_erp_table *erp_table,
struct mlxsw_sp_acl_erp *erp;
int err;
- erp = kzalloc_obj(*erp, GFP_KERNEL);
+ erp = kzalloc_obj(*erp);
if (!erp)
return ERR_PTR(-ENOMEM);
@@ -798,7 +798,7 @@ mlxsw_sp_acl_erp_ctcam_mask_create(struct mlxsw_sp_acl_erp_table *erp_table,
struct mlxsw_sp_acl_erp *erp;
int err;
- erp = kzalloc_obj(*erp, GFP_KERNEL);
+ erp = kzalloc_obj(*erp);
if (!erp)
return ERR_PTR(-ENOMEM);
@@ -1236,7 +1236,7 @@ static void *mlxsw_sp_acl_erp_delta_create(void *priv, void *parent_obj,
if (err)
return ERR_PTR(-EINVAL);
- delta = kzalloc_obj(*delta, GFP_KERNEL);
+ delta = kzalloc_obj(*delta);
if (!delta)
return ERR_PTR(-ENOMEM);
delta->start = delta_start;
@@ -1309,7 +1309,7 @@ mlxsw_sp_acl_erp_table_create(struct mlxsw_sp_acl_atcam_region *aregion,
struct mlxsw_sp_acl_erp_table *erp_table;
int err;
- erp_table = kzalloc_obj(*erp_table, GFP_KERNEL);
+ erp_table = kzalloc_obj(*erp_table);
if (!erp_table)
return ERR_PTR(-ENOMEM);
@@ -1563,7 +1563,7 @@ int mlxsw_sp_acl_erps_init(struct mlxsw_sp *mlxsw_sp,
struct mlxsw_sp_acl_erp_core *erp_core;
int err;
- erp_core = kzalloc_obj(*erp_core, GFP_KERNEL);
+ erp_core = kzalloc_obj(*erp_core);
if (!erp_core)
return -ENOMEM;
erp_core->mlxsw_sp = mlxsw_sp;
diff --git a/drivers/net/ethernet/mellanox/mlxsw/spectrum_acl_tcam.c b/drivers/net/ethernet/mellanox/mlxsw/spectrum_acl_tcam.c
index 5a282cb4b52d..3232ff3ad3c3 100644
--- a/drivers/net/ethernet/mellanox/mlxsw/spectrum_acl_tcam.c
+++ b/drivers/net/ethernet/mellanox/mlxsw/spectrum_acl_tcam.c
@@ -778,7 +778,7 @@ mlxsw_sp_acl_tcam_vregion_create(struct mlxsw_sp *mlxsw_sp,
struct mlxsw_sp_acl_tcam_vregion *vregion;
int err;
- vregion = kzalloc_obj(*vregion, GFP_KERNEL);
+ vregion = kzalloc_obj(*vregion);
if (!vregion)
return ERR_PTR(-ENOMEM);
INIT_LIST_HEAD(&vregion->vchunk_list);
@@ -939,7 +939,7 @@ mlxsw_sp_acl_tcam_vchunk_create(struct mlxsw_sp *mlxsw_sp,
if (priority == MLXSW_SP_ACL_TCAM_CATCHALL_PRIO)
return ERR_PTR(-EINVAL);
- vchunk = kzalloc_obj(*vchunk, GFP_KERNEL);
+ vchunk = kzalloc_obj(*vchunk);
if (!vchunk)
return ERR_PTR(-ENOMEM);
INIT_LIST_HEAD(&vchunk->ventry_list);
diff --git a/drivers/net/ethernet/mellanox/mlxsw/spectrum_buffers.c b/drivers/net/ethernet/mellanox/mlxsw/spectrum_buffers.c
index fd6b36c3d475..d1358c716079 100644
--- a/drivers/net/ethernet/mellanox/mlxsw/spectrum_buffers.c
+++ b/drivers/net/ethernet/mellanox/mlxsw/spectrum_buffers.c
@@ -628,7 +628,7 @@ static int mlxsw_sp_sb_port_init(struct mlxsw_sp *mlxsw_sp,
{
struct mlxsw_sp_sb_pm *pms;
- pms = kzalloc_objs(*pms, mlxsw_sp->sb_vals->pool_count, GFP_KERNEL);
+ pms = kzalloc_objs(*pms, mlxsw_sp->sb_vals->pool_count);
if (!pms)
return -ENOMEM;
sb_port->pms = pms;
@@ -652,7 +652,7 @@ static int mlxsw_sp_sb_ports_init(struct mlxsw_sp *mlxsw_sp)
if (!mlxsw_sp->sb->ports)
return -ENOMEM;
- prs = kzalloc_objs(*prs, mlxsw_sp->sb_vals->pool_count, GFP_KERNEL);
+ prs = kzalloc_objs(*prs, mlxsw_sp->sb_vals->pool_count);
if (!prs) {
err = -ENOMEM;
goto err_alloc_prs;
@@ -1261,7 +1261,7 @@ int mlxsw_sp_buffers_init(struct mlxsw_sp *mlxsw_sp)
if (!MLXSW_CORE_RES_VALID(mlxsw_sp->core, MAX_HEADROOM_SIZE))
return -EIO;
- mlxsw_sp->sb = kzalloc_obj(*mlxsw_sp->sb, GFP_KERNEL);
+ mlxsw_sp->sb = kzalloc_obj(*mlxsw_sp->sb);
if (!mlxsw_sp->sb)
return -ENOMEM;
mlxsw_sp->sb->cell_size = MLXSW_CORE_RES_GET(mlxsw_sp->core, CELL_SIZE);
@@ -1324,7 +1324,7 @@ int mlxsw_sp_port_buffers_init(struct mlxsw_sp_port *mlxsw_sp_port)
{
int err;
- mlxsw_sp_port->hdroom = kzalloc_obj(*mlxsw_sp_port->hdroom, GFP_KERNEL);
+ mlxsw_sp_port->hdroom = kzalloc_obj(*mlxsw_sp_port->hdroom);
if (!mlxsw_sp_port->hdroom)
return -ENOMEM;
mlxsw_sp_port->hdroom->mtu = mlxsw_sp_port->dev->mtu;
diff --git a/drivers/net/ethernet/mellanox/mlxsw/spectrum_fid.c b/drivers/net/ethernet/mellanox/mlxsw/spectrum_fid.c
index 2e9c35f5f992..4f921bbc1e77 100644
--- a/drivers/net/ethernet/mellanox/mlxsw/spectrum_fid.c
+++ b/drivers/net/ethernet/mellanox/mlxsw/spectrum_fid.c
@@ -1022,7 +1022,7 @@ mlxsw_sp_fid_port_vid_list_add(struct mlxsw_sp_fid *fid, u16 local_port,
{
struct mlxsw_sp_fid_port_vid *port_vid, *tmp_port_vid;
- port_vid = kzalloc_obj(*port_vid, GFP_KERNEL);
+ port_vid = kzalloc_obj(*port_vid);
if (!port_vid)
return -ENOMEM;
@@ -2295,7 +2295,7 @@ mlxsw_sp_fids_init(struct mlxsw_sp *mlxsw_sp,
struct mlxsw_sp_fid_core *fid_core;
int err, i;
- fid_core = kzalloc_obj(*mlxsw_sp->fid_core, GFP_KERNEL);
+ fid_core = kzalloc_obj(*mlxsw_sp->fid_core);
if (!fid_core)
return -ENOMEM;
mlxsw_sp->fid_core = fid_core;
diff --git a/drivers/net/ethernet/mellanox/mlxsw/spectrum_flow.c b/drivers/net/ethernet/mellanox/mlxsw/spectrum_flow.c
index 6e341b4a9805..f1b8d2868a22 100644
--- a/drivers/net/ethernet/mellanox/mlxsw/spectrum_flow.c
+++ b/drivers/net/ethernet/mellanox/mlxsw/spectrum_flow.c
@@ -14,7 +14,7 @@ mlxsw_sp_flow_block_create(struct mlxsw_sp *mlxsw_sp, struct net *net)
{
struct mlxsw_sp_flow_block *block;
- block = kzalloc_obj(*block, GFP_KERNEL);
+ block = kzalloc_obj(*block);
if (!block)
return NULL;
INIT_LIST_HEAD(&block->binding_list);
@@ -75,7 +75,7 @@ static int mlxsw_sp_flow_block_bind(struct mlxsw_sp *mlxsw_sp,
if (err)
return err;
- binding = kzalloc_obj(*binding, GFP_KERNEL);
+ binding = kzalloc_obj(*binding);
if (!binding) {
err = -ENOMEM;
goto err_binding_alloc;
diff --git a/drivers/net/ethernet/mellanox/mlxsw/spectrum_matchall.c b/drivers/net/ethernet/mellanox/mlxsw/spectrum_matchall.c
index a5fdc1a7555a..fefd39a96320 100644
--- a/drivers/net/ethernet/mellanox/mlxsw/spectrum_matchall.c
+++ b/drivers/net/ethernet/mellanox/mlxsw/spectrum_matchall.c
@@ -243,7 +243,7 @@ int mlxsw_sp_mall_replace(struct mlxsw_sp *mlxsw_sp,
return -EOPNOTSUPP;
}
- mall_entry = kzalloc_obj(*mall_entry, GFP_KERNEL);
+ mall_entry = kzalloc_obj(*mall_entry);
if (!mall_entry)
return -ENOMEM;
mall_entry->cookie = f->cookie;
diff --git a/drivers/net/ethernet/mellanox/mlxsw/spectrum_mr.c b/drivers/net/ethernet/mellanox/mlxsw/spectrum_mr.c
index 1ca8a15a9cb2..e700e9ac33b7 100644
--- a/drivers/net/ethernet/mellanox/mlxsw/spectrum_mr.c
+++ b/drivers/net/ethernet/mellanox/mlxsw/spectrum_mr.c
@@ -172,7 +172,7 @@ static int mlxsw_sp_mr_route_evif_link(struct mlxsw_sp_mr_route *mr_route,
{
struct mlxsw_sp_mr_route_vif_entry *rve;
- rve = kzalloc_obj(*rve, GFP_KERNEL);
+ rve = kzalloc_obj(*rve);
if (!rve)
return -ENOMEM;
rve->mr_route = mr_route;
@@ -305,7 +305,7 @@ mlxsw_sp_mr_route_create(struct mlxsw_sp_mr_table *mr_table,
int i;
/* Allocate and init a new route and fill it with parameters */
- mr_route = kzalloc_obj(*mr_route, GFP_KERNEL);
+ mr_route = kzalloc_obj(*mr_route);
if (!mr_route)
return ERR_PTR(-ENOMEM);
INIT_LIST_HEAD(&mr_route->evif_list);
diff --git a/drivers/net/ethernet/mellanox/mlxsw/spectrum_mr_tcam.c b/drivers/net/ethernet/mellanox/mlxsw/spectrum_mr_tcam.c
index f652630cbac1..34f8a6fabfe7 100644
--- a/drivers/net/ethernet/mellanox/mlxsw/spectrum_mr_tcam.c
+++ b/drivers/net/ethernet/mellanox/mlxsw/spectrum_mr_tcam.c
@@ -52,7 +52,7 @@ mlxsw_sp_mr_erif_sublist_create(struct mlxsw_sp *mlxsw_sp,
struct mlxsw_sp_mr_erif_sublist *erif_sublist;
int err;
- erif_sublist = kzalloc_obj(*erif_sublist, GFP_KERNEL);
+ erif_sublist = kzalloc_obj(*erif_sublist);
if (!erif_sublist)
return ERR_PTR(-ENOMEM);
err = mlxsw_sp_kvdl_alloc(mlxsw_sp, MLXSW_SP_KVDL_ENTRY_TYPE_MCRIGR,
diff --git a/drivers/net/ethernet/mellanox/mlxsw/spectrum_nve.c b/drivers/net/ethernet/mellanox/mlxsw/spectrum_nve.c
index 8068502c8c2b..874659d5eb97 100644
--- a/drivers/net/ethernet/mellanox/mlxsw/spectrum_nve.c
+++ b/drivers/net/ethernet/mellanox/mlxsw/spectrum_nve.c
@@ -216,7 +216,7 @@ mlxsw_sp_nve_mc_list_create(struct mlxsw_sp *mlxsw_sp,
struct mlxsw_sp_nve_mc_list *mc_list;
int err;
- mc_list = kmalloc_obj(*mc_list, GFP_KERNEL);
+ mc_list = kmalloc_obj(*mc_list);
if (!mc_list)
return ERR_PTR(-ENOMEM);
@@ -848,7 +848,7 @@ static int mlxsw_sp_nve_ipv6_ht_insert(struct mlxsw_sp *mlxsw_sp,
struct mlxsw_sp_nve *nve = mlxsw_sp->nve;
int err;
- ipv6_ht_node = kzalloc_obj(*ipv6_ht_node, GFP_KERNEL);
+ ipv6_ht_node = kzalloc_obj(*ipv6_ht_node);
if (!ipv6_ht_node)
return -ENOMEM;
@@ -1119,7 +1119,7 @@ int mlxsw_sp_nve_init(struct mlxsw_sp *mlxsw_sp)
struct mlxsw_sp_nve *nve;
int err;
- nve = kzalloc_obj(*mlxsw_sp->nve, GFP_KERNEL);
+ nve = kzalloc_obj(*mlxsw_sp->nve);
if (!nve)
return -ENOMEM;
mlxsw_sp->nve = nve;
diff --git a/drivers/net/ethernet/mellanox/mlxsw/spectrum_pgt.c b/drivers/net/ethernet/mellanox/mlxsw/spectrum_pgt.c
index 0b6269a40c5a..0cef30fafddd 100644
--- a/drivers/net/ethernet/mellanox/mlxsw/spectrum_pgt.c
+++ b/drivers/net/ethernet/mellanox/mlxsw/spectrum_pgt.c
@@ -116,7 +116,7 @@ mlxsw_sp_pgt_entry_create(struct mlxsw_sp_pgt *pgt, u16 mid, u16 smpe)
void *ret;
int err;
- pgt_entry = kzalloc_obj(*pgt_entry, GFP_KERNEL);
+ pgt_entry = kzalloc_obj(*pgt_entry);
if (!pgt_entry)
return ERR_PTR(-ENOMEM);
@@ -211,7 +211,7 @@ mlxsw_sp_pgt_entry_port_create(struct mlxsw_sp *mlxsw_sp,
struct mlxsw_sp_pgt_entry_port *pgt_entry_port;
int err;
- pgt_entry_port = kzalloc_obj(*pgt_entry_port, GFP_KERNEL);
+ pgt_entry_port = kzalloc_obj(*pgt_entry_port);
if (!pgt_entry_port)
return ERR_PTR(-ENOMEM);
@@ -315,7 +315,7 @@ int mlxsw_sp_pgt_init(struct mlxsw_sp *mlxsw_sp)
if (!MLXSW_CORE_RES_VALID(mlxsw_sp->core, PGT_SIZE))
return -EIO;
- pgt = kzalloc_obj(*mlxsw_sp->pgt, GFP_KERNEL);
+ pgt = kzalloc_obj(*mlxsw_sp->pgt);
if (!pgt)
return -ENOMEM;
diff --git a/drivers/net/ethernet/mellanox/mlxsw/spectrum_policer.c b/drivers/net/ethernet/mellanox/mlxsw/spectrum_policer.c
index a6d849c7bb3d..cbad1af0cd80 100644
--- a/drivers/net/ethernet/mellanox/mlxsw/spectrum_policer.c
+++ b/drivers/net/ethernet/mellanox/mlxsw/spectrum_policer.c
@@ -243,7 +243,7 @@ int mlxsw_sp_policer_add(struct mlxsw_sp *mlxsw_sp,
if (err)
return err;
- policer = kmalloc_obj(*policer, GFP_KERNEL);
+ policer = kmalloc_obj(*policer);
if (!policer)
return -ENOMEM;
policer->params = *params;
@@ -357,7 +357,7 @@ int mlxsw_sp_policers_init(struct mlxsw_sp *mlxsw_sp)
struct mlxsw_sp_policer_core *policer_core;
int i, err;
- policer_core = kzalloc_obj(*policer_core, GFP_KERNEL);
+ policer_core = kzalloc_obj(*policer_core);
if (!policer_core)
return -ENOMEM;
mlxsw_sp->policer_core = policer_core;
diff --git a/drivers/net/ethernet/mellanox/mlxsw/spectrum_port_range.c b/drivers/net/ethernet/mellanox/mlxsw/spectrum_port_range.c
index 4afcb32e7d14..a330d1c0c47c 100644
--- a/drivers/net/ethernet/mellanox/mlxsw/spectrum_port_range.c
+++ b/drivers/net/ethernet/mellanox/mlxsw/spectrum_port_range.c
@@ -52,7 +52,7 @@ mlxsw_sp_port_range_reg_create(struct mlxsw_sp *mlxsw_sp,
struct mlxsw_sp_port_range_reg *prr;
int err;
- prr = kzalloc_obj(*prr, GFP_KERNEL);
+ prr = kzalloc_obj(*prr);
if (!prr)
return ERR_PTR(-ENOMEM);
@@ -172,7 +172,7 @@ int mlxsw_sp_port_range_init(struct mlxsw_sp *mlxsw_sp)
*/
WARN_ON(max > BITS_PER_BYTE * sizeof(u16));
- pr_core = kzalloc_obj(*mlxsw_sp->pr_core, GFP_KERNEL);
+ pr_core = kzalloc_obj(*mlxsw_sp->pr_core);
if (!pr_core)
return -ENOMEM;
mlxsw_sp->pr_core = pr_core;
diff --git a/drivers/net/ethernet/mellanox/mlxsw/spectrum_ptp.c b/drivers/net/ethernet/mellanox/mlxsw/spectrum_ptp.c
index 4025b556b39c..9939749c47bc 100644
--- a/drivers/net/ethernet/mellanox/mlxsw/spectrum_ptp.c
+++ b/drivers/net/ethernet/mellanox/mlxsw/spectrum_ptp.c
@@ -277,7 +277,7 @@ mlxsw_sp1_ptp_clock_init(struct mlxsw_sp *mlxsw_sp, struct device *dev)
struct mlxsw_sp1_ptp_clock *clock;
int err;
- clock = kzalloc_obj(*clock, GFP_KERNEL);
+ clock = kzalloc_obj(*clock);
if (!clock)
return ERR_PTR(-ENOMEM);
@@ -446,7 +446,7 @@ mlxsw_sp2_ptp_clock_init(struct mlxsw_sp *mlxsw_sp, struct device *dev)
struct mlxsw_sp_ptp_clock *clock;
int err;
- clock = kzalloc_obj(*clock, GFP_KERNEL);
+ clock = kzalloc_obj(*clock);
if (!clock)
return ERR_PTR(-ENOMEM);
@@ -1032,7 +1032,7 @@ struct mlxsw_sp_ptp_state *mlxsw_sp1_ptp_init(struct mlxsw_sp *mlxsw_sp)
if (err)
return ERR_PTR(err);
- ptp_state = kzalloc_obj(*ptp_state, GFP_KERNEL);
+ ptp_state = kzalloc_obj(*ptp_state);
if (!ptp_state)
return ERR_PTR(-ENOMEM);
ptp_state->common.mlxsw_sp = mlxsw_sp;
@@ -1358,7 +1358,7 @@ struct mlxsw_sp_ptp_state *mlxsw_sp2_ptp_init(struct mlxsw_sp *mlxsw_sp)
if (!MLXSW_CORE_RES_VALID(mlxsw_sp->core, FID))
return ERR_PTR(-EIO);
- ptp_state = kzalloc_obj(*ptp_state, GFP_KERNEL);
+ ptp_state = kzalloc_obj(*ptp_state);
if (!ptp_state)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/net/ethernet/mellanox/mlxsw/spectrum_qdisc.c b/drivers/net/ethernet/mellanox/mlxsw/spectrum_qdisc.c
index 5e159b326100..a4df29aab39d 100644
--- a/drivers/net/ethernet/mellanox/mlxsw/spectrum_qdisc.c
+++ b/drivers/net/ethernet/mellanox/mlxsw/spectrum_qdisc.c
@@ -1332,7 +1332,7 @@ __mlxsw_sp_qdisc_ets_replace(struct mlxsw_sp_port *mlxsw_sp_port,
int err;
if (!ets_data) {
- ets_data = kzalloc_obj(*ets_data, GFP_KERNEL);
+ ets_data = kzalloc_obj(*ets_data);
if (!ets_data)
return -ENOMEM;
mlxsw_sp_qdisc->ets_data = ets_data;
@@ -2021,7 +2021,7 @@ static int mlxsw_sp_qevent_mall_replace(struct mlxsw_sp *mlxsw_sp,
return -EOPNOTSUPP;
}
- mall_entry = kzalloc_obj(*mall_entry, GFP_KERNEL);
+ mall_entry = kzalloc_obj(*mall_entry);
if (!mall_entry)
return -ENOMEM;
mall_entry->cookie = f->cookie;
@@ -2100,7 +2100,7 @@ static struct mlxsw_sp_qevent_block *mlxsw_sp_qevent_block_create(struct mlxsw_s
{
struct mlxsw_sp_qevent_block *qevent_block;
- qevent_block = kzalloc_obj(*qevent_block, GFP_KERNEL);
+ qevent_block = kzalloc_obj(*qevent_block);
if (!qevent_block)
return NULL;
@@ -2132,7 +2132,7 @@ mlxsw_sp_qevent_binding_create(struct mlxsw_sp_port *mlxsw_sp_port, u32 handle,
{
struct mlxsw_sp_qevent_binding *binding;
- binding = kzalloc_obj(*binding, GFP_KERNEL);
+ binding = kzalloc_obj(*binding);
if (!binding)
return ERR_PTR(-ENOMEM);
@@ -2321,7 +2321,7 @@ int mlxsw_sp_tc_qdisc_init(struct mlxsw_sp_port *mlxsw_sp_port)
{
struct mlxsw_sp_qdisc_state *qdisc_state;
- qdisc_state = kzalloc_obj(*qdisc_state, GFP_KERNEL);
+ qdisc_state = kzalloc_obj(*qdisc_state);
if (!qdisc_state)
return -ENOMEM;
diff --git a/drivers/net/ethernet/mellanox/mlxsw/spectrum_router.c b/drivers/net/ethernet/mellanox/mlxsw/spectrum_router.c
index 417431895268..1124f5feeb23 100644
--- a/drivers/net/ethernet/mellanox/mlxsw/spectrum_router.c
+++ b/drivers/net/ethernet/mellanox/mlxsw/spectrum_router.c
@@ -538,7 +538,7 @@ static struct mlxsw_sp_fib *mlxsw_sp_fib_create(struct mlxsw_sp *mlxsw_sp,
int err;
lpm_tree = mlxsw_sp->router->lpm.proto_trees[proto];
- fib = kzalloc_obj(*fib, GFP_KERNEL);
+ fib = kzalloc_obj(*fib);
if (!fib)
return ERR_PTR(-ENOMEM);
err = rhashtable_init(&fib->ht, &mlxsw_sp_fib_ht_params);
@@ -1095,7 +1095,7 @@ mlxsw_sp_crif_alloc(struct net_device *dev)
{
struct mlxsw_sp_crif *crif;
- crif = kzalloc_obj(*crif, GFP_KERNEL);
+ crif = kzalloc_obj(*crif);
if (!crif)
return NULL;
@@ -1178,7 +1178,7 @@ mlxsw_sp_ipip_entry_alloc(struct mlxsw_sp *mlxsw_sp,
int err;
ipip_ops = mlxsw_sp->router->ipip_ops_arr[ipipt];
- ipip_entry = kzalloc_obj(*ipip_entry, GFP_KERNEL);
+ ipip_entry = kzalloc_obj(*ipip_entry);
if (!ipip_entry)
return ERR_PTR(-ENOMEM);
@@ -2261,7 +2261,7 @@ mlxsw_sp_neigh_entry_alloc(struct mlxsw_sp *mlxsw_sp, struct neighbour *n,
{
struct mlxsw_sp_neigh_entry *neigh_entry;
- neigh_entry = kzalloc_obj(*neigh_entry, GFP_KERNEL);
+ neigh_entry = kzalloc_obj(*neigh_entry);
if (!neigh_entry)
return NULL;
@@ -3172,7 +3172,7 @@ mlxsw_sp_nexthop_counter_alloc(struct mlxsw_sp *mlxsw_sp)
struct mlxsw_sp_nexthop_counter *nhct;
int err;
- nhct = kzalloc_obj(*nhct, GFP_KERNEL);
+ nhct = kzalloc_obj(*nhct);
if (!nhct)
return ERR_PTR(-ENOMEM);
@@ -3404,7 +3404,7 @@ mlxsw_sp_nexthop_group_vr_entry_create(struct mlxsw_sp_nexthop_group *nh_grp,
struct mlxsw_sp_nexthop_group_vr_entry *vr_entry;
int err;
- vr_entry = kzalloc_obj(*vr_entry, GFP_KERNEL);
+ vr_entry = kzalloc_obj(*vr_entry);
if (!vr_entry)
return -ENOMEM;
@@ -5304,7 +5304,7 @@ mlxsw_sp_nexthop_obj_group_create(struct mlxsw_sp *mlxsw_sp,
struct mlxsw_sp_nexthop_group *nh_grp;
int err;
- nh_grp = kzalloc_obj(*nh_grp, GFP_KERNEL);
+ nh_grp = kzalloc_obj(*nh_grp);
if (!nh_grp)
return ERR_PTR(-ENOMEM);
INIT_LIST_HEAD(&nh_grp->vr_list);
@@ -5841,7 +5841,7 @@ mlxsw_sp_nexthop4_group_create(struct mlxsw_sp *mlxsw_sp, struct fib_info *fi)
struct mlxsw_sp_nexthop_group *nh_grp;
int err;
- nh_grp = kzalloc_obj(*nh_grp, GFP_KERNEL);
+ nh_grp = kzalloc_obj(*nh_grp);
if (!nh_grp)
return ERR_PTR(-ENOMEM);
INIT_LIST_HEAD(&nh_grp->vr_list);
@@ -6481,7 +6481,7 @@ mlxsw_sp_fib4_entry_create(struct mlxsw_sp *mlxsw_sp,
struct mlxsw_sp_fib_entry *fib_entry;
int err;
- fib4_entry = kzalloc_obj(*fib4_entry, GFP_KERNEL);
+ fib4_entry = kzalloc_obj(*fib4_entry);
if (!fib4_entry)
return ERR_PTR(-ENOMEM);
fib_entry = &fib4_entry->common;
@@ -6601,7 +6601,7 @@ mlxsw_sp_fib_node_create(struct mlxsw_sp_fib *fib, const void *addr,
{
struct mlxsw_sp_fib_node *fib_node;
- fib_node = kzalloc_obj(*fib_node, GFP_KERNEL);
+ fib_node = kzalloc_obj(*fib_node);
if (!fib_node)
return NULL;
@@ -6906,7 +6906,7 @@ static struct mlxsw_sp_rt6 *mlxsw_sp_rt6_create(struct fib6_info *rt)
{
struct mlxsw_sp_rt6 *mlxsw_sp_rt6;
- mlxsw_sp_rt6 = kzalloc_obj(*mlxsw_sp_rt6, GFP_KERNEL);
+ mlxsw_sp_rt6 = kzalloc_obj(*mlxsw_sp_rt6);
if (!mlxsw_sp_rt6)
return ERR_PTR(-ENOMEM);
@@ -7098,7 +7098,7 @@ mlxsw_sp_nexthop6_group_create(struct mlxsw_sp *mlxsw_sp,
struct mlxsw_sp_nexthop_group *nh_grp;
int err;
- nh_grp = kzalloc_obj(*nh_grp, GFP_KERNEL);
+ nh_grp = kzalloc_obj(*nh_grp);
if (!nh_grp)
return ERR_PTR(-ENOMEM);
INIT_LIST_HEAD(&nh_grp->vr_list);
@@ -7377,7 +7377,7 @@ mlxsw_sp_fib6_entry_create(struct mlxsw_sp *mlxsw_sp,
struct mlxsw_sp_rt6 *mlxsw_sp_rt6;
int err, i;
- fib6_entry = kzalloc_obj(*fib6_entry, GFP_KERNEL);
+ fib6_entry = kzalloc_obj(*fib6_entry);
if (!fib6_entry)
return ERR_PTR(-ENOMEM);
fib_entry = &fib6_entry->common;
@@ -8541,7 +8541,7 @@ mlxsw_sp_router_hwstats_notify_schedule(struct net_device *dev)
* later.
*/
- hws_work = kzalloc_obj(*hws_work, GFP_KERNEL);
+ hws_work = kzalloc_obj(*hws_work);
if (!hws_work)
return;
@@ -8946,7 +8946,7 @@ mlxsw_sp_rif_mac_profile_alloc(const char *mac)
{
struct mlxsw_sp_rif_mac_profile *profile;
- profile = kzalloc_obj(*profile, GFP_KERNEL);
+ profile = kzalloc_obj(*profile);
if (!profile)
return NULL;
@@ -11582,7 +11582,7 @@ int mlxsw_sp_router_init(struct mlxsw_sp *mlxsw_sp,
struct notifier_block *nb;
int err;
- router = kzalloc_obj(*mlxsw_sp->router, GFP_KERNEL);
+ router = kzalloc_obj(*mlxsw_sp->router);
if (!router)
return -ENOMEM;
mutex_init(&router->lock);
diff --git a/drivers/net/ethernet/mellanox/mlxsw/spectrum_span.c b/drivers/net/ethernet/mellanox/mlxsw/spectrum_span.c
index 79b0ed4e4c71..8ee83d35be9a 100644
--- a/drivers/net/ethernet/mellanox/mlxsw/spectrum_span.c
+++ b/drivers/net/ethernet/mellanox/mlxsw/spectrum_span.c
@@ -1120,7 +1120,7 @@ mlxsw_sp_span_analyzed_port_create(struct mlxsw_sp_span *span,
struct mlxsw_sp_span_analyzed_port *analyzed_port;
int err;
- analyzed_port = kzalloc_obj(*analyzed_port, GFP_KERNEL);
+ analyzed_port = kzalloc_obj(*analyzed_port);
if (!analyzed_port)
return ERR_PTR(-ENOMEM);
@@ -1505,7 +1505,7 @@ mlxsw_sp_span_trigger_entry_create(struct mlxsw_sp_span *span,
struct mlxsw_sp_span_trigger_entry *trigger_entry;
int err;
- trigger_entry = kzalloc_obj(*trigger_entry, GFP_KERNEL);
+ trigger_entry = kzalloc_obj(*trigger_entry);
if (!trigger_entry)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/net/ethernet/mellanox/mlxsw/spectrum_switchdev.c b/drivers/net/ethernet/mellanox/mlxsw/spectrum_switchdev.c
index 7c386ee2ea74..fe45e533a4b2 100644
--- a/drivers/net/ethernet/mellanox/mlxsw/spectrum_switchdev.c
+++ b/drivers/net/ethernet/mellanox/mlxsw/spectrum_switchdev.c
@@ -262,7 +262,7 @@ mlxsw_sp_bridge_device_create(struct mlxsw_sp_bridge *bridge,
return ERR_PTR(-EINVAL);
}
- bridge_device = kzalloc_obj(*bridge_device, GFP_KERNEL);
+ bridge_device = kzalloc_obj(*bridge_device);
if (!bridge_device)
return ERR_PTR(-ENOMEM);
@@ -478,7 +478,7 @@ mlxsw_sp_bridge_port_create(struct mlxsw_sp_bridge_device *bridge_device,
struct mlxsw_sp_port *mlxsw_sp_port;
int err;
- bridge_port = kzalloc_obj(*bridge_port, GFP_KERNEL);
+ bridge_port = kzalloc_obj(*bridge_port);
if (!bridge_port)
return ERR_PTR(-ENOMEM);
@@ -625,7 +625,7 @@ mlxsw_sp_bridge_vlan_create(struct mlxsw_sp_bridge_port *bridge_port, u16 vid)
{
struct mlxsw_sp_bridge_vlan *bridge_vlan;
- bridge_vlan = kzalloc_obj(*bridge_vlan, GFP_KERNEL);
+ bridge_vlan = kzalloc_obj(*bridge_vlan);
if (!bridge_vlan)
return NULL;
@@ -1131,7 +1131,7 @@ mlxsw_sp_mdb_entry_port_get(struct mlxsw_sp *mlxsw_sp,
if (err)
return ERR_PTR(err);
- mdb_entry_port = kzalloc_obj(*mdb_entry_port, GFP_KERNEL);
+ mdb_entry_port = kzalloc_obj(*mdb_entry_port);
if (!mdb_entry_port) {
err = -ENOMEM;
goto err_mdb_entry_port_alloc;
@@ -1195,7 +1195,7 @@ mlxsw_sp_mdb_entry_mrouter_port_get(struct mlxsw_sp *mlxsw_sp,
if (err)
return ERR_PTR(err);
- mdb_entry_port = kzalloc_obj(*mdb_entry_port, GFP_KERNEL);
+ mdb_entry_port = kzalloc_obj(*mdb_entry_port);
if (!mdb_entry_port) {
err = -ENOMEM;
goto err_mdb_entry_port_alloc;
@@ -2027,7 +2027,7 @@ mlxsw_sp_mc_mdb_entry_init(struct mlxsw_sp *mlxsw_sp,
struct mlxsw_sp_mdb_entry *mdb_entry;
int err;
- mdb_entry = kzalloc_obj(*mdb_entry, GFP_KERNEL);
+ mdb_entry = kzalloc_obj(*mdb_entry);
if (!mdb_entry)
return ERR_PTR(-ENOMEM);
@@ -4169,7 +4169,7 @@ int mlxsw_sp_switchdev_init(struct mlxsw_sp *mlxsw_sp)
{
struct mlxsw_sp_bridge *bridge;
- bridge = kzalloc_obj(*mlxsw_sp->bridge, GFP_KERNEL);
+ bridge = kzalloc_obj(*mlxsw_sp->bridge);
if (!bridge)
return -ENOMEM;
mlxsw_sp->bridge = bridge;
diff --git a/drivers/net/ethernet/micrel/ksz884x.c b/drivers/net/ethernet/micrel/ksz884x.c
index e594ea78b118..4b15fe4c30fb 100644
--- a/drivers/net/ethernet/micrel/ksz884x.c
+++ b/drivers/net/ethernet/micrel/ksz884x.c
@@ -6577,7 +6577,7 @@ static int pcidev_init(struct pci_dev *pdev, const struct pci_device_id *id)
result = -ENOMEM;
- info = kzalloc_obj(struct platform_info, GFP_KERNEL);
+ info = kzalloc_obj(struct platform_info);
if (!info)
goto pcidev_init_dev_err;
@@ -6630,7 +6630,7 @@ static int pcidev_init(struct pci_dev *pdev, const struct pci_device_id *id)
mib_port_count = SWITCH_PORT_NUM;
}
hw->mib_port_cnt = TOTAL_PORT_NUM;
- hw->ksz_switch = kzalloc_obj(struct ksz_switch, GFP_KERNEL);
+ hw->ksz_switch = kzalloc_obj(struct ksz_switch);
if (!hw->ksz_switch)
goto pcidev_init_alloc_err;
diff --git a/drivers/net/ethernet/microchip/lan743x_main.c b/drivers/net/ethernet/microchip/lan743x_main.c
index 7ab6ad877a3c..a3845edf0e48 100644
--- a/drivers/net/ethernet/microchip/lan743x_main.c
+++ b/drivers/net/ethernet/microchip/lan743x_main.c
@@ -2141,7 +2141,7 @@ static int lan743x_tx_ring_init(struct lan743x_tx *tx)
tx->ring_cpu_ptr = (struct lan743x_tx_descriptor *)cpu_ptr;
tx->ring_dma_ptr = dma_ptr;
- cpu_ptr = kzalloc_objs(*tx->buffer_info, tx->ring_size, GFP_KERNEL);
+ cpu_ptr = kzalloc_objs(*tx->buffer_info, tx->ring_size);
if (!cpu_ptr) {
ret = -ENOMEM;
goto cleanup;
@@ -2686,7 +2686,7 @@ static int lan743x_rx_ring_init(struct lan743x_rx *rx)
rx->ring_cpu_ptr = (struct lan743x_rx_descriptor *)cpu_ptr;
rx->ring_dma_ptr = dma_ptr;
- cpu_ptr = kzalloc_objs(*rx->buffer_info, rx->ring_size, GFP_KERNEL);
+ cpu_ptr = kzalloc_objs(*rx->buffer_info, rx->ring_size);
if (!cpu_ptr) {
ret = -ENOMEM;
goto cleanup;
diff --git a/drivers/net/ethernet/microchip/lan966x/lan966x_fdb.c b/drivers/net/ethernet/microchip/lan966x/lan966x_fdb.c
index cddd5dd35feb..95cbbe5b513a 100644
--- a/drivers/net/ethernet/microchip/lan966x/lan966x_fdb.c
+++ b/drivers/net/ethernet/microchip/lan966x/lan966x_fdb.c
@@ -46,7 +46,7 @@ static void lan966x_fdb_add_entry(struct lan966x *lan966x,
return;
}
- fdb_entry = kzalloc_obj(*fdb_entry, GFP_KERNEL);
+ fdb_entry = kzalloc_obj(*fdb_entry);
if (!fdb_entry)
return;
diff --git a/drivers/net/ethernet/microchip/lan966x/lan966x_mdb.c b/drivers/net/ethernet/microchip/lan966x/lan966x_mdb.c
index aef4bc288e05..a4722140675d 100644
--- a/drivers/net/ethernet/microchip/lan966x/lan966x_mdb.c
+++ b/drivers/net/ethernet/microchip/lan966x/lan966x_mdb.c
@@ -74,7 +74,7 @@ lan966x_mdb_entry_add(struct lan966x *lan966x,
{
struct lan966x_mdb_entry *mdb_entry;
- mdb_entry = kzalloc_obj(*mdb_entry, GFP_KERNEL);
+ mdb_entry = kzalloc_obj(*mdb_entry);
if (!mdb_entry)
return ERR_PTR(-ENOMEM);
@@ -184,7 +184,7 @@ lan966x_pgid_entry_add(struct lan966x *lan966x, int index, u16 ports)
{
struct lan966x_pgid_entry *pgid_entry;
- pgid_entry = kzalloc_obj(*pgid_entry, GFP_KERNEL);
+ pgid_entry = kzalloc_obj(*pgid_entry);
if (!pgid_entry)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/net/ethernet/microchip/lan966x/lan966x_vcap_impl.c b/drivers/net/ethernet/microchip/lan966x/lan966x_vcap_impl.c
index cb07178f55fa..72e3b189bac5 100644
--- a/drivers/net/ethernet/microchip/lan966x/lan966x_vcap_impl.c
+++ b/drivers/net/ethernet/microchip/lan966x/lan966x_vcap_impl.c
@@ -611,7 +611,7 @@ lan966x_vcap_admin_alloc(struct lan966x *lan966x, struct vcap_control *ctrl,
{
struct vcap_admin *admin;
- admin = kzalloc_obj(*admin, GFP_KERNEL);
+ admin = kzalloc_obj(*admin);
if (!admin)
return ERR_PTR(-ENOMEM);
@@ -712,7 +712,7 @@ int lan966x_vcap_init(struct lan966x *lan966x)
struct vcap_admin *admin;
struct dentry *dir;
- ctrl = kzalloc_obj(*ctrl, GFP_KERNEL);
+ ctrl = kzalloc_obj(*ctrl);
if (!ctrl)
return -ENOMEM;
diff --git a/drivers/net/ethernet/microchip/sparx5/lan969x/lan969x_fdma.c b/drivers/net/ethernet/microchip/sparx5/lan969x/lan969x_fdma.c
index 57a24cbfb398..c7e0e58ff0f7 100644
--- a/drivers/net/ethernet/microchip/sparx5/lan969x/lan969x_fdma.c
+++ b/drivers/net/ethernet/microchip/sparx5/lan969x/lan969x_fdma.c
@@ -186,7 +186,7 @@ static int lan969x_fdma_tx_alloc(struct sparx5 *sparx5)
struct fdma *fdma = &tx->fdma;
int err;
- tx->dbs = kzalloc_objs(struct sparx5_tx_buf, fdma->n_dcbs, GFP_KERNEL);
+ tx->dbs = kzalloc_objs(struct sparx5_tx_buf, fdma->n_dcbs);
if (!tx->dbs)
return -ENOMEM;
diff --git a/drivers/net/ethernet/microchip/sparx5/sparx5_calendar.c b/drivers/net/ethernet/microchip/sparx5/sparx5_calendar.c
index 19321de0712e..8c67ff1d411b 100644
--- a/drivers/net/ethernet/microchip/sparx5/sparx5_calendar.c
+++ b/drivers/net/ethernet/microchip/sparx5/sparx5_calendar.c
@@ -585,7 +585,7 @@ int sparx5_config_dsm_calendar(struct sparx5 *sparx5)
struct sparx5_calendar_data *data;
int err = 0;
- data = kzalloc_obj(*data, GFP_KERNEL);
+ data = kzalloc_obj(*data);
if (!data)
return -ENOMEM;
diff --git a/drivers/net/ethernet/microchip/sparx5/sparx5_switchdev.c b/drivers/net/ethernet/microchip/sparx5/sparx5_switchdev.c
index 6743c5ef3efd..644458108dd2 100644
--- a/drivers/net/ethernet/microchip/sparx5/sparx5_switchdev.c
+++ b/drivers/net/ethernet/microchip/sparx5/sparx5_switchdev.c
@@ -465,7 +465,7 @@ static int sparx5_alloc_mdb_entry(struct sparx5 *sparx5,
u16 pgid_idx;
int err;
- entry = kzalloc_obj(*entry, GFP_KERNEL);
+ entry = kzalloc_obj(*entry);
if (!entry)
return -ENOMEM;
diff --git a/drivers/net/ethernet/microchip/sparx5/sparx5_tc_flower.c b/drivers/net/ethernet/microchip/sparx5/sparx5_tc_flower.c
index 57d88fe32752..f779a5c00803 100644
--- a/drivers/net/ethernet/microchip/sparx5/sparx5_tc_flower.c
+++ b/drivers/net/ethernet/microchip/sparx5/sparx5_tc_flower.c
@@ -1464,7 +1464,7 @@ static int sparx5_tc_flower_template_create(struct net_device *ndev,
return -EBUSY;
}
- ftp = kzalloc_obj(*ftp, GFP_KERNEL);
+ ftp = kzalloc_obj(*ftp);
if (!ftp)
return -ENOMEM;
diff --git a/drivers/net/ethernet/microchip/sparx5/sparx5_tc_matchall.c b/drivers/net/ethernet/microchip/sparx5/sparx5_tc_matchall.c
index cd0f44a6c88e..702257979462 100644
--- a/drivers/net/ethernet/microchip/sparx5/sparx5_tc_matchall.c
+++ b/drivers/net/ethernet/microchip/sparx5/sparx5_tc_matchall.c
@@ -60,7 +60,7 @@ static int sparx5_tc_matchall_replace(struct net_device *ndev,
}
action = &tmo->rule->action.entries[0];
- mall_entry = kzalloc_obj(*mall_entry, GFP_KERNEL);
+ mall_entry = kzalloc_obj(*mall_entry);
if (!mall_entry)
return -ENOMEM;
diff --git a/drivers/net/ethernet/microchip/sparx5/sparx5_vcap_impl.c b/drivers/net/ethernet/microchip/sparx5/sparx5_vcap_impl.c
index 4bf3be00d627..3d64a0448d43 100644
--- a/drivers/net/ethernet/microchip/sparx5/sparx5_vcap_impl.c
+++ b/drivers/net/ethernet/microchip/sparx5/sparx5_vcap_impl.c
@@ -1944,7 +1944,7 @@ sparx5_vcap_admin_alloc(struct sparx5 *sparx5, struct vcap_control *ctrl,
{
struct vcap_admin *admin;
- admin = kzalloc_obj(*admin, GFP_KERNEL);
+ admin = kzalloc_obj(*admin);
if (!admin)
return ERR_PTR(-ENOMEM);
INIT_LIST_HEAD(&admin->list);
@@ -2047,7 +2047,7 @@ int sparx5_vcap_init(struct sparx5 *sparx5)
* - Initialize VCAP blocks
* - Configure port keysets
*/
- ctrl = kzalloc_obj(*ctrl, GFP_KERNEL);
+ ctrl = kzalloc_obj(*ctrl);
if (!ctrl)
return -ENOMEM;
diff --git a/drivers/net/ethernet/microchip/vcap/vcap_api.c b/drivers/net/ethernet/microchip/vcap/vcap_api.c
index 29fe5101db4c..0fdb5e363bad 100644
--- a/drivers/net/ethernet/microchip/vcap/vcap_api.c
+++ b/drivers/net/ethernet/microchip/vcap/vcap_api.c
@@ -1004,7 +1004,7 @@ static struct vcap_rule_internal *vcap_dup_rule(struct vcap_rule_internal *ri,
struct vcap_rule_internal *duprule;
/* Allocate the client part */
- duprule = kzalloc_obj(*duprule, GFP_KERNEL);
+ duprule = kzalloc_obj(*duprule);
if (!duprule)
return ERR_PTR(-ENOMEM);
*duprule = *ri;
@@ -1309,7 +1309,7 @@ static void vcap_rule_alloc_keyfield(struct vcap_rule_internal *ri,
{
struct vcap_client_keyfield *field;
- field = kzalloc_obj(*field, GFP_KERNEL);
+ field = kzalloc_obj(*field);
if (!field)
return;
INIT_LIST_HEAD(&field->ctrl.list);
@@ -1418,7 +1418,7 @@ static void vcap_rule_alloc_actionfield(struct vcap_rule_internal *ri,
{
struct vcap_client_actionfield *field;
- field = kzalloc_obj(*field, GFP_KERNEL);
+ field = kzalloc_obj(*field);
if (!field)
return;
INIT_LIST_HEAD(&field->ctrl.list);
@@ -2345,7 +2345,7 @@ struct vcap_rule *vcap_alloc_rule(struct vcap_control *vctrl,
}
/* Create a container for the rule and return it */
- ri = kzalloc_obj(*ri, GFP_KERNEL);
+ ri = kzalloc_obj(*ri);
if (!ri) {
err = -ENOMEM;
goto out_unlock;
@@ -2689,7 +2689,7 @@ static int vcap_rule_add_key(struct vcap_rule *rule,
return -EINVAL;
}
- field = kzalloc_obj(*field, GFP_KERNEL);
+ field = kzalloc_obj(*field);
if (!field)
return -ENOMEM;
memcpy(&field->data, data, sizeof(field->data));
@@ -2857,7 +2857,7 @@ static int vcap_rule_add_action(struct vcap_rule *rule,
return -EINVAL;
}
- field = kzalloc_obj(*field, GFP_KERNEL);
+ field = kzalloc_obj(*field);
if (!field)
return -ENOMEM;
memcpy(&field->data, data, sizeof(field->data));
@@ -3125,7 +3125,7 @@ static int vcap_enable(struct vcap_control *vctrl, struct net_device *ndev,
if (!admin)
return -ENOENT;
- eport = kzalloc_obj(*eport, GFP_KERNEL);
+ eport = kzalloc_obj(*eport);
if (!eport)
return -ENOMEM;
diff --git a/drivers/net/ethernet/microchip/vcap/vcap_api_kunit.c b/drivers/net/ethernet/microchip/vcap/vcap_api_kunit.c
index c57919278783..ce26ccbdccdf 100644
--- a/drivers/net/ethernet/microchip/vcap/vcap_api_kunit.c
+++ b/drivers/net/ethernet/microchip/vcap/vcap_api_kunit.c
@@ -2037,7 +2037,7 @@ static void vcap_api_filter_unsupported_keys_test(struct kunit *test)
/* Add all keys to the rule */
INIT_LIST_HEAD(&ri.data.keyfields);
for (idx = 0; idx < ARRAY_SIZE(keylist); idx++) {
- ckf = kzalloc_obj(*ckf, GFP_KERNEL);
+ ckf = kzalloc_obj(*ckf);
if (ckf) {
ckf->ctrl.key = keylist[idx];
list_add_tail(&ckf->ctrl.list, &ri.data.keyfields);
@@ -2161,7 +2161,7 @@ static void vcap_api_filter_keylist_test(struct kunit *test)
/* Add all keys to the rule */
INIT_LIST_HEAD(&ri.data.keyfields);
for (idx = 0; idx < ARRAY_SIZE(keylist); idx++) {
- ckf = kzalloc_obj(*ckf, GFP_KERNEL);
+ ckf = kzalloc_obj(*ckf);
if (ckf) {
ckf->ctrl.key = keylist[idx];
list_add_tail(&ckf->ctrl.list, &ri.data.keyfields);
diff --git a/drivers/net/ethernet/microsoft/mana/gdma_main.c b/drivers/net/ethernet/microsoft/mana/gdma_main.c
index dc7c29240cac..f5deed37567b 100644
--- a/drivers/net/ethernet/microsoft/mana/gdma_main.c
+++ b/drivers/net/ethernet/microsoft/mana/gdma_main.c
@@ -923,7 +923,7 @@ int mana_gd_create_hwc_queue(struct gdma_dev *gd,
struct gdma_queue *queue;
int err;
- queue = kzalloc_obj(*queue, GFP_KERNEL);
+ queue = kzalloc_obj(*queue);
if (!queue)
return -ENOMEM;
@@ -1062,7 +1062,7 @@ int mana_gd_create_mana_eq(struct gdma_dev *gd,
if (spec->type != GDMA_EQ)
return -EINVAL;
- queue = kzalloc_obj(*queue, GFP_KERNEL);
+ queue = kzalloc_obj(*queue);
if (!queue)
return -ENOMEM;
@@ -1115,7 +1115,7 @@ int mana_gd_create_mana_wq_cq(struct gdma_dev *gd,
spec->type != GDMA_RQ)
return -EINVAL;
- queue = kzalloc_obj(*queue, GFP_KERNEL);
+ queue = kzalloc_obj(*queue);
if (!queue)
return -ENOMEM;
@@ -1625,7 +1625,7 @@ static int mana_gd_setup_dyn_irqs(struct pci_dev *pdev, int nvec)
bool skip_first_cpu = false;
int *irqs, irq, err, i;
- irqs = kmalloc_objs(int, nvec, GFP_KERNEL);
+ irqs = kmalloc_objs(int, nvec);
if (!irqs)
return -ENOMEM;
@@ -1636,7 +1636,7 @@ static int mana_gd_setup_dyn_irqs(struct pci_dev *pdev, int nvec)
* further used in irq_setup()
*/
for (i = 1; i <= nvec; i++) {
- gic = kzalloc_obj(*gic, GFP_KERNEL);
+ gic = kzalloc_obj(*gic);
if (!gic) {
err = -ENOMEM;
goto free_irq;
@@ -1707,14 +1707,14 @@ static int mana_gd_setup_irqs(struct pci_dev *pdev, int nvec)
unsigned int cpu;
int err, i;
- irqs = kmalloc_objs(int, nvec, GFP_KERNEL);
+ irqs = kmalloc_objs(int, nvec);
if (!irqs)
return -ENOMEM;
start_irqs = irqs;
for (i = 0; i < nvec; i++) {
- gic = kzalloc_obj(*gic, GFP_KERNEL);
+ gic = kzalloc_obj(*gic);
if (!gic) {
err = -ENOMEM;
goto free_irq;
@@ -2071,7 +2071,7 @@ static int mana_gd_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
dev_info(&pdev->dev, "Start MANA recovery mode\n");
- dev = kzalloc_obj(*dev, GFP_KERNEL);
+ dev = kzalloc_obj(*dev);
if (!dev)
return err;
diff --git a/drivers/net/ethernet/microsoft/mana/hw_channel.c b/drivers/net/ethernet/microsoft/mana/hw_channel.c
index f2221e65a6a3..9ee0f7f110dd 100644
--- a/drivers/net/ethernet/microsoft/mana/hw_channel.c
+++ b/drivers/net/ethernet/microsoft/mana/hw_channel.c
@@ -407,7 +407,7 @@ static int mana_hwc_create_cq(struct hw_channel_context *hwc, u16 q_depth,
if (cq_size < MANA_MIN_QSIZE)
cq_size = MANA_MIN_QSIZE;
- hwc_cq = kzalloc_obj(*hwc_cq, GFP_KERNEL);
+ hwc_cq = kzalloc_obj(*hwc_cq);
if (!hwc_cq)
return -ENOMEM;
@@ -426,7 +426,7 @@ static int mana_hwc_create_cq(struct hw_channel_context *hwc, u16 q_depth,
}
hwc_cq->gdma_cq = cq;
- comp_buf = kzalloc_objs(*comp_buf, q_depth, GFP_KERNEL);
+ comp_buf = kzalloc_objs(*comp_buf, q_depth);
if (!comp_buf) {
err = -ENOMEM;
goto out;
@@ -539,7 +539,7 @@ static int mana_hwc_create_wq(struct hw_channel_context *hwc,
if (queue_size < MANA_MIN_QSIZE)
queue_size = MANA_MIN_QSIZE;
- hwc_wq = kzalloc_obj(*hwc_wq, GFP_KERNEL);
+ hwc_wq = kzalloc_obj(*hwc_wq);
if (!hwc_wq)
return -ENOMEM;
@@ -644,7 +644,7 @@ static int mana_hwc_test_channel(struct hw_channel_context *hwc, u16 q_depth,
return err;
}
- ctx = kzalloc_objs(*ctx, q_depth, GFP_KERNEL);
+ ctx = kzalloc_objs(*ctx, q_depth);
if (!ctx)
return -ENOMEM;
@@ -750,7 +750,7 @@ int mana_hwc_create_channel(struct gdma_context *gc)
u16 q_depth_max;
int err;
- hwc = kzalloc_obj(*hwc, GFP_KERNEL);
+ hwc = kzalloc_obj(*hwc);
if (!hwc)
return -ENOMEM;
diff --git a/drivers/net/ethernet/microsoft/mana/mana_en.c b/drivers/net/ethernet/microsoft/mana/mana_en.c
index 5c9704f2041a..dad52eaa152f 100644
--- a/drivers/net/ethernet/microsoft/mana/mana_en.c
+++ b/drivers/net/ethernet/microsoft/mana/mana_en.c
@@ -803,7 +803,7 @@ int mana_pre_alloc_rxbufs(struct mana_port_context *mpc, int new_mtu, int num_qu
if (!mpc->rxbufs_pre)
goto error;
- mpc->das_pre = kmalloc_objs(dma_addr_t, num_rxb, GFP_KERNEL);
+ mpc->das_pre = kmalloc_objs(dma_addr_t, num_rxb);
if (!mpc->das_pre)
goto error;
@@ -995,7 +995,7 @@ static void mana_cleanup_indir_table(struct mana_port_context *apc)
static int mana_init_port_context(struct mana_port_context *apc)
{
- apc->rxqs = kzalloc_objs(struct mana_rxq *, apc->num_queues, GFP_KERNEL);
+ apc->rxqs = kzalloc_objs(struct mana_rxq *, apc->num_queues);
return !apc->rxqs ? -ENOMEM : 0;
}
@@ -1632,7 +1632,7 @@ static int mana_create_eq(struct mana_context *ac)
int err;
int i;
- ac->eqs = kzalloc_objs(struct mana_eq, gc->max_num_queues, GFP_KERNEL);
+ ac->eqs = kzalloc_objs(struct mana_eq, gc->max_num_queues);
if (!ac->eqs)
return -ENOMEM;
@@ -3415,7 +3415,7 @@ static int add_adev(struct gdma_dev *gd, const char *name)
struct mana_adev *madev;
int ret;
- madev = kzalloc_obj(*madev, GFP_KERNEL);
+ madev = kzalloc_obj(*madev);
if (!madev)
return -ENOMEM;
@@ -3559,7 +3559,7 @@ int mana_probe(struct gdma_dev *gd, bool resuming)
return err;
if (!resuming) {
- ac = kzalloc_obj(*ac, GFP_KERNEL);
+ ac = kzalloc_obj(*ac);
if (!ac)
return -ENOMEM;
diff --git a/drivers/net/ethernet/mscc/ocelot.c b/drivers/net/ethernet/mscc/ocelot.c
index a572170506cb..67ecd0e91002 100644
--- a/drivers/net/ethernet/mscc/ocelot.c
+++ b/drivers/net/ethernet/mscc/ocelot.c
@@ -576,7 +576,7 @@ static int ocelot_update_vlan_reclassify_rule(struct ocelot *ocelot, int port)
}
/* Filter doesn't exist, create it */
- filter = kzalloc_obj(*filter, GFP_KERNEL);
+ filter = kzalloc_obj(*filter);
if (!filter)
return -ENOMEM;
@@ -682,7 +682,7 @@ static int ocelot_vlan_member_add(struct ocelot *ocelot, int port, u16 vid,
return 0;
}
- vlan = kzalloc_obj(*vlan, GFP_KERNEL);
+ vlan = kzalloc_obj(*vlan);
if (!vlan)
return -ENOMEM;
@@ -1664,7 +1664,7 @@ int ocelot_trap_add(struct ocelot *ocelot, int port,
trap = ocelot_vcap_block_find_filter_by_id(block_vcap_is2, cookie,
false);
if (!trap) {
- trap = kzalloc_obj(*trap, GFP_KERNEL);
+ trap = kzalloc_obj(*trap);
if (!trap)
return -ENOMEM;
@@ -2046,7 +2046,7 @@ static struct ocelot_pgid *ocelot_pgid_alloc(struct ocelot *ocelot, int index,
{
struct ocelot_pgid *pgid;
- pgid = kzalloc_obj(*pgid, GFP_KERNEL);
+ pgid = kzalloc_obj(*pgid);
if (!pgid)
return ERR_PTR(-ENOMEM);
@@ -2563,7 +2563,7 @@ int ocelot_lag_fdb_add(struct ocelot *ocelot, struct net_device *bond,
struct ocelot_lag_fdb *fdb;
int lag, err;
- fdb = kzalloc_obj(*fdb, GFP_KERNEL);
+ fdb = kzalloc_obj(*fdb);
if (!fdb)
return -ENOMEM;
@@ -2894,7 +2894,7 @@ struct ocelot_mirror *ocelot_mirror_get(struct ocelot *ocelot, int to,
return m;
}
- m = kzalloc_obj(*m, GFP_KERNEL);
+ m = kzalloc_obj(*m);
if (!m)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/net/ethernet/mscc/ocelot_flower.c b/drivers/net/ethernet/mscc/ocelot_flower.c
index 4fccc8adad56..844292eb7422 100644
--- a/drivers/net/ethernet/mscc/ocelot_flower.c
+++ b/drivers/net/ethernet/mscc/ocelot_flower.c
@@ -833,7 +833,7 @@ static struct ocelot_vcap_filter
{
struct ocelot_vcap_filter *filter;
- filter = kzalloc_obj(*filter, GFP_KERNEL);
+ filter = kzalloc_obj(*filter);
if (!filter)
return NULL;
diff --git a/drivers/net/ethernet/mscc/ocelot_mrp.c b/drivers/net/ethernet/mscc/ocelot_mrp.c
index 04ae7a156f22..51e0157c4dac 100644
--- a/drivers/net/ethernet/mscc/ocelot_mrp.c
+++ b/drivers/net/ethernet/mscc/ocelot_mrp.c
@@ -54,7 +54,7 @@ static int ocelot_mrp_redirect_add_vcap(struct ocelot *ocelot, int src_port,
struct ocelot_vcap_filter *filter;
int err;
- filter = kzalloc_obj(*filter, GFP_KERNEL);
+ filter = kzalloc_obj(*filter);
if (!filter)
return -ENOMEM;
diff --git a/drivers/net/ethernet/mscc/ocelot_vcap.c b/drivers/net/ethernet/mscc/ocelot_vcap.c
index ec193ed18050..25e533e91d71 100644
--- a/drivers/net/ethernet/mscc/ocelot_vcap.c
+++ b/drivers/net/ethernet/mscc/ocelot_vcap.c
@@ -910,7 +910,7 @@ int ocelot_vcap_policer_add(struct ocelot *ocelot, u32 pol_ix,
return 0;
}
- tmp = kzalloc_obj(*tmp, GFP_KERNEL);
+ tmp = kzalloc_obj(*tmp);
if (!tmp)
return -ENOMEM;
diff --git a/drivers/net/ethernet/netronome/nfp/abm/cls.c b/drivers/net/ethernet/netronome/nfp/abm/cls.c
index 5cb4bb03b2a5..f7894c415a2f 100644
--- a/drivers/net/ethernet/netronome/nfp/abm/cls.c
+++ b/drivers/net/ethernet/netronome/nfp/abm/cls.c
@@ -203,7 +203,7 @@ nfp_abm_u32_knode_replace(struct nfp_abm_link *alink,
}
if (!match) {
- match = kzalloc_obj(*match, GFP_KERNEL);
+ match = kzalloc_obj(*match);
if (!match)
return -ENOMEM;
list_add(&match->list, &alink->dscp_map);
diff --git a/drivers/net/ethernet/netronome/nfp/abm/main.c b/drivers/net/ethernet/netronome/nfp/abm/main.c
index b4c85bb0f787..9b6bda523191 100644
--- a/drivers/net/ethernet/netronome/nfp/abm/main.c
+++ b/drivers/net/ethernet/netronome/nfp/abm/main.c
@@ -317,7 +317,7 @@ nfp_abm_vnic_alloc(struct nfp_app *app, struct nfp_net *nn, unsigned int id)
struct nfp_abm_link *alink;
int err;
- alink = kzalloc_obj(*alink, GFP_KERNEL);
+ alink = kzalloc_obj(*alink);
if (!alink)
return -ENOMEM;
nn->app_priv = alink;
@@ -461,7 +461,7 @@ static int nfp_abm_init(struct nfp_app *app)
return -EINVAL;
}
- abm = kzalloc_obj(*abm, GFP_KERNEL);
+ abm = kzalloc_obj(*abm);
if (!abm)
return -ENOMEM;
app->priv = abm;
diff --git a/drivers/net/ethernet/netronome/nfp/abm/qdisc.c b/drivers/net/ethernet/netronome/nfp/abm/qdisc.c
index a030b59901c9..900d416bcf8b 100644
--- a/drivers/net/ethernet/netronome/nfp/abm/qdisc.c
+++ b/drivers/net/ethernet/netronome/nfp/abm/qdisc.c
@@ -344,7 +344,7 @@ nfp_abm_qdisc_alloc(struct net_device *netdev, struct nfp_abm_link *alink,
struct nfp_qdisc *qdisc;
int err;
- qdisc = kzalloc_obj(*qdisc, GFP_KERNEL);
+ qdisc = kzalloc_obj(*qdisc);
if (!qdisc)
return NULL;
diff --git a/drivers/net/ethernet/netronome/nfp/bpf/main.c b/drivers/net/ethernet/netronome/nfp/bpf/main.c
index d9591ca44a8f..608c1bcaa641 100644
--- a/drivers/net/ethernet/netronome/nfp/bpf/main.c
+++ b/drivers/net/ethernet/netronome/nfp/bpf/main.c
@@ -76,7 +76,7 @@ nfp_bpf_vnic_alloc(struct nfp_app *app, struct nfp_net *nn, unsigned int id)
return -EINVAL;
}
- bv = kzalloc_obj(*bv, GFP_KERNEL);
+ bv = kzalloc_obj(*bv);
if (!bv)
return -ENOMEM;
nn->app_priv = bv;
@@ -458,7 +458,7 @@ static int nfp_bpf_init(struct nfp_app *app)
struct nfp_app_bpf *bpf;
int err;
- bpf = kzalloc_obj(*bpf, GFP_KERNEL);
+ bpf = kzalloc_obj(*bpf);
if (!bpf)
return -ENOMEM;
bpf->app = app;
diff --git a/drivers/net/ethernet/netronome/nfp/bpf/offload.c b/drivers/net/ethernet/netronome/nfp/bpf/offload.c
index 2b22725fb8a6..1fcd53af4479 100644
--- a/drivers/net/ethernet/netronome/nfp/bpf/offload.c
+++ b/drivers/net/ethernet/netronome/nfp/bpf/offload.c
@@ -48,7 +48,7 @@ nfp_map_ptr_record(struct nfp_app_bpf *bpf, struct nfp_prog *nfp_prog,
*/
bpf_map_inc(map);
- record = kmalloc_obj(*record, GFP_KERNEL);
+ record = kmalloc_obj(*record);
if (!record) {
err = -ENOMEM;
goto err_map_put;
@@ -154,7 +154,7 @@ nfp_prog_prepare(struct nfp_prog *nfp_prog, const struct bpf_insn *prog,
unsigned int i;
for (i = 0; i < cnt; i++) {
- meta = kzalloc_obj(*meta, GFP_KERNEL);
+ meta = kzalloc_obj(*meta);
if (!meta)
return -ENOMEM;
@@ -192,7 +192,7 @@ static int nfp_bpf_verifier_prep(struct bpf_prog *prog)
struct nfp_prog *nfp_prog;
int ret;
- nfp_prog = kzalloc_obj(*nfp_prog, GFP_KERNEL);
+ nfp_prog = kzalloc_obj(*nfp_prog);
if (!nfp_prog)
return -ENOMEM;
prog->aux->offload->dev_priv = nfp_prog;
diff --git a/drivers/net/ethernet/netronome/nfp/flower/conntrack.c b/drivers/net/ethernet/netronome/nfp/flower/conntrack.c
index 178184a68816..c983e8b1799d 100644
--- a/drivers/net/ethernet/netronome/nfp/flower/conntrack.c
+++ b/drivers/net/ethernet/netronome/nfp/flower/conntrack.c
@@ -1355,7 +1355,7 @@ nfp_fl_ct_zone_entry *get_nfp_zone_entry(struct nfp_flower_priv *priv,
if (IS_ERR(zt) || zt->priv)
return zt;
} else {
- zt = kzalloc_obj(*zt, GFP_KERNEL);
+ zt = kzalloc_obj(*zt);
if (!zt)
return ERR_PTR(-ENOMEM);
}
@@ -1487,7 +1487,7 @@ nfp_fl_ct_flow_entry *nfp_fl_ct_add_flow(struct nfp_fl_ct_zone_entry *zt,
struct flow_action_entry *act;
int err, i;
- entry = kzalloc_obj(*entry, GFP_KERNEL);
+ entry = kzalloc_obj(*entry);
if (!entry)
return ERR_PTR(-ENOMEM);
@@ -1501,7 +1501,7 @@ nfp_fl_ct_flow_entry *nfp_fl_ct_add_flow(struct nfp_fl_ct_zone_entry *zt,
* to do a full copy instead of just a reference.
*/
if (is_nft) {
- nft_match = kzalloc_obj(*nft_match, GFP_KERNEL);
+ nft_match = kzalloc_obj(*nft_match);
if (!nft_match) {
err = -ENOMEM;
goto err_pre_ct_act;
diff --git a/drivers/net/ethernet/netronome/nfp/flower/lag_conf.c b/drivers/net/ethernet/netronome/nfp/flower/lag_conf.c
index 9b78cc9600fe..1c61d4a83e8b 100644
--- a/drivers/net/ethernet/netronome/nfp/flower/lag_conf.c
+++ b/drivers/net/ethernet/netronome/nfp/flower/lag_conf.c
@@ -119,7 +119,7 @@ nfp_fl_lag_group_create(struct nfp_fl_lag *lag, struct net_device *master)
return ERR_PTR(id);
}
- group = kmalloc_obj(*group, GFP_KERNEL);
+ group = kmalloc_obj(*group);
if (!group) {
ida_free(&lag->ida_handle, id);
return ERR_PTR(-ENOMEM);
diff --git a/drivers/net/ethernet/netronome/nfp/flower/main.c b/drivers/net/ethernet/netronome/nfp/flower/main.c
index 4677183322bc..5c5fc640d65b 100644
--- a/drivers/net/ethernet/netronome/nfp/flower/main.c
+++ b/drivers/net/ethernet/netronome/nfp/flower/main.c
@@ -182,7 +182,7 @@ nfp_flower_non_repr_priv_get(struct nfp_app *app, struct net_device *netdev)
if (entry)
goto inc_ref;
- entry = kzalloc_obj(*entry, GFP_KERNEL);
+ entry = kzalloc_obj(*entry);
if (!entry)
return NULL;
@@ -406,7 +406,7 @@ nfp_flower_spawn_vnic_reprs(struct nfp_app *app,
goto err_reprs_clean;
}
- repr_priv = kzalloc_obj(*repr_priv, GFP_KERNEL);
+ repr_priv = kzalloc_obj(*repr_priv);
if (!repr_priv) {
err = -ENOMEM;
nfp_repr_free(repr);
@@ -524,7 +524,7 @@ nfp_flower_spawn_phy_reprs(struct nfp_app *app, struct nfp_flower_priv *priv)
goto err_reprs_clean;
}
- repr_priv = kzalloc_obj(*repr_priv, GFP_KERNEL);
+ repr_priv = kzalloc_obj(*repr_priv);
if (!repr_priv) {
err = -ENOMEM;
nfp_repr_free(repr);
diff --git a/drivers/net/ethernet/netronome/nfp/flower/metadata.c b/drivers/net/ethernet/netronome/nfp/flower/metadata.c
index fbb858a5324b..ca9e5dab2ec7 100644
--- a/drivers/net/ethernet/netronome/nfp/flower/metadata.c
+++ b/drivers/net/ethernet/netronome/nfp/flower/metadata.c
@@ -214,7 +214,7 @@ nfp_add_mask_table(struct nfp_app *app, char *mask_data, u32 mask_len)
if (nfp_mask_alloc(app, &mask_id))
return -ENOENT;
- mask_entry = kmalloc_obj(*mask_entry, GFP_KERNEL);
+ mask_entry = kmalloc_obj(*mask_entry);
if (!mask_entry) {
nfp_release_mask_id(app, mask_id);
return -ENOMEM;
@@ -324,7 +324,7 @@ int nfp_compile_flow_metadata(struct nfp_app *app, u32 cookie,
nfp_flow->meta.host_cookie = cpu_to_be64(cookie);
nfp_flow->ingress_dev = netdev;
- ctx_entry = kzalloc_obj(*ctx_entry, GFP_KERNEL);
+ ctx_entry = kzalloc_obj(*ctx_entry);
if (!ctx_entry) {
err = -ENOMEM;
goto err_release_stats;
@@ -573,7 +573,7 @@ int nfp_flower_metadata_init(struct nfp_app *app, u64 host_ctx_count,
stats_size = FIELD_PREP(NFP_FL_STAT_ID_STAT, host_ctx_count) |
FIELD_PREP(NFP_FL_STAT_ID_MU_NUM, host_num_mems - 1);
- priv->stats = kvmalloc_objs(struct nfp_fl_stats, stats_size, GFP_KERNEL);
+ priv->stats = kvmalloc_objs(struct nfp_fl_stats, stats_size);
if (!priv->stats)
goto err_free_ring_buf;
diff --git a/drivers/net/ethernet/netronome/nfp/flower/offload.c b/drivers/net/ethernet/netronome/nfp/flower/offload.c
index b6e1e33d3f27..161190200dbd 100644
--- a/drivers/net/ethernet/netronome/nfp/flower/offload.c
+++ b/drivers/net/ethernet/netronome/nfp/flower/offload.c
@@ -549,7 +549,7 @@ nfp_flower_allocate_new(struct nfp_fl_key_ls *key_layer)
{
struct nfp_fl_payload *flow_pay;
- flow_pay = kmalloc_obj(*flow_pay, GFP_KERNEL);
+ flow_pay = kmalloc_obj(*flow_pay);
if (!flow_pay)
return NULL;
@@ -979,7 +979,7 @@ static int nfp_flower_link_flows(struct nfp_fl_payload *merge_flow,
{
struct nfp_fl_payload_link *link;
- link = kmalloc_obj(*link, GFP_KERNEL);
+ link = kmalloc_obj(*link);
if (!link)
return -ENOMEM;
@@ -1067,7 +1067,7 @@ int nfp_flower_merge_offloaded_flows(struct nfp_app *app,
if (err)
goto err_release_metadata;
- merge_info = kmalloc_obj(*merge_info, GFP_KERNEL);
+ merge_info = kmalloc_obj(*merge_info);
if (!merge_info) {
err = -ENOMEM;
goto err_remove_rhash;
@@ -1354,7 +1354,7 @@ nfp_flower_add_offload(struct nfp_app *app, struct net_device *netdev,
if (!offload_pre_check(flow))
return -EOPNOTSUPP;
- key_layer = kmalloc_obj(*key_layer, GFP_KERNEL);
+ key_layer = kmalloc_obj(*key_layer);
if (!key_layer)
return -ENOMEM;
@@ -1400,7 +1400,7 @@ nfp_flower_add_offload(struct nfp_app *app, struct net_device *netdev,
if (priv->flower_ext_feats & NFP_FL_FEATS_DECAP_V2) {
struct nfp_predt_entry *predt;
- predt = kzalloc_obj(*predt, GFP_KERNEL);
+ predt = kzalloc_obj(*predt);
if (!predt) {
err = -ENOMEM;
goto err_remove_rhash;
@@ -1901,7 +1901,7 @@ nfp_flower_setup_indr_tc_block(struct net_device *netdev, struct Qdisc *sch, str
&nfp_block_cb_list))
return -EBUSY;
- cb_priv = kmalloc_obj(*cb_priv, GFP_KERNEL);
+ cb_priv = kmalloc_obj(*cb_priv);
if (!cb_priv)
return -ENOMEM;
diff --git a/drivers/net/ethernet/netronome/nfp/flower/qos_conf.c b/drivers/net/ethernet/netronome/nfp/flower/qos_conf.c
index 6a7f806b3fdf..8c7d838920cb 100644
--- a/drivers/net/ethernet/netronome/nfp/flower/qos_conf.c
+++ b/drivers/net/ethernet/netronome/nfp/flower/qos_conf.c
@@ -579,7 +579,7 @@ nfp_flower_add_meter_entry(struct nfp_app *app, u32 meter_id)
if (meter_entry)
return meter_entry;
- meter_entry = kzalloc_obj(*meter_entry, GFP_KERNEL);
+ meter_entry = kzalloc_obj(*meter_entry);
if (!meter_entry)
return NULL;
diff --git a/drivers/net/ethernet/netronome/nfp/flower/tunnel_conf.c b/drivers/net/ethernet/netronome/nfp/flower/tunnel_conf.c
index e0d32ddc80c3..0cef0e2b85d0 100644
--- a/drivers/net/ethernet/netronome/nfp/flower/tunnel_conf.c
+++ b/drivers/net/ethernet/netronome/nfp/flower/tunnel_conf.c
@@ -884,7 +884,7 @@ void nfp_tunnel_add_ipv4_off(struct nfp_app *app, __be32 ipv4)
}
}
- entry = kmalloc_obj(*entry, GFP_KERNEL);
+ entry = kmalloc_obj(*entry);
if (!entry) {
mutex_unlock(&priv->tun.ipv4_off_lock);
nfp_flower_cmsg_warn(app, "Mem error when offloading IP address.\n");
@@ -959,7 +959,7 @@ nfp_tunnel_add_ipv6_off(struct nfp_app *app, struct in6_addr *ipv6)
return entry;
}
- entry = kmalloc_obj(*entry, GFP_KERNEL);
+ entry = kmalloc_obj(*entry);
if (!entry) {
mutex_unlock(&priv->tun.ipv6_off_lock);
nfp_flower_cmsg_warn(app, "Mem error when offloading IP address.\n");
@@ -1117,7 +1117,7 @@ nfp_tunnel_add_shared_mac(struct nfp_app *app, struct net_device *netdev,
}
if (!entry) {
- entry = kzalloc_obj(*entry, GFP_KERNEL);
+ entry = kzalloc_obj(*entry);
if (!entry) {
err = -ENOMEM;
goto err_free_ida;
diff --git a/drivers/net/ethernet/netronome/nfp/nfp_app.c b/drivers/net/ethernet/netronome/nfp/nfp_app.c
index f53418136c37..ad70c9c2e333 100644
--- a/drivers/net/ethernet/netronome/nfp/nfp_app.c
+++ b/drivers/net/ethernet/netronome/nfp/nfp_app.c
@@ -239,7 +239,7 @@ struct nfp_app *nfp_app_alloc(struct nfp_pf *pf, enum nfp_app_id id)
if (WARN_ON(!apps[id]->ctrl_msg_rx && apps[id]->ctrl_msg_rx_raw))
return ERR_PTR(-EINVAL);
- app = kzalloc_obj(*app, GFP_KERNEL);
+ app = kzalloc_obj(*app);
if (!app)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/net/ethernet/netronome/nfp/nfp_net_common.c b/drivers/net/ethernet/netronome/nfp/nfp_net_common.c
index bebf7e7c4a86..a9c7bab489b2 100644
--- a/drivers/net/ethernet/netronome/nfp/nfp_net_common.c
+++ b/drivers/net/ethernet/netronome/nfp/nfp_net_common.c
@@ -1554,7 +1554,7 @@ struct nfp_net_dp *nfp_net_clone_dp(struct nfp_net *nn)
{
struct nfp_net_dp *new;
- new = kmalloc_obj(*new, GFP_KERNEL);
+ new = kmalloc_obj(*new);
if (!new)
return NULL;
diff --git a/drivers/net/ethernet/netronome/nfp/nfp_net_dp.c b/drivers/net/ethernet/netronome/nfp/nfp_net_dp.c
index cbb983729f22..3e8222886fe4 100644
--- a/drivers/net/ethernet/netronome/nfp/nfp_net_dp.c
+++ b/drivers/net/ethernet/netronome/nfp/nfp_net_dp.c
@@ -184,7 +184,7 @@ int nfp_net_tx_rings_prepare(struct nfp_net *nn, struct nfp_net_dp *dp)
{
unsigned int r;
- dp->tx_rings = kzalloc_objs(*dp->tx_rings, dp->num_tx_rings, GFP_KERNEL);
+ dp->tx_rings = kzalloc_objs(*dp->tx_rings, dp->num_tx_rings);
if (!dp->tx_rings)
return -ENOMEM;
@@ -339,7 +339,7 @@ int nfp_net_rx_rings_prepare(struct nfp_net *nn, struct nfp_net_dp *dp)
{
unsigned int r;
- dp->rx_rings = kzalloc_objs(*dp->rx_rings, dp->num_rx_rings, GFP_KERNEL);
+ dp->rx_rings = kzalloc_objs(*dp->rx_rings, dp->num_rx_rings);
if (!dp->rx_rings)
return -ENOMEM;
diff --git a/drivers/net/ethernet/netronome/nfp/nfp_net_ethtool.c b/drivers/net/ethernet/netronome/nfp/nfp_net_ethtool.c
index 16bf77708b9e..a2a89d48e3ca 100644
--- a/drivers/net/ethernet/netronome/nfp/nfp_net_ethtool.c
+++ b/drivers/net/ethernet/netronome/nfp/nfp_net_ethtool.c
@@ -713,7 +713,7 @@ static int nfp_test_nsp(struct net_device *netdev)
goto exit_close_nsp;
}
- nspi = kzalloc_obj(*nspi, GFP_KERNEL);
+ nspi = kzalloc_obj(*nspi);
if (!nspi) {
err = -ENOMEM;
goto exit_close_nsp;
@@ -1676,7 +1676,7 @@ static int nfp_net_fs_add(struct nfp_net *nn, struct ethtool_rxnfc *cmd)
if (unsupp_mask)
return -EOPNOTSUPP;
- new = kzalloc_obj(*new, GFP_KERNEL);
+ new = kzalloc_obj(*new);
if (!new)
return -ENOMEM;
diff --git a/drivers/net/ethernet/netronome/nfp/nfp_netvf_main.c b/drivers/net/ethernet/netronome/nfp/nfp_netvf_main.c
index 061d1ba89760..b5646c884371 100644
--- a/drivers/net/ethernet/netronome/nfp/nfp_netvf_main.c
+++ b/drivers/net/ethernet/netronome/nfp/nfp_netvf_main.c
@@ -93,7 +93,7 @@ static int nfp_netvf_pci_probe(struct pci_dev *pdev,
dev_info = &nfp_dev_info[pci_id->driver_data];
- vf = kzalloc_obj(*vf, GFP_KERNEL);
+ vf = kzalloc_obj(*vf);
if (!vf)
return -ENOMEM;
pci_set_drvdata(pdev, vf);
diff --git a/drivers/net/ethernet/netronome/nfp/nfp_port.c b/drivers/net/ethernet/netronome/nfp/nfp_port.c
index 1ce12ad44d2f..7f5de6bd7218 100644
--- a/drivers/net/ethernet/netronome/nfp/nfp_port.c
+++ b/drivers/net/ethernet/netronome/nfp/nfp_port.c
@@ -203,7 +203,7 @@ nfp_port_alloc(struct nfp_app *app, enum nfp_port_type type,
{
struct nfp_port *port;
- port = kzalloc_obj(*port, GFP_KERNEL);
+ port = kzalloc_obj(*port);
if (!port)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/net/ethernet/netronome/nfp/nfpcore/nfp6000_pcie.c b/drivers/net/ethernet/netronome/nfp/nfpcore/nfp6000_pcie.c
index ff16af23fc3a..0bc9e517c4fd 100644
--- a/drivers/net/ethernet/netronome/nfp/nfpcore/nfp6000_pcie.c
+++ b/drivers/net/ethernet/netronome/nfp/nfpcore/nfp6000_pcie.c
@@ -1320,7 +1320,7 @@ nfp_cpp_from_nfp6000_pcie(struct pci_dev *pdev, const struct nfp_dev_info *dev_i
dev_info->chip_names);
pcie_print_link_status(pdev);
- nfp = kzalloc_obj(*nfp, GFP_KERNEL);
+ nfp = kzalloc_obj(*nfp);
if (!nfp) {
err = -ENOMEM;
goto err_ret;
diff --git a/drivers/net/ethernet/netronome/nfp/nfpcore/nfp_cppcore.c b/drivers/net/ethernet/netronome/nfp/nfpcore/nfp_cppcore.c
index 06ebad34c00b..85d3554a79a9 100644
--- a/drivers/net/ethernet/netronome/nfp/nfpcore/nfp_cppcore.c
+++ b/drivers/net/ethernet/netronome/nfp/nfpcore/nfp_cppcore.c
@@ -802,7 +802,7 @@ int nfp_cpp_area_cache_add(struct nfp_cpp *cpp, size_t size)
if (!area)
return -ENOMEM;
- cache = kzalloc_obj(*cache, GFP_KERNEL);
+ cache = kzalloc_obj(*cache);
if (!cache) {
nfp_cpp_area_free(area);
return -ENOMEM;
@@ -1170,7 +1170,7 @@ nfp_cpp_from_operations(const struct nfp_cpp_operations *ops,
u32 xpbaddr;
size_t tgt;
- cpp = kzalloc_obj(*cpp, GFP_KERNEL);
+ cpp = kzalloc_obj(*cpp);
if (!cpp) {
err = -ENOMEM;
goto err_malloc;
diff --git a/drivers/net/ethernet/netronome/nfp/nfpcore/nfp_mip.c b/drivers/net/ethernet/netronome/nfp/nfpcore/nfp_mip.c
index 93b11eaf7d9f..aa787c502913 100644
--- a/drivers/net/ethernet/netronome/nfp/nfpcore/nfp_mip.c
+++ b/drivers/net/ethernet/netronome/nfp/nfpcore/nfp_mip.c
@@ -101,7 +101,7 @@ const struct nfp_mip *nfp_mip_open(struct nfp_cpp *cpp)
struct nfp_mip *mip;
int err;
- mip = kmalloc_obj(*mip, GFP_KERNEL);
+ mip = kmalloc_obj(*mip);
if (!mip)
return NULL;
diff --git a/drivers/net/ethernet/netronome/nfp/nfpcore/nfp_mutex.c b/drivers/net/ethernet/netronome/nfp/nfpcore/nfp_mutex.c
index d017b7779819..f079284c0ecd 100644
--- a/drivers/net/ethernet/netronome/nfp/nfpcore/nfp_mutex.c
+++ b/drivers/net/ethernet/netronome/nfp/nfpcore/nfp_mutex.c
@@ -140,7 +140,7 @@ struct nfp_cpp_mutex *nfp_cpp_mutex_alloc(struct nfp_cpp *cpp, int target,
if (tmp != key)
return NULL;
- mutex = kzalloc_obj(*mutex, GFP_KERNEL);
+ mutex = kzalloc_obj(*mutex);
if (!mutex)
return NULL;
diff --git a/drivers/net/ethernet/netronome/nfp/nfpcore/nfp_nffw.c b/drivers/net/ethernet/netronome/nfp/nfpcore/nfp_nffw.c
index 4ad0f7586ba1..69c2fb9bea48 100644
--- a/drivers/net/ethernet/netronome/nfp/nfpcore/nfp_nffw.c
+++ b/drivers/net/ethernet/netronome/nfp/nfpcore/nfp_nffw.c
@@ -163,7 +163,7 @@ struct nfp_nffw_info *nfp_nffw_info_open(struct nfp_cpp *cpp)
u32 info_ver;
int err;
- state = kzalloc_obj(*state, GFP_KERNEL);
+ state = kzalloc_obj(*state);
if (!state)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/net/ethernet/netronome/nfp/nfpcore/nfp_nsp.c b/drivers/net/ethernet/netronome/nfp/nfpcore/nfp_nsp.c
index a874a5f233a6..5a1aadf6e17e 100644
--- a/drivers/net/ethernet/netronome/nfp/nfpcore/nfp_nsp.c
+++ b/drivers/net/ethernet/netronome/nfp/nfpcore/nfp_nsp.c
@@ -280,7 +280,7 @@ struct nfp_nsp *nfp_nsp_open(struct nfp_cpp *cpp)
if (IS_ERR(res))
return ERR_CAST(res);
- state = kzalloc_obj(*state, GFP_KERNEL);
+ state = kzalloc_obj(*state);
if (!state) {
nfp_resource_release(res);
return ERR_PTR(-ENOMEM);
@@ -514,7 +514,7 @@ nfp_nsp_command_buf_dma_sg(struct nfp_nsp *nsp,
dma_size = BIT_ULL(dma_order);
nseg = DIV_ROUND_UP(max_size, chunk_size);
- chunks = kzalloc_objs(*chunks, nseg, GFP_KERNEL);
+ chunks = kzalloc_objs(*chunks, nseg);
if (!chunks)
return -ENOMEM;
diff --git a/drivers/net/ethernet/netronome/nfp/nfpcore/nfp_nsp_cmds.c b/drivers/net/ethernet/netronome/nfp/nfpcore/nfp_nsp_cmds.c
index 33ff357b6fc6..d39c8f282199 100644
--- a/drivers/net/ethernet/netronome/nfp/nfpcore/nfp_nsp_cmds.c
+++ b/drivers/net/ethernet/netronome/nfp/nfpcore/nfp_nsp_cmds.c
@@ -29,7 +29,7 @@ struct nfp_nsp_identify *__nfp_nsp_identify(struct nfp_nsp *nsp)
if (nfp_nsp_get_abi_ver_minor(nsp) < 15)
return NULL;
- ni = kzalloc_obj(*ni, GFP_KERNEL);
+ ni = kzalloc_obj(*ni);
if (!ni)
return NULL;
@@ -40,7 +40,7 @@ struct nfp_nsp_identify *__nfp_nsp_identify(struct nfp_nsp *nsp)
goto exit_free;
}
- nspi = kzalloc_obj(*nspi, GFP_KERNEL);
+ nspi = kzalloc_obj(*nspi);
if (!nspi)
goto exit_free;
diff --git a/drivers/net/ethernet/netronome/nfp/nfpcore/nfp_resource.c b/drivers/net/ethernet/netronome/nfp/nfpcore/nfp_resource.c
index 54089663bbd7..6d5833479d12 100644
--- a/drivers/net/ethernet/netronome/nfp/nfpcore/nfp_resource.c
+++ b/drivers/net/ethernet/netronome/nfp/nfpcore/nfp_resource.c
@@ -155,7 +155,7 @@ nfp_resource_acquire(struct nfp_cpp *cpp, const char *name)
struct nfp_resource *res;
int err;
- res = kzalloc_obj(*res, GFP_KERNEL);
+ res = kzalloc_obj(*res);
if (!res)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/net/ethernet/netronome/nfp/nic/main.c b/drivers/net/ethernet/netronome/nfp/nic/main.c
index 82ec6d9018b0..f7a4d76899c2 100644
--- a/drivers/net/ethernet/netronome/nfp/nic/main.c
+++ b/drivers/net/ethernet/netronome/nfp/nic/main.c
@@ -51,7 +51,7 @@ static int nfp_nic_vnic_alloc(struct nfp_app *app, struct nfp_net *nn,
return err;
if (sizeof(*app_pri)) {
- nn->app_priv = kzalloc_obj(*app_pri, GFP_KERNEL);
+ nn->app_priv = kzalloc_obj(*app_pri);
if (!nn->app_priv)
return -ENOMEM;
}
diff --git a/drivers/net/ethernet/pensando/ionic/ionic_aux.c b/drivers/net/ethernet/pensando/ionic/ionic_aux.c
index 4c9db73cef23..4f193d0ee87a 100644
--- a/drivers/net/ethernet/pensando/ionic/ionic_aux.c
+++ b/drivers/net/ethernet/pensando/ionic/ionic_aux.c
@@ -26,7 +26,7 @@ int ionic_auxbus_register(struct ionic_lif *lif)
if (!(le64_to_cpu(lif->ionic->ident.lif.capabilities) & IONIC_LIF_CAP_RDMA))
return 0;
- ionic_adev = kzalloc_obj(*ionic_adev, GFP_KERNEL);
+ ionic_adev = kzalloc_obj(*ionic_adev);
if (!ionic_adev)
return -ENOMEM;
diff --git a/drivers/net/ethernet/pensando/ionic/ionic_bus_pci.c b/drivers/net/ethernet/pensando/ionic/ionic_bus_pci.c
index 104e1d35e0be..05f19489ec5c 100644
--- a/drivers/net/ethernet/pensando/ionic/ionic_bus_pci.c
+++ b/drivers/net/ethernet/pensando/ionic/ionic_bus_pci.c
@@ -151,7 +151,7 @@ static int ionic_vf_alloc(struct ionic *ionic, int num_vfs)
down_write(&ionic->vf_op_lock);
- ionic->vfs = kzalloc_objs(struct ionic_vf, num_vfs, GFP_KERNEL);
+ ionic->vfs = kzalloc_objs(struct ionic_vf, num_vfs);
if (!ionic->vfs) {
err = -ENOMEM;
goto out;
diff --git a/drivers/net/ethernet/pensando/ionic/ionic_lif.c b/drivers/net/ethernet/pensando/ionic/ionic_lif.c
index 050dd3168f6b..8d040e611d5a 100644
--- a/drivers/net/ethernet/pensando/ionic/ionic_lif.c
+++ b/drivers/net/ethernet/pensando/ionic/ionic_lif.c
@@ -2694,7 +2694,7 @@ static int ionic_register_rxq_info(struct ionic_queue *q, unsigned int napi_id)
struct xdp_rxq_info *rxq_info;
int err;
- rxq_info = kzalloc_obj(*rxq_info, GFP_KERNEL);
+ rxq_info = kzalloc_obj(*rxq_info);
if (!rxq_info)
return -ENOMEM;
@@ -3177,7 +3177,7 @@ static int ionic_affinity_masks_alloc(struct ionic *ionic)
int nintrs = ionic->nintrs;
int i;
- affinity_masks = kzalloc_objs(cpumask_var_t, nintrs, GFP_KERNEL);
+ affinity_masks = kzalloc_objs(cpumask_var_t, nintrs);
if (!affinity_masks)
return -ENOMEM;
@@ -3218,7 +3218,7 @@ int ionic_lif_alloc(struct ionic *ionic)
int tbl_sz;
int err;
- lid = kzalloc_obj(*lid, GFP_KERNEL);
+ lid = kzalloc_obj(*lid);
if (!lid)
return -ENOMEM;
diff --git a/drivers/net/ethernet/qlogic/netxen/netxen_nic_init.c b/drivers/net/ethernet/qlogic/netxen/netxen_nic_init.c
index a0466693e2d9..163eabd47f55 100644
--- a/drivers/net/ethernet/qlogic/netxen/netxen_nic_init.c
+++ b/drivers/net/ethernet/qlogic/netxen/netxen_nic_init.c
@@ -185,7 +185,7 @@ int netxen_alloc_sw_resources(struct netxen_adapter *adapter)
struct netxen_cmd_buffer *cmd_buf_arr;
struct net_device *netdev = adapter->netdev;
- tx_ring = kzalloc_obj(struct nx_host_tx_ring, GFP_KERNEL);
+ tx_ring = kzalloc_obj(struct nx_host_tx_ring);
if (tx_ring == NULL)
return -ENOMEM;
@@ -451,7 +451,7 @@ int netxen_pinit_from_rom(struct netxen_adapter *adapter)
return -EIO;
}
- buf = kzalloc_objs(struct crb_addr_pair, n, GFP_KERNEL);
+ buf = kzalloc_objs(struct crb_addr_pair, n);
if (buf == NULL)
return -ENOMEM;
diff --git a/drivers/net/ethernet/qlogic/qed/qed_cxt.c b/drivers/net/ethernet/qlogic/qed/qed_cxt.c
index ddc1f9213a95..4826f44ebced 100644
--- a/drivers/net/ethernet/qlogic/qed/qed_cxt.c
+++ b/drivers/net/ethernet/qlogic/qed/qed_cxt.c
@@ -1114,7 +1114,7 @@ int qed_cxt_mngr_alloc(struct qed_hwfn *p_hwfn)
struct qed_cxt_mngr *p_mngr;
u32 i;
- p_mngr = kzalloc_obj(*p_mngr, GFP_KERNEL);
+ p_mngr = kzalloc_obj(*p_mngr);
if (!p_mngr)
return -ENOMEM;
diff --git a/drivers/net/ethernet/qlogic/qed/qed_dcbx.c b/drivers/net/ethernet/qlogic/qed/qed_dcbx.c
index 593931ec7226..3a5c25026858 100644
--- a/drivers/net/ethernet/qlogic/qed/qed_dcbx.c
+++ b/drivers/net/ethernet/qlogic/qed/qed_dcbx.c
@@ -915,7 +915,7 @@ qed_dcbx_mib_update_event(struct qed_hwfn *p_hwfn,
int qed_dcbx_info_alloc(struct qed_hwfn *p_hwfn)
{
- p_hwfn->p_dcbx_info = kzalloc_obj(*p_hwfn->p_dcbx_info, GFP_KERNEL);
+ p_hwfn->p_dcbx_info = kzalloc_obj(*p_hwfn->p_dcbx_info);
if (!p_hwfn->p_dcbx_info)
return -ENOMEM;
@@ -1244,7 +1244,7 @@ int qed_dcbx_get_config_params(struct qed_hwfn *p_hwfn,
return 0;
}
- dcbx_info = kzalloc_obj(*dcbx_info, GFP_KERNEL);
+ dcbx_info = kzalloc_obj(*dcbx_info);
if (!dcbx_info)
return -ENOMEM;
diff --git a/drivers/net/ethernet/qlogic/qed/qed_debug.c b/drivers/net/ethernet/qlogic/qed/qed_debug.c
index a869a2a7e918..83d043d62231 100644
--- a/drivers/net/ethernet/qlogic/qed/qed_debug.c
+++ b/drivers/net/ethernet/qlogic/qed/qed_debug.c
@@ -7535,7 +7535,7 @@ enum dbg_status qed_dbg_user_set_bin_ptr(struct qed_hwfn *p_hwfn,
enum dbg_status qed_dbg_alloc_user_data(struct qed_hwfn *p_hwfn,
void **user_data_ptr)
{
- *user_data_ptr = kzalloc_obj(struct dbg_tools_user_data, GFP_KERNEL);
+ *user_data_ptr = kzalloc_obj(struct dbg_tools_user_data);
if (!(*user_data_ptr))
return DBG_STATUS_VIRT_MEM_ALLOC_FAILED;
diff --git a/drivers/net/ethernet/qlogic/qed/qed_dev.c b/drivers/net/ethernet/qlogic/qed/qed_dev.c
index 4c2027972347..33ea3a2edeae 100644
--- a/drivers/net/ethernet/qlogic/qed/qed_dev.c
+++ b/drivers/net/ethernet/qlogic/qed/qed_dev.c
@@ -146,7 +146,7 @@ int qed_db_recovery_add(struct qed_dev *cdev,
p_hwfn = qed_db_rec_find_hwfn(cdev, db_addr);
/* Create entry */
- db_entry = kzalloc_obj(*db_entry, GFP_KERNEL);
+ db_entry = kzalloc_obj(*db_entry);
if (!db_entry) {
DP_NOTICE(cdev, "Failed to allocate a db recovery entry\n");
return -ENOMEM;
@@ -383,7 +383,7 @@ static int qed_llh_alloc(struct qed_dev *cdev)
struct qed_llh_info *p_llh_info;
u32 size, i;
- p_llh_info = kzalloc_obj(*p_llh_info, GFP_KERNEL);
+ p_llh_info = kzalloc_obj(*p_llh_info);
if (!p_llh_info)
return -ENOMEM;
cdev->p_llh_info = p_llh_info;
@@ -2155,7 +2155,7 @@ int qed_resc_alloc(struct qed_dev *cdev)
return rc;
}
- cdev->fw_data = kzalloc_obj(*cdev->fw_data, GFP_KERNEL);
+ cdev->fw_data = kzalloc_obj(*cdev->fw_data);
if (!cdev->fw_data)
return -ENOMEM;
@@ -2345,7 +2345,7 @@ int qed_resc_alloc(struct qed_dev *cdev)
goto alloc_err;
}
- cdev->reset_stats = kzalloc_obj(*cdev->reset_stats, GFP_KERNEL);
+ cdev->reset_stats = kzalloc_obj(*cdev->reset_stats);
if (!cdev->reset_stats)
goto alloc_no_mem;
@@ -2642,7 +2642,7 @@ static int qed_hw_init_common(struct qed_hwfn *p_hwfn,
u32 concrete_fid;
int rc = 0;
- params = kzalloc_obj(*params, GFP_KERNEL);
+ params = kzalloc_obj(*params);
if (!params) {
DP_NOTICE(p_hwfn->cdev,
"Failed to allocate common init params\n");
diff --git a/drivers/net/ethernet/qlogic/qed/qed_fcoe.c b/drivers/net/ethernet/qlogic/qed/qed_fcoe.c
index 9d91e4775b52..5bdbe331ac8e 100644
--- a/drivers/net/ethernet/qlogic/qed/qed_fcoe.c
+++ b/drivers/net/ethernet/qlogic/qed/qed_fcoe.c
@@ -383,7 +383,7 @@ qed_fcoe_allocate_connection(struct qed_hwfn *p_hwfn,
}
spin_unlock_bh(&p_hwfn->p_fcoe_info->lock);
- p_conn = kzalloc_obj(*p_conn, GFP_KERNEL);
+ p_conn = kzalloc_obj(*p_conn);
if (!p_conn)
return -ENOMEM;
@@ -535,7 +535,7 @@ int qed_fcoe_alloc(struct qed_hwfn *p_hwfn)
struct qed_fcoe_info *p_fcoe_info;
/* Allocate LL2's set struct */
- p_fcoe_info = kzalloc_obj(*p_fcoe_info, GFP_KERNEL);
+ p_fcoe_info = kzalloc_obj(*p_fcoe_info);
if (!p_fcoe_info) {
DP_NOTICE(p_hwfn, "Failed to allocate qed_fcoe_info'\n");
return -ENOMEM;
@@ -855,7 +855,7 @@ static int qed_fcoe_acquire_conn(struct qed_dev *cdev,
int rc;
/* Allocate a hashed connection */
- hash_con = kzalloc_obj(*hash_con, GFP_KERNEL);
+ hash_con = kzalloc_obj(*hash_con);
if (!hash_con) {
DP_NOTICE(cdev, "Failed to allocate hashed connection\n");
return -ENOMEM;
diff --git a/drivers/net/ethernet/qlogic/qed/qed_hw.c b/drivers/net/ethernet/qlogic/qed/qed_hw.c
index 6fff9788101c..77c240d27fe9 100644
--- a/drivers/net/ethernet/qlogic/qed/qed_hw.c
+++ b/drivers/net/ethernet/qlogic/qed/qed_hw.c
@@ -46,7 +46,7 @@ struct qed_ptt_pool {
int qed_ptt_pool_alloc(struct qed_hwfn *p_hwfn)
{
- struct qed_ptt_pool *p_pool = kmalloc_obj(*p_pool, GFP_KERNEL);
+ struct qed_ptt_pool *p_pool = kmalloc_obj(*p_pool);
int i;
if (!p_pool)
diff --git a/drivers/net/ethernet/qlogic/qed/qed_init_ops.c b/drivers/net/ethernet/qlogic/qed/qed_init_ops.c
index 330c75d9ee07..edcaecf5b679 100644
--- a/drivers/net/ethernet/qlogic/qed/qed_init_ops.c
+++ b/drivers/net/ethernet/qlogic/qed/qed_init_ops.c
@@ -210,7 +210,7 @@ int qed_init_alloc(struct qed_hwfn *p_hwfn)
if (IS_VF(p_hwfn->cdev))
return 0;
- rt_data->b_valid = kzalloc_objs(bool, RUNTIME_ARRAY_SIZE, GFP_KERNEL);
+ rt_data->b_valid = kzalloc_objs(bool, RUNTIME_ARRAY_SIZE);
if (!rt_data->b_valid)
return -ENOMEM;
diff --git a/drivers/net/ethernet/qlogic/qed/qed_int.c b/drivers/net/ethernet/qlogic/qed/qed_int.c
index a65827240d00..db3b0bc4ed93 100644
--- a/drivers/net/ethernet/qlogic/qed/qed_int.c
+++ b/drivers/net/ethernet/qlogic/qed/qed_int.c
@@ -1412,7 +1412,7 @@ static int qed_int_sb_attn_alloc(struct qed_hwfn *p_hwfn,
void *p_virt;
/* SB struct */
- p_sb = kmalloc_obj(*p_sb, GFP_KERNEL);
+ p_sb = kmalloc_obj(*p_sb);
if (!p_sb)
return -ENOMEM;
@@ -1765,7 +1765,7 @@ static int qed_int_sp_sb_alloc(struct qed_hwfn *p_hwfn, struct qed_ptt *p_ptt)
void *p_virt;
/* SB struct */
- p_sb = kmalloc_obj(*p_sb, GFP_KERNEL);
+ p_sb = kmalloc_obj(*p_sb);
if (!p_sb)
return -ENOMEM;
@@ -2188,7 +2188,7 @@ int qed_int_igu_read_cam(struct qed_hwfn *p_hwfn, struct qed_ptt *p_ptt)
u32 min_vf = 0, max_vf = 0;
u16 igu_sb_id;
- p_hwfn->hw_info.p_igu_info = kzalloc_obj(*p_igu_info, GFP_KERNEL);
+ p_hwfn->hw_info.p_igu_info = kzalloc_obj(*p_igu_info);
if (!p_hwfn->hw_info.p_igu_info)
return -ENOMEM;
diff --git a/drivers/net/ethernet/qlogic/qed/qed_iscsi.c b/drivers/net/ethernet/qlogic/qed/qed_iscsi.c
index 758fa97be920..34f1217227bc 100644
--- a/drivers/net/ethernet/qlogic/qed/qed_iscsi.c
+++ b/drivers/net/ethernet/qlogic/qed/qed_iscsi.c
@@ -710,7 +710,7 @@ static int qed_iscsi_allocate_connection(struct qed_hwfn *p_hwfn,
/* Need to allocate a new connection */
p_params = &p_hwfn->pf_params.iscsi_pf_params;
- p_conn = kzalloc_obj(*p_conn, GFP_KERNEL);
+ p_conn = kzalloc_obj(*p_conn);
if (!p_conn)
return -ENOMEM;
@@ -845,7 +845,7 @@ int qed_iscsi_alloc(struct qed_hwfn *p_hwfn)
{
struct qed_iscsi_info *p_iscsi_info;
- p_iscsi_info = kzalloc_obj(*p_iscsi_info, GFP_KERNEL);
+ p_iscsi_info = kzalloc_obj(*p_iscsi_info);
if (!p_iscsi_info)
return -ENOMEM;
@@ -1125,7 +1125,7 @@ static int qed_iscsi_start(struct qed_dev *cdev,
if (!tasks)
return 0;
- tid_info = kzalloc_obj(*tid_info, GFP_KERNEL);
+ tid_info = kzalloc_obj(*tid_info);
if (!tid_info) {
qed_iscsi_stop(cdev);
diff --git a/drivers/net/ethernet/qlogic/qed/qed_iwarp.c b/drivers/net/ethernet/qlogic/qed/qed_iwarp.c
index 3b1ff94a0588..0101b4a7c56c 100644
--- a/drivers/net/ethernet/qlogic/qed/qed_iwarp.c
+++ b/drivers/net/ethernet/qlogic/qed/qed_iwarp.c
@@ -546,7 +546,7 @@ qed_iwarp_create_ep(struct qed_hwfn *p_hwfn, struct qed_iwarp_ep **ep_out)
struct qed_iwarp_ep *ep;
int rc;
- ep = kzalloc_obj(*ep, GFP_KERNEL);
+ ep = kzalloc_obj(*ep);
if (!ep)
return -ENOMEM;
@@ -2602,7 +2602,7 @@ qed_iwarp_ll2_alloc_buffers(struct qed_hwfn *p_hwfn,
int i;
for (i = 0; i < num_rx_bufs; i++) {
- buffer = kzalloc_obj(*buffer, GFP_KERNEL);
+ buffer = kzalloc_obj(*buffer);
if (!buffer) {
rc = -ENOMEM;
break;
@@ -3166,7 +3166,7 @@ qed_iwarp_create_listen(void *rdma_cxt,
struct qed_hwfn *p_hwfn = rdma_cxt;
struct qed_iwarp_listener *listener;
- listener = kzalloc_obj(*listener, GFP_KERNEL);
+ listener = kzalloc_obj(*listener);
if (!listener)
return -ENOMEM;
diff --git a/drivers/net/ethernet/qlogic/qed/qed_l2.c b/drivers/net/ethernet/qlogic/qed/qed_l2.c
index e78f9c2ffc38..0f6905e33df6 100644
--- a/drivers/net/ethernet/qlogic/qed/qed_l2.c
+++ b/drivers/net/ethernet/qlogic/qed/qed_l2.c
@@ -58,7 +58,7 @@ int qed_l2_alloc(struct qed_hwfn *p_hwfn)
if (!QED_IS_L2_PERSONALITY(p_hwfn))
return 0;
- p_l2_info = kzalloc_obj(*p_l2_info, GFP_KERNEL);
+ p_l2_info = kzalloc_obj(*p_l2_info);
if (!p_l2_info)
return -ENOMEM;
p_hwfn->p_l2_info = p_l2_info;
diff --git a/drivers/net/ethernet/qlogic/qed/qed_ll2.c b/drivers/net/ethernet/qlogic/qed/qed_ll2.c
index 904bb1cd9bdb..572feb68d1d2 100644
--- a/drivers/net/ethernet/qlogic/qed/qed_ll2.c
+++ b/drivers/net/ethernet/qlogic/qed/qed_ll2.c
@@ -1195,7 +1195,7 @@ qed_ll2_acquire_connection_rx(struct qed_hwfn *p_hwfn,
}
capacity = qed_chain_get_capacity(&p_ll2_info->rx_queue.rxq_chain);
- p_descq = kzalloc_objs(struct qed_ll2_rx_packet, capacity, GFP_KERNEL);
+ p_descq = kzalloc_objs(struct qed_ll2_rx_packet, capacity);
if (!p_descq) {
rc = -ENOMEM;
DP_NOTICE(p_hwfn, "Failed to allocate ll2 Rx desc\n");
@@ -1290,7 +1290,7 @@ qed_ll2_acquire_connection_ooo(struct qed_hwfn *p_hwfn,
for (buf_idx = 0; buf_idx < p_ll2_info->input.rx_num_ooo_buffers;
buf_idx++) {
- p_buf = kzalloc_obj(*p_buf, GFP_KERNEL);
+ p_buf = kzalloc_obj(*p_buf);
if (!p_buf) {
rc = -ENOMEM;
goto out;
@@ -2603,7 +2603,7 @@ static int qed_ll2_start(struct qed_dev *cdev, struct qed_ll2_params *params)
DP_INFO(cdev, "Allocating %d LL2 buffers of size %08x bytes\n",
rx_num_desc, cdev->ll2->rx_size);
for (i = 0; i < rx_num_desc; i++) {
- buffer = kzalloc_obj(*buffer, GFP_KERNEL);
+ buffer = kzalloc_obj(*buffer);
if (!buffer) {
DP_INFO(cdev, "Failed to allocate LL2 buffers\n");
rc = -ENOMEM;
@@ -2811,7 +2811,7 @@ const struct qed_ll2_ops qed_ll2_ops_pass = {
int qed_ll2_alloc_if(struct qed_dev *cdev)
{
- cdev->ll2 = kzalloc_obj(*cdev->ll2, GFP_KERNEL);
+ cdev->ll2 = kzalloc_obj(*cdev->ll2);
return cdev->ll2 ? 0 : -ENOMEM;
}
diff --git a/drivers/net/ethernet/qlogic/qed/qed_main.c b/drivers/net/ethernet/qlogic/qed/qed_main.c
index 544d790efdea..28a8a2b9d501 100644
--- a/drivers/net/ethernet/qlogic/qed/qed_main.c
+++ b/drivers/net/ethernet/qlogic/qed/qed_main.c
@@ -461,7 +461,7 @@ static struct qed_dev *qed_alloc_cdev(struct pci_dev *pdev)
{
struct qed_dev *cdev;
- cdev = kzalloc_obj(*cdev, GFP_KERNEL);
+ cdev = kzalloc_obj(*cdev);
if (!cdev)
return cdev;
@@ -612,7 +612,7 @@ static int qed_set_int_mode(struct qed_dev *cdev, bool force_mode)
case QED_INT_MODE_MSIX:
/* Allocate MSIX table */
cnt = int_params->in.num_vectors;
- int_params->msix_table = kzalloc_objs(*tbl, cnt, GFP_KERNEL);
+ int_params->msix_table = kzalloc_objs(*tbl, cnt);
if (!int_params->msix_table) {
rc = -ENOMEM;
goto out;
@@ -1050,7 +1050,7 @@ static int qed_alloc_stream_mem(struct qed_dev *cdev)
for_each_hwfn(cdev, i) {
struct qed_hwfn *p_hwfn = &cdev->hwfns[i];
- p_hwfn->stream = kzalloc_obj(*p_hwfn->stream, GFP_KERNEL);
+ p_hwfn->stream = kzalloc_obj(*p_hwfn->stream);
if (!p_hwfn->stream)
return -ENOMEM;
diff --git a/drivers/net/ethernet/qlogic/qed/qed_mcp.c b/drivers/net/ethernet/qlogic/qed/qed_mcp.c
index 22802c793d68..9a461ab73bf2 100644
--- a/drivers/net/ethernet/qlogic/qed/qed_mcp.c
+++ b/drivers/net/ethernet/qlogic/qed/qed_mcp.c
@@ -241,7 +241,7 @@ int qed_mcp_cmd_init(struct qed_hwfn *p_hwfn, struct qed_ptt *p_ptt)
u32 size;
/* Allocate mcp_info structure */
- p_hwfn->mcp_info = kzalloc_obj(*p_hwfn->mcp_info, GFP_KERNEL);
+ p_hwfn->mcp_info = kzalloc_obj(*p_hwfn->mcp_info);
if (!p_hwfn->mcp_info)
goto err;
p_info = p_hwfn->mcp_info;
diff --git a/drivers/net/ethernet/qlogic/qed/qed_nvmetcp.c b/drivers/net/ethernet/qlogic/qed/qed_nvmetcp.c
index 81823f4197f6..b28128c4398c 100644
--- a/drivers/net/ethernet/qlogic/qed/qed_nvmetcp.c
+++ b/drivers/net/ethernet/qlogic/qed/qed_nvmetcp.c
@@ -218,7 +218,7 @@ static int qed_nvmetcp_start(struct qed_dev *cdev,
if (!tasks)
return 0;
- tid_info = kzalloc_obj(*tid_info, GFP_KERNEL);
+ tid_info = kzalloc_obj(*tid_info);
if (!tid_info) {
qed_nvmetcp_stop(cdev);
@@ -477,7 +477,7 @@ static int qed_nvmetcp_allocate_connection(struct qed_hwfn *p_hwfn,
/* Need to allocate a new connection */
p_params = &p_hwfn->pf_params.nvmetcp_pf_params;
- p_conn = kzalloc_obj(*p_conn, GFP_KERNEL);
+ p_conn = kzalloc_obj(*p_conn);
if (!p_conn)
return -ENOMEM;
@@ -568,7 +568,7 @@ int qed_nvmetcp_alloc(struct qed_hwfn *p_hwfn)
{
struct qed_nvmetcp_info *p_nvmetcp_info;
- p_nvmetcp_info = kzalloc_obj(*p_nvmetcp_info, GFP_KERNEL);
+ p_nvmetcp_info = kzalloc_obj(*p_nvmetcp_info);
if (!p_nvmetcp_info)
return -ENOMEM;
diff --git a/drivers/net/ethernet/qlogic/qed/qed_ooo.c b/drivers/net/ethernet/qlogic/qed/qed_ooo.c
index 23631e18858e..610afab93b3f 100644
--- a/drivers/net/ethernet/qlogic/qed/qed_ooo.c
+++ b/drivers/net/ethernet/qlogic/qed/qed_ooo.c
@@ -107,7 +107,7 @@ int qed_ooo_alloc(struct qed_hwfn *p_hwfn)
return -EINVAL;
}
- p_ooo_info = kzalloc_obj(*p_ooo_info, GFP_KERNEL);
+ p_ooo_info = kzalloc_obj(*p_ooo_info);
if (!p_ooo_info)
return -ENOMEM;
diff --git a/drivers/net/ethernet/qlogic/qed/qed_rdma.c b/drivers/net/ethernet/qlogic/qed/qed_rdma.c
index 8872c9ebcd26..24e2bdf42817 100644
--- a/drivers/net/ethernet/qlogic/qed/qed_rdma.c
+++ b/drivers/net/ethernet/qlogic/qed/qed_rdma.c
@@ -119,7 +119,7 @@ int qed_rdma_info_alloc(struct qed_hwfn *p_hwfn)
{
struct qed_rdma_info *p_rdma_info;
- p_rdma_info = kzalloc_obj(*p_rdma_info, GFP_KERNEL);
+ p_rdma_info = kzalloc_obj(*p_rdma_info);
if (!p_rdma_info)
return -ENOMEM;
@@ -168,12 +168,12 @@ static int qed_rdma_alloc(struct qed_hwfn *p_hwfn)
p_rdma_info->max_queue_zones = (u16)RESC_NUM(p_hwfn, QED_L2_QUEUE);
/* Allocate a struct with device params and fill it */
- p_rdma_info->dev = kzalloc_obj(*p_rdma_info->dev, GFP_KERNEL);
+ p_rdma_info->dev = kzalloc_obj(*p_rdma_info->dev);
if (!p_rdma_info->dev)
return rc;
/* Allocate a struct with port params and fill it */
- p_rdma_info->port = kzalloc_obj(*p_rdma_info->port, GFP_KERNEL);
+ p_rdma_info->port = kzalloc_obj(*p_rdma_info->port);
if (!p_rdma_info->port)
goto free_rdma_dev;
@@ -1293,7 +1293,7 @@ qed_rdma_create_qp(void *rdma_cxt,
}
}
- qp = kzalloc_obj(*qp, GFP_KERNEL);
+ qp = kzalloc_obj(*qp);
if (!qp)
return NULL;
diff --git a/drivers/net/ethernet/qlogic/qed/qed_spq.c b/drivers/net/ethernet/qlogic/qed/qed_spq.c
index d0ef2782f5ba..9b1beb5af517 100644
--- a/drivers/net/ethernet/qlogic/qed/qed_spq.c
+++ b/drivers/net/ethernet/qlogic/qed/qed_spq.c
@@ -407,7 +407,7 @@ int qed_eq_alloc(struct qed_hwfn *p_hwfn, u16 num_elem)
int ret;
/* Allocate EQ struct */
- p_eq = kzalloc_obj(*p_eq, GFP_KERNEL);
+ p_eq = kzalloc_obj(*p_eq);
if (!p_eq)
return -ENOMEM;
@@ -562,7 +562,7 @@ int qed_spq_alloc(struct qed_hwfn *p_hwfn)
int ret;
/* SPQ struct */
- p_spq = kzalloc_obj(*p_spq, GFP_KERNEL);
+ p_spq = kzalloc_obj(*p_spq);
if (!p_spq)
return -ENOMEM;
@@ -1013,7 +1013,7 @@ int qed_consq_alloc(struct qed_hwfn *p_hwfn)
int ret;
/* Allocate ConsQ struct */
- p_consq = kzalloc_obj(*p_consq, GFP_KERNEL);
+ p_consq = kzalloc_obj(*p_consq);
if (!p_consq)
return -ENOMEM;
diff --git a/drivers/net/ethernet/qlogic/qed/qed_sriov.c b/drivers/net/ethernet/qlogic/qed/qed_sriov.c
index cc9087abbacc..96a1d9e01096 100644
--- a/drivers/net/ethernet/qlogic/qed/qed_sriov.c
+++ b/drivers/net/ethernet/qlogic/qed/qed_sriov.c
@@ -543,7 +543,7 @@ int qed_iov_alloc(struct qed_hwfn *p_hwfn)
return 0;
}
- p_sriov = kzalloc_obj(*p_sriov, GFP_KERNEL);
+ p_sriov = kzalloc_obj(*p_sriov);
if (!p_sriov)
return -ENOMEM;
@@ -600,7 +600,7 @@ int qed_iov_hw_info(struct qed_hwfn *p_hwfn)
}
/* Allocate a new struct for IOV information */
- cdev->p_iov_info = kzalloc_obj(*cdev->p_iov_info, GFP_KERNEL);
+ cdev->p_iov_info = kzalloc_obj(*cdev->p_iov_info);
if (!cdev->p_iov_info)
return -ENOMEM;
diff --git a/drivers/net/ethernet/qlogic/qed/qed_vf.c b/drivers/net/ethernet/qlogic/qed/qed_vf.c
index b9ebf91e6b6a..315e313d91b1 100644
--- a/drivers/net/ethernet/qlogic/qed/qed_vf.c
+++ b/drivers/net/ethernet/qlogic/qed/qed_vf.c
@@ -454,7 +454,7 @@ int qed_vf_hw_prepare(struct qed_hwfn *p_hwfn)
p_hwfn->hw_info.concrete_fid = REG_RD(p_hwfn, reg);
/* Allocate vf sriov info */
- p_iov = kzalloc_obj(*p_iov, GFP_KERNEL);
+ p_iov = kzalloc_obj(*p_iov);
if (!p_iov)
return -ENOMEM;
diff --git a/drivers/net/ethernet/qlogic/qede/qede_filter.c b/drivers/net/ethernet/qlogic/qede/qede_filter.c
index 32bb653c50f7..ab8b818588e2 100644
--- a/drivers/net/ethernet/qlogic/qede/qede_filter.c
+++ b/drivers/net/ethernet/qlogic/qede/qede_filter.c
@@ -682,7 +682,7 @@ int qede_vlan_rx_add_vid(struct net_device *dev, __be16 proto, u16 vid)
DP_VERBOSE(edev, NETIF_MSG_IFUP, "Adding vlan 0x%04x\n", vid);
- vlan = kzalloc_obj(*vlan, GFP_KERNEL);
+ vlan = kzalloc_obj(*vlan);
if (!vlan) {
DP_INFO(edev, "Failed to allocate struct for vlan\n");
return -ENOMEM;
@@ -1916,7 +1916,7 @@ int qede_add_tc_flower_fltr(struct qede_dev *edev, __be16 proto,
goto unlock;
}
- n = kzalloc_obj(*n, GFP_KERNEL);
+ n = kzalloc_obj(*n);
if (!n) {
rc = -ENOMEM;
goto unlock;
@@ -2059,7 +2059,7 @@ int qede_add_cls_rule(struct qede_dev *edev, struct ethtool_rxnfc *info)
goto unlock;
}
- n = kzalloc_obj(*n, GFP_KERNEL);
+ n = kzalloc_obj(*n);
if (!n) {
rc = -ENOMEM;
goto unlock;
diff --git a/drivers/net/ethernet/qlogic/qede/qede_main.c b/drivers/net/ethernet/qlogic/qede/qede_main.c
index dfa221b30e9e..19319956ca13 100644
--- a/drivers/net/ethernet/qlogic/qede/qede_main.c
+++ b/drivers/net/ethernet/qlogic/qede/qede_main.c
@@ -990,7 +990,7 @@ static int qede_alloc_fp_array(struct qede_dev *edev)
for_each_queue(i) {
fp = &edev->fp_array[i];
- fp->sb_info = kzalloc_obj(*fp->sb_info, GFP_KERNEL);
+ fp->sb_info = kzalloc_obj(*fp->sb_info);
if (!fp->sb_info) {
DP_NOTICE(edev, "sb info struct allocation failed\n");
goto err;
@@ -1014,7 +1014,7 @@ static int qede_alloc_fp_array(struct qede_dev *edev)
}
if (fp->type & QEDE_FASTPATH_RX) {
- fp->rxq = kzalloc_obj(*fp->rxq, GFP_KERNEL);
+ fp->rxq = kzalloc_obj(*fp->rxq);
if (!fp->rxq)
goto err;
diff --git a/drivers/net/ethernet/qlogic/qede/qede_ptp.c b/drivers/net/ethernet/qlogic/qede/qede_ptp.c
index 774f77f9a55e..e3fe6306a85c 100644
--- a/drivers/net/ethernet/qlogic/qede/qede_ptp.c
+++ b/drivers/net/ethernet/qlogic/qede/qede_ptp.c
@@ -446,7 +446,7 @@ int qede_ptp_enable(struct qede_dev *edev)
struct qede_ptp *ptp;
int rc;
- ptp = kzalloc_obj(*ptp, GFP_KERNEL);
+ ptp = kzalloc_obj(*ptp);
if (!ptp) {
DP_INFO(edev, "Failed to allocate struct for PTP\n");
return -ENOMEM;
diff --git a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_hw.c b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_hw.c
index bae848bd5e26..bc82cecd0fe2 100644
--- a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_hw.c
+++ b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_hw.c
@@ -4164,7 +4164,7 @@ int qlcnic_83xx_init_mailbox_work(struct qlcnic_adapter *adapter)
struct qlcnic_hardware_context *ahw = adapter->ahw;
struct qlcnic_mailbox *mbx;
- ahw->mailbox = kzalloc_obj(*mbx, GFP_KERNEL);
+ ahw->mailbox = kzalloc_obj(*mbx);
if (!ahw->mailbox)
return -ENOMEM;
diff --git a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_init.c b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_init.c
index 42c8e5490ee7..45ed8705c7ca 100644
--- a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_init.c
+++ b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_init.c
@@ -2388,7 +2388,7 @@ static int qlcnic_83xx_get_fw_info(struct qlcnic_adapter *adapter)
struct qlc_83xx_fw_info *fw_info;
int err = 0;
- ahw->fw_info = kzalloc_obj(*fw_info, GFP_KERNEL);
+ ahw->fw_info = kzalloc_obj(*fw_info);
if (!ahw->fw_info) {
err = -ENOMEM;
} else {
diff --git a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_init.c b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_init.c
index e56ef10b6a2d..86e9cb04cae8 100644
--- a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_init.c
+++ b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_init.c
@@ -454,7 +454,7 @@ int qlcnic_pinit_from_rom(struct qlcnic_adapter *adapter)
return -EIO;
}
- buf = kzalloc_objs(struct crb_addr_pair, n, GFP_KERNEL);
+ buf = kzalloc_objs(struct crb_addr_pair, n);
if (buf == NULL)
return -ENOMEM;
diff --git a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c
index 00eab09c1710..106cbe12398a 100644
--- a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c
+++ b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c
@@ -950,7 +950,7 @@ static int qlcnic_get_act_pci_func(struct qlcnic_adapter *adapter)
if (ahw->op_mode == QLCNIC_MGMT_FUNC)
return 0;
- pci_info = kzalloc_objs(*pci_info, ahw->max_vnic_func, GFP_KERNEL);
+ pci_info = kzalloc_objs(*pci_info, ahw->max_vnic_func);
if (!pci_info)
return -ENOMEM;
@@ -984,7 +984,7 @@ int qlcnic_init_pci_info(struct qlcnic_adapter *adapter)
u16 act_pci_func;
u8 pfn;
- pci_info = kzalloc_objs(*pci_info, ahw->max_vnic_func, GFP_KERNEL);
+ pci_info = kzalloc_objs(*pci_info, ahw->max_vnic_func);
if (!pci_info)
return -ENOMEM;
@@ -2055,7 +2055,7 @@ static int qlcnic_alloc_adapter_resources(struct qlcnic_adapter *adapter)
struct qlcnic_hardware_context *ahw = adapter->ahw;
int err = 0;
- adapter->recv_ctx = kzalloc_obj(struct qlcnic_recv_context, GFP_KERNEL);
+ adapter->recv_ctx = kzalloc_obj(struct qlcnic_recv_context);
if (!adapter->recv_ctx) {
err = -ENOMEM;
goto err_out;
@@ -2439,7 +2439,7 @@ qlcnic_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
pci_set_master(pdev);
- ahw = kzalloc_obj(struct qlcnic_hardware_context, GFP_KERNEL);
+ ahw = kzalloc_obj(struct qlcnic_hardware_context);
if (!ahw) {
err = -ENOMEM;
goto err_out_free_res;
diff --git a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_minidump.c b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_minidump.c
index c2bf5455092c..44d16a303555 100644
--- a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_minidump.c
+++ b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_minidump.c
@@ -792,7 +792,7 @@ static u32 qlcnic_read_memory_pexdma(struct qlcnic_adapter *adapter,
}
/* Create DMA descriptor */
- dma_descr = kzalloc_obj(struct qlcnic_pex_dma_descriptor, GFP_KERNEL);
+ dma_descr = kzalloc_obj(struct qlcnic_pex_dma_descriptor);
if (!dma_descr) {
*ret = -ENOMEM;
return 0;
diff --git a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_sriov_common.c b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_sriov_common.c
index c6af69e5a700..e2f1169e05fa 100644
--- a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_sriov_common.c
+++ b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_sriov_common.c
@@ -149,7 +149,7 @@ int qlcnic_sriov_init(struct qlcnic_adapter *adapter, int num_vfs)
if (!qlcnic_sriov_enable_check(adapter))
return -EIO;
- sriov = kzalloc_obj(struct qlcnic_sriov, GFP_KERNEL);
+ sriov = kzalloc_obj(struct qlcnic_sriov);
if (!sriov)
return -ENOMEM;
@@ -201,7 +201,7 @@ int qlcnic_sriov_init(struct qlcnic_adapter *adapter, int num_vfs)
INIT_WORK(&vf->trans_work, qlcnic_sriov_process_bc_cmd);
if (qlcnic_sriov_pf_check(adapter)) {
- vp = kzalloc_obj(struct qlcnic_vport, GFP_KERNEL);
+ vp = kzalloc_obj(struct qlcnic_vport);
if (!vp) {
err = -ENOMEM;
goto qlcnic_destroy_async_wq;
diff --git a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_sysfs.c b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_sysfs.c
index 406101671602..6f0d6376607d 100644
--- a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_sysfs.c
+++ b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_sysfs.c
@@ -909,7 +909,7 @@ static ssize_t qlcnic_sysfs_read_pci_config(struct file *file,
int i, ret;
u32 count;
- pci_info = kzalloc_objs(*pci_info, size, GFP_KERNEL);
+ pci_info = kzalloc_objs(*pci_info, size);
if (!pci_info)
return -ENOMEM;
diff --git a/drivers/net/ethernet/qualcomm/rmnet/rmnet_config.c b/drivers/net/ethernet/qualcomm/rmnet/rmnet_config.c
index 723ddbb1a70a..269c0449760c 100644
--- a/drivers/net/ethernet/qualcomm/rmnet/rmnet_config.c
+++ b/drivers/net/ethernet/qualcomm/rmnet/rmnet_config.c
@@ -68,7 +68,7 @@ static int rmnet_register_real_device(struct net_device *real_dev,
return 0;
}
- port = kzalloc_obj(*port, GFP_KERNEL);
+ port = kzalloc_obj(*port);
if (!port)
return -ENOMEM;
@@ -143,7 +143,7 @@ static int rmnet_newlink(struct net_device *dev,
return -ENODEV;
}
- ep = kzalloc_obj(*ep, GFP_KERNEL);
+ ep = kzalloc_obj(*ep);
if (!ep)
return -ENOMEM;
diff --git a/drivers/net/ethernet/realtek/r8169_leds.c b/drivers/net/ethernet/realtek/r8169_leds.c
index 5da64cea5eb4..1999e81f0bca 100644
--- a/drivers/net/ethernet/realtek/r8169_leds.c
+++ b/drivers/net/ethernet/realtek/r8169_leds.c
@@ -154,7 +154,7 @@ struct r8169_led_classdev *rtl8168_init_leds(struct net_device *ndev)
struct r8169_led_classdev *leds;
int i;
- leds = kzalloc_objs(*leds, RTL8168_NUM_LEDS + 1, GFP_KERNEL);
+ leds = kzalloc_objs(*leds, RTL8168_NUM_LEDS + 1);
if (!leds)
return NULL;
@@ -253,7 +253,7 @@ struct r8169_led_classdev *rtl8125_init_leds(struct net_device *ndev)
struct r8169_led_classdev *leds;
int i;
- leds = kzalloc_objs(*leds, RTL8125_NUM_LEDS + 1, GFP_KERNEL);
+ leds = kzalloc_objs(*leds, RTL8125_NUM_LEDS + 1);
if (!leds)
return NULL;
diff --git a/drivers/net/ethernet/realtek/r8169_main.c b/drivers/net/ethernet/realtek/r8169_main.c
index ad0e07e2a09d..58788d196c57 100644
--- a/drivers/net/ethernet/realtek/r8169_main.c
+++ b/drivers/net/ethernet/realtek/r8169_main.c
@@ -2683,7 +2683,7 @@ static void rtl_request_firmware(struct rtl8169_private *tp)
if (tp->rtl_fw || !tp->fw_name)
return;
- rtl_fw = kzalloc_obj(*rtl_fw, GFP_KERNEL);
+ rtl_fw = kzalloc_obj(*rtl_fw);
if (!rtl_fw)
return;
diff --git a/drivers/net/ethernet/renesas/rswitch_main.c b/drivers/net/ethernet/renesas/rswitch_main.c
index 421677d4b1d7..65b84ea060d1 100644
--- a/drivers/net/ethernet/renesas/rswitch_main.c
+++ b/drivers/net/ethernet/renesas/rswitch_main.c
@@ -357,7 +357,7 @@ static int rswitch_gwca_queue_alloc(struct net_device *ndev,
sizeof(struct rswitch_ext_ts_desc) *
(gq->ring_size + 1), &gq->ring_dma, GFP_KERNEL);
} else {
- gq->skbs = kzalloc_objs(*gq->skbs, gq->ring_size, GFP_KERNEL);
+ gq->skbs = kzalloc_objs(*gq->skbs, gq->ring_size);
if (!gq->skbs)
return -ENOMEM;
gq->unmap_addrs = kzalloc_objs(*gq->unmap_addrs, gq->ring_size,
diff --git a/drivers/net/ethernet/renesas/rtsn.c b/drivers/net/ethernet/renesas/rtsn.c
index 2850e76d7f6f..03a2669f0518 100644
--- a/drivers/net/ethernet/renesas/rtsn.c
+++ b/drivers/net/ethernet/renesas/rtsn.c
@@ -349,8 +349,8 @@ static int rtsn_chain_init(struct rtsn_private *priv, int tx_size, int rx_size)
priv->num_tx_ring = tx_size;
priv->num_rx_ring = rx_size;
- priv->tx_skb = kzalloc_objs(*priv->tx_skb, tx_size, GFP_KERNEL);
- priv->rx_skb = kzalloc_objs(*priv->rx_skb, rx_size, GFP_KERNEL);
+ priv->tx_skb = kzalloc_objs(*priv->tx_skb, tx_size);
+ priv->rx_skb = kzalloc_objs(*priv->rx_skb, rx_size);
if (!priv->rx_skb || !priv->tx_skb)
goto error;
diff --git a/drivers/net/ethernet/rocker/rocker_main.c b/drivers/net/ethernet/rocker/rocker_main.c
index 503a9869e1db..32eb56335c63 100644
--- a/drivers/net/ethernet/rocker/rocker_main.c
+++ b/drivers/net/ethernet/rocker/rocker_main.c
@@ -66,7 +66,7 @@ static struct rocker_wait *rocker_wait_create(void)
{
struct rocker_wait *wait;
- wait = kzalloc_obj(*wait, GFP_KERNEL);
+ wait = kzalloc_obj(*wait);
if (!wait)
return NULL;
return wait;
@@ -435,7 +435,7 @@ static int rocker_dma_ring_create(const struct rocker *rocker,
info->type = type;
info->head = 0;
info->tail = 0;
- info->desc_info = kzalloc_objs(*info->desc_info, info->size, GFP_KERNEL);
+ info->desc_info = kzalloc_objs(*info->desc_info, info->size);
if (!info->desc_info)
return -ENOMEM;
@@ -2848,7 +2848,7 @@ static int rocker_probe(struct pci_dev *pdev, const struct pci_device_id *id)
struct rocker *rocker;
int err;
- rocker = kzalloc_obj(*rocker, GFP_KERNEL);
+ rocker = kzalloc_obj(*rocker);
if (!rocker)
return -ENOMEM;
diff --git a/drivers/net/ethernet/rocker/rocker_ofdpa.c b/drivers/net/ethernet/rocker/rocker_ofdpa.c
index a9795b79d1d4..50ea5f9ef63a 100644
--- a/drivers/net/ethernet/rocker/rocker_ofdpa.c
+++ b/drivers/net/ethernet/rocker/rocker_ofdpa.c
@@ -838,7 +838,7 @@ static int ofdpa_flow_tbl_ig_port(struct ofdpa_port *ofdpa_port, int flags,
{
struct ofdpa_flow_tbl_entry *entry;
- entry = kzalloc_obj(*entry, GFP_KERNEL);
+ entry = kzalloc_obj(*entry);
if (!entry)
return -ENOMEM;
@@ -860,7 +860,7 @@ static int ofdpa_flow_tbl_vlan(struct ofdpa_port *ofdpa_port,
{
struct ofdpa_flow_tbl_entry *entry;
- entry = kzalloc_obj(*entry, GFP_KERNEL);
+ entry = kzalloc_obj(*entry);
if (!entry)
return -ENOMEM;
@@ -886,7 +886,7 @@ static int ofdpa_flow_tbl_term_mac(struct ofdpa_port *ofdpa_port,
{
struct ofdpa_flow_tbl_entry *entry;
- entry = kzalloc_obj(*entry, GFP_KERNEL);
+ entry = kzalloc_obj(*entry);
if (!entry)
return -ENOMEM;
@@ -976,7 +976,7 @@ static int ofdpa_flow_tbl_ucast4_routing(struct ofdpa_port *ofdpa_port,
{
struct ofdpa_flow_tbl_entry *entry;
- entry = kzalloc_obj(*entry, GFP_KERNEL);
+ entry = kzalloc_obj(*entry);
if (!entry)
return -ENOMEM;
@@ -1006,7 +1006,7 @@ static int ofdpa_flow_tbl_acl(struct ofdpa_port *ofdpa_port, int flags,
u32 priority;
struct ofdpa_flow_tbl_entry *entry;
- entry = kzalloc_obj(*entry, GFP_KERNEL);
+ entry = kzalloc_obj(*entry);
if (!entry)
return -ENOMEM;
@@ -1150,7 +1150,7 @@ static int ofdpa_group_l2_interface(struct ofdpa_port *ofdpa_port,
{
struct ofdpa_group_tbl_entry *entry;
- entry = kzalloc_obj(*entry, GFP_KERNEL);
+ entry = kzalloc_obj(*entry);
if (!entry)
return -ENOMEM;
@@ -1166,7 +1166,7 @@ static int ofdpa_group_l2_fan_out(struct ofdpa_port *ofdpa_port,
{
struct ofdpa_group_tbl_entry *entry;
- entry = kzalloc_obj(*entry, GFP_KERNEL);
+ entry = kzalloc_obj(*entry);
if (!entry)
return -ENOMEM;
@@ -1199,7 +1199,7 @@ static int ofdpa_group_l3_unicast(struct ofdpa_port *ofdpa_port, int flags,
{
struct ofdpa_group_tbl_entry *entry;
- entry = kzalloc_obj(*entry, GFP_KERNEL);
+ entry = kzalloc_obj(*entry);
if (!entry)
return -ENOMEM;
@@ -1386,7 +1386,7 @@ static int ofdpa_port_ipv4_nh(struct ofdpa_port *ofdpa_port,
bool resolved = true;
int err = 0;
- entry = kzalloc_obj(*entry, GFP_KERNEL);
+ entry = kzalloc_obj(*entry);
if (!entry)
return -ENOMEM;
@@ -1904,7 +1904,7 @@ static int ofdpa_port_fdb(struct ofdpa_port *ofdpa_port,
bool removing = (flags & OFDPA_OP_FLAG_REMOVE);
unsigned long lock_flags;
- fdb = kzalloc_obj(*fdb, GFP_KERNEL);
+ fdb = kzalloc_obj(*fdb);
if (!fdb)
return -ENOMEM;
@@ -2232,7 +2232,7 @@ static __be16 ofdpa_port_internal_vlan_id_get(struct ofdpa_port *ofdpa_port,
unsigned long lock_flags;
int i;
- entry = kzalloc_obj(*entry, GFP_KERNEL);
+ entry = kzalloc_obj(*entry);
if (!entry)
return 0;
diff --git a/drivers/net/ethernet/samsung/sxgbe/sxgbe_main.c b/drivers/net/ethernet/samsung/sxgbe/sxgbe_main.c
index 437bcf8ad0c8..4f16779f2e3e 100644
--- a/drivers/net/ethernet/samsung/sxgbe/sxgbe_main.c
+++ b/drivers/net/ethernet/samsung/sxgbe/sxgbe_main.c
@@ -489,7 +489,7 @@ static int init_rx_ring(struct net_device *dev, u8 queue_no,
return -ENOMEM;
/* allocate memory for RX skbuff array */
- rx_ring->rx_skbuff_dma = kmalloc_objs(dma_addr_t, rx_rsize, GFP_KERNEL);
+ rx_ring->rx_skbuff_dma = kmalloc_objs(dma_addr_t, rx_rsize);
if (!rx_ring->rx_skbuff_dma) {
ret = -ENOMEM;
goto err_free_dma_rx;
@@ -2006,7 +2006,7 @@ static int sxgbe_hw_init(struct sxgbe_priv_data * const priv)
{
u32 ctrl_ids;
- priv->hw = kmalloc_obj(*priv->hw, GFP_KERNEL);
+ priv->hw = kmalloc_obj(*priv->hw);
if(!priv->hw)
return -ENOMEM;
diff --git a/drivers/net/ethernet/sfc/ef10.c b/drivers/net/ethernet/sfc/ef10.c
index 58d3a381271d..7e04f115bbaa 100644
--- a/drivers/net/ethernet/sfc/ef10.c
+++ b/drivers/net/ethernet/sfc/ef10.c
@@ -431,7 +431,7 @@ static int efx_ef10_add_vlan(struct efx_nic *efx, u16 vid)
}
rc = -ENOMEM;
- vlan = kzalloc_obj(*vlan, GFP_KERNEL);
+ vlan = kzalloc_obj(*vlan);
if (!vlan)
goto fail_alloc;
@@ -527,7 +527,7 @@ static int efx_ef10_probe(struct efx_nic *efx)
struct efx_ef10_nic_data *nic_data;
int i, rc;
- nic_data = kzalloc_obj(*nic_data, GFP_KERNEL);
+ nic_data = kzalloc_obj(*nic_data);
if (!nic_data)
return -ENOMEM;
efx->nic_data = nic_data;
@@ -3591,7 +3591,7 @@ static int efx_ef10_mtd_probe(struct efx_nic *efx)
MCDI_VAR_ARRAY_LEN(outlen, NVRAM_PARTITIONS_OUT_TYPE_ID))
return -EIO;
- parts = kzalloc_objs(*parts, n_parts_total, GFP_KERNEL);
+ parts = kzalloc_objs(*parts, n_parts_total);
if (!parts)
return -ENOMEM;
diff --git a/drivers/net/ethernet/sfc/ef100.c b/drivers/net/ethernet/sfc/ef100.c
index d2f64e049be1..0dd5364506d7 100644
--- a/drivers/net/ethernet/sfc/ef100.c
+++ b/drivers/net/ethernet/sfc/ef100.c
@@ -453,7 +453,7 @@ static int ef100_pci_probe(struct pci_dev *pci_dev,
int rc;
/* Allocate probe data and struct efx_nic */
- probe_data = kzalloc_obj(*probe_data, GFP_KERNEL);
+ probe_data = kzalloc_obj(*probe_data);
if (!probe_data)
return -ENOMEM;
probe_data->pci_dev = pci_dev;
diff --git a/drivers/net/ethernet/sfc/ef100_nic.c b/drivers/net/ethernet/sfc/ef100_nic.c
index da433a94a994..00050f786cae 100644
--- a/drivers/net/ethernet/sfc/ef100_nic.c
+++ b/drivers/net/ethernet/sfc/ef100_nic.c
@@ -351,7 +351,7 @@ int ef100_phy_probe(struct efx_nic *efx)
int rc;
/* Probe for the PHY */
- efx->phy_data = kzalloc_obj(struct efx_mcdi_phy_data, GFP_KERNEL);
+ efx->phy_data = kzalloc_obj(struct efx_mcdi_phy_data);
if (!efx->phy_data)
return -ENOMEM;
@@ -1020,7 +1020,7 @@ static int ef100_probe_main(struct efx_nic *efx)
if (WARN_ON(bar_size == 0))
return -EIO;
- nic_data = kzalloc_obj(*nic_data, GFP_KERNEL);
+ nic_data = kzalloc_obj(*nic_data);
if (!nic_data)
return -ENOMEM;
efx->nic_data = nic_data;
diff --git a/drivers/net/ethernet/sfc/ef10_sriov.c b/drivers/net/ethernet/sfc/ef10_sriov.c
index 5b3377ca7220..f98f1707d1a9 100644
--- a/drivers/net/ethernet/sfc/ef10_sriov.c
+++ b/drivers/net/ethernet/sfc/ef10_sriov.c
@@ -189,7 +189,7 @@ static int efx_ef10_sriov_alloc_vf_vswitching(struct efx_nic *efx)
unsigned int i;
int rc;
- nic_data->vf = kzalloc_objs(struct ef10_vf, efx->vf_count, GFP_KERNEL);
+ nic_data->vf = kzalloc_objs(struct ef10_vf, efx->vf_count);
if (!nic_data->vf)
return -ENOMEM;
diff --git a/drivers/net/ethernet/sfc/efx.c b/drivers/net/ethernet/sfc/efx.c
index 133a23a9dd5a..8f136a11d396 100644
--- a/drivers/net/ethernet/sfc/efx.c
+++ b/drivers/net/ethernet/sfc/efx.c
@@ -1155,7 +1155,7 @@ static int efx_pci_probe(struct pci_dev *pci_dev,
int rc;
/* Allocate probe data and struct efx_nic */
- probe_data = kzalloc_obj(*probe_data, GFP_KERNEL);
+ probe_data = kzalloc_obj(*probe_data);
if (!probe_data)
return -ENOMEM;
probe_data->pci_dev = pci_dev;
diff --git a/drivers/net/ethernet/sfc/efx_channels.c b/drivers/net/ethernet/sfc/efx_channels.c
index 84beb79f1969..c3766594d12e 100644
--- a/drivers/net/ethernet/sfc/efx_channels.c
+++ b/drivers/net/ethernet/sfc/efx_channels.c
@@ -534,7 +534,7 @@ static struct efx_channel *efx_alloc_channel(struct efx_nic *efx, int i)
struct efx_channel *channel;
int j;
- channel = kzalloc_obj(*channel, GFP_KERNEL);
+ channel = kzalloc_obj(*channel);
if (!channel)
return NULL;
@@ -604,7 +604,7 @@ struct efx_channel *efx_copy_channel(const struct efx_channel *old_channel)
struct efx_channel *channel;
int j;
- channel = kmalloc_obj(*channel, GFP_KERNEL);
+ channel = kmalloc_obj(*channel);
if (!channel)
return NULL;
diff --git a/drivers/net/ethernet/sfc/ethtool_common.c b/drivers/net/ethernet/sfc/ethtool_common.c
index 6b762153c8a4..54f8e4626568 100644
--- a/drivers/net/ethernet/sfc/ethtool_common.c
+++ b/drivers/net/ethernet/sfc/ethtool_common.c
@@ -133,7 +133,7 @@ void efx_ethtool_self_test(struct net_device *net_dev,
bool already_up;
int rc = -ENOMEM;
- efx_tests = kzalloc_obj(*efx_tests, GFP_KERNEL);
+ efx_tests = kzalloc_obj(*efx_tests);
if (!efx_tests)
goto fail;
diff --git a/drivers/net/ethernet/sfc/falcon/efx.c b/drivers/net/ethernet/sfc/falcon/efx.c
index 2852868c1003..0c197b448645 100644
--- a/drivers/net/ethernet/sfc/falcon/efx.c
+++ b/drivers/net/ethernet/sfc/falcon/efx.c
@@ -423,7 +423,7 @@ ef4_alloc_channel(struct ef4_nic *efx, int i, struct ef4_channel *old_channel)
struct ef4_tx_queue *tx_queue;
int j;
- channel = kzalloc_obj(*channel, GFP_KERNEL);
+ channel = kzalloc_obj(*channel);
if (!channel)
return NULL;
@@ -456,7 +456,7 @@ ef4_copy_channel(const struct ef4_channel *old_channel)
struct ef4_tx_queue *tx_queue;
int j;
- channel = kmalloc_obj(*channel, GFP_KERNEL);
+ channel = kmalloc_obj(*channel);
if (!channel)
return NULL;
diff --git a/drivers/net/ethernet/sfc/falcon/ethtool.c b/drivers/net/ethernet/sfc/falcon/ethtool.c
index 069269884396..3d81b3ca61e9 100644
--- a/drivers/net/ethernet/sfc/falcon/ethtool.c
+++ b/drivers/net/ethernet/sfc/falcon/ethtool.c
@@ -493,7 +493,7 @@ static void ef4_ethtool_self_test(struct net_device *net_dev,
bool already_up;
int rc = -ENOMEM;
- ef4_tests = kzalloc_obj(*ef4_tests, GFP_KERNEL);
+ ef4_tests = kzalloc_obj(*ef4_tests);
if (!ef4_tests)
goto fail;
diff --git a/drivers/net/ethernet/sfc/falcon/falcon.c b/drivers/net/ethernet/sfc/falcon/falcon.c
index 1603c5267654..fb1d19b7c419 100644
--- a/drivers/net/ethernet/sfc/falcon/falcon.c
+++ b/drivers/net/ethernet/sfc/falcon/falcon.c
@@ -929,7 +929,7 @@ static int falcon_mtd_probe(struct ef4_nic *efx)
ASSERT_RTNL();
/* Allocate space for maximum number of partitions */
- parts = kzalloc_objs(*parts, 2, GFP_KERNEL);
+ parts = kzalloc_objs(*parts, 2);
if (!parts)
return -ENOMEM;
n_parts = 0;
@@ -2180,7 +2180,7 @@ static int falcon_probe_nvconfig(struct ef4_nic *efx)
struct falcon_nvconfig *nvconfig;
int rc;
- nvconfig = kmalloc_obj(*nvconfig, GFP_KERNEL);
+ nvconfig = kmalloc_obj(*nvconfig);
if (!nvconfig)
return -ENOMEM;
@@ -2289,7 +2289,7 @@ static int falcon_probe_nic(struct ef4_nic *efx)
efx->primary = efx; /* only one usable function per controller */
/* Allocate storage for hardware specific data */
- nic_data = kzalloc_obj(*nic_data, GFP_KERNEL);
+ nic_data = kzalloc_obj(*nic_data);
if (!nic_data)
return -ENOMEM;
efx->nic_data = nic_data;
diff --git a/drivers/net/ethernet/sfc/falcon/farch.c b/drivers/net/ethernet/sfc/falcon/farch.c
index 67b62c3a9839..23d507a3820d 100644
--- a/drivers/net/ethernet/sfc/falcon/farch.c
+++ b/drivers/net/ethernet/sfc/falcon/farch.c
@@ -2701,7 +2701,7 @@ int ef4_farch_filter_table_probe(struct ef4_nic *efx)
struct ef4_farch_filter_table *table;
unsigned table_id;
- state = kzalloc_obj(struct ef4_farch_filter_state, GFP_KERNEL);
+ state = kzalloc_obj(struct ef4_farch_filter_state);
if (!state)
return -ENOMEM;
efx->filter_state = state;
diff --git a/drivers/net/ethernet/sfc/falcon/qt202x_phy.c b/drivers/net/ethernet/sfc/falcon/qt202x_phy.c
index dc6383ceb656..2dd7d7ba1559 100644
--- a/drivers/net/ethernet/sfc/falcon/qt202x_phy.c
+++ b/drivers/net/ethernet/sfc/falcon/qt202x_phy.c
@@ -340,7 +340,7 @@ static int qt202x_phy_probe(struct ef4_nic *efx)
{
struct qt202x_phy_data *phy_data;
- phy_data = kzalloc_obj(struct qt202x_phy_data, GFP_KERNEL);
+ phy_data = kzalloc_obj(struct qt202x_phy_data);
if (!phy_data)
return -ENOMEM;
efx->phy_data = phy_data;
diff --git a/drivers/net/ethernet/sfc/falcon/rx.c b/drivers/net/ethernet/sfc/falcon/rx.c
index d32bab1b5783..f7cc47b9b234 100644
--- a/drivers/net/ethernet/sfc/falcon/rx.c
+++ b/drivers/net/ethernet/sfc/falcon/rx.c
@@ -701,7 +701,7 @@ int ef4_probe_rx_queue(struct ef4_rx_queue *rx_queue)
rx_queue->ptr_mask);
/* Allocate RX buffers */
- rx_queue->buffer = kzalloc_objs(*rx_queue->buffer, entries, GFP_KERNEL);
+ rx_queue->buffer = kzalloc_objs(*rx_queue->buffer, entries);
if (!rx_queue->buffer)
return -ENOMEM;
diff --git a/drivers/net/ethernet/sfc/falcon/selftest.c b/drivers/net/ethernet/sfc/falcon/selftest.c
index 8205a08132ae..ddea1e715f00 100644
--- a/drivers/net/ethernet/sfc/falcon/selftest.c
+++ b/drivers/net/ethernet/sfc/falcon/selftest.c
@@ -635,7 +635,7 @@ static int ef4_test_loopbacks(struct ef4_nic *efx, struct ef4_self_tests *tests,
/* Set the port loopback_selftest member. From this point on
* all received packets will be dropped. Mark the state as
* "flushing" so all inflight packets are dropped */
- state = kzalloc_obj(*state, GFP_KERNEL);
+ state = kzalloc_obj(*state);
if (state == NULL)
return -ENOMEM;
BUG_ON(efx->loopback_selftest);
diff --git a/drivers/net/ethernet/sfc/falcon/tenxpress.c b/drivers/net/ethernet/sfc/falcon/tenxpress.c
index 4a5e24b4d174..db9d35bde75d 100644
--- a/drivers/net/ethernet/sfc/falcon/tenxpress.c
+++ b/drivers/net/ethernet/sfc/falcon/tenxpress.c
@@ -165,7 +165,7 @@ static int tenxpress_phy_probe(struct ef4_nic *efx)
struct tenxpress_phy_data *phy_data;
/* Allocate phy private storage */
- phy_data = kzalloc_obj(*phy_data, GFP_KERNEL);
+ phy_data = kzalloc_obj(*phy_data);
if (!phy_data)
return -ENOMEM;
efx->phy_data = phy_data;
diff --git a/drivers/net/ethernet/sfc/falcon/tx.c b/drivers/net/ethernet/sfc/falcon/tx.c
index a295b40342a4..c514d2c65672 100644
--- a/drivers/net/ethernet/sfc/falcon/tx.c
+++ b/drivers/net/ethernet/sfc/falcon/tx.c
@@ -544,7 +544,7 @@ int ef4_probe_tx_queue(struct ef4_tx_queue *tx_queue)
tx_queue->queue, efx->txq_entries, tx_queue->ptr_mask);
/* Allocate software ring */
- tx_queue->buffer = kzalloc_objs(*tx_queue->buffer, entries, GFP_KERNEL);
+ tx_queue->buffer = kzalloc_objs(*tx_queue->buffer, entries);
if (!tx_queue->buffer)
return -ENOMEM;
diff --git a/drivers/net/ethernet/sfc/falcon/txc43128_phy.c b/drivers/net/ethernet/sfc/falcon/txc43128_phy.c
index 0025baff6efe..f20f9166d730 100644
--- a/drivers/net/ethernet/sfc/falcon/txc43128_phy.c
+++ b/drivers/net/ethernet/sfc/falcon/txc43128_phy.c
@@ -323,7 +323,7 @@ static int txc43128_phy_probe(struct ef4_nic *efx)
struct txc43128_data *phy_data;
/* Allocate phy private storage */
- phy_data = kzalloc_obj(*phy_data, GFP_KERNEL);
+ phy_data = kzalloc_obj(*phy_data);
if (!phy_data)
return -ENOMEM;
efx->phy_data = phy_data;
diff --git a/drivers/net/ethernet/sfc/mae.c b/drivers/net/ethernet/sfc/mae.c
index 6e8e90254792..33278d0580aa 100644
--- a/drivers/net/ethernet/sfc/mae.c
+++ b/drivers/net/ethernet/sfc/mae.c
@@ -1158,7 +1158,7 @@ int efx_mae_enumerate_mports(struct efx_nic *efx)
for (i = 0; i < count; i++) {
struct mae_mport_desc *d;
- d = kzalloc_obj(*d, GFP_KERNEL);
+ d = kzalloc_obj(*d);
if (!d) {
rc = -ENOMEM;
goto fail;
@@ -2313,7 +2313,7 @@ int efx_init_mae(struct efx_nic *efx)
if (!nic_data->have_mport)
return -EINVAL;
- mae = kmalloc_obj(*mae, GFP_KERNEL);
+ mae = kmalloc_obj(*mae);
if (!mae)
return -ENOMEM;
diff --git a/drivers/net/ethernet/sfc/mcdi.c b/drivers/net/ethernet/sfc/mcdi.c
index 7a19bba484cd..e65db9b70724 100644
--- a/drivers/net/ethernet/sfc/mcdi.c
+++ b/drivers/net/ethernet/sfc/mcdi.c
@@ -63,7 +63,7 @@ int efx_mcdi_init(struct efx_nic *efx)
bool already_attached;
int rc = -ENOMEM;
- efx->mcdi = kzalloc_obj(*efx->mcdi, GFP_KERNEL);
+ efx->mcdi = kzalloc_obj(*efx->mcdi);
if (!efx->mcdi)
goto fail;
diff --git a/drivers/net/ethernet/sfc/mcdi_filters.c b/drivers/net/ethernet/sfc/mcdi_filters.c
index 80d53614e4fc..e10c868b987f 100644
--- a/drivers/net/ethernet/sfc/mcdi_filters.c
+++ b/drivers/net/ethernet/sfc/mcdi_filters.c
@@ -1310,7 +1310,7 @@ int efx_mcdi_filter_table_probe(struct efx_nic *efx, bool multicast_chaining)
if (efx->filter_state) /* already probed */
return 0;
- table = kzalloc_obj(*table, GFP_KERNEL);
+ table = kzalloc_obj(*table);
if (!table)
return -ENOMEM;
@@ -1586,7 +1586,7 @@ int efx_mcdi_filter_add_vlan(struct efx_nic *efx, u16 vid)
return -EALREADY;
}
- vlan = kzalloc_obj(*vlan, GFP_KERNEL);
+ vlan = kzalloc_obj(*vlan);
if (!vlan)
return -ENOMEM;
diff --git a/drivers/net/ethernet/sfc/mcdi_mon.c b/drivers/net/ethernet/sfc/mcdi_mon.c
index 2d6472ec4a02..68eb11117c2d 100644
--- a/drivers/net/ethernet/sfc/mcdi_mon.c
+++ b/drivers/net/ethernet/sfc/mcdi_mon.c
@@ -350,7 +350,7 @@ int efx_mcdi_mon_probe(struct efx_nic *efx)
* value, min, max, crit, alarm and label for each sensor.
*/
n_attrs = 6 * n_sensors;
- hwmon->attrs = kzalloc_objs(*hwmon->attrs, n_attrs, GFP_KERNEL);
+ hwmon->attrs = kzalloc_objs(*hwmon->attrs, n_attrs);
if (!hwmon->attrs) {
rc = -ENOMEM;
goto fail;
diff --git a/drivers/net/ethernet/sfc/mcdi_port_common.c b/drivers/net/ethernet/sfc/mcdi_port_common.c
index ba9e29ca9874..8d3d5cdfbdfc 100644
--- a/drivers/net/ethernet/sfc/mcdi_port_common.c
+++ b/drivers/net/ethernet/sfc/mcdi_port_common.c
@@ -429,7 +429,7 @@ int efx_mcdi_phy_probe(struct efx_nic *efx)
int rc;
/* Initialise and populate phy_data */
- phy_data = kzalloc_obj(*phy_data, GFP_KERNEL);
+ phy_data = kzalloc_obj(*phy_data);
if (phy_data == NULL)
return -ENOMEM;
diff --git a/drivers/net/ethernet/sfc/ptp.c b/drivers/net/ethernet/sfc/ptp.c
index 7268f049cf3d..6ca9a75af01d 100644
--- a/drivers/net/ethernet/sfc/ptp.c
+++ b/drivers/net/ethernet/sfc/ptp.c
@@ -1263,7 +1263,7 @@ static int efx_ptp_insert_filter(struct efx_nic *efx,
return 0;
}
- rxfilter = kzalloc_obj(*rxfilter, GFP_KERNEL);
+ rxfilter = kzalloc_obj(*rxfilter);
if (!rxfilter)
return -ENOMEM;
@@ -1565,7 +1565,7 @@ int efx_ptp_probe(struct efx_nic *efx, struct efx_channel *channel)
return 0;
}
- ptp = kzalloc_obj(struct efx_ptp_data, GFP_KERNEL);
+ ptp = kzalloc_obj(struct efx_ptp_data);
efx->ptp_data = ptp;
if (!efx->ptp_data)
return -ENOMEM;
diff --git a/drivers/net/ethernet/sfc/rx_common.c b/drivers/net/ethernet/sfc/rx_common.c
index 809faeead09b..aa3647422f83 100644
--- a/drivers/net/ethernet/sfc/rx_common.c
+++ b/drivers/net/ethernet/sfc/rx_common.c
@@ -204,7 +204,7 @@ int efx_probe_rx_queue(struct efx_rx_queue *rx_queue)
rx_queue->ptr_mask);
/* Allocate RX buffers */
- rx_queue->buffer = kzalloc_objs(*rx_queue->buffer, entries, GFP_KERNEL);
+ rx_queue->buffer = kzalloc_objs(*rx_queue->buffer, entries);
if (!rx_queue->buffer)
return -ENOMEM;
diff --git a/drivers/net/ethernet/sfc/selftest.c b/drivers/net/ethernet/sfc/selftest.c
index ef37de056a19..26bff77f743b 100644
--- a/drivers/net/ethernet/sfc/selftest.c
+++ b/drivers/net/ethernet/sfc/selftest.c
@@ -628,7 +628,7 @@ static int efx_test_loopbacks(struct efx_nic *efx, struct efx_self_tests *tests,
/* Set the port loopback_selftest member. From this point on
* all received packets will be dropped. Mark the state as
* "flushing" so all inflight packets are dropped */
- state = kzalloc_obj(*state, GFP_KERNEL);
+ state = kzalloc_obj(*state);
if (state == NULL)
return -ENOMEM;
BUG_ON(efx->loopback_selftest);
diff --git a/drivers/net/ethernet/sfc/siena/efx_channels.c b/drivers/net/ethernet/sfc/siena/efx_channels.c
index f2ed3c8b1f5d..1ddab2e2263e 100644
--- a/drivers/net/ethernet/sfc/siena/efx_channels.c
+++ b/drivers/net/ethernet/sfc/siena/efx_channels.c
@@ -536,7 +536,7 @@ static struct efx_channel *efx_alloc_channel(struct efx_nic *efx, int i)
struct efx_channel *channel;
int j;
- channel = kzalloc_obj(*channel, GFP_KERNEL);
+ channel = kzalloc_obj(*channel);
if (!channel)
return NULL;
@@ -607,7 +607,7 @@ struct efx_channel *efx_copy_channel(const struct efx_channel *old_channel)
struct efx_channel *channel;
int j;
- channel = kmalloc_obj(*channel, GFP_KERNEL);
+ channel = kmalloc_obj(*channel);
if (!channel)
return NULL;
diff --git a/drivers/net/ethernet/sfc/siena/ethtool_common.c b/drivers/net/ethernet/sfc/siena/ethtool_common.c
index cb19af6aafd9..76cbce2b9592 100644
--- a/drivers/net/ethernet/sfc/siena/ethtool_common.c
+++ b/drivers/net/ethernet/sfc/siena/ethtool_common.c
@@ -355,7 +355,7 @@ void efx_siena_ethtool_self_test(struct net_device *net_dev,
bool already_up;
int rc = -ENOMEM;
- efx_tests = kzalloc_obj(*efx_tests, GFP_KERNEL);
+ efx_tests = kzalloc_obj(*efx_tests);
if (!efx_tests)
goto fail;
diff --git a/drivers/net/ethernet/sfc/siena/farch.c b/drivers/net/ethernet/sfc/siena/farch.c
index ab2e36520fb9..7613d7988894 100644
--- a/drivers/net/ethernet/sfc/siena/farch.c
+++ b/drivers/net/ethernet/sfc/siena/farch.c
@@ -2790,7 +2790,7 @@ int efx_farch_filter_table_probe(struct efx_nic *efx)
struct efx_farch_filter_table *table;
unsigned table_id;
- state = kzalloc_obj(struct efx_farch_filter_state, GFP_KERNEL);
+ state = kzalloc_obj(struct efx_farch_filter_state);
if (!state)
return -ENOMEM;
efx->filter_state = state;
diff --git a/drivers/net/ethernet/sfc/siena/mcdi.c b/drivers/net/ethernet/sfc/siena/mcdi.c
index 3bee5c0e6edc..4d0d6bd5d3d1 100644
--- a/drivers/net/ethernet/sfc/siena/mcdi.c
+++ b/drivers/net/ethernet/sfc/siena/mcdi.c
@@ -65,7 +65,7 @@ int efx_siena_mcdi_init(struct efx_nic *efx)
bool already_attached;
int rc = -ENOMEM;
- efx->mcdi = kzalloc_obj(*efx->mcdi, GFP_KERNEL);
+ efx->mcdi = kzalloc_obj(*efx->mcdi);
if (!efx->mcdi)
goto fail;
diff --git a/drivers/net/ethernet/sfc/siena/mcdi_mon.c b/drivers/net/ethernet/sfc/siena/mcdi_mon.c
index ddf7d712fb21..9d3df883656b 100644
--- a/drivers/net/ethernet/sfc/siena/mcdi_mon.c
+++ b/drivers/net/ethernet/sfc/siena/mcdi_mon.c
@@ -350,7 +350,7 @@ int efx_siena_mcdi_mon_probe(struct efx_nic *efx)
* value, min, max, crit, alarm and label for each sensor.
*/
n_attrs = 6 * n_sensors;
- hwmon->attrs = kzalloc_objs(*hwmon->attrs, n_attrs, GFP_KERNEL);
+ hwmon->attrs = kzalloc_objs(*hwmon->attrs, n_attrs);
if (!hwmon->attrs) {
rc = -ENOMEM;
goto fail;
diff --git a/drivers/net/ethernet/sfc/siena/mcdi_port_common.c b/drivers/net/ethernet/sfc/siena/mcdi_port_common.c
index 6154d09f9dde..72d07a2ec553 100644
--- a/drivers/net/ethernet/sfc/siena/mcdi_port_common.c
+++ b/drivers/net/ethernet/sfc/siena/mcdi_port_common.c
@@ -430,7 +430,7 @@ int efx_siena_mcdi_phy_probe(struct efx_nic *efx)
int rc;
/* Initialise and populate phy_data */
- phy_data = kzalloc_obj(*phy_data, GFP_KERNEL);
+ phy_data = kzalloc_obj(*phy_data);
if (phy_data == NULL)
return -ENOMEM;
diff --git a/drivers/net/ethernet/sfc/siena/ptp.c b/drivers/net/ethernet/sfc/siena/ptp.c
index 2cb1d0fc9daa..0b723a127364 100644
--- a/drivers/net/ethernet/sfc/siena/ptp.c
+++ b/drivers/net/ethernet/sfc/siena/ptp.c
@@ -1443,7 +1443,7 @@ static int efx_ptp_probe(struct efx_nic *efx, struct efx_channel *channel)
int rc = 0;
unsigned int pos;
- ptp = kzalloc_obj(struct efx_ptp_data, GFP_KERNEL);
+ ptp = kzalloc_obj(struct efx_ptp_data);
efx->ptp_data = ptp;
if (!efx->ptp_data)
return -ENOMEM;
diff --git a/drivers/net/ethernet/sfc/siena/rx_common.c b/drivers/net/ethernet/sfc/siena/rx_common.c
index 71549c21ebc1..83dfd6aae9fe 100644
--- a/drivers/net/ethernet/sfc/siena/rx_common.c
+++ b/drivers/net/ethernet/sfc/siena/rx_common.c
@@ -207,7 +207,7 @@ int efx_siena_probe_rx_queue(struct efx_rx_queue *rx_queue)
rx_queue->ptr_mask);
/* Allocate RX buffers */
- rx_queue->buffer = kzalloc_objs(*rx_queue->buffer, entries, GFP_KERNEL);
+ rx_queue->buffer = kzalloc_objs(*rx_queue->buffer, entries);
if (!rx_queue->buffer)
return -ENOMEM;
diff --git a/drivers/net/ethernet/sfc/siena/selftest.c b/drivers/net/ethernet/sfc/siena/selftest.c
index 668e6771b8bf..864632a07851 100644
--- a/drivers/net/ethernet/sfc/siena/selftest.c
+++ b/drivers/net/ethernet/sfc/siena/selftest.c
@@ -633,7 +633,7 @@ static int efx_test_loopbacks(struct efx_nic *efx, struct efx_self_tests *tests,
/* Set the port loopback_selftest member. From this point on
* all received packets will be dropped. Mark the state as
* "flushing" so all inflight packets are dropped */
- state = kzalloc_obj(*state, GFP_KERNEL);
+ state = kzalloc_obj(*state);
if (state == NULL)
return -ENOMEM;
BUG_ON(efx->loopback_selftest);
diff --git a/drivers/net/ethernet/sfc/siena/siena.c b/drivers/net/ethernet/sfc/siena/siena.c
index 4718a31b4d94..dbd1417f803f 100644
--- a/drivers/net/ethernet/sfc/siena/siena.c
+++ b/drivers/net/ethernet/sfc/siena/siena.c
@@ -266,7 +266,7 @@ static int siena_probe_nic(struct efx_nic *efx)
int rc;
/* Allocate storage for hardware specific data */
- nic_data = kzalloc_obj(struct siena_nic_data, GFP_KERNEL);
+ nic_data = kzalloc_obj(struct siena_nic_data);
if (!nic_data)
return -ENOMEM;
nic_data->efx = efx;
@@ -923,7 +923,7 @@ static int siena_mtd_probe(struct efx_nic *efx)
if (rc)
return rc;
- parts = kzalloc_objs(*parts, hweight32(nvram_types), GFP_KERNEL);
+ parts = kzalloc_objs(*parts, hweight32(nvram_types));
if (!parts)
return -ENOMEM;
diff --git a/drivers/net/ethernet/sfc/siena/siena_sriov.c b/drivers/net/ethernet/sfc/siena/siena_sriov.c
index bcab299f7204..d9789330f8dc 100644
--- a/drivers/net/ethernet/sfc/siena/siena_sriov.c
+++ b/drivers/net/ethernet/sfc/siena/siena_sriov.c
@@ -1123,7 +1123,7 @@ static void efx_siena_sriov_peer_work(struct work_struct *data)
++peer_count;
if (--peer_space == 0) {
if (list_empty(&pages)) {
- epp = kmalloc_obj(*epp, GFP_KERNEL);
+ epp = kmalloc_obj(*epp);
if (!epp)
break;
epp->ptr = dma_alloc_coherent(
@@ -1197,7 +1197,7 @@ static int efx_siena_sriov_vf_alloc(struct efx_nic *efx)
struct siena_vf *vf;
struct siena_nic_data *nic_data = efx->nic_data;
- nic_data->vf = kzalloc_objs(*nic_data->vf, efx->vf_count, GFP_KERNEL);
+ nic_data->vf = kzalloc_objs(*nic_data->vf, efx->vf_count);
if (!nic_data->vf)
return -ENOMEM;
diff --git a/drivers/net/ethernet/sfc/siena/tx_common.c b/drivers/net/ethernet/sfc/siena/tx_common.c
index ca7f910a4847..6a92543a1c5e 100644
--- a/drivers/net/ethernet/sfc/siena/tx_common.c
+++ b/drivers/net/ethernet/sfc/siena/tx_common.c
@@ -36,7 +36,7 @@ int efx_siena_probe_tx_queue(struct efx_tx_queue *tx_queue)
tx_queue->queue, efx->txq_entries, tx_queue->ptr_mask);
/* Allocate software ring */
- tx_queue->buffer = kzalloc_objs(*tx_queue->buffer, entries, GFP_KERNEL);
+ tx_queue->buffer = kzalloc_objs(*tx_queue->buffer, entries);
if (!tx_queue->buffer)
return -ENOMEM;
diff --git a/drivers/net/ethernet/sfc/tc.c b/drivers/net/ethernet/sfc/tc.c
index bf39fb5e4bb6..25341acfb472 100644
--- a/drivers/net/ethernet/sfc/tc.c
+++ b/drivers/net/ethernet/sfc/tc.c
@@ -2672,7 +2672,7 @@ static int efx_tc_configure_default_rule(struct efx_nic *efx, u32 ing_port,
match->value.ingress_port = ing_port;
match->mask.ingress_port = ~0;
- act = kzalloc_obj(*act, GFP_KERNEL);
+ act = kzalloc_obj(*act);
if (!act)
return -ENOMEM;
act->deliver = 1;
@@ -2745,7 +2745,7 @@ static int efx_tc_configure_fallback_acts(struct efx_nic *efx, u32 eg_port,
struct efx_tc_action_set *act;
int rc;
- act = kzalloc_obj(*act, GFP_KERNEL);
+ act = kzalloc_obj(*act);
if (!act)
return -ENOMEM;
act->deliver = 1;
@@ -2988,10 +2988,10 @@ int efx_init_struct_tc(struct efx_nic *efx)
if (efx->type->is_vf)
return 0;
- efx->tc = kzalloc_obj(*efx->tc, GFP_KERNEL);
+ efx->tc = kzalloc_obj(*efx->tc);
if (!efx->tc)
return -ENOMEM;
- efx->tc->caps = kzalloc_obj(struct mae_caps, GFP_KERNEL);
+ efx->tc->caps = kzalloc_obj(struct mae_caps);
if (!efx->tc->caps) {
rc = -ENOMEM;
goto fail_alloc_caps;
diff --git a/drivers/net/ethernet/sfc/tc_bindings.c b/drivers/net/ethernet/sfc/tc_bindings.c
index c4b187b51a69..5c02aa738239 100644
--- a/drivers/net/ethernet/sfc/tc_bindings.c
+++ b/drivers/net/ethernet/sfc/tc_bindings.c
@@ -59,7 +59,7 @@ static struct efx_tc_block_binding *efx_tc_create_binding(
struct efx_nic *efx, struct efx_rep *efv,
struct net_device *otherdev, struct flow_block *block)
{
- struct efx_tc_block_binding *binding = kmalloc_obj(*binding, GFP_KERNEL);
+ struct efx_tc_block_binding *binding = kmalloc_obj(*binding);
if (!binding)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/net/ethernet/sfc/tx_common.c b/drivers/net/ethernet/sfc/tx_common.c
index 4437e2c424f7..f5bdfa0c31a3 100644
--- a/drivers/net/ethernet/sfc/tx_common.c
+++ b/drivers/net/ethernet/sfc/tx_common.c
@@ -36,7 +36,7 @@ int efx_probe_tx_queue(struct efx_tx_queue *tx_queue)
tx_queue->queue, efx->txq_entries, tx_queue->ptr_mask);
/* Allocate software ring */
- tx_queue->buffer = kzalloc_objs(*tx_queue->buffer, entries, GFP_KERNEL);
+ tx_queue->buffer = kzalloc_objs(*tx_queue->buffer, entries);
if (!tx_queue->buffer)
return -ENOMEM;
diff --git a/drivers/net/ethernet/sis/sis190.c b/drivers/net/ethernet/sis/sis190.c
index c06387ed3bf1..12ddea514910 100644
--- a/drivers/net/ethernet/sis/sis190.c
+++ b/drivers/net/ethernet/sis/sis190.c
@@ -1407,7 +1407,7 @@ static int sis190_mii_probe(struct net_device *dev)
if (status == 0xffff || status == 0x0000)
continue;
- phy = kmalloc_obj(*phy, GFP_KERNEL);
+ phy = kmalloc_obj(*phy);
if (!phy) {
sis190_free_phy(&tp->first_phy);
rc = -ENOMEM;
diff --git a/drivers/net/ethernet/sis/sis900.c b/drivers/net/ethernet/sis/sis900.c
index b756eea09513..1349ef50cd26 100644
--- a/drivers/net/ethernet/sis/sis900.c
+++ b/drivers/net/ethernet/sis/sis900.c
@@ -619,7 +619,7 @@ static int sis900_mii_probe(struct net_device *net_dev)
continue;
}
- if ((mii_phy = kmalloc_obj(struct mii_phy, GFP_KERNEL)) == NULL) {
+ if ((mii_phy = kmalloc_obj(struct mii_phy)) == NULL) {
mii_phy = sis_priv->first_mii;
while (mii_phy) {
struct mii_phy *phy;
diff --git a/drivers/net/ethernet/socionext/netsec.c b/drivers/net/ethernet/socionext/netsec.c
index 3b6008cad3a5..d14a6584473c 100644
--- a/drivers/net/ethernet/socionext/netsec.c
+++ b/drivers/net/ethernet/socionext/netsec.c
@@ -1263,7 +1263,7 @@ static int netsec_alloc_dring(struct netsec_priv *priv, enum ring_id id)
if (!dring->vaddr)
goto err;
- dring->desc = kzalloc_objs(*dring->desc, DESC_NUM, GFP_KERNEL);
+ dring->desc = kzalloc_objs(*dring->desc, DESC_NUM);
if (!dring->desc)
goto err;
diff --git a/drivers/net/ethernet/socionext/sni_ave.c b/drivers/net/ethernet/socionext/sni_ave.c
index 3c581d71c00e..84cb2f4f0648 100644
--- a/drivers/net/ethernet/socionext/sni_ave.c
+++ b/drivers/net/ethernet/socionext/sni_ave.c
@@ -1273,13 +1273,13 @@ static int ave_open(struct net_device *ndev)
if (ret)
return ret;
- priv->tx.desc = kzalloc_objs(*priv->tx.desc, priv->tx.ndesc, GFP_KERNEL);
+ priv->tx.desc = kzalloc_objs(*priv->tx.desc, priv->tx.ndesc);
if (!priv->tx.desc) {
ret = -ENOMEM;
goto out_free_irq;
}
- priv->rx.desc = kzalloc_objs(*priv->rx.desc, priv->rx.ndesc, GFP_KERNEL);
+ priv->rx.desc = kzalloc_objs(*priv->rx.desc, priv->rx.ndesc);
if (!priv->rx.desc) {
kfree(priv->tx.desc);
ret = -ENOMEM;
diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
index ebda64cd1bf2..3dc05dfaa983 100644
--- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
+++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
@@ -4013,7 +4013,7 @@ stmmac_setup_dma_desc(struct stmmac_priv *priv, unsigned int mtu)
struct stmmac_dma_conf *dma_conf;
int chan, bfsize, ret;
- dma_conf = kzalloc_obj(*dma_conf, GFP_KERNEL);
+ dma_conf = kzalloc_obj(*dma_conf);
if (!dma_conf) {
netdev_err(priv->dev, "%s: DMA conf allocation failed\n",
__func__);
diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_selftests.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_selftests.c
index 8f18a2eab33e..0a0789aaaa53 100644
--- a/drivers/net/ethernet/stmicro/stmmac/stmmac_selftests.c
+++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_selftests.c
@@ -324,7 +324,7 @@ static int __stmmac_test_loopback(struct stmmac_priv *priv,
struct sk_buff *skb = NULL;
int ret = 0;
- tpriv = kzalloc_obj(*tpriv, GFP_KERNEL);
+ tpriv = kzalloc_obj(*tpriv);
if (!tpriv)
return -ENOMEM;
@@ -434,11 +434,11 @@ static int stmmac_test_eee(struct stmmac_priv *priv)
if (!priv->dma_cap.eee || !priv->eee_active)
return -EOPNOTSUPP;
- initial = kzalloc_obj(*initial, GFP_KERNEL);
+ initial = kzalloc_obj(*initial);
if (!initial)
return -ENOMEM;
- final = kzalloc_obj(*final, GFP_KERNEL);
+ final = kzalloc_obj(*final);
if (!final) {
ret = -ENOMEM;
goto out_free_initial;
@@ -744,7 +744,7 @@ static int stmmac_test_flowctrl(struct stmmac_priv *priv)
if (!phydev || (!phydev->pause && !phydev->asym_pause))
return -EOPNOTSUPP;
- tpriv = kzalloc_obj(*tpriv, GFP_KERNEL);
+ tpriv = kzalloc_obj(*tpriv);
if (!tpriv)
return -ENOMEM;
@@ -898,7 +898,7 @@ static int __stmmac_test_vlanfilt(struct stmmac_priv *priv)
struct sk_buff *skb = NULL;
int ret = 0, i;
- tpriv = kzalloc_obj(*tpriv, GFP_KERNEL);
+ tpriv = kzalloc_obj(*tpriv);
if (!tpriv)
return -ENOMEM;
@@ -991,7 +991,7 @@ static int __stmmac_test_dvlanfilt(struct stmmac_priv *priv)
struct sk_buff *skb = NULL;
int ret = 0, i;
- tpriv = kzalloc_obj(*tpriv, GFP_KERNEL);
+ tpriv = kzalloc_obj(*tpriv);
if (!tpriv)
return -ENOMEM;
@@ -1099,19 +1099,19 @@ static int stmmac_test_rxp(struct stmmac_priv *priv)
if (!sel)
return -ENOMEM;
- exts = kzalloc_obj(*exts, GFP_KERNEL);
+ exts = kzalloc_obj(*exts);
if (!exts) {
ret = -ENOMEM;
goto cleanup_sel;
}
- actions = kzalloc_objs(*actions, nk, GFP_KERNEL);
+ actions = kzalloc_objs(*actions, nk);
if (!actions) {
ret = -ENOMEM;
goto cleanup_exts;
}
- gact = kzalloc_objs(*gact, nk, GFP_KERNEL);
+ gact = kzalloc_objs(*gact, nk);
if (!gact) {
ret = -ENOMEM;
goto cleanup_actions;
@@ -1266,7 +1266,7 @@ static int stmmac_test_vlanoff_common(struct stmmac_priv *priv, bool svlan)
if (!priv->dma_cap.vlins)
return -EOPNOTSUPP;
- tpriv = kzalloc_obj(*tpriv, GFP_KERNEL);
+ tpriv = kzalloc_obj(*tpriv);
if (!tpriv)
return -ENOMEM;
@@ -1349,7 +1349,7 @@ static int __stmmac_test_l3filt(struct stmmac_priv *priv, u32 dst, u32 src,
priv->plat->rx_queues_to_use);
}
- dissector = kzalloc_obj(*dissector, GFP_KERNEL);
+ dissector = kzalloc_obj(*dissector);
if (!dissector) {
ret = -ENOMEM;
goto cleanup_rss;
@@ -1358,7 +1358,7 @@ static int __stmmac_test_l3filt(struct stmmac_priv *priv, u32 dst, u32 src,
dissector->used_keys |= (1ULL << FLOW_DISSECTOR_KEY_IPV4_ADDRS);
dissector->offset[FLOW_DISSECTOR_KEY_IPV4_ADDRS] = 0;
- cls = kzalloc_obj(*cls, GFP_KERNEL);
+ cls = kzalloc_obj(*cls);
if (!cls) {
ret = -ENOMEM;
goto cleanup_dissector;
@@ -1475,7 +1475,7 @@ static int __stmmac_test_l4filt(struct stmmac_priv *priv, u32 dst, u32 src,
priv->plat->rx_queues_to_use);
}
- dissector = kzalloc_obj(*dissector, GFP_KERNEL);
+ dissector = kzalloc_obj(*dissector);
if (!dissector) {
ret = -ENOMEM;
goto cleanup_rss;
@@ -1486,7 +1486,7 @@ static int __stmmac_test_l4filt(struct stmmac_priv *priv, u32 dst, u32 src,
dissector->offset[FLOW_DISSECTOR_KEY_BASIC] = 0;
dissector->offset[FLOW_DISSECTOR_KEY_PORTS] = offsetof(typeof(keys), key);
- cls = kzalloc_obj(*cls, GFP_KERNEL);
+ cls = kzalloc_obj(*cls);
if (!cls) {
ret = -ENOMEM;
goto cleanup_dissector;
@@ -1628,7 +1628,7 @@ static int stmmac_test_arpoffload(struct stmmac_priv *priv)
if (!priv->dma_cap.arpoffsel)
return -EOPNOTSUPP;
- tpriv = kzalloc_obj(*tpriv, GFP_KERNEL);
+ tpriv = kzalloc_obj(*tpriv);
if (!tpriv)
return -ENOMEM;
diff --git a/drivers/net/ethernet/sun/ldmvsw.c b/drivers/net/ethernet/sun/ldmvsw.c
index c1102acbb1e0..05689e62ca83 100644
--- a/drivers/net/ethernet/sun/ldmvsw.c
+++ b/drivers/net/ethernet/sun/ldmvsw.c
@@ -202,7 +202,7 @@ static struct vnet *vsw_get_vnet(struct mdesc_handle *hp,
}
if (!vp) {
- vp = kzalloc_obj(*vp, GFP_KERNEL);
+ vp = kzalloc_obj(*vp);
if (unlikely(!vp)) {
mutex_unlock(&vnet_list_mutex);
return ERR_PTR(-ENOMEM);
diff --git a/drivers/net/ethernet/sun/niu.c b/drivers/net/ethernet/sun/niu.c
index 2d31e6112ca6..88df15e6dd74 100644
--- a/drivers/net/ethernet/sun/niu.c
+++ b/drivers/net/ethernet/sun/niu.c
@@ -4341,7 +4341,7 @@ static int niu_alloc_rx_ring_info(struct niu *np,
{
BUILD_BUG_ON(sizeof(struct rxdma_mailbox) != 64);
- rp->rxhash = kzalloc_objs(struct page *, MAX_RBR_RING_SIZE, GFP_KERNEL);
+ rp->rxhash = kzalloc_objs(struct page *, MAX_RBR_RING_SIZE);
if (!rp->rxhash)
return -ENOMEM;
@@ -4484,7 +4484,7 @@ static int niu_alloc_channels(struct niu *np)
num_rx_rings = parent->rxchan_per_port[port];
num_tx_rings = parent->txchan_per_port[port];
- rx_rings = kzalloc_objs(struct rx_ring_info, num_rx_rings, GFP_KERNEL);
+ rx_rings = kzalloc_objs(struct rx_ring_info, num_rx_rings);
err = -ENOMEM;
if (!rx_rings)
goto out_err;
@@ -4523,7 +4523,7 @@ static int niu_alloc_channels(struct niu *np)
goto out_err;
}
- tx_rings = kzalloc_objs(struct tx_ring_info, num_tx_rings, GFP_KERNEL);
+ tx_rings = kzalloc_objs(struct tx_ring_info, num_tx_rings);
err = -ENOMEM;
if (!tx_rings)
goto out_err;
@@ -9511,7 +9511,7 @@ static struct niu_parent *niu_new_parent(struct niu *np,
goto fail_unregister;
}
- p = kzalloc_obj(*p, GFP_KERNEL);
+ p = kzalloc_obj(*p);
if (!p)
goto fail_unregister;
diff --git a/drivers/net/ethernet/sun/sunhme.c b/drivers/net/ethernet/sun/sunhme.c
index 1984a6de65ee..4c9d5d4dd8a0 100644
--- a/drivers/net/ethernet/sun/sunhme.c
+++ b/drivers/net/ethernet/sun/sunhme.c
@@ -2248,7 +2248,7 @@ static struct quattro *quattro_sbus_find(struct platform_device *child)
if (qp)
return qp;
- qp = kzalloc_obj(*qp, GFP_KERNEL);
+ qp = kzalloc_obj(*qp);
if (!qp)
return NULL;
@@ -2278,7 +2278,7 @@ static struct quattro *quattro_pci_find(struct pci_dev *pdev)
return qp;
}
- qp = kmalloc_obj(struct quattro, GFP_KERNEL);
+ qp = kmalloc_obj(struct quattro);
if (!qp)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/net/ethernet/sun/sunqe.c b/drivers/net/ethernet/sun/sunqe.c
index 36187e85b7e6..acef22cb9134 100644
--- a/drivers/net/ethernet/sun/sunqe.c
+++ b/drivers/net/ethernet/sun/sunqe.c
@@ -771,7 +771,7 @@ static struct sunqec *get_qec(struct platform_device *child)
qecp = platform_get_drvdata(op);
if (!qecp) {
- qecp = kzalloc_obj(struct sunqec, GFP_KERNEL);
+ qecp = kzalloc_obj(struct sunqec);
if (qecp) {
u32 ctrl;
diff --git a/drivers/net/ethernet/sun/sunvnet.c b/drivers/net/ethernet/sun/sunvnet.c
index 7c756e07eb55..6d477401f179 100644
--- a/drivers/net/ethernet/sun/sunvnet.c
+++ b/drivers/net/ethernet/sun/sunvnet.c
@@ -436,7 +436,7 @@ static int vnet_port_probe(struct vio_dev *vdev, const struct vio_device_id *id)
goto err_out_put_mdesc;
}
- port = kzalloc_obj(*port, GFP_KERNEL);
+ port = kzalloc_obj(*port);
err = -ENOMEM;
if (!port)
goto err_out_put_mdesc;
diff --git a/drivers/net/ethernet/ti/icssm/icssm_prueth_switch.c b/drivers/net/ethernet/ti/icssm/icssm_prueth_switch.c
index fa9959ad966d..66866ea37913 100644
--- a/drivers/net/ethernet/ti/icssm/icssm_prueth_switch.c
+++ b/drivers/net/ethernet/ti/icssm/icssm_prueth_switch.c
@@ -748,7 +748,7 @@ int icssm_prueth_sw_init_fdb_table(struct prueth *prueth)
if (prueth->emac_configured)
return 0;
- prueth->fdb_tbl = kmalloc_obj(*prueth->fdb_tbl, GFP_KERNEL);
+ prueth->fdb_tbl = kmalloc_obj(*prueth->fdb_tbl);
if (!prueth->fdb_tbl)
return -ENOMEM;
diff --git a/drivers/net/ethernet/ti/k3-cppi-desc-pool.c b/drivers/net/ethernet/ti/k3-cppi-desc-pool.c
index 58bb394fecdf..36d8244252bd 100644
--- a/drivers/net/ethernet/ti/k3-cppi-desc-pool.c
+++ b/drivers/net/ethernet/ti/k3-cppi-desc-pool.c
@@ -55,7 +55,7 @@ k3_cppi_desc_pool_create_name(struct device *dev, size_t size,
const char *pool_name = NULL;
int ret = -ENOMEM;
- pool = kzalloc_obj(*pool, GFP_KERNEL);
+ pool = kzalloc_obj(*pool);
if (!pool)
return ERR_PTR(ret);
diff --git a/drivers/net/ethernet/toshiba/ps3_gelic_wireless.c b/drivers/net/ethernet/toshiba/ps3_gelic_wireless.c
index 67d96efcb8bc..f20e06985c5e 100644
--- a/drivers/net/ethernet/toshiba/ps3_gelic_wireless.c
+++ b/drivers/net/ethernet/toshiba/ps3_gelic_wireless.c
@@ -209,7 +209,7 @@ static struct gelic_eurus_cmd *gelic_eurus_sync_cmd(struct gelic_wl_info *wl,
struct gelic_eurus_cmd *cmd;
/* allocate cmd */
- cmd = kzalloc_obj(*cmd, GFP_KERNEL);
+ cmd = kzalloc_obj(*cmd);
if (!cmd)
return NULL;
diff --git a/drivers/net/ethernet/via/via-velocity.c b/drivers/net/ethernet/via/via-velocity.c
index f761975aeda8..b71784bacf73 100644
--- a/drivers/net/ethernet/via/via-velocity.c
+++ b/drivers/net/ethernet/via/via-velocity.c
@@ -2304,7 +2304,7 @@ static int velocity_change_mtu(struct net_device *dev, int new_mtu)
struct rx_info rx;
struct tx_info tx;
- tmp_vptr = kzalloc_obj(*tmp_vptr, GFP_KERNEL);
+ tmp_vptr = kzalloc_obj(*tmp_vptr);
if (!tmp_vptr) {
ret = -ENOMEM;
goto out_0;
diff --git a/drivers/net/ethernet/wangxun/libwx/wx_lib.c b/drivers/net/ethernet/wangxun/libwx/wx_lib.c
index 00c23bebdc72..08dd0e4c3bc3 100644
--- a/drivers/net/ethernet/wangxun/libwx/wx_lib.c
+++ b/drivers/net/ethernet/wangxun/libwx/wx_lib.c
@@ -1905,14 +1905,14 @@ static int wx_acquire_msix_vectors(struct wx *wx)
nvecs = min_t(int, nvecs, num_online_cpus());
nvecs = min_t(int, nvecs, wx->mac.max_msix_vectors);
- wx->msix_q_entries = kzalloc_objs(struct msix_entry, nvecs, GFP_KERNEL);
+ wx->msix_q_entries = kzalloc_objs(struct msix_entry, nvecs);
if (!wx->msix_q_entries)
return -ENOMEM;
/* One for non-queue interrupts */
nvecs += 1;
- wx->msix_entry = kzalloc_objs(struct msix_entry, 1, GFP_KERNEL);
+ wx->msix_entry = kzalloc_objs(struct msix_entry, 1);
if (!wx->msix_entry) {
kfree(wx->msix_q_entries);
wx->msix_q_entries = NULL;
diff --git a/drivers/net/ethernet/wangxun/libwx/wx_mbx.c b/drivers/net/ethernet/wangxun/libwx/wx_mbx.c
index d237814cbae5..761aa4f713bd 100644
--- a/drivers/net/ethernet/wangxun/libwx/wx_mbx.c
+++ b/drivers/net/ethernet/wangxun/libwx/wx_mbx.c
@@ -403,7 +403,7 @@ int wx_read_mbx_vf(struct wx *wx, u32 *msg, u16 size)
int wx_init_mbx_params_vf(struct wx *wx)
{
- wx->vfinfo = kzalloc_obj(struct vf_data_storage, GFP_KERNEL);
+ wx->vfinfo = kzalloc_obj(struct vf_data_storage);
if (!wx->vfinfo)
return -ENOMEM;
diff --git a/drivers/net/ethernet/wangxun/libwx/wx_sriov.c b/drivers/net/ethernet/wangxun/libwx/wx_sriov.c
index 70a5b00eb353..a360b06a086a 100644
--- a/drivers/net/ethernet/wangxun/libwx/wx_sriov.c
+++ b/drivers/net/ethernet/wangxun/libwx/wx_sriov.c
@@ -32,7 +32,7 @@ static int wx_alloc_vf_macvlans(struct wx *wx, u8 num_vfs)
if (!num_vf_macvlans)
return -EINVAL;
- mv_list = kzalloc_objs(struct vf_macvlans, num_vf_macvlans, GFP_KERNEL);
+ mv_list = kzalloc_objs(struct vf_macvlans, num_vf_macvlans);
if (!mv_list)
return -ENOMEM;
@@ -87,7 +87,7 @@ static int __wx_enable_sriov(struct wx *wx, u8 num_vfs)
wx->ring_feature[RING_F_VMDQ].limit = 1;
wx->ring_feature[RING_F_VMDQ].offset = num_vfs;
- wx->vfinfo = kzalloc_objs(struct vf_data_storage, num_vfs, GFP_KERNEL);
+ wx->vfinfo = kzalloc_objs(struct vf_data_storage, num_vfs);
if (!wx->vfinfo)
return -ENOMEM;
diff --git a/drivers/net/ethernet/wangxun/ngbe/ngbe_ethtool.c b/drivers/net/ethernet/wangxun/ngbe/ngbe_ethtool.c
index d42fd6d8d9c8..fc04040957bf 100644
--- a/drivers/net/ethernet/wangxun/ngbe/ngbe_ethtool.c
+++ b/drivers/net/ethernet/wangxun/ngbe/ngbe_ethtool.c
@@ -81,7 +81,7 @@ static int ngbe_set_ringparam(struct net_device *netdev,
/* allocate temporary buffer to store rings in */
i = max_t(int, wx->num_tx_queues, wx->num_rx_queues);
- temp_ring = kvmalloc_objs(struct wx_ring, i, GFP_KERNEL);
+ temp_ring = kvmalloc_objs(struct wx_ring, i);
if (!temp_ring) {
err = -ENOMEM;
goto clear_reset;
diff --git a/drivers/net/ethernet/wangxun/txgbe/txgbe_ethtool.c b/drivers/net/ethernet/wangxun/txgbe/txgbe_ethtool.c
index cc0ebc3d030a..9157b8275be1 100644
--- a/drivers/net/ethernet/wangxun/txgbe/txgbe_ethtool.c
+++ b/drivers/net/ethernet/wangxun/txgbe/txgbe_ethtool.c
@@ -73,7 +73,7 @@ static int txgbe_set_ringparam(struct net_device *netdev,
/* allocate temporary buffer to store rings in */
i = max_t(int, wx->num_tx_queues, wx->num_rx_queues);
- temp_ring = kvmalloc_objs(struct wx_ring, i, GFP_KERNEL);
+ temp_ring = kvmalloc_objs(struct wx_ring, i);
if (!temp_ring) {
err = -ENOMEM;
goto clear_reset;
diff --git a/drivers/net/ethernet/xilinx/xilinx_axienet_main.c b/drivers/net/ethernet/xilinx/xilinx_axienet_main.c
index 8980c965b5fd..cb286ba821db 100644
--- a/drivers/net/ethernet/xilinx/xilinx_axienet_main.c
+++ b/drivers/net/ethernet/xilinx/xilinx_axienet_main.c
@@ -1549,7 +1549,7 @@ static int axienet_init_dmaengine(struct net_device *ndev)
goto err_dma_release_rx;
}
for (i = 0; i < TX_BD_NUM_MAX; i++) {
- skbuf_dma = kzalloc_obj(*skbuf_dma, GFP_KERNEL);
+ skbuf_dma = kzalloc_obj(*skbuf_dma);
if (!skbuf_dma) {
ret = -ENOMEM;
goto err_free_tx_skb_ring;
@@ -1564,7 +1564,7 @@ static int axienet_init_dmaengine(struct net_device *ndev)
goto err_free_tx_skb_ring;
}
for (i = 0; i < RX_BUF_NUM_DEFAULT; i++) {
- skbuf_dma = kzalloc_obj(*skbuf_dma, GFP_KERNEL);
+ skbuf_dma = kzalloc_obj(*skbuf_dma);
if (!skbuf_dma) {
ret = -ENOMEM;
goto err_free_rx_skb_ring;
diff --git a/drivers/net/fjes/fjes_hw.c b/drivers/net/fjes/fjes_hw.c
index db40667413b4..774eac1c11c0 100644
--- a/drivers/net/fjes/fjes_hw.c
+++ b/drivers/net/fjes/fjes_hw.c
@@ -212,7 +212,7 @@ static int fjes_hw_setup(struct fjes_hw *hw)
hw->hw_info.max_epid = &hw->max_epid;
hw->hw_info.my_epid = &hw->my_epid;
- buf = kzalloc_objs(struct ep_share_mem_info, hw->max_epid, GFP_KERNEL);
+ buf = kzalloc_objs(struct ep_share_mem_info, hw->max_epid);
if (!buf)
return -ENOMEM;
diff --git a/drivers/net/geneve.c b/drivers/net/geneve.c
index d482e5512fa8..01cdd06102e0 100644
--- a/drivers/net/geneve.c
+++ b/drivers/net/geneve.c
@@ -980,7 +980,7 @@ static struct geneve_sock *geneve_socket_create(struct net *net, __be16 port,
struct udp_tunnel_sock_cfg tunnel_cfg;
int h;
- gs = kzalloc_obj(*gs, GFP_KERNEL);
+ gs = kzalloc_obj(*gs);
if (!gs)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/net/hamradio/yam.c b/drivers/net/hamradio/yam.c
index 16220b740b8e..4106f0301ab4 100644
--- a/drivers/net/hamradio/yam.c
+++ b/drivers/net/hamradio/yam.c
@@ -386,7 +386,7 @@ static unsigned char *add_mcs(unsigned char *bits, int bitrate,
}
/* Allocate a new mcs */
- if ((p = kmalloc_obj(struct yam_mcs, GFP_KERNEL)) == NULL) {
+ if ((p = kmalloc_obj(struct yam_mcs)) == NULL) {
release_firmware(fw);
return NULL;
}
diff --git a/drivers/net/hyperv/netvsc.c b/drivers/net/hyperv/netvsc.c
index d9fa2fc4c43c..59e95341f9b1 100644
--- a/drivers/net/hyperv/netvsc.c
+++ b/drivers/net/hyperv/netvsc.c
@@ -129,7 +129,7 @@ static struct netvsc_device *alloc_net_device(void)
{
struct netvsc_device *net_device;
- net_device = kzalloc_obj(struct netvsc_device, GFP_KERNEL);
+ net_device = kzalloc_obj(struct netvsc_device);
if (!net_device)
return NULL;
diff --git a/drivers/net/hyperv/rndis_filter.c b/drivers/net/hyperv/rndis_filter.c
index 2fa77dc21d7e..9b6c44979b4e 100644
--- a/drivers/net/hyperv/rndis_filter.c
+++ b/drivers/net/hyperv/rndis_filter.c
@@ -64,7 +64,7 @@ static struct rndis_device *get_rndis_device(void)
{
struct rndis_device *device;
- device = kzalloc_obj(struct rndis_device, GFP_KERNEL);
+ device = kzalloc_obj(struct rndis_device);
if (!device)
return NULL;
@@ -87,7 +87,7 @@ static struct rndis_request *get_rndis_request(struct rndis_device *dev,
struct rndis_set_request *set;
unsigned long flags;
- request = kzalloc_obj(struct rndis_request, GFP_KERNEL);
+ request = kzalloc_obj(struct rndis_request);
if (!request)
return NULL;
diff --git a/drivers/net/ieee802154/ca8210.c b/drivers/net/ieee802154/ca8210.c
index bb3ff9ce06b2..97c69f522a82 100644
--- a/drivers/net/ieee802154/ca8210.c
+++ b/drivers/net/ieee802154/ca8210.c
@@ -3067,7 +3067,7 @@ static int ca8210_probe(struct spi_device *spi_device)
ca8210_hw_setup(hw);
ieee802154_random_extended_addr(&hw->phy->perm_extended_addr);
- pdata = kmalloc_obj(*pdata, GFP_KERNEL);
+ pdata = kmalloc_obj(*pdata);
if (!pdata) {
ret = -ENOMEM;
goto error;
diff --git a/drivers/net/ieee802154/mac802154_hwsim.c b/drivers/net/ieee802154/mac802154_hwsim.c
index e449afd8e71f..6daa0f198b9f 100644
--- a/drivers/net/ieee802154/mac802154_hwsim.c
+++ b/drivers/net/ieee802154/mac802154_hwsim.c
@@ -545,11 +545,11 @@ static struct hwsim_edge *hwsim_alloc_edge(struct hwsim_phy *endpoint, u8 lqi)
struct hwsim_edge_info *einfo;
struct hwsim_edge *e;
- e = kzalloc_obj(*e, GFP_KERNEL);
+ e = kzalloc_obj(*e);
if (!e)
return NULL;
- einfo = kzalloc_obj(*einfo, GFP_KERNEL);
+ einfo = kzalloc_obj(*einfo);
if (!einfo) {
kfree(e);
return NULL;
@@ -713,7 +713,7 @@ static int hwsim_set_edge_lqi(struct sk_buff *msg, struct genl_info *info)
return -ENOENT;
}
- einfo = kzalloc_obj(*einfo, GFP_KERNEL);
+ einfo = kzalloc_obj(*einfo);
if (!einfo) {
mutex_unlock(&hwsim_phys_lock);
return -ENOMEM;
@@ -946,7 +946,7 @@ static int hwsim_add_one(struct genl_info *info, struct device *dev,
/* hwsim phy channel 13 as default */
hw->phy->current_channel = 13;
- pib = kzalloc_obj(*pib, GFP_KERNEL);
+ pib = kzalloc_obj(*pib);
if (!pib) {
err = -ENOMEM;
goto err_pib;
diff --git a/drivers/net/ifb.c b/drivers/net/ifb.c
index 4ad90264433a..5407d2ed71b3 100644
--- a/drivers/net/ifb.c
+++ b/drivers/net/ifb.c
@@ -187,7 +187,7 @@ static int ifb_dev_init(struct net_device *dev)
struct ifb_q_private *txp;
int i;
- txp = kzalloc_objs(*txp, dev->num_tx_queues, GFP_KERNEL);
+ txp = kzalloc_objs(*txp, dev->num_tx_queues);
if (!txp)
return -ENOMEM;
dp->tx_private = txp;
diff --git a/drivers/net/ipa/gsi_trans.c b/drivers/net/ipa/gsi_trans.c
index f82484de39dd..d0b10a2020ea 100644
--- a/drivers/net/ipa/gsi_trans.c
+++ b/drivers/net/ipa/gsi_trans.c
@@ -746,7 +746,7 @@ int gsi_channel_trans_init(struct gsi *gsi, u32 channel_id)
* Each entry in this map records the transaction associated
* with a corresponding completed TRE.
*/
- trans_info->map = kzalloc_objs(*trans_info->map, tre_count, GFP_KERNEL);
+ trans_info->map = kzalloc_objs(*trans_info->map, tre_count);
if (!trans_info->map) {
ret = -ENOMEM;
goto err_trans_free;
diff --git a/drivers/net/ipa/ipa_interrupt.c b/drivers/net/ipa/ipa_interrupt.c
index 9e8d75a98f05..131b9cc94201 100644
--- a/drivers/net/ipa/ipa_interrupt.c
+++ b/drivers/net/ipa/ipa_interrupt.c
@@ -329,7 +329,7 @@ struct ipa_interrupt *ipa_interrupt_init(struct platform_device *pdev)
if (irq <= 0)
return ERR_PTR(irq ? : -EINVAL);
- interrupt = kzalloc_obj(*interrupt, GFP_KERNEL);
+ interrupt = kzalloc_obj(*interrupt);
if (!interrupt)
return ERR_PTR(-ENOMEM);
interrupt->irq = irq;
diff --git a/drivers/net/ipa/ipa_main.c b/drivers/net/ipa/ipa_main.c
index d09b4723f26c..edead9c48d1f 100644
--- a/drivers/net/ipa/ipa_main.c
+++ b/drivers/net/ipa/ipa_main.c
@@ -830,7 +830,7 @@ static int ipa_probe(struct platform_device *pdev)
}
/* No more EPROBE_DEFER. Allocate and initialize the IPA structure */
- ipa = kzalloc_obj(*ipa, GFP_KERNEL);
+ ipa = kzalloc_obj(*ipa);
if (!ipa) {
ret = -ENOMEM;
goto err_power_exit;
diff --git a/drivers/net/ipa/ipa_smp2p.c b/drivers/net/ipa/ipa_smp2p.c
index e96bdd9b68a8..2f0ccdd937cc 100644
--- a/drivers/net/ipa/ipa_smp2p.c
+++ b/drivers/net/ipa/ipa_smp2p.c
@@ -242,7 +242,7 @@ ipa_smp2p_init(struct ipa *ipa, struct platform_device *pdev, bool modem_init)
if (enabled_bit >= 32) /* BITS_PER_U32 */
return -EINVAL;
- smp2p = kzalloc_obj(*smp2p, GFP_KERNEL);
+ smp2p = kzalloc_obj(*smp2p);
if (!smp2p)
return -ENOMEM;
diff --git a/drivers/net/ipvlan/ipvlan_main.c b/drivers/net/ipvlan/ipvlan_main.c
index 6f4ea2234ccb..ed46439a9f4e 100644
--- a/drivers/net/ipvlan/ipvlan_main.c
+++ b/drivers/net/ipvlan/ipvlan_main.c
@@ -64,7 +64,7 @@ static int ipvlan_port_create(struct net_device *dev)
struct ipvl_port *port;
int err, idx;
- port = kzalloc_obj(struct ipvl_port, GFP_KERNEL);
+ port = kzalloc_obj(struct ipvl_port);
if (!port)
return -ENOMEM;
diff --git a/drivers/net/macsec.c b/drivers/net/macsec.c
index 1b523a56e7da..f6cad0746a02 100644
--- a/drivers/net/macsec.c
+++ b/drivers/net/macsec.c
@@ -1465,7 +1465,7 @@ static struct macsec_rx_sc *create_rx_sc(struct net_device *dev, sci_t sci,
return ERR_PTR(-EEXIST);
}
- rx_sc = kzalloc_obj(*rx_sc, GFP_KERNEL);
+ rx_sc = kzalloc_obj(*rx_sc);
if (!rx_sc)
return ERR_PTR(-ENOMEM);
@@ -1797,7 +1797,7 @@ static int macsec_add_rxsa(struct sk_buff *skb, struct genl_info *info)
return -EBUSY;
}
- rx_sa = kmalloc_obj(*rx_sa, GFP_KERNEL);
+ rx_sa = kmalloc_obj(*rx_sa);
if (!rx_sa) {
rtnl_unlock();
return -ENOMEM;
@@ -2005,7 +2005,7 @@ static int macsec_add_txsa(struct sk_buff *skb, struct genl_info *info)
return -EBUSY;
}
- tx_sa = kmalloc_obj(*tx_sa, GFP_KERNEL);
+ tx_sa = kmalloc_obj(*tx_sa);
if (!tx_sa) {
rtnl_unlock();
return -ENOMEM;
@@ -4013,7 +4013,7 @@ static int register_macsec_dev(struct net_device *real_dev,
if (!rxd) {
int err;
- rxd = kmalloc_obj(*rxd, GFP_KERNEL);
+ rxd = kmalloc_obj(*rxd);
if (!rxd)
return -ENOMEM;
diff --git a/drivers/net/macvlan.c b/drivers/net/macvlan.c
index 1b4e327e26e1..a71f058eceef 100644
--- a/drivers/net/macvlan.c
+++ b/drivers/net/macvlan.c
@@ -163,7 +163,7 @@ static int macvlan_hash_add_source(struct macvlan_dev *vlan,
if (entry)
return 0;
- entry = kmalloc_obj(*entry, GFP_KERNEL);
+ entry = kmalloc_obj(*entry);
if (!entry)
return -ENOMEM;
@@ -1131,7 +1131,7 @@ static int macvlan_dev_netpoll_setup(struct net_device *dev)
struct netpoll *netpoll;
int err;
- netpoll = kzalloc_obj(*netpoll, GFP_KERNEL);
+ netpoll = kzalloc_obj(*netpoll);
err = -ENOMEM;
if (!netpoll)
goto out;
@@ -1249,7 +1249,7 @@ static int macvlan_port_create(struct net_device *dev)
if (netdev_is_rx_handler_busy(dev))
return -EBUSY;
- port = kzalloc_obj(*port, GFP_KERNEL);
+ port = kzalloc_obj(*port);
if (port == NULL)
return -ENOMEM;
diff --git a/drivers/net/mctp/mctp-i2c.c b/drivers/net/mctp/mctp-i2c.c
index 03f51a66933c..de6bc1736734 100644
--- a/drivers/net/mctp/mctp-i2c.c
+++ b/drivers/net/mctp/mctp-i2c.c
@@ -154,7 +154,7 @@ static struct mctp_i2c_client *mctp_i2c_new_client(struct i2c_client *client)
goto err;
}
- mcli = kzalloc_obj(*mcli, GFP_KERNEL);
+ mcli = kzalloc_obj(*mcli);
if (!mcli) {
rc = -ENOMEM;
goto err;
diff --git a/drivers/net/mctp/mctp-i3c.c b/drivers/net/mctp/mctp-i3c.c
index 0814b65c2843..6d2bbae7477b 100644
--- a/drivers/net/mctp/mctp-i3c.c
+++ b/drivers/net/mctp/mctp-i3c.c
@@ -259,7 +259,7 @@ __must_hold(&busdevs_lock)
struct mctp_i3c_device *mi = NULL;
int rc;
- mi = kzalloc_obj(*mi, GFP_KERNEL);
+ mi = kzalloc_obj(*mi);
if (!mi) {
rc = -ENOMEM;
goto err;
diff --git a/drivers/net/netconsole.c b/drivers/net/netconsole.c
index 73604c019b25..37415cad69f5 100644
--- a/drivers/net/netconsole.c
+++ b/drivers/net/netconsole.c
@@ -348,7 +348,7 @@ static struct netconsole_target *alloc_and_init(void)
{
struct netconsole_target *nt;
- nt = kzalloc_obj(*nt, GFP_KERNEL);
+ nt = kzalloc_obj(*nt);
if (!nt)
return nt;
@@ -1270,7 +1270,7 @@ static struct config_item *userdatum_make_item(struct config_group *group,
if (count_userdata_entries(nt) >= MAX_USERDATA_ITEMS)
return ERR_PTR(-ENOSPC);
- udm = kzalloc_obj(*udm, GFP_KERNEL);
+ udm = kzalloc_obj(*udm);
if (!udm)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/net/netdevsim/bpf.c b/drivers/net/netdevsim/bpf.c
index badf08add94f..8eebcc933ddb 100644
--- a/drivers/net/netdevsim/bpf.c
+++ b/drivers/net/netdevsim/bpf.c
@@ -222,7 +222,7 @@ static int nsim_bpf_create_prog(struct nsim_dev *nsim_dev,
char name[16];
int ret;
- state = kzalloc_obj(*state, GFP_KERNEL);
+ state = kzalloc_obj(*state);
if (!state)
return -ENOMEM;
diff --git a/drivers/net/netdevsim/bus.c b/drivers/net/netdevsim/bus.c
index 8de96fe6c02a..f85b1c261dfb 100644
--- a/drivers/net/netdevsim/bus.c
+++ b/drivers/net/netdevsim/bus.c
@@ -451,7 +451,7 @@ nsim_bus_dev_new(unsigned int id, unsigned int port_count, unsigned int num_queu
struct nsim_bus_dev *nsim_bus_dev;
int err;
- nsim_bus_dev = kzalloc_obj(*nsim_bus_dev, GFP_KERNEL);
+ nsim_bus_dev = kzalloc_obj(*nsim_bus_dev);
if (!nsim_bus_dev)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/net/netdevsim/dev.c b/drivers/net/netdevsim/dev.c
index a227c0b9fe4c..bc13df81bfa3 100644
--- a/drivers/net/netdevsim/dev.c
+++ b/drivers/net/netdevsim/dev.c
@@ -935,7 +935,7 @@ static int nsim_dev_traps_init(struct devlink *devlink)
struct nsim_trap_data *nsim_trap_data;
int err;
- nsim_trap_data = kzalloc_obj(*nsim_trap_data, GFP_KERNEL);
+ nsim_trap_data = kzalloc_obj(*nsim_trap_data);
if (!nsim_trap_data)
return -ENOMEM;
@@ -1348,7 +1348,7 @@ static int nsim_rate_node_new(struct devlink_rate *node, void **priv,
return -EOPNOTSUPP;
}
- nsim_node = kzalloc_obj(*nsim_node, GFP_KERNEL);
+ nsim_node = kzalloc_obj(*nsim_node);
if (!nsim_node)
return -ENOMEM;
@@ -1464,7 +1464,7 @@ static int __nsim_dev_port_add(struct nsim_dev *nsim_dev, enum nsim_dev_port_typ
if (type == NSIM_DEV_PORT_TYPE_VF && !nsim_dev_get_vfs(nsim_dev))
return -EINVAL;
- nsim_dev_port = kzalloc_obj(*nsim_dev_port, GFP_KERNEL);
+ nsim_dev_port = kzalloc_obj(*nsim_dev_port);
if (!nsim_dev_port)
return -ENOMEM;
nsim_dev_port->port_index = nsim_dev_port_index(type, port_index);
diff --git a/drivers/net/netdevsim/fib.c b/drivers/net/netdevsim/fib.c
index b1292a8c0ef1..1a42bdbfaa41 100644
--- a/drivers/net/netdevsim/fib.c
+++ b/drivers/net/netdevsim/fib.c
@@ -277,7 +277,7 @@ nsim_fib4_rt_create(struct nsim_fib_data *data,
{
struct nsim_fib4_rt *fib4_rt;
- fib4_rt = kzalloc_obj(*fib4_rt, GFP_KERNEL);
+ fib4_rt = kzalloc_obj(*fib4_rt);
if (!fib4_rt)
return NULL;
@@ -497,7 +497,7 @@ static int nsim_fib6_rt_nh_add(struct nsim_fib6_rt *fib6_rt,
{
struct nsim_fib6_rt_nh *fib6_rt_nh;
- fib6_rt_nh = kzalloc_obj(*fib6_rt_nh, GFP_KERNEL);
+ fib6_rt_nh = kzalloc_obj(*fib6_rt_nh);
if (!fib6_rt_nh)
return -ENOMEM;
@@ -544,7 +544,7 @@ nsim_fib6_rt_create(struct nsim_fib_data *data,
int i = 0;
int err;
- fib6_rt = kzalloc_obj(*fib6_rt, GFP_KERNEL);
+ fib6_rt = kzalloc_obj(*fib6_rt);
if (!fib6_rt)
return ERR_PTR(-ENOMEM);
@@ -1116,7 +1116,7 @@ static struct nsim_nexthop *nsim_nexthop_create(struct nsim_fib_data *data,
u64 occ = 0;
int i;
- nexthop = kzalloc_obj(*nexthop, GFP_KERNEL);
+ nexthop = kzalloc_obj(*nexthop);
if (!nexthop)
return ERR_PTR(-ENOMEM);
@@ -1556,7 +1556,7 @@ struct nsim_fib_data *nsim_fib_create(struct devlink *devlink,
struct nsim_dev *nsim_dev;
int err;
- data = kzalloc_obj(*data, GFP_KERNEL);
+ data = kzalloc_obj(*data);
if (!data)
return ERR_PTR(-ENOMEM);
data->devlink = devlink;
diff --git a/drivers/net/netdevsim/hwstats.c b/drivers/net/netdevsim/hwstats.c
index 57b782aa1046..14234a4cc244 100644
--- a/drivers/net/netdevsim/hwstats.c
+++ b/drivers/net/netdevsim/hwstats.c
@@ -238,7 +238,7 @@ nsim_dev_hwstats_enable_ifindex(struct nsim_dev_hwstats *hwstats,
goto out_unlock_list;
}
- hwsdev = kzalloc_obj(*hwsdev, GFP_KERNEL);
+ hwsdev = kzalloc_obj(*hwsdev);
if (!hwsdev) {
err = -ENOMEM;
goto out_put_netdev;
diff --git a/drivers/net/netdevsim/psample.c b/drivers/net/netdevsim/psample.c
index 39250b9d201f..47d24bc64ee4 100644
--- a/drivers/net/netdevsim/psample.c
+++ b/drivers/net/netdevsim/psample.c
@@ -200,7 +200,7 @@ int nsim_dev_psample_init(struct nsim_dev *nsim_dev)
struct nsim_dev_psample *psample;
int err;
- psample = kzalloc_obj(*psample, GFP_KERNEL);
+ psample = kzalloc_obj(*psample);
if (!psample)
return -ENOMEM;
nsim_dev->psample = psample;
diff --git a/drivers/net/ovpn/crypto_aead.c b/drivers/net/ovpn/crypto_aead.c
index de335ab81948..77be0942a269 100644
--- a/drivers/net/ovpn/crypto_aead.c
+++ b/drivers/net/ovpn/crypto_aead.c
@@ -328,7 +328,7 @@ ovpn_aead_crypto_key_slot_new(const struct ovpn_key_config *kc)
return ERR_PTR(-EINVAL);
/* build the key slot */
- ks = kmalloc_obj(*ks, GFP_KERNEL);
+ ks = kmalloc_obj(*ks);
if (!ks)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/net/ovpn/main.c b/drivers/net/ovpn/main.c
index 4554b0f8a409..2e0420febda0 100644
--- a/drivers/net/ovpn/main.c
+++ b/drivers/net/ovpn/main.c
@@ -57,7 +57,7 @@ static int ovpn_mp_alloc(struct ovpn_priv *ovpn)
/* the peer container is fairly large, therefore we allocate it only in
* MP mode
*/
- ovpn->peers = kzalloc_obj(*ovpn->peers, GFP_KERNEL);
+ ovpn->peers = kzalloc_obj(*ovpn->peers);
if (!ovpn->peers)
return -ENOMEM;
diff --git a/drivers/net/ovpn/peer.c b/drivers/net/ovpn/peer.c
index bac34068f0fc..3716a1d82801 100644
--- a/drivers/net/ovpn/peer.c
+++ b/drivers/net/ovpn/peer.c
@@ -95,7 +95,7 @@ struct ovpn_peer *ovpn_peer_new(struct ovpn_priv *ovpn, u32 id)
int ret;
/* alloc and init peer object */
- peer = kzalloc_obj(*peer, GFP_KERNEL);
+ peer = kzalloc_obj(*peer);
if (!peer)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/net/ovpn/socket.c b/drivers/net/ovpn/socket.c
index 7be493f78440..517caa64a4fe 100644
--- a/drivers/net/ovpn/socket.c
+++ b/drivers/net/ovpn/socket.c
@@ -191,7 +191,7 @@ struct ovpn_socket *ovpn_socket_new(struct socket *sock, struct ovpn_peer *peer)
/* socket is not owned: attach to this ovpn instance */
- ovpn_sock = kzalloc_obj(*ovpn_sock, GFP_KERNEL);
+ ovpn_sock = kzalloc_obj(*ovpn_sock);
if (!ovpn_sock) {
ovpn_sock = ERR_PTR(-ENOMEM);
goto sock_release;
diff --git a/drivers/net/pcs/pcs-lynx.c b/drivers/net/pcs/pcs-lynx.c
index abf521f063cf..a92081560e64 100644
--- a/drivers/net/pcs/pcs-lynx.c
+++ b/drivers/net/pcs/pcs-lynx.c
@@ -288,7 +288,7 @@ static struct phylink_pcs *lynx_pcs_create(struct mdio_device *mdio)
struct lynx_pcs *lynx;
int i;
- lynx = kzalloc_obj(*lynx, GFP_KERNEL);
+ lynx = kzalloc_obj(*lynx);
if (!lynx)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/net/pcs/pcs-mtk-lynxi.c b/drivers/net/pcs/pcs-mtk-lynxi.c
index 5587d572dcbc..c12f8087af9b 100644
--- a/drivers/net/pcs/pcs-mtk-lynxi.c
+++ b/drivers/net/pcs/pcs-mtk-lynxi.c
@@ -334,7 +334,7 @@ struct phylink_pcs *mtk_pcs_lynxi_create(struct device *dev,
dev_dbg(dev, "MediaTek LynxI SGMII PCS (id 0x%08x, ver 0x%04x)\n", id,
ver);
- mpcs = kzalloc_obj(*mpcs, GFP_KERNEL);
+ mpcs = kzalloc_obj(*mpcs);
if (!mpcs)
return NULL;
diff --git a/drivers/net/pcs/pcs-rzn1-miic.c b/drivers/net/pcs/pcs-rzn1-miic.c
index 4de8c426787e..4652dc7dd604 100644
--- a/drivers/net/pcs/pcs-rzn1-miic.c
+++ b/drivers/net/pcs/pcs-rzn1-miic.c
@@ -487,7 +487,7 @@ struct phylink_pcs *miic_create(struct device *dev, struct device_node *np)
return ERR_PTR(-EINVAL);
}
- miic_port = kzalloc_obj(*miic_port, GFP_KERNEL);
+ miic_port = kzalloc_obj(*miic_port);
if (!miic_port) {
put_device(&pdev->dev);
return ERR_PTR(-ENOMEM);
diff --git a/drivers/net/pcs/pcs-xpcs.c b/drivers/net/pcs/pcs-xpcs.c
index 8566e6ad64e9..e69fa2f0a0e8 100644
--- a/drivers/net/pcs/pcs-xpcs.c
+++ b/drivers/net/pcs/pcs-xpcs.c
@@ -1528,7 +1528,7 @@ static struct dw_xpcs *xpcs_create_data(struct mdio_device *mdiodev)
{
struct dw_xpcs *xpcs;
- xpcs = kzalloc_obj(*xpcs, GFP_KERNEL);
+ xpcs = kzalloc_obj(*xpcs);
if (!xpcs)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/net/phy/as21xxx.c b/drivers/net/phy/as21xxx.c
index d3954ea6b1dd..d5738117eca6 100644
--- a/drivers/net/phy/as21xxx.c
+++ b/drivers/net/phy/as21xxx.c
@@ -907,7 +907,7 @@ static int as21xxx_match_phy_device(struct phy_device *phydev,
return phy_id == phydrv->phy_id;
/* Allocate temp priv and load the firmware */
- priv = kzalloc_obj(*priv, GFP_KERNEL);
+ priv = kzalloc_obj(*priv);
if (!priv)
return -ENOMEM;
diff --git a/drivers/net/phy/dp83640.c b/drivers/net/phy/dp83640.c
index a56f4302840f..be0051ff6420 100644
--- a/drivers/net/phy/dp83640.c
+++ b/drivers/net/phy/dp83640.c
@@ -1027,7 +1027,7 @@ static struct dp83640_clock *dp83640_clock_get_bus(struct mii_bus *bus)
if (clock)
goto out;
- clock = kzalloc_obj(struct dp83640_clock, GFP_KERNEL);
+ clock = kzalloc_obj(struct dp83640_clock);
if (!clock)
goto out;
@@ -1411,7 +1411,7 @@ static int dp83640_probe(struct phy_device *phydev)
if (!clock)
goto no_clock;
- dp83640 = kzalloc_obj(struct dp83640_private, GFP_KERNEL);
+ dp83640 = kzalloc_obj(struct dp83640_private);
if (!dp83640)
goto no_memory;
diff --git a/drivers/net/phy/mdio_device.c b/drivers/net/phy/mdio_device.c
index 172fbfcb215c..b8a5a1838196 100644
--- a/drivers/net/phy/mdio_device.c
+++ b/drivers/net/phy/mdio_device.c
@@ -41,7 +41,7 @@ struct mdio_device *mdio_device_create(struct mii_bus *bus, int addr)
struct mdio_device *mdiodev;
/* We allocate the device, and initialize the default values */
- mdiodev = kzalloc_obj(*mdiodev, GFP_KERNEL);
+ mdiodev = kzalloc_obj(*mdiodev);
if (!mdiodev)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/net/phy/micrel.c b/drivers/net/phy/micrel.c
index 5ef9248c6b49..c6b011a9d636 100644
--- a/drivers/net/phy/micrel.c
+++ b/drivers/net/phy/micrel.c
@@ -4114,7 +4114,7 @@ static void lan8814_get_rx_ts(struct kszphy_ptp_priv *ptp_priv)
u32 reg;
do {
- rx_ts = kzalloc_obj(*rx_ts, GFP_KERNEL);
+ rx_ts = kzalloc_obj(*rx_ts);
if (!rx_ts)
return;
diff --git a/drivers/net/phy/microchip_rds_ptp.c b/drivers/net/phy/microchip_rds_ptp.c
index 9307df6f6d11..2ad95d5c9d86 100644
--- a/drivers/net/phy/microchip_rds_ptp.c
+++ b/drivers/net/phy/microchip_rds_ptp.c
@@ -999,7 +999,7 @@ static struct mchp_rds_ptp_rx_ts
if (rc < 0)
goto error;
- rx_ts = kmalloc_obj(*rx_ts, GFP_KERNEL);
+ rx_ts = kmalloc_obj(*rx_ts);
if (!rx_ts)
return NULL;
diff --git a/drivers/net/phy/mii_timestamper.c b/drivers/net/phy/mii_timestamper.c
index 259ed30897c7..3ad10e9e36d0 100644
--- a/drivers/net/phy/mii_timestamper.c
+++ b/drivers/net/phy/mii_timestamper.c
@@ -28,7 +28,7 @@ int register_mii_tstamp_controller(struct device *device,
{
struct mii_timestamping_desc *desc;
- desc = kzalloc_obj(*desc, GFP_KERNEL);
+ desc = kzalloc_obj(*desc);
if (!desc)
return -ENOMEM;
diff --git a/drivers/net/phy/mscc/mscc_macsec.c b/drivers/net/phy/mscc/mscc_macsec.c
index ed0d445ce1e1..2ae5eed6da1a 100644
--- a/drivers/net/phy/mscc/mscc_macsec.c
+++ b/drivers/net/phy/mscc/mscc_macsec.c
@@ -610,7 +610,7 @@ static struct macsec_flow *vsc8584_macsec_alloc_flow(struct vsc8531_private *pri
if (index == MSCC_MS_MAX_FLOWS)
return ERR_PTR(-ENOMEM);
- flow = kzalloc_obj(*flow, GFP_KERNEL);
+ flow = kzalloc_obj(*flow);
if (!flow)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/net/phy/nxp-c45-tja11xx-macsec.c b/drivers/net/phy/nxp-c45-tja11xx-macsec.c
index 21519a2d9f85..63e3934be653 100644
--- a/drivers/net/phy/nxp-c45-tja11xx-macsec.c
+++ b/drivers/net/phy/nxp-c45-tja11xx-macsec.c
@@ -431,7 +431,7 @@ static struct nxp_c45_sa *nxp_c45_sa_alloc(struct list_head *sa_list, void *sa,
return ERR_PTR(-ENOSPC);
}
- tmp = kzalloc_obj(*tmp, GFP_KERNEL);
+ tmp = kzalloc_obj(*tmp);
if (!tmp)
return ERR_PTR(-ENOMEM);
@@ -991,7 +991,7 @@ static int nxp_c45_mdo_add_secy(struct macsec_context *ctx)
if (idx == TX_SC_MAX)
return -ENOSPC;
- phy_secy = kzalloc_obj(*phy_secy, GFP_KERNEL);
+ phy_secy = kzalloc_obj(*phy_secy);
if (!phy_secy)
return -ENOMEM;
diff --git a/drivers/net/phy/phy.c b/drivers/net/phy/phy.c
index 376bfa923349..1f1039084f51 100644
--- a/drivers/net/phy/phy.c
+++ b/drivers/net/phy/phy.c
@@ -736,7 +736,7 @@ int phy_ethtool_set_plca_cfg(struct phy_device *phydev,
goto out;
}
- curr_plca_cfg = kmalloc_obj(*curr_plca_cfg, GFP_KERNEL);
+ curr_plca_cfg = kmalloc_obj(*curr_plca_cfg);
if (!curr_plca_cfg) {
ret = -ENOMEM;
goto out;
diff --git a/drivers/net/phy/phy_device.c b/drivers/net/phy/phy_device.c
index 52c2ff7fc6ae..02fc0133428d 100644
--- a/drivers/net/phy/phy_device.c
+++ b/drivers/net/phy/phy_device.c
@@ -438,7 +438,7 @@ static SIMPLE_DEV_PM_OPS(mdio_bus_phy_pm_ops, mdio_bus_phy_suspend,
static int phy_register_fixup(const char *bus_id, u32 phy_uid, u32 phy_uid_mask,
int (*run)(struct phy_device *))
{
- struct phy_fixup *fixup = kzalloc_obj(*fixup, GFP_KERNEL);
+ struct phy_fixup *fixup = kzalloc_obj(*fixup);
if (!fixup)
return -ENOMEM;
@@ -754,7 +754,7 @@ struct phy_device *phy_device_create(struct mii_bus *bus, int addr, u32 phy_id,
int ret = 0;
/* We allocate the device, and initialize the default values */
- dev = kzalloc_obj(*dev, GFP_KERNEL);
+ dev = kzalloc_obj(*dev);
if (!dev)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/net/phy/phy_led_triggers.c b/drivers/net/phy/phy_led_triggers.c
index 7821fe19934c..9e24d4ebcb79 100644
--- a/drivers/net/phy/phy_led_triggers.c
+++ b/drivers/net/phy/phy_led_triggers.c
@@ -93,7 +93,7 @@ int phy_led_triggers_register(struct phy_device *phy)
if (!phy->phy_num_led_triggers)
return 0;
- phy->led_link_trigger = kzalloc_obj(*phy->led_link_trigger, GFP_KERNEL);
+ phy->led_link_trigger = kzalloc_obj(*phy->led_link_trigger);
if (!phy->led_link_trigger) {
err = -ENOMEM;
goto out_clear;
diff --git a/drivers/net/phy/phy_link_topology.c b/drivers/net/phy/phy_link_topology.c
index ed15599dd38d..1f1eb5d59b38 100644
--- a/drivers/net/phy/phy_link_topology.c
+++ b/drivers/net/phy/phy_link_topology.c
@@ -15,7 +15,7 @@ static int netdev_alloc_phy_link_topology(struct net_device *dev)
{
struct phy_link_topology *topo;
- topo = kzalloc_obj(*topo, GFP_KERNEL);
+ topo = kzalloc_obj(*topo);
if (!topo)
return -ENOMEM;
@@ -43,7 +43,7 @@ int phy_link_topo_add_phy(struct net_device *dev,
topo = dev->link_topo;
}
- pdn = kzalloc_obj(*pdn, GFP_KERNEL);
+ pdn = kzalloc_obj(*pdn);
if (!pdn)
return -ENOMEM;
diff --git a/drivers/net/phy/phy_package.c b/drivers/net/phy/phy_package.c
index 3137a8fecf21..63e4f862f731 100644
--- a/drivers/net/phy/phy_package.c
+++ b/drivers/net/phy/phy_package.c
@@ -219,7 +219,7 @@ int phy_package_join(struct phy_device *phydev, int base_addr, size_t priv_size)
shared = bus->shared[base_addr];
if (!shared) {
ret = -ENOMEM;
- shared = kzalloc_obj(*shared, GFP_KERNEL);
+ shared = kzalloc_obj(*shared);
if (!shared)
goto err_unlock;
if (priv_size) {
diff --git a/drivers/net/phy/phy_port.c b/drivers/net/phy/phy_port.c
index cae133a25fb0..e56e29d0e9fa 100644
--- a/drivers/net/phy/phy_port.c
+++ b/drivers/net/phy/phy_port.c
@@ -19,7 +19,7 @@ struct phy_port *phy_port_alloc(void)
{
struct phy_port *port;
- port = kzalloc_obj(*port, GFP_KERNEL);
+ port = kzalloc_obj(*port);
if (!port)
return NULL;
diff --git a/drivers/net/phy/phylink.c b/drivers/net/phy/phylink.c
index f21a69e34d1c..aba1b35c7cd7 100644
--- a/drivers/net/phy/phylink.c
+++ b/drivers/net/phy/phylink.c
@@ -1853,7 +1853,7 @@ struct phylink *phylink_create(struct phylink_config *config,
return ERR_PTR(-EINVAL);
}
- pl = kzalloc_obj(*pl, GFP_KERNEL);
+ pl = kzalloc_obj(*pl);
if (!pl)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/net/phy/sfp-bus.c b/drivers/net/phy/sfp-bus.c
index 07175bf3ef60..8679d27bf1ba 100644
--- a/drivers/net/phy/sfp-bus.c
+++ b/drivers/net/phy/sfp-bus.c
@@ -388,7 +388,7 @@ static struct sfp_bus *sfp_bus_get(const struct fwnode_handle *fwnode)
{
struct sfp_bus *sfp, *new, *found = NULL;
- new = kzalloc_obj(*new, GFP_KERNEL);
+ new = kzalloc_obj(*new);
mutex_lock(&sfp_mutex);
diff --git a/drivers/net/phy/sfp.c b/drivers/net/phy/sfp.c
index 42a9c93f03b3..f4bf53da3d4f 100644
--- a/drivers/net/phy/sfp.c
+++ b/drivers/net/phy/sfp.c
@@ -3029,7 +3029,7 @@ static struct sfp *sfp_alloc(struct device *dev)
{
struct sfp *sfp;
- sfp = kzalloc_obj(*sfp, GFP_KERNEL);
+ sfp = kzalloc_obj(*sfp);
if (!sfp)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/net/ppp/bsd_comp.c b/drivers/net/ppp/bsd_comp.c
index 26bfa0feb7f5..63a6d251c746 100644
--- a/drivers/net/ppp/bsd_comp.c
+++ b/drivers/net/ppp/bsd_comp.c
@@ -395,7 +395,7 @@ static void *bsd_alloc (unsigned char *options, int opt_len, int decomp)
* Allocate the main control structure for this instance.
*/
maxmaxcode = MAXCODE(bits);
- db = kzalloc_obj(struct bsd_db, GFP_KERNEL);
+ db = kzalloc_obj(struct bsd_db);
if (!db)
{
return NULL;
diff --git a/drivers/net/ppp/ppp_async.c b/drivers/net/ppp/ppp_async.c
index ead937d95cd8..b4cf2d09c6bd 100644
--- a/drivers/net/ppp/ppp_async.c
+++ b/drivers/net/ppp/ppp_async.c
@@ -163,7 +163,7 @@ ppp_asynctty_open(struct tty_struct *tty)
return -EOPNOTSUPP;
err = -ENOMEM;
- ap = kzalloc_obj(*ap, GFP_KERNEL);
+ ap = kzalloc_obj(*ap);
if (!ap)
goto out;
diff --git a/drivers/net/ppp/ppp_deflate.c b/drivers/net/ppp/ppp_deflate.c
index 1d8370d2f098..d6d5e656b3f4 100644
--- a/drivers/net/ppp/ppp_deflate.c
+++ b/drivers/net/ppp/ppp_deflate.c
@@ -97,7 +97,7 @@ static void *z_comp_alloc(unsigned char *options, int opt_len)
if (w_size < DEFLATE_MIN_SIZE || w_size > DEFLATE_MAX_SIZE)
return NULL;
- state = kzalloc_obj(*state, GFP_KERNEL);
+ state = kzalloc_obj(*state);
if (state == NULL)
return NULL;
@@ -312,7 +312,7 @@ static void *z_decomp_alloc(unsigned char *options, int opt_len)
if (w_size < DEFLATE_MIN_SIZE || w_size > DEFLATE_MAX_SIZE)
return NULL;
- state = kzalloc_obj(*state, GFP_KERNEL);
+ state = kzalloc_obj(*state);
if (state == NULL)
return NULL;
diff --git a/drivers/net/ppp/ppp_generic.c b/drivers/net/ppp/ppp_generic.c
index fdf96999ba18..e9b41777be80 100644
--- a/drivers/net/ppp/ppp_generic.c
+++ b/drivers/net/ppp/ppp_generic.c
@@ -2926,7 +2926,7 @@ int ppp_register_net_channel(struct net *net, struct ppp_channel *chan)
struct channel *pch;
struct ppp_net *pn;
- pch = kzalloc_obj(struct channel, GFP_KERNEL);
+ pch = kzalloc_obj(struct channel);
if (!pch)
return -ENOMEM;
diff --git a/drivers/net/ppp/ppp_mppe.c b/drivers/net/ppp/ppp_mppe.c
index eacfe50b6955..3900279b4819 100644
--- a/drivers/net/ppp/ppp_mppe.c
+++ b/drivers/net/ppp/ppp_mppe.c
@@ -158,7 +158,7 @@ static void *mppe_alloc(unsigned char *options, int optlen)
fips_enabled)
return NULL;
- state = kzalloc_obj(*state, GFP_KERNEL);
+ state = kzalloc_obj(*state);
if (state == NULL)
return NULL;
diff --git a/drivers/net/ppp/ppp_synctty.c b/drivers/net/ppp/ppp_synctty.c
index f49e60985171..c2063961f395 100644
--- a/drivers/net/ppp/ppp_synctty.c
+++ b/drivers/net/ppp/ppp_synctty.c
@@ -162,7 +162,7 @@ ppp_sync_open(struct tty_struct *tty)
if (tty->ops->write == NULL)
return -EOPNOTSUPP;
- ap = kzalloc_obj(*ap, GFP_KERNEL);
+ ap = kzalloc_obj(*ap);
err = -ENOMEM;
if (!ap)
goto out;
diff --git a/drivers/net/pse-pd/pd692x0.c b/drivers/net/pse-pd/pd692x0.c
index ef130eb75212..e923da5c5506 100644
--- a/drivers/net/pse-pd/pd692x0.c
+++ b/drivers/net/pse-pd/pd692x0.c
@@ -1259,7 +1259,7 @@ static int pd692x0_setup_pi_matrix(struct pse_controller_dev *pcdev)
struct pd692x0_manager *manager;
int ret;
- manager = kzalloc_objs(*manager, PD692X0_MAX_MANAGERS, GFP_KERNEL);
+ manager = kzalloc_objs(*manager, PD692X0_MAX_MANAGERS);
if (!manager)
return -ENOMEM;
diff --git a/drivers/net/pse-pd/pse_core.c b/drivers/net/pse-pd/pse_core.c
index ccbcda0cc4a2..3beaaaeec9e1 100644
--- a/drivers/net/pse-pd/pse_core.c
+++ b/drivers/net/pse-pd/pse_core.c
@@ -162,7 +162,7 @@ static int of_load_pse_pis(struct pse_controller_dev *pcdev)
if (!np)
return -ENODEV;
- pcdev->pi = kzalloc_objs(*pcdev->pi, pcdev->nr_lines, GFP_KERNEL);
+ pcdev->pi = kzalloc_objs(*pcdev->pi, pcdev->nr_lines);
if (!pcdev->pi)
return -ENOMEM;
@@ -1408,7 +1408,7 @@ pse_control_get_internal(struct pse_controller_dev *pcdev, unsigned int index,
}
}
- psec = kzalloc_obj(*psec, GFP_KERNEL);
+ psec = kzalloc_obj(*psec);
if (!psec)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/net/pse-pd/tps23881.c b/drivers/net/pse-pd/tps23881.c
index 465b6cfa6253..d40cb35a2547 100644
--- a/drivers/net/pse-pd/tps23881.c
+++ b/drivers/net/pse-pd/tps23881.c
@@ -523,7 +523,7 @@ tps23881_pi_get_pw_limit_ranges(struct pse_controller_dev *pcdev, int id,
{
struct ethtool_c33_pse_pw_limit_range *c33_pw_limit_ranges;
- c33_pw_limit_ranges = kzalloc_obj(*c33_pw_limit_ranges, GFP_KERNEL);
+ c33_pw_limit_ranges = kzalloc_obj(*c33_pw_limit_ranges);
if (!c33_pw_limit_ranges)
return -ENOMEM;
diff --git a/drivers/net/rionet.c b/drivers/net/rionet.c
index 09fbb4ce8e38..64b5d0a8ae4a 100644
--- a/drivers/net/rionet.c
+++ b/drivers/net/rionet.c
@@ -603,7 +603,7 @@ static int rionet_add_dev(struct device *dev, struct subsys_interface *sif)
rnet = netdev_priv(nets[netid].ndev);
- peer = kzalloc_obj(*peer, GFP_KERNEL);
+ peer = kzalloc_obj(*peer);
if (!peer) {
rc = -ENOMEM;
goto out;
diff --git a/drivers/net/slip/slhc.c b/drivers/net/slip/slhc.c
index 98c4d5925694..e3c785da3eef 100644
--- a/drivers/net/slip/slhc.c
+++ b/drivers/net/slip/slhc.c
@@ -98,7 +98,7 @@ slhc_init(int rslots, int tslots)
if (rslots < 0 || rslots > 255 || tslots < 0 || tslots > 255)
return ERR_PTR(-EINVAL);
- comp = kzalloc_obj(struct slcompress, GFP_KERNEL);
+ comp = kzalloc_obj(struct slcompress);
if (! comp)
goto out_fail;
diff --git a/drivers/net/slip/slip.c b/drivers/net/slip/slip.c
index 4019c6b4dafc..820e1a8fc956 100644
--- a/drivers/net/slip/slip.c
+++ b/drivers/net/slip/slip.c
@@ -1297,7 +1297,7 @@ static int __init slip_init(void)
printk(KERN_INFO "SLIP linefill/keepalive option.\n");
#endif
- slip_devs = kzalloc_objs(struct net_device *, slip_maxdev, GFP_KERNEL);
+ slip_devs = kzalloc_objs(struct net_device *, slip_maxdev);
if (!slip_devs)
return -ENOMEM;
diff --git a/drivers/net/tap.c b/drivers/net/tap.c
index aee69767342e..b8240737dc51 100644
--- a/drivers/net/tap.c
+++ b/drivers/net/tap.c
@@ -1197,7 +1197,7 @@ int tap_queue_resize(struct tap_dev *tap)
int n = tap->numqueues;
int ret, i = 0;
- rings = kmalloc_objs(*rings, n, GFP_KERNEL);
+ rings = kmalloc_objs(*rings, n);
if (!rings)
return -ENOMEM;
diff --git a/drivers/net/team/team_core.c b/drivers/net/team/team_core.c
index 28c09ffd34b8..937dd6dc070b 100644
--- a/drivers/net/team/team_core.c
+++ b/drivers/net/team/team_core.c
@@ -157,7 +157,7 @@ static int __team_option_inst_add(struct team *team, struct team_option *option,
array_size = 1; /* No array but still need one instance */
for (i = 0; i < array_size; i++) {
- opt_inst = kmalloc_obj(*opt_inst, GFP_KERNEL);
+ opt_inst = kmalloc_obj(*opt_inst);
if (!opt_inst)
return -ENOMEM;
opt_inst->option = option;
@@ -256,7 +256,7 @@ static int __team_options_register(struct team *team,
struct team_option **dst_opts;
int err;
- dst_opts = kzalloc_objs(struct team_option *, option_count, GFP_KERNEL);
+ dst_opts = kzalloc_objs(struct team_option *, option_count);
if (!dst_opts)
return -ENOMEM;
for (i = 0; i < option_count; i++, option++) {
@@ -433,7 +433,7 @@ int team_mode_register(const struct team_mode *mode)
mode->priv_size > TEAM_MODE_PRIV_SIZE)
return -EINVAL;
- mitem = kmalloc_obj(*mitem, GFP_KERNEL);
+ mitem = kmalloc_obj(*mitem);
if (!mitem)
return -ENOMEM;
@@ -779,7 +779,7 @@ static int team_queue_override_init(struct team *team)
if (!queue_cnt)
return 0;
- listarr = kmalloc_objs(struct list_head, queue_cnt, GFP_KERNEL);
+ listarr = kmalloc_objs(struct list_head, queue_cnt);
if (!listarr)
return -ENOMEM;
team->qom_lists = listarr;
@@ -1015,7 +1015,7 @@ static int __team_port_enable_netpoll(struct team_port *port)
struct netpoll *np;
int err;
- np = kzalloc_obj(*np, GFP_KERNEL);
+ np = kzalloc_obj(*np);
if (!np)
return -ENOMEM;
diff --git a/drivers/net/team/team_mode_loadbalance.c b/drivers/net/team/team_mode_loadbalance.c
index b50c479f06ce..684954c2a8de 100644
--- a/drivers/net/team/team_mode_loadbalance.c
+++ b/drivers/net/team/team_mode_loadbalance.c
@@ -259,7 +259,7 @@ static int __fprog_create(struct sock_fprog_kern **pfprog, u32 data_len,
if (data_len % sizeof(struct sock_filter))
return -EINVAL;
- fprog = kmalloc_obj(*fprog, GFP_KERNEL);
+ fprog = kmalloc_obj(*fprog);
if (!fprog)
return -ENOMEM;
fprog->filter = kmemdup(filter, data_len, GFP_KERNEL);
@@ -594,7 +594,7 @@ static int lb_init(struct team *team)
BUG_ON(!func);
rcu_assign_pointer(lb_priv->select_tx_port_func, func);
- lb_priv->ex = kzalloc_obj(*lb_priv->ex, GFP_KERNEL);
+ lb_priv->ex = kzalloc_obj(*lb_priv->ex);
if (!lb_priv->ex)
return -ENOMEM;
lb_priv->ex->team = team;
diff --git a/drivers/net/tun.c b/drivers/net/tun.c
index fcddbeb6d36a..c492fda6fc15 100644
--- a/drivers/net/tun.c
+++ b/drivers/net/tun.c
@@ -2228,7 +2228,7 @@ static int __tun_set_ebpf(struct tun_struct *tun,
struct tun_prog *old, *new = NULL;
if (prog) {
- new = kmalloc_obj(*new, GFP_KERNEL);
+ new = kmalloc_obj(*new);
if (!new)
return -ENOMEM;
new->prog = prog;
@@ -3605,7 +3605,7 @@ static int tun_queue_resize(struct tun_struct *tun)
int n = tun->numqueues + tun->numdisabled;
int ret, i;
- rings = kmalloc_objs(*rings, n, GFP_KERNEL);
+ rings = kmalloc_objs(*rings, n);
if (!rings)
return -ENOMEM;
diff --git a/drivers/net/usb/aqc111.c b/drivers/net/usb/aqc111.c
index 5ab60f7c90dd..cbffa9ae1bb6 100644
--- a/drivers/net/usb/aqc111.c
+++ b/drivers/net/usb/aqc111.c
@@ -703,7 +703,7 @@ static int aqc111_bind(struct usbnet *dev, struct usb_interface *intf)
return ret;
}
- aqc111_data = kzalloc_obj(*aqc111_data, GFP_KERNEL);
+ aqc111_data = kzalloc_obj(*aqc111_data);
if (!aqc111_data)
return -ENOMEM;
diff --git a/drivers/net/usb/asix_devices.c b/drivers/net/usb/asix_devices.c
index ca8a9d04a16b..df0bcfedddbc 100644
--- a/drivers/net/usb/asix_devices.c
+++ b/drivers/net/usb/asix_devices.c
@@ -1314,7 +1314,7 @@ static int ax88178_bind(struct usbnet *dev, struct usb_interface *intf)
dev->rx_urb_size = 2048;
}
- dev->driver_priv = kzalloc_obj(struct asix_common_private, GFP_KERNEL);
+ dev->driver_priv = kzalloc_obj(struct asix_common_private);
if (!dev->driver_priv)
return -ENOMEM;
diff --git a/drivers/net/usb/ax88172a.c b/drivers/net/usb/ax88172a.c
index 54c0ba627b50..6b14bce2a552 100644
--- a/drivers/net/usb/ax88172a.c
+++ b/drivers/net/usb/ax88172a.c
@@ -165,7 +165,7 @@ static int ax88172a_bind(struct usbnet *dev, struct usb_interface *intf)
if (ret)
return ret;
- priv = kzalloc_obj(*priv, GFP_KERNEL);
+ priv = kzalloc_obj(*priv);
if (!priv)
return -ENOMEM;
diff --git a/drivers/net/usb/ax88179_178a.c b/drivers/net/usb/ax88179_178a.c
index 46e6c4dcda47..98f899ea2e94 100644
--- a/drivers/net/usb/ax88179_178a.c
+++ b/drivers/net/usb/ax88179_178a.c
@@ -1287,7 +1287,7 @@ static int ax88179_bind(struct usbnet *dev, struct usb_interface *intf)
if (ret < 0)
return ret;
- ax179_data = kzalloc_obj(*ax179_data, GFP_KERNEL);
+ ax179_data = kzalloc_obj(*ax179_data);
if (!ax179_data)
return -ENOMEM;
diff --git a/drivers/net/usb/cdc_ncm.c b/drivers/net/usb/cdc_ncm.c
index 39e8063b1f5b..7057c6c0cfc6 100644
--- a/drivers/net/usb/cdc_ncm.c
+++ b/drivers/net/usb/cdc_ncm.c
@@ -827,7 +827,7 @@ int cdc_ncm_bind_common(struct usbnet *dev, struct usb_interface *intf, u8 data_
u8 iface_no;
struct usb_cdc_parsed_header hdr;
- ctx = kzalloc_obj(*ctx, GFP_KERNEL);
+ ctx = kzalloc_obj(*ctx);
if (!ctx)
return -ENOMEM;
diff --git a/drivers/net/usb/cx82310_eth.c b/drivers/net/usb/cx82310_eth.c
index 54199fde1c64..068acb052adb 100644
--- a/drivers/net/usb/cx82310_eth.c
+++ b/drivers/net/usb/cx82310_eth.c
@@ -173,7 +173,7 @@ static int cx82310_bind(struct usbnet *dev, struct usb_interface *intf)
if (!dev->partial_data)
return -ENOMEM;
- priv = kzalloc_obj(*priv, GFP_KERNEL);
+ priv = kzalloc_obj(*priv);
if (!priv) {
ret = -ENOMEM;
goto err_partial;
diff --git a/drivers/net/usb/hso.c b/drivers/net/usb/hso.c
index 1da216248896..e7f66e4f63b5 100644
--- a/drivers/net/usb/hso.c
+++ b/drivers/net/usb/hso.c
@@ -2313,7 +2313,7 @@ static struct hso_device *hso_create_device(struct usb_interface *intf,
{
struct hso_device *hso_dev;
- hso_dev = kzalloc_obj(*hso_dev, GFP_KERNEL);
+ hso_dev = kzalloc_obj(*hso_dev);
if (!hso_dev)
return NULL;
@@ -2617,7 +2617,7 @@ static struct hso_device *hso_create_bulk_serial_device(
if (!hso_dev)
return NULL;
- serial = kzalloc_obj(*serial, GFP_KERNEL);
+ serial = kzalloc_obj(*serial);
if (!serial)
goto exit;
@@ -2626,7 +2626,7 @@ static struct hso_device *hso_create_bulk_serial_device(
if ((port & HSO_PORT_MASK) == HSO_PORT_MODEM) {
num_urbs = 2;
- serial->tiocmget = kzalloc_obj(struct hso_tiocmget, GFP_KERNEL);
+ serial->tiocmget = kzalloc_obj(struct hso_tiocmget);
if (!serial->tiocmget)
goto exit;
serial->tiocmget->serial_state_notification
@@ -2710,7 +2710,7 @@ struct hso_device *hso_create_mux_serial_device(struct usb_interface *interface,
if (!hso_dev)
return NULL;
- serial = kzalloc_obj(*serial, GFP_KERNEL);
+ serial = kzalloc_obj(*serial);
if (!serial)
goto err_free_dev;
@@ -2754,7 +2754,7 @@ static void hso_free_shared_int(struct hso_shared_int *mux)
static
struct hso_shared_int *hso_create_shared_int(struct usb_interface *interface)
{
- struct hso_shared_int *mux = kzalloc_obj(*mux, GFP_KERNEL);
+ struct hso_shared_int *mux = kzalloc_obj(*mux);
if (!mux)
return NULL;
diff --git a/drivers/net/usb/lan78xx.c b/drivers/net/usb/lan78xx.c
index 92ec3e73edff..8da8e04c3109 100644
--- a/drivers/net/usb/lan78xx.c
+++ b/drivers/net/usb/lan78xx.c
@@ -682,7 +682,7 @@ static int lan78xx_read_stats(struct lan78xx_net *dev,
u32 *src;
u32 *dst;
- stats = kmalloc_obj(*stats, GFP_KERNEL);
+ stats = kmalloc_obj(*stats);
if (!stats)
return -ENOMEM;
@@ -3728,7 +3728,7 @@ static int lan78xx_bind(struct lan78xx_net *dev, struct usb_interface *intf)
int ret;
int i;
- dev->data[0] = (unsigned long) kzalloc_obj(*pdata, GFP_KERNEL);
+ dev->data[0] = (unsigned long) kzalloc_obj(*pdata);
pdata = (struct lan78xx_priv *)(dev->data[0]);
if (!pdata) {
diff --git a/drivers/net/usb/lg-vl600.c b/drivers/net/usb/lg-vl600.c
index 21f6a4795295..c4ad2d9f6f4f 100644
--- a/drivers/net/usb/lg-vl600.c
+++ b/drivers/net/usb/lg-vl600.c
@@ -56,7 +56,7 @@ struct vl600_state {
static int vl600_bind(struct usbnet *dev, struct usb_interface *intf)
{
int ret;
- struct vl600_state *s = kzalloc_obj(struct vl600_state, GFP_KERNEL);
+ struct vl600_state *s = kzalloc_obj(struct vl600_state);
if (!s)
return -ENOMEM;
diff --git a/drivers/net/usb/r8152.c b/drivers/net/usb/r8152.c
index c224d2ee107c..4af85728ac4f 100644
--- a/drivers/net/usb/r8152.c
+++ b/drivers/net/usb/r8152.c
@@ -9647,7 +9647,7 @@ static u8 __rtl_get_hw_ver(struct usb_device *udev)
int ret;
int i;
- tmp = kmalloc_obj(*tmp, GFP_KERNEL);
+ tmp = kmalloc_obj(*tmp);
if (!tmp)
return 0;
diff --git a/drivers/net/usb/sierra_net.c b/drivers/net/usb/sierra_net.c
index 87a10f5ab557..4d3ed642b3e7 100644
--- a/drivers/net/usb/sierra_net.c
+++ b/drivers/net/usb/sierra_net.c
@@ -683,7 +683,7 @@ static int sierra_net_bind(struct usbnet *dev, struct usb_interface *intf)
return -ENODEV;
}
/* Initialize sierra private data */
- priv = kzalloc_obj(*priv, GFP_KERNEL);
+ priv = kzalloc_obj(*priv);
if (!priv)
return -ENOMEM;
diff --git a/drivers/net/usb/smsc95xx.c b/drivers/net/usb/smsc95xx.c
index df2c4c1f8c0b..42e4048b574b 100644
--- a/drivers/net/usb/smsc95xx.c
+++ b/drivers/net/usb/smsc95xx.c
@@ -1157,7 +1157,7 @@ static int smsc95xx_bind(struct usbnet *dev, struct usb_interface *intf)
return ret;
}
- pdata = kzalloc_obj(*pdata, GFP_KERNEL);
+ pdata = kzalloc_obj(*pdata);
if (!pdata)
return -ENOMEM;
diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c
index 31ed78712e43..72d6a9c6a5a2 100644
--- a/drivers/net/virtio_net.c
+++ b/drivers/net/virtio_net.c
@@ -3732,7 +3732,7 @@ static int virtnet_set_queues(struct virtnet_info *vi, u16 queue_pairs)
goto succ;
}
- mq = kzalloc_obj(*mq, GFP_KERNEL);
+ mq = kzalloc_obj(*mq);
if (!mq)
return -ENOMEM;
@@ -3799,7 +3799,7 @@ static void virtnet_rx_mode_work(struct work_struct *work)
if (!virtio_has_feature(vi->vdev, VIRTIO_NET_F_CTRL_RX))
return;
- promisc_allmulti = kzalloc_obj(*promisc_allmulti, GFP_KERNEL);
+ promisc_allmulti = kzalloc_obj(*promisc_allmulti);
if (!promisc_allmulti) {
dev_warn(&dev->dev, "Failed to set RX mode, no memory.\n");
return;
@@ -3885,7 +3885,7 @@ static int virtnet_vlan_rx_add_vid(struct net_device *dev,
__virtio16 *_vid __free(kfree) = NULL;
struct scatterlist sg;
- _vid = kzalloc_obj(*_vid, GFP_KERNEL);
+ _vid = kzalloc_obj(*_vid);
if (!_vid)
return -ENOMEM;
@@ -3905,7 +3905,7 @@ static int virtnet_vlan_rx_kill_vid(struct net_device *dev,
__virtio16 *_vid __free(kfree) = NULL;
struct scatterlist sg;
- _vid = kzalloc_obj(*_vid, GFP_KERNEL);
+ _vid = kzalloc_obj(*_vid);
if (!_vid)
return -ENOMEM;
@@ -4028,7 +4028,7 @@ static int virtnet_send_ctrl_coal_vq_cmd(struct virtnet_info *vi,
struct virtio_net_ctrl_coal_vq *coal_vq __free(kfree) = NULL;
struct scatterlist sgs;
- coal_vq = kzalloc_obj(*coal_vq, GFP_KERNEL);
+ coal_vq = kzalloc_obj(*coal_vq);
if (!coal_vq)
return -ENOMEM;
@@ -4987,7 +4987,7 @@ static int virtnet_get_hw_stats(struct virtnet_info *vi,
qnum += 1;
}
- req = kzalloc_objs(*req, qnum, GFP_KERNEL);
+ req = kzalloc_objs(*req, qnum);
if (!req)
return -ENOMEM;
@@ -5127,7 +5127,7 @@ static int virtnet_send_tx_notf_coal_cmds(struct virtnet_info *vi,
struct scatterlist sgs_tx;
int i;
- coal_tx = kzalloc_obj(*coal_tx, GFP_KERNEL);
+ coal_tx = kzalloc_obj(*coal_tx);
if (!coal_tx)
return -ENOMEM;
@@ -5175,7 +5175,7 @@ static int virtnet_send_rx_notf_coal_cmds(struct virtnet_info *vi,
return 0;
}
- coal_rx = kzalloc_obj(*coal_rx, GFP_KERNEL);
+ coal_rx = kzalloc_obj(*coal_rx);
if (!coal_rx)
return -ENOMEM;
@@ -5738,7 +5738,7 @@ static int virtnet_set_guest_offloads(struct virtnet_info *vi, u64 offloads)
__virtio64 *_offloads __free(kfree) = NULL;
struct scatterlist sg;
- _offloads = kzalloc_obj(*_offloads, GFP_KERNEL);
+ _offloads = kzalloc_obj(*_offloads);
if (!_offloads)
return -ENOMEM;
@@ -5882,7 +5882,7 @@ static int virtnet_xsk_pool_enable(struct net_device *dev,
size = virtqueue_get_vring_size(rq->vq);
- rq->xsk_buffs = kvzalloc_objs(*rq->xsk_buffs, size, GFP_KERNEL);
+ rq->xsk_buffs = kvzalloc_objs(*rq->xsk_buffs, size);
if (!rq->xsk_buffs)
return -ENOMEM;
@@ -6395,14 +6395,14 @@ static int virtnet_find_vqs(struct virtnet_info *vi)
virtio_has_feature(vi->vdev, VIRTIO_NET_F_CTRL_VQ);
/* Allocate space for find_vqs parameters */
- vqs = kzalloc_objs(*vqs, total_vqs, GFP_KERNEL);
+ vqs = kzalloc_objs(*vqs, total_vqs);
if (!vqs)
goto err_vq;
- vqs_info = kzalloc_objs(*vqs_info, total_vqs, GFP_KERNEL);
+ vqs_info = kzalloc_objs(*vqs_info, total_vqs);
if (!vqs_info)
goto err_vqs_info;
if (!vi->big_packets || vi->mergeable_rx_bufs) {
- ctx = kzalloc_objs(*ctx, total_vqs, GFP_KERNEL);
+ ctx = kzalloc_objs(*ctx, total_vqs);
if (!ctx)
goto err_ctx;
} else {
@@ -6460,16 +6460,16 @@ static int virtnet_alloc_queues(struct virtnet_info *vi)
int i;
if (vi->has_cvq) {
- vi->ctrl = kzalloc_obj(*vi->ctrl, GFP_KERNEL);
+ vi->ctrl = kzalloc_obj(*vi->ctrl);
if (!vi->ctrl)
goto err_ctrl;
} else {
vi->ctrl = NULL;
}
- vi->sq = kzalloc_objs(*vi->sq, vi->max_queue_pairs, GFP_KERNEL);
+ vi->sq = kzalloc_objs(*vi->sq, vi->max_queue_pairs);
if (!vi->sq)
goto err_sq;
- vi->rq = kzalloc_objs(*vi->rq, vi->max_queue_pairs, GFP_KERNEL);
+ vi->rq = kzalloc_objs(*vi->rq, vi->max_queue_pairs);
if (!vi->rq)
goto err_rq;
@@ -7016,7 +7016,7 @@ static int virtnet_probe(struct virtio_device *vdev)
struct scatterlist sg;
__le64 v;
- stats_cap = kzalloc_obj(*stats_cap, GFP_KERNEL);
+ stats_cap = kzalloc_obj(*stats_cap);
if (!stats_cap) {
rtnl_unlock();
err = -ENOMEM;
diff --git a/drivers/net/vxlan/vxlan_core.c b/drivers/net/vxlan/vxlan_core.c
index c1cf3eff4c1b..05558b6afecd 100644
--- a/drivers/net/vxlan/vxlan_core.c
+++ b/drivers/net/vxlan/vxlan_core.c
@@ -3578,7 +3578,7 @@ static struct vxlan_sock *vxlan_socket_create(struct net *net, bool ipv6,
ASSERT_RTNL();
- vs = kzalloc_obj(*vs, GFP_KERNEL);
+ vs = kzalloc_obj(*vs);
if (!vs)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/net/vxlan/vxlan_mdb.c b/drivers/net/vxlan/vxlan_mdb.c
index 8f53ae776613..055a4969f593 100644
--- a/drivers/net/vxlan/vxlan_mdb.c
+++ b/drivers/net/vxlan/vxlan_mdb.c
@@ -430,7 +430,7 @@ static int vxlan_mdb_config_src_entry_init(struct vxlan_mdb_config *cfg,
extack))
return -EINVAL;
- src = kzalloc_obj(*src, GFP_KERNEL);
+ src = kzalloc_obj(*src);
if (!src)
return -ENOMEM;
@@ -697,7 +697,7 @@ static int vxlan_mdb_remote_rdst_init(const struct vxlan_mdb_config *cfg,
struct vxlan_rdst *rd;
int err;
- rd = kzalloc_obj(*rd, GFP_KERNEL);
+ rd = kzalloc_obj(*rd);
if (!rd)
return -ENOMEM;
@@ -767,7 +767,7 @@ vxlan_mdb_remote_src_entry_add(struct vxlan_mdb_remote *remote,
{
struct vxlan_mdb_src_entry *ent;
- ent = kzalloc_obj(*ent, GFP_KERNEL);
+ ent = kzalloc_obj(*ent);
if (!ent)
return NULL;
@@ -1139,7 +1139,7 @@ static int vxlan_mdb_remote_add(const struct vxlan_mdb_config *cfg,
return -ENOENT;
}
- remote = kzalloc_obj(*remote, GFP_KERNEL);
+ remote = kzalloc_obj(*remote);
if (!remote)
return -ENOMEM;
@@ -1187,7 +1187,7 @@ vxlan_mdb_entry_get(struct vxlan_dev *vxlan,
if (mdb_entry)
return mdb_entry;
- mdb_entry = kzalloc_obj(*mdb_entry, GFP_KERNEL);
+ mdb_entry = kzalloc_obj(*mdb_entry);
if (!mdb_entry)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/net/vxlan/vxlan_vnifilter.c b/drivers/net/vxlan/vxlan_vnifilter.c
index 726a34d16fa2..2042369379ff 100644
--- a/drivers/net/vxlan/vxlan_vnifilter.c
+++ b/drivers/net/vxlan/vxlan_vnifilter.c
@@ -697,7 +697,7 @@ static struct vxlan_vni_node *vxlan_vni_alloc(struct vxlan_dev *vxlan,
{
struct vxlan_vni_node *vninode;
- vninode = kzalloc_obj(*vninode, GFP_KERNEL);
+ vninode = kzalloc_obj(*vninode);
if (!vninode)
return NULL;
vninode->stats = netdev_alloc_pcpu_stats(struct vxlan_vni_stats_pcpu);
@@ -925,7 +925,7 @@ int vxlan_vnigroup_init(struct vxlan_dev *vxlan)
struct vxlan_vni_group *vg;
int ret;
- vg = kzalloc_obj(*vg, GFP_KERNEL);
+ vg = kzalloc_obj(*vg);
if (!vg)
return -ENOMEM;
ret = rhashtable_init(&vg->vni_hash, &vxlan_vni_rht_params);
diff --git a/drivers/net/wan/c101.c b/drivers/net/wan/c101.c
index 82ba8dfa979b..f35a15cf5dd9 100644
--- a/drivers/net/wan/c101.c
+++ b/drivers/net/wan/c101.c
@@ -313,7 +313,7 @@ static int __init c101_run(unsigned long irq, unsigned long winbase)
return -ENODEV;
}
- card = kzalloc_obj(card_t, GFP_KERNEL);
+ card = kzalloc_obj(card_t);
if (!card)
return -ENOBUFS;
diff --git a/drivers/net/wan/farsync.c b/drivers/net/wan/farsync.c
index 9f989b2ff558..957e0b272d54 100644
--- a/drivers/net/wan/farsync.c
+++ b/drivers/net/wan/farsync.c
@@ -2359,7 +2359,7 @@ fst_add_one(struct pci_dev *pdev, const struct pci_device_id *ent)
}
/* Allocate driver private data */
- card = kzalloc_obj(struct fst_card_info, GFP_KERNEL);
+ card = kzalloc_obj(struct fst_card_info);
if (!card)
return -ENOMEM;
diff --git a/drivers/net/wan/framer/framer-core.c b/drivers/net/wan/framer/framer-core.c
index 66ed38e97336..d779b03a9e1b 100644
--- a/drivers/net/wan/framer/framer-core.c
+++ b/drivers/net/wan/framer/framer-core.c
@@ -615,7 +615,7 @@ struct framer *framer_create(struct device *dev, struct device_node *node,
if (WARN_ON((ops->flags & FRAMER_FLAG_POLL_STATUS) && !ops->get_status))
return ERR_PTR(-EINVAL);
- framer = kzalloc_obj(*framer, GFP_KERNEL);
+ framer = kzalloc_obj(*framer);
if (!framer)
return ERR_PTR(-ENOMEM);
@@ -771,7 +771,7 @@ __framer_provider_of_register(struct device *dev, struct module *owner,
{
struct framer_provider *framer_provider;
- framer_provider = kzalloc_obj(*framer_provider, GFP_KERNEL);
+ framer_provider = kzalloc_obj(*framer_provider);
if (!framer_provider)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/net/wan/framer/pef2256/pef2256.c b/drivers/net/wan/framer/pef2256/pef2256.c
index f7ed6b3dd2d7..6938316bf82b 100644
--- a/drivers/net/wan/framer/pef2256/pef2256.c
+++ b/drivers/net/wan/framer/pef2256/pef2256.c
@@ -638,7 +638,7 @@ static int pef2256_add_audio_devices(struct pef2256 *pef2256)
if (!count)
return 0;
- audio_devs = kzalloc_objs(*audio_devs, count, GFP_KERNEL);
+ audio_devs = kzalloc_objs(*audio_devs, count);
if (!audio_devs)
return -ENOMEM;
diff --git a/drivers/net/wan/fsl_ucc_hdlc.c b/drivers/net/wan/fsl_ucc_hdlc.c
index 5e93e204da0c..f26233d4bcbb 100644
--- a/drivers/net/wan/fsl_ucc_hdlc.c
+++ b/drivers/net/wan/fsl_ucc_hdlc.c
@@ -898,7 +898,7 @@ static int uhdlc_suspend(struct device *dev)
priv->gumr = ioread32be(&uf_regs->gumr);
priv->guemr = ioread8(&uf_regs->guemr);
- priv->ucc_pram_bak = kmalloc_obj(*priv->ucc_pram_bak, GFP_KERNEL);
+ priv->ucc_pram_bak = kmalloc_obj(*priv->ucc_pram_bak);
if (!priv->ucc_pram_bak)
return -ENOMEM;
@@ -1170,7 +1170,7 @@ static int ucc_hdlc_probe(struct platform_device *pdev)
ut_info->uf_info.regs = res.start;
ut_info->uf_info.irq = irq_of_parse_and_map(np, 0);
- uhdlc_priv = kzalloc_obj(*uhdlc_priv, GFP_KERNEL);
+ uhdlc_priv = kzalloc_obj(*uhdlc_priv);
if (!uhdlc_priv)
return -ENOMEM;
@@ -1183,7 +1183,7 @@ static int ucc_hdlc_probe(struct platform_device *pdev)
uhdlc_priv->hdlc_bus = of_property_read_bool(np, "fsl,hdlc-bus");
if (uhdlc_priv->tsa == 1) {
- utdm = kzalloc_obj(*utdm, GFP_KERNEL);
+ utdm = kzalloc_obj(*utdm);
if (!utdm) {
ret = -ENOMEM;
dev_err(&pdev->dev, "No mem to alloc ucc tdm data\n");
diff --git a/drivers/net/wan/n2.c b/drivers/net/wan/n2.c
index 1892ee67bf20..0e405fb307f9 100644
--- a/drivers/net/wan/n2.c
+++ b/drivers/net/wan/n2.c
@@ -340,7 +340,7 @@ static int __init n2_run(unsigned long io, unsigned long irq,
return -ENODEV;
}
- card = kzalloc_obj(card_t, GFP_KERNEL);
+ card = kzalloc_obj(card_t);
if (!card)
return -ENOBUFS;
diff --git a/drivers/net/wan/pc300too.c b/drivers/net/wan/pc300too.c
index 82ae9e1db51d..7e57d289b62c 100644
--- a/drivers/net/wan/pc300too.c
+++ b/drivers/net/wan/pc300too.c
@@ -300,7 +300,7 @@ static int pc300_pci_init_one(struct pci_dev *pdev,
return i;
}
- card = kzalloc_obj(card_t, GFP_KERNEL);
+ card = kzalloc_obj(card_t);
if (!card) {
pci_release_regions(pdev);
pci_disable_device(pdev);
diff --git a/drivers/net/wan/pci200syn.c b/drivers/net/wan/pci200syn.c
index 33f562919923..89f4b4584a33 100644
--- a/drivers/net/wan/pci200syn.c
+++ b/drivers/net/wan/pci200syn.c
@@ -281,7 +281,7 @@ static int pci200_pci_init_one(struct pci_dev *pdev,
return i;
}
- card = kzalloc_obj(card_t, GFP_KERNEL);
+ card = kzalloc_obj(card_t);
if (!card) {
pci_release_regions(pdev);
pci_disable_device(pdev);
diff --git a/drivers/net/wireguard/noise.c b/drivers/net/wireguard/noise.c
index 994b7c6f0613..9c0a09bf6c95 100644
--- a/drivers/net/wireguard/noise.c
+++ b/drivers/net/wireguard/noise.c
@@ -97,7 +97,7 @@ void wg_noise_handshake_clear(struct noise_handshake *handshake)
static struct noise_keypair *keypair_create(struct wg_peer *peer)
{
- struct noise_keypair *keypair = kzalloc_obj(*keypair, GFP_KERNEL);
+ struct noise_keypair *keypair = kzalloc_obj(*keypair);
if (unlikely(!keypair))
return NULL;
diff --git a/drivers/net/wireguard/peerlookup.c b/drivers/net/wireguard/peerlookup.c
index 5ae4e6c5e7c9..99651a86ac95 100644
--- a/drivers/net/wireguard/peerlookup.c
+++ b/drivers/net/wireguard/peerlookup.c
@@ -21,7 +21,7 @@ static struct hlist_head *pubkey_bucket(struct pubkey_hashtable *table,
struct pubkey_hashtable *wg_pubkey_hashtable_alloc(void)
{
- struct pubkey_hashtable *table = kvmalloc_obj(*table, GFP_KERNEL);
+ struct pubkey_hashtable *table = kvmalloc_obj(*table);
if (!table)
return NULL;
@@ -82,7 +82,7 @@ static struct hlist_head *index_bucket(struct index_hashtable *table,
struct index_hashtable *wg_index_hashtable_alloc(void)
{
- struct index_hashtable *table = kvmalloc_obj(*table, GFP_KERNEL);
+ struct index_hashtable *table = kvmalloc_obj(*table);
if (!table)
return NULL;
diff --git a/drivers/net/wireguard/ratelimiter.c b/drivers/net/wireguard/ratelimiter.c
index 13d532a44294..2b3867f692ab 100644
--- a/drivers/net/wireguard/ratelimiter.c
+++ b/drivers/net/wireguard/ratelimiter.c
@@ -176,12 +176,12 @@ int wg_ratelimiter_init(void)
(1U << 14) / sizeof(struct hlist_head)));
max_entries = table_size * 8;
- table_v4 = kvzalloc_objs(*table_v4, table_size, GFP_KERNEL);
+ table_v4 = kvzalloc_objs(*table_v4, table_size);
if (unlikely(!table_v4))
goto err_kmemcache;
#if IS_ENABLED(CONFIG_IPV6)
- table_v6 = kvzalloc_objs(*table_v6, table_size, GFP_KERNEL);
+ table_v6 = kvzalloc_objs(*table_v6, table_size);
if (unlikely(!table_v6)) {
kvfree(table_v4);
goto err_kmemcache;
diff --git a/drivers/net/wireguard/selftest/allowedips.c b/drivers/net/wireguard/selftest/allowedips.c
index 6c7c79e39ad4..2da3008c3a01 100644
--- a/drivers/net/wireguard/selftest/allowedips.c
+++ b/drivers/net/wireguard/selftest/allowedips.c
@@ -181,7 +181,7 @@ static __init int
horrible_allowedips_insert_v4(struct horrible_allowedips *table,
struct in_addr *ip, u8 cidr, void *value)
{
- struct horrible_allowedips_node *node = kzalloc_obj(*node, GFP_KERNEL);
+ struct horrible_allowedips_node *node = kzalloc_obj(*node);
if (unlikely(!node))
return -ENOMEM;
@@ -198,7 +198,7 @@ static __init int
horrible_allowedips_insert_v6(struct horrible_allowedips *table,
struct in6_addr *ip, u8 cidr, void *value)
{
- struct horrible_allowedips_node *node = kzalloc_obj(*node, GFP_KERNEL);
+ struct horrible_allowedips_node *node = kzalloc_obj(*node);
if (unlikely(!node))
return -ENOMEM;
@@ -266,13 +266,13 @@ static __init bool randomized_test(void)
wg_allowedips_init(&t);
horrible_allowedips_init(&h);
- peers = kzalloc_objs(*peers, NUM_PEERS, GFP_KERNEL);
+ peers = kzalloc_objs(*peers, NUM_PEERS);
if (unlikely(!peers)) {
pr_err("allowedips random self-test malloc: FAIL\n");
goto free;
}
for (i = 0; i < NUM_PEERS; ++i) {
- peers[i] = kzalloc_obj(*peers[i], GFP_KERNEL);
+ peers[i] = kzalloc_obj(*peers[i]);
if (unlikely(!peers[i])) {
pr_err("allowedips random self-test malloc: FAIL\n");
goto free;
@@ -447,7 +447,7 @@ static __init inline struct in6_addr *ip6(u32 a, u32 b, u32 c, u32 d)
static __init struct wg_peer *init_peer(void)
{
- struct wg_peer *peer = kzalloc_obj(*peer, GFP_KERNEL);
+ struct wg_peer *peer = kzalloc_obj(*peer);
if (!peer)
return NULL;
diff --git a/drivers/net/wireguard/selftest/counter.c b/drivers/net/wireguard/selftest/counter.c
index 13c5535a1fd6..8595ab697869 100644
--- a/drivers/net/wireguard/selftest/counter.c
+++ b/drivers/net/wireguard/selftest/counter.c
@@ -10,7 +10,7 @@ bool __init wg_packet_counter_selftest(void)
unsigned int test_num = 0, i;
bool success = true;
- counter = kmalloc_obj(*counter, GFP_KERNEL);
+ counter = kmalloc_obj(*counter);
if (unlikely(!counter)) {
pr_err("nonce counter self-test malloc: FAIL\n");
return false;
diff --git a/drivers/net/wireless/ath/ar5523/ar5523.c b/drivers/net/wireless/ath/ar5523/ar5523.c
index f1567365ac04..66ac396858a5 100644
--- a/drivers/net/wireless/ath/ar5523/ar5523.c
+++ b/drivers/net/wireless/ath/ar5523/ar5523.c
@@ -1512,11 +1512,11 @@ static int ar5523_load_firmware(struct usb_device *dev)
return -ENOENT;
}
- txblock = kzalloc_obj(*txblock, GFP_KERNEL);
+ txblock = kzalloc_obj(*txblock);
if (!txblock)
goto out;
- rxblock = kmalloc_obj(*rxblock, GFP_KERNEL);
+ rxblock = kmalloc_obj(*rxblock);
if (!rxblock)
goto out_free_txblock;
diff --git a/drivers/net/wireless/ath/ath10k/htt_rx.c b/drivers/net/wireless/ath/ath10k/htt_rx.c
index bea2cd4e5ee4..25ab945fecef 100644
--- a/drivers/net/wireless/ath/ath10k/htt_rx.c
+++ b/drivers/net/wireless/ath/ath10k/htt_rx.c
@@ -807,7 +807,7 @@ int ath10k_htt_rx_alloc(struct ath10k_htt *htt)
}
htt->rx_ring.netbufs_ring =
- kzalloc_objs(struct sk_buff *, htt->rx_ring.size, GFP_KERNEL);
+ kzalloc_objs(struct sk_buff *, htt->rx_ring.size);
if (!htt->rx_ring.netbufs_ring)
goto err_netbuf;
diff --git a/drivers/net/wireless/ath/ath10k/mac.c b/drivers/net/wireless/ath/ath10k/mac.c
index ef595a939bde..cf7424be9f4b 100644
--- a/drivers/net/wireless/ath/ath10k/mac.c
+++ b/drivers/net/wireless/ath/ath10k/mac.c
@@ -6431,7 +6431,7 @@ static int ath10k_hw_scan(struct ieee80211_hw *hw,
if (ret)
goto exit;
- arg = kzalloc_obj(*arg, GFP_KERNEL);
+ arg = kzalloc_obj(*arg);
if (!arg) {
ret = -ENOMEM;
goto exit;
@@ -7972,7 +7972,7 @@ static int ath10k_remain_on_channel(struct ieee80211_hw *hw,
scan_time_msec = ar->hw->wiphy->max_remain_on_channel_duration * 2;
- arg = kzalloc_obj(*arg, GFP_KERNEL);
+ arg = kzalloc_obj(*arg);
if (!arg) {
ret = -ENOMEM;
goto exit;
@@ -8954,7 +8954,7 @@ ath10k_mac_op_change_chanctx(struct ieee80211_hw *hw,
if (arg.n_vifs == 0)
goto radar;
- arg.vifs = kzalloc_objs(arg.vifs[0], arg.n_vifs, GFP_KERNEL);
+ arg.vifs = kzalloc_objs(arg.vifs[0], arg.n_vifs);
if (!arg.vifs)
goto radar;
diff --git a/drivers/net/wireless/ath/ath10k/qmi.c b/drivers/net/wireless/ath/ath10k/qmi.c
index 62c9ef500ee7..eebd78e7ff6b 100644
--- a/drivers/net/wireless/ath/ath10k/qmi.c
+++ b/drivers/net/wireless/ath/ath10k/qmi.c
@@ -245,7 +245,7 @@ static int ath10k_qmi_bdf_dnld_send_sync(struct ath10k_qmi *qmi)
const u8 *temp;
int ret;
- req = kzalloc_obj(*req, GFP_KERNEL);
+ req = kzalloc_obj(*req);
if (!req)
return -ENOMEM;
@@ -437,7 +437,7 @@ ath10k_qmi_cfg_send_sync_msg(struct ath10k *ar,
int ret;
u32 i;
- req = kzalloc_obj(*req, GFP_KERNEL);
+ req = kzalloc_obj(*req);
if (!req)
return -ENOMEM;
@@ -578,7 +578,7 @@ static int ath10k_qmi_cap_send_sync_msg(struct ath10k_qmi *qmi)
struct qmi_txn txn;
int ret;
- resp = kzalloc_obj(*resp, GFP_KERNEL);
+ resp = kzalloc_obj(*resp);
if (!resp)
return -ENOMEM;
@@ -1075,7 +1075,7 @@ int ath10k_qmi_init(struct ath10k *ar, u32 msa_size)
struct ath10k_qmi *qmi;
int ret;
- qmi = kzalloc_obj(*qmi, GFP_KERNEL);
+ qmi = kzalloc_obj(*qmi);
if (!qmi)
return -ENOMEM;
diff --git a/drivers/net/wireless/ath/ath10k/sdio.c b/drivers/net/wireless/ath/ath10k/sdio.c
index ff046cff7399..43a6b1ba8fb8 100644
--- a/drivers/net/wireless/ath/ath10k/sdio.c
+++ b/drivers/net/wireless/ath/ath10k/sdio.c
@@ -246,7 +246,7 @@ static int ath10k_sdio_writesb32(struct ath10k *ar, u32 addr, u32 val)
__le32 *buf;
int ret;
- buf = kzalloc_obj(*buf, GFP_KERNEL);
+ buf = kzalloc_obj(*buf);
if (!buf)
return -ENOMEM;
@@ -1766,7 +1766,7 @@ static int ath10k_sdio_diag_read32(struct ath10k *ar, u32 address,
__le32 *val;
int ret;
- val = kzalloc_obj(*val, GFP_KERNEL);
+ val = kzalloc_obj(*val);
if (!val)
return -ENOMEM;
diff --git a/drivers/net/wireless/ath/ath10k/usb.c b/drivers/net/wireless/ath/ath10k/usb.c
index 59969db56048..6661fff326e0 100644
--- a/drivers/net/wireless/ath/ath10k/usb.c
+++ b/drivers/net/wireless/ath/ath10k/usb.c
@@ -799,7 +799,7 @@ static int ath10k_usb_alloc_pipe_resources(struct ath10k *ar,
init_usb_anchor(&pipe->urb_submitted);
for (i = 0; i < urb_cnt; i++) {
- urb_context = kzalloc_obj(*urb_context, GFP_KERNEL);
+ urb_context = kzalloc_obj(*urb_context);
if (!urb_context)
return -ENOMEM;
diff --git a/drivers/net/wireless/ath/ath10k/wow.c b/drivers/net/wireless/ath/ath10k/wow.c
index 8b7f608b5265..78653f257925 100644
--- a/drivers/net/wireless/ath/ath10k/wow.c
+++ b/drivers/net/wireless/ath/ath10k/wow.c
@@ -301,7 +301,7 @@ static int ath10k_vif_wow_set_wakeups(struct ath10k_vif *arvif,
struct wmi_pno_scan_req *pno;
int ret;
- pno = kzalloc_obj(*pno, GFP_KERNEL);
+ pno = kzalloc_obj(*pno);
if (!pno)
return -ENOMEM;
@@ -413,7 +413,7 @@ static int ath10k_vif_wow_clean_nlo(struct ath10k_vif *arvif)
if (ar->nlo_enabled) {
struct wmi_pno_scan_req *pno;
- pno = kzalloc_obj(*pno, GFP_KERNEL);
+ pno = kzalloc_obj(*pno);
if (!pno)
return -ENOMEM;
diff --git a/drivers/net/wireless/ath/ath11k/cfr.c b/drivers/net/wireless/ath/ath11k/cfr.c
index 61ac656ece07..a91f25fb6c6b 100644
--- a/drivers/net/wireless/ath/ath11k/cfr.c
+++ b/drivers/net/wireless/ath/ath11k/cfr.c
@@ -975,7 +975,7 @@ int ath11k_cfr_init(struct ath11k_base *ab)
spin_lock_init(&cfr->lut_lock);
num_lut_entries = min_t(u32, CFR_MAX_LUT_ENTRIES, db_cap.min_elem);
- cfr->lut = kzalloc_objs(*cfr->lut, num_lut_entries, GFP_KERNEL);
+ cfr->lut = kzalloc_objs(*cfr->lut, num_lut_entries);
if (!cfr->lut) {
ret = -ENOMEM;
goto err;
diff --git a/drivers/net/wireless/ath/ath11k/debugfs.c b/drivers/net/wireless/ath/ath11k/debugfs.c
index 9b8660e56a1a..7ec8be82c1c9 100644
--- a/drivers/net/wireless/ath/ath11k/debugfs.c
+++ b/drivers/net/wireless/ath/ath11k/debugfs.c
@@ -1193,7 +1193,7 @@ static int ath11k_debugfs_dbr_dbg_init(struct ath11k *ar, int dbr_id)
if (ar->debug.dbr_debug[dbr_id])
return 0;
- ar->debug.dbr_debug[dbr_id] = kzalloc_obj(*dbr_debug, GFP_KERNEL);
+ ar->debug.dbr_debug[dbr_id] = kzalloc_obj(*dbr_debug);
if (!ar->debug.dbr_debug[dbr_id])
return -ENOMEM;
diff --git a/drivers/net/wireless/ath/ath11k/mac.c b/drivers/net/wireless/ath/ath11k/mac.c
index 7ec87ea7620f..e4ee2ba1f669 100644
--- a/drivers/net/wireless/ath/ath11k/mac.c
+++ b/drivers/net/wireless/ath/ath11k/mac.c
@@ -4221,7 +4221,7 @@ static int ath11k_mac_op_hw_scan(struct ieee80211_hw *hw,
if (ret)
goto exit;
- arg = kzalloc_obj(*arg, GFP_KERNEL);
+ arg = kzalloc_obj(*arg);
if (!arg) {
ret = -ENOMEM;
@@ -7876,7 +7876,7 @@ ath11k_mac_update_active_vif_chan(struct ath11k *ar,
if (arg.n_vifs == 0)
return;
- arg.vifs = kzalloc_objs(arg.vifs[0], arg.n_vifs, GFP_KERNEL);
+ arg.vifs = kzalloc_objs(arg.vifs[0], arg.n_vifs);
if (!arg.vifs)
return;
@@ -9729,7 +9729,7 @@ static int ath11k_mac_op_remain_on_channel(struct ieee80211_hw *hw,
scan_time_msec = ar->hw->wiphy->max_remain_on_channel_duration * 2;
- arg = kzalloc_obj(*arg, GFP_KERNEL);
+ arg = kzalloc_obj(*arg);
if (!arg) {
ret = -ENOMEM;
goto exit;
@@ -9823,7 +9823,7 @@ static int ath11k_mac_station_add(struct ath11k *ar,
arvif->reinstall_group_keys = false;
}
- arsta->rx_stats = kzalloc_obj(*arsta->rx_stats, GFP_KERNEL);
+ arsta->rx_stats = kzalloc_obj(*arsta->rx_stats);
if (!arsta->rx_stats) {
ret = -ENOMEM;
goto dec_num_station;
@@ -9844,7 +9844,7 @@ static int ath11k_mac_station_add(struct ath11k *ar,
sta->addr, arvif->vdev_id);
if (ath11k_debugfs_is_extd_tx_stats_enabled(ar)) {
- arsta->tx_stats = kzalloc_obj(*arsta->tx_stats, GFP_KERNEL);
+ arsta->tx_stats = kzalloc_obj(*arsta->tx_stats);
if (!arsta->tx_stats) {
ret = -ENOMEM;
goto free_peer;
@@ -10278,7 +10278,7 @@ static void ath11k_mac_setup_mac_address_list(struct ath11k *ar)
return;
n_addresses = ar->ab->hw_params.num_vdevs;
- addresses = kzalloc_objs(*addresses, n_addresses, GFP_KERNEL);
+ addresses = kzalloc_objs(*addresses, n_addresses);
if (!addresses)
return;
@@ -10310,7 +10310,7 @@ static int ath11k_mac_setup_iface_combinations(struct ath11k *ar)
else
n_combos = 1;
- combinations = kzalloc_objs(*combinations, n_combos, GFP_KERNEL);
+ combinations = kzalloc_objs(*combinations, n_combos);
if (!combinations)
return -ENOMEM;
@@ -10319,7 +10319,7 @@ static int ath11k_mac_setup_iface_combinations(struct ath11k *ar)
else
n_limits = 2;
- limits = kzalloc_objs(*limits, n_limits, GFP_KERNEL);
+ limits = kzalloc_objs(*limits, n_limits);
if (!limits) {
kfree(combinations);
return -ENOMEM;
diff --git a/drivers/net/wireless/ath/ath11k/mhi.c b/drivers/net/wireless/ath/ath11k/mhi.c
index 7cb91d23362f..f994233df2bb 100644
--- a/drivers/net/wireless/ath/ath11k/mhi.c
+++ b/drivers/net/wireless/ath/ath11k/mhi.c
@@ -207,7 +207,7 @@ static int ath11k_mhi_get_msi(struct ath11k_pci *ab_pci)
ath11k_dbg(ab, ATH11K_DBG_PCI, "num_vectors %d base_vector %d\n",
num_vectors, base_vector);
- irq = kzalloc_objs(int, num_vectors, GFP_KERNEL);
+ irq = kzalloc_objs(int, num_vectors);
if (!irq)
return -ENOMEM;
diff --git a/drivers/net/wireless/ath/ath11k/qmi.c b/drivers/net/wireless/ath/ath11k/qmi.c
index ea6f560abd98..feebbc30f3df 100644
--- a/drivers/net/wireless/ath/ath11k/qmi.c
+++ b/drivers/net/wireless/ath/ath11k/qmi.c
@@ -1799,11 +1799,11 @@ static int ath11k_qmi_fw_ind_register_send(struct ath11k_base *ab)
struct qmi_txn txn;
int ret;
- req = kzalloc_obj(*req, GFP_KERNEL);
+ req = kzalloc_obj(*req);
if (!req)
return -ENOMEM;
- resp = kzalloc_obj(*resp, GFP_KERNEL);
+ resp = kzalloc_obj(*resp);
if (!resp) {
ret = -ENOMEM;
goto resp_out;
@@ -1878,7 +1878,7 @@ static int ath11k_qmi_respond_fw_mem_request(struct ath11k_base *ab)
int ret = 0, i;
bool delayed;
- req = kzalloc_obj(*req, GFP_KERNEL);
+ req = kzalloc_obj(*req);
if (!req)
return -ENOMEM;
@@ -2306,7 +2306,7 @@ static int ath11k_qmi_load_file_target_mem(struct ath11k_base *ab,
int ret = 0;
u32 remaining = len;
- req = kzalloc_obj(*req, GFP_KERNEL);
+ req = kzalloc_obj(*req);
if (!req)
return -ENOMEM;
@@ -2705,7 +2705,7 @@ static int ath11k_qmi_wlanfw_wlan_cfg_send(struct ath11k_base *ab)
ce_cfg = (struct ce_pipe_config *)ab->qmi.ce_cfg.tgt_ce;
svc_cfg = (struct service_to_pipe *)ab->qmi.ce_cfg.svc_to_ce_map;
- req = kzalloc_obj(*req, GFP_KERNEL);
+ req = kzalloc_obj(*req);
if (!req)
return -ENOMEM;
diff --git a/drivers/net/wireless/ath/ath11k/wow.c b/drivers/net/wireless/ath/ath11k/wow.c
index 7b696d1dd0e8..f02edc9b8a9e 100644
--- a/drivers/net/wireless/ath/ath11k/wow.c
+++ b/drivers/net/wireless/ath/ath11k/wow.c
@@ -381,7 +381,7 @@ static int ath11k_vif_wow_set_wakeups(struct ath11k_vif *arvif,
struct wmi_pno_scan_req *pno;
int ret;
- pno = kzalloc_obj(*pno, GFP_KERNEL);
+ pno = kzalloc_obj(*pno);
if (!pno)
return -ENOMEM;
@@ -495,7 +495,7 @@ static int ath11k_vif_wow_clean_nlo(struct ath11k_vif *arvif)
if (ar->nlo_enabled) {
struct wmi_pno_scan_req *pno;
- pno = kzalloc_obj(*pno, GFP_KERNEL);
+ pno = kzalloc_obj(*pno);
if (!pno)
return -ENOMEM;
diff --git a/drivers/net/wireless/ath/ath12k/core.c b/drivers/net/wireless/ath/ath12k/core.c
index d9b41fc90dcd..4ed608ba3c30 100644
--- a/drivers/net/wireless/ath/ath12k/core.c
+++ b/drivers/net/wireless/ath/ath12k/core.c
@@ -1805,7 +1805,7 @@ static struct ath12k_hw_group *ath12k_core_hw_group_alloc(struct ath12k_base *ab
list_for_each_entry(ag, &ath12k_hw_group_list, list)
count++;
- ag = kzalloc_obj(*ag, GFP_KERNEL);
+ ag = kzalloc_obj(*ag);
if (!ag)
return NULL;
diff --git a/drivers/net/wireless/ath/ath12k/dp_peer.c b/drivers/net/wireless/ath/ath12k/dp_peer.c
index 95b5a4af4b2e..a1100782d45e 100644
--- a/drivers/net/wireless/ath/ath12k/dp_peer.c
+++ b/drivers/net/wireless/ath/ath12k/dp_peer.c
@@ -233,7 +233,7 @@ static int ath12k_dp_link_peer_rhash_addr_tbl_init(struct ath12k_dp *dp)
lockdep_assert_held(&dp->link_peer_rhash_tbl_lock);
- rhash_addr_tbl = kzalloc_obj(*dp->rhead_peer_addr, GFP_KERNEL);
+ rhash_addr_tbl = kzalloc_obj(*dp->rhead_peer_addr);
if (!rhash_addr_tbl)
return -ENOMEM;
diff --git a/drivers/net/wireless/ath/ath12k/mac.c b/drivers/net/wireless/ath/ath12k/mac.c
index 007c91dbb269..c6d64b467898 100644
--- a/drivers/net/wireless/ath/ath12k/mac.c
+++ b/drivers/net/wireless/ath/ath12k/mac.c
@@ -3838,7 +3838,7 @@ static void ath12k_bss_assoc(struct ath12k *ar,
lockdep_assert_wiphy(ath12k_ar_to_hw(ar)->wiphy);
struct ath12k_wmi_peer_assoc_arg *peer_arg __free(kfree) =
- kzalloc_obj(*peer_arg, GFP_KERNEL);
+ kzalloc_obj(*peer_arg);
if (!peer_arg)
return;
@@ -4217,7 +4217,7 @@ static struct ath12k_link_vif *ath12k_mac_assign_link_vif(struct ath12k_hw *ah,
if (vif->type == NL80211_IFTYPE_STATION)
arvif->is_sta_assoc_link = true;
} else {
- arvif = kzalloc_obj(*arvif, GFP_KERNEL);
+ arvif = kzalloc_obj(*arvif);
if (!arvif)
return NULL;
}
@@ -5603,7 +5603,7 @@ static int ath12k_mac_initiate_hw_scan(struct ieee80211_hw *hw,
if (ret)
goto exit;
- arg = kzalloc_obj(*arg, GFP_KERNEL);
+ arg = kzalloc_obj(*arg);
if (!arg) {
ret = -ENOMEM;
goto exit;
@@ -5693,7 +5693,7 @@ int ath12k_mac_op_hw_scan(struct ieee80211_hw *hw,
lockdep_assert_wiphy(hw->wiphy);
- chan_list = kzalloc_objs(*chan_list, hw_req->req.n_channels, GFP_KERNEL);
+ chan_list = kzalloc_objs(*chan_list, hw_req->req.n_channels);
if (!chan_list)
return -ENOMEM;
@@ -6123,7 +6123,7 @@ static int ath12k_mac_update_key_cache(struct ath12k_vif_cache *cache,
}
if (cmd == SET_KEY) {
- key_conf = kzalloc_obj(*key_conf, GFP_KERNEL);
+ key_conf = kzalloc_obj(*key_conf);
if (!key_conf)
return -ENOMEM;
@@ -6457,7 +6457,7 @@ static int ath12k_mac_station_assoc(struct ath12k *ar,
mask = &arvif->bitrate_mask;
struct ath12k_wmi_peer_assoc_arg *peer_arg __free(kfree) =
- kzalloc_obj(*peer_arg, GFP_KERNEL);
+ kzalloc_obj(*peer_arg);
if (!peer_arg)
return -ENOMEM;
@@ -6620,7 +6620,7 @@ static void ath12k_sta_rc_update_wk(struct wiphy *wiphy, struct wiphy_work *wk)
nss = min(nss, mac_nss);
struct ath12k_wmi_peer_assoc_arg *peer_arg __free(kfree) =
- kzalloc_obj(*peer_arg, GFP_KERNEL);
+ kzalloc_obj(*peer_arg);
if (!peer_arg)
return;
@@ -7975,7 +7975,7 @@ static struct ath12k_link_sta *ath12k_mac_alloc_assign_link_sta(struct ath12k_hw
if (arsta)
return NULL;
- arsta = kmalloc_obj(*arsta, GFP_KERNEL);
+ arsta = kmalloc_obj(*arsta);
if (!arsta)
return NULL;
@@ -11550,7 +11550,7 @@ ath12k_mac_update_active_vif_chan(struct ath12k *ar,
if (arg.n_vifs == 0)
return;
- arg.vifs = kzalloc_objs(arg.vifs[0], arg.n_vifs, GFP_KERNEL);
+ arg.vifs = kzalloc_objs(arg.vifs[0], arg.n_vifs);
if (!arg.vifs)
return;
@@ -13715,7 +13715,7 @@ int ath12k_mac_op_remain_on_channel(struct ieee80211_hw *hw,
scan_time_msec = hw->wiphy->max_remain_on_channel_duration * 2;
struct ath12k_wmi_scan_req_arg *arg __free(kfree) =
- kzalloc_obj(*arg, GFP_KERNEL);
+ kzalloc_obj(*arg);
if (!arg)
return -ENOMEM;
@@ -14123,7 +14123,7 @@ ath12k_mac_setup_radio_iface_comb(struct ath12k *ar,
max_interfaces = 1;
}
- limits = kzalloc_objs(*limits, n_limits, GFP_KERNEL);
+ limits = kzalloc_objs(*limits, n_limits);
if (!limits)
return -ENOMEM;
@@ -14187,7 +14187,7 @@ ath12k_mac_setup_global_iface_comb(struct ath12k_hw *ah,
else
n_limits = 1;
- limits = kzalloc_objs(*limits, n_limits, GFP_KERNEL);
+ limits = kzalloc_objs(*limits, n_limits);
if (!limits)
return -ENOMEM;
@@ -14272,20 +14272,20 @@ static int ath12k_mac_setup_iface_combinations(struct ath12k_hw *ah)
goto out;
}
- combinations = kzalloc_objs(*combinations, n_combinations, GFP_KERNEL);
+ combinations = kzalloc_objs(*combinations, n_combinations);
if (!combinations)
return -ENOMEM;
/* there are multiple radios */
- radio = kzalloc_objs(*radio, ah->num_radio, GFP_KERNEL);
+ radio = kzalloc_objs(*radio, ah->num_radio);
if (!radio) {
ret = -ENOMEM;
goto err_free_combinations;
}
for_each_ar(ah, ar, i) {
- comb = kzalloc_obj(*comb, GFP_KERNEL);
+ comb = kzalloc_obj(*comb);
if (!comb) {
ret = -ENOMEM;
goto err_free_radios;
diff --git a/drivers/net/wireless/ath/ath12k/mhi.c b/drivers/net/wireless/ath/ath12k/mhi.c
index 8f07c00c51a2..ee87f00bc5de 100644
--- a/drivers/net/wireless/ath/ath12k/mhi.c
+++ b/drivers/net/wireless/ath/ath12k/mhi.c
@@ -80,7 +80,7 @@ static int ath12k_mhi_get_msi(struct ath12k_pci *ab_pci)
ath12k_dbg(ab, ATH12K_DBG_PCI, "Number of assigned MSI for MHI is %d, base vector is %d\n",
num_vectors, base_vector);
- irq = kzalloc_objs(*irq, num_vectors, GFP_KERNEL);
+ irq = kzalloc_objs(*irq, num_vectors);
if (!irq)
return -ENOMEM;
diff --git a/drivers/net/wireless/ath/ath12k/peer.c b/drivers/net/wireless/ath/ath12k/peer.c
index ad571a4cf974..2e875176baaa 100644
--- a/drivers/net/wireless/ath/ath12k/peer.c
+++ b/drivers/net/wireless/ath/ath12k/peer.c
@@ -413,7 +413,7 @@ int ath12k_link_sta_rhash_tbl_init(struct ath12k_base *ab)
struct rhashtable *rhash_addr_tbl;
int ret;
- rhash_addr_tbl = kzalloc_obj(*ab->rhead_sta_addr, GFP_KERNEL);
+ rhash_addr_tbl = kzalloc_obj(*ab->rhead_sta_addr);
if (!rhash_addr_tbl)
return -ENOMEM;
diff --git a/drivers/net/wireless/ath/ath12k/qmi.c b/drivers/net/wireless/ath/ath12k/qmi.c
index 631041bf1dc1..c11b84b56f8f 100644
--- a/drivers/net/wireless/ath/ath12k/qmi.c
+++ b/drivers/net/wireless/ath/ath12k/qmi.c
@@ -2344,11 +2344,11 @@ static int ath12k_qmi_fw_ind_register_send(struct ath12k_base *ab)
struct qmi_txn txn;
int ret;
- req = kzalloc_obj(*req, GFP_KERNEL);
+ req = kzalloc_obj(*req);
if (!req)
return -ENOMEM;
- resp = kzalloc_obj(*resp, GFP_KERNEL);
+ resp = kzalloc_obj(*resp);
if (!resp) {
ret = -ENOMEM;
goto resp_out;
@@ -2416,7 +2416,7 @@ int ath12k_qmi_respond_fw_mem_request(struct ath12k_base *ab)
int ret = 0, i;
bool delayed;
- req = kzalloc_obj(*req, GFP_KERNEL);
+ req = kzalloc_obj(*req);
if (!req)
return -ENOMEM;
@@ -2968,7 +2968,7 @@ static int ath12k_qmi_load_file_target_mem(struct ath12k_base *ab,
int ret = 0;
u32 remaining = len;
- req = kzalloc_obj(*req, GFP_KERNEL);
+ req = kzalloc_obj(*req);
if (!req)
return -ENOMEM;
@@ -3465,7 +3465,7 @@ static int ath12k_qmi_wlanfw_wlan_cfg_send(struct ath12k_base *ab)
ce_cfg = (struct ce_pipe_config *)ab->qmi.ce_cfg.tgt_ce;
svc_cfg = (struct service_to_pipe *)ab->qmi.ce_cfg.svc_to_ce_map;
- req = kzalloc_obj(*req, GFP_KERNEL);
+ req = kzalloc_obj(*req);
if (!req)
return -ENOMEM;
diff --git a/drivers/net/wireless/ath/ath12k/wifi7/dp.c b/drivers/net/wireless/ath/ath12k/wifi7/dp.c
index 8e0b83801346..c72f604661ce 100644
--- a/drivers/net/wireless/ath/ath12k/wifi7/dp.c
+++ b/drivers/net/wireless/ath/ath12k/wifi7/dp.c
@@ -161,7 +161,7 @@ struct ath12k_dp *ath12k_wifi7_dp_device_alloc(struct ath12k_base *ab)
struct ath12k_dp *dp;
/* TODO: align dp later if cache alignment becomes a bottleneck */
- dp = kzalloc_obj(*dp, GFP_KERNEL);
+ dp = kzalloc_obj(*dp);
if (!dp)
return NULL;
diff --git a/drivers/net/wireless/ath/ath12k/wow.c b/drivers/net/wireless/ath/ath12k/wow.c
index bdac483c58cf..d8789104d886 100644
--- a/drivers/net/wireless/ath/ath12k/wow.c
+++ b/drivers/net/wireless/ath/ath12k/wow.c
@@ -395,7 +395,7 @@ static int ath12k_wow_vif_set_wakeups(struct ath12k_link_vif *arvif,
struct wmi_pno_scan_req_arg *pno;
int ret;
- pno = kzalloc_obj(*pno, GFP_KERNEL);
+ pno = kzalloc_obj(*pno);
if (!pno)
return -ENOMEM;
@@ -507,7 +507,7 @@ static int ath12k_wow_vdev_clean_nlo(struct ath12k *ar, u32 vdev_id)
if (!ar->nlo_enabled)
return 0;
- pno = kzalloc_obj(*pno, GFP_KERNEL);
+ pno = kzalloc_obj(*pno);
if (!pno)
return -ENOMEM;
@@ -748,7 +748,7 @@ static int ath12k_wow_arp_ns_offload(struct ath12k *ar, bool enable)
lockdep_assert_wiphy(ath12k_ar_to_hw(ar)->wiphy);
- offload = kmalloc_obj(*offload, GFP_KERNEL);
+ offload = kmalloc_obj(*offload);
if (!offload)
return -ENOMEM;
diff --git a/drivers/net/wireless/ath/ath5k/debug.c b/drivers/net/wireless/ath/ath5k/debug.c
index 5e30316f4543..25edc35dc7b9 100644
--- a/drivers/net/wireless/ath/ath5k/debug.c
+++ b/drivers/net/wireless/ath/ath5k/debug.c
@@ -928,7 +928,7 @@ static int open_file_eeprom(struct inode *inode, struct file *file)
/* Create private struct and assign to file */
- ep = kmalloc_obj(*ep, GFP_KERNEL);
+ ep = kmalloc_obj(*ep);
if (!ep) {
ret = -ENOMEM;
goto freebuf;
diff --git a/drivers/net/wireless/ath/ath6kl/core.c b/drivers/net/wireless/ath/ath6kl/core.c
index 8be852e832f3..648110cd313f 100644
--- a/drivers/net/wireless/ath/ath6kl/core.c
+++ b/drivers/net/wireless/ath/ath6kl/core.c
@@ -311,7 +311,7 @@ struct ath6kl *ath6kl_core_create(struct device *dev)
ar->sta_list[ctr].mgmt_psq_len = 0;
INIT_LIST_HEAD(&ar->sta_list[ctr].mgmt_psq);
ar->sta_list[ctr].aggr_conn =
- kzalloc_obj(struct aggr_info_conn, GFP_KERNEL);
+ kzalloc_obj(struct aggr_info_conn);
if (!ar->sta_list[ctr].aggr_conn) {
ath6kl_err("Failed to allocate memory for sta aggregation information\n");
ath6kl_core_destroy(ar);
diff --git a/drivers/net/wireless/ath/ath6kl/htc_mbox.c b/drivers/net/wireless/ath/ath6kl/htc_mbox.c
index 19dfeb012c04..9ece8f9983f1 100644
--- a/drivers/net/wireless/ath/ath6kl/htc_mbox.c
+++ b/drivers/net/wireless/ath/ath6kl/htc_mbox.c
@@ -2792,7 +2792,7 @@ static int ath6kl_htc_reset(struct htc_target *target)
(HTC_MAX_CTRL_MSG_LEN + HTC_HDR_LENGTH);
for (i = 0; i < NUM_CONTROL_BUFFERS; i++) {
- packet = kzalloc_obj(*packet, GFP_KERNEL);
+ packet = kzalloc_obj(*packet);
if (!packet)
return -ENOMEM;
@@ -2842,13 +2842,13 @@ static void *ath6kl_htc_mbox_create(struct ath6kl *ar)
struct htc_target *target = NULL;
int status = 0;
- target = kzalloc_obj(*target, GFP_KERNEL);
+ target = kzalloc_obj(*target);
if (!target) {
ath6kl_err("unable to allocate memory\n");
return NULL;
}
- target->dev = kzalloc_obj(*target->dev, GFP_KERNEL);
+ target->dev = kzalloc_obj(*target->dev);
if (!target->dev) {
ath6kl_err("unable to allocate memory\n");
kfree(target);
diff --git a/drivers/net/wireless/ath/ath6kl/htc_pipe.c b/drivers/net/wireless/ath/ath6kl/htc_pipe.c
index ba8a701087c3..5183e3029886 100644
--- a/drivers/net/wireless/ath/ath6kl/htc_pipe.c
+++ b/drivers/net/wireless/ath/ath6kl/htc_pipe.c
@@ -510,7 +510,7 @@ static struct htc_packet *build_htc_txctrl_packet(void)
struct htc_packet *packet = NULL;
struct sk_buff *skb;
- packet = kzalloc_obj(struct htc_packet, GFP_KERNEL);
+ packet = kzalloc_obj(struct htc_packet);
if (packet == NULL)
return NULL;
@@ -1409,7 +1409,7 @@ static void *ath6kl_htc_pipe_create(struct ath6kl *ar)
struct htc_packet *packet;
int i;
- target = kzalloc_obj(struct htc_target, GFP_KERNEL);
+ target = kzalloc_obj(struct htc_target);
if (target == NULL) {
ath6kl_err("htc create unable to allocate memory\n");
status = -ENOMEM;
@@ -1423,13 +1423,13 @@ static void *ath6kl_htc_pipe_create(struct ath6kl *ar)
reset_endpoint_states(target);
for (i = 0; i < HTC_PACKET_CONTAINER_ALLOCATION; i++) {
- packet = kzalloc_obj(struct htc_packet, GFP_KERNEL);
+ packet = kzalloc_obj(struct htc_packet);
if (packet != NULL)
free_htc_packet_container(target, packet);
}
- target->dev = kzalloc_obj(*target->dev, GFP_KERNEL);
+ target->dev = kzalloc_obj(*target->dev);
if (!target->dev) {
ath6kl_err("unable to allocate memory\n");
status = -ENOMEM;
diff --git a/drivers/net/wireless/ath/ath6kl/main.c b/drivers/net/wireless/ath/ath6kl/main.c
index 908cb87842f7..85d6ad53cf94 100644
--- a/drivers/net/wireless/ath/ath6kl/main.c
+++ b/drivers/net/wireless/ath/ath6kl/main.c
@@ -485,7 +485,7 @@ void ath6kl_connect_ap_mode_sta(struct ath6kl_vif *vif, u16 aid, u8 *mac_addr,
keymgmt, ucipher, auth, apsd_info);
/* send event to application */
- sinfo = kzalloc_obj(*sinfo, GFP_KERNEL);
+ sinfo = kzalloc_obj(*sinfo);
if (!sinfo)
return;
diff --git a/drivers/net/wireless/ath/ath6kl/sdio.c b/drivers/net/wireless/ath/ath6kl/sdio.c
index c0a895ae882f..56929e965bd6 100644
--- a/drivers/net/wireless/ath/ath6kl/sdio.c
+++ b/drivers/net/wireless/ath/ath6kl/sdio.c
@@ -1316,7 +1316,7 @@ static int ath6kl_sdio_probe(struct sdio_func *func,
func->num, func->vendor, func->device,
func->max_blksize, func->cur_blksize);
- ar_sdio = kzalloc_obj(struct ath6kl_sdio, GFP_KERNEL);
+ ar_sdio = kzalloc_obj(struct ath6kl_sdio);
if (!ar_sdio)
return -ENOMEM;
diff --git a/drivers/net/wireless/ath/ath6kl/txrx.c b/drivers/net/wireless/ath/ath6kl/txrx.c
index 623d134c4be7..97fdac7237e2 100644
--- a/drivers/net/wireless/ath/ath6kl/txrx.c
+++ b/drivers/net/wireless/ath/ath6kl/txrx.c
@@ -1770,13 +1770,13 @@ struct aggr_info *aggr_init(struct ath6kl_vif *vif)
{
struct aggr_info *p_aggr = NULL;
- p_aggr = kzalloc_obj(struct aggr_info, GFP_KERNEL);
+ p_aggr = kzalloc_obj(struct aggr_info);
if (!p_aggr) {
ath6kl_err("failed to alloc memory for aggr_node\n");
return NULL;
}
- p_aggr->aggr_conn = kzalloc_obj(struct aggr_info_conn, GFP_KERNEL);
+ p_aggr->aggr_conn = kzalloc_obj(struct aggr_info_conn);
if (!p_aggr->aggr_conn) {
ath6kl_err("failed to alloc memory for connection specific aggr info\n");
kfree(p_aggr);
diff --git a/drivers/net/wireless/ath/ath6kl/usb.c b/drivers/net/wireless/ath/ath6kl/usb.c
index 9362ab82cc30..852e77e41bde 100644
--- a/drivers/net/wireless/ath/ath6kl/usb.c
+++ b/drivers/net/wireless/ath/ath6kl/usb.c
@@ -190,7 +190,7 @@ static int ath6kl_usb_alloc_pipe_resources(struct ath6kl_usb_pipe *pipe,
init_usb_anchor(&pipe->urb_submitted);
for (i = 0; i < urb_cnt; i++) {
- urb_context = kzalloc_obj(struct ath6kl_urb_context, GFP_KERNEL);
+ urb_context = kzalloc_obj(struct ath6kl_urb_context);
if (urb_context == NULL) {
status = -ENOMEM;
goto fail_alloc_pipe_resources;
@@ -633,7 +633,7 @@ static struct ath6kl_usb *ath6kl_usb_create(struct usb_interface *interface)
int i;
/* ath6kl_usb_destroy() needs ar_usb != NULL && ar_usb->wq != NULL. */
- ar_usb = kzalloc_obj(struct ath6kl_usb, GFP_KERNEL);
+ ar_usb = kzalloc_obj(struct ath6kl_usb);
if (ar_usb == NULL)
return NULL;
ar_usb->wq = alloc_workqueue("ath6kl_wq", 0, 0);
diff --git a/drivers/net/wireless/ath/ath6kl/wmi.c b/drivers/net/wireless/ath/ath6kl/wmi.c
index c043ba9a2afa..72611a2ceb9d 100644
--- a/drivers/net/wireless/ath/ath6kl/wmi.c
+++ b/drivers/net/wireless/ath/ath6kl/wmi.c
@@ -4135,7 +4135,7 @@ void *ath6kl_wmi_init(struct ath6kl *dev)
{
struct wmi *wmi;
- wmi = kzalloc_obj(struct wmi, GFP_KERNEL);
+ wmi = kzalloc_obj(struct wmi);
if (!wmi)
return NULL;
diff --git a/drivers/net/wireless/ath/ath9k/hif_usb.c b/drivers/net/wireless/ath/ath9k/hif_usb.c
index c7e063482f55..8533b88974b2 100644
--- a/drivers/net/wireless/ath/ath9k/hif_usb.c
+++ b/drivers/net/wireless/ath/ath9k/hif_usb.c
@@ -107,7 +107,7 @@ static int hif_usb_send_regout(struct hif_device_usb *hif_dev,
if (urb == NULL)
return -ENOMEM;
- cmd = kzalloc_obj(*cmd, GFP_KERNEL);
+ cmd = kzalloc_obj(*cmd);
if (cmd == NULL) {
usb_free_urb(urb);
return -ENOMEM;
@@ -849,7 +849,7 @@ static int ath9k_hif_usb_alloc_tx_urbs(struct hif_device_usb *hif_dev)
init_usb_anchor(&hif_dev->mgmt_submitted);
for (i = 0; i < MAX_TX_URB_NUM; i++) {
- tx_buf = kzalloc_obj(*tx_buf, GFP_KERNEL);
+ tx_buf = kzalloc_obj(*tx_buf);
if (!tx_buf)
goto err;
@@ -897,7 +897,7 @@ static int ath9k_hif_usb_alloc_rx_urbs(struct hif_device_usb *hif_dev)
for (i = 0; i < MAX_RX_URB_NUM; i++) {
- rx_buf = kzalloc_obj(*rx_buf, GFP_KERNEL);
+ rx_buf = kzalloc_obj(*rx_buf);
if (!rx_buf) {
ret = -ENOMEM;
goto err_rxb;
@@ -972,7 +972,7 @@ static int ath9k_hif_usb_alloc_reg_in_urbs(struct hif_device_usb *hif_dev)
for (i = 0; i < MAX_REG_IN_URB_NUM; i++) {
- rx_buf = kzalloc_obj(*rx_buf, GFP_KERNEL);
+ rx_buf = kzalloc_obj(*rx_buf);
if (!rx_buf) {
ret = -ENOMEM;
goto err_rxb;
@@ -1376,7 +1376,7 @@ static int ath9k_hif_usb_probe(struct usb_interface *interface,
if (id->driver_info == STORAGE_DEVICE)
return send_eject_command(interface);
- hif_dev = kzalloc_obj(struct hif_device_usb, GFP_KERNEL);
+ hif_dev = kzalloc_obj(struct hif_device_usb);
if (!hif_dev) {
ret = -ENOMEM;
goto err_alloc;
diff --git a/drivers/net/wireless/ath/ath9k/htc_drv_init.c b/drivers/net/wireless/ath/ath9k/htc_drv_init.c
index a57b1ca76891..5270d0c0af17 100644
--- a/drivers/net/wireless/ath/ath9k/htc_drv_init.c
+++ b/drivers/net/wireless/ath/ath9k/htc_drv_init.c
@@ -611,7 +611,7 @@ static int ath9k_init_priv(struct ath9k_htc_priv *priv,
struct ath_common *common;
int i, ret = 0, csz = 0;
- ah = kzalloc_obj(struct ath_hw, GFP_KERNEL);
+ ah = kzalloc_obj(struct ath_hw);
if (!ah)
return -ENOMEM;
diff --git a/drivers/net/wireless/ath/ath9k/htc_drv_txrx.c b/drivers/net/wireless/ath/ath9k/htc_drv_txrx.c
index 20e1f9b72b16..bed7ea2425a0 100644
--- a/drivers/net/wireless/ath/ath9k/htc_drv_txrx.c
+++ b/drivers/net/wireless/ath/ath9k/htc_drv_txrx.c
@@ -1193,7 +1193,7 @@ int ath9k_rx_init(struct ath9k_htc_priv *priv)
for (i = 0; i < ATH9K_HTC_RXBUF; i++) {
struct ath9k_htc_rxbuf *rxbuf =
- kzalloc_obj(struct ath9k_htc_rxbuf, GFP_KERNEL);
+ kzalloc_obj(struct ath9k_htc_rxbuf);
if (rxbuf == NULL)
goto err;
diff --git a/drivers/net/wireless/ath/ath9k/htc_hst.c b/drivers/net/wireless/ath/ath9k/htc_hst.c
index a2fe131d8c00..efd73f2ffda6 100644
--- a/drivers/net/wireless/ath/ath9k/htc_hst.c
+++ b/drivers/net/wireless/ath/ath9k/htc_hst.c
@@ -499,7 +499,7 @@ struct htc_target *ath9k_htc_hw_alloc(void *hif_handle,
struct htc_endpoint *endpoint;
struct htc_target *target;
- target = kzalloc_obj(struct htc_target, GFP_KERNEL);
+ target = kzalloc_obj(struct htc_target);
if (!target)
return NULL;
diff --git a/drivers/net/wireless/ath/ath9k/hw.c b/drivers/net/wireless/ath/ath9k/hw.c
index e7bf63d257b2..a45351afcf6e 100644
--- a/drivers/net/wireless/ath/ath9k/hw.c
+++ b/drivers/net/wireless/ath/ath9k/hw.c
@@ -3128,7 +3128,7 @@ struct ath_gen_timer *ath_gen_timer_alloc(struct ath_hw *ah,
!AR_SREV_9300_20_OR_LATER(ah))
return NULL;
- timer = kzalloc_obj(struct ath_gen_timer, GFP_KERNEL);
+ timer = kzalloc_obj(struct ath_gen_timer);
if (timer == NULL)
return NULL;
diff --git a/drivers/net/wireless/ath/ath9k/wmi.c b/drivers/net/wireless/ath/ath9k/wmi.c
index 2f56b9cc0ab8..284e8c13b043 100644
--- a/drivers/net/wireless/ath/ath9k/wmi.c
+++ b/drivers/net/wireless/ath/ath9k/wmi.c
@@ -92,7 +92,7 @@ struct wmi *ath9k_init_wmi(struct ath9k_htc_priv *priv)
{
struct wmi *wmi;
- wmi = kzalloc_obj(struct wmi, GFP_KERNEL);
+ wmi = kzalloc_obj(struct wmi);
if (!wmi)
return NULL;
diff --git a/drivers/net/wireless/ath/carl9170/main.c b/drivers/net/wireless/ath/carl9170/main.c
index 3262a279746f..af632418fa06 100644
--- a/drivers/net/wireless/ath/carl9170/main.c
+++ b/drivers/net/wireless/ath/carl9170/main.c
@@ -1412,7 +1412,7 @@ static int carl9170_op_ampdu_action(struct ieee80211_hw *hw,
if (!sta_info->ht_sta)
return -EOPNOTSUPP;
- tid_info = kzalloc_obj(struct carl9170_sta_tid, GFP_KERNEL);
+ tid_info = kzalloc_obj(struct carl9170_sta_tid);
if (!tid_info)
return -ENOMEM;
diff --git a/drivers/net/wireless/ath/dfs_pattern_detector.c b/drivers/net/wireless/ath/dfs_pattern_detector.c
index a798ff11183d..ce5a6a39c0ad 100644
--- a/drivers/net/wireless/ath/dfs_pattern_detector.c
+++ b/drivers/net/wireless/ath/dfs_pattern_detector.c
@@ -354,7 +354,7 @@ dfs_pattern_detector_init(struct ath_common *common,
if (!IS_ENABLED(CONFIG_CFG80211_CERTIFICATION_ONUS))
return NULL;
- dpd = kmalloc_obj(*dpd, GFP_KERNEL);
+ dpd = kmalloc_obj(*dpd);
if (dpd == NULL)
return NULL;
diff --git a/drivers/net/wireless/ath/wcn36xx/dxe.c b/drivers/net/wireless/ath/wcn36xx/dxe.c
index c6ec7a296240..5a0ef2295a3a 100644
--- a/drivers/net/wireless/ath/wcn36xx/dxe.c
+++ b/drivers/net/wireless/ath/wcn36xx/dxe.c
@@ -74,7 +74,7 @@ static int wcn36xx_dxe_allocate_ctl_block(struct wcn36xx_dxe_ch *ch)
spin_lock_init(&ch->lock);
for (i = 0; i < ch->desc_num; i++) {
- cur_ctl = kzalloc_obj(*cur_ctl, GFP_KERNEL);
+ cur_ctl = kzalloc_obj(*cur_ctl);
if (!cur_ctl)
goto out_fail;
diff --git a/drivers/net/wireless/ath/wcn36xx/smd.c b/drivers/net/wireless/ath/wcn36xx/smd.c
index f9ebe13d0245..813553edcb78 100644
--- a/drivers/net/wireless/ath/wcn36xx/smd.c
+++ b/drivers/net/wireless/ath/wcn36xx/smd.c
@@ -847,7 +847,7 @@ int wcn36xx_smd_start_hw_scan(struct wcn36xx *wcn, struct ieee80211_vif *vif,
return -EINVAL;
mutex_lock(&wcn->hal_mutex);
- msg_body = kzalloc_obj(*msg_body, GFP_KERNEL);
+ msg_body = kzalloc_obj(*msg_body);
if (!msg_body) {
ret = -ENOMEM;
goto out;
@@ -942,7 +942,7 @@ int wcn36xx_smd_update_channel_list(struct wcn36xx *wcn, struct cfg80211_scan_re
struct wcn36xx_hal_update_channel_list_req_msg *msg_body;
int ret, i;
- msg_body = kzalloc_obj(*msg_body, GFP_KERNEL);
+ msg_body = kzalloc_obj(*msg_body);
if (!msg_body)
return -ENOMEM;
@@ -1624,7 +1624,7 @@ static int wcn36xx_smd_config_bss_v1(struct wcn36xx *wcn,
struct cfg80211_chan_def *chandef;
int ret;
- msg_body = kzalloc_obj(*msg_body, GFP_KERNEL);
+ msg_body = kzalloc_obj(*msg_body);
if (!msg_body)
return -ENOMEM;
@@ -1744,7 +1744,7 @@ static int wcn36xx_smd_config_bss_v0(struct wcn36xx *wcn,
struct wcn36xx_hal_config_sta_params *sta_params;
int ret;
- msg = kzalloc_obj(*msg, GFP_KERNEL);
+ msg = kzalloc_obj(*msg);
if (!msg)
return -ENOMEM;
diff --git a/drivers/net/wireless/ath/wil6210/cfg80211.c b/drivers/net/wireless/ath/wil6210/cfg80211.c
index e0f39ef9ac78..c74f5e66166d 100644
--- a/drivers/net/wireless/ath/wil6210/cfg80211.c
+++ b/drivers/net/wireless/ath/wil6210/cfg80211.c
@@ -691,7 +691,7 @@ wil_cfg80211_add_iface(struct wiphy *wiphy, const char *name,
return ERR_PTR(-EINVAL);
}
- p2p_wdev = kzalloc_obj(*p2p_wdev, GFP_KERNEL);
+ p2p_wdev = kzalloc_obj(*p2p_wdev);
if (!p2p_wdev)
return ERR_PTR(-ENOMEM);
@@ -2394,7 +2394,7 @@ static int wil_cfg80211_probe_client(struct wiphy *wiphy,
if (cid < 0)
return -ENOLINK;
- req = kzalloc_obj(*req, GFP_KERNEL);
+ req = kzalloc_obj(*req);
if (!req)
return -ENOMEM;
diff --git a/drivers/net/wireless/ath/wil6210/debugfs.c b/drivers/net/wireless/ath/wil6210/debugfs.c
index 2e5c24245e6a..1e796087435d 100644
--- a/drivers/net/wireless/ath/wil6210/debugfs.c
+++ b/drivers/net/wireless/ath/wil6210/debugfs.c
@@ -1392,7 +1392,7 @@ static int link_show(struct seq_file *s, void *data)
struct station_info *sinfo;
int i, rc = 0;
- sinfo = kzalloc_obj(*sinfo, GFP_KERNEL);
+ sinfo = kzalloc_obj(*sinfo);
if (!sinfo)
return -ENOMEM;
diff --git a/drivers/net/wireless/ath/wil6210/rx_reorder.c b/drivers/net/wireless/ath/wil6210/rx_reorder.c
index 75bf9dbbf23a..5841098ff8f9 100644
--- a/drivers/net/wireless/ath/wil6210/rx_reorder.c
+++ b/drivers/net/wireless/ath/wil6210/rx_reorder.c
@@ -241,13 +241,13 @@ void wil_rx_bar(struct wil6210_priv *wil, struct wil6210_vif *vif,
struct wil_tid_ampdu_rx *wil_tid_ampdu_rx_alloc(struct wil6210_priv *wil,
int size, u16 ssn)
{
- struct wil_tid_ampdu_rx *r = kzalloc_obj(*r, GFP_KERNEL);
+ struct wil_tid_ampdu_rx *r = kzalloc_obj(*r);
if (!r)
return NULL;
r->reorder_buf =
- kzalloc_objs(struct sk_buff *, size, GFP_KERNEL);
+ kzalloc_objs(struct sk_buff *, size);
if (!r->reorder_buf) {
kfree(r);
return NULL;
diff --git a/drivers/net/wireless/ath/wil6210/txrx.c b/drivers/net/wireless/ath/wil6210/txrx.c
index e11f30a7bb48..e8320607603e 100644
--- a/drivers/net/wireless/ath/wil6210/txrx.c
+++ b/drivers/net/wireless/ath/wil6210/txrx.c
@@ -119,7 +119,7 @@ static int wil_vring_alloc(struct wil6210_priv *wil, struct wil_ring *vring)
vring->swhead = 0;
vring->swtail = 0;
- vring->ctx = kzalloc_objs(vring->ctx[0], vring->size, GFP_KERNEL);
+ vring->ctx = kzalloc_objs(vring->ctx[0], vring->size);
if (!vring->ctx) {
vring->va = NULL;
return -ENOMEM;
diff --git a/drivers/net/wireless/ath/wil6210/txrx_edma.c b/drivers/net/wireless/ath/wil6210/txrx_edma.c
index e391951346c2..c4c6b3088a7a 100644
--- a/drivers/net/wireless/ath/wil6210/txrx_edma.c
+++ b/drivers/net/wireless/ath/wil6210/txrx_edma.c
@@ -381,7 +381,7 @@ static int wil_ring_alloc_desc_ring(struct wil6210_priv *wil,
ring->swhead = 0;
ring->swtail = 0;
- ring->ctx = kzalloc_objs(ring->ctx[0], ring->size, GFP_KERNEL);
+ ring->ctx = kzalloc_objs(ring->ctx[0], ring->size);
if (!ring->ctx)
goto err;
diff --git a/drivers/net/wireless/ath/wil6210/wmi.c b/drivers/net/wireless/ath/wil6210/wmi.c
index 69f9fb19f01b..05b040c684e8 100644
--- a/drivers/net/wireless/ath/wil6210/wmi.c
+++ b/drivers/net/wireless/ath/wil6210/wmi.c
@@ -1080,7 +1080,7 @@ static void wmi_evt_connect(struct wil6210_vif *vif, int id, void *d, int len)
goto out;
}
- sinfo = kzalloc_obj(*sinfo, GFP_KERNEL);
+ sinfo = kzalloc_obj(*sinfo);
if (!sinfo) {
rc = -ENOMEM;
goto out;
diff --git a/drivers/net/wireless/atmel/at76c50x-usb.c b/drivers/net/wireless/atmel/at76c50x-usb.c
index 11554306a5f3..6445332801a4 100644
--- a/drivers/net/wireless/atmel/at76c50x-usb.c
+++ b/drivers/net/wireless/atmel/at76c50x-usb.c
@@ -378,7 +378,7 @@ static int at76_usbdfu_download(struct usb_device *udev, u8 *buf, u32 size,
return -EINVAL;
}
- dfu_stat_buf = kmalloc_obj(*dfu_stat_buf, GFP_KERNEL);
+ dfu_stat_buf = kmalloc_obj(*dfu_stat_buf);
if (!dfu_stat_buf) {
ret = -ENOMEM;
goto exit;
@@ -607,7 +607,7 @@ static inline int at76_get_hw_cfg_intersil(struct usb_device *udev,
static int at76_get_hw_config(struct at76_priv *priv)
{
int ret;
- union at76_hwcfg *hwcfg = kmalloc_obj(*hwcfg, GFP_KERNEL);
+ union at76_hwcfg *hwcfg = kmalloc_obj(*hwcfg);
if (!hwcfg)
return -ENOMEM;
@@ -931,7 +931,7 @@ static void at76_dump_mib_mac_addr(struct at76_priv *priv)
{
int i;
int ret;
- struct mib_mac_addr *m = kmalloc_obj(*m, GFP_KERNEL);
+ struct mib_mac_addr *m = kmalloc_obj(*m);
if (!m)
return;
@@ -959,7 +959,7 @@ static void at76_dump_mib_mac_wep(struct at76_priv *priv)
int i;
int ret;
int key_len;
- struct mib_mac_wep *m = kmalloc_obj(*m, GFP_KERNEL);
+ struct mib_mac_wep *m = kmalloc_obj(*m);
if (!m)
return;
@@ -994,7 +994,7 @@ static void at76_dump_mib_mac_wep(struct at76_priv *priv)
static void at76_dump_mib_mac_mgmt(struct at76_priv *priv)
{
int ret;
- struct mib_mac_mgmt *m = kmalloc_obj(*m, GFP_KERNEL);
+ struct mib_mac_mgmt *m = kmalloc_obj(*m);
if (!m)
return;
@@ -1030,7 +1030,7 @@ static void at76_dump_mib_mac_mgmt(struct at76_priv *priv)
static void at76_dump_mib_mac(struct at76_priv *priv)
{
int ret;
- struct mib_mac *m = kmalloc_obj(*m, GFP_KERNEL);
+ struct mib_mac *m = kmalloc_obj(*m);
if (!m)
return;
@@ -1067,7 +1067,7 @@ static void at76_dump_mib_mac(struct at76_priv *priv)
static void at76_dump_mib_phy(struct at76_priv *priv)
{
int ret;
- struct mib_phy *m = kmalloc_obj(*m, GFP_KERNEL);
+ struct mib_phy *m = kmalloc_obj(*m);
if (!m)
return;
@@ -1100,7 +1100,7 @@ static void at76_dump_mib_phy(struct at76_priv *priv)
static void at76_dump_mib_local(struct at76_priv *priv)
{
int ret;
- struct mib_local *m = kmalloc_obj(*m, GFP_KERNEL);
+ struct mib_local *m = kmalloc_obj(*m);
if (!m)
return;
@@ -1125,7 +1125,7 @@ static void at76_dump_mib_local(struct at76_priv *priv)
static void at76_dump_mib_mdomain(struct at76_priv *priv)
{
int ret;
- struct mib_mdomain *m = kmalloc_obj(*m, GFP_KERNEL);
+ struct mib_mdomain *m = kmalloc_obj(*m);
if (!m)
return;
@@ -2442,7 +2442,7 @@ static int at76_probe(struct usb_interface *interface,
udev = usb_get_dev(interface_to_usbdev(interface));
- fwv = kmalloc_obj(*fwv, GFP_KERNEL);
+ fwv = kmalloc_obj(*fwv);
if (!fwv) {
ret = -ENOMEM;
goto exit;
diff --git a/drivers/net/wireless/broadcom/b43/bus.c b/drivers/net/wireless/broadcom/b43/bus.c
index b6c8697f782b..3ed329a39daf 100644
--- a/drivers/net/wireless/broadcom/b43/bus.c
+++ b/drivers/net/wireless/broadcom/b43/bus.c
@@ -74,7 +74,7 @@ void b43_bus_bcma_block_write(struct b43_bus_dev *dev, const void *buffer,
struct b43_bus_dev *b43_bus_dev_bcma_init(struct bcma_device *core)
{
- struct b43_bus_dev *dev = kzalloc_obj(*dev, GFP_KERNEL);
+ struct b43_bus_dev *dev = kzalloc_obj(*dev);
if (!dev)
return NULL;
@@ -179,7 +179,7 @@ struct b43_bus_dev *b43_bus_dev_ssb_init(struct ssb_device *sdev)
{
struct b43_bus_dev *dev;
- dev = kzalloc_obj(*dev, GFP_KERNEL);
+ dev = kzalloc_obj(*dev);
if (!dev)
return NULL;
diff --git a/drivers/net/wireless/broadcom/b43/debugfs.c b/drivers/net/wireless/broadcom/b43/debugfs.c
index aa6768a66b03..3d1c94d2d999 100644
--- a/drivers/net/wireless/broadcom/b43/debugfs.c
+++ b/drivers/net/wireless/broadcom/b43/debugfs.c
@@ -670,7 +670,7 @@ void b43_debugfs_add_device(struct b43_wldev *dev)
char devdir[16];
B43_WARN_ON(!dev);
- e = kzalloc_obj(*e, GFP_KERNEL);
+ e = kzalloc_obj(*e);
if (!e) {
b43err(dev->wl, "debugfs: add device OOM\n");
return;
diff --git a/drivers/net/wireless/broadcom/b43/dma.c b/drivers/net/wireless/broadcom/b43/dma.c
index eca39555718f..6eabe78c938a 100644
--- a/drivers/net/wireless/broadcom/b43/dma.c
+++ b/drivers/net/wireless/broadcom/b43/dma.c
@@ -838,7 +838,7 @@ struct b43_dmaring *b43_setup_dmaring(struct b43_wldev *dev,
int i, err;
dma_addr_t dma_test;
- ring = kzalloc_obj(*ring, GFP_KERNEL);
+ ring = kzalloc_obj(*ring);
if (!ring)
goto out;
diff --git a/drivers/net/wireless/broadcom/b43/lo.c b/drivers/net/wireless/broadcom/b43/lo.c
index 6fcd7205bda3..f86e8969673f 100644
--- a/drivers/net/wireless/broadcom/b43/lo.c
+++ b/drivers/net/wireless/broadcom/b43/lo.c
@@ -766,7 +766,7 @@ struct b43_lo_calib *b43_calibrate_lo_setting(struct b43_wldev *dev,
loctl.i, loctl.q);
}
- cal = kmalloc_obj(*cal, GFP_KERNEL);
+ cal = kmalloc_obj(*cal);
if (!cal) {
b43warn(dev->wl, "LO calib: out of memory\n");
return NULL;
diff --git a/drivers/net/wireless/broadcom/b43/main.c b/drivers/net/wireless/broadcom/b43/main.c
index 97e222e9e613..b0e6aeb0b872 100644
--- a/drivers/net/wireless/broadcom/b43/main.c
+++ b/drivers/net/wireless/broadcom/b43/main.c
@@ -2555,7 +2555,7 @@ static void b43_request_firmware(struct work_struct *work)
int err;
const char *errmsg;
- ctx = kzalloc_obj(*ctx, GFP_KERNEL);
+ ctx = kzalloc_obj(*ctx);
if (!ctx)
return;
ctx->dev = dev;
@@ -5494,7 +5494,7 @@ static int b43_one_core_attach(struct b43_bus_dev *dev, struct b43_wl *wl)
struct b43_wldev *wldev;
int err = -ENOMEM;
- wldev = kzalloc_obj(*wldev, GFP_KERNEL);
+ wldev = kzalloc_obj(*wldev);
if (!wldev)
goto out;
diff --git a/drivers/net/wireless/broadcom/b43/phy_ac.c b/drivers/net/wireless/broadcom/b43/phy_ac.c
index 85af2d791d91..fe102ea3d1fa 100644
--- a/drivers/net/wireless/broadcom/b43/phy_ac.c
+++ b/drivers/net/wireless/broadcom/b43/phy_ac.c
@@ -17,7 +17,7 @@ static int b43_phy_ac_op_allocate(struct b43_wldev *dev)
{
struct b43_phy_ac *phy_ac;
- phy_ac = kzalloc_obj(*phy_ac, GFP_KERNEL);
+ phy_ac = kzalloc_obj(*phy_ac);
if (!phy_ac)
return -ENOMEM;
dev->phy.ac = phy_ac;
diff --git a/drivers/net/wireless/broadcom/b43/phy_g.c b/drivers/net/wireless/broadcom/b43/phy_g.c
index 94038d427b39..9e292a349674 100644
--- a/drivers/net/wireless/broadcom/b43/phy_g.c
+++ b/drivers/net/wireless/broadcom/b43/phy_g.c
@@ -2422,14 +2422,14 @@ static int b43_gphy_op_allocate(struct b43_wldev *dev)
struct b43_txpower_lo_control *lo;
int err;
- gphy = kzalloc_obj(*gphy, GFP_KERNEL);
+ gphy = kzalloc_obj(*gphy);
if (!gphy) {
err = -ENOMEM;
goto error;
}
dev->phy.g = gphy;
- lo = kzalloc_obj(*lo, GFP_KERNEL);
+ lo = kzalloc_obj(*lo);
if (!lo) {
err = -ENOMEM;
goto err_free_gphy;
diff --git a/drivers/net/wireless/broadcom/b43/phy_ht.c b/drivers/net/wireless/broadcom/b43/phy_ht.c
index a1a5e699caf1..fab8399c64f7 100644
--- a/drivers/net/wireless/broadcom/b43/phy_ht.c
+++ b/drivers/net/wireless/broadcom/b43/phy_ht.c
@@ -842,7 +842,7 @@ static int b43_phy_ht_op_allocate(struct b43_wldev *dev)
{
struct b43_phy_ht *phy_ht;
- phy_ht = kzalloc_obj(*phy_ht, GFP_KERNEL);
+ phy_ht = kzalloc_obj(*phy_ht);
if (!phy_ht)
return -ENOMEM;
dev->phy.ht = phy_ht;
diff --git a/drivers/net/wireless/broadcom/b43/phy_lcn.c b/drivers/net/wireless/broadcom/b43/phy_lcn.c
index 67b61a915aa2..dd726894738c 100644
--- a/drivers/net/wireless/broadcom/b43/phy_lcn.c
+++ b/drivers/net/wireless/broadcom/b43/phy_lcn.c
@@ -669,7 +669,7 @@ static int b43_phy_lcn_op_allocate(struct b43_wldev *dev)
{
struct b43_phy_lcn *phy_lcn;
- phy_lcn = kzalloc_obj(*phy_lcn, GFP_KERNEL);
+ phy_lcn = kzalloc_obj(*phy_lcn);
if (!phy_lcn)
return -ENOMEM;
dev->phy.lcn = phy_lcn;
diff --git a/drivers/net/wireless/broadcom/b43/phy_lp.c b/drivers/net/wireless/broadcom/b43/phy_lp.c
index 622d4fe3b613..8e0058072242 100644
--- a/drivers/net/wireless/broadcom/b43/phy_lp.c
+++ b/drivers/net/wireless/broadcom/b43/phy_lp.c
@@ -43,7 +43,7 @@ static int b43_lpphy_op_allocate(struct b43_wldev *dev)
{
struct b43_phy_lp *lpphy;
- lpphy = kzalloc_obj(*lpphy, GFP_KERNEL);
+ lpphy = kzalloc_obj(*lpphy);
if (!lpphy)
return -ENOMEM;
dev->phy.lp = lpphy;
diff --git a/drivers/net/wireless/broadcom/b43/phy_n.c b/drivers/net/wireless/broadcom/b43/phy_n.c
index 768d9576be41..bbc30cbad0bb 100644
--- a/drivers/net/wireless/broadcom/b43/phy_n.c
+++ b/drivers/net/wireless/broadcom/b43/phy_n.c
@@ -1549,7 +1549,7 @@ static u16 b43_nphy_gen_load_samples(struct b43_wldev *dev, u32 freq, u16 max,
len = bw << 1;
}
- samples = kzalloc_objs(struct cordic_iq, len, GFP_KERNEL);
+ samples = kzalloc_objs(struct cordic_iq, len);
if (!samples) {
b43err(dev->wl, "allocation for samples generation failed\n");
return 0;
@@ -6417,7 +6417,7 @@ static int b43_nphy_op_allocate(struct b43_wldev *dev)
{
struct b43_phy_n *nphy;
- nphy = kzalloc_obj(*nphy, GFP_KERNEL);
+ nphy = kzalloc_obj(*nphy);
if (!nphy)
return -ENOMEM;
diff --git a/drivers/net/wireless/broadcom/b43/pio.c b/drivers/net/wireless/broadcom/b43/pio.c
index 135091bec6c4..8358b1d5c298 100644
--- a/drivers/net/wireless/broadcom/b43/pio.c
+++ b/drivers/net/wireless/broadcom/b43/pio.c
@@ -127,7 +127,7 @@ static struct b43_pio_txqueue *b43_setup_pioqueue_tx(struct b43_wldev *dev,
struct b43_pio_txpacket *p;
unsigned int i;
- q = kzalloc_obj(*q, GFP_KERNEL);
+ q = kzalloc_obj(*q);
if (!q)
return NULL;
q->dev = dev;
@@ -161,7 +161,7 @@ static struct b43_pio_rxqueue *b43_setup_pioqueue_rx(struct b43_wldev *dev,
{
struct b43_pio_rxqueue *q;
- q = kzalloc_obj(*q, GFP_KERNEL);
+ q = kzalloc_obj(*q);
if (!q)
return NULL;
q->dev = dev;
diff --git a/drivers/net/wireless/broadcom/b43/sdio.c b/drivers/net/wireless/broadcom/b43/sdio.c
index 8d19fe48831f..dda8d894aebe 100644
--- a/drivers/net/wireless/broadcom/b43/sdio.c
+++ b/drivers/net/wireless/broadcom/b43/sdio.c
@@ -139,7 +139,7 @@ static int b43_sdio_probe(struct sdio_func *func,
}
sdio_release_host(func);
- sdio = kzalloc_obj(*sdio, GFP_KERNEL);
+ sdio = kzalloc_obj(*sdio);
if (!sdio) {
error = -ENOMEM;
dev_err(&func->dev, "failed to allocate ssb bus\n");
diff --git a/drivers/net/wireless/broadcom/b43legacy/debugfs.c b/drivers/net/wireless/broadcom/b43legacy/debugfs.c
index ec1f67f6d328..22811359d89d 100644
--- a/drivers/net/wireless/broadcom/b43legacy/debugfs.c
+++ b/drivers/net/wireless/broadcom/b43legacy/debugfs.c
@@ -358,7 +358,7 @@ void b43legacy_debugfs_add_device(struct b43legacy_wldev *dev)
char devdir[16];
B43legacy_WARN_ON(!dev);
- e = kzalloc_obj(*e, GFP_KERNEL);
+ e = kzalloc_obj(*e);
if (!e) {
b43legacyerr(dev->wl, "debugfs: add device OOM\n");
return;
diff --git a/drivers/net/wireless/broadcom/b43legacy/dma.c b/drivers/net/wireless/broadcom/b43legacy/dma.c
index aff7e9161ffc..1608fd0a582b 100644
--- a/drivers/net/wireless/broadcom/b43legacy/dma.c
+++ b/drivers/net/wireless/broadcom/b43legacy/dma.c
@@ -610,7 +610,7 @@ struct b43legacy_dmaring *b43legacy_setup_dmaring(struct b43legacy_wldev *dev,
int nr_slots;
dma_addr_t dma_test;
- ring = kzalloc_obj(*ring, GFP_KERNEL);
+ ring = kzalloc_obj(*ring);
if (!ring)
goto out;
ring->type = type;
diff --git a/drivers/net/wireless/broadcom/b43legacy/main.c b/drivers/net/wireless/broadcom/b43legacy/main.c
index 0873014a9299..aba1168ab728 100644
--- a/drivers/net/wireless/broadcom/b43legacy/main.c
+++ b/drivers/net/wireless/broadcom/b43legacy/main.c
@@ -3738,7 +3738,7 @@ static int b43legacy_one_core_attach(struct ssb_device *dev,
struct b43legacy_wldev *wldev;
int err = -ENOMEM;
- wldev = kzalloc_obj(*wldev, GFP_KERNEL);
+ wldev = kzalloc_obj(*wldev);
if (!wldev)
goto out;
diff --git a/drivers/net/wireless/broadcom/b43legacy/pio.c b/drivers/net/wireless/broadcom/b43legacy/pio.c
index fd9b79710350..0274fe47ca7e 100644
--- a/drivers/net/wireless/broadcom/b43legacy/pio.c
+++ b/drivers/net/wireless/broadcom/b43legacy/pio.c
@@ -320,7 +320,7 @@ struct b43legacy_pioqueue *b43legacy_setup_pioqueue(struct b43legacy_wldev *dev,
u32 value;
u16 qsize;
- queue = kzalloc_obj(*queue, GFP_KERNEL);
+ queue = kzalloc_obj(*queue);
if (!queue)
goto out;
diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/bcmsdh.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/bcmsdh.c
index cf5cf1dce28d..28e5df04bd43 100644
--- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/bcmsdh.c
+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/bcmsdh.c
@@ -794,7 +794,7 @@ static int brcmf_sdiod_freezer_attach(struct brcmf_sdio_dev *sdiodev)
if (!IS_ENABLED(CONFIG_PM_SLEEP))
return 0;
- sdiodev->freezer = kzalloc_obj(*sdiodev->freezer, GFP_KERNEL);
+ sdiodev->freezer = kzalloc_obj(*sdiodev->freezer);
if (!sdiodev->freezer)
return -ENOMEM;
atomic_set(&sdiodev->freezer->thread_count, 0);
@@ -1067,10 +1067,10 @@ static int brcmf_ops_sdio_probe(struct sdio_func *func,
if (func->num != 2)
return -ENODEV;
- bus_if = kzalloc_obj(*bus_if, GFP_KERNEL);
+ bus_if = kzalloc_obj(*bus_if);
if (!bus_if)
return -ENOMEM;
- sdiodev = kzalloc_obj(*sdiodev, GFP_KERNEL);
+ sdiodev = kzalloc_obj(*sdiodev);
if (!sdiodev) {
kfree(bus_if);
return -ENOMEM;
diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/btcoex.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/btcoex.c
index 5aa1dd33bf85..0ca7f8672803 100644
--- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/btcoex.c
+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/btcoex.c
@@ -362,7 +362,7 @@ int brcmf_btcoex_attach(struct brcmf_cfg80211_info *cfg)
struct brcmf_btcoex_info *btci;
brcmf_dbg(TRACE, "enter\n");
- btci = kmalloc_obj(*btci, GFP_KERNEL);
+ btci = kmalloc_obj(*btci);
if (!btci)
return -ENOMEM;
diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c
index a442c74423a6..cea02b33b798 100644
--- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c
+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c
@@ -2527,7 +2527,7 @@ brcmf_cfg80211_connect(struct wiphy *wiphy, struct net_device *ndev,
offsetof(struct brcmf_assoc_params_le, chanspec_list);
if (cfg->channel)
join_params_size += sizeof(u16);
- ext_join_params = kzalloc_obj(*ext_join_params, GFP_KERNEL);
+ ext_join_params = kzalloc_obj(*ext_join_params);
if (ext_join_params == NULL) {
err = -ENOMEM;
goto done;
@@ -4330,7 +4330,7 @@ brcmf_pmksa_v3_op(struct brcmf_if *ifp, struct cfg80211_pmksa *pmksa,
int length = offsetof(struct brcmf_pmk_op_v3_le, pmk);
int ret;
- pmk_op = kzalloc_obj(*pmk_op, GFP_KERNEL);
+ pmk_op = kzalloc_obj(*pmk_op);
if (!pmk_op)
return -ENOMEM;
@@ -5588,7 +5588,7 @@ brcmf_cfg80211_mgmt_tx(struct wiphy *wiphy, struct wireless_dev *wdev,
err = -EINVAL;
goto exit;
}
- af_params = kzalloc_obj(*af_params, GFP_KERNEL);
+ af_params = kzalloc_obj(*af_params);
if (af_params == NULL) {
bphy_err(drvr, "unable to allocate frame\n");
err = -ENOMEM;
@@ -6050,7 +6050,7 @@ struct brcmf_cfg80211_vif *brcmf_alloc_vif(struct brcmf_cfg80211_info *cfg,
brcmf_dbg(TRACE, "allocating virtual interface (size=%zu)\n",
sizeof(*vif));
- vif = kzalloc_obj(*vif, GFP_KERNEL);
+ vif = kzalloc_obj(*vif);
if (!vif)
return ERR_PTR(-ENOMEM);
@@ -6540,7 +6540,7 @@ brcmf_notify_connect_status_ap(struct brcmf_cfg80211_info *cfg,
return -EINVAL;
}
- sinfo = kzalloc_obj(*sinfo, GFP_KERNEL);
+ sinfo = kzalloc_obj(*sinfo);
if (!sinfo)
return -ENOMEM;
@@ -6828,7 +6828,7 @@ static void brcmf_deinit_priv_mem(struct brcmf_cfg80211_info *cfg)
static s32 brcmf_init_priv_mem(struct brcmf_cfg80211_info *cfg)
{
- cfg->conf = kzalloc_obj(*cfg->conf, GFP_KERNEL);
+ cfg->conf = kzalloc_obj(*cfg->conf);
if (!cfg->conf)
goto init_priv_mem_out;
cfg->extra_buf = kzalloc(WL_EXTRA_BUF_MAX, GFP_KERNEL);
@@ -7486,7 +7486,7 @@ static int brcmf_setup_ifmodes(struct wiphy *wiphy, struct brcmf_if *ifp)
mchan = brcmf_feat_is_enabled(ifp, BRCMF_FEAT_MCHAN);
n_combos = 1 + !!(p2p && !rsdb) + !!mbss;
- combo = kzalloc_objs(*combo, n_combos, GFP_KERNEL);
+ combo = kzalloc_objs(*combo, n_combos);
if (!combo)
goto err;
@@ -7503,7 +7503,7 @@ static int brcmf_setup_ifmodes(struct wiphy *wiphy, struct brcmf_if *ifp)
c = 0;
i = 0;
n_limits = 1 + mon_flag + (p2p ? 2 : 0) + (rsdb || !p2p);
- c0_limits = kzalloc_objs(*c0_limits, n_limits, GFP_KERNEL);
+ c0_limits = kzalloc_objs(*c0_limits, n_limits);
if (!c0_limits)
goto err;
@@ -7542,7 +7542,7 @@ static int brcmf_setup_ifmodes(struct wiphy *wiphy, struct brcmf_if *ifp)
if (p2p && !rsdb) {
c++;
i = 0;
- p2p_limits = kzalloc_objs(*p2p_limits, 4, GFP_KERNEL);
+ p2p_limits = kzalloc_objs(*p2p_limits, 4);
if (!p2p_limits)
goto err;
p2p_limits[i].max = 1;
@@ -7563,7 +7563,7 @@ static int brcmf_setup_ifmodes(struct wiphy *wiphy, struct brcmf_if *ifp)
c++;
i = 0;
n_limits = 1 + mon_flag;
- mbss_limits = kzalloc_objs(*mbss_limits, n_limits, GFP_KERNEL);
+ mbss_limits = kzalloc_objs(*mbss_limits, n_limits);
if (!mbss_limits)
goto err;
mbss_limits[i].max = 4;
@@ -8321,7 +8321,7 @@ struct brcmf_cfg80211_info *brcmf_cfg80211_attach(struct brcmf_pub *drvr,
return NULL;
}
- cfg = kzalloc_obj(*cfg, GFP_KERNEL);
+ cfg = kzalloc_obj(*cfg);
if (!cfg) {
bphy_err(drvr, "Could not allocate wiphy device\n");
return NULL;
diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/chip.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/chip.c
index a3bbbb76dd97..a790f1693b82 100644
--- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/chip.c
+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/chip.c
@@ -507,7 +507,7 @@ static struct brcmf_core *brcmf_chip_add_core(struct brcmf_chip_priv *ci,
{
struct brcmf_core_priv *core;
- core = kzalloc_obj(*core, GFP_KERNEL);
+ core = kzalloc_obj(*core);
if (!core)
return ERR_PTR(-ENOMEM);
@@ -1137,7 +1137,7 @@ struct brcmf_chip *brcmf_chip_attach(void *ctx, u16 devid,
if (err < 0)
return ERR_PTR(-EINVAL);
- chip = kzalloc_obj(*chip, GFP_KERNEL);
+ chip = kzalloc_obj(*chip);
if (!chip)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.c
index 99d5fd453cf1..ec170647800d 100644
--- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.c
+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.c
@@ -879,7 +879,7 @@ struct brcmf_if *brcmf_add_if(struct brcmf_pub *drvr, s32 bsscfgidx, s32 ifidx,
if (!drvr->settings->p2p_enable && is_p2pdev) {
/* this is P2P_DEVICE interface */
brcmf_dbg(INFO, "allocate non-netdev interface\n");
- ifp = kzalloc_obj(*ifp, GFP_KERNEL);
+ ifp = kzalloc_obj(*ifp);
if (!ifp)
return ERR_PTR(-ENOMEM);
} else {
diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/firmware.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/firmware.c
index 7b3b0bd1acaf..9d05a0f656f4 100644
--- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/firmware.c
+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/firmware.c
@@ -765,7 +765,7 @@ int brcmf_fw_get_firmwares(struct device *dev, struct brcmf_fw_request *req,
if (!brcmf_fw_request_is_valid(req))
return -EINVAL;
- fwctx = kzalloc_obj(*fwctx, GFP_KERNEL);
+ fwctx = kzalloc_obj(*fwctx);
if (!fwctx)
return -ENOMEM;
diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/flowring.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/flowring.c
index 9184022600d6..df7e3bee19f2 100644
--- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/flowring.c
+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/flowring.c
@@ -360,7 +360,7 @@ struct brcmf_flowring *brcmf_flowring_attach(struct device *dev, u16 nrofrings)
struct brcmf_flowring *flow;
u32 i;
- flow = kzalloc_obj(*flow, GFP_KERNEL);
+ flow = kzalloc_obj(*flow);
if (flow) {
flow->dev = dev;
flow->nrofrings = nrofrings;
@@ -369,7 +369,7 @@ struct brcmf_flowring *brcmf_flowring_attach(struct device *dev, u16 nrofrings)
flow->addr_mode[i] = ADDR_INDIRECT;
for (i = 0; i < ARRAY_SIZE(flow->hash); i++)
flow->hash[i].ifidx = BRCMF_FLOWRING_INVALID_IFIDX;
- flow->rings = kzalloc_objs(*flow->rings, nrofrings, GFP_KERNEL);
+ flow->rings = kzalloc_objs(*flow->rings, nrofrings);
if (!flow->rings) {
kfree(flow);
flow = NULL;
diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/fwsignal.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/fwsignal.c
index b6fab5eb6002..a43f1a38b0e3 100644
--- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/fwsignal.c
+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/fwsignal.c
@@ -2342,7 +2342,7 @@ struct brcmf_fws_info *brcmf_fws_attach(struct brcmf_pub *drvr)
int rc;
u32 mode;
- fws = kzalloc_obj(*fws, GFP_KERNEL);
+ fws = kzalloc_obj(*fws);
if (!fws) {
rc = -ENOMEM;
goto fail;
diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/msgbuf.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/msgbuf.c
index 7252cdb6d87a..a88abe390aee 100644
--- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/msgbuf.c
+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/msgbuf.c
@@ -299,11 +299,11 @@ brcmf_msgbuf_init_pktids(u32 nr_array_entries,
struct brcmf_msgbuf_pktid *array;
struct brcmf_msgbuf_pktids *pktids;
- array = kzalloc_objs(*array, nr_array_entries, GFP_KERNEL);
+ array = kzalloc_objs(*array, nr_array_entries);
if (!array)
return NULL;
- pktids = kzalloc_obj(*pktids, GFP_KERNEL);
+ pktids = kzalloc_obj(*pktids);
if (!pktids) {
kfree(array);
return NULL;
@@ -1539,7 +1539,7 @@ int brcmf_proto_msgbuf_attach(struct brcmf_pub *drvr)
if_msgbuf->max_flowrings = BRCMF_FLOWRING_HASHSIZE - 1;
}
- msgbuf = kzalloc_obj(*msgbuf, GFP_KERNEL);
+ msgbuf = kzalloc_obj(*msgbuf);
if (!msgbuf)
goto fail;
diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/pcie.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/pcie.c
index d15b98273cd3..beb33003fe54 100644
--- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/pcie.c
+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/pcie.c
@@ -1155,7 +1155,7 @@ brcmf_pcie_alloc_dma_and_ring(struct brcmf_pciedev_info *devinfo, u32 ring_id,
addr = tcm_ring_phys_addr + BRCMF_RING_LEN_ITEMS_OFFSET;
brcmf_pcie_write_tcm16(devinfo, addr, ring_itemsize_array[ring_id]);
- ring = kzalloc_obj(*ring, GFP_KERNEL);
+ ring = kzalloc_obj(*ring);
if (!ring) {
dma_free_coherent(&devinfo->pdev->dev, size, dma_buf,
dma_handle);
@@ -1347,7 +1347,7 @@ static int brcmf_pcie_init_ringbuffers(struct brcmf_pciedev_info *devinfo)
devinfo->shared.max_flowrings = max_flowrings;
devinfo->shared.max_submissionrings = max_submissionrings;
devinfo->shared.max_completionrings = max_completionrings;
- rings = kzalloc_objs(*ring, max_flowrings, GFP_KERNEL);
+ rings = kzalloc_objs(*ring, max_flowrings);
if (!rings)
goto fail;
@@ -2457,7 +2457,7 @@ brcmf_pcie_probe(struct pci_dev *pdev, const struct pci_device_id *id)
brcmf_dbg(PCIE, "Enter %x:%x\n", pdev->vendor, pdev->device);
ret = -ENOMEM;
- devinfo = kzalloc_obj(*devinfo, GFP_KERNEL);
+ devinfo = kzalloc_obj(*devinfo);
if (devinfo == NULL)
return ret;
@@ -2477,7 +2477,7 @@ brcmf_pcie_probe(struct pci_dev *pdev, const struct pci_device_id *id)
else
devinfo->reginfo = &brcmf_reginfo_default;
- pcie_bus_dev = kzalloc_obj(*pcie_bus_dev, GFP_KERNEL);
+ pcie_bus_dev = kzalloc_obj(*pcie_bus_dev);
if (pcie_bus_dev == NULL) {
ret = -ENOMEM;
goto fail;
@@ -2495,12 +2495,12 @@ brcmf_pcie_probe(struct pci_dev *pdev, const struct pci_device_id *id)
if (ret < 0)
goto fail;
- bus = kzalloc_obj(*bus, GFP_KERNEL);
+ bus = kzalloc_obj(*bus);
if (!bus) {
ret = -ENOMEM;
goto fail;
}
- bus->msgbuf = kzalloc_obj(*bus->msgbuf, GFP_KERNEL);
+ bus->msgbuf = kzalloc_obj(*bus->msgbuf);
if (!bus->msgbuf) {
ret = -ENOMEM;
kfree(bus);
diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/pno.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/pno.c
index 34179e69d77d..d9fc94076791 100644
--- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/pno.c
+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/pno.c
@@ -321,7 +321,7 @@ static int brcmf_pno_prep_fwconfig(struct brcmf_pno_info *pi,
}
*buckets = NULL;
- fw_buckets = kzalloc_objs(*fw_buckets, pi->n_reqs, GFP_KERNEL);
+ fw_buckets = kzalloc_objs(*fw_buckets, pi->n_reqs);
if (!fw_buckets)
return -ENOMEM;
@@ -517,7 +517,7 @@ int brcmf_pno_attach(struct brcmf_cfg80211_info *cfg)
struct brcmf_pno_info *pi;
brcmf_dbg(TRACE, "enter\n");
- pi = kzalloc_obj(*pi, GFP_KERNEL);
+ pi = kzalloc_obj(*pi);
if (!pi)
return -ENOMEM;
diff --git a/drivers/net/wireless/intel/ipw2x00/ipw2200.c b/drivers/net/wireless/intel/ipw2x00/ipw2200.c
index a39985e4a977..e045208e2531 100644
--- a/drivers/net/wireless/intel/ipw2x00/ipw2200.c
+++ b/drivers/net/wireless/intel/ipw2x00/ipw2200.c
@@ -3153,7 +3153,7 @@ static int ipw_load_firmware(struct ipw_priv *priv, u8 * data, size_t len)
if (!virts)
return -ENOMEM;
- phys = kmalloc_objs(dma_addr_t, CB_NUMBER_OF_ELEMENTS_SMALL, GFP_KERNEL);
+ phys = kmalloc_objs(dma_addr_t, CB_NUMBER_OF_ELEMENTS_SMALL);
if (!phys) {
kfree(virts);
return -ENOMEM;
@@ -3722,7 +3722,7 @@ static int ipw_queue_tx_init(struct ipw_priv *priv,
{
struct pci_dev *dev = priv->pci_dev;
- q->txb = kmalloc_objs(q->txb[0], count, GFP_KERNEL);
+ q->txb = kmalloc_objs(q->txb[0], count);
if (!q->txb)
return -ENOMEM;
@@ -5200,7 +5200,7 @@ static struct ipw_rx_queue *ipw_rx_queue_alloc(struct ipw_priv *priv)
struct ipw_rx_queue *rxq;
int i;
- rxq = kzalloc_obj(*rxq, GFP_KERNEL);
+ rxq = kzalloc_obj(*rxq);
if (unlikely(!rxq)) {
IPW_ERROR("memory allocation failed\n");
return NULL;
@@ -11118,7 +11118,7 @@ static int ipw_up(struct ipw_priv *priv)
return -EIO;
if (cmdlog && !priv->cmdlog) {
- priv->cmdlog = kzalloc_objs(*priv->cmdlog, cmdlog, GFP_KERNEL);
+ priv->cmdlog = kzalloc_objs(*priv->cmdlog, cmdlog);
if (priv->cmdlog == NULL) {
IPW_ERROR("Error allocating %d command log entries.\n",
cmdlog);
diff --git a/drivers/net/wireless/intel/ipw2x00/libipw_crypto.c b/drivers/net/wireless/intel/ipw2x00/libipw_crypto.c
index e39b95f68dd4..af03114fdf6c 100644
--- a/drivers/net/wireless/intel/ipw2x00/libipw_crypto.c
+++ b/drivers/net/wireless/intel/ipw2x00/libipw_crypto.c
@@ -159,7 +159,7 @@ int libipw_register_crypto_ops(const struct libipw_crypto_ops *ops)
unsigned long flags;
struct libipw_crypto_alg *alg;
- alg = kzalloc_obj(*alg, GFP_KERNEL);
+ alg = kzalloc_obj(*alg);
if (alg == NULL)
return -ENOMEM;
diff --git a/drivers/net/wireless/intel/ipw2x00/libipw_wx.c b/drivers/net/wireless/intel/ipw2x00/libipw_wx.c
index 3db31b740a0e..122bcbae188f 100644
--- a/drivers/net/wireless/intel/ipw2x00/libipw_wx.c
+++ b/drivers/net/wireless/intel/ipw2x00/libipw_wx.c
@@ -365,7 +365,7 @@ int libipw_wx_set_encode(struct libipw_device *ieee,
struct libipw_crypt_data *new_crypt;
/* take WEP into use */
- new_crypt = kzalloc_obj(struct libipw_crypt_data, GFP_KERNEL);
+ new_crypt = kzalloc_obj(struct libipw_crypt_data);
if (new_crypt == NULL)
return -ENOMEM;
new_crypt->ops = libipw_get_crypto_ops("WEP");
@@ -597,7 +597,7 @@ int libipw_wx_set_encodeext(struct libipw_device *ieee,
libipw_crypt_delayed_deinit(&ieee->crypt_info, crypt);
- new_crypt = kzalloc_obj(*new_crypt, GFP_KERNEL);
+ new_crypt = kzalloc_obj(*new_crypt);
if (new_crypt == NULL) {
ret = -ENOMEM;
goto done;
diff --git a/drivers/net/wireless/intel/iwlegacy/3945-mac.c b/drivers/net/wireless/intel/iwlegacy/3945-mac.c
index c87579e4c7f9..c148654aa953 100644
--- a/drivers/net/wireless/intel/iwlegacy/3945-mac.c
+++ b/drivers/net/wireless/intel/iwlegacy/3945-mac.c
@@ -269,7 +269,7 @@ il3945_get_free_frame(struct il_priv *il)
struct il3945_frame *frame;
struct list_head *element;
if (list_empty(&il->free_frames)) {
- frame = kzalloc_obj(*frame, GFP_KERNEL);
+ frame = kzalloc_obj(*frame);
if (!frame) {
IL_ERR("Could not allocate frame!\n");
return NULL;
diff --git a/drivers/net/wireless/intel/iwlegacy/4965-mac.c b/drivers/net/wireless/intel/iwlegacy/4965-mac.c
index 8429b6f5768b..7921bc45e21d 100644
--- a/drivers/net/wireless/intel/iwlegacy/4965-mac.c
+++ b/drivers/net/wireless/intel/iwlegacy/4965-mac.c
@@ -3027,7 +3027,7 @@ il4965_sta_alloc_lq(struct il_priv *il, u8 sta_id)
u32 rate_flags = 0;
__le32 rate_n_flags;
- link_cmd = kzalloc_obj(struct il_link_quality_cmd, GFP_KERNEL);
+ link_cmd = kzalloc_obj(struct il_link_quality_cmd);
if (!link_cmd) {
IL_ERR("Unable to allocate memory for LQ cmd.\n");
return NULL;
@@ -3709,7 +3709,7 @@ il4965_get_free_frame(struct il_priv *il)
struct il_frame *frame;
struct list_head *element;
if (list_empty(&il->free_frames)) {
- frame = kzalloc_obj(*frame, GFP_KERNEL);
+ frame = kzalloc_obj(*frame);
if (!frame) {
IL_ERR("Could not allocate frame!\n");
return NULL;
diff --git a/drivers/net/wireless/intel/iwlegacy/common.c b/drivers/net/wireless/intel/iwlegacy/common.c
index 4a12703e9b46..c9efb948f6c7 100644
--- a/drivers/net/wireless/intel/iwlegacy/common.c
+++ b/drivers/net/wireless/intel/iwlegacy/common.c
@@ -907,7 +907,7 @@ il_init_channel_map(struct il_priv *il)
D_EEPROM("Parsing data for %d channels.\n", il->channel_count);
il->channel_info =
- kzalloc_objs(struct il_channel_info, il->channel_count, GFP_KERNEL);
+ kzalloc_objs(struct il_channel_info, il->channel_count);
if (!il->channel_info) {
IL_ERR("Could not allocate channel_info\n");
il->channel_count = 0;
@@ -3022,9 +3022,9 @@ il_tx_queue_init(struct il_priv *il, u32 txq_id)
}
txq->meta =
- kzalloc_objs(struct il_cmd_meta, actual_slots, GFP_KERNEL);
+ kzalloc_objs(struct il_cmd_meta, actual_slots);
txq->cmd =
- kzalloc_objs(struct il_device_cmd *, actual_slots, GFP_KERNEL);
+ kzalloc_objs(struct il_device_cmd *, actual_slots);
if (!txq->meta || !txq->cmd)
goto out_free_arrays;
@@ -3447,7 +3447,7 @@ il_init_geos(struct il_priv *il)
if (!channels)
return -ENOMEM;
- rates = kzalloc_objs(*rates, RATE_COUNT_LEGACY, GFP_KERNEL);
+ rates = kzalloc_objs(*rates, RATE_COUNT_LEGACY);
if (!rates) {
kfree(channels);
return -ENOMEM;
diff --git a/drivers/net/wireless/intel/iwlwifi/dvm/devices.c b/drivers/net/wireless/intel/iwlwifi/dvm/devices.c
index 5c8665b5a1b7..7f83f1bbdaad 100644
--- a/drivers/net/wireless/intel/iwlwifi/dvm/devices.c
+++ b/drivers/net/wireless/intel/iwlwifi/dvm/devices.c
@@ -567,7 +567,7 @@ static int iwl6000_hw_channel_switch(struct iwl_priv *priv,
};
int err;
- cmd = kzalloc_obj(*cmd, GFP_KERNEL);
+ cmd = kzalloc_obj(*cmd);
if (!cmd)
return -ENOMEM;
diff --git a/drivers/net/wireless/intel/iwlwifi/dvm/lib.c b/drivers/net/wireless/intel/iwlwifi/dvm/lib.c
index bc14ed3060dd..2e16799818e4 100644
--- a/drivers/net/wireless/intel/iwlwifi/dvm/lib.c
+++ b/drivers/net/wireless/intel/iwlwifi/dvm/lib.c
@@ -1056,7 +1056,7 @@ int iwlagn_suspend(struct iwl_priv *priv, struct cfg80211_wowlan *wowlan)
int ret, i;
u16 seq;
- key_data.rsc_tsc = kzalloc_obj(*key_data.rsc_tsc, GFP_KERNEL);
+ key_data.rsc_tsc = kzalloc_obj(*key_data.rsc_tsc);
if (!key_data.rsc_tsc)
return -ENOMEM;
diff --git a/drivers/net/wireless/intel/iwlwifi/dvm/main.c b/drivers/net/wireless/intel/iwlwifi/dvm/main.c
index ec30b5f3870b..ca5a8140908a 100644
--- a/drivers/net/wireless/intel/iwlwifi/dvm/main.c
+++ b/drivers/net/wireless/intel/iwlwifi/dvm/main.c
@@ -205,7 +205,7 @@ int iwlagn_send_beacon_cmd(struct iwl_priv *priv)
/* Allocate beacon command */
if (!priv->beacon_cmd)
- priv->beacon_cmd = kzalloc_obj(*tx_beacon_cmd, GFP_KERNEL);
+ priv->beacon_cmd = kzalloc_obj(*tx_beacon_cmd);
tx_beacon_cmd = priv->beacon_cmd;
if (!tx_beacon_cmd)
return -ENOMEM;
diff --git a/drivers/net/wireless/intel/iwlwifi/dvm/sta.c b/drivers/net/wireless/intel/iwlwifi/dvm/sta.c
index b29859f9d7c0..b6e3824fcda8 100644
--- a/drivers/net/wireless/intel/iwlwifi/dvm/sta.c
+++ b/drivers/net/wireless/intel/iwlwifi/dvm/sta.c
@@ -864,7 +864,7 @@ iwl_sta_alloc_lq(struct iwl_priv *priv, struct iwl_rxon_context *ctx,
{
struct iwl_link_quality_cmd *link_cmd;
- link_cmd = kzalloc_obj(struct iwl_link_quality_cmd, GFP_KERNEL);
+ link_cmd = kzalloc_obj(struct iwl_link_quality_cmd);
if (!link_cmd) {
IWL_ERR(priv, "Unable to allocate memory for LQ cmd.\n");
return NULL;
diff --git a/drivers/net/wireless/intel/iwlwifi/fw/dbg.c b/drivers/net/wireless/intel/iwlwifi/fw/dbg.c
index a070593e085f..402842e0dad4 100644
--- a/drivers/net/wireless/intel/iwlwifi/fw/dbg.c
+++ b/drivers/net/wireless/intel/iwlwifi/fw/dbg.c
@@ -595,7 +595,7 @@ static struct scatterlist *alloc_sgtable(ssize_t size)
nents -= n_fill;
}
- new = kzalloc_objs(*new, n_alloc, GFP_KERNEL);
+ new = kzalloc_objs(*new, n_alloc);
if (!new) {
if (result)
_devcd_free_sgtable(result);
diff --git a/drivers/net/wireless/intel/iwlwifi/fw/debugfs.c b/drivers/net/wireless/intel/iwlwifi/fw/debugfs.c
index 21d889344796..ddee7c2deb36 100644
--- a/drivers/net/wireless/intel/iwlwifi/fw/debugfs.c
+++ b/drivers/net/wireless/intel/iwlwifi/fw/debugfs.c
@@ -360,7 +360,7 @@ static void *iwl_dbgfs_fw_info_seq_start(struct seq_file *seq, loff_t *pos)
if (*pos >= fw->ucode_capa.n_cmd_versions)
return NULL;
- state = kzalloc_obj(*state, GFP_KERNEL);
+ state = kzalloc_obj(*state);
if (!state)
return NULL;
state->pos = *pos;
diff --git a/drivers/net/wireless/intel/iwlwifi/fw/pnvm.c b/drivers/net/wireless/intel/iwlwifi/fw/pnvm.c
index a45c3a9c223e..afff8d51ca95 100644
--- a/drivers/net/wireless/intel/iwlwifi/fw/pnvm.c
+++ b/drivers/net/wireless/intel/iwlwifi/fw/pnvm.c
@@ -379,7 +379,7 @@ iwl_pnvm_load_pnvm_to_trans(struct iwl_trans *trans,
return;
}
- pnvm_data = kzalloc_obj(*pnvm_data, GFP_KERNEL);
+ pnvm_data = kzalloc_obj(*pnvm_data);
if (!pnvm_data)
goto free;
@@ -425,7 +425,7 @@ iwl_pnvm_load_reduce_power_to_trans(struct iwl_trans *trans,
return;
}
- pnvm_data = kzalloc_obj(*pnvm_data, GFP_KERNEL);
+ pnvm_data = kzalloc_obj(*pnvm_data);
if (!pnvm_data)
goto free;
diff --git a/drivers/net/wireless/intel/iwlwifi/iwl-dbg-tlv.c b/drivers/net/wireless/intel/iwlwifi/iwl-dbg-tlv.c
index a6733224428a..ac8b64fec96d 100644
--- a/drivers/net/wireless/intel/iwlwifi/iwl-dbg-tlv.c
+++ b/drivers/net/wireless/intel/iwlwifi/iwl-dbg-tlv.c
@@ -618,7 +618,7 @@ static int iwl_dbg_tlv_alloc_fragments(struct iwl_fw_runtime *fwrt,
num_frags = min_t(u32, num_frags, remain_pages);
frag_pages = DIV_ROUND_UP(remain_pages, num_frags);
- fw_mon->frags = kzalloc_objs(*fw_mon->frags, num_frags, GFP_KERNEL);
+ fw_mon->frags = kzalloc_objs(*fw_mon->frags, num_frags);
if (!fw_mon->frags)
return -ENOMEM;
@@ -1001,7 +1001,7 @@ static void iwl_dbg_tlv_set_periodic_trigs(struct iwl_fw_runtime *fwrt)
collect_interval = le32_to_cpu(trig->data[0]);
- timer_node = kzalloc_obj(*timer_node, GFP_KERNEL);
+ timer_node = kzalloc_obj(*timer_node);
if (!timer_node) {
IWL_ERR(fwrt,
"WRT: Failed to allocate periodic trigger\n");
diff --git a/drivers/net/wireless/intel/iwlwifi/iwl-drv.c b/drivers/net/wireless/intel/iwlwifi/iwl-drv.c
index 39e362df0233..475b3e417efa 100644
--- a/drivers/net/wireless/intel/iwlwifi/iwl-drv.c
+++ b/drivers/net/wireless/intel/iwlwifi/iwl-drv.c
@@ -1459,7 +1459,7 @@ static int iwl_alloc_ucode_mem(struct fw_img *out, struct fw_img_parsing *img)
{
struct fw_desc *sec;
- sec = kzalloc_objs(*sec, img->sec_counter, GFP_KERNEL);
+ sec = kzalloc_objs(*sec, img->sec_counter);
if (!sec)
return -ENOMEM;
@@ -1622,7 +1622,7 @@ static void iwl_req_fw_callback(const struct firmware *ucode_raw, void *context)
/* dump all fw memory areas by default */
fw->dbg.dump_mask = 0xffffffff;
- pieces = kzalloc_obj(*pieces, GFP_KERNEL);
+ pieces = kzalloc_obj(*pieces);
if (!pieces)
goto out_free_fw;
@@ -1915,7 +1915,7 @@ struct iwl_drv *iwl_drv_start(struct iwl_trans *trans)
struct iwl_drv *drv;
int ret;
- drv = kzalloc_obj(*drv, GFP_KERNEL);
+ drv = kzalloc_obj(*drv);
if (!drv) {
ret = -ENOMEM;
goto err;
diff --git a/drivers/net/wireless/intel/iwlwifi/iwl-phy-db.c b/drivers/net/wireless/intel/iwlwifi/iwl-phy-db.c
index a5e287daf440..0a87deea3474 100644
--- a/drivers/net/wireless/intel/iwlwifi/iwl-phy-db.c
+++ b/drivers/net/wireless/intel/iwlwifi/iwl-phy-db.c
@@ -59,7 +59,7 @@ struct iwl_phy_db_chg_txp {
struct iwl_phy_db *iwl_phy_db_init(struct iwl_trans *trans)
{
- struct iwl_phy_db *phy_db = kzalloc_obj(struct iwl_phy_db, GFP_KERNEL);
+ struct iwl_phy_db *phy_db = kzalloc_obj(struct iwl_phy_db);
if (!phy_db)
return phy_db;
diff --git a/drivers/net/wireless/intel/iwlwifi/iwl-trans.c b/drivers/net/wireless/intel/iwlwifi/iwl-trans.c
index eebec9b8c169..89901786fd68 100644
--- a/drivers/net/wireless/intel/iwlwifi/iwl-trans.c
+++ b/drivers/net/wireless/intel/iwlwifi/iwl-trans.c
@@ -113,7 +113,7 @@ static void iwl_trans_schedule_reprobe(struct iwl_trans *trans,
return;
}
- reprobe = kzalloc_obj(*reprobe, GFP_KERNEL);
+ reprobe = kzalloc_obj(*reprobe);
if (!reprobe) {
module_put(THIS_MODULE);
return;
diff --git a/drivers/net/wireless/intel/iwlwifi/mei/main.c b/drivers/net/wireless/intel/iwlwifi/mei/main.c
index f9358cb01103..c5ff1b1b720f 100644
--- a/drivers/net/wireless/intel/iwlwifi/mei/main.c
+++ b/drivers/net/wireless/intel/iwlwifi/mei/main.c
@@ -702,7 +702,7 @@ static void iwl_mei_handle_csme_filters(struct mei_cl_device *cldev,
rcu_dereference_protected(mei->filters,
lockdep_is_held(&iwl_mei_mutex));
- new_filters = kzalloc_obj(*new_filters, GFP_KERNEL);
+ new_filters = kzalloc_obj(*new_filters);
if (!new_filters)
return;
@@ -886,7 +886,7 @@ static void iwl_mei_handle_nvm(struct mei_cl_device *cldev,
int i;
kfree(mei->nvm);
- mei->nvm = kzalloc_obj(*mei_nvm, GFP_KERNEL);
+ mei->nvm = kzalloc_obj(*mei_nvm);
if (!mei->nvm)
return;
diff --git a/drivers/net/wireless/intel/iwlwifi/mld/d3.c b/drivers/net/wireless/intel/iwlwifi/mld/d3.c
index e7849183dff1..5ececb849786 100644
--- a/drivers/net/wireless/intel/iwlwifi/mld/d3.c
+++ b/drivers/net/wireless/intel/iwlwifi/mld/d3.c
@@ -1654,7 +1654,7 @@ iwl_mld_suspend_send_security_cmds(struct iwl_mld *mld,
struct iwl_mld_suspend_key_iter_data data = {};
int ret;
- data.rsc = kzalloc_obj(*data.rsc, GFP_KERNEL);
+ data.rsc = kzalloc_obj(*data.rsc);
if (!data.rsc)
return -ENOMEM;
diff --git a/drivers/net/wireless/intel/iwlwifi/mld/iface.c b/drivers/net/wireless/intel/iwlwifi/mld/iface.c
index b418cbeb30aa..29df747c8938 100644
--- a/drivers/net/wireless/intel/iwlwifi/mld/iface.c
+++ b/drivers/net/wireless/intel/iwlwifi/mld/iface.c
@@ -542,7 +542,7 @@ void iwl_mld_handle_probe_resp_data_notif(struct iwl_mld *mld,
notif->noa_attr.len_low))
return;
- new_data = kzalloc_obj(*new_data, GFP_KERNEL);
+ new_data = kzalloc_obj(*new_data);
if (!new_data)
return;
diff --git a/drivers/net/wireless/intel/iwlwifi/mld/link.c b/drivers/net/wireless/intel/iwlwifi/mld/link.c
index 5640de4662d7..b5430e8a73d6 100644
--- a/drivers/net/wireless/intel/iwlwifi/mld/link.c
+++ b/drivers/net/wireless/intel/iwlwifi/mld/link.c
@@ -468,7 +468,7 @@ int iwl_mld_add_link(struct iwl_mld *mld,
if (is_deflink) {
link = &mld_vif->deflink;
} else {
- link = kzalloc_obj(*link, GFP_KERNEL);
+ link = kzalloc_obj(*link);
if (!link)
return -ENOMEM;
}
diff --git a/drivers/net/wireless/intel/iwlwifi/mld/sta.c b/drivers/net/wireless/intel/iwlwifi/mld/sta.c
index 0869f2ee7cee..3f0d093f2c5e 100644
--- a/drivers/net/wireless/intel/iwlwifi/mld/sta.c
+++ b/drivers/net/wireless/intel/iwlwifi/mld/sta.c
@@ -539,7 +539,7 @@ iwl_mld_add_link_sta(struct iwl_mld *mld, struct ieee80211_link_sta *link_sta)
if (link_sta == &link_sta->sta->deflink) {
mld_link_sta = &mld_sta->deflink;
} else {
- mld_link_sta = kzalloc_obj(*mld_link_sta, GFP_KERNEL);
+ mld_link_sta = kzalloc_obj(*mld_link_sta);
if (!mld_link_sta)
return -ENOMEM;
}
diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/d3.c b/drivers/net/wireless/intel/iwlwifi/mvm/d3.c
index 8df70323d426..66f4b3c98580 100644
--- a/drivers/net/wireless/intel/iwlwifi/mvm/d3.c
+++ b/drivers/net/wireless/intel/iwlwifi/mvm/d3.c
@@ -460,7 +460,7 @@ static int iwl_mvm_wowlan_config_rsc_tsc(struct iwl_mvm *mvm,
struct wowlan_key_rsc_v5_data data = {};
int i;
- data.rsc = kzalloc_obj(*data.rsc, GFP_KERNEL);
+ data.rsc = kzalloc_obj(*data.rsc);
if (!data.rsc)
return -ENOMEM;
@@ -483,7 +483,7 @@ static int iwl_mvm_wowlan_config_rsc_tsc(struct iwl_mvm *mvm,
} else if (ver == 2 || ver == IWL_FW_CMD_VER_UNKNOWN) {
struct wowlan_key_rsc_tsc_data data = {};
- data.rsc_tsc = kzalloc_obj(*data.rsc_tsc, GFP_KERNEL);
+ data.rsc_tsc = kzalloc_obj(*data.rsc_tsc);
if (!data.rsc_tsc)
return -ENOMEM;
@@ -3091,7 +3091,7 @@ static int __iwl_mvm_resume(struct iwl_mvm *mvm)
}
if (resume_notif_based) {
- d3_data.status = kzalloc_obj(*d3_data.status, GFP_KERNEL);
+ d3_data.status = kzalloc_obj(*d3_data.status);
if (!d3_data.status) {
IWL_ERR(mvm, "Failed to allocate wowlan status\n");
ret = -ENOMEM;
diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/ftm-initiator.c b/drivers/net/wireless/intel/iwlwifi/mvm/ftm-initiator.c
index 0a21670a9207..ebc569e94f55 100644
--- a/drivers/net/wireless/intel/iwlwifi/mvm/ftm-initiator.c
+++ b/drivers/net/wireless/intel/iwlwifi/mvm/ftm-initiator.c
@@ -1124,7 +1124,7 @@ static void iwl_mvm_ftm_rtt_smoothing(struct iwl_mvm *mvm,
}
if (!resp) {
- resp = kzalloc_obj(*resp, GFP_KERNEL);
+ resp = kzalloc_obj(*resp);
if (!resp)
return;
diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/mac-ctxt.c b/drivers/net/wireless/intel/iwlwifi/mvm/mac-ctxt.c
index a633f0d9c821..c523c5e82d4a 100644
--- a/drivers/net/wireless/intel/iwlwifi/mvm/mac-ctxt.c
+++ b/drivers/net/wireless/intel/iwlwifi/mvm/mac-ctxt.c
@@ -1764,7 +1764,7 @@ void iwl_mvm_probe_resp_data_notif(struct iwl_mvm *mvm,
notif->noa_attr.len_low))
return;
- new_data = kzalloc_obj(*new_data, GFP_KERNEL);
+ new_data = kzalloc_obj(*new_data);
if (!new_data)
return;
diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/mld-mac80211.c b/drivers/net/wireless/intel/iwlwifi/mvm/mld-mac80211.c
index 00ba47d5f499..896ed9823021 100644
--- a/drivers/net/wireless/intel/iwlwifi/mvm/mld-mac80211.c
+++ b/drivers/net/wireless/intel/iwlwifi/mvm/mld-mac80211.c
@@ -905,7 +905,7 @@ iwl_mvm_mld_change_vif_links(struct ieee80211_hw *hw,
if (!(added & BIT(i)))
continue;
- new_link[i] = kzalloc_obj(*new_link[i], GFP_KERNEL);
+ new_link[i] = kzalloc_obj(*new_link[i]);
if (!new_link[i]) {
err = -ENOMEM;
goto free;
diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/mld-sta.c b/drivers/net/wireless/intel/iwlwifi/mvm/mld-sta.c
index 8417b76e8fdb..3359e02e151f 100644
--- a/drivers/net/wireless/intel/iwlwifi/mvm/mld-sta.c
+++ b/drivers/net/wireless/intel/iwlwifi/mvm/mld-sta.c
@@ -547,7 +547,7 @@ static int iwl_mvm_mld_alloc_sta_link(struct iwl_mvm *mvm,
if (rcu_access_pointer(sta->link[link_id]) == &sta->deflink) {
link = &mvm_sta->deflink;
} else {
- link = kzalloc_obj(*link, GFP_KERNEL);
+ link = kzalloc_obj(*link);
if (!link)
return -ENOMEM;
}
diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/ops.c b/drivers/net/wireless/intel/iwlwifi/mvm/ops.c
index be328607e6f8..ae177477b201 100644
--- a/drivers/net/wireless/intel/iwlwifi/mvm/ops.c
+++ b/drivers/net/wireless/intel/iwlwifi/mvm/ops.c
@@ -1097,7 +1097,7 @@ static void iwl_mvm_me_conn_status(void *priv, const struct iwl_mei_conn_info *c
*/
prev_conn_info = rcu_dereference_protected(mvm->csme_conn_info, true);
- curr_conn_info = kzalloc_obj(*curr_conn_info, GFP_KERNEL);
+ curr_conn_info = kzalloc_obj(*curr_conn_info);
if (!curr_conn_info)
return;
diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/scan.c b/drivers/net/wireless/intel/iwlwifi/mvm/scan.c
index 3e39c243ddca..966558885ea6 100644
--- a/drivers/net/wireless/intel/iwlwifi/mvm/scan.c
+++ b/drivers/net/wireless/intel/iwlwifi/mvm/scan.c
@@ -547,7 +547,7 @@ iwl_mvm_config_sched_scan_profiles(struct iwl_mvm *mvm,
else
blocklist_len = IWL_SCAN_MAX_BLACKLIST_LEN;
- blocklist = kzalloc_objs(*blocklist, blocklist_len, GFP_KERNEL);
+ blocklist = kzalloc_objs(*blocklist, blocklist_len);
if (!blocklist)
return -ENOMEM;
diff --git a/drivers/net/wireless/intel/iwlwifi/pcie/ctxt-info.c b/drivers/net/wireless/intel/iwlwifi/pcie/ctxt-info.c
index 65b54f1e6347..d5eb895144ef 100644
--- a/drivers/net/wireless/intel/iwlwifi/pcie/ctxt-info.c
+++ b/drivers/net/wireless/intel/iwlwifi/pcie/ctxt-info.c
@@ -99,10 +99,10 @@ int iwl_pcie_init_fw_sec(struct iwl_trans *trans,
/* add 2 due to separators */
paging_cnt = iwl_pcie_get_num_sections(fw, lmac_cnt + umac_cnt + 2);
- dram->fw = kzalloc_objs(*dram->fw, umac_cnt + lmac_cnt, GFP_KERNEL);
+ dram->fw = kzalloc_objs(*dram->fw, umac_cnt + lmac_cnt);
if (!dram->fw)
return -ENOMEM;
- dram->paging = kzalloc_objs(*dram->paging, paging_cnt, GFP_KERNEL);
+ dram->paging = kzalloc_objs(*dram->paging, paging_cnt);
if (!dram->paging)
return -ENOMEM;
diff --git a/drivers/net/wireless/intel/iwlwifi/pcie/gen1_2/trans.c b/drivers/net/wireless/intel/iwlwifi/pcie/gen1_2/trans.c
index ec88aefb0913..4560d92d76fe 100644
--- a/drivers/net/wireless/intel/iwlwifi/pcie/gen1_2/trans.c
+++ b/drivers/net/wireless/intel/iwlwifi/pcie/gen1_2/trans.c
@@ -2748,7 +2748,7 @@ static void *iwl_dbgfs_tx_queue_seq_start(struct seq_file *seq, loff_t *pos)
if (*pos >= priv->trans->mac_cfg->base->num_of_queues)
return NULL;
- state = kmalloc_obj(*state, GFP_KERNEL);
+ state = kmalloc_obj(*state);
if (!state)
return NULL;
state->pos = *pos;
diff --git a/drivers/net/wireless/intel/iwlwifi/pcie/gen1_2/tx-gen2.c b/drivers/net/wireless/intel/iwlwifi/pcie/gen1_2/tx-gen2.c
index f2752ab4c402..bda9f807321e 100644
--- a/drivers/net/wireless/intel/iwlwifi/pcie/gen1_2/tx-gen2.c
+++ b/drivers/net/wireless/intel/iwlwifi/pcie/gen1_2/tx-gen2.c
@@ -928,7 +928,7 @@ iwl_txq_dyn_alloc_dma(struct iwl_trans *trans, int size, unsigned int timeout)
if (WARN_ON(size > bc_tbl_entries))
return ERR_PTR(-EINVAL);
- txq = kzalloc_obj(*txq, GFP_KERNEL);
+ txq = kzalloc_obj(*txq);
if (!txq)
return ERR_PTR(-ENOMEM);
@@ -1152,7 +1152,7 @@ int iwl_txq_gen2_init(struct iwl_trans *trans, int txq_id, int queue_size)
/* alloc and init the tx queue */
if (!trans_pcie->txqs.txq[txq_id]) {
- queue = kzalloc_obj(*queue, GFP_KERNEL);
+ queue = kzalloc_obj(*queue);
if (!queue) {
IWL_ERR(trans, "Not enough memory for tx queue\n");
return -ENOMEM;
diff --git a/drivers/net/wireless/intel/iwlwifi/pcie/gen1_2/tx.c b/drivers/net/wireless/intel/iwlwifi/pcie/gen1_2/tx.c
index 0b817e5c5679..0de3f5de237e 100644
--- a/drivers/net/wireless/intel/iwlwifi/pcie/gen1_2/tx.c
+++ b/drivers/net/wireless/intel/iwlwifi/pcie/gen1_2/tx.c
@@ -750,7 +750,7 @@ int iwl_pcie_txq_alloc(struct iwl_trans *trans, struct iwl_txq *txq,
if (cmd_queue)
for (i = 0; i < slots_num; i++) {
txq->entries[i].cmd =
- kmalloc_obj(struct iwl_device_cmd, GFP_KERNEL);
+ kmalloc_obj(struct iwl_device_cmd);
if (!txq->entries[i].cmd)
goto error;
}
diff --git a/drivers/net/wireless/intersil/p54/eeprom.c b/drivers/net/wireless/intersil/p54/eeprom.c
index c338a7a7fc41..1c49aad5d5f8 100644
--- a/drivers/net/wireless/intersil/p54/eeprom.c
+++ b/drivers/net/wireless/intersil/p54/eeprom.c
@@ -154,7 +154,7 @@ static int p54_generate_band(struct ieee80211_hw *dev,
if ((!list->entries) || (!list->band_channel_num[band]))
return -EINVAL;
- tmp = kzalloc_obj(*tmp, GFP_KERNEL);
+ tmp = kzalloc_obj(*tmp);
if (!tmp)
goto err_out;
@@ -335,7 +335,7 @@ static int p54_generate_channel_lists(struct ieee80211_hw *dev)
max_channel_num = max_t(unsigned int, max_channel_num,
priv->curve_data->entries);
- list = kzalloc_obj(*list, GFP_KERNEL);
+ list = kzalloc_obj(*list);
if (!list) {
ret = -ENOMEM;
goto free;
diff --git a/drivers/net/wireless/marvell/libertas/cfg.c b/drivers/net/wireless/marvell/libertas/cfg.c
index 331b0b69ce62..98517888dba7 100644
--- a/drivers/net/wireless/marvell/libertas/cfg.c
+++ b/drivers/net/wireless/marvell/libertas/cfg.c
@@ -2094,7 +2094,7 @@ struct wireless_dev *lbs_cfg_alloc(struct device *dev)
int ret = 0;
struct wireless_dev *wdev;
- wdev = kzalloc_obj(struct wireless_dev, GFP_KERNEL);
+ wdev = kzalloc_obj(struct wireless_dev);
if (!wdev)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/net/wireless/marvell/libertas/debugfs.c b/drivers/net/wireless/marvell/libertas/debugfs.c
index d2dc9128dae2..9ebd69134940 100644
--- a/drivers/net/wireless/marvell/libertas/debugfs.c
+++ b/drivers/net/wireless/marvell/libertas/debugfs.c
@@ -232,7 +232,7 @@ static ssize_t lbs_threshold_read(uint16_t tlv_type, uint16_t event_mask,
if (!buf)
return -ENOMEM;
- subscribed = kzalloc_obj(*subscribed, GFP_KERNEL);
+ subscribed = kzalloc_obj(*subscribed);
if (!subscribed) {
ret = -ENOMEM;
goto out_page;
@@ -288,7 +288,7 @@ static ssize_t lbs_threshold_write(uint16_t tlv_type, uint16_t event_mask,
ret = -EINVAL;
goto out_page;
}
- events = kzalloc_obj(*events, GFP_KERNEL);
+ events = kzalloc_obj(*events);
if (!events) {
ret = -ENOMEM;
goto out_page;
diff --git a/drivers/net/wireless/marvell/libertas/if_sdio.c b/drivers/net/wireless/marvell/libertas/if_sdio.c
index b814cf9032ad..dd6756c1242e 100644
--- a/drivers/net/wireless/marvell/libertas/if_sdio.c
+++ b/drivers/net/wireless/marvell/libertas/if_sdio.c
@@ -1158,7 +1158,7 @@ static int if_sdio_probe(struct sdio_func *func,
return -ENODEV;
}
- card = kzalloc_obj(struct if_sdio_card, GFP_KERNEL);
+ card = kzalloc_obj(struct if_sdio_card);
if (!card)
return -ENOMEM;
diff --git a/drivers/net/wireless/marvell/libertas/if_spi.c b/drivers/net/wireless/marvell/libertas/if_spi.c
index a21f7bba13c5..b22d1e65f552 100644
--- a/drivers/net/wireless/marvell/libertas/if_spi.c
+++ b/drivers/net/wireless/marvell/libertas/if_spi.c
@@ -1113,7 +1113,7 @@ static int if_spi_probe(struct spi_device *spi)
}
/* Allocate card structure to represent this specific device */
- card = kzalloc_obj(struct if_spi_card, GFP_KERNEL);
+ card = kzalloc_obj(struct if_spi_card);
if (!card) {
err = -ENOMEM;
goto teardown;
diff --git a/drivers/net/wireless/marvell/libertas/if_usb.c b/drivers/net/wireless/marvell/libertas/if_usb.c
index e02756d7e87a..8a6bf1365cfa 100644
--- a/drivers/net/wireless/marvell/libertas/if_usb.c
+++ b/drivers/net/wireless/marvell/libertas/if_usb.c
@@ -203,7 +203,7 @@ static int if_usb_probe(struct usb_interface *intf,
udev = interface_to_usbdev(intf);
- cardp = kzalloc_obj(struct if_usb_card, GFP_KERNEL);
+ cardp = kzalloc_obj(struct if_usb_card);
if (!cardp)
goto error;
diff --git a/drivers/net/wireless/marvell/libertas/mesh.c b/drivers/net/wireless/marvell/libertas/mesh.c
index aa94b777da13..fced7485d015 100644
--- a/drivers/net/wireless/marvell/libertas/mesh.c
+++ b/drivers/net/wireless/marvell/libertas/mesh.c
@@ -983,7 +983,7 @@ static int lbs_add_mesh(struct lbs_private *priv)
int ret = 0;
/* Allocate a virtual mesh device */
- mesh_wdev = kzalloc_obj(struct wireless_dev, GFP_KERNEL);
+ mesh_wdev = kzalloc_obj(struct wireless_dev);
if (!mesh_wdev) {
lbs_deb_mesh("init mshX wireless device failed\n");
ret = -ENOMEM;
diff --git a/drivers/net/wireless/marvell/libertas_tf/if_usb.c b/drivers/net/wireless/marvell/libertas_tf/if_usb.c
index 44c609205422..f49151c18b79 100644
--- a/drivers/net/wireless/marvell/libertas_tf/if_usb.c
+++ b/drivers/net/wireless/marvell/libertas_tf/if_usb.c
@@ -154,7 +154,7 @@ static int if_usb_probe(struct usb_interface *intf,
lbtf_deb_enter(LBTF_DEB_USB);
udev = interface_to_usbdev(intf);
- cardp = kzalloc_obj(struct if_usb_card, GFP_KERNEL);
+ cardp = kzalloc_obj(struct if_usb_card);
if (!cardp)
goto error;
diff --git a/drivers/net/wireless/marvell/mwifiex/11n_rxreorder.c b/drivers/net/wireless/marvell/mwifiex/11n_rxreorder.c
index c00b385c0f58..610ec8302adf 100644
--- a/drivers/net/wireless/marvell/mwifiex/11n_rxreorder.c
+++ b/drivers/net/wireless/marvell/mwifiex/11n_rxreorder.c
@@ -344,7 +344,7 @@ mwifiex_11n_create_rx_reorder_tbl(struct mwifiex_private *priv, u8 *ta,
return;
}
/* if !tbl then create one */
- new_node = kzalloc_obj(struct mwifiex_rx_reorder_tbl, GFP_KERNEL);
+ new_node = kzalloc_obj(struct mwifiex_rx_reorder_tbl);
if (!new_node)
return;
diff --git a/drivers/net/wireless/marvell/mwifiex/cfg80211.c b/drivers/net/wireless/marvell/mwifiex/cfg80211.c
index f387b26b086b..63d9ccc5a81c 100644
--- a/drivers/net/wireless/marvell/mwifiex/cfg80211.c
+++ b/drivers/net/wireless/marvell/mwifiex/cfg80211.c
@@ -756,7 +756,7 @@ mwifiex_cfg80211_set_wiphy_params(struct wiphy *wiphy, int radio_idx,
return -EINVAL;
}
- bss_cfg = kzalloc_obj(*bss_cfg, GFP_KERNEL);
+ bss_cfg = kzalloc_obj(*bss_cfg);
if (!bss_cfg)
return -ENOMEM;
@@ -2073,7 +2073,7 @@ static int mwifiex_cfg80211_start_ap(struct wiphy *wiphy,
if (GET_BSS_ROLE(priv) != MWIFIEX_BSS_ROLE_UAP)
return -1;
- bss_cfg = kzalloc_obj(struct mwifiex_uap_bss_param, GFP_KERNEL);
+ bss_cfg = kzalloc_obj(struct mwifiex_uap_bss_param);
if (!bss_cfg)
return -ENOMEM;
@@ -2683,7 +2683,7 @@ mwifiex_cfg80211_scan(struct wiphy *wiphy,
if (!mwifiex_stop_bg_scan(priv))
cfg80211_sched_scan_stopped_locked(priv->wdev.wiphy, 0);
- user_scan_cfg = kzalloc_obj(*user_scan_cfg, GFP_KERNEL);
+ user_scan_cfg = kzalloc_obj(*user_scan_cfg);
if (!user_scan_cfg)
return -ENOMEM;
@@ -2787,7 +2787,7 @@ mwifiex_cfg80211_sched_scan_start(struct wiphy *wiphy,
request->n_channels, request->scan_plans->interval,
(int)request->ie_len);
- bgscan_cfg = kzalloc_obj(*bgscan_cfg, GFP_KERNEL);
+ bgscan_cfg = kzalloc_obj(*bgscan_cfg);
if (!bgscan_cfg)
return -ENOMEM;
@@ -3452,7 +3452,7 @@ static int mwifiex_set_mef_filter(struct mwifiex_private *priv,
if (wowlan->n_patterns || wowlan->magic_pkt)
num_entries++;
- mef_entry = kzalloc_objs(*mef_entry, num_entries, GFP_KERNEL);
+ mef_entry = kzalloc_objs(*mef_entry, num_entries);
if (!mef_entry)
return -ENOMEM;
@@ -3989,7 +3989,7 @@ mwifiex_cfg80211_uap_add_station(struct mwifiex_private *priv, const u8 *mac,
if (!ret) {
struct station_info *sinfo;
- sinfo = kzalloc_obj(*sinfo, GFP_KERNEL);
+ sinfo = kzalloc_obj(*sinfo);
if (!sinfo)
return -ENOMEM;
@@ -4161,7 +4161,7 @@ static int mwifiex_tm_cmd(struct wiphy *wiphy, struct wireless_dev *wdev,
if (!tb[MWIFIEX_TM_ATTR_DATA])
return -EINVAL;
- hostcmd = kzalloc_obj(*hostcmd, GFP_KERNEL);
+ hostcmd = kzalloc_obj(*hostcmd);
if (!hostcmd)
return -ENOMEM;
diff --git a/drivers/net/wireless/marvell/mwifiex/ie.c b/drivers/net/wireless/marvell/mwifiex/ie.c
index 55af5e9b5bee..6e4074bfc0c8 100644
--- a/drivers/net/wireless/marvell/mwifiex/ie.c
+++ b/drivers/net/wireless/marvell/mwifiex/ie.c
@@ -149,7 +149,7 @@ mwifiex_update_uap_custom_ie(struct mwifiex_private *priv,
u16 len;
int ret;
- ap_custom_ie = kzalloc_obj(*ap_custom_ie, GFP_KERNEL);
+ ap_custom_ie = kzalloc_obj(*ap_custom_ie);
if (!ap_custom_ie)
return -ENOMEM;
@@ -221,7 +221,7 @@ static int mwifiex_update_vs_ie(const u8 *ies, int ies_len,
vendor_ie = cfg80211_find_vendor_ie(oui, oui_type, ies, ies_len);
if (vendor_ie) {
if (!*ie_ptr) {
- *ie_ptr = kzalloc_obj(struct mwifiex_ie, GFP_KERNEL);
+ *ie_ptr = kzalloc_obj(struct mwifiex_ie);
if (!*ie_ptr)
return -ENOMEM;
ie = *ie_ptr;
@@ -325,7 +325,7 @@ static int mwifiex_uap_parse_tail_ies(struct mwifiex_private *priv,
if (!info->tail || !info->tail_len)
return 0;
- gen_ie = kzalloc_obj(*gen_ie, GFP_KERNEL);
+ gen_ie = kzalloc_obj(*gen_ie);
if (!gen_ie)
return -ENOMEM;
@@ -438,7 +438,7 @@ int mwifiex_del_mgmt_ies(struct mwifiex_private *priv)
int ret = 0;
if (priv->gen_idx != MWIFIEX_AUTO_IDX_MASK) {
- gen_ie = kmalloc_obj(*gen_ie, GFP_KERNEL);
+ gen_ie = kmalloc_obj(*gen_ie);
if (!gen_ie)
return -ENOMEM;
@@ -456,7 +456,7 @@ int mwifiex_del_mgmt_ies(struct mwifiex_private *priv)
}
if (priv->beacon_idx != MWIFIEX_AUTO_IDX_MASK) {
- beacon_ie = kmalloc_obj(struct mwifiex_ie, GFP_KERNEL);
+ beacon_ie = kmalloc_obj(struct mwifiex_ie);
if (!beacon_ie) {
ret = -ENOMEM;
goto done;
@@ -466,7 +466,7 @@ int mwifiex_del_mgmt_ies(struct mwifiex_private *priv)
beacon_ie->ie_length = 0;
}
if (priv->proberesp_idx != MWIFIEX_AUTO_IDX_MASK) {
- pr_ie = kmalloc_obj(struct mwifiex_ie, GFP_KERNEL);
+ pr_ie = kmalloc_obj(struct mwifiex_ie);
if (!pr_ie) {
ret = -ENOMEM;
goto done;
@@ -476,7 +476,7 @@ int mwifiex_del_mgmt_ies(struct mwifiex_private *priv)
pr_ie->ie_length = 0;
}
if (priv->assocresp_idx != MWIFIEX_AUTO_IDX_MASK) {
- ar_ie = kmalloc_obj(struct mwifiex_ie, GFP_KERNEL);
+ ar_ie = kmalloc_obj(struct mwifiex_ie);
if (!ar_ie) {
ret = -ENOMEM;
goto done;
diff --git a/drivers/net/wireless/marvell/mwifiex/init.c b/drivers/net/wireless/marvell/mwifiex/init.c
index 28ffcc780eab..5c9a46e64d23 100644
--- a/drivers/net/wireless/marvell/mwifiex/init.c
+++ b/drivers/net/wireless/marvell/mwifiex/init.c
@@ -25,7 +25,7 @@ static int mwifiex_add_bss_prio_tbl(struct mwifiex_private *priv)
struct mwifiex_bss_prio_node *bss_prio;
struct mwifiex_bss_prio_tbl *tbl = adapter->bss_prio_tbl;
- bss_prio = kzalloc_obj(struct mwifiex_bss_prio_node, GFP_KERNEL);
+ bss_prio = kzalloc_obj(struct mwifiex_bss_prio_node);
if (!bss_prio)
return -ENOMEM;
diff --git a/drivers/net/wireless/marvell/mwifiex/main.c b/drivers/net/wireless/marvell/mwifiex/main.c
index d4c62fad8099..a8eab6b1e63b 100644
--- a/drivers/net/wireless/marvell/mwifiex/main.c
+++ b/drivers/net/wireless/marvell/mwifiex/main.c
@@ -60,7 +60,7 @@ static int mwifiex_register(void *card, struct device *dev,
struct mwifiex_adapter *adapter;
int i;
- adapter = kzalloc_obj(struct mwifiex_adapter, GFP_KERNEL);
+ adapter = kzalloc_obj(struct mwifiex_adapter);
if (!adapter)
return -ENOMEM;
@@ -82,7 +82,7 @@ static int mwifiex_register(void *card, struct device *dev,
for (i = 0; i < MWIFIEX_MAX_BSS_NUM; i++) {
/* Allocate memory for private structure */
adapter->priv[i] =
- kzalloc_obj(struct mwifiex_private, GFP_KERNEL);
+ kzalloc_obj(struct mwifiex_private);
if (!adapter->priv[i])
goto error;
@@ -1180,7 +1180,7 @@ void mwifiex_drv_info_dump(struct mwifiex_adapter *adapter)
p += adapter->if_ops.reg_dump(adapter, p);
}
p += sprintf(p, "\n=== more debug information\n");
- debug_info = kzalloc_obj(*debug_info, GFP_KERNEL);
+ debug_info = kzalloc_obj(*debug_info);
if (debug_info) {
for (i = 0; i < adapter->priv_num; i++) {
if (!adapter->priv[i]->netdev)
@@ -1346,7 +1346,7 @@ void mwifiex_init_priv_params(struct mwifiex_private *priv,
if (GET_BSS_ROLE(priv) == MWIFIEX_BSS_ROLE_STA ||
GET_BSS_ROLE(priv) == MWIFIEX_BSS_ROLE_UAP) {
- priv->hist_data = kmalloc_obj(*priv->hist_data, GFP_KERNEL);
+ priv->hist_data = kmalloc_obj(*priv->hist_data);
if (priv->hist_data)
mwifiex_hist_data_reset(priv);
}
diff --git a/drivers/net/wireless/marvell/mwifiex/scan.c b/drivers/net/wireless/marvell/mwifiex/scan.c
index b4858c0002e0..ae9a63d8128d 100644
--- a/drivers/net/wireless/marvell/mwifiex/scan.c
+++ b/drivers/net/wireless/marvell/mwifiex/scan.c
@@ -1649,7 +1649,7 @@ static int mwifiex_save_hidden_ssid_channels(struct mwifiex_private *priv,
int chid;
/* Allocate and fill new bss descriptor */
- bss_desc = kzalloc_obj(*bss_desc, GFP_KERNEL);
+ bss_desc = kzalloc_obj(*bss_desc);
if (!bss_desc)
return -ENOMEM;
@@ -1692,7 +1692,7 @@ static int mwifiex_update_curr_bss_params(struct mwifiex_private *priv,
int ret;
/* Allocate and fill new bss descriptor */
- bss_desc = kzalloc_obj(struct mwifiex_bssdescriptor, GFP_KERNEL);
+ bss_desc = kzalloc_obj(struct mwifiex_bssdescriptor);
if (!bss_desc)
return -ENOMEM;
@@ -1931,7 +1931,7 @@ mwifiex_active_scan_req_for_passive_chan(struct mwifiex_private *priv)
mwifiex_dbg(adapter, INFO, "No BSS with hidden SSID found on DFS channels\n");
return 0;
}
- user_scan_cfg = kzalloc_obj(*user_scan_cfg, GFP_KERNEL);
+ user_scan_cfg = kzalloc_obj(*user_scan_cfg);
if (!user_scan_cfg)
return -ENOMEM;
@@ -2450,7 +2450,7 @@ int mwifiex_stop_bg_scan(struct mwifiex_private *priv)
return 0;
}
- bgscan_cfg = kzalloc_obj(*bgscan_cfg, GFP_KERNEL);
+ bgscan_cfg = kzalloc_obj(*bgscan_cfg);
if (!bgscan_cfg)
return -ENOMEM;
@@ -2777,7 +2777,7 @@ static int mwifiex_scan_specific_ssid(struct mwifiex_private *priv,
return -EBUSY;
}
- scan_cfg = kzalloc_obj(struct mwifiex_user_scan_cfg, GFP_KERNEL);
+ scan_cfg = kzalloc_obj(struct mwifiex_user_scan_cfg);
if (!scan_cfg)
return -ENOMEM;
diff --git a/drivers/net/wireless/marvell/mwifiex/sta_cmd.c b/drivers/net/wireless/marvell/mwifiex/sta_cmd.c
index b457ed6f18f5..70ce31d7c76e 100644
--- a/drivers/net/wireless/marvell/mwifiex/sta_cmd.c
+++ b/drivers/net/wireless/marvell/mwifiex/sta_cmd.c
@@ -1516,7 +1516,7 @@ int mwifiex_send_rgpower_table(struct mwifiex_private *priv, const u8 *data,
struct mwifiex_adapter *adapter = priv->adapter;
struct mwifiex_ds_misc_cmd *hostcmd __free(kfree) = NULL;
- hostcmd = kzalloc_obj(*hostcmd, GFP_KERNEL);
+ hostcmd = kzalloc_obj(*hostcmd);
if (!hostcmd)
return -ENOMEM;
diff --git a/drivers/net/wireless/marvell/mwifiex/sta_ioctl.c b/drivers/net/wireless/marvell/mwifiex/sta_ioctl.c
index 46476cb752dd..a6550548d3b4 100644
--- a/drivers/net/wireless/marvell/mwifiex/sta_ioctl.c
+++ b/drivers/net/wireless/marvell/mwifiex/sta_ioctl.c
@@ -330,7 +330,7 @@ int mwifiex_bss_start(struct mwifiex_private *priv, struct cfg80211_bss *bss,
return -EINVAL;
/* Allocate and fill new bss descriptor */
- bss_desc = kzalloc_obj(struct mwifiex_bssdescriptor, GFP_KERNEL);
+ bss_desc = kzalloc_obj(struct mwifiex_bssdescriptor);
if (!bss_desc)
return -ENOMEM;
diff --git a/drivers/net/wireless/marvell/mwifiex/uap_event.c b/drivers/net/wireless/marvell/mwifiex/uap_event.c
index 9abd011aa295..703104fd1fbe 100644
--- a/drivers/net/wireless/marvell/mwifiex/uap_event.c
+++ b/drivers/net/wireless/marvell/mwifiex/uap_event.c
@@ -105,7 +105,7 @@ int mwifiex_process_uap_event(struct mwifiex_private *priv)
switch (eventcause) {
case EVENT_UAP_STA_ASSOC:
- sinfo = kzalloc_obj(*sinfo, GFP_KERNEL);
+ sinfo = kzalloc_obj(*sinfo);
if (!sinfo)
return -ENOMEM;
diff --git a/drivers/net/wireless/marvell/mwl8k.c b/drivers/net/wireless/marvell/mwl8k.c
index c505c83f8abc..99321d180f34 100644
--- a/drivers/net/wireless/marvell/mwl8k.c
+++ b/drivers/net/wireless/marvell/mwl8k.c
@@ -1182,7 +1182,7 @@ static int mwl8k_rxq_init(struct ieee80211_hw *hw, int index)
return -ENOMEM;
}
- rxq->buf = kzalloc_objs(*rxq->buf, MWL8K_RX_DESCS, GFP_KERNEL);
+ rxq->buf = kzalloc_objs(*rxq->buf, MWL8K_RX_DESCS);
if (rxq->buf == NULL) {
dma_free_coherent(&priv->pdev->dev, size, rxq->rxd,
rxq->rxd_dma);
@@ -1478,7 +1478,7 @@ static int mwl8k_txq_init(struct ieee80211_hw *hw, int index)
return -ENOMEM;
}
- txq->skb = kzalloc_objs(*txq->skb, MWL8K_TX_DESCS, GFP_KERNEL);
+ txq->skb = kzalloc_objs(*txq->skb, MWL8K_TX_DESCS);
if (txq->skb == NULL) {
dma_free_coherent(&priv->pdev->dev, size, txq->txd,
txq->txd_dma);
@@ -2472,7 +2472,7 @@ static int mwl8k_cmd_get_hw_spec_sta(struct ieee80211_hw *hw)
int rc;
int i;
- cmd = kzalloc_obj(*cmd, GFP_KERNEL);
+ cmd = kzalloc_obj(*cmd);
if (cmd == NULL)
return -ENOMEM;
@@ -2537,7 +2537,7 @@ static int mwl8k_cmd_get_hw_spec_ap(struct ieee80211_hw *hw)
int rc, i;
u32 api_version;
- cmd = kzalloc_obj(*cmd, GFP_KERNEL);
+ cmd = kzalloc_obj(*cmd);
if (cmd == NULL)
return -ENOMEM;
@@ -2639,7 +2639,7 @@ static int mwl8k_cmd_set_hw_spec(struct ieee80211_hw *hw)
int rc;
int i;
- cmd = kzalloc_obj(*cmd, GFP_KERNEL);
+ cmd = kzalloc_obj(*cmd);
if (cmd == NULL)
return -ENOMEM;
@@ -2753,7 +2753,7 @@ static int mwl8k_cmd_get_stat(struct ieee80211_hw *hw,
struct mwl8k_cmd_get_stat *cmd;
int rc;
- cmd = kzalloc_obj(*cmd, GFP_KERNEL);
+ cmd = kzalloc_obj(*cmd);
if (cmd == NULL)
return -ENOMEM;
@@ -2796,7 +2796,7 @@ mwl8k_cmd_radio_control(struct ieee80211_hw *hw, bool enable, bool force)
if (enable == priv->radio_on && !force)
return 0;
- cmd = kzalloc_obj(*cmd, GFP_KERNEL);
+ cmd = kzalloc_obj(*cmd);
if (cmd == NULL)
return -ENOMEM;
@@ -2854,7 +2854,7 @@ static int mwl8k_cmd_rf_tx_power(struct ieee80211_hw *hw, int dBm)
struct mwl8k_cmd_rf_tx_power *cmd;
int rc;
- cmd = kzalloc_obj(*cmd, GFP_KERNEL);
+ cmd = kzalloc_obj(*cmd);
if (cmd == NULL)
return -ENOMEM;
@@ -2895,7 +2895,7 @@ static int mwl8k_cmd_tx_power(struct ieee80211_hw *hw,
int rc;
int i;
- cmd = kzalloc_obj(*cmd, GFP_KERNEL);
+ cmd = kzalloc_obj(*cmd);
if (cmd == NULL)
return -ENOMEM;
@@ -2948,7 +2948,7 @@ mwl8k_cmd_rf_antenna(struct ieee80211_hw *hw, int antenna, int mask)
struct mwl8k_cmd_rf_antenna *cmd;
int rc;
- cmd = kzalloc_obj(*cmd, GFP_KERNEL);
+ cmd = kzalloc_obj(*cmd);
if (cmd == NULL)
return -ENOMEM;
@@ -3066,7 +3066,7 @@ static int mwl8k_cmd_set_pre_scan(struct ieee80211_hw *hw)
struct mwl8k_cmd_set_pre_scan *cmd;
int rc;
- cmd = kzalloc_obj(*cmd, GFP_KERNEL);
+ cmd = kzalloc_obj(*cmd);
if (cmd == NULL)
return -ENOMEM;
@@ -3099,7 +3099,7 @@ mwl8k_cmd_bbp_reg_access(struct ieee80211_hw *hw,
struct mwl8k_cmd_bbp_reg_access *cmd;
int rc;
- cmd = kzalloc_obj(*cmd, GFP_KERNEL);
+ cmd = kzalloc_obj(*cmd);
if (cmd == NULL)
return -ENOMEM;
@@ -3135,7 +3135,7 @@ mwl8k_cmd_set_post_scan(struct ieee80211_hw *hw, const __u8 *mac)
struct mwl8k_cmd_set_post_scan *cmd;
int rc;
- cmd = kzalloc_obj(*cmd, GFP_KERNEL);
+ cmd = kzalloc_obj(*cmd);
if (cmd == NULL)
return -ENOMEM;
@@ -3228,7 +3228,7 @@ static int mwl8k_cmd_set_rf_channel(struct ieee80211_hw *hw,
struct mwl8k_priv *priv = hw->priv;
int rc;
- cmd = kzalloc_obj(*cmd, GFP_KERNEL);
+ cmd = kzalloc_obj(*cmd);
if (cmd == NULL)
return -ENOMEM;
@@ -3314,7 +3314,7 @@ mwl8k_cmd_set_aid(struct ieee80211_hw *hw,
u16 prot_mode;
int rc;
- cmd = kzalloc_obj(*cmd, GFP_KERNEL);
+ cmd = kzalloc_obj(*cmd);
if (cmd == NULL)
return -ENOMEM;
@@ -3368,7 +3368,7 @@ mwl8k_cmd_set_rate(struct ieee80211_hw *hw, struct ieee80211_vif *vif,
struct mwl8k_cmd_set_rate *cmd;
int rc;
- cmd = kzalloc_obj(*cmd, GFP_KERNEL);
+ cmd = kzalloc_obj(*cmd);
if (cmd == NULL)
return -ENOMEM;
@@ -3402,7 +3402,7 @@ static int mwl8k_cmd_finalize_join(struct ieee80211_hw *hw, void *frame,
int payload_len;
int rc;
- cmd = kzalloc_obj(*cmd, GFP_KERNEL);
+ cmd = kzalloc_obj(*cmd);
if (cmd == NULL)
return -ENOMEM;
@@ -3440,7 +3440,7 @@ mwl8k_cmd_set_rts_threshold(struct ieee80211_hw *hw, int radio_idx,
struct mwl8k_cmd_set_rts_threshold *cmd;
int rc;
- cmd = kzalloc_obj(*cmd, GFP_KERNEL);
+ cmd = kzalloc_obj(*cmd);
if (cmd == NULL)
return -ENOMEM;
@@ -3469,7 +3469,7 @@ static int mwl8k_cmd_set_slot(struct ieee80211_hw *hw, bool short_slot_time)
struct mwl8k_cmd_set_slot *cmd;
int rc;
- cmd = kzalloc_obj(*cmd, GFP_KERNEL);
+ cmd = kzalloc_obj(*cmd);
if (cmd == NULL)
return -ENOMEM;
@@ -3543,7 +3543,7 @@ mwl8k_cmd_set_edca_params(struct ieee80211_hw *hw, __u8 qnum,
struct mwl8k_cmd_set_edca_params *cmd;
int rc;
- cmd = kzalloc_obj(*cmd, GFP_KERNEL);
+ cmd = kzalloc_obj(*cmd);
if (cmd == NULL)
return -ENOMEM;
@@ -3583,7 +3583,7 @@ static int mwl8k_cmd_set_wmm_mode(struct ieee80211_hw *hw, bool enable)
struct mwl8k_cmd_set_wmm_mode *cmd;
int rc;
- cmd = kzalloc_obj(*cmd, GFP_KERNEL);
+ cmd = kzalloc_obj(*cmd);
if (cmd == NULL)
return -ENOMEM;
@@ -3615,7 +3615,7 @@ static int mwl8k_cmd_mimo_config(struct ieee80211_hw *hw, __u8 rx, __u8 tx)
struct mwl8k_cmd_mimo_config *cmd;
int rc;
- cmd = kzalloc_obj(*cmd, GFP_KERNEL);
+ cmd = kzalloc_obj(*cmd);
if (cmd == NULL)
return -ENOMEM;
@@ -3658,7 +3658,7 @@ static int mwl8k_cmd_use_fixed_rate_sta(struct ieee80211_hw *hw)
struct mwl8k_cmd_use_fixed_rate_sta *cmd;
int rc;
- cmd = kzalloc_obj(*cmd, GFP_KERNEL);
+ cmd = kzalloc_obj(*cmd);
if (cmd == NULL)
return -ENOMEM;
@@ -3698,7 +3698,7 @@ mwl8k_cmd_use_fixed_rate_ap(struct ieee80211_hw *hw, int mcast, int mgmt)
struct mwl8k_cmd_use_fixed_rate_ap *cmd;
int rc;
- cmd = kzalloc_obj(*cmd, GFP_KERNEL);
+ cmd = kzalloc_obj(*cmd);
if (cmd == NULL)
return -ENOMEM;
@@ -3727,7 +3727,7 @@ static int mwl8k_cmd_enable_sniffer(struct ieee80211_hw *hw, bool enable)
struct mwl8k_cmd_enable_sniffer *cmd;
int rc;
- cmd = kzalloc_obj(*cmd, GFP_KERNEL);
+ cmd = kzalloc_obj(*cmd);
if (cmd == NULL)
return -ENOMEM;
@@ -3782,7 +3782,7 @@ static int mwl8k_cmd_update_mac_addr(struct ieee80211_hw *hw,
mac_type = MWL8K_MAC_TYPE_SECONDARY_AP;
}
- cmd = kzalloc_obj(*cmd, GFP_KERNEL);
+ cmd = kzalloc_obj(*cmd);
if (cmd == NULL)
return -ENOMEM;
@@ -3837,7 +3837,7 @@ static int mwl8k_cmd_set_rateadapt_mode(struct ieee80211_hw *hw, __u16 mode)
struct mwl8k_cmd_set_rate_adapt_mode *cmd;
int rc;
- cmd = kzalloc_obj(*cmd, GFP_KERNEL);
+ cmd = kzalloc_obj(*cmd);
if (cmd == NULL)
return -ENOMEM;
@@ -3865,7 +3865,7 @@ static int mwl8k_cmd_get_watchdog_bitmap(struct ieee80211_hw *hw, u8 *bitmap)
struct mwl8k_cmd_get_watchdog_bitmap *cmd;
int rc;
- cmd = kzalloc_obj(*cmd, GFP_KERNEL);
+ cmd = kzalloc_obj(*cmd);
if (cmd == NULL)
return -ENOMEM;
@@ -3954,7 +3954,7 @@ static int mwl8k_cmd_bss_start(struct ieee80211_hw *hw,
if (!enable && !(priv->running_bsses & (1 << mwl8k_vif->macid)))
return 0;
- cmd = kzalloc_obj(*cmd, GFP_KERNEL);
+ cmd = kzalloc_obj(*cmd);
if (cmd == NULL)
return -ENOMEM;
@@ -4046,7 +4046,7 @@ mwl8k_check_ba(struct ieee80211_hw *hw, struct mwl8k_ampdu_stream *stream,
struct mwl8k_cmd_bastream *cmd;
int rc;
- cmd = kzalloc_obj(*cmd, GFP_KERNEL);
+ cmd = kzalloc_obj(*cmd);
if (cmd == NULL)
return -ENOMEM;
@@ -4078,7 +4078,7 @@ mwl8k_create_ba(struct ieee80211_hw *hw, struct mwl8k_ampdu_stream *stream,
struct mwl8k_cmd_bastream *cmd;
int rc;
- cmd = kzalloc_obj(*cmd, GFP_KERNEL);
+ cmd = kzalloc_obj(*cmd);
if (cmd == NULL)
return -ENOMEM;
@@ -4121,7 +4121,7 @@ static void mwl8k_destroy_ba(struct ieee80211_hw *hw,
{
struct mwl8k_cmd_bastream *cmd;
- cmd = kzalloc_obj(*cmd, GFP_KERNEL);
+ cmd = kzalloc_obj(*cmd);
if (cmd == NULL)
return;
@@ -4173,7 +4173,7 @@ static int mwl8k_cmd_set_new_stn_add(struct ieee80211_hw *hw,
u32 rates;
int rc;
- cmd = kzalloc_obj(*cmd, GFP_KERNEL);
+ cmd = kzalloc_obj(*cmd);
if (cmd == NULL)
return -ENOMEM;
@@ -4211,7 +4211,7 @@ static int mwl8k_cmd_set_new_stn_add_self(struct ieee80211_hw *hw,
struct mwl8k_cmd_set_new_stn *cmd;
int rc;
- cmd = kzalloc_obj(*cmd, GFP_KERNEL);
+ cmd = kzalloc_obj(*cmd);
if (cmd == NULL)
return -ENOMEM;
@@ -4254,7 +4254,7 @@ static int mwl8k_cmd_set_new_stn_del(struct ieee80211_hw *hw,
spin_unlock(&priv->stream_lock);
- cmd = kzalloc_obj(*cmd, GFP_KERNEL);
+ cmd = kzalloc_obj(*cmd);
if (cmd == NULL)
return -ENOMEM;
@@ -4341,7 +4341,7 @@ static int mwl8k_cmd_update_encryption_enable(struct ieee80211_hw *hw,
struct mwl8k_cmd_update_encryption *cmd;
int rc;
- cmd = kzalloc_obj(*cmd, GFP_KERNEL);
+ cmd = kzalloc_obj(*cmd);
if (cmd == NULL)
return -ENOMEM;
@@ -4410,7 +4410,7 @@ static int mwl8k_cmd_encryption_set_key(struct ieee80211_hw *hw,
u8 idx;
struct mwl8k_vif *mwl8k_vif = MWL8K_VIF(vif);
- cmd = kzalloc_obj(*cmd, GFP_KERNEL);
+ cmd = kzalloc_obj(*cmd);
if (cmd == NULL)
return -ENOMEM;
@@ -4467,7 +4467,7 @@ static int mwl8k_cmd_encryption_remove_key(struct ieee80211_hw *hw,
int rc;
struct mwl8k_vif *mwl8k_vif = MWL8K_VIF(vif);
- cmd = kzalloc_obj(*cmd, GFP_KERNEL);
+ cmd = kzalloc_obj(*cmd);
if (cmd == NULL)
return -ENOMEM;
@@ -4604,7 +4604,7 @@ static int mwl8k_cmd_update_stadb_add(struct ieee80211_hw *hw,
u32 rates;
int rc;
- cmd = kzalloc_obj(*cmd, GFP_KERNEL);
+ cmd = kzalloc_obj(*cmd);
if (cmd == NULL)
return -ENOMEM;
@@ -4643,7 +4643,7 @@ static int mwl8k_cmd_update_stadb_del(struct ieee80211_hw *hw,
struct mwl8k_cmd_update_stadb *cmd;
int rc;
- cmd = kzalloc_obj(*cmd, GFP_KERNEL);
+ cmd = kzalloc_obj(*cmd);
if (cmd == NULL)
return -ENOMEM;
diff --git a/drivers/net/wireless/mediatek/mt76/mt7996/main.c b/drivers/net/wireless/mediatek/mt76/mt7996/main.c
index fee1f5ae0496..f16135f0b7f9 100644
--- a/drivers/net/wireless/mediatek/mt76/mt7996/main.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7996/main.c
@@ -966,7 +966,7 @@ mt7996_mac_sta_init_link(struct mt7996_dev *dev,
mtxq->wcid = idx;
}
} else {
- msta_link = kzalloc_obj(*msta_link, GFP_KERNEL);
+ msta_link = kzalloc_obj(*msta_link);
if (!msta_link)
return -ENOMEM;
diff --git a/drivers/net/wireless/microchip/wilc1000/cfg80211.c b/drivers/net/wireless/microchip/wilc1000/cfg80211.c
index edd4e570fe9f..0abf519243f5 100644
--- a/drivers/net/wireless/microchip/wilc1000/cfg80211.c
+++ b/drivers/net/wireless/microchip/wilc1000/cfg80211.c
@@ -1178,7 +1178,7 @@ static int mgmt_tx(struct wiphy *wiphy,
if (!ieee80211_is_mgmt(mgmt->frame_control))
goto out;
- mgmt_tx = kmalloc_obj(*mgmt_tx, GFP_KERNEL);
+ mgmt_tx = kmalloc_obj(*mgmt_tx);
if (!mgmt_tx) {
ret = -ENOMEM;
goto out;
diff --git a/drivers/net/wireless/microchip/wilc1000/hif.c b/drivers/net/wireless/microchip/wilc1000/hif.c
index bbd1794acb27..f354b11cb919 100644
--- a/drivers/net/wireless/microchip/wilc1000/hif.c
+++ b/drivers/net/wireless/microchip/wilc1000/hif.c
@@ -387,7 +387,7 @@ wilc_parse_join_bss_param(struct cfg80211_bss *bss,
u64 ies_tsf;
int ret;
- param = kzalloc_obj(*param, GFP_KERNEL);
+ param = kzalloc_obj(*param);
if (!param)
return NULL;
@@ -1039,7 +1039,7 @@ int wilc_set_external_auth_param(struct wilc_vif *vif,
wid.id = WID_EXTERNAL_AUTH_PARAM;
wid.type = WID_BIN_DATA;
wid.size = sizeof(*param);
- param = kzalloc_obj(*param, GFP_KERNEL);
+ param = kzalloc_obj(*param);
if (!param)
return -EINVAL;
@@ -1516,7 +1516,7 @@ int wilc_init(struct net_device *dev, struct host_if_drv **hif_drv_handler)
struct host_if_drv *hif_drv;
struct wilc_vif *vif = netdev_priv(dev);
- hif_drv = kzalloc_obj(*hif_drv, GFP_KERNEL);
+ hif_drv = kzalloc_obj(*hif_drv);
if (!hif_drv)
return -ENOMEM;
diff --git a/drivers/net/wireless/microchip/wilc1000/sdio.c b/drivers/net/wireless/microchip/wilc1000/sdio.c
index 64b1490b793d..67dea1360f0a 100644
--- a/drivers/net/wireless/microchip/wilc1000/sdio.c
+++ b/drivers/net/wireless/microchip/wilc1000/sdio.c
@@ -145,7 +145,7 @@ static int wilc_sdio_probe(struct sdio_func *func,
int ret;
- sdio_priv = kzalloc_obj(*sdio_priv, GFP_KERNEL);
+ sdio_priv = kzalloc_obj(*sdio_priv);
if (!sdio_priv)
return -ENOMEM;
diff --git a/drivers/net/wireless/microchip/wilc1000/spi.c b/drivers/net/wireless/microchip/wilc1000/spi.c
index cad1fcf2e14f..e40b829f719d 100644
--- a/drivers/net/wireless/microchip/wilc1000/spi.c
+++ b/drivers/net/wireless/microchip/wilc1000/spi.c
@@ -211,7 +211,7 @@ static int wilc_bus_probe(struct spi_device *spi)
struct wilc *wilc;
int ret;
- spi_priv = kzalloc_obj(*spi_priv, GFP_KERNEL);
+ spi_priv = kzalloc_obj(*spi_priv);
if (!spi_priv)
return -ENOMEM;
diff --git a/drivers/net/wireless/microchip/wilc1000/wlan.c b/drivers/net/wireless/microchip/wilc1000/wlan.c
index 15a2221892cd..3fa8592eb250 100644
--- a/drivers/net/wireless/microchip/wilc1000/wlan.c
+++ b/drivers/net/wireless/microchip/wilc1000/wlan.c
@@ -1209,7 +1209,7 @@ static void wilc_wlan_handle_isr_ext(struct wilc *wilc, u32 int_status)
offset += size;
wilc->rx_buffer_offset = offset;
- rqe = kmalloc_obj(*rqe, GFP_KERNEL);
+ rqe = kmalloc_obj(*rqe);
if (!rqe)
return;
diff --git a/drivers/net/wireless/microchip/wilc1000/wlan_cfg.c b/drivers/net/wireless/microchip/wilc1000/wlan_cfg.c
index 0163f0b17497..7664403c8d50 100644
--- a/drivers/net/wireless/microchip/wilc1000/wlan_cfg.c
+++ b/drivers/net/wireless/microchip/wilc1000/wlan_cfg.c
@@ -390,7 +390,7 @@ int wilc_wlan_cfg_init(struct wilc *wl)
if (!wl->cfg.s)
goto out_w;
- str_vals = kzalloc_obj(*str_vals, GFP_KERNEL);
+ str_vals = kzalloc_obj(*str_vals);
if (!str_vals)
goto out_s;
diff --git a/drivers/net/wireless/purelifi/plfxlc/usb.c b/drivers/net/wireless/purelifi/plfxlc/usb.c
index 09303aa6c1d7..5724ec173e64 100644
--- a/drivers/net/wireless/purelifi/plfxlc/usb.c
+++ b/drivers/net/wireless/purelifi/plfxlc/usb.c
@@ -204,7 +204,7 @@ static int __lf_x_usb_enable_rx(struct plfxlc_usb *usb)
int i, r;
r = -ENOMEM;
- urbs = kzalloc_objs(struct urb *, RX_URBS_COUNT, GFP_KERNEL);
+ urbs = kzalloc_objs(struct urb *, RX_URBS_COUNT);
if (!urbs)
goto error;
diff --git a/drivers/net/wireless/quantenna/qtnfmac/commands.c b/drivers/net/wireless/quantenna/qtnfmac/commands.c
index b1908fa90cfa..db2e2bbab1b1 100644
--- a/drivers/net/wireless/quantenna/qtnfmac/commands.c
+++ b/drivers/net/wireless/quantenna/qtnfmac/commands.c
@@ -981,7 +981,7 @@ qtnf_parse_wowlan_info(struct qtnf_wmac *mac,
const struct qlink_wowlan_support *data1;
struct wiphy_wowlan_support *supp;
- supp = kzalloc_obj(*supp, GFP_KERNEL);
+ supp = kzalloc_obj(*supp);
if (!supp)
return;
diff --git a/drivers/net/wireless/quantenna/qtnfmac/core.c b/drivers/net/wireless/quantenna/qtnfmac/core.c
index 4cab8dee332b..0c106709ae29 100644
--- a/drivers/net/wireless/quantenna/qtnfmac/core.c
+++ b/drivers/net/wireless/quantenna/qtnfmac/core.c
@@ -212,7 +212,7 @@ static int qtnf_mac_init_single_band(struct wiphy *wiphy,
{
int ret;
- wiphy->bands[band] = kzalloc_obj(*wiphy->bands[band], GFP_KERNEL);
+ wiphy->bands[band] = kzalloc_obj(*wiphy->bands[band]);
if (!wiphy->bands[band])
return -ENOMEM;
diff --git a/drivers/net/wireless/quantenna/qtnfmac/event.c b/drivers/net/wireless/quantenna/qtnfmac/event.c
index c16cd1e5286a..2551d74ed56e 100644
--- a/drivers/net/wireless/quantenna/qtnfmac/event.c
+++ b/drivers/net/wireless/quantenna/qtnfmac/event.c
@@ -41,7 +41,7 @@ qtnf_event_handle_sta_assoc(struct qtnf_wmac *mac, struct qtnf_vif *vif,
return -EPROTO;
}
- sinfo = kzalloc_obj(*sinfo, GFP_KERNEL);
+ sinfo = kzalloc_obj(*sinfo);
if (!sinfo)
return -ENOMEM;
diff --git a/drivers/net/wireless/quantenna/qtnfmac/util.c b/drivers/net/wireless/quantenna/qtnfmac/util.c
index 5c1a5a8f87a6..4ad66cc1804d 100644
--- a/drivers/net/wireless/quantenna/qtnfmac/util.c
+++ b/drivers/net/wireless/quantenna/qtnfmac/util.c
@@ -59,7 +59,7 @@ struct qtnf_sta_node *qtnf_sta_list_add(struct qtnf_vif *vif,
if (node)
goto done;
- node = kzalloc_obj(*node, GFP_KERNEL);
+ node = kzalloc_obj(*node);
if (unlikely(!node))
goto done;
diff --git a/drivers/net/wireless/ralink/rt2x00/rt2400pci.c b/drivers/net/wireless/ralink/rt2x00/rt2400pci.c
index f2b55db0b27b..cac191304bf5 100644
--- a/drivers/net/wireless/ralink/rt2x00/rt2400pci.c
+++ b/drivers/net/wireless/ralink/rt2x00/rt2400pci.c
@@ -1589,7 +1589,7 @@ static int rt2400pci_probe_hw_mode(struct rt2x00_dev *rt2x00dev)
/*
* Create channel information array
*/
- info = kzalloc_objs(*info, spec->num_channels, GFP_KERNEL);
+ info = kzalloc_objs(*info, spec->num_channels);
if (!info)
return -ENOMEM;
diff --git a/drivers/net/wireless/ralink/rt2x00/rt2500pci.c b/drivers/net/wireless/ralink/rt2x00/rt2500pci.c
index a6b26c5ef4cf..fc35b60e422c 100644
--- a/drivers/net/wireless/ralink/rt2x00/rt2500pci.c
+++ b/drivers/net/wireless/ralink/rt2x00/rt2500pci.c
@@ -1907,7 +1907,7 @@ static int rt2500pci_probe_hw_mode(struct rt2x00_dev *rt2x00dev)
/*
* Create channel information array
*/
- info = kzalloc_objs(*info, spec->num_channels, GFP_KERNEL);
+ info = kzalloc_objs(*info, spec->num_channels);
if (!info)
return -ENOMEM;
diff --git a/drivers/net/wireless/ralink/rt2x00/rt2500usb.c b/drivers/net/wireless/ralink/rt2x00/rt2500usb.c
index 50f1eeddf913..58728df6666c 100644
--- a/drivers/net/wireless/ralink/rt2x00/rt2500usb.c
+++ b/drivers/net/wireless/ralink/rt2x00/rt2500usb.c
@@ -1720,7 +1720,7 @@ static int rt2500usb_probe_hw_mode(struct rt2x00_dev *rt2x00dev)
/*
* Create channel information array
*/
- info = kzalloc_objs(*info, spec->num_channels, GFP_KERNEL);
+ info = kzalloc_objs(*info, spec->num_channels);
if (!info)
return -ENOMEM;
diff --git a/drivers/net/wireless/ralink/rt2x00/rt2800lib.c b/drivers/net/wireless/ralink/rt2x00/rt2800lib.c
index 6041f029857b..bf2c30d0f5ff 100644
--- a/drivers/net/wireless/ralink/rt2x00/rt2800lib.c
+++ b/drivers/net/wireless/ralink/rt2x00/rt2800lib.c
@@ -11907,7 +11907,7 @@ static int rt2800_probe_hw_mode(struct rt2x00_dev *rt2x00dev)
/*
* Create channel information and survey arrays
*/
- info = kzalloc_objs(*info, spec->num_channels, GFP_KERNEL);
+ info = kzalloc_objs(*info, spec->num_channels);
if (!info)
return -ENOMEM;
diff --git a/drivers/net/wireless/ralink/rt2x00/rt2800usb.c b/drivers/net/wireless/ralink/rt2x00/rt2800usb.c
index d1d94b0b0f31..15de3db12429 100644
--- a/drivers/net/wireless/ralink/rt2x00/rt2800usb.c
+++ b/drivers/net/wireless/ralink/rt2x00/rt2800usb.c
@@ -179,7 +179,7 @@ static int rt2800usb_autorun_detect(struct rt2x00_dev *rt2x00dev)
u32 fw_mode;
int ret;
- reg = kmalloc_obj(*reg, GFP_KERNEL);
+ reg = kmalloc_obj(*reg);
if (reg == NULL)
return -ENOMEM;
/* cannot use rt2x00usb_register_read here as it uses different
diff --git a/drivers/net/wireless/ralink/rt2x00/rt2x00debug.c b/drivers/net/wireless/ralink/rt2x00/rt2x00debug.c
index edececd89572..e0bca06c7094 100644
--- a/drivers/net/wireless/ralink/rt2x00/rt2x00debug.c
+++ b/drivers/net/wireless/ralink/rt2x00/rt2x00debug.c
@@ -639,7 +639,7 @@ void rt2x00debug_register(struct rt2x00_dev *rt2x00dev)
struct dentry *queue_folder;
struct dentry *register_folder;
- intf = kzalloc_obj(struct rt2x00debug_intf, GFP_KERNEL);
+ intf = kzalloc_obj(struct rt2x00debug_intf);
if (!intf) {
rt2x00_err(rt2x00dev, "Failed to allocate debug handler\n");
return;
diff --git a/drivers/net/wireless/ralink/rt2x00/rt2x00dev.c b/drivers/net/wireless/ralink/rt2x00/rt2x00dev.c
index dee01472747f..82fb230a73bb 100644
--- a/drivers/net/wireless/ralink/rt2x00/rt2x00dev.c
+++ b/drivers/net/wireless/ralink/rt2x00/rt2x00dev.c
@@ -1020,11 +1020,11 @@ static int rt2x00lib_probe_hw_modes(struct rt2x00_dev *rt2x00dev,
if (spec->supported_rates & SUPPORT_RATE_OFDM)
num_rates += 8;
- channels = kzalloc_objs(*channels, spec->num_channels, GFP_KERNEL);
+ channels = kzalloc_objs(*channels, spec->num_channels);
if (!channels)
return -ENOMEM;
- rates = kzalloc_objs(*rates, num_rates, GFP_KERNEL);
+ rates = kzalloc_objs(*rates, num_rates);
if (!rates)
goto exit_free_channels;
diff --git a/drivers/net/wireless/ralink/rt2x00/rt2x00queue.c b/drivers/net/wireless/ralink/rt2x00/rt2x00queue.c
index 8fb336834ced..4b842497653c 100644
--- a/drivers/net/wireless/ralink/rt2x00/rt2x00queue.c
+++ b/drivers/net/wireless/ralink/rt2x00/rt2x00queue.c
@@ -1244,7 +1244,7 @@ int rt2x00queue_allocate(struct rt2x00_dev *rt2x00dev)
*/
rt2x00dev->data_queues = 2 + rt2x00dev->ops->tx_queues + req_atim;
- queue = kzalloc_objs(*queue, rt2x00dev->data_queues, GFP_KERNEL);
+ queue = kzalloc_objs(*queue, rt2x00dev->data_queues);
if (!queue)
return -ENOMEM;
diff --git a/drivers/net/wireless/ralink/rt2x00/rt61pci.c b/drivers/net/wireless/ralink/rt2x00/rt61pci.c
index aea74b6b28e4..79e1fd0a1fbd 100644
--- a/drivers/net/wireless/ralink/rt2x00/rt61pci.c
+++ b/drivers/net/wireless/ralink/rt2x00/rt61pci.c
@@ -2712,7 +2712,7 @@ static int rt61pci_probe_hw_mode(struct rt2x00_dev *rt2x00dev)
/*
* Create channel information array
*/
- info = kzalloc_objs(*info, spec->num_channels, GFP_KERNEL);
+ info = kzalloc_objs(*info, spec->num_channels);
if (!info)
return -ENOMEM;
diff --git a/drivers/net/wireless/ralink/rt2x00/rt73usb.c b/drivers/net/wireless/ralink/rt2x00/rt73usb.c
index c47f4689ffdd..d6b7174d087a 100644
--- a/drivers/net/wireless/ralink/rt2x00/rt73usb.c
+++ b/drivers/net/wireless/ralink/rt2x00/rt73usb.c
@@ -2136,7 +2136,7 @@ static int rt73usb_probe_hw_mode(struct rt2x00_dev *rt2x00dev)
/*
* Create channel information array
*/
- info = kzalloc_objs(*info, spec->num_channels, GFP_KERNEL);
+ info = kzalloc_objs(*info, spec->num_channels);
if (!info)
return -ENOMEM;
diff --git a/drivers/net/wireless/realtek/rtl818x/rtl8187/dev.c b/drivers/net/wireless/realtek/rtl818x/rtl8187/dev.c
index 7a2a31af9a79..f7e0f6573180 100644
--- a/drivers/net/wireless/realtek/rtl818x/rtl8187/dev.c
+++ b/drivers/net/wireless/realtek/rtl818x/rtl8187/dev.c
@@ -1463,7 +1463,7 @@ static int rtl8187_probe(struct usb_interface *intf,
priv->is_rtl8187b = (id->driver_info == DEVICE_RTL8187B);
/* allocate "DMA aware" buffer for register accesses */
- priv->io_dmabuf = kmalloc_obj(*priv->io_dmabuf, GFP_KERNEL);
+ priv->io_dmabuf = kmalloc_obj(*priv->io_dmabuf);
if (!priv->io_dmabuf) {
err = -ENOMEM;
goto err_free_dev;
diff --git a/drivers/net/wireless/realtek/rtl8xxxu/core.c b/drivers/net/wireless/realtek/rtl8xxxu/core.c
index 721c95f13ec9..794187d28caa 100644
--- a/drivers/net/wireless/realtek/rtl8xxxu/core.c
+++ b/drivers/net/wireless/realtek/rtl8xxxu/core.c
@@ -7381,7 +7381,7 @@ static int rtl8xxxu_start(struct ieee80211_hw *hw)
}
for (i = 0; i < RTL8XXXU_TX_URBS; i++) {
- tx_urb = kmalloc_obj(struct rtl8xxxu_tx_urb, GFP_KERNEL);
+ tx_urb = kmalloc_obj(struct rtl8xxxu_tx_urb);
if (!tx_urb) {
if (!i)
ret = -ENOMEM;
@@ -7402,7 +7402,7 @@ static int rtl8xxxu_start(struct ieee80211_hw *hw)
spin_unlock_irqrestore(&priv->rx_urb_lock, flags);
for (i = 0; i < RTL8XXXU_RX_URBS; i++) {
- rx_urb = kmalloc_obj(struct rtl8xxxu_rx_urb, GFP_KERNEL);
+ rx_urb = kmalloc_obj(struct rtl8xxxu_rx_urb);
if (!rx_urb) {
if (!i)
ret = -ENOMEM;
diff --git a/drivers/net/wireless/realtek/rtlwifi/btcoexist/rtl_btc.c b/drivers/net/wireless/realtek/rtlwifi/btcoexist/rtl_btc.c
index 332f90e4d83f..bcd8bc270180 100644
--- a/drivers/net/wireless/realtek/rtlwifi/btcoexist/rtl_btc.c
+++ b/drivers/net/wireless/realtek/rtlwifi/btcoexist/rtl_btc.c
@@ -132,10 +132,10 @@ static void rtl_btc_alloc_variable(struct rtl_priv *rtlpriv, bool wifi_only)
{
if (wifi_only)
rtlpriv->btcoexist.wifi_only_context =
- kzalloc_obj(struct wifi_only_cfg, GFP_KERNEL);
+ kzalloc_obj(struct wifi_only_cfg);
else
rtlpriv->btcoexist.btc_context =
- kzalloc_obj(struct btc_coexist, GFP_KERNEL);
+ kzalloc_obj(struct btc_coexist);
}
static void rtl_btc_free_variable(struct rtl_priv *rtlpriv)
diff --git a/drivers/net/wireless/realtek/rtw88/fw.c b/drivers/net/wireless/realtek/rtw88/fw.c
index a3e5b0963cb7..48207052e3f8 100644
--- a/drivers/net/wireless/realtek/rtw88/fw.c
+++ b/drivers/net/wireless/realtek/rtw88/fw.c
@@ -1331,7 +1331,7 @@ static struct rtw_rsvd_page *rtw_alloc_rsvd_page(struct rtw_dev *rtwdev,
{
struct rtw_rsvd_page *rsvd_pkt = NULL;
- rsvd_pkt = kzalloc_obj(*rsvd_pkt, GFP_KERNEL);
+ rsvd_pkt = kzalloc_obj(*rsvd_pkt);
if (!rsvd_pkt)
return NULL;
diff --git a/drivers/net/wireless/realtek/rtw89/cam.c b/drivers/net/wireless/realtek/rtw89/cam.c
index 949f304216e2..7c62ece137d0 100644
--- a/drivers/net/wireless/realtek/rtw89/cam.c
+++ b/drivers/net/wireless/realtek/rtw89/cam.c
@@ -420,7 +420,7 @@ static int rtw89_cam_sec_key_install(struct rtw89_dev *rtwdev,
return ret;
}
- sec_cam = kzalloc_obj(*sec_cam, GFP_KERNEL);
+ sec_cam = kzalloc_obj(*sec_cam);
if (!sec_cam) {
ret = -ENOMEM;
goto err_release_cam;
diff --git a/drivers/net/wireless/realtek/rtw89/core.c b/drivers/net/wireless/realtek/rtw89/core.c
index 3295f76a0f1c..36e988277b2b 100644
--- a/drivers/net/wireless/realtek/rtw89/core.c
+++ b/drivers/net/wireless/realtek/rtw89/core.c
@@ -4220,7 +4220,7 @@ int rtw89_core_send_nullfunc(struct rtw89_dev *rtwdev, struct rtw89_vif_link *rt
if (vif->type != NL80211_IFTYPE_STATION || !vif->cfg.assoc)
return 0;
- wait = kzalloc_obj(*wait, GFP_KERNEL);
+ wait = kzalloc_obj(*wait);
if (!wait)
return -ENOMEM;
@@ -5657,7 +5657,7 @@ rtw89_wait_for_cond_prep(struct rtw89_wait_info *wait, unsigned int cond)
if (cur != RTW89_WAIT_COND_IDLE)
return ERR_PTR(-EPERM);
- prep = kzalloc_obj(*prep, GFP_KERNEL);
+ prep = kzalloc_obj(*prep);
if (!prep)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/net/wireless/realtek/rtw89/debug.c b/drivers/net/wireless/realtek/rtw89/debug.c
index fb89660ba70c..012ead92f5f2 100644
--- a/drivers/net/wireless/realtek/rtw89/debug.c
+++ b/drivers/net/wireless/realtek/rtw89/debug.c
@@ -3524,7 +3524,7 @@ rtw89_debug_priv_early_h2c_set(struct rtw89_dev *rtwdev,
goto out;
}
- early_h2c = kmalloc_obj(*early_h2c, GFP_KERNEL);
+ early_h2c = kmalloc_obj(*early_h2c);
if (!early_h2c) {
kfree(h2c);
return -EFAULT;
diff --git a/drivers/net/wireless/realtek/rtw89/fw.c b/drivers/net/wireless/realtek/rtw89/fw.c
index 97c58a2fa399..c52f9e11a8b2 100644
--- a/drivers/net/wireless/realtek/rtw89/fw.c
+++ b/drivers/net/wireless/realtek/rtw89/fw.c
@@ -1099,12 +1099,12 @@ int rtw89_build_phy_tbl_from_elm(struct rtw89_dev *rtwdev,
else if (*pp)
return 1; /* ignore if an element is existing */
- tbl = kzalloc_obj(*tbl, GFP_KERNEL);
+ tbl = kzalloc_obj(*tbl);
if (!tbl)
return -ENOMEM;
n_regs = le32_to_cpu(elm->size) / sizeof(tbl->regs[0]);
- regs = kzalloc_objs(*regs, n_regs, GFP_KERNEL);
+ regs = kzalloc_objs(*regs, n_regs);
if (!regs)
goto out;
@@ -1141,7 +1141,7 @@ int rtw89_fw_recognize_txpwr_from_elm(struct rtw89_dev *rtwdev,
struct rtw89_txpwr_conf *conf;
if (!rtwdev->rfe_data) {
- rtwdev->rfe_data = kzalloc_obj(*rtwdev->rfe_data, GFP_KERNEL);
+ rtwdev->rfe_data = kzalloc_obj(*rtwdev->rfe_data);
if (!rtwdev->rfe_data)
return -ENOMEM;
}
@@ -1201,7 +1201,7 @@ int rtw89_build_txpwr_trk_tbl_from_elm(struct rtw89_dev *rtwdev,
return -ENOENT;
}
- elm_info->txpwr_trk = kzalloc_obj(*elm_info->txpwr_trk, GFP_KERNEL);
+ elm_info->txpwr_trk = kzalloc_obj(*elm_info->txpwr_trk);
if (!elm_info->txpwr_trk)
return -ENOMEM;
@@ -1250,7 +1250,7 @@ int rtw89_build_rfk_log_fmt_from_elm(struct rtw89_dev *rtwdev,
if (elm_info->rfk_log_fmt)
goto allocated;
- elm_info->rfk_log_fmt = kzalloc_obj(*elm_info->rfk_log_fmt, GFP_KERNEL);
+ elm_info->rfk_log_fmt = kzalloc_obj(*elm_info->rfk_log_fmt);
if (!elm_info->rfk_log_fmt)
return 1; /* this is an optional element, so just ignore this */
@@ -2944,7 +2944,7 @@ static int rtw89_fw_h2c_add_general_pkt(struct rtw89_dev *rtwdev,
struct sk_buff *skb;
int ret;
- info = kzalloc_obj(*info, GFP_KERNEL);
+ info = kzalloc_obj(*info);
if (!info)
return -ENOMEM;
@@ -8138,7 +8138,7 @@ static int rtw89_append_probe_req_ie(struct rtw89_dev *rtwdev,
skb_put_data(new, ies->ies[band], ies->len[band]);
skb_put_data(new, ies->common_ies, ies->common_ie_len);
- info = kzalloc_obj(*info, GFP_KERNEL);
+ info = kzalloc_obj(*info);
if (!info) {
ret = -ENOMEM;
kfree_skb(new);
@@ -8234,7 +8234,7 @@ static int rtw89_update_6ghz_rnr_chan_ax(struct rtw89_dev *rtwdev,
hdr = (struct ieee80211_hdr *)skb->data;
ether_addr_copy(hdr->addr3, params->bssid);
- info = kzalloc_obj(*info, GFP_KERNEL);
+ info = kzalloc_obj(*info);
if (!info) {
ret = -ENOMEM;
kfree_skb(skb);
@@ -8527,7 +8527,7 @@ int rtw89_pno_scan_add_chan_list_ax(struct rtw89_dev *rtwdev,
idx < nd_config->n_channels && list_len < RTW89_SCAN_LIST_LIMIT_AX;
idx++, list_len++) {
channel = nd_config->channels[idx];
- ch_info = kzalloc_obj(*ch_info, GFP_KERNEL);
+ ch_info = kzalloc_obj(*ch_info);
if (!ch_info) {
ret = -ENOMEM;
goto out;
@@ -8567,7 +8567,7 @@ static int rtw89_hw_scan_add_op_types_ax(struct rtw89_dev *rtwdev,
{
struct rtw89_mac_chinfo_ax *tmp;
- tmp = kzalloc_obj(*tmp, GFP_KERNEL);
+ tmp = kzalloc_obj(*tmp);
if (!tmp)
return -ENOMEM;
@@ -8613,7 +8613,7 @@ int rtw89_hw_scan_prep_chan_list_ax(struct rtw89_dev *rtwdev,
for (idx = 0; idx < req->n_channels; idx++) {
channel = req->channels[idx];
- ch_info = kzalloc_obj(*ch_info, GFP_KERNEL);
+ ch_info = kzalloc_obj(*ch_info);
if (!ch_info) {
ret = -ENOMEM;
goto out;
@@ -8745,7 +8745,7 @@ int rtw89_pno_scan_add_chan_list_be(struct rtw89_dev *rtwdev,
idx < nd_config->n_channels && list_len < RTW89_SCAN_LIST_LIMIT_BE;
idx++, list_len++) {
channel = nd_config->channels[idx];
- ch_info = kzalloc_obj(*ch_info, GFP_KERNEL);
+ ch_info = kzalloc_obj(*ch_info);
if (!ch_info) {
ret = -ENOMEM;
goto out;
@@ -8807,7 +8807,7 @@ int rtw89_hw_scan_prep_chan_list_be(struct rtw89_dev *rtwdev,
!cfg80211_channel_is_psc(channel) && chan_by_rnr)
continue;
- ch_info = kzalloc_obj(*ch_info, GFP_KERNEL);
+ ch_info = kzalloc_obj(*ch_info);
if (!ch_info) {
ret = -ENOMEM;
goto out;
diff --git a/drivers/net/wireless/realtek/rtw89/mac80211.c b/drivers/net/wireless/realtek/rtw89/mac80211.c
index 594af3b7201b..0ea33743853e 100644
--- a/drivers/net/wireless/realtek/rtw89/mac80211.c
+++ b/drivers/net/wireless/realtek/rtw89/mac80211.c
@@ -1666,7 +1666,7 @@ int rtw89_ops_change_vif_links(struct ieee80211_hw *hw,
return -EOPNOTSUPP;
if (removing_links) {
- snap = kzalloc_obj(*snap, GFP_KERNEL);
+ snap = kzalloc_obj(*snap);
if (!snap)
return -ENOMEM;
diff --git a/drivers/net/wireless/realtek/rtw89/phy.c b/drivers/net/wireless/realtek/rtw89/phy.c
index eb2e2191408a..ee6ab2136b9a 100644
--- a/drivers/net/wireless/realtek/rtw89/phy.c
+++ b/drivers/net/wireless/realtek/rtw89/phy.c
@@ -1975,7 +1975,7 @@ void rtw89_phy_init_rf_reg(struct rtw89_dev *rtwdev, bool noio)
struct rtw89_fw_h2c_rf_reg_info *rf_reg_info;
u8 path;
- rf_reg_info = kzalloc_obj(*rf_reg_info, GFP_KERNEL);
+ rf_reg_info = kzalloc_obj(*rf_reg_info);
if (!rf_reg_info)
return;
diff --git a/drivers/net/wireless/realtek/rtw89/sar.c b/drivers/net/wireless/realtek/rtw89/sar.c
index 994ebbd8d267..7886ffaf5695 100644
--- a/drivers/net/wireless/realtek/rtw89/sar.c
+++ b/drivers/net/wireless/realtek/rtw89/sar.c
@@ -501,7 +501,7 @@ static void rtw89_set_sar_from_acpi(struct rtw89_dev *rtwdev)
struct rtw89_sar_cfg_acpi *cfg;
int ret;
- cfg = kzalloc_obj(*cfg, GFP_KERNEL);
+ cfg = kzalloc_obj(*cfg);
if (!cfg)
return;
diff --git a/drivers/net/wireless/realtek/rtw89/wow.c b/drivers/net/wireless/realtek/rtw89/wow.c
index 6954ca8f0b35..368e08826f1e 100644
--- a/drivers/net/wireless/realtek/rtw89/wow.c
+++ b/drivers/net/wireless/realtek/rtw89/wow.c
@@ -1490,7 +1490,7 @@ static int rtw89_pno_scan_update_probe_req(struct rtw89_dev *rtwdev,
skb_put_data(skb, basic_rate_ie, sizeof(basic_rate_ie));
skb_put_data(skb, nd_config->ie, nd_config->ie_len);
- info = kzalloc_obj(*info, GFP_KERNEL);
+ info = kzalloc_obj(*info);
if (!info) {
kfree_skb(skb);
rtw89_fw_release_pno_pkt_list(rtwdev, rtwvif_link);
diff --git a/drivers/net/wireless/rsi/rsi_91x_coex.c b/drivers/net/wireless/rsi/rsi_91x_coex.c
index 5bc8c30f2721..ee603a5173fb 100644
--- a/drivers/net/wireless/rsi/rsi_91x_coex.c
+++ b/drivers/net/wireless/rsi/rsi_91x_coex.c
@@ -140,7 +140,7 @@ int rsi_coex_attach(struct rsi_common *common)
struct rsi_coex_ctrl_block *coex_cb;
int cnt;
- coex_cb = kzalloc_obj(*coex_cb, GFP_KERNEL);
+ coex_cb = kzalloc_obj(*coex_cb);
if (!coex_cb)
return -ENOMEM;
diff --git a/drivers/net/wireless/rsi/rsi_91x_debugfs.c b/drivers/net/wireless/rsi/rsi_91x_debugfs.c
index ea1766b967ee..34836a200620 100644
--- a/drivers/net/wireless/rsi/rsi_91x_debugfs.c
+++ b/drivers/net/wireless/rsi/rsi_91x_debugfs.c
@@ -285,7 +285,7 @@ int rsi_init_dbgfs(struct rsi_hw *adapter)
int ii;
const struct rsi_dbg_files *files;
- dev_dbgfs = kzalloc_obj(*dev_dbgfs, GFP_KERNEL);
+ dev_dbgfs = kzalloc_obj(*dev_dbgfs);
if (!dev_dbgfs)
return -ENOMEM;
diff --git a/drivers/net/wireless/rsi/rsi_91x_hal.c b/drivers/net/wireless/rsi/rsi_91x_hal.c
index 9e65db2f6460..a0c36144eb0b 100644
--- a/drivers/net/wireless/rsi/rsi_91x_hal.c
+++ b/drivers/net/wireless/rsi/rsi_91x_hal.c
@@ -647,7 +647,7 @@ static int bl_write_header(struct rsi_hw *adapter, u8 *flash_content,
u32 write_addr, write_len;
int status;
- bl_hdr = kzalloc_obj(*bl_hdr, GFP_KERNEL);
+ bl_hdr = kzalloc_obj(*bl_hdr);
if (!bl_hdr)
return -ENOMEM;
diff --git a/drivers/net/wireless/rsi/rsi_91x_main.c b/drivers/net/wireless/rsi/rsi_91x_main.c
index c936e40ac871..662e42d1e5e8 100644
--- a/drivers/net/wireless/rsi/rsi_91x_main.c
+++ b/drivers/net/wireless/rsi/rsi_91x_main.c
@@ -304,11 +304,11 @@ struct rsi_hw *rsi_91x_init(u16 oper_mode)
struct rsi_common *common = NULL;
u8 ii = 0;
- adapter = kzalloc_obj(*adapter, GFP_KERNEL);
+ adapter = kzalloc_obj(*adapter);
if (!adapter)
return NULL;
- adapter->priv = kzalloc_obj(*common, GFP_KERNEL);
+ adapter->priv = kzalloc_obj(*common);
if (adapter->priv == NULL) {
rsi_dbg(ERR_ZONE, "%s: Failed in allocation of memory\n",
__func__);
diff --git a/drivers/net/wireless/rsi/rsi_91x_sdio.c b/drivers/net/wireless/rsi/rsi_91x_sdio.c
index 51932a434d89..bfa386b820d8 100644
--- a/drivers/net/wireless/rsi/rsi_91x_sdio.c
+++ b/drivers/net/wireless/rsi/rsi_91x_sdio.c
@@ -828,7 +828,7 @@ static int rsi_init_sdio_interface(struct rsi_hw *adapter,
struct rsi_91x_sdiodev *rsi_91x_dev;
int status;
- rsi_91x_dev = kzalloc_obj(*rsi_91x_dev, GFP_KERNEL);
+ rsi_91x_dev = kzalloc_obj(*rsi_91x_dev);
if (!rsi_91x_dev)
return -ENOMEM;
diff --git a/drivers/net/wireless/rsi/rsi_91x_usb.c b/drivers/net/wireless/rsi/rsi_91x_usb.c
index b0238103c13b..d83204701e27 100644
--- a/drivers/net/wireless/rsi/rsi_91x_usb.c
+++ b/drivers/net/wireless/rsi/rsi_91x_usb.c
@@ -620,7 +620,7 @@ static int rsi_init_usb_interface(struct rsi_hw *adapter,
struct rsi_91x_usbdev *rsi_dev;
int status;
- rsi_dev = kzalloc_obj(*rsi_dev, GFP_KERNEL);
+ rsi_dev = kzalloc_obj(*rsi_dev);
if (!rsi_dev)
return -ENOMEM;
diff --git a/drivers/net/wireless/silabs/wfx/debug.c b/drivers/net/wireless/silabs/wfx/debug.c
index 6475a4a42afc..454ec59fdc50 100644
--- a/drivers/net/wireless/silabs/wfx/debug.c
+++ b/drivers/net/wireless/silabs/wfx/debug.c
@@ -291,7 +291,7 @@ static ssize_t wfx_send_hif_msg_read(struct file *file, char __user *user_buf,
static int wfx_send_hif_msg_open(struct inode *inode, struct file *file)
{
- struct dbgfs_hif_msg *context = kzalloc_obj(*context, GFP_KERNEL);
+ struct dbgfs_hif_msg *context = kzalloc_obj(*context);
if (!context)
return -ENOMEM;
diff --git a/drivers/net/wireless/st/cw1200/cw1200_sdio.c b/drivers/net/wireless/st/cw1200/cw1200_sdio.c
index b503112d3a3e..2b6afe221268 100644
--- a/drivers/net/wireless/st/cw1200/cw1200_sdio.c
+++ b/drivers/net/wireless/st/cw1200/cw1200_sdio.c
@@ -287,7 +287,7 @@ static int cw1200_sdio_probe(struct sdio_func *func,
if (func->num != 0x01)
return -ENODEV;
- self = kzalloc_obj(*self, GFP_KERNEL);
+ self = kzalloc_obj(*self);
if (!self) {
pr_err("Can't allocate SDIO hwbus_priv.\n");
return -ENOMEM;
diff --git a/drivers/net/wireless/st/cw1200/pm.c b/drivers/net/wireless/st/cw1200/pm.c
index ed2650b2a40b..120f0379f81d 100644
--- a/drivers/net/wireless/st/cw1200/pm.c
+++ b/drivers/net/wireless/st/cw1200/pm.c
@@ -207,7 +207,7 @@ int cw1200_wow_suspend(struct ieee80211_hw *hw, struct cfg80211_wowlan *wowlan)
wsm_set_ether_type_filter(priv, &cw1200_ether_type_filter_on.hdr);
/* Allocate state */
- state = kzalloc_obj(struct cw1200_suspend_state, GFP_KERNEL);
+ state = kzalloc_obj(struct cw1200_suspend_state);
if (!state)
goto revert3;
diff --git a/drivers/net/wireless/st/cw1200/queue.c b/drivers/net/wireless/st/cw1200/queue.c
index 717da9c2cad9..dc557ed80910 100644
--- a/drivers/net/wireless/st/cw1200/queue.c
+++ b/drivers/net/wireless/st/cw1200/queue.c
@@ -153,7 +153,7 @@ int cw1200_queue_stats_init(struct cw1200_queue_stats *stats,
spin_lock_init(&stats->lock);
init_waitqueue_head(&stats->wait_link_id_empty);
- stats->link_map_cache = kzalloc_objs(int, map_capacity, GFP_KERNEL);
+ stats->link_map_cache = kzalloc_objs(int, map_capacity);
if (!stats->link_map_cache)
return -ENOMEM;
diff --git a/drivers/net/wireless/st/cw1200/wsm.c b/drivers/net/wireless/st/cw1200/wsm.c
index 0b669b2f3ef4..d6529e5b73b2 100644
--- a/drivers/net/wireless/st/cw1200/wsm.c
+++ b/drivers/net/wireless/st/cw1200/wsm.c
@@ -922,7 +922,7 @@ static int wsm_event_indication(struct cw1200_common *priv, struct wsm_buf *buf)
return 0;
}
- event = kzalloc_obj(struct cw1200_wsm_event, GFP_KERNEL);
+ event = kzalloc_obj(struct cw1200_wsm_event);
if (!event)
return -ENOMEM;
diff --git a/drivers/net/wireless/ti/wl1251/acx.c b/drivers/net/wireless/ti/wl1251/acx.c
index b53ac17172c4..bff73be2e6e8 100644
--- a/drivers/net/wireless/ti/wl1251/acx.c
+++ b/drivers/net/wireless/ti/wl1251/acx.c
@@ -18,7 +18,7 @@ int wl1251_acx_frame_rates(struct wl1251 *wl, u8 ctrl_rate, u8 ctrl_mod,
wl1251_debug(DEBUG_ACX, "acx frame rates");
- rates = kzalloc_obj(*rates, GFP_KERNEL);
+ rates = kzalloc_obj(*rates);
if (!rates)
return -ENOMEM;
@@ -47,7 +47,7 @@ int wl1251_acx_station_id(struct wl1251 *wl)
wl1251_debug(DEBUG_ACX, "acx dot11_station_id");
- mac = kzalloc_obj(*mac, GFP_KERNEL);
+ mac = kzalloc_obj(*mac);
if (!mac)
return -ENOMEM;
@@ -67,7 +67,7 @@ int wl1251_acx_default_key(struct wl1251 *wl, u8 key_id)
wl1251_debug(DEBUG_ACX, "acx dot11_default_key (%d)", key_id);
- default_key = kzalloc_obj(*default_key, GFP_KERNEL);
+ default_key = kzalloc_obj(*default_key);
if (!default_key)
return -ENOMEM;
@@ -95,7 +95,7 @@ int wl1251_acx_wake_up_conditions(struct wl1251 *wl, u8 wake_up_event,
wl1251_debug(DEBUG_ACX, "acx wake up conditions");
- wake_up = kzalloc_obj(*wake_up, GFP_KERNEL);
+ wake_up = kzalloc_obj(*wake_up);
if (!wake_up)
return -ENOMEM;
@@ -121,7 +121,7 @@ int wl1251_acx_sleep_auth(struct wl1251 *wl, u8 sleep_auth)
wl1251_debug(DEBUG_ACX, "acx sleep auth");
- auth = kzalloc_obj(*auth, GFP_KERNEL);
+ auth = kzalloc_obj(*auth);
if (!auth)
return -ENOMEM;
@@ -140,7 +140,7 @@ int wl1251_acx_fw_version(struct wl1251 *wl, char *buf, size_t len)
wl1251_debug(DEBUG_ACX, "acx fw rev");
- rev = kzalloc_obj(*rev, GFP_KERNEL);
+ rev = kzalloc_obj(*rev);
if (!rev)
return -ENOMEM;
@@ -167,7 +167,7 @@ int wl1251_acx_tx_power(struct wl1251 *wl, int power)
if (power < 0 || power > 25)
return -EINVAL;
- acx = kzalloc_obj(*acx, GFP_KERNEL);
+ acx = kzalloc_obj(*acx);
if (!acx)
return -ENOMEM;
@@ -191,7 +191,7 @@ int wl1251_acx_feature_cfg(struct wl1251 *wl, u32 data_flow_options)
wl1251_debug(DEBUG_ACX, "acx feature cfg");
- feature = kzalloc_obj(*feature, GFP_KERNEL);
+ feature = kzalloc_obj(*feature);
if (!feature)
return -ENOMEM;
@@ -233,7 +233,7 @@ int wl1251_acx_data_path_params(struct wl1251 *wl,
wl1251_debug(DEBUG_ACX, "acx data path params");
- params = kzalloc_obj(*params, GFP_KERNEL);
+ params = kzalloc_obj(*params);
if (!params)
return -ENOMEM;
@@ -279,7 +279,7 @@ int wl1251_acx_rx_msdu_life_time(struct wl1251 *wl, u32 life_time)
wl1251_debug(DEBUG_ACX, "acx rx msdu life time");
- acx = kzalloc_obj(*acx, GFP_KERNEL);
+ acx = kzalloc_obj(*acx);
if (!acx)
return -ENOMEM;
@@ -303,7 +303,7 @@ int wl1251_acx_rx_config(struct wl1251 *wl, u32 config, u32 filter)
wl1251_debug(DEBUG_ACX, "acx rx config");
- rx_config = kzalloc_obj(*rx_config, GFP_KERNEL);
+ rx_config = kzalloc_obj(*rx_config);
if (!rx_config)
return -ENOMEM;
@@ -329,7 +329,7 @@ int wl1251_acx_pd_threshold(struct wl1251 *wl)
wl1251_debug(DEBUG_ACX, "acx data pd threshold");
- pd = kzalloc_obj(*pd, GFP_KERNEL);
+ pd = kzalloc_obj(*pd);
if (!pd)
return -ENOMEM;
@@ -353,7 +353,7 @@ int wl1251_acx_slot(struct wl1251 *wl, enum acx_slot_type slot_time)
wl1251_debug(DEBUG_ACX, "acx slot");
- slot = kzalloc_obj(*slot, GFP_KERNEL);
+ slot = kzalloc_obj(*slot);
if (!slot)
return -ENOMEM;
@@ -379,7 +379,7 @@ int wl1251_acx_group_address_tbl(struct wl1251 *wl, bool enable,
wl1251_debug(DEBUG_ACX, "acx group address tbl");
- acx = kzalloc_obj(*acx, GFP_KERNEL);
+ acx = kzalloc_obj(*acx);
if (!acx)
return -ENOMEM;
@@ -405,7 +405,7 @@ int wl1251_acx_service_period_timeout(struct wl1251 *wl)
struct acx_rx_timeout *rx_timeout;
int ret;
- rx_timeout = kzalloc_obj(*rx_timeout, GFP_KERNEL);
+ rx_timeout = kzalloc_obj(*rx_timeout);
if (!rx_timeout)
return -ENOMEM;
@@ -434,7 +434,7 @@ int wl1251_acx_rts_threshold(struct wl1251 *wl, u16 rts_threshold)
wl1251_debug(DEBUG_ACX, "acx rts threshold");
- rts = kzalloc_obj(*rts, GFP_KERNEL);
+ rts = kzalloc_obj(*rts);
if (!rts)
return -ENOMEM;
@@ -458,7 +458,7 @@ int wl1251_acx_beacon_filter_opt(struct wl1251 *wl, bool enable_filter)
wl1251_debug(DEBUG_ACX, "acx beacon filter opt");
- beacon_filter = kzalloc_obj(*beacon_filter, GFP_KERNEL);
+ beacon_filter = kzalloc_obj(*beacon_filter);
if (!beacon_filter)
return -ENOMEM;
@@ -485,7 +485,7 @@ int wl1251_acx_beacon_filter_table(struct wl1251 *wl)
wl1251_debug(DEBUG_ACX, "acx beacon filter table");
- ie_table = kzalloc_obj(*ie_table, GFP_KERNEL);
+ ie_table = kzalloc_obj(*ie_table);
if (!ie_table)
return -ENOMEM;
@@ -513,7 +513,7 @@ int wl1251_acx_conn_monit_params(struct wl1251 *wl)
wl1251_debug(DEBUG_ACX, "acx connection monitor parameters");
- acx = kzalloc_obj(*acx, GFP_KERNEL);
+ acx = kzalloc_obj(*acx);
if (!acx)
return -ENOMEM;
@@ -540,7 +540,7 @@ int wl1251_acx_sg_enable(struct wl1251 *wl)
wl1251_debug(DEBUG_ACX, "acx sg enable");
- pta = kzalloc_obj(*pta, GFP_KERNEL);
+ pta = kzalloc_obj(*pta);
if (!pta)
return -ENOMEM;
@@ -564,7 +564,7 @@ int wl1251_acx_sg_cfg(struct wl1251 *wl)
wl1251_debug(DEBUG_ACX, "acx sg cfg");
- param = kzalloc_obj(*param, GFP_KERNEL);
+ param = kzalloc_obj(*param);
if (!param)
return -ENOMEM;
@@ -616,7 +616,7 @@ int wl1251_acx_cca_threshold(struct wl1251 *wl)
wl1251_debug(DEBUG_ACX, "acx cca threshold");
- detection = kzalloc_obj(*detection, GFP_KERNEL);
+ detection = kzalloc_obj(*detection);
if (!detection)
return -ENOMEM;
@@ -639,7 +639,7 @@ int wl1251_acx_bcn_dtim_options(struct wl1251 *wl)
wl1251_debug(DEBUG_ACX, "acx bcn dtim options");
- bb = kzalloc_obj(*bb, GFP_KERNEL);
+ bb = kzalloc_obj(*bb);
if (!bb)
return -ENOMEM;
@@ -666,7 +666,7 @@ int wl1251_acx_aid(struct wl1251 *wl, u16 aid)
wl1251_debug(DEBUG_ACX, "acx aid");
- acx_aid = kzalloc_obj(*acx_aid, GFP_KERNEL);
+ acx_aid = kzalloc_obj(*acx_aid);
if (!acx_aid)
return -ENOMEM;
@@ -690,7 +690,7 @@ int wl1251_acx_event_mbox_mask(struct wl1251 *wl, u32 event_mask)
wl1251_debug(DEBUG_ACX, "acx event mbox mask");
- mask = kzalloc_obj(*mask, GFP_KERNEL);
+ mask = kzalloc_obj(*mask);
if (!mask)
return -ENOMEM;
@@ -719,7 +719,7 @@ int wl1251_acx_low_rssi(struct wl1251 *wl, s8 threshold, u8 weight,
wl1251_debug(DEBUG_ACX, "acx low rssi");
- rssi = kzalloc_obj(*rssi, GFP_KERNEL);
+ rssi = kzalloc_obj(*rssi);
if (!rssi)
return -ENOMEM;
@@ -743,7 +743,7 @@ int wl1251_acx_set_preamble(struct wl1251 *wl, enum acx_preamble_type preamble)
wl1251_debug(DEBUG_ACX, "acx_set_preamble");
- acx = kzalloc_obj(*acx, GFP_KERNEL);
+ acx = kzalloc_obj(*acx);
if (!acx)
return -ENOMEM;
@@ -768,7 +768,7 @@ int wl1251_acx_cts_protect(struct wl1251 *wl,
wl1251_debug(DEBUG_ACX, "acx_set_ctsprotect");
- acx = kzalloc_obj(*acx, GFP_KERNEL);
+ acx = kzalloc_obj(*acx);
if (!acx)
return -ENOMEM;
@@ -790,7 +790,7 @@ int wl1251_acx_tsf_info(struct wl1251 *wl, u64 *mactime)
struct acx_tsf_info *tsf_info;
int ret;
- tsf_info = kzalloc_obj(*tsf_info, GFP_KERNEL);
+ tsf_info = kzalloc_obj(*tsf_info);
if (!tsf_info)
return -ENOMEM;
@@ -832,7 +832,7 @@ int wl1251_acx_mem_cfg(struct wl1251 *wl)
wl1251_debug(DEBUG_ACX, "acx mem cfg");
- mem_conf = kzalloc_obj(*mem_conf, GFP_KERNEL);
+ mem_conf = kzalloc_obj(*mem_conf);
if (!mem_conf)
return -ENOMEM;
@@ -877,7 +877,7 @@ int wl1251_acx_wr_tbtt_and_dtim(struct wl1251 *wl, u16 tbtt, u8 dtim)
wl1251_debug(DEBUG_ACX, "acx tbtt and dtim");
- acx = kzalloc_obj(*acx, GFP_KERNEL);
+ acx = kzalloc_obj(*acx);
if (!acx)
return -ENOMEM;
@@ -904,7 +904,7 @@ int wl1251_acx_bet_enable(struct wl1251 *wl, enum wl1251_acx_bet_mode mode,
wl1251_debug(DEBUG_ACX, "acx bet enable");
- acx = kzalloc_obj(*acx, GFP_KERNEL);
+ acx = kzalloc_obj(*acx);
if (!acx)
return -ENOMEM;
@@ -929,7 +929,7 @@ int wl1251_acx_arp_ip_filter(struct wl1251 *wl, bool enable, __be32 address)
wl1251_debug(DEBUG_ACX, "acx arp ip filter, enable: %d", enable);
- acx = kzalloc_obj(*acx, GFP_KERNEL);
+ acx = kzalloc_obj(*acx);
if (!acx)
return -ENOMEM;
@@ -957,7 +957,7 @@ int wl1251_acx_ac_cfg(struct wl1251 *wl, u8 ac, u8 cw_min, u16 cw_max,
wl1251_debug(DEBUG_ACX, "acx ac cfg %d cw_ming %d cw_max %d "
"aifs %d txop %d", ac, cw_min, cw_max, aifs, txop);
- acx = kzalloc_obj(*acx, GFP_KERNEL);
+ acx = kzalloc_obj(*acx);
if (!acx)
return -ENOMEM;
@@ -990,7 +990,7 @@ int wl1251_acx_tid_cfg(struct wl1251 *wl, u8 queue,
"ps_scheme %d ack_policy %d", queue, type, tsid,
ps_scheme, ack_policy);
- acx = kzalloc_obj(*acx, GFP_KERNEL);
+ acx = kzalloc_obj(*acx);
if (!acx)
return -ENOMEM;
diff --git a/drivers/net/wireless/ti/wl1251/cmd.c b/drivers/net/wireless/ti/wl1251/cmd.c
index 19eb8806651f..a726a809b54a 100644
--- a/drivers/net/wireless/ti/wl1251/cmd.c
+++ b/drivers/net/wireless/ti/wl1251/cmd.c
@@ -133,7 +133,7 @@ int wl1251_cmd_vbm(struct wl1251 *wl, u8 identity,
wl1251_debug(DEBUG_CMD, "cmd vbm");
- vbm = kzalloc_obj(*vbm, GFP_KERNEL);
+ vbm = kzalloc_obj(*vbm);
if (!vbm)
return -ENOMEM;
@@ -169,7 +169,7 @@ int wl1251_cmd_data_path_rx(struct wl1251 *wl, u8 channel, bool enable)
wl1251_debug(DEBUG_CMD, "cmd data path");
- cmd = kzalloc_obj(*cmd, GFP_KERNEL);
+ cmd = kzalloc_obj(*cmd);
if (!cmd)
return -ENOMEM;
@@ -203,7 +203,7 @@ int wl1251_cmd_data_path_tx(struct wl1251 *wl, u8 channel, bool enable)
wl1251_debug(DEBUG_CMD, "cmd data path");
- cmd = kzalloc_obj(*cmd, GFP_KERNEL);
+ cmd = kzalloc_obj(*cmd);
if (!cmd)
return -ENOMEM;
@@ -233,7 +233,7 @@ int wl1251_cmd_join(struct wl1251 *wl, u8 bss_type, u8 channel,
int ret, i;
u8 *bssid;
- join = kzalloc_obj(*join, GFP_KERNEL);
+ join = kzalloc_obj(*join);
if (!join)
return -ENOMEM;
@@ -276,7 +276,7 @@ int wl1251_cmd_ps_mode(struct wl1251 *wl, u8 ps_mode)
wl1251_debug(DEBUG_CMD, "cmd set ps mode");
- ps_params = kzalloc_obj(*ps_params, GFP_KERNEL);
+ ps_params = kzalloc_obj(*ps_params);
if (!ps_params)
return -ENOMEM;
@@ -342,7 +342,7 @@ int wl1251_cmd_scan(struct wl1251 *wl, u8 *ssid, size_t ssid_len,
WARN_ON(n_channels > SCAN_MAX_NUM_OF_CHANNELS);
- cmd = kzalloc_obj(*cmd, GFP_KERNEL);
+ cmd = kzalloc_obj(*cmd);
if (!cmd)
return -ENOMEM;
@@ -409,7 +409,7 @@ int wl1251_cmd_trigger_scan_to(struct wl1251 *wl, u32 timeout)
wl1251_debug(DEBUG_CMD, "cmd trigger scan to");
- cmd = kzalloc_obj(*cmd, GFP_KERNEL);
+ cmd = kzalloc_obj(*cmd);
if (!cmd)
return -ENOMEM;
diff --git a/drivers/net/wireless/ti/wl1251/debugfs.c b/drivers/net/wireless/ti/wl1251/debugfs.c
index a68d57555318..60ab923b75db 100644
--- a/drivers/net/wireless/ti/wl1251/debugfs.c
+++ b/drivers/net/wireless/ti/wl1251/debugfs.c
@@ -444,7 +444,7 @@ void wl1251_debugfs_reset(struct wl1251 *wl)
int wl1251_debugfs_init(struct wl1251 *wl)
{
- wl->stats.fw_stats = kzalloc_obj(*wl->stats.fw_stats, GFP_KERNEL);
+ wl->stats.fw_stats = kzalloc_obj(*wl->stats.fw_stats);
if (!wl->stats.fw_stats)
return -ENOMEM;
diff --git a/drivers/net/wireless/ti/wl1251/event.c b/drivers/net/wireless/ti/wl1251/event.c
index 6135d7c6d109..7575590446a3 100644
--- a/drivers/net/wireless/ti/wl1251/event.c
+++ b/drivers/net/wireless/ti/wl1251/event.c
@@ -208,7 +208,7 @@ int wl1251_event_handle(struct wl1251 *wl, u8 mbox_num)
if (mbox_num > 1)
return -EINVAL;
- mbox = kmalloc_obj(*mbox, GFP_KERNEL);
+ mbox = kmalloc_obj(*mbox);
if (!mbox) {
wl1251_error("can not allocate mbox buffer");
return -ENOMEM;
diff --git a/drivers/net/wireless/ti/wl1251/init.c b/drivers/net/wireless/ti/wl1251/init.c
index 0d7f08f0a41a..9134418ca3f2 100644
--- a/drivers/net/wireless/ti/wl1251/init.c
+++ b/drivers/net/wireless/ti/wl1251/init.c
@@ -194,7 +194,7 @@ int wl1251_hw_init_mem_config(struct wl1251 *wl)
if (ret < 0)
return ret;
- wl->target_mem_map = kzalloc_obj(struct wl1251_acx_mem_map, GFP_KERNEL);
+ wl->target_mem_map = kzalloc_obj(struct wl1251_acx_mem_map);
if (!wl->target_mem_map) {
wl1251_error("couldn't allocate target memory map");
return -ENOMEM;
@@ -260,7 +260,7 @@ static int wl1251_hw_init_tx_queue_config(struct wl1251 *wl)
wl1251_debug(DEBUG_ACX, "acx tx queue config");
- config = kzalloc_obj(*config, GFP_KERNEL);
+ config = kzalloc_obj(*config);
if (!config) {
ret = -ENOMEM;
goto out;
diff --git a/drivers/net/wireless/ti/wl1251/io.c b/drivers/net/wireless/ti/wl1251/io.c
index 84d497ebc7f2..6660b77f4ebb 100644
--- a/drivers/net/wireless/ti/wl1251/io.c
+++ b/drivers/net/wireless/ti/wl1251/io.c
@@ -123,7 +123,7 @@ void wl1251_set_partition(struct wl1251 *wl,
{
struct wl1251_partition_set *partition;
- partition = kmalloc_obj(*partition, GFP_KERNEL);
+ partition = kmalloc_obj(*partition);
if (!partition) {
wl1251_error("can not allocate partition buffer");
return;
diff --git a/drivers/net/wireless/ti/wl1251/main.c b/drivers/net/wireless/ti/wl1251/main.c
index 0a5ec19f8abc..0f3f22e729ce 100644
--- a/drivers/net/wireless/ti/wl1251/main.c
+++ b/drivers/net/wireless/ti/wl1251/main.c
@@ -878,7 +878,7 @@ static int wl1251_op_set_key(struct ieee80211_hw *hw, enum set_key_cmd cmd,
wl1251_debug(DEBUG_MAC80211, "mac80211 set key");
- wl_cmd = kzalloc_obj(*wl_cmd, GFP_KERNEL);
+ wl_cmd = kzalloc_obj(*wl_cmd);
if (!wl_cmd) {
ret = -ENOMEM;
goto out;
@@ -1640,7 +1640,7 @@ struct ieee80211_hw *wl1251_alloc_hw(void)
wl->tx_mgmt_frm_rate = DEFAULT_HW_GEN_TX_RATE;
wl->tx_mgmt_frm_mod = DEFAULT_HW_GEN_MODULATION_TYPE;
- wl->rx_descriptor = kmalloc_obj(*wl->rx_descriptor, GFP_KERNEL);
+ wl->rx_descriptor = kmalloc_obj(*wl->rx_descriptor);
if (!wl->rx_descriptor) {
wl1251_error("could not allocate memory for rx descriptor");
ieee80211_free_hw(hw);
diff --git a/drivers/net/wireless/ti/wl1251/sdio.c b/drivers/net/wireless/ti/wl1251/sdio.c
index 1ba35c9fb34b..8fdc7430c008 100644
--- a/drivers/net/wireless/ti/wl1251/sdio.c
+++ b/drivers/net/wireless/ti/wl1251/sdio.c
@@ -204,7 +204,7 @@ static int wl1251_sdio_probe(struct sdio_func *func,
wl = hw->priv;
- wl_sdio = kzalloc_obj(*wl_sdio, GFP_KERNEL);
+ wl_sdio = kzalloc_obj(*wl_sdio);
if (wl_sdio == NULL) {
ret = -ENOMEM;
goto out_free_hw;
diff --git a/drivers/net/wireless/ti/wl1251/tx.c b/drivers/net/wireless/ti/wl1251/tx.c
index acd4834d8a54..2da8c0d5105b 100644
--- a/drivers/net/wireless/ti/wl1251/tx.c
+++ b/drivers/net/wireless/ti/wl1251/tx.c
@@ -451,7 +451,7 @@ void wl1251_tx_complete(struct wl1251 *wl)
if (unlikely(wl->state != WL1251_STATE_ON))
return;
- result = kmalloc_objs(*result, FW_TX_CMPLT_BLOCK_SIZE, GFP_KERNEL);
+ result = kmalloc_objs(*result, FW_TX_CMPLT_BLOCK_SIZE);
if (!result) {
wl1251_error("can not allocate result buffer");
return;
diff --git a/drivers/net/wireless/ti/wl12xx/acx.c b/drivers/net/wireless/ti/wl12xx/acx.c
index 74e16f8c8b22..c669d19b122f 100644
--- a/drivers/net/wireless/ti/wl12xx/acx.c
+++ b/drivers/net/wireless/ti/wl12xx/acx.c
@@ -17,7 +17,7 @@ int wl1271_acx_host_if_cfg_bitmap(struct wl1271 *wl, u32 host_cfg_bitmap)
struct wl1271_acx_host_config_bitmap *bitmap_conf;
int ret;
- bitmap_conf = kzalloc_obj(*bitmap_conf, GFP_KERNEL);
+ bitmap_conf = kzalloc_obj(*bitmap_conf);
if (!bitmap_conf) {
ret = -ENOMEM;
goto out;
diff --git a/drivers/net/wireless/ti/wl12xx/cmd.c b/drivers/net/wireless/ti/wl12xx/cmd.c
index d57f420baa60..1a0755f3f37e 100644
--- a/drivers/net/wireless/ti/wl12xx/cmd.c
+++ b/drivers/net/wireless/ti/wl12xx/cmd.c
@@ -22,7 +22,7 @@ int wl1271_cmd_ext_radio_parms(struct wl1271 *wl)
if (!wl->nvs)
return -ENODEV;
- ext_radio_parms = kzalloc_obj(*ext_radio_parms, GFP_KERNEL);
+ ext_radio_parms = kzalloc_obj(*ext_radio_parms);
if (!ext_radio_parms)
return -ENOMEM;
@@ -63,7 +63,7 @@ int wl1271_cmd_general_parms(struct wl1271 *wl)
return -EINVAL;
}
- gen_parms = kzalloc_obj(*gen_parms, GFP_KERNEL);
+ gen_parms = kzalloc_obj(*gen_parms);
if (!gen_parms)
return -ENOMEM;
@@ -130,7 +130,7 @@ int wl128x_cmd_general_parms(struct wl1271 *wl)
return -EINVAL;
}
- gen_parms = kzalloc_obj(*gen_parms, GFP_KERNEL);
+ gen_parms = kzalloc_obj(*gen_parms);
if (!gen_parms)
return -ENOMEM;
@@ -191,7 +191,7 @@ int wl1271_cmd_radio_parms(struct wl1271 *wl)
if (!wl->nvs)
return -ENODEV;
- radio_parms = kzalloc_obj(*radio_parms, GFP_KERNEL);
+ radio_parms = kzalloc_obj(*radio_parms);
if (!radio_parms)
return -ENOMEM;
@@ -235,7 +235,7 @@ int wl128x_cmd_radio_parms(struct wl1271 *wl)
if (!wl->nvs)
return -ENODEV;
- radio_parms = kzalloc_obj(*radio_parms, GFP_KERNEL);
+ radio_parms = kzalloc_obj(*radio_parms);
if (!radio_parms)
return -ENOMEM;
@@ -280,7 +280,7 @@ int wl12xx_cmd_channel_switch(struct wl1271 *wl,
wl1271_debug(DEBUG_ACX, "cmd channel switch");
- cmd = kzalloc_obj(*cmd, GFP_KERNEL);
+ cmd = kzalloc_obj(*cmd);
if (!cmd) {
ret = -ENOMEM;
goto out;
diff --git a/drivers/net/wireless/ti/wl12xx/main.c b/drivers/net/wireless/ti/wl12xx/main.c
index f766845e2451..30a1da72eb08 100644
--- a/drivers/net/wireless/ti/wl12xx/main.c
+++ b/drivers/net/wireless/ti/wl12xx/main.c
@@ -1882,7 +1882,7 @@ static int wl12xx_setup(struct wl1271 *wl)
wl1271_error("Invalid tcxo parameter %s", tcxo_param);
}
- priv->rx_mem_addr = kmalloc_obj(*priv->rx_mem_addr, GFP_KERNEL);
+ priv->rx_mem_addr = kmalloc_obj(*priv->rx_mem_addr);
if (!priv->rx_mem_addr)
return -ENOMEM;
diff --git a/drivers/net/wireless/ti/wl12xx/scan.c b/drivers/net/wireless/ti/wl12xx/scan.c
index 021c547bbab8..ec2fb6ff8860 100644
--- a/drivers/net/wireless/ti/wl12xx/scan.c
+++ b/drivers/net/wireless/ti/wl12xx/scan.c
@@ -91,8 +91,8 @@ static int wl1271_scan_send(struct wl1271 *wl, struct wl12xx_vif *wlvif,
if (!passive && wl->scan.req->n_ssids == 0)
return WL1271_NOTHING_TO_SCAN;
- cmd = kzalloc_obj(*cmd, GFP_KERNEL);
- trigger = kzalloc_obj(*trigger, GFP_KERNEL);
+ cmd = kzalloc_obj(*cmd);
+ trigger = kzalloc_obj(*trigger);
if (!cmd || !trigger) {
ret = -ENOMEM;
goto out;
@@ -184,7 +184,7 @@ int wl12xx_scan_stop(struct wl1271 *wl, struct wl12xx_vif *wlvif)
wl1271_debug(DEBUG_CMD, "cmd scan stop");
- cmd = kzalloc_obj(*cmd, GFP_KERNEL);
+ cmd = kzalloc_obj(*cmd);
if (!cmd) {
ret = -ENOMEM;
goto out;
@@ -317,7 +317,7 @@ int wl1271_scan_sched_scan_config(struct wl1271 *wl,
wl1271_debug(DEBUG_CMD, "cmd sched_scan scan config");
- cfg = kzalloc_obj(*cfg, GFP_KERNEL);
+ cfg = kzalloc_obj(*cfg);
if (!cfg)
return -ENOMEM;
@@ -348,7 +348,7 @@ int wl1271_scan_sched_scan_config(struct wl1271 *wl,
wl1271_debug(DEBUG_SCAN, "filter_type = %d", cfg->filter_type);
- cfg_channels = kzalloc_obj(*cfg_channels, GFP_KERNEL);
+ cfg_channels = kzalloc_obj(*cfg_channels);
if (!cfg_channels) {
ret = -ENOMEM;
goto out;
@@ -425,7 +425,7 @@ int wl1271_scan_sched_scan_start(struct wl1271 *wl, struct wl12xx_vif *wlvif)
test_bit(WLVIF_FLAG_IN_USE, &wlvif->flags))
return -EBUSY;
- start = kzalloc_obj(*start, GFP_KERNEL);
+ start = kzalloc_obj(*start);
if (!start)
return -ENOMEM;
@@ -465,7 +465,7 @@ void wl12xx_scan_sched_scan_stop(struct wl1271 *wl, struct wl12xx_vif *wlvif)
wl1271_debug(DEBUG_CMD, "cmd periodic scan stop");
/* FIXME: what to do if alloc'ing to stop fails? */
- stop = kzalloc_obj(*stop, GFP_KERNEL);
+ stop = kzalloc_obj(*stop);
if (!stop) {
wl1271_error("failed to alloc memory to send sched scan stop");
return;
diff --git a/drivers/net/wireless/ti/wl18xx/acx.c b/drivers/net/wireless/ti/wl18xx/acx.c
index f29dd27814f5..07f3008cf727 100644
--- a/drivers/net/wireless/ti/wl18xx/acx.c
+++ b/drivers/net/wireless/ti/wl18xx/acx.c
@@ -23,7 +23,7 @@ int wl18xx_acx_host_if_cfg_bitmap(struct wl1271 *wl, u32 host_cfg_bitmap,
host_cfg_bitmap, sdio_blk_size, extra_mem_blks,
len_field_size);
- bitmap_conf = kzalloc_obj(*bitmap_conf, GFP_KERNEL);
+ bitmap_conf = kzalloc_obj(*bitmap_conf);
if (!bitmap_conf) {
ret = -ENOMEM;
goto out;
@@ -54,7 +54,7 @@ int wl18xx_acx_set_checksum_state(struct wl1271 *wl)
wl1271_debug(DEBUG_ACX, "acx checksum state");
- acx = kzalloc_obj(*acx, GFP_KERNEL);
+ acx = kzalloc_obj(*acx);
if (!acx) {
ret = -ENOMEM;
goto out;
@@ -80,7 +80,7 @@ int wl18xx_acx_clear_statistics(struct wl1271 *wl)
wl1271_debug(DEBUG_ACX, "acx clear statistics");
- acx = kzalloc_obj(*acx, GFP_KERNEL);
+ acx = kzalloc_obj(*acx);
if (!acx) {
ret = -ENOMEM;
goto out;
@@ -105,7 +105,7 @@ int wl18xx_acx_peer_ht_operation_mode(struct wl1271 *wl, u8 hlid, bool wide)
wl1271_debug(DEBUG_ACX, "acx peer ht operation mode hlid %d bw %d",
hlid, wide);
- acx = kzalloc_obj(*acx, GFP_KERNEL);
+ acx = kzalloc_obj(*acx);
if (!acx) {
ret = -ENOMEM;
goto out;
@@ -146,7 +146,7 @@ int wl18xx_acx_set_peer_cap(struct wl1271 *wl,
"acx set cap ht_supp: %d ht_cap: %d rates: 0x%x",
ht_cap->ht_supported, ht_cap->cap, rate_set);
- acx = kzalloc_obj(*acx, GFP_KERNEL);
+ acx = kzalloc_obj(*acx);
if (!acx) {
ret = -ENOMEM;
goto out;
@@ -192,7 +192,7 @@ int wl18xx_acx_interrupt_notify_config(struct wl1271 *wl,
struct wl18xx_acx_interrupt_notify *acx;
int ret = 0;
- acx = kzalloc_obj(*acx, GFP_KERNEL);
+ acx = kzalloc_obj(*acx);
if (!acx) {
ret = -ENOMEM;
goto out;
@@ -219,7 +219,7 @@ int wl18xx_acx_rx_ba_filter(struct wl1271 *wl, bool action)
struct wl18xx_acx_rx_ba_filter *acx;
int ret = 0;
- acx = kzalloc_obj(*acx, GFP_KERNEL);
+ acx = kzalloc_obj(*acx);
if (!acx) {
ret = -ENOMEM;
goto out;
@@ -247,7 +247,7 @@ int wl18xx_acx_ap_sleep(struct wl1271 *wl)
wl1271_debug(DEBUG_ACX, "acx config ap sleep");
- acx = kzalloc_obj(*acx, GFP_KERNEL);
+ acx = kzalloc_obj(*acx);
if (!acx) {
ret = -ENOMEM;
goto out;
@@ -277,7 +277,7 @@ int wl18xx_acx_dynamic_fw_traces(struct wl1271 *wl)
wl1271_debug(DEBUG_ACX, "acx dynamic fw traces config %d",
wl->dynamic_fw_traces);
- acx = kzalloc_obj(*acx, GFP_KERNEL);
+ acx = kzalloc_obj(*acx);
if (!acx) {
ret = -ENOMEM;
goto out;
@@ -305,7 +305,7 @@ int wl18xx_acx_time_sync_cfg(struct wl1271 *wl)
wl->conf.sg.params[WL18XX_CONF_SG_TIME_SYNC],
wl->zone_master_mac_addr);
- acx = kzalloc_obj(*acx, GFP_KERNEL);
+ acx = kzalloc_obj(*acx);
if (!acx) {
ret = -ENOMEM;
goto out;
diff --git a/drivers/net/wireless/ti/wl18xx/cmd.c b/drivers/net/wireless/ti/wl18xx/cmd.c
index 5a1dc648fd57..20fe6b8601fb 100644
--- a/drivers/net/wireless/ti/wl18xx/cmd.c
+++ b/drivers/net/wireless/ti/wl18xx/cmd.c
@@ -22,7 +22,7 @@ int wl18xx_cmd_channel_switch(struct wl1271 *wl,
wl1271_debug(DEBUG_ACX, "cmd channel switch (count=%d)",
ch_switch->count);
- cmd = kzalloc_obj(*cmd, GFP_KERNEL);
+ cmd = kzalloc_obj(*cmd);
if (!cmd) {
ret = -ENOMEM;
goto out;
@@ -78,7 +78,7 @@ int wl18xx_cmd_smart_config_start(struct wl1271 *wl, u32 group_bitmap)
wl1271_debug(DEBUG_CMD, "cmd smart config start group_bitmap=0x%x",
group_bitmap);
- cmd = kzalloc_obj(*cmd, GFP_KERNEL);
+ cmd = kzalloc_obj(*cmd);
if (!cmd) {
ret = -ENOMEM;
goto out;
@@ -105,7 +105,7 @@ int wl18xx_cmd_smart_config_stop(struct wl1271 *wl)
wl1271_debug(DEBUG_CMD, "cmd smart config stop");
- cmd = kzalloc_obj(*cmd, GFP_KERNEL);
+ cmd = kzalloc_obj(*cmd);
if (!cmd) {
ret = -ENOMEM;
goto out;
@@ -137,7 +137,7 @@ int wl18xx_cmd_smart_config_set_group_key(struct wl1271 *wl, u16 group_id,
return -E2BIG;
}
- cmd = kzalloc_obj(*cmd, GFP_KERNEL);
+ cmd = kzalloc_obj(*cmd);
if (!cmd) {
ret = -ENOMEM;
goto out;
@@ -167,7 +167,7 @@ int wl18xx_cmd_set_cac(struct wl1271 *wl, struct wl12xx_vif *wlvif, bool start)
wl1271_debug(DEBUG_CMD, "cmd cac (channel %d) %s",
wlvif->channel, start ? "start" : "stop");
- cmd = kzalloc_obj(*cmd, GFP_KERNEL);
+ cmd = kzalloc_obj(*cmd);
if (!cmd)
return -ENOMEM;
@@ -198,7 +198,7 @@ int wl18xx_cmd_radar_detection_debug(struct wl1271 *wl, u8 channel)
wl1271_debug(DEBUG_CMD, "cmd radar detection debug (chan %d)",
channel);
- cmd = kzalloc_obj(*cmd, GFP_KERNEL);
+ cmd = kzalloc_obj(*cmd);
if (!cmd)
return -ENOMEM;
@@ -224,7 +224,7 @@ int wl18xx_cmd_dfs_master_restart(struct wl1271 *wl, struct wl12xx_vif *wlvif)
wl1271_debug(DEBUG_CMD, "cmd dfs master restart (role %d)",
wlvif->role_id);
- cmd = kzalloc_obj(*cmd, GFP_KERNEL);
+ cmd = kzalloc_obj(*cmd);
if (!cmd)
return -ENOMEM;
diff --git a/drivers/net/wireless/ti/wl18xx/scan.c b/drivers/net/wireless/ti/wl18xx/scan.c
index 7e61403aa374..1f4896eb0434 100644
--- a/drivers/net/wireless/ti/wl18xx/scan.c
+++ b/drivers/net/wireless/ti/wl18xx/scan.c
@@ -31,7 +31,7 @@ static int wl18xx_scan_send(struct wl1271 *wl, struct wl12xx_vif *wlvif,
struct wlcore_scan_channels *cmd_channels = NULL;
int ret;
- cmd = kzalloc_obj(*cmd, GFP_KERNEL);
+ cmd = kzalloc_obj(*cmd);
if (!cmd) {
ret = -ENOMEM;
goto out;
@@ -67,7 +67,7 @@ static int wl18xx_scan_send(struct wl1271 *wl, struct wl12xx_vif *wlvif,
/* configure channels */
WARN_ON(req->n_ssids > 1);
- cmd_channels = kzalloc_obj(*cmd_channels, GFP_KERNEL);
+ cmd_channels = kzalloc_obj(*cmd_channels);
if (!cmd_channels) {
ret = -ENOMEM;
goto out;
@@ -169,7 +169,7 @@ int wl18xx_scan_sched_scan_config(struct wl1271 *wl,
if (filter_type < 0)
return filter_type;
- cmd = kzalloc_obj(*cmd, GFP_KERNEL);
+ cmd = kzalloc_obj(*cmd);
if (!cmd) {
ret = -ENOMEM;
goto out;
@@ -201,7 +201,7 @@ int wl18xx_scan_sched_scan_config(struct wl1271 *wl,
/* don't stop scanning automatically when something is found */
cmd->terminate_after = 0;
- cmd_channels = kzalloc_obj(*cmd_channels, GFP_KERNEL);
+ cmd_channels = kzalloc_obj(*cmd_channels);
if (!cmd_channels) {
ret = -ENOMEM;
goto out;
@@ -301,7 +301,7 @@ static int __wl18xx_scan_stop(struct wl1271 *wl, struct wl12xx_vif *wlvif,
wl1271_debug(DEBUG_CMD, "cmd periodic scan stop");
- stop = kzalloc_obj(*stop, GFP_KERNEL);
+ stop = kzalloc_obj(*stop);
if (!stop) {
wl1271_error("failed to alloc memory to send sched scan stop");
return -ENOMEM;
diff --git a/drivers/net/wireless/ti/wlcore/acx.c b/drivers/net/wireless/ti/wlcore/acx.c
index 65d1df37828d..9efa13638c45 100644
--- a/drivers/net/wireless/ti/wlcore/acx.c
+++ b/drivers/net/wireless/ti/wlcore/acx.c
@@ -28,7 +28,7 @@ int wl1271_acx_wake_up_conditions(struct wl1271 *wl, struct wl12xx_vif *wlvif,
wl1271_debug(DEBUG_ACX, "acx wake up conditions (wake_up_event %d listen_interval %d)",
wake_up_event, listen_interval);
- wake_up = kzalloc_obj(*wake_up, GFP_KERNEL);
+ wake_up = kzalloc_obj(*wake_up);
if (!wake_up) {
ret = -ENOMEM;
goto out;
@@ -57,7 +57,7 @@ int wl1271_acx_sleep_auth(struct wl1271 *wl, u8 sleep_auth)
wl1271_debug(DEBUG_ACX, "acx sleep auth %d", sleep_auth);
- auth = kzalloc_obj(*auth, GFP_KERNEL);
+ auth = kzalloc_obj(*auth);
if (!auth) {
ret = -ENOMEM;
goto out;
@@ -90,7 +90,7 @@ int wl1271_acx_tx_power(struct wl1271 *wl, struct wl12xx_vif *wlvif,
if (power < 0 || power > 25)
return -EINVAL;
- acx = kzalloc_obj(*acx, GFP_KERNEL);
+ acx = kzalloc_obj(*acx);
if (!acx) {
ret = -ENOMEM;
goto out;
@@ -117,7 +117,7 @@ int wl1271_acx_feature_cfg(struct wl1271 *wl, struct wl12xx_vif *wlvif)
wl1271_debug(DEBUG_ACX, "acx feature cfg");
- feature = kzalloc_obj(*feature, GFP_KERNEL);
+ feature = kzalloc_obj(*feature);
if (!feature) {
ret = -ENOMEM;
goto out;
@@ -162,7 +162,7 @@ int wl1271_acx_rx_msdu_life_time(struct wl1271 *wl)
wl1271_debug(DEBUG_ACX, "acx rx msdu life time");
- acx = kzalloc_obj(*acx, GFP_KERNEL);
+ acx = kzalloc_obj(*acx);
if (!acx) {
ret = -ENOMEM;
goto out;
@@ -189,7 +189,7 @@ int wl1271_acx_slot(struct wl1271 *wl, struct wl12xx_vif *wlvif,
wl1271_debug(DEBUG_ACX, "acx slot");
- slot = kzalloc_obj(*slot, GFP_KERNEL);
+ slot = kzalloc_obj(*slot);
if (!slot) {
ret = -ENOMEM;
goto out;
@@ -218,7 +218,7 @@ int wl1271_acx_group_address_tbl(struct wl1271 *wl, struct wl12xx_vif *wlvif,
wl1271_debug(DEBUG_ACX, "acx group address tbl");
- acx = kzalloc_obj(*acx, GFP_KERNEL);
+ acx = kzalloc_obj(*acx);
if (!acx) {
ret = -ENOMEM;
goto out;
@@ -248,7 +248,7 @@ int wl1271_acx_service_period_timeout(struct wl1271 *wl,
struct acx_rx_timeout *rx_timeout;
int ret;
- rx_timeout = kzalloc_obj(*rx_timeout, GFP_KERNEL);
+ rx_timeout = kzalloc_obj(*rx_timeout);
if (!rx_timeout) {
ret = -ENOMEM;
goto out;
@@ -288,7 +288,7 @@ int wl1271_acx_rts_threshold(struct wl1271 *wl, struct wl12xx_vif *wlvif,
wl1271_debug(DEBUG_ACX, "acx rts threshold: %d", rts_threshold);
- rts = kzalloc_obj(*rts, GFP_KERNEL);
+ rts = kzalloc_obj(*rts);
if (!rts) {
ret = -ENOMEM;
goto out;
@@ -316,7 +316,7 @@ int wl1271_acx_dco_itrim_params(struct wl1271 *wl)
wl1271_debug(DEBUG_ACX, "acx dco itrim parameters");
- dco = kzalloc_obj(*dco, GFP_KERNEL);
+ dco = kzalloc_obj(*dco);
if (!dco) {
ret = -ENOMEM;
goto out;
@@ -350,7 +350,7 @@ int wl1271_acx_beacon_filter_opt(struct wl1271 *wl, struct wl12xx_vif *wlvif,
wl->conf.conn.bcn_filt_mode == CONF_BCN_FILT_MODE_DISABLED)
goto out;
- beacon_filter = kzalloc_obj(*beacon_filter, GFP_KERNEL);
+ beacon_filter = kzalloc_obj(*beacon_filter);
if (!beacon_filter) {
ret = -ENOMEM;
goto out;
@@ -387,7 +387,7 @@ int wl1271_acx_beacon_filter_table(struct wl1271 *wl,
wl1271_debug(DEBUG_ACX, "acx beacon filter table");
- ie_table = kzalloc_obj(*ie_table, GFP_KERNEL);
+ ie_table = kzalloc_obj(*ie_table);
if (!ie_table) {
ret = -ENOMEM;
goto out;
@@ -446,7 +446,7 @@ int wl1271_acx_conn_monit_params(struct wl1271 *wl, struct wl12xx_vif *wlvif,
wl1271_debug(DEBUG_ACX, "acx connection monitor parameters: %s",
enable ? "enabled" : "disabled");
- acx = kzalloc_obj(*acx, GFP_KERNEL);
+ acx = kzalloc_obj(*acx);
if (!acx) {
ret = -ENOMEM;
goto out;
@@ -482,7 +482,7 @@ int wl1271_acx_sg_enable(struct wl1271 *wl, bool enable)
wl1271_debug(DEBUG_ACX, "acx sg enable");
- pta = kzalloc_obj(*pta, GFP_KERNEL);
+ pta = kzalloc_obj(*pta);
if (!pta) {
ret = -ENOMEM;
goto out;
@@ -512,7 +512,7 @@ int wl12xx_acx_sg_cfg(struct wl1271 *wl)
wl1271_debug(DEBUG_ACX, "acx sg cfg");
- param = kzalloc_obj(*param, GFP_KERNEL);
+ param = kzalloc_obj(*param);
if (!param) {
ret = -ENOMEM;
goto out;
@@ -541,7 +541,7 @@ int wl1271_acx_cca_threshold(struct wl1271 *wl)
wl1271_debug(DEBUG_ACX, "acx cca threshold");
- detection = kzalloc_obj(*detection, GFP_KERNEL);
+ detection = kzalloc_obj(*detection);
if (!detection) {
ret = -ENOMEM;
goto out;
@@ -567,7 +567,7 @@ int wl1271_acx_bcn_dtim_options(struct wl1271 *wl, struct wl12xx_vif *wlvif)
wl1271_debug(DEBUG_ACX, "acx bcn dtim options");
- bb = kzalloc_obj(*bb, GFP_KERNEL);
+ bb = kzalloc_obj(*bb);
if (!bb) {
ret = -ENOMEM;
goto out;
@@ -597,7 +597,7 @@ int wl1271_acx_aid(struct wl1271 *wl, struct wl12xx_vif *wlvif, u16 aid)
wl1271_debug(DEBUG_ACX, "acx aid");
- acx_aid = kzalloc_obj(*acx_aid, GFP_KERNEL);
+ acx_aid = kzalloc_obj(*acx_aid);
if (!acx_aid) {
ret = -ENOMEM;
goto out;
@@ -624,7 +624,7 @@ int wl1271_acx_event_mbox_mask(struct wl1271 *wl, u32 event_mask)
wl1271_debug(DEBUG_ACX, "acx event mbox mask");
- mask = kzalloc_obj(*mask, GFP_KERNEL);
+ mask = kzalloc_obj(*mask);
if (!mask) {
ret = -ENOMEM;
goto out;
@@ -654,7 +654,7 @@ int wl1271_acx_set_preamble(struct wl1271 *wl, struct wl12xx_vif *wlvif,
wl1271_debug(DEBUG_ACX, "acx_set_preamble");
- acx = kzalloc_obj(*acx, GFP_KERNEL);
+ acx = kzalloc_obj(*acx);
if (!acx) {
ret = -ENOMEM;
goto out;
@@ -682,7 +682,7 @@ int wl1271_acx_cts_protect(struct wl1271 *wl, struct wl12xx_vif *wlvif,
wl1271_debug(DEBUG_ACX, "acx_set_ctsprotect");
- acx = kzalloc_obj(*acx, GFP_KERNEL);
+ acx = kzalloc_obj(*acx);
if (!acx) {
ret = -ENOMEM;
goto out;
@@ -727,7 +727,7 @@ int wl1271_acx_sta_rate_policies(struct wl1271 *wl, struct wl12xx_vif *wlvif)
wl1271_debug(DEBUG_ACX, "acx rate policies");
- acx = kzalloc_obj(*acx, GFP_KERNEL);
+ acx = kzalloc_obj(*acx);
if (!acx) {
ret = -ENOMEM;
@@ -798,7 +798,7 @@ int wl1271_acx_ap_rate_policy(struct wl1271 *wl, struct conf_tx_rate_class *c,
wl1271_debug(DEBUG_ACX, "acx ap rate policy %d rates 0x%x",
idx, c->enabled_rates);
- acx = kzalloc_obj(*acx, GFP_KERNEL);
+ acx = kzalloc_obj(*acx);
if (!acx) {
ret = -ENOMEM;
goto out;
@@ -831,7 +831,7 @@ int wl1271_acx_ac_cfg(struct wl1271 *wl, struct wl12xx_vif *wlvif,
wl1271_debug(DEBUG_ACX, "acx ac cfg %d cw_ming %d cw_max %d "
"aifs %d txop %d", ac, cw_min, cw_max, aifsn, txop);
- acx = kzalloc_obj(*acx, GFP_KERNEL);
+ acx = kzalloc_obj(*acx);
if (!acx) {
ret = -ENOMEM;
@@ -866,7 +866,7 @@ int wl1271_acx_tid_cfg(struct wl1271 *wl, struct wl12xx_vif *wlvif,
wl1271_debug(DEBUG_ACX, "acx tid config");
- acx = kzalloc_obj(*acx, GFP_KERNEL);
+ acx = kzalloc_obj(*acx);
if (!acx) {
ret = -ENOMEM;
@@ -907,7 +907,7 @@ int wl1271_acx_frag_threshold(struct wl1271 *wl, u32 frag_threshold)
wl1271_debug(DEBUG_ACX, "acx frag threshold: %d", frag_threshold);
- acx = kzalloc_obj(*acx, GFP_KERNEL);
+ acx = kzalloc_obj(*acx);
if (!acx) {
ret = -ENOMEM;
@@ -933,7 +933,7 @@ int wl1271_acx_tx_config_options(struct wl1271 *wl)
wl1271_debug(DEBUG_ACX, "acx tx config options");
- acx = kzalloc_obj(*acx, GFP_KERNEL);
+ acx = kzalloc_obj(*acx);
if (!acx) {
ret = -ENOMEM;
@@ -961,7 +961,7 @@ int wl12xx_acx_mem_cfg(struct wl1271 *wl)
wl1271_debug(DEBUG_ACX, "wl1271 mem cfg");
- mem_conf = kzalloc_obj(*mem_conf, GFP_KERNEL);
+ mem_conf = kzalloc_obj(*mem_conf);
if (!mem_conf) {
ret = -ENOMEM;
goto out;
@@ -998,7 +998,7 @@ int wl1271_acx_init_mem_config(struct wl1271 *wl)
{
int ret;
- wl->target_mem_map = kzalloc_obj(struct wl1271_acx_mem_map, GFP_KERNEL);
+ wl->target_mem_map = kzalloc_obj(struct wl1271_acx_mem_map);
if (!wl->target_mem_map) {
wl1271_error("couldn't allocate target memory map");
return -ENOMEM;
@@ -1031,7 +1031,7 @@ int wl1271_acx_init_rx_interrupt(struct wl1271 *wl)
wl1271_debug(DEBUG_ACX, "wl1271 rx interrupt config");
- rx_conf = kzalloc_obj(*rx_conf, GFP_KERNEL);
+ rx_conf = kzalloc_obj(*rx_conf);
if (!rx_conf) {
ret = -ENOMEM;
goto out;
@@ -1065,7 +1065,7 @@ int wl1271_acx_bet_enable(struct wl1271 *wl, struct wl12xx_vif *wlvif,
if (enable && wl->conf.conn.bet_enable == CONF_BET_MODE_DISABLE)
goto out;
- acx = kzalloc_obj(*acx, GFP_KERNEL);
+ acx = kzalloc_obj(*acx);
if (!acx) {
ret = -ENOMEM;
goto out;
@@ -1094,7 +1094,7 @@ int wl1271_acx_arp_ip_filter(struct wl1271 *wl, struct wl12xx_vif *wlvif,
wl1271_debug(DEBUG_ACX, "acx arp ip filter, enable: %d", enable);
- acx = kzalloc_obj(*acx, GFP_KERNEL);
+ acx = kzalloc_obj(*acx);
if (!acx) {
ret = -ENOMEM;
goto out;
@@ -1127,7 +1127,7 @@ int wl1271_acx_pm_config(struct wl1271 *wl)
wl1271_debug(DEBUG_ACX, "acx pm config");
- acx = kzalloc_obj(*acx, GFP_KERNEL);
+ acx = kzalloc_obj(*acx);
if (!acx) {
ret = -ENOMEM;
goto out;
@@ -1156,7 +1156,7 @@ int wl1271_acx_keep_alive_mode(struct wl1271 *wl, struct wl12xx_vif *wlvif,
wl1271_debug(DEBUG_ACX, "acx keep alive mode: %d", enable);
- acx = kzalloc_obj(*acx, GFP_KERNEL);
+ acx = kzalloc_obj(*acx);
if (!acx) {
ret = -ENOMEM;
goto out;
@@ -1184,7 +1184,7 @@ int wl1271_acx_keep_alive_config(struct wl1271 *wl, struct wl12xx_vif *wlvif,
wl1271_debug(DEBUG_ACX, "acx keep alive config");
- acx = kzalloc_obj(*acx, GFP_KERNEL);
+ acx = kzalloc_obj(*acx);
if (!acx) {
ret = -ENOMEM;
goto out;
@@ -1216,7 +1216,7 @@ int wl1271_acx_rssi_snr_trigger(struct wl1271 *wl, struct wl12xx_vif *wlvif,
wl1271_debug(DEBUG_ACX, "acx rssi snr trigger");
- acx = kzalloc_obj(*acx, GFP_KERNEL);
+ acx = kzalloc_obj(*acx);
if (!acx) {
ret = -ENOMEM;
goto out;
@@ -1258,7 +1258,7 @@ int wl1271_acx_rssi_snr_avg_weights(struct wl1271 *wl,
wl1271_debug(DEBUG_ACX, "acx rssi snr avg weights");
- acx = kzalloc_obj(*acx, GFP_KERNEL);
+ acx = kzalloc_obj(*acx);
if (!acx) {
ret = -ENOMEM;
goto out;
@@ -1293,7 +1293,7 @@ int wl1271_acx_set_ht_capabilities(struct wl1271 *wl,
"sta supp: %d sta cap: %d", ht_cap->ht_supported,
ht_cap->cap);
- acx = kzalloc_obj(*acx, GFP_KERNEL);
+ acx = kzalloc_obj(*acx);
if (!acx) {
ret = -ENOMEM;
goto out;
@@ -1339,7 +1339,7 @@ int wl1271_acx_set_ht_information(struct wl1271 *wl,
wl1271_debug(DEBUG_ACX, "acx ht information setting");
- acx = kzalloc_obj(*acx, GFP_KERNEL);
+ acx = kzalloc_obj(*acx);
if (!acx) {
ret = -ENOMEM;
goto out;
@@ -1375,7 +1375,7 @@ int wl12xx_acx_set_ba_initiator_policy(struct wl1271 *wl,
wl1271_debug(DEBUG_ACX, "acx ba initiator policy");
- acx = kzalloc_obj(*acx, GFP_KERNEL);
+ acx = kzalloc_obj(*acx);
if (!acx) {
ret = -ENOMEM;
goto out;
@@ -1411,7 +1411,7 @@ int wl12xx_acx_set_ba_receiver_session(struct wl1271 *wl, u8 tid_index,
wl1271_debug(DEBUG_ACX, "acx ba receiver session setting");
- acx = kzalloc_obj(*acx, GFP_KERNEL);
+ acx = kzalloc_obj(*acx);
if (!acx) {
ret = -ENOMEM;
goto out;
@@ -1450,7 +1450,7 @@ int wl12xx_acx_tsf_info(struct wl1271 *wl, struct wl12xx_vif *wlvif,
struct wl12xx_acx_fw_tsf_information *tsf_info;
int ret;
- tsf_info = kzalloc_obj(*tsf_info, GFP_KERNEL);
+ tsf_info = kzalloc_obj(*tsf_info);
if (!tsf_info) {
ret = -ENOMEM;
goto out;
@@ -1482,7 +1482,7 @@ int wl1271_acx_ps_rx_streaming(struct wl1271 *wl, struct wl12xx_vif *wlvif,
wl1271_debug(DEBUG_ACX, "acx ps rx streaming");
- rx_streaming = kzalloc_obj(*rx_streaming, GFP_KERNEL);
+ rx_streaming = kzalloc_obj(*rx_streaming);
if (!rx_streaming) {
ret = -ENOMEM;
goto out;
@@ -1529,7 +1529,7 @@ int wl1271_acx_ap_max_tx_retry(struct wl1271 *wl, struct wl12xx_vif *wlvif)
wl1271_debug(DEBUG_ACX, "acx ap max tx retry");
- acx = kzalloc_obj(*acx, GFP_KERNEL);
+ acx = kzalloc_obj(*acx);
if (!acx)
return -ENOMEM;
@@ -1554,7 +1554,7 @@ int wl12xx_acx_config_ps(struct wl1271 *wl, struct wl12xx_vif *wlvif)
wl1271_debug(DEBUG_ACX, "acx config ps");
- config_ps = kzalloc_obj(*config_ps, GFP_KERNEL);
+ config_ps = kzalloc_obj(*config_ps);
if (!config_ps) {
ret = -ENOMEM;
goto out;
@@ -1585,7 +1585,7 @@ int wl1271_acx_set_inconnection_sta(struct wl1271 *wl,
wl1271_debug(DEBUG_ACX, "acx set inconnaction sta %pM", addr);
- acx = kzalloc_obj(*acx, GFP_KERNEL);
+ acx = kzalloc_obj(*acx);
if (!acx)
return -ENOMEM;
@@ -1611,7 +1611,7 @@ int wl1271_acx_fm_coex(struct wl1271 *wl)
wl1271_debug(DEBUG_ACX, "acx fm coex setting");
- acx = kzalloc_obj(*acx, GFP_KERNEL);
+ acx = kzalloc_obj(*acx);
if (!acx) {
ret = -ENOMEM;
goto out;
@@ -1652,7 +1652,7 @@ int wl12xx_acx_set_rate_mgmt_params(struct wl1271 *wl)
wl1271_debug(DEBUG_ACX, "acx set rate mgmt params");
- acx = kzalloc_obj(*acx, GFP_KERNEL);
+ acx = kzalloc_obj(*acx);
if (!acx)
return -ENOMEM;
@@ -1694,7 +1694,7 @@ int wl12xx_acx_config_hangover(struct wl1271 *wl)
wl1271_debug(DEBUG_ACX, "acx config hangover");
- acx = kzalloc_obj(*acx, GFP_KERNEL);
+ acx = kzalloc_obj(*acx);
if (!acx) {
ret = -ENOMEM;
goto out;
@@ -1734,7 +1734,7 @@ int wlcore_acx_average_rssi(struct wl1271 *wl, struct wl12xx_vif *wlvif,
wl1271_debug(DEBUG_ACX, "acx roaming statistics");
- acx = kzalloc_obj(*acx, GFP_KERNEL);
+ acx = kzalloc_obj(*acx);
if (!acx) {
ret = -ENOMEM;
goto out;
@@ -1766,7 +1766,7 @@ int wl1271_acx_default_rx_filter_enable(struct wl1271 *wl, bool enable,
wl1271_debug(DEBUG_ACX, "acx default rx filter en: %d act: %d",
enable, action);
- acx = kzalloc_obj(*acx, GFP_KERNEL);
+ acx = kzalloc_obj(*acx);
if (!acx)
return -ENOMEM;
diff --git a/drivers/net/wireless/ti/wlcore/cmd.c b/drivers/net/wireless/ti/wlcore/cmd.c
index ded64bf9c5a6..04d0bb8460fe 100644
--- a/drivers/net/wireless/ti/wlcore/cmd.c
+++ b/drivers/net/wireless/ti/wlcore/cmd.c
@@ -231,7 +231,7 @@ int wl12xx_cmd_role_enable(struct wl1271 *wl, u8 *addr, u8 role_type,
if (WARN_ON(*role_id != WL12XX_INVALID_ROLE_ID))
return -EBUSY;
- cmd = kzalloc_obj(*cmd, GFP_KERNEL);
+ cmd = kzalloc_obj(*cmd);
if (!cmd) {
ret = -ENOMEM;
goto out;
@@ -273,7 +273,7 @@ int wl12xx_cmd_role_disable(struct wl1271 *wl, u8 *role_id)
if (WARN_ON(*role_id == WL12XX_INVALID_ROLE_ID))
return -ENOENT;
- cmd = kzalloc_obj(*cmd, GFP_KERNEL);
+ cmd = kzalloc_obj(*cmd);
if (!cmd) {
ret = -ENOMEM;
goto out;
@@ -431,7 +431,7 @@ static int wl12xx_cmd_role_start_dev(struct wl1271 *wl,
struct wl12xx_cmd_role_start *cmd;
int ret;
- cmd = kzalloc_obj(*cmd, GFP_KERNEL);
+ cmd = kzalloc_obj(*cmd);
if (!cmd) {
ret = -ENOMEM;
goto out;
@@ -483,7 +483,7 @@ static int wl12xx_cmd_role_stop_dev(struct wl1271 *wl,
if (WARN_ON(wlvif->dev_hlid == WL12XX_INVALID_LINK_ID))
return -EINVAL;
- cmd = kzalloc_obj(*cmd, GFP_KERNEL);
+ cmd = kzalloc_obj(*cmd);
if (!cmd) {
ret = -ENOMEM;
goto out;
@@ -517,7 +517,7 @@ int wl12xx_cmd_role_start_sta(struct wl1271 *wl, struct wl12xx_vif *wlvif)
u32 supported_rates;
int ret;
- cmd = kzalloc_obj(*cmd, GFP_KERNEL);
+ cmd = kzalloc_obj(*cmd);
if (!cmd) {
ret = -ENOMEM;
goto out;
@@ -594,7 +594,7 @@ int wl12xx_cmd_role_stop_sta(struct wl1271 *wl, struct wl12xx_vif *wlvif)
if (WARN_ON(wlvif->sta.hlid == WL12XX_INVALID_LINK_ID))
return -EINVAL;
- cmd = kzalloc_obj(*cmd, GFP_KERNEL);
+ cmd = kzalloc_obj(*cmd);
if (!cmd) {
ret = -ENOMEM;
goto out;
@@ -641,7 +641,7 @@ int wl12xx_cmd_role_start_ap(struct wl1271 *wl, struct wl12xx_vif *wlvif)
}
}
- cmd = kzalloc_obj(*cmd, GFP_KERNEL);
+ cmd = kzalloc_obj(*cmd);
if (!cmd) {
ret = -ENOMEM;
goto out;
@@ -736,7 +736,7 @@ int wl12xx_cmd_role_stop_ap(struct wl1271 *wl, struct wl12xx_vif *wlvif)
struct wl12xx_cmd_role_stop *cmd;
int ret;
- cmd = kzalloc_obj(*cmd, GFP_KERNEL);
+ cmd = kzalloc_obj(*cmd);
if (!cmd) {
ret = -ENOMEM;
goto out;
@@ -769,7 +769,7 @@ int wl12xx_cmd_role_start_ibss(struct wl1271 *wl, struct wl12xx_vif *wlvif)
struct ieee80211_bss_conf *bss_conf = &vif->bss_conf;
int ret;
- cmd = kzalloc_obj(*cmd, GFP_KERNEL);
+ cmd = kzalloc_obj(*cmd);
if (!cmd) {
ret = -ENOMEM;
goto out;
@@ -942,7 +942,7 @@ int wl1271_cmd_data_path(struct wl1271 *wl, bool enable)
wl1271_debug(DEBUG_CMD, "cmd data path");
- cmd = kzalloc_obj(*cmd, GFP_KERNEL);
+ cmd = kzalloc_obj(*cmd);
if (!cmd) {
ret = -ENOMEM;
goto out;
@@ -993,7 +993,7 @@ int wl1271_cmd_ps_mode(struct wl1271 *wl, struct wl12xx_vif *wlvif,
wl1271_debug(DEBUG_CMD, "cmd set ps mode");
- ps_params = kzalloc_obj(*ps_params, GFP_KERNEL);
+ ps_params = kzalloc_obj(*ps_params);
if (!ps_params) {
ret = -ENOMEM;
goto out;
@@ -1028,7 +1028,7 @@ int wl1271_cmd_template_set(struct wl1271 *wl, u8 role_id,
WARN_ON(buf_len > WL1271_CMD_TEMPL_MAX_SIZE);
buf_len = min_t(size_t, buf_len, WL1271_CMD_TEMPL_MAX_SIZE);
- cmd = kzalloc_obj(*cmd, GFP_KERNEL);
+ cmd = kzalloc_obj(*cmd);
if (!cmd) {
ret = -ENOMEM;
goto out;
@@ -1340,7 +1340,7 @@ int wl12xx_cmd_set_default_wep_key(struct wl1271 *wl, u8 id, u8 hlid)
wl1271_debug(DEBUG_CMD, "cmd set_default_wep_key %d", id);
- cmd = kzalloc_obj(*cmd, GFP_KERNEL);
+ cmd = kzalloc_obj(*cmd);
if (!cmd) {
ret = -ENOMEM;
goto out;
@@ -1376,7 +1376,7 @@ int wl1271_cmd_set_sta_key(struct wl1271 *wl, struct wl12xx_vif *wlvif,
if (wlvif->sta.hlid == WL12XX_INVALID_LINK_ID)
return 0;
- cmd = kzalloc_obj(*cmd, GFP_KERNEL);
+ cmd = kzalloc_obj(*cmd);
if (!cmd) {
ret = -ENOMEM;
goto out;
@@ -1442,7 +1442,7 @@ int wl1271_cmd_set_ap_key(struct wl1271 *wl, struct wl12xx_vif *wlvif,
int ret = 0;
u8 lid_type;
- cmd = kzalloc_obj(*cmd, GFP_KERNEL);
+ cmd = kzalloc_obj(*cmd);
if (!cmd)
return -ENOMEM;
@@ -1505,7 +1505,7 @@ int wl12xx_cmd_set_peer_state(struct wl1271 *wl, struct wl12xx_vif *wlvif,
wl1271_debug(DEBUG_CMD, "cmd set peer state (hlid=%d)", hlid);
- cmd = kzalloc_obj(*cmd, GFP_KERNEL);
+ cmd = kzalloc_obj(*cmd);
if (!cmd) {
ret = -ENOMEM;
goto out;
@@ -1540,7 +1540,7 @@ int wl12xx_cmd_add_peer(struct wl1271 *wl, struct wl12xx_vif *wlvif,
wl1271_debug(DEBUG_CMD, "cmd add peer %d", (int)hlid);
- cmd = kzalloc_obj(*cmd, GFP_KERNEL);
+ cmd = kzalloc_obj(*cmd);
if (!cmd) {
ret = -ENOMEM;
goto out;
@@ -1599,7 +1599,7 @@ int wl12xx_cmd_remove_peer(struct wl1271 *wl, struct wl12xx_vif *wlvif,
wl1271_debug(DEBUG_CMD, "cmd remove peer %d", (int)hlid);
- cmd = kzalloc_obj(*cmd, GFP_KERNEL);
+ cmd = kzalloc_obj(*cmd);
if (!cmd) {
ret = -ENOMEM;
goto out;
@@ -1733,7 +1733,7 @@ int wlcore_cmd_regdomain_config_locked(struct wl1271 *wl)
if (!memcmp(tmp_ch_bitmap, wl->reg_ch_conf_last, sizeof(tmp_ch_bitmap)))
goto out;
- cmd = kzalloc_obj(*cmd, GFP_KERNEL);
+ cmd = kzalloc_obj(*cmd);
if (!cmd) {
ret = -ENOMEM;
goto out;
@@ -1778,7 +1778,7 @@ int wl12xx_cmd_config_fwlog(struct wl1271 *wl)
wl1271_debug(DEBUG_CMD, "cmd config firmware logger");
- cmd = kzalloc_obj(*cmd, GFP_KERNEL);
+ cmd = kzalloc_obj(*cmd);
if (!cmd) {
ret = -ENOMEM;
goto out;
@@ -1810,7 +1810,7 @@ int wl12xx_cmd_stop_fwlog(struct wl1271 *wl)
wl1271_debug(DEBUG_CMD, "cmd stop firmware logger");
- cmd = kzalloc_obj(*cmd, GFP_KERNEL);
+ cmd = kzalloc_obj(*cmd);
if (!cmd) {
ret = -ENOMEM;
goto out;
@@ -1840,7 +1840,7 @@ static int wl12xx_cmd_roc(struct wl1271 *wl, struct wl12xx_vif *wlvif,
if (WARN_ON(role_id == WL12XX_INVALID_ROLE_ID))
return -EINVAL;
- cmd = kzalloc_obj(*cmd, GFP_KERNEL);
+ cmd = kzalloc_obj(*cmd);
if (!cmd) {
ret = -ENOMEM;
goto out;
@@ -1882,7 +1882,7 @@ static int wl12xx_cmd_croc(struct wl1271 *wl, u8 role_id)
wl1271_debug(DEBUG_CMD, "cmd croc (%d)", role_id);
- cmd = kzalloc_obj(*cmd, GFP_KERNEL);
+ cmd = kzalloc_obj(*cmd);
if (!cmd) {
ret = -ENOMEM;
goto out;
@@ -1951,7 +1951,7 @@ int wl12xx_cmd_stop_channel_switch(struct wl1271 *wl, struct wl12xx_vif *wlvif)
wl1271_debug(DEBUG_ACX, "cmd stop channel switch");
- cmd = kzalloc_obj(*cmd, GFP_KERNEL);
+ cmd = kzalloc_obj(*cmd);
if (!cmd) {
ret = -ENOMEM;
goto out;
@@ -2055,7 +2055,7 @@ int wlcore_cmd_generic_cfg(struct wl1271 *wl, struct wl12xx_vif *wlvif,
"cmd generic cfg (role %d feature %d enable %d value %d)",
wlvif->role_id, feature, enable, value);
- cmd = kzalloc_obj(*cmd, GFP_KERNEL);
+ cmd = kzalloc_obj(*cmd);
if (!cmd)
return -ENOMEM;
diff --git a/drivers/net/wireless/ti/wlcore/init.c b/drivers/net/wireless/ti/wlcore/init.c
index 3f544a900f67..aa59ddd520f9 100644
--- a/drivers/net/wireless/ti/wlcore/init.c
+++ b/drivers/net/wireless/ti/wlcore/init.c
@@ -148,7 +148,7 @@ static int wl1271_ap_init_deauth_template(struct wl1271 *wl,
int ret;
u32 rate;
- tmpl = kzalloc_obj(*tmpl, GFP_KERNEL);
+ tmpl = kzalloc_obj(*tmpl);
if (!tmpl) {
ret = -ENOMEM;
goto out;
@@ -175,7 +175,7 @@ static int wl1271_ap_init_null_template(struct wl1271 *wl,
int ret;
u32 rate;
- nullfunc = kzalloc_obj(*nullfunc, GFP_KERNEL);
+ nullfunc = kzalloc_obj(*nullfunc);
if (!nullfunc) {
ret = -ENOMEM;
goto out;
@@ -208,7 +208,7 @@ static int wl1271_ap_init_qos_null_template(struct wl1271 *wl,
int ret;
u32 rate;
- qosnull = kzalloc_obj(*qosnull, GFP_KERNEL);
+ qosnull = kzalloc_obj(*qosnull);
if (!qosnull) {
ret = -ENOMEM;
goto out;
diff --git a/drivers/net/wireless/ti/wlcore/main.c b/drivers/net/wireless/ti/wlcore/main.c
index 82e035aea874..17dd417756f2 100644
--- a/drivers/net/wireless/ti/wlcore/main.c
+++ b/drivers/net/wireless/ti/wlcore/main.c
@@ -1070,11 +1070,11 @@ static int wl1271_setup(struct wl1271 *wl)
if (!wl->raw_fw_status)
goto err;
- wl->fw_status = kzalloc_obj(*wl->fw_status, GFP_KERNEL);
+ wl->fw_status = kzalloc_obj(*wl->fw_status);
if (!wl->fw_status)
goto err;
- wl->tx_res_if = kzalloc_obj(*wl->tx_res_if, GFP_KERNEL);
+ wl->tx_res_if = kzalloc_obj(*wl->tx_res_if);
if (!wl->tx_res_if)
goto err;
@@ -1477,7 +1477,7 @@ wl1271_validate_wowlan_pattern(struct cfg80211_pkt_pattern *p)
struct wl12xx_rx_filter *wl1271_rx_filter_alloc(void)
{
- return kzalloc_obj(struct wl12xx_rx_filter, GFP_KERNEL);
+ return kzalloc_obj(struct wl12xx_rx_filter);
}
void wl1271_rx_filter_free(struct wl12xx_rx_filter *filter)
@@ -3346,7 +3346,7 @@ static int wl1271_record_ap_key(struct wl1271 *wl, struct wl12xx_vif *wlvif,
if (i == MAX_NUM_KEYS)
return -EBUSY;
- ap_key = kzalloc_obj(*ap_key, GFP_KERNEL);
+ ap_key = kzalloc_obj(*ap_key);
if (!ap_key)
return -ENOMEM;
@@ -6459,7 +6459,7 @@ struct ieee80211_hw *wlcore_alloc_hw(size_t priv_size, u32 aggr_buf_size,
goto err_fwlog;
}
- wl->buffer_32 = kmalloc_obj(*wl->buffer_32, GFP_KERNEL);
+ wl->buffer_32 = kmalloc_obj(*wl->buffer_32);
if (!wl->buffer_32) {
ret = -ENOMEM;
goto err_mbox;
diff --git a/drivers/net/wireless/ti/wlcore/scan.c b/drivers/net/wireless/ti/wlcore/scan.c
index 7cd58bb0efb6..976d96495f28 100644
--- a/drivers/net/wireless/ti/wlcore/scan.c
+++ b/drivers/net/wireless/ti/wlcore/scan.c
@@ -389,7 +389,7 @@ wlcore_scan_sched_scan_ssid_list(struct wl1271 *wl,
goto out;
}
- cmd = kzalloc_obj(*cmd, GFP_KERNEL);
+ cmd = kzalloc_obj(*cmd);
if (!cmd) {
ret = -ENOMEM;
goto out;
diff --git a/drivers/net/wireless/ti/wlcore/testmode.c b/drivers/net/wireless/ti/wlcore/testmode.c
index caca2786d07c..8437038e4dd0 100644
--- a/drivers/net/wireless/ti/wlcore/testmode.c
+++ b/drivers/net/wireless/ti/wlcore/testmode.c
@@ -159,7 +159,7 @@ static int wl1271_tm_cmd_interrogate(struct wl1271 *wl, struct nlattr *tb[])
if (ret < 0)
goto out;
- cmd = kzalloc_obj(*cmd, GFP_KERNEL);
+ cmd = kzalloc_obj(*cmd);
if (!cmd) {
ret = -ENOMEM;
goto out_sleep;
diff --git a/drivers/net/wireless/virtual/mac80211_hwsim.c b/drivers/net/wireless/virtual/mac80211_hwsim.c
index f4f37f71285e..e89173f91637 100644
--- a/drivers/net/wireless/virtual/mac80211_hwsim.c
+++ b/drivers/net/wireless/virtual/mac80211_hwsim.c
@@ -6489,7 +6489,7 @@ static int hwsim_new_radio_nl(struct sk_buff *msg, struct genl_info *info)
if (info->attrs[HWSIM_ATTR_PMSR_SUPPORT]) {
struct cfg80211_pmsr_capabilities *pmsr_capa;
- pmsr_capa = kmalloc_obj(*pmsr_capa, GFP_KERNEL);
+ pmsr_capa = kmalloc_obj(*pmsr_capa);
if (!pmsr_capa) {
ret = -ENOMEM;
goto out_free;
diff --git a/drivers/net/wireless/virtual/virt_wifi.c b/drivers/net/wireless/virtual/virt_wifi.c
index eac81ebf9551..885dc7243e8d 100644
--- a/drivers/net/wireless/virtual/virt_wifi.c
+++ b/drivers/net/wireless/virtual/virt_wifi.c
@@ -558,7 +558,7 @@ static int virt_wifi_newlink(struct net_device *dev,
netif_stacked_transfer_operstate(priv->lowerdev, dev);
SET_NETDEV_DEV(dev, &priv->lowerdev->dev);
- dev->ieee80211_ptr = kzalloc_obj(*dev->ieee80211_ptr, GFP_KERNEL);
+ dev->ieee80211_ptr = kzalloc_obj(*dev->ieee80211_ptr);
if (!dev->ieee80211_ptr) {
err = -ENOMEM;
diff --git a/drivers/net/wireless/zydas/zd1211rw/zd_mac.c b/drivers/net/wireless/zydas/zd1211rw/zd_mac.c
index f5063efc8e42..03948f0b4628 100644
--- a/drivers/net/wireless/zydas/zd1211rw/zd_mac.c
+++ b/drivers/net/wireless/zydas/zd1211rw/zd_mac.c
@@ -722,7 +722,7 @@ static int zd_mac_config_beacon(struct ieee80211_hw *hw, struct sk_buff *beacon,
/* Alloc memory for full beacon write at once. */
num_cmds = 1 + zd_chip_is_zd1211b(&mac->chip) + full_len;
- ioreqs = kmalloc_objs(struct zd_ioreq32, num_cmds, GFP_KERNEL);
+ ioreqs = kmalloc_objs(struct zd_ioreq32, num_cmds);
if (!ioreqs) {
r = -ENOMEM;
goto out_nofree;
diff --git a/drivers/net/wireless/zydas/zd1211rw/zd_rf_uw2453.c b/drivers/net/wireless/zydas/zd1211rw/zd_rf_uw2453.c
index d15d95ff5aad..50aca6f681bf 100644
--- a/drivers/net/wireless/zydas/zd1211rw/zd_rf_uw2453.c
+++ b/drivers/net/wireless/zydas/zd1211rw/zd_rf_uw2453.c
@@ -518,7 +518,7 @@ int zd_rf_init_uw2453(struct zd_rf *rf)
/* we have our own TX integration code */
rf->update_channel_int = 0;
- rf->priv = kmalloc_obj(struct uw2453_priv, GFP_KERNEL);
+ rf->priv = kmalloc_obj(struct uw2453_priv);
if (rf->priv == NULL)
return -ENOMEM;
diff --git a/drivers/net/wireless/zydas/zd1211rw/zd_usb.c b/drivers/net/wireless/zydas/zd1211rw/zd_usb.c
index e5c3be14ae4e..966d8ccb0dbc 100644
--- a/drivers/net/wireless/zydas/zd1211rw/zd_usb.c
+++ b/drivers/net/wireless/zydas/zd1211rw/zd_usb.c
@@ -752,7 +752,7 @@ static int __zd_usb_enable_rx(struct zd_usb *usb)
dev_dbg_f(zd_usb_dev(usb), "\n");
r = -ENOMEM;
- urbs = kzalloc_objs(struct urb *, RX_URBS_COUNT, GFP_KERNEL);
+ urbs = kzalloc_objs(struct urb *, RX_URBS_COUNT);
if (!urbs)
goto error;
for (i = 0; i < RX_URBS_COUNT; i++) {
diff --git a/drivers/net/wwan/iosm/iosm_ipc_imem.c b/drivers/net/wwan/iosm/iosm_ipc_imem.c
index f354e4514565..1b7bc7d63a2e 100644
--- a/drivers/net/wwan/iosm/iosm_ipc_imem.c
+++ b/drivers/net/wwan/iosm/iosm_ipc_imem.c
@@ -1334,7 +1334,7 @@ static int ipc_imem_config(struct iosm_imem *ipc_imem)
struct iosm_imem *ipc_imem_init(struct iosm_pcie *pcie, unsigned int device_id,
void __iomem *mmio, struct device *dev)
{
- struct iosm_imem *ipc_imem = kzalloc_obj(*pcie->imem, GFP_KERNEL);
+ struct iosm_imem *ipc_imem = kzalloc_obj(*pcie->imem);
enum ipc_mem_exec_stage stage;
if (!ipc_imem)
@@ -1359,7 +1359,7 @@ struct iosm_imem *ipc_imem_init(struct iosm_pcie *pcie, unsigned int device_id,
goto mmio_init_fail;
}
- ipc_imem->ipc_task = kzalloc_obj(*ipc_imem->ipc_task, GFP_KERNEL);
+ ipc_imem->ipc_task = kzalloc_obj(*ipc_imem->ipc_task);
/* Create tasklet for event handling*/
if (!ipc_imem->ipc_task)
diff --git a/drivers/net/wwan/iosm/iosm_ipc_mmio.c b/drivers/net/wwan/iosm/iosm_ipc_mmio.c
index 3319d7423101..f8d32b0f95d9 100644
--- a/drivers/net/wwan/iosm/iosm_ipc_mmio.c
+++ b/drivers/net/wwan/iosm/iosm_ipc_mmio.c
@@ -82,7 +82,7 @@ void ipc_mmio_update_cp_capability(struct iosm_mmio *ipc_mmio)
struct iosm_mmio *ipc_mmio_init(void __iomem *mmio, struct device *dev)
{
- struct iosm_mmio *ipc_mmio = kzalloc_obj(*ipc_mmio, GFP_KERNEL);
+ struct iosm_mmio *ipc_mmio = kzalloc_obj(*ipc_mmio);
int retries = IPC_MMIO_EXEC_STAGE_TIMEOUT;
enum ipc_mem_exec_stage stage;
diff --git a/drivers/net/wwan/iosm/iosm_ipc_mux.c b/drivers/net/wwan/iosm/iosm_ipc_mux.c
index d370c7b7810a..17c09221f0dd 100644
--- a/drivers/net/wwan/iosm/iosm_ipc_mux.c
+++ b/drivers/net/wwan/iosm/iosm_ipc_mux.c
@@ -278,7 +278,7 @@ static int ipc_mux_schedule(struct iosm_mux *ipc_mux, union mux_msg *msg)
struct iosm_mux *ipc_mux_init(struct ipc_mux_config *mux_cfg,
struct iosm_imem *imem)
{
- struct iosm_mux *ipc_mux = kzalloc_obj(*ipc_mux, GFP_KERNEL);
+ struct iosm_mux *ipc_mux = kzalloc_obj(*ipc_mux);
int i, j, ul_tds, ul_td_size;
struct sk_buff_head *free_list;
struct sk_buff *skb;
diff --git a/drivers/net/wwan/iosm/iosm_ipc_pcie.c b/drivers/net/wwan/iosm/iosm_ipc_pcie.c
index f7f693c2296a..49052eb511ba 100644
--- a/drivers/net/wwan/iosm/iosm_ipc_pcie.c
+++ b/drivers/net/wwan/iosm/iosm_ipc_pcie.c
@@ -260,7 +260,7 @@ static enum ipc_pcie_sleep_state ipc_pcie_read_bios_cfg(struct device *dev)
static int ipc_pcie_probe(struct pci_dev *pci,
const struct pci_device_id *pci_id)
{
- struct iosm_pcie *ipc_pcie = kzalloc_obj(*ipc_pcie, GFP_KERNEL);
+ struct iosm_pcie *ipc_pcie = kzalloc_obj(*ipc_pcie);
int ret;
pr_debug("Probing device 0x%X from the vendor 0x%X", pci_id->device,
diff --git a/drivers/net/wwan/iosm/iosm_ipc_port.c b/drivers/net/wwan/iosm/iosm_ipc_port.c
index bf75d8b94682..021349a78884 100644
--- a/drivers/net/wwan/iosm/iosm_ipc_port.c
+++ b/drivers/net/wwan/iosm/iosm_ipc_port.c
@@ -48,7 +48,7 @@ static const struct wwan_port_ops ipc_wwan_ctrl_ops = {
struct iosm_cdev *ipc_port_init(struct iosm_imem *ipc_imem,
struct ipc_chnl_cfg ipc_port_cfg)
{
- struct iosm_cdev *ipc_port = kzalloc_obj(*ipc_port, GFP_KERNEL);
+ struct iosm_cdev *ipc_port = kzalloc_obj(*ipc_port);
enum wwan_port_type port_type = ipc_port_cfg.wwan_port_type;
enum ipc_channel_id chl_id = ipc_port_cfg.id;
diff --git a/drivers/net/wwan/iosm/iosm_ipc_task_queue.c b/drivers/net/wwan/iosm/iosm_ipc_task_queue.c
index f9c1837781e5..7cb2f6a506d9 100644
--- a/drivers/net/wwan/iosm/iosm_ipc_task_queue.c
+++ b/drivers/net/wwan/iosm/iosm_ipc_task_queue.c
@@ -174,7 +174,7 @@ int ipc_task_init(struct ipc_task *ipc_task)
{
struct ipc_task_queue *ipc_queue = &ipc_task->ipc_queue;
- ipc_task->ipc_tasklet = kzalloc_obj(*ipc_task->ipc_tasklet, GFP_KERNEL);
+ ipc_task->ipc_tasklet = kzalloc_obj(*ipc_task->ipc_tasklet);
if (!ipc_task->ipc_tasklet)
return -ENOMEM;
diff --git a/drivers/net/wwan/iosm/iosm_ipc_trace.c b/drivers/net/wwan/iosm/iosm_ipc_trace.c
index c6368131d786..7f3d305b3857 100644
--- a/drivers/net/wwan/iosm/iosm_ipc_trace.c
+++ b/drivers/net/wwan/iosm/iosm_ipc_trace.c
@@ -140,7 +140,7 @@ struct iosm_trace *ipc_trace_init(struct iosm_imem *ipc_imem)
ipc_imem_channel_init(ipc_imem, IPC_CTYPE_CTRL, chnl_cfg,
IRQ_MOD_OFF);
- ipc_trace = kzalloc_obj(*ipc_trace, GFP_KERNEL);
+ ipc_trace = kzalloc_obj(*ipc_trace);
if (!ipc_trace)
return NULL;
diff --git a/drivers/net/wwan/iosm/iosm_ipc_wwan.c b/drivers/net/wwan/iosm/iosm_ipc_wwan.c
index 7a299b6b41c9..21266b599f62 100644
--- a/drivers/net/wwan/iosm/iosm_ipc_wwan.c
+++ b/drivers/net/wwan/iosm/iosm_ipc_wwan.c
@@ -290,7 +290,7 @@ struct iosm_wwan *ipc_wwan_init(struct iosm_imem *ipc_imem, struct device *dev)
{
struct iosm_wwan *ipc_wwan;
- ipc_wwan = kzalloc_obj(*ipc_wwan, GFP_KERNEL);
+ ipc_wwan = kzalloc_obj(*ipc_wwan);
if (!ipc_wwan)
return NULL;
diff --git a/drivers/net/wwan/mhi_wwan_ctrl.c b/drivers/net/wwan/mhi_wwan_ctrl.c
index 33e0dd11abde..fa73861db6ad 100644
--- a/drivers/net/wwan/mhi_wwan_ctrl.c
+++ b/drivers/net/wwan/mhi_wwan_ctrl.c
@@ -218,7 +218,7 @@ static int mhi_wwan_ctrl_probe(struct mhi_device *mhi_dev,
struct mhi_wwan_dev *mhiwwan;
struct wwan_port *port;
- mhiwwan = kzalloc_obj(*mhiwwan, GFP_KERNEL);
+ mhiwwan = kzalloc_obj(*mhiwwan);
if (!mhiwwan)
return -ENOMEM;
diff --git a/drivers/net/wwan/t7xx/t7xx_hif_cldma.c b/drivers/net/wwan/t7xx/t7xx_hif_cldma.c
index a32378dcc392..e10cb4f9104e 100644
--- a/drivers/net/wwan/t7xx/t7xx_hif_cldma.c
+++ b/drivers/net/wwan/t7xx/t7xx_hif_cldma.c
@@ -391,7 +391,7 @@ static struct cldma_request *t7xx_alloc_rx_request(struct cldma_ctrl *md_ctrl, s
struct cldma_request *req;
int val;
- req = kzalloc_obj(*req, GFP_KERNEL);
+ req = kzalloc_obj(*req);
if (!req)
return NULL;
@@ -451,7 +451,7 @@ static struct cldma_request *t7xx_alloc_tx_request(struct cldma_ctrl *md_ctrl)
{
struct cldma_request *req;
- req = kzalloc_obj(*req, GFP_KERNEL);
+ req = kzalloc_obj(*req);
if (!req)
return NULL;
@@ -1206,7 +1206,7 @@ static int t7xx_cldma_suspend(struct t7xx_pci_dev *t7xx_dev, void *entity_param)
static int t7xx_cldma_pm_init(struct cldma_ctrl *md_ctrl)
{
- md_ctrl->pm_entity = kzalloc_obj(*md_ctrl->pm_entity, GFP_KERNEL);
+ md_ctrl->pm_entity = kzalloc_obj(*md_ctrl->pm_entity);
if (!md_ctrl->pm_entity)
return -ENOMEM;
diff --git a/drivers/net/wwan/wwan_core.c b/drivers/net/wwan/wwan_core.c
index ffa222b6dce8..ccce2ad74128 100644
--- a/drivers/net/wwan/wwan_core.c
+++ b/drivers/net/wwan/wwan_core.c
@@ -250,7 +250,7 @@ static struct wwan_device *wwan_create_dev(struct device *parent)
goto done_unlock;
}
- wwandev = kzalloc_obj(*wwandev, GFP_KERNEL);
+ wwandev = kzalloc_obj(*wwandev);
if (!wwandev) {
wwandev = ERR_PTR(-ENOMEM);
ida_free(&wwan_dev_ids, id);
@@ -639,7 +639,7 @@ struct wwan_port *wwan_create_port(struct device *parent,
if (IS_ERR(wwandev))
return ERR_CAST(wwandev);
- port = kzalloc_obj(*port, GFP_KERNEL);
+ port = kzalloc_obj(*port);
if (!port) {
err = -ENOMEM;
goto error_wwandev_remove;
diff --git a/drivers/net/wwan/wwan_hwsim.c b/drivers/net/wwan/wwan_hwsim.c
index 55d3b2bb4061..c3c2d2a68767 100644
--- a/drivers/net/wwan/wwan_hwsim.c
+++ b/drivers/net/wwan/wwan_hwsim.c
@@ -317,7 +317,7 @@ static struct wwan_hwsim_port *wwan_hwsim_port_new(struct wwan_hwsim_dev *dev,
else
return ERR_PTR(-EINVAL);
- port = kzalloc_obj(*port, GFP_KERNEL);
+ port = kzalloc_obj(*port);
if (!port)
return ERR_PTR(-ENOMEM);
@@ -390,7 +390,7 @@ static struct wwan_hwsim_dev *wwan_hwsim_dev_new(void)
struct wwan_hwsim_dev *dev;
int err;
- dev = kzalloc_obj(*dev, GFP_KERNEL);
+ dev = kzalloc_obj(*dev);
if (!dev)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/net/xen-netback/xenbus.c b/drivers/net/xen-netback/xenbus.c
index adb3967f00ee..e020f44ac2c7 100644
--- a/drivers/net/xen-netback/xenbus.c
+++ b/drivers/net/xen-netback/xenbus.c
@@ -1007,7 +1007,7 @@ static int netback_probe(struct xenbus_device *dev,
int err;
int sg;
const char *script;
- struct backend_info *be = kzalloc_obj(*be, GFP_KERNEL);
+ struct backend_info *be = kzalloc_obj(*be);
if (!be) {
xenbus_dev_fatal(dev, -ENOMEM,
diff --git a/drivers/nfc/mei_phy.c b/drivers/nfc/mei_phy.c
index 5f8c9c2c7c06..0ea28597e6f5 100644
--- a/drivers/nfc/mei_phy.c
+++ b/drivers/nfc/mei_phy.c
@@ -373,7 +373,7 @@ struct nfc_mei_phy *nfc_mei_phy_alloc(struct mei_cl_device *cldev)
{
struct nfc_mei_phy *phy;
- phy = kzalloc_obj(struct nfc_mei_phy, GFP_KERNEL);
+ phy = kzalloc_obj(struct nfc_mei_phy);
if (!phy)
return NULL;
diff --git a/drivers/nfc/microread/microread.c b/drivers/nfc/microread/microread.c
index 60cdf4d09577..4149c5d735bd 100644
--- a/drivers/nfc/microread/microread.c
+++ b/drivers/nfc/microread/microread.c
@@ -473,7 +473,7 @@ static void microread_target_discovered(struct nfc_hci_dev *hdev, u8 gate,
pr_info("target discovered to gate 0x%x\n", gate);
- targets = kzalloc_obj(struct nfc_target, GFP_KERNEL);
+ targets = kzalloc_obj(struct nfc_target);
if (targets == NULL) {
r = -ENOMEM;
goto exit;
@@ -650,7 +650,7 @@ int microread_probe(void *phy_id, const struct nfc_phy_ops *phy_ops,
struct nfc_hci_init_data init_data;
int r;
- info = kzalloc_obj(struct microread_info, GFP_KERNEL);
+ info = kzalloc_obj(struct microread_info);
if (!info) {
r = -ENOMEM;
goto err_info_alloc;
diff --git a/drivers/nfc/nfcmrvl/main.c b/drivers/nfc/nfcmrvl/main.c
index 2065befd3793..c51d22e4579c 100644
--- a/drivers/nfc/nfcmrvl/main.c
+++ b/drivers/nfc/nfcmrvl/main.c
@@ -101,7 +101,7 @@ struct nfcmrvl_private *nfcmrvl_nci_register_dev(enum nfcmrvl_phy phy,
int tailroom;
u32 protocols;
- priv = kzalloc_obj(*priv, GFP_KERNEL);
+ priv = kzalloc_obj(*priv);
if (!priv)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/nfc/nfcsim.c b/drivers/nfc/nfcsim.c
index 6b2939e6a7cd..f8e5c4da3b13 100644
--- a/drivers/nfc/nfcsim.c
+++ b/drivers/nfc/nfcsim.c
@@ -66,7 +66,7 @@ static struct nfcsim_link *nfcsim_link_new(void)
{
struct nfcsim_link *link;
- link = kzalloc_obj(struct nfcsim_link, GFP_KERNEL);
+ link = kzalloc_obj(struct nfcsim_link);
if (!link)
return NULL;
@@ -373,7 +373,7 @@ static struct nfcsim *nfcsim_device_new(struct nfcsim_link *link_in,
struct nfcsim *dev;
int rc;
- dev = kzalloc_obj(struct nfcsim, GFP_KERNEL);
+ dev = kzalloc_obj(struct nfcsim);
if (!dev)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/nfc/pn533/pn533.c b/drivers/nfc/pn533/pn533.c
index 8d62084c3e92..d7bdbc82e2ba 100644
--- a/drivers/nfc/pn533/pn533.c
+++ b/drivers/nfc/pn533/pn533.c
@@ -444,7 +444,7 @@ static int __pn533_send_async(struct pn533 *dev, u8 cmd_code,
dev_dbg(dev->dev, "Sending command 0x%x\n", cmd_code);
- cmd = kzalloc_obj(*cmd, GFP_KERNEL);
+ cmd = kzalloc_obj(*cmd);
if (!cmd)
return -ENOMEM;
@@ -518,7 +518,7 @@ static int pn533_send_cmd_direct_async(struct pn533 *dev, u8 cmd_code,
struct pn533_cmd *cmd;
int rc;
- cmd = kzalloc_obj(*cmd, GFP_KERNEL);
+ cmd = kzalloc_obj(*cmd);
if (!cmd)
return -ENOMEM;
@@ -2019,7 +2019,7 @@ static int pn533_dep_link_up(struct nfc_dev *nfc_dev, struct nfc_target *target,
*next = 0;
}
- arg = kmalloc_obj(*arg, GFP_KERNEL);
+ arg = kmalloc_obj(*arg);
if (!arg) {
dev_kfree_skb(skb);
return -ENOMEM;
@@ -2266,7 +2266,7 @@ static int pn533_transceive(struct nfc_dev *nfc_dev,
goto error;
}
- arg = kmalloc_obj(*arg, GFP_KERNEL);
+ arg = kmalloc_obj(*arg);
if (!arg) {
rc = -ENOMEM;
goto error;
@@ -2744,7 +2744,7 @@ struct pn533 *pn53x_common_init(u32 device_type,
{
struct pn533 *priv;
- priv = kzalloc_obj(*priv, GFP_KERNEL);
+ priv = kzalloc_obj(*priv);
if (!priv)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/nfc/pn533/uart.c b/drivers/nfc/pn533/uart.c
index 3355736e5e26..6d2f520a5bc8 100644
--- a/drivers/nfc/pn533/uart.c
+++ b/drivers/nfc/pn533/uart.c
@@ -242,7 +242,7 @@ static int pn532_uart_probe(struct serdev_device *serdev)
int err;
err = -ENOMEM;
- pn532 = kzalloc_obj(*pn532, GFP_KERNEL);
+ pn532 = kzalloc_obj(*pn532);
if (!pn532)
goto err_exit;
diff --git a/drivers/nfc/pn544/pn544.c b/drivers/nfc/pn544/pn544.c
index 87803f125f5e..9d0a16ac465e 100644
--- a/drivers/nfc/pn544/pn544.c
+++ b/drivers/nfc/pn544/pn544.c
@@ -910,7 +910,7 @@ int pn544_hci_probe(void *phy_id, const struct nfc_phy_ops *phy_ops,
struct nfc_hci_init_data init_data;
int r;
- info = kzalloc_obj(struct pn544_hci_info, GFP_KERNEL);
+ info = kzalloc_obj(struct pn544_hci_info);
if (!info) {
r = -ENOMEM;
goto err_info_alloc;
diff --git a/drivers/nfc/port100.c b/drivers/nfc/port100.c
index 3dcd13878535..a922569d7b48 100644
--- a/drivers/nfc/port100.c
+++ b/drivers/nfc/port100.c
@@ -859,7 +859,7 @@ static int port100_send_cmd_async(struct port100 *dev, u8 cmd_code,
if (!resp)
return -ENOMEM;
- cmd = kzalloc_obj(*cmd, GFP_KERNEL);
+ cmd = kzalloc_obj(*cmd);
if (!cmd) {
dev_kfree_skb(resp);
return -ENOMEM;
@@ -1211,7 +1211,7 @@ static int port100_in_send_cmd(struct nfc_digital_dev *ddev,
struct port100_cb_arg *cb_arg;
__le16 timeout;
- cb_arg = kzalloc_obj(struct port100_cb_arg, GFP_KERNEL);
+ cb_arg = kzalloc_obj(struct port100_cb_arg);
if (!cb_arg)
return -ENOMEM;
@@ -1377,7 +1377,7 @@ static int port100_tg_send_cmd(struct nfc_digital_dev *ddev,
struct port100_tg_comm_rf_cmd *hdr;
struct port100_cb_arg *cb_arg;
- cb_arg = kzalloc_obj(struct port100_cb_arg, GFP_KERNEL);
+ cb_arg = kzalloc_obj(struct port100_cb_arg);
if (!cb_arg)
return -ENOMEM;
@@ -1418,7 +1418,7 @@ static int port100_listen_mdaa(struct nfc_digital_dev *ddev,
if (rc)
return rc;
- cb_arg = kzalloc_obj(struct port100_cb_arg, GFP_KERNEL);
+ cb_arg = kzalloc_obj(struct port100_cb_arg);
if (!cb_arg)
return -ENOMEM;
diff --git a/drivers/nfc/st21nfca/core.c b/drivers/nfc/st21nfca/core.c
index 31f6e7c9930f..fd39a05c9622 100644
--- a/drivers/nfc/st21nfca/core.c
+++ b/drivers/nfc/st21nfca/core.c
@@ -946,7 +946,7 @@ int st21nfca_hci_probe(void *phy_id, const struct nfc_phy_ops *phy_ops,
struct nfc_hci_init_data init_data;
unsigned long quirks = 0;
- info = kzalloc_obj(struct st21nfca_hci_info, GFP_KERNEL);
+ info = kzalloc_obj(struct st21nfca_hci_info);
if (!info)
return -ENOMEM;
diff --git a/drivers/nfc/virtual_ncidev.c b/drivers/nfc/virtual_ncidev.c
index 81cc2e046ee6..8eeb447ac96e 100644
--- a/drivers/nfc/virtual_ncidev.c
+++ b/drivers/nfc/virtual_ncidev.c
@@ -135,7 +135,7 @@ static int virtual_ncidev_open(struct inode *inode, struct file *file)
int ret = 0;
struct virtual_nci_dev *vdev;
- vdev = kzalloc_obj(*vdev, GFP_KERNEL);
+ vdev = kzalloc_obj(*vdev);
if (!vdev)
return -ENOMEM;
vdev->ndev = nci_allocate_device(&virtual_nci_ops,
diff --git a/drivers/nubus/proc.c b/drivers/nubus/proc.c
index 4d6773ef484e..3ea3d1738eae 100644
--- a/drivers/nubus/proc.c
+++ b/drivers/nubus/proc.c
@@ -96,7 +96,7 @@ nubus_proc_alloc_pde_data(unsigned char *ptr, unsigned int size)
{
struct nubus_proc_pde_data *pded;
- pded = kmalloc_obj(*pded, GFP_KERNEL);
+ pded = kmalloc_obj(*pded);
if (!pded)
return NULL;
diff --git a/drivers/nvdimm/badrange.c b/drivers/nvdimm/badrange.c
index 7d2422f72e66..551cb0691856 100644
--- a/drivers/nvdimm/badrange.c
+++ b/drivers/nvdimm/badrange.c
@@ -50,7 +50,7 @@ static int add_badrange(struct badrange *badrange, u64 addr, u64 length)
struct badrange_entry *bre, *bre_new;
spin_unlock(&badrange->lock);
- bre_new = kzalloc_obj(*bre_new, GFP_KERNEL);
+ bre_new = kzalloc_obj(*bre_new);
spin_lock(&badrange->lock);
if (list_empty(&badrange->list)) {
diff --git a/drivers/nvdimm/btt.c b/drivers/nvdimm/btt.c
index c47785274d3a..afbefc5f49bc 100644
--- a/drivers/nvdimm/btt.c
+++ b/drivers/nvdimm/btt.c
@@ -751,7 +751,7 @@ static struct arena_info *alloc_arena(struct btt *btt, size_t size,
u64 logsize, mapsize, datasize;
u64 available = size;
- arena = kzalloc_obj(*arena, GFP_KERNEL);
+ arena = kzalloc_obj(*arena);
if (!arena)
return NULL;
arena->nd_btt = btt->nd_btt;
@@ -854,7 +854,7 @@ static int discover_arenas(struct btt *btt)
size_t cur_off = 0;
int num_arenas = 0;
- struct btt_sb *super __free(kfree) = kzalloc_obj(*super, GFP_KERNEL);
+ struct btt_sb *super __free(kfree) = kzalloc_obj(*super);
if (!super)
return -ENOMEM;
diff --git a/drivers/nvdimm/btt_devs.c b/drivers/nvdimm/btt_devs.c
index ab9d0ad53724..d6b2f157368f 100644
--- a/drivers/nvdimm/btt_devs.c
+++ b/drivers/nvdimm/btt_devs.c
@@ -180,7 +180,7 @@ static struct device *__nd_btt_create(struct nd_region *nd_region,
struct nd_btt *nd_btt;
struct device *dev;
- nd_btt = kzalloc_obj(*nd_btt, GFP_KERNEL);
+ nd_btt = kzalloc_obj(*nd_btt);
if (!nd_btt)
return NULL;
diff --git a/drivers/nvdimm/bus.c b/drivers/nvdimm/bus.c
index 767a4f1e27e5..bd9621d3f73c 100644
--- a/drivers/nvdimm/bus.c
+++ b/drivers/nvdimm/bus.c
@@ -336,7 +336,7 @@ struct nvdimm_bus *nvdimm_bus_register(struct device *parent,
struct nvdimm_bus *nvdimm_bus;
int rc;
- nvdimm_bus = kzalloc_obj(*nvdimm_bus, GFP_KERNEL);
+ nvdimm_bus = kzalloc_obj(*nvdimm_bus);
if (!nvdimm_bus)
return NULL;
INIT_LIST_HEAD(&nvdimm_bus->list);
@@ -736,7 +736,7 @@ int nvdimm_bus_create_ndctl(struct nvdimm_bus *nvdimm_bus)
struct device *dev;
int rc;
- dev = kzalloc_obj(*dev, GFP_KERNEL);
+ dev = kzalloc_obj(*dev);
if (!dev)
return -ENOMEM;
device_initialize(dev);
diff --git a/drivers/nvdimm/core.c b/drivers/nvdimm/core.c
index 5c2e4160e6ae..34bd886c04a6 100644
--- a/drivers/nvdimm/core.c
+++ b/drivers/nvdimm/core.c
@@ -80,7 +80,7 @@ static struct nvdimm_map *alloc_nvdimm_map(struct device *dev,
struct nvdimm_bus *nvdimm_bus = walk_to_nvdimm_bus(dev);
struct nvdimm_map *nvdimm_map;
- nvdimm_map = kzalloc_obj(*nvdimm_map, GFP_KERNEL);
+ nvdimm_map = kzalloc_obj(*nvdimm_map);
if (!nvdimm_map)
return NULL;
diff --git a/drivers/nvdimm/dax_devs.c b/drivers/nvdimm/dax_devs.c
index 6d25a7fbf751..decc70f2fe3f 100644
--- a/drivers/nvdimm/dax_devs.c
+++ b/drivers/nvdimm/dax_devs.c
@@ -50,7 +50,7 @@ static struct nd_dax *nd_dax_alloc(struct nd_region *nd_region)
struct nd_dax *nd_dax;
struct device *dev;
- nd_dax = kzalloc_obj(*nd_dax, GFP_KERNEL);
+ nd_dax = kzalloc_obj(*nd_dax);
if (!nd_dax)
return NULL;
diff --git a/drivers/nvdimm/dimm.c b/drivers/nvdimm/dimm.c
index f7c7ecee80a7..addbd149a9c1 100644
--- a/drivers/nvdimm/dimm.c
+++ b/drivers/nvdimm/dimm.c
@@ -39,7 +39,7 @@ static int nvdimm_probe(struct device *dev)
*/
nvdimm_clear_locked(dev);
- ndd = kzalloc_obj(*ndd, GFP_KERNEL);
+ ndd = kzalloc_obj(*ndd);
if (!ndd)
return -ENOMEM;
diff --git a/drivers/nvdimm/dimm_devs.c b/drivers/nvdimm/dimm_devs.c
index c0366fd5d6a0..81daeb4d11a9 100644
--- a/drivers/nvdimm/dimm_devs.c
+++ b/drivers/nvdimm/dimm_devs.c
@@ -575,7 +575,7 @@ struct nvdimm *__nvdimm_create(struct nvdimm_bus *nvdimm_bus,
const struct nvdimm_security_ops *sec_ops,
const struct nvdimm_fw_ops *fw_ops)
{
- struct nvdimm *nvdimm = kzalloc_obj(*nvdimm, GFP_KERNEL);
+ struct nvdimm *nvdimm = kzalloc_obj(*nvdimm);
struct device *dev;
if (!nvdimm)
diff --git a/drivers/nvdimm/label.c b/drivers/nvdimm/label.c
index e370eaf17099..4218e3ac4a2a 100644
--- a/drivers/nvdimm/label.c
+++ b/drivers/nvdimm/label.c
@@ -982,7 +982,7 @@ static int init_labels(struct nd_mapping *nd_mapping, int num_labels)
* they can be garbage collected after writing the new labels.
*/
for (i = old_num_labels; i < num_labels; i++) {
- label_ent = kzalloc_obj(*label_ent, GFP_KERNEL);
+ label_ent = kzalloc_obj(*label_ent);
if (!label_ent)
return -ENOMEM;
mutex_lock(&nd_mapping->lock);
diff --git a/drivers/nvdimm/namespace_devs.c b/drivers/nvdimm/namespace_devs.c
index 6f2cd7d32467..557fe0cb43e2 100644
--- a/drivers/nvdimm/namespace_devs.c
+++ b/drivers/nvdimm/namespace_devs.c
@@ -1530,11 +1530,11 @@ static struct device **create_namespace_io(struct nd_region *nd_region)
struct device *dev, **devs;
struct resource *res;
- nsio = kzalloc_obj(*nsio, GFP_KERNEL);
+ nsio = kzalloc_obj(*nsio);
if (!nsio)
return NULL;
- devs = kzalloc_objs(struct device *, 2, GFP_KERNEL);
+ devs = kzalloc_objs(struct device *, 2);
if (!devs) {
kfree(nsio);
return NULL;
@@ -1693,7 +1693,7 @@ static struct device *create_namespace_pmem(struct nd_region *nd_region,
nsl_uuid_raw(ndd, nd_label));
}
- nspm = kzalloc_obj(*nspm, GFP_KERNEL);
+ nspm = kzalloc_obj(*nspm);
if (!nspm)
return ERR_PTR(-ENOMEM);
@@ -1797,7 +1797,7 @@ static struct device *nd_namespace_pmem_create(struct nd_region *nd_region)
if (!is_memory(&nd_region->dev))
return NULL;
- nspm = kzalloc_obj(*nspm, GFP_KERNEL);
+ nspm = kzalloc_obj(*nspm);
if (!nspm)
return NULL;
@@ -1931,7 +1931,7 @@ static struct device **scan_labels(struct nd_region *nd_region)
struct nvdimm_drvdata *ndd = to_ndd(nd_mapping);
resource_size_t map_end = nd_mapping->start + nd_mapping->size - 1;
- devs = kzalloc_objs(dev, 2, GFP_KERNEL);
+ devs = kzalloc_objs(dev, 2);
if (!devs)
return NULL;
@@ -1954,7 +1954,7 @@ static struct device **scan_labels(struct nd_region *nd_region)
if (i < count)
continue;
if (count) {
- __devs = kzalloc_objs(dev, count + 2, GFP_KERNEL);
+ __devs = kzalloc_objs(dev, count + 2);
if (!__devs)
goto err;
memcpy(__devs, devs, sizeof(dev) * count);
@@ -1984,7 +1984,7 @@ static struct device **scan_labels(struct nd_region *nd_region)
/* Publish a zero-sized namespace for userspace to configure. */
nd_mapping_free_labels(nd_mapping);
- nspm = kzalloc_obj(*nspm, GFP_KERNEL);
+ nspm = kzalloc_obj(*nspm);
if (!nspm)
goto err;
dev = &nspm->nsio.common.dev;
@@ -2118,7 +2118,7 @@ static int init_active_labels(struct nd_region *nd_region)
for (j = 0; j < count; j++) {
struct nd_namespace_label *label;
- label_ent = kzalloc_obj(*label_ent, GFP_KERNEL);
+ label_ent = kzalloc_obj(*label_ent);
if (!label_ent)
break;
label = nd_label_active(ndd, j);
diff --git a/drivers/nvdimm/nd_perf.c b/drivers/nvdimm/nd_perf.c
index 5338a440890b..9bd8dff3d35a 100644
--- a/drivers/nvdimm/nd_perf.c
+++ b/drivers/nvdimm/nd_perf.c
@@ -184,7 +184,7 @@ static int create_cpumask_attr_group(struct nvdimm_pmu *nd_pmu)
struct attribute **attrs_group;
struct attribute_group *nvdimm_pmu_cpumask_group;
- pmu_events_attr = kzalloc_obj(*pmu_events_attr, GFP_KERNEL);
+ pmu_events_attr = kzalloc_obj(*pmu_events_attr);
if (!pmu_events_attr)
return -ENOMEM;
diff --git a/drivers/nvdimm/nd_virtio.c b/drivers/nvdimm/nd_virtio.c
index e70aee4ef7a9..4176046627be 100644
--- a/drivers/nvdimm/nd_virtio.c
+++ b/drivers/nvdimm/nd_virtio.c
@@ -55,7 +55,7 @@ static int virtio_pmem_flush(struct nd_region *nd_region)
return -EIO;
}
- req_data = kmalloc_obj(*req_data, GFP_KERNEL);
+ req_data = kmalloc_obj(*req_data);
if (!req_data)
return -ENOMEM;
diff --git a/drivers/nvdimm/of_pmem.c b/drivers/nvdimm/of_pmem.c
index f78aede2aab5..776b7778a12e 100644
--- a/drivers/nvdimm/of_pmem.c
+++ b/drivers/nvdimm/of_pmem.c
@@ -26,7 +26,7 @@ static int of_pmem_region_probe(struct platform_device *pdev)
if (!np)
return -ENXIO;
- priv = kzalloc_obj(*priv, GFP_KERNEL);
+ priv = kzalloc_obj(*priv);
if (!priv)
return -ENOMEM;
diff --git a/drivers/nvdimm/pfn_devs.c b/drivers/nvdimm/pfn_devs.c
index 5d1e1c214847..8fa9c16aba7e 100644
--- a/drivers/nvdimm/pfn_devs.c
+++ b/drivers/nvdimm/pfn_devs.c
@@ -311,7 +311,7 @@ static struct nd_pfn *nd_pfn_alloc(struct nd_region *nd_region)
struct nd_pfn *nd_pfn;
struct device *dev;
- nd_pfn = kzalloc_obj(*nd_pfn, GFP_KERNEL);
+ nd_pfn = kzalloc_obj(*nd_pfn);
if (!nd_pfn)
return NULL;
diff --git a/drivers/nvdimm/ramdax.c b/drivers/nvdimm/ramdax.c
index 8d6cfffbb56c..e76fca736d76 100644
--- a/drivers/nvdimm/ramdax.c
+++ b/drivers/nvdimm/ramdax.c
@@ -40,7 +40,7 @@ static int ramdax_register_region(struct resource *res,
struct nd_interleave_set *nd_set;
int nid = phys_to_target_node(res->start);
- nd_set = kzalloc_obj(*nd_set, GFP_KERNEL);
+ nd_set = kzalloc_obj(*nd_set);
if (!nd_set)
return -ENOMEM;
@@ -80,7 +80,7 @@ static int ramdax_register_dimm(struct resource *res, void *data)
struct ramdax_dimm *dimm;
int err;
- dimm = kzalloc_obj(*dimm, GFP_KERNEL);
+ dimm = kzalloc_obj(*dimm);
if (!dimm)
return -ENOMEM;
diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c
index fe05fb76afe6..f5ebcaa2f859 100644
--- a/drivers/nvme/host/core.c
+++ b/drivers/nvme/host/core.c
@@ -1469,7 +1469,7 @@ static int nvme_identify_ctrl(struct nvme_ctrl *dev, struct nvme_id_ctrl **id)
c.identify.opcode = nvme_admin_identify;
c.identify.cns = NVME_ID_CNS_CTRL;
- *id = kmalloc_obj(struct nvme_id_ctrl, GFP_KERNEL);
+ *id = kmalloc_obj(struct nvme_id_ctrl);
if (!*id)
return -ENOMEM;
@@ -1599,7 +1599,7 @@ int nvme_identify_ns(struct nvme_ctrl *ctrl, unsigned nsid,
c.identify.nsid = cpu_to_le32(nsid);
c.identify.cns = NVME_ID_CNS_NS;
- *id = kmalloc_obj(**id, GFP_KERNEL);
+ *id = kmalloc_obj(**id);
if (!*id)
return -ENOMEM;
@@ -1663,7 +1663,7 @@ static int nvme_ns_info_from_id_cs_indep(struct nvme_ctrl *ctrl,
};
int ret;
- id = kmalloc_obj(*id, GFP_KERNEL);
+ id = kmalloc_obj(*id);
if (!id)
return -ENOMEM;
@@ -1923,7 +1923,7 @@ static int nvme_identify_ns_nvm(struct nvme_ctrl *ctrl, unsigned int nsid,
struct nvme_id_ns_nvm *nvm;
int ret;
- nvm = kzalloc_obj(*nvm, GFP_KERNEL);
+ nvm = kzalloc_obj(*nvm);
if (!nvm)
return -ENOMEM;
@@ -2784,7 +2784,7 @@ static int nvme_configure_host_options(struct nvme_ctrl *ctrl)
if (!acre && !lbafee)
return 0;
- host = kzalloc_obj(*host, GFP_KERNEL);
+ host = kzalloc_obj(*host);
if (!host)
return 0;
@@ -2873,7 +2873,7 @@ static int nvme_configure_apst(struct nvme_ctrl *ctrl)
return 0;
}
- table = kzalloc_obj(*table, GFP_KERNEL);
+ table = kzalloc_obj(*table);
if (!table)
return 0;
@@ -3208,7 +3208,7 @@ static int nvme_init_subsystem(struct nvme_ctrl *ctrl, struct nvme_id_ctrl *id)
struct nvme_subsystem *subsys, *found;
int ret;
- subsys = kzalloc_obj(*subsys, GFP_KERNEL);
+ subsys = kzalloc_obj(*subsys);
if (!subsys)
return -ENOMEM;
@@ -3326,7 +3326,7 @@ static int nvme_get_effects_log(struct nvme_ctrl *ctrl, u8 csi,
if (cel)
goto out;
- cel = kzalloc_obj(*cel, GFP_KERNEL);
+ cel = kzalloc_obj(*cel);
if (!cel)
return -ENOMEM;
@@ -3379,7 +3379,7 @@ static int nvme_init_non_mdts_limits(struct nvme_ctrl *ctrl)
test_bit(NVME_CTRL_SKIP_ID_CNS_CS, &ctrl->flags))
return 0;
- id = kzalloc_obj(*id, GFP_KERNEL);
+ id = kzalloc_obj(*id);
if (!id)
return -ENOMEM;
@@ -3408,7 +3408,7 @@ static int nvme_init_effects_log(struct nvme_ctrl *ctrl,
{
struct nvme_effects_log *effects, *old;
- effects = kzalloc_obj(*effects, GFP_KERNEL);
+ effects = kzalloc_obj(*effects);
if (!effects)
return -ENOMEM;
@@ -4688,7 +4688,7 @@ static void nvme_get_fw_slot_info(struct nvme_ctrl *ctrl)
struct nvme_fw_slot_info_log *log;
u8 next_fw_slot, cur_fw_slot;
- log = kmalloc_obj(*log, GFP_KERNEL);
+ log = kmalloc_obj(*log);
if (!log)
return;
diff --git a/drivers/nvme/host/fabrics.c b/drivers/nvme/host/fabrics.c
index b4e4bdea1db0..5fe09e327b3d 100644
--- a/drivers/nvme/host/fabrics.c
+++ b/drivers/nvme/host/fabrics.c
@@ -26,7 +26,7 @@ static struct nvmf_host *nvmf_host_alloc(const char *hostnqn, uuid_t *id)
{
struct nvmf_host *host;
- host = kmalloc_obj(*host, GFP_KERNEL);
+ host = kmalloc_obj(*host);
if (!host)
return NULL;
@@ -396,7 +396,7 @@ static struct nvmf_connect_data *nvmf_connect_data_prep(struct nvme_ctrl *ctrl,
{
struct nvmf_connect_data *data;
- data = kzalloc_obj(*data, GFP_KERNEL);
+ data = kzalloc_obj(*data);
if (!data)
return NULL;
@@ -1312,7 +1312,7 @@ nvmf_create_ctrl(struct device *dev, const char *buf)
struct nvme_ctrl *ctrl;
int ret;
- opts = kzalloc_obj(*opts, GFP_KERNEL);
+ opts = kzalloc_obj(*opts);
if (!opts)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/nvme/host/fc.c b/drivers/nvme/host/fc.c
index 0b65d1bab4c1..d839824b4e8d 100644
--- a/drivers/nvme/host/fc.c
+++ b/drivers/nvme/host/fc.c
@@ -1724,15 +1724,15 @@ nvme_fc_rcv_ls_req(struct nvme_fc_remote_port *portptr,
goto out_put;
}
- lsop = kzalloc_obj(*lsop, GFP_KERNEL);
+ lsop = kzalloc_obj(*lsop);
if (!lsop) {
nvme_fc_rcv_ls_req_err_msg(lport, w0);
ret = -ENOMEM;
goto out_put;
}
- lsop->rqstbuf = kzalloc_obj(*lsop->rqstbuf, GFP_KERNEL);
- lsop->rspbuf = kzalloc_obj(*lsop->rspbuf, GFP_KERNEL);
+ lsop->rqstbuf = kzalloc_obj(*lsop->rqstbuf);
+ lsop->rspbuf = kzalloc_obj(*lsop->rspbuf);
if (!lsop->rqstbuf || !lsop->rspbuf) {
nvme_fc_rcv_ls_req_err_msg(lport, w0);
ret = -ENOMEM;
@@ -3443,7 +3443,7 @@ nvme_fc_alloc_ctrl(struct device *dev, struct nvmf_ctrl_options *opts,
goto out_fail;
}
- ctrl = kzalloc_obj(*ctrl, GFP_KERNEL);
+ ctrl = kzalloc_obj(*ctrl);
if (!ctrl) {
ret = -ENOMEM;
goto out_fail;
diff --git a/drivers/nvme/host/hwmon.c b/drivers/nvme/host/hwmon.c
index c60bd960f03a..406203d8b9ad 100644
--- a/drivers/nvme/host/hwmon.c
+++ b/drivers/nvme/host/hwmon.c
@@ -230,11 +230,11 @@ int nvme_hwmon_init(struct nvme_ctrl *ctrl)
struct device *hwmon;
int err;
- data = kzalloc_obj(*data, GFP_KERNEL);
+ data = kzalloc_obj(*data);
if (!data)
return -ENOMEM;
- data->log = kzalloc_obj(*data->log, GFP_KERNEL);
+ data->log = kzalloc_obj(*data->log);
if (!data->log) {
err = -ENOMEM;
goto err_free_data;
diff --git a/drivers/nvme/host/pci.c b/drivers/nvme/host/pci.c
index 89b5095d1b2e..2f0c05719316 100644
--- a/drivers/nvme/host/pci.c
+++ b/drivers/nvme/host/pci.c
@@ -2447,7 +2447,7 @@ static int nvme_alloc_host_mem_multi(struct nvme_dev *dev, u64 preferred,
if (!descs)
goto out;
- bufs = kzalloc_objs(*bufs, max_entries, GFP_KERNEL);
+ bufs = kzalloc_objs(*bufs, max_entries);
if (!bufs)
goto out_free_descs;
diff --git a/drivers/nvme/host/rdma.c b/drivers/nvme/host/rdma.c
index 718bbc9b87c1..1bf73073c814 100644
--- a/drivers/nvme/host/rdma.c
+++ b/drivers/nvme/host/rdma.c
@@ -215,7 +215,7 @@ static struct nvme_rdma_qe *nvme_rdma_alloc_ring(struct ib_device *ibdev,
struct nvme_rdma_qe *ring;
int i;
- ring = kzalloc_objs(struct nvme_rdma_qe, ib_queue_size, GFP_KERNEL);
+ ring = kzalloc_objs(struct nvme_rdma_qe, ib_queue_size);
if (!ring)
return NULL;
@@ -300,7 +300,7 @@ static int nvme_rdma_init_request(struct blk_mq_tag_set *set,
struct nvme_rdma_queue *queue = &ctrl->queues[queue_idx];
nvme_req(rq)->ctrl = &ctrl->ctrl;
- req->sqe.data = kzalloc_obj(struct nvme_command, GFP_KERNEL);
+ req->sqe.data = kzalloc_obj(struct nvme_command);
if (!req->sqe.data)
return -ENOMEM;
@@ -375,7 +375,7 @@ nvme_rdma_find_get_device(struct rdma_cm_id *cm_id)
goto out_unlock;
}
- ndev = kzalloc_obj(*ndev, GFP_KERNEL);
+ ndev = kzalloc_obj(*ndev);
if (!ndev)
goto out_err;
@@ -2240,7 +2240,7 @@ static struct nvme_rdma_ctrl *nvme_rdma_alloc_ctrl(struct device *dev,
struct nvme_rdma_ctrl *ctrl;
int ret;
- ctrl = kzalloc_obj(*ctrl, GFP_KERNEL);
+ ctrl = kzalloc_obj(*ctrl);
if (!ctrl)
return ERR_PTR(-ENOMEM);
ctrl->ctrl.opts = opts;
diff --git a/drivers/nvme/host/tcp.c b/drivers/nvme/host/tcp.c
index 489102bdd057..62fe19dd2809 100644
--- a/drivers/nvme/host/tcp.c
+++ b/drivers/nvme/host/tcp.c
@@ -1467,11 +1467,11 @@ static int nvme_tcp_init_connection(struct nvme_tcp_queue *queue)
u32 maxh2cdata;
int ret;
- icreq = kzalloc_obj(*icreq, GFP_KERNEL);
+ icreq = kzalloc_obj(*icreq);
if (!icreq)
return -ENOMEM;
- icresp = kzalloc_obj(*icresp, GFP_KERNEL);
+ icresp = kzalloc_obj(*icresp);
if (!icresp) {
ret = -ENOMEM;
goto free_icreq;
@@ -2891,7 +2891,7 @@ static struct nvme_tcp_ctrl *nvme_tcp_alloc_ctrl(struct device *dev,
struct nvme_tcp_ctrl *ctrl;
int ret;
- ctrl = kzalloc_obj(*ctrl, GFP_KERNEL);
+ ctrl = kzalloc_obj(*ctrl);
if (!ctrl)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/nvme/host/zns.c b/drivers/nvme/host/zns.c
index 68dbe78c90c4..8ed1b6a33454 100644
--- a/drivers/nvme/host/zns.c
+++ b/drivers/nvme/host/zns.c
@@ -13,7 +13,7 @@ static int nvme_set_max_append(struct nvme_ctrl *ctrl)
struct nvme_id_ctrl_zns *id;
int status;
- id = kzalloc_obj(*id, GFP_KERNEL);
+ id = kzalloc_obj(*id);
if (!id)
return -ENOMEM;
@@ -64,7 +64,7 @@ int nvme_query_zone_info(struct nvme_ns *ns, unsigned lbaf,
return status;
}
- id = kzalloc_obj(*id, GFP_KERNEL);
+ id = kzalloc_obj(*id);
if (!id)
return -ENOMEM;
diff --git a/drivers/nvme/target/admin-cmd.c b/drivers/nvme/target/admin-cmd.c
index 431702ff21fb..b8cf9bbb16d4 100644
--- a/drivers/nvme/target/admin-cmd.c
+++ b/drivers/nvme/target/admin-cmd.c
@@ -203,7 +203,7 @@ static void nvmet_execute_get_supported_log_pages(struct nvmet_req *req)
struct nvme_supported_log *logs;
u16 status;
- logs = kzalloc_obj(*logs, GFP_KERNEL);
+ logs = kzalloc_obj(*logs);
if (!logs) {
status = NVME_SC_INTERNAL;
goto out;
@@ -308,7 +308,7 @@ static void nvmet_execute_get_log_page_rmi(struct nvmet_req *req)
goto out;
}
- log = kzalloc_obj(*log, GFP_KERNEL);
+ log = kzalloc_obj(*log);
if (!log)
goto out;
@@ -334,7 +334,7 @@ static void nvmet_execute_get_log_page_smart(struct nvmet_req *req)
if (req->transfer_len != sizeof(*log))
goto out;
- log = kzalloc_obj(*log, GFP_KERNEL);
+ log = kzalloc_obj(*log);
if (!log)
goto out;
@@ -409,7 +409,7 @@ static void nvmet_execute_get_log_cmd_effects_ns(struct nvmet_req *req)
struct nvme_effects_log *log;
u16 status = NVME_SC_SUCCESS;
- log = kzalloc_obj(*log, GFP_KERNEL);
+ log = kzalloc_obj(*log);
if (!log) {
status = NVME_SC_INTERNAL;
goto out;
@@ -504,7 +504,7 @@ static void nvmet_execute_get_log_page_endgrp(struct nvmet_req *req)
if (status)
goto out;
- log = kzalloc_obj(*log, GFP_KERNEL);
+ log = kzalloc_obj(*log);
if (!log) {
status = NVME_SC_INTERNAL;
goto out;
@@ -580,7 +580,7 @@ static void nvmet_execute_get_log_page_features(struct nvmet_req *req)
struct nvme_supported_features_log *features;
u16 status;
- features = kzalloc_obj(*features, GFP_KERNEL);
+ features = kzalloc_obj(*features);
if (!features) {
status = NVME_SC_INTERNAL;
goto out;
@@ -659,7 +659,7 @@ static void nvmet_execute_identify_ctrl(struct nvmet_req *req)
mutex_unlock(&subsys->lock);
}
- id = kzalloc_obj(*id, GFP_KERNEL);
+ id = kzalloc_obj(*id);
if (!id) {
status = NVME_SC_INTERNAL;
goto out;
@@ -808,7 +808,7 @@ static void nvmet_execute_identify_ns(struct nvmet_req *req)
goto out;
}
- id = kzalloc_obj(*id, GFP_KERNEL);
+ id = kzalloc_obj(*id);
if (!id) {
status = NVME_SC_INTERNAL;
goto out;
@@ -1052,7 +1052,7 @@ static void nvme_execute_identify_ns_nvm(struct nvmet_req *req)
if (status)
goto out;
- id = kzalloc_obj(*id, GFP_KERNEL);
+ id = kzalloc_obj(*id);
if (!id) {
status = NVME_SC_INTERNAL;
goto out;
@@ -1072,7 +1072,7 @@ static void nvmet_execute_id_cs_indep(struct nvmet_req *req)
if (status)
goto out;
- id = kzalloc_obj(*id, GFP_KERNEL);
+ id = kzalloc_obj(*id);
if (!id) {
status = NVME_SC_INTERNAL;
goto out;
diff --git a/drivers/nvme/target/configfs.c b/drivers/nvme/target/configfs.c
index 6df2844dcec1..1cb21d74bb56 100644
--- a/drivers/nvme/target/configfs.c
+++ b/drivers/nvme/target/configfs.c
@@ -1040,7 +1040,7 @@ static int nvmet_port_subsys_allow_link(struct config_item *parent,
return -EINVAL;
}
subsys = to_subsys(target);
- link = kmalloc_obj(*link, GFP_KERNEL);
+ link = kmalloc_obj(*link);
if (!link)
return -ENOMEM;
link->subsys = subsys;
@@ -1120,7 +1120,7 @@ static int nvmet_allowed_hosts_allow_link(struct config_item *parent,
}
host = to_host(target);
- link = kmalloc_obj(*link, GFP_KERNEL);
+ link = kmalloc_obj(*link);
if (!link)
return -ENOMEM;
link->host = host;
@@ -1825,7 +1825,7 @@ static struct config_group *nvmet_referral_make(
{
struct nvmet_port *port;
- port = kzalloc_obj(*port, GFP_KERNEL);
+ port = kzalloc_obj(*port);
if (!port)
return ERR_PTR(-ENOMEM);
@@ -1943,7 +1943,7 @@ static struct config_group *nvmet_ana_groups_make_group(
goto out;
ret = -ENOMEM;
- grp = kzalloc_obj(*grp, GFP_KERNEL);
+ grp = kzalloc_obj(*grp);
if (!grp)
goto out;
grp->port = port;
@@ -2022,7 +2022,7 @@ static struct config_group *nvmet_ports_make(struct config_group *group,
if (kstrtou16(name, 0, &portid))
return ERR_PTR(-EINVAL);
- port = kzalloc_obj(*port, GFP_KERNEL);
+ port = kzalloc_obj(*port);
if (!port)
return ERR_PTR(-ENOMEM);
@@ -2257,7 +2257,7 @@ static struct config_group *nvmet_hosts_make_group(struct config_group *group,
{
struct nvmet_host *host;
- host = kzalloc_obj(*host, GFP_KERNEL);
+ host = kzalloc_obj(*host);
if (!host)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/nvme/target/core.c b/drivers/nvme/target/core.c
index 255a6c9b2548..efc1ad235318 100644
--- a/drivers/nvme/target/core.c
+++ b/drivers/nvme/target/core.c
@@ -194,7 +194,7 @@ void nvmet_add_async_event(struct nvmet_ctrl *ctrl, u8 event_type,
{
struct nvmet_async_event *aen;
- aen = kmalloc_obj(*aen, GFP_KERNEL);
+ aen = kmalloc_obj(*aen);
if (!aen)
return;
@@ -693,7 +693,7 @@ struct nvmet_ns *nvmet_ns_alloc(struct nvmet_subsys *subsys, u32 nsid)
if (subsys->nr_namespaces == NVMET_MAX_NAMESPACES)
goto out_unlock;
- ns = kzalloc_obj(*ns, GFP_KERNEL);
+ ns = kzalloc_obj(*ns);
if (!ns)
goto out_unlock;
@@ -1609,7 +1609,7 @@ struct nvmet_ctrl *nvmet_alloc_ctrl(struct nvmet_alloc_ctrl_args *args)
up_read(&nvmet_config_sem);
args->status = NVME_SC_INTERNAL;
- ctrl = kzalloc_obj(*ctrl, GFP_KERNEL);
+ ctrl = kzalloc_obj(*ctrl);
if (!ctrl)
goto out_put_subsystem;
mutex_init(&ctrl->lock);
@@ -1828,7 +1828,7 @@ struct nvmet_subsys *nvmet_subsys_alloc(const char *subsysnqn,
char serial[NVMET_SN_MAX_SIZE / 2];
int ret;
- subsys = kzalloc_obj(*subsys, GFP_KERNEL);
+ subsys = kzalloc_obj(*subsys);
if (!subsys)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/nvme/target/discovery.c b/drivers/nvme/target/discovery.c
index 8a4a33f82177..e9b35549e254 100644
--- a/drivers/nvme/target/discovery.c
+++ b/drivers/nvme/target/discovery.c
@@ -263,7 +263,7 @@ static void nvmet_execute_disc_identify(struct nvmet_req *req)
goto out;
}
- id = kzalloc_obj(*id, GFP_KERNEL);
+ id = kzalloc_obj(*id);
if (!id) {
status = NVME_SC_INTERNAL;
goto out;
diff --git a/drivers/nvme/target/fabrics-cmd.c b/drivers/nvme/target/fabrics-cmd.c
index 5c0a1a3dd5b6..7cadd1c9e44c 100644
--- a/drivers/nvme/target/fabrics-cmd.c
+++ b/drivers/nvme/target/fabrics-cmd.c
@@ -280,7 +280,7 @@ static void nvmet_execute_admin_connect(struct nvmet_req *req)
if (!nvmet_check_transfer_len(req, sizeof(struct nvmf_connect_data)))
return;
- d = kmalloc_obj(*d, GFP_KERNEL);
+ d = kmalloc_obj(*d);
if (!d) {
args.status = NVME_SC_INTERNAL;
goto complete;
@@ -344,7 +344,7 @@ static void nvmet_execute_io_connect(struct nvmet_req *req)
if (!nvmet_check_transfer_len(req, sizeof(struct nvmf_connect_data)))
return;
- d = kmalloc_obj(*d, GFP_KERNEL);
+ d = kmalloc_obj(*d);
if (!d) {
status = NVME_SC_INTERNAL;
goto complete;
diff --git a/drivers/nvme/target/fc.c b/drivers/nvme/target/fc.c
index 69ab0830313d..a867a16092ea 100644
--- a/drivers/nvme/target/fc.c
+++ b/drivers/nvme/target/fc.c
@@ -1034,7 +1034,7 @@ nvmet_fc_alloc_hostport(struct nvmet_fc_tgtport *tgtport, void *hosthandle)
if (match)
return match;
- newhost = kzalloc_obj(*newhost, GFP_KERNEL);
+ newhost = kzalloc_obj(*newhost);
if (!newhost)
return ERR_PTR(-ENOMEM);
@@ -1116,7 +1116,7 @@ nvmet_fc_alloc_target_assoc(struct nvmet_fc_tgtport *tgtport, void *hosthandle)
if (!tgtport->pe)
return NULL;
- assoc = kzalloc_obj(*assoc, GFP_KERNEL);
+ assoc = kzalloc_obj(*assoc);
if (!assoc)
return NULL;
@@ -2717,7 +2717,7 @@ nvmet_fc_rcv_fcp_req(struct nvmet_fc_target_port *target_port,
spin_unlock_irqrestore(&queue->qlock, flags);
/* Now we need to dynamically allocate one */
- deferfcp = kmalloc_obj(*deferfcp, GFP_KERNEL);
+ deferfcp = kmalloc_obj(*deferfcp);
if (!deferfcp) {
/* release the queue lookup reference */
nvmet_fc_tgt_q_put(queue);
@@ -2882,7 +2882,7 @@ nvmet_fc_add_port(struct nvmet_port *port)
if (ret)
return ret;
- pe = kzalloc_obj(*pe, GFP_KERNEL);
+ pe = kzalloc_obj(*pe);
if (!pe)
return -ENOMEM;
diff --git a/drivers/nvme/target/fcloop.c b/drivers/nvme/target/fcloop.c
index 8473e41e5856..866048f07e61 100644
--- a/drivers/nvme/target/fcloop.c
+++ b/drivers/nvme/target/fcloop.c
@@ -559,7 +559,7 @@ fcloop_tgt_discovery_evt(struct nvmet_fc_target_port *tgtport)
{
struct fcloop_rscn *tgt_rscn;
- tgt_rscn = kzalloc_obj(*tgt_rscn, GFP_KERNEL);
+ tgt_rscn = kzalloc_obj(*tgt_rscn);
if (!tgt_rscn)
return;
@@ -1194,11 +1194,11 @@ fcloop_create_local_port(struct device *dev, struct device_attribute *attr,
unsigned long flags;
int ret = -ENOMEM;
- lport = kzalloc_obj(*lport, GFP_KERNEL);
+ lport = kzalloc_obj(*lport);
if (!lport)
return -ENOMEM;
- opts = kzalloc_obj(*opts, GFP_KERNEL);
+ opts = kzalloc_obj(*opts);
if (!opts)
goto out_free_lport;
@@ -1345,7 +1345,7 @@ fcloop_alloc_nport(const char *buf, size_t count, bool remoteport)
u32 opts_mask = (remoteport) ? RPORT_OPTS : TGTPORT_OPTS;
int ret;
- opts = kzalloc_obj(*opts, GFP_KERNEL);
+ opts = kzalloc_obj(*opts);
if (!opts)
return NULL;
@@ -1357,7 +1357,7 @@ fcloop_alloc_nport(const char *buf, size_t count, bool remoteport)
if ((opts->mask & opts_mask) != opts_mask)
goto out_free_opts;
- newnport = kzalloc_obj(*newnport, GFP_KERNEL);
+ newnport = kzalloc_obj(*newnport);
if (!newnport)
goto out_free_opts;
diff --git a/drivers/nvme/target/io-cmd-file.c b/drivers/nvme/target/io-cmd-file.c
index 6e810a91e6c5..0b22d183f927 100644
--- a/drivers/nvme/target/io-cmd-file.c
+++ b/drivers/nvme/target/io-cmd-file.c
@@ -228,7 +228,7 @@ static void nvmet_file_execute_rw(struct nvmet_req *req)
}
if (nr_bvec > NVMET_MAX_INLINE_BIOVEC)
- req->f.bvec = kmalloc_objs(struct bio_vec, nr_bvec, GFP_KERNEL);
+ req->f.bvec = kmalloc_objs(struct bio_vec, nr_bvec);
else
req->f.bvec = req->inline_bvec;
diff --git a/drivers/nvme/target/loop.c b/drivers/nvme/target/loop.c
index 575c5c31ea29..db09382c38f3 100644
--- a/drivers/nvme/target/loop.c
+++ b/drivers/nvme/target/loop.c
@@ -565,7 +565,7 @@ static struct nvme_ctrl *nvme_loop_create_ctrl(struct device *dev,
struct nvme_loop_ctrl *ctrl;
int ret;
- ctrl = kzalloc_obj(*ctrl, GFP_KERNEL);
+ ctrl = kzalloc_obj(*ctrl);
if (!ctrl)
return ERR_PTR(-ENOMEM);
ctrl->ctrl.opts = opts;
diff --git a/drivers/nvme/target/passthru.c b/drivers/nvme/target/passthru.c
index bac8b8f864ce..e27f84e3cf2b 100644
--- a/drivers/nvme/target/passthru.c
+++ b/drivers/nvme/target/passthru.c
@@ -86,7 +86,7 @@ static u16 nvmet_passthru_override_id_ctrl(struct nvmet_req *req)
unsigned int max_hw_sectors;
int page_shift;
- id = kzalloc_obj(*id, GFP_KERNEL);
+ id = kzalloc_obj(*id);
if (!id)
return NVME_SC_INTERNAL;
@@ -178,7 +178,7 @@ static u16 nvmet_passthru_override_id_ns(struct nvmet_req *req)
struct nvme_id_ns *id;
int i;
- id = kzalloc_obj(*id, GFP_KERNEL);
+ id = kzalloc_obj(*id);
if (!id)
return NVME_SC_INTERNAL;
diff --git a/drivers/nvme/target/pr.c b/drivers/nvme/target/pr.c
index 254960a844ac..c71ae46244ff 100644
--- a/drivers/nvme/target/pr.c
+++ b/drivers/nvme/target/pr.c
@@ -230,7 +230,7 @@ static u16 nvmet_pr_register(struct nvmet_req *req,
u16 status = NVME_SC_SUCCESS;
u64 nrkey = le64_to_cpu(d->nrkey);
- new = kmalloc_obj(*new, GFP_KERNEL);
+ new = kmalloc_obj(*new);
if (!new)
return NVME_SC_INTERNAL;
@@ -380,7 +380,7 @@ static void nvmet_execute_pr_register(struct nvmet_req *req)
u8 reg_act = cdw10 & 0x07; /* Reservation Register Action, bit 02:00 */
u16 status;
- d = kmalloc_obj(*d, GFP_KERNEL);
+ d = kmalloc_obj(*d);
if (!d) {
status = NVME_SC_INTERNAL;
goto out;
@@ -662,7 +662,7 @@ static void nvmet_execute_pr_acquire(struct nvmet_req *req)
goto out;
}
- d = kmalloc_obj(*d, GFP_KERNEL);
+ d = kmalloc_obj(*d);
if (!d) {
status = NVME_SC_INTERNAL;
goto out;
@@ -773,7 +773,7 @@ static void nvmet_execute_pr_release(struct nvmet_req *req)
goto out;
}
- d = kmalloc_obj(*d, GFP_KERNEL);
+ d = kmalloc_obj(*d);
if (!d) {
status = NVME_SC_INTERNAL;
goto out;
diff --git a/drivers/nvme/target/rdma.c b/drivers/nvme/target/rdma.c
index ae2e27d9cc07..2d6eb89f98af 100644
--- a/drivers/nvme/target/rdma.c
+++ b/drivers/nvme/target/rdma.c
@@ -222,7 +222,7 @@ nvmet_rdma_get_rsp(struct nvmet_rdma_queue *queue)
if (unlikely(!rsp)) {
int ret;
- rsp = kzalloc_obj(*rsp, GFP_KERNEL);
+ rsp = kzalloc_obj(*rsp);
if (unlikely(!rsp))
return NULL;
ret = nvmet_rdma_alloc_rsp(queue->dev, rsp,
@@ -317,7 +317,7 @@ static int nvmet_rdma_alloc_cmd(struct nvmet_rdma_device *ndev,
struct nvmet_rdma_cmd *c, bool admin)
{
/* NVMe command / RDMA RECV */
- c->nvme_cmd = kmalloc_obj(*c->nvme_cmd, GFP_KERNEL);
+ c->nvme_cmd = kmalloc_obj(*c->nvme_cmd);
if (!c->nvme_cmd)
goto out;
@@ -367,7 +367,7 @@ nvmet_rdma_alloc_cmds(struct nvmet_rdma_device *ndev,
struct nvmet_rdma_cmd *cmds;
int ret = -EINVAL, i;
- cmds = kvzalloc_objs(struct nvmet_rdma_cmd, nr_cmds, GFP_KERNEL);
+ cmds = kvzalloc_objs(struct nvmet_rdma_cmd, nr_cmds);
if (!cmds)
goto out;
@@ -401,7 +401,7 @@ static int nvmet_rdma_alloc_rsp(struct nvmet_rdma_device *ndev,
struct nvmet_rdma_rsp *r, int tag)
{
/* NVMe CQE / RDMA SEND */
- r->req.cqe = kmalloc_obj(*r->req.cqe, GFP_KERNEL);
+ r->req.cqe = kmalloc_obj(*r->req.cqe);
if (!r->req.cqe)
goto out;
@@ -455,7 +455,7 @@ nvmet_rdma_alloc_rsps(struct nvmet_rdma_queue *queue)
NUMA_NO_NODE, false, true))
goto out;
- queue->rsps = kvzalloc_objs(struct nvmet_rdma_rsp, nr_rsps, GFP_KERNEL);
+ queue->rsps = kvzalloc_objs(struct nvmet_rdma_rsp, nr_rsps);
if (!queue->rsps)
goto out_free_sbitmap;
@@ -1095,7 +1095,7 @@ nvmet_rdma_init_srq(struct nvmet_rdma_device *ndev)
struct ib_srq *srq;
int ret, i;
- nsrq = kzalloc_obj(*nsrq, GFP_KERNEL);
+ nsrq = kzalloc_obj(*nsrq);
if (!nsrq)
return ERR_PTR(-ENOMEM);
@@ -1154,7 +1154,7 @@ static int nvmet_rdma_init_srqs(struct nvmet_rdma_device *ndev)
ndev->srq_count = min(ndev->device->num_comp_vectors,
ndev->device->attrs.max_srq);
- ndev->srqs = kzalloc_objs(*ndev->srqs, ndev->srq_count, GFP_KERNEL);
+ ndev->srqs = kzalloc_objs(*ndev->srqs, ndev->srq_count);
if (!ndev->srqs)
return -ENOMEM;
@@ -1207,7 +1207,7 @@ nvmet_rdma_find_get_device(struct rdma_cm_id *cm_id)
goto out_unlock;
}
- ndev = kzalloc_obj(*ndev, GFP_KERNEL);
+ ndev = kzalloc_obj(*ndev);
if (!ndev)
goto out_err;
@@ -1429,7 +1429,7 @@ nvmet_rdma_alloc_queue(struct nvmet_rdma_device *ndev,
struct nvmet_rdma_queue *queue;
int ret;
- queue = kzalloc_obj(*queue, GFP_KERNEL);
+ queue = kzalloc_obj(*queue);
if (!queue) {
ret = NVME_RDMA_CM_NO_RSC;
goto out_reject;
@@ -1923,7 +1923,7 @@ static int nvmet_rdma_add_port(struct nvmet_port *nport)
__kernel_sa_family_t af;
int ret;
- port = kzalloc_obj(*port, GFP_KERNEL);
+ port = kzalloc_obj(*port);
if (!port)
return -ENOMEM;
diff --git a/drivers/nvme/target/tcp.c b/drivers/nvme/target/tcp.c
index ac0a44bfa386..acc71a26733f 100644
--- a/drivers/nvme/target/tcp.c
+++ b/drivers/nvme/target/tcp.c
@@ -439,7 +439,7 @@ static int nvmet_tcp_map_data(struct nvmet_tcp_cmd *cmd)
cmd->cur_sg = cmd->req.sg;
if (nvmet_tcp_has_data_in(cmd)) {
- cmd->iov = kmalloc_objs(*cmd->iov, cmd->req.sg_cnt, GFP_KERNEL);
+ cmd->iov = kmalloc_objs(*cmd->iov, cmd->req.sg_cnt);
if (!cmd->iov)
goto err;
}
@@ -1512,7 +1512,7 @@ static int nvmet_tcp_alloc_cmds(struct nvmet_tcp_queue *queue)
struct nvmet_tcp_cmd *cmds;
int i, ret = -EINVAL, nr_cmds = queue->nr_cmds;
- cmds = kvzalloc_objs(struct nvmet_tcp_cmd, nr_cmds, GFP_KERNEL);
+ cmds = kvzalloc_objs(struct nvmet_tcp_cmd, nr_cmds);
if (!cmds)
goto out;
@@ -1900,7 +1900,7 @@ static void nvmet_tcp_alloc_queue(struct nvmet_tcp_port *port,
struct file *sock_file = NULL;
int ret;
- queue = kzalloc_obj(*queue, GFP_KERNEL);
+ queue = kzalloc_obj(*queue);
if (!queue) {
ret = -ENOMEM;
goto out_release;
@@ -2036,7 +2036,7 @@ static int nvmet_tcp_add_port(struct nvmet_port *nport)
__kernel_sa_family_t af;
int ret;
- port = kzalloc_obj(*port, GFP_KERNEL);
+ port = kzalloc_obj(*port);
if (!port)
return -ENOMEM;
diff --git a/drivers/nvme/target/zns.c b/drivers/nvme/target/zns.c
index e895f6b3a308..aeaf73b54c3a 100644
--- a/drivers/nvme/target/zns.c
+++ b/drivers/nvme/target/zns.c
@@ -73,7 +73,7 @@ void nvmet_execute_identify_ctrl_zns(struct nvmet_req *req)
struct nvme_id_ctrl_zns *id;
u16 status;
- id = kzalloc_obj(*id, GFP_KERNEL);
+ id = kzalloc_obj(*id);
if (!id) {
status = NVME_SC_INTERNAL;
goto out;
@@ -104,7 +104,7 @@ void nvmet_execute_identify_ns_zns(struct nvmet_req *req)
goto out;
}
- id_zns = kzalloc_obj(*id_zns, GFP_KERNEL);
+ id_zns = kzalloc_obj(*id_zns);
if (!id_zns) {
status = NVME_SC_INTERNAL;
goto out;
diff --git a/drivers/nvmem/core.c b/drivers/nvmem/core.c
index 2c838c0b2b7d..311cb2e5a5c0 100644
--- a/drivers/nvmem/core.c
+++ b/drivers/nvmem/core.c
@@ -650,7 +650,7 @@ int nvmem_add_one_cell(struct nvmem_device *nvmem,
struct nvmem_cell_entry *cell;
int rval;
- cell = kzalloc_obj(*cell, GFP_KERNEL);
+ cell = kzalloc_obj(*cell);
if (!cell)
return -ENOMEM;
@@ -908,7 +908,7 @@ struct nvmem_device *nvmem_register(const struct nvmem_config *config)
if (!config->reg_read && !config->reg_write)
return ERR_PTR(-EINVAL);
- nvmem = kzalloc_obj(*nvmem, GFP_KERNEL);
+ nvmem = kzalloc_obj(*nvmem);
if (!nvmem)
return ERR_PTR(-ENOMEM);
@@ -1295,7 +1295,7 @@ static struct nvmem_cell *nvmem_create_cell(struct nvmem_cell_entry *entry,
struct nvmem_cell *cell;
const char *name = NULL;
- cell = kzalloc_obj(*cell, GFP_KERNEL);
+ cell = kzalloc_obj(*cell);
if (!cell)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/nvmem/layouts.c b/drivers/nvmem/layouts.c
index 13d5b9941059..b90584e1b99e 100644
--- a/drivers/nvmem/layouts.c
+++ b/drivers/nvmem/layouts.c
@@ -96,7 +96,7 @@ static int nvmem_layout_create_device(struct nvmem_device *nvmem,
struct device *dev;
int ret;
- layout = kzalloc_obj(*layout, GFP_KERNEL);
+ layout = kzalloc_obj(*layout);
if (!layout)
return -ENOMEM;
diff --git a/drivers/of/address.c b/drivers/of/address.c
index 590d2db007d2..cf4aab11e9b1 100644
--- a/drivers/of/address.c
+++ b/drivers/of/address.c
@@ -929,7 +929,7 @@ int of_dma_get_range(struct device_node *np, const struct bus_dma_region **map)
if (!num_ranges)
return -EINVAL;
- r = kzalloc_objs(*r, num_ranges + 1, GFP_KERNEL);
+ r = kzalloc_objs(*r, num_ranges + 1);
if (!r)
return -ENOMEM;
diff --git a/drivers/of/dynamic.c b/drivers/of/dynamic.c
index 1b3cc351a895..1a06175def37 100644
--- a/drivers/of/dynamic.c
+++ b/drivers/of/dynamic.c
@@ -454,7 +454,7 @@ struct device_node *__of_node_dup(const struct device_node *np,
{
struct device_node *node;
- node = kzalloc_obj(*node, GFP_KERNEL);
+ node = kzalloc_obj(*node);
if (!node)
return NULL;
node->full_name = kstrdup(full_name, GFP_KERNEL);
@@ -908,7 +908,7 @@ int of_changeset_action(struct of_changeset *ocs, unsigned long action,
if (WARN_ON(action >= ARRAY_SIZE(action_names)))
return -EINVAL;
- ce = kzalloc_obj(*ce, GFP_KERNEL);
+ ce = kzalloc_obj(*ce);
if (!ce)
return -ENOMEM;
diff --git a/drivers/of/irq.c b/drivers/of/irq.c
index 55c2de65a13a..6367c67732d2 100644
--- a/drivers/of/irq.c
+++ b/drivers/of/irq.c
@@ -669,7 +669,7 @@ void __init of_irq_init(const struct of_device_id *matches)
* Here, we allocate and populate an of_intc_desc with the node
* pointer, interrupt-parent device_node etc.
*/
- desc = kzalloc_obj(*desc, GFP_KERNEL);
+ desc = kzalloc_obj(*desc);
if (!desc) {
of_node_put(np);
goto err;
diff --git a/drivers/of/of_reserved_mem.c b/drivers/of/of_reserved_mem.c
index 0344c55300b6..1fd28f805610 100644
--- a/drivers/of/of_reserved_mem.c
+++ b/drivers/of/of_reserved_mem.c
@@ -646,7 +646,7 @@ int of_reserved_mem_device_init_by_idx(struct device *dev,
if (!rmem || !rmem->ops || !rmem->ops->device_init)
return -EINVAL;
- rd = kmalloc_obj(struct rmem_assigned_device, GFP_KERNEL);
+ rd = kmalloc_obj(struct rmem_assigned_device);
if (!rd)
return -ENOMEM;
diff --git a/drivers/of/overlay.c b/drivers/of/overlay.c
index 87faec65c865..c1c5686fc7b1 100644
--- a/drivers/of/overlay.c
+++ b/drivers/of/overlay.c
@@ -248,7 +248,7 @@ static struct property *dup_and_fixup_symbol_prop(
return NULL;
target_path_len = strlen(target_path);
- new_prop = kzalloc_obj(*new_prop, GFP_KERNEL);
+ new_prop = kzalloc_obj(*new_prop);
if (!new_prop)
goto err_free_target_path;
@@ -784,7 +784,7 @@ static int init_overlay_changeset(struct overlay_changeset *ovcs,
of_node_put(node);
}
- fragments = kzalloc_objs(*fragments, cnt, GFP_KERNEL);
+ fragments = kzalloc_objs(*fragments, cnt);
if (!fragments) {
ret = -ENOMEM;
goto err_out;
@@ -1009,7 +1009,7 @@ int of_overlay_fdt_apply(const void *overlay_fdt, u32 overlay_fdt_size,
if (overlay_fdt_size < size)
return -EINVAL;
- ovcs = kzalloc_obj(*ovcs, GFP_KERNEL);
+ ovcs = kzalloc_obj(*ovcs);
if (!ovcs)
return -ENOMEM;
diff --git a/drivers/of/platform.c b/drivers/of/platform.c
index d9a717c47ad6..ba591fbceb56 100644
--- a/drivers/of/platform.c
+++ b/drivers/of/platform.c
@@ -111,7 +111,7 @@ struct platform_device *of_device_alloc(struct device_node *np,
/* Populate the resource table */
if (num_reg) {
- res = kzalloc_objs(*res, num_reg, GFP_KERNEL);
+ res = kzalloc_objs(*res, num_reg);
if (!res) {
platform_device_put(dev);
return NULL;
diff --git a/drivers/of/unittest.c b/drivers/of/unittest.c
index a8b70b49e780..2940295843e6 100644
--- a/drivers/of/unittest.c
+++ b/drivers/of/unittest.c
@@ -197,7 +197,7 @@ static void __init of_unittest_dynamic(void)
}
/* Array of 4 properties for the purpose of testing */
- prop = kzalloc_objs(*prop, 4, GFP_KERNEL);
+ prop = kzalloc_objs(*prop, 4);
if (!prop) {
unittest(0, "kzalloc() failed\n");
return;
@@ -379,7 +379,7 @@ static void __init of_unittest_check_phandles(void)
}
}
- nh = kzalloc_obj(*nh, GFP_KERNEL);
+ nh = kzalloc_obj(*nh);
if (!nh)
return;
@@ -1136,7 +1136,7 @@ static void __init of_unittest_dma_ranges_one(const char *path,
dma_addr_t dma_addr;
struct device *dev_bogus;
- dev_bogus = kzalloc_obj(struct device, GFP_KERNEL);
+ dev_bogus = kzalloc_obj(struct device);
if (!dev_bogus) {
unittest(0, "kzalloc() failed\n");
kfree(map);
@@ -2275,7 +2275,7 @@ static int unittest_gpio_probe(struct platform_device *pdev)
unittest_gpio_probe_count++;
- devptr = kzalloc_obj(*devptr, GFP_KERNEL);
+ devptr = kzalloc_obj(*devptr);
if (!devptr)
return -ENOMEM;
diff --git a/drivers/opp/core.c b/drivers/opp/core.c
index a109d4dd5316..98893b269679 100644
--- a/drivers/opp/core.c
+++ b/drivers/opp/core.c
@@ -1532,7 +1532,7 @@ static struct opp_table *_allocate_opp_table(struct device *dev, int index)
* Allocate a new OPP table. In the infrequent case where a new
* device is needed to be added, we pay this penalty.
*/
- opp_table = kzalloc_obj(*opp_table, GFP_KERNEL);
+ opp_table = kzalloc_obj(*opp_table);
if (!opp_table)
return ERR_PTR(-ENOMEM);
@@ -2363,7 +2363,7 @@ static int _opp_set_clknames(struct opp_table *opp_table, struct device *dev,
if (opp_table->clks)
return 0;
- opp_table->clks = kmalloc_objs(*opp_table->clks, count, GFP_KERNEL);
+ opp_table->clks = kmalloc_objs(*opp_table->clks, count);
if (!opp_table->clks)
return -ENOMEM;
@@ -2548,7 +2548,7 @@ int dev_pm_opp_set_config(struct device *dev, struct dev_pm_opp_config *config)
unsigned int id;
int ret;
- data = kmalloc_obj(*data, GFP_KERNEL);
+ data = kmalloc_obj(*data);
if (!data)
return -ENOMEM;
diff --git a/drivers/opp/cpu.c b/drivers/opp/cpu.c
index 9ea7c323a8b9..0ea69c5c5001 100644
--- a/drivers/opp/cpu.c
+++ b/drivers/opp/cpu.c
@@ -51,7 +51,7 @@ int dev_pm_opp_init_cpufreq_table(struct device *dev,
if (max_opps <= 0)
return max_opps ? max_opps : -ENODATA;
- freq_table = kzalloc_objs(*freq_table, (max_opps + 1), GFP_KERNEL);
+ freq_table = kzalloc_objs(*freq_table, (max_opps + 1));
if (!freq_table)
return -ENOMEM;
diff --git a/drivers/opp/of.c b/drivers/opp/of.c
index a6e16f406289..6ea3b1bd6280 100644
--- a/drivers/opp/of.c
+++ b/drivers/opp/of.c
@@ -470,7 +470,7 @@ int dev_pm_opp_of_find_icc_paths(struct device *dev,
}
num_paths = count / 2;
- paths = kzalloc_objs(*paths, num_paths, GFP_KERNEL);
+ paths = kzalloc_objs(*paths, num_paths);
if (!paths)
return -ENOMEM;
diff --git a/drivers/opp/ti-opp-supply.c b/drivers/opp/ti-opp-supply.c
index b4281f85415b..406ba47e0f0b 100644
--- a/drivers/opp/ti-opp-supply.c
+++ b/drivers/opp/ti-opp-supply.c
@@ -127,7 +127,7 @@ static int _store_optimized_voltages(struct device *dev,
goto out;
}
- table = kzalloc_objs(*data->vdd_table, data->num_vdd_table, GFP_KERNEL);
+ table = kzalloc_objs(*data->vdd_table, data->num_vdd_table);
if (!table) {
ret = -ENOMEM;
goto out;
diff --git a/drivers/parisc/ccio-dma.c b/drivers/parisc/ccio-dma.c
index 78bee83bcadd..d5b95e63c24e 100644
--- a/drivers/parisc/ccio-dma.c
+++ b/drivers/parisc/ccio-dma.c
@@ -1520,7 +1520,7 @@ static int __init ccio_probe(struct parisc_device *dev)
struct ioc *ioc, **ioc_p = &ioc_list;
struct pci_hba_data *hba;
- ioc = kzalloc_obj(struct ioc, GFP_KERNEL);
+ ioc = kzalloc_obj(struct ioc);
if (ioc == NULL) {
printk(KERN_ERR MODULE_NAME ": memory allocation failure\n");
return -ENOMEM;
@@ -1550,7 +1550,7 @@ static int __init ccio_probe(struct parisc_device *dev)
}
hppa_dma_ops = &ccio_ops;
- hba = kzalloc_obj(*hba, GFP_KERNEL);
+ hba = kzalloc_obj(*hba);
/* if this fails, no I/O cards will work, so may as well bug */
BUG_ON(hba == NULL);
diff --git a/drivers/parisc/dino.c b/drivers/parisc/dino.c
index 58c1f5433cbb..4b96d9fda49a 100644
--- a/drivers/parisc/dino.c
+++ b/drivers/parisc/dino.c
@@ -990,7 +990,7 @@ static int __init dino_probe(struct parisc_device *dev)
*/
}
- dino_dev = kzalloc_obj(struct dino_device, GFP_KERNEL);
+ dino_dev = kzalloc_obj(struct dino_device);
if (!dino_dev) {
printk("dino_init_chip - couldn't alloc dino_device\n");
return 1;
diff --git a/drivers/parisc/eisa_enumerator.c b/drivers/parisc/eisa_enumerator.c
index 88cca5035c67..e0a57086a8a8 100644
--- a/drivers/parisc/eisa_enumerator.c
+++ b/drivers/parisc/eisa_enumerator.c
@@ -86,7 +86,7 @@ static int configure_memory(const unsigned char *buf,
for (i=0;i<HPEE_MEMORY_MAX_ENT;i++) {
c = get_8(buf+len);
- if (NULL != (res = kzalloc_obj(struct resource, GFP_KERNEL))) {
+ if (NULL != (res = kzalloc_obj(struct resource))) {
int result;
res->name = name;
@@ -178,7 +178,7 @@ static int configure_port(const unsigned char *buf, struct resource *io_parent,
for (i=0;i<HPEE_PORT_MAX_ENT;i++) {
c = get_8(buf+len);
- if (NULL != (res = kzalloc_obj(struct resource, GFP_KERNEL))) {
+ if (NULL != (res = kzalloc_obj(struct resource))) {
res->name = board;
res->start = get_16(buf+len+1);
res->end = get_16(buf+len+1)+(c&HPEE_PORT_SIZE_MASK)+1;
diff --git a/drivers/parisc/hppb.c b/drivers/parisc/hppb.c
index 72f9e7762cc5..33709eafe291 100644
--- a/drivers/parisc/hppb.c
+++ b/drivers/parisc/hppb.c
@@ -54,7 +54,7 @@ static int __init hppb_probe(struct parisc_device *dev)
}
if(card->hpa) {
- card->next = kzalloc_obj(struct hppb_card, GFP_KERNEL);
+ card->next = kzalloc_obj(struct hppb_card);
if(!card->next) {
printk(KERN_ERR "HP-PB: Unable to allocate memory.\n");
return 1;
diff --git a/drivers/parisc/iosapic.c b/drivers/parisc/iosapic.c
index e8a60a1bfd43..cf629665db8e 100644
--- a/drivers/parisc/iosapic.c
+++ b/drivers/parisc/iosapic.c
@@ -221,7 +221,7 @@ static size_t irt_num_entry;
static struct irt_entry *iosapic_alloc_irt(int num_entries)
{
- return kzalloc_objs(struct irt_entry, num_entries, GFP_KERNEL);
+ return kzalloc_objs(struct irt_entry, num_entries);
}
/**
@@ -915,7 +915,7 @@ void *iosapic_register(unsigned long hpa, void __iomem *vaddr)
return NULL;
}
- isi = kzalloc_obj(struct iosapic_info, GFP_KERNEL);
+ isi = kzalloc_obj(struct iosapic_info);
if (!isi) {
BUG();
return NULL;
diff --git a/drivers/parisc/lasi.c b/drivers/parisc/lasi.c
index f9cb9bb3af77..ef6125d83878 100644
--- a/drivers/parisc/lasi.c
+++ b/drivers/parisc/lasi.c
@@ -162,7 +162,7 @@ static int __init lasi_init_chip(struct parisc_device *dev)
struct gsc_asic *lasi;
int ret;
- lasi = kzalloc_obj(*lasi, GFP_KERNEL);
+ lasi = kzalloc_obj(*lasi);
if (!lasi)
return -ENOMEM;
diff --git a/drivers/parisc/lba_pci.c b/drivers/parisc/lba_pci.c
index c608854c2f0d..5197a3c93c70 100644
--- a/drivers/parisc/lba_pci.c
+++ b/drivers/parisc/lba_pci.c
@@ -1025,11 +1025,11 @@ lba_pat_resources(struct parisc_device *pa_dev, struct lba_device *lba_dev)
pdc_pat_cell_mod_maddr_block_t *io_pdc_cell; /* IO_VIEW */
int i;
- pa_pdc_cell = kzalloc_obj(pdc_pat_cell_mod_maddr_block_t, GFP_KERNEL);
+ pa_pdc_cell = kzalloc_obj(pdc_pat_cell_mod_maddr_block_t);
if (!pa_pdc_cell)
return;
- io_pdc_cell = kzalloc_obj(pdc_pat_cell_mod_maddr_block_t, GFP_KERNEL);
+ io_pdc_cell = kzalloc_obj(pdc_pat_cell_mod_maddr_block_t);
if (!io_pdc_cell) {
kfree(pa_pdc_cell);
return;
@@ -1546,7 +1546,7 @@ lba_driver_probe(struct parisc_device *dev)
** have an IRT entry will get NULL back from iosapic code.
*/
- lba_dev = kzalloc_obj(struct lba_device, GFP_KERNEL);
+ lba_dev = kzalloc_obj(struct lba_device);
if (!lba_dev) {
printk(KERN_ERR "lba_init_chip - couldn't alloc lba_device\n");
return(1);
diff --git a/drivers/parisc/sba_iommu.c b/drivers/parisc/sba_iommu.c
index 9eadbfd70663..d9339dd50826 100644
--- a/drivers/parisc/sba_iommu.c
+++ b/drivers/parisc/sba_iommu.c
@@ -1939,7 +1939,7 @@ static int __init sba_driver_callback(struct parisc_device *dev)
printk(KERN_INFO "%s found %s at 0x%llx\n",
MODULE_NAME, version, (unsigned long long)dev->hpa.start);
- sba_dev = kzalloc_obj(struct sba_device, GFP_KERNEL);
+ sba_dev = kzalloc_obj(struct sba_device);
if (!sba_dev) {
printk(KERN_ERR MODULE_NAME " - couldn't alloc sba_device\n");
return -ENOMEM;
diff --git a/drivers/parisc/wax.c b/drivers/parisc/wax.c
index 94947be33bd0..a82a5e88ed6d 100644
--- a/drivers/parisc/wax.c
+++ b/drivers/parisc/wax.c
@@ -70,7 +70,7 @@ static int __init wax_init_chip(struct parisc_device *dev)
struct parisc_device *parent;
int ret;
- wax = kzalloc_obj(*wax, GFP_KERNEL);
+ wax = kzalloc_obj(*wax);
if (!wax)
return -ENOMEM;
diff --git a/drivers/parport/daisy.c b/drivers/parport/daisy.c
index 2e3b95ae2718..0f15c5de8df8 100644
--- a/drivers/parport/daisy.c
+++ b/drivers/parport/daisy.c
@@ -51,7 +51,7 @@ static int assign_addrs(struct parport *port);
static void add_dev(int devnum, struct parport *port, int daisy)
{
struct daisydev *newdev, **p;
- newdev = kmalloc_obj(struct daisydev, GFP_KERNEL);
+ newdev = kmalloc_obj(struct daisydev);
if (newdev) {
newdev->port = port;
newdev->daisy = daisy;
diff --git a/drivers/parport/parport_cs.c b/drivers/parport/parport_cs.c
index f8318db9a75f..2c1c8253a00b 100644
--- a/drivers/parport/parport_cs.c
+++ b/drivers/parport/parport_cs.c
@@ -87,7 +87,7 @@ static int parport_probe(struct pcmcia_device *link)
dev_dbg(&link->dev, "parport_attach()\n");
/* Create new parport device */
- info = kzalloc_obj(*info, GFP_KERNEL);
+ info = kzalloc_obj(*info);
if (!info) return -ENOMEM;
link->priv = info;
info->p_dev = link;
diff --git a/drivers/parport/parport_gsc.c b/drivers/parport/parport_gsc.c
index f442c1fb0d7a..e5e8054a1af8 100644
--- a/drivers/parport/parport_gsc.c
+++ b/drivers/parport/parport_gsc.c
@@ -234,7 +234,7 @@ static struct parport *parport_gsc_probe_port(unsigned long base,
struct parport tmp;
struct parport *p = &tmp;
- priv = kzalloc_obj(struct parport_gsc_private, GFP_KERNEL);
+ priv = kzalloc_obj(struct parport_gsc_private);
if (!priv) {
printk(KERN_DEBUG "parport (0x%lx): no memory!\n", base);
return NULL;
diff --git a/drivers/parport/parport_ip32.c b/drivers/parport/parport_ip32.c
index 84c4bba2756e..14a4f4251d5c 100644
--- a/drivers/parport/parport_ip32.c
+++ b/drivers/parport/parport_ip32.c
@@ -2031,8 +2031,8 @@ static __init struct parport *parport_ip32_probe_port(void)
parport_ip32_make_isa_registers(®s, &mace->isa.parallel,
&mace->isa.ecp1284, 8 /* regshift */);
- ops = kmalloc_obj(struct parport_operations, GFP_KERNEL);
- priv = kmalloc_obj(struct parport_ip32_private, GFP_KERNEL);
+ ops = kmalloc_obj(struct parport_operations);
+ priv = kmalloc_obj(struct parport_ip32_private);
p = parport_register_port(0, PARPORT_IRQ_NONE, PARPORT_DMA_NONE, ops);
if (ops == NULL || priv == NULL || p == NULL) {
err = -ENOMEM;
diff --git a/drivers/parport/parport_pc.c b/drivers/parport/parport_pc.c
index 99d44864b9ff..c75abdd8ef25 100644
--- a/drivers/parport/parport_pc.c
+++ b/drivers/parport/parport_pc.c
@@ -2056,11 +2056,11 @@ static struct parport *__parport_pc_probe_port(unsigned long int base,
}
}
- ops = kmalloc_obj(struct parport_operations, GFP_KERNEL);
+ ops = kmalloc_obj(struct parport_operations);
if (!ops)
goto out1;
- priv = kmalloc_obj(struct parport_pc_private, GFP_KERNEL);
+ priv = kmalloc_obj(struct parport_pc_private);
if (!priv)
goto out2;
@@ -2880,7 +2880,7 @@ static int parport_pc_pci_probe(struct pci_dev *dev,
if (err)
return err;
- data = kmalloc_obj(struct pci_parport_data, GFP_KERNEL);
+ data = kmalloc_obj(struct pci_parport_data);
if (!data)
return -ENOMEM;
diff --git a/drivers/parport/share.c b/drivers/parport/share.c
index 44e5d37afbf8..ba5292828703 100644
--- a/drivers/parport/share.c
+++ b/drivers/parport/share.c
@@ -430,7 +430,7 @@ struct parport *parport_register_port(unsigned long base, int irq, int dma,
int device;
int ret;
- tmp = kzalloc_obj(struct parport, GFP_KERNEL);
+ tmp = kzalloc_obj(struct parport);
if (!tmp)
return NULL;
@@ -709,11 +709,11 @@ parport_register_dev_model(struct parport *port, const char *name,
parport_get_port(port);
- par_dev = kzalloc_obj(*par_dev, GFP_KERNEL);
+ par_dev = kzalloc_obj(*par_dev);
if (!par_dev)
goto err_put_port;
- par_dev->state = kzalloc_obj(*par_dev->state, GFP_KERNEL);
+ par_dev->state = kzalloc_obj(*par_dev->state);
if (!par_dev->state)
goto err_put_par_dev;
diff --git a/drivers/pci/bus.c b/drivers/pci/bus.c
index e71aeecba11d..6c1ad1f542d9 100644
--- a/drivers/pci/bus.c
+++ b/drivers/pci/bus.c
@@ -65,7 +65,7 @@ void pci_bus_add_resource(struct pci_bus *bus, struct resource *res)
{
struct pci_bus_resource *bus_res;
- bus_res = kzalloc_obj(struct pci_bus_resource, GFP_KERNEL);
+ bus_res = kzalloc_obj(struct pci_bus_resource);
if (!bus_res) {
dev_err(&bus->dev, "can't add %pR resource\n", res);
return;
diff --git a/drivers/pci/controller/pci-hyperv.c b/drivers/pci/controller/pci-hyperv.c
index 3f106bd9fe7e..2c7a406b4ba8 100644
--- a/drivers/pci/controller/pci-hyperv.c
+++ b/drivers/pci/controller/pci-hyperv.c
@@ -945,7 +945,7 @@ static int hv_pci_irqchip_init(void)
struct irq_domain *irq_domain_parent = NULL;
int ret = -ENOMEM;
- chip_data = kzalloc_obj(*chip_data, GFP_KERNEL);
+ chip_data = kzalloc_obj(*chip_data);
if (!chip_data)
return ret;
@@ -2592,7 +2592,7 @@ static struct hv_pci_dev *new_pcichild_device(struct hv_pcibus_device *hbus,
unsigned long flags;
int ret;
- hpdev = kzalloc_obj(*hpdev, GFP_KERNEL);
+ hpdev = kzalloc_obj(*hpdev);
if (!hpdev)
return NULL;
@@ -3713,7 +3713,7 @@ static int hv_pci_probe(struct hv_device *hdev,
if (!bridge)
return -ENOMEM;
- hbus = kzalloc_obj(*hbus, GFP_KERNEL);
+ hbus = kzalloc_obj(*hbus);
if (!hbus)
return -ENOMEM;
diff --git a/drivers/pci/controller/vmd.c b/drivers/pci/controller/vmd.c
index 44bfe301b557..d4ae250d4bc6 100644
--- a/drivers/pci/controller/vmd.c
+++ b/drivers/pci/controller/vmd.c
@@ -270,7 +270,7 @@ static int vmd_msi_alloc(struct irq_domain *domain, unsigned int virq,
struct vmd_irq *vmdirq;
for (int i = 0; i < nr_irqs; ++i) {
- vmdirq = kzalloc_obj(*vmdirq, GFP_KERNEL);
+ vmdirq = kzalloc_obj(*vmdirq);
if (!vmdirq) {
vmd_msi_free(domain, virq, i);
return -ENOMEM;
diff --git a/drivers/pci/doe.c b/drivers/pci/doe.c
index 811276ae9b13..7b41da4ec11a 100644
--- a/drivers/pci/doe.c
+++ b/drivers/pci/doe.c
@@ -167,7 +167,7 @@ static int pci_doe_sysfs_feature_populate(struct pci_dev *pdev,
xa_for_each(&doe_mb->feats, i, entry)
num_features++;
- attrs = kzalloc_objs(*attrs, num_features, GFP_KERNEL);
+ attrs = kzalloc_objs(*attrs, num_features);
if (!attrs) {
pci_warn(pdev, "Failed allocating the device_attribute array\n");
return -ENOMEM;
@@ -641,7 +641,7 @@ static struct pci_doe_mb *pci_doe_create_mb(struct pci_dev *pdev,
struct pci_doe_mb *doe_mb;
int rc;
- doe_mb = kzalloc_obj(*doe_mb, GFP_KERNEL);
+ doe_mb = kzalloc_obj(*doe_mb);
if (!doe_mb)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/pci/ecam.c b/drivers/pci/ecam.c
index 8c7559e73bb6..119de32ff07b 100644
--- a/drivers/pci/ecam.c
+++ b/drivers/pci/ecam.c
@@ -37,7 +37,7 @@ struct pci_config_window *pci_ecam_create(struct device *dev,
if (busr->start > busr->end)
return ERR_PTR(-EINVAL);
- cfg = kzalloc_obj(*cfg, GFP_KERNEL);
+ cfg = kzalloc_obj(*cfg);
if (!cfg)
return ERR_PTR(-ENOMEM);
@@ -75,7 +75,7 @@ struct pci_config_window *pci_ecam_create(struct device *dev,
}
if (per_bus_mapping) {
- cfg->winp = kzalloc_objs(*cfg->winp, bus_range, GFP_KERNEL);
+ cfg->winp = kzalloc_objs(*cfg->winp, bus_range);
if (!cfg->winp)
goto err_exit_malloc;
} else {
diff --git a/drivers/pci/endpoint/functions/pci-epf-mhi.c b/drivers/pci/endpoint/functions/pci-epf-mhi.c
index ccee5c6b6ad7..f9cf18aa5b34 100644
--- a/drivers/pci/endpoint/functions/pci-epf-mhi.c
+++ b/drivers/pci/endpoint/functions/pci-epf-mhi.c
@@ -525,7 +525,7 @@ static int pci_epf_mhi_edma_read_async(struct mhi_ep_cntrl *mhi_cntrl,
goto err_unmap;
}
- transfer = kzalloc_obj(*transfer, GFP_KERNEL);
+ transfer = kzalloc_obj(*transfer);
if (!transfer) {
ret = -ENOMEM;
goto err_unmap;
@@ -604,7 +604,7 @@ static int pci_epf_mhi_edma_write_async(struct mhi_ep_cntrl *mhi_cntrl,
goto err_unmap;
}
- transfer = kzalloc_obj(*transfer, GFP_KERNEL);
+ transfer = kzalloc_obj(*transfer);
if (!transfer) {
ret = -ENOMEM;
goto err_unmap;
diff --git a/drivers/pci/endpoint/functions/pci-epf-test.c b/drivers/pci/endpoint/functions/pci-epf-test.c
index 69f6ac37cdd0..582938b7b4f1 100644
--- a/drivers/pci/endpoint/functions/pci-epf-test.c
+++ b/drivers/pci/endpoint/functions/pci-epf-test.c
@@ -872,7 +872,7 @@ static void pci_epf_test_bar_subrange_setup(struct pci_epf_test *epf_test,
sub_size = bar->size / nsub;
- submap = kzalloc_objs(*submap, nsub, GFP_KERNEL);
+ submap = kzalloc_objs(*submap, nsub);
if (!submap)
goto err;
diff --git a/drivers/pci/endpoint/pci-ep-cfs.c b/drivers/pci/endpoint/pci-ep-cfs.c
index 6c14cf85d336..0f3921f28f17 100644
--- a/drivers/pci/endpoint/pci-ep-cfs.c
+++ b/drivers/pci/endpoint/pci-ep-cfs.c
@@ -274,7 +274,7 @@ struct config_group *pci_ep_cfs_add_epc_group(const char *name)
struct config_group *group;
struct pci_epc_group *epc_group;
- epc_group = kzalloc_obj(*epc_group, GFP_KERNEL);
+ epc_group = kzalloc_obj(*epc_group);
if (!epc_group) {
ret = -ENOMEM;
goto err;
@@ -599,7 +599,7 @@ static struct config_group *pci_epf_make(struct config_group *group,
char *epf_name;
int index, err;
- epf_group = kzalloc_obj(*epf_group, GFP_KERNEL);
+ epf_group = kzalloc_obj(*epf_group);
if (!epf_group)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/pci/endpoint/pci-ep-msi.c b/drivers/pci/endpoint/pci-ep-msi.c
index 4625dc9827bc..51c19942a81e 100644
--- a/drivers/pci/endpoint/pci-ep-msi.c
+++ b/drivers/pci/endpoint/pci-ep-msi.c
@@ -67,7 +67,7 @@ int pci_epf_alloc_doorbell(struct pci_epf *epf, u16 num_db)
dev_set_msi_domain(epc->dev.parent, domain);
- msg = kzalloc_objs(struct pci_epf_doorbell_msg, num_db, GFP_KERNEL);
+ msg = kzalloc_objs(struct pci_epf_doorbell_msg, num_db);
if (!msg)
return -ENOMEM;
diff --git a/drivers/pci/endpoint/pci-epc-core.c b/drivers/pci/endpoint/pci-epc-core.c
index d6998e637d3c..e546b3dbb240 100644
--- a/drivers/pci/endpoint/pci-epc-core.c
+++ b/drivers/pci/endpoint/pci-epc-core.c
@@ -982,7 +982,7 @@ __pci_epc_create(struct device *dev, const struct pci_epc_ops *ops,
goto err_ret;
}
- epc = kzalloc_obj(*epc, GFP_KERNEL);
+ epc = kzalloc_obj(*epc);
if (!epc) {
ret = -ENOMEM;
goto err_ret;
diff --git a/drivers/pci/endpoint/pci-epc-mem.c b/drivers/pci/endpoint/pci-epc-mem.c
index a3b5f8d1767c..6102a4af9d79 100644
--- a/drivers/pci/endpoint/pci-epc-mem.c
+++ b/drivers/pci/endpoint/pci-epc-mem.c
@@ -62,7 +62,7 @@ int pci_epc_multi_mem_init(struct pci_epc *epc,
if (!windows || !num_windows)
return -EINVAL;
- epc->windows = kzalloc_objs(*epc->windows, num_windows, GFP_KERNEL);
+ epc->windows = kzalloc_objs(*epc->windows, num_windows);
if (!epc->windows)
return -ENOMEM;
@@ -74,7 +74,7 @@ int pci_epc_multi_mem_init(struct pci_epc *epc,
pages = windows[i].size >> page_shift;
bitmap_size = BITS_TO_LONGS(pages) * sizeof(long);
- mem = kzalloc_obj(*mem, GFP_KERNEL);
+ mem = kzalloc_obj(*mem);
if (!mem) {
ret = -ENOMEM;
i--;
diff --git a/drivers/pci/endpoint/pci-epf-core.c b/drivers/pci/endpoint/pci-epf-core.c
index c44f4ddfd60b..83fd20c11238 100644
--- a/drivers/pci/endpoint/pci-epf-core.c
+++ b/drivers/pci/endpoint/pci-epf-core.c
@@ -535,7 +535,7 @@ struct pci_epf *pci_epf_create(const char *name)
struct device *dev;
int len;
- epf = kzalloc_obj(*epf, GFP_KERNEL);
+ epf = kzalloc_obj(*epf);
if (!epf)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/pci/hotplug/acpiphp_core.c b/drivers/pci/hotplug/acpiphp_core.c
index 051af60f999a..70c95166e509 100644
--- a/drivers/pci/hotplug/acpiphp_core.c
+++ b/drivers/pci/hotplug/acpiphp_core.c
@@ -260,7 +260,7 @@ int acpiphp_register_hotplug_slot(struct acpiphp_slot *acpiphp_slot,
int retval = -ENOMEM;
char name[SLOT_NAME_SIZE];
- slot = kzalloc_obj(*slot, GFP_KERNEL);
+ slot = kzalloc_obj(*slot);
if (!slot)
goto error;
diff --git a/drivers/pci/hotplug/acpiphp_glue.c b/drivers/pci/hotplug/acpiphp_glue.c
index 55620e29b457..78e3effbb32d 100644
--- a/drivers/pci/hotplug/acpiphp_glue.c
+++ b/drivers/pci/hotplug/acpiphp_glue.c
@@ -60,7 +60,7 @@ static struct acpiphp_context *acpiphp_init_context(struct acpi_device *adev)
{
struct acpiphp_context *context;
- context = kzalloc_obj(*context, GFP_KERNEL);
+ context = kzalloc_obj(*context);
if (!context)
return NULL;
@@ -279,7 +279,7 @@ static acpi_status acpiphp_add_context(acpi_handle handle, u32 lvl, void *data,
if (slot->device == device)
goto slot_found;
- slot = kzalloc_obj(struct acpiphp_slot, GFP_KERNEL);
+ slot = kzalloc_obj(struct acpiphp_slot);
if (!slot) {
acpi_lock_hp_context();
acpiphp_put_context(context);
@@ -869,7 +869,7 @@ void acpiphp_enumerate_slots(struct pci_bus *bus)
return;
handle = adev->handle;
- bridge = kzalloc_obj(struct acpiphp_bridge, GFP_KERNEL);
+ bridge = kzalloc_obj(struct acpiphp_bridge);
if (!bridge)
return;
@@ -889,7 +889,7 @@ void acpiphp_enumerate_slots(struct pci_bus *bus)
if (pci_is_root_bus(bridge->pci_bus)) {
struct acpiphp_root_context *root_context;
- root_context = kzalloc_obj(*root_context, GFP_KERNEL);
+ root_context = kzalloc_obj(*root_context);
if (!root_context)
goto err;
diff --git a/drivers/pci/hotplug/acpiphp_ibm.c b/drivers/pci/hotplug/acpiphp_ibm.c
index f86e39e9dd68..f8016ed24523 100644
--- a/drivers/pci/hotplug/acpiphp_ibm.c
+++ b/drivers/pci/hotplug/acpiphp_ibm.c
@@ -141,7 +141,7 @@ static union apci_descriptor *ibm_slot_from_id(int id)
ibm_slot_done:
if (ret) {
- ret = kmalloc_obj(union apci_descriptor, GFP_KERNEL);
+ ret = kmalloc_obj(union apci_descriptor);
if (ret)
memcpy(ret, des, sizeof(union apci_descriptor));
}
diff --git a/drivers/pci/hotplug/cpci_hotplug_core.c b/drivers/pci/hotplug/cpci_hotplug_core.c
index 50793ca10526..e7cd801a2655 100644
--- a/drivers/pci/hotplug/cpci_hotplug_core.c
+++ b/drivers/pci/hotplug/cpci_hotplug_core.c
@@ -189,7 +189,7 @@ cpci_hp_register_bus(struct pci_bus *bus, u8 first, u8 last)
* with the pci_hotplug subsystem.
*/
for (i = first; i <= last; ++i) {
- slot = kzalloc_obj(struct slot, GFP_KERNEL);
+ slot = kzalloc_obj(struct slot);
if (!slot) {
status = -ENOMEM;
goto error;
diff --git a/drivers/pci/hotplug/cpqphp_core.c b/drivers/pci/hotplug/cpqphp_core.c
index 158859352185..76e26b9a9f0d 100644
--- a/drivers/pci/hotplug/cpqphp_core.c
+++ b/drivers/pci/hotplug/cpqphp_core.c
@@ -593,7 +593,7 @@ static int ctrl_slot_setup(struct controller *ctrl,
slot_number = ctrl->first_slot;
while (number_of_slots) {
- slot = kzalloc_obj(*slot, GFP_KERNEL);
+ slot = kzalloc_obj(*slot);
if (!slot) {
result = -ENOMEM;
goto error;
@@ -822,7 +822,7 @@ static int cpqhpc_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
goto err_disable_device;
}
- ctrl = kzalloc_obj(struct controller, GFP_KERNEL);
+ ctrl = kzalloc_obj(struct controller);
if (!ctrl) {
rc = -ENOMEM;
goto err_disable_device;
diff --git a/drivers/pci/hotplug/cpqphp_ctrl.c b/drivers/pci/hotplug/cpqphp_ctrl.c
index 2c63bdc61306..040429028402 100644
--- a/drivers/pci/hotplug/cpqphp_ctrl.c
+++ b/drivers/pci/hotplug/cpqphp_ctrl.c
@@ -428,7 +428,7 @@ static struct pci_resource *do_pre_bridge_resource_split(struct pci_resource **h
/* this one isn't an aligned length, so we'll make a new entry
* and split it up.
*/
- split_node = kmalloc_obj(*split_node, GFP_KERNEL);
+ split_node = kmalloc_obj(*split_node);
if (!split_node)
return NULL;
@@ -553,7 +553,7 @@ static struct pci_resource *get_io_resource(struct pci_resource **head, u32 size
if ((node->length - (temp_dword - node->base)) < size)
continue;
- split_node = kmalloc_obj(*split_node, GFP_KERNEL);
+ split_node = kmalloc_obj(*split_node);
if (!split_node)
return NULL;
@@ -573,7 +573,7 @@ static struct pci_resource *get_io_resource(struct pci_resource **head, u32 size
/* this one is longer than we need
* so we'll make a new entry and split it up
*/
- split_node = kmalloc_obj(*split_node, GFP_KERNEL);
+ split_node = kmalloc_obj(*split_node);
if (!split_node)
return NULL;
@@ -650,7 +650,7 @@ static struct pci_resource *get_max_resource(struct pci_resource **head, u32 siz
if ((max->length - (temp_dword - max->base)) < size)
continue;
- split_node = kmalloc_obj(*split_node, GFP_KERNEL);
+ split_node = kmalloc_obj(*split_node);
if (!split_node)
return NULL;
@@ -668,7 +668,7 @@ static struct pci_resource *get_max_resource(struct pci_resource **head, u32 siz
/* this one isn't end aligned properly at the top
* so we'll make a new entry and split it up
*/
- split_node = kmalloc_obj(*split_node, GFP_KERNEL);
+ split_node = kmalloc_obj(*split_node);
if (!split_node)
return NULL;
@@ -747,7 +747,7 @@ static struct pci_resource *get_resource(struct pci_resource **head, u32 size)
if ((node->length - (temp_dword - node->base)) < size)
continue;
- split_node = kmalloc_obj(*split_node, GFP_KERNEL);
+ split_node = kmalloc_obj(*split_node);
if (!split_node)
return NULL;
@@ -767,7 +767,7 @@ static struct pci_resource *get_resource(struct pci_resource **head, u32 size)
/* this one is longer than we need
* so we'll make a new entry and split it up
*/
- split_node = kmalloc_obj(*split_node, GFP_KERNEL);
+ split_node = kmalloc_obj(*split_node);
if (!split_node)
return NULL;
@@ -955,7 +955,7 @@ struct pci_func *cpqhp_slot_create(u8 busnumber)
struct pci_func *new_slot;
struct pci_func *next;
- new_slot = kzalloc_obj(*new_slot, GFP_KERNEL);
+ new_slot = kzalloc_obj(*new_slot);
if (new_slot == NULL)
return new_slot;
@@ -2435,10 +2435,10 @@ static int configure_new_function(struct controller *ctrl, struct pci_func *func
/* Make copies of the nodes we are going to pass down so that
* if there is a problem,we can just use these to free resources
*/
- hold_bus_node = kmalloc_obj(*hold_bus_node, GFP_KERNEL);
- hold_IO_node = kmalloc_obj(*hold_IO_node, GFP_KERNEL);
- hold_mem_node = kmalloc_obj(*hold_mem_node, GFP_KERNEL);
- hold_p_mem_node = kmalloc_obj(*hold_p_mem_node, GFP_KERNEL);
+ hold_bus_node = kmalloc_obj(*hold_bus_node);
+ hold_IO_node = kmalloc_obj(*hold_IO_node);
+ hold_mem_node = kmalloc_obj(*hold_mem_node);
+ hold_p_mem_node = kmalloc_obj(*hold_p_mem_node);
if (!hold_bus_node || !hold_IO_node || !hold_mem_node || !hold_p_mem_node) {
kfree(hold_bus_node);
diff --git a/drivers/pci/hotplug/cpqphp_nvram.c b/drivers/pci/hotplug/cpqphp_nvram.c
index 83c97f72ca3b..692d3cafa16d 100644
--- a/drivers/pci/hotplug/cpqphp_nvram.c
+++ b/drivers/pci/hotplug/cpqphp_nvram.c
@@ -504,7 +504,7 @@ int compaq_nvram_load(void __iomem *rom_start, struct controller *ctrl)
return 2;
while (nummem--) {
- mem_node = kmalloc_obj(struct pci_resource, GFP_KERNEL);
+ mem_node = kmalloc_obj(struct pci_resource);
if (!mem_node)
break;
@@ -561,7 +561,7 @@ int compaq_nvram_load(void __iomem *rom_start, struct controller *ctrl)
}
while (numio--) {
- io_node = kmalloc_obj(struct pci_resource, GFP_KERNEL);
+ io_node = kmalloc_obj(struct pci_resource);
if (!io_node)
break;
@@ -589,7 +589,7 @@ int compaq_nvram_load(void __iomem *rom_start, struct controller *ctrl)
}
while (numbus--) {
- bus_node = kmalloc_obj(struct pci_resource, GFP_KERNEL);
+ bus_node = kmalloc_obj(struct pci_resource);
if (!bus_node)
break;
diff --git a/drivers/pci/hotplug/cpqphp_pci.c b/drivers/pci/hotplug/cpqphp_pci.c
index 03e2391f6786..4ccd5294c545 100644
--- a/drivers/pci/hotplug/cpqphp_pci.c
+++ b/drivers/pci/hotplug/cpqphp_pci.c
@@ -151,8 +151,8 @@ int cpqhp_set_irq(u8 bus_num, u8 dev_num, u8 int_pin, u8 irq_num)
struct pci_bus *fakebus;
u16 temp_word;
- fakedev = kmalloc_obj(*fakedev, GFP_KERNEL);
- fakebus = kmalloc_obj(*fakebus, GFP_KERNEL);
+ fakedev = kmalloc_obj(*fakedev);
+ fakebus = kmalloc_obj(*fakebus);
if (!fakedev || !fakebus) {
kfree(fakedev);
kfree(fakebus);
@@ -721,7 +721,7 @@ int cpqhp_save_used_resources(struct controller *ctrl, struct pci_func *func)
pci_bus_read_config_byte(pci_bus, devfn, PCI_SECONDARY_BUS, &secondary_bus);
pci_bus_read_config_byte(pci_bus, devfn, PCI_SUBORDINATE_BUS, &temp_byte);
- bus_node = kmalloc_obj(*bus_node, GFP_KERNEL);
+ bus_node = kmalloc_obj(*bus_node);
if (!bus_node)
return -ENOMEM;
@@ -736,7 +736,7 @@ int cpqhp_save_used_resources(struct controller *ctrl, struct pci_func *func)
pci_bus_read_config_byte(pci_bus, devfn, PCI_IO_LIMIT, &b_length);
if ((b_base <= b_length) && (save_command & 0x01)) {
- io_node = kmalloc_obj(*io_node, GFP_KERNEL);
+ io_node = kmalloc_obj(*io_node);
if (!io_node)
return -ENOMEM;
@@ -752,7 +752,7 @@ int cpqhp_save_used_resources(struct controller *ctrl, struct pci_func *func)
pci_bus_read_config_word(pci_bus, devfn, PCI_MEMORY_LIMIT, &w_length);
if ((w_base <= w_length) && (save_command & 0x02)) {
- mem_node = kmalloc_obj(*mem_node, GFP_KERNEL);
+ mem_node = kmalloc_obj(*mem_node);
if (!mem_node)
return -ENOMEM;
@@ -1294,7 +1294,7 @@ int cpqhp_find_available_resources(struct controller *ctrl, void __iomem *rom_st
temp_dword = io_base + io_length;
if ((io_base) && (temp_dword < 0x10000)) {
- io_node = kmalloc_obj(*io_node, GFP_KERNEL);
+ io_node = kmalloc_obj(*io_node);
if (!io_node)
return -ENOMEM;
@@ -1316,7 +1316,7 @@ int cpqhp_find_available_resources(struct controller *ctrl, void __iomem *rom_st
/* If we've got a valid memory base, use it */
temp_dword = mem_base + mem_length;
if ((mem_base) && (temp_dword < 0x10000)) {
- mem_node = kmalloc_obj(*mem_node, GFP_KERNEL);
+ mem_node = kmalloc_obj(*mem_node);
if (!mem_node)
return -ENOMEM;
@@ -1341,7 +1341,7 @@ int cpqhp_find_available_resources(struct controller *ctrl, void __iomem *rom_st
*/
temp_dword = pre_mem_base + pre_mem_length;
if ((pre_mem_base) && (temp_dword < 0x10000)) {
- p_mem_node = kmalloc_obj(*p_mem_node, GFP_KERNEL);
+ p_mem_node = kmalloc_obj(*p_mem_node);
if (!p_mem_node)
return -ENOMEM;
@@ -1366,7 +1366,7 @@ int cpqhp_find_available_resources(struct controller *ctrl, void __iomem *rom_st
* populated slots that don't have PCI-PCI bridges
*/
if (secondary_bus && (secondary_bus != primary_bus)) {
- bus_node = kmalloc_obj(*bus_node, GFP_KERNEL);
+ bus_node = kmalloc_obj(*bus_node);
if (!bus_node)
return -ENOMEM;
diff --git a/drivers/pci/hotplug/cpqphp_sysfs.c b/drivers/pci/hotplug/cpqphp_sysfs.c
index 055fff069ce3..ca153c626942 100644
--- a/drivers/pci/hotplug/cpqphp_sysfs.c
+++ b/drivers/pci/hotplug/cpqphp_sysfs.c
@@ -134,7 +134,7 @@ static int open(struct inode *inode, struct file *file)
int retval = -ENOMEM;
mutex_lock(&cpqphp_mutex);
- dbg = kmalloc_obj(*dbg, GFP_KERNEL);
+ dbg = kmalloc_obj(*dbg);
if (!dbg)
goto exit;
dbg->data = kmalloc(MAX_OUTPUT, GFP_KERNEL);
diff --git a/drivers/pci/hotplug/ibmphp_core.c b/drivers/pci/hotplug/ibmphp_core.c
index af4e8b032093..aca86c092d4a 100644
--- a/drivers/pci/hotplug/ibmphp_core.c
+++ b/drivers/pci/hotplug/ibmphp_core.c
@@ -624,11 +624,11 @@ static u8 bus_structure_fixup(u8 busno)
if (pci_find_bus(0, busno) || !(ibmphp_find_same_bus_num(busno)))
return 1;
- bus = kmalloc_obj(*bus, GFP_KERNEL);
+ bus = kmalloc_obj(*bus);
if (!bus)
return 1;
- dev = kmalloc_obj(*dev, GFP_KERNEL);
+ dev = kmalloc_obj(*dev);
if (!dev) {
kfree(bus);
return 1;
@@ -986,7 +986,7 @@ static int enable_slot(struct hotplug_slot *hs)
goto error_power;
}
- slot_cur->func = kzalloc_obj(struct pci_func, GFP_KERNEL);
+ slot_cur->func = kzalloc_obj(struct pci_func);
if (!slot_cur->func) {
/* do update_slot_info here? */
rc = -ENOMEM;
@@ -1093,7 +1093,7 @@ int ibmphp_do_disable_slot(struct slot *slot_cur)
if (slot_cur->func == NULL) {
/* We need this for functions that were there on bootup */
- slot_cur->func = kzalloc_obj(struct pci_func, GFP_KERNEL);
+ slot_cur->func = kzalloc_obj(struct pci_func);
if (!slot_cur->func) {
rc = -ENOMEM;
goto error;
@@ -1187,7 +1187,7 @@ static int __init ibmphp_init(void)
info(DRIVER_DESC " version: " DRIVER_VERSION "\n");
- ibmphp_pci_bus = kmalloc_obj(*ibmphp_pci_bus, GFP_KERNEL);
+ ibmphp_pci_bus = kmalloc_obj(*ibmphp_pci_bus);
if (!ibmphp_pci_bus) {
rc = -ENOMEM;
goto exit;
diff --git a/drivers/pci/hotplug/ibmphp_ebda.c b/drivers/pci/hotplug/ibmphp_ebda.c
index bfd9f11c2d39..49575cb2a2dc 100644
--- a/drivers/pci/hotplug/ibmphp_ebda.c
+++ b/drivers/pci/hotplug/ibmphp_ebda.c
@@ -57,7 +57,7 @@ static int ebda_rio_table(void);
static struct ebda_hpc_list * __init alloc_ebda_hpc_list(void)
{
- return kzalloc_obj(struct ebda_hpc_list, GFP_KERNEL);
+ return kzalloc_obj(struct ebda_hpc_list);
}
static struct controller *alloc_ebda_hpc(u32 slot_count, u32 bus_count)
@@ -66,16 +66,16 @@ static struct controller *alloc_ebda_hpc(u32 slot_count, u32 bus_count)
struct ebda_hpc_slot *slots;
struct ebda_hpc_bus *buses;
- controller = kzalloc_obj(struct controller, GFP_KERNEL);
+ controller = kzalloc_obj(struct controller);
if (!controller)
goto error;
- slots = kzalloc_objs(struct ebda_hpc_slot, slot_count, GFP_KERNEL);
+ slots = kzalloc_objs(struct ebda_hpc_slot, slot_count);
if (!slots)
goto error_contr;
controller->slots = slots;
- buses = kzalloc_objs(struct ebda_hpc_bus, bus_count, GFP_KERNEL);
+ buses = kzalloc_objs(struct ebda_hpc_bus, bus_count);
if (!buses)
goto error_slots;
controller->buses = buses;
@@ -98,12 +98,12 @@ static void free_ebda_hpc(struct controller *controller)
static struct ebda_rsrc_list * __init alloc_ebda_rsrc_list(void)
{
- return kzalloc_obj(struct ebda_rsrc_list, GFP_KERNEL);
+ return kzalloc_obj(struct ebda_rsrc_list);
}
static struct ebda_pci_rsrc *alloc_ebda_pci_rsrc(void)
{
- return kzalloc_obj(struct ebda_pci_rsrc, GFP_KERNEL);
+ return kzalloc_obj(struct ebda_pci_rsrc);
}
static void __init print_bus_info(void)
@@ -409,7 +409,7 @@ static int __init ebda_rio_table(void)
// we do concern about rio details
for (i = 0; i < rio_table_ptr->riodev_count; i++) {
- rio_detail_ptr = kzalloc_obj(struct rio_detail, GFP_KERNEL);
+ rio_detail_ptr = kzalloc_obj(struct rio_detail);
if (!rio_detail_ptr)
return -ENOMEM;
rio_detail_ptr->rio_node_id = readb(io_mem + offset);
@@ -462,7 +462,7 @@ static int __init combine_wpg_for_chassis(void)
list_for_each_entry(rio_detail_ptr, &rio_vg_head, rio_detail_list) {
opt_rio_ptr = search_opt_vg(rio_detail_ptr->chassis_num);
if (!opt_rio_ptr) {
- opt_rio_ptr = kzalloc_obj(struct opt_rio, GFP_KERNEL);
+ opt_rio_ptr = kzalloc_obj(struct opt_rio);
if (!opt_rio_ptr)
return -ENOMEM;
opt_rio_ptr->rio_type = rio_detail_ptr->rio_type;
@@ -843,7 +843,7 @@ static int __init ebda_rsrc_controller(void)
// register slots with hpc core as well as create linked list of ibm slot
for (index = 0; index < hpc_ptr->slot_count; index++) {
- tmp_slot = kzalloc_obj(*tmp_slot, GFP_KERNEL);
+ tmp_slot = kzalloc_obj(*tmp_slot);
if (!tmp_slot) {
rc = -ENOMEM;
goto error_no_slot;
diff --git a/drivers/pci/hotplug/ibmphp_pci.c b/drivers/pci/hotplug/ibmphp_pci.c
index f1ec9ada9faa..c4d28987af3f 100644
--- a/drivers/pci/hotplug/ibmphp_pci.c
+++ b/drivers/pci/hotplug/ibmphp_pci.c
@@ -816,7 +816,7 @@ static int configure_bridge(struct pci_func **func_passed, u8 slotno)
flag_io = 1;
} else {
debug("it wants %x IO behind the bridge\n", amount_needed->io);
- io = kzalloc_obj(*io, GFP_KERNEL);
+ io = kzalloc_obj(*io);
if (!io) {
retval = -ENOMEM;
@@ -838,7 +838,7 @@ static int configure_bridge(struct pci_func **func_passed, u8 slotno)
flag_mem = 1;
} else {
debug("it wants %x memory behind the bridge\n", amount_needed->mem);
- mem = kzalloc_obj(*mem, GFP_KERNEL);
+ mem = kzalloc_obj(*mem);
if (!mem) {
retval = -ENOMEM;
goto error;
@@ -859,7 +859,7 @@ static int configure_bridge(struct pci_func **func_passed, u8 slotno)
flag_pfmem = 1;
} else {
debug("it wants %x pfmemory behind the bridge\n", amount_needed->pfmem);
- pfmem = kzalloc_obj(*pfmem, GFP_KERNEL);
+ pfmem = kzalloc_obj(*pfmem);
if (!pfmem) {
retval = -ENOMEM;
goto error;
@@ -873,7 +873,7 @@ static int configure_bridge(struct pci_func **func_passed, u8 slotno)
ibmphp_add_resource(pfmem);
flag_pfmem = 1;
} else {
- mem_tmp = kzalloc_obj(*mem_tmp, GFP_KERNEL);
+ mem_tmp = kzalloc_obj(*mem_tmp);
if (!mem_tmp) {
retval = -ENOMEM;
goto error;
@@ -903,7 +903,7 @@ static int configure_bridge(struct pci_func **func_passed, u8 slotno)
*/
bus = ibmphp_find_res_bus(sec_number);
if (!bus) {
- bus = kzalloc_obj(*bus, GFP_KERNEL);
+ bus = kzalloc_obj(*bus);
if (!bus) {
retval = -ENOMEM;
goto error;
@@ -1076,7 +1076,7 @@ static struct res_needed *scan_behind_bridge(struct pci_func *func, u8 busno)
};
struct res_needed *amount;
- amount = kzalloc_obj(*amount, GFP_KERNEL);
+ amount = kzalloc_obj(*amount);
if (amount == NULL)
return NULL;
@@ -1630,7 +1630,7 @@ static int add_new_bus(struct bus_node *bus, struct resource_node *io, struct re
list_add(&bus->bus_list, &cur_bus->bus_list);
}
if (io) {
- io_range = kzalloc_obj(*io_range, GFP_KERNEL);
+ io_range = kzalloc_obj(*io_range);
if (!io_range)
return -ENOMEM;
@@ -1641,7 +1641,7 @@ static int add_new_bus(struct bus_node *bus, struct resource_node *io, struct re
bus->rangeIO = io_range;
}
if (mem) {
- mem_range = kzalloc_obj(*mem_range, GFP_KERNEL);
+ mem_range = kzalloc_obj(*mem_range);
if (!mem_range)
return -ENOMEM;
@@ -1652,7 +1652,7 @@ static int add_new_bus(struct bus_node *bus, struct resource_node *io, struct re
bus->rangeMem = mem_range;
}
if (pfmem) {
- pfmem_range = kzalloc_obj(*pfmem_range, GFP_KERNEL);
+ pfmem_range = kzalloc_obj(*pfmem_range);
if (!pfmem_range)
return -ENOMEM;
diff --git a/drivers/pci/hotplug/ibmphp_res.c b/drivers/pci/hotplug/ibmphp_res.c
index c05a2c05e302..e52d4acd1310 100644
--- a/drivers/pci/hotplug/ibmphp_res.c
+++ b/drivers/pci/hotplug/ibmphp_res.c
@@ -41,7 +41,7 @@ static struct bus_node * __init alloc_error_bus(struct ebda_pci_rsrc *curr, u8 b
return NULL;
}
- newbus = kzalloc_obj(struct bus_node, GFP_KERNEL);
+ newbus = kzalloc_obj(struct bus_node);
if (!newbus)
return NULL;
@@ -62,7 +62,7 @@ static struct resource_node * __init alloc_resources(struct ebda_pci_rsrc *curr)
return NULL;
}
- rs = kzalloc_obj(struct resource_node, GFP_KERNEL);
+ rs = kzalloc_obj(struct resource_node);
if (!rs)
return NULL;
@@ -81,7 +81,7 @@ static int __init alloc_bus_range(struct bus_node **new_bus, struct range_node *
u8 num_ranges = 0;
if (first_bus) {
- newbus = kzalloc_obj(struct bus_node, GFP_KERNEL);
+ newbus = kzalloc_obj(struct bus_node);
if (!newbus)
return -ENOMEM;
@@ -101,7 +101,7 @@ static int __init alloc_bus_range(struct bus_node **new_bus, struct range_node *
}
}
- newrange = kzalloc_obj(struct range_node, GFP_KERNEL);
+ newrange = kzalloc_obj(struct range_node);
if (!newrange) {
if (first_bus)
kfree(newbus);
diff --git a/drivers/pci/hotplug/octep_hp.c b/drivers/pci/hotplug/octep_hp.c
index 109513822589..a0a7f9ccb8fa 100644
--- a/drivers/pci/hotplug/octep_hp.c
+++ b/drivers/pci/hotplug/octep_hp.c
@@ -136,7 +136,7 @@ octep_hp_register_slot(struct octep_hp_controller *hp_ctrl,
struct octep_hp_slot *hp_slot;
int ret;
- hp_slot = kzalloc_obj(*hp_slot, GFP_KERNEL);
+ hp_slot = kzalloc_obj(*hp_slot);
if (!hp_slot)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/pci/hotplug/pciehp_core.c b/drivers/pci/hotplug/pciehp_core.c
index b344ccb3cbc1..1e9158d7bac7 100644
--- a/drivers/pci/hotplug/pciehp_core.c
+++ b/drivers/pci/hotplug/pciehp_core.c
@@ -55,7 +55,7 @@ static int init_slot(struct controller *ctrl)
int retval;
/* Setup hotplug slot ops */
- ops = kzalloc_obj(*ops, GFP_KERNEL);
+ ops = kzalloc_obj(*ops);
if (!ops)
return -ENOMEM;
diff --git a/drivers/pci/hotplug/pciehp_hpc.c b/drivers/pci/hotplug/pciehp_hpc.c
index 33396ad0331c..4c62140a3cb4 100644
--- a/drivers/pci/hotplug/pciehp_hpc.c
+++ b/drivers/pci/hotplug/pciehp_hpc.c
@@ -1011,7 +1011,7 @@ struct controller *pcie_init(struct pcie_device *dev)
struct pci_dev *pdev = dev->port;
struct pci_bus *subordinate = pdev->subordinate;
- ctrl = kzalloc_obj(*ctrl, GFP_KERNEL);
+ ctrl = kzalloc_obj(*ctrl);
if (!ctrl)
return NULL;
diff --git a/drivers/pci/hotplug/pnv_php.c b/drivers/pci/hotplug/pnv_php.c
index 4364f068fb72..5c020831e318 100644
--- a/drivers/pci/hotplug/pnv_php.c
+++ b/drivers/pci/hotplug/pnv_php.c
@@ -791,7 +791,7 @@ static struct pnv_php_slot *pnv_php_alloc_slot(struct device_node *dn)
if (!bus)
return NULL;
- php_slot = kzalloc_obj(*php_slot, GFP_KERNEL);
+ php_slot = kzalloc_obj(*php_slot);
if (!php_slot)
return NULL;
diff --git a/drivers/pci/hotplug/rpaphp_slot.c b/drivers/pci/hotplug/rpaphp_slot.c
index 730a3d6c12ba..33ca19200c1b 100644
--- a/drivers/pci/hotplug/rpaphp_slot.c
+++ b/drivers/pci/hotplug/rpaphp_slot.c
@@ -32,7 +32,7 @@ struct slot *alloc_slot_struct(struct device_node *dn,
{
struct slot *slot;
- slot = kzalloc_obj(struct slot, GFP_KERNEL);
+ slot = kzalloc_obj(struct slot);
if (!slot)
goto error_nomem;
slot->name = kstrdup(drc_name, GFP_KERNEL);
diff --git a/drivers/pci/hotplug/shpchp_core.c b/drivers/pci/hotplug/shpchp_core.c
index 13687b666f7a..8d6f8eea599d 100644
--- a/drivers/pci/hotplug/shpchp_core.c
+++ b/drivers/pci/hotplug/shpchp_core.c
@@ -66,7 +66,7 @@ static int init_slots(struct controller *ctrl)
int i;
for (i = 0; i < ctrl->num_slots; i++) {
- slot = kzalloc_obj(*slot, GFP_KERNEL);
+ slot = kzalloc_obj(*slot);
if (!slot) {
retval = -ENOMEM;
goto error;
@@ -259,7 +259,7 @@ static int shpc_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
if (acpi_get_hp_hw_control_from_firmware(pdev))
return -ENODEV;
- ctrl = kzalloc_obj(*ctrl, GFP_KERNEL);
+ ctrl = kzalloc_obj(*ctrl);
if (!ctrl)
goto err_out_none;
diff --git a/drivers/pci/hotplug/shpchp_ctrl.c b/drivers/pci/hotplug/shpchp_ctrl.c
index 20526c1fa441..a10cdcdcbbdc 100644
--- a/drivers/pci/hotplug/shpchp_ctrl.c
+++ b/drivers/pci/hotplug/shpchp_ctrl.c
@@ -418,7 +418,7 @@ void shpchp_queue_pushbutton_work(struct work_struct *work)
struct slot *p_slot = container_of(work, struct slot, work.work);
struct pushbutton_work_info *info;
- info = kmalloc_obj(*info, GFP_KERNEL);
+ info = kmalloc_obj(*info);
if (!info) {
ctrl_err(p_slot->ctrl, "%s: Cannot allocate memory\n",
__func__);
diff --git a/drivers/pci/ide.c b/drivers/pci/ide.c
index 94c20f35f86f..be74e8f0ae21 100644
--- a/drivers/pci/ide.c
+++ b/drivers/pci/ide.c
@@ -258,7 +258,7 @@ struct pci_ide *pci_ide_stream_alloc(struct pci_dev *pdev)
if (!pdev->ide_cap)
return NULL;
- struct pci_ide *ide __free(kfree) = kzalloc_obj(*ide, GFP_KERNEL);
+ struct pci_ide *ide __free(kfree) = kzalloc_obj(*ide);
if (!ide)
return NULL;
diff --git a/drivers/pci/iov.c b/drivers/pci/iov.c
index 99b939f233be..91ac4e37ecb9 100644
--- a/drivers/pci/iov.c
+++ b/drivers/pci/iov.c
@@ -837,7 +837,7 @@ static int sriov_init(struct pci_dev *dev, int pos)
pgsz &= ~(pgsz - 1);
pci_write_config_dword(dev, pos + PCI_SRIOV_SYS_PGSIZE, pgsz);
- iov = kzalloc_obj(*iov, GFP_KERNEL);
+ iov = kzalloc_obj(*iov);
if (!iov)
return -ENOMEM;
diff --git a/drivers/pci/of.c b/drivers/pci/of.c
index 492ec76da821..9f8eb5df279e 100644
--- a/drivers/pci/of.c
+++ b/drivers/pci/of.c
@@ -696,7 +696,7 @@ void of_pci_make_dev_node(struct pci_dev *pdev)
if (!name)
return;
- cset = kmalloc_obj(*cset, GFP_KERNEL);
+ cset = kmalloc_obj(*cset);
if (!cset)
goto out_free_name;
of_changeset_init(cset);
@@ -784,7 +784,7 @@ void of_pci_make_host_bridge_node(struct pci_host_bridge *bridge)
if (!name)
return;
- cset = kmalloc_obj(*cset, GFP_KERNEL);
+ cset = kmalloc_obj(*cset);
if (!cset)
goto out_free_name;
of_changeset_init(cset);
diff --git a/drivers/pci/of_property.c b/drivers/pci/of_property.c
index 9011f890ebf3..75a358f73e69 100644
--- a/drivers/pci/of_property.c
+++ b/drivers/pci/of_property.c
@@ -119,7 +119,7 @@ static int of_pci_prop_ranges(struct pci_dev *pdev, struct of_changeset *ocs,
res = &pdev->resource[PCI_STD_RESOURCES];
}
- rp = kzalloc_objs(*rp, num, GFP_KERNEL);
+ rp = kzalloc_objs(*rp, num);
if (!rp)
return -ENOMEM;
diff --git a/drivers/pci/p2pdma.c b/drivers/pci/p2pdma.c
index 4ab9800c22cc..e0f546166eb8 100644
--- a/drivers/pci/p2pdma.c
+++ b/drivers/pci/p2pdma.c
@@ -1006,7 +1006,7 @@ struct scatterlist *pci_p2pmem_alloc_sgl(struct pci_dev *pdev,
struct scatterlist *sg;
void *addr;
- sg = kmalloc_obj(*sg, GFP_KERNEL);
+ sg = kmalloc_obj(*sg);
if (!sg)
return NULL;
diff --git a/drivers/pci/pci-acpi.c b/drivers/pci/pci-acpi.c
index 854597fe4eab..4d0f2cb6c695 100644
--- a/drivers/pci/pci-acpi.c
+++ b/drivers/pci/pci-acpi.c
@@ -1663,11 +1663,11 @@ struct pci_bus *pci_acpi_scan_root(struct acpi_pci_root *root)
struct acpi_pci_root_ops *root_ops;
struct pci_host_bridge *host;
- ri = kzalloc_obj(*ri, GFP_KERNEL);
+ ri = kzalloc_obj(*ri);
if (!ri)
return NULL;
- root_ops = kzalloc_obj(*root_ops, GFP_KERNEL);
+ root_ops = kzalloc_obj(*root_ops);
if (!root_ops) {
kfree(ri);
return NULL;
diff --git a/drivers/pci/pci-driver.c b/drivers/pci/pci-driver.c
index 206d30324dfd..dd9075403987 100644
--- a/drivers/pci/pci-driver.c
+++ b/drivers/pci/pci-driver.c
@@ -58,7 +58,7 @@ int pci_add_dynid(struct pci_driver *drv,
{
struct pci_dynid *dynid;
- dynid = kzalloc_obj(*dynid, GFP_KERNEL);
+ dynid = kzalloc_obj(*dynid);
if (!dynid)
return -ENOMEM;
@@ -203,7 +203,7 @@ static ssize_t new_id_store(struct device_driver *driver, const char *buf,
return -EINVAL;
if (fields != 7) {
- struct pci_dev *pdev = kzalloc_obj(*pdev, GFP_KERNEL);
+ struct pci_dev *pdev = kzalloc_obj(*pdev);
if (!pdev)
return -ENOMEM;
diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c
index 4aa21fe3b13e..8479c2e1f74f 100644
--- a/drivers/pci/pci.c
+++ b/drivers/pci/pci.c
@@ -2462,7 +2462,7 @@ void pci_pme_active(struct pci_dev *dev, bool enable)
if (dev->pme_poll) {
struct pci_pme_device *pme_dev;
if (enable) {
- pme_dev = kmalloc_obj(struct pci_pme_device, GFP_KERNEL);
+ pme_dev = kmalloc_obj(struct pci_pme_device);
if (!pme_dev) {
pci_warn(dev, "can't enable PME#\n");
return;
diff --git a/drivers/pci/pcie/aer.c b/drivers/pci/pcie/aer.c
index 068594aa6878..d916378bc707 100644
--- a/drivers/pci/pcie/aer.c
+++ b/drivers/pci/pcie/aer.c
@@ -390,7 +390,7 @@ void pci_aer_init(struct pci_dev *dev)
if (!dev->aer_cap)
return;
- dev->aer_info = kzalloc_obj(*dev->aer_info, GFP_KERNEL);
+ dev->aer_info = kzalloc_obj(*dev->aer_info);
if (!dev->aer_info) {
dev->aer_cap = 0;
return;
diff --git a/drivers/pci/pcie/aer_inject.c b/drivers/pci/pcie/aer_inject.c
index 9c8b2dc496b9..09bfc7194ef3 100644
--- a/drivers/pci/pcie/aer_inject.c
+++ b/drivers/pci/pcie/aer_inject.c
@@ -300,7 +300,7 @@ static int pci_bus_set_aer_ops(struct pci_bus *bus)
struct pci_bus_ops *bus_ops;
unsigned long flags;
- bus_ops = kmalloc_obj(*bus_ops, GFP_KERNEL);
+ bus_ops = kmalloc_obj(*bus_ops);
if (!bus_ops)
return -ENOMEM;
ops = pci_bus_set_ops(bus, &aer_inj_pci_ops);
@@ -360,12 +360,12 @@ static int aer_inject(struct aer_error_inj *einj)
goto out_put;
}
- err_alloc = kzalloc_obj(struct aer_error, GFP_KERNEL);
+ err_alloc = kzalloc_obj(struct aer_error);
if (!err_alloc) {
ret = -ENOMEM;
goto out_put;
}
- rperr_alloc = kzalloc_obj(struct aer_error, GFP_KERNEL);
+ rperr_alloc = kzalloc_obj(struct aer_error);
if (!rperr_alloc) {
ret = -ENOMEM;
goto out_put;
diff --git a/drivers/pci/pcie/aspm.c b/drivers/pci/pcie/aspm.c
index 83ea061f2eba..21f5d23e0b61 100644
--- a/drivers/pci/pcie/aspm.c
+++ b/drivers/pci/pcie/aspm.c
@@ -1063,7 +1063,7 @@ static struct pcie_link_state *alloc_pcie_link_state(struct pci_dev *pdev)
{
struct pcie_link_state *link;
- link = kzalloc_obj(*link, GFP_KERNEL);
+ link = kzalloc_obj(*link);
if (!link)
return NULL;
diff --git a/drivers/pci/pcie/pme.c b/drivers/pci/pcie/pme.c
index 050d814f6eac..4996cc4789f3 100644
--- a/drivers/pci/pcie/pme.c
+++ b/drivers/pci/pcie/pme.c
@@ -335,7 +335,7 @@ static int pcie_pme_probe(struct pcie_device *srv)
type != PCI_EXP_TYPE_ROOT_PORT)
return -ENODEV;
- data = kzalloc_obj(*data, GFP_KERNEL);
+ data = kzalloc_obj(*data);
if (!data)
return -ENOMEM;
diff --git a/drivers/pci/pcie/portdrv.c b/drivers/pci/pcie/portdrv.c
index f033acbd71a4..2d6aa488fe7b 100644
--- a/drivers/pci/pcie/portdrv.c
+++ b/drivers/pci/pcie/portdrv.c
@@ -293,7 +293,7 @@ static int pcie_device_init(struct pci_dev *pdev, int service, int irq)
struct pcie_device *pcie;
struct device *device;
- pcie = kzalloc_obj(*pcie, GFP_KERNEL);
+ pcie = kzalloc_obj(*pcie);
if (!pcie)
return -ENOMEM;
pcie->port = pdev;
diff --git a/drivers/pci/pcie/ptm.c b/drivers/pci/pcie/ptm.c
index d8727369e6a5..91a598ed534c 100644
--- a/drivers/pci/pcie/ptm.c
+++ b/drivers/pci/pcie/ptm.c
@@ -537,7 +537,7 @@ struct pci_ptm_debugfs *pcie_ptm_create_debugfs(struct device *dev, void *pdata,
return NULL;
}
- ptm_debugfs = kzalloc_obj(*ptm_debugfs, GFP_KERNEL);
+ ptm_debugfs = kzalloc_obj(*ptm_debugfs);
if (!ptm_debugfs)
return NULL;
diff --git a/drivers/pci/pcie/rcec.c b/drivers/pci/pcie/rcec.c
index 531cde54d747..2bf6d9d549ba 100644
--- a/drivers/pci/pcie/rcec.c
+++ b/drivers/pci/pcie/rcec.c
@@ -160,7 +160,7 @@ void pci_rcec_init(struct pci_dev *dev)
if (!rcec)
return;
- rcec_ea = kzalloc_obj(*rcec_ea, GFP_KERNEL);
+ rcec_ea = kzalloc_obj(*rcec_ea);
if (!rcec_ea)
return;
diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c
index 013334b53bfb..bccc7a4bdd79 100644
--- a/drivers/pci/probe.c
+++ b/drivers/pci/probe.c
@@ -53,7 +53,7 @@ static struct resource *get_pci_domain_busn_res(int domain_nr)
if (r->domain_nr == domain_nr)
return &r->res;
- r = kzalloc_obj(*r, GFP_KERNEL);
+ r = kzalloc_obj(*r);
if (!r)
return NULL;
@@ -620,7 +620,7 @@ static struct pci_bus *pci_alloc_bus(struct pci_bus *parent)
{
struct pci_bus *b;
- b = kzalloc_obj(*b, GFP_KERNEL);
+ b = kzalloc_obj(*b);
if (!b)
return NULL;
@@ -2502,7 +2502,7 @@ struct pci_dev *pci_alloc_dev(struct pci_bus *bus)
{
struct pci_dev *dev;
- dev = kzalloc_obj(struct pci_dev, GFP_KERNEL);
+ dev = kzalloc_obj(struct pci_dev);
if (!dev)
return NULL;
diff --git a/drivers/pci/proc.c b/drivers/pci/proc.c
index 53104f5c6378..ce36e35681e8 100644
--- a/drivers/pci/proc.c
+++ b/drivers/pci/proc.c
@@ -297,7 +297,7 @@ static int proc_bus_pci_mmap(struct file *file, struct vm_area_struct *vma)
static int proc_bus_pci_open(struct inode *inode, struct file *file)
{
- struct pci_filp_private *fpriv = kmalloc_obj(*fpriv, GFP_KERNEL);
+ struct pci_filp_private *fpriv = kmalloc_obj(*fpriv);
if (!fpriv)
return -ENOMEM;
diff --git a/drivers/pci/setup-bus.c b/drivers/pci/setup-bus.c
index b641f60a2aa5..61f769aaa2f6 100644
--- a/drivers/pci/setup-bus.c
+++ b/drivers/pci/setup-bus.c
@@ -73,7 +73,7 @@ int pci_dev_res_add_to_list(struct list_head *head, struct pci_dev *dev,
{
struct pci_dev_resource *tmp;
- tmp = kzalloc_obj(*tmp, GFP_KERNEL);
+ tmp = kzalloc_obj(*tmp);
if (!tmp)
return -ENOMEM;
@@ -350,7 +350,7 @@ static void pdev_sort_resources(struct pci_dev *dev, struct list_head *head)
continue;
}
- tmp = kzalloc_obj(*tmp, GFP_KERNEL);
+ tmp = kzalloc_obj(*tmp);
if (!tmp)
panic("%s: kzalloc() failed!\n", __func__);
tmp->res = r;
diff --git a/drivers/pci/slot.c b/drivers/pci/slot.c
index 15e98de7bdbe..787311614e5b 100644
--- a/drivers/pci/slot.c
+++ b/drivers/pci/slot.c
@@ -256,7 +256,7 @@ struct pci_slot *pci_create_slot(struct pci_bus *parent, int slot_nr,
}
placeholder:
- slot = kzalloc_obj(*slot, GFP_KERNEL);
+ slot = kzalloc_obj(*slot);
if (!slot) {
err = -ENOMEM;
goto err;
diff --git a/drivers/pci/switch/switchtec.c b/drivers/pci/switch/switchtec.c
index c6e97d1af1a0..93ebec94b763 100644
--- a/drivers/pci/switch/switchtec.c
+++ b/drivers/pci/switch/switchtec.c
@@ -86,7 +86,7 @@ static struct switchtec_user *stuser_create(struct switchtec_dev *stdev)
{
struct switchtec_user *stuser;
- stuser = kzalloc_obj(*stuser, GFP_KERNEL);
+ stuser = kzalloc_obj(*stuser);
if (!stuser)
return ERR_PTR(-ENOMEM);
@@ -895,7 +895,7 @@ static int ioctl_event_summary(struct switchtec_dev *stdev,
u32 reg;
int ret = 0;
- s = kzalloc_obj(*s, GFP_KERNEL);
+ s = kzalloc_obj(*s);
if (!s)
return -ENOMEM;
diff --git a/drivers/pci/vgaarb.c b/drivers/pci/vgaarb.c
index 21204da24e73..d9383bf541e7 100644
--- a/drivers/pci/vgaarb.c
+++ b/drivers/pci/vgaarb.c
@@ -735,7 +735,7 @@ static bool vga_arbiter_add_pci_device(struct pci_dev *pdev)
u16 cmd;
/* Allocate structure */
- vgadev = kzalloc_obj(struct vga_device, GFP_KERNEL);
+ vgadev = kzalloc_obj(struct vga_device);
if (vgadev == NULL) {
vgaarb_err(&pdev->dev, "failed to allocate VGA arbiter data\n");
/*
@@ -1385,7 +1385,7 @@ static int vga_arb_open(struct inode *inode, struct file *file)
pr_debug("%s\n", __func__);
- priv = kzalloc_obj(*priv, GFP_KERNEL);
+ priv = kzalloc_obj(*priv);
if (priv == NULL)
return -ENOMEM;
spin_lock_init(&priv->lock);
diff --git a/drivers/pci/xen-pcifront.c b/drivers/pci/xen-pcifront.c
index bbb43539a2b0..b8aaa292c3e7 100644
--- a/drivers/pci/xen-pcifront.c
+++ b/drivers/pci/xen-pcifront.c
@@ -462,8 +462,8 @@ static int pcifront_scan_root(struct pcifront_device *pdev,
dev_info(&pdev->xdev->dev, "Creating PCI Frontend Bus %04x:%02x\n",
domain, bus);
- bus_entry = kzalloc_obj(*bus_entry, GFP_KERNEL);
- sd = kzalloc_obj(*sd, GFP_KERNEL);
+ bus_entry = kzalloc_obj(*bus_entry);
+ sd = kzalloc_obj(*sd);
if (!bus_entry || !sd) {
err = -ENOMEM;
goto err_out;
@@ -687,7 +687,7 @@ static struct pcifront_device *alloc_pdev(struct xenbus_device *xdev)
{
struct pcifront_device *pdev;
- pdev = kzalloc_obj(struct pcifront_device, GFP_KERNEL);
+ pdev = kzalloc_obj(struct pcifront_device);
if (pdev == NULL)
goto out;
diff --git a/drivers/pcmcia/bcm63xx_pcmcia.c b/drivers/pcmcia/bcm63xx_pcmcia.c
index cfb2a3724252..724fd6ee0fd0 100644
--- a/drivers/pcmcia/bcm63xx_pcmcia.c
+++ b/drivers/pcmcia/bcm63xx_pcmcia.c
@@ -333,7 +333,7 @@ static int bcm63xx_drv_pcmcia_probe(struct platform_device *pdev)
int ret;
int irq;
- skt = kzalloc_obj(*skt, GFP_KERNEL);
+ skt = kzalloc_obj(*skt);
if (!skt)
return -ENOMEM;
spin_lock_init(&skt->lock);
diff --git a/drivers/pcmcia/cistpl.c b/drivers/pcmcia/cistpl.c
index e22ebce496d5..d73ec3281b5e 100644
--- a/drivers/pcmcia/cistpl.c
+++ b/drivers/pcmcia/cistpl.c
@@ -1393,12 +1393,12 @@ int pccard_validate_cis(struct pcmcia_socket *s, unsigned int *info)
destroy_cis_cache(s);
mutex_unlock(&s->ops_mutex);
- tuple = kmalloc_obj(*tuple, GFP_KERNEL);
+ tuple = kmalloc_obj(*tuple);
if (tuple == NULL) {
dev_warn(&s->dev, "no memory to validate CIS\n");
return -ENOMEM;
}
- p = kmalloc_obj(*p, GFP_KERNEL);
+ p = kmalloc_obj(*p);
if (p == NULL) {
kfree(tuple);
dev_warn(&s->dev, "no memory to validate CIS\n");
@@ -1480,11 +1480,11 @@ static ssize_t pccard_extract_cis(struct pcmcia_socket *s, char *buf,
u_char *tuplebuffer;
u_char *tempbuffer;
- tuplebuffer = kmalloc_objs(u_char, 256, GFP_KERNEL);
+ tuplebuffer = kmalloc_objs(u_char, 256);
if (!tuplebuffer)
return -ENOMEM;
- tempbuffer = kmalloc_objs(u_char, 258, GFP_KERNEL);
+ tempbuffer = kmalloc_objs(u_char, 258);
if (!tempbuffer) {
ret = -ENOMEM;
goto free_tuple;
diff --git a/drivers/pcmcia/db1xxx_ss.c b/drivers/pcmcia/db1xxx_ss.c
index 5f80ad72566b..7b896d7dbc9f 100644
--- a/drivers/pcmcia/db1xxx_ss.c
+++ b/drivers/pcmcia/db1xxx_ss.c
@@ -427,7 +427,7 @@ static int db1x_pcmcia_socket_probe(struct platform_device *pdev)
struct resource *r;
int ret, bid;
- sock = kzalloc_obj(struct db1x_pcmcia_sock, GFP_KERNEL);
+ sock = kzalloc_obj(struct db1x_pcmcia_sock);
if (!sock)
return -ENOMEM;
diff --git a/drivers/pcmcia/ds.c b/drivers/pcmcia/ds.c
index 9c26aeb39dcf..cc9f74391cf1 100644
--- a/drivers/pcmcia/ds.c
+++ b/drivers/pcmcia/ds.c
@@ -108,7 +108,7 @@ new_id_store(struct device_driver *driver, const char *buf, size_t count)
if (fields < 6)
return -EINVAL;
- dynid = kzalloc_obj(struct pcmcia_dynid, GFP_KERNEL);
+ dynid = kzalloc_obj(struct pcmcia_dynid);
if (!dynid)
return -ENOMEM;
@@ -402,7 +402,7 @@ static int pcmcia_device_query(struct pcmcia_device *p_dev)
cistpl_vers_1_t *vers1;
unsigned int i;
- vers1 = kmalloc_obj(*vers1, GFP_KERNEL);
+ vers1 = kmalloc_obj(*vers1);
if (!vers1)
return -ENOMEM;
@@ -428,7 +428,7 @@ static int pcmcia_device_query(struct pcmcia_device *p_dev)
* probably memory cards (from pcmcia-cs) */
cistpl_device_geo_t *devgeo;
- devgeo = kmalloc_obj(*devgeo, GFP_KERNEL);
+ devgeo = kmalloc_obj(*devgeo);
if (!devgeo) {
kfree(vers1);
return -ENOMEM;
@@ -488,7 +488,7 @@ static struct pcmcia_device *pcmcia_device_add(struct pcmcia_socket *s,
pr_debug("adding device to %d, function %d\n", s->sock, function);
- p_dev = kzalloc_obj(struct pcmcia_device, GFP_KERNEL);
+ p_dev = kzalloc_obj(struct pcmcia_device);
if (!p_dev)
goto err_put;
@@ -542,7 +542,7 @@ static struct pcmcia_device *pcmcia_device_add(struct pcmcia_socket *s,
if (!p_dev->function_config) {
config_t *c;
dev_dbg(&p_dev->dev, "creating config_t\n");
- c = kzalloc_obj(struct config_t, GFP_KERNEL);
+ c = kzalloc_obj(struct config_t);
if (!c) {
mutex_unlock(&s->ops_mutex);
goto err_unreg;
diff --git a/drivers/pcmcia/electra_cf.c b/drivers/pcmcia/electra_cf.c
index 05d78262e408..e9179d0ae234 100644
--- a/drivers/pcmcia/electra_cf.c
+++ b/drivers/pcmcia/electra_cf.c
@@ -190,7 +190,7 @@ static int electra_cf_probe(struct platform_device *ofdev)
if (err)
return -EINVAL;
- cf = kzalloc_obj(*cf, GFP_KERNEL);
+ cf = kzalloc_obj(*cf);
if (!cf)
return -ENOMEM;
diff --git a/drivers/pcmcia/omap_cf.c b/drivers/pcmcia/omap_cf.c
index c43f15557906..49621074a47a 100644
--- a/drivers/pcmcia/omap_cf.c
+++ b/drivers/pcmcia/omap_cf.c
@@ -218,7 +218,7 @@ static int __init omap_cf_probe(struct platform_device *pdev)
if (!res)
return -EINVAL;
- cf = kzalloc_obj(*cf, GFP_KERNEL);
+ cf = kzalloc_obj(*cf);
if (!cf)
return -ENOMEM;
timer_setup(&cf->timer, omap_cf_timer, 0);
diff --git a/drivers/pcmcia/pcmcia_cis.c b/drivers/pcmcia/pcmcia_cis.c
index f84ca5cde76b..0f474629229f 100644
--- a/drivers/pcmcia/pcmcia_cis.c
+++ b/drivers/pcmcia/pcmcia_cis.c
@@ -264,7 +264,7 @@ int pcmcia_loop_config(struct pcmcia_device *p_dev,
struct pcmcia_cfg_mem *cfg_mem;
int ret;
- cfg_mem = kzalloc_obj(struct pcmcia_cfg_mem, GFP_KERNEL);
+ cfg_mem = kzalloc_obj(struct pcmcia_cfg_mem);
if (cfg_mem == NULL)
return -ENOMEM;
diff --git a/drivers/pcmcia/pd6729.c b/drivers/pcmcia/pd6729.c
index 3f4fc34d1b54..1b62ca30d08a 100644
--- a/drivers/pcmcia/pd6729.c
+++ b/drivers/pcmcia/pd6729.c
@@ -629,7 +629,7 @@ static int pd6729_pci_probe(struct pci_dev *dev,
char configbyte;
struct pd6729_socket *socket;
- socket = kzalloc_objs(struct pd6729_socket, MAX_SOCKETS, GFP_KERNEL);
+ socket = kzalloc_objs(struct pd6729_socket, MAX_SOCKETS);
if (!socket) {
dev_warn(&dev->dev, "failed to kzalloc socket.\n");
return -ENOMEM;
diff --git a/drivers/pcmcia/rsrc_mgr.c b/drivers/pcmcia/rsrc_mgr.c
index f6606b772eff..25b12c585ecb 100644
--- a/drivers/pcmcia/rsrc_mgr.c
+++ b/drivers/pcmcia/rsrc_mgr.c
@@ -31,7 +31,7 @@ struct resource *pcmcia_make_resource(resource_size_t start,
resource_size_t end,
unsigned long flags, const char *name)
{
- struct resource *res = kzalloc_obj(*res, GFP_KERNEL);
+ struct resource *res = kzalloc_obj(*res);
if (res) {
res->name = name;
diff --git a/drivers/pcmcia/rsrc_nonstatic.c b/drivers/pcmcia/rsrc_nonstatic.c
index 3531d98e5bb1..0679dd434719 100644
--- a/drivers/pcmcia/rsrc_nonstatic.c
+++ b/drivers/pcmcia/rsrc_nonstatic.c
@@ -117,7 +117,7 @@ static int add_interval(struct resource_map *map, u_long base, u_long num)
if ((p->next == map) || (p->next->base > base+num-1))
break;
}
- q = kmalloc_obj(struct resource_map, GFP_KERNEL);
+ q = kmalloc_obj(struct resource_map);
if (!q) {
printk(KERN_WARNING "out of memory to update resources\n");
return -ENOMEM;
@@ -155,7 +155,7 @@ static int sub_interval(struct resource_map *map, u_long base, u_long num)
q->num = base - q->base;
} else {
/* Split the block into two pieces */
- p = kmalloc_obj(struct resource_map, GFP_KERNEL);
+ p = kmalloc_obj(struct resource_map);
if (!p) {
printk(KERN_WARNING "out of memory to update resources\n");
return -ENOMEM;
@@ -1022,7 +1022,7 @@ static int nonstatic_init(struct pcmcia_socket *s)
{
struct socket_data *data;
- data = kzalloc_obj(struct socket_data, GFP_KERNEL);
+ data = kzalloc_obj(struct socket_data);
if (!data)
return -ENOMEM;
diff --git a/drivers/pcmcia/sa1111_generic.c b/drivers/pcmcia/sa1111_generic.c
index b0c08d8a43a8..55ea3ea6851b 100644
--- a/drivers/pcmcia/sa1111_generic.c
+++ b/drivers/pcmcia/sa1111_generic.c
@@ -153,7 +153,7 @@ int sa1111_pcmcia_add(struct sa1111_dev *dev, struct pcmcia_low_level *ops,
ops->socket_state = sa1111_pcmcia_socket_state;
for (i = 0; i < ops->nr; i++) {
- s = kzalloc_obj(*s, GFP_KERNEL);
+ s = kzalloc_obj(*s);
if (!s)
return -ENOMEM;
diff --git a/drivers/pcmcia/xxs1500_ss.c b/drivers/pcmcia/xxs1500_ss.c
index 2d7e674d86d6..8a8aae1843b5 100644
--- a/drivers/pcmcia/xxs1500_ss.c
+++ b/drivers/pcmcia/xxs1500_ss.c
@@ -212,7 +212,7 @@ static int xxs1500_pcmcia_probe(struct platform_device *pdev)
struct resource *r;
int ret, irq;
- sock = kzalloc_obj(struct xxs1500_pcmcia_sock, GFP_KERNEL);
+ sock = kzalloc_obj(struct xxs1500_pcmcia_sock);
if (!sock)
return -ENOMEM;
diff --git a/drivers/pcmcia/yenta_socket.c b/drivers/pcmcia/yenta_socket.c
index ddff589bebc8..54dc1fee57aa 100644
--- a/drivers/pcmcia/yenta_socket.c
+++ b/drivers/pcmcia/yenta_socket.c
@@ -1171,7 +1171,7 @@ static int yenta_probe(struct pci_dev *dev, const struct pci_device_id *id)
return -ENODEV;
}
- socket = kzalloc_obj(struct yenta_socket, GFP_KERNEL);
+ socket = kzalloc_obj(struct yenta_socket);
if (!socket)
return -ENOMEM;
diff --git a/drivers/peci/core.c b/drivers/peci/core.c
index f54341959769..e14995b1bf7f 100644
--- a/drivers/peci/core.c
+++ b/drivers/peci/core.c
@@ -52,7 +52,7 @@ static struct peci_controller *peci_controller_alloc(struct device *dev,
if (!ops->xfer)
return ERR_PTR(-EINVAL);
- controller = kzalloc_obj(*controller, GFP_KERNEL);
+ controller = kzalloc_obj(*controller);
if (!controller)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/peci/cpu.c b/drivers/peci/cpu.c
index 050612e2d3ca..c9fc06c9ff53 100644
--- a/drivers/peci/cpu.c
+++ b/drivers/peci/cpu.c
@@ -199,7 +199,7 @@ static struct auxiliary_device *adev_alloc(struct peci_cpu *priv, int idx)
const char *name;
int ret;
- adev = kzalloc_obj(*adev, GFP_KERNEL);
+ adev = kzalloc_obj(*adev);
if (!adev)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/peci/device.c b/drivers/peci/device.c
index ed4177b72f0e..2b9610216c8b 100644
--- a/drivers/peci/device.c
+++ b/drivers/peci/device.c
@@ -170,7 +170,7 @@ int peci_device_create(struct peci_controller *controller, u8 addr)
return ret;
}
- device = kzalloc_obj(*device, GFP_KERNEL);
+ device = kzalloc_obj(*device);
if (!device)
return -ENOMEM;
diff --git a/drivers/peci/request.c b/drivers/peci/request.c
index 437a59146dff..db2cc30a42a4 100644
--- a/drivers/peci/request.c
+++ b/drivers/peci/request.c
@@ -203,7 +203,7 @@ struct peci_request *peci_request_alloc(struct peci_device *device, u8 tx_len, u
* should be converted to DMA API once support for controllers that do
* allow it is added to avoid an extra copy.
*/
- req = kzalloc_obj(*req, GFP_KERNEL);
+ req = kzalloc_obj(*req);
if (!req)
return NULL;
diff --git a/drivers/perf/alibaba_uncore_drw_pmu.c b/drivers/perf/alibaba_uncore_drw_pmu.c
index 3c5ec82f0454..ac49d3b2dad6 100644
--- a/drivers/perf/alibaba_uncore_drw_pmu.c
+++ b/drivers/perf/alibaba_uncore_drw_pmu.c
@@ -431,7 +431,7 @@ static struct ali_drw_pmu_irq *__ali_drw_pmu_init_irq(struct platform_device
return irq;
}
- irq = kzalloc_obj(*irq, GFP_KERNEL);
+ irq = kzalloc_obj(*irq);
if (!irq)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/perf/arm-cmn.c b/drivers/perf/arm-cmn.c
index dd87d29c395a..40c05c519a1d 100644
--- a/drivers/perf/arm-cmn.c
+++ b/drivers/perf/arm-cmn.c
@@ -1700,7 +1700,7 @@ static int arm_cmn_validate_group(struct arm_cmn *cmn, struct perf_event *event)
if (event->pmu != leader->pmu && !is_software_event(leader))
return -EINVAL;
- val = kzalloc_obj(*val, GFP_KERNEL);
+ val = kzalloc_obj(*val);
if (!val)
return -ENOMEM;
diff --git a/drivers/perf/arm_dmc620_pmu.c b/drivers/perf/arm_dmc620_pmu.c
index 3354ef908a56..4f6b196160f8 100644
--- a/drivers/perf/arm_dmc620_pmu.c
+++ b/drivers/perf/arm_dmc620_pmu.c
@@ -432,7 +432,7 @@ static struct dmc620_pmu_irq *__dmc620_pmu_get_irq(int irq_num)
if (irq->irq_num == irq_num && refcount_inc_not_zero(&irq->refcount))
return irq;
- irq = kzalloc_obj(*irq, GFP_KERNEL);
+ irq = kzalloc_obj(*irq);
if (!irq)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/perf/arm_pmu.c b/drivers/perf/arm_pmu.c
index 5e7da5286d2c..939bcbd433aa 100644
--- a/drivers/perf/arm_pmu.c
+++ b/drivers/perf/arm_pmu.c
@@ -864,7 +864,7 @@ struct arm_pmu *armpmu_alloc(void)
struct arm_pmu *pmu;
int cpu;
- pmu = kzalloc_obj(*pmu, GFP_KERNEL);
+ pmu = kzalloc_obj(*pmu);
if (!pmu)
goto out;
diff --git a/drivers/perf/arm_spe_pmu.c b/drivers/perf/arm_spe_pmu.c
index eca2955693dc..dbd0da111639 100644
--- a/drivers/perf/arm_spe_pmu.c
+++ b/drivers/perf/arm_spe_pmu.c
@@ -1020,7 +1020,7 @@ static void *arm_spe_pmu_setup_aux(struct perf_event *event, void **pages,
if (!buf)
return NULL;
- pglist = kzalloc_objs(*pglist, nr_pages, GFP_KERNEL);
+ pglist = kzalloc_objs(*pglist, nr_pages);
if (!pglist)
goto out_free_buf;
diff --git a/drivers/perf/dwc_pcie_pmu.c b/drivers/perf/dwc_pcie_pmu.c
index ceb039306bb6..5385401fa9cf 100644
--- a/drivers/perf/dwc_pcie_pmu.c
+++ b/drivers/perf/dwc_pcie_pmu.c
@@ -649,7 +649,7 @@ static int dwc_pcie_register_dev(struct pci_dev *pdev)
if (IS_ERR(plat_dev))
return PTR_ERR(plat_dev);
- dev_info = kzalloc_obj(*dev_info, GFP_KERNEL);
+ dev_info = kzalloc_obj(*dev_info);
if (!dev_info) {
platform_device_unregister(plat_dev);
return -ENOMEM;
diff --git a/drivers/perf/riscv_pmu.c b/drivers/perf/riscv_pmu.c
index e5e43899ea74..8e3cd0f35336 100644
--- a/drivers/perf/riscv_pmu.c
+++ b/drivers/perf/riscv_pmu.c
@@ -389,7 +389,7 @@ struct riscv_pmu *riscv_pmu_alloc(void)
int cpuid, i;
struct cpu_hw_events *cpuc;
- pmu = kzalloc_obj(*pmu, GFP_KERNEL);
+ pmu = kzalloc_obj(*pmu);
if (!pmu)
goto out;
diff --git a/drivers/perf/riscv_pmu_sbi.c b/drivers/perf/riscv_pmu_sbi.c
index 09acac7ae073..87e60297395b 100644
--- a/drivers/perf/riscv_pmu_sbi.c
+++ b/drivers/perf/riscv_pmu_sbi.c
@@ -873,7 +873,7 @@ static int pmu_sbi_get_ctrinfo(int nctr, unsigned long *mask)
int i, num_hw_ctr = 0, num_fw_ctr = 0;
union sbi_pmu_ctr_info cinfo;
- pmu_ctr_list = kzalloc_objs(*pmu_ctr_list, nctr, GFP_KERNEL);
+ pmu_ctr_list = kzalloc_objs(*pmu_ctr_list, nctr);
if (!pmu_ctr_list)
return -ENOMEM;
diff --git a/drivers/phy/phy-core.c b/drivers/phy/phy-core.c
index b1b5ddd9e05e..21aaf2f76e53 100644
--- a/drivers/phy/phy-core.c
+++ b/drivers/phy/phy-core.c
@@ -75,7 +75,7 @@ int phy_create_lookup(struct phy *phy, const char *con_id, const char *dev_id)
if (!phy || !dev_id || !con_id)
return -EINVAL;
- pl = kzalloc_obj(*pl, GFP_KERNEL);
+ pl = kzalloc_obj(*pl);
if (!pl)
return -ENOMEM;
@@ -1004,7 +1004,7 @@ struct phy *phy_create(struct device *dev, struct device_node *node,
if (WARN_ON(!dev))
return ERR_PTR(-EINVAL);
- phy = kzalloc_obj(*phy, GFP_KERNEL);
+ phy = kzalloc_obj(*phy);
if (!phy)
return ERR_PTR(-ENOMEM);
@@ -1174,7 +1174,7 @@ struct phy_provider *__of_phy_provider_register(struct device *dev,
children = dev->of_node;
}
- phy_provider = kzalloc_obj(*phy_provider, GFP_KERNEL);
+ phy_provider = kzalloc_obj(*phy_provider);
if (!phy_provider)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/phy/tegra/xusb-tegra124.c b/drivers/phy/tegra/xusb-tegra124.c
index f180ef8a8829..70b6213370a8 100644
--- a/drivers/phy/tegra/xusb-tegra124.c
+++ b/drivers/phy/tegra/xusb-tegra124.c
@@ -430,7 +430,7 @@ tegra124_usb2_lane_probe(struct tegra_xusb_pad *pad, struct device_node *np,
struct tegra_xusb_usb2_lane *usb2;
int err;
- usb2 = kzalloc_obj(*usb2, GFP_KERNEL);
+ usb2 = kzalloc_obj(*usb2);
if (!usb2)
return ERR_PTR(-ENOMEM);
@@ -614,7 +614,7 @@ tegra124_usb2_pad_probe(struct tegra_xusb_padctl *padctl,
struct tegra_xusb_pad *pad;
int err;
- usb2 = kzalloc_obj(*usb2, GFP_KERNEL);
+ usb2 = kzalloc_obj(*usb2);
if (!usb2)
return ERR_PTR(-ENOMEM);
@@ -679,7 +679,7 @@ tegra124_ulpi_lane_probe(struct tegra_xusb_pad *pad, struct device_node *np,
struct tegra_xusb_ulpi_lane *ulpi;
int err;
- ulpi = kzalloc_obj(*ulpi, GFP_KERNEL);
+ ulpi = kzalloc_obj(*ulpi);
if (!ulpi)
return ERR_PTR(-ENOMEM);
@@ -751,7 +751,7 @@ tegra124_ulpi_pad_probe(struct tegra_xusb_padctl *padctl,
struct tegra_xusb_pad *pad;
int err;
- ulpi = kzalloc_obj(*ulpi, GFP_KERNEL);
+ ulpi = kzalloc_obj(*ulpi);
if (!ulpi)
return ERR_PTR(-ENOMEM);
@@ -815,7 +815,7 @@ tegra124_hsic_lane_probe(struct tegra_xusb_pad *pad, struct device_node *np,
struct tegra_xusb_hsic_lane *hsic;
int err;
- hsic = kzalloc_obj(*hsic, GFP_KERNEL);
+ hsic = kzalloc_obj(*hsic);
if (!hsic)
return ERR_PTR(-ENOMEM);
@@ -967,7 +967,7 @@ tegra124_hsic_pad_probe(struct tegra_xusb_padctl *padctl,
struct tegra_xusb_pad *pad;
int err;
- hsic = kzalloc_obj(*hsic, GFP_KERNEL);
+ hsic = kzalloc_obj(*hsic);
if (!hsic)
return ERR_PTR(-ENOMEM);
@@ -1035,7 +1035,7 @@ tegra124_pcie_lane_probe(struct tegra_xusb_pad *pad, struct device_node *np,
struct tegra_xusb_pcie_lane *pcie;
int err;
- pcie = kzalloc_obj(*pcie, GFP_KERNEL);
+ pcie = kzalloc_obj(*pcie);
if (!pcie)
return ERR_PTR(-ENOMEM);
@@ -1155,7 +1155,7 @@ tegra124_pcie_pad_probe(struct tegra_xusb_padctl *padctl,
struct tegra_xusb_pad *pad;
int err;
- pcie = kzalloc_obj(*pcie, GFP_KERNEL);
+ pcie = kzalloc_obj(*pcie);
if (!pcie)
return ERR_PTR(-ENOMEM);
@@ -1213,7 +1213,7 @@ tegra124_sata_lane_probe(struct tegra_xusb_pad *pad, struct device_node *np,
struct tegra_xusb_sata_lane *sata;
int err;
- sata = kzalloc_obj(*sata, GFP_KERNEL);
+ sata = kzalloc_obj(*sata);
if (!sata)
return ERR_PTR(-ENOMEM);
@@ -1351,7 +1351,7 @@ tegra124_sata_pad_probe(struct tegra_xusb_padctl *padctl,
struct tegra_xusb_pad *pad;
int err;
- sata = kzalloc_obj(*sata, GFP_KERNEL);
+ sata = kzalloc_obj(*sata);
if (!sata)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/phy/tegra/xusb-tegra186.c b/drivers/phy/tegra/xusb-tegra186.c
index eb643af34d68..1ddf11265974 100644
--- a/drivers/phy/tegra/xusb-tegra186.c
+++ b/drivers/phy/tegra/xusb-tegra186.c
@@ -302,7 +302,7 @@ tegra186_usb2_lane_probe(struct tegra_xusb_pad *pad, struct device_node *np,
struct tegra_xusb_usb2_lane *usb2;
int err;
- usb2 = kzalloc_obj(*usb2, GFP_KERNEL);
+ usb2 = kzalloc_obj(*usb2);
if (!usb2)
return ERR_PTR(-ENOMEM);
@@ -1031,7 +1031,7 @@ tegra186_usb2_pad_probe(struct tegra_xusb_padctl *padctl,
struct tegra_xusb_pad *pad;
int err;
- usb2 = kzalloc_obj(*usb2, GFP_KERNEL);
+ usb2 = kzalloc_obj(*usb2);
if (!usb2)
return ERR_PTR(-ENOMEM);
@@ -1113,7 +1113,7 @@ tegra186_usb3_lane_probe(struct tegra_xusb_pad *pad, struct device_node *np,
struct tegra_xusb_usb3_lane *usb3;
int err;
- usb3 = kzalloc_obj(*usb3, GFP_KERNEL);
+ usb3 = kzalloc_obj(*usb3);
if (!usb3)
return ERR_PTR(-ENOMEM);
@@ -1417,7 +1417,7 @@ tegra186_usb3_pad_probe(struct tegra_xusb_padctl *padctl,
struct tegra_xusb_pad *pad;
int err;
- usb3 = kzalloc_obj(*usb3, GFP_KERNEL);
+ usb3 = kzalloc_obj(*usb3);
if (!usb3)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/phy/tegra/xusb-tegra210.c b/drivers/phy/tegra/xusb-tegra210.c
index 872ae93e0722..1abc5913ec49 100644
--- a/drivers/phy/tegra/xusb-tegra210.c
+++ b/drivers/phy/tegra/xusb-tegra210.c
@@ -1759,7 +1759,7 @@ tegra210_usb2_lane_probe(struct tegra_xusb_pad *pad, struct device_node *np,
struct tegra_xusb_usb2_lane *usb2;
int err;
- usb2 = kzalloc_obj(*usb2, GFP_KERNEL);
+ usb2 = kzalloc_obj(*usb2);
if (!usb2)
return ERR_PTR(-ENOMEM);
@@ -2185,7 +2185,7 @@ tegra210_usb2_pad_probe(struct tegra_xusb_padctl *padctl,
struct tegra_xusb_pad *pad;
int err;
- usb2 = kzalloc_obj(*usb2, GFP_KERNEL);
+ usb2 = kzalloc_obj(*usb2);
if (!usb2)
return ERR_PTR(-ENOMEM);
@@ -2255,7 +2255,7 @@ tegra210_hsic_lane_probe(struct tegra_xusb_pad *pad, struct device_node *np,
struct tegra_xusb_hsic_lane *hsic;
int err;
- hsic = kzalloc_obj(*hsic, GFP_KERNEL);
+ hsic = kzalloc_obj(*hsic);
if (!hsic)
return ERR_PTR(-ENOMEM);
@@ -2439,7 +2439,7 @@ tegra210_hsic_pad_probe(struct tegra_xusb_padctl *padctl,
struct tegra_xusb_pad *pad;
int err;
- hsic = kzalloc_obj(*hsic, GFP_KERNEL);
+ hsic = kzalloc_obj(*hsic);
if (!hsic)
return ERR_PTR(-ENOMEM);
@@ -2688,7 +2688,7 @@ tegra210_pcie_lane_probe(struct tegra_xusb_pad *pad, struct device_node *np,
struct tegra_xusb_pcie_lane *pcie;
int err;
- pcie = kzalloc_obj(*pcie, GFP_KERNEL);
+ pcie = kzalloc_obj(*pcie);
if (!pcie)
return ERR_PTR(-ENOMEM);
@@ -2786,7 +2786,7 @@ tegra210_pcie_pad_probe(struct tegra_xusb_padctl *padctl,
struct tegra_xusb_pad *pad;
int err;
- pcie = kzalloc_obj(*pcie, GFP_KERNEL);
+ pcie = kzalloc_obj(*pcie);
if (!pcie)
return ERR_PTR(-ENOMEM);
@@ -2858,7 +2858,7 @@ tegra210_sata_lane_probe(struct tegra_xusb_pad *pad, struct device_node *np,
struct tegra_xusb_sata_lane *sata;
int err;
- sata = kzalloc_obj(*sata, GFP_KERNEL);
+ sata = kzalloc_obj(*sata);
if (!sata)
return ERR_PTR(-ENOMEM);
@@ -2955,7 +2955,7 @@ tegra210_sata_pad_probe(struct tegra_xusb_padctl *padctl,
struct tegra_xusb_pad *pad;
int err;
- sata = kzalloc_obj(*sata, GFP_KERNEL);
+ sata = kzalloc_obj(*sata);
if (!sata)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/phy/tegra/xusb.c b/drivers/phy/tegra/xusb.c
index 6667ac08754d..9d74c0ecc31b 100644
--- a/drivers/phy/tegra/xusb.c
+++ b/drivers/phy/tegra/xusb.c
@@ -796,7 +796,7 @@ static int tegra_xusb_add_usb2_port(struct tegra_xusb_padctl *padctl,
if (!np || !of_device_is_available(np))
goto out;
- usb2 = kzalloc_obj(*usb2, GFP_KERNEL);
+ usb2 = kzalloc_obj(*usb2);
if (!usb2) {
err = -ENOMEM;
goto out;
@@ -863,7 +863,7 @@ static int tegra_xusb_add_ulpi_port(struct tegra_xusb_padctl *padctl,
if (!np || !of_device_is_available(np))
goto out;
- ulpi = kzalloc_obj(*ulpi, GFP_KERNEL);
+ ulpi = kzalloc_obj(*ulpi);
if (!ulpi) {
err = -ENOMEM;
goto out;
@@ -919,7 +919,7 @@ static int tegra_xusb_add_hsic_port(struct tegra_xusb_padctl *padctl,
if (!np || !of_device_is_available(np))
goto out;
- hsic = kzalloc_obj(*hsic, GFP_KERNEL);
+ hsic = kzalloc_obj(*hsic);
if (!hsic) {
err = -ENOMEM;
goto out;
@@ -1004,7 +1004,7 @@ static int tegra_xusb_add_usb3_port(struct tegra_xusb_padctl *padctl,
if (!np || !of_device_is_available(np))
goto out;
- usb3 = kzalloc_obj(*usb3, GFP_KERNEL);
+ usb3 = kzalloc_obj(*usb3);
if (!usb3) {
err = -ENOMEM;
goto out;
diff --git a/drivers/pinctrl/bcm/pinctrl-bcm2835.c b/drivers/pinctrl/bcm/pinctrl-bcm2835.c
index 8383c14035ef..17d39c2d454b 100644
--- a/drivers/pinctrl/bcm/pinctrl-bcm2835.c
+++ b/drivers/pinctrl/bcm/pinctrl-bcm2835.c
@@ -803,7 +803,7 @@ static int bcm2835_pctl_dt_node_to_map_pull(struct bcm2835_pinctrl *pc,
return -EINVAL;
}
- configs = kzalloc_obj(*configs, GFP_KERNEL);
+ configs = kzalloc_obj(*configs);
if (!configs)
return -ENOMEM;
configs[0] = pinconf_to_config_packed(BCM2835_PINCONF_PARAM_PULL, pull);
diff --git a/drivers/pinctrl/core.c b/drivers/pinctrl/core.c
index 3d728ed310f4..b5e97689589f 100644
--- a/drivers/pinctrl/core.c
+++ b/drivers/pinctrl/core.c
@@ -215,7 +215,7 @@ static int pinctrl_register_one_pin(struct pinctrl_dev *pctldev,
return -EINVAL;
}
- pindesc = kzalloc_obj(*pindesc, GFP_KERNEL);
+ pindesc = kzalloc_obj(*pindesc);
if (!pindesc)
return -ENOMEM;
@@ -955,7 +955,7 @@ static struct pinctrl_state *create_state(struct pinctrl *p,
{
struct pinctrl_state *state;
- state = kzalloc_obj(*state, GFP_KERNEL);
+ state = kzalloc_obj(*state);
if (!state)
return ERR_PTR(-ENOMEM);
@@ -983,7 +983,7 @@ static int add_setting(struct pinctrl *p, struct pinctrl_dev *pctldev,
if (map->type == PIN_MAP_TYPE_DUMMY_STATE)
return 0;
- setting = kzalloc_obj(*setting, GFP_KERNEL);
+ setting = kzalloc_obj(*setting);
if (!setting)
return -ENOMEM;
@@ -1063,7 +1063,7 @@ static struct pinctrl *create_pinctrl(struct device *dev,
* mapping, this is what consumers will get when requesting
* a pin control handle with pinctrl_get()
*/
- p = kzalloc_obj(*p, GFP_KERNEL);
+ p = kzalloc_obj(*p);
if (!p)
return ERR_PTR(-ENOMEM);
p->dev = dev;
@@ -1483,7 +1483,7 @@ int pinctrl_register_mappings(const struct pinctrl_map *maps,
}
}
- maps_node = kzalloc_obj(*maps_node, GFP_KERNEL);
+ maps_node = kzalloc_obj(*maps_node);
if (!maps_node)
return -ENOMEM;
@@ -2076,7 +2076,7 @@ pinctrl_init_controller(const struct pinctrl_desc *pctldesc, struct device *dev,
if (!pctldesc->name)
return ERR_PTR(-EINVAL);
- pctldev = kzalloc_obj(*pctldev, GFP_KERNEL);
+ pctldev = kzalloc_obj(*pctldev);
if (!pctldev)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/pinctrl/devicetree.c b/drivers/pinctrl/devicetree.c
index ed3671f94463..d0c3e26409a8 100644
--- a/drivers/pinctrl/devicetree.c
+++ b/drivers/pinctrl/devicetree.c
@@ -84,7 +84,7 @@ static int dt_remember_or_free_map(struct pinctrl *p, const char *statename,
}
/* Remember the converted mapping table entries */
- dt_map = kzalloc_obj(*dt_map, GFP_KERNEL);
+ dt_map = kzalloc_obj(*dt_map);
if (!dt_map)
goto err_free_map;
@@ -187,7 +187,7 @@ static int dt_remember_dummy_state(struct pinctrl *p, const char *statename)
{
struct pinctrl_map *map;
- map = kzalloc_obj(*map, GFP_KERNEL);
+ map = kzalloc_obj(*map);
if (!map)
return -ENOMEM;
diff --git a/drivers/pinctrl/freescale/pinctrl-imx-scmi.c b/drivers/pinctrl/freescale/pinctrl-imx-scmi.c
index 9e3f29e8d993..e14bdbc7bea7 100644
--- a/drivers/pinctrl/freescale/pinctrl-imx-scmi.c
+++ b/drivers/pinctrl/freescale/pinctrl-imx-scmi.c
@@ -99,7 +99,7 @@ static int pinctrl_scmi_imx_dt_node_to_map(struct pinctrl_dev *pctldev,
num_pins = size / pin_size;
map_num = num_pins;
- new_map = kmalloc_objs(struct pinctrl_map, map_num, GFP_KERNEL);
+ new_map = kmalloc_objs(struct pinctrl_map, map_num);
if (!new_map)
return -ENOMEM;
diff --git a/drivers/pinctrl/freescale/pinctrl-imx.c b/drivers/pinctrl/freescale/pinctrl-imx.c
index 1d892cbb59a6..9a45b376d36f 100644
--- a/drivers/pinctrl/freescale/pinctrl-imx.c
+++ b/drivers/pinctrl/freescale/pinctrl-imx.c
@@ -88,7 +88,7 @@ static int imx_dt_node_to_map(struct pinctrl_dev *pctldev,
}
}
- new_map = kmalloc_objs(struct pinctrl_map, map_num, GFP_KERNEL);
+ new_map = kmalloc_objs(struct pinctrl_map, map_num);
if (!new_map)
return -ENOMEM;
diff --git a/drivers/pinctrl/freescale/pinctrl-imx1-core.c b/drivers/pinctrl/freescale/pinctrl-imx1-core.c
index abffe09bdb83..b36c8a1461b7 100644
--- a/drivers/pinctrl/freescale/pinctrl-imx1-core.c
+++ b/drivers/pinctrl/freescale/pinctrl-imx1-core.c
@@ -244,7 +244,7 @@ static int imx1_dt_node_to_map(struct pinctrl_dev *pctldev,
for (i = 0; i < grp->npins; i++)
map_num++;
- new_map = kmalloc_objs(struct pinctrl_map, map_num, GFP_KERNEL);
+ new_map = kmalloc_objs(struct pinctrl_map, map_num);
if (!new_map)
return -ENOMEM;
diff --git a/drivers/pinctrl/freescale/pinctrl-mxs.c b/drivers/pinctrl/freescale/pinctrl-mxs.c
index e11697efeb47..6280009be3fa 100644
--- a/drivers/pinctrl/freescale/pinctrl-mxs.c
+++ b/drivers/pinctrl/freescale/pinctrl-mxs.c
@@ -92,7 +92,7 @@ static int mxs_dt_node_to_map(struct pinctrl_dev *pctldev,
if (!purecfg && config)
new_num = 2;
- new_map = kzalloc_objs(*new_map, new_num, GFP_KERNEL);
+ new_map = kzalloc_objs(*new_map, new_num);
if (!new_map)
return -ENOMEM;
diff --git a/drivers/pinctrl/mvebu/pinctrl-mvebu.c b/drivers/pinctrl/mvebu/pinctrl-mvebu.c
index 59fede73c31d..5ce3d7fcdd34 100644
--- a/drivers/pinctrl/mvebu/pinctrl-mvebu.c
+++ b/drivers/pinctrl/mvebu/pinctrl-mvebu.c
@@ -430,7 +430,7 @@ static int mvebu_pinctrl_dt_node_to_map(struct pinctrl_dev *pctldev,
return 0;
}
- *map = kmalloc_objs(**map, nmaps, GFP_KERNEL);
+ *map = kmalloc_objs(**map, nmaps);
if (!*map)
return -ENOMEM;
diff --git a/drivers/pinctrl/nuvoton/pinctrl-ma35.c b/drivers/pinctrl/nuvoton/pinctrl-ma35.c
index 9bbf73de5747..f01344201628 100644
--- a/drivers/pinctrl/nuvoton/pinctrl-ma35.c
+++ b/drivers/pinctrl/nuvoton/pinctrl-ma35.c
@@ -202,7 +202,7 @@ static int ma35_pinctrl_dt_node_to_map_func(struct pinctrl_dev *pctldev,
}
map_num += grp->grp.npins;
- new_map = kzalloc_objs(*new_map, map_num, GFP_KERNEL);
+ new_map = kzalloc_objs(*new_map, map_num);
if (!new_map)
return -ENOMEM;
diff --git a/drivers/pinctrl/nxp/pinctrl-s32cc.c b/drivers/pinctrl/nxp/pinctrl-s32cc.c
index e811803b7cc5..fe7cd641fddd 100644
--- a/drivers/pinctrl/nxp/pinctrl-s32cc.c
+++ b/drivers/pinctrl/nxp/pinctrl-s32cc.c
@@ -386,7 +386,7 @@ static int s32_pmx_gpio_request_enable(struct pinctrl_dev *pctldev,
return ret;
/* Save current configuration */
- gpio_pin = kmalloc_obj(*gpio_pin, GFP_KERNEL);
+ gpio_pin = kmalloc_obj(*gpio_pin);
if (!gpio_pin)
return -ENOMEM;
diff --git a/drivers/pinctrl/pinctrl-k230.c b/drivers/pinctrl/pinctrl-k230.c
index 8aeb540390c8..886577abf0d0 100644
--- a/drivers/pinctrl/pinctrl-k230.c
+++ b/drivers/pinctrl/pinctrl-k230.c
@@ -211,7 +211,7 @@ static int k230_dt_node_to_map(struct pinctrl_dev *pctldev,
map_num += info->groups[grp_id].num_pins + 1;
}
- new_map = kzalloc_objs(*new_map, map_num, GFP_KERNEL);
+ new_map = kzalloc_objs(*new_map, map_num);
if (!new_map)
return -ENOMEM;
*map = new_map;
diff --git a/drivers/pinctrl/pinctrl-rockchip.c b/drivers/pinctrl/pinctrl-rockchip.c
index 7e838a230cfe..d87c0b1de616 100644
--- a/drivers/pinctrl/pinctrl-rockchip.c
+++ b/drivers/pinctrl/pinctrl-rockchip.c
@@ -415,7 +415,7 @@ static int rockchip_dt_node_to_map(struct pinctrl_dev *pctldev,
map_num += grp->npins;
- new_map = kzalloc_objs(*new_map, map_num, GFP_KERNEL);
+ new_map = kzalloc_objs(*new_map, map_num);
if (!new_map)
return -ENOMEM;
@@ -3604,7 +3604,7 @@ static int rockchip_pinconf_defer_pin(struct rockchip_pin_bank *bank,
{
struct rockchip_pin_deferred *cfg;
- cfg = kzalloc_obj(*cfg, GFP_KERNEL);
+ cfg = kzalloc_obj(*cfg);
if (!cfg)
return -ENOMEM;
diff --git a/drivers/pinctrl/pinctrl-rp1.c b/drivers/pinctrl/pinctrl-rp1.c
index 15ac2a6625c6..fc4ed68ea5ac 100644
--- a/drivers/pinctrl/pinctrl-rp1.c
+++ b/drivers/pinctrl/pinctrl-rp1.c
@@ -1158,7 +1158,7 @@ static int rp1_pctl_legacy_map_pull(struct rp1_pinctrl *pc,
return -EINVAL;
}
- configs = kzalloc_obj(*configs, GFP_KERNEL);
+ configs = kzalloc_obj(*configs);
if (!configs)
return -ENOMEM;
@@ -1233,7 +1233,7 @@ static int rp1_pctl_dt_node_to_map(struct pinctrl_dev *pctldev,
if (num_configs || num_pulls)
maps_per_pin++;
reserved_maps = num_pins * maps_per_pin;
- maps = kzalloc_objs(*maps, reserved_maps, GFP_KERNEL);
+ maps = kzalloc_objs(*maps, reserved_maps);
if (!maps)
return -ENOMEM;
diff --git a/drivers/pinctrl/pinctrl-scmi.c b/drivers/pinctrl/pinctrl-scmi.c
index 51434aa4d99f..f4f296e07be5 100644
--- a/drivers/pinctrl/pinctrl-scmi.c
+++ b/drivers/pinctrl/pinctrl-scmi.c
@@ -319,7 +319,7 @@ pinctrl_scmi_alloc_configs(struct pinctrl_dev *pctldev, u32 num_configs,
if (!*p_config_value)
return -ENOMEM;
- *p_config_type = kzalloc_objs(**p_config_type, num_configs, GFP_KERNEL);
+ *p_config_type = kzalloc_objs(**p_config_type, num_configs);
if (!*p_config_type) {
kfree(*p_config_value);
return -ENOMEM;
diff --git a/drivers/pinctrl/pinctrl-th1520.c b/drivers/pinctrl/pinctrl-th1520.c
index 3539c8b4d107..4d5a99483dee 100644
--- a/drivers/pinctrl/pinctrl-th1520.c
+++ b/drivers/pinctrl/pinctrl-th1520.c
@@ -447,7 +447,7 @@ static int th1520_pinctrl_dt_node_to_map(struct pinctrl_dev *pctldev,
nmaps += npins;
}
- map = kzalloc_objs(*map, nmaps, GFP_KERNEL);
+ map = kzalloc_objs(*map, nmaps);
if (!map)
return -ENOMEM;
diff --git a/drivers/pinctrl/renesas/core.c b/drivers/pinctrl/renesas/core.c
index ec74bc54286b..0840668638d9 100644
--- a/drivers/pinctrl/renesas/core.c
+++ b/drivers/pinctrl/renesas/core.c
@@ -1273,7 +1273,7 @@ static void __init sh_pfc_check_driver(const struct platform_driver *pdrv)
!of_find_matching_node(NULL, pdrv->driver.of_match_table))
return;
- sh_pfc_regs = kzalloc_objs(*sh_pfc_regs, SH_PFC_MAX_REGS, GFP_KERNEL);
+ sh_pfc_regs = kzalloc_objs(*sh_pfc_regs, SH_PFC_MAX_REGS);
if (!sh_pfc_regs)
return;
diff --git a/drivers/pinctrl/renesas/pinctrl-rza1.c b/drivers/pinctrl/renesas/pinctrl-rza1.c
index 3be4ee9d1419..bc8b9b9ad05b 100644
--- a/drivers/pinctrl/renesas/pinctrl-rza1.c
+++ b/drivers/pinctrl/renesas/pinctrl-rza1.c
@@ -1062,7 +1062,7 @@ static int rza1_dt_node_to_map(struct pinctrl_dev *pctldev,
/* Create map where to retrieve function and mux settings from */
*num_maps = 0;
- *map = kzalloc_obj(**map, GFP_KERNEL);
+ *map = kzalloc_obj(**map);
if (!*map) {
ret = -ENOMEM;
goto remove_function;
diff --git a/drivers/pinctrl/renesas/pinctrl-rza2.c b/drivers/pinctrl/renesas/pinctrl-rza2.c
index 1d43abc14df7..8618f32ed26a 100644
--- a/drivers/pinctrl/renesas/pinctrl-rza2.c
+++ b/drivers/pinctrl/renesas/pinctrl-rza2.c
@@ -395,7 +395,7 @@ static int rza2_dt_node_to_map(struct pinctrl_dev *pctldev,
/* Create map where to retrieve function and mux settings from */
*num_maps = 0;
- *map = kzalloc_obj(**map, GFP_KERNEL);
+ *map = kzalloc_obj(**map);
if (!*map) {
ret = -ENOMEM;
goto remove_function;
diff --git a/drivers/pinctrl/sophgo/pinctrl-sophgo-common.c b/drivers/pinctrl/sophgo/pinctrl-sophgo-common.c
index 5aef2a1082b5..4dfe16b66188 100644
--- a/drivers/pinctrl/sophgo/pinctrl-sophgo-common.c
+++ b/drivers/pinctrl/sophgo/pinctrl-sophgo-common.c
@@ -94,7 +94,7 @@ int sophgo_pctrl_dt_node_to_map(struct pinctrl_dev *pctldev, struct device_node
if (!grpnames)
return -ENOMEM;
- map = kzalloc_objs(*map, ngroups * 2, GFP_KERNEL);
+ map = kzalloc_objs(*map, ngroups * 2);
if (!map)
return -ENOMEM;
diff --git a/drivers/pinctrl/spacemit/pinctrl-k1.c b/drivers/pinctrl/spacemit/pinctrl-k1.c
index 1b29313ab36d..62cab6f6cd0a 100644
--- a/drivers/pinctrl/spacemit/pinctrl-k1.c
+++ b/drivers/pinctrl/spacemit/pinctrl-k1.c
@@ -499,7 +499,7 @@ static int spacemit_pctrl_dt_node_to_map(struct pinctrl_dev *pctldev,
if (!grpnames)
return -ENOMEM;
- map = kzalloc_objs(*map, ngroups * 2, GFP_KERNEL);
+ map = kzalloc_objs(*map, ngroups * 2);
if (!map)
return -ENOMEM;
diff --git a/drivers/pinctrl/spear/pinctrl-spear.c b/drivers/pinctrl/spear/pinctrl-spear.c
index 5af70ec62a76..f92f6efde1dc 100644
--- a/drivers/pinctrl/spear/pinctrl-spear.c
+++ b/drivers/pinctrl/spear/pinctrl-spear.c
@@ -173,7 +173,7 @@ static int spear_pinctrl_dt_node_to_map(struct pinctrl_dev *pctldev,
return -ENODEV;
}
- *map = kzalloc_objs(**map, count, GFP_KERNEL);
+ *map = kzalloc_objs(**map, count);
if (!*map)
return -ENOMEM;
diff --git a/drivers/pinctrl/starfive/pinctrl-starfive-jh7100.c b/drivers/pinctrl/starfive/pinctrl-starfive-jh7100.c
index a58c7e1362a9..25cb98d9c54e 100644
--- a/drivers/pinctrl/starfive/pinctrl-starfive-jh7100.c
+++ b/drivers/pinctrl/starfive/pinctrl-starfive-jh7100.c
@@ -517,7 +517,7 @@ static int starfive_dt_node_to_map(struct pinctrl_dev *pctldev,
if (!pgnames)
return -ENOMEM;
- map = kzalloc_objs(*map, nmaps, GFP_KERNEL);
+ map = kzalloc_objs(*map, nmaps);
if (!map)
return -ENOMEM;
diff --git a/drivers/pinctrl/starfive/pinctrl-starfive-jh7110.c b/drivers/pinctrl/starfive/pinctrl-starfive-jh7110.c
index 6822a077d36f..e44480e71ea8 100644
--- a/drivers/pinctrl/starfive/pinctrl-starfive-jh7110.c
+++ b/drivers/pinctrl/starfive/pinctrl-starfive-jh7110.c
@@ -143,7 +143,7 @@ static int jh7110_dt_node_to_map(struct pinctrl_dev *pctldev,
if (!pgnames)
return -ENOMEM;
- map = kzalloc_objs(*map, nmaps, GFP_KERNEL);
+ map = kzalloc_objs(*map, nmaps);
if (!map)
return -ENOMEM;
diff --git a/drivers/pinctrl/sunplus/sppctl.c b/drivers/pinctrl/sunplus/sppctl.c
index 66575987f34b..67e036d66245 100644
--- a/drivers/pinctrl/sunplus/sppctl.c
+++ b/drivers/pinctrl/sunplus/sppctl.c
@@ -865,7 +865,7 @@ static int sppctl_dt_node_to_map(struct pinctrl_dev *pctldev, struct device_node
if (nmG <= 0)
nmG = 0;
- *map = kzalloc_objs(**map, *num_maps + nmG, GFP_KERNEL);
+ *map = kzalloc_objs(**map, *num_maps + nmG);
if (!(*map))
return -ENOMEM;
@@ -882,7 +882,7 @@ static int sppctl_dt_node_to_map(struct pinctrl_dev *pctldev, struct device_node
(*map)[i].type = PIN_MAP_TYPE_CONFIGS_PIN;
(*map)[i].data.configs.num_configs = 1;
(*map)[i].data.configs.group_or_pin = pin_get_name(pctldev, pin_num);
- configs = kmalloc_obj(*configs, GFP_KERNEL);
+ configs = kmalloc_obj(*configs);
if (!configs)
goto sppctl_map_err;
*configs = FIELD_GET(GENMASK(7, 0), dt_pin);
@@ -897,7 +897,7 @@ static int sppctl_dt_node_to_map(struct pinctrl_dev *pctldev, struct device_node
(*map)[i].type = PIN_MAP_TYPE_CONFIGS_PIN;
(*map)[i].data.configs.num_configs = 1;
(*map)[i].data.configs.group_or_pin = pin_get_name(pctldev, pin_num);
- configs = kmalloc_obj(*configs, GFP_KERNEL);
+ configs = kmalloc_obj(*configs);
if (!configs)
goto sppctl_map_err;
*configs = SPPCTL_IOP_CONFIGS;
diff --git a/drivers/pinctrl/sunxi/pinctrl-sunxi.c b/drivers/pinctrl/sunxi/pinctrl-sunxi.c
index c41b91a5371f..fc9167e784be 100644
--- a/drivers/pinctrl/sunxi/pinctrl-sunxi.c
+++ b/drivers/pinctrl/sunxi/pinctrl-sunxi.c
@@ -435,7 +435,7 @@ static int sunxi_pctrl_dt_node_to_map(struct pinctrl_dev *pctldev,
* any configuration.
*/
nmaps = npins * 2;
- *map = kmalloc_objs(struct pinctrl_map, nmaps, GFP_KERNEL);
+ *map = kmalloc_objs(struct pinctrl_map, nmaps);
if (!*map)
return -ENOMEM;
diff --git a/drivers/pinctrl/vt8500/pinctrl-wmt.c b/drivers/pinctrl/vt8500/pinctrl-wmt.c
index f67a675acd24..3da2f768f223 100644
--- a/drivers/pinctrl/vt8500/pinctrl-wmt.c
+++ b/drivers/pinctrl/vt8500/pinctrl-wmt.c
@@ -251,7 +251,7 @@ static int wmt_pctl_dt_node_to_map_pull(struct wmt_pinctrl_data *data,
return group;
}
- configs = kzalloc_obj(*configs, GFP_KERNEL);
+ configs = kzalloc_obj(*configs);
if (!configs)
return -ENOMEM;
diff --git a/drivers/platform/arm64/huawei-gaokun-ec.c b/drivers/platform/arm64/huawei-gaokun-ec.c
index 23a727bb230c..a83ddc20b5a3 100644
--- a/drivers/platform/arm64/huawei-gaokun-ec.c
+++ b/drivers/platform/arm64/huawei-gaokun-ec.c
@@ -680,7 +680,7 @@ static int gaokun_aux_init(struct device *parent, const char *name,
struct auxiliary_device *adev;
int ret;
- adev = kzalloc_obj(*adev, GFP_KERNEL);
+ adev = kzalloc_obj(*adev);
if (!adev)
return -ENOMEM;
diff --git a/drivers/platform/chrome/chromeos_laptop.c b/drivers/platform/chrome/chromeos_laptop.c
index 7a019827afa5..042f8ca6a463 100644
--- a/drivers/platform/chrome/chromeos_laptop.c
+++ b/drivers/platform/chrome/chromeos_laptop.c
@@ -880,7 +880,7 @@ chromeos_laptop_prepare(const struct chromeos_laptop *src)
struct chromeos_laptop *cros_laptop;
int error;
- cros_laptop = kzalloc_obj(*cros_laptop, GFP_KERNEL);
+ cros_laptop = kzalloc_obj(*cros_laptop);
if (!cros_laptop)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/platform/chrome/cros_ec_chardev.c b/drivers/platform/chrome/cros_ec_chardev.c
index a2c919caa220..002be3352100 100644
--- a/drivers/platform/chrome/cros_ec_chardev.c
+++ b/drivers/platform/chrome/cros_ec_chardev.c
@@ -162,7 +162,7 @@ static int cros_ec_chardev_open(struct inode *inode, struct file *filp)
struct chardev_priv *priv;
int ret;
- priv = kzalloc_obj(*priv, GFP_KERNEL);
+ priv = kzalloc_obj(*priv);
if (!priv)
return -ENOMEM;
diff --git a/drivers/platform/chrome/wilco_ec/event.c b/drivers/platform/chrome/wilco_ec/event.c
index e7f85d6f29f1..3a7ef8e0e0f4 100644
--- a/drivers/platform/chrome/wilco_ec/event.c
+++ b/drivers/platform/chrome/wilco_ec/event.c
@@ -457,7 +457,7 @@ static int event_device_add(struct acpi_device *adev)
return error;
}
- dev_data = kzalloc_obj(*dev_data, GFP_KERNEL);
+ dev_data = kzalloc_obj(*dev_data);
if (!dev_data) {
error = -ENOMEM;
goto free_minor;
diff --git a/drivers/platform/chrome/wilco_ec/telemetry.c b/drivers/platform/chrome/wilco_ec/telemetry.c
index 6375bbb6d6ce..cadb68fa0a40 100644
--- a/drivers/platform/chrome/wilco_ec/telemetry.c
+++ b/drivers/platform/chrome/wilco_ec/telemetry.c
@@ -248,7 +248,7 @@ static int telem_open(struct inode *inode, struct file *filp)
get_device(&dev_data->dev);
- sess_data = kzalloc_obj(*sess_data, GFP_KERNEL);
+ sess_data = kzalloc_obj(*sess_data);
if (!sess_data) {
atomic_set(&dev_data->available, 1);
return -ENOMEM;
@@ -370,7 +370,7 @@ static int telem_device_probe(struct platform_device *pdev)
return error;
}
- dev_data = kzalloc_obj(*dev_data, GFP_KERNEL);
+ dev_data = kzalloc_obj(*dev_data);
if (!dev_data) {
ida_free(&telem_ida, minor);
return -ENOMEM;
diff --git a/drivers/platform/goldfish/goldfish_pipe.c b/drivers/platform/goldfish/goldfish_pipe.c
index 370259ef3bfe..75c86f5688c9 100644
--- a/drivers/platform/goldfish/goldfish_pipe.c
+++ b/drivers/platform/goldfish/goldfish_pipe.c
@@ -699,7 +699,7 @@ static int goldfish_pipe_open(struct inode *inode, struct file *file)
int status;
/* Allocate new pipe kernel object */
- struct goldfish_pipe *pipe = kzalloc_obj(*pipe, GFP_KERNEL);
+ struct goldfish_pipe *pipe = kzalloc_obj(*pipe);
if (!pipe)
return -ENOMEM;
@@ -826,7 +826,7 @@ static int goldfish_pipe_device_init(struct platform_device *pdev,
dev->pdev_dev = &pdev->dev;
dev->first_signalled_pipe = NULL;
dev->pipes_capacity = INITIAL_PIPES_CAPACITY;
- dev->pipes = kzalloc_objs(*dev->pipes, dev->pipes_capacity, GFP_KERNEL);
+ dev->pipes = kzalloc_objs(*dev->pipes, dev->pipes_capacity);
if (!dev->pipes) {
misc_deregister(&dev->miscdev);
return -ENOMEM;
diff --git a/drivers/platform/mellanox/mlxbf-tmfifo.c b/drivers/platform/mellanox/mlxbf-tmfifo.c
index 7fea80d3220c..3c6408581373 100644
--- a/drivers/platform/mellanox/mlxbf-tmfifo.c
+++ b/drivers/platform/mellanox/mlxbf-tmfifo.c
@@ -1203,7 +1203,7 @@ static int mlxbf_tmfifo_create_vdev(struct device *dev,
goto fail;
}
- tm_vdev = kzalloc_obj(*tm_vdev, GFP_KERNEL);
+ tm_vdev = kzalloc_obj(*tm_vdev);
if (!tm_vdev) {
ret = -ENOMEM;
goto fail;
diff --git a/drivers/platform/olpc/olpc-ec.c b/drivers/platform/olpc/olpc-ec.c
index 6a6f94ee93f4..4a2d36f7331e 100644
--- a/drivers/platform/olpc/olpc-ec.c
+++ b/drivers/platform/olpc/olpc-ec.c
@@ -408,7 +408,7 @@ static int olpc_ec_probe(struct platform_device *pdev)
if (!ec_driver)
return -ENODEV;
- ec = kzalloc_obj(*ec, GFP_KERNEL);
+ ec = kzalloc_obj(*ec);
if (!ec)
return -ENOMEM;
diff --git a/drivers/platform/raspberrypi/vchiq-interface/vchiq_arm.c b/drivers/platform/raspberrypi/vchiq-interface/vchiq_arm.c
index 1e72dc819e2a..e78641703252 100644
--- a/drivers/platform/raspberrypi/vchiq-interface/vchiq_arm.c
+++ b/drivers/platform/raspberrypi/vchiq-interface/vchiq_arm.c
@@ -358,7 +358,7 @@ int vchiq_initialise(struct vchiq_state *state, struct vchiq_instance **instance
__func__, i);
}
- instance = kzalloc_obj(*instance, GFP_KERNEL);
+ instance = kzalloc_obj(*instance);
if (!instance) {
ret = -ENOMEM;
goto failed;
@@ -618,7 +618,7 @@ vchiq_blocking_bulk_transfer(struct vchiq_instance *instance, unsigned int handl
}
}
} else {
- waiter = kzalloc_obj(*waiter, GFP_KERNEL);
+ waiter = kzalloc_obj(*waiter);
if (!waiter)
return -ENOMEM;
}
@@ -1249,7 +1249,7 @@ vchiq_dump_service_use_state(struct vchiq_state *state)
if (!arm_state)
return;
- service_data = kmalloc_objs(*service_data, MAX_SERVICES, GFP_KERNEL);
+ service_data = kmalloc_objs(*service_data, MAX_SERVICES);
if (!service_data)
return;
diff --git a/drivers/platform/raspberrypi/vchiq-interface/vchiq_bus.c b/drivers/platform/raspberrypi/vchiq-interface/vchiq_bus.c
index 616e05a36918..011105f1318d 100644
--- a/drivers/platform/raspberrypi/vchiq-interface/vchiq_bus.c
+++ b/drivers/platform/raspberrypi/vchiq-interface/vchiq_bus.c
@@ -68,7 +68,7 @@ vchiq_device_register(struct device *parent, const char *name)
struct vchiq_device *device;
int ret;
- device = kzalloc_obj(*device, GFP_KERNEL);
+ device = kzalloc_obj(*device);
if (!device)
return NULL;
diff --git a/drivers/platform/raspberrypi/vchiq-interface/vchiq_core.c b/drivers/platform/raspberrypi/vchiq-interface/vchiq_core.c
index 1dac7d1ffaa2..48d6b1d74329 100644
--- a/drivers/platform/raspberrypi/vchiq-interface/vchiq_core.c
+++ b/drivers/platform/raspberrypi/vchiq-interface/vchiq_core.c
@@ -2723,7 +2723,7 @@ vchiq_add_service_internal(struct vchiq_state *state,
if (ret)
return NULL;
- service = kzalloc_obj(*service, GFP_KERNEL);
+ service = kzalloc_obj(*service);
if (!service)
return service;
diff --git a/drivers/platform/raspberrypi/vchiq-interface/vchiq_dev.c b/drivers/platform/raspberrypi/vchiq-interface/vchiq_dev.c
index 18bcb8c133d1..f1c9c0d4b96a 100644
--- a/drivers/platform/raspberrypi/vchiq-interface/vchiq_dev.c
+++ b/drivers/platform/raspberrypi/vchiq-interface/vchiq_dev.c
@@ -149,7 +149,7 @@ static int vchiq_ioc_create_service(struct vchiq_instance *instance,
if (args->is_open && !instance->connected)
return -ENOTCONN;
- user_service = kmalloc_obj(*user_service, GFP_KERNEL);
+ user_service = kmalloc_obj(*user_service);
if (!user_service)
return -ENOMEM;
@@ -298,7 +298,7 @@ static int vchiq_irq_queue_bulk_tx_rx(struct vchiq_instance *instance,
return -EINVAL;
if (args->mode == VCHIQ_BULK_MODE_BLOCKING) {
- waiter = kzalloc_obj(*waiter, GFP_KERNEL);
+ waiter = kzalloc_obj(*waiter);
if (!waiter) {
ret = -ENOMEM;
goto out;
@@ -1185,7 +1185,7 @@ static int vchiq_open(struct inode *inode, struct file *file)
return -ENOTCONN;
}
- instance = kzalloc_obj(*instance, GFP_KERNEL);
+ instance = kzalloc_obj(*instance);
if (!instance)
return -ENOMEM;
diff --git a/drivers/platform/raspberrypi/vchiq-mmal/mmal-vchiq.c b/drivers/platform/raspberrypi/vchiq-mmal/mmal-vchiq.c
index 79790867c45c..c89c16fb8b33 100644
--- a/drivers/platform/raspberrypi/vchiq-mmal/mmal-vchiq.c
+++ b/drivers/platform/raspberrypi/vchiq-mmal/mmal-vchiq.c
@@ -190,7 +190,7 @@ get_msg_context(struct vchiq_mmal_instance *instance)
int handle;
/* todo: should this be allocated from a pool to avoid kzalloc */
- msg_context = kzalloc_obj(*msg_context, GFP_KERNEL);
+ msg_context = kzalloc_obj(*msg_context);
if (!msg_context)
return ERR_PTR(-ENOMEM);
@@ -1898,7 +1898,7 @@ int vchiq_mmal_init(struct device *dev, struct vchiq_mmal_instance **out_instanc
goto err_shutdown_vchiq;
}
- instance = kzalloc_obj(*instance, GFP_KERNEL);
+ instance = kzalloc_obj(*instance);
if (!instance) {
err = -ENOMEM;
diff --git a/drivers/platform/surface/aggregator/bus.c b/drivers/platform/surface/aggregator/bus.c
index dba8ca379385..4395331be659 100644
--- a/drivers/platform/surface/aggregator/bus.c
+++ b/drivers/platform/surface/aggregator/bus.c
@@ -83,7 +83,7 @@ struct ssam_device *ssam_device_alloc(struct ssam_controller *ctrl,
{
struct ssam_device *sdev;
- sdev = kzalloc_obj(*sdev, GFP_KERNEL);
+ sdev = kzalloc_obj(*sdev);
if (!sdev)
return NULL;
diff --git a/drivers/platform/surface/aggregator/controller.c b/drivers/platform/surface/aggregator/controller.c
index 5f1940a186a1..6a8430cb9cbf 100644
--- a/drivers/platform/surface/aggregator/controller.c
+++ b/drivers/platform/surface/aggregator/controller.c
@@ -344,7 +344,7 @@ ssam_nf_refcount_inc(struct ssam_nf *nf, struct ssam_event_registry reg,
}
}
- entry = kzalloc_obj(*entry, GFP_KERNEL);
+ entry = kzalloc_obj(*entry);
if (!entry)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/platform/surface/aggregator/core.c b/drivers/platform/surface/aggregator/core.c
index 9349a1b14ab7..43d5988fb964 100644
--- a/drivers/platform/surface/aggregator/core.c
+++ b/drivers/platform/surface/aggregator/core.c
@@ -652,7 +652,7 @@ static int ssam_serial_hub_probe(struct serdev_device *serdev)
}
/* Allocate controller. */
- ctrl = kzalloc_obj(*ctrl, GFP_KERNEL);
+ ctrl = kzalloc_obj(*ctrl);
if (!ctrl)
return -ENOMEM;
diff --git a/drivers/platform/surface/surface3_power.c b/drivers/platform/surface/surface3_power.c
index b00f52687fa4..94fdddc7f207 100644
--- a/drivers/platform/surface/surface3_power.c
+++ b/drivers/platform/surface/surface3_power.c
@@ -454,7 +454,7 @@ static int mshw0011_install_space_handler(struct i2c_client *client)
if (!adev)
return -ENODEV;
- data = kzalloc_obj(struct mshw0011_handler_data, GFP_KERNEL);
+ data = kzalloc_obj(struct mshw0011_handler_data);
if (!data)
return -ENOMEM;
diff --git a/drivers/platform/surface/surface_aggregator_cdev.c b/drivers/platform/surface/surface_aggregator_cdev.c
index 2e4746c700c8..8929937ba9dc 100644
--- a/drivers/platform/surface/surface_aggregator_cdev.c
+++ b/drivers/platform/surface/surface_aggregator_cdev.c
@@ -154,7 +154,7 @@ static int ssam_cdev_notifier_register(struct ssam_cdev_client *client, u8 tc, i
}
/* Allocate new notifier. */
- nf = kzalloc_obj(*nf, GFP_KERNEL);
+ nf = kzalloc_obj(*nf);
if (!nf) {
mutex_unlock(&client->notifier_lock);
return -ENOMEM;
@@ -685,7 +685,7 @@ static int ssam_dbg_device_probe(struct platform_device *pdev)
if (IS_ERR(ctrl))
return PTR_ERR(ctrl) == -ENODEV ? -EPROBE_DEFER : PTR_ERR(ctrl);
- cdev = kzalloc_obj(*cdev, GFP_KERNEL);
+ cdev = kzalloc_obj(*cdev);
if (!cdev)
return -ENOMEM;
diff --git a/drivers/platform/surface/surface_dtx.c b/drivers/platform/surface/surface_dtx.c
index 43a8c23b2bf0..d6cd56970479 100644
--- a/drivers/platform/surface/surface_dtx.c
+++ b/drivers/platform/surface/surface_dtx.c
@@ -403,7 +403,7 @@ static int surface_dtx_open(struct inode *inode, struct file *file)
struct sdtx_client *client;
/* Initialize client. */
- client = kzalloc_obj(*client, GFP_KERNEL);
+ client = kzalloc_obj(*client);
if (!client)
return -ENOMEM;
@@ -1044,7 +1044,7 @@ static struct sdtx_device *sdtx_device_create(struct device *dev, struct ssam_co
struct sdtx_device *ddev;
int status;
- ddev = kzalloc_obj(*ddev, GFP_KERNEL);
+ ddev = kzalloc_obj(*ddev);
if (!ddev)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/platform/surface/surfacepro3_button.c b/drivers/platform/surface/surfacepro3_button.c
index 28386780177c..9bd39f09c7db 100644
--- a/drivers/platform/surface/surfacepro3_button.c
+++ b/drivers/platform/surface/surfacepro3_button.c
@@ -199,7 +199,7 @@ static int surface_button_add(struct acpi_device *device)
if (!surface_button_check_MSHW0040(device))
return -ENODEV;
- button = kzalloc_obj(struct surface_button, GFP_KERNEL);
+ button = kzalloc_obj(struct surface_button);
if (!button)
return -ENOMEM;
diff --git a/drivers/platform/wmi/core.c b/drivers/platform/wmi/core.c
index de11edb40b04..b8e6b9a421c6 100644
--- a/drivers/platform/wmi/core.c
+++ b/drivers/platform/wmi/core.c
@@ -1296,7 +1296,7 @@ static int parse_wdg(struct device *wmi_bus_dev, struct platform_device *pdev)
continue;
}
- wblock = kzalloc_obj(*wblock, GFP_KERNEL);
+ wblock = kzalloc_obj(*wblock);
if (!wblock)
continue;
diff --git a/drivers/platform/x86/apple-gmux.c b/drivers/platform/x86/apple-gmux.c
index 83f4e96ecbc7..fbc30f1f8abd 100644
--- a/drivers/platform/x86/apple-gmux.c
+++ b/drivers/platform/x86/apple-gmux.c
@@ -799,7 +799,7 @@ static int gmux_probe(struct pnp_dev *pnp, const struct pnp_device_id *id)
return -ENODEV;
}
- gmux_data = kzalloc_obj(*gmux_data, GFP_KERNEL);
+ gmux_data = kzalloc_obj(*gmux_data);
if (!gmux_data)
return -ENOMEM;
pnp_set_drvdata(pnp, gmux_data);
diff --git a/drivers/platform/x86/asus-laptop.c b/drivers/platform/x86/asus-laptop.c
index 2b85315b7bd5..d96f6af26ff7 100644
--- a/drivers/platform/x86/asus-laptop.c
+++ b/drivers/platform/x86/asus-laptop.c
@@ -1831,7 +1831,7 @@ static int asus_acpi_add(struct acpi_device *device)
pr_notice("Asus Laptop Support version %s\n",
ASUS_LAPTOP_VERSION);
- asus = kzalloc_obj(struct asus_laptop, GFP_KERNEL);
+ asus = kzalloc_obj(struct asus_laptop);
if (!asus)
return -ENOMEM;
asus->handle = device->handle;
diff --git a/drivers/platform/x86/asus-wmi.c b/drivers/platform/x86/asus-wmi.c
index 93905860fe07..7c0915e097ba 100644
--- a/drivers/platform/x86/asus-wmi.c
+++ b/drivers/platform/x86/asus-wmi.c
@@ -5014,7 +5014,7 @@ static int asus_wmi_add(struct platform_device *pdev)
int err;
u32 result;
- asus = kzalloc_obj(struct asus_wmi, GFP_KERNEL);
+ asus = kzalloc_obj(struct asus_wmi);
if (!asus)
return -ENOMEM;
diff --git a/drivers/platform/x86/classmate-laptop.c b/drivers/platform/x86/classmate-laptop.c
index bc9e26b94c84..e6eed3d65580 100644
--- a/drivers/platform/x86/classmate-laptop.c
+++ b/drivers/platform/x86/classmate-laptop.c
@@ -400,7 +400,7 @@ static int cmpc_accel_add_v4(struct acpi_device *acpi)
struct input_dev *inputdev;
struct cmpc_accel *accel;
- accel = kmalloc_obj(*accel, GFP_KERNEL);
+ accel = kmalloc_obj(*accel);
if (!accel)
return -ENOMEM;
@@ -650,7 +650,7 @@ static int cmpc_accel_add(struct acpi_device *acpi)
struct input_dev *inputdev;
struct cmpc_accel *accel;
- accel = kmalloc_obj(*accel, GFP_KERNEL);
+ accel = kmalloc_obj(*accel);
if (!accel)
return -ENOMEM;
@@ -964,7 +964,7 @@ static int cmpc_ipml_add(struct acpi_device *acpi)
struct ipml200_dev *ipml;
struct backlight_properties props;
- ipml = kmalloc_obj(*ipml, GFP_KERNEL);
+ ipml = kmalloc_obj(*ipml);
if (ipml == NULL)
return -ENOMEM;
diff --git a/drivers/platform/x86/dell/dell-smbios-base.c b/drivers/platform/x86/dell/dell-smbios-base.c
index dd011e252713..564ff5279797 100644
--- a/drivers/platform/x86/dell/dell-smbios-base.c
+++ b/drivers/platform/x86/dell/dell-smbios-base.c
@@ -495,7 +495,7 @@ static int build_tokens_sysfs(struct platform_device *dev)
int ret;
int i, j;
- token_entries = kzalloc_objs(*token_entries, da_num_tokens, GFP_KERNEL);
+ token_entries = kzalloc_objs(*token_entries, da_num_tokens);
if (!token_entries)
return -ENOMEM;
diff --git a/drivers/platform/x86/dell/dell-wmi-base.c b/drivers/platform/x86/dell/dell-wmi-base.c
index f2e63be75fb3..cdaa366b5e11 100644
--- a/drivers/platform/x86/dell/dell-wmi-base.c
+++ b/drivers/platform/x86/dell/dell-wmi-base.c
@@ -586,7 +586,7 @@ static void handle_dmi_entry(const struct dmi_header *dm, void *opaque)
return;
}
- keymap = kzalloc_objs(struct key_entry, hotkey_num, GFP_KERNEL);
+ keymap = kzalloc_objs(struct key_entry, hotkey_num);
if (!keymap) {
results->err = -ENOMEM;
return;
@@ -769,7 +769,7 @@ static int dell_wmi_events_set_enabled(bool enable)
struct calling_interface_buffer *buffer;
int ret;
- buffer = kzalloc_obj(struct calling_interface_buffer, GFP_KERNEL);
+ buffer = kzalloc_obj(struct calling_interface_buffer);
if (!buffer)
return -ENOMEM;
buffer->cmd_class = CLASS_INFO;
diff --git a/drivers/platform/x86/dell/dell-wmi-sysman/sysman.c b/drivers/platform/x86/dell/dell-wmi-sysman/sysman.c
index 577949ee2e23..9dddab6c9397 100644
--- a/drivers/platform/x86/dell/dell-wmi-sysman/sysman.c
+++ b/drivers/platform/x86/dell/dell-wmi-sysman/sysman.c
@@ -460,7 +460,7 @@ static int init_bios_attributes(int attr_type, const char *guid)
}
/* build attribute */
- attr_name_kobj = kzalloc_obj(*attr_name_kobj, GFP_KERNEL);
+ attr_name_kobj = kzalloc_obj(*attr_name_kobj);
if (!attr_name_kobj) {
retval = -ENOMEM;
goto err_attr_init;
diff --git a/drivers/platform/x86/dell/dell_rbu.c b/drivers/platform/x86/dell/dell_rbu.c
index daf5df8cbafc..eb50f1d75d0c 100644
--- a/drivers/platform/x86/dell/dell_rbu.c
+++ b/drivers/platform/x86/dell/dell_rbu.c
@@ -111,7 +111,7 @@ static int create_packet(void *data, size_t length) __must_hold(&rbu_data.lock)
spin_unlock(&rbu_data.lock);
- newpacket = kzalloc_obj(struct packet_data, GFP_KERNEL);
+ newpacket = kzalloc_obj(struct packet_data);
if (!newpacket) {
pr_warn("failed to allocate new packet\n");
diff --git a/drivers/platform/x86/eeepc-laptop.c b/drivers/platform/x86/eeepc-laptop.c
index e42045494b2c..974f55e0b36f 100644
--- a/drivers/platform/x86/eeepc-laptop.c
+++ b/drivers/platform/x86/eeepc-laptop.c
@@ -1366,7 +1366,7 @@ static int eeepc_acpi_add(struct acpi_device *device)
int result;
pr_notice(EEEPC_LAPTOP_NAME "\n");
- eeepc = kzalloc_obj(struct eeepc_laptop, GFP_KERNEL);
+ eeepc = kzalloc_obj(struct eeepc_laptop);
if (!eeepc)
return -ENOMEM;
eeepc->handle = device->handle;
diff --git a/drivers/platform/x86/hp/hp-bioscfg/bioscfg.c b/drivers/platform/x86/hp/hp-bioscfg/bioscfg.c
index bf3d409e5974..27fd6cd21529 100644
--- a/drivers/platform/x86/hp/hp-bioscfg/bioscfg.c
+++ b/drivers/platform/x86/hp/hp-bioscfg/bioscfg.c
@@ -588,7 +588,7 @@ static int hp_add_other_attributes(int attr_type)
int ret;
char *attr_name;
- attr_name_kobj = kzalloc_obj(*attr_name_kobj, GFP_KERNEL);
+ attr_name_kobj = kzalloc_obj(*attr_name_kobj);
if (!attr_name_kobj)
return -ENOMEM;
@@ -711,7 +711,7 @@ static int hp_init_bios_package_attribute(enum hp_wmi_data_type attr_type,
}
/* build attribute */
- attr_name_kobj = kzalloc_obj(*attr_name_kobj, GFP_KERNEL);
+ attr_name_kobj = kzalloc_obj(*attr_name_kobj);
if (!attr_name_kobj) {
ret = -ENOMEM;
goto pack_attr_exit;
@@ -810,7 +810,7 @@ static int hp_init_bios_buffer_attribute(enum hp_wmi_data_type attr_type,
}
/* build attribute */
- attr_name_kobj = kzalloc_obj(*attr_name_kobj, GFP_KERNEL);
+ attr_name_kobj = kzalloc_obj(*attr_name_kobj);
if (!attr_name_kobj) {
ret = -ENOMEM;
goto buff_attr_exit;
diff --git a/drivers/platform/x86/huawei-wmi.c b/drivers/platform/x86/huawei-wmi.c
index 64c5543f795d..93cca17fdf58 100644
--- a/drivers/platform/x86/huawei-wmi.c
+++ b/drivers/platform/x86/huawei-wmi.c
@@ -854,7 +854,7 @@ static __init int huawei_wmi_init(void)
struct platform_device *pdev;
int err;
- huawei_wmi = kzalloc_obj(struct huawei_wmi, GFP_KERNEL);
+ huawei_wmi = kzalloc_obj(struct huawei_wmi);
if (!huawei_wmi)
return -ENOMEM;
diff --git a/drivers/platform/x86/intel/ifs/core.c b/drivers/platform/x86/intel/ifs/core.c
index 1f4f84217d5e..3dafa28a1010 100644
--- a/drivers/platform/x86/intel/ifs/core.c
+++ b/drivers/platform/x86/intel/ifs/core.c
@@ -125,7 +125,7 @@ static int __init ifs_init(void)
if (rdmsrq_safe(MSR_INTEGRITY_CAPS, &msrval))
return -ENODEV;
- ifs_pkg_auth = kmalloc_objs(bool, topology_max_packages(), GFP_KERNEL);
+ ifs_pkg_auth = kmalloc_objs(bool, topology_max_packages());
if (!ifs_pkg_auth)
return -ENOMEM;
diff --git a/drivers/platform/x86/intel/int1092/intel_sar.c b/drivers/platform/x86/intel/int1092/intel_sar.c
index 568a2722477b..fb26e5a26ffa 100644
--- a/drivers/platform/x86/intel/int1092/intel_sar.c
+++ b/drivers/platform/x86/intel/int1092/intel_sar.c
@@ -248,7 +248,7 @@ static int sar_probe(struct platform_device *device)
int reg;
int result;
- context = kzalloc_obj(*context, GFP_KERNEL);
+ context = kzalloc_obj(*context);
if (!context)
return -ENOMEM;
diff --git a/drivers/platform/x86/intel/pmc/pltdrv.c b/drivers/platform/x86/intel/pmc/pltdrv.c
index 6fcf0f85a8d7..71ebb9ea1be2 100644
--- a/drivers/platform/x86/intel/pmc/pltdrv.c
+++ b/drivers/platform/x86/intel/pmc/pltdrv.c
@@ -65,7 +65,7 @@ static int __init pmc_core_platform_init(void)
if (!x86_match_cpu(intel_pmc_core_platform_ids))
return -ENODEV;
- pmc_core_device = kzalloc_obj(*pmc_core_device, GFP_KERNEL);
+ pmc_core_device = kzalloc_obj(*pmc_core_device);
if (!pmc_core_device)
return -ENOMEM;
diff --git a/drivers/platform/x86/intel/pmt/telemetry.c b/drivers/platform/x86/intel/pmt/telemetry.c
index 2eee7389dcf9..a52803bfe124 100644
--- a/drivers/platform/x86/intel/pmt/telemetry.c
+++ b/drivers/platform/x86/intel/pmt/telemetry.c
@@ -107,7 +107,7 @@ static int pmt_telem_add_endpoint(struct intel_vsec_device *ivdev,
struct telem_endpoint *ep;
/* Endpoint lifetimes are managed by kref, not devres */
- entry->ep = kzalloc_obj(*(entry->ep), GFP_KERNEL);
+ entry->ep = kzalloc_obj(*(entry->ep));
if (!entry->ep)
return -ENOMEM;
diff --git a/drivers/platform/x86/intel/speed_select_if/isst_if_common.c b/drivers/platform/x86/intel/speed_select_if/isst_if_common.c
index 33abff1dbe84..fa75eb77e0cb 100644
--- a/drivers/platform/x86/intel/speed_select_if/isst_if_common.c
+++ b/drivers/platform/x86/intel/speed_select_if/isst_if_common.c
@@ -89,7 +89,7 @@ static int isst_store_new_cmd(int cmd, u32 cpu, int mbox_cmd_type, u32 param,
{
struct isst_cmd *sst_cmd;
- sst_cmd = kmalloc_obj(*sst_cmd, GFP_KERNEL);
+ sst_cmd = kmalloc_obj(*sst_cmd);
if (!sst_cmd)
return -ENOMEM;
diff --git a/drivers/platform/x86/intel/speed_select_if/isst_tpmi_core.c b/drivers/platform/x86/intel/speed_select_if/isst_tpmi_core.c
index 9242e29aac59..a38c278a792b 100644
--- a/drivers/platform/x86/intel/speed_select_if/isst_tpmi_core.c
+++ b/drivers/platform/x86/intel/speed_select_if/isst_tpmi_core.c
@@ -1603,7 +1603,7 @@ int tpmi_sst_dev_add(struct auxiliary_device *auxdev)
* devm_* allocation here as each partition is a
* different device, which can be unbound.
*/
- tpmi_sst = kzalloc_obj(*tpmi_sst, GFP_KERNEL);
+ tpmi_sst = kzalloc_obj(*tpmi_sst);
if (!tpmi_sst) {
ret = -ENOMEM;
goto unlock_exit;
diff --git a/drivers/platform/x86/intel/vsec.c b/drivers/platform/x86/intel/vsec.c
index b21a9cfabad4..5059d320edf8 100644
--- a/drivers/platform/x86/intel/vsec.c
+++ b/drivers/platform/x86/intel/vsec.c
@@ -299,11 +299,11 @@ static int intel_vsec_add_dev(struct pci_dev *pdev, struct intel_vsec_header *he
return -EINVAL;
}
- intel_vsec_dev = kzalloc_obj(*intel_vsec_dev, GFP_KERNEL);
+ intel_vsec_dev = kzalloc_obj(*intel_vsec_dev);
if (!intel_vsec_dev)
return -ENOMEM;
- res = kzalloc_objs(*res, header->num_entries, GFP_KERNEL);
+ res = kzalloc_objs(*res, header->num_entries);
if (!res)
return -ENOMEM;
diff --git a/drivers/platform/x86/intel/vsec_tpmi.c b/drivers/platform/x86/intel/vsec_tpmi.c
index 9614fb8584f2..98846e88d3d0 100644
--- a/drivers/platform/x86/intel/vsec_tpmi.c
+++ b/drivers/platform/x86/intel/vsec_tpmi.c
@@ -622,11 +622,11 @@ static int tpmi_create_device(struct intel_tpmi_info *tpmi_info,
if (!name)
return -EOPNOTSUPP;
- res = kzalloc_objs(*res, pfs->pfs_header.num_entries, GFP_KERNEL);
+ res = kzalloc_objs(*res, pfs->pfs_header.num_entries);
if (!res)
return -ENOMEM;
- feature_vsec_dev = kzalloc_obj(*feature_vsec_dev, GFP_KERNEL);
+ feature_vsec_dev = kzalloc_obj(*feature_vsec_dev);
if (!feature_vsec_dev) {
kfree(res);
return -ENOMEM;
diff --git a/drivers/platform/x86/intel_scu_ipc.c b/drivers/platform/x86/intel_scu_ipc.c
index 4412e7c2bce0..a2472ad10f37 100644
--- a/drivers/platform/x86/intel_scu_ipc.c
+++ b/drivers/platform/x86/intel_scu_ipc.c
@@ -573,7 +573,7 @@ __intel_scu_ipc_register(struct device *parent,
if (ipcdev)
return ERR_PTR(-EBUSY);
- scu = kzalloc_obj(*scu, GFP_KERNEL);
+ scu = kzalloc_obj(*scu);
if (!scu)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/platform/x86/lenovo/ideapad-laptop.c b/drivers/platform/x86/lenovo/ideapad-laptop.c
index 59703574e8ce..ae1ebb071fab 100644
--- a/drivers/platform/x86/lenovo/ideapad-laptop.c
+++ b/drivers/platform/x86/lenovo/ideapad-laptop.c
@@ -1172,7 +1172,7 @@ static int ideapad_dytc_profile_init(struct ideapad_private *priv)
return -ENODEV;
}
- priv->dytc = kzalloc_obj(*priv->dytc, GFP_KERNEL);
+ priv->dytc = kzalloc_obj(*priv->dytc);
if (!priv->dytc)
return -ENOMEM;
diff --git a/drivers/platform/x86/lenovo/think-lmi.c b/drivers/platform/x86/lenovo/think-lmi.c
index a89f9436a795..e215e86e3db7 100644
--- a/drivers/platform/x86/lenovo/think-lmi.c
+++ b/drivers/platform/x86/lenovo/think-lmi.c
@@ -1593,7 +1593,7 @@ static struct tlmi_pwd_setting *tlmi_create_auth(const char *pwd_type,
{
struct tlmi_pwd_setting *new_pwd;
- new_pwd = kzalloc_obj(struct tlmi_pwd_setting, GFP_KERNEL);
+ new_pwd = kzalloc_obj(struct tlmi_pwd_setting);
if (!new_pwd)
return NULL;
@@ -1668,7 +1668,7 @@ static int tlmi_analyze(struct wmi_device *wdev)
strreplace(item, ',', '\0');
/* Create a setting entry */
- setting = kzalloc_obj(*setting, GFP_KERNEL);
+ setting = kzalloc_obj(*setting);
if (!setting) {
ret = -ENOMEM;
kfree(item);
diff --git a/drivers/platform/x86/lenovo/thinkpad_acpi.c b/drivers/platform/x86/lenovo/thinkpad_acpi.c
index 9a5b1d793cb9..f9c736777908 100644
--- a/drivers/platform/x86/lenovo/thinkpad_acpi.c
+++ b/drivers/platform/x86/lenovo/thinkpad_acpi.c
@@ -873,7 +873,7 @@ static int __init register_tpacpi_subdriver(struct ibm_struct *ibm)
BUG_ON(!ibm->acpi);
- ibm->acpi->driver = kzalloc_obj(struct acpi_driver, GFP_KERNEL);
+ ibm->acpi->driver = kzalloc_obj(struct acpi_driver);
if (!ibm->acpi->driver) {
pr_err("failed to allocate memory for ibm->acpi->driver\n");
return -ENOMEM;
@@ -1197,7 +1197,7 @@ static int __init tpacpi_new_rfkill(const enum tpacpi_rfk_id id,
BUG_ON(id >= TPACPI_RFK_SW_MAX || tpacpi_rfkill_switches[id]);
- atp_rfk = kzalloc_obj(struct tpacpi_rfk, GFP_KERNEL);
+ atp_rfk = kzalloc_obj(struct tpacpi_rfk);
if (atp_rfk)
atp_rfk->rfkill = rfkill_alloc(name,
&tpacpi_pdev->dev,
@@ -5817,7 +5817,7 @@ static int __init led_init(struct ibm_init_struct *iibm)
if (led_supported == TPACPI_LED_NONE)
return -ENODEV;
- tpacpi_leds = kzalloc_objs(*tpacpi_leds, TPACPI_LED_NUMLEDS, GFP_KERNEL);
+ tpacpi_leds = kzalloc_objs(*tpacpi_leds, TPACPI_LED_NUMLEDS);
if (!tpacpi_leds) {
pr_err("Out of memory for LED data\n");
return -ENOMEM;
diff --git a/drivers/platform/x86/panasonic-laptop.c b/drivers/platform/x86/panasonic-laptop.c
index 9990f6b920c5..d923ddaa4849 100644
--- a/drivers/platform/x86/panasonic-laptop.c
+++ b/drivers/platform/x86/panasonic-laptop.c
@@ -1017,7 +1017,7 @@ static int acpi_pcc_hotkey_add(struct acpi_device *device)
*/
num_sifr++;
- pcc = kzalloc_obj(struct pcc_acpi, GFP_KERNEL);
+ pcc = kzalloc_obj(struct pcc_acpi);
if (!pcc) {
pr_err("Couldn't allocate mem for pcc");
return -ENOMEM;
diff --git a/drivers/platform/x86/pmc_atom.c b/drivers/platform/x86/pmc_atom.c
index 3b6edd709543..48c2a0e59d18 100644
--- a/drivers/platform/x86/pmc_atom.c
+++ b/drivers/platform/x86/pmc_atom.c
@@ -428,7 +428,7 @@ static int pmc_setup_clks(struct pci_dev *pdev, void __iomem *pmc_regmap,
struct platform_device *clkdev;
struct pmc_clk_data *clk_data;
- clk_data = kzalloc_obj(*clk_data, GFP_KERNEL);
+ clk_data = kzalloc_obj(*clk_data);
if (!clk_data)
return -ENOMEM;
diff --git a/drivers/platform/x86/samsung-laptop.c b/drivers/platform/x86/samsung-laptop.c
index 50e337a85135..710f3d5bf84c 100644
--- a/drivers/platform/x86/samsung-laptop.c
+++ b/drivers/platform/x86/samsung-laptop.c
@@ -1671,7 +1671,7 @@ static int __init samsung_init(void)
if (!force && !dmi_check_system(samsung_dmi_table))
return -ENODEV;
- samsung = kzalloc_obj(*samsung, GFP_KERNEL);
+ samsung = kzalloc_obj(*samsung);
if (!samsung)
return -ENOMEM;
diff --git a/drivers/platform/x86/sony-laptop.c b/drivers/platform/x86/sony-laptop.c
index a670473b20ab..477f56385e54 100644
--- a/drivers/platform/x86/sony-laptop.c
+++ b/drivers/platform/x86/sony-laptop.c
@@ -829,7 +829,7 @@ static int sony_nc_handles_setup(struct platform_device *pd)
{
int i, r, result, arg;
- handles = kzalloc_obj(*handles, GFP_KERNEL);
+ handles = kzalloc_obj(*handles);
if (!handles)
return -ENOMEM;
@@ -1902,7 +1902,7 @@ static int sony_nc_kbd_backlight_setup(struct platform_device *pd,
}
}
- kbdbl_ctl = kzalloc_obj(*kbdbl_ctl, GFP_KERNEL);
+ kbdbl_ctl = kzalloc_obj(*kbdbl_ctl);
if (!kbdbl_ctl)
return -ENOMEM;
@@ -2070,7 +2070,7 @@ static int sony_nc_battery_care_setup(struct platform_device *pd,
{
int ret = 0;
- bcare_ctl = kzalloc_obj(struct battery_care_control, GFP_KERNEL);
+ bcare_ctl = kzalloc_obj(struct battery_care_control);
if (!bcare_ctl)
return -ENOMEM;
@@ -2222,7 +2222,7 @@ static ssize_t sony_nc_thermal_mode_show(struct device *dev,
static int sony_nc_thermal_setup(struct platform_device *pd)
{
int ret = 0;
- th_handle = kzalloc_obj(struct snc_thermal_ctrl, GFP_KERNEL);
+ th_handle = kzalloc_obj(struct snc_thermal_ctrl);
if (!th_handle)
return -ENOMEM;
@@ -2370,7 +2370,7 @@ static int sony_nc_lid_resume_setup(struct platform_device *pd,
if (sony_call_snc_handle(handle, 0x0000, &result))
return -EIO;
- lid_ctl = kzalloc_obj(struct snc_lid_resume_control, GFP_KERNEL);
+ lid_ctl = kzalloc_obj(struct snc_lid_resume_control);
if (!lid_ctl)
return -ENOMEM;
@@ -2497,7 +2497,7 @@ static int sony_nc_gfx_switch_setup(struct platform_device *pd,
{
unsigned int result;
- gfxs_ctl = kzalloc_obj(struct snc_gfx_switch_control, GFP_KERNEL);
+ gfxs_ctl = kzalloc_obj(struct snc_gfx_switch_control);
if (!gfxs_ctl)
return -ENOMEM;
@@ -2576,7 +2576,7 @@ static int sony_nc_highspeed_charging_setup(struct platform_device *pd)
return 0;
}
- hsc_handle = kzalloc_obj(struct device_attribute, GFP_KERNEL);
+ hsc_handle = kzalloc_obj(struct device_attribute);
if (!hsc_handle)
return -ENOMEM;
@@ -2642,7 +2642,7 @@ static int sony_nc_lowbatt_setup(struct platform_device *pd)
{
unsigned int result;
- lowbatt_handle = kzalloc_obj(struct device_attribute, GFP_KERNEL);
+ lowbatt_handle = kzalloc_obj(struct device_attribute);
if (!lowbatt_handle)
return -ENOMEM;
@@ -2719,11 +2719,11 @@ static int sony_nc_fanspeed_setup(struct platform_device *pd)
{
unsigned int result;
- fan_handle = kzalloc_obj(struct device_attribute, GFP_KERNEL);
+ fan_handle = kzalloc_obj(struct device_attribute);
if (!fan_handle)
return -ENOMEM;
- hsf_handle = kzalloc_obj(struct device_attribute, GFP_KERNEL);
+ hsf_handle = kzalloc_obj(struct device_attribute);
if (!hsf_handle) {
result = -ENOMEM;
goto out_hsf_handle_alloc;
@@ -2823,7 +2823,7 @@ static int sony_nc_usb_charge_setup(struct platform_device *pd)
return 0;
}
- uc_handle = kzalloc_obj(struct device_attribute, GFP_KERNEL);
+ uc_handle = kzalloc_obj(struct device_attribute);
if (!uc_handle)
return -ENOMEM;
@@ -2870,7 +2870,7 @@ static int sony_nc_panelid_setup(struct platform_device *pd)
{
unsigned int result;
- panel_handle = kzalloc_obj(struct device_attribute, GFP_KERNEL);
+ panel_handle = kzalloc_obj(struct device_attribute);
if (!panel_handle)
return -ENOMEM;
@@ -2925,7 +2925,7 @@ static int sony_nc_smart_conn_setup(struct platform_device *pd)
{
unsigned int result;
- sc_handle = kzalloc_obj(struct device_attribute, GFP_KERNEL);
+ sc_handle = kzalloc_obj(struct device_attribute);
if (!sc_handle)
return -ENOMEM;
@@ -2999,7 +2999,7 @@ static int sony_nc_touchpad_setup(struct platform_device *pd,
{
int ret = 0;
- tp_ctl = kzalloc_obj(struct touchpad_control, GFP_KERNEL);
+ tp_ctl = kzalloc_obj(struct touchpad_control);
if (!tp_ctl)
return -ENOMEM;
@@ -4192,7 +4192,7 @@ sony_pic_read_possible_resource(struct acpi_resource *resource, void *context)
p->interrupts[i]);
continue;
}
- interrupt = kzalloc_obj(*interrupt, GFP_KERNEL);
+ interrupt = kzalloc_obj(*interrupt);
if (!interrupt)
return AE_ERROR;
diff --git a/drivers/platform/x86/topstar-laptop.c b/drivers/platform/x86/topstar-laptop.c
index 955021a0ffa4..a7b4b6c8e549 100644
--- a/drivers/platform/x86/topstar-laptop.c
+++ b/drivers/platform/x86/topstar-laptop.c
@@ -292,7 +292,7 @@ static int topstar_acpi_add(struct acpi_device *device)
dmi_check_system(topstar_dmi_ids);
- topstar = kzalloc_obj(struct topstar_laptop, GFP_KERNEL);
+ topstar = kzalloc_obj(struct topstar_laptop);
if (!topstar)
return -ENOMEM;
diff --git a/drivers/platform/x86/toshiba_acpi.c b/drivers/platform/x86/toshiba_acpi.c
index 8e1773f44f64..18fb558115aa 100644
--- a/drivers/platform/x86/toshiba_acpi.c
+++ b/drivers/platform/x86/toshiba_acpi.c
@@ -3321,7 +3321,7 @@ static int toshiba_acpi_add(struct acpi_device *acpi_dev)
return -ENODEV;
}
- dev = kzalloc_obj(*dev, GFP_KERNEL);
+ dev = kzalloc_obj(*dev);
if (!dev)
return -ENOMEM;
dev->acpi_dev = acpi_dev;
diff --git a/drivers/platform/x86/toshiba_bluetooth.c b/drivers/platform/x86/toshiba_bluetooth.c
index 6e71de0abca2..e587beef05b9 100644
--- a/drivers/platform/x86/toshiba_bluetooth.c
+++ b/drivers/platform/x86/toshiba_bluetooth.c
@@ -242,7 +242,7 @@ static int toshiba_bt_rfkill_add(struct acpi_device *device)
pr_info("Toshiba ACPI Bluetooth device driver\n");
- bt_dev = kzalloc_obj(*bt_dev, GFP_KERNEL);
+ bt_dev = kzalloc_obj(*bt_dev);
if (!bt_dev)
return -ENOMEM;
bt_dev->acpi_dev = device;
diff --git a/drivers/platform/x86/uniwill/uniwill-acpi.c b/drivers/platform/x86/uniwill/uniwill-acpi.c
index bad9c030295f..fee93537aa43 100644
--- a/drivers/platform/x86/uniwill/uniwill-acpi.c
+++ b/drivers/platform/x86/uniwill/uniwill-acpi.c
@@ -1293,7 +1293,7 @@ static int uniwill_add_battery(struct power_supply *battery, struct acpi_battery
struct uniwill_battery_entry *entry;
int ret;
- entry = kzalloc_obj(*entry, GFP_KERNEL);
+ entry = kzalloc_obj(*entry);
if (!entry)
return -ENOMEM;
diff --git a/drivers/platform/x86/uv_sysfs.c b/drivers/platform/x86/uv_sysfs.c
index fa2e31151923..353f9c6ef214 100644
--- a/drivers/platform/x86/uv_sysfs.c
+++ b/drivers/platform/x86/uv_sysfs.c
@@ -242,14 +242,14 @@ static int uv_hubs_init(void)
goto err_enum_objs;
}
- uv_hubs = kzalloc_objs(*uv_hubs, uv_bios_obj_cnt, GFP_KERNEL);
+ uv_hubs = kzalloc_objs(*uv_hubs, uv_bios_obj_cnt);
if (!uv_hubs) {
ret = -ENOMEM;
goto err_enum_objs;
}
for (i = 0; i < uv_bios_obj_cnt; i++) {
- uv_hubs[i] = kzalloc_obj(*uv_hubs[i], GFP_KERNEL);
+ uv_hubs[i] = kzalloc_obj(*uv_hubs[i]);
if (!uv_hubs[i]) {
i--;
ret = -ENOMEM;
@@ -368,7 +368,7 @@ static int uv_ports_init(void)
s64 biosr;
int j = 0, k = 0, ret, sz;
- port_buf = kzalloc_objs(*port_buf, uv_bios_obj_cnt, GFP_KERNEL);
+ port_buf = kzalloc_objs(*port_buf, uv_bios_obj_cnt);
if (!port_buf)
return -ENOMEM;
diff --git a/drivers/platform/x86/wireless-hotkey.c b/drivers/platform/x86/wireless-hotkey.c
index bba55c634e2c..e5083c0e1515 100644
--- a/drivers/platform/x86/wireless-hotkey.c
+++ b/drivers/platform/x86/wireless-hotkey.c
@@ -91,7 +91,7 @@ static int wl_add(struct acpi_device *device)
struct wl_button *button;
int err;
- button = kzalloc_obj(struct wl_button, GFP_KERNEL);
+ button = kzalloc_obj(struct wl_button);
if (!button)
return -ENOMEM;
diff --git a/drivers/platform/x86/x86-android-tablets/core.c b/drivers/platform/x86/x86-android-tablets/core.c
index 15a50ced6867..2656ecea2a2a 100644
--- a/drivers/platform/x86/x86-android-tablets/core.c
+++ b/drivers/platform/x86/x86-android-tablets/core.c
@@ -463,7 +463,7 @@ static __init int x86_android_tablet_probe(struct platform_device *pdev)
}
}
- spi_devs = kzalloc_objs(*spi_devs, dev_info->spi_dev_count, GFP_KERNEL);
+ spi_devs = kzalloc_objs(*spi_devs, dev_info->spi_dev_count);
if (!spi_devs) {
x86_android_tablet_remove(pdev);
return -ENOMEM;
@@ -479,7 +479,7 @@ static __init int x86_android_tablet_probe(struct platform_device *pdev)
}
/* + 1 to make space for the (optional) gpio_keys_button platform device */
- pdevs = kzalloc_objs(*pdevs, dev_info->pdev_count + 1, GFP_KERNEL);
+ pdevs = kzalloc_objs(*pdevs, dev_info->pdev_count + 1);
if (!pdevs) {
x86_android_tablet_remove(pdev);
return -ENOMEM;
@@ -495,7 +495,7 @@ static __init int x86_android_tablet_probe(struct platform_device *pdev)
}
}
- serdevs = kzalloc_objs(*serdevs, dev_info->serdev_count, GFP_KERNEL);
+ serdevs = kzalloc_objs(*serdevs, dev_info->serdev_count);
if (!serdevs) {
x86_android_tablet_remove(pdev);
return -ENOMEM;
diff --git a/drivers/platform/x86/xo15-ebook.c b/drivers/platform/x86/xo15-ebook.c
index 6bc5cd2abfab..4d1b1b310cc5 100644
--- a/drivers/platform/x86/xo15-ebook.c
+++ b/drivers/platform/x86/xo15-ebook.c
@@ -86,7 +86,7 @@ static int ebook_switch_add(struct acpi_device *device)
struct input_dev *input;
int error;
- button = kzalloc_obj(struct ebook_switch, GFP_KERNEL);
+ button = kzalloc_obj(struct ebook_switch);
if (!button)
return -ENOMEM;
diff --git a/drivers/pmdomain/core.c b/drivers/pmdomain/core.c
index a324740b248b..52ea84e548ff 100644
--- a/drivers/pmdomain/core.c
+++ b/drivers/pmdomain/core.c
@@ -1811,7 +1811,7 @@ static struct generic_pm_domain_data *genpd_alloc_dev_data(struct device *dev,
if (ret)
return ERR_PTR(ret);
- gpd_data = kzalloc_obj(*gpd_data, GFP_KERNEL);
+ gpd_data = kzalloc_obj(*gpd_data);
if (!gpd_data) {
ret = -ENOMEM;
goto err_put;
@@ -1822,7 +1822,7 @@ static struct generic_pm_domain_data *genpd_alloc_dev_data(struct device *dev,
/* Allocate data used by a governor. */
if (has_governor) {
- td = kzalloc_obj(*td, GFP_KERNEL);
+ td = kzalloc_obj(*td);
if (!td) {
ret = -ENOMEM;
goto err_free;
@@ -2161,7 +2161,7 @@ static int genpd_add_subdomain(struct generic_pm_domain *genpd,
return -EINVAL;
}
- link = kzalloc_obj(*link, GFP_KERNEL);
+ link = kzalloc_obj(*link);
if (!link)
return -ENOMEM;
@@ -2269,7 +2269,7 @@ static int genpd_set_default_power_state(struct generic_pm_domain *genpd)
{
struct genpd_power_state *state;
- state = kzalloc_obj(*state, GFP_KERNEL);
+ state = kzalloc_obj(*state);
if (!state)
return -ENOMEM;
@@ -2295,7 +2295,7 @@ static int genpd_alloc_data(struct generic_pm_domain *genpd)
return -ENOMEM;
if (genpd->gov) {
- gd = kzalloc_obj(*gd, GFP_KERNEL);
+ gd = kzalloc_obj(*gd);
if (!gd) {
ret = -ENOMEM;
goto free;
@@ -2623,7 +2623,7 @@ static int genpd_add_provider(struct device_node *np, genpd_xlate_t xlate,
{
struct of_genpd_provider *cp;
- cp = kzalloc_obj(*cp, GFP_KERNEL);
+ cp = kzalloc_obj(*cp);
if (!cp)
return -ENOMEM;
@@ -3316,7 +3316,7 @@ struct device *genpd_dev_pm_attach_by_id(struct device *dev,
return ERR_PTR(-ENODEV);
/* Allocate and register device on the genpd bus. */
- virt_dev = kzalloc_obj(*virt_dev, GFP_KERNEL);
+ virt_dev = kzalloc_obj(*virt_dev);
if (!virt_dev)
return ERR_PTR(-ENOMEM);
@@ -3474,7 +3474,7 @@ int of_genpd_parse_idle_states(struct device_node *dn,
return 0;
}
- st = kzalloc_objs(*st, ret, GFP_KERNEL);
+ st = kzalloc_objs(*st, ret);
if (!st)
return -ENOMEM;
diff --git a/drivers/pmdomain/renesas/rcar-gen4-sysc.c b/drivers/pmdomain/renesas/rcar-gen4-sysc.c
index a62937a9a045..0c6c639a91d0 100644
--- a/drivers/pmdomain/renesas/rcar-gen4-sysc.c
+++ b/drivers/pmdomain/renesas/rcar-gen4-sysc.c
@@ -324,7 +324,7 @@ static int __init rcar_gen4_sysc_pd_init(void)
rcar_gen4_sysc_base = base;
- domains = kzalloc_obj(*domains, GFP_KERNEL);
+ domains = kzalloc_obj(*domains);
if (!domains) {
error = -ENOMEM;
goto out_put;
diff --git a/drivers/pmdomain/renesas/rcar-sysc.c b/drivers/pmdomain/renesas/rcar-sysc.c
index aa5485876e0a..bd7bb9cbd9da 100644
--- a/drivers/pmdomain/renesas/rcar-sysc.c
+++ b/drivers/pmdomain/renesas/rcar-sysc.c
@@ -383,7 +383,7 @@ static int __init rcar_sysc_pd_init(void)
rcar_sysc_extmask_offs = info->extmask_offs;
rcar_sysc_extmask_val = info->extmask_val;
- domains = kzalloc_obj(*domains, GFP_KERNEL);
+ domains = kzalloc_obj(*domains);
if (!domains) {
error = -ENOMEM;
goto out_put;
diff --git a/drivers/pmdomain/renesas/rmobile-sysc.c b/drivers/pmdomain/renesas/rmobile-sysc.c
index 541f5739c13a..93103ff33d6e 100644
--- a/drivers/pmdomain/renesas/rmobile-sysc.c
+++ b/drivers/pmdomain/renesas/rmobile-sysc.c
@@ -277,7 +277,7 @@ static int __init rmobile_add_pm_domains(void __iomem *base,
/* always-on domain */
}
- pd = kzalloc_obj(*pd, GFP_KERNEL);
+ pd = kzalloc_obj(*pd);
if (!pd)
return -ENOMEM;
diff --git a/drivers/pmdomain/st/ste-ux500-pm-domain.c b/drivers/pmdomain/st/ste-ux500-pm-domain.c
index 45ea76b9c7f8..6896cb4a7b71 100644
--- a/drivers/pmdomain/st/ste-ux500-pm-domain.c
+++ b/drivers/pmdomain/st/ste-ux500-pm-domain.c
@@ -65,7 +65,7 @@ static int ux500_pm_domains_probe(struct platform_device *pdev)
if (!np)
return -ENODEV;
- genpd_data = kzalloc_obj(*genpd_data, GFP_KERNEL);
+ genpd_data = kzalloc_obj(*genpd_data);
if (!genpd_data)
return -ENOMEM;
diff --git a/drivers/pmdomain/tegra/powergate-bpmp.c b/drivers/pmdomain/tegra/powergate-bpmp.c
index 43a46edd1ebc..8cde4f384846 100644
--- a/drivers/pmdomain/tegra/powergate-bpmp.c
+++ b/drivers/pmdomain/tegra/powergate-bpmp.c
@@ -226,7 +226,7 @@ tegra_bpmp_probe_powergates(struct tegra_bpmp *bpmp,
dev_dbg(bpmp->dev, "maximum powergate ID: %u\n", max_id);
- powergates = kzalloc_objs(*powergates, max_id + 1, GFP_KERNEL);
+ powergates = kzalloc_objs(*powergates, max_id + 1);
if (!powergates)
return -ENOMEM;
@@ -260,7 +260,7 @@ static int tegra_bpmp_add_powergates(struct tegra_bpmp *bpmp,
unsigned int i;
int err;
- domains = kzalloc_objs(*domains, count, GFP_KERNEL);
+ domains = kzalloc_objs(*domains, count);
if (!domains)
return -ENOMEM;
diff --git a/drivers/pnp/card.c b/drivers/pnp/card.c
index 226a81cdb664..87f5af454751 100644
--- a/drivers/pnp/card.c
+++ b/drivers/pnp/card.c
@@ -80,7 +80,7 @@ static int card_probe(struct pnp_card *card, struct pnp_card_driver *drv)
if (!id)
return 0;
- clink = kzalloc_obj(*clink, GFP_KERNEL);
+ clink = kzalloc_obj(*clink);
if (!clink)
return 0;
clink->card = card;
@@ -108,7 +108,7 @@ static struct pnp_id *pnp_add_card_id(struct pnp_card *card, char *id)
{
struct pnp_id *dev_id, *ptr;
- dev_id = kzalloc_obj(struct pnp_id, GFP_KERNEL);
+ dev_id = kzalloc_obj(struct pnp_id);
if (!dev_id)
return NULL;
@@ -159,7 +159,7 @@ struct pnp_card *pnp_alloc_card(struct pnp_protocol *protocol, int id, char *pnp
struct pnp_card *card;
struct pnp_id *dev_id;
- card = kzalloc_obj(struct pnp_card, GFP_KERNEL);
+ card = kzalloc_obj(struct pnp_card);
if (!card)
return NULL;
diff --git a/drivers/pnp/core.c b/drivers/pnp/core.c
index 768388ddaeca..81603327079c 100644
--- a/drivers/pnp/core.c
+++ b/drivers/pnp/core.c
@@ -122,7 +122,7 @@ struct pnp_dev *pnp_alloc_dev(struct pnp_protocol *protocol, int id,
struct pnp_dev *dev;
struct pnp_id *dev_id;
- dev = kzalloc_obj(struct pnp_dev, GFP_KERNEL);
+ dev = kzalloc_obj(struct pnp_dev);
if (!dev)
return NULL;
diff --git a/drivers/pnp/driver.c b/drivers/pnp/driver.c
index 731a37002811..6d58b1465081 100644
--- a/drivers/pnp/driver.c
+++ b/drivers/pnp/driver.c
@@ -315,7 +315,7 @@ struct pnp_id *pnp_add_id(struct pnp_dev *dev, const char *id)
{
struct pnp_id *dev_id, *ptr;
- dev_id = kzalloc_obj(struct pnp_id, GFP_KERNEL);
+ dev_id = kzalloc_obj(struct pnp_id);
if (!dev_id)
return NULL;
diff --git a/drivers/pnp/interface.c b/drivers/pnp/interface.c
index 108f7c63ddc5..9303fef72df0 100644
--- a/drivers/pnp/interface.c
+++ b/drivers/pnp/interface.c
@@ -214,7 +214,7 @@ static ssize_t options_show(struct device *dmdev, struct device_attribute *attr,
int ret, dep = 0, set = 0;
char *indent;
- buffer = kzalloc_obj(*buffer, GFP_KERNEL);
+ buffer = kzalloc_obj(*buffer);
if (!buffer)
return -ENOMEM;
@@ -257,7 +257,7 @@ static ssize_t resources_show(struct device *dmdev,
if (!dev)
return -EINVAL;
- buffer = kzalloc_obj(*buffer, GFP_KERNEL);
+ buffer = kzalloc_obj(*buffer);
if (!buffer)
return -ENOMEM;
diff --git a/drivers/pnp/quirks.c b/drivers/pnp/quirks.c
index 2afa17c39628..7aaecd137d31 100644
--- a/drivers/pnp/quirks.c
+++ b/drivers/pnp/quirks.c
@@ -29,7 +29,7 @@ static void quirk_awe32_add_ports(struct pnp_dev *dev,
{
struct pnp_option *new_option;
- new_option = kmalloc_obj(struct pnp_option, GFP_KERNEL);
+ new_option = kmalloc_obj(struct pnp_option);
if (!new_option) {
dev_err(&dev->dev, "couldn't add ioport region to option set "
"%d\n", pnp_option_set(option));
@@ -155,7 +155,7 @@ static struct pnp_option *pnp_clone_dependent_set(struct pnp_dev *dev,
list_for_each_entry(option, &dev->options, list) {
if (pnp_option_is_dependent(option) &&
pnp_option_set(option) == set) {
- new_option = kmalloc_obj(struct pnp_option, GFP_KERNEL);
+ new_option = kmalloc_obj(struct pnp_option);
if (!new_option) {
dev_err(&dev->dev, "couldn't clone dependent "
"set %d\n", set);
diff --git a/drivers/pnp/resource.c b/drivers/pnp/resource.c
index f62544ec5a1f..6792bd023123 100644
--- a/drivers/pnp/resource.c
+++ b/drivers/pnp/resource.c
@@ -38,7 +38,7 @@ static struct pnp_option *pnp_build_option(struct pnp_dev *dev, unsigned long ty
{
struct pnp_option *option;
- option = kzalloc_obj(struct pnp_option, GFP_KERNEL);
+ option = kzalloc_obj(struct pnp_option);
if (!option)
return NULL;
@@ -499,7 +499,7 @@ static struct pnp_resource *pnp_new_resource(struct pnp_dev *dev)
{
struct pnp_resource *pnp_res;
- pnp_res = kzalloc_obj(struct pnp_resource, GFP_KERNEL);
+ pnp_res = kzalloc_obj(struct pnp_resource);
if (!pnp_res)
return NULL;
diff --git a/drivers/power/sequencing/core.c b/drivers/power/sequencing/core.c
index 666bcfd3c655..4dff71be11b6 100644
--- a/drivers/power/sequencing/core.c
+++ b/drivers/power/sequencing/core.c
@@ -90,7 +90,7 @@ static struct pwrseq_unit *pwrseq_unit_new(const struct pwrseq_unit_data *data)
{
struct pwrseq_unit *unit;
- unit = kzalloc_obj(*unit, GFP_KERNEL);
+ unit = kzalloc_obj(*unit);
if (!unit)
return NULL;
@@ -138,7 +138,7 @@ static struct pwrseq_unit_dep *pwrseq_unit_dep_new(struct pwrseq_unit *unit)
{
struct pwrseq_unit_dep *dep;
- dep = kzalloc_obj(*dep, GFP_KERNEL);
+ dep = kzalloc_obj(*dep);
if (!dep)
return NULL;
@@ -195,7 +195,7 @@ pwrseq_target_new(const struct pwrseq_target_data *data)
{
struct pwrseq_target *target;
- target = kzalloc_obj(*target, GFP_KERNEL);
+ target = kzalloc_obj(*target);
if (!target)
return NULL;
@@ -669,7 +669,7 @@ struct pwrseq_desc *pwrseq_get(struct device *dev, const char *target)
struct pwrseq_match_data match_data;
int ret;
- struct pwrseq_desc *desc __free(kfree) = kzalloc_obj(*desc, GFP_KERNEL);
+ struct pwrseq_desc *desc __free(kfree) = kzalloc_obj(*desc);
if (!desc)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/power/sequencing/pwrseq-thead-gpu.c b/drivers/power/sequencing/pwrseq-thead-gpu.c
index ce32201f5a21..a45318b4b2c1 100644
--- a/drivers/power/sequencing/pwrseq-thead-gpu.c
+++ b/drivers/power/sequencing/pwrseq-thead-gpu.c
@@ -145,7 +145,7 @@ static int pwrseq_thead_gpu_match(struct pwrseq_device *pwrseq,
PWRSEQ_MATCH_OK : PWRSEQ_NO_MATCH;
ctx->num_clks = ARRAY_SIZE(clk_names);
- ctx->clks = kzalloc_objs(*ctx->clks, ctx->num_clks, GFP_KERNEL);
+ ctx->clks = kzalloc_objs(*ctx->clks, ctx->num_clks);
if (!ctx->clks)
return -ENOMEM;
diff --git a/drivers/power/supply/pmu_battery.c b/drivers/power/supply/pmu_battery.c
index 054f75d904a8..b5ffe2da14dc 100644
--- a/drivers/power/supply/pmu_battery.c
+++ b/drivers/power/supply/pmu_battery.c
@@ -160,7 +160,7 @@ static int __init pmu_bat_init(void)
for (i = 0; i < pmu_battery_count; i++) {
struct power_supply_config psy_cfg = {};
- struct pmu_battery_dev *pbat = kzalloc_obj(*pbat, GFP_KERNEL);
+ struct pmu_battery_dev *pbat = kzalloc_obj(*pbat);
if (!pbat)
break;
diff --git a/drivers/power/supply/power_supply_core.c b/drivers/power/supply/power_supply_core.c
index 91e8b18e09ff..a446d3d086fc 100644
--- a/drivers/power/supply/power_supply_core.c
+++ b/drivers/power/supply/power_supply_core.c
@@ -1426,7 +1426,7 @@ int power_supply_register_extension(struct power_supply *psy, const struct power
if (power_supply_has_property(psy, ext->properties[i]))
return -EEXIST;
- reg = kmalloc_obj(*reg, GFP_KERNEL);
+ reg = kmalloc_obj(*reg);
if (!reg)
return -ENOMEM;
diff --git a/drivers/power/supply/power_supply_leds.c b/drivers/power/supply/power_supply_leds.c
index af32dc2e0210..1548aaba3362 100644
--- a/drivers/power/supply/power_supply_leds.c
+++ b/drivers/power/supply/power_supply_leds.c
@@ -48,7 +48,7 @@ static int power_supply_register_led_trigger(struct power_supply *psy,
if (err && *err)
return *err;
- psy_trig = kzalloc_obj(*psy_trig, GFP_KERNEL);
+ psy_trig = kzalloc_obj(*psy_trig);
if (!psy_trig)
goto err_free_trigger;
diff --git a/drivers/powercap/arm_scmi_powercap.c b/drivers/powercap/arm_scmi_powercap.c
index 798c43e482ae..ab66e9a3b1e2 100644
--- a/drivers/powercap/arm_scmi_powercap.c
+++ b/drivers/powercap/arm_scmi_powercap.c
@@ -370,7 +370,7 @@ static int scmi_zones_register(struct device *dev,
unsigned int sp = 0, reg_zones = 0;
struct scmi_powercap_zone *spz, **zones_stack;
- zones_stack = kzalloc_objs(spz, pr->num_zones, GFP_KERNEL);
+ zones_stack = kzalloc_objs(spz, pr->num_zones);
if (!zones_stack)
return -ENOMEM;
diff --git a/drivers/powercap/dtpm.c b/drivers/powercap/dtpm.c
index afdeecef69ef..b7a65e543f19 100644
--- a/drivers/powercap/dtpm.c
+++ b/drivers/powercap/dtpm.c
@@ -418,7 +418,7 @@ static struct dtpm *dtpm_setup_virtual(const struct dtpm_node *hierarchy,
struct dtpm *dtpm;
int ret;
- dtpm = kzalloc_obj(*dtpm, GFP_KERNEL);
+ dtpm = kzalloc_obj(*dtpm);
if (!dtpm)
return ERR_PTR(-ENOMEM);
dtpm_init(dtpm, NULL);
diff --git a/drivers/powercap/dtpm_cpu.c b/drivers/powercap/dtpm_cpu.c
index 25489b3b03be..21355db6419d 100644
--- a/drivers/powercap/dtpm_cpu.c
+++ b/drivers/powercap/dtpm_cpu.c
@@ -212,7 +212,7 @@ static int __dtpm_cpu_setup(int cpu, struct dtpm *parent)
goto release_policy;
}
- dtpm_cpu = kzalloc_obj(*dtpm_cpu, GFP_KERNEL);
+ dtpm_cpu = kzalloc_obj(*dtpm_cpu);
if (!dtpm_cpu) {
ret = -ENOMEM;
goto release_policy;
diff --git a/drivers/powercap/dtpm_devfreq.c b/drivers/powercap/dtpm_devfreq.c
index e941bb241986..fa71285dee60 100644
--- a/drivers/powercap/dtpm_devfreq.c
+++ b/drivers/powercap/dtpm_devfreq.c
@@ -160,7 +160,7 @@ static int __dtpm_devfreq_setup(struct devfreq *devfreq, struct dtpm *parent)
}
}
- dtpm_devfreq = kzalloc_obj(*dtpm_devfreq, GFP_KERNEL);
+ dtpm_devfreq = kzalloc_obj(*dtpm_devfreq);
if (!dtpm_devfreq)
return -ENOMEM;
diff --git a/drivers/powercap/intel_rapl_common.c b/drivers/powercap/intel_rapl_common.c
index e7f538ebab2f..4d5b12ba0eff 100644
--- a/drivers/powercap/intel_rapl_common.c
+++ b/drivers/powercap/intel_rapl_common.c
@@ -2216,7 +2216,7 @@ struct rapl_package *rapl_add_package_cpuslocked(int id, struct rapl_if_priv *pr
struct rapl_package *rp;
int ret;
- rp = kzalloc_obj(struct rapl_package, GFP_KERNEL);
+ rp = kzalloc_obj(struct rapl_package);
if (!rp)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/powercap/intel_rapl_tpmi.c b/drivers/powercap/intel_rapl_tpmi.c
index f68784c7e718..ba956a2571d1 100644
--- a/drivers/powercap/intel_rapl_tpmi.c
+++ b/drivers/powercap/intel_rapl_tpmi.c
@@ -102,7 +102,7 @@ static struct tpmi_rapl_package *trp_alloc(int pkg_id)
}
}
- trp = kzalloc_obj(*trp, GFP_KERNEL);
+ trp = kzalloc_obj(*trp);
if (!trp) {
ret = -ENOMEM;
goto err_del_powercap;
diff --git a/drivers/powercap/powercap_sys.c b/drivers/powercap/powercap_sys.c
index b32ac11a6c49..b65bb4f4b92a 100644
--- a/drivers/powercap/powercap_sys.c
+++ b/drivers/powercap/powercap_sys.c
@@ -501,7 +501,7 @@ struct powercap_zone *powercap_register_zone(
return ERR_PTR(-EINVAL);
memset(power_zone, 0, sizeof(*power_zone));
} else {
- power_zone = kzalloc_obj(*power_zone, GFP_KERNEL);
+ power_zone = kzalloc_obj(*power_zone);
if (!power_zone)
return ERR_PTR(-ENOMEM);
power_zone->allocated = true;
@@ -613,7 +613,7 @@ struct powercap_control_type *powercap_register_control_type(
return ERR_PTR(-EINVAL);
memset(control_type, 0, sizeof(*control_type));
} else {
- control_type = kzalloc_obj(*control_type, GFP_KERNEL);
+ control_type = kzalloc_obj(*control_type);
if (!control_type)
return ERR_PTR(-ENOMEM);
control_type->allocated = true;
diff --git a/drivers/pps/clients/pps_parport.c b/drivers/pps/clients/pps_parport.c
index 975d984b0fd5..f5af18bc2971 100644
--- a/drivers/pps/clients/pps_parport.c
+++ b/drivers/pps/clients/pps_parport.c
@@ -142,7 +142,7 @@ static void parport_attach(struct parport *port)
return;
}
- device = kzalloc_obj(struct pps_client_pp, GFP_KERNEL);
+ device = kzalloc_obj(struct pps_client_pp);
if (!device) {
pr_err("memory allocation failed, not attaching\n");
return;
diff --git a/drivers/pps/generators/pps_gen.c b/drivers/pps/generators/pps_gen.c
index a91f6871f98a..7143c003366c 100644
--- a/drivers/pps/generators/pps_gen.c
+++ b/drivers/pps/generators/pps_gen.c
@@ -230,7 +230,7 @@ struct pps_gen_device *pps_gen_register_source(const struct pps_gen_source_info
struct pps_gen_device *pps_gen;
int err;
- pps_gen = kzalloc_obj(struct pps_gen_device, GFP_KERNEL);
+ pps_gen = kzalloc_obj(struct pps_gen_device);
if (pps_gen == NULL) {
err = -ENOMEM;
goto pps_gen_register_source_exit;
diff --git a/drivers/pps/kapi.c b/drivers/pps/kapi.c
index de2ce4faf262..1bf0335a1b41 100644
--- a/drivers/pps/kapi.c
+++ b/drivers/pps/kapi.c
@@ -83,7 +83,7 @@ struct pps_device *pps_register_source(struct pps_source_info *info,
}
/* Allocate memory for the new PPS source struct */
- pps = kzalloc_obj(struct pps_device, GFP_KERNEL);
+ pps = kzalloc_obj(struct pps_device);
if (pps == NULL) {
err = -ENOMEM;
goto pps_register_source_exit;
diff --git a/drivers/ps3/ps3-lpm.c b/drivers/ps3/ps3-lpm.c
index 8f1ee4c748bf..f8d8f607134a 100644
--- a/drivers/ps3/ps3-lpm.c
+++ b/drivers/ps3/ps3-lpm.c
@@ -1181,7 +1181,7 @@ static int ps3_lpm_probe(struct ps3_system_bus_device *dev)
return -EBUSY;
}
- lpm_priv = kzalloc_obj(*lpm_priv, GFP_KERNEL);
+ lpm_priv = kzalloc_obj(*lpm_priv);
if (!lpm_priv)
return -ENOMEM;
diff --git a/drivers/ps3/ps3-vuart.c b/drivers/ps3/ps3-vuart.c
index 3493a9ef05ce..39ffa2366132 100644
--- a/drivers/ps3/ps3-vuart.c
+++ b/drivers/ps3/ps3-vuart.c
@@ -914,7 +914,7 @@ static int ps3_vuart_bus_interrupt_get(void)
BUG_ON(vuart_bus_priv.bmp);
- vuart_bus_priv.bmp = kzalloc_obj(struct ports_bmp, GFP_KERNEL);
+ vuart_bus_priv.bmp = kzalloc_obj(struct ports_bmp);
if (!vuart_bus_priv.bmp) {
result = -ENOMEM;
@@ -1015,7 +1015,7 @@ static int ps3_vuart_probe(struct ps3_system_bus_device *dev)
/* Setup dev->driver_priv. */
- dev->driver_priv = kzalloc_obj(struct ps3_vuart_port_priv, GFP_KERNEL);
+ dev->driver_priv = kzalloc_obj(struct ps3_vuart_port_priv);
if (!dev->driver_priv) {
result = -ENOMEM;
diff --git a/drivers/ps3/ps3av.c b/drivers/ps3/ps3av.c
index 19f2c5b4f8f3..d4b91c480f98 100644
--- a/drivers/ps3/ps3av.c
+++ b/drivers/ps3/ps3av.c
@@ -934,7 +934,7 @@ static int ps3av_probe(struct ps3_system_bus_device *dev)
return -EBUSY;
}
- ps3av = kzalloc_obj(*ps3av, GFP_KERNEL);
+ ps3av = kzalloc_obj(*ps3av);
if (!ps3av)
return -ENOMEM;
diff --git a/drivers/ptp/ptp_clock.c b/drivers/ptp/ptp_clock.c
index dc6d9afdd5c6..d6f54ccaf93b 100644
--- a/drivers/ptp/ptp_clock.c
+++ b/drivers/ptp/ptp_clock.c
@@ -328,7 +328,7 @@ struct ptp_clock *ptp_clock_register(struct ptp_clock_info *info,
return ERR_PTR(-EINVAL);
/* Initialize a clock structure. */
- ptp = kzalloc_obj(struct ptp_clock, GFP_KERNEL);
+ ptp = kzalloc_obj(struct ptp_clock);
if (!ptp) {
err = -ENOMEM;
goto no_memory;
@@ -344,7 +344,7 @@ struct ptp_clock *ptp_clock_register(struct ptp_clock_info *info,
ptp->devid = MKDEV(major, index);
ptp->index = index;
INIT_LIST_HEAD(&ptp->tsevqs);
- queue = kzalloc_obj(*queue, GFP_KERNEL);
+ queue = kzalloc_obj(*queue);
if (!queue) {
err = -ENOMEM;
goto no_memory_queue;
diff --git a/drivers/ptp/ptp_ines.c b/drivers/ptp/ptp_ines.c
index 67eda6fb22d1..9e7af6a10261 100644
--- a/drivers/ptp/ptp_ines.c
+++ b/drivers/ptp/ptp_ines.c
@@ -760,7 +760,7 @@ static int ines_ptp_ctrl_probe(struct platform_device *pld)
err = PTR_ERR(addr);
goto out;
}
- clock = kzalloc_obj(*clock, GFP_KERNEL);
+ clock = kzalloc_obj(*clock);
if (!clock) {
err = -ENOMEM;
goto out;
diff --git a/drivers/ptp/ptp_mock.c b/drivers/ptp/ptp_mock.c
index 267168e9d0ca..4d66b6147121 100644
--- a/drivers/ptp/ptp_mock.c
+++ b/drivers/ptp/ptp_mock.c
@@ -120,7 +120,7 @@ struct mock_phc *mock_phc_create(struct device *dev)
struct mock_phc *phc;
int err;
- phc = kzalloc_obj(*phc, GFP_KERNEL);
+ phc = kzalloc_obj(*phc);
if (!phc) {
err = -ENOMEM;
goto out;
diff --git a/drivers/ptp/ptp_ocp.c b/drivers/ptp/ptp_ocp.c
index 1ed492c12e1d..d88ab2f86b1b 100644
--- a/drivers/ptp/ptp_ocp.c
+++ b/drivers/ptp/ptp_ocp.c
@@ -2241,7 +2241,7 @@ ptp_ocp_register_ext(struct ptp_ocp *bp, struct ocp_resource *r)
struct ptp_ocp_ext_src *ext;
int err;
- ext = kzalloc_obj(*ext, GFP_KERNEL);
+ ext = kzalloc_obj(*ext);
if (!ext)
return -ENOMEM;
@@ -2378,7 +2378,7 @@ ptp_ocp_attr_group_add(struct ptp_ocp *bp,
if (attr_tbl[i].cap & bp->fw_cap)
count++;
- bp->attr_group = kzalloc_objs(*bp->attr_group, count + 1, GFP_KERNEL);
+ bp->attr_group = kzalloc_objs(*bp->attr_group, count + 1);
if (!bp->attr_group)
return -ENOMEM;
@@ -2645,7 +2645,7 @@ ptp_ocp_set_pins(struct ptp_ocp *bp)
struct ptp_pin_desc *config;
int i;
- config = kzalloc_objs(*config, 4, GFP_KERNEL);
+ config = kzalloc_objs(*config, 4);
if (!config)
return -ENOMEM;
diff --git a/drivers/ptp/ptp_qoriq.c b/drivers/ptp/ptp_qoriq.c
index 71f4de4e8fc3..76272e5ac5b8 100644
--- a/drivers/ptp/ptp_qoriq.c
+++ b/drivers/ptp/ptp_qoriq.c
@@ -613,7 +613,7 @@ static int ptp_qoriq_probe(struct platform_device *dev)
int err = -ENOMEM;
void __iomem *base;
- ptp_qoriq = kzalloc_obj(*ptp_qoriq, GFP_KERNEL);
+ ptp_qoriq = kzalloc_obj(*ptp_qoriq);
if (!ptp_qoriq)
goto no_memory;
diff --git a/drivers/ptp/ptp_sysfs.c b/drivers/ptp/ptp_sysfs.c
index f398eac4a263..dc398c6b7528 100644
--- a/drivers/ptp/ptp_sysfs.c
+++ b/drivers/ptp/ptp_sysfs.c
@@ -443,11 +443,11 @@ int ptp_populate_pin_groups(struct ptp_clock *ptp)
if (!n_pins)
return 0;
- ptp->pin_dev_attr = kzalloc_objs(*ptp->pin_dev_attr, n_pins, GFP_KERNEL);
+ ptp->pin_dev_attr = kzalloc_objs(*ptp->pin_dev_attr, n_pins);
if (!ptp->pin_dev_attr)
goto no_dev_attr;
- ptp->pin_attr = kzalloc_objs(*ptp->pin_attr, 1 + n_pins, GFP_KERNEL);
+ ptp->pin_attr = kzalloc_objs(*ptp->pin_attr, 1 + n_pins);
if (!ptp->pin_attr)
goto no_pin_attr;
diff --git a/drivers/ptp/ptp_vclock.c b/drivers/ptp/ptp_vclock.c
index b27b25715e1e..915a4f6defc9 100644
--- a/drivers/ptp/ptp_vclock.c
+++ b/drivers/ptp/ptp_vclock.c
@@ -191,7 +191,7 @@ struct ptp_vclock *ptp_vclock_register(struct ptp_clock *pclock)
{
struct ptp_vclock *vclock;
- vclock = kzalloc_obj(*vclock, GFP_KERNEL);
+ vclock = kzalloc_obj(*vclock);
if (!vclock)
return NULL;
diff --git a/drivers/ptp/ptp_vmclock.c b/drivers/ptp/ptp_vmclock.c
index 431510435376..8b630eb916b5 100644
--- a/drivers/ptp/ptp_vmclock.c
+++ b/drivers/ptp/ptp_vmclock.c
@@ -460,7 +460,7 @@ static int vmclock_miscdev_open(struct inode *inode, struct file *fp)
{
struct vmclock_state *st = container_of(fp->private_data,
struct vmclock_state, miscdev);
- struct vmclock_file_state *fst = kzalloc_obj(*fst, GFP_KERNEL);
+ struct vmclock_file_state *fst = kzalloc_obj(*fst);
if (!fst)
return -ENOMEM;
diff --git a/drivers/pwm/core.c b/drivers/pwm/core.c
index 7f54abd61c02..39febc6ccbb7 100644
--- a/drivers/pwm/core.c
+++ b/drivers/pwm/core.c
@@ -1333,7 +1333,7 @@ static int pwm_export_child(struct device *pwmchip_dev, struct pwm_device *pwm)
if (test_and_set_bit(PWMF_EXPORTED, &pwm->flags))
return -EBUSY;
- export = kzalloc_obj(*export, GFP_KERNEL);
+ export = kzalloc_obj(*export);
if (!export) {
clear_bit(PWMF_EXPORTED, &pwm->flags);
return -ENOMEM;
diff --git a/drivers/rapidio/devices/rio_mport_cdev.c b/drivers/rapidio/devices/rio_mport_cdev.c
index 10277dff206e..009b3b595bbf 100644
--- a/drivers/rapidio/devices/rio_mport_cdev.c
+++ b/drivers/rapidio/devices/rio_mport_cdev.c
@@ -348,7 +348,7 @@ rio_mport_create_outbound_mapping(struct mport_dev *md, struct file *filp,
rmcd_debug(OBW, "did=%d ra=0x%llx sz=0x%x", rioid, raddr, size);
- map = kzalloc_obj(*map, GFP_KERNEL);
+ map = kzalloc_obj(*map);
if (map == NULL)
return -ENOMEM;
@@ -800,7 +800,7 @@ rio_dma_transfer(struct file *filp, u32 transfer_mode,
if (xfer->length == 0)
return -EINVAL;
- req = kzalloc_obj(*req, GFP_KERNEL);
+ req = kzalloc_obj(*req);
if (!req)
return -ENOMEM;
@@ -835,7 +835,7 @@ rio_dma_transfer(struct file *filp, u32 transfer_mode,
offset = lower_32_bits(offset_in_page(xfer->loc_addr));
nr_pages = PAGE_ALIGN(xfer->length + offset) >> PAGE_SHIFT;
- page_list = kmalloc_objs(*page_list, nr_pages, GFP_KERNEL);
+ page_list = kmalloc_objs(*page_list, nr_pages);
if (page_list == NULL) {
ret = -ENOMEM;
goto err_req;
@@ -1069,7 +1069,7 @@ static int rio_mport_create_dma_mapping(struct mport_dev *md, struct file *filp,
{
struct rio_mport_mapping *map;
- map = kzalloc_obj(*map, GFP_KERNEL);
+ map = kzalloc_obj(*map);
if (map == NULL)
return -ENOMEM;
@@ -1189,7 +1189,7 @@ rio_mport_create_inbound_mapping(struct mport_dev *md, struct file *filp,
if (size > 0xffffffff)
return -EINVAL;
- map = kzalloc_obj(*map, GFP_KERNEL);
+ map = kzalloc_obj(*map);
if (map == NULL)
return -ENOMEM;
@@ -1431,7 +1431,7 @@ static int rio_mport_add_db_filter(struct mport_cdev_priv *priv,
return ret;
}
- db_filter = kzalloc_obj(*db_filter, GFP_KERNEL);
+ db_filter = kzalloc_obj(*db_filter);
if (db_filter == NULL) {
rio_release_inb_dbell(md->mport, filter.low, filter.high);
return -ENOMEM;
@@ -1539,7 +1539,7 @@ static int rio_mport_add_pw_filter(struct mport_cdev_priv *priv,
if (copy_from_user(&filter, arg, sizeof(filter)))
return -EFAULT;
- pw_filter = kzalloc_obj(*pw_filter, GFP_KERNEL);
+ pw_filter = kzalloc_obj(*pw_filter);
if (pw_filter == NULL)
return -ENOMEM;
@@ -1878,7 +1878,7 @@ static int mport_cdev_open(struct inode *inode, struct file *filp)
get_device(&chdev->dev);
- priv = kzalloc_obj(*priv, GFP_KERNEL);
+ priv = kzalloc_obj(*priv);
if (!priv) {
put_device(&chdev->dev);
return -ENOMEM;
@@ -2348,7 +2348,7 @@ static struct mport_dev *mport_cdev_add(struct rio_mport *mport)
struct mport_dev *md;
struct rio_mport_attr attr;
- md = kzalloc_obj(*md, GFP_KERNEL);
+ md = kzalloc_obj(*md);
if (!md) {
rmcd_error("Unable allocate a device object");
return NULL;
diff --git a/drivers/rapidio/devices/tsi721.c b/drivers/rapidio/devices/tsi721.c
index 9d3f2577bccb..66331e67cf4e 100644
--- a/drivers/rapidio/devices/tsi721.c
+++ b/drivers/rapidio/devices/tsi721.c
@@ -2774,7 +2774,7 @@ static int tsi721_probe(struct pci_dev *pdev,
struct tsi721_device *priv;
int err;
- priv = kzalloc_obj(struct tsi721_device, GFP_KERNEL);
+ priv = kzalloc_obj(struct tsi721_device);
if (!priv) {
err = -ENOMEM;
goto err_exit;
diff --git a/drivers/rapidio/rio.c b/drivers/rapidio/rio.c
index c811cc3ebc5d..0c175e6d424f 100644
--- a/drivers/rapidio/rio.c
+++ b/drivers/rapidio/rio.c
@@ -107,7 +107,7 @@ EXPORT_SYMBOL(rio_query_mport);
*/
struct rio_net *rio_alloc_net(struct rio_mport *mport)
{
- struct rio_net *net = kzalloc_obj(*net, GFP_KERNEL);
+ struct rio_net *net = kzalloc_obj(*net);
if (net) {
INIT_LIST_HEAD(&net->node);
@@ -242,7 +242,7 @@ int rio_request_inb_mbox(struct rio_mport *mport,
if (!mport->ops->open_inb_mbox)
goto out;
- res = kzalloc_obj(*res, GFP_KERNEL);
+ res = kzalloc_obj(*res);
if (res) {
rio_init_mbox_res(res, mbox, mbox);
@@ -326,7 +326,7 @@ int rio_request_outb_mbox(struct rio_mport *mport,
if (!mport->ops->open_outb_mbox)
goto out;
- res = kzalloc_obj(*res, GFP_KERNEL);
+ res = kzalloc_obj(*res);
if (res) {
rio_init_mbox_res(res, mbox, mbox);
@@ -403,7 +403,7 @@ rio_setup_inb_dbell(struct rio_mport *mport, void *dev_id, struct resource *res,
void (*dinb) (struct rio_mport * mport, void *dev_id, u16 src, u16 dst,
u16 info))
{
- struct rio_dbell *dbell = kmalloc_obj(*dbell, GFP_KERNEL);
+ struct rio_dbell *dbell = kmalloc_obj(*dbell);
if (!dbell)
return -ENOMEM;
@@ -438,7 +438,7 @@ int rio_request_inb_dbell(struct rio_mport *mport,
u16 dst, u16 info))
{
int rc;
- struct resource *res = kzalloc_obj(*res, GFP_KERNEL);
+ struct resource *res = kzalloc_obj(*res);
if (res) {
rio_init_dbell_res(res, start, end);
@@ -515,7 +515,7 @@ EXPORT_SYMBOL_GPL(rio_release_inb_dbell);
struct resource *rio_request_outb_dbell(struct rio_dev *rdev, u16 start,
u16 end)
{
- struct resource *res = kzalloc_obj(struct resource, GFP_KERNEL);
+ struct resource *res = kzalloc_obj(struct resource);
if (res) {
rio_init_dbell_res(res, start, end);
@@ -563,7 +563,7 @@ int rio_add_mport_pw_handler(struct rio_mport *mport, void *context,
int (*pwcback)(struct rio_mport *mport,
void *context, union rio_pw_msg *msg, int step))
{
- struct rio_pwrite *pwrite = kzalloc_obj(*pwrite, GFP_KERNEL);
+ struct rio_pwrite *pwrite = kzalloc_obj(*pwrite);
if (!pwrite)
return -ENOMEM;
@@ -1865,7 +1865,7 @@ int rio_register_scan(int mport_id, struct rio_scan *scan_ops)
/*
* Allocate and initialize new scan registration node.
*/
- scan = kzalloc_obj(*scan, GFP_KERNEL);
+ scan = kzalloc_obj(*scan);
if (!scan) {
rc = -ENOMEM;
goto err_out;
@@ -2000,7 +2000,7 @@ int rio_init_mports(void)
goto no_disc;
}
- work = kzalloc_objs(*work, n, GFP_KERNEL);
+ work = kzalloc_objs(*work, n);
if (!work) {
destroy_workqueue(rio_wq);
goto no_disc;
diff --git a/drivers/rapidio/rio_cm.c b/drivers/rapidio/rio_cm.c
index d01c749de5fd..c55af5924da2 100644
--- a/drivers/rapidio/rio_cm.c
+++ b/drivers/rapidio/rio_cm.c
@@ -389,7 +389,7 @@ static int riocm_req_handler(struct cm_dev *cm, void *req_data)
return -EINVAL;
}
- req = kzalloc_obj(*req, GFP_KERNEL);
+ req = kzalloc_obj(*req);
if (!req) {
riocm_put_channel(ch);
return -ENOMEM;
@@ -702,7 +702,7 @@ static int riocm_queue_req(struct cm_dev *cm, struct rio_dev *rdev,
unsigned long flags;
struct tx_req *treq;
- treq = kzalloc_obj(*treq, GFP_KERNEL);
+ treq = kzalloc_obj(*treq);
if (treq == NULL)
return -ENOMEM;
@@ -965,7 +965,7 @@ static int riocm_ch_connect(u16 loc_ch, struct cm_dev *cm,
* Send connect request to the remote RapidIO device
*/
- hdr = kzalloc_obj(*hdr, GFP_KERNEL);
+ hdr = kzalloc_obj(*hdr);
if (hdr == NULL) {
ret = -ENOMEM;
goto conn_done;
@@ -1022,7 +1022,7 @@ static int riocm_send_ack(struct rio_channel *ch)
struct rio_ch_chan_hdr *hdr;
int ret;
- hdr = kzalloc_obj(*hdr, GFP_KERNEL);
+ hdr = kzalloc_obj(*hdr);
if (hdr == NULL)
return -ENOMEM;
@@ -1283,7 +1283,7 @@ static struct rio_channel *riocm_ch_alloc(u16 ch_num)
int start, end;
struct rio_channel *ch;
- ch = kzalloc_obj(*ch, GFP_KERNEL);
+ ch = kzalloc_obj(*ch);
if (!ch)
return ERR_PTR(-ENOMEM);
@@ -1396,7 +1396,7 @@ static int riocm_send_close(struct rio_channel *ch)
* Send CH_CLOSE notification to the remote RapidIO device
*/
- hdr = kzalloc_obj(*hdr, GFP_KERNEL);
+ hdr = kzalloc_obj(*hdr);
if (hdr == NULL)
return -ENOMEM;
@@ -1952,7 +1952,7 @@ static int riocm_add_dev(struct device *dev, struct subsys_interface *sif)
riocm_debug(RDEV, "(%s)", rio_name(rdev));
- peer = kmalloc_obj(*peer, GFP_KERNEL);
+ peer = kmalloc_obj(*peer);
if (!peer)
return -ENOMEM;
@@ -2099,7 +2099,7 @@ static int riocm_add_mport(struct device *dev)
riocm_debug(MPORT, "add mport %s", mport->name);
- cm = kzalloc_obj(*cm, GFP_KERNEL);
+ cm = kzalloc_obj(*cm);
if (!cm)
return -ENOMEM;
diff --git a/drivers/ras/amd/fmpm.c b/drivers/ras/amd/fmpm.c
index c84e26cca724..34ef75af31cb 100644
--- a/drivers/ras/amd/fmpm.c
+++ b/drivers/ras/amd/fmpm.c
@@ -819,7 +819,7 @@ static int allocate_records(void)
{
int i, ret = 0;
- fru_records = kzalloc_objs(struct fru_rec *, max_nr_fru, GFP_KERNEL);
+ fru_records = kzalloc_objs(struct fru_rec *, max_nr_fru);
if (!fru_records) {
ret = -ENOMEM;
goto out;
diff --git a/drivers/regulator/core.c b/drivers/regulator/core.c
index 386304bc200c..2286bdf6edcb 100644
--- a/drivers/regulator/core.c
+++ b/drivers/regulator/core.c
@@ -1855,7 +1855,7 @@ static int set_consumer_device_supply(struct regulator_dev *rdev,
else
has_dev = 0;
- new_node = kzalloc_obj(struct regulator_map, GFP_KERNEL);
+ new_node = kzalloc_obj(struct regulator_map);
if (new_node == NULL)
return -ENOMEM;
@@ -2021,7 +2021,7 @@ static struct regulator *create_regulator(struct regulator_dev *rdev,
return NULL;
}
- regulator = kzalloc_obj(*regulator, GFP_KERNEL);
+ regulator = kzalloc_obj(*regulator);
if (regulator == NULL) {
kfree_const(supply_name);
return NULL;
@@ -2701,7 +2701,7 @@ int regulator_register_supply_alias(struct device *dev, const char *id,
struct regulator_supply_alias *map;
struct regulator_supply_alias *new_map;
- new_map = kzalloc_obj(struct regulator_supply_alias, GFP_KERNEL);
+ new_map = kzalloc_obj(struct regulator_supply_alias);
if (!new_map)
return -ENOMEM;
@@ -2825,7 +2825,7 @@ static int regulator_ena_gpio_request(struct regulator_dev *rdev,
struct gpio_desc *gpiod;
gpiod = config->ena_gpiod;
- new_pin = kzalloc_obj(*new_pin, GFP_KERNEL);
+ new_pin = kzalloc_obj(*new_pin);
mutex_lock(®ulator_list_mutex);
@@ -5913,7 +5913,7 @@ static int regulator_init_coupling(struct regulator_dev *rdev)
else
n_phandles = of_get_n_coupled(rdev);
- coupled = kzalloc_objs(*coupled, n_phandles + 1, GFP_KERNEL);
+ coupled = kzalloc_objs(*coupled, n_phandles + 1);
if (!coupled)
return -ENOMEM;
@@ -6034,7 +6034,7 @@ regulator_register(struct device *dev,
goto rinse;
}
- rdev = kzalloc_obj(struct regulator_dev, GFP_KERNEL);
+ rdev = kzalloc_obj(struct regulator_dev);
if (rdev == NULL) {
ret = -ENOMEM;
goto rinse;
@@ -6117,7 +6117,7 @@ regulator_register(struct device *dev,
sizeof(*rdev->constraints),
GFP_KERNEL);
else
- rdev->constraints = kzalloc_obj(*rdev->constraints, GFP_KERNEL);
+ rdev->constraints = kzalloc_obj(*rdev->constraints);
if (!rdev->constraints) {
ret = -ENOMEM;
goto wash;
diff --git a/drivers/regulator/fixed-helper.c b/drivers/regulator/fixed-helper.c
index 186a05b00733..ba5551ac034d 100644
--- a/drivers/regulator/fixed-helper.c
+++ b/drivers/regulator/fixed-helper.c
@@ -34,7 +34,7 @@ struct platform_device *regulator_register_always_on(int id, const char *name,
{
struct fixed_regulator_data *data;
- data = kzalloc_obj(*data, GFP_KERNEL);
+ data = kzalloc_obj(*data);
if (!data)
return NULL;
diff --git a/drivers/remoteproc/qcom_common.c b/drivers/remoteproc/qcom_common.c
index bb6038bf8bd4..6c31140268ac 100644
--- a/drivers/remoteproc/qcom_common.c
+++ b/drivers/remoteproc/qcom_common.c
@@ -370,7 +370,7 @@ static struct qcom_ssr_subsystem *qcom_ssr_get_subsys(const char *name)
if (!strcmp(info->name, name))
goto out;
- info = kzalloc_obj(*info, GFP_KERNEL);
+ info = kzalloc_obj(*info);
if (!info) {
info = ERR_PTR(-ENOMEM);
goto out;
@@ -534,7 +534,7 @@ static int pdm_notify_prepare(struct rproc_subdev *subdev)
struct auxiliary_device *adev;
int ret;
- adev = kzalloc_obj(*adev, GFP_KERNEL);
+ adev = kzalloc_obj(*adev);
if (!adev)
return -ENOMEM;
diff --git a/drivers/remoteproc/qcom_sysmon.c b/drivers/remoteproc/qcom_sysmon.c
index bbbe732fe767..cf10e8ecfb8f 100644
--- a/drivers/remoteproc/qcom_sysmon.c
+++ b/drivers/remoteproc/qcom_sysmon.c
@@ -628,7 +628,7 @@ struct qcom_sysmon *qcom_add_sysmon_subdev(struct rproc *rproc,
struct qcom_sysmon *sysmon;
int ret;
- sysmon = kzalloc_obj(*sysmon, GFP_KERNEL);
+ sysmon = kzalloc_obj(*sysmon);
if (!sysmon)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/remoteproc/qcom_wcnss_iris.c b/drivers/remoteproc/qcom_wcnss_iris.c
index 78cb8150f64b..2b89b4db6c94 100644
--- a/drivers/remoteproc/qcom_wcnss_iris.c
+++ b/drivers/remoteproc/qcom_wcnss_iris.c
@@ -125,7 +125,7 @@ struct qcom_iris *qcom_iris_probe(struct device *parent, bool *use_48mhz_xo)
return ERR_PTR(-EINVAL);
}
- iris = kzalloc_obj(*iris, GFP_KERNEL);
+ iris = kzalloc_obj(*iris);
if (!iris) {
of_node_put(of_node);
return ERR_PTR(-ENOMEM);
diff --git a/drivers/remoteproc/remoteproc_core.c b/drivers/remoteproc/remoteproc_core.c
index bb5887a9d2ac..b087ed21858a 100644
--- a/drivers/remoteproc/remoteproc_core.c
+++ b/drivers/remoteproc/remoteproc_core.c
@@ -557,7 +557,7 @@ static int rproc_handle_trace(struct rproc *rproc, void *ptr,
return -EINVAL;
}
- trace = kzalloc_obj(*trace, GFP_KERNEL);
+ trace = kzalloc_obj(*trace);
if (!trace)
return -ENOMEM;
@@ -635,7 +635,7 @@ static int rproc_handle_devmem(struct rproc *rproc, void *ptr,
return -EINVAL;
}
- mapping = kzalloc_obj(*mapping, GFP_KERNEL);
+ mapping = kzalloc_obj(*mapping);
if (!mapping)
return -ENOMEM;
@@ -727,7 +727,7 @@ static int rproc_alloc_carveout(struct rproc *rproc,
* physical address in this case.
*/
if (mem->da != FW_RSC_ADDR_ANY && rproc->domain) {
- mapping = kzalloc_obj(*mapping, GFP_KERNEL);
+ mapping = kzalloc_obj(*mapping);
if (!mapping) {
ret = -ENOMEM;
goto dma_free;
@@ -917,7 +917,7 @@ rproc_mem_entry_init(struct device *dev,
struct rproc_mem_entry *mem;
va_list args;
- mem = kzalloc_obj(*mem, GFP_KERNEL);
+ mem = kzalloc_obj(*mem);
if (!mem)
return mem;
@@ -960,7 +960,7 @@ rproc_of_resm_mem_entry_init(struct device *dev, u32 of_resm_idx, size_t len,
struct rproc_mem_entry *mem;
va_list args;
- mem = kzalloc_obj(*mem, GFP_KERNEL);
+ mem = kzalloc_obj(*mem);
if (!mem)
return mem;
diff --git a/drivers/remoteproc/remoteproc_coredump.c b/drivers/remoteproc/remoteproc_coredump.c
index f925c8e775a5..ceff380228c7 100644
--- a/drivers/remoteproc/remoteproc_coredump.c
+++ b/drivers/remoteproc/remoteproc_coredump.c
@@ -49,7 +49,7 @@ int rproc_coredump_add_segment(struct rproc *rproc, dma_addr_t da, size_t size)
{
struct rproc_dump_segment *segment;
- segment = kzalloc_obj(*segment, GFP_KERNEL);
+ segment = kzalloc_obj(*segment);
if (!segment)
return -ENOMEM;
@@ -86,7 +86,7 @@ int rproc_coredump_add_custom_segment(struct rproc *rproc,
{
struct rproc_dump_segment *segment;
- segment = kzalloc_obj(*segment, GFP_KERNEL);
+ segment = kzalloc_obj(*segment);
if (!segment)
return -ENOMEM;
diff --git a/drivers/remoteproc/remoteproc_virtio.c b/drivers/remoteproc/remoteproc_virtio.c
index 92c7c0b0ad65..d5e9ff045a28 100644
--- a/drivers/remoteproc/remoteproc_virtio.c
+++ b/drivers/remoteproc/remoteproc_virtio.c
@@ -430,7 +430,7 @@ static int rproc_add_virtio_dev(struct rproc_vdev *rvdev, int id)
}
/* Allocate virtio device */
- vdev = kzalloc_obj(*vdev, GFP_KERNEL);
+ vdev = kzalloc_obj(*vdev);
if (!vdev) {
ret = -ENOMEM;
goto out;
diff --git a/drivers/remoteproc/stm32_rproc.c b/drivers/remoteproc/stm32_rproc.c
index 6185343a6d3f..632614013dc6 100644
--- a/drivers/remoteproc/stm32_rproc.c
+++ b/drivers/remoteproc/stm32_rproc.c
@@ -164,7 +164,7 @@ static int stm32_rproc_of_memory_translations(struct platform_device *pdev,
p_mems = devm_kcalloc(dev, cnt, sizeof(*p_mems), GFP_KERNEL);
if (!p_mems)
return -ENOMEM;
- mem_range = kzalloc_objs(*mem_range, cnt, GFP_KERNEL);
+ mem_range = kzalloc_objs(*mem_range, cnt);
if (!mem_range)
return -ENOMEM;
diff --git a/drivers/remoteproc/xlnx_r5_remoteproc.c b/drivers/remoteproc/xlnx_r5_remoteproc.c
index a8b13fb50992..b71ce69afe9f 100644
--- a/drivers/remoteproc/xlnx_r5_remoteproc.c
+++ b/drivers/remoteproc/xlnx_r5_remoteproc.c
@@ -265,7 +265,7 @@ static struct mbox_info *zynqmp_r5_setup_mbox(struct device *cdev)
struct mbox_client *mbox_cl;
struct mbox_info *ipi;
- ipi = kzalloc_obj(*ipi, GFP_KERNEL);
+ ipi = kzalloc_obj(*ipi);
if (!ipi)
return NULL;
@@ -1337,11 +1337,11 @@ static int zynqmp_r5_cluster_init(struct zynqmp_r5_cluster *cluster)
core_count = 1;
}
- child_devs = kzalloc_objs(struct device *, core_count, GFP_KERNEL);
+ child_devs = kzalloc_objs(struct device *, core_count);
if (!child_devs)
return -ENOMEM;
- r5_cores = kzalloc_objs(struct zynqmp_r5_core *, core_count, GFP_KERNEL);
+ r5_cores = kzalloc_objs(struct zynqmp_r5_core *, core_count);
if (!r5_cores) {
kfree(child_devs);
return -ENOMEM;
@@ -1502,7 +1502,7 @@ static int zynqmp_r5_remoteproc_probe(struct platform_device *pdev)
struct device *dev = &pdev->dev;
int ret;
- cluster = kzalloc_obj(*cluster, GFP_KERNEL);
+ cluster = kzalloc_obj(*cluster);
if (!cluster)
return -ENOMEM;
diff --git a/drivers/resctrl/mpam_devices.c b/drivers/resctrl/mpam_devices.c
index 323dba59fce8..ef4df1792ece 100644
--- a/drivers/resctrl/mpam_devices.c
+++ b/drivers/resctrl/mpam_devices.c
@@ -295,7 +295,7 @@ mpam_class_alloc(u8 level_idx, enum mpam_class_types type)
lockdep_assert_held(&mpam_list_lock);
- class = kzalloc_obj(*class, GFP_KERNEL);
+ class = kzalloc_obj(*class);
if (!class)
return ERR_PTR(-ENOMEM);
init_garbage(&class->garbage);
@@ -343,7 +343,7 @@ mpam_component_alloc(struct mpam_class *class, int id)
lockdep_assert_held(&mpam_list_lock);
- comp = kzalloc_obj(*comp, GFP_KERNEL);
+ comp = kzalloc_obj(*comp);
if (!comp)
return ERR_PTR(-ENOMEM);
init_garbage(&comp->garbage);
@@ -398,7 +398,7 @@ mpam_vmsc_alloc(struct mpam_component *comp, struct mpam_msc *msc)
lockdep_assert_held(&mpam_list_lock);
- vmsc = kzalloc_obj(*vmsc, GFP_KERNEL);
+ vmsc = kzalloc_obj(*vmsc);
if (!vmsc)
return ERR_PTR(-ENOMEM);
init_garbage(&vmsc->garbage);
@@ -2419,7 +2419,7 @@ static int __allocate_component_cfg(struct mpam_component *comp)
if (comp->cfg)
return 0;
- comp->cfg = kzalloc_objs(*comp->cfg, mpam_partid_max + 1, GFP_KERNEL);
+ comp->cfg = kzalloc_objs(*comp->cfg, mpam_partid_max + 1);
if (!comp->cfg)
return -ENOMEM;
diff --git a/drivers/reset/core.c b/drivers/reset/core.c
index c224e42e0f6c..ae7996f677bd 100644
--- a/drivers/reset/core.c
+++ b/drivers/reset/core.c
@@ -778,7 +778,7 @@ __reset_control_get_internal(struct reset_controller_dev *rcdev,
}
}
- rstc = kzalloc_obj(*rstc, GFP_KERNEL);
+ rstc = kzalloc_obj(*rstc);
if (!rstc)
return ERR_PTR(-ENOMEM);
@@ -836,7 +836,7 @@ static int reset_add_gpio_aux_device(struct device *parent,
struct auxiliary_device *adev;
int ret;
- adev = kzalloc_obj(*adev, GFP_KERNEL);
+ adev = kzalloc_obj(*adev);
if (!adev)
return -ENOMEM;
@@ -931,7 +931,7 @@ static int __reset_add_reset_gpio_device(const struct of_phandle_args *args)
return id;
/* Not freed on success, because it is persisent subsystem data. */
- rgpio_dev = kzalloc_obj(*rgpio_dev, GFP_KERNEL);
+ rgpio_dev = kzalloc_obj(*rgpio_dev);
if (!rgpio_dev) {
ret = -ENOMEM;
goto err_ida_free;
diff --git a/drivers/reset/reset-npcm.c b/drivers/reset/reset-npcm.c
index c28cb4632883..4070a4b6663f 100644
--- a/drivers/reset/reset-npcm.c
+++ b/drivers/reset/reset-npcm.c
@@ -399,7 +399,7 @@ static struct auxiliary_device *npcm_clock_adev_alloc(struct npcm_rc_data *rst_d
struct auxiliary_device *adev;
int ret;
- rdev = kzalloc_obj(*rdev, GFP_KERNEL);
+ rdev = kzalloc_obj(*rdev);
if (!rdev)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/reset/reset-socfpga.c b/drivers/reset/reset-socfpga.c
index a18cc81e0efa..da208270b787 100644
--- a/drivers/reset/reset-socfpga.c
+++ b/drivers/reset/reset-socfpga.c
@@ -27,7 +27,7 @@ static int a10_reset_init(struct device_node *np)
int ret;
u32 reg_offset = 0x10;
- data = kzalloc_obj(*data, GFP_KERNEL);
+ data = kzalloc_obj(*data);
if (!data)
return -ENOMEM;
diff --git a/drivers/reset/reset-sunxi.c b/drivers/reset/reset-sunxi.c
index b88d1d001ec3..2544de6576e4 100644
--- a/drivers/reset/reset-sunxi.c
+++ b/drivers/reset/reset-sunxi.c
@@ -27,7 +27,7 @@ static int sunxi_reset_init(struct device_node *np)
resource_size_t size;
int ret;
- data = kzalloc_obj(*data, GFP_KERNEL);
+ data = kzalloc_obj(*data);
if (!data)
return -ENOMEM;
diff --git a/drivers/rpmsg/mtk_rpmsg.c b/drivers/rpmsg/mtk_rpmsg.c
index bbeac30cbc8e..0e03c5336609 100644
--- a/drivers/rpmsg/mtk_rpmsg.c
+++ b/drivers/rpmsg/mtk_rpmsg.c
@@ -91,7 +91,7 @@ __mtk_create_ept(struct mtk_rpmsg_rproc_subdev *mtk_subdev,
struct platform_device *pdev = mtk_subdev->pdev;
int ret;
- mept = kzalloc_obj(*mept, GFP_KERNEL);
+ mept = kzalloc_obj(*mept);
if (!mept)
return NULL;
mept->mtk_subdev = mtk_subdev;
@@ -201,7 +201,7 @@ static int mtk_rpmsg_register_device(struct mtk_rpmsg_rproc_subdev *mtk_subdev,
struct mtk_rpmsg_device *mdev;
struct platform_device *pdev = mtk_subdev->pdev;
- mdev = kzalloc_obj(*mdev, GFP_KERNEL);
+ mdev = kzalloc_obj(*mdev);
if (!mdev)
return -ENOMEM;
@@ -252,7 +252,7 @@ static int mtk_rpmsg_create_device(struct mtk_rpmsg_rproc_subdev *mtk_subdev,
{
struct mtk_rpmsg_channel_info *info;
- info = kzalloc_obj(*info, GFP_KERNEL);
+ info = kzalloc_obj(*info);
if (!info)
return -ENOMEM;
@@ -380,7 +380,7 @@ mtk_rpmsg_create_rproc_subdev(struct platform_device *pdev,
{
struct mtk_rpmsg_rproc_subdev *mtk_subdev;
- mtk_subdev = kzalloc_obj(*mtk_subdev, GFP_KERNEL);
+ mtk_subdev = kzalloc_obj(*mtk_subdev);
if (!mtk_subdev)
return NULL;
diff --git a/drivers/rpmsg/qcom_glink_native.c b/drivers/rpmsg/qcom_glink_native.c
index dd775f955bfe..9ef17c2e45b0 100644
--- a/drivers/rpmsg/qcom_glink_native.c
+++ b/drivers/rpmsg/qcom_glink_native.c
@@ -227,7 +227,7 @@ static struct glink_channel *qcom_glink_alloc_channel(struct qcom_glink *glink,
{
struct glink_channel *channel;
- channel = kzalloc_obj(*channel, GFP_KERNEL);
+ channel = kzalloc_obj(*channel);
if (!channel)
return ERR_PTR(-ENOMEM);
@@ -754,7 +754,7 @@ qcom_glink_alloc_intent(struct qcom_glink *glink,
int ret;
unsigned long flags;
- intent = kzalloc_obj(*intent, GFP_KERNEL);
+ intent = kzalloc_obj(*intent);
if (!intent)
return NULL;
@@ -1669,7 +1669,7 @@ static int qcom_glink_rx_open(struct qcom_glink *glink, unsigned int rcid,
complete_all(&channel->open_req);
if (create_device) {
- rpdev = kzalloc_obj(*rpdev, GFP_KERNEL);
+ rpdev = kzalloc_obj(*rpdev);
if (!rpdev) {
ret = -ENOMEM;
goto rcid_remove;
@@ -1868,7 +1868,7 @@ static int qcom_glink_create_chrdev(struct qcom_glink *glink)
struct rpmsg_device *rpdev;
struct glink_channel *channel;
- rpdev = kzalloc_obj(*rpdev, GFP_KERNEL);
+ rpdev = kzalloc_obj(*rpdev);
if (!rpdev)
return -ENOMEM;
diff --git a/drivers/rpmsg/qcom_glink_smem.c b/drivers/rpmsg/qcom_glink_smem.c
index 26727cbb7ce4..62adc4db2317 100644
--- a/drivers/rpmsg/qcom_glink_smem.c
+++ b/drivers/rpmsg/qcom_glink_smem.c
@@ -230,7 +230,7 @@ struct qcom_glink_smem *qcom_glink_smem_register(struct device *parent,
size_t size;
int ret;
- smem = kzalloc_obj(*smem, GFP_KERNEL);
+ smem = kzalloc_obj(*smem);
if (!smem)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/rpmsg/qcom_smd.c b/drivers/rpmsg/qcom_smd.c
index 7faed3530888..e1eb450f4fea 100644
--- a/drivers/rpmsg/qcom_smd.c
+++ b/drivers/rpmsg/qcom_smd.c
@@ -922,7 +922,7 @@ static struct rpmsg_endpoint *qcom_smd_create_ept(struct rpmsg_device *rpdev,
return NULL;
}
- qsept = kzalloc_obj(*qsept, GFP_KERNEL);
+ qsept = kzalloc_obj(*qsept);
if (!qsept)
return NULL;
@@ -1077,7 +1077,7 @@ static int qcom_smd_create_device(struct qcom_smd_channel *channel)
dev_dbg(&edge->dev, "registering '%s'\n", channel->name);
- qsdev = kzalloc_obj(*qsdev, GFP_KERNEL);
+ qsdev = kzalloc_obj(*qsdev);
if (!qsdev)
return -ENOMEM;
@@ -1104,7 +1104,7 @@ static int qcom_smd_create_chrdev(struct qcom_smd_edge *edge)
{
struct qcom_smd_device *qsdev;
- qsdev = kzalloc_obj(*qsdev, GFP_KERNEL);
+ qsdev = kzalloc_obj(*qsdev);
if (!qsdev)
return -ENOMEM;
@@ -1132,7 +1132,7 @@ static struct qcom_smd_channel *qcom_smd_create_channel(struct qcom_smd_edge *ed
void *info;
int ret;
- channel = kzalloc_obj(*channel, GFP_KERNEL);
+ channel = kzalloc_obj(*channel);
if (!channel)
return ERR_PTR(-ENOMEM);
@@ -1484,7 +1484,7 @@ struct qcom_smd_edge *qcom_smd_register_edge(struct device *parent,
if (!qcom_smem_is_available())
return ERR_PTR(-EPROBE_DEFER);
- edge = kzalloc_obj(*edge, GFP_KERNEL);
+ edge = kzalloc_obj(*edge);
if (!edge)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/rpmsg/rpmsg_char.c b/drivers/rpmsg/rpmsg_char.c
index a368698113eb..ca9cf8858a5e 100644
--- a/drivers/rpmsg/rpmsg_char.c
+++ b/drivers/rpmsg/rpmsg_char.c
@@ -410,7 +410,7 @@ static struct rpmsg_eptdev *rpmsg_chrdev_eptdev_alloc(struct rpmsg_device *rpdev
struct rpmsg_eptdev *eptdev;
struct device *dev;
- eptdev = kzalloc_obj(*eptdev, GFP_KERNEL);
+ eptdev = kzalloc_obj(*eptdev);
if (!eptdev)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/rpmsg/rpmsg_ctrl.c b/drivers/rpmsg/rpmsg_ctrl.c
index 95f8be640dfc..5c19188d0294 100644
--- a/drivers/rpmsg/rpmsg_ctrl.c
+++ b/drivers/rpmsg/rpmsg_ctrl.c
@@ -141,7 +141,7 @@ static int rpmsg_ctrldev_probe(struct rpmsg_device *rpdev)
struct device *dev;
int ret;
- ctrldev = kzalloc_obj(*ctrldev, GFP_KERNEL);
+ ctrldev = kzalloc_obj(*ctrldev);
if (!ctrldev)
return -ENOMEM;
diff --git a/drivers/rpmsg/virtio_rpmsg_bus.c b/drivers/rpmsg/virtio_rpmsg_bus.c
index 20ba05917841..8d9e2b4dc7c1 100644
--- a/drivers/rpmsg/virtio_rpmsg_bus.c
+++ b/drivers/rpmsg/virtio_rpmsg_bus.c
@@ -210,7 +210,7 @@ static struct rpmsg_endpoint *__rpmsg_create_ept(struct virtproc_info *vrp,
struct rpmsg_endpoint *ept;
struct device *dev = rpdev ? &rpdev->dev : &vrp->vdev->dev;
- ept = kzalloc_obj(*ept, GFP_KERNEL);
+ ept = kzalloc_obj(*ept);
if (!ept)
return NULL;
@@ -400,7 +400,7 @@ static struct rpmsg_device *__rpmsg_create_channel(struct virtproc_info *vrp,
return NULL;
}
- vch = kzalloc_obj(*vch, GFP_KERNEL);
+ vch = kzalloc_obj(*vch);
if (!vch)
return NULL;
@@ -779,7 +779,7 @@ static struct rpmsg_device *rpmsg_virtio_add_ctrl_dev(struct virtio_device *vdev
struct rpmsg_device *rpdev_ctrl;
int err = 0;
- vch = kzalloc_obj(*vch, GFP_KERNEL);
+ vch = kzalloc_obj(*vch);
if (!vch)
return ERR_PTR(-ENOMEM);
@@ -825,7 +825,7 @@ static int rpmsg_probe(struct virtio_device *vdev)
size_t total_buf_space;
bool notify;
- vrp = kzalloc_obj(*vrp, GFP_KERNEL);
+ vrp = kzalloc_obj(*vrp);
if (!vrp)
return -ENOMEM;
@@ -898,7 +898,7 @@ static int rpmsg_probe(struct virtio_device *vdev)
/* if supported by the remote processor, enable the name service */
if (virtio_has_feature(vdev, VIRTIO_RPMSG_F_NS)) {
- vch = kzalloc_obj(*vch, GFP_KERNEL);
+ vch = kzalloc_obj(*vch);
if (!vch) {
err = -ENOMEM;
goto free_ctrldev;
diff --git a/drivers/rtc/class.c b/drivers/rtc/class.c
index eda2d5d46798..c39dc7d3b487 100644
--- a/drivers/rtc/class.c
+++ b/drivers/rtc/class.c
@@ -208,7 +208,7 @@ static struct rtc_device *rtc_allocate_device(void)
{
struct rtc_device *rtc;
- rtc = kzalloc_obj(*rtc, GFP_KERNEL);
+ rtc = kzalloc_obj(*rtc);
if (!rtc)
return NULL;
diff --git a/drivers/rtc/rtc-sun6i.c b/drivers/rtc/rtc-sun6i.c
index 2bc86e8a8a86..9065b437dd8a 100644
--- a/drivers/rtc/rtc-sun6i.c
+++ b/drivers/rtc/rtc-sun6i.c
@@ -233,7 +233,7 @@ static void __init sun6i_rtc_clk_init(struct device_node *node,
const char *parents[2];
u32 reg;
- rtc = kzalloc_obj(*rtc, GFP_KERNEL);
+ rtc = kzalloc_obj(*rtc);
if (!rtc)
return;
diff --git a/drivers/s390/block/dasd.c b/drivers/s390/block/dasd.c
index cc86a2b76a0a..3181c06d91ce 100644
--- a/drivers/s390/block/dasd.c
+++ b/drivers/s390/block/dasd.c
@@ -868,7 +868,7 @@ int dasd_profile_on(struct dasd_profile *profile)
{
struct dasd_profile_info *data;
- data = kzalloc_obj(*data, GFP_KERNEL);
+ data = kzalloc_obj(*data);
if (!data)
return -ENOMEM;
spin_lock_bh(&profile->lock);
@@ -3180,7 +3180,7 @@ enum blk_eh_timer_return dasd_times_out(struct request *req)
static int dasd_init_hctx(struct blk_mq_hw_ctx *hctx, void *data,
unsigned int idx)
{
- struct dasd_queue *dq = kzalloc_obj(*dq, GFP_KERNEL);
+ struct dasd_queue *dq = kzalloc_obj(*dq);
if (!dq)
return -ENOMEM;
diff --git a/drivers/s390/block/dasd_alias.c b/drivers/s390/block/dasd_alias.c
index f5f3b6da2d4b..8d6c16d35c22 100644
--- a/drivers/s390/block/dasd_alias.c
+++ b/drivers/s390/block/dasd_alias.c
@@ -98,7 +98,7 @@ static struct alias_server *_allocate_server(struct dasd_uid *uid)
{
struct alias_server *server;
- server = kzalloc_obj(*server, GFP_KERNEL);
+ server = kzalloc_obj(*server);
if (!server)
return ERR_PTR(-ENOMEM);
memcpy(server->uid.vendor, uid->vendor, sizeof(uid->vendor));
@@ -117,7 +117,7 @@ static struct alias_lcu *_allocate_lcu(struct dasd_uid *uid)
{
struct alias_lcu *lcu;
- lcu = kzalloc_obj(*lcu, GFP_KERNEL);
+ lcu = kzalloc_obj(*lcu);
if (!lcu)
return ERR_PTR(-ENOMEM);
lcu->uac = kzalloc_obj(*(lcu->uac), GFP_KERNEL | GFP_DMA);
diff --git a/drivers/s390/block/dasd_devmap.c b/drivers/s390/block/dasd_devmap.c
index d46274ef2f3e..381d616ad433 100644
--- a/drivers/s390/block/dasd_devmap.c
+++ b/drivers/s390/block/dasd_devmap.c
@@ -412,7 +412,7 @@ dasd_add_busid(const char *bus_id, int features)
struct dasd_devmap *devmap, *new, *tmp;
int hash;
- new = kzalloc_obj(struct dasd_devmap, GFP_KERNEL);
+ new = kzalloc_obj(struct dasd_devmap);
if (!new)
return ERR_PTR(-ENOMEM);
spin_lock(&dasd_devmap_lock);
@@ -605,7 +605,7 @@ static int dasd_devmap_get_pprc_status(struct dasd_device *device,
dev_warn(&device->cdev->dev, "Unable to query copy relation status\n");
return -EOPNOTSUPP;
}
- temp = kzalloc_obj(*temp, GFP_KERNEL);
+ temp = kzalloc_obj(*temp);
if (!temp)
return -ENOMEM;
@@ -2274,7 +2274,7 @@ static ssize_t dasd_copy_pair_store(struct device *dev,
} else if (sec_devmap->copy) {
copy = sec_devmap->copy;
} else {
- copy = kzalloc_obj(*copy, GFP_KERNEL);
+ copy = kzalloc_obj(*copy);
if (!copy)
return -ENOMEM;
}
diff --git a/drivers/s390/block/dasd_diag.c b/drivers/s390/block/dasd_diag.c
index ac15322a1d06..af68c2ee659d 100644
--- a/drivers/s390/block/dasd_diag.c
+++ b/drivers/s390/block/dasd_diag.c
@@ -325,7 +325,7 @@ dasd_diag_check_device(struct dasd_device *device)
int rc;
if (private == NULL) {
- private = kzalloc_obj(*private, GFP_KERNEL);
+ private = kzalloc_obj(*private);
if (private == NULL) {
DBF_DEV_EVENT(DBF_WARNING, device, "%s",
"Allocating memory for private DASD data "
@@ -395,7 +395,7 @@ dasd_diag_check_device(struct dasd_device *device)
rc = -ENOMEM;
goto out;
}
- bio = kzalloc_obj(*bio, GFP_KERNEL);
+ bio = kzalloc_obj(*bio);
if (bio == NULL) {
DBF_DEV_EVENT(DBF_WARNING, device, "%s",
"No memory to allocate initialization bio");
diff --git a/drivers/s390/block/dasd_eckd.c b/drivers/s390/block/dasd_eckd.c
index 47ffc255e9b4..cb068d5e2145 100644
--- a/drivers/s390/block/dasd_eckd.c
+++ b/drivers/s390/block/dasd_eckd.c
@@ -3729,7 +3729,7 @@ static int dasd_in_copy_relation(struct dasd_device *device)
if (!dasd_eckd_pprc_enabled(device))
return 0;
- temp = kzalloc_obj(*temp, GFP_KERNEL);
+ temp = kzalloc_obj(*temp);
if (!temp)
return -ENOMEM;
@@ -6721,7 +6721,7 @@ static void dasd_eckd_check_attention_work(struct work_struct *work)
data = container_of(work, struct check_attention_work_data, worker);
device = data->device;
- messages = kzalloc_obj(*messages, GFP_KERNEL);
+ messages = kzalloc_obj(*messages);
if (!messages) {
DBF_DEV_EVENT(DBF_WARNING, device, "%s",
"Could not allocate attention message buffer");
diff --git a/drivers/s390/block/dasd_eer.c b/drivers/s390/block/dasd_eer.c
index 648ab74ae60f..78d66e2711cd 100644
--- a/drivers/s390/block/dasd_eer.c
+++ b/drivers/s390/block/dasd_eer.c
@@ -544,7 +544,7 @@ static int dasd_eer_open(struct inode *inp, struct file *filp)
struct eerbuffer *eerb;
unsigned long flags;
- eerb = kzalloc_obj(struct eerbuffer, GFP_KERNEL);
+ eerb = kzalloc_obj(struct eerbuffer);
if (!eerb)
return -ENOMEM;
eerb->buffer_page_count = eer_pages;
@@ -689,7 +689,7 @@ int __init dasd_eer_init(void)
{
int rc;
- dasd_eer_dev = kzalloc_obj(*dasd_eer_dev, GFP_KERNEL);
+ dasd_eer_dev = kzalloc_obj(*dasd_eer_dev);
if (!dasd_eer_dev)
return -ENOMEM;
diff --git a/drivers/s390/block/dasd_ioctl.c b/drivers/s390/block/dasd_ioctl.c
index d5534ce25558..c85ee42732a3 100644
--- a/drivers/s390/block/dasd_ioctl.c
+++ b/drivers/s390/block/dasd_ioctl.c
@@ -442,7 +442,7 @@ static int dasd_ioctl_read_profile(struct dasd_block *block, void __user *argp)
struct dasd_profile_info_t *data;
int rc = 0;
- data = kmalloc_obj(*data, GFP_KERNEL);
+ data = kmalloc_obj(*data);
if (!data)
return -ENOMEM;
@@ -560,7 +560,7 @@ static int dasd_ioctl_information(struct dasd_block *block, void __user *argp,
struct dasd_information2_t *dasd_info;
int error;
- dasd_info = kzalloc_obj(*dasd_info, GFP_KERNEL);
+ dasd_info = kzalloc_obj(*dasd_info);
if (!dasd_info)
return -ENOMEM;
diff --git a/drivers/s390/block/dcssblk.c b/drivers/s390/block/dcssblk.c
index 5d7229f39480..e8407338697c 100644
--- a/drivers/s390/block/dcssblk.c
+++ b/drivers/s390/block/dcssblk.c
@@ -309,7 +309,7 @@ dcssblk_load_segment(char *name, struct segment_info **seg_info)
return -EEXIST;
/* get a struct segment_info */
- *seg_info = kzalloc_obj(struct segment_info, GFP_KERNEL);
+ *seg_info = kzalloc_obj(struct segment_info);
if (*seg_info == NULL)
return -ENOMEM;
diff --git a/drivers/s390/block/scm_blk.c b/drivers/s390/block/scm_blk.c
index 0781c7e9d913..2ffd47b6a997 100644
--- a/drivers/s390/block/scm_blk.c
+++ b/drivers/s390/block/scm_blk.c
@@ -331,7 +331,7 @@ static blk_status_t scm_blk_request(struct blk_mq_hw_ctx *hctx,
static int scm_blk_init_hctx(struct blk_mq_hw_ctx *hctx, void *data,
unsigned int idx)
{
- struct scm_queue *qd = kzalloc_obj(*qd, GFP_KERNEL);
+ struct scm_queue *qd = kzalloc_obj(*qd);
if (!qd)
return -ENOMEM;
diff --git a/drivers/s390/block/scm_drv.c b/drivers/s390/block/scm_drv.c
index 81b32b44b03c..095d06eeae7c 100644
--- a/drivers/s390/block/scm_drv.c
+++ b/drivers/s390/block/scm_drv.c
@@ -43,7 +43,7 @@ static int scm_probe(struct scm_device *scmdev)
if (scmdev->attrs.oper_state != OP_STATE_GOOD)
return -EINVAL;
- bdev = kzalloc_obj(*bdev, GFP_KERNEL);
+ bdev = kzalloc_obj(*bdev);
if (!bdev)
return -ENOMEM;
diff --git a/drivers/s390/char/con3270.c b/drivers/s390/char/con3270.c
index 1dcf0198d8a7..2fa8ac601778 100644
--- a/drivers/s390/char/con3270.c
+++ b/drivers/s390/char/con3270.c
@@ -829,7 +829,7 @@ static struct tty3270 *tty3270_alloc_view(void)
{
struct tty3270 *tp;
- tp = kzalloc_obj(*tp, GFP_KERNEL);
+ tp = kzalloc_obj(*tp);
if (!tp)
goto out_err;
@@ -895,7 +895,7 @@ static struct tty3270_line *tty3270_alloc_screen(struct tty3270 *tp, unsigned in
int allocated, lines;
allocated = __roundup_pow_of_two(rows) * TTY3270_SCREEN_PAGES;
- screen = kzalloc_objs(struct tty3270_line, allocated, GFP_KERNEL);
+ screen = kzalloc_objs(struct tty3270_line, allocated);
if (!screen)
goto out_err;
for (lines = 0; lines < allocated; lines++) {
diff --git a/drivers/s390/char/fs3270.c b/drivers/s390/char/fs3270.c
index c601134eee04..f8e2cc17ac53 100644
--- a/drivers/s390/char/fs3270.c
+++ b/drivers/s390/char/fs3270.c
@@ -367,7 +367,7 @@ static struct fs3270 *fs3270_alloc_view(void)
{
struct fs3270 *fp;
- fp = kzalloc_obj(*fp, GFP_KERNEL);
+ fp = kzalloc_obj(*fp);
if (!fp)
return ERR_PTR(-ENOMEM);
fp->init = raw3270_request_alloc(0);
diff --git a/drivers/s390/char/keyboard.c b/drivers/s390/char/keyboard.c
index 006c381e2417..ecd9ace2b3aa 100644
--- a/drivers/s390/char/keyboard.c
+++ b/drivers/s390/char/keyboard.c
@@ -78,7 +78,7 @@ kbd_alloc(void) {
struct kbd_data *kbd;
int i;
- kbd = kzalloc_obj(struct kbd_data, GFP_KERNEL);
+ kbd = kzalloc_obj(struct kbd_data);
if (!kbd)
goto out;
kbd->key_maps = kzalloc(sizeof(ebc_key_maps), GFP_KERNEL);
@@ -105,7 +105,7 @@ kbd_alloc(void) {
}
}
kbd->fn_handler =
- kzalloc_objs(fn_handler_fn *, NR_FN_HANDLER, GFP_KERNEL);
+ kzalloc_objs(fn_handler_fn *, NR_FN_HANDLER);
if (!kbd->fn_handler)
goto out_func;
kbd->accent_table = kmemdup(ebc_accent_table,
diff --git a/drivers/s390/char/monreader.c b/drivers/s390/char/monreader.c
index 9c1bcc4f35c5..52bc0c95bfbf 100644
--- a/drivers/s390/char/monreader.c
+++ b/drivers/s390/char/monreader.c
@@ -181,11 +181,11 @@ static struct mon_private *mon_alloc_mem(void)
int i;
struct mon_private *monpriv;
- monpriv = kzalloc_obj(struct mon_private, GFP_KERNEL);
+ monpriv = kzalloc_obj(struct mon_private);
if (!monpriv)
return NULL;
for (i = 0; i < MON_MSGLIM; i++) {
- monpriv->msg_array[i] = kzalloc_obj(struct mon_msg, GFP_KERNEL);
+ monpriv->msg_array[i] = kzalloc_obj(struct mon_msg);
if (!monpriv->msg_array[i]) {
mon_free_mem(monpriv);
return NULL;
diff --git a/drivers/s390/char/monwriter.c b/drivers/s390/char/monwriter.c
index d7ef93351a2e..eaeb4a6384d1 100644
--- a/drivers/s390/char/monwriter.c
+++ b/drivers/s390/char/monwriter.c
@@ -58,8 +58,8 @@ static int monwrite_diag(struct monwrite_hdr *myhdr, char *buffer, int fcn)
struct appldata_product_id *id;
int rc;
- id = kmalloc_obj(*id, GFP_KERNEL);
- parm_list = kmalloc_obj(*parm_list, GFP_KERNEL);
+ id = kmalloc_obj(*id);
+ parm_list = kmalloc_obj(*parm_list);
rc = -ENOMEM;
if (!id || !parm_list)
goto out;
@@ -126,7 +126,7 @@ static int monwrite_new_hdr(struct mon_private *monpriv)
} else if (monhdr->mon_function != MONWRITE_STOP_INTERVAL) {
if (mon_buf_count >= mon_max_bufs)
return -ENOSPC;
- monbuf = kzalloc_obj(struct mon_buf, GFP_KERNEL);
+ monbuf = kzalloc_obj(struct mon_buf);
if (!monbuf)
return -ENOMEM;
monbuf->data = kzalloc(monhdr->datalen,
@@ -188,7 +188,7 @@ static int monwrite_open(struct inode *inode, struct file *filp)
{
struct mon_private *monpriv;
- monpriv = kzalloc_obj(struct mon_private, GFP_KERNEL);
+ monpriv = kzalloc_obj(struct mon_private);
if (!monpriv)
return -ENOMEM;
INIT_LIST_HEAD(&monpriv->list);
diff --git a/drivers/s390/char/sclp_cmd.c b/drivers/s390/char/sclp_cmd.c
index c4a79cf6db86..1dc93d945be6 100644
--- a/drivers/s390/char/sclp_cmd.c
+++ b/drivers/s390/char/sclp_cmd.c
@@ -66,7 +66,7 @@ int sclp_sync_request_timeout(sclp_cmdw_t cmd, void *sccb, int timeout)
struct sclp_req *request;
int rc;
- request = kzalloc_obj(*request, GFP_KERNEL);
+ request = kzalloc_obj(*request);
if (!request)
return -ENOMEM;
if (timeout)
diff --git a/drivers/s390/char/sclp_cpi_sys.c b/drivers/s390/char/sclp_cpi_sys.c
index ea3ee83bac85..b80f73fa1e01 100644
--- a/drivers/s390/char/sclp_cpi_sys.c
+++ b/drivers/s390/char/sclp_cpi_sys.c
@@ -81,7 +81,7 @@ static struct sclp_req *cpi_prepare_req(void)
struct cpi_sccb *sccb;
struct cpi_evbuf *evb;
- req = kzalloc_obj(struct sclp_req, GFP_KERNEL);
+ req = kzalloc_obj(struct sclp_req);
if (!req)
return ERR_PTR(-ENOMEM);
sccb = (struct cpi_sccb *) get_zeroed_page(GFP_KERNEL | GFP_DMA);
diff --git a/drivers/s390/char/sclp_ftp.c b/drivers/s390/char/sclp_ftp.c
index f9c15f6f8078..853492d53953 100644
--- a/drivers/s390/char/sclp_ftp.c
+++ b/drivers/s390/char/sclp_ftp.c
@@ -92,7 +92,7 @@ static int sclp_ftp_et7(const struct hmcdrv_ftp_cmdspec *ftp)
ssize_t len;
int rc;
- req = kzalloc_obj(*req, GFP_KERNEL);
+ req = kzalloc_obj(*req);
sccb = (void *) get_zeroed_page(GFP_KERNEL | GFP_DMA);
if (!req || !sccb) {
rc = -ENOMEM;
diff --git a/drivers/s390/char/sclp_mem.c b/drivers/s390/char/sclp_mem.c
index 9417857ce401..78c054e26d17 100644
--- a/drivers/s390/char/sclp_mem.c
+++ b/drivers/s390/char/sclp_mem.c
@@ -431,7 +431,7 @@ static int __init sclp_init_mem(void)
max_sclp_mems = roundup(sclp.rnmax * sclp.rzm, block_size) / block_size;
/* Allocate memory for all blocks ahead of time. */
- sclp_mems = kzalloc_objs(struct sclp_mem, max_sclp_mems, GFP_KERNEL);
+ sclp_mems = kzalloc_objs(struct sclp_mem, max_sclp_mems);
if (!sclp_mems)
return -ENOMEM;
kset = kset_create_and_add("memory", NULL, firmware_kobj);
@@ -453,7 +453,7 @@ static void __init insert_increment(u16 rn, int standby, int assigned)
struct list_head *prev;
u16 last_rn;
- new_incr = kzalloc_obj(*new_incr, GFP_KERNEL);
+ new_incr = kzalloc_obj(*new_incr);
if (!new_incr)
return;
new_incr->rn = rn;
diff --git a/drivers/s390/char/sclp_sd.c b/drivers/s390/char/sclp_sd.c
index ee09803db422..c62b2eacdc13 100644
--- a/drivers/s390/char/sclp_sd.c
+++ b/drivers/s390/char/sclp_sd.c
@@ -518,7 +518,7 @@ static __init struct sclp_sd_file *sclp_sd_file_create(const char *name, u8 di)
struct sclp_sd_file *sd_file;
int rc;
- sd_file = kzalloc_obj(*sd_file, GFP_KERNEL);
+ sd_file = kzalloc_obj(*sd_file);
if (!sd_file)
return NULL;
sd_file->di = di;
diff --git a/drivers/s390/char/tape_class.c b/drivers/s390/char/tape_class.c
index b211324b801f..b69430220a81 100644
--- a/drivers/s390/char/tape_class.c
+++ b/drivers/s390/char/tape_class.c
@@ -45,7 +45,7 @@ struct tape_class_device *register_tape_dev(
int rc;
char * s;
- tcd = kzalloc_obj(struct tape_class_device, GFP_KERNEL);
+ tcd = kzalloc_obj(struct tape_class_device);
if (!tcd)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/s390/char/tape_core.c b/drivers/s390/char/tape_core.c
index f3270f22a1ef..bd8e3deb1199 100644
--- a/drivers/s390/char/tape_core.c
+++ b/drivers/s390/char/tape_core.c
@@ -477,7 +477,7 @@ tape_alloc_device(void)
{
struct tape_device *device;
- device = kzalloc_obj(struct tape_device, GFP_KERNEL);
+ device = kzalloc_obj(struct tape_device);
if (device == NULL) {
DBF_EXCEPTION(2, "ti:no mem\n");
return ERR_PTR(-ENOMEM);
@@ -678,7 +678,7 @@ tape_alloc_request(int cplength, int datasize)
DBF_LH(6, "tape_alloc_request(%d, %d)\n", cplength, datasize);
- request = kzalloc_obj(struct tape_request, GFP_KERNEL);
+ request = kzalloc_obj(struct tape_request);
if (request == NULL) {
DBF_EXCEPTION(1, "cqra nomem\n");
return ERR_PTR(-ENOMEM);
diff --git a/drivers/s390/char/uvdevice.c b/drivers/s390/char/uvdevice.c
index 83ed0a26e884..e6a264c996ce 100644
--- a/drivers/s390/char/uvdevice.c
+++ b/drivers/s390/char/uvdevice.c
@@ -196,7 +196,7 @@ static int uvio_attestation(struct uvio_ioctl_cb *uv_ioctl)
goto out;
ret = -ENOMEM;
- uvio_attest = kzalloc_obj(*uvio_attest, GFP_KERNEL);
+ uvio_attest = kzalloc_obj(*uvio_attest);
if (!uvio_attest)
goto out;
@@ -216,7 +216,7 @@ static int uvio_attestation(struct uvio_ioctl_cb *uv_ioctl)
goto out;
}
- uvcb_attest = kzalloc_obj(*uvcb_attest, GFP_KERNEL);
+ uvcb_attest = kzalloc_obj(*uvcb_attest);
if (!uvcb_attest)
goto out;
diff --git a/drivers/s390/char/vmcp.c b/drivers/s390/char/vmcp.c
index 4cf82f83c175..b277f9d0c321 100644
--- a/drivers/s390/char/vmcp.c
+++ b/drivers/s390/char/vmcp.c
@@ -104,7 +104,7 @@ static int vmcp_open(struct inode *inode, struct file *file)
if (!capable(CAP_SYS_ADMIN))
return -EPERM;
- session = kmalloc_obj(*session, GFP_KERNEL);
+ session = kmalloc_obj(*session);
if (!session)
return -ENOMEM;
diff --git a/drivers/s390/char/vmur.c b/drivers/s390/char/vmur.c
index f855774687b2..a47a40fac848 100644
--- a/drivers/s390/char/vmur.c
+++ b/drivers/s390/char/vmur.c
@@ -107,7 +107,7 @@ static struct urdev *urdev_alloc(struct ccw_device *cdev)
{
struct urdev *urd;
- urd = kzalloc_obj(struct urdev, GFP_KERNEL);
+ urd = kzalloc_obj(struct urdev);
if (!urd)
return NULL;
urd->reclen = cdev->id.driver_info;
@@ -396,7 +396,7 @@ static struct urfile *urfile_alloc(struct urdev *urd)
{
struct urfile *urf;
- urf = kzalloc_obj(struct urfile, GFP_KERNEL);
+ urf = kzalloc_obj(struct urfile);
if (!urf)
return NULL;
urf->urd = urd;
diff --git a/drivers/s390/cio/airq.c b/drivers/s390/cio/airq.c
index ecccd5f24a4e..061ee91e490e 100644
--- a/drivers/s390/cio/airq.c
+++ b/drivers/s390/cio/airq.c
@@ -130,7 +130,7 @@ struct airq_iv *airq_iv_create(unsigned long bits, unsigned long flags,
struct airq_iv *iv;
unsigned long size;
- iv = kzalloc_obj(*iv, GFP_KERNEL);
+ iv = kzalloc_obj(*iv);
if (!iv)
goto out;
iv->bits = bits;
diff --git a/drivers/s390/cio/chp.c b/drivers/s390/cio/chp.c
index de07d03f1ed4..c890f21a82ce 100644
--- a/drivers/s390/cio/chp.c
+++ b/drivers/s390/cio/chp.c
@@ -530,7 +530,7 @@ int chp_new(struct chp_id chpid)
if (chp_is_registered(chpid))
goto out;
- chp = kzalloc_obj(struct channel_path, GFP_KERNEL);
+ chp = kzalloc_obj(struct channel_path);
if (!chp) {
ret = -ENOMEM;
goto out;
@@ -593,7 +593,7 @@ struct channel_path_desc_fmt0 *chp_get_chp_desc(struct chp_id chpid)
chp = chpid_to_chp(chpid);
if (!chp)
return NULL;
- desc = kmalloc_obj(*desc, GFP_KERNEL);
+ desc = kmalloc_obj(*desc);
if (!desc)
return NULL;
diff --git a/drivers/s390/cio/chsc_sch.c b/drivers/s390/cio/chsc_sch.c
index fcbb2906117f..73413417a2ce 100644
--- a/drivers/s390/cio/chsc_sch.c
+++ b/drivers/s390/cio/chsc_sch.c
@@ -81,7 +81,7 @@ static int chsc_subchannel_probe(struct subchannel *sch)
CHSC_MSG(6, "Detected chsc subchannel 0.%x.%04x\n",
sch->schid.ssid, sch->schid.sch_no);
sch->isc = CHSC_SCH_ISC;
- private = kzalloc_obj(*private, GFP_KERNEL);
+ private = kzalloc_obj(*private);
if (!private)
return -ENOMEM;
dev_set_drvdata(&sch->dev, private);
@@ -295,7 +295,7 @@ static int chsc_ioctl_start(void __user *user_area)
chsc_area = (void *)get_zeroed_page(GFP_KERNEL);
if (!chsc_area)
return -ENOMEM;
- request = kzalloc_obj(*request, GFP_KERNEL);
+ request = kzalloc_obj(*request);
if (!request) {
ret = -ENOMEM;
goto out_free;
@@ -335,7 +335,7 @@ static int chsc_ioctl_on_close_set(void __user *user_area)
ret = -EBUSY;
goto out_unlock;
}
- on_close_request = kzalloc_obj(*on_close_request, GFP_KERNEL);
+ on_close_request = kzalloc_obj(*on_close_request);
if (!on_close_request) {
ret = -ENOMEM;
goto out_unlock;
@@ -441,7 +441,7 @@ static int chsc_ioctl_info_channel_path(void __user *user_cd)
scpcd_area = (void *)get_zeroed_page(GFP_KERNEL);
if (!scpcd_area)
return -ENOMEM;
- cd = kzalloc_obj(*cd, GFP_KERNEL);
+ cd = kzalloc_obj(*cd);
if (!cd) {
ret = -ENOMEM;
goto out_free;
@@ -503,7 +503,7 @@ static int chsc_ioctl_info_cu(void __user *user_cd)
scucd_area = (void *)get_zeroed_page(GFP_KERNEL);
if (!scucd_area)
return -ENOMEM;
- cd = kzalloc_obj(*cd, GFP_KERNEL);
+ cd = kzalloc_obj(*cd);
if (!cd) {
ret = -ENOMEM;
goto out_free;
@@ -566,7 +566,7 @@ static int chsc_ioctl_info_sch_cu(void __user *user_cud)
sscud_area = (void *)get_zeroed_page(GFP_KERNEL);
if (!sscud_area)
return -ENOMEM;
- cud = kzalloc_obj(*cud, GFP_KERNEL);
+ cud = kzalloc_obj(*cud);
if (!cud) {
ret = -ENOMEM;
goto out_free;
@@ -628,7 +628,7 @@ static int chsc_ioctl_conf_info(void __user *user_ci)
sci_area = (void *)get_zeroed_page(GFP_KERNEL);
if (!sci_area)
return -ENOMEM;
- ci = kzalloc_obj(*ci, GFP_KERNEL);
+ ci = kzalloc_obj(*ci);
if (!ci) {
ret = -ENOMEM;
goto out_free;
@@ -699,7 +699,7 @@ static int chsc_ioctl_conf_comp_list(void __user *user_ccl)
sccl_area = (void *)get_zeroed_page(GFP_KERNEL);
if (!sccl_area)
return -ENOMEM;
- ccl = kzalloc_obj(*ccl, GFP_KERNEL);
+ ccl = kzalloc_obj(*ccl);
if (!ccl) {
ret = -ENOMEM;
goto out_free;
@@ -755,7 +755,7 @@ static int chsc_ioctl_chpd(void __user *user_chpd)
struct chsc_cpd_info *chpd;
int ret;
- chpd = kzalloc_obj(*chpd, GFP_KERNEL);
+ chpd = kzalloc_obj(*chpd);
scpd_area = (void *)get_zeroed_page(GFP_KERNEL);
if (!scpd_area || !chpd) {
ret = -ENOMEM;
@@ -799,7 +799,7 @@ static int chsc_ioctl_dcal(void __user *user_dcal)
sdcal_area = (void *)get_zeroed_page(GFP_KERNEL);
if (!sdcal_area)
return -ENOMEM;
- dcal = kzalloc_obj(*dcal, GFP_KERNEL);
+ dcal = kzalloc_obj(*dcal);
if (!dcal) {
ret = -ENOMEM;
goto out_free;
diff --git a/drivers/s390/cio/cmf.c b/drivers/s390/cio/cmf.c
index cbc0efe0d870..92ab3d546fe4 100644
--- a/drivers/s390/cio/cmf.c
+++ b/drivers/s390/cio/cmf.c
@@ -483,11 +483,11 @@ static int alloc_cmb(struct ccw_device *cdev)
struct cmb_data *cmb_data;
/* Allocate private cmb_data. */
- cmb_data = kzalloc_obj(struct cmb_data, GFP_KERNEL);
+ cmb_data = kzalloc_obj(struct cmb_data);
if (!cmb_data)
return -ENOMEM;
- cmb_data->last_block = kzalloc_obj(struct cmb, GFP_KERNEL);
+ cmb_data->last_block = kzalloc_obj(struct cmb);
if (!cmb_data->last_block) {
kfree(cmb_data);
return -ENOMEM;
@@ -766,11 +766,11 @@ static int alloc_cmbe(struct ccw_device *cdev)
if (!cmbe)
return ret;
- cmb_data = kzalloc_obj(*cmb_data, GFP_KERNEL);
+ cmb_data = kzalloc_obj(*cmb_data);
if (!cmb_data)
goto out_free;
- cmb_data->last_block = kzalloc_obj(struct cmbe, GFP_KERNEL);
+ cmb_data->last_block = kzalloc_obj(struct cmbe);
if (!cmb_data->last_block)
goto out_free;
diff --git a/drivers/s390/cio/css.c b/drivers/s390/cio/css.c
index b6f943d6e30c..174a8fa911f0 100644
--- a/drivers/s390/cio/css.c
+++ b/drivers/s390/cio/css.c
@@ -971,7 +971,7 @@ static int __init setup_css(int nr)
struct channel_subsystem *css;
int ret;
- css = kzalloc_obj(*css, GFP_KERNEL);
+ css = kzalloc_obj(*css);
if (!css)
return -ENOMEM;
diff --git a/drivers/s390/cio/device.c b/drivers/s390/cio/device.c
index 4e6efdcf5617..5bbb112b1619 100644
--- a/drivers/s390/cio/device.c
+++ b/drivers/s390/cio/device.c
@@ -686,7 +686,7 @@ static struct ccw_device * io_subchannel_allocate_dev(struct subchannel *sch)
struct gen_pool *dma_pool;
int ret;
- cdev = kzalloc_obj(*cdev, GFP_KERNEL);
+ cdev = kzalloc_obj(*cdev);
if (!cdev) {
ret = -ENOMEM;
goto err_cdev;
diff --git a/drivers/s390/cio/qdio_debug.c b/drivers/s390/cio/qdio_debug.c
index bbbf89a65445..b35195e7c68a 100644
--- a/drivers/s390/cio/qdio_debug.c
+++ b/drivers/s390/cio/qdio_debug.c
@@ -81,7 +81,7 @@ int qdio_allocate_dbf(struct qdio_irq *irq_ptr)
}
debug_set_level(irq_ptr->debug_area, DBF_WARN);
DBF_DEV_EVENT(DBF_ERR, irq_ptr, "dbf created");
- new_entry = kzalloc_obj(struct qdio_dbf_entry, GFP_KERNEL);
+ new_entry = kzalloc_obj(struct qdio_dbf_entry);
if (!new_entry) {
debug_unregister(irq_ptr->debug_area);
return -ENOMEM;
diff --git a/drivers/s390/cio/scm.c b/drivers/s390/cio/scm.c
index 22da5887e0ab..d13ed1011c03 100644
--- a/drivers/s390/cio/scm.c
+++ b/drivers/s390/cio/scm.c
@@ -207,7 +207,7 @@ static int scm_add(struct chsc_scm_info *scm_info, size_t num)
put_device(&scmdev->dev);
continue;
}
- scmdev = kzalloc_obj(*scmdev, GFP_KERNEL);
+ scmdev = kzalloc_obj(*scmdev);
if (!scmdev)
return -ENODEV;
scmdev_setup(scmdev, sale, scm_info->is, scm_info->mbc);
diff --git a/drivers/s390/cio/vfio_ccw_cp.c b/drivers/s390/cio/vfio_ccw_cp.c
index 62c9c005b542..7561aa7d3e01 100644
--- a/drivers/s390/cio/vfio_ccw_cp.c
+++ b/drivers/s390/cio/vfio_ccw_cp.c
@@ -65,11 +65,11 @@ static int page_array_alloc(struct page_array *pa, unsigned int len)
pa->pa_nr = len;
- pa->pa_iova = kzalloc_objs(*pa->pa_iova, len, GFP_KERNEL);
+ pa->pa_iova = kzalloc_objs(*pa->pa_iova, len);
if (!pa->pa_iova)
return -ENOMEM;
- pa->pa_page = kzalloc_objs(*pa->pa_page, len, GFP_KERNEL);
+ pa->pa_page = kzalloc_objs(*pa->pa_page, len);
if (!pa->pa_page) {
kfree(pa->pa_iova);
return -ENOMEM;
@@ -319,7 +319,7 @@ static struct ccwchain *ccwchain_alloc(struct channel_program *cp, int len)
{
struct ccwchain *chain;
- chain = kzalloc_obj(*chain, GFP_KERNEL);
+ chain = kzalloc_obj(*chain);
if (!chain)
return NULL;
@@ -327,7 +327,7 @@ static struct ccwchain *ccwchain_alloc(struct channel_program *cp, int len)
if (!chain->ch_ccw)
goto out_err;
- chain->ch_pa = kzalloc_objs(*chain->ch_pa, len, GFP_KERNEL);
+ chain->ch_pa = kzalloc_objs(*chain->ch_pa, len);
if (!chain->ch_pa)
goto out_err;
diff --git a/drivers/s390/cio/vfio_ccw_drv.c b/drivers/s390/cio/vfio_ccw_drv.c
index db0bed2db4eb..1a095085bc72 100644
--- a/drivers/s390/cio/vfio_ccw_drv.c
+++ b/drivers/s390/cio/vfio_ccw_drv.c
@@ -171,7 +171,7 @@ static int vfio_ccw_sch_probe(struct subchannel *sch)
return -ENODEV;
}
- parent = kzalloc_obj(*parent, GFP_KERNEL);
+ parent = kzalloc_obj(*parent);
if (!parent)
return -ENOMEM;
diff --git a/drivers/s390/crypto/ap_card.c b/drivers/s390/crypto/ap_card.c
index bf6ae6e099e9..e827fbeb76fb 100644
--- a/drivers/s390/crypto/ap_card.c
+++ b/drivers/s390/crypto/ap_card.c
@@ -233,7 +233,7 @@ struct ap_card *ap_card_create(int id, struct ap_tapq_hwinfo hwinfo,
{
struct ap_card *ac;
- ac = kzalloc_obj(*ac, GFP_KERNEL);
+ ac = kzalloc_obj(*ac);
if (!ac)
return NULL;
ac->ap_dev.device.release = ap_card_device_release;
diff --git a/drivers/s390/crypto/ap_queue.c b/drivers/s390/crypto/ap_queue.c
index cf349627a19c..3fe2e41c5c6b 100644
--- a/drivers/s390/crypto/ap_queue.c
+++ b/drivers/s390/crypto/ap_queue.c
@@ -1183,7 +1183,7 @@ struct ap_queue *ap_queue_create(ap_qid_t qid, struct ap_card *ac)
{
struct ap_queue *aq;
- aq = kzalloc_obj(*aq, GFP_KERNEL);
+ aq = kzalloc_obj(*aq);
if (!aq)
return NULL;
aq->card = ac;
diff --git a/drivers/s390/crypto/pkey_api.c b/drivers/s390/crypto/pkey_api.c
index 0f0938cd96d2..d6b595eb3370 100644
--- a/drivers/s390/crypto/pkey_api.c
+++ b/drivers/s390/crypto/pkey_api.c
@@ -223,7 +223,7 @@ static int pkey_ioctl_findcard(struct pkey_findcard __user *ufc)
return -EFAULT;
nr_apqns = MAXAPQNSINLIST;
- apqns = kmalloc_objs(struct pkey_apqn, nr_apqns, GFP_KERNEL);
+ apqns = kmalloc_objs(struct pkey_apqn, nr_apqns);
if (!apqns)
return -ENOMEM;
@@ -569,7 +569,7 @@ static int pkey_ioctl_apqns4k(struct pkey_apqns4key __user *uak)
return -EFAULT;
nr_apqns = kak.apqn_entries;
if (nr_apqns) {
- apqns = kmalloc_objs(struct pkey_apqn, nr_apqns, GFP_KERNEL);
+ apqns = kmalloc_objs(struct pkey_apqn, nr_apqns);
if (!apqns)
return -ENOMEM;
}
@@ -618,7 +618,7 @@ static int pkey_ioctl_apqns4kt(struct pkey_apqns4keytype __user *uat)
return -EFAULT;
nr_apqns = kat.apqn_entries;
if (nr_apqns) {
- apqns = kmalloc_objs(struct pkey_apqn, nr_apqns, GFP_KERNEL);
+ apqns = kmalloc_objs(struct pkey_apqn, nr_apqns);
if (!apqns)
return -ENOMEM;
}
diff --git a/drivers/s390/crypto/pkey_uv.c b/drivers/s390/crypto/pkey_uv.c
index a21594c64be6..17a914d111ac 100644
--- a/drivers/s390/crypto/pkey_uv.c
+++ b/drivers/s390/crypto/pkey_uv.c
@@ -291,7 +291,7 @@ static int __init pkey_uv_init(void)
if (!test_bit_inv(BIT_UVC_CMD_RETR_SECRET, uv_info.inst_calls_list))
return -ENODEV;
- uv_list = kmalloc_obj(*uv_list, GFP_KERNEL);
+ uv_list = kmalloc_obj(*uv_list);
if (!uv_list)
return -ENOMEM;
diff --git a/drivers/s390/crypto/vfio_ap_drv.c b/drivers/s390/crypto/vfio_ap_drv.c
index 5146a3db53fd..fd7394d81880 100644
--- a/drivers/s390/crypto/vfio_ap_drv.c
+++ b/drivers/s390/crypto/vfio_ap_drv.c
@@ -96,7 +96,7 @@ static int vfio_ap_matrix_dev_create(void)
if (ret)
goto bus_register_err;
- matrix_dev = kzalloc_obj(*matrix_dev, GFP_KERNEL);
+ matrix_dev = kzalloc_obj(*matrix_dev);
if (!matrix_dev) {
ret = -ENOMEM;
goto matrix_alloc_err;
diff --git a/drivers/s390/crypto/vfio_ap_ops.c b/drivers/s390/crypto/vfio_ap_ops.c
index b19068ffcdc8..44b3a1dcc1b3 100644
--- a/drivers/s390/crypto/vfio_ap_ops.c
+++ b/drivers/s390/crypto/vfio_ap_ops.c
@@ -2424,7 +2424,7 @@ int vfio_ap_mdev_probe_queue(struct ap_device *apdev)
if (ret)
return ret;
- q = kzalloc_obj(*q, GFP_KERNEL);
+ q = kzalloc_obj(*q);
if (!q) {
ret = -ENOMEM;
goto err_remove_group;
diff --git a/drivers/s390/crypto/zcrypt_api.c b/drivers/s390/crypto/zcrypt_api.c
index 75e1d69346ae..c1f3ee5eda5a 100644
--- a/drivers/s390/crypto/zcrypt_api.c
+++ b/drivers/s390/crypto/zcrypt_api.c
@@ -397,7 +397,7 @@ static int zcdn_create(const char *name)
}
/* alloc and prepare a new zcdn device */
- zcdndev = kzalloc_obj(*zcdndev, GFP_KERNEL);
+ zcdndev = kzalloc_obj(*zcdndev);
if (!zcdndev) {
rc = -ENOMEM;
goto unlockout;
@@ -1065,7 +1065,7 @@ static long _zcrypt_send_ep11_cprb(u32 xflags, struct ap_perms *perms,
rc = -ENOMEM;
if (target_num != 0) {
if (userspace) {
- targets = kzalloc_objs(*targets, target_num, GFP_KERNEL);
+ targets = kzalloc_objs(*targets, target_num);
if (!targets)
goto out;
if (copy_from_user(targets, xcrb->targets,
diff --git a/drivers/s390/crypto/zcrypt_card.c b/drivers/s390/crypto/zcrypt_card.c
index f905132ebad4..16f04e65046b 100644
--- a/drivers/s390/crypto/zcrypt_card.c
+++ b/drivers/s390/crypto/zcrypt_card.c
@@ -138,7 +138,7 @@ struct zcrypt_card *zcrypt_card_alloc(void)
{
struct zcrypt_card *zc;
- zc = kzalloc_obj(*zc, GFP_KERNEL);
+ zc = kzalloc_obj(*zc);
if (!zc)
return NULL;
INIT_LIST_HEAD(&zc->list);
diff --git a/drivers/s390/crypto/zcrypt_queue.c b/drivers/s390/crypto/zcrypt_queue.c
index 73a5987499c9..87457cde2c7c 100644
--- a/drivers/s390/crypto/zcrypt_queue.c
+++ b/drivers/s390/crypto/zcrypt_queue.c
@@ -115,7 +115,7 @@ struct zcrypt_queue *zcrypt_queue_alloc(size_t reply_buf_size)
{
struct zcrypt_queue *zq;
- zq = kzalloc_obj(*zq, GFP_KERNEL);
+ zq = kzalloc_obj(*zq);
if (!zq)
return NULL;
zq->reply.msg = kmalloc(reply_buf_size, GFP_KERNEL);
diff --git a/drivers/s390/net/ctcm_main.c b/drivers/s390/net/ctcm_main.c
index 22fbe94e5a7e..8b0d76a47d9f 100644
--- a/drivers/s390/net/ctcm_main.c
+++ b/drivers/s390/net/ctcm_main.c
@@ -1268,7 +1268,7 @@ static int ctcm_probe_device(struct ccwgroup_device *cgdev)
if (!get_device(&cgdev->dev))
return -ENODEV;
- priv = kzalloc_obj(struct ctcm_priv, GFP_KERNEL);
+ priv = kzalloc_obj(struct ctcm_priv);
if (!priv) {
CTCM_DBF_TEXT_(ERROR, CTC_DBF_ERROR,
"%s: memory allocation failure",
@@ -1307,7 +1307,7 @@ static int add_channel(struct ccw_device *cdev, enum ctcm_channel_types type,
"%s(%s), type %d, proto %d",
__func__, dev_name(&cdev->dev), type, priv->protocol);
- ch = kzalloc_obj(struct channel, GFP_KERNEL);
+ ch = kzalloc_obj(struct channel);
if (ch == NULL)
return -ENOMEM;
@@ -1408,7 +1408,7 @@ static int add_channel(struct ccw_device *cdev, enum ctcm_channel_types type,
fsm_newstate(ch->fsm, CTC_STATE_IDLE);
- ch->irb = kzalloc_obj(struct irb, GFP_KERNEL);
+ ch->irb = kzalloc_obj(struct irb);
if (ch->irb == NULL)
goto nomem_return;
diff --git a/drivers/s390/net/ctcm_mpc.c b/drivers/s390/net/ctcm_mpc.c
index 35662bd25c3c..aeb102537e7f 100644
--- a/drivers/s390/net/ctcm_mpc.c
+++ b/drivers/s390/net/ctcm_mpc.c
@@ -1259,7 +1259,7 @@ struct mpc_group *ctcmpc_init_mpc_group(struct ctcm_priv *priv)
CTCM_DBF_TEXT_(MPC_SETUP, CTC_DBF_INFO,
"Enter %s(%p)", CTCM_FUNTAIL, priv);
- grp = kzalloc_obj(struct mpc_group, GFP_KERNEL);
+ grp = kzalloc_obj(struct mpc_group);
if (grp == NULL)
return NULL;
diff --git a/drivers/s390/net/ism_drv.c b/drivers/s390/net/ism_drv.c
index c9808772d621..7d0479e4e095 100644
--- a/drivers/s390/net/ism_drv.c
+++ b/drivers/s390/net/ism_drv.c
@@ -598,7 +598,7 @@ static int ism_probe(struct pci_dev *pdev, const struct pci_device_id *id)
struct ism_dev *ism;
int ret;
- ism = kzalloc_obj(*ism, GFP_KERNEL);
+ ism = kzalloc_obj(*ism);
if (!ism)
return -ENOMEM;
diff --git a/drivers/s390/net/qeth_core_main.c b/drivers/s390/net/qeth_core_main.c
index 41041abd3d1b..cf5f760d0e02 100644
--- a/drivers/s390/net/qeth_core_main.c
+++ b/drivers/s390/net/qeth_core_main.c
@@ -225,7 +225,7 @@ static struct qeth_buffer_pool_entry *qeth_alloc_pool_entry(unsigned int pages)
struct qeth_buffer_pool_entry *entry;
unsigned int i;
- entry = kzalloc_obj(*entry, GFP_KERNEL);
+ entry = kzalloc_obj(*entry);
if (!entry)
return NULL;
@@ -324,7 +324,7 @@ static void qeth_free_qdio_queue(struct qeth_qdio_q *q)
static struct qeth_qdio_q *qeth_alloc_qdio_queue(void)
{
- struct qeth_qdio_q *q = kzalloc_obj(*q, GFP_KERNEL);
+ struct qeth_qdio_q *q = kzalloc_obj(*q);
int i;
if (!q)
@@ -930,7 +930,7 @@ static struct qeth_cmd_buffer *qeth_alloc_cmd(struct qeth_channel *channel,
if (length > QETH_BUFSIZE)
return NULL;
- iob = kzalloc_obj(*iob, GFP_KERNEL);
+ iob = kzalloc_obj(*iob);
if (!iob)
return NULL;
@@ -1626,7 +1626,7 @@ static struct qeth_card *qeth_alloc_card(struct ccwgroup_device *gdev)
struct qeth_card *card;
QETH_DBF_TEXT(SETUP, 2, "alloccrd");
- card = kzalloc_obj(*card, GFP_KERNEL);
+ card = kzalloc_obj(*card);
if (!card)
goto out;
QETH_DBF_HEX(SETUP, 2, &card, sizeof(void *));
@@ -2591,7 +2591,7 @@ static void qeth_free_output_queue(struct qeth_qdio_out_q *q)
static struct qeth_qdio_out_q *qeth_alloc_output_queue(void)
{
- struct qeth_qdio_out_q *q = kzalloc_obj(*q, GFP_KERNEL);
+ struct qeth_qdio_out_q *q = kzalloc_obj(*q);
unsigned int i;
if (!q)
@@ -6249,7 +6249,7 @@ static int qeth_add_dbf_entry(struct qeth_card *card, char *name)
}
if (debug_register_view(card->debug, &debug_hex_ascii_view))
goto err_dbg;
- new_entry = kzalloc_obj(struct qeth_dbf_entry, GFP_KERNEL);
+ new_entry = kzalloc_obj(struct qeth_dbf_entry);
if (!new_entry)
goto err_dbg;
strscpy(new_entry->dbf_name, name, sizeof(new_entry->dbf_name));
diff --git a/drivers/s390/net/qeth_l3_sys.c b/drivers/s390/net/qeth_l3_sys.c
index db0985fe35b3..aa2603122e2c 100644
--- a/drivers/s390/net/qeth_l3_sys.c
+++ b/drivers/s390/net/qeth_l3_sys.c
@@ -431,7 +431,7 @@ static ssize_t qeth_l3_dev_ipato_add_store(const char *buf, size_t count,
if (rc)
return rc;
- ipatoe = kzalloc_obj(struct qeth_ipato_entry, GFP_KERNEL);
+ ipatoe = kzalloc_obj(struct qeth_ipato_entry);
if (!ipatoe)
return -ENOMEM;
diff --git a/drivers/s390/net/smsgiucv.c b/drivers/s390/net/smsgiucv.c
index 645d7edcbf2d..852bb2d5eba2 100644
--- a/drivers/s390/net/smsgiucv.c
+++ b/drivers/s390/net/smsgiucv.c
@@ -92,7 +92,7 @@ int smsg_register_callback(const char *prefix,
{
struct smsg_callback *cb;
- cb = kmalloc_obj(struct smsg_callback, GFP_KERNEL);
+ cb = kmalloc_obj(struct smsg_callback);
if (!cb)
return -ENOMEM;
cb->prefix = prefix;
diff --git a/drivers/s390/scsi/zfcp_aux.c b/drivers/s390/scsi/zfcp_aux.c
index f8435ea9a967..8ff7db7921b5 100644
--- a/drivers/s390/scsi/zfcp_aux.c
+++ b/drivers/s390/scsi/zfcp_aux.c
@@ -344,7 +344,7 @@ struct zfcp_adapter *zfcp_adapter_enqueue(struct ccw_device *ccw_device)
if (!get_device(&ccw_device->dev))
return ERR_PTR(-ENODEV);
- adapter = kzalloc_obj(struct zfcp_adapter, GFP_KERNEL);
+ adapter = kzalloc_obj(struct zfcp_adapter);
if (!adapter) {
put_device(&ccw_device->dev);
return ERR_PTR(-ENOMEM);
@@ -518,7 +518,7 @@ struct zfcp_port *zfcp_port_enqueue(struct zfcp_adapter *adapter, u64 wwpn,
goto err_put;
}
- port = kzalloc_obj(struct zfcp_port, GFP_KERNEL);
+ port = kzalloc_obj(struct zfcp_port);
if (!port)
goto err_put;
diff --git a/drivers/s390/scsi/zfcp_dbf.c b/drivers/s390/scsi/zfcp_dbf.c
index 37938e6903ef..71f625926ae1 100644
--- a/drivers/s390/scsi/zfcp_dbf.c
+++ b/drivers/s390/scsi/zfcp_dbf.c
@@ -816,7 +816,7 @@ int zfcp_dbf_adapter_register(struct zfcp_adapter *adapter)
char name[DEBUG_MAX_NAME_LEN];
struct zfcp_dbf *dbf;
- dbf = kzalloc_obj(struct zfcp_dbf, GFP_KERNEL);
+ dbf = kzalloc_obj(struct zfcp_dbf);
if (!dbf)
return -ENOMEM;
diff --git a/drivers/s390/scsi/zfcp_diag.c b/drivers/s390/scsi/zfcp_diag.c
index e8c9077b4e96..7be5a1d56263 100644
--- a/drivers/s390/scsi/zfcp_diag.c
+++ b/drivers/s390/scsi/zfcp_diag.c
@@ -36,7 +36,7 @@ int zfcp_diag_adapter_setup(struct zfcp_adapter *const adapter)
struct zfcp_diag_adapter *diag;
struct zfcp_diag_header *hdr;
- diag = kzalloc_obj(*diag, GFP_KERNEL);
+ diag = kzalloc_obj(*diag);
if (diag == NULL)
return -ENOMEM;
diff --git a/drivers/s390/scsi/zfcp_fc.c b/drivers/s390/scsi/zfcp_fc.c
index c212ca0924f8..05d081297879 100644
--- a/drivers/s390/scsi/zfcp_fc.c
+++ b/drivers/s390/scsi/zfcp_fc.c
@@ -1116,7 +1116,7 @@ int zfcp_fc_gs_setup(struct zfcp_adapter *adapter)
{
struct zfcp_fc_wka_ports *wka_ports;
- wka_ports = kzalloc_obj(struct zfcp_fc_wka_ports, GFP_KERNEL);
+ wka_ports = kzalloc_obj(struct zfcp_fc_wka_ports);
if (!wka_ports)
return -ENOMEM;
diff --git a/drivers/s390/scsi/zfcp_qdio.c b/drivers/s390/scsi/zfcp_qdio.c
index 3febefc80ccf..ce1af72d9b61 100644
--- a/drivers/s390/scsi/zfcp_qdio.c
+++ b/drivers/s390/scsi/zfcp_qdio.c
@@ -549,7 +549,7 @@ int zfcp_qdio_setup(struct zfcp_adapter *adapter)
{
struct zfcp_qdio *qdio;
- qdio = kzalloc_obj(struct zfcp_qdio, GFP_KERNEL);
+ qdio = kzalloc_obj(struct zfcp_qdio);
if (!qdio)
return -ENOMEM;
diff --git a/drivers/s390/scsi/zfcp_reqlist.h b/drivers/s390/scsi/zfcp_reqlist.h
index 2037424f9981..a0fd4739ff4a 100644
--- a/drivers/s390/scsi/zfcp_reqlist.h
+++ b/drivers/s390/scsi/zfcp_reqlist.h
@@ -42,7 +42,7 @@ static inline struct zfcp_reqlist *zfcp_reqlist_alloc(void)
size_t i;
struct zfcp_reqlist *rl;
- rl = kzalloc_obj(struct zfcp_reqlist, GFP_KERNEL);
+ rl = kzalloc_obj(struct zfcp_reqlist);
if (!rl)
return NULL;
diff --git a/drivers/s390/scsi/zfcp_scsi.c b/drivers/s390/scsi/zfcp_scsi.c
index f78df15b384a..3590113c2b74 100644
--- a/drivers/s390/scsi/zfcp_scsi.c
+++ b/drivers/s390/scsi/zfcp_scsi.c
@@ -542,7 +542,7 @@ zfcp_scsi_init_fc_host_stats(struct zfcp_adapter *adapter)
struct fc_host_statistics *fc_stats;
if (!adapter->fc_stats) {
- fc_stats = kmalloc_obj(*fc_stats, GFP_KERNEL);
+ fc_stats = kmalloc_obj(*fc_stats);
if (!fc_stats)
return NULL;
adapter->fc_stats = fc_stats; /* freed in adapter_release */
@@ -622,7 +622,7 @@ zfcp_scsi_get_fc_host_stats(struct Scsi_Host *host)
if (!fc_stats)
return NULL;
- data = kzalloc_obj(*data, GFP_KERNEL);
+ data = kzalloc_obj(*data);
if (!data)
return NULL;
@@ -651,7 +651,7 @@ static void zfcp_scsi_reset_fc_host_stats(struct Scsi_Host *shost)
int ret;
adapter = (struct zfcp_adapter *)shost->hostdata[0];
- data = kzalloc_obj(*data, GFP_KERNEL);
+ data = kzalloc_obj(*data);
if (!data)
return;
diff --git a/drivers/s390/scsi/zfcp_sysfs.c b/drivers/s390/scsi/zfcp_sysfs.c
index 33ea87286c35..42423549e511 100644
--- a/drivers/s390/scsi/zfcp_sysfs.c
+++ b/drivers/s390/scsi/zfcp_sysfs.c
@@ -708,7 +708,7 @@ static ssize_t zfcp_sysfs_adapter_util_show(struct device *dev,
if (!(adapter->adapter_features & FSF_FEATURE_MEASUREMENT_DATA))
return -EOPNOTSUPP;
- qtcb_port = kzalloc_obj(struct fsf_qtcb_bottom_port, GFP_KERNEL);
+ qtcb_port = kzalloc_obj(struct fsf_qtcb_bottom_port);
if (!qtcb_port)
return -ENOMEM;
@@ -733,7 +733,7 @@ static int zfcp_sysfs_adapter_ex_config(struct device *dev,
if (!(adapter->adapter_features & FSF_FEATURE_MEASUREMENT_DATA))
return -EOPNOTSUPP;
- qtcb_config = kzalloc_obj(struct fsf_qtcb_bottom_config, GFP_KERNEL);
+ qtcb_config = kzalloc_obj(struct fsf_qtcb_bottom_config);
if (!qtcb_config)
return -ENOMEM;
diff --git a/drivers/s390/scsi/zfcp_unit.c b/drivers/s390/scsi/zfcp_unit.c
index 0f47643cd5d9..510cb248cf83 100644
--- a/drivers/s390/scsi/zfcp_unit.c
+++ b/drivers/s390/scsi/zfcp_unit.c
@@ -137,7 +137,7 @@ int zfcp_unit_add(struct zfcp_port *port, u64 fcp_lun)
goto out;
}
- unit = kzalloc_obj(struct zfcp_unit, GFP_KERNEL);
+ unit = kzalloc_obj(struct zfcp_unit);
if (!unit) {
retval = -ENOMEM;
goto out;
diff --git a/drivers/s390/virtio/virtio_ccw.c b/drivers/s390/virtio/virtio_ccw.c
index ae36a1f410a5..bab6cad3fd5c 100644
--- a/drivers/s390/virtio/virtio_ccw.c
+++ b/drivers/s390/virtio/virtio_ccw.c
@@ -277,7 +277,7 @@ static struct airq_info *new_airq_info(int index)
struct airq_info *info;
int rc;
- info = kzalloc_obj(*info, GFP_KERNEL);
+ info = kzalloc_obj(*info);
if (!info)
return NULL;
rwlock_init(&info->lock);
@@ -566,7 +566,7 @@ static struct virtqueue *virtio_ccw_setup_vq(struct virtio_device *vdev,
notify = virtio_ccw_kvm_notify;
/* Allocate queue. */
- info = kzalloc_obj(struct virtio_ccw_vq_info, GFP_KERNEL);
+ info = kzalloc_obj(struct virtio_ccw_vq_info);
if (!info) {
dev_warn(&vcdev->cdev->dev, "no info\n");
err = -ENOMEM;
@@ -1370,7 +1370,7 @@ static int virtio_ccw_online(struct ccw_device *cdev)
struct virtio_ccw_device *vcdev;
unsigned long flags;
- vcdev = kzalloc_obj(*vcdev, GFP_KERNEL);
+ vcdev = kzalloc_obj(*vcdev);
if (!vcdev) {
dev_warn(&cdev->dev, "Could not get memory for virtio\n");
ret = -ENOMEM;
diff --git a/drivers/sbus/char/bbc_envctrl.c b/drivers/sbus/char/bbc_envctrl.c
index 9f9cb764d8be..d3083a547aa5 100644
--- a/drivers/sbus/char/bbc_envctrl.c
+++ b/drivers/sbus/char/bbc_envctrl.c
@@ -448,7 +448,7 @@ static void attach_one_temp(struct bbc_i2c_bus *bp, struct platform_device *op,
{
struct bbc_cpu_temperature *tp;
- tp = kzalloc_obj(*tp, GFP_KERNEL);
+ tp = kzalloc_obj(*tp);
if (!tp)
return;
@@ -496,7 +496,7 @@ static void attach_one_fan(struct bbc_i2c_bus *bp, struct platform_device *op,
{
struct bbc_fan_control *fp;
- fp = kzalloc_obj(*fp, GFP_KERNEL);
+ fp = kzalloc_obj(*fp);
if (!fp)
return;
diff --git a/drivers/sbus/char/bbc_i2c.c b/drivers/sbus/char/bbc_i2c.c
index 3a4b36514485..1801ba56389c 100644
--- a/drivers/sbus/char/bbc_i2c.c
+++ b/drivers/sbus/char/bbc_i2c.c
@@ -92,7 +92,7 @@ struct bbc_i2c_client *bbc_i2c_attach(struct bbc_i2c_bus *bp, struct platform_de
struct bbc_i2c_client *client;
const u32 *reg;
- client = kzalloc_obj(*client, GFP_KERNEL);
+ client = kzalloc_obj(*client);
if (!client)
return NULL;
client->bp = bp;
@@ -298,7 +298,7 @@ static struct bbc_i2c_bus * attach_one_i2c(struct platform_device *op, int index
struct device_node *dp;
int entry;
- bp = kzalloc_obj(*bp, GFP_KERNEL);
+ bp = kzalloc_obj(*bp);
if (!bp)
return NULL;
diff --git a/drivers/sbus/char/openprom.c b/drivers/sbus/char/openprom.c
index 77de0d987d44..0b90a2450429 100644
--- a/drivers/sbus/char/openprom.c
+++ b/drivers/sbus/char/openprom.c
@@ -666,7 +666,7 @@ static int openprom_open(struct inode * inode, struct file * file)
{
DATA *data;
- data = kmalloc_obj(DATA, GFP_KERNEL);
+ data = kmalloc_obj(DATA);
if (!data)
return -ENOMEM;
diff --git a/drivers/sbus/char/oradax.c b/drivers/sbus/char/oradax.c
index ff31511a6c85..45df0b274491 100644
--- a/drivers/sbus/char/oradax.c
+++ b/drivers/sbus/char/oradax.c
@@ -643,11 +643,11 @@ static int dax_open(struct inode *inode, struct file *f)
struct dax_ctx *ctx = NULL;
int i;
- ctx = kzalloc_obj(*ctx, GFP_KERNEL);
+ ctx = kzalloc_obj(*ctx);
if (ctx == NULL)
goto done;
- ctx->ccb_buf = kzalloc_objs(struct dax_ccb, DAX_MAX_CCBS, GFP_KERNEL);
+ ctx->ccb_buf = kzalloc_objs(struct dax_ccb, DAX_MAX_CCBS);
if (ctx->ccb_buf == NULL)
goto done;
diff --git a/drivers/sbus/char/uctrl.c b/drivers/sbus/char/uctrl.c
index e9a28ab02ddb..85aaec5876a7 100644
--- a/drivers/sbus/char/uctrl.c
+++ b/drivers/sbus/char/uctrl.c
@@ -348,7 +348,7 @@ static int uctrl_probe(struct platform_device *op)
struct uctrl_driver *p;
int err = -ENOMEM;
- p = kzalloc_obj(*p, GFP_KERNEL);
+ p = kzalloc_obj(*p);
if (!p) {
printk(KERN_ERR "uctrl: Unable to allocate device struct.\n");
goto out;
diff --git a/drivers/scsi/3w-9xxx.c b/drivers/scsi/3w-9xxx.c
index 35bc55f8195d..9b93a2440af8 100644
--- a/drivers/scsi/3w-9xxx.c
+++ b/drivers/scsi/3w-9xxx.c
@@ -1184,7 +1184,7 @@ static int twa_initialize_device_extension(TW_Device_Extension *tw_dev)
}
/* Allocate event info space */
- tw_dev->event_queue[0] = kzalloc_objs(TW_Event, TW_Q_LENGTH, GFP_KERNEL);
+ tw_dev->event_queue[0] = kzalloc_objs(TW_Event, TW_Q_LENGTH);
if (!tw_dev->event_queue[0]) {
TW_PRINTK(tw_dev->host, TW_DRIVER, 0x18, "Event info memory allocation failed");
goto out;
diff --git a/drivers/scsi/3w-sas.c b/drivers/scsi/3w-sas.c
index cbc3af2694cb..52dc1aa639f7 100644
--- a/drivers/scsi/3w-sas.c
+++ b/drivers/scsi/3w-sas.c
@@ -1052,7 +1052,7 @@ static int twl_initialize_device_extension(TW_Device_Extension *tw_dev)
}
/* Allocate event info space */
- tw_dev->event_queue[0] = kzalloc_objs(TW_Event, TW_Q_LENGTH, GFP_KERNEL);
+ tw_dev->event_queue[0] = kzalloc_objs(TW_Event, TW_Q_LENGTH);
if (!tw_dev->event_queue[0]) {
TW_PRINTK(tw_dev->host, TW_DRIVER, 0xc, "Event info memory allocation failed");
goto out;
diff --git a/drivers/scsi/BusLogic.c b/drivers/scsi/BusLogic.c
index 1152a0151545..6545ef855bd1 100644
--- a/drivers/scsi/BusLogic.c
+++ b/drivers/scsi/BusLogic.c
@@ -2222,7 +2222,7 @@ static int __init blogic_init(void)
return -ENOMEM;
}
- adapter = kzalloc_obj(struct blogic_adapter, GFP_KERNEL);
+ adapter = kzalloc_obj(struct blogic_adapter);
if (adapter == NULL) {
kfree(blogic_probeinfo_list);
blogic_err("BusLogic: Unable to allocate Prototype Host Adapter\n", NULL);
diff --git a/drivers/scsi/a4000t.c b/drivers/scsi/a4000t.c
index cf7d1f867081..a02638b477de 100644
--- a/drivers/scsi/a4000t.c
+++ b/drivers/scsi/a4000t.c
@@ -47,7 +47,7 @@ static int __init amiga_a4000t_scsi_probe(struct platform_device *pdev)
"A4000T builtin SCSI"))
return -EBUSY;
- hostdata = kzalloc_obj(struct NCR_700_Host_Parameters, GFP_KERNEL);
+ hostdata = kzalloc_obj(struct NCR_700_Host_Parameters);
if (!hostdata) {
dev_err(&pdev->dev, "Failed to allocate host data\n");
goto out_release;
diff --git a/drivers/scsi/aacraid/aachba.c b/drivers/scsi/aacraid/aachba.c
index 6df882e264f6..2e8119ce4411 100644
--- a/drivers/scsi/aacraid/aachba.c
+++ b/drivers/scsi/aacraid/aachba.c
@@ -820,7 +820,7 @@ int aac_probe_container(struct aac_dev *dev, int cid)
{
struct aac_cmd_priv *cmd_priv;
struct scsi_cmnd *scsicmd = kzalloc(sizeof(*scsicmd) + sizeof(*cmd_priv), GFP_KERNEL);
- struct scsi_device *scsidev = kzalloc_obj(*scsidev, GFP_KERNEL);
+ struct scsi_device *scsidev = kzalloc_obj(*scsidev);
int status;
if (!scsicmd || !scsidev) {
diff --git a/drivers/scsi/aacraid/commctrl.c b/drivers/scsi/aacraid/commctrl.c
index f7dca5ab3f6d..bd82aeb679ae 100644
--- a/drivers/scsi/aacraid/commctrl.c
+++ b/drivers/scsi/aacraid/commctrl.c
@@ -169,7 +169,7 @@ static int open_getadapter_fib(struct aac_dev * dev, void __user *arg)
struct aac_fib_context * fibctx;
int status;
- fibctx = kmalloc_obj(struct aac_fib_context, GFP_KERNEL);
+ fibctx = kmalloc_obj(struct aac_fib_context);
if (fibctx == NULL) {
status = -ENOMEM;
} else {
diff --git a/drivers/scsi/aacraid/comminit.c b/drivers/scsi/aacraid/comminit.c
index e425dee827a3..9bd3f5b868bc 100644
--- a/drivers/scsi/aacraid/comminit.c
+++ b/drivers/scsi/aacraid/comminit.c
@@ -632,7 +632,7 @@ struct aac_dev *aac_init_adapter(struct aac_dev *dev)
* Ok now init the communication subsystem
*/
- dev->queues = kzalloc_obj(struct aac_queue_block, GFP_KERNEL);
+ dev->queues = kzalloc_obj(struct aac_queue_block);
if (dev->queues == NULL) {
printk(KERN_ERR "Error could not allocate comm region.\n");
return NULL;
diff --git a/drivers/scsi/aacraid/commsup.c b/drivers/scsi/aacraid/commsup.c
index 3502e5e47539..c4485629f792 100644
--- a/drivers/scsi/aacraid/commsup.c
+++ b/drivers/scsi/aacraid/commsup.c
@@ -1907,13 +1907,13 @@ static int fillup_pools(struct aac_dev *dev, struct hw_fib **hw_fib_pool,
hw_fib_p = hw_fib_pool;
fib_p = fib_pool;
while (hw_fib_p < &hw_fib_pool[num]) {
- *(hw_fib_p) = kmalloc_obj(struct hw_fib, GFP_KERNEL);
+ *(hw_fib_p) = kmalloc_obj(struct hw_fib);
if (!(*(hw_fib_p++))) {
--hw_fib_p;
break;
}
- *(fib_p) = kmalloc_obj(struct fib, GFP_KERNEL);
+ *(fib_p) = kmalloc_obj(struct fib);
if (!(*(fib_p++))) {
kfree(*(--hw_fib_p));
break;
@@ -2101,11 +2101,11 @@ static void aac_process_events(struct aac_dev *dev)
if (!num)
goto free_fib;
- hw_fib_pool = kmalloc_objs(struct hw_fib *, num, GFP_KERNEL);
+ hw_fib_pool = kmalloc_objs(struct hw_fib *, num);
if (!hw_fib_pool)
goto free_fib;
- fib_pool = kmalloc_objs(struct fib *, num, GFP_KERNEL);
+ fib_pool = kmalloc_objs(struct fib *, num);
if (!fib_pool)
goto free_hw_fib_pool;
diff --git a/drivers/scsi/advansys.c b/drivers/scsi/advansys.c
index f78448254f99..fcf059bf41e8 100644
--- a/drivers/scsi/advansys.c
+++ b/drivers/scsi/advansys.c
@@ -11314,7 +11314,7 @@ static int advansys_eisa_probe(struct device *dev)
struct eisa_scsi_data *data;
err = -ENOMEM;
- data = kzalloc_obj(*data, GFP_KERNEL);
+ data = kzalloc_obj(*data);
if (!data)
goto fail;
ioport = edev->base_addr + 0xc30;
diff --git a/drivers/scsi/aic94xx/aic94xx_init.c b/drivers/scsi/aic94xx/aic94xx_init.c
index 243f8d6166a5..4400a3661d90 100644
--- a/drivers/scsi/aic94xx/aic94xx_init.c
+++ b/drivers/scsi/aic94xx/aic94xx_init.c
@@ -642,9 +642,9 @@ static int asd_register_sas_ha(struct asd_ha_struct *asd_ha)
{
int i;
struct asd_sas_phy **sas_phys =
- kzalloc_objs(*sas_phys, ASD_MAX_PHYS, GFP_KERNEL);
+ kzalloc_objs(*sas_phys, ASD_MAX_PHYS);
struct asd_sas_port **sas_ports =
- kzalloc_objs(*sas_ports, ASD_MAX_PHYS, GFP_KERNEL);
+ kzalloc_objs(*sas_ports, ASD_MAX_PHYS);
if (!sas_phys || !sas_ports) {
kfree(sas_phys);
@@ -710,7 +710,7 @@ static int asd_pci_probe(struct pci_dev *dev, const struct pci_device_id *id)
asd_dev = &asd_pcidev_data[asd_id];
- asd_ha = kzalloc_obj(*asd_ha, GFP_KERNEL);
+ asd_ha = kzalloc_obj(*asd_ha);
if (!asd_ha) {
asd_printk("out of memory\n");
goto Err_put;
diff --git a/drivers/scsi/aic94xx/aic94xx_sds.c b/drivers/scsi/aic94xx/aic94xx_sds.c
index 89d1e385af69..57818393f9f0 100644
--- a/drivers/scsi/aic94xx/aic94xx_sds.c
+++ b/drivers/scsi/aic94xx/aic94xx_sds.c
@@ -207,7 +207,7 @@ static int asd_get_bios_chim(struct asd_ha_struct *asd_ha,
goto out;
}
err = -ENOMEM;
- bc_struct = kmalloc_obj(*bc_struct, GFP_KERNEL);
+ bc_struct = kmalloc_obj(*bc_struct);
if (!bc_struct) {
asd_printk("no memory for bios_chim struct\n");
goto out;
@@ -341,7 +341,7 @@ int asd_read_ocm(struct asd_ha_struct *asd_ha)
if (asd_hwi_check_ocm_access(asd_ha))
return -1;
- dir = kmalloc_obj(*dir, GFP_KERNEL);
+ dir = kmalloc_obj(*dir);
if (!dir) {
asd_printk("no memory for ocm dir\n");
return -ENOMEM;
@@ -1040,7 +1040,7 @@ int asd_read_flash(struct asd_ha_struct *asd_ha)
if (err)
return err;
- flash_dir = kmalloc_obj(*flash_dir, GFP_KERNEL);
+ flash_dir = kmalloc_obj(*flash_dir);
if (!flash_dir)
return -ENOMEM;
diff --git a/drivers/scsi/am53c974.c b/drivers/scsi/am53c974.c
index 734b5a9dcf5e..f972a3c90a2f 100644
--- a/drivers/scsi/am53c974.c
+++ b/drivers/scsi/am53c974.c
@@ -396,7 +396,7 @@ static int pci_esp_probe_one(struct pci_dev *pdev,
goto fail_disable_device;
}
- pep = kzalloc_obj(struct pci_esp_priv, GFP_KERNEL);
+ pep = kzalloc_obj(struct pci_esp_priv);
if (!pep) {
dev_printk(KERN_INFO, &pdev->dev,
"failed to allocate esp_priv\n");
diff --git a/drivers/scsi/arm/queue.c b/drivers/scsi/arm/queue.c
index 2849f59b6015..797cf4971f5d 100644
--- a/drivers/scsi/arm/queue.c
+++ b/drivers/scsi/arm/queue.c
@@ -71,7 +71,7 @@ int queue_initialise (Queue_t *queue)
* need to keep free lists or allocate this
* memory.
*/
- queue->alloc = q = kmalloc_objs(QE_t, nqueues, GFP_KERNEL);
+ queue->alloc = q = kmalloc_objs(QE_t, nqueues);
if (q) {
for (; nqueues; q++, nqueues--) {
SET_MAGIC(q, QUEUE_MAGIC_FREE);
diff --git a/drivers/scsi/be2iscsi/be_main.c b/drivers/scsi/be2iscsi/be_main.c
index 1242ae2694c1..6c264def9911 100644
--- a/drivers/scsi/be2iscsi/be_main.c
+++ b/drivers/scsi/be2iscsi/be_main.c
@@ -2484,7 +2484,7 @@ static int beiscsi_alloc_mem(struct beiscsi_hba *phba)
return -ENOMEM;
}
- phba->init_mem = kzalloc_objs(*mem_descr, SE_MEM_MAX, GFP_KERNEL);
+ phba->init_mem = kzalloc_objs(*mem_descr, SE_MEM_MAX);
if (!phba->init_mem) {
kfree(phwi_ctrlr->wrb_context);
kfree(phba->phwi_ctrlr);
@@ -2540,7 +2540,7 @@ static int beiscsi_alloc_mem(struct beiscsi_hba *phba)
} while (alloc_size);
mem_descr->num_elements = j;
mem_descr->size_in_bytes = phba->mem_req[i];
- mem_descr->mem_array = kmalloc_objs(*mem_arr, j, GFP_KERNEL);
+ mem_descr->mem_array = kmalloc_objs(*mem_arr, j);
if (!mem_descr->mem_array)
goto free_mem;
diff --git a/drivers/scsi/bfa/bfa_fcs_lport.c b/drivers/scsi/bfa/bfa_fcs_lport.c
index 9285e9922ea8..2df399c537c1 100644
--- a/drivers/scsi/bfa/bfa_fcs_lport.c
+++ b/drivers/scsi/bfa/bfa_fcs_lport.c
@@ -1863,7 +1863,7 @@ bfa_fcs_lport_fdmi_build_rhba_pyld(struct bfa_fcs_lport_fdmi_s *fdmi, u8 *pyld)
u8 *curr_ptr;
u16 templen, count;
- fcs_hba_attr = kzalloc_obj(*fcs_hba_attr, GFP_KERNEL);
+ fcs_hba_attr = kzalloc_obj(*fcs_hba_attr);
if (!fcs_hba_attr)
return -ENOMEM;
diff --git a/drivers/scsi/bfa/bfad.c b/drivers/scsi/bfa/bfad.c
index 629942abc5ca..448f736457f0 100644
--- a/drivers/scsi/bfa/bfad.c
+++ b/drivers/scsi/bfa/bfad.c
@@ -640,7 +640,7 @@ bfad_vport_create(struct bfad_s *bfad, u16 vf_id,
unsigned long flags;
struct completion fcomp;
- vport = kzalloc_obj(struct bfad_vport_s, GFP_KERNEL);
+ vport = kzalloc_obj(struct bfad_vport_s);
if (!vport) {
rc = BFA_STATUS_ENOMEM;
goto ext;
@@ -1271,13 +1271,13 @@ bfad_pci_probe(struct pci_dev *pdev, const struct pci_device_id *pid)
(PCI_FUNC(pdev->devfn) != 0))
return -ENODEV;
- bfad = kzalloc_obj(struct bfad_s, GFP_KERNEL);
+ bfad = kzalloc_obj(struct bfad_s);
if (!bfad) {
error = -ENOMEM;
goto out;
}
- bfad->trcmod = kzalloc_obj(struct bfa_trc_mod_s, GFP_KERNEL);
+ bfad->trcmod = kzalloc_obj(struct bfa_trc_mod_s);
if (!bfad->trcmod) {
printk(KERN_WARNING "Error alloc trace buffer!\n");
error = -ENOMEM;
diff --git a/drivers/scsi/bfa/bfad_attr.c b/drivers/scsi/bfa/bfad_attr.c
index 50f975d63c07..9751beff817d 100644
--- a/drivers/scsi/bfa/bfad_attr.c
+++ b/drivers/scsi/bfa/bfad_attr.c
@@ -264,7 +264,7 @@ bfad_im_get_stats(struct Scsi_Host *shost)
bfa_status_t rc;
unsigned long flags;
- fcstats = kzalloc_obj(union bfa_port_stats_u, GFP_KERNEL);
+ fcstats = kzalloc_obj(union bfa_port_stats_u);
if (fcstats == NULL)
return NULL;
diff --git a/drivers/scsi/bfa/bfad_bsg.c b/drivers/scsi/bfa/bfad_bsg.c
index 0a33657e67d5..292bc9aa43f1 100644
--- a/drivers/scsi/bfa/bfad_bsg.c
+++ b/drivers/scsi/bfa/bfad_bsg.c
@@ -3410,7 +3410,7 @@ bfad_im_bsg_els_ct_request(struct bsg_job *job)
goto out;
}
- drv_fcxp = kzalloc_obj(struct bfad_fcxp, GFP_KERNEL);
+ drv_fcxp = kzalloc_obj(struct bfad_fcxp);
if (drv_fcxp == NULL) {
kfree(bsg_fcpt);
rc = -ENOMEM;
diff --git a/drivers/scsi/bfa/bfad_debugfs.c b/drivers/scsi/bfa/bfad_debugfs.c
index 335f5f6a96fa..2f9bb8fa7fa7 100644
--- a/drivers/scsi/bfa/bfad_debugfs.c
+++ b/drivers/scsi/bfa/bfad_debugfs.c
@@ -46,7 +46,7 @@ bfad_debugfs_open_drvtrc(struct inode *inode, struct file *file)
struct bfad_s *bfad = port->bfad;
struct bfad_debug_info *debug;
- debug = kzalloc_obj(struct bfad_debug_info, GFP_KERNEL);
+ debug = kzalloc_obj(struct bfad_debug_info);
if (!debug)
return -ENOMEM;
@@ -67,7 +67,7 @@ bfad_debugfs_open_fwtrc(struct inode *inode, struct file *file)
unsigned long flags;
int rc;
- fw_debug = kzalloc_obj(struct bfad_debug_info, GFP_KERNEL);
+ fw_debug = kzalloc_obj(struct bfad_debug_info);
if (!fw_debug)
return -ENOMEM;
@@ -109,7 +109,7 @@ bfad_debugfs_open_fwsave(struct inode *inode, struct file *file)
unsigned long flags;
int rc;
- fw_debug = kzalloc_obj(struct bfad_debug_info, GFP_KERNEL);
+ fw_debug = kzalloc_obj(struct bfad_debug_info);
if (!fw_debug)
return -ENOMEM;
@@ -147,7 +147,7 @@ bfad_debugfs_open_reg(struct inode *inode, struct file *file)
{
struct bfad_debug_info *reg_debug;
- reg_debug = kzalloc_obj(struct bfad_debug_info, GFP_KERNEL);
+ reg_debug = kzalloc_obj(struct bfad_debug_info);
if (!reg_debug)
return -ENOMEM;
diff --git a/drivers/scsi/bfa/bfad_im.c b/drivers/scsi/bfa/bfad_im.c
index 1feb2a9517c7..97990b285e17 100644
--- a/drivers/scsi/bfa/bfad_im.c
+++ b/drivers/scsi/bfa/bfad_im.c
@@ -698,7 +698,7 @@ bfad_im_probe(struct bfad_s *bfad)
{
struct bfad_im_s *im;
- im = kzalloc_obj(struct bfad_im_s, GFP_KERNEL);
+ im = kzalloc_obj(struct bfad_im_s);
if (im == NULL)
return BFA_STATUS_ENOMEM;
@@ -994,7 +994,7 @@ bfad_im_supported_speeds(struct bfa_s *bfa)
struct bfa_ioc_attr_s *ioc_attr;
u32 supported_speed = 0;
- ioc_attr = kzalloc_obj(struct bfa_ioc_attr_s, GFP_KERNEL);
+ ioc_attr = kzalloc_obj(struct bfa_ioc_attr_s);
if (!ioc_attr)
return 0;
diff --git a/drivers/scsi/bnx2fc/bnx2fc_fcoe.c b/drivers/scsi/bnx2fc/bnx2fc_fcoe.c
index 84f7f7ef75b3..c2f2c383b1f4 100644
--- a/drivers/scsi/bnx2fc/bnx2fc_fcoe.c
+++ b/drivers/scsi/bnx2fc/bnx2fc_fcoe.c
@@ -1356,7 +1356,7 @@ static struct bnx2fc_hba *bnx2fc_hba_create(struct cnic_dev *cnic)
struct fcoe_capabilities *fcoe_cap;
int rc;
- hba = kzalloc_obj(*hba, GFP_KERNEL);
+ hba = kzalloc_obj(*hba);
if (!hba) {
printk(KERN_ERR PFX "Unable to allocate hba structure\n");
return NULL;
@@ -1492,7 +1492,7 @@ static struct fc_lport *bnx2fc_if_create(struct bnx2fc_interface *interface,
struct bnx2fc_hba *hba = interface->hba;
int rc = 0;
- blport = kzalloc_obj(struct bnx2fc_lport, GFP_KERNEL);
+ blport = kzalloc_obj(struct bnx2fc_lport);
if (!blport) {
BNX2FC_HBA_DBG(ctlr->lp, "Unable to alloc blport\n");
return NULL;
@@ -2200,7 +2200,7 @@ static int __bnx2fc_enable(struct fcoe_ctlr *ctlr)
if (!hba->cnic->get_fc_npiv_tbl)
goto done;
- npiv_tbl = kzalloc_obj(struct cnic_fc_npiv_tbl, GFP_KERNEL);
+ npiv_tbl = kzalloc_obj(struct cnic_fc_npiv_tbl);
if (!npiv_tbl)
goto done;
diff --git a/drivers/scsi/bnx2fc/bnx2fc_io.c b/drivers/scsi/bnx2fc/bnx2fc_io.c
index ba299196dee9..d8d6afed1575 100644
--- a/drivers/scsi/bnx2fc/bnx2fc_io.c
+++ b/drivers/scsi/bnx2fc/bnx2fc_io.c
@@ -241,7 +241,7 @@ struct bnx2fc_cmd_mgr *bnx2fc_cmd_mgr_alloc(struct bnx2fc_hba *hba)
}
cmgr->hba = hba;
- cmgr->free_list = kzalloc_objs(*cmgr->free_list, arr_sz, GFP_KERNEL);
+ cmgr->free_list = kzalloc_objs(*cmgr->free_list, arr_sz);
if (!cmgr->free_list) {
printk(KERN_ERR PFX "failed to alloc free_list\n");
goto mem_err;
@@ -271,7 +271,7 @@ struct bnx2fc_cmd_mgr *bnx2fc_cmd_mgr_alloc(struct bnx2fc_hba *hba)
xid = BNX2FC_MIN_XID;
num_pri_ios = num_ios - hba->elstm_xids;
for (i = 0; i < num_ios; i++) {
- io_req = kzalloc_obj(*io_req, GFP_KERNEL);
+ io_req = kzalloc_obj(*io_req);
if (!io_req) {
printk(KERN_ERR PFX "failed to alloc io_req\n");
diff --git a/drivers/scsi/bvme6000_scsi.c b/drivers/scsi/bvme6000_scsi.c
index f276f4f4eadf..23301edf100d 100644
--- a/drivers/scsi/bvme6000_scsi.c
+++ b/drivers/scsi/bvme6000_scsi.c
@@ -44,7 +44,7 @@ bvme6000_probe(struct platform_device *dev)
if (!MACH_IS_BVME6000)
goto out;
- hostdata = kzalloc_obj(struct NCR_700_Host_Parameters, GFP_KERNEL);
+ hostdata = kzalloc_obj(struct NCR_700_Host_Parameters);
if (!hostdata) {
printk(KERN_ERR "bvme6000-scsi: "
"Failed to allocate host data\n");
diff --git a/drivers/scsi/ch.c b/drivers/scsi/ch.c
index 3a6ab2d09ded..4010fdbf813c 100644
--- a/drivers/scsi/ch.c
+++ b/drivers/scsi/ch.c
@@ -364,7 +364,7 @@ ch_readconfig(scsi_changer *ch)
}
/* look up the devices of the data transfer elements */
- ch->dt = kzalloc_objs(*ch->dt, ch->counts[CHET_DT], GFP_KERNEL);
+ ch->dt = kzalloc_objs(*ch->dt, ch->counts[CHET_DT]);
if (!ch->dt) {
kfree(buffer);
@@ -903,7 +903,7 @@ static int ch_probe(struct scsi_device *sd)
if (sd->type != TYPE_MEDIUM_CHANGER)
return -ENODEV;
- ch = kzalloc_obj(*ch, GFP_KERNEL);
+ ch = kzalloc_obj(*ch);
if (NULL == ch)
return -ENOMEM;
diff --git a/drivers/scsi/csiostor/csio_hw.c b/drivers/scsi/csiostor/csio_hw.c
index 03299d5e523a..df9f81f29950 100644
--- a/drivers/scsi/csiostor/csio_hw.c
+++ b/drivers/scsi/csiostor/csio_hw.c
@@ -2429,7 +2429,7 @@ csio_hw_flash_fw(struct csio_hw *hw, int *reset)
/* allocate memory to read the header of the firmware on the
* card
*/
- card_fw = kmalloc_obj(*card_fw, GFP_KERNEL);
+ card_fw = kmalloc_obj(*card_fw);
if (!card_fw)
return -ENOMEM;
@@ -4389,7 +4389,7 @@ csio_hw_init(struct csio_hw *hw)
INIT_LIST_HEAD(&hw->evt_free_q);
for (i = 0; i < csio_evtq_sz; i++) {
- evt_entry = kzalloc_obj(struct csio_evt_msg, GFP_KERNEL);
+ evt_entry = kzalloc_obj(struct csio_evt_msg);
if (!evt_entry) {
rv = -ENOMEM;
csio_err(hw, "Failed to initialize eventq");
diff --git a/drivers/scsi/csiostor/csio_init.c b/drivers/scsi/csiostor/csio_init.c
index 1d2fcccb46c2..238431524801 100644
--- a/drivers/scsi/csiostor/csio_init.c
+++ b/drivers/scsi/csiostor/csio_init.c
@@ -516,7 +516,7 @@ static struct csio_hw *csio_hw_alloc(struct pci_dev *pdev)
{
struct csio_hw *hw;
- hw = kzalloc_obj(struct csio_hw, GFP_KERNEL);
+ hw = kzalloc_obj(struct csio_hw);
if (!hw)
goto err;
diff --git a/drivers/scsi/csiostor/csio_lnode.c b/drivers/scsi/csiostor/csio_lnode.c
index cdd61b990c64..3e201f2c56da 100644
--- a/drivers/scsi/csiostor/csio_lnode.c
+++ b/drivers/scsi/csiostor/csio_lnode.c
@@ -1837,7 +1837,7 @@ csio_ln_fdmi_init(struct csio_lnode *ln)
struct csio_dma_buf *dma_buf;
/* Allocate MGMT request required for FDMI */
- ln->mgmt_req = kzalloc_obj(struct csio_ioreq, GFP_KERNEL);
+ ln->mgmt_req = kzalloc_obj(struct csio_ioreq);
if (!ln->mgmt_req) {
csio_ln_err(ln, "Failed to alloc ioreq for FDMI\n");
CSIO_INC_STATS(hw, n_err_nomem);
@@ -2002,7 +2002,7 @@ csio_ln_init(struct csio_lnode *ln)
/* This is the lnode used during initialization */
- ln->fcfinfo = kzalloc_obj(struct csio_fcf_info, GFP_KERNEL);
+ ln->fcfinfo = kzalloc_obj(struct csio_fcf_info);
if (!ln->fcfinfo) {
csio_ln_err(ln, "Failed to alloc FCF record\n");
CSIO_INC_STATS(hw, n_err_nomem);
diff --git a/drivers/scsi/csiostor/csio_scsi.c b/drivers/scsi/csiostor/csio_scsi.c
index 2c75c2663f73..b1de615cf316 100644
--- a/drivers/scsi/csiostor/csio_scsi.c
+++ b/drivers/scsi/csiostor/csio_scsi.c
@@ -2341,7 +2341,7 @@ csio_scsi_alloc_ddp_bufs(struct csio_scsim *scm, struct csio_hw *hw,
for (n = 0; n < num_buf; n++) {
/* Set unit size to request size */
unit_size = buf_size;
- ddp_desc = kzalloc_obj(struct csio_dma_buf, GFP_KERNEL);
+ ddp_desc = kzalloc_obj(struct csio_dma_buf);
if (!ddp_desc) {
csio_err(hw,
"Failed to allocate ddp descriptors,"
@@ -2435,7 +2435,7 @@ csio_scsim_init(struct csio_scsim *scm, struct csio_hw *hw)
INIT_LIST_HEAD(&scm->ioreq_freelist);
for (i = 0; i < csio_scsi_ioreqs; i++) {
- ioreq = kzalloc_obj(struct csio_ioreq, GFP_KERNEL);
+ ioreq = kzalloc_obj(struct csio_ioreq);
if (!ioreq) {
csio_err(hw,
"I/O request element allocation failed, "
diff --git a/drivers/scsi/csiostor/csio_wr.c b/drivers/scsi/csiostor/csio_wr.c
index 0310fa71ab07..4769e39a8b64 100644
--- a/drivers/scsi/csiostor/csio_wr.c
+++ b/drivers/scsi/csiostor/csio_wr.c
@@ -1650,12 +1650,12 @@ csio_wrm_init(struct csio_wrm *wrm, struct csio_hw *hw)
return -EINVAL;
}
- wrm->q_arr = kzalloc_objs(struct csio_q *, wrm->num_q, GFP_KERNEL);
+ wrm->q_arr = kzalloc_objs(struct csio_q *, wrm->num_q);
if (!wrm->q_arr)
goto err;
for (i = 0; i < wrm->num_q; i++) {
- wrm->q_arr[i] = kzalloc_obj(struct csio_q, GFP_KERNEL);
+ wrm->q_arr[i] = kzalloc_obj(struct csio_q);
if (!wrm->q_arr[i]) {
while (--i >= 0)
kfree(wrm->q_arr[i]);
diff --git a/drivers/scsi/device_handler/scsi_dh_alua.c b/drivers/scsi/device_handler/scsi_dh_alua.c
index 842476f131fd..efb08b9b145a 100644
--- a/drivers/scsi/device_handler/scsi_dh_alua.c
+++ b/drivers/scsi/device_handler/scsi_dh_alua.c
@@ -219,7 +219,7 @@ static struct alua_port_group *alua_alloc_pg(struct scsi_device *sdev,
{
struct alua_port_group *pg, *tmp_pg;
- pg = kzalloc_obj(struct alua_port_group, GFP_KERNEL);
+ pg = kzalloc_obj(struct alua_port_group);
if (!pg)
return ERR_PTR(-ENOMEM);
@@ -1137,7 +1137,7 @@ static int alua_activate(struct scsi_device *sdev,
struct alua_queue_data *qdata;
struct alua_port_group *pg;
- qdata = kzalloc_obj(*qdata, GFP_KERNEL);
+ qdata = kzalloc_obj(*qdata);
if (!qdata) {
err = SCSI_DH_RES_TEMP_UNAVAIL;
goto out;
@@ -1239,7 +1239,7 @@ static int alua_bus_attach(struct scsi_device *sdev)
struct alua_dh_data *h;
int err;
- h = kzalloc_obj(*h, GFP_KERNEL);
+ h = kzalloc_obj(*h);
if (!h)
return SCSI_DH_NOMEM;
spin_lock_init(&h->pg_lock);
diff --git a/drivers/scsi/device_handler/scsi_dh_emc.c b/drivers/scsi/device_handler/scsi_dh_emc.c
index 5a2f6f09de07..ff41b51ef462 100644
--- a/drivers/scsi/device_handler/scsi_dh_emc.c
+++ b/drivers/scsi/device_handler/scsi_dh_emc.c
@@ -478,7 +478,7 @@ static int clariion_bus_attach(struct scsi_device *sdev)
struct clariion_dh_data *h;
int err;
- h = kzalloc_obj(*h, GFP_KERNEL);
+ h = kzalloc_obj(*h);
if (!h)
return SCSI_DH_NOMEM;
h->lun_state = CLARIION_LUN_UNINITIALIZED;
diff --git a/drivers/scsi/device_handler/scsi_dh_hp_sw.c b/drivers/scsi/device_handler/scsi_dh_hp_sw.c
index 36d877afff4b..6e8849d7f0a3 100644
--- a/drivers/scsi/device_handler/scsi_dh_hp_sw.c
+++ b/drivers/scsi/device_handler/scsi_dh_hp_sw.c
@@ -226,7 +226,7 @@ static int hp_sw_bus_attach(struct scsi_device *sdev)
struct hp_sw_dh_data *h;
int ret;
- h = kzalloc_obj(*h, GFP_KERNEL);
+ h = kzalloc_obj(*h);
if (!h)
return SCSI_DH_NOMEM;
h->path_state = HP_SW_PATH_UNINITIALIZED;
diff --git a/drivers/scsi/device_handler/scsi_dh_rdac.c b/drivers/scsi/device_handler/scsi_dh_rdac.c
index 088dc509d505..88c8e36b221e 100644
--- a/drivers/scsi/device_handler/scsi_dh_rdac.c
+++ b/drivers/scsi/device_handler/scsi_dh_rdac.c
@@ -601,7 +601,7 @@ static int queue_mode_select(struct scsi_device *sdev,
struct rdac_queue_data *qdata;
struct rdac_controller *ctlr;
- qdata = kzalloc_obj(*qdata, GFP_KERNEL);
+ qdata = kzalloc_obj(*qdata);
if (!qdata)
return SCSI_DH_RETRY;
@@ -741,7 +741,7 @@ static int rdac_bus_attach(struct scsi_device *sdev)
char array_name[ARRAY_LABEL_LEN];
char array_id[UNIQUE_ID_LEN];
- h = kzalloc_obj(*h, GFP_KERNEL);
+ h = kzalloc_obj(*h);
if (!h)
return SCSI_DH_NOMEM;
h->lun = UNINITIALIZED_LUN;
diff --git a/drivers/scsi/elx/efct/efct_driver.c b/drivers/scsi/elx/efct/efct_driver.c
index 03c0dbee779f..07c2f453459e 100644
--- a/drivers/scsi/elx/efct/efct_driver.c
+++ b/drivers/scsi/elx/efct/efct_driver.c
@@ -93,7 +93,7 @@ efct_efclib_config(struct efct *efct, struct libefc_function_template *tt)
struct sli4 *sli;
int rc = 0;
- efc = kzalloc_obj(*efc, GFP_KERNEL);
+ efc = kzalloc_obj(*efc);
if (!efc)
return -ENOMEM;
diff --git a/drivers/scsi/elx/efct/efct_hw.c b/drivers/scsi/elx/efct/efct_hw.c
index aba82cb69459..fd9a980ef502 100644
--- a/drivers/scsi/elx/efct/efct_hw.c
+++ b/drivers/scsi/elx/efct/efct_hw.c
@@ -487,14 +487,14 @@ efct_hw_setup_io(struct efct_hw *hw)
struct efct *efct = hw->os;
if (!hw->io) {
- hw->io = kmalloc_objs(io, hw->config.n_io, GFP_KERNEL);
+ hw->io = kmalloc_objs(io, hw->config.n_io);
if (!hw->io)
return -ENOMEM;
memset(hw->io, 0, hw->config.n_io * sizeof(io));
for (i = 0; i < hw->config.n_io; i++) {
- hw->io[i] = kzalloc_obj(*io, GFP_KERNEL);
+ hw->io[i] = kzalloc_obj(*io);
if (!hw->io[i])
goto error;
}
@@ -611,7 +611,7 @@ efct_hw_init_prereg_io(struct efct_hw *hw)
struct efc_dma req;
struct efct *efct = hw->os;
- sgls = kmalloc_objs(*sgls, sgls_per_request, GFP_KERNEL);
+ sgls = kmalloc_objs(*sgls, sgls_per_request);
if (!sgls)
return -ENOMEM;
@@ -1182,7 +1182,7 @@ efct_hw_rx_buffer_alloc(struct efct_hw *hw, u32 rqindex, u32 count,
if (!count)
return NULL;
- rq_buf = kmalloc_objs(*rq_buf, count, GFP_KERNEL);
+ rq_buf = kmalloc_objs(*rq_buf, count);
if (!rq_buf)
return NULL;
memset(rq_buf, 0, sizeof(*rq_buf) * count);
@@ -2064,7 +2064,7 @@ efct_hw_reqtag_pool_alloc(struct efct_hw *hw)
struct reqtag_pool *reqtag_pool;
struct hw_wq_callback *wqcb;
- reqtag_pool = kzalloc_obj(*reqtag_pool, GFP_KERNEL);
+ reqtag_pool = kzalloc_obj(*reqtag_pool);
if (!reqtag_pool)
return NULL;
@@ -2072,7 +2072,7 @@ efct_hw_reqtag_pool_alloc(struct efct_hw *hw)
/* initialize reqtag pool lock */
spin_lock_init(&reqtag_pool->lock);
for (i = 0; i < U16_MAX; i++) {
- wqcb = kmalloc_obj(*wqcb, GFP_KERNEL);
+ wqcb = kmalloc_obj(*wqcb);
if (!wqcb)
break;
@@ -3239,7 +3239,7 @@ efct_hw_async_call(struct efct_hw *hw, efct_hw_async_cb_t callback, void *arg)
* we need this to be persistent as the mbox cmd submission may be
* queued and executed later execution.
*/
- ctx = kzalloc_obj(*ctx, GFP_KERNEL);
+ ctx = kzalloc_obj(*ctx);
if (!ctx)
return -ENOMEM;
@@ -3307,7 +3307,7 @@ efct_hw_firmware_write(struct efct_hw *hw, struct efc_dma *dma, u32 size,
struct efct_hw_fw_wr_cb_arg *cb_arg;
int noc = 0;
- cb_arg = kzalloc_obj(*cb_arg, GFP_KERNEL);
+ cb_arg = kzalloc_obj(*cb_arg);
if (!cb_arg)
return -ENOMEM;
diff --git a/drivers/scsi/elx/efct/efct_hw_queues.c b/drivers/scsi/elx/efct/efct_hw_queues.c
index 83d8f2c37569..3c27f927f96c 100644
--- a/drivers/scsi/elx/efct/efct_hw_queues.c
+++ b/drivers/scsi/elx/efct/efct_hw_queues.c
@@ -127,7 +127,7 @@ efct_hw_map_wq_cpu(struct efct_hw *hw)
struct hw_eq *
efct_hw_new_eq(struct efct_hw *hw, u32 entry_count)
{
- struct hw_eq *eq = kzalloc_obj(*eq, GFP_KERNEL);
+ struct hw_eq *eq = kzalloc_obj(*eq);
if (!eq)
return NULL;
@@ -159,7 +159,7 @@ struct hw_cq *
efct_hw_new_cq(struct hw_eq *eq, u32 entry_count)
{
struct efct_hw *hw = eq->hw;
- struct hw_cq *cq = kzalloc_obj(*cq, GFP_KERNEL);
+ struct hw_cq *cq = kzalloc_obj(*cq);
if (!cq)
return NULL;
@@ -204,7 +204,7 @@ efct_hw_new_cq_set(struct hw_eq *eqs[], struct hw_cq *cqs[],
cqs[i] = NULL;
for (i = 0; i < num_cqs; i++) {
- cq = kzalloc_obj(*cq, GFP_KERNEL);
+ cq = kzalloc_obj(*cq);
if (!cq)
goto error;
@@ -244,7 +244,7 @@ struct hw_mq *
efct_hw_new_mq(struct hw_cq *cq, u32 entry_count)
{
struct efct_hw *hw = cq->eq->hw;
- struct hw_mq *mq = kzalloc_obj(*mq, GFP_KERNEL);
+ struct hw_mq *mq = kzalloc_obj(*mq);
if (!mq)
return NULL;
@@ -275,7 +275,7 @@ struct hw_wq *
efct_hw_new_wq(struct hw_cq *cq, u32 entry_count)
{
struct efct_hw *hw = cq->eq->hw;
- struct hw_wq *wq = kzalloc_obj(*wq, GFP_KERNEL);
+ struct hw_wq *wq = kzalloc_obj(*wq);
if (!wq)
return NULL;
@@ -324,7 +324,7 @@ efct_hw_new_rq_set(struct hw_cq *cqs[], struct hw_rq *rqs[],
* encapsulates 2 SLI queues (for rq pair)
*/
for (i = 0, q_count = 0; i < num_rq_pairs; i++, q_count += 2) {
- rq = kzalloc_obj(*rq, GFP_KERNEL);
+ rq = kzalloc_obj(*rq);
if (!rq)
goto error;
diff --git a/drivers/scsi/elx/efct/efct_io.c b/drivers/scsi/elx/efct/efct_io.c
index dabbe996ab7c..91ab64ce9f97 100644
--- a/drivers/scsi/elx/efct/efct_io.c
+++ b/drivers/scsi/elx/efct/efct_io.c
@@ -25,7 +25,7 @@ efct_io_pool_create(struct efct *efct, u32 num_sgl)
struct efct_io *io;
/* Allocate the IO pool */
- io_pool = kzalloc_obj(*io_pool, GFP_KERNEL);
+ io_pool = kzalloc_obj(*io_pool);
if (!io_pool)
return NULL;
@@ -35,7 +35,7 @@ efct_io_pool_create(struct efct *efct, u32 num_sgl)
spin_lock_init(&io_pool->lock);
for (i = 0; i < EFCT_NUM_SCSI_IOS; i++) {
- io = kzalloc_obj(*io, GFP_KERNEL);
+ io = kzalloc_obj(*io);
if (!io)
break;
diff --git a/drivers/scsi/elx/efct/efct_lio.c b/drivers/scsi/elx/efct/efct_lio.c
index a6ad6b84fc7a..d6e35ee8fee0 100644
--- a/drivers/scsi/elx/efct/efct_lio.c
+++ b/drivers/scsi/elx/efct/efct_lio.c
@@ -744,7 +744,7 @@ efct_lio_make_nport(struct target_fabric_configfs *tf,
return ERR_PTR(-ENXIO);
}
- lio_nport = kzalloc_obj(*lio_nport, GFP_KERNEL);
+ lio_nport = kzalloc_obj(*lio_nport);
if (!lio_nport)
return ERR_PTR(-ENOMEM);
@@ -796,7 +796,7 @@ efct_lio_npiv_make_nport(struct target_fabric_configfs *tf,
return ERR_PTR(-ENXIO);
}
- lio_vport = kzalloc_obj(*lio_vport, GFP_KERNEL);
+ lio_vport = kzalloc_obj(*lio_vport);
if (!lio_vport)
return ERR_PTR(-ENOMEM);
@@ -808,7 +808,7 @@ efct_lio_npiv_make_nport(struct target_fabric_configfs *tf,
efct_format_wwn(lio_vport->wwpn_str, sizeof(lio_vport->wwpn_str),
"naa.", npiv_wwpn);
- vport_list = kzalloc_obj(*vport_list, GFP_KERNEL);
+ vport_list = kzalloc_obj(*vport_list);
if (!vport_list) {
kfree(lio_vport);
return ERR_PTR(-ENOMEM);
@@ -895,7 +895,7 @@ efct_lio_make_tpg(struct se_wwn *wwn, const char *name)
if (kstrtoul(name + 5, 10, &n) || n > USHRT_MAX)
return ERR_PTR(-EINVAL);
- tpg = kzalloc_obj(*tpg, GFP_KERNEL);
+ tpg = kzalloc_obj(*tpg);
if (!tpg)
return ERR_PTR(-ENOMEM);
@@ -958,7 +958,7 @@ efct_lio_npiv_make_tpg(struct se_wwn *wwn, const char *name)
return ERR_PTR(-EINVAL);
}
- tpg = kzalloc_obj(*tpg, GFP_KERNEL);
+ tpg = kzalloc_obj(*tpg);
if (!tpg)
return ERR_PTR(-ENOMEM);
@@ -1069,7 +1069,7 @@ static int efct_session_cb(struct se_portal_group *se_tpg,
struct efct_node *tgt_node;
struct efct *efct = node->efc->base;
- tgt_node = kzalloc_obj(*tgt_node, GFP_KERNEL);
+ tgt_node = kzalloc_obj(*tgt_node);
if (!tgt_node)
return -ENOMEM;
diff --git a/drivers/scsi/elx/efct/efct_xport.c b/drivers/scsi/elx/efct/efct_xport.c
index 66574b8c9f9e..9dcaef6fc188 100644
--- a/drivers/scsi/elx/efct/efct_xport.c
+++ b/drivers/scsi/elx/efct/efct_xport.c
@@ -28,7 +28,7 @@ efct_xport_alloc(struct efct *efct)
{
struct efct_xport *xport;
- xport = kzalloc_obj(*xport, GFP_KERNEL);
+ xport = kzalloc_obj(*xport);
if (!xport)
return xport;
diff --git a/drivers/scsi/esas2r/esas2r_init.c b/drivers/scsi/esas2r/esas2r_init.c
index fd72946ec41f..290d29bc9682 100644
--- a/drivers/scsi/esas2r/esas2r_init.c
+++ b/drivers/scsi/esas2r/esas2r_init.c
@@ -783,7 +783,7 @@ bool esas2r_init_adapter_struct(struct esas2r_adapter *a,
/* allocate requests for asynchronous events */
a->first_ae_req =
- kzalloc_objs(struct esas2r_request, num_ae_requests, GFP_KERNEL);
+ kzalloc_objs(struct esas2r_request, num_ae_requests);
if (a->first_ae_req == NULL) {
esas2r_log(ESAS2R_LOG_CRIT,
diff --git a/drivers/scsi/esas2r/esas2r_main.c b/drivers/scsi/esas2r/esas2r_main.c
index 454807522250..ada278c24c51 100644
--- a/drivers/scsi/esas2r/esas2r_main.c
+++ b/drivers/scsi/esas2r/esas2r_main.c
@@ -194,7 +194,7 @@ static ssize_t write_hw(struct file *file, struct kobject *kobj,
int length = min(sizeof(struct atto_ioctl), count);
if (!a->local_atto_ioctl) {
- a->local_atto_ioctl = kmalloc_obj(struct atto_ioctl, GFP_KERNEL);
+ a->local_atto_ioctl = kmalloc_obj(struct atto_ioctl);
if (a->local_atto_ioctl == NULL) {
esas2r_log(ESAS2R_LOG_WARN,
"write_hw kzalloc failed for %zu bytes",
diff --git a/drivers/scsi/esp_scsi.c b/drivers/scsi/esp_scsi.c
index af46112b4fb0..897a01d3e303 100644
--- a/drivers/scsi/esp_scsi.c
+++ b/drivers/scsi/esp_scsi.c
@@ -2447,7 +2447,7 @@ static int esp_sdev_init(struct scsi_device *dev)
struct esp_target_data *tp = &esp->target[dev->id];
struct esp_lun_data *lp;
- lp = kzalloc_obj(*lp, GFP_KERNEL);
+ lp = kzalloc_obj(*lp);
if (!lp)
return -ENOMEM;
dev->hostdata = lp;
diff --git a/drivers/scsi/fcoe/fcoe.c b/drivers/scsi/fcoe/fcoe.c
index bc0064da561c..534596c6d76c 100644
--- a/drivers/scsi/fcoe/fcoe.c
+++ b/drivers/scsi/fcoe/fcoe.c
@@ -820,7 +820,7 @@ static void fcoe_fdmi_info(struct fc_lport *lport, struct net_device *netdev)
if (realdev->netdev_ops->ndo_fcoe_get_hbainfo) {
struct netdev_fcoe_hbainfo *fdmi;
- fdmi = kzalloc_obj(*fdmi, GFP_KERNEL);
+ fdmi = kzalloc_obj(*fdmi);
if (!fdmi)
return;
diff --git a/drivers/scsi/fcoe/fcoe_ctlr.c b/drivers/scsi/fcoe/fcoe_ctlr.c
index a356cf072bf1..02cd4410efca 100644
--- a/drivers/scsi/fcoe/fcoe_ctlr.c
+++ b/drivers/scsi/fcoe/fcoe_ctlr.c
@@ -168,7 +168,7 @@ static int fcoe_sysfs_fcf_add(struct fcoe_fcf *new)
LIBFCOE_FIP_DBG(fip, "New FCF fab %16.16llx mac %pM\n",
new->fabric_name, new->fcf_mac);
- temp = kzalloc_obj(*temp, GFP_KERNEL);
+ temp = kzalloc_obj(*temp);
if (!temp)
goto out;
diff --git a/drivers/scsi/fcoe/fcoe_transport.c b/drivers/scsi/fcoe/fcoe_transport.c
index e1615cc5c092..88d85fc9a52a 100644
--- a/drivers/scsi/fcoe/fcoe_transport.c
+++ b/drivers/scsi/fcoe/fcoe_transport.c
@@ -638,7 +638,7 @@ static int fcoe_add_netdev_mapping(struct net_device *netdev,
{
struct fcoe_netdev_mapping *nm;
- nm = kmalloc_obj(*nm, GFP_KERNEL);
+ nm = kmalloc_obj(*nm);
if (!nm) {
printk(KERN_ERR "Unable to allocate netdev_mapping");
return -ENOMEM;
diff --git a/drivers/scsi/fnic/fdls_disc.c b/drivers/scsi/fnic/fdls_disc.c
index 69ffc492ec9d..455426564ca0 100644
--- a/drivers/scsi/fnic/fdls_disc.c
+++ b/drivers/scsi/fnic/fdls_disc.c
@@ -316,7 +316,7 @@ void fdls_schedule_oxid_free_retry_work(struct work_struct *work)
FNIC_FCS_DBG(KERN_INFO, fnic->host, fnic->fnic_num,
"Schedule oxid free. oxid idx: %d\n", idx);
- reclaim_entry = kzalloc_obj(*reclaim_entry, GFP_KERNEL);
+ reclaim_entry = kzalloc_obj(*reclaim_entry);
if (!reclaim_entry) {
schedule_delayed_work(&oxid_pool->schedule_oxid_free_retry,
msecs_to_jiffies(SCHEDULE_OXID_FREE_RETRY_TIME));
diff --git a/drivers/scsi/fnic/fip.c b/drivers/scsi/fnic/fip.c
index 5072c08e75ad..ccd0da7d490f 100644
--- a/drivers/scsi/fnic/fip.c
+++ b/drivers/scsi/fnic/fip.c
@@ -139,7 +139,7 @@ void fnic_fcoe_process_vlan_resp(struct fnic *fnic, struct fip_header *fiph)
FNIC_FIP_DBG(KERN_INFO, fnic->host,
fnic->fnic_num,
"process_vlan_resp: FIP VLAN %d\n", vid);
- vlan = kzalloc_obj(*vlan, GFP_KERNEL);
+ vlan = kzalloc_obj(*vlan);
if (!vlan) {
/* retry from timer */
diff --git a/drivers/scsi/fnic/fnic_debugfs.c b/drivers/scsi/fnic/fnic_debugfs.c
index ef5298685054..ba86964fb45e 100644
--- a/drivers/scsi/fnic/fnic_debugfs.c
+++ b/drivers/scsi/fnic/fnic_debugfs.c
@@ -200,7 +200,7 @@ static int fnic_trace_debugfs_open(struct inode *inode,
fnic_dbgfs_t *fnic_dbg_prt;
u8 *rdata_ptr;
rdata_ptr = (u8 *)inode->i_private;
- fnic_dbg_prt = kzalloc_obj(fnic_dbgfs_t, GFP_KERNEL);
+ fnic_dbg_prt = kzalloc_obj(fnic_dbgfs_t);
if (!fnic_dbg_prt)
return -ENOMEM;
@@ -436,7 +436,7 @@ static int fnic_reset_stats_open(struct inode *inode, struct file *file)
{
struct stats_debug_info *debug;
- debug = kzalloc_obj(struct stats_debug_info, GFP_KERNEL);
+ debug = kzalloc_obj(struct stats_debug_info);
if (!debug)
return -ENOMEM;
@@ -583,7 +583,7 @@ static int fnic_stats_debugfs_open(struct inode *inode,
struct stats_debug_info *debug;
int buf_size = 2 * PAGE_SIZE;
- debug = kzalloc_obj(struct stats_debug_info, GFP_KERNEL);
+ debug = kzalloc_obj(struct stats_debug_info);
if (!debug)
return -ENOMEM;
diff --git a/drivers/scsi/fnic/fnic_main.c b/drivers/scsi/fnic/fnic_main.c
index 8a8c008ea2c7..8b551b79e087 100644
--- a/drivers/scsi/fnic/fnic_main.c
+++ b/drivers/scsi/fnic/fnic_main.c
@@ -715,7 +715,7 @@ static int fnic_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
/*
* Allocate fnic
*/
- fnic = kzalloc_obj(struct fnic, GFP_KERNEL);
+ fnic = kzalloc_obj(struct fnic);
if (!fnic) {
err = -ENOMEM;
goto err_out_fnic_alloc;
diff --git a/drivers/scsi/fnic/vnic_dev.c b/drivers/scsi/fnic/vnic_dev.c
index 590effeb21e6..991c86eb5aff 100644
--- a/drivers/scsi/fnic/vnic_dev.c
+++ b/drivers/scsi/fnic/vnic_dev.c
@@ -911,7 +911,7 @@ struct vnic_dev *vnic_dev_register(struct vnic_dev *vdev,
void *priv, struct pci_dev *pdev, struct vnic_dev_bar *bar)
{
if (!vdev) {
- vdev = kzalloc_obj(struct vnic_dev, GFP_KERNEL);
+ vdev = kzalloc_obj(struct vnic_dev);
if (!vdev)
return NULL;
}
diff --git a/drivers/scsi/hpsa.c b/drivers/scsi/hpsa.c
index ce20f8906ac7..adb3b7d8c6fb 100644
--- a/drivers/scsi/hpsa.c
+++ b/drivers/scsi/hpsa.c
@@ -1597,7 +1597,7 @@ static void hpsa_monitor_offline_device(struct ctlr_info *h,
spin_unlock_irqrestore(&h->offline_device_lock, flags);
/* Device is not on the list, add it. */
- device = kmalloc_obj(*device, GFP_KERNEL);
+ device = kmalloc_obj(*device);
if (!device)
return;
@@ -1936,8 +1936,8 @@ static void adjust_hpsa_scsi_table(struct ctlr_info *h,
}
spin_unlock_irqrestore(&h->reset_lock, flags);
- added = kzalloc_objs(*added, HPSA_MAX_DEVICES, GFP_KERNEL);
- removed = kzalloc_objs(*removed, HPSA_MAX_DEVICES, GFP_KERNEL);
+ added = kzalloc_objs(*added, HPSA_MAX_DEVICES);
+ removed = kzalloc_objs(*removed, HPSA_MAX_DEVICES);
if (!added || !removed) {
dev_warn(&h->pdev->dev, "out of memory in "
@@ -2200,7 +2200,7 @@ static int hpsa_allocate_ioaccel2_sg_chain_blocks(struct ctlr_info *h)
return 0;
h->ioaccel2_cmd_sg_list =
- kzalloc_objs(*h->ioaccel2_cmd_sg_list, h->nr_cmds, GFP_KERNEL);
+ kzalloc_objs(*h->ioaccel2_cmd_sg_list, h->nr_cmds);
if (!h->ioaccel2_cmd_sg_list)
return -ENOMEM;
for (i = 0; i < h->nr_cmds; i++) {
@@ -2238,7 +2238,7 @@ static int hpsa_alloc_sg_chain_blocks(struct ctlr_info *h)
if (h->chainsize <= 0)
return 0;
- h->cmd_sg_list = kzalloc_objs(*h->cmd_sg_list, h->nr_cmds, GFP_KERNEL);
+ h->cmd_sg_list = kzalloc_objs(*h->cmd_sg_list, h->nr_cmds);
if (!h->cmd_sg_list)
return -ENOMEM;
@@ -3465,11 +3465,11 @@ static void hpsa_get_enclosure_info(struct ctlr_info *h,
goto out;
}
- bssbp = kzalloc_obj(*bssbp, GFP_KERNEL);
+ bssbp = kzalloc_obj(*bssbp);
if (!bssbp)
goto out;
- id_phys = kzalloc_obj(*id_phys, GFP_KERNEL);
+ id_phys = kzalloc_obj(*id_phys);
if (!id_phys)
goto out;
@@ -3530,7 +3530,7 @@ static u64 hpsa_get_sas_address_from_report_physical(struct ctlr_info *h,
u64 sa = 0;
int i;
- physdev = kzalloc_obj(*physdev, GFP_KERNEL);
+ physdev = kzalloc_obj(*physdev);
if (!physdev)
return 0;
@@ -3561,7 +3561,7 @@ static void hpsa_get_sas_address(struct ctlr_info *h, unsigned char *scsi3addr,
if (is_hba_lunid(scsi3addr)) {
struct bmic_sense_subsystem_info *ssi;
- ssi = kzalloc_obj(*ssi, GFP_KERNEL);
+ ssi = kzalloc_obj(*ssi);
if (!ssi)
return;
@@ -3785,7 +3785,7 @@ static inline int hpsa_scsi_do_report_phys_luns(struct ctlr_info *h,
return rc;
/* REPORT PHYS EXTENDED is not supported */
- lbuf = kzalloc_obj(*lbuf, GFP_KERNEL);
+ lbuf = kzalloc_obj(*lbuf);
if (!lbuf)
return -ENOMEM;
@@ -4256,7 +4256,7 @@ static bool hpsa_is_disk_spare(struct ctlr_info *h, u8 *lunaddrbytes)
bool is_spare = false;
int rc;
- id_phys = kzalloc_obj(*id_phys, GFP_KERNEL);
+ id_phys = kzalloc_obj(*id_phys);
if (!id_phys)
return false;
@@ -4341,12 +4341,12 @@ static void hpsa_update_scsi_devices(struct ctlr_info *h)
int raid_ctlr_position;
bool physical_device;
- currentsd = kzalloc_objs(*currentsd, HPSA_MAX_DEVICES, GFP_KERNEL);
- physdev_list = kzalloc_obj(*physdev_list, GFP_KERNEL);
- logdev_list = kzalloc_obj(*logdev_list, GFP_KERNEL);
- tmpdevice = kzalloc_obj(*tmpdevice, GFP_KERNEL);
- id_phys = kzalloc_obj(*id_phys, GFP_KERNEL);
- id_ctlr = kzalloc_obj(*id_ctlr, GFP_KERNEL);
+ currentsd = kzalloc_objs(*currentsd, HPSA_MAX_DEVICES);
+ physdev_list = kzalloc_obj(*physdev_list);
+ logdev_list = kzalloc_obj(*logdev_list);
+ tmpdevice = kzalloc_obj(*tmpdevice);
+ id_phys = kzalloc_obj(*id_phys);
+ id_ctlr = kzalloc_obj(*id_ctlr);
if (!currentsd || !physdev_list || !logdev_list ||
!tmpdevice || !id_phys || !id_ctlr) {
@@ -4386,7 +4386,7 @@ static void hpsa_update_scsi_devices(struct ctlr_info *h)
break;
}
- currentsd[i] = kzalloc_obj(*currentsd[i], GFP_KERNEL);
+ currentsd[i] = kzalloc_obj(*currentsd[i]);
if (!currentsd[i]) {
h->drv_req_rescan = 1;
goto out;
@@ -6500,7 +6500,7 @@ static int hpsa_big_passthru_ioctl(struct ctlr_info *h,
status = -ENOMEM;
goto cleanup1;
}
- buff_size = kmalloc_objs(int, SG_ENTRIES_IN_CMD, GFP_KERNEL);
+ buff_size = kmalloc_objs(int, SG_ENTRIES_IN_CMD);
if (!buff_size) {
status = -ENOMEM;
goto cleanup1;
@@ -8490,7 +8490,7 @@ static int hpsa_luns_changed(struct ctlr_info *h)
if (!h->lastlogicals)
return rc;
- logdev = kzalloc_obj(*logdev, GFP_KERNEL);
+ logdev = kzalloc_obj(*logdev);
if (!logdev)
return rc;
@@ -8631,7 +8631,7 @@ static struct ctlr_info *hpda_alloc_ctlr_info(void)
{
struct ctlr_info *h;
- h = kzalloc_obj(*h, GFP_KERNEL);
+ h = kzalloc_obj(*h);
if (!h)
return NULL;
@@ -8852,7 +8852,7 @@ static int hpsa_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
hpsa_hba_inquiry(h);
- h->lastlogicals = kzalloc_obj(*(h->lastlogicals), GFP_KERNEL);
+ h->lastlogicals = kzalloc_obj(*(h->lastlogicals));
if (!h->lastlogicals)
dev_info(&h->pdev->dev,
"Can't track change to report lun data\n");
@@ -8956,7 +8956,7 @@ static void hpsa_disable_rld_caching(struct ctlr_info *h)
if (unlikely(h->lockup_detected))
return;
- options = kzalloc_obj(*options, GFP_KERNEL);
+ options = kzalloc_obj(*options);
if (!options)
return;
@@ -9553,7 +9553,7 @@ static struct hpsa_sas_phy *hpsa_alloc_sas_phy(
struct hpsa_sas_phy *hpsa_sas_phy;
struct sas_phy *phy;
- hpsa_sas_phy = kzalloc_obj(*hpsa_sas_phy, GFP_KERNEL);
+ hpsa_sas_phy = kzalloc_obj(*hpsa_sas_phy);
if (!hpsa_sas_phy)
return NULL;
@@ -9638,7 +9638,7 @@ static struct hpsa_sas_port
struct hpsa_sas_port *hpsa_sas_port;
struct sas_port *port;
- hpsa_sas_port = kzalloc_obj(*hpsa_sas_port, GFP_KERNEL);
+ hpsa_sas_port = kzalloc_obj(*hpsa_sas_port);
if (!hpsa_sas_port)
return NULL;
@@ -9686,7 +9686,7 @@ static struct hpsa_sas_node *hpsa_alloc_sas_node(struct device *parent_dev)
{
struct hpsa_sas_node *hpsa_sas_node;
- hpsa_sas_node = kzalloc_obj(*hpsa_sas_node, GFP_KERNEL);
+ hpsa_sas_node = kzalloc_obj(*hpsa_sas_node);
if (hpsa_sas_node) {
hpsa_sas_node->parent_dev = parent_dev;
INIT_LIST_HEAD(&hpsa_sas_node->port_list_head);
diff --git a/drivers/scsi/ibmvscsi/ibmvfc.c b/drivers/scsi/ibmvscsi/ibmvfc.c
index 2973395badab..e47a954acd43 100644
--- a/drivers/scsi/ibmvscsi/ibmvfc.c
+++ b/drivers/scsi/ibmvscsi/ibmvfc.c
@@ -797,7 +797,7 @@ static int ibmvfc_init_event_pool(struct ibmvfc_host *vhost,
return 0;
pool->size = queue->total_depth;
- pool->events = kzalloc_objs(*pool->events, pool->size, GFP_KERNEL);
+ pool->events = kzalloc_objs(*pool->events, pool->size);
if (!pool->events)
return -ENOMEM;
diff --git a/drivers/scsi/ibmvscsi/ibmvscsi.c b/drivers/scsi/ibmvscsi/ibmvscsi.c
index da88b6b125d6..609bda730b3a 100644
--- a/drivers/scsi/ibmvscsi/ibmvscsi.c
+++ b/drivers/scsi/ibmvscsi/ibmvscsi.c
@@ -447,7 +447,7 @@ static int initialize_event_pool(struct event_pool *pool,
pool->size = size;
pool->next = 0;
- pool->events = kzalloc_objs(*pool->events, pool->size, GFP_KERNEL);
+ pool->events = kzalloc_objs(*pool->events, pool->size);
if (!pool->events)
return -ENOMEM;
diff --git a/drivers/scsi/ibmvscsi_tgt/ibmvscsi_tgt.c b/drivers/scsi/ibmvscsi_tgt/ibmvscsi_tgt.c
index a3a6953ba1c7..b395a9d7c640 100644
--- a/drivers/scsi/ibmvscsi_tgt/ibmvscsi_tgt.c
+++ b/drivers/scsi/ibmvscsi_tgt/ibmvscsi_tgt.c
@@ -2214,7 +2214,7 @@ static int ibmvscsis_make_nexus(struct ibmvscsis_tport *tport)
return 0;
}
- nexus = kzalloc_obj(*nexus, GFP_KERNEL);
+ nexus = kzalloc_obj(*nexus);
if (!nexus) {
dev_err(&vscsi->dev, "Unable to allocate struct ibmvscsis_nexus\n");
return -ENOMEM;
@@ -3424,7 +3424,7 @@ static int ibmvscsis_probe(struct vio_dev *vdev,
int rc = 0;
long hrc = 0;
- vscsi = kzalloc_obj(*vscsi, GFP_KERNEL);
+ vscsi = kzalloc_obj(*vscsi);
if (!vscsi) {
rc = -ENOMEM;
dev_err(&vdev->dev, "probe: allocation of adapter failed\n");
diff --git a/drivers/scsi/ibmvscsi_tgt/libsrp.c b/drivers/scsi/ibmvscsi_tgt/libsrp.c
index 8fd0bc7cb429..eef9e452ece5 100644
--- a/drivers/scsi/ibmvscsi_tgt/libsrp.c
+++ b/drivers/scsi/ibmvscsi_tgt/libsrp.c
@@ -27,10 +27,10 @@ static int srp_iu_pool_alloc(struct srp_queue *q, size_t max,
struct iu_entry *iue;
int i;
- q->pool = kzalloc_objs(struct iu_entry *, max, GFP_KERNEL);
+ q->pool = kzalloc_objs(struct iu_entry *, max);
if (!q->pool)
return -ENOMEM;
- q->items = kzalloc_objs(struct iu_entry, max, GFP_KERNEL);
+ q->items = kzalloc_objs(struct iu_entry, max);
if (!q->items)
goto free_pool;
@@ -61,12 +61,12 @@ static struct srp_buf **srp_ring_alloc(struct device *dev,
struct srp_buf **ring;
int i;
- ring = kzalloc_objs(struct srp_buf *, max, GFP_KERNEL);
+ ring = kzalloc_objs(struct srp_buf *, max);
if (!ring)
return NULL;
for (i = 0; i < max; i++) {
- ring[i] = kzalloc_obj(*ring[i], GFP_KERNEL);
+ ring[i] = kzalloc_obj(*ring[i]);
if (!ring[i])
goto out;
ring[i]->buf = dma_alloc_coherent(dev, size, &ring[i]->dma,
diff --git a/drivers/scsi/imm.c b/drivers/scsi/imm.c
index 2ed57ea13884..0535252e77e3 100644
--- a/drivers/scsi/imm.c
+++ b/drivers/scsi/imm.c
@@ -1158,7 +1158,7 @@ static int __imm_attach(struct parport *pb)
init_waitqueue_head(&waiting);
- dev = kzalloc_obj(imm_struct, GFP_KERNEL);
+ dev = kzalloc_obj(imm_struct);
if (!dev)
return -ENOMEM;
diff --git a/drivers/scsi/ipr.c b/drivers/scsi/ipr.c
index 3b3f40eb32f4..c93dc8b4fe59 100644
--- a/drivers/scsi/ipr.c
+++ b/drivers/scsi/ipr.c
@@ -3776,7 +3776,7 @@ static struct ipr_sglist *ipr_alloc_ucode_buffer(int buf_len)
order = get_order(sg_size);
/* Allocate a scatter/gather list for the DMA */
- sglist = kzalloc_obj(struct ipr_sglist, GFP_KERNEL);
+ sglist = kzalloc_obj(struct ipr_sglist);
if (sglist == NULL) {
ipr_trace;
return NULL;
@@ -4273,7 +4273,7 @@ static int ipr_alloc_dump(struct ipr_ioa_cfg *ioa_cfg)
__be32 **ioa_data;
unsigned long lock_flags = 0;
- dump = kzalloc_obj(struct ipr_dump, GFP_KERNEL);
+ dump = kzalloc_obj(struct ipr_dump);
if (!dump) {
ipr_err("Dump memory allocation failed\n");
diff --git a/drivers/scsi/ips.c b/drivers/scsi/ips.c
index 6bb87f02b746..41ed73966a48 100644
--- a/drivers/scsi/ips.c
+++ b/drivers/scsi/ips.c
@@ -6874,7 +6874,7 @@ ips_init_phase1(struct pci_dev *pci_dev, int *indexPtr)
}
/* found a controller */
- ha = kzalloc_obj(ips_ha_t, GFP_KERNEL);
+ ha = kzalloc_obj(ips_ha_t);
if (ha == NULL) {
IPS_PRINTK(KERN_WARNING, pci_dev,
"Unable to allocate temporary ha struct\n");
@@ -6947,7 +6947,7 @@ ips_init_phase1(struct pci_dev *pci_dev, int *indexPtr)
ha->logical_drive_info_dma_addr = dma_address;
- ha->conf = kmalloc_obj(IPS_CONF, GFP_KERNEL);
+ ha->conf = kmalloc_obj(IPS_CONF);
if (!ha->conf) {
IPS_PRINTK(KERN_WARNING, pci_dev,
@@ -6955,7 +6955,7 @@ ips_init_phase1(struct pci_dev *pci_dev, int *indexPtr)
return ips_abort_init(ha, index);
}
- ha->nvram = kmalloc_obj(IPS_NVRAM_P5, GFP_KERNEL);
+ ha->nvram = kmalloc_obj(IPS_NVRAM_P5);
if (!ha->nvram) {
IPS_PRINTK(KERN_WARNING, pci_dev,
@@ -6963,7 +6963,7 @@ ips_init_phase1(struct pci_dev *pci_dev, int *indexPtr)
return ips_abort_init(ha, index);
}
- ha->subsys = kmalloc_obj(IPS_SUBSYS, GFP_KERNEL);
+ ha->subsys = kmalloc_obj(IPS_SUBSYS);
if (!ha->subsys) {
IPS_PRINTK(KERN_WARNING, pci_dev,
diff --git a/drivers/scsi/iscsi_boot_sysfs.c b/drivers/scsi/iscsi_boot_sysfs.c
index 09fa63fc18f5..0b22197bf8f5 100644
--- a/drivers/scsi/iscsi_boot_sysfs.c
+++ b/drivers/scsi/iscsi_boot_sysfs.c
@@ -344,7 +344,7 @@ iscsi_boot_create_kobj(struct iscsi_boot_kset *boot_kset,
{
struct iscsi_boot_kobj *boot_kobj;
- boot_kobj = kzalloc_obj(*boot_kobj, GFP_KERNEL);
+ boot_kobj = kzalloc_obj(*boot_kobj);
if (!boot_kobj)
return NULL;
INIT_LIST_HEAD(&boot_kobj->list);
@@ -497,7 +497,7 @@ struct iscsi_boot_kset *iscsi_boot_create_kset(const char *set_name)
{
struct iscsi_boot_kset *boot_kset;
- boot_kset = kzalloc_obj(*boot_kset, GFP_KERNEL);
+ boot_kset = kzalloc_obj(*boot_kset);
if (!boot_kset)
return NULL;
diff --git a/drivers/scsi/lasi700.c b/drivers/scsi/lasi700.c
index 4663927255ba..6d1fb55cc3ad 100644
--- a/drivers/scsi/lasi700.c
+++ b/drivers/scsi/lasi700.c
@@ -88,7 +88,7 @@ lasi700_probe(struct parisc_device *dev)
struct NCR_700_Host_Parameters *hostdata;
struct Scsi_Host *host;
- hostdata = kzalloc_obj(*hostdata, GFP_KERNEL);
+ hostdata = kzalloc_obj(*hostdata);
if (!hostdata) {
dev_printk(KERN_ERR, &dev->dev, "Failed to allocate host data\n");
return -ENOMEM;
diff --git a/drivers/scsi/libfc/fc_disc.c b/drivers/scsi/libfc/fc_disc.c
index 5cc10b70b772..7792724d5b97 100644
--- a/drivers/scsi/libfc/fc_disc.c
+++ b/drivers/scsi/libfc/fc_disc.c
@@ -116,7 +116,7 @@ static void fc_disc_recv_rscn_req(struct fc_disc *disc, struct fc_frame *fp)
case ELS_ADDR_FMT_PORT:
FC_DISC_DBG(disc, "Port address format for port "
"(%6.6x)\n", ntoh24(pp->rscn_fid));
- dp = kzalloc_obj(*dp, GFP_KERNEL);
+ dp = kzalloc_obj(*dp);
if (!dp) {
redisc = 1;
break;
diff --git a/drivers/scsi/libfc/fc_fcp.c b/drivers/scsi/libfc/fc_fcp.c
index 414bd2e45fec..a5139e43ca4c 100644
--- a/drivers/scsi/libfc/fc_fcp.c
+++ b/drivers/scsi/libfc/fc_fcp.c
@@ -2298,7 +2298,7 @@ int fc_fcp_init(struct fc_lport *lport)
if (!lport->tt.fcp_abort_io)
lport->tt.fcp_abort_io = fc_fcp_abort_io;
- si = kzalloc_obj(struct fc_fcp_internal, GFP_KERNEL);
+ si = kzalloc_obj(struct fc_fcp_internal);
if (!si)
return -ENOMEM;
lport->scsi_priv = si;
diff --git a/drivers/scsi/libfc/fc_lport.c b/drivers/scsi/libfc/fc_lport.c
index 67583e44ad5b..32683ea6953c 100644
--- a/drivers/scsi/libfc/fc_lport.c
+++ b/drivers/scsi/libfc/fc_lport.c
@@ -2049,7 +2049,7 @@ static int fc_lport_els_request(struct bsg_job *job,
fh->fh_df_ctl = 0;
fh->fh_parm_offset = 0;
- info = kzalloc_obj(struct fc_bsg_info, GFP_KERNEL);
+ info = kzalloc_obj(struct fc_bsg_info);
if (!info) {
fc_frame_free(fp);
return -ENOMEM;
@@ -2109,7 +2109,7 @@ static int fc_lport_ct_request(struct bsg_job *job,
fh->fh_df_ctl = 0;
fh->fh_parm_offset = 0;
- info = kzalloc_obj(struct fc_bsg_info, GFP_KERNEL);
+ info = kzalloc_obj(struct fc_bsg_info);
if (!info) {
fc_frame_free(fp);
return -ENOMEM;
diff --git a/drivers/scsi/libsas/sas_ata.c b/drivers/scsi/libsas/sas_ata.c
index 0d24d6cc2dd8..61368e55bf86 100644
--- a/drivers/scsi/libsas/sas_ata.c
+++ b/drivers/scsi/libsas/sas_ata.c
@@ -579,7 +579,7 @@ int sas_ata_init(struct domain_device *found_dev)
struct ata_port *ap;
int rc;
- ata_host = kzalloc_obj(*ata_host, GFP_KERNEL);
+ ata_host = kzalloc_obj(*ata_host);
if (!ata_host) {
pr_err("ata host alloc failed.\n");
return -ENOMEM;
diff --git a/drivers/scsi/libsas/sas_expander.c b/drivers/scsi/libsas/sas_expander.c
index e48b5233c2e9..f471ab464a78 100644
--- a/drivers/scsi/libsas/sas_expander.c
+++ b/drivers/scsi/libsas/sas_expander.c
@@ -433,7 +433,7 @@ static int sas_expander_discover(struct domain_device *dev)
struct expander_device *ex = &dev->ex_dev;
int res;
- ex->ex_phy = kzalloc_objs(*ex->ex_phy, ex->num_phys, GFP_KERNEL);
+ ex->ex_phy = kzalloc_objs(*ex->ex_phy, ex->num_phys);
if (!ex->ex_phy)
return -ENOMEM;
diff --git a/drivers/scsi/libsas/sas_init.c b/drivers/scsi/libsas/sas_init.c
index 08e641374c85..0bec236f0fb5 100644
--- a/drivers/scsi/libsas/sas_init.c
+++ b/drivers/scsi/libsas/sas_init.c
@@ -505,7 +505,7 @@ static void phy_enable_work(struct work_struct *work)
static int sas_phy_setup(struct sas_phy *phy)
{
- struct sas_phy_data *d = kzalloc_obj(*d, GFP_KERNEL);
+ struct sas_phy_data *d = kzalloc_obj(*d);
if (!d)
return -ENOMEM;
diff --git a/drivers/scsi/libsas/sas_internal.h b/drivers/scsi/libsas/sas_internal.h
index fafcefcf722a..7dce0f587149 100644
--- a/drivers/scsi/libsas/sas_internal.h
+++ b/drivers/scsi/libsas/sas_internal.h
@@ -192,7 +192,7 @@ static inline void sas_phy_set_target(struct asd_sas_phy *p, struct domain_devic
static inline struct domain_device *sas_alloc_device(void)
{
- struct domain_device *dev = kzalloc_obj(*dev, GFP_KERNEL);
+ struct domain_device *dev = kzalloc_obj(*dev);
if (dev) {
INIT_LIST_HEAD(&dev->siblings);
diff --git a/drivers/scsi/lpfc/lpfc_attr.c b/drivers/scsi/lpfc/lpfc_attr.c
index fef3f283cfa7..53f41d68e0d8 100644
--- a/drivers/scsi/lpfc/lpfc_attr.c
+++ b/drivers/scsi/lpfc/lpfc_attr.c
@@ -2041,7 +2041,7 @@ lpfc_xcvr_data_show(struct device *dev, struct device_attribute *attr,
struct sff_trasnceiver_codes_byte7 *trasn_code_byte7;
/* Get transceiver information */
- rdp_context = kmalloc_obj(*rdp_context, GFP_KERNEL);
+ rdp_context = kmalloc_obj(*rdp_context);
if (!rdp_context) {
len = scnprintf(buf, PAGE_SIZE - len,
"SPF info NA: alloc failure\n");
diff --git a/drivers/scsi/lpfc/lpfc_bsg.c b/drivers/scsi/lpfc/lpfc_bsg.c
index 8c2b303ff144..7406dfa60016 100644
--- a/drivers/scsi/lpfc/lpfc_bsg.c
+++ b/drivers/scsi/lpfc/lpfc_bsg.c
@@ -174,7 +174,7 @@ lpfc_alloc_bsg_buffers(struct lpfc_hba *phba, unsigned int size,
/* Allocate dma buffer and place in BPL passed */
while (bytes_left) {
/* Allocate dma buffer */
- mp = kmalloc_obj(struct lpfc_dmabuf, GFP_KERNEL);
+ mp = kmalloc_obj(struct lpfc_dmabuf);
if (!mp) {
if (mlist)
lpfc_free_bsg_buffers(phba, mlist);
@@ -416,7 +416,7 @@ lpfc_bsg_send_mgmt_cmd(struct bsg_job *job)
return -ENODEV;
/* allocate our bsg tracking structure */
- dd_data = kmalloc_obj(struct bsg_job_data, GFP_KERNEL);
+ dd_data = kmalloc_obj(struct bsg_job_data);
if (!dd_data) {
lpfc_printf_log(phba, KERN_WARNING, LOG_LIBDFC,
"2733 Failed allocation of dd_data\n");
@@ -430,7 +430,7 @@ lpfc_bsg_send_mgmt_cmd(struct bsg_job *job)
goto free_dd;
}
- bmp = kmalloc_obj(struct lpfc_dmabuf, GFP_KERNEL);
+ bmp = kmalloc_obj(struct lpfc_dmabuf);
if (!bmp) {
rc = -ENOMEM;
goto free_cmdiocbq;
@@ -683,7 +683,7 @@ lpfc_bsg_rport_els(struct bsg_job *job)
}
/* allocate our bsg tracking structure */
- dd_data = kmalloc_obj(struct bsg_job_data, GFP_KERNEL);
+ dd_data = kmalloc_obj(struct bsg_job_data);
if (!dd_data) {
lpfc_printf_log(phba, KERN_WARNING, LOG_LIBDFC,
"2735 Failed allocation of dd_data\n");
@@ -843,7 +843,7 @@ lpfc_bsg_event_unref(struct lpfc_bsg_event *evt)
static struct lpfc_bsg_event *
lpfc_bsg_event_new(uint32_t ev_mask, int ev_reg_id, uint32_t ev_req_id)
{
- struct lpfc_bsg_event *evt = kzalloc_obj(*evt, GFP_KERNEL);
+ struct lpfc_bsg_event *evt = kzalloc_obj(*evt);
if (!evt)
return NULL;
@@ -939,7 +939,7 @@ lpfc_bsg_ct_unsol_event(struct lpfc_hba *phba, struct lpfc_sli_ring *pring,
lpfc_bsg_event_ref(evt);
spin_unlock_irqrestore(&phba->ct_ev_lock, flags);
- evt_dat = kzalloc_obj(*evt_dat, GFP_KERNEL);
+ evt_dat = kzalloc_obj(*evt_dat);
if (evt_dat == NULL) {
spin_lock_irqsave(&phba->ct_ev_lock, flags);
lpfc_bsg_event_unref(evt);
@@ -1215,7 +1215,7 @@ lpfc_bsg_hba_set_event(struct bsg_job *job)
if (&evt->node == &phba->ct_ev_waiters) {
/* no event waiting struct yet - first call */
- dd_data = kmalloc_obj(struct bsg_job_data, GFP_KERNEL);
+ dd_data = kmalloc_obj(struct bsg_job_data);
if (dd_data == NULL) {
lpfc_printf_log(phba, KERN_WARNING, LOG_LIBDFC,
"2734 Failed allocation of dd_data\n");
@@ -1477,7 +1477,7 @@ lpfc_issue_ct_rsp(struct lpfc_hba *phba, struct bsg_job *job, uint32_t tag,
}
/* allocate our bsg tracking structure */
- dd_data = kmalloc_obj(struct bsg_job_data, GFP_KERNEL);
+ dd_data = kmalloc_obj(struct bsg_job_data);
if (!dd_data) {
lpfc_printf_log(phba, KERN_WARNING, LOG_LIBDFC,
"2736 Failed allocation of dd_data\n");
@@ -1605,7 +1605,7 @@ lpfc_bsg_send_mgmt_rsp(struct bsg_job *job)
goto send_mgmt_rsp_exit;
}
- bmp = kmalloc_obj(struct lpfc_dmabuf, GFP_KERNEL);
+ bmp = kmalloc_obj(struct lpfc_dmabuf);
if (!bmp) {
rc = -ENOMEM;
goto send_mgmt_rsp_exit;
@@ -2628,7 +2628,7 @@ static int lpfcdiag_loop_get_xri(struct lpfc_hba *phba, uint16_t rpi,
cmdiocbq = lpfc_sli_get_iocbq(phba);
rspiocbq = lpfc_sli_get_iocbq(phba);
- dmabuf = kmalloc_obj(struct lpfc_dmabuf, GFP_KERNEL);
+ dmabuf = kmalloc_obj(struct lpfc_dmabuf);
if (dmabuf) {
dmabuf->virt = lpfc_mbuf_alloc(phba, 0, &dmabuf->phys);
if (dmabuf->virt) {
@@ -2733,7 +2733,7 @@ lpfc_bsg_dma_page_alloc(struct lpfc_hba *phba)
struct pci_dev *pcidev = phba->pcidev;
/* allocate dma buffer struct */
- dmabuf = kmalloc_obj(struct lpfc_dmabuf, GFP_KERNEL);
+ dmabuf = kmalloc_obj(struct lpfc_dmabuf);
if (!dmabuf)
return NULL;
@@ -2829,7 +2829,7 @@ diag_cmd_data_alloc(struct lpfc_hba *phba,
cnt = size;
/* allocate struct lpfc_dmabufext buffer header */
- dmp = kmalloc_obj(struct lpfc_dmabufext, GFP_KERNEL);
+ dmp = kmalloc_obj(struct lpfc_dmabufext);
if (!dmp)
goto out;
@@ -2909,7 +2909,7 @@ static int lpfcdiag_sli3_loop_post_rxbufs(struct lpfc_hba *phba, uint16_t rxxri,
pring = lpfc_phba_elsring(phba);
cmdiocbq = lpfc_sli_get_iocbq(phba);
- rxbmp = kmalloc_obj(struct lpfc_dmabuf, GFP_KERNEL);
+ rxbmp = kmalloc_obj(struct lpfc_dmabuf);
if (rxbmp != NULL) {
rxbmp->virt = lpfc_mbuf_alloc(phba, 0, &rxbmp->phys);
if (rxbmp->virt) {
@@ -3160,7 +3160,7 @@ lpfc_bsg_diag_loopback_run(struct bsg_job *job)
cmdiocbq = lpfc_sli_get_iocbq(phba);
if (phba->sli_rev < LPFC_SLI_REV4)
rspiocbq = lpfc_sli_get_iocbq(phba);
- txbmp = kmalloc_obj(struct lpfc_dmabuf, GFP_KERNEL);
+ txbmp = kmalloc_obj(struct lpfc_dmabuf);
if (txbmp) {
txbmp->virt = lpfc_mbuf_alloc(phba, 0, &txbmp->phys);
@@ -4074,7 +4074,7 @@ lpfc_bsg_sli_cfg_read_cmd_ext(struct lpfc_hba *phba, struct bsg_job *job,
}
/* bsg tracking structure */
- dd_data = kmalloc_obj(struct bsg_job_data, GFP_KERNEL);
+ dd_data = kmalloc_obj(struct bsg_job_data);
if (!dd_data) {
rc = -ENOMEM;
goto job_error;
@@ -4275,7 +4275,7 @@ lpfc_bsg_sli_cfg_write_cmd_ext(struct lpfc_hba *phba, struct bsg_job *job,
if (ext_buf_cnt == 1) {
/* bsg tracking structure */
- dd_data = kmalloc_obj(struct bsg_job_data, GFP_KERNEL);
+ dd_data = kmalloc_obj(struct bsg_job_data);
if (!dd_data) {
rc = -ENOMEM;
goto job_error;
@@ -4624,7 +4624,7 @@ lpfc_bsg_write_ebuf_set(struct lpfc_hba *phba, struct bsg_job *job,
"ebuffers received\n",
phba->mbox_ext_buf_ctx.numBuf);
- dd_data = kmalloc_obj(struct bsg_job_data, GFP_KERNEL);
+ dd_data = kmalloc_obj(struct bsg_job_data);
if (!dd_data) {
rc = -ENOMEM;
goto job_error;
@@ -4896,7 +4896,7 @@ lpfc_bsg_issue_mbox(struct lpfc_hba *phba, struct bsg_job *job,
goto job_done; /* must be negative */
/* allocate our bsg tracking structure */
- dd_data = kmalloc_obj(struct bsg_job_data, GFP_KERNEL);
+ dd_data = kmalloc_obj(struct bsg_job_data);
if (!dd_data) {
lpfc_printf_log(phba, KERN_WARNING, LOG_LIBDFC,
"2727 Failed allocation of dd_data\n");
diff --git a/drivers/scsi/lpfc/lpfc_ct.c b/drivers/scsi/lpfc/lpfc_ct.c
index a6ae7b7cf99c..d64f4acfcdae 100644
--- a/drivers/scsi/lpfc/lpfc_ct.c
+++ b/drivers/scsi/lpfc/lpfc_ct.c
@@ -165,7 +165,7 @@ lpfc_ct_reject_event(struct lpfc_nodelist *ndlp,
u32 tmo;
/* fill in BDEs for command */
- mp = kmalloc_obj(*mp, GFP_KERNEL);
+ mp = kmalloc_obj(*mp);
if (!mp) {
rc = 1;
goto ct_exit;
@@ -178,7 +178,7 @@ lpfc_ct_reject_event(struct lpfc_nodelist *ndlp,
}
/* Allocate buffer for Buffer ptr list */
- bmp = kmalloc_obj(*bmp, GFP_KERNEL);
+ bmp = kmalloc_obj(*bmp);
if (!bmp) {
rc = 3;
goto ct_free_mpvirt;
@@ -498,7 +498,7 @@ lpfc_alloc_ct_rsp(struct lpfc_hba *phba, __be16 cmdcode, struct ulp_bde64 *bpl,
while (size) {
/* Allocate buffer for rsp payload */
- mp = kmalloc_obj(struct lpfc_dmabuf, GFP_KERNEL);
+ mp = kmalloc_obj(struct lpfc_dmabuf);
if (!mp) {
if (mlist)
lpfc_free_ct_rsp(phba, mlist);
@@ -1924,7 +1924,7 @@ lpfc_ns_cmd(struct lpfc_vport *vport, int cmdcode,
/* fill in BDEs for command */
/* Allocate buffer for command payload */
- mp = kmalloc_obj(struct lpfc_dmabuf, GFP_KERNEL);
+ mp = kmalloc_obj(struct lpfc_dmabuf);
if (!mp) {
rc=2;
goto ns_cmd_exit;
@@ -1938,7 +1938,7 @@ lpfc_ns_cmd(struct lpfc_vport *vport, int cmdcode,
}
/* Allocate buffer for Buffer ptr list */
- bmp = kmalloc_obj(struct lpfc_dmabuf, GFP_KERNEL);
+ bmp = kmalloc_obj(struct lpfc_dmabuf);
if (!bmp) {
rc=4;
goto ns_cmd_free_mpvirt;
@@ -3220,7 +3220,7 @@ lpfc_fdmi_cmd(struct lpfc_vport *vport, struct lpfc_nodelist *ndlp,
/* fill in BDEs for command */
/* Allocate buffer for command payload */
- rq = kmalloc_obj(*rq, GFP_KERNEL);
+ rq = kmalloc_obj(*rq);
if (!rq)
goto fdmi_cmd_exit;
@@ -3229,7 +3229,7 @@ lpfc_fdmi_cmd(struct lpfc_vport *vport, struct lpfc_nodelist *ndlp,
goto fdmi_cmd_free_rq;
/* Allocate buffer for Buffer ptr list */
- rsp = kmalloc_obj(*rsp, GFP_KERNEL);
+ rsp = kmalloc_obj(*rsp);
if (!rsp)
goto fdmi_cmd_free_rqvirt;
@@ -3716,7 +3716,7 @@ lpfc_vmid_cmd(struct lpfc_vport *vport,
/* fill in BDEs for command */
/* Allocate buffer for command payload */
- mp = kmalloc_obj(*mp, GFP_KERNEL);
+ mp = kmalloc_obj(*mp);
if (!mp)
goto vmid_free_mp_exit;
@@ -3725,7 +3725,7 @@ lpfc_vmid_cmd(struct lpfc_vport *vport,
goto vmid_free_mp_virt_exit;
/* Allocate buffer for Buffer ptr list */
- bmp = kmalloc_obj(*bmp, GFP_KERNEL);
+ bmp = kmalloc_obj(*bmp);
if (!bmp)
goto vmid_free_bmp_exit;
diff --git a/drivers/scsi/lpfc/lpfc_debugfs.c b/drivers/scsi/lpfc/lpfc_debugfs.c
index f9f46119f341..1d9b3fcaa27e 100644
--- a/drivers/scsi/lpfc/lpfc_debugfs.c
+++ b/drivers/scsi/lpfc/lpfc_debugfs.c
@@ -1951,7 +1951,7 @@ lpfc_debugfs_disc_trc_open(struct inode *inode, struct file *file)
goto out;
}
- debug = kmalloc_obj(*debug, GFP_KERNEL);
+ debug = kmalloc_obj(*debug);
if (!debug)
goto out;
@@ -2001,7 +2001,7 @@ lpfc_debugfs_slow_ring_trc_open(struct inode *inode, struct file *file)
goto out;
}
- debug = kmalloc_obj(*debug, GFP_KERNEL);
+ debug = kmalloc_obj(*debug);
if (!debug)
goto out;
@@ -2045,7 +2045,7 @@ lpfc_debugfs_hbqinfo_open(struct inode *inode, struct file *file)
struct lpfc_debug *debug;
int rc = -ENOMEM;
- debug = kmalloc_obj(*debug, GFP_KERNEL);
+ debug = kmalloc_obj(*debug);
if (!debug)
goto out;
@@ -2087,7 +2087,7 @@ lpfc_debugfs_multixripools_open(struct inode *inode, struct file *file)
struct lpfc_debug *debug;
int rc = -ENOMEM;
- debug = kmalloc_obj(*debug, GFP_KERNEL);
+ debug = kmalloc_obj(*debug);
if (!debug)
goto out;
@@ -2132,7 +2132,7 @@ lpfc_debugfs_lockstat_open(struct inode *inode, struct file *file)
struct lpfc_debug *debug;
int rc = -ENOMEM;
- debug = kmalloc_obj(*debug, GFP_KERNEL);
+ debug = kmalloc_obj(*debug);
if (!debug)
goto out;
@@ -2269,7 +2269,7 @@ lpfc_debugfs_ras_log_open(struct inode *inode, struct file *file)
phba->cfg_ras_fwlog_buffsize, &size))
goto out;
- debug = kzalloc_obj(*debug, GFP_KERNEL);
+ debug = kzalloc_obj(*debug);
if (!debug)
goto out;
@@ -2316,7 +2316,7 @@ lpfc_debugfs_dumpHBASlim_open(struct inode *inode, struct file *file)
struct lpfc_debug *debug;
int rc = -ENOMEM;
- debug = kmalloc_obj(*debug, GFP_KERNEL);
+ debug = kmalloc_obj(*debug);
if (!debug)
goto out;
@@ -2358,7 +2358,7 @@ lpfc_debugfs_dumpHostSlim_open(struct inode *inode, struct file *file)
struct lpfc_debug *debug;
int rc = -ENOMEM;
- debug = kmalloc_obj(*debug, GFP_KERNEL);
+ debug = kmalloc_obj(*debug);
if (!debug)
goto out;
@@ -2522,7 +2522,7 @@ lpfc_debugfs_nodelist_open(struct inode *inode, struct file *file)
struct lpfc_debug *debug;
int rc = -ENOMEM;
- debug = kmalloc_obj(*debug, GFP_KERNEL);
+ debug = kmalloc_obj(*debug);
if (!debug)
goto out;
@@ -2688,7 +2688,7 @@ lpfc_debugfs_nvmestat_open(struct inode *inode, struct file *file)
struct lpfc_debug *debug;
int rc = -ENOMEM;
- debug = kmalloc_obj(*debug, GFP_KERNEL);
+ debug = kmalloc_obj(*debug);
if (!debug)
goto out;
@@ -2776,7 +2776,7 @@ lpfc_debugfs_scsistat_open(struct inode *inode, struct file *file)
struct lpfc_debug *debug;
int rc = -ENOMEM;
- debug = kmalloc_obj(*debug, GFP_KERNEL);
+ debug = kmalloc_obj(*debug);
if (!debug)
goto out;
@@ -2830,7 +2830,7 @@ lpfc_debugfs_ioktime_open(struct inode *inode, struct file *file)
struct lpfc_debug *debug;
int rc = -ENOMEM;
- debug = kmalloc_obj(*debug, GFP_KERNEL);
+ debug = kmalloc_obj(*debug);
if (!debug)
goto out;
@@ -2957,7 +2957,7 @@ lpfc_debugfs_nvmeio_trc_open(struct inode *inode, struct file *file)
struct lpfc_debug *debug;
int rc = -ENOMEM;
- debug = kmalloc_obj(*debug, GFP_KERNEL);
+ debug = kmalloc_obj(*debug);
if (!debug)
goto out;
@@ -3062,7 +3062,7 @@ lpfc_debugfs_hdwqstat_open(struct inode *inode, struct file *file)
struct lpfc_debug *debug;
int rc = -ENOMEM;
- debug = kmalloc_obj(*debug, GFP_KERNEL);
+ debug = kmalloc_obj(*debug);
if (!debug)
goto out;
@@ -3226,7 +3226,7 @@ lpfc_idiag_open(struct inode *inode, struct file *file)
{
struct lpfc_debug *debug;
- debug = kmalloc_obj(*debug, GFP_KERNEL);
+ debug = kmalloc_obj(*debug);
if (!debug)
return -ENOMEM;
@@ -5471,7 +5471,7 @@ lpfc_cgn_buffer_open(struct inode *inode, struct file *file)
struct lpfc_debug *debug;
int rc = -ENOMEM;
- debug = kmalloc_obj(*debug, GFP_KERNEL);
+ debug = kmalloc_obj(*debug);
if (!debug)
goto out;
@@ -5563,7 +5563,7 @@ lpfc_rx_monitor_open(struct inode *inode, struct file *file)
struct lpfc_rx_monitor_debug *debug;
int rc = -ENOMEM;
- debug = kmalloc_obj(*debug, GFP_KERNEL);
+ debug = kmalloc_obj(*debug);
if (!debug)
goto out;
diff --git a/drivers/scsi/lpfc/lpfc_els.c b/drivers/scsi/lpfc/lpfc_els.c
index 5177f0a80670..a6d936150b31 100644
--- a/drivers/scsi/lpfc/lpfc_els.c
+++ b/drivers/scsi/lpfc/lpfc_els.c
@@ -216,7 +216,7 @@ lpfc_prep_els_iocb(struct lpfc_vport *vport, u8 expect_rsp,
/* fill in BDEs for command */
/* Allocate buffer for command payload */
- pcmd = kmalloc_obj(*pcmd, GFP_KERNEL);
+ pcmd = kmalloc_obj(*pcmd);
if (pcmd)
pcmd->virt = lpfc_mbuf_alloc(phba, MEM_PRI, &pcmd->phys);
if (!pcmd || !pcmd->virt)
@@ -226,7 +226,7 @@ lpfc_prep_els_iocb(struct lpfc_vport *vport, u8 expect_rsp,
/* Allocate buffer for response payload */
if (expect_rsp) {
- prsp = kmalloc_obj(*prsp, GFP_KERNEL);
+ prsp = kmalloc_obj(*prsp);
if (prsp)
prsp->virt = lpfc_mbuf_alloc(phba, MEM_PRI,
&prsp->phys);
@@ -238,7 +238,7 @@ lpfc_prep_els_iocb(struct lpfc_vport *vport, u8 expect_rsp,
}
/* Allocate buffer for Buffer ptr list */
- pbuflist = kmalloc_obj(*pbuflist, GFP_KERNEL);
+ pbuflist = kmalloc_obj(*pbuflist);
if (pbuflist)
pbuflist->virt = lpfc_mbuf_alloc(phba, MEM_PRI,
&pbuflist->phys);
@@ -7537,7 +7537,7 @@ lpfc_els_rcv_rdp(struct lpfc_vport *vport, struct lpfc_iocbq *cmdiocb,
if (RDP_NPORT_ID_SIZE !=
be32_to_cpu(rdp_req->nport_id_desc.length))
goto rjt_logerr;
- rdp_context = kzalloc_obj(struct lpfc_rdp_context, GFP_KERNEL);
+ rdp_context = kzalloc_obj(struct lpfc_rdp_context);
if (!rdp_context) {
rjt_err = LSRJT_UNABLE_TPC;
goto error;
@@ -7842,7 +7842,7 @@ lpfc_els_rcv_lcb(struct lpfc_vport *vport, struct lpfc_iocbq *cmdiocb,
goto rjt;
}
- lcb_context = kmalloc_obj(*lcb_context, GFP_KERNEL);
+ lcb_context = kmalloc_obj(*lcb_context);
if (!lcb_context) {
rjt_err = LSRJT_UNABLE_TPC;
goto rjt;
@@ -9965,7 +9965,7 @@ lpfc_send_els_event(struct lpfc_vport *vport,
struct Scsi_Host *shost = lpfc_shost_from_vport(vport);
if (*payload == ELS_CMD_LOGO) {
- logo_data = kmalloc_obj(struct lpfc_logo_event, GFP_KERNEL);
+ logo_data = kmalloc_obj(struct lpfc_logo_event);
if (!logo_data) {
lpfc_printf_vlog(vport, KERN_ERR, LOG_TRACE_EVENT,
"0148 Failed to allocate memory "
@@ -9974,7 +9974,7 @@ lpfc_send_els_event(struct lpfc_vport *vport,
}
els_data = &logo_data->header;
} else {
- els_data = kmalloc_obj(struct lpfc_els_event_header, GFP_KERNEL);
+ els_data = kmalloc_obj(struct lpfc_els_event_header);
if (!els_data) {
lpfc_printf_vlog(vport, KERN_ERR, LOG_TRACE_EVENT,
"0149 Failed to allocate memory "
@@ -12437,7 +12437,7 @@ lpfc_vmid_uvem(struct lpfc_vport *vport,
if (!ndlp || ndlp->nlp_state != NLP_STE_UNMAPPED_NODE)
return -ENXIO;
- vmid_context = kmalloc_obj(*vmid_context, GFP_KERNEL);
+ vmid_context = kmalloc_obj(*vmid_context);
if (!vmid_context)
return -ENOMEM;
elsiocb = lpfc_prep_els_iocb(vport, 1, LPFC_UVEM_SIZE, 2,
diff --git a/drivers/scsi/lpfc/lpfc_hbadisc.c b/drivers/scsi/lpfc/lpfc_hbadisc.c
index 0e6cc42c61c9..8aaf05d7bb0a 100644
--- a/drivers/scsi/lpfc/lpfc_hbadisc.c
+++ b/drivers/scsi/lpfc/lpfc_hbadisc.c
@@ -3643,7 +3643,7 @@ lpfc_mbx_process_link_up(struct lpfc_hba *phba, struct lpfc_mbx_read_top *la)
* defaults.
*/
if (!test_bit(HBA_FIP_SUPPORT, &phba->hba_flag)) {
- fcf_record = kzalloc_obj(struct fcf_record, GFP_KERNEL);
+ fcf_record = kzalloc_obj(struct fcf_record);
if (unlikely(!fcf_record)) {
lpfc_printf_log(phba, KERN_ERR,
LOG_TRACE_EVENT,
@@ -4054,7 +4054,7 @@ lpfc_create_static_vport(struct lpfc_hba *phba)
memset(pmb, 0, sizeof(LPFC_MBOXQ_t));
mb = &pmb->u.mb;
- vport_info = kzalloc_obj(struct static_vport_info, GFP_KERNEL);
+ vport_info = kzalloc_obj(struct static_vport_info);
if (!vport_info) {
lpfc_printf_log(phba, KERN_ERR, LOG_TRACE_EVENT,
"0543 lpfc_create_static_vport failed to"
@@ -7010,7 +7010,7 @@ lpfc_read_fcf_conn_tbl(struct lpfc_hba *phba,
for (i = 0; i < record_count; i++) {
if (!(conn_rec[i].flags & FCFCNCT_VALID))
continue;
- conn_entry = kzalloc_obj(struct lpfc_fcf_conn_entry, GFP_KERNEL);
+ conn_entry = kzalloc_obj(struct lpfc_fcf_conn_entry);
if (!conn_entry) {
lpfc_printf_log(phba, KERN_ERR, LOG_TRACE_EVENT,
"2566 Failed to allocate connection"
diff --git a/drivers/scsi/lpfc/lpfc_init.c b/drivers/scsi/lpfc/lpfc_init.c
index 1139fb7dc0fb..ab7e871b679d 100644
--- a/drivers/scsi/lpfc/lpfc_init.c
+++ b/drivers/scsi/lpfc/lpfc_init.c
@@ -2820,7 +2820,7 @@ lpfc_sli3_post_buffer(struct lpfc_hba *phba, struct lpfc_sli_ring *pring, int cn
/* 2 buffers can be posted per command */
/* Allocate buffer to post */
- mp1 = kmalloc_obj(struct lpfc_dmabuf, GFP_KERNEL);
+ mp1 = kmalloc_obj(struct lpfc_dmabuf);
if (mp1)
mp1->virt = lpfc_mbuf_alloc(phba, MEM_PRI, &mp1->phys);
if (!mp1 || !mp1->virt) {
@@ -2833,7 +2833,7 @@ lpfc_sli3_post_buffer(struct lpfc_hba *phba, struct lpfc_sli_ring *pring, int cn
INIT_LIST_HEAD(&mp1->list);
/* Allocate buffer to post */
if (cnt > 1) {
- mp2 = kmalloc_obj(struct lpfc_dmabuf, GFP_KERNEL);
+ mp2 = kmalloc_obj(struct lpfc_dmabuf);
if (mp2)
mp2->virt = lpfc_mbuf_alloc(phba, MEM_PRI,
&mp2->phys);
@@ -3539,7 +3539,7 @@ void lpfc_create_multixri_pools(struct lpfc_hba *phba)
count_per_hwq = phba->sli4_hba.io_xri_cnt / hwq_count;
for (i = 0; i < hwq_count; i++) {
- multixri_pool = kzalloc_obj(*multixri_pool, GFP_KERNEL);
+ multixri_pool = kzalloc_obj(*multixri_pool);
if (!multixri_pool) {
lpfc_printf_log(phba, KERN_INFO, LOG_INIT,
@@ -4064,7 +4064,7 @@ lpfc_sli4_els_sgl_update(struct lpfc_hba *phba)
els_xri_cnt);
/* allocate the additional els sgls */
for (i = 0; i < xri_cnt; i++) {
- sglq_entry = kzalloc_obj(struct lpfc_sglq, GFP_KERNEL);
+ sglq_entry = kzalloc_obj(struct lpfc_sglq);
if (sglq_entry == NULL) {
lpfc_printf_log(phba, KERN_ERR,
LOG_TRACE_EVENT,
@@ -4183,7 +4183,7 @@ lpfc_sli4_nvmet_sgl_update(struct lpfc_hba *phba)
phba->sli4_hba.nvmet_xri_cnt, nvmet_xri_cnt);
/* allocate the additional nvmet sgls */
for (i = 0; i < xri_cnt; i++) {
- sglq_entry = kzalloc_obj(struct lpfc_sglq, GFP_KERNEL);
+ sglq_entry = kzalloc_obj(struct lpfc_sglq);
if (sglq_entry == NULL) {
lpfc_printf_log(phba, KERN_ERR,
LOG_TRACE_EVENT,
@@ -4476,7 +4476,7 @@ lpfc_new_io_buf(struct lpfc_hba *phba, int num_to_alloc)
phba->sli4_hba.io_xri_cnt = 0;
for (bcnt = 0; bcnt < num_to_alloc; bcnt++) {
- lpfc_ncmd = kzalloc_obj(*lpfc_ncmd, GFP_KERNEL);
+ lpfc_ncmd = kzalloc_obj(*lpfc_ncmd);
if (!lpfc_ncmd)
break;
/*
@@ -8661,7 +8661,7 @@ lpfc_init_iocb_list(struct lpfc_hba *phba, int iocb_count)
/* Initialize and populate the iocb list per host. */
INIT_LIST_HEAD(&phba->lpfc_iocb_list);
for (i = 0; i < iocb_count; i++) {
- iocbq_entry = kzalloc_obj(struct lpfc_iocbq, GFP_KERNEL);
+ iocbq_entry = kzalloc_obj(struct lpfc_iocbq);
if (iocbq_entry == NULL) {
printk(KERN_ERR "%s: only allocated %d iocbs of "
"expected %d count. Unloading driver.\n",
@@ -8911,7 +8911,7 @@ lpfc_sli4_create_rpi_hdr(struct lpfc_hba *phba)
* First allocate the protocol header region for the port. The
* port expects a 4KB DMA-mapped memory region that is 4K aligned.
*/
- dmabuf = kzalloc_obj(struct lpfc_dmabuf, GFP_KERNEL);
+ dmabuf = kzalloc_obj(struct lpfc_dmabuf);
if (!dmabuf)
return NULL;
@@ -8929,7 +8929,7 @@ lpfc_sli4_create_rpi_hdr(struct lpfc_hba *phba)
}
/* Save the rpi header data for cleanup later. */
- rpi_hdr = kzalloc_obj(struct lpfc_rpi_hdr, GFP_KERNEL);
+ rpi_hdr = kzalloc_obj(struct lpfc_rpi_hdr);
if (!rpi_hdr)
goto err_free_coherent;
@@ -9002,7 +9002,7 @@ lpfc_hba_alloc(struct pci_dev *pdev)
struct lpfc_hba *phba;
/* Allocate memory for HBA structure */
- phba = kzalloc_obj(struct lpfc_hba, GFP_KERNEL);
+ phba = kzalloc_obj(struct lpfc_hba);
if (!phba) {
dev_err(&pdev->dev, "failed to allocate hba struct\n");
return NULL;
@@ -9720,7 +9720,7 @@ lpfc_create_bootstrap_mbox(struct lpfc_hba *phba)
uint32_t pa_addr;
uint64_t phys_addr;
- dmabuf = kzalloc_obj(struct lpfc_dmabuf, GFP_KERNEL);
+ dmabuf = kzalloc_obj(struct lpfc_dmabuf);
if (!dmabuf)
return -ENOMEM;
@@ -11507,7 +11507,7 @@ lpfc_sli4_cq_event_pool_create(struct lpfc_hba *phba)
int i;
for (i = 0; i < (4 * phba->sli4_hba.cq_ecount); i++) {
- cq_event = kmalloc_obj(struct lpfc_cq_event, GFP_KERNEL);
+ cq_event = kmalloc_obj(struct lpfc_cq_event);
if (!cq_event)
goto out_pool_create_fail;
list_add_tail(&cq_event->list,
@@ -14612,7 +14612,7 @@ lpfc_write_firmware(const struct firmware *fw, void *context)
"New Version:%s\n",
fwrev, image->revision);
for (i = 0; i < LPFC_MBX_WR_CONFIG_MAX_BDE; i++) {
- dmabuf = kzalloc_obj(struct lpfc_dmabuf, GFP_KERNEL);
+ dmabuf = kzalloc_obj(struct lpfc_dmabuf);
if (!dmabuf) {
rc = -ENOMEM;
goto release_out;
diff --git a/drivers/scsi/lpfc/lpfc_mbox.c b/drivers/scsi/lpfc/lpfc_mbox.c
index 5f7249e6bda8..e13abb6f925c 100644
--- a/drivers/scsi/lpfc/lpfc_mbox.c
+++ b/drivers/scsi/lpfc/lpfc_mbox.c
@@ -64,7 +64,7 @@ lpfc_mbox_rsrc_prep(struct lpfc_hba *phba, LPFC_MBOXQ_t *mbox)
{
struct lpfc_dmabuf *mp;
- mp = kmalloc_obj(*mp, GFP_KERNEL);
+ mp = kmalloc_obj(*mp);
if (!mp)
return -ENOMEM;
diff --git a/drivers/scsi/lpfc/lpfc_mem.c b/drivers/scsi/lpfc/lpfc_mem.c
index c067d6762ae3..6f5e5d1311e5 100644
--- a/drivers/scsi/lpfc/lpfc_mem.c
+++ b/drivers/scsi/lpfc/lpfc_mem.c
@@ -510,7 +510,7 @@ lpfc_els_hbq_alloc(struct lpfc_hba *phba)
{
struct hbq_dmabuf *hbqbp;
- hbqbp = kzalloc_obj(struct hbq_dmabuf, GFP_KERNEL);
+ hbqbp = kzalloc_obj(struct hbq_dmabuf);
if (!hbqbp)
return NULL;
@@ -562,7 +562,7 @@ lpfc_sli4_rb_alloc(struct lpfc_hba *phba)
{
struct hbq_dmabuf *dma_buf;
- dma_buf = kzalloc_obj(struct hbq_dmabuf, GFP_KERNEL);
+ dma_buf = kzalloc_obj(struct hbq_dmabuf);
if (!dma_buf)
return NULL;
@@ -620,7 +620,7 @@ lpfc_sli4_nvmet_alloc(struct lpfc_hba *phba)
{
struct rqb_dmabuf *dma_buf;
- dma_buf = kzalloc_obj(*dma_buf, GFP_KERNEL);
+ dma_buf = kzalloc_obj(*dma_buf);
if (!dma_buf)
return NULL;
diff --git a/drivers/scsi/lpfc/lpfc_nportdisc.c b/drivers/scsi/lpfc/lpfc_nportdisc.c
index 9e61021edfe1..5e431928de0b 100644
--- a/drivers/scsi/lpfc/lpfc_nportdisc.c
+++ b/drivers/scsi/lpfc/lpfc_nportdisc.c
@@ -564,7 +564,7 @@ lpfc_rcv_plogi(struct lpfc_vport *vport, struct lpfc_nodelist *ndlp,
if (!login_mbox)
goto out;
- save_iocb = kzalloc_obj(*save_iocb, GFP_KERNEL);
+ save_iocb = kzalloc_obj(*save_iocb);
if (!save_iocb)
goto out;
@@ -764,7 +764,7 @@ lpfc_rcv_padisc(struct lpfc_vport *vport, struct lpfc_nodelist *ndlp,
* registered.
*/
if (test_bit(NLP_RPI_REGISTERED, &ndlp->nlp_flag)) {
- elsiocb = kmalloc_obj(*elsiocb, GFP_KERNEL);
+ elsiocb = kmalloc_obj(*elsiocb);
if (elsiocb) {
/* Save info from cmd IOCB used in
* rsp
diff --git a/drivers/scsi/lpfc/lpfc_nvme.c b/drivers/scsi/lpfc/lpfc_nvme.c
index edddb1e9a353..a6b3b16f870d 100644
--- a/drivers/scsi/lpfc/lpfc_nvme.c
+++ b/drivers/scsi/lpfc/lpfc_nvme.c
@@ -98,7 +98,7 @@ lpfc_nvme_create_queue(struct nvme_fc_local_port *pnvme_lport,
test_bit(HBA_IOQ_FLUSH, &vport->phba->hba_flag))
return -ENODEV;
- qhandle = kzalloc_obj(struct lpfc_nvme_qhandle, GFP_KERNEL);
+ qhandle = kzalloc_obj(struct lpfc_nvme_qhandle);
if (qhandle == NULL)
return -ENOMEM;
@@ -587,7 +587,7 @@ __lpfc_nvme_ls_req(struct lpfc_vport *vport, struct lpfc_nodelist *ndlp,
* in the nvme-fc layer.
*/
- bmp = kmalloc_obj(*bmp, GFP_KERNEL);
+ bmp = kmalloc_obj(*bmp);
if (!bmp) {
lpfc_printf_vlog(vport, KERN_ERR, LOG_TRACE_EVENT,
"6044 NVMEx LS REQ: Could not alloc LS buf "
diff --git a/drivers/scsi/lpfc/lpfc_nvmet.c b/drivers/scsi/lpfc/lpfc_nvmet.c
index 48642f01f2c9..ea5f24e28ef0 100644
--- a/drivers/scsi/lpfc/lpfc_nvmet.c
+++ b/drivers/scsi/lpfc/lpfc_nvmet.c
@@ -1567,14 +1567,14 @@ lpfc_nvmet_setup_io_context(struct lpfc_hba *phba)
idx = 0;
cpu = cpumask_first(cpu_present_mask);
for (i = 0; i < phba->sli4_hba.nvmet_xri_cnt; i++) {
- ctx_buf = kzalloc_obj(*ctx_buf, GFP_KERNEL);
+ ctx_buf = kzalloc_obj(*ctx_buf);
if (!ctx_buf) {
lpfc_printf_log(phba, KERN_ERR, LOG_TRACE_EVENT,
"6404 Ran out of memory for NVMET\n");
return -ENOMEM;
}
- ctx_buf->context = kzalloc_obj(*ctx_buf->context, GFP_KERNEL);
+ ctx_buf->context = kzalloc_obj(*ctx_buf->context);
if (!ctx_buf->context) {
kfree(ctx_buf);
lpfc_printf_log(phba, KERN_ERR, LOG_TRACE_EVENT,
diff --git a/drivers/scsi/lpfc/lpfc_scsi.c b/drivers/scsi/lpfc/lpfc_scsi.c
index ca2bd782608d..69bf1ac6f846 100644
--- a/drivers/scsi/lpfc/lpfc_scsi.c
+++ b/drivers/scsi/lpfc/lpfc_scsi.c
@@ -265,7 +265,7 @@ lpfc_new_scsi_buf_s3(struct lpfc_vport *vport, int num_to_alloc)
(int)sizeof(struct fcp_rsp), bpl_size);
for (bcnt = 0; bcnt < num_to_alloc; bcnt++) {
- psb = kzalloc_obj(struct lpfc_io_buf, GFP_KERNEL);
+ psb = kzalloc_obj(struct lpfc_io_buf);
if (!psb)
break;
diff --git a/drivers/scsi/lpfc/lpfc_sli.c b/drivers/scsi/lpfc/lpfc_sli.c
index b328fc772bd8..dab6b288db51 100644
--- a/drivers/scsi/lpfc/lpfc_sli.c
+++ b/drivers/scsi/lpfc/lpfc_sli.c
@@ -2135,7 +2135,7 @@ lpfc_sli_next_iotag(struct lpfc_hba *phba, struct lpfc_iocbq *iocbq)
- LPFC_IOCBQ_LOOKUP_INCREMENT)) {
new_len = psli->iocbq_lookup_len + LPFC_IOCBQ_LOOKUP_INCREMENT;
spin_unlock_irq(&phba->hbalock);
- new_arr = kzalloc_objs(struct lpfc_iocbq *, new_len, GFP_KERNEL);
+ new_arr = kzalloc_objs(struct lpfc_iocbq *, new_len);
if (new_arr) {
spin_lock_irq(&phba->hbalock);
old_arr = psli->iocbq_lookup;
@@ -5893,7 +5893,7 @@ lpfc_sli4_read_rev(struct lpfc_hba *phba, LPFC_MBOXQ_t *mboxq,
struct lpfc_dmabuf *dmabuf;
struct lpfc_mqe *mqe;
- dmabuf = kzalloc_obj(struct lpfc_dmabuf, GFP_KERNEL);
+ dmabuf = kzalloc_obj(struct lpfc_dmabuf);
if (!dmabuf)
return -ENOMEM;
@@ -6943,7 +6943,7 @@ lpfc_sli4_ras_dma_alloc(struct lpfc_hba *phba,
ras_fwlog->fw_buffcount = fwlog_buff_count;
for (i = 0; i < ras_fwlog->fw_buffcount; i++) {
- dmabuf = kzalloc_obj(struct lpfc_dmabuf, GFP_KERNEL);
+ dmabuf = kzalloc_obj(struct lpfc_dmabuf);
if (!dmabuf) {
rc = -ENOMEM;
lpfc_printf_log(phba, KERN_WARNING, LOG_INIT,
@@ -8294,7 +8294,7 @@ lpfc_cmf_setup(struct lpfc_hba *phba)
/* Allocate Congestion Information Buffer */
if (!phba->cgn_i) {
- mp = kmalloc_obj(*mp, GFP_KERNEL);
+ mp = kmalloc_obj(*mp);
if (mp)
mp->virt = dma_alloc_coherent
(&phba->pcidev->dev,
@@ -8376,7 +8376,7 @@ lpfc_cmf_setup(struct lpfc_hba *phba)
/* Allocate RX Monitor Buffer */
if (!phba->rx_monitor) {
- phba->rx_monitor = kzalloc_obj(*phba->rx_monitor, GFP_KERNEL);
+ phba->rx_monitor = kzalloc_obj(*phba->rx_monitor);
if (!phba->rx_monitor) {
lpfc_printf_log(phba, KERN_ERR, LOG_INIT,
@@ -17144,7 +17144,7 @@ lpfc_wq_create(struct lpfc_hba *phba, struct lpfc_queue *wq,
} else
wq->db_regaddr = phba->sli4_hba.WQDBregaddr;
}
- wq->pring = kzalloc_obj(struct lpfc_sli_ring, GFP_KERNEL);
+ wq->pring = kzalloc_obj(struct lpfc_sli_ring);
if (wq->pring == NULL) {
status = -ENOMEM;
goto out;
@@ -19463,7 +19463,7 @@ lpfc_sli4_handle_mds_loopback(struct lpfc_vport *vport,
}
/* Allocate buffer for command payload */
- pcmd = kmalloc_obj(struct lpfc_dmabuf, GFP_KERNEL);
+ pcmd = kmalloc_obj(struct lpfc_dmabuf);
if (pcmd)
pcmd->virt = dma_pool_alloc(phba->lpfc_drb_pool, GFP_KERNEL,
&pcmd->phys);
@@ -22294,7 +22294,7 @@ lpfc_read_object(struct lpfc_hba *phba, char *rdobject, uint32_t *datap,
read_object->u.request.rd_object_name[j] =
cpu_to_le32(rd_object_name[j]);
- pcmd = kmalloc_obj(*pcmd, GFP_KERNEL);
+ pcmd = kmalloc_obj(*pcmd);
if (pcmd)
pcmd->virt = lpfc_mbuf_alloc(phba, MEM_PRI, &pcmd->phys);
if (!pcmd || !pcmd->virt) {
diff --git a/drivers/scsi/mac_esp.c b/drivers/scsi/mac_esp.c
index 68923dafee42..a0ceaa2428c2 100644
--- a/drivers/scsi/mac_esp.c
+++ b/drivers/scsi/mac_esp.c
@@ -323,7 +323,7 @@ static int esp_mac_probe(struct platform_device *dev)
host->this_id = esp->scsi_id;
esp->scsi_id_mask = 1 << esp->scsi_id;
- mep = kzalloc_obj(struct mac_esp_priv, GFP_KERNEL);
+ mep = kzalloc_obj(struct mac_esp_priv);
if (!mep)
goto fail_free_command_block;
mep->esp = esp;
diff --git a/drivers/scsi/megaraid.c b/drivers/scsi/megaraid.c
index de40a791ed3d..9476a0d2c72d 100644
--- a/drivers/scsi/megaraid.c
+++ b/drivers/scsi/megaraid.c
@@ -4254,7 +4254,7 @@ megaraid_probe_one(struct pci_dev *pdev, const struct pci_device_id *id)
goto out_host_put;
}
- adapter->scb_list = kmalloc_objs(scb_t, MAX_COMMANDS, GFP_KERNEL);
+ adapter->scb_list = kmalloc_objs(scb_t, MAX_COMMANDS);
if (!adapter->scb_list) {
dev_warn(&pdev->dev, "out of RAM\n");
goto out_free_cmd_buffer;
diff --git a/drivers/scsi/megaraid/megaraid_mbox.c b/drivers/scsi/megaraid/megaraid_mbox.c
index fa10a89d7563..06cf94ee4e36 100644
--- a/drivers/scsi/megaraid/megaraid_mbox.c
+++ b/drivers/scsi/megaraid/megaraid_mbox.c
@@ -429,7 +429,7 @@ megaraid_probe_one(struct pci_dev *pdev, const struct pci_device_id *id)
pci_set_master(pdev);
// Allocate the per driver initialization structure
- adapter = kzalloc_obj(adapter_t, GFP_KERNEL);
+ adapter = kzalloc_obj(adapter_t);
if (adapter == NULL) {
con_log(CL_ANN, (KERN_WARNING
@@ -713,7 +713,7 @@ megaraid_init_mbox(adapter_t *adapter)
* Allocate and initialize the init data structure for mailbox
* controllers
*/
- raid_dev = kzalloc_obj(mraid_device_t, GFP_KERNEL);
+ raid_dev = kzalloc_obj(mraid_device_t);
if (raid_dev == NULL) return -1;
@@ -1017,7 +1017,7 @@ megaraid_alloc_cmd_packets(adapter_t *adapter)
* since the calling routine does not yet know the number of available
* commands.
*/
- adapter->kscb_list = kzalloc_objs(scb_t, MBOX_MAX_SCSI_CMDS, GFP_KERNEL);
+ adapter->kscb_list = kzalloc_objs(scb_t, MBOX_MAX_SCSI_CMDS);
if (adapter->kscb_list == NULL) {
con_log(CL_ANN, (KERN_WARNING
@@ -3403,7 +3403,7 @@ megaraid_cmm_register(adapter_t *adapter)
int i;
// Allocate memory for the base list of scb for management module.
- adapter->uscb_list = kzalloc_objs(scb_t, MBOX_MAX_USER_CMDS, GFP_KERNEL);
+ adapter->uscb_list = kzalloc_objs(scb_t, MBOX_MAX_USER_CMDS);
if (adapter->uscb_list == NULL) {
con_log(CL_ANN, (KERN_WARNING
@@ -3763,9 +3763,9 @@ megaraid_sysfs_alloc_resources(adapter_t *adapter)
mraid_device_t *raid_dev = ADAP2RAIDDEV(adapter);
int rval = 0;
- raid_dev->sysfs_uioc = kmalloc_obj(uioc_t, GFP_KERNEL);
+ raid_dev->sysfs_uioc = kmalloc_obj(uioc_t);
- raid_dev->sysfs_mbox64 = kmalloc_obj(mbox64_t, GFP_KERNEL);
+ raid_dev->sysfs_mbox64 = kmalloc_obj(mbox64_t);
raid_dev->sysfs_buffer = dma_alloc_coherent(&adapter->pdev->dev,
PAGE_SIZE, &raid_dev->sysfs_buffer_dma, GFP_KERNEL);
diff --git a/drivers/scsi/megaraid/megaraid_mm.c b/drivers/scsi/megaraid/megaraid_mm.c
index 0b457f691b1e..1532183897ab 100644
--- a/drivers/scsi/megaraid/megaraid_mm.c
+++ b/drivers/scsi/megaraid/megaraid_mm.c
@@ -913,7 +913,7 @@ mraid_mm_register_adp(mraid_mmadp_t *lld_adp)
if (lld_adp->drvr_type != DRVRTYPE_MBOX)
return (-EINVAL);
- adapter = kzalloc_obj(mraid_mmadp_t, GFP_KERNEL);
+ adapter = kzalloc_obj(mraid_mmadp_t);
if (!adapter)
return -ENOMEM;
diff --git a/drivers/scsi/megaraid/megaraid_sas_base.c b/drivers/scsi/megaraid/megaraid_sas_base.c
index 074ace2c9790..5b18c7ac6aa2 100644
--- a/drivers/scsi/megaraid/megaraid_sas_base.c
+++ b/drivers/scsi/megaraid/megaraid_sas_base.c
@@ -2137,7 +2137,7 @@ static int megasas_sdev_init(struct scsi_device *sdev)
}
scan_target:
- mr_device_priv_data = kzalloc_obj(*mr_device_priv_data, GFP_KERNEL);
+ mr_device_priv_data = kzalloc_obj(*mr_device_priv_data);
if (!mr_device_priv_data)
return -ENOMEM;
@@ -6386,7 +6386,7 @@ static int megasas_init_fw(struct megasas_instance *instance)
}
for (i = 0; i < MAX_LOGICAL_DRIVES_EXT; ++i) {
fusion->stream_detect_by_ld[i] =
- kzalloc_obj(struct LD_STREAM_DETECT, GFP_KERNEL);
+ kzalloc_obj(struct LD_STREAM_DETECT);
if (!fusion->stream_detect_by_ld[i]) {
dev_err(&instance->pdev->dev,
"unable to allocate stream detect by LD\n");
@@ -8494,7 +8494,7 @@ megasas_compat_iocpacket_get_user(void __user *arg)
int err = -EFAULT;
int i;
- ioc = kzalloc_obj(*ioc, GFP_KERNEL);
+ ioc = kzalloc_obj(*ioc);
if (!ioc)
return ERR_PTR(-ENOMEM);
size = offsetof(struct megasas_iocpacket, frame) + sizeof(ioc->frame);
diff --git a/drivers/scsi/megaraid/megaraid_sas_debugfs.c b/drivers/scsi/megaraid/megaraid_sas_debugfs.c
index 43bb218dea13..81698cd83f5a 100644
--- a/drivers/scsi/megaraid/megaraid_sas_debugfs.c
+++ b/drivers/scsi/megaraid/megaraid_sas_debugfs.c
@@ -65,7 +65,7 @@ megasas_debugfs_raidmap_open(struct inode *inode, struct file *file)
fusion = instance->ctrl_context;
- debug = kzalloc_obj(struct megasas_debugfs_buffer, GFP_KERNEL);
+ debug = kzalloc_obj(struct megasas_debugfs_buffer);
if (!debug)
return -ENOMEM;
diff --git a/drivers/scsi/megaraid/megaraid_sas_fusion.c b/drivers/scsi/megaraid/megaraid_sas_fusion.c
index e3de9c95bf4f..f02c93d6a2c9 100644
--- a/drivers/scsi/megaraid/megaraid_sas_fusion.c
+++ b/drivers/scsi/megaraid/megaraid_sas_fusion.c
@@ -1744,7 +1744,7 @@ static int megasas_alloc_ioc_init_frame(struct megasas_instance *instance)
fusion = instance->ctrl_context;
- cmd = kzalloc_obj(struct megasas_cmd, GFP_KERNEL);
+ cmd = kzalloc_obj(struct megasas_cmd);
if (!cmd) {
dev_err(&instance->pdev->dev, "Failed from func: %s line: %d\n",
@@ -5298,7 +5298,7 @@ megasas_alloc_fusion_context(struct megasas_instance *instance)
{
struct fusion_context *fusion;
- instance->ctrl_context = kzalloc_obj(struct fusion_context, GFP_KERNEL);
+ instance->ctrl_context = kzalloc_obj(struct fusion_context);
if (!instance->ctrl_context) {
dev_err(&instance->pdev->dev, "Failed from %s %d\n",
__func__, __LINE__);
diff --git a/drivers/scsi/mpi3mr/mpi3mr_fw.c b/drivers/scsi/mpi3mr/mpi3mr_fw.c
index b42c14f1442b..1b938359df08 100644
--- a/drivers/scsi/mpi3mr/mpi3mr_fw.c
+++ b/drivers/scsi/mpi3mr/mpi3mr_fw.c
@@ -1288,7 +1288,7 @@ static void mpi3mr_fault_uevent_emit(struct mpi3mr_ioc *mrioc)
struct kobj_uevent_env *env;
int ret;
- env = kzalloc_obj(*env, GFP_KERNEL);
+ env = kzalloc_obj(*env);
if (!env)
return;
diff --git a/drivers/scsi/mpi3mr/mpi3mr_os.c b/drivers/scsi/mpi3mr/mpi3mr_os.c
index 5e53b200c19b..90f8b9d1c2ac 100644
--- a/drivers/scsi/mpi3mr/mpi3mr_os.c
+++ b/drivers/scsi/mpi3mr/mpi3mr_os.c
@@ -1710,7 +1710,7 @@ static void mpi3mr_encldev_add_chg_evt_bh(struct mpi3mr_ioc *mrioc,
encl_handle);
if (!enclosure_dev && present) {
enclosure_dev =
- kzalloc_obj(struct mpi3mr_enclosure_node, GFP_KERNEL);
+ kzalloc_obj(struct mpi3mr_enclosure_node);
if (!enclosure_dev)
return;
list_add_tail(&enclosure_dev->list,
@@ -4897,7 +4897,7 @@ static int mpi3mr_sdev_init(struct scsi_device *sdev)
spin_unlock_irqrestore(&mrioc->tgtdev_lock, flags);
- scsi_dev_priv_data = kzalloc_obj(*scsi_dev_priv_data, GFP_KERNEL);
+ scsi_dev_priv_data = kzalloc_obj(*scsi_dev_priv_data);
if (!scsi_dev_priv_data)
return -ENOMEM;
@@ -4928,7 +4928,7 @@ static int mpi3mr_target_alloc(struct scsi_target *starget)
int retval = 0;
struct sas_rphy *rphy = NULL;
- scsi_tgt_priv_data = kzalloc_obj(*scsi_tgt_priv_data, GFP_KERNEL);
+ scsi_tgt_priv_data = kzalloc_obj(*scsi_tgt_priv_data);
if (!scsi_tgt_priv_data)
return -ENOMEM;
diff --git a/drivers/scsi/mpi3mr/mpi3mr_transport.c b/drivers/scsi/mpi3mr/mpi3mr_transport.c
index c79ba5bf56de..be4c14078952 100644
--- a/drivers/scsi/mpi3mr/mpi3mr_transport.c
+++ b/drivers/scsi/mpi3mr/mpi3mr_transport.c
@@ -1022,7 +1022,7 @@ mpi3mr_alloc_hba_port(struct mpi3mr_ioc *mrioc, u16 port_id)
{
struct mpi3mr_hba_port *hba_port;
- hba_port = kzalloc_obj(struct mpi3mr_hba_port, GFP_KERNEL);
+ hba_port = kzalloc_obj(struct mpi3mr_hba_port);
if (!hba_port)
return NULL;
hba_port->port_id = port_id;
@@ -1343,7 +1343,7 @@ static struct mpi3mr_sas_port *mpi3mr_sas_port_add(struct mpi3mr_ioc *mrioc,
return NULL;
}
- mr_sas_port = kzalloc_obj(struct mpi3mr_sas_port, GFP_KERNEL);
+ mr_sas_port = kzalloc_obj(struct mpi3mr_sas_port);
if (!mr_sas_port)
return NULL;
@@ -1720,7 +1720,7 @@ mpi3mr_refresh_sas_ports(struct mpi3mr_ioc *mrioc)
sas_io_unit_pg0 = kzalloc(sz, GFP_KERNEL);
if (!sas_io_unit_pg0)
return;
- h_port = kzalloc_objs(struct host_port, 64, GFP_KERNEL);
+ h_port = kzalloc_objs(struct host_port, 64);
if (!h_port)
goto out;
@@ -2097,7 +2097,7 @@ int mpi3mr_expander_add(struct mpi3mr_ioc *mrioc, u16 handle)
if (sas_expander)
return 0;
- sas_expander = kzalloc_obj(struct mpi3mr_sas_node, GFP_KERNEL);
+ sas_expander = kzalloc_obj(struct mpi3mr_sas_node);
if (!sas_expander)
return -ENOMEM;
diff --git a/drivers/scsi/mpt3sas/mpt3sas_base.c b/drivers/scsi/mpt3sas/mpt3sas_base.c
index 32e6c1f2f058..8d34d1ca3866 100644
--- a/drivers/scsi/mpt3sas/mpt3sas_base.c
+++ b/drivers/scsi/mpt3sas/mpt3sas_base.c
@@ -3161,7 +3161,7 @@ _base_request_irq(struct MPT3SAS_ADAPTER *ioc, u8 index)
struct adapter_reply_queue *reply_q;
int r, qid;
- reply_q = kzalloc_obj(struct adapter_reply_queue, GFP_KERNEL);
+ reply_q = kzalloc_obj(struct adapter_reply_queue);
if (!reply_q) {
ioc_err(ioc, "unable to allocate memory %zu!\n",
sizeof(struct adapter_reply_queue));
diff --git a/drivers/scsi/mpt3sas/mpt3sas_ctl.c b/drivers/scsi/mpt3sas/mpt3sas_ctl.c
index 35b78162e8c3..111b23875f4d 100644
--- a/drivers/scsi/mpt3sas/mpt3sas_ctl.c
+++ b/drivers/scsi/mpt3sas/mpt3sas_ctl.c
@@ -4031,7 +4031,7 @@ diag_trigger_scsi_store(struct device *cdev,
sz = min(sizeof(struct SL_WH_SCSI_TRIGGERS_T), count);
if (ioc->supports_trigger_pages) {
- scsi_tg = kzalloc_obj(struct SL_WH_SCSI_TRIGGERS_T, GFP_KERNEL);
+ scsi_tg = kzalloc_obj(struct SL_WH_SCSI_TRIGGERS_T);
if (!scsi_tg)
return -ENOMEM;
@@ -4104,7 +4104,7 @@ diag_trigger_mpi_store(struct device *cdev,
sz = min(sizeof(struct SL_WH_MPI_TRIGGERS_T), count);
if (ioc->supports_trigger_pages) {
- mpi_tg = kzalloc_obj(struct SL_WH_MPI_TRIGGERS_T, GFP_KERNEL);
+ mpi_tg = kzalloc_obj(struct SL_WH_MPI_TRIGGERS_T);
if (!mpi_tg)
return -ENOMEM;
diff --git a/drivers/scsi/mpt3sas/mpt3sas_debugfs.c b/drivers/scsi/mpt3sas/mpt3sas_debugfs.c
index d755f58ad7a0..183391f6b8d1 100644
--- a/drivers/scsi/mpt3sas/mpt3sas_debugfs.c
+++ b/drivers/scsi/mpt3sas/mpt3sas_debugfs.c
@@ -58,7 +58,7 @@ _debugfs_iocdump_open(struct inode *inode, struct file *file)
struct MPT3SAS_ADAPTER *ioc = inode->i_private;
struct mpt3sas_debugfs_buffer *debug;
- debug = kzalloc_obj(struct mpt3sas_debugfs_buffer, GFP_KERNEL);
+ debug = kzalloc_obj(struct mpt3sas_debugfs_buffer);
if (!debug)
return -ENOMEM;
diff --git a/drivers/scsi/mpt3sas/mpt3sas_scsih.c b/drivers/scsi/mpt3sas/mpt3sas_scsih.c
index 1bafd51cdcf6..6407d6561d9e 100644
--- a/drivers/scsi/mpt3sas/mpt3sas_scsih.c
+++ b/drivers/scsi/mpt3sas/mpt3sas_scsih.c
@@ -1940,7 +1940,7 @@ scsih_target_alloc(struct scsi_target *starget)
unsigned long flags;
struct sas_rphy *rphy;
- sas_target_priv_data = kzalloc_obj(*sas_target_priv_data, GFP_KERNEL);
+ sas_target_priv_data = kzalloc_obj(*sas_target_priv_data);
if (!sas_target_priv_data)
return -ENOMEM;
@@ -2108,7 +2108,7 @@ scsih_sdev_init(struct scsi_device *sdev)
struct _pcie_device *pcie_device;
unsigned long flags;
- sas_device_priv_data = kzalloc_obj(*sas_device_priv_data, GFP_KERNEL);
+ sas_device_priv_data = kzalloc_obj(*sas_device_priv_data);
if (!sas_device_priv_data)
return -ENOMEM;
@@ -6839,7 +6839,7 @@ _scsih_alloc_vphy(struct MPT3SAS_ADAPTER *ioc, u8 port_id, u8 phy_num)
vphy = mpt3sas_get_vphy_by_phy(ioc, port, phy_num);
if (!vphy) {
- vphy = kzalloc_obj(struct virtual_phy, GFP_KERNEL);
+ vphy = kzalloc_obj(struct virtual_phy);
if (!vphy)
return NULL;
@@ -6909,7 +6909,7 @@ _scsih_sas_host_refresh(struct MPT3SAS_ADAPTER *ioc)
sas_iounit_pg0->PhyData[0].ControllerDevHandle);
port_id = sas_iounit_pg0->PhyData[i].Port;
if (!(mpt3sas_get_port_by_id(ioc, port_id, 0))) {
- port = kzalloc_obj(struct hba_port, GFP_KERNEL);
+ port = kzalloc_obj(struct hba_port);
if (!port)
goto out;
@@ -7116,7 +7116,7 @@ _scsih_sas_host_add(struct MPT3SAS_ADAPTER *ioc)
port_id = sas_iounit_pg0->PhyData[i].Port;
if (!(mpt3sas_get_port_by_id(ioc, port_id, 0))) {
- port = kzalloc_obj(struct hba_port, GFP_KERNEL);
+ port = kzalloc_obj(struct hba_port);
if (!port)
goto out;
@@ -7257,7 +7257,7 @@ _scsih_expander_add(struct MPT3SAS_ADAPTER *ioc, u16 handle)
if (sas_expander)
return 0;
- sas_expander = kzalloc_obj(struct _sas_node, GFP_KERNEL);
+ sas_expander = kzalloc_obj(struct _sas_node);
if (!sas_expander) {
ioc_err(ioc, "failure at %s:%d/%s()!\n",
__FILE__, __LINE__, __func__);
@@ -7780,7 +7780,7 @@ _scsih_report_luns(struct MPT3SAS_ADAPTER *ioc, u16 handle, void *data,
int retries;
lun_data = NULL;
- transfer_packet = kzalloc_obj(struct _scsi_io_transfer, GFP_KERNEL);
+ transfer_packet = kzalloc_obj(struct _scsi_io_transfer);
if (!transfer_packet) {
ioc_err(ioc, "failure at %s:%d/%s()!\n", __FILE__, __LINE__, __func__);
@@ -7867,7 +7867,7 @@ _scsih_start_unit(struct MPT3SAS_ADAPTER *ioc, u16 handle, u32 lun, u8 is_pd,
enum device_responsive_state rc;
int return_code;
- transfer_packet = kzalloc_obj(struct _scsi_io_transfer, GFP_KERNEL);
+ transfer_packet = kzalloc_obj(struct _scsi_io_transfer);
if (!transfer_packet) {
pr_info("failure at %s:%d/%s()!\n", __FILE__, __LINE__, __func__);
@@ -7928,7 +7928,7 @@ _scsih_test_unit_ready(struct MPT3SAS_ADAPTER *ioc, u16 handle, u32 lun,
int return_code;
int sata_init_failure = 0;
- transfer_packet = kzalloc_obj(struct _scsi_io_transfer, GFP_KERNEL);
+ transfer_packet = kzalloc_obj(struct _scsi_io_transfer);
if (!transfer_packet) {
pr_info("failure at %s:%d/%s()!\n", __FILE__, __LINE__, __func__);
@@ -8000,7 +8000,7 @@ _scsih_ata_pass_thru_idd(struct MPT3SAS_ADAPTER *ioc, u16 handle,
u32 data_length;
idd_data = NULL;
- transfer_packet = kzalloc_obj(struct _scsi_io_transfer, GFP_KERNEL);
+ transfer_packet = kzalloc_obj(struct _scsi_io_transfer);
if (!transfer_packet) {
ioc_err(ioc, "failure at %s:%d/%s()!\n", __FILE__, __LINE__, __func__);
@@ -8131,7 +8131,7 @@ _scsih_wait_for_target_to_become_ready(struct MPT3SAS_ADAPTER *ioc, u16 handle,
int lun;
struct scsi_lun *lunp;
- lun_data = kzalloc_objs(struct scsi_lun, MPT3_MAX_LUNS, GFP_KERNEL);
+ lun_data = kzalloc_objs(struct scsi_lun, MPT3_MAX_LUNS);
if (!lun_data) {
ioc_err(ioc, "failure at %s:%d/%s()!\n", __FILE__, __LINE__, __func__);
@@ -8480,7 +8480,7 @@ _scsih_add_device(struct MPT3SAS_ADAPTER *ioc, u16 handle, u8 retry_count,
}
}
- sas_device = kzalloc_obj(struct _sas_device, GFP_KERNEL);
+ sas_device = kzalloc_obj(struct _sas_device);
if (!sas_device) {
ioc_err(ioc, "failure at %s:%d/%s()!\n",
__FILE__, __LINE__, __func__);
@@ -9383,7 +9383,7 @@ _scsih_pcie_add_device(struct MPT3SAS_ADAPTER *ioc, u16 handle, u8 retry_count)
}
}
- pcie_device = kzalloc_obj(struct _pcie_device, GFP_KERNEL);
+ pcie_device = kzalloc_obj(struct _pcie_device);
if (!pcie_device) {
ioc_err(ioc, "failure at %s:%d/%s()!\n",
__FILE__, __LINE__, __func__);
@@ -9835,7 +9835,7 @@ _scsih_sas_enclosure_dev_status_change_event(struct MPT3SAS_ADAPTER *ioc,
case MPI2_EVENT_SAS_ENCL_RC_ADDED:
if (!enclosure_dev) {
enclosure_dev =
- kzalloc_obj(struct _enclosure_node, GFP_KERNEL);
+ kzalloc_obj(struct _enclosure_node);
if (!enclosure_dev) {
ioc_info(ioc, "failure at %s:%d/%s()!\n",
__FILE__, __LINE__, __func__);
@@ -10260,7 +10260,7 @@ _scsih_sas_volume_add(struct MPT3SAS_ADAPTER *ioc,
if (raid_device)
return;
- raid_device = kzalloc_obj(struct _raid_device, GFP_KERNEL);
+ raid_device = kzalloc_obj(struct _raid_device);
if (!raid_device) {
ioc_err(ioc, "failure at %s:%d/%s()!\n",
__FILE__, __LINE__, __func__);
@@ -10678,7 +10678,7 @@ _scsih_sas_ir_volume_event(struct MPT3SAS_ADAPTER *ioc,
break;
}
- raid_device = kzalloc_obj(struct _raid_device, GFP_KERNEL);
+ raid_device = kzalloc_obj(struct _raid_device);
if (!raid_device) {
ioc_err(ioc, "failure at %s:%d/%s()!\n",
__FILE__, __LINE__, __func__);
@@ -11039,7 +11039,7 @@ _scsih_create_enclosure_list_after_reset(struct MPT3SAS_ADAPTER *ioc)
enclosure_handle = 0xFFFF;
do {
enclosure_dev =
- kzalloc_obj(struct _enclosure_node, GFP_KERNEL);
+ kzalloc_obj(struct _enclosure_node);
if (!enclosure_dev) {
ioc_err(ioc, "failure at %s:%d/%s()!\n",
__FILE__, __LINE__, __func__);
diff --git a/drivers/scsi/mpt3sas/mpt3sas_transport.c b/drivers/scsi/mpt3sas/mpt3sas_transport.c
index 09a36e561da5..e74a526efa8d 100644
--- a/drivers/scsi/mpt3sas/mpt3sas_transport.c
+++ b/drivers/scsi/mpt3sas/mpt3sas_transport.c
@@ -698,7 +698,7 @@ mpt3sas_transport_port_add(struct MPT3SAS_ADAPTER *ioc, u16 handle,
return NULL;
}
- mpt3sas_port = kzalloc_obj(struct _sas_port, GFP_KERNEL);
+ mpt3sas_port = kzalloc_obj(struct _sas_port);
if (!mpt3sas_port) {
ioc_err(ioc, "failure at %s:%d/%s()!\n",
__FILE__, __LINE__, __func__);
diff --git a/drivers/scsi/mvme16x_scsi.c b/drivers/scsi/mvme16x_scsi.c
index 43c68802d40a..f4db93c13986 100644
--- a/drivers/scsi/mvme16x_scsi.c
+++ b/drivers/scsi/mvme16x_scsi.c
@@ -49,7 +49,7 @@ static int mvme16x_probe(struct platform_device *dev)
goto out;
}
- hostdata = kzalloc_obj(struct NCR_700_Host_Parameters, GFP_KERNEL);
+ hostdata = kzalloc_obj(struct NCR_700_Host_Parameters);
if (hostdata == NULL) {
printk(KERN_ERR "mvme16x-scsi: "
"Failed to allocate host data\n");
diff --git a/drivers/scsi/mvsas/mv_init.c b/drivers/scsi/mvsas/mv_init.c
index 6f5a98572c33..5abc17a2e261 100644
--- a/drivers/scsi/mvsas/mv_init.c
+++ b/drivers/scsi/mvsas/mv_init.c
@@ -401,7 +401,7 @@ static int mvs_prep_sas_ha_init(struct Scsi_Host *shost,
sha->sas_port = arr_port;
sha->shost = shost;
- sha->lldd_ha = kzalloc_obj(struct mvs_prv_info, GFP_KERNEL);
+ sha->lldd_ha = kzalloc_obj(struct mvs_prv_info);
if (!sha->lldd_ha)
goto exit_free;
@@ -502,7 +502,7 @@ static int mvs_pci_init(struct pci_dev *pdev, const struct pci_device_id *ent)
chip = &mvs_chips[ent->driver_data];
SHOST_TO_SAS_HA(shost) =
- kzalloc_objs(struct sas_ha_struct, 1, GFP_KERNEL);
+ kzalloc_objs(struct sas_ha_struct, 1);
if (!SHOST_TO_SAS_HA(shost)) {
scsi_host_put(shost);
rc = -ENOMEM;
diff --git a/drivers/scsi/mvumi.c b/drivers/scsi/mvumi.c
index 10b40c434977..5fe066a6c377 100644
--- a/drivers/scsi/mvumi.c
+++ b/drivers/scsi/mvumi.c
@@ -252,7 +252,7 @@ static struct mvumi_cmd *mvumi_create_internal_cmd(struct mvumi_hba *mhba,
{
struct mvumi_cmd *cmd;
- cmd = kzalloc_obj(*cmd, GFP_KERNEL);
+ cmd = kzalloc_obj(*cmd);
if (!cmd) {
dev_err(&mhba->pdev->dev, "failed to create a internal cmd\n");
return NULL;
@@ -368,7 +368,7 @@ static int mvumi_alloc_cmds(struct mvumi_hba *mhba)
struct mvumi_cmd *cmd;
for (i = 0; i < mhba->max_io; i++) {
- cmd = kzalloc_obj(*cmd, GFP_KERNEL);
+ cmd = kzalloc_obj(*cmd);
if (!cmd)
goto err_exit;
@@ -2193,7 +2193,7 @@ static int mvumi_cfg_hw_reg(struct mvumi_hba *mhba)
mhba->mmio = mhba->base_addr[0];
base = mhba->mmio;
if (!mhba->regs) {
- mhba->regs = kzalloc_obj(*regs, GFP_KERNEL);
+ mhba->regs = kzalloc_obj(*regs);
if (mhba->regs == NULL)
return -ENOMEM;
}
@@ -2245,7 +2245,7 @@ static int mvumi_cfg_hw_reg(struct mvumi_hba *mhba)
mhba->mmio = mhba->base_addr[2];
base = mhba->mmio;
if (!mhba->regs) {
- mhba->regs = kzalloc_obj(*regs, GFP_KERNEL);
+ mhba->regs = kzalloc_obj(*regs);
if (mhba->regs == NULL)
return -ENOMEM;
}
diff --git a/drivers/scsi/myrb.c b/drivers/scsi/myrb.c
index e24996921e87..3678b66310ed 100644
--- a/drivers/scsi/myrb.c
+++ b/drivers/scsi/myrb.c
@@ -1628,7 +1628,7 @@ static int myrb_ldev_sdev_init(struct scsi_device *sdev)
ldev_info = cb->ldev_info_buf + ldev_num;
- sdev->hostdata = kzalloc_obj(*ldev_info, GFP_KERNEL);
+ sdev->hostdata = kzalloc_obj(*ldev_info);
if (!sdev->hostdata)
return -ENOMEM;
dev_dbg(&sdev->sdev_gendev,
@@ -1672,7 +1672,7 @@ static int myrb_pdev_sdev_init(struct scsi_device *sdev)
if (sdev->id > MYRB_MAX_TARGETS)
return -ENXIO;
- pdev_info = kzalloc_obj(*pdev_info, GFP_KERNEL);
+ pdev_info = kzalloc_obj(*pdev_info);
if (!pdev_info)
return -ENOMEM;
diff --git a/drivers/scsi/myrs.c b/drivers/scsi/myrs.c
index 77ed566d7b92..afd68225221a 100644
--- a/drivers/scsi/myrs.c
+++ b/drivers/scsi/myrs.c
@@ -538,11 +538,11 @@ static bool myrs_enable_mmio_mbox(struct myrs_hba *cs,
cs->fwstat_buf = NULL;
goto out_free;
}
- cs->ctlr_info = kzalloc_obj(struct myrs_ctlr_info, GFP_KERNEL);
+ cs->ctlr_info = kzalloc_obj(struct myrs_ctlr_info);
if (!cs->ctlr_info)
goto out_free;
- cs->event_buf = kzalloc_obj(struct myrs_event, GFP_KERNEL);
+ cs->event_buf = kzalloc_obj(struct myrs_event);
if (!cs->event_buf)
goto out_free;
@@ -1803,7 +1803,7 @@ static int myrs_sdev_init(struct scsi_device *sdev)
ldev_num = myrs_translate_ldev(cs, sdev);
- ldev_info = kzalloc_obj(*ldev_info, GFP_KERNEL);
+ ldev_info = kzalloc_obj(*ldev_info);
if (!ldev_info)
return -ENOMEM;
@@ -1865,7 +1865,7 @@ static int myrs_sdev_init(struct scsi_device *sdev)
} else {
struct myrs_pdev_info *pdev_info;
- pdev_info = kzalloc_obj(*pdev_info, GFP_KERNEL);
+ pdev_info = kzalloc_obj(*pdev_info);
if (!pdev_info)
return -ENOMEM;
diff --git a/drivers/scsi/pcmcia/aha152x_stub.c b/drivers/scsi/pcmcia/aha152x_stub.c
index ae96602a543b..014ae8d42331 100644
--- a/drivers/scsi/pcmcia/aha152x_stub.c
+++ b/drivers/scsi/pcmcia/aha152x_stub.c
@@ -96,7 +96,7 @@ static int aha152x_probe(struct pcmcia_device *link)
dev_dbg(&link->dev, "aha152x_attach()\n");
/* Create new SCSI device */
- info = kzalloc_obj(*info, GFP_KERNEL);
+ info = kzalloc_obj(*info);
if (!info) return -ENOMEM;
info->p_dev = link;
link->priv = info;
diff --git a/drivers/scsi/pcmcia/nsp_cs.c b/drivers/scsi/pcmcia/nsp_cs.c
index 50d2e4ffe037..ae70fda96ae9 100644
--- a/drivers/scsi/pcmcia/nsp_cs.c
+++ b/drivers/scsi/pcmcia/nsp_cs.c
@@ -1520,7 +1520,7 @@ static int nsp_cs_probe(struct pcmcia_device *link)
nsp_dbg(NSP_DEBUG_INIT, "in");
/* Create new SCSI device */
- info = kzalloc_obj(*info, GFP_KERNEL);
+ info = kzalloc_obj(*info);
if (info == NULL) { return -ENOMEM; }
info->p_dev = link;
link->priv = info;
diff --git a/drivers/scsi/pcmcia/qlogic_stub.c b/drivers/scsi/pcmcia/qlogic_stub.c
index f24223fc58b8..5d8a434d3f66 100644
--- a/drivers/scsi/pcmcia/qlogic_stub.c
+++ b/drivers/scsi/pcmcia/qlogic_stub.c
@@ -152,7 +152,7 @@ static int qlogic_probe(struct pcmcia_device *link)
dev_dbg(&link->dev, "qlogic_attach()\n");
/* Create new SCSI device */
- info = kzalloc_obj(*info, GFP_KERNEL);
+ info = kzalloc_obj(*info);
if (!info)
return -ENOMEM;
info->p_dev = link;
diff --git a/drivers/scsi/pcmcia/sym53c500_cs.c b/drivers/scsi/pcmcia/sym53c500_cs.c
index 2accb2c538f0..1530c1ad5d36 100644
--- a/drivers/scsi/pcmcia/sym53c500_cs.c
+++ b/drivers/scsi/pcmcia/sym53c500_cs.c
@@ -849,7 +849,7 @@ SYM53C500_probe(struct pcmcia_device *link)
dev_dbg(&link->dev, "SYM53C500_attach()\n");
/* Create new SCSI device */
- info = kzalloc_obj(*info, GFP_KERNEL);
+ info = kzalloc_obj(*info);
if (!info)
return -ENOMEM;
info->p_dev = link;
diff --git a/drivers/scsi/pm8001/pm8001_hwi.c b/drivers/scsi/pm8001/pm8001_hwi.c
index 68b4ddcb7781..fff8d877abb9 100644
--- a/drivers/scsi/pm8001/pm8001_hwi.c
+++ b/drivers/scsi/pm8001/pm8001_hwi.c
@@ -4371,7 +4371,7 @@ int pm8001_chip_get_nvmd_req(struct pm8001_hba_info *pm8001_ha,
struct pm8001_ioctl_payload *ioctl_payload = payload;
nvmd_type = ioctl_payload->minor_function;
- fw_control_context = kzalloc_obj(struct fw_control_ex, GFP_KERNEL);
+ fw_control_context = kzalloc_obj(struct fw_control_ex);
if (!fw_control_context)
return -ENOMEM;
fw_control_context->usrAddr = (u8 *)ioctl_payload->func_specific;
@@ -4464,7 +4464,7 @@ int pm8001_chip_set_nvmd_req(struct pm8001_hba_info *pm8001_ha,
struct pm8001_ioctl_payload *ioctl_payload = payload;
nvmd_type = ioctl_payload->minor_function;
- fw_control_context = kzalloc_obj(struct fw_control_ex, GFP_KERNEL);
+ fw_control_context = kzalloc_obj(struct fw_control_ex);
if (!fw_control_context)
return -ENOMEM;
@@ -4579,7 +4579,7 @@ pm8001_chip_fw_flash_update_req(struct pm8001_hba_info *pm8001_ha,
dma_addr_t phys_addr = pm8001_ha->memoryMap.region[FW_FLASH].phys_addr;
struct pm8001_ioctl_payload *ioctl_payload = payload;
- fw_control_context = kzalloc_obj(struct fw_control_ex, GFP_KERNEL);
+ fw_control_context = kzalloc_obj(struct fw_control_ex);
if (!fw_control_context)
return -ENOMEM;
fw_control = (struct fw_control_info *)&ioctl_payload->func_specific;
diff --git a/drivers/scsi/pm8001/pm8001_init.c b/drivers/scsi/pm8001/pm8001_init.c
index 631b7fa47fce..e93ea76b565e 100644
--- a/drivers/scsi/pm8001/pm8001_init.c
+++ b/drivers/scsi/pm8001/pm8001_init.c
@@ -622,7 +622,7 @@ static int pm8001_prep_sas_ha_init(struct Scsi_Host *shost,
sha->sas_phy = arr_phy;
sha->sas_port = arr_port;
- sha->lldd_ha = kzalloc_obj(struct pm8001_hba_info, GFP_KERNEL);
+ sha->lldd_ha = kzalloc_obj(struct pm8001_hba_info);
if (!sha->lldd_ha)
goto exit_free1;
@@ -1148,7 +1148,7 @@ static int pm8001_pci_probe(struct pci_dev *pdev,
goto err_out_regions;
}
chip = &pm8001_chips[ent->driver_data];
- sha = kzalloc_obj(struct sas_ha_struct, GFP_KERNEL);
+ sha = kzalloc_obj(struct sas_ha_struct);
if (!sha) {
rc = -ENOMEM;
goto err_out_free_host;
@@ -1264,7 +1264,7 @@ static int pm8001_init_ccb_tag(struct pm8001_hba_info *pm8001_ha)
/* Memory region for ccb_info*/
pm8001_ha->ccb_count = ccb_count;
pm8001_ha->ccb_info =
- kzalloc_objs(struct pm8001_ccb_info, ccb_count, GFP_KERNEL);
+ kzalloc_objs(struct pm8001_ccb_info, ccb_count);
if (!pm8001_ha->ccb_info) {
pm8001_dbg(pm8001_ha, FAIL,
"Unable to allocate memory for ccb\n");
diff --git a/drivers/scsi/pm8001/pm80xx_hwi.c b/drivers/scsi/pm8001/pm80xx_hwi.c
index 77ded22a26c7..954f307352e6 100644
--- a/drivers/scsi/pm8001/pm80xx_hwi.c
+++ b/drivers/scsi/pm8001/pm80xx_hwi.c
@@ -1563,7 +1563,7 @@ void pm80xx_fatal_error_uevent_emit(struct pm8001_hba_info *pm8001_ha,
pm8001_dbg(pm8001_ha, FAIL, "emitting fatal error uevent");
- env = kzalloc_obj(struct kobj_uevent_env, GFP_KERNEL);
+ env = kzalloc_obj(struct kobj_uevent_env);
if (!env)
return;
diff --git a/drivers/scsi/pmcraid.c b/drivers/scsi/pmcraid.c
index ff31e12aaba0..ce76c9dd6171 100644
--- a/drivers/scsi/pmcraid.c
+++ b/drivers/scsi/pmcraid.c
@@ -3468,7 +3468,7 @@ static long pmcraid_chr_ioctl(
void __user *argp = (void __user *)arg;
int retval = -ENOTTY;
- hdr = kmalloc_obj(struct pmcraid_ioctl_header, GFP_KERNEL);
+ hdr = kmalloc_obj(struct pmcraid_ioctl_header);
if (!hdr) {
pmcraid_err("failed to allocate memory for ioctl header\n");
diff --git a/drivers/scsi/ppa.c b/drivers/scsi/ppa.c
index 7c8923368edd..8a4e910d5758 100644
--- a/drivers/scsi/ppa.c
+++ b/drivers/scsi/ppa.c
@@ -1042,7 +1042,7 @@ static int __ppa_attach(struct parport *pb)
int err = -ENOMEM;
struct pardev_cb ppa_cb;
- dev = kzalloc_obj(ppa_struct, GFP_KERNEL);
+ dev = kzalloc_obj(ppa_struct);
if (!dev)
return -ENOMEM;
dev->base = -1;
diff --git a/drivers/scsi/qedf/qedf_debugfs.c b/drivers/scsi/qedf/qedf_debugfs.c
index 9b2ed9cb6245..a9d109c2cb4d 100644
--- a/drivers/scsi/qedf/qedf_debugfs.c
+++ b/drivers/scsi/qedf/qedf_debugfs.c
@@ -422,7 +422,7 @@ qedf_offload_stats_show(struct seq_file *s, void *unused)
struct qedf_ctx *qedf = s->private;
struct qed_fcoe_stats *fw_fcoe_stats;
- fw_fcoe_stats = kmalloc_obj(struct qed_fcoe_stats, GFP_KERNEL);
+ fw_fcoe_stats = kmalloc_obj(struct qed_fcoe_stats);
if (!fw_fcoe_stats) {
QEDF_ERR(&(qedf->dbg_ctx), "Could not allocate memory for "
"fw_fcoe_stats.\n");
diff --git a/drivers/scsi/qedf/qedf_io.c b/drivers/scsi/qedf/qedf_io.c
index 73a0ce7e5180..af1a34bed2f1 100644
--- a/drivers/scsi/qedf/qedf_io.c
+++ b/drivers/scsi/qedf/qedf_io.c
@@ -254,7 +254,7 @@ struct qedf_cmd_mgr *qedf_cmd_mgr_alloc(struct qedf_ctx *qedf)
}
/* Allocate pool of io_bdts - one for each qedf_ioreq */
- cmgr->io_bdt_pool = kmalloc_objs(struct io_bdt *, num_ios, GFP_KERNEL);
+ cmgr->io_bdt_pool = kmalloc_objs(struct io_bdt *, num_ios);
if (!cmgr->io_bdt_pool) {
QEDF_WARN(&(qedf->dbg_ctx), "Failed to alloc io_bdt_pool.\n");
@@ -262,7 +262,7 @@ struct qedf_cmd_mgr *qedf_cmd_mgr_alloc(struct qedf_ctx *qedf)
}
for (i = 0; i < num_ios; i++) {
- cmgr->io_bdt_pool[i] = kmalloc_obj(struct io_bdt, GFP_KERNEL);
+ cmgr->io_bdt_pool[i] = kmalloc_obj(struct io_bdt);
if (!cmgr->io_bdt_pool[i]) {
QEDF_WARN(&(qedf->dbg_ctx),
"Failed to alloc io_bdt_pool[%d].\n", i);
diff --git a/drivers/scsi/qedf/qedf_main.c b/drivers/scsi/qedf/qedf_main.c
index c712fdf86911..f1b6abba81e6 100644
--- a/drivers/scsi/qedf/qedf_main.c
+++ b/drivers/scsi/qedf/qedf_main.c
@@ -2082,7 +2082,7 @@ static struct fc_host_statistics *qedf_fc_get_host_stats(struct Scsi_Host
if (lport->vport)
goto out;
- fw_fcoe_stats = kmalloc_obj(struct qed_fcoe_stats, GFP_KERNEL);
+ fw_fcoe_stats = kmalloc_obj(struct qed_fcoe_stats);
if (!fw_fcoe_stats) {
QEDF_ERR(&(qedf->dbg_ctx), "Could not allocate memory for "
"fw_fcoe_stats.\n");
@@ -2778,7 +2778,7 @@ static int qedf_prepare_sb(struct qedf_ctx *qedf)
int ret;
qedf->fp_array =
- kzalloc_objs(struct qedf_fastpath, qedf->num_queues, GFP_KERNEL);
+ kzalloc_objs(struct qedf_fastpath, qedf->num_queues);
if (!qedf->fp_array) {
QEDF_ERR(&(qedf->dbg_ctx), "fastpath array allocation "
@@ -2789,7 +2789,7 @@ static int qedf_prepare_sb(struct qedf_ctx *qedf)
for (id = 0; id < qedf->num_queues; id++) {
fp = &(qedf->fp_array[id]);
fp->sb_id = QEDF_SB_ID_NULL;
- fp->sb_info = kzalloc_objs(*fp->sb_info, 1, GFP_KERNEL);
+ fp->sb_info = kzalloc_objs(*fp->sb_info, 1);
if (!fp->sb_info) {
QEDF_ERR(&(qedf->dbg_ctx), "SB info struct "
"allocation failed.\n");
diff --git a/drivers/scsi/qedi/qedi_iscsi.c b/drivers/scsi/qedi/qedi_iscsi.c
index 65fdbc07de43..6ab3a989d281 100644
--- a/drivers/scsi/qedi/qedi_iscsi.c
+++ b/drivers/scsi/qedi/qedi_iscsi.c
@@ -440,7 +440,7 @@ static int qedi_iscsi_update_conn(struct qedi_ctx *qedi,
qedi_ep = qedi_conn->ep;
- conn_info = kzalloc_obj(*conn_info, GFP_KERNEL);
+ conn_info = kzalloc_obj(*conn_info);
if (!conn_info) {
QEDI_ERR(&qedi->dbg_ctx, "memory alloc failed\n");
return -ENOMEM;
@@ -505,7 +505,7 @@ static int qedi_iscsi_offload_conn(struct qedi_endpoint *qedi_ep)
int rval;
int i;
- conn_info = kzalloc_obj(*conn_info, GFP_KERNEL);
+ conn_info = kzalloc_obj(*conn_info);
if (!conn_info) {
QEDI_ERR(&qedi->dbg_ctx,
"Failed to allocate memory ep=%p\n", qedi_ep);
diff --git a/drivers/scsi/qedi/qedi_main.c b/drivers/scsi/qedi/qedi_main.c
index 14ec6cb44316..ddb061ac300b 100644
--- a/drivers/scsi/qedi/qedi_main.c
+++ b/drivers/scsi/qedi/qedi_main.c
@@ -276,7 +276,7 @@ static int qedi_alloc_uio_rings(struct qedi_ctx *qedi)
}
}
- udev = kzalloc_obj(*udev, GFP_KERNEL);
+ udev = kzalloc_obj(*udev);
if (!udev)
goto err_udev;
@@ -956,7 +956,7 @@ static int qedi_find_boot_info(struct qedi_ctx *qedi,
pri_ctrl_flags = !!(block->target[0].ctrl_flags &
NVM_ISCSI_CFG_TARGET_ENABLED);
if (pri_ctrl_flags) {
- pri_tgt = kzalloc_obj(*pri_tgt, GFP_KERNEL);
+ pri_tgt = kzalloc_obj(*pri_tgt);
if (!pri_tgt)
return -1;
qedi_get_boot_tgt_info(block, pri_tgt, 0);
@@ -965,7 +965,7 @@ static int qedi_find_boot_info(struct qedi_ctx *qedi,
sec_ctrl_flags = !!(block->target[1].ctrl_flags &
NVM_ISCSI_CFG_TARGET_ENABLED);
if (sec_ctrl_flags) {
- sec_tgt = kzalloc_obj(*sec_tgt, GFP_KERNEL);
+ sec_tgt = kzalloc_obj(*sec_tgt);
if (!sec_tgt) {
ret = -1;
goto free_tgt;
@@ -1066,7 +1066,7 @@ static void qedi_get_protocol_tlv_data(void *dev, void *data)
struct qedi_ctx *qedi = dev;
int rval = 0;
- fw_iscsi_stats = kmalloc_obj(*fw_iscsi_stats, GFP_KERNEL);
+ fw_iscsi_stats = kmalloc_obj(*fw_iscsi_stats);
if (!fw_iscsi_stats) {
QEDI_ERR(&qedi->dbg_ctx,
"Could not allocate memory for fw_iscsi_stats.\n");
diff --git a/drivers/scsi/qla2xxx/qla_bsg.c b/drivers/scsi/qla2xxx/qla_bsg.c
index 924b07f56c80..5e910b5ca670 100644
--- a/drivers/scsi/qla2xxx/qla_bsg.c
+++ b/drivers/scsi/qla2xxx/qla_bsg.c
@@ -2395,7 +2395,7 @@ qla2x00_do_dport_diagnostics(struct bsg_job *bsg_job)
!IS_QLA28XX(vha->hw))
return -EPERM;
- dd = kmalloc_obj(*dd, GFP_KERNEL);
+ dd = kmalloc_obj(*dd);
if (!dd) {
ql_log(ql_log_warn, vha, 0x70db,
"Failed to allocate memory for dport.\n");
@@ -2441,7 +2441,7 @@ qla2x00_do_dport_diagnostics_v2(struct bsg_job *bsg_job)
if (!IS_DPORT_CAPABLE(vha->hw))
return -EPERM;
- dd = kzalloc_obj(*dd, GFP_KERNEL);
+ dd = kzalloc_obj(*dd);
if (!dd)
return -ENOMEM;
@@ -2598,7 +2598,7 @@ qla2x00_manage_host_stats(struct bsg_job *bsg_job)
return -EIO;
}
- req_data = kzalloc_obj(*req_data, GFP_KERNEL);
+ req_data = kzalloc_obj(*req_data);
if (!req_data) {
ql_log(ql_log_warn, vha, 0x0000, "req_data memory allocation failure.\n");
return -ENOMEM;
@@ -2669,7 +2669,7 @@ qla2x00_get_host_stats(struct bsg_job *bsg_job)
return -EIO;
}
- req_data = kzalloc_obj(*req_data, GFP_KERNEL);
+ req_data = kzalloc_obj(*req_data);
if (!req_data) {
ql_log(ql_log_warn, vha, 0x0000, "req_data memory allocation failure.\n");
return -ENOMEM;
@@ -2776,7 +2776,7 @@ qla2x00_get_tgt_stats(struct bsg_job *bsg_job)
return -EIO;
}
- req_data = kzalloc_obj(*req_data, GFP_KERNEL);
+ req_data = kzalloc_obj(*req_data);
if (!req_data) {
ql_log(ql_log_warn, vha, 0x0000, "req_data memory allocation failure.\n");
return -ENOMEM;
@@ -2859,7 +2859,7 @@ qla2x00_manage_host_port(struct bsg_job *bsg_job)
return -EIO;
}
- req_data = kzalloc_obj(*req_data, GFP_KERNEL);
+ req_data = kzalloc_obj(*req_data);
if (!req_data) {
ql_log(ql_log_warn, vha, 0x0000, "req_data memory allocation failure.\n");
return -ENOMEM;
diff --git a/drivers/scsi/qla2xxx/qla_edif.c b/drivers/scsi/qla2xxx/qla_edif.c
index a2db229d3af4..eccedb38a515 100644
--- a/drivers/scsi/qla2xxx/qla_edif.c
+++ b/drivers/scsi/qla2xxx/qla_edif.c
@@ -1393,7 +1393,7 @@ qla_edif_add_sa_ctl(fc_port_t *fcport, struct qla_sa_update_frame *sa_frame,
int index = sa_frame->fast_sa_index;
unsigned long flags = 0;
- sa_ctl = kzalloc_obj(*sa_ctl, GFP_KERNEL);
+ sa_ctl = kzalloc_obj(*sa_ctl);
if (!sa_ctl) {
/* couldn't get space */
ql_dbg(ql_dbg_edif, fcport->vha, 0x9100,
@@ -3381,7 +3381,7 @@ void qla_edif_sadb_release(struct qla_hw_data *ha)
int qla_edif_sadb_build_free_pool(struct qla_hw_data *ha)
{
ha->edif_tx_sa_id_map =
- kzalloc_objs(long, BITS_TO_LONGS(EDIF_NUM_SA_INDEX), GFP_KERNEL);
+ kzalloc_objs(long, BITS_TO_LONGS(EDIF_NUM_SA_INDEX));
if (!ha->edif_tx_sa_id_map) {
ql_log_pci(ql_log_fatal, ha->pdev, 0x0009,
@@ -3390,7 +3390,7 @@ int qla_edif_sadb_build_free_pool(struct qla_hw_data *ha)
}
ha->edif_rx_sa_id_map =
- kzalloc_objs(long, BITS_TO_LONGS(EDIF_NUM_SA_INDEX), GFP_KERNEL);
+ kzalloc_objs(long, BITS_TO_LONGS(EDIF_NUM_SA_INDEX));
if (!ha->edif_rx_sa_id_map) {
kfree(ha->edif_tx_sa_id_map);
ha->edif_tx_sa_id_map = NULL;
diff --git a/drivers/scsi/qla2xxx/qla_init.c b/drivers/scsi/qla2xxx/qla_init.c
index 808acf7daf4d..5badce1b8ff5 100644
--- a/drivers/scsi/qla2xxx/qla_init.c
+++ b/drivers/scsi/qla2xxx/qla_init.c
@@ -9230,7 +9230,7 @@ qla84xx_get_chip(struct scsi_qla_host *vha)
}
}
- cs84xx = kzalloc_obj(*cs84xx, GFP_KERNEL);
+ cs84xx = kzalloc_obj(*cs84xx);
if (!cs84xx)
goto done;
@@ -9884,7 +9884,7 @@ struct qla_qpair *qla2xxx_create_qpair(struct scsi_qla_host *vha, int qos,
}
if (ql2xmqsupport || ql2xnvmeenable) {
- qpair = kzalloc_obj(struct qla_qpair, GFP_KERNEL);
+ qpair = kzalloc_obj(struct qla_qpair);
if (qpair == NULL) {
ql_log(ql_log_warn, vha, 0x0182,
"Failed to allocate memory for queue pair.\n");
diff --git a/drivers/scsi/qla2xxx/qla_mid.c b/drivers/scsi/qla2xxx/qla_mid.c
index 34928d981677..6dca934b033a 100644
--- a/drivers/scsi/qla2xxx/qla_mid.c
+++ b/drivers/scsi/qla2xxx/qla_mid.c
@@ -707,7 +707,7 @@ qla25xx_create_req_que(struct qla_hw_data *ha, uint16_t options,
device_reg_t *reg;
uint32_t cnt;
- req = kzalloc_obj(struct req_que, GFP_KERNEL);
+ req = kzalloc_obj(struct req_que);
if (req == NULL) {
ql_log(ql_log_fatal, base_vha, 0x00d9,
"Failed to allocate memory for request queue.\n");
@@ -834,7 +834,7 @@ qla25xx_create_rsp_que(struct qla_hw_data *ha, uint16_t options,
uint16_t que_id = 0;
device_reg_t *reg;
- rsp = kzalloc_obj(struct rsp_que, GFP_KERNEL);
+ rsp = kzalloc_obj(struct rsp_que);
if (rsp == NULL) {
ql_log(ql_log_warn, base_vha, 0x0066,
"Failed to allocate memory for response queue.\n");
diff --git a/drivers/scsi/qla2xxx/qla_nx.c b/drivers/scsi/qla2xxx/qla_nx.c
index ec47ef3f0783..298c060c1292 100644
--- a/drivers/scsi/qla2xxx/qla_nx.c
+++ b/drivers/scsi/qla2xxx/qla_nx.c
@@ -1183,7 +1183,7 @@ qla82xx_pinit_from_rom(scsi_qla_host_t *vha)
ql_log(ql_log_info, vha, 0x0072,
"%d CRB init values found in ROM.\n", n);
- buf = kmalloc_objs(struct crb_addr_pair, n, GFP_KERNEL);
+ buf = kmalloc_objs(struct crb_addr_pair, n);
if (buf == NULL) {
ql_log(ql_log_fatal, vha, 0x010c,
"Unable to allocate memory.\n");
diff --git a/drivers/scsi/qla2xxx/qla_os.c b/drivers/scsi/qla2xxx/qla_os.c
index 89540254b784..976181464fbb 100644
--- a/drivers/scsi/qla2xxx/qla_os.c
+++ b/drivers/scsi/qla2xxx/qla_os.c
@@ -454,7 +454,7 @@ static int qla2x00_alloc_queues(struct qla_hw_data *ha, struct req_que *req,
goto fail_rsp_map;
}
- ha->base_qpair = kzalloc_obj(struct qla_qpair, GFP_KERNEL);
+ ha->base_qpair = kzalloc_obj(struct qla_qpair);
if (ha->base_qpair == NULL) {
ql_log(ql_log_warn, vha, 0x00e0,
"Failed to allocate base queue pair memory.\n");
@@ -2960,7 +2960,7 @@ qla2x00_probe_one(struct pci_dev *pdev, const struct pci_device_id *id)
ql2xallocfwdump = 0;
}
- ha = kzalloc_obj(struct qla_hw_data, GFP_KERNEL);
+ ha = kzalloc_obj(struct qla_hw_data);
if (!ha) {
ql_log_pci(ql_log_fatal, pdev, 0x0009,
"Unable to allocate memory for ha.\n");
@@ -4336,7 +4336,7 @@ qla2x00_mem_alloc(struct qla_hw_data *ha, uint16_t req_len, uint16_t rsp_len,
}
/* Allocate memory for request ring */
- *req = kzalloc_obj(struct req_que, GFP_KERNEL);
+ *req = kzalloc_obj(struct req_que);
if (!*req) {
ql_log_pci(ql_log_fatal, ha->pdev, 0x0028,
"Failed to allocate memory for req.\n");
@@ -4352,7 +4352,7 @@ qla2x00_mem_alloc(struct qla_hw_data *ha, uint16_t req_len, uint16_t rsp_len,
goto fail_req_ring;
}
/* Allocate memory for response ring */
- *rsp = kzalloc_obj(struct rsp_que, GFP_KERNEL);
+ *rsp = kzalloc_obj(struct rsp_que);
if (!*rsp) {
ql_log_pci(ql_log_fatal, ha->pdev, 0x002a,
"Failed to allocate memory for rsp.\n");
@@ -6017,7 +6017,7 @@ qla25xx_rdp_rsp_reduce_size(struct scsi_qla_host *vha,
ql_dbg(ql_dbg_init, vha, 0x0181, "%s: s_id=%#x\n", __func__, sid);
- pdb = kzalloc_obj(*pdb, GFP_KERNEL);
+ pdb = kzalloc_obj(*pdb);
if (!pdb) {
ql_dbg(ql_dbg_init, vha, 0x0181,
"%s: Failed allocate pdb\n", __func__);
diff --git a/drivers/scsi/qla2xxx/qla_target.c b/drivers/scsi/qla2xxx/qla_target.c
index 8062dad21d4e..9c9cb5c97f5c 100644
--- a/drivers/scsi/qla2xxx/qla_target.c
+++ b/drivers/scsi/qla2xxx/qla_target.c
@@ -7458,7 +7458,7 @@ int qlt_add_target(struct qla_hw_data *ha, struct scsi_qla_host *base_vha)
BUG_ON(base_vha->vha_tgt.qla_tgt != NULL);
- tgt = kzalloc_obj(struct qla_tgt, GFP_KERNEL);
+ tgt = kzalloc_obj(struct qla_tgt);
if (!tgt) {
ql_dbg(ql_dbg_tgt, base_vha, 0xe066,
"Unable to allocate struct qla_tgt\n");
diff --git a/drivers/scsi/qla2xxx/tcm_qla2xxx.c b/drivers/scsi/qla2xxx/tcm_qla2xxx.c
index 2eae89aad109..28df9025def0 100644
--- a/drivers/scsi/qla2xxx/tcm_qla2xxx.c
+++ b/drivers/scsi/qla2xxx/tcm_qla2xxx.c
@@ -1015,7 +1015,7 @@ static struct se_portal_group *tcm_qla2xxx_make_tpg(struct se_wwn *wwn,
return ERR_PTR(-ENOSYS);
}
- tpg = kzalloc_obj(struct tcm_qla2xxx_tpg, GFP_KERNEL);
+ tpg = kzalloc_obj(struct tcm_qla2xxx_tpg);
if (!tpg) {
pr_err("Unable to allocate struct tcm_qla2xxx_tpg\n");
return ERR_PTR(-ENOMEM);
@@ -1106,7 +1106,7 @@ static struct se_portal_group *tcm_qla2xxx_npiv_make_tpg(struct se_wwn *wwn,
if (kstrtoul(name + 5, 10, &tpgt) || tpgt > USHRT_MAX)
return ERR_PTR(-EINVAL);
- tpg = kzalloc_obj(struct tcm_qla2xxx_tpg, GFP_KERNEL);
+ tpg = kzalloc_obj(struct tcm_qla2xxx_tpg);
if (!tpg) {
pr_err("Unable to allocate struct tcm_qla2xxx_tpg\n");
return ERR_PTR(-ENOMEM);
@@ -1609,7 +1609,7 @@ static struct se_wwn *tcm_qla2xxx_make_lport(
if (tcm_qla2xxx_parse_wwn(name, &wwpn, 1) < 0)
return ERR_PTR(-EINVAL);
- lport = kzalloc_obj(struct tcm_qla2xxx_lport, GFP_KERNEL);
+ lport = kzalloc_obj(struct tcm_qla2xxx_lport);
if (!lport) {
pr_err("Unable to allocate struct tcm_qla2xxx_lport\n");
return ERR_PTR(-ENOMEM);
@@ -1735,7 +1735,7 @@ static struct se_wwn *tcm_qla2xxx_npiv_make_lport(
&npiv_wwpn, &npiv_wwnn) < 0)
return ERR_PTR(-EINVAL);
- lport = kzalloc_obj(struct tcm_qla2xxx_lport, GFP_KERNEL);
+ lport = kzalloc_obj(struct tcm_qla2xxx_lport);
if (!lport) {
pr_err("Unable to allocate struct tcm_qla2xxx_lport for NPIV\n");
return ERR_PTR(-ENOMEM);
diff --git a/drivers/scsi/qla4xxx/ql4_iocb.c b/drivers/scsi/qla4xxx/ql4_iocb.c
index 3ec9321f41e2..c40441b12db9 100644
--- a/drivers/scsi/qla4xxx/ql4_iocb.c
+++ b/drivers/scsi/qla4xxx/ql4_iocb.c
@@ -451,7 +451,7 @@ static struct mrb *qla4xxx_get_new_mrb(struct scsi_qla_host *ha)
{
struct mrb *mrb;
- mrb = kzalloc_obj(*mrb, GFP_KERNEL);
+ mrb = kzalloc_obj(*mrb);
if (!mrb)
return mrb;
diff --git a/drivers/scsi/qla4xxx/ql4_nx.c b/drivers/scsi/qla4xxx/ql4_nx.c
index 47b9fea0a989..f7340cfc990a 100644
--- a/drivers/scsi/qla4xxx/ql4_nx.c
+++ b/drivers/scsi/qla4xxx/ql4_nx.c
@@ -1058,7 +1058,7 @@ qla4_82xx_pinit_from_rom(struct scsi_qla_host *ha, int verbose)
ql4_printk(KERN_INFO, ha,
"%s: %d CRB init values found in ROM.\n", DRIVER_NAME, n);
- buf = kmalloc_objs(struct crb_addr_pair, n, GFP_KERNEL);
+ buf = kmalloc_objs(struct crb_addr_pair, n);
if (buf == NULL) {
ql4_printk(KERN_WARNING, ha,
"%s: [ERROR] Unable to malloc memory.\n", DRIVER_NAME);
diff --git a/drivers/scsi/raid_class.c b/drivers/scsi/raid_class.c
index 46fb627f61d6..94f76e358634 100644
--- a/drivers/scsi/raid_class.c
+++ b/drivers/scsi/raid_class.c
@@ -81,7 +81,7 @@ static int raid_setup(struct transport_container *tc, struct device *dev,
BUG_ON(dev_get_drvdata(cdev));
- rd = kzalloc_obj(*rd, GFP_KERNEL);
+ rd = kzalloc_obj(*rd);
if (!rd)
return -ENOMEM;
@@ -212,7 +212,7 @@ raid_attr_ro_state_fn(state);
struct raid_template *
raid_class_attach(struct raid_function_template *ft)
{
- struct raid_internal *i = kzalloc_obj(struct raid_internal, GFP_KERNEL);
+ struct raid_internal *i = kzalloc_obj(struct raid_internal);
int count = 0;
if (unlikely(!i))
diff --git a/drivers/scsi/scsi_debug.c b/drivers/scsi/scsi_debug.c
index fb609d2db056..91933d2f5159 100644
--- a/drivers/scsi/scsi_debug.c
+++ b/drivers/scsi/scsi_debug.c
@@ -1169,7 +1169,7 @@ static ssize_t sdebug_error_write(struct file *file, const char __user *ubuf,
return -EINVAL;
}
- inject = kzalloc_obj(struct sdebug_err_inject, GFP_KERNEL);
+ inject = kzalloc_obj(struct sdebug_err_inject);
if (!inject) {
kfree(buf);
return -ENOMEM;
@@ -1266,7 +1266,7 @@ static int sdebug_target_alloc(struct scsi_target *starget)
{
struct sdebug_target_info *targetip;
- targetip = kzalloc_obj(struct sdebug_target_info, GFP_KERNEL);
+ targetip = kzalloc_obj(struct sdebug_target_info);
if (!targetip)
return -ENOMEM;
@@ -8791,7 +8791,7 @@ static int sdebug_add_store(void)
struct sdeb_store_info *sip = NULL;
struct xa_limit xal = { .max = 1 << 16, .min = 0 };
- sip = kzalloc_obj(*sip, GFP_KERNEL);
+ sip = kzalloc_obj(*sip);
if (!sip)
return -ENOMEM;
@@ -8868,7 +8868,7 @@ static int sdebug_add_host_helper(int per_host_idx)
struct sdebug_host_info *sdbg_host;
struct sdebug_dev_info *sdbg_devinfo, *tmp;
- sdbg_host = kzalloc_obj(*sdbg_host, GFP_KERNEL);
+ sdbg_host = kzalloc_obj(*sdbg_host);
if (!sdbg_host)
return -ENOMEM;
idx = (per_host_idx < 0) ? sdeb_first_idx : per_host_idx;
diff --git a/drivers/scsi/scsi_devinfo.c b/drivers/scsi/scsi_devinfo.c
index bb27ae42c594..0dada89d8d99 100644
--- a/drivers/scsi/scsi_devinfo.c
+++ b/drivers/scsi/scsi_devinfo.c
@@ -355,7 +355,7 @@ int scsi_dev_info_list_add_keyed(int compatible, char *vendor, char *model,
if (IS_ERR(devinfo_table))
return PTR_ERR(devinfo_table);
- devinfo = kmalloc_obj(*devinfo, GFP_KERNEL);
+ devinfo = kmalloc_obj(*devinfo);
if (!devinfo) {
printk(KERN_ERR "%s: no memory\n", __func__);
return -ENOMEM;
@@ -615,7 +615,7 @@ static int devinfo_seq_show(struct seq_file *m, void *v)
static void *devinfo_seq_start(struct seq_file *m, loff_t *ppos)
{
- struct double_list *dl = kmalloc_obj(*dl, GFP_KERNEL);
+ struct double_list *dl = kmalloc_obj(*dl);
loff_t pos = *ppos;
if (!dl)
@@ -759,7 +759,7 @@ int scsi_dev_info_add_list(enum scsi_devinfo_key key, const char *name)
/* list already exists */
return -EEXIST;
- devinfo_table = kmalloc_obj(*devinfo_table, GFP_KERNEL);
+ devinfo_table = kmalloc_obj(*devinfo_table);
if (!devinfo_table)
return -ENOMEM;
diff --git a/drivers/scsi/scsi_proc.c b/drivers/scsi/scsi_proc.c
index 046871351dc0..1799dcae775c 100644
--- a/drivers/scsi/scsi_proc.c
+++ b/drivers/scsi/scsi_proc.c
@@ -162,7 +162,7 @@ int scsi_proc_hostdir_add(const struct scsi_host_template *sht)
mutex_lock(&global_host_template_mutex);
e = __scsi_lookup_proc_entry(sht);
if (!e) {
- e = kzalloc_obj(*e, GFP_KERNEL);
+ e = kzalloc_obj(*e);
if (!e) {
ret = -ENOMEM;
goto unlock;
diff --git a/drivers/scsi/scsi_scan.c b/drivers/scsi/scsi_scan.c
index ca2bda973aad..60c06fa4ec32 100644
--- a/drivers/scsi/scsi_scan.c
+++ b/drivers/scsi/scsi_scan.c
@@ -1954,7 +1954,7 @@ static struct async_scan_data *scsi_prep_async_scan(struct Scsi_Host *shost)
goto err;
}
- data = kmalloc_obj(*data, GFP_KERNEL);
+ data = kmalloc_obj(*data);
if (!data)
goto err;
data->shost = scsi_host_get(shost);
diff --git a/drivers/scsi/scsi_transport_fc.c b/drivers/scsi/scsi_transport_fc.c
index 3ec584e65fb4..dce95e361daf 100644
--- a/drivers/scsi/scsi_transport_fc.c
+++ b/drivers/scsi/scsi_transport_fc.c
@@ -2651,7 +2651,7 @@ struct scsi_transport_template *
fc_attach_transport(struct fc_function_template *ft)
{
int count;
- struct fc_internal *i = kzalloc_obj(struct fc_internal, GFP_KERNEL);
+ struct fc_internal *i = kzalloc_obj(struct fc_internal);
if (unlikely(!i))
return NULL;
diff --git a/drivers/scsi/scsi_transport_iscsi.c b/drivers/scsi/scsi_transport_iscsi.c
index af050a2c628e..8aa76f813bcd 100644
--- a/drivers/scsi/scsi_transport_iscsi.c
+++ b/drivers/scsi/scsi_transport_iscsi.c
@@ -4848,7 +4848,7 @@ iscsi_register_transport(struct iscsi_transport *tt)
if (priv)
return NULL;
- priv = kzalloc_obj(*priv, GFP_KERNEL);
+ priv = kzalloc_obj(*priv);
if (!priv)
return NULL;
INIT_LIST_HEAD(&priv->list);
diff --git a/drivers/scsi/scsi_transport_sas.c b/drivers/scsi/scsi_transport_sas.c
index 9bc00d950f86..12124f9d5ccd 100644
--- a/drivers/scsi/scsi_transport_sas.c
+++ b/drivers/scsi/scsi_transport_sas.c
@@ -712,7 +712,7 @@ struct sas_phy *sas_phy_alloc(struct device *parent, int number)
struct Scsi_Host *shost = dev_to_shost(parent);
struct sas_phy *phy;
- phy = kzalloc_obj(*phy, GFP_KERNEL);
+ phy = kzalloc_obj(*phy);
if (!phy)
return NULL;
@@ -907,7 +907,7 @@ struct sas_port *sas_port_alloc(struct device *parent, int port_id)
struct Scsi_Host *shost = dev_to_shost(parent);
struct sas_port *port;
- port = kzalloc_obj(*port, GFP_KERNEL);
+ port = kzalloc_obj(*port);
if (!port)
return NULL;
@@ -1467,7 +1467,7 @@ struct sas_rphy *sas_end_device_alloc(struct sas_port *parent)
struct Scsi_Host *shost = dev_to_shost(&parent->dev);
struct sas_end_device *rdev;
- rdev = kzalloc_obj(*rdev, GFP_KERNEL);
+ rdev = kzalloc_obj(*rdev);
if (!rdev) {
return NULL;
}
@@ -1511,7 +1511,7 @@ struct sas_rphy *sas_expander_alloc(struct sas_port *parent,
BUG_ON(type != SAS_EDGE_EXPANDER_DEVICE &&
type != SAS_FANOUT_EXPANDER_DEVICE);
- rdev = kzalloc_obj(*rdev, GFP_KERNEL);
+ rdev = kzalloc_obj(*rdev);
if (!rdev) {
return NULL;
}
@@ -1815,7 +1815,7 @@ sas_attach_transport(struct sas_function_template *ft)
struct sas_internal *i;
int count;
- i = kzalloc_obj(struct sas_internal, GFP_KERNEL);
+ i = kzalloc_obj(struct sas_internal);
if (!i)
return NULL;
diff --git a/drivers/scsi/scsi_transport_spi.c b/drivers/scsi/scsi_transport_spi.c
index 1f4299a61e1f..3e3da8c2ff26 100644
--- a/drivers/scsi/scsi_transport_spi.c
+++ b/drivers/scsi/scsi_transport_spi.c
@@ -1570,7 +1570,7 @@ static int spi_target_configure(struct transport_container *tc,
struct scsi_transport_template *
spi_attach_transport(struct spi_function_template *ft)
{
- struct spi_internal *i = kzalloc_obj(struct spi_internal, GFP_KERNEL);
+ struct spi_internal *i = kzalloc_obj(struct spi_internal);
if (unlikely(!i))
return NULL;
diff --git a/drivers/scsi/scsi_transport_srp.c b/drivers/scsi/scsi_transport_srp.c
index ada7e07e5ae0..d71ab5fdb758 100644
--- a/drivers/scsi/scsi_transport_srp.c
+++ b/drivers/scsi/scsi_transport_srp.c
@@ -700,7 +700,7 @@ struct srp_rport *srp_rport_add(struct Scsi_Host *shost,
struct srp_internal *i = to_srp_internal(shost->transportt);
int id, ret;
- rport = kzalloc_obj(*rport, GFP_KERNEL);
+ rport = kzalloc_obj(*rport);
if (!rport)
return ERR_PTR(-ENOMEM);
@@ -814,7 +814,7 @@ srp_attach_transport(struct srp_function_template *ft)
int count;
struct srp_internal *i;
- i = kzalloc_obj(*i, GFP_KERNEL);
+ i = kzalloc_obj(*i);
if (!i)
return NULL;
diff --git a/drivers/scsi/sd.c b/drivers/scsi/sd.c
index 92fbe9caf6be..628a1d0a74ba 100644
--- a/drivers/scsi/sd.c
+++ b/drivers/scsi/sd.c
@@ -3735,7 +3735,7 @@ static void sd_revalidate_disk(struct gendisk *disk)
if (!scsi_device_online(sdp))
return;
- lim = kmalloc_obj(*lim, GFP_KERNEL);
+ lim = kmalloc_obj(*lim);
if (!lim)
return;
@@ -3974,7 +3974,7 @@ static int sd_probe(struct scsi_device *sdp)
"sd_probe\n"));
error = -ENOMEM;
- sdkp = kzalloc_obj(*sdkp, GFP_KERNEL);
+ sdkp = kzalloc_obj(*sdkp);
if (!sdkp)
goto out;
diff --git a/drivers/scsi/ses.c b/drivers/scsi/ses.c
index 901956cf3c5b..c096bbf68b2f 100644
--- a/drivers/scsi/ses.c
+++ b/drivers/scsi/ses.c
@@ -715,7 +715,7 @@ static int ses_intf_add(struct device *cdev)
if (sdev->type != TYPE_ENCLOSURE)
sdev_printk(KERN_NOTICE, sdev, "Embedded Enclosure Device\n");
- ses_dev = kzalloc_obj(*ses_dev, GFP_KERNEL);
+ ses_dev = kzalloc_obj(*ses_dev);
hdr_buf = kzalloc(INIT_ALLOC_SIZE, GFP_KERNEL);
if (!hdr_buf || !ses_dev)
goto err_init_free;
diff --git a/drivers/scsi/sg.c b/drivers/scsi/sg.c
index b04d8ddeb2eb..37bac49f30f0 100644
--- a/drivers/scsi/sg.c
+++ b/drivers/scsi/sg.c
@@ -1436,7 +1436,7 @@ sg_alloc(struct scsi_device *scsidp)
int error;
u32 k;
- sdp = kzalloc_obj(Sg_device, GFP_KERNEL);
+ sdp = kzalloc_obj(Sg_device);
if (!sdp) {
sdev_printk(KERN_WARNING, scsidp, "%s: kmalloc Sg_device "
"failure\n", __func__);
@@ -2456,7 +2456,7 @@ struct sg_proc_deviter {
static void * dev_seq_start(struct seq_file *s, loff_t *pos)
{
- struct sg_proc_deviter * it = kmalloc_obj(*it, GFP_KERNEL);
+ struct sg_proc_deviter * it = kmalloc_obj(*it);
s->private = it;
if (! it)
diff --git a/drivers/scsi/sim710.c b/drivers/scsi/sim710.c
index 16ca6245c51d..408f37003748 100644
--- a/drivers/scsi/sim710.c
+++ b/drivers/scsi/sim710.c
@@ -87,7 +87,7 @@ static int sim710_probe_common(struct device *dev, unsigned long base_addr,
{
struct Scsi_Host * host = NULL;
struct NCR_700_Host_Parameters *hostdata =
- kzalloc_obj(struct NCR_700_Host_Parameters, GFP_KERNEL);
+ kzalloc_obj(struct NCR_700_Host_Parameters);
printk(KERN_NOTICE "sim710: %s\n", dev_name(dev));
printk(KERN_NOTICE "sim710: irq = %d, clock = %d, base = 0x%lx, scsi_id = %d\n",
diff --git a/drivers/scsi/smartpqi/smartpqi_init.c b/drivers/scsi/smartpqi/smartpqi_init.c
index 88b94e611d0f..2fb918677eb6 100644
--- a/drivers/scsi/smartpqi/smartpqi_init.c
+++ b/drivers/scsi/smartpqi/smartpqi_init.c
@@ -888,7 +888,7 @@ static int pqi_get_advanced_raid_bypass_config(struct pqi_ctrl_info *ctrl_info)
struct pqi_raid_path_request request;
struct bmic_sense_feature_buffer *buffer;
- buffer = kmalloc_obj(*buffer, GFP_KERNEL);
+ buffer = kmalloc_obj(*buffer);
if (!buffer)
return -ENOMEM;
@@ -953,7 +953,7 @@ static int pqi_flush_cache(struct pqi_ctrl_info *ctrl_info,
int rc;
struct bmic_flush_cache *flush_cache;
- flush_cache = kzalloc_obj(*flush_cache, GFP_KERNEL);
+ flush_cache = kzalloc_obj(*flush_cache);
if (!flush_cache)
return -ENOMEM;
@@ -982,7 +982,7 @@ static int pqi_set_diag_rescan(struct pqi_ctrl_info *ctrl_info)
int rc;
struct bmic_diag_options *diag;
- diag = kzalloc_obj(*diag, GFP_KERNEL);
+ diag = kzalloc_obj(*diag);
if (!diag)
return -ENOMEM;
@@ -1164,7 +1164,7 @@ static int pqi_report_phys_logical_luns(struct pqi_ctrl_info *ctrl_info, u8 cmd,
void *lun_data = NULL;
struct report_lun_header *report_lun_header;
- report_lun_header = kmalloc_obj(*report_lun_header, GFP_KERNEL);
+ report_lun_header = kmalloc_obj(*report_lun_header);
if (!report_lun_header) {
rc = -ENOMEM;
goto out;
@@ -1478,7 +1478,7 @@ static int pqi_get_raid_map(struct pqi_ctrl_info *ctrl_info,
u32 raid_map_size;
struct raid_map *raid_map;
- raid_map = kmalloc_obj(*raid_map, GFP_KERNEL);
+ raid_map = kmalloc_obj(*raid_map);
if (!raid_map)
return -ENOMEM;
@@ -1616,7 +1616,7 @@ static void pqi_get_volume_status(struct pqi_ctrl_info *ctrl_info,
u32 volume_flags;
struct ciss_vpd_logical_volume_status *vpd;
- vpd = kmalloc_obj(*vpd, GFP_KERNEL);
+ vpd = kmalloc_obj(*vpd);
if (!vpd)
goto no_buffer;
@@ -2447,7 +2447,7 @@ static int pqi_update_scsi_devices(struct pqi_ctrl_info *ctrl_info)
* pqi_get_physical_disk_info() because it's a fairly large
* buffer.
*/
- id_phys = kmalloc_obj(*id_phys, GFP_KERNEL);
+ id_phys = kmalloc_obj(*id_phys);
if (!id_phys) {
dev_warn(&ctrl_info->pci_dev->dev, "%s\n",
out_of_memory_msg);
@@ -2481,7 +2481,7 @@ static int pqi_update_scsi_devices(struct pqi_ctrl_info *ctrl_info)
}
for (i = 0; i < num_new_devices; i++) {
- device = kzalloc_obj(*device, GFP_KERNEL);
+ device = kzalloc_obj(*device);
if (!device) {
dev_warn(&ctrl_info->pci_dev->dev, "%s\n",
out_of_memory_msg);
@@ -4750,7 +4750,7 @@ static int pqi_report_device_capability(struct pqi_ctrl_info *ctrl_info)
struct pqi_device_capability *capability;
struct pqi_iu_layer_descriptor *sop_iu_layer_descriptor;
- capability = kmalloc_obj(*capability, GFP_KERNEL);
+ capability = kmalloc_obj(*capability);
if (!capability)
return -ENOMEM;
@@ -7746,7 +7746,7 @@ static int pqi_get_ctrl_serial_number(struct pqi_ctrl_info *ctrl_info)
int rc;
struct bmic_sense_subsystem_info *sense_info;
- sense_info = kzalloc_obj(*sense_info, GFP_KERNEL);
+ sense_info = kzalloc_obj(*sense_info);
if (!sense_info)
return -ENOMEM;
@@ -7769,7 +7769,7 @@ static int pqi_get_ctrl_product_details(struct pqi_ctrl_info *ctrl_info)
int rc;
struct bmic_identify_controller *identify;
- identify = kmalloc_obj(*identify, GFP_KERNEL);
+ identify = kmalloc_obj(*identify);
if (!identify)
return -ENOMEM;
diff --git a/drivers/scsi/smartpqi/smartpqi_sas_transport.c b/drivers/scsi/smartpqi/smartpqi_sas_transport.c
index 093b2ee39e90..b9c56a3816e0 100644
--- a/drivers/scsi/smartpqi/smartpqi_sas_transport.c
+++ b/drivers/scsi/smartpqi/smartpqi_sas_transport.c
@@ -22,7 +22,7 @@ static struct pqi_sas_phy *pqi_alloc_sas_phy(struct pqi_sas_port *pqi_sas_port)
struct pqi_sas_phy *pqi_sas_phy;
struct sas_phy *phy;
- pqi_sas_phy = kzalloc_obj(*pqi_sas_phy, GFP_KERNEL);
+ pqi_sas_phy = kzalloc_obj(*pqi_sas_phy);
if (!pqi_sas_phy)
return NULL;
@@ -131,7 +131,7 @@ static struct pqi_sas_port *pqi_alloc_sas_port(
struct pqi_sas_port *pqi_sas_port;
struct sas_port *port;
- pqi_sas_port = kzalloc_obj(*pqi_sas_port, GFP_KERNEL);
+ pqi_sas_port = kzalloc_obj(*pqi_sas_port);
if (!pqi_sas_port)
return NULL;
@@ -180,7 +180,7 @@ static struct pqi_sas_node *pqi_alloc_sas_node(struct device *parent_dev)
{
struct pqi_sas_node *pqi_sas_node;
- pqi_sas_node = kzalloc_obj(*pqi_sas_node, GFP_KERNEL);
+ pqi_sas_node = kzalloc_obj(*pqi_sas_node);
if (pqi_sas_node) {
pqi_sas_node->parent_dev = parent_dev;
INIT_LIST_HEAD(&pqi_sas_node->port_list_head);
@@ -463,7 +463,7 @@ pqi_build_csmi_smp_passthru_buffer(struct sas_rphy *rphy,
u32 req_size;
u32 resp_size;
- smp_buf = kzalloc_obj(*smp_buf, GFP_KERNEL);
+ smp_buf = kzalloc_obj(*smp_buf);
if (!smp_buf)
return NULL;
diff --git a/drivers/scsi/sni_53c710.c b/drivers/scsi/sni_53c710.c
index 0e57e873dc42..b504a2cc5041 100644
--- a/drivers/scsi/sni_53c710.c
+++ b/drivers/scsi/sni_53c710.c
@@ -64,7 +64,7 @@ static int snirm710_probe(struct platform_device *dev)
return -ENODEV;
base = res->start;
- hostdata = kzalloc_obj(*hostdata, GFP_KERNEL);
+ hostdata = kzalloc_obj(*hostdata);
if (!hostdata)
return -ENOMEM;
diff --git a/drivers/scsi/snic/snic_disc.c b/drivers/scsi/snic/snic_disc.c
index 064f2d4d0ffc..71d34a702f2a 100644
--- a/drivers/scsi/snic/snic_disc.c
+++ b/drivers/scsi/snic/snic_disc.c
@@ -244,7 +244,7 @@ snic_tgt_create(struct snic *snic, struct snic_tgt_id *tgtid)
return tgt;
}
- tgt = kzalloc_obj(*tgt, GFP_KERNEL);
+ tgt = kzalloc_obj(*tgt);
if (!tgt) {
SNIC_HOST_ERR(snic->shost, "Failure to allocate snic_tgt.\n");
ret = -ENOMEM;
diff --git a/drivers/scsi/snic/snic_main.c b/drivers/scsi/snic/snic_main.c
index f9ee2205407e..82953e6a0915 100644
--- a/drivers/scsi/snic/snic_main.c
+++ b/drivers/scsi/snic/snic_main.c
@@ -818,7 +818,7 @@ snic_global_data_init(void)
struct kmem_cache *cachep;
ssize_t len = 0;
- snic_glob = kzalloc_obj(*snic_glob, GFP_KERNEL);
+ snic_glob = kzalloc_obj(*snic_glob);
if (!snic_glob) {
SNIC_ERR("Failed to allocate Global Context.\n");
diff --git a/drivers/scsi/sr.c b/drivers/scsi/sr.c
index f1871d78c30c..7adb2573f50d 100644
--- a/drivers/scsi/sr.c
+++ b/drivers/scsi/sr.c
@@ -629,7 +629,7 @@ static int sr_probe(struct scsi_device *sdev)
goto fail;
error = -ENOMEM;
- cd = kzalloc_obj(*cd, GFP_KERNEL);
+ cd = kzalloc_obj(*cd);
if (!cd)
goto fail;
diff --git a/drivers/scsi/st.c b/drivers/scsi/st.c
index 438c4e50d0fd..f1c3c4946637 100644
--- a/drivers/scsi/st.c
+++ b/drivers/scsi/st.c
@@ -462,7 +462,7 @@ static struct st_request *st_allocate_request(struct scsi_tape *stp)
{
struct st_request *streq;
- streq = kzalloc_obj(*streq, GFP_KERNEL);
+ streq = kzalloc_obj(*streq);
if (streq)
streq->stp = stp;
else {
@@ -3973,7 +3973,7 @@ static struct st_buffer *new_tape_buffer(int max_sg)
{
struct st_buffer *tb;
- tb = kzalloc_obj(struct st_buffer, GFP_KERNEL);
+ tb = kzalloc_obj(struct st_buffer);
if (!tb) {
printk(KERN_NOTICE "st: Can't allocate new tape buffer.\n");
return NULL;
@@ -3982,7 +3982,7 @@ static struct st_buffer *new_tape_buffer(int max_sg)
tb->use_sg = max_sg;
tb->buffer_size = 0;
- tb->reserved_pages = kzalloc_objs(struct page *, max_sg, GFP_KERNEL);
+ tb->reserved_pages = kzalloc_objs(struct page *, max_sg);
if (!tb->reserved_pages) {
kfree(tb);
return NULL;
@@ -4373,7 +4373,7 @@ static int st_probe(struct scsi_device *SDp)
goto out;
}
- tpnt = kzalloc_obj(struct scsi_tape, GFP_KERNEL);
+ tpnt = kzalloc_obj(struct scsi_tape);
if (tpnt == NULL) {
sdev_printk(KERN_ERR, SDp,
"st: Can't allocate device descriptor.\n");
@@ -4456,7 +4456,7 @@ static int st_probe(struct scsi_device *SDp)
}
tpnt->index = error;
sprintf(tpnt->name, "st%d", tpnt->index);
- tpnt->stats = kzalloc_obj(struct scsi_tape_stats, GFP_KERNEL);
+ tpnt->stats = kzalloc_obj(struct scsi_tape_stats);
if (tpnt->stats == NULL) {
sdev_printk(KERN_ERR, SDp,
"st: Can't allocate statistics.\n");
@@ -5006,7 +5006,7 @@ static int sgl_map_user_pages(struct st_buffer *STbp,
if (count == 0)
return 0;
- pages = kmalloc_objs(*pages, max_pages, GFP_KERNEL);
+ pages = kmalloc_objs(*pages, max_pages);
if (pages == NULL)
return -ENOMEM;
diff --git a/drivers/scsi/stex.c b/drivers/scsi/stex.c
index 1ff8be01b1b1..6aeeb338633d 100644
--- a/drivers/scsi/stex.c
+++ b/drivers/scsi/stex.c
@@ -1757,7 +1757,7 @@ static int stex_probe(struct pci_dev *pdev, const struct pci_device_id *id)
}
}
- hba->ccb = kzalloc_objs(struct st_ccb, ci->rq_count, GFP_KERNEL);
+ hba->ccb = kzalloc_objs(struct st_ccb, ci->rq_count);
if (!hba->ccb) {
err = -ENOMEM;
printk(KERN_ERR DRV_NAME "(%s): ccb alloc failed\n",
diff --git a/drivers/scsi/storvsc_drv.c b/drivers/scsi/storvsc_drv.c
index 4e3ff9e0a794..664ad55728b5 100644
--- a/drivers/scsi/storvsc_drv.c
+++ b/drivers/scsi/storvsc_drv.c
@@ -1970,7 +1970,7 @@ static int storvsc_probe(struct hv_device *device,
host_dev->host = host;
- stor_device = kzalloc_obj(struct storvsc_device, GFP_KERNEL);
+ stor_device = kzalloc_obj(struct storvsc_device);
if (!stor_device) {
ret = -ENOMEM;
goto err_out0;
diff --git a/drivers/scsi/sym53c8xx_2/sym_hipd.c b/drivers/scsi/sym53c8xx_2/sym_hipd.c
index b9117acd324d..c554e4158094 100644
--- a/drivers/scsi/sym53c8xx_2/sym_hipd.c
+++ b/drivers/scsi/sym53c8xx_2/sym_hipd.c
@@ -5655,7 +5655,7 @@ int sym_hcb_attach(struct Scsi_Host *shost, struct sym_fw *fw, struct sym_nvram
/*
* Allocate the array of lists of CCBs hashed by DSA.
*/
- np->ccbh = kzalloc_objs(*np->ccbh, CCB_HASH_SIZE, GFP_KERNEL);
+ np->ccbh = kzalloc_objs(*np->ccbh, CCB_HASH_SIZE);
if (!np->ccbh)
goto attach_failed;
diff --git a/drivers/scsi/virtio_scsi.c b/drivers/scsi/virtio_scsi.c
index 7cccb4e06297..0ed8558dad72 100644
--- a/drivers/scsi/virtio_scsi.c
+++ b/drivers/scsi/virtio_scsi.c
@@ -853,8 +853,8 @@ static int virtscsi_init(struct virtio_device *vdev,
num_req_vqs = vscsi->num_queues;
num_vqs = num_req_vqs + VIRTIO_SCSI_VQ_BASE;
- vqs = kmalloc_objs(struct virtqueue *, num_vqs, GFP_KERNEL);
- vqs_info = kzalloc_objs(*vqs_info, num_vqs, GFP_KERNEL);
+ vqs = kmalloc_objs(struct virtqueue *, num_vqs);
+ vqs_info = kzalloc_objs(*vqs_info, num_vqs);
if (!vqs || !vqs_info) {
err = -ENOMEM;
diff --git a/drivers/scsi/zorro7xx.c b/drivers/scsi/zorro7xx.c
index 392c905726ef..6aca9897b231 100644
--- a/drivers/scsi/zorro7xx.c
+++ b/drivers/scsi/zorro7xx.c
@@ -95,7 +95,7 @@ static int zorro7xx_init_one(struct zorro_dev *z,
return -EBUSY;
}
- hostdata = kzalloc_obj(struct NCR_700_Host_Parameters, GFP_KERNEL);
+ hostdata = kzalloc_obj(struct NCR_700_Host_Parameters);
if (!hostdata) {
printk(KERN_ERR "zorro7xx: Failed to allocate host data\n");
goto out_release;
diff --git a/drivers/scsi/zorro_esp.c b/drivers/scsi/zorro_esp.c
index 39c0357eb8bd..1622285c9aec 100644
--- a/drivers/scsi/zorro_esp.c
+++ b/drivers/scsi/zorro_esp.c
@@ -726,7 +726,7 @@ static int zorro_esp_probe(struct zorro_dev *z,
pr_info("%s found at address 0x%lx.\n", zdd->name, board);
- zep = kzalloc_obj(*zep, GFP_KERNEL);
+ zep = kzalloc_obj(*zep);
if (!zep) {
pr_err("Can't allocate device private data!\n");
return -ENOMEM;
diff --git a/drivers/sh/clk/cpg.c b/drivers/sh/clk/cpg.c
index 58e64a666b2f..f93b8d9d9ca8 100644
--- a/drivers/sh/clk/cpg.c
+++ b/drivers/sh/clk/cpg.c
@@ -459,7 +459,7 @@ int __init sh_clk_fsidiv_register(struct clk *clks, int nr)
for (i = 0; i < nr; i++) {
- map = kzalloc_obj(struct clk_mapping, GFP_KERNEL);
+ map = kzalloc_obj(struct clk_mapping);
if (!map) {
pr_err("%s: unable to alloc memory\n", __func__);
return -ENOMEM;
diff --git a/drivers/sh/maple/maple.c b/drivers/sh/maple/maple.c
index c9c3ba77653a..5585f220e495 100644
--- a/drivers/sh/maple/maple.c
+++ b/drivers/sh/maple/maple.c
@@ -187,7 +187,7 @@ static struct mapleq *maple_allocq(struct maple_device *mdev)
{
struct mapleq *mq;
- mq = kzalloc_obj(*mq, GFP_KERNEL);
+ mq = kzalloc_obj(*mq);
if (!mq)
goto failed_nomem;
@@ -215,7 +215,7 @@ static struct maple_device *maple_alloc_dev(int port, int unit)
/* zero this out to avoid kobj subsystem
* thinking it has already been registered */
- mdev = kzalloc_obj(*mdev, GFP_KERNEL);
+ mdev = kzalloc_obj(*mdev);
if (!mdev)
return NULL;
diff --git a/drivers/siox/siox-core.c b/drivers/siox/siox-core.c
index d058f481a39a..3e8f3b6a4555 100644
--- a/drivers/siox/siox-core.c
+++ b/drivers/siox/siox-core.c
@@ -822,7 +822,7 @@ static struct siox_device *siox_device_add(struct siox_master *smaster,
int ret;
size_t buf_len;
- sdevice = kzalloc_obj(*sdevice, GFP_KERNEL);
+ sdevice = kzalloc_obj(*sdevice);
if (!sdevice)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/slimbus/core.c b/drivers/slimbus/core.c
index 4f796e24a6ed..ee6318e247d3 100644
--- a/drivers/slimbus/core.c
+++ b/drivers/slimbus/core.c
@@ -180,7 +180,7 @@ static struct slim_device *slim_alloc_device(struct slim_controller *ctrl,
struct slim_device *sbdev;
int ret;
- sbdev = kzalloc_obj(*sbdev, GFP_KERNEL);
+ sbdev = kzalloc_obj(*sbdev);
if (!sbdev)
return NULL;
diff --git a/drivers/slimbus/qcom-ngd-ctrl.c b/drivers/slimbus/qcom-ngd-ctrl.c
index 0bead6949410..9aa7218b4e8d 100644
--- a/drivers/slimbus/qcom-ngd-ctrl.c
+++ b/drivers/slimbus/qcom-ngd-ctrl.c
@@ -1523,7 +1523,7 @@ static int of_qcom_slim_ngd_register(struct device *parent,
if (of_property_read_u32(node, "reg", &id))
continue;
- ngd = kzalloc_obj(*ngd, GFP_KERNEL);
+ ngd = kzalloc_obj(*ngd);
if (!ngd)
return -ENOMEM;
diff --git a/drivers/slimbus/stream.c b/drivers/slimbus/stream.c
index 48711d4cf110..b4e70a7edd1c 100644
--- a/drivers/slimbus/stream.c
+++ b/drivers/slimbus/stream.c
@@ -103,7 +103,7 @@ struct slim_stream_runtime *slim_stream_allocate(struct slim_device *dev,
{
struct slim_stream_runtime *rt;
- rt = kzalloc_obj(*rt, GFP_KERNEL);
+ rt = kzalloc_obj(*rt);
if (!rt)
return ERR_PTR(-ENOMEM);
@@ -214,7 +214,7 @@ int slim_stream_prepare(struct slim_stream_runtime *rt,
}
num_ports = hweight32(cfg->port_mask);
- rt->ports = kzalloc_objs(*port, num_ports, GFP_KERNEL);
+ rt->ports = kzalloc_objs(*port, num_ports);
if (!rt->ports)
return -ENOMEM;
diff --git a/drivers/soc/amlogic/meson-gx-socinfo.c b/drivers/soc/amlogic/meson-gx-socinfo.c
index f10aa0aab8d3..c20f685e56f9 100644
--- a/drivers/soc/amlogic/meson-gx-socinfo.c
+++ b/drivers/soc/amlogic/meson-gx-socinfo.c
@@ -188,7 +188,7 @@ static int __init meson_gx_socinfo_init(void)
return -EINVAL;
}
- soc_dev_attr = kzalloc_obj(*soc_dev_attr, GFP_KERNEL);
+ soc_dev_attr = kzalloc_obj(*soc_dev_attr);
if (!soc_dev_attr)
return -ENODEV;
diff --git a/drivers/soc/amlogic/meson-mx-socinfo.c b/drivers/soc/amlogic/meson-mx-socinfo.c
index e9003fd55294..e1a7795a2733 100644
--- a/drivers/soc/amlogic/meson-mx-socinfo.c
+++ b/drivers/soc/amlogic/meson-mx-socinfo.c
@@ -146,7 +146,7 @@ static int __init meson_mx_socinfo_init(void)
if (ret < 0)
return ret;
- soc_dev_attr = kzalloc_obj(*soc_dev_attr, GFP_KERNEL);
+ soc_dev_attr = kzalloc_obj(*soc_dev_attr);
if (!soc_dev_attr)
return -ENODEV;
diff --git a/drivers/soc/apple/rtkit.c b/drivers/soc/apple/rtkit.c
index 0cde365c75bb..a3fdac8f6f06 100644
--- a/drivers/soc/apple/rtkit.c
+++ b/drivers/soc/apple/rtkit.c
@@ -667,7 +667,7 @@ struct apple_rtkit *apple_rtkit_init(struct device *dev, void *cookie,
if (!ops)
return ERR_PTR(-EINVAL);
- rtk = kzalloc_obj(*rtk, GFP_KERNEL);
+ rtk = kzalloc_obj(*rtk);
if (!rtk)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/soc/aspeed/aspeed-p2a-ctrl.c b/drivers/soc/aspeed/aspeed-p2a-ctrl.c
index bbab8dabd940..d88abc5f195b 100644
--- a/drivers/soc/aspeed/aspeed-p2a-ctrl.c
+++ b/drivers/soc/aspeed/aspeed-p2a-ctrl.c
@@ -238,7 +238,7 @@ static int aspeed_p2a_open(struct inode *inode, struct file *file)
{
struct aspeed_p2a_user *priv;
- priv = kmalloc_obj(*priv, GFP_KERNEL);
+ priv = kmalloc_obj(*priv);
if (!priv)
return -ENOMEM;
diff --git a/drivers/soc/aspeed/aspeed-socinfo.c b/drivers/soc/aspeed/aspeed-socinfo.c
index b4009164c84c..5e34e01ad26d 100644
--- a/drivers/soc/aspeed/aspeed-socinfo.c
+++ b/drivers/soc/aspeed/aspeed-socinfo.c
@@ -113,7 +113,7 @@ static int __init aspeed_socinfo_init(void)
}
of_node_put(np);
- attrs = kzalloc_obj(*attrs, GFP_KERNEL);
+ attrs = kzalloc_obj(*attrs);
if (!attrs)
return -ENODEV;
diff --git a/drivers/soc/atmel/soc.c b/drivers/soc/atmel/soc.c
index 88de5aa41191..d89f9dcade7d 100644
--- a/drivers/soc/atmel/soc.c
+++ b/drivers/soc/atmel/soc.c
@@ -368,7 +368,7 @@ struct soc_device * __init at91_soc_init(const struct at91_soc *socs)
return NULL;
}
- soc_dev_attr = kzalloc_obj(*soc_dev_attr, GFP_KERNEL);
+ soc_dev_attr = kzalloc_obj(*soc_dev_attr);
if (!soc_dev_attr)
return NULL;
diff --git a/drivers/soc/bcm/brcmstb/common.c b/drivers/soc/bcm/brcmstb/common.c
index e9cf6897d8bf..2da79bd42930 100644
--- a/drivers/soc/bcm/brcmstb/common.c
+++ b/drivers/soc/bcm/brcmstb/common.c
@@ -82,7 +82,7 @@ static int __init brcmstb_soc_device_init(void)
if (!sun_top_ctrl)
return ret;
- soc_dev_attr = kzalloc_obj(*soc_dev_attr, GFP_KERNEL);
+ soc_dev_attr = kzalloc_obj(*soc_dev_attr);
if (!soc_dev_attr) {
ret = -ENOMEM;
goto out;
diff --git a/drivers/soc/cirrus/soc-ep93xx.c b/drivers/soc/cirrus/soc-ep93xx.c
index d42813382977..d55cf28ed726 100644
--- a/drivers/soc/cirrus/soc-ep93xx.c
+++ b/drivers/soc/cirrus/soc-ep93xx.c
@@ -92,7 +92,7 @@ static struct auxiliary_device __init *ep93xx_adev_alloc(struct device *parent,
struct auxiliary_device *adev;
int ret;
- rdev = kzalloc_obj(*rdev, GFP_KERNEL);
+ rdev = kzalloc_obj(*rdev);
if (!rdev)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/soc/dove/pmu.c b/drivers/soc/dove/pmu.c
index 64b05aa80d2c..611caaeed8fc 100644
--- a/drivers/soc/dove/pmu.c
+++ b/drivers/soc/dove/pmu.c
@@ -311,7 +311,7 @@ int __init dove_init_pmu_legacy(const struct dove_pmu_initdata *initdata)
struct pmu_data *pmu;
int ret;
- pmu = kzalloc_obj(*pmu, GFP_KERNEL);
+ pmu = kzalloc_obj(*pmu);
if (!pmu)
return -ENOMEM;
@@ -324,7 +324,7 @@ int __init dove_init_pmu_legacy(const struct dove_pmu_initdata *initdata)
domain_initdata++) {
struct pmu_domain *domain;
- domain = kzalloc_obj(*domain, GFP_KERNEL);
+ domain = kzalloc_obj(*domain);
if (domain) {
domain->pmu = pmu;
domain->pwr_mask = domain_initdata->pwr_mask;
@@ -386,7 +386,7 @@ int __init dove_init_pmu(void)
return 0;
}
- pmu = kzalloc_obj(*pmu, GFP_KERNEL);
+ pmu = kzalloc_obj(*pmu);
if (!pmu)
return -ENOMEM;
@@ -408,7 +408,7 @@ int __init dove_init_pmu(void)
struct of_phandle_args args;
struct pmu_domain *domain;
- domain = kzalloc_obj(*domain, GFP_KERNEL);
+ domain = kzalloc_obj(*domain);
if (!domain)
break;
diff --git a/drivers/soc/fsl/dpaa2-console.c b/drivers/soc/fsl/dpaa2-console.c
index 841e0510151c..7f2ffe38dc07 100644
--- a/drivers/soc/fsl/dpaa2-console.c
+++ b/drivers/soc/fsl/dpaa2-console.c
@@ -111,7 +111,7 @@ static int dpaa2_generic_console_open(struct inode *node, struct file *fp,
u64 base_addr;
int err;
- cd = kmalloc_obj(*cd, GFP_KERNEL);
+ cd = kmalloc_obj(*cd);
if (!cd)
return -ENOMEM;
diff --git a/drivers/soc/fsl/dpio/dpio-service.c b/drivers/soc/fsl/dpio/dpio-service.c
index 2a73d4e846ff..317ca50b0c2b 100644
--- a/drivers/soc/fsl/dpio/dpio-service.c
+++ b/drivers/soc/fsl/dpio/dpio-service.c
@@ -133,7 +133,7 @@ static void dpaa2_io_dim_work(struct work_struct *w)
struct dpaa2_io *dpaa2_io_create(const struct dpaa2_io_desc *desc,
struct device *dev)
{
- struct dpaa2_io *obj = kmalloc_obj(*obj, GFP_KERNEL);
+ struct dpaa2_io *obj = kmalloc_obj(*obj);
u32 qman_256_cycles_per_ns;
if (!obj)
@@ -523,7 +523,7 @@ int dpaa2_io_service_enqueue_multiple_desc_fq(struct dpaa2_io *d,
struct qbman_eq_desc *ed;
int i, ret;
- ed = kzalloc_objs(struct qbman_eq_desc, 32, GFP_KERNEL);
+ ed = kzalloc_objs(struct qbman_eq_desc, 32);
if (!ed)
return -ENOMEM;
@@ -658,7 +658,7 @@ struct dpaa2_io_store *dpaa2_io_store_create(unsigned int max_frames,
if (!max_frames || (max_frames > 32))
return NULL;
- ret = kmalloc_obj(*ret, GFP_KERNEL);
+ ret = kmalloc_obj(*ret);
if (!ret)
return NULL;
diff --git a/drivers/soc/fsl/dpio/qbman-portal.c b/drivers/soc/fsl/dpio/qbman-portal.c
index b6adc87f473a..278e25d09be2 100644
--- a/drivers/soc/fsl/dpio/qbman-portal.c
+++ b/drivers/soc/fsl/dpio/qbman-portal.c
@@ -246,7 +246,7 @@ static inline u8 qm_cyc_diff(u8 ringsize, u8 first, u8 last)
*/
struct qbman_swp *qbman_swp_init(const struct qbman_swp_desc *d)
{
- struct qbman_swp *p = kzalloc_obj(*p, GFP_KERNEL);
+ struct qbman_swp *p = kzalloc_obj(*p);
u32 reg;
u32 mask_size;
u32 eqcr_pi;
diff --git a/drivers/soc/fsl/guts.c b/drivers/soc/fsl/guts.c
index 055d0b61ea1d..40afb27b582b 100644
--- a/drivers/soc/fsl/guts.c
+++ b/drivers/soc/fsl/guts.c
@@ -213,7 +213,7 @@ static int __init fsl_guts_init(void)
of_node_put(np);
/* Register soc device */
- soc_dev_attr = kzalloc_obj(*soc_dev_attr, GFP_KERNEL);
+ soc_dev_attr = kzalloc_obj(*soc_dev_attr);
if (!soc_dev_attr)
return -ENOMEM;
diff --git a/drivers/soc/fsl/qbman/bman.c b/drivers/soc/fsl/qbman/bman.c
index 8993cf2d47b5..f22eff294122 100644
--- a/drivers/soc/fsl/qbman/bman.c
+++ b/drivers/soc/fsl/qbman/bman.c
@@ -700,7 +700,7 @@ struct bman_pool *bman_new_pool(void)
if (bm_alloc_bpid_range(&bpid, 1))
return NULL;
- pool = kmalloc_obj(*pool, GFP_KERNEL);
+ pool = kmalloc_obj(*pool);
if (!pool)
goto err;
diff --git a/drivers/soc/fsl/qbman/qman.c b/drivers/soc/fsl/qbman/qman.c
index 210438ea923e..411381f1a1c4 100644
--- a/drivers/soc/fsl/qbman/qman.c
+++ b/drivers/soc/fsl/qbman/qman.c
@@ -1270,7 +1270,7 @@ static int qman_create_portal(struct qman_portal *portal,
qm_dqrr_set_ithresh(p, QMAN_PIRQ_DQRR_ITHRESH);
qm_mr_set_ithresh(p, QMAN_PIRQ_MR_ITHRESH);
qm_out(p, QM_REG_ITPR, QMAN_PIRQ_IPERIOD);
- portal->cgrs = kmalloc_objs(*portal->cgrs, 2, GFP_KERNEL);
+ portal->cgrs = kmalloc_objs(*portal->cgrs, 2);
if (!portal->cgrs)
goto fail_cgrs;
/* initial snapshot is no-depletion */
diff --git a/drivers/soc/fsl/qe/gpio.c b/drivers/soc/fsl/qe/gpio.c
index 488770405e99..66828f2a3577 100644
--- a/drivers/soc/fsl/qe/gpio.c
+++ b/drivers/soc/fsl/qe/gpio.c
@@ -161,7 +161,7 @@ struct qe_pin *qe_pin_request(struct device *dev, int index)
int gpio_num;
int err;
- qe_pin = kzalloc_obj(*qe_pin, GFP_KERNEL);
+ qe_pin = kzalloc_obj(*qe_pin);
if (!qe_pin) {
dev_dbg(dev, "%s: can't allocate memory\n", __func__);
return ERR_PTR(-ENOMEM);
diff --git a/drivers/soc/fsl/qe/ucc_fast.c b/drivers/soc/fsl/qe/ucc_fast.c
index 3cb45090fe74..fa474dfcca13 100644
--- a/drivers/soc/fsl/qe/ucc_fast.c
+++ b/drivers/soc/fsl/qe/ucc_fast.c
@@ -191,7 +191,7 @@ int ucc_fast_init(struct ucc_fast_info * uf_info, struct ucc_fast_private ** ucc
return -EINVAL;
}
- uccf = kzalloc_obj(struct ucc_fast_private, GFP_KERNEL);
+ uccf = kzalloc_obj(struct ucc_fast_private);
if (!uccf) {
printk(KERN_ERR "%s: Cannot allocate private data\n",
__func__);
diff --git a/drivers/soc/fsl/qe/ucc_slow.c b/drivers/soc/fsl/qe/ucc_slow.c
index 335c8629a316..7c5dc7de54d5 100644
--- a/drivers/soc/fsl/qe/ucc_slow.c
+++ b/drivers/soc/fsl/qe/ucc_slow.c
@@ -148,7 +148,7 @@ int ucc_slow_init(struct ucc_slow_info * us_info, struct ucc_slow_private ** ucc
return -EINVAL;
}
- uccs = kzalloc_obj(struct ucc_slow_private, GFP_KERNEL);
+ uccs = kzalloc_obj(struct ucc_slow_private);
if (!uccs) {
printk(KERN_ERR "%s: Cannot allocate private data\n",
__func__);
diff --git a/drivers/soc/hisilicon/kunpeng_hccs.c b/drivers/soc/hisilicon/kunpeng_hccs.c
index 62e3b86fa42d..2af3bfda313e 100644
--- a/drivers/soc/hisilicon/kunpeng_hccs.c
+++ b/drivers/soc/hisilicon/kunpeng_hccs.c
@@ -616,7 +616,7 @@ static int hccs_get_all_port_info_on_die(struct hccs_dev *hdev,
int ret;
u8 i;
- attrs = kzalloc_objs(struct hccs_port_attr, die->port_num, GFP_KERNEL);
+ attrs = kzalloc_objs(struct hccs_port_attr, die->port_num);
if (!attrs)
return -ENOMEM;
diff --git a/drivers/soc/imx/soc-imx.c b/drivers/soc/imx/soc-imx.c
index 5d39cc3f5e7d..504ebce18793 100644
--- a/drivers/soc/imx/soc-imx.c
+++ b/drivers/soc/imx/soc-imx.c
@@ -40,7 +40,7 @@ static int __init imx_soc_device_init(void)
if (!__mxc_cpu_type)
return 0;
- soc_dev_attr = kzalloc_obj(*soc_dev_attr, GFP_KERNEL);
+ soc_dev_attr = kzalloc_obj(*soc_dev_attr);
if (!soc_dev_attr)
return -ENOMEM;
diff --git a/drivers/soc/mediatek/mtk-cmdq-helper.c b/drivers/soc/mediatek/mtk-cmdq-helper.c
index a0f14aa28106..f8ee6c9ade89 100644
--- a/drivers/soc/mediatek/mtk-cmdq-helper.c
+++ b/drivers/soc/mediatek/mtk-cmdq-helper.c
@@ -114,7 +114,7 @@ struct cmdq_client *cmdq_mbox_create(struct device *dev, int index)
{
struct cmdq_client *client;
- client = kzalloc_obj(*client, GFP_KERNEL);
+ client = kzalloc_obj(*client);
if (!client)
return (struct cmdq_client *)-ENOMEM;
diff --git a/drivers/soc/microchip/mpfs-sys-controller.c b/drivers/soc/microchip/mpfs-sys-controller.c
index 4ce94066a5a8..8e7ae3cb92ff 100644
--- a/drivers/soc/microchip/mpfs-sys-controller.c
+++ b/drivers/soc/microchip/mpfs-sys-controller.c
@@ -132,7 +132,7 @@ static int mpfs_sys_controller_probe(struct platform_device *pdev)
struct device_node *np;
int i, ret;
- sys_controller = kzalloc_obj(*sys_controller, GFP_KERNEL);
+ sys_controller = kzalloc_obj(*sys_controller);
if (!sys_controller)
return -ENOMEM;
diff --git a/drivers/soc/nuvoton/wpcm450-soc.c b/drivers/soc/nuvoton/wpcm450-soc.c
index dc1242bda713..5511bd284773 100644
--- a/drivers/soc/nuvoton/wpcm450-soc.c
+++ b/drivers/soc/nuvoton/wpcm450-soc.c
@@ -74,7 +74,7 @@ static int __init wpcm450_soc_init(void)
return -ENODEV;
}
- attr = kzalloc_obj(*attr, GFP_KERNEL);
+ attr = kzalloc_obj(*attr);
if (!attr)
return -ENOMEM;
diff --git a/drivers/soc/qcom/apr.c b/drivers/soc/qcom/apr.c
index 2c46a25abb24..78e72379a6e0 100644
--- a/drivers/soc/qcom/apr.c
+++ b/drivers/soc/qcom/apr.c
@@ -95,7 +95,7 @@ gpr_port_t *gpr_alloc_port(struct apr_device *gdev, struct device *dev,
struct pkt_router_svc *svc;
int id;
- port = kzalloc_obj(*port, GFP_KERNEL);
+ port = kzalloc_obj(*port);
if (!port)
return ERR_PTR(-ENOMEM);
@@ -416,7 +416,7 @@ static int apr_add_device(struct device *dev, struct device_node *np,
struct pkt_router_svc *svc;
int ret;
- adev = kzalloc_obj(*adev, GFP_KERNEL);
+ adev = kzalloc_obj(*adev);
if (!adev)
return -ENOMEM;
diff --git a/drivers/soc/qcom/llcc-qcom.c b/drivers/soc/qcom/llcc-qcom.c
index 84ceba84d51a..ad5899d083f3 100644
--- a/drivers/soc/qcom/llcc-qcom.c
+++ b/drivers/soc/qcom/llcc-qcom.c
@@ -4447,7 +4447,7 @@ struct llcc_slice_desc *llcc_slice_getd(u32 uid)
if (count == sz || !cfg)
return ERR_PTR(-ENODEV);
- desc = kzalloc_obj(*desc, GFP_KERNEL);
+ desc = kzalloc_obj(*desc);
if (!desc)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/soc/qcom/ocmem.c b/drivers/soc/qcom/ocmem.c
index 0a6094e17e66..6a23f18b0281 100644
--- a/drivers/soc/qcom/ocmem.c
+++ b/drivers/soc/qcom/ocmem.c
@@ -226,7 +226,7 @@ struct ocmem_buf *ocmem_allocate(struct ocmem *ocmem, enum ocmem_client client,
if (test_and_set_bit_lock(BIT(client), &ocmem->active_allocations))
return ERR_PTR(-EBUSY);
- struct ocmem_buf *buf __free(kfree) = kzalloc_obj(*buf, GFP_KERNEL);
+ struct ocmem_buf *buf __free(kfree) = kzalloc_obj(*buf);
if (!buf) {
ret = -ENOMEM;
goto err_unlock;
diff --git a/drivers/soc/qcom/pdr_interface.c b/drivers/soc/qcom/pdr_interface.c
index cd36f3f0b80f..ba903569f885 100644
--- a/drivers/soc/qcom/pdr_interface.c
+++ b/drivers/soc/qcom/pdr_interface.c
@@ -322,7 +322,7 @@ static void pdr_indication_cb(struct qmi_handle *qmi,
ind_msg->service_path, ind_msg->curr_state,
ind_msg->transaction_id);
- ind = kzalloc_obj(*ind, GFP_KERNEL);
+ ind = kzalloc_obj(*ind);
if (!ind)
return;
@@ -520,7 +520,7 @@ struct pdr_service *pdr_add_lookup(struct pdr_handle *pdr,
!service_path || strlen(service_path) > SERVREG_NAME_LENGTH)
return ERR_PTR(-EINVAL);
- struct pdr_service *pds __free(kfree) = kzalloc_obj(*pds, GFP_KERNEL);
+ struct pdr_service *pds __free(kfree) = kzalloc_obj(*pds);
if (!pds)
return ERR_PTR(-ENOMEM);
@@ -645,7 +645,7 @@ struct pdr_handle *pdr_handle_alloc(void (*status)(int state,
if (!status)
return ERR_PTR(-EINVAL);
- struct pdr_handle *pdr __free(kfree) = kzalloc_obj(*pdr, GFP_KERNEL);
+ struct pdr_handle *pdr __free(kfree) = kzalloc_obj(*pdr);
if (!pdr)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/soc/qcom/qcom_pd_mapper.c b/drivers/soc/qcom/qcom_pd_mapper.c
index cb92c214311b..dc10bc859ff4 100644
--- a/drivers/soc/qcom/qcom_pd_mapper.c
+++ b/drivers/soc/qcom/qcom_pd_mapper.c
@@ -77,7 +77,7 @@ static int qcom_pdm_add_service_domain(struct qcom_pdm_data *data,
return -EBUSY;
}
} else {
- service = kzalloc_obj(*service, GFP_KERNEL);
+ service = kzalloc_obj(*service);
if (!service)
return -ENOMEM;
@@ -87,7 +87,7 @@ static int qcom_pdm_add_service_domain(struct qcom_pdm_data *data,
list_add_tail(&service->list, &data->services);
}
- domain = kzalloc_obj(*domain, GFP_KERNEL);
+ domain = kzalloc_obj(*domain);
if (!domain) {
if (list_empty(&service->domains)) {
list_del(&service->list);
@@ -158,7 +158,7 @@ static void qcom_pdm_get_domain_list(struct qmi_handle *qmi,
u32 offset;
int ret;
- rsp = kzalloc_obj(*rsp, GFP_KERNEL);
+ rsp = kzalloc_obj(*rsp);
if (!rsp)
return;
@@ -635,7 +635,7 @@ static struct qcom_pdm_data *qcom_pdm_start(void)
return ERR_PTR(-ENODEV);
}
- data = kzalloc_obj(*data, GFP_KERNEL);
+ data = kzalloc_obj(*data);
if (!data)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/soc/qcom/qmi_interface.c b/drivers/soc/qcom/qmi_interface.c
index 59a11fa572a7..16e2e24b6096 100644
--- a/drivers/soc/qcom/qmi_interface.c
+++ b/drivers/soc/qcom/qmi_interface.c
@@ -44,7 +44,7 @@ static void qmi_recv_new_server(struct qmi_handle *qmi,
if (!node && !port)
return;
- svc = kzalloc_obj(*svc, GFP_KERNEL);
+ svc = kzalloc_obj(*svc);
if (!svc)
return;
@@ -209,7 +209,7 @@ int qmi_add_lookup(struct qmi_handle *qmi, unsigned int service,
{
struct qmi_service *svc;
- svc = kzalloc_obj(*svc, GFP_KERNEL);
+ svc = kzalloc_obj(*svc);
if (!svc)
return -ENOMEM;
@@ -273,7 +273,7 @@ int qmi_add_server(struct qmi_handle *qmi, unsigned int service,
{
struct qmi_service *svc;
- svc = kzalloc_obj(*svc, GFP_KERNEL);
+ svc = kzalloc_obj(*svc);
if (!svc)
return -ENOMEM;
diff --git a/drivers/soc/qcom/rmtfs_mem.c b/drivers/soc/qcom/rmtfs_mem.c
index cec7912f74dd..342c0845134e 100644
--- a/drivers/soc/qcom/rmtfs_mem.c
+++ b/drivers/soc/qcom/rmtfs_mem.c
@@ -192,7 +192,7 @@ static int qcom_rmtfs_mem_probe(struct platform_device *pdev)
}
- rmtfs_mem = kzalloc_obj(*rmtfs_mem, GFP_KERNEL);
+ rmtfs_mem = kzalloc_obj(*rmtfs_mem);
if (!rmtfs_mem)
return -ENOMEM;
diff --git a/drivers/soc/qcom/smem_state.c b/drivers/soc/qcom/smem_state.c
index 3d9bc96dfd2d..be52ec4396d1 100644
--- a/drivers/soc/qcom/smem_state.c
+++ b/drivers/soc/qcom/smem_state.c
@@ -197,7 +197,7 @@ struct qcom_smem_state *qcom_smem_state_register(struct device_node *of_node,
{
struct qcom_smem_state *state;
- state = kzalloc_obj(*state, GFP_KERNEL);
+ state = kzalloc_obj(*state);
if (!state)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/soc/renesas/renesas-soc.c b/drivers/soc/renesas/renesas-soc.c
index d170743d576a..38ff0b823bda 100644
--- a/drivers/soc/renesas/renesas-soc.c
+++ b/drivers/soc/renesas/renesas-soc.c
@@ -487,7 +487,7 @@ static int __init renesas_soc_init(void)
chipid = ioremap(family->reg, 4);
}
- soc_dev_attr = kzalloc_obj(*soc_dev_attr, GFP_KERNEL);
+ soc_dev_attr = kzalloc_obj(*soc_dev_attr);
if (!soc_dev_attr) {
if (chipid)
iounmap(chipid);
diff --git a/drivers/soc/tegra/fuse/fuse-tegra.c b/drivers/soc/tegra/fuse/fuse-tegra.c
index 165fad4f548e..291484595dcf 100644
--- a/drivers/soc/tegra/fuse/fuse-tegra.c
+++ b/drivers/soc/tegra/fuse/fuse-tegra.c
@@ -441,7 +441,7 @@ struct device *tegra_soc_device_register(void)
struct soc_device_attribute *attr;
struct soc_device *dev;
- attr = kzalloc_obj(*attr, GFP_KERNEL);
+ attr = kzalloc_obj(*attr);
if (!attr)
return NULL;
diff --git a/drivers/soc/tegra/pmc.c b/drivers/soc/tegra/pmc.c
index 8f2f83c4ad90..a1a2966512d1 100644
--- a/drivers/soc/tegra/pmc.c
+++ b/drivers/soc/tegra/pmc.c
@@ -1131,11 +1131,11 @@ int tegra_pmc_powergate_sequence_power_up(struct tegra_pmc *pmc,
if (!tegra_powergate_is_available(pmc, id))
return -EINVAL;
- pg = kzalloc_obj(*pg, GFP_KERNEL);
+ pg = kzalloc_obj(*pg);
if (!pg)
return -ENOMEM;
- pg->clk_rates = kzalloc_obj(*pg->clk_rates, GFP_KERNEL);
+ pg->clk_rates = kzalloc_obj(*pg->clk_rates);
if (!pg->clk_rates) {
kfree(pg->clks);
return -ENOMEM;
@@ -1341,7 +1341,7 @@ static int tegra_powergate_of_get_clks(struct tegra_powergate *pg,
if (count == 0)
return -ENODEV;
- pg->clks = kzalloc_objs(clk, count, GFP_KERNEL);
+ pg->clks = kzalloc_objs(clk, count);
if (!pg->clks)
return -ENOMEM;
@@ -1402,7 +1402,7 @@ static int tegra_powergate_add(struct tegra_pmc *pmc, struct device_node *np)
int id, err = 0;
bool off;
- pg = kzalloc_obj(*pg, GFP_KERNEL);
+ pg = kzalloc_obj(*pg);
if (!pg)
return -ENOMEM;
diff --git a/drivers/soc/ti/k3-socinfo.c b/drivers/soc/ti/k3-socinfo.c
index 8655f829dc7b..676041879eca 100644
--- a/drivers/soc/ti/k3-socinfo.c
+++ b/drivers/soc/ti/k3-socinfo.c
@@ -163,7 +163,7 @@ static int k3_chipinfo_probe(struct platform_device *pdev)
partno_id = (jtag_id & CTRLMMR_WKUP_JTAGID_PARTNO_MASK) >>
CTRLMMR_WKUP_JTAGID_PARTNO_SHIFT;
- soc_dev_attr = kzalloc_obj(*soc_dev_attr, GFP_KERNEL);
+ soc_dev_attr = kzalloc_obj(*soc_dev_attr);
if (!soc_dev_attr)
return -ENOMEM;
diff --git a/drivers/soc/ux500/ux500-soc-id.c b/drivers/soc/ux500/ux500-soc-id.c
index eb26a601643a..f49539d79824 100644
--- a/drivers/soc/ux500/ux500-soc-id.c
+++ b/drivers/soc/ux500/ux500-soc-id.c
@@ -205,7 +205,7 @@ static int __init ux500_soc_device_init(void)
ux500_setup_id();
- soc_dev_attr = kzalloc_obj(*soc_dev_attr, GFP_KERNEL);
+ soc_dev_attr = kzalloc_obj(*soc_dev_attr);
if (!soc_dev_attr) {
of_node_put(backupram);
return -ENOMEM;
diff --git a/drivers/soc/versatile/soc-integrator.c b/drivers/soc/versatile/soc-integrator.c
index 45110efcd4a1..b67a7fd4af25 100644
--- a/drivers/soc/versatile/soc-integrator.c
+++ b/drivers/soc/versatile/soc-integrator.c
@@ -123,7 +123,7 @@ static int __init integrator_soc_init(void)
return -ENODEV;
integrator_coreid = val;
- soc_dev_attr = kzalloc_obj(*soc_dev_attr, GFP_KERNEL);
+ soc_dev_attr = kzalloc_obj(*soc_dev_attr);
if (!soc_dev_attr)
return -ENOMEM;
diff --git a/drivers/soc/xilinx/xlnx_event_manager.c b/drivers/soc/xilinx/xlnx_event_manager.c
index 6a45b1b53caf..f733dc42b3b1 100644
--- a/drivers/soc/xilinx/xlnx_event_manager.c
+++ b/drivers/soc/xilinx/xlnx_event_manager.c
@@ -122,7 +122,7 @@ static int xlnx_add_cb_for_notify_event(const u32 node_id, const u32 event, cons
if (!present_in_hash) {
/* Add new entry if not present in HASH table */
- eve_data = kmalloc_obj(*eve_data, GFP_KERNEL);
+ eve_data = kmalloc_obj(*eve_data);
if (!eve_data)
return -ENOMEM;
eve_data->key = key;
@@ -130,7 +130,7 @@ static int xlnx_add_cb_for_notify_event(const u32 node_id, const u32 event, cons
eve_data->wake = wake;
INIT_LIST_HEAD(&eve_data->cb_list_head);
- cb_data = kmalloc_obj(*cb_data, GFP_KERNEL);
+ cb_data = kmalloc_obj(*cb_data);
if (!cb_data) {
kfree(eve_data);
return -ENOMEM;
@@ -153,7 +153,7 @@ static int xlnx_add_cb_for_notify_event(const u32 node_id, const u32 event, cons
}
/* Add multiple handler and private data in list */
- cb_data = kmalloc_obj(*cb_data, GFP_KERNEL);
+ cb_data = kmalloc_obj(*cb_data);
if (!cb_data)
return -ENOMEM;
cb_data->eve_cb = cb_fun;
@@ -179,7 +179,7 @@ static int xlnx_add_cb_for_suspend(event_cb_func_t cb_fun, void *data)
}
/* Add new entry if not present */
- eve_data = kmalloc_obj(*eve_data, GFP_KERNEL);
+ eve_data = kmalloc_obj(*eve_data);
if (!eve_data)
return -ENOMEM;
@@ -187,7 +187,7 @@ static int xlnx_add_cb_for_suspend(event_cb_func_t cb_fun, void *data)
eve_data->cb_type = PM_INIT_SUSPEND_CB;
INIT_LIST_HEAD(&eve_data->cb_list_head);
- cb_data = kmalloc_obj(*cb_data, GFP_KERNEL);
+ cb_data = kmalloc_obj(*cb_data);
if (!cb_data) {
kfree(eve_data);
return -ENOMEM;
diff --git a/drivers/soundwire/amd_init.c b/drivers/soundwire/amd_init.c
index e71cc23523e1..7db37f044850 100644
--- a/drivers/soundwire/amd_init.c
+++ b/drivers/soundwire/amd_init.c
@@ -98,7 +98,7 @@ static struct sdw_amd_ctx *sdw_amd_probe_controller(struct sdw_amd_res *res)
* the parent .probe.
* If devm_ was used, the memory might never be freed on errors.
*/
- ctx = kzalloc_obj(*ctx, GFP_KERNEL);
+ ctx = kzalloc_obj(*ctx);
if (!ctx)
return NULL;
diff --git a/drivers/soundwire/amd_manager.c b/drivers/soundwire/amd_manager.c
index 91dee9499df2..c2f405785c5f 100644
--- a/drivers/soundwire/amd_manager.c
+++ b/drivers/soundwire/amd_manager.c
@@ -764,7 +764,7 @@ static int amd_set_sdw_stream(struct snd_soc_dai *dai, void *stream, int directi
}
/* allocate and set dai_runtime info */
- dai_runtime = kzalloc_obj(*dai_runtime, GFP_KERNEL);
+ dai_runtime = kzalloc_obj(*dai_runtime);
if (!dai_runtime)
return -ENOMEM;
diff --git a/drivers/soundwire/cadence_master.c b/drivers/soundwire/cadence_master.c
index dfdb591c6f6e..f245c3ffb9e9 100644
--- a/drivers/soundwire/cadence_master.c
+++ b/drivers/soundwire/cadence_master.c
@@ -1846,7 +1846,7 @@ int cdns_set_sdw_stream(struct snd_soc_dai *dai,
}
/* allocate and set dai_runtime info */
- dai_runtime = kzalloc_obj(*dai_runtime, GFP_KERNEL);
+ dai_runtime = kzalloc_obj(*dai_runtime);
if (!dai_runtime)
return -ENOMEM;
diff --git a/drivers/soundwire/debugfs.c b/drivers/soundwire/debugfs.c
index 0e9c48ca76e9..ccc9670ef77c 100644
--- a/drivers/soundwire/debugfs.c
+++ b/drivers/soundwire/debugfs.c
@@ -224,7 +224,7 @@ static int do_bpt_sequence(struct sdw_slave *slave, bool write, u8 *buffer)
struct sdw_bpt_msg msg = {0};
struct sdw_bpt_section *sec;
- sec = kzalloc_objs(*sec, 1, GFP_KERNEL);
+ sec = kzalloc_objs(*sec, 1);
if (!sec)
return -ENOMEM;
msg.sections = 1;
diff --git a/drivers/soundwire/generic_bandwidth_allocation.c b/drivers/soundwire/generic_bandwidth_allocation.c
index f5a7f404aacb..fb3970e12dac 100644
--- a/drivers/soundwire/generic_bandwidth_allocation.c
+++ b/drivers/soundwire/generic_bandwidth_allocation.c
@@ -402,7 +402,7 @@ static int sdw_compute_port_params(struct sdw_bus *bus, struct sdw_stream_runtim
if (group.count == 0)
goto out;
- params = kzalloc_objs(*params, group.count, GFP_KERNEL);
+ params = kzalloc_objs(*params, group.count);
if (!params) {
ret = -ENOMEM;
goto out;
diff --git a/drivers/soundwire/intel_ace2x.c b/drivers/soundwire/intel_ace2x.c
index 8a37d185cbca..87bde136d234 100644
--- a/drivers/soundwire/intel_ace2x.c
+++ b/drivers/soundwire/intel_ace2x.c
@@ -127,7 +127,7 @@ static int intel_ace2x_bpt_open_stream(struct sdw_intel *sdw, struct sdw_slave *
sconfig.bps = 32; /* this is required for BPT/BRA */
/* Port configuration */
- pconfig = kzalloc_objs(*pconfig, 2, GFP_KERNEL);
+ pconfig = kzalloc_objs(*pconfig, 2);
if (!pconfig) {
ret = -ENOMEM;
goto remove_slave;
diff --git a/drivers/soundwire/intel_init.c b/drivers/soundwire/intel_init.c
index 982d25f92c7c..e180657ae231 100644
--- a/drivers/soundwire/intel_init.c
+++ b/drivers/soundwire/intel_init.c
@@ -40,7 +40,7 @@ static struct sdw_intel_link_dev *intel_link_dev_register(struct sdw_intel_res *
struct auxiliary_device *auxdev;
int ret;
- ldev = kzalloc_obj(*ldev, GFP_KERNEL);
+ ldev = kzalloc_obj(*ldev);
if (!ldev)
return ERR_PTR(-ENOMEM);
@@ -186,7 +186,7 @@ static struct sdw_intel_ctx
* the parent .probe.
* If devm_ was used, the memory might never be freed on errors.
*/
- ctx = kzalloc_obj(*ctx, GFP_KERNEL);
+ ctx = kzalloc_obj(*ctx);
if (!ctx)
return NULL;
@@ -198,7 +198,7 @@ static struct sdw_intel_ctx
* If some links are disabled, the link pointer will remain NULL. Given that the
* number of links is small, this is simpler than using a list to keep track of links.
*/
- ctx->ldev = kzalloc_objs(*ctx->ldev, ctx->count, GFP_KERNEL);
+ ctx->ldev = kzalloc_objs(*ctx->ldev, ctx->count);
if (!ctx->ldev) {
kfree(ctx);
return NULL;
diff --git a/drivers/soundwire/master.c b/drivers/soundwire/master.c
index a0f94877bc91..440bfc52ccba 100644
--- a/drivers/soundwire/master.c
+++ b/drivers/soundwire/master.c
@@ -133,7 +133,7 @@ int sdw_master_device_add(struct sdw_bus *bus, struct device *parent,
if (!parent)
return -EINVAL;
- md = kzalloc_obj(*md, GFP_KERNEL);
+ md = kzalloc_obj(*md);
if (!md)
return -ENOMEM;
diff --git a/drivers/soundwire/slave.c b/drivers/soundwire/slave.c
index 45e80b9496f4..f5a3ca3b9dda 100644
--- a/drivers/soundwire/slave.c
+++ b/drivers/soundwire/slave.c
@@ -32,7 +32,7 @@ int sdw_slave_add(struct sdw_bus *bus,
int ret;
int i;
- slave = kzalloc_obj(*slave, GFP_KERNEL);
+ slave = kzalloc_obj(*slave);
if (!slave)
return -ENOMEM;
diff --git a/drivers/soundwire/stream.c b/drivers/soundwire/stream.c
index c6e3f911371b..b6982f8dcf17 100644
--- a/drivers/soundwire/stream.c
+++ b/drivers/soundwire/stream.c
@@ -748,11 +748,11 @@ static int sdw_bank_switch(struct sdw_bus *bus, int m_rt_count)
int ret;
u16 addr;
- wr_msg = kzalloc_obj(*wr_msg, GFP_KERNEL);
+ wr_msg = kzalloc_obj(*wr_msg);
if (!wr_msg)
return -ENOMEM;
- wbuf = kzalloc_obj(*wbuf, GFP_KERNEL);
+ wbuf = kzalloc_obj(*wbuf);
if (!wbuf) {
ret = -ENOMEM;
goto error_1;
@@ -956,7 +956,7 @@ static struct sdw_port_runtime *sdw_port_alloc(struct list_head *port_list)
{
struct sdw_port_runtime *p_rt;
- p_rt = kzalloc_obj(*p_rt, GFP_KERNEL);
+ p_rt = kzalloc_obj(*p_rt);
if (!p_rt)
return NULL;
@@ -1131,7 +1131,7 @@ static struct sdw_slave_runtime
{
struct sdw_slave_runtime *s_rt;
- s_rt = kzalloc_obj(*s_rt, GFP_KERNEL);
+ s_rt = kzalloc_obj(*s_rt);
if (!s_rt)
return NULL;
@@ -1241,7 +1241,7 @@ static struct sdw_master_runtime
}
}
- m_rt = kzalloc_obj(*m_rt, GFP_KERNEL);
+ m_rt = kzalloc_obj(*m_rt);
if (!m_rt)
return NULL;
@@ -1875,7 +1875,7 @@ struct sdw_stream_runtime *sdw_alloc_stream(const char *stream_name, enum sdw_st
{
struct sdw_stream_runtime *stream;
- stream = kzalloc_obj(*stream, GFP_KERNEL);
+ stream = kzalloc_obj(*stream);
if (!stream)
return NULL;
diff --git a/drivers/spi/spi-amlogic-spifc-a4.c b/drivers/spi/spi-amlogic-spifc-a4.c
index 786d66304c3d..2aef528cfc1b 100644
--- a/drivers/spi/spi-amlogic-spifc-a4.c
+++ b/drivers/spi/spi-amlogic-spifc-a4.c
@@ -986,7 +986,7 @@ static int aml_sfc_ecc_init_ctx(struct nand_device *nand)
nand->ecc.ctx.conf.engine_type = NAND_ECC_ENGINE_TYPE_ON_HOST;
- ecc_cfg = kzalloc_obj(*ecc_cfg, GFP_KERNEL);
+ ecc_cfg = kzalloc_obj(*ecc_cfg);
if (!ecc_cfg)
return -ENOMEM;
diff --git a/drivers/spi/spi-at91-usart.c b/drivers/spi/spi-at91-usart.c
index 40890068d840..76eb3ba75ab1 100644
--- a/drivers/spi/spi-at91-usart.c
+++ b/drivers/spi/spi-at91-usart.c
@@ -364,7 +364,7 @@ static int at91_usart_spi_setup(struct spi_device *spi)
mr &= ~US_MR_LOOP;
if (!ausd) {
- ausd = kzalloc_obj(*ausd, GFP_KERNEL);
+ ausd = kzalloc_obj(*ausd);
if (!ausd)
return -ENOMEM;
diff --git a/drivers/spi/spi-atmel.c b/drivers/spi/spi-atmel.c
index ff4bf4e6bdb5..445d645585bf 100644
--- a/drivers/spi/spi-atmel.c
+++ b/drivers/spi/spi-atmel.c
@@ -1300,7 +1300,7 @@ static int atmel_spi_setup(struct spi_device *spi)
asd = spi->controller_state;
if (!asd) {
- asd = kzalloc_obj(struct atmel_spi_device, GFP_KERNEL);
+ asd = kzalloc_obj(struct atmel_spi_device);
if (!asd)
return -ENOMEM;
diff --git a/drivers/spi/spi-bcm-qspi.c b/drivers/spi/spi-bcm-qspi.c
index 123d9d4fb08d..63aa37f19490 100644
--- a/drivers/spi/spi-bcm-qspi.c
+++ b/drivers/spi/spi-bcm-qspi.c
@@ -712,7 +712,7 @@ static int bcm_qspi_setup(struct spi_device *spi)
xp = spi_get_ctldata(spi);
if (!xp) {
- xp = kzalloc_obj(*xp, GFP_KERNEL);
+ xp = kzalloc_obj(*xp);
if (!xp)
return -ENOMEM;
spi_set_ctldata(spi, xp);
diff --git a/drivers/spi/spi-bitbang.c b/drivers/spi/spi-bitbang.c
index d9cfb6e18a4c..9f03ac217319 100644
--- a/drivers/spi/spi-bitbang.c
+++ b/drivers/spi/spi-bitbang.c
@@ -193,7 +193,7 @@ int spi_bitbang_setup(struct spi_device *spi)
bitbang = spi_controller_get_devdata(spi->controller);
if (!cs) {
- cs = kzalloc_obj(*cs, GFP_KERNEL);
+ cs = kzalloc_obj(*cs);
if (!cs)
return -ENOMEM;
spi->controller_state = cs;
diff --git a/drivers/spi/spi-davinci.c b/drivers/spi/spi-davinci.c
index 62171cc0d84d..da7f2ae3a570 100644
--- a/drivers/spi/spi-davinci.c
+++ b/drivers/spi/spi-davinci.c
@@ -443,7 +443,7 @@ static int davinci_spi_of_setup(struct spi_device *spi)
u32 prop;
if (spicfg == NULL && np) {
- spicfg = kzalloc_obj(*spicfg, GFP_KERNEL);
+ spicfg = kzalloc_obj(*spicfg);
if (!spicfg)
return -ENOMEM;
*spicfg = davinci_spi_default_cfg;
diff --git a/drivers/spi/spi-dw-core.c b/drivers/spi/spi-dw-core.c
index d2aa199bab9d..b47637888c5c 100644
--- a/drivers/spi/spi-dw-core.c
+++ b/drivers/spi/spi-dw-core.c
@@ -797,7 +797,7 @@ static int dw_spi_setup(struct spi_device *spi)
struct dw_spi *dws = spi_controller_get_devdata(spi->controller);
u32 rx_sample_dly_ns;
- chip = kzalloc_obj(*chip, GFP_KERNEL);
+ chip = kzalloc_obj(*chip);
if (!chip)
return -ENOMEM;
spi_set_ctldata(spi, chip);
diff --git a/drivers/spi/spi-fsl-dspi.c b/drivers/spi/spi-fsl-dspi.c
index 031d6785ecc4..9f2a7b8163b1 100644
--- a/drivers/spi/spi-fsl-dspi.c
+++ b/drivers/spi/spi-fsl-dspi.c
@@ -1290,7 +1290,7 @@ static int dspi_setup(struct spi_device *spi)
/* Only alloc on first setup */
chip = spi_get_ctldata(spi);
if (chip == NULL) {
- chip = kzalloc_obj(struct chip_data, GFP_KERNEL);
+ chip = kzalloc_obj(struct chip_data);
if (!chip)
return -ENOMEM;
}
diff --git a/drivers/spi/spi-fsl-espi.c b/drivers/spi/spi-fsl-espi.c
index f46f5c3cc992..56270f8fdc17 100644
--- a/drivers/spi/spi-fsl-espi.c
+++ b/drivers/spi/spi-fsl-espi.c
@@ -482,7 +482,7 @@ static int fsl_espi_setup(struct spi_device *spi)
struct fsl_espi_cs *cs = spi_get_ctldata(spi);
if (!cs) {
- cs = kzalloc_obj(*cs, GFP_KERNEL);
+ cs = kzalloc_obj(*cs);
if (!cs)
return -ENOMEM;
spi_set_ctldata(spi, cs);
diff --git a/drivers/spi/spi-fsl-spi.c b/drivers/spi/spi-fsl-spi.c
index e2f15998495f..bf3fc3ce0cc2 100644
--- a/drivers/spi/spi-fsl-spi.c
+++ b/drivers/spi/spi-fsl-spi.c
@@ -378,7 +378,7 @@ static int fsl_spi_setup(struct spi_device *spi)
return -EINVAL;
if (!cs) {
- cs = kzalloc_obj(*cs, GFP_KERNEL);
+ cs = kzalloc_obj(*cs);
if (!cs)
return -ENOMEM;
spi_set_ctldata(spi, cs);
diff --git a/drivers/spi/spi-hisi-kunpeng.c b/drivers/spi/spi-hisi-kunpeng.c
index 798ba06b86bc..216a0a91fc47 100644
--- a/drivers/spi/spi-hisi-kunpeng.c
+++ b/drivers/spi/spi-hisi-kunpeng.c
@@ -426,7 +426,7 @@ static int hisi_spi_setup(struct spi_device *spi)
/* Only alloc on first setup */
chip = spi_get_ctldata(spi);
if (!chip) {
- chip = kzalloc_obj(*chip, GFP_KERNEL);
+ chip = kzalloc_obj(*chip);
if (!chip)
return -ENOMEM;
spi_set_ctldata(spi, chip);
diff --git a/drivers/spi/spi-mem.c b/drivers/spi/spi-mem.c
index abb380d2791b..a09371a075d2 100644
--- a/drivers/spi/spi-mem.c
+++ b/drivers/spi/spi-mem.c
@@ -713,7 +713,7 @@ spi_mem_dirmap_create(struct spi_mem *mem,
if (info->op_tmpl.data.dir == SPI_MEM_NO_DATA)
return ERR_PTR(-EINVAL);
- desc = kzalloc_obj(*desc, GFP_KERNEL);
+ desc = kzalloc_obj(*desc);
if (!desc)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/spi/spi-mpc512x-psc.c b/drivers/spi/spi-mpc512x-psc.c
index e8383a79cb2e..75d560f6b5cc 100644
--- a/drivers/spi/spi-mpc512x-psc.c
+++ b/drivers/spi/spi-mpc512x-psc.c
@@ -362,7 +362,7 @@ static int mpc512x_psc_spi_setup(struct spi_device *spi)
return -EINVAL;
if (!cs) {
- cs = kzalloc_obj(*cs, GFP_KERNEL);
+ cs = kzalloc_obj(*cs);
if (!cs)
return -ENOMEM;
diff --git a/drivers/spi/spi-mpc52xx-psc.c b/drivers/spi/spi-mpc52xx-psc.c
index 03ee5f370382..954f6caceb31 100644
--- a/drivers/spi/spi-mpc52xx-psc.c
+++ b/drivers/spi/spi-mpc52xx-psc.c
@@ -222,7 +222,7 @@ static int mpc52xx_psc_spi_setup(struct spi_device *spi)
return -EINVAL;
if (!cs) {
- cs = kzalloc_obj(*cs, GFP_KERNEL);
+ cs = kzalloc_obj(*cs);
if (!cs)
return -ENOMEM;
spi->controller_state = cs;
diff --git a/drivers/spi/spi-mtk-snfi.c b/drivers/spi/spi-mtk-snfi.c
index 833f8f8901bf..437edbd658aa 100644
--- a/drivers/spi/spi-mtk-snfi.c
+++ b/drivers/spi/spi-mtk-snfi.c
@@ -675,7 +675,7 @@ static int mtk_snand_ecc_init_ctx(struct nand_device *nand)
if (ret)
return ret;
- ecc_cfg = kzalloc_obj(*ecc_cfg, GFP_KERNEL);
+ ecc_cfg = kzalloc_obj(*ecc_cfg);
if (!ecc_cfg)
return -ENOMEM;
diff --git a/drivers/spi/spi-mxs.c b/drivers/spi/spi-mxs.c
index 35e4300deff5..b3301c69e2de 100644
--- a/drivers/spi/spi-mxs.c
+++ b/drivers/spi/spi-mxs.c
@@ -182,7 +182,7 @@ static int mxs_spi_txrx_dma(struct mxs_spi *spi,
if (!len)
return -EINVAL;
- dma_xfer = kzalloc_objs(*dma_xfer, sgs, GFP_KERNEL);
+ dma_xfer = kzalloc_objs(*dma_xfer, sgs);
if (!dma_xfer)
return -ENOMEM;
diff --git a/drivers/spi/spi-offload.c b/drivers/spi/spi-offload.c
index de6de1517554..a579ef33b2d2 100644
--- a/drivers/spi/spi-offload.c
+++ b/drivers/spi/spi-offload.c
@@ -117,7 +117,7 @@ struct spi_offload *devm_spi_offload_get(struct device *dev,
if (!spi->controller->get_offload)
return ERR_PTR(-ENODEV);
- resource = kzalloc_obj(*resource, GFP_KERNEL);
+ resource = kzalloc_obj(*resource);
if (!resource)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/spi/spi-omap-uwire.c b/drivers/spi/spi-omap-uwire.c
index 367a36a1fdc5..83e263eb6069 100644
--- a/drivers/spi/spi-omap-uwire.c
+++ b/drivers/spi/spi-omap-uwire.c
@@ -425,7 +425,7 @@ static int uwire_setup(struct spi_device *spi)
int status;
if (ust == NULL) {
- ust = kzalloc_obj(*ust, GFP_KERNEL);
+ ust = kzalloc_obj(*ust);
if (ust == NULL)
return -ENOMEM;
spi->controller_state = ust;
diff --git a/drivers/spi/spi-omap2-mcspi.c b/drivers/spi/spi-omap2-mcspi.c
index 11eca0572733..2207e05c9d06 100644
--- a/drivers/spi/spi-omap2-mcspi.c
+++ b/drivers/spi/spi-omap2-mcspi.c
@@ -1076,7 +1076,7 @@ static int omap2_mcspi_setup(struct spi_device *spi)
struct omap2_mcspi_cs *cs = spi->controller_state;
if (!cs) {
- cs = kzalloc_obj(*cs, GFP_KERNEL);
+ cs = kzalloc_obj(*cs);
if (!cs)
return -ENOMEM;
cs->base = mcspi->base + spi_get_chipselect(spi, 0) * 0x14;
diff --git a/drivers/spi/spi-pic32-sqi.c b/drivers/spi/spi-pic32-sqi.c
index f663ea5983d0..051590038895 100644
--- a/drivers/spi/spi-pic32-sqi.c
+++ b/drivers/spi/spi-pic32-sqi.c
@@ -467,7 +467,7 @@ static int ring_desc_ring_alloc(struct pic32_sqi *sqi)
}
/* allocate software ring descriptors */
- sqi->ring = kzalloc_objs(*rdesc, PESQI_BD_COUNT, GFP_KERNEL);
+ sqi->ring = kzalloc_objs(*rdesc, PESQI_BD_COUNT);
if (!sqi->ring) {
dma_free_coherent(&sqi->host->dev,
sizeof(*bd) * PESQI_BD_COUNT,
diff --git a/drivers/spi/spi-pl022.c b/drivers/spi/spi-pl022.c
index 87f9d41f0236..c82cc522776d 100644
--- a/drivers/spi/spi-pl022.c
+++ b/drivers/spi/spi-pl022.c
@@ -1606,7 +1606,7 @@ static int pl022_setup(struct spi_device *spi)
chip = spi_get_ctldata(spi);
if (chip == NULL) {
- chip = kzalloc_obj(struct chip_data, GFP_KERNEL);
+ chip = kzalloc_obj(struct chip_data);
if (!chip)
return -ENOMEM;
dev_dbg(&spi->dev,
diff --git a/drivers/spi/spi-ppc4xx.c b/drivers/spi/spi-ppc4xx.c
index c4ebef57c991..46ac58dfb3fc 100644
--- a/drivers/spi/spi-ppc4xx.c
+++ b/drivers/spi/spi-ppc4xx.c
@@ -218,7 +218,7 @@ static int spi_ppc4xx_setup(struct spi_device *spi)
}
if (cs == NULL) {
- cs = kzalloc_obj(*cs, GFP_KERNEL);
+ cs = kzalloc_obj(*cs);
if (!cs)
return -ENOMEM;
spi->controller_state = cs;
diff --git a/drivers/spi/spi-pxa2xx.c b/drivers/spi/spi-pxa2xx.c
index b0424ee64b75..f7881a31e4cc 100644
--- a/drivers/spi/spi-pxa2xx.c
+++ b/drivers/spi/spi-pxa2xx.c
@@ -1184,7 +1184,7 @@ static int setup(struct spi_device *spi)
/* Only allocate on the first setup */
chip = spi_get_ctldata(spi);
if (!chip) {
- chip = kzalloc_obj(struct chip_data, GFP_KERNEL);
+ chip = kzalloc_obj(struct chip_data);
if (!chip)
return -ENOMEM;
}
diff --git a/drivers/spi/spi-qpic-snand.c b/drivers/spi/spi-qpic-snand.c
index eae0edb47652..66f2d1b78ade 100644
--- a/drivers/spi/spi-qpic-snand.c
+++ b/drivers/spi/spi-qpic-snand.c
@@ -258,7 +258,7 @@ static int qcom_spi_ecc_init_ctx_pipelined(struct nand_device *nand)
cwperpage = mtd->writesize / NANDC_STEP_SIZE;
snandc->qspi->num_cw = cwperpage;
- ecc_cfg = kzalloc_obj(*ecc_cfg, GFP_KERNEL);
+ ecc_cfg = kzalloc_obj(*ecc_cfg);
if (!ecc_cfg)
return -ENOMEM;
diff --git a/drivers/spi/spi-s3c64xx.c b/drivers/spi/spi-s3c64xx.c
index 2591f1d11a9d..ba85243d6d89 100644
--- a/drivers/spi/spi-s3c64xx.c
+++ b/drivers/spi/spi-s3c64xx.c
@@ -961,7 +961,7 @@ static struct s3c64xx_spi_csinfo *s3c64xx_get_target_ctrldata(
return ERR_PTR(-EINVAL);
}
- cs = kzalloc_obj(*cs, GFP_KERNEL);
+ cs = kzalloc_obj(*cs);
if (!cs)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/spi/spi-tegra114.c b/drivers/spi/spi-tegra114.c
index 6983a4567c45..848cb6836bd5 100644
--- a/drivers/spi/spi-tegra114.c
+++ b/drivers/spi/spi-tegra114.c
@@ -920,7 +920,7 @@ static struct tegra_spi_client_data
return NULL;
}
- cdata = kzalloc_obj(*cdata, GFP_KERNEL);
+ cdata = kzalloc_obj(*cdata);
if (!cdata)
return NULL;
diff --git a/drivers/spi/spi-tle62x0.c b/drivers/spi/spi-tle62x0.c
index 0ef65cc689bd..dd8bfb3f3544 100644
--- a/drivers/spi/spi-tle62x0.c
+++ b/drivers/spi/spi-tle62x0.c
@@ -249,7 +249,7 @@ static int tle62x0_probe(struct spi_device *spi)
return -EINVAL;
}
- st = kzalloc_obj(struct tle62x0_state, GFP_KERNEL);
+ st = kzalloc_obj(struct tle62x0_state);
if (st == NULL)
return -ENOMEM;
diff --git a/drivers/spi/spi-topcliff-pch.c b/drivers/spi/spi-topcliff-pch.c
index 72316aa1aab9..cae2dcefabea 100644
--- a/drivers/spi/spi-topcliff-pch.c
+++ b/drivers/spi/spi-topcliff-pch.c
@@ -1527,11 +1527,11 @@ static int pch_spi_probe(struct pci_dev *pdev, const struct pci_device_id *id)
int i;
struct pch_pd_dev_save *pd_dev_save;
- pd_dev_save = kzalloc_obj(*pd_dev_save, GFP_KERNEL);
+ pd_dev_save = kzalloc_obj(*pd_dev_save);
if (!pd_dev_save)
return -ENOMEM;
- board_dat = kzalloc_obj(*board_dat, GFP_KERNEL);
+ board_dat = kzalloc_obj(*board_dat);
if (!board_dat) {
retval = -ENOMEM;
goto err_no_mem;
diff --git a/drivers/spi/spi.c b/drivers/spi/spi.c
index bd80a8bc8139..61f7bde8c7fb 100644
--- a/drivers/spi/spi.c
+++ b/drivers/spi/spi.c
@@ -568,7 +568,7 @@ struct spi_device *spi_alloc_device(struct spi_controller *ctlr)
if (!spi_controller_get(ctlr))
return NULL;
- spi = kzalloc_obj(*spi, GFP_KERNEL);
+ spi = kzalloc_obj(*spi);
if (!spi) {
spi_controller_put(ctlr);
return NULL;
@@ -921,7 +921,7 @@ int spi_register_board_info(struct spi_board_info const *info, unsigned n)
if (!n)
return 0;
- bi = kzalloc_objs(*bi, n, GFP_KERNEL);
+ bi = kzalloc_objs(*bi, n);
if (!bi)
return -ENOMEM;
diff --git a/drivers/spi/spidev.c b/drivers/spi/spidev.c
index 840347f404b9..638221178384 100644
--- a/drivers/spi/spidev.c
+++ b/drivers/spi/spidev.c
@@ -214,7 +214,7 @@ static int spidev_message(struct spidev_data *spidev,
int status = -EFAULT;
spi_message_init(&msg);
- k_xfers = kzalloc_objs(*k_tmp, n_xfers, GFP_KERNEL);
+ k_xfers = kzalloc_objs(*k_tmp, n_xfers);
if (k_xfers == NULL)
return -ENOMEM;
@@ -777,7 +777,7 @@ static int spidev_probe(struct spi_device *spi)
}
/* Allocate driver data */
- spidev = kzalloc_obj(*spidev, GFP_KERNEL);
+ spidev = kzalloc_obj(*spidev);
if (!spidev)
return -ENOMEM;
diff --git a/drivers/spmi/spmi.c b/drivers/spmi/spmi.c
index 29de3055443d..e889b129f3ac 100644
--- a/drivers/spmi/spmi.c
+++ b/drivers/spmi/spmi.c
@@ -418,7 +418,7 @@ struct spmi_device *spmi_device_alloc(struct spmi_controller *ctrl)
{
struct spmi_device *sdev;
- sdev = kzalloc_obj(*sdev, GFP_KERNEL);
+ sdev = kzalloc_obj(*sdev);
if (!sdev)
return NULL;
diff --git a/drivers/ssb/bridge_pcmcia_80211.c b/drivers/ssb/bridge_pcmcia_80211.c
index 6e958e403dbe..689ff069ff37 100644
--- a/drivers/ssb/bridge_pcmcia_80211.c
+++ b/drivers/ssb/bridge_pcmcia_80211.c
@@ -31,7 +31,7 @@ static int ssb_host_pcmcia_probe(struct pcmcia_device *dev)
int err = -ENOMEM;
int res = 0;
- ssb = kzalloc_obj(*ssb, GFP_KERNEL);
+ ssb = kzalloc_obj(*ssb);
if (!ssb)
goto out_error;
diff --git a/drivers/ssb/driver_gige.c b/drivers/ssb/driver_gige.c
index fc2bf4ceedee..0aca0711807b 100644
--- a/drivers/ssb/driver_gige.c
+++ b/drivers/ssb/driver_gige.c
@@ -173,7 +173,7 @@ static int ssb_gige_probe(struct ssb_device *sdev,
struct ssb_gige *dev;
u32 base, tmslow, tmshigh;
- dev = kzalloc_obj(*dev, GFP_KERNEL);
+ dev = kzalloc_obj(*dev);
if (!dev)
return -ENOMEM;
dev->dev = sdev;
diff --git a/drivers/ssb/main.c b/drivers/ssb/main.c
index bb52e5197b1f..b2d339eb57d5 100644
--- a/drivers/ssb/main.c
+++ b/drivers/ssb/main.c
@@ -481,7 +481,7 @@ static int ssb_devices_register(struct ssb_bus *bus)
continue;
}
- devwrap = kzalloc_obj(*devwrap, GFP_KERNEL);
+ devwrap = kzalloc_obj(*devwrap);
if (!devwrap) {
err = -ENOMEM;
goto error;
diff --git a/drivers/ssb/pcihost_wrapper.c b/drivers/ssb/pcihost_wrapper.c
index 36011a93f5af..5b6b5e0e4433 100644
--- a/drivers/ssb/pcihost_wrapper.c
+++ b/drivers/ssb/pcihost_wrapper.c
@@ -71,7 +71,7 @@ static int ssb_pcihost_probe(struct pci_dev *dev,
int err = -ENOMEM;
u32 val;
- ssb = kzalloc_obj(*ssb, GFP_KERNEL);
+ ssb = kzalloc_obj(*ssb);
if (!ssb)
goto out;
err = pci_enable_device(dev);
diff --git a/drivers/staging/greybus/authentication.c b/drivers/staging/greybus/authentication.c
index e52e3f043572..97b9937bbdc1 100644
--- a/drivers/staging/greybus/authentication.c
+++ b/drivers/staging/greybus/authentication.c
@@ -306,7 +306,7 @@ int gb_cap_connection_init(struct gb_connection *connection)
if (!connection)
return 0;
- cap = kzalloc_obj(*cap, GFP_KERNEL);
+ cap = kzalloc_obj(*cap);
if (!cap)
return -ENOMEM;
diff --git a/drivers/staging/greybus/bootrom.c b/drivers/staging/greybus/bootrom.c
index bad4091e2433..83921d90c322 100644
--- a/drivers/staging/greybus/bootrom.c
+++ b/drivers/staging/greybus/bootrom.c
@@ -424,7 +424,7 @@ static int gb_bootrom_probe(struct gb_bundle *bundle,
if (cport_desc->protocol_id != GREYBUS_PROTOCOL_BOOTROM)
return -ENODEV;
- bootrom = kzalloc_obj(*bootrom, GFP_KERNEL);
+ bootrom = kzalloc_obj(*bootrom);
if (!bootrom)
return -ENOMEM;
diff --git a/drivers/staging/greybus/camera.c b/drivers/staging/greybus/camera.c
index 8ad3785ff467..62b55bb28408 100644
--- a/drivers/staging/greybus/camera.c
+++ b/drivers/staging/greybus/camera.c
@@ -791,7 +791,7 @@ static int gb_camera_op_configure_streams(void *priv, unsigned int *nstreams,
if (gb_nstreams > GB_CAMERA_MAX_STREAMS)
return -EINVAL;
- gb_streams = kzalloc_objs(*gb_streams, gb_nstreams, GFP_KERNEL);
+ gb_streams = kzalloc_objs(*gb_streams, gb_nstreams);
if (!gb_streams)
return -ENOMEM;
@@ -932,7 +932,7 @@ static ssize_t gb_camera_debugfs_configure_streams(struct gb_camera *gcam,
return ret;
/* For each stream to configure parse width, height and format */
- streams = kzalloc_objs(*streams, nstreams, GFP_KERNEL);
+ streams = kzalloc_objs(*streams, nstreams);
if (!streams)
return -ENOMEM;
@@ -1244,7 +1244,7 @@ static int gb_camera_probe(struct gb_bundle *bundle,
if (!mgmt_cport_id || !data_cport_id)
return -ENODEV;
- gcam = kzalloc_obj(*gcam, GFP_KERNEL);
+ gcam = kzalloc_obj(*gcam);
if (!gcam)
return -ENOMEM;
diff --git a/drivers/staging/greybus/fw-core.c b/drivers/staging/greybus/fw-core.c
index 8a437361302c..2016a74f137f 100644
--- a/drivers/staging/greybus/fw-core.c
+++ b/drivers/staging/greybus/fw-core.c
@@ -68,7 +68,7 @@ static int gb_fw_core_probe(struct gb_bundle *bundle,
u16 cport_id;
u8 protocol_id;
- fw_core = kzalloc_obj(*fw_core, GFP_KERNEL);
+ fw_core = kzalloc_obj(*fw_core);
if (!fw_core)
return -ENOMEM;
diff --git a/drivers/staging/greybus/fw-download.c b/drivers/staging/greybus/fw-download.c
index 0216282f72f2..a0a683447b3d 100644
--- a/drivers/staging/greybus/fw-download.c
+++ b/drivers/staging/greybus/fw-download.c
@@ -165,7 +165,7 @@ static struct fw_request *find_firmware(struct fw_download *fw_download,
struct fw_request *fw_req;
int ret, req_count;
- fw_req = kzalloc_obj(*fw_req, GFP_KERNEL);
+ fw_req = kzalloc_obj(*fw_req);
if (!fw_req)
return ERR_PTR(-ENOMEM);
@@ -409,7 +409,7 @@ int gb_fw_download_connection_init(struct gb_connection *connection)
if (!connection)
return 0;
- fw_download = kzalloc_obj(*fw_download, GFP_KERNEL);
+ fw_download = kzalloc_obj(*fw_download);
if (!fw_download)
return -ENOMEM;
diff --git a/drivers/staging/greybus/fw-management.c b/drivers/staging/greybus/fw-management.c
index 012ed95d750e..5d01da6b6eb9 100644
--- a/drivers/staging/greybus/fw-management.c
+++ b/drivers/staging/greybus/fw-management.c
@@ -577,7 +577,7 @@ int gb_fw_mgmt_connection_init(struct gb_connection *connection)
if (!connection)
return 0;
- fw_mgmt = kzalloc_obj(*fw_mgmt, GFP_KERNEL);
+ fw_mgmt = kzalloc_obj(*fw_mgmt);
if (!fw_mgmt)
return -ENOMEM;
diff --git a/drivers/staging/greybus/gbphy.c b/drivers/staging/greybus/gbphy.c
index 24556c686e62..bdb0f5164a6f 100644
--- a/drivers/staging/greybus/gbphy.c
+++ b/drivers/staging/greybus/gbphy.c
@@ -229,7 +229,7 @@ static struct gbphy_device *gb_gbphy_create_dev(struct gb_bundle *bundle,
if (id < 0)
return ERR_PTR(id);
- gbphy_dev = kzalloc_obj(*gbphy_dev, GFP_KERNEL);
+ gbphy_dev = kzalloc_obj(*gbphy_dev);
if (!gbphy_dev) {
ida_free(&gbphy_id, id);
return ERR_PTR(-ENOMEM);
@@ -282,7 +282,7 @@ static int gb_gbphy_probe(struct gb_bundle *bundle,
if (bundle->num_cports == 0)
return -ENODEV;
- gbphy_host = kzalloc_obj(*gbphy_host, GFP_KERNEL);
+ gbphy_host = kzalloc_obj(*gbphy_host);
if (!gbphy_host)
return -ENOMEM;
diff --git a/drivers/staging/greybus/gpio.c b/drivers/staging/greybus/gpio.c
index 5b30841a4205..12185f7a982c 100644
--- a/drivers/staging/greybus/gpio.c
+++ b/drivers/staging/greybus/gpio.c
@@ -485,7 +485,7 @@ static int gb_gpio_controller_setup(struct gb_gpio_controller *ggc)
if (ret)
return ret;
- ggc->lines = kzalloc_objs(*ggc->lines, ggc->line_max + 1, GFP_KERNEL);
+ ggc->lines = kzalloc_objs(*ggc->lines, ggc->line_max + 1);
if (!ggc->lines)
return -ENOMEM;
@@ -502,7 +502,7 @@ static int gb_gpio_probe(struct gbphy_device *gbphy_dev,
struct irq_chip *irqc;
int ret;
- ggc = kzalloc_obj(*ggc, GFP_KERNEL);
+ ggc = kzalloc_obj(*ggc);
if (!ggc)
return -ENOMEM;
diff --git a/drivers/staging/greybus/hid.c b/drivers/staging/greybus/hid.c
index 2b5e6a7b04e6..1f58c907c036 100644
--- a/drivers/staging/greybus/hid.c
+++ b/drivers/staging/greybus/hid.c
@@ -434,7 +434,7 @@ static int gb_hid_probe(struct gb_bundle *bundle,
if (cport_desc->protocol_id != GREYBUS_PROTOCOL_HID)
return -ENODEV;
- ghid = kzalloc_obj(*ghid, GFP_KERNEL);
+ ghid = kzalloc_obj(*ghid);
if (!ghid)
return -ENOMEM;
diff --git a/drivers/staging/greybus/i2c.c b/drivers/staging/greybus/i2c.c
index e6934459c8f6..7b6f42113065 100644
--- a/drivers/staging/greybus/i2c.c
+++ b/drivers/staging/greybus/i2c.c
@@ -235,7 +235,7 @@ static int gb_i2c_probe(struct gbphy_device *gbphy_dev,
struct i2c_adapter *adapter;
int ret;
- gb_i2c_dev = kzalloc_obj(*gb_i2c_dev, GFP_KERNEL);
+ gb_i2c_dev = kzalloc_obj(*gb_i2c_dev);
if (!gb_i2c_dev)
return -ENOMEM;
diff --git a/drivers/staging/greybus/light.c b/drivers/staging/greybus/light.c
index 5b8694d3943b..aa93af873d63 100644
--- a/drivers/staging/greybus/light.c
+++ b/drivers/staging/greybus/light.c
@@ -269,10 +269,10 @@ static int channel_attr_groups_set(struct gb_channel *channel,
return 0;
/* Set attributes based in the channel flags */
- channel->attrs = kzalloc_objs(*channel->attrs, size + 1, GFP_KERNEL);
+ channel->attrs = kzalloc_objs(*channel->attrs, size + 1);
if (!channel->attrs)
return -ENOMEM;
- channel->attr_group = kzalloc_obj(*channel->attr_group, GFP_KERNEL);
+ channel->attr_group = kzalloc_obj(*channel->attr_group);
if (!channel->attr_group)
return -ENOMEM;
channel->attr_groups = kzalloc_objs(*channel->attr_groups, 2,
@@ -1262,7 +1262,7 @@ static int gb_lights_probe(struct gb_bundle *bundle,
if (cport_desc->protocol_id != GREYBUS_PROTOCOL_LIGHTS)
return -ENODEV;
- glights = kzalloc_obj(*glights, GFP_KERNEL);
+ glights = kzalloc_obj(*glights);
if (!glights)
return -ENOMEM;
diff --git a/drivers/staging/greybus/log.c b/drivers/staging/greybus/log.c
index 77fb9880c695..815d20ba9b6b 100644
--- a/drivers/staging/greybus/log.c
+++ b/drivers/staging/greybus/log.c
@@ -77,7 +77,7 @@ static int gb_log_probe(struct gb_bundle *bundle,
if (cport_desc->protocol_id != GREYBUS_PROTOCOL_LOG)
return -ENODEV;
- log = kzalloc_obj(*log, GFP_KERNEL);
+ log = kzalloc_obj(*log);
if (!log)
return -ENOMEM;
diff --git a/drivers/staging/greybus/loopback.c b/drivers/staging/greybus/loopback.c
index 37a8cbf140ad..aa9c73cb0ae5 100644
--- a/drivers/staging/greybus/loopback.c
+++ b/drivers/staging/greybus/loopback.c
@@ -471,7 +471,7 @@ static int gb_loopback_async_operation(struct gb_loopback *gb, int type,
struct gb_operation *operation;
int ret;
- op_async = kzalloc_obj(*op_async, GFP_KERNEL);
+ op_async = kzalloc_obj(*op_async);
if (!op_async)
return -ENOMEM;
@@ -989,7 +989,7 @@ static int gb_loopback_probe(struct gb_bundle *bundle,
if (cport_desc->protocol_id != GREYBUS_PROTOCOL_LOOPBACK)
return -ENODEV;
- gb = kzalloc_obj(*gb, GFP_KERNEL);
+ gb = kzalloc_obj(*gb);
if (!gb)
return -ENOMEM;
diff --git a/drivers/staging/greybus/power_supply.c b/drivers/staging/greybus/power_supply.c
index 94e3650a2880..c51efeaee707 100644
--- a/drivers/staging/greybus/power_supply.c
+++ b/drivers/staging/greybus/power_supply.c
@@ -1063,7 +1063,7 @@ static int gb_power_supply_probe(struct gb_bundle *bundle,
if (cport_desc->protocol_id != GREYBUS_PROTOCOL_POWER_SUPPLY)
return -ENODEV;
- supplies = kzalloc_obj(*supplies, GFP_KERNEL);
+ supplies = kzalloc_obj(*supplies);
if (!supplies)
return -ENOMEM;
diff --git a/drivers/staging/greybus/raw.c b/drivers/staging/greybus/raw.c
index 742b3a84cf12..a8b598ed9269 100644
--- a/drivers/staging/greybus/raw.c
+++ b/drivers/staging/greybus/raw.c
@@ -164,7 +164,7 @@ static int gb_raw_probe(struct gb_bundle *bundle,
if (cport_desc->protocol_id != GREYBUS_PROTOCOL_RAW)
return -ENODEV;
- raw = kzalloc_obj(*raw, GFP_KERNEL);
+ raw = kzalloc_obj(*raw);
if (!raw)
return -ENOMEM;
diff --git a/drivers/staging/greybus/uart.c b/drivers/staging/greybus/uart.c
index 99eff4b97e7a..7d060b4cd33d 100644
--- a/drivers/staging/greybus/uart.c
+++ b/drivers/staging/greybus/uart.c
@@ -823,7 +823,7 @@ static int gb_uart_probe(struct gbphy_device *gbphy_dev,
goto exit_connection_destroy;
}
- gb_tty = kzalloc_obj(*gb_tty, GFP_KERNEL);
+ gb_tty = kzalloc_obj(*gb_tty);
if (!gb_tty) {
retval = -ENOMEM;
goto exit_connection_destroy;
diff --git a/drivers/staging/greybus/vibrator.c b/drivers/staging/greybus/vibrator.c
index fc995fe41604..0ec4d317c9db 100644
--- a/drivers/staging/greybus/vibrator.c
+++ b/drivers/staging/greybus/vibrator.c
@@ -128,7 +128,7 @@ static int gb_vibrator_probe(struct gb_bundle *bundle,
if (cport_desc->protocol_id != GREYBUS_PROTOCOL_VIBRATOR)
return -ENODEV;
- vib = kzalloc_obj(*vib, GFP_KERNEL);
+ vib = kzalloc_obj(*vib);
if (!vib)
return -ENOMEM;
diff --git a/drivers/staging/media/atomisp/i2c/atomisp-gc2235.c b/drivers/staging/media/atomisp/i2c/atomisp-gc2235.c
index a67eeed04b0c..d3414312e1de 100644
--- a/drivers/staging/media/atomisp/i2c/atomisp-gc2235.c
+++ b/drivers/staging/media/atomisp/i2c/atomisp-gc2235.c
@@ -794,7 +794,7 @@ static int gc2235_probe(struct i2c_client *client)
int ret;
unsigned int i;
- dev = kzalloc_obj(*dev, GFP_KERNEL);
+ dev = kzalloc_obj(*dev);
if (!dev)
return -ENOMEM;
diff --git a/drivers/staging/media/atomisp/i2c/atomisp-ov2722.c b/drivers/staging/media/atomisp/i2c/atomisp-ov2722.c
index 38568259bd7f..2c41c496daa6 100644
--- a/drivers/staging/media/atomisp/i2c/atomisp-ov2722.c
+++ b/drivers/staging/media/atomisp/i2c/atomisp-ov2722.c
@@ -952,7 +952,7 @@ static int ov2722_probe(struct i2c_client *client)
void *ovpdev;
int ret;
- dev = kzalloc_obj(*dev, GFP_KERNEL);
+ dev = kzalloc_obj(*dev);
if (!dev)
return -ENOMEM;
diff --git a/drivers/staging/media/atomisp/pci/atomisp_cmd.c b/drivers/staging/media/atomisp/pci/atomisp_cmd.c
index 4584f0ee15f0..fec369575d88 100644
--- a/drivers/staging/media/atomisp/pci/atomisp_cmd.c
+++ b/drivers/staging/media/atomisp/pci/atomisp_cmd.c
@@ -2960,7 +2960,7 @@ int atomisp_set_parameters(struct video_device *vdev,
* are ready, the parameters will be set to CSS.
* per-frame setting only works for the main output frame.
*/
- param = kvzalloc_obj(*param, GFP_KERNEL);
+ param = kvzalloc_obj(*param);
if (!param)
return -ENOMEM;
css_param = ¶m->params;
diff --git a/drivers/staging/media/atomisp/pci/atomisp_gmin_platform.c b/drivers/staging/media/atomisp/pci/atomisp_gmin_platform.c
index 27d3c7d83e21..4026e98c5845 100644
--- a/drivers/staging/media/atomisp/pci/atomisp_gmin_platform.c
+++ b/drivers/staging/media/atomisp/pci/atomisp_gmin_platform.c
@@ -969,7 +969,7 @@ static int camera_sensor_csi_alloc(struct v4l2_subdev *sd, u32 port, u32 lanes,
struct i2c_client *client = v4l2_get_subdevdata(sd);
struct camera_mipi_info *csi;
- csi = kzalloc_obj(*csi, GFP_KERNEL);
+ csi = kzalloc_obj(*csi);
if (!csi)
return -ENOMEM;
diff --git a/drivers/staging/media/atomisp/pci/hmm/hmm_bo.c b/drivers/staging/media/atomisp/pci/hmm/hmm_bo.c
index 8181e988266a..856561e951a5 100644
--- a/drivers/staging/media/atomisp/pci/hmm/hmm_bo.c
+++ b/drivers/staging/media/atomisp/pci/hmm/hmm_bo.c
@@ -676,7 +676,7 @@ int hmm_bo_alloc_pages(struct hmm_buffer_object *bo,
mutex_lock(&bo->mutex);
check_bo_status_no_goto(bo, HMM_BO_PAGE_ALLOCED, status_err);
- bo->pages = kzalloc_objs(struct page *, bo->pgnr, GFP_KERNEL);
+ bo->pages = kzalloc_objs(struct page *, bo->pgnr);
if (unlikely(!bo->pages)) {
ret = -ENOMEM;
goto alloc_err;
diff --git a/drivers/staging/media/atomisp/pci/isp/kernels/sdis/sdis_1.0/ia_css_sdis.host.c b/drivers/staging/media/atomisp/pci/isp/kernels/sdis/sdis_1.0/ia_css_sdis.host.c
index 473e71e1bb59..bd2def6c341a 100644
--- a/drivers/staging/media/atomisp/pci/isp/kernels/sdis/sdis_1.0/ia_css_sdis.host.c
+++ b/drivers/staging/media/atomisp/pci/isp/kernels/sdis/sdis_1.0/ia_css_sdis.host.c
@@ -309,7 +309,7 @@ ia_css_isp_dvs_statistics_allocate(
if (!grid->enable)
return NULL;
- me = kvzalloc_objs(*me, 1, GFP_KERNEL);
+ me = kvzalloc_objs(*me, 1);
if (!me)
goto err;
@@ -350,7 +350,7 @@ ia_css_isp_dvs_statistics_map_allocate(
* so we use a local char * instead. */
char *base_ptr;
- me = kvmalloc_obj(*me, GFP_KERNEL);
+ me = kvmalloc_obj(*me);
if (!me) {
IA_CSS_LOG("cannot allocate memory");
goto err;
diff --git a/drivers/staging/media/atomisp/pci/isp/kernels/sdis/sdis_2/ia_css_sdis2.host.c b/drivers/staging/media/atomisp/pci/isp/kernels/sdis/sdis_2/ia_css_sdis2.host.c
index f84ee4c683f4..4a38d678f334 100644
--- a/drivers/staging/media/atomisp/pci/isp/kernels/sdis/sdis_2/ia_css_sdis2.host.c
+++ b/drivers/staging/media/atomisp/pci/isp/kernels/sdis/sdis_2/ia_css_sdis2.host.c
@@ -274,7 +274,7 @@ ia_css_isp_dvs2_statistics_allocate(
if (!grid->enable)
return NULL;
- me = kvzalloc_objs(*me, 1, GFP_KERNEL);
+ me = kvzalloc_objs(*me, 1);
if (!me)
goto err;
diff --git a/drivers/staging/media/atomisp/pci/runtime/frame/src/frame.c b/drivers/staging/media/atomisp/pci/runtime/frame/src/frame.c
index 2217e3623a23..8614efc28b19 100644
--- a/drivers/staging/media/atomisp/pci/runtime/frame/src/frame.c
+++ b/drivers/staging/media/atomisp/pci/runtime/frame/src/frame.c
@@ -650,7 +650,7 @@ static struct ia_css_frame *frame_create(unsigned int width,
unsigned int raw_bit_depth,
bool valid)
{
- struct ia_css_frame *me = kvmalloc_obj(*me, GFP_KERNEL);
+ struct ia_css_frame *me = kvmalloc_obj(*me);
if (!me)
return NULL;
diff --git a/drivers/staging/media/atomisp/pci/runtime/pipeline/src/pipeline.c b/drivers/staging/media/atomisp/pci/runtime/pipeline/src/pipeline.c
index 2a1ba0a9c916..0470871f8fff 100644
--- a/drivers/staging/media/atomisp/pci/runtime/pipeline/src/pipeline.c
+++ b/drivers/staging/media/atomisp/pci/runtime/pipeline/src/pipeline.c
@@ -579,7 +579,7 @@ static int pipeline_stage_create(
out_frame[i] = stage_desc->out_frame[i];
}
- stage = kvzalloc_obj(*stage, GFP_KERNEL);
+ stage = kvzalloc_obj(*stage);
if (!stage) {
err = -ENOMEM;
goto ERR;
diff --git a/drivers/staging/media/atomisp/pci/sh_css.c b/drivers/staging/media/atomisp/pci/sh_css.c
index abf598b2811f..78ea854d903d 100644
--- a/drivers/staging/media/atomisp/pci/sh_css.c
+++ b/drivers/staging/media/atomisp/pci/sh_css.c
@@ -1880,7 +1880,7 @@ create_pipe(enum ia_css_pipe_mode mode,
return -EINVAL;
}
- me = kmalloc_obj(*me, GFP_KERNEL);
+ me = kmalloc_obj(*me);
if (!me)
return -ENOMEM;
@@ -7910,7 +7910,7 @@ ia_css_stream_create(const struct ia_css_stream_config *stream_config,
}
/* allocate the stream instance */
- curr_stream = kzalloc_obj(struct ia_css_stream, GFP_KERNEL);
+ curr_stream = kzalloc_obj(struct ia_css_stream);
if (!curr_stream) {
err = -ENOMEM;
IA_CSS_LEAVE_ERR(err);
diff --git a/drivers/staging/media/atomisp/pci/sh_css_host_data.c b/drivers/staging/media/atomisp/pci/sh_css_host_data.c
index c9400600c241..d8f8e5e4482c 100644
--- a/drivers/staging/media/atomisp/pci/sh_css_host_data.c
+++ b/drivers/staging/media/atomisp/pci/sh_css_host_data.c
@@ -12,7 +12,7 @@ struct ia_css_host_data *ia_css_host_data_allocate(size_t size)
{
struct ia_css_host_data *me;
- me = kmalloc_obj(struct ia_css_host_data, GFP_KERNEL);
+ me = kmalloc_obj(struct ia_css_host_data);
if (!me)
return NULL;
me->size = (uint32_t)size;
diff --git a/drivers/staging/media/atomisp/pci/sh_css_param_dvs.c b/drivers/staging/media/atomisp/pci/sh_css_param_dvs.c
index 19f1b71a5c06..9ccdb66de2df 100644
--- a/drivers/staging/media/atomisp/pci/sh_css_param_dvs.c
+++ b/drivers/staging/media/atomisp/pci/sh_css_param_dvs.c
@@ -22,7 +22,7 @@ alloc_dvs_6axis_table(const struct ia_css_resolution *frame_res,
int err = 0;
struct ia_css_dvs_6axis_config *dvs_config = NULL;
- dvs_config = kvmalloc_obj(struct ia_css_dvs_6axis_config, GFP_KERNEL);
+ dvs_config = kvmalloc_obj(struct ia_css_dvs_6axis_config);
if (!dvs_config) {
IA_CSS_ERROR("out of memory");
err = -ENOMEM;
diff --git a/drivers/staging/media/atomisp/pci/sh_css_param_shading.c b/drivers/staging/media/atomisp/pci/sh_css_param_shading.c
index e9ce4ef6a991..9105334c71b1 100644
--- a/drivers/staging/media/atomisp/pci/sh_css_param_shading.c
+++ b/drivers/staging/media/atomisp/pci/sh_css_param_shading.c
@@ -328,7 +328,7 @@ ia_css_shading_table_alloc(
IA_CSS_ENTER("");
- me = kmalloc_obj(*me, GFP_KERNEL);
+ me = kmalloc_obj(*me);
if (!me)
return me;
diff --git a/drivers/staging/media/atomisp/pci/sh_css_params.c b/drivers/staging/media/atomisp/pci/sh_css_params.c
index ab9ab7b2f177..424876311da5 100644
--- a/drivers/staging/media/atomisp/pci/sh_css_params.c
+++ b/drivers/staging/media/atomisp/pci/sh_css_params.c
@@ -1369,7 +1369,7 @@ struct ia_css_morph_table *ia_css_morph_table_allocate(
IA_CSS_ENTER("");
- me = kvmalloc_obj(*me, GFP_KERNEL);
+ me = kvmalloc_obj(*me);
if (!me) {
IA_CSS_ERROR("out of memory");
return me;
@@ -1516,7 +1516,7 @@ ia_css_isp_3a_statistics_map_allocate(
* so we use a local char * instead. */
char *base_ptr;
- me = kvmalloc_obj(*me, GFP_KERNEL);
+ me = kvmalloc_obj(*me);
if (!me) {
IA_CSS_LEAVE("cannot allocate memory");
goto err;
@@ -2136,7 +2136,7 @@ ia_css_isp_3a_statistics_allocate(const struct ia_css_3a_grid_info *grid)
if (!grid->enable)
return NULL;
- me = kvzalloc_objs(*me, 1, GFP_KERNEL);
+ me = kvzalloc_objs(*me, 1);
if (!me)
goto err;
@@ -2200,7 +2200,7 @@ ia_css_metadata_allocate(const struct ia_css_metadata_info *metadata_info)
if (metadata_info->size == 0)
return NULL;
- md = kvmalloc_obj(*md, GFP_KERNEL);
+ md = kvmalloc_obj(*md);
if (!md)
goto error;
@@ -2330,7 +2330,7 @@ sh_css_create_isp_params(struct ia_css_stream *stream,
int err;
size_t params_size;
struct ia_css_isp_parameters *params =
- kvmalloc_obj(struct ia_css_isp_parameters, GFP_KERNEL);
+ kvmalloc_obj(struct ia_css_isp_parameters);
if (!params) {
*isp_params_out = NULL;
@@ -4161,7 +4161,7 @@ ia_css_3a_statistics_allocate(const struct ia_css_3a_grid_info *grid)
assert(grid);
- me = kvzalloc_objs(*me, 1, GFP_KERNEL);
+ me = kvzalloc_objs(*me, 1);
if (!me)
goto err;
@@ -4201,7 +4201,7 @@ ia_css_dvs_statistics_allocate(const struct ia_css_dvs_grid_info *grid)
assert(grid);
- me = kvzalloc_objs(*me, 1, GFP_KERNEL);
+ me = kvzalloc_objs(*me, 1);
if (!me)
goto err;
@@ -4239,7 +4239,7 @@ ia_css_dvs_coefficients_allocate(const struct ia_css_dvs_grid_info *grid)
assert(grid);
- me = kvzalloc_objs(*me, 1, GFP_KERNEL);
+ me = kvzalloc_objs(*me, 1);
if (!me)
goto err;
@@ -4280,7 +4280,7 @@ ia_css_dvs2_statistics_allocate(const struct ia_css_dvs_grid_info *grid)
assert(grid);
- me = kvzalloc_objs(*me, 1, GFP_KERNEL);
+ me = kvzalloc_objs(*me, 1);
if (!me)
goto err;
@@ -4371,7 +4371,7 @@ ia_css_dvs2_coefficients_allocate(const struct ia_css_dvs_grid_info *grid)
assert(grid);
- me = kvzalloc_objs(*me, 1, GFP_KERNEL);
+ me = kvzalloc_objs(*me, 1);
if (!me)
goto err;
diff --git a/drivers/staging/media/av7110/av7110.c b/drivers/staging/media/av7110/av7110.c
index bdd3cc28e364..607992100baf 100644
--- a/drivers/staging/media/av7110/av7110.c
+++ b/drivers/staging/media/av7110/av7110.c
@@ -2424,7 +2424,7 @@ static int av7110_attach(struct saa7146_dev *dev,
}
/* prepare the av7110 device struct */
- av7110 = kzalloc_obj(*av7110, GFP_KERNEL);
+ av7110 = kzalloc_obj(*av7110);
if (!av7110) {
dprintk(1, "out of memory\n");
return -ENOMEM;
diff --git a/drivers/staging/media/av7110/sp8870.c b/drivers/staging/media/av7110/sp8870.c
index 2254a5f3a351..29fb4934c039 100644
--- a/drivers/staging/media/av7110/sp8870.c
+++ b/drivers/staging/media/av7110/sp8870.c
@@ -563,7 +563,7 @@ struct dvb_frontend *sp8870_attach(const struct sp8870_config *config,
struct sp8870_state *state = NULL;
/* allocate memory for the internal state */
- state = kzalloc_obj(*state, GFP_KERNEL);
+ state = kzalloc_obj(*state);
if (!state)
goto error;
diff --git a/drivers/staging/media/imx/imx-media-csc-scaler.c b/drivers/staging/media/imx/imx-media-csc-scaler.c
index f068ead6c088..00fcdd4d0487 100644
--- a/drivers/staging/media/imx/imx-media-csc-scaler.c
+++ b/drivers/staging/media/imx/imx-media-csc-scaler.c
@@ -124,7 +124,7 @@ static void device_run(void *_ctx)
src_buf = v4l2_m2m_next_src_buf(ctx->fh.m2m_ctx);
dst_buf = v4l2_m2m_next_dst_buf(ctx->fh.m2m_ctx);
- run = kzalloc_obj(*run, GFP_KERNEL);
+ run = kzalloc_obj(*run);
if (!run)
goto err;
@@ -756,7 +756,7 @@ static int ipu_csc_scaler_open(struct file *file)
struct ipu_csc_scaler_ctx *ctx = NULL;
int ret;
- ctx = kzalloc_obj(*ctx, GFP_KERNEL);
+ ctx = kzalloc_obj(*ctx);
if (!ctx)
return -ENOMEM;
@@ -880,7 +880,7 @@ imx_media_csc_scaler_device_init(struct imx_media_dev *md)
struct video_device *vfd;
int ret;
- priv = kzalloc_obj(*priv, GFP_KERNEL);
+ priv = kzalloc_obj(*priv);
if (!priv)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/staging/media/ipu3/ipu3-css-fw.c b/drivers/staging/media/ipu3/ipu3-css-fw.c
index 0f242dd27288..146e92ce6e4c 100644
--- a/drivers/staging/media/ipu3/ipu3-css-fw.c
+++ b/drivers/staging/media/ipu3/ipu3-css-fw.c
@@ -236,7 +236,7 @@ int imgu_css_fw_init(struct imgu_css *css)
/* Allocate and map fw binaries into IMGU */
- css->binary = kzalloc_objs(*css->binary, binary_nr, GFP_KERNEL);
+ css->binary = kzalloc_objs(*css->binary, binary_nr);
if (!css->binary) {
r = -ENOMEM;
goto error_out;
diff --git a/drivers/staging/media/ipu3/ipu3-css.c b/drivers/staging/media/ipu3/ipu3-css.c
index 3fb863043c71..8063401246fb 100644
--- a/drivers/staging/media/ipu3/ipu3-css.c
+++ b/drivers/staging/media/ipu3/ipu3-css.c
@@ -1702,7 +1702,7 @@ int imgu_css_fmt_try(struct imgu_css *css,
struct v4l2_pix_format_mplane *in, *out, *vf;
int i, s, ret;
- q = kzalloc_objs(struct imgu_css_queue, IPU3_CSS_QUEUES, GFP_KERNEL);
+ q = kzalloc_objs(struct imgu_css_queue, IPU3_CSS_QUEUES);
if (!q)
return -ENOMEM;
diff --git a/drivers/staging/media/ipu3/ipu3-dmamap.c b/drivers/staging/media/ipu3/ipu3-dmamap.c
index 9f6025aa8a1f..ef208a059ef6 100644
--- a/drivers/staging/media/ipu3/ipu3-dmamap.c
+++ b/drivers/staging/media/ipu3/ipu3-dmamap.c
@@ -39,7 +39,7 @@ static struct page **imgu_dmamap_alloc_buffer(size_t size, gfp_t gfp)
const gfp_t high_order_gfp = __GFP_NOWARN | __GFP_NORETRY;
/* Allocate mem for array of page ptrs */
- pages = kvmalloc_objs(*pages, count, GFP_KERNEL);
+ pages = kvmalloc_objs(*pages, count);
if (!pages)
return NULL;
diff --git a/drivers/staging/media/ipu3/ipu3-mmu.c b/drivers/staging/media/ipu3/ipu3-mmu.c
index 03583d37fdd0..b196a5815903 100644
--- a/drivers/staging/media/ipu3/ipu3-mmu.c
+++ b/drivers/staging/media/ipu3/ipu3-mmu.c
@@ -429,7 +429,7 @@ struct imgu_mmu_info *imgu_mmu_init(struct device *parent, void __iomem *base)
struct imgu_mmu *mmu;
u32 pteval;
- mmu = kzalloc_obj(*mmu, GFP_KERNEL);
+ mmu = kzalloc_obj(*mmu);
if (!mmu)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/staging/media/ipu7/ipu7-bus.c b/drivers/staging/media/ipu7/ipu7-bus.c
index 583825d15230..7a1b0744b236 100644
--- a/drivers/staging/media/ipu7/ipu7-bus.c
+++ b/drivers/staging/media/ipu7/ipu7-bus.c
@@ -89,7 +89,7 @@ ipu7_bus_initialize_device(struct pci_dev *pdev, struct device *parent,
struct ipu7_device *isp = pci_get_drvdata(pdev);
int ret;
- adev = kzalloc_obj(*adev, GFP_KERNEL);
+ adev = kzalloc_obj(*adev);
if (!adev)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/staging/media/ipu7/ipu7-dma.c b/drivers/staging/media/ipu7/ipu7-dma.c
index 4f934e4c930b..9a356ae3b95a 100644
--- a/drivers/staging/media/ipu7/ipu7-dma.c
+++ b/drivers/staging/media/ipu7/ipu7-dma.c
@@ -164,7 +164,7 @@ void *ipu7_dma_alloc(struct ipu7_bus_device *sys, size_t size,
unsigned int i;
int ret;
- info = kzalloc_obj(*info, GFP_KERNEL);
+ info = kzalloc_obj(*info);
if (!info)
return NULL;
diff --git a/drivers/staging/media/ipu7/ipu7-mmu.c b/drivers/staging/media/ipu7/ipu7-mmu.c
index dfed9872bdfd..6ded07ccd780 100644
--- a/drivers/staging/media/ipu7/ipu7-mmu.c
+++ b/drivers/staging/media/ipu7/ipu7-mmu.c
@@ -584,7 +584,7 @@ static struct ipu7_mmu_info *ipu7_mmu_alloc(struct ipu7_device *isp)
struct ipu7_mmu_info *mmu_info;
int ret;
- mmu_info = kzalloc_obj(*mmu_info, GFP_KERNEL);
+ mmu_info = kzalloc_obj(*mmu_info);
if (!mmu_info)
return NULL;
@@ -654,7 +654,7 @@ static struct ipu7_dma_mapping *alloc_dma_mapping(struct ipu7_device *isp)
struct ipu7_dma_mapping *dmap;
unsigned long base_pfn;
- dmap = kzalloc_obj(*dmap, GFP_KERNEL);
+ dmap = kzalloc_obj(*dmap);
if (!dmap)
return NULL;
diff --git a/drivers/staging/media/ipu7/ipu7.c b/drivers/staging/media/ipu7/ipu7.c
index 47b859e1fa0f..c771e763f8c5 100644
--- a/drivers/staging/media/ipu7/ipu7.c
+++ b/drivers/staging/media/ipu7/ipu7.c
@@ -2150,7 +2150,7 @@ ipu7_isys_init(struct pci_dev *pdev, struct device *parent,
}
}
- pdata = kzalloc_obj(*pdata, GFP_KERNEL);
+ pdata = kzalloc_obj(*pdata);
if (!pdata)
return ERR_PTR(-ENOMEM);
@@ -2197,7 +2197,7 @@ ipu7_psys_init(struct pci_dev *pdev, struct device *parent,
struct ipu7_psys_pdata *pdata;
int ret;
- pdata = kzalloc_obj(*pdata, GFP_KERNEL);
+ pdata = kzalloc_obj(*pdata);
if (!pdata)
return ERR_PTR(-ENOMEM);
@@ -2271,7 +2271,7 @@ static int ipu7_map_fw_code_region(struct ipu7_bus_device *sys,
n_pages = PFN_UP(size);
- pages = kmalloc_objs(*pages, n_pages, GFP_KERNEL);
+ pages = kmalloc_objs(*pages, n_pages);
if (!pages)
return -ENOMEM;
diff --git a/drivers/staging/media/meson/vdec/codec_h264.c b/drivers/staging/media/meson/vdec/codec_h264.c
index bafa7e99abf1..89e0f8624e5b 100644
--- a/drivers/staging/media/meson/vdec/codec_h264.c
+++ b/drivers/staging/media/meson/vdec/codec_h264.c
@@ -233,7 +233,7 @@ static int codec_h264_load_extended_firmware(struct amvdec_session *sess,
if (len < SIZE_EXT_FW)
return -EINVAL;
- h264 = kzalloc_obj(*h264, GFP_KERNEL);
+ h264 = kzalloc_obj(*h264);
if (!h264)
return -ENOMEM;
diff --git a/drivers/staging/media/meson/vdec/codec_mpeg12.c b/drivers/staging/media/meson/vdec/codec_mpeg12.c
index 01adf66fb50a..76e9ca7191ab 100644
--- a/drivers/staging/media/meson/vdec/codec_mpeg12.c
+++ b/drivers/staging/media/meson/vdec/codec_mpeg12.c
@@ -66,7 +66,7 @@ static int codec_mpeg12_start(struct amvdec_session *sess)
struct codec_mpeg12 *mpeg12;
int ret;
- mpeg12 = kzalloc_obj(*mpeg12, GFP_KERNEL);
+ mpeg12 = kzalloc_obj(*mpeg12);
if (!mpeg12)
return -ENOMEM;
diff --git a/drivers/staging/media/meson/vdec/codec_vp9.c b/drivers/staging/media/meson/vdec/codec_vp9.c
index c82f7be67bc5..8e80ecf84193 100644
--- a/drivers/staging/media/meson/vdec/codec_vp9.c
+++ b/drivers/staging/media/meson/vdec/codec_vp9.c
@@ -762,7 +762,7 @@ static int codec_vp9_start(struct amvdec_session *sess)
int i;
int ret;
- vp9 = kzalloc_obj(*vp9, GFP_KERNEL);
+ vp9 = kzalloc_obj(*vp9);
if (!vp9)
return -ENOMEM;
@@ -1192,7 +1192,7 @@ static struct vp9_frame *codec_vp9_get_new_frame(struct amvdec_session *sess)
struct vb2_v4l2_buffer *vbuf;
struct vp9_frame *new_frame;
- new_frame = kzalloc_obj(*new_frame, GFP_KERNEL);
+ new_frame = kzalloc_obj(*new_frame);
if (!new_frame)
return NULL;
diff --git a/drivers/staging/media/meson/vdec/vdec.c b/drivers/staging/media/meson/vdec/vdec.c
index befd3c3762cc..4b77ec1af5a7 100644
--- a/drivers/staging/media/meson/vdec/vdec.c
+++ b/drivers/staging/media/meson/vdec/vdec.c
@@ -132,7 +132,7 @@ vdec_queue_recycle(struct amvdec_session *sess, struct vb2_buffer *vb)
{
struct amvdec_buffer *new_buf;
- new_buf = kmalloc_obj(*new_buf, GFP_KERNEL);
+ new_buf = kmalloc_obj(*new_buf);
if (!new_buf)
return;
new_buf->vb = vb;
@@ -867,7 +867,7 @@ static int vdec_open(struct file *file)
struct amvdec_session *sess;
int ret;
- sess = kzalloc_obj(*sess, GFP_KERNEL);
+ sess = kzalloc_obj(*sess);
if (!sess)
return -ENOMEM;
diff --git a/drivers/staging/media/meson/vdec/vdec_helpers.c b/drivers/staging/media/meson/vdec/vdec_helpers.c
index 86ed5b8113d2..f02c21d5a9c1 100644
--- a/drivers/staging/media/meson/vdec/vdec_helpers.c
+++ b/drivers/staging/media/meson/vdec/vdec_helpers.c
@@ -233,7 +233,7 @@ int amvdec_add_ts(struct amvdec_session *sess, u64 ts,
struct amvdec_timestamp *new_ts;
unsigned long flags;
- new_ts = kzalloc_obj(*new_ts, GFP_KERNEL);
+ new_ts = kzalloc_obj(*new_ts);
if (!new_ts)
return -ENOMEM;
diff --git a/drivers/staging/media/sunxi/cedrus/cedrus.c b/drivers/staging/media/sunxi/cedrus/cedrus.c
index accaee635d21..6600245dff0e 100644
--- a/drivers/staging/media/sunxi/cedrus/cedrus.c
+++ b/drivers/staging/media/sunxi/cedrus/cedrus.c
@@ -359,7 +359,7 @@ static int cedrus_open(struct file *file)
if (mutex_lock_interruptible(&dev->dev_mutex))
return -ERESTARTSYS;
- ctx = kzalloc_obj(*ctx, GFP_KERNEL);
+ ctx = kzalloc_obj(*ctx);
if (!ctx) {
mutex_unlock(&dev->dev_mutex);
return -ENOMEM;
diff --git a/drivers/staging/media/tegra-video/csi.c b/drivers/staging/media/tegra-video/csi.c
index 98e3a97ee658..7842104ca933 100644
--- a/drivers/staging/media/tegra-video/csi.c
+++ b/drivers/staging/media/tegra-video/csi.c
@@ -463,7 +463,7 @@ static int tegra_csi_channel_alloc(struct tegra_csi *csi,
struct tegra_csi_channel *chan;
int ret = 0, i;
- chan = kzalloc_obj(*chan, GFP_KERNEL);
+ chan = kzalloc_obj(*chan);
if (!chan)
return -ENOMEM;
diff --git a/drivers/staging/media/tegra-video/vi.c b/drivers/staging/media/tegra-video/vi.c
index a86d0223f6c3..9c0b38585d63 100644
--- a/drivers/staging/media/tegra-video/vi.c
+++ b/drivers/staging/media/tegra-video/vi.c
@@ -1209,7 +1209,7 @@ static int tegra_vi_channel_alloc(struct tegra_vi *vi, unsigned int port_num,
* be holding the device node open. Channel memory allocated
* with kzalloc is freed during video device release callback.
*/
- chan = kzalloc_obj(*chan, GFP_KERNEL);
+ chan = kzalloc_obj(*chan);
if (!chan)
return -ENOMEM;
diff --git a/drivers/staging/media/tegra-video/video.c b/drivers/staging/media/tegra-video/video.c
index 06d85292c0d2..ae1ae03fa9de 100644
--- a/drivers/staging/media/tegra-video/video.c
+++ b/drivers/staging/media/tegra-video/video.c
@@ -46,7 +46,7 @@ static int host1x_video_probe(struct host1x_device *dev)
struct tegra_video_device *vid;
int ret;
- vid = kzalloc_obj(*vid, GFP_KERNEL);
+ vid = kzalloc_obj(*vid);
if (!vid)
return -ENOMEM;
diff --git a/drivers/staging/most/dim2/dim2.c b/drivers/staging/most/dim2/dim2.c
index 16b1aca26333..8d649d920433 100644
--- a/drivers/staging/most/dim2/dim2.c
+++ b/drivers/staging/most/dim2/dim2.c
@@ -759,7 +759,7 @@ static int dim2_probe(struct platform_device *pdev)
enum { MLB_INT_IDX, AHB0_INT_IDX };
- dev = kzalloc_obj(*dev, GFP_KERNEL);
+ dev = kzalloc_obj(*dev);
if (!dev)
return -ENOMEM;
diff --git a/drivers/staging/most/video/video.c b/drivers/staging/most/video/video.c
index b0d7216f5ab5..04351f8ccccf 100644
--- a/drivers/staging/most/video/video.c
+++ b/drivers/staging/most/video/video.c
@@ -84,7 +84,7 @@ static int comp_vdev_open(struct file *filp)
return -EINVAL;
}
- fh = kzalloc_obj(*fh, GFP_KERNEL);
+ fh = kzalloc_obj(*fh);
if (!fh)
return -ENOMEM;
@@ -474,7 +474,7 @@ static int comp_probe_channel(struct most_interface *iface, int channel_idx,
return -EINVAL;
}
- mdev = kzalloc_obj(*mdev, GFP_KERNEL);
+ mdev = kzalloc_obj(*mdev);
if (!mdev)
return -ENOMEM;
diff --git a/drivers/staging/nvec/nvec_ps2.c b/drivers/staging/nvec/nvec_ps2.c
index 3422a5213803..e6234d29e264 100644
--- a/drivers/staging/nvec/nvec_ps2.c
+++ b/drivers/staging/nvec/nvec_ps2.c
@@ -102,7 +102,7 @@ static int nvec_mouse_probe(struct platform_device *pdev)
struct nvec_chip *nvec = dev_get_drvdata(pdev->dev.parent);
struct serio *ser_dev;
- ser_dev = kzalloc_obj(*ser_dev, GFP_KERNEL);
+ ser_dev = kzalloc_obj(*ser_dev);
if (!ser_dev)
return -ENOMEM;
diff --git a/drivers/staging/rtl8723bs/core/rtw_ap.c b/drivers/staging/rtl8723bs/core/rtw_ap.c
index a90b117906ce..864cd8b6d1f1 100644
--- a/drivers/staging/rtl8723bs/core/rtw_ap.c
+++ b/drivers/staging/rtl8723bs/core/rtw_ap.c
@@ -1229,13 +1229,13 @@ u8 rtw_ap_set_pairwise_key(struct adapter *padapter, struct sta_info *psta)
struct cmd_priv *pcmdpriv = &padapter->cmdpriv;
u8 res = _SUCCESS;
- ph2c = kzalloc_obj(*ph2c, GFP_KERNEL);
+ ph2c = kzalloc_obj(*ph2c);
if (!ph2c) {
res = _FAIL;
goto exit;
}
- psetstakey_para = kzalloc_obj(*psetstakey_para, GFP_KERNEL);
+ psetstakey_para = kzalloc_obj(*psetstakey_para);
if (!psetstakey_para) {
kfree(ph2c);
res = _FAIL;
@@ -1269,12 +1269,12 @@ static int rtw_ap_set_key(struct adapter *padapter,
struct cmd_priv *pcmdpriv = &padapter->cmdpriv;
int res = _SUCCESS;
- pcmd = kzalloc_obj(*pcmd, GFP_KERNEL);
+ pcmd = kzalloc_obj(*pcmd);
if (!pcmd) {
res = _FAIL;
goto exit;
}
- psetkeyparm = kzalloc_obj(*psetkeyparm, GFP_KERNEL);
+ psetkeyparm = kzalloc_obj(*psetkeyparm);
if (!psetkeyparm) {
kfree(pcmd);
res = _FAIL;
diff --git a/drivers/staging/rtl8723bs/core/rtw_cmd.c b/drivers/staging/rtl8723bs/core/rtw_cmd.c
index 59f4e12535f9..abb84f8aecbe 100644
--- a/drivers/staging/rtl8723bs/core/rtw_cmd.c
+++ b/drivers/staging/rtl8723bs/core/rtw_cmd.c
@@ -634,7 +634,7 @@ int rtw_startbss_cmd(struct adapter *padapter, int flags)
start_bss_network(padapter);
} else {
/* need enqueue, prepare cmd_obj and enqueue */
- pcmd = kzalloc_obj(*pcmd, GFP_KERNEL);
+ pcmd = kzalloc_obj(*pcmd);
if (!pcmd) {
res = _FAIL;
goto exit;
@@ -686,7 +686,7 @@ u8 rtw_joinbss_cmd(struct adapter *padapter, struct wlan_network *pnetwork)
u32 tmp_len;
u8 *ptmp = NULL;
- pcmd = kzalloc_obj(*pcmd, GFP_KERNEL);
+ pcmd = kzalloc_obj(*pcmd);
if (!pcmd) {
res = _FAIL;
goto exit;
@@ -795,7 +795,7 @@ u8 rtw_disassoc_cmd(struct adapter *padapter, u32 deauth_timeout_ms, bool enqueu
u8 res = _SUCCESS;
/* prepare cmd parameter */
- param = kzalloc_obj(*param, GFP_KERNEL);
+ param = kzalloc_obj(*param);
if (!param) {
res = _FAIL;
goto exit;
@@ -804,7 +804,7 @@ u8 rtw_disassoc_cmd(struct adapter *padapter, u32 deauth_timeout_ms, bool enqueu
if (enqueue) {
/* need enqueue, prepare cmd_obj and enqueue */
- cmdobj = kzalloc_obj(*cmdobj, GFP_KERNEL);
+ cmdobj = kzalloc_obj(*cmdobj);
if (!cmdobj) {
res = _FAIL;
kfree(param);
@@ -831,7 +831,7 @@ u8 rtw_setopmode_cmd(struct adapter *padapter, enum ndis_802_11_network_infrast
struct cmd_priv *pcmdpriv = &padapter->cmdpriv;
u8 res = _SUCCESS;
- psetop = kzalloc_obj(*psetop, GFP_KERNEL);
+ psetop = kzalloc_obj(*psetop);
if (!psetop) {
res = _FAIL;
goto exit;
@@ -839,7 +839,7 @@ u8 rtw_setopmode_cmd(struct adapter *padapter, enum ndis_802_11_network_infrast
psetop->mode = (u8)networktype;
if (enqueue) {
- ph2c = kzalloc_obj(*ph2c, GFP_KERNEL);
+ ph2c = kzalloc_obj(*ph2c);
if (!ph2c) {
kfree(psetop);
res = _FAIL;
@@ -866,7 +866,7 @@ u8 rtw_setstakey_cmd(struct adapter *padapter, struct sta_info *sta, u8 unicast_
struct security_priv *psecuritypriv = &padapter->securitypriv;
u8 res = _SUCCESS;
- psetstakey_para = kzalloc_obj(*psetstakey_para, GFP_KERNEL);
+ psetstakey_para = kzalloc_obj(*psetstakey_para);
if (!psetstakey_para) {
res = _FAIL;
goto exit;
@@ -888,14 +888,14 @@ u8 rtw_setstakey_cmd(struct adapter *padapter, struct sta_info *sta, u8 unicast_
padapter->securitypriv.busetkipkey = true;
if (enqueue) {
- ph2c = kzalloc_obj(*ph2c, GFP_KERNEL);
+ ph2c = kzalloc_obj(*ph2c);
if (!ph2c) {
kfree(psetstakey_para);
res = _FAIL;
goto exit;
}
- psetstakey_rsp = kzalloc_obj(*psetstakey_rsp, GFP_KERNEL);
+ psetstakey_rsp = kzalloc_obj(*psetstakey_rsp);
if (!psetstakey_rsp) {
kfree(ph2c);
kfree(psetstakey_para);
@@ -933,20 +933,20 @@ u8 rtw_clearstakey_cmd(struct adapter *padapter, struct sta_info *sta, u8 enqueu
rtw_camid_free(padapter, cam_id);
}
} else {
- ph2c = kzalloc_obj(*ph2c, GFP_KERNEL);
+ ph2c = kzalloc_obj(*ph2c);
if (!ph2c) {
res = _FAIL;
goto exit;
}
- psetstakey_para = kzalloc_obj(*psetstakey_para, GFP_KERNEL);
+ psetstakey_para = kzalloc_obj(*psetstakey_para);
if (!psetstakey_para) {
kfree(ph2c);
res = _FAIL;
goto exit;
}
- psetstakey_rsp = kzalloc_obj(*psetstakey_rsp, GFP_KERNEL);
+ psetstakey_rsp = kzalloc_obj(*psetstakey_rsp);
if (!psetstakey_rsp) {
kfree(ph2c);
kfree(psetstakey_para);
@@ -1651,13 +1651,13 @@ u8 rtw_c2h_wk_cmd(struct adapter *padapter, u8 *c2h_evt)
struct cmd_priv *pcmdpriv = &padapter->cmdpriv;
u8 res = _SUCCESS;
- ph2c = kzalloc_obj(*ph2c, GFP_KERNEL);
+ ph2c = kzalloc_obj(*ph2c);
if (!ph2c) {
res = _FAIL;
goto exit;
}
- pdrvextra_cmd_parm = kzalloc_obj(*pdrvextra_cmd_parm, GFP_KERNEL);
+ pdrvextra_cmd_parm = kzalloc_obj(*pdrvextra_cmd_parm);
if (!pdrvextra_cmd_parm) {
kfree(ph2c);
res = _FAIL;
diff --git a/drivers/staging/rtl8723bs/core/rtw_mlme.c b/drivers/staging/rtl8723bs/core/rtw_mlme.c
index 1bc90fa48d36..7df651708381 100644
--- a/drivers/staging/rtl8723bs/core/rtw_mlme.c
+++ b/drivers/staging/rtl8723bs/core/rtw_mlme.c
@@ -1875,13 +1875,13 @@ signed int rtw_set_auth(struct adapter *adapter, struct security_priv *psecurity
struct cmd_priv *pcmdpriv = &adapter->cmdpriv;
signed int res = _SUCCESS;
- pcmd = kzalloc_obj(*pcmd, GFP_KERNEL);
+ pcmd = kzalloc_obj(*pcmd);
if (!pcmd) {
res = _FAIL; /* try again */
goto exit;
}
- psetauthparm = kzalloc_obj(*psetauthparm, GFP_KERNEL);
+ psetauthparm = kzalloc_obj(*psetauthparm);
if (!psetauthparm) {
kfree(pcmd);
res = _FAIL;
@@ -1912,7 +1912,7 @@ signed int rtw_set_key(struct adapter *adapter, struct security_priv *psecurityp
struct cmd_priv *pcmdpriv = &adapter->cmdpriv;
signed int res = _SUCCESS;
- psetkeyparm = kzalloc_obj(*psetkeyparm, GFP_KERNEL);
+ psetkeyparm = kzalloc_obj(*psetkeyparm);
if (!psetkeyparm) {
res = _FAIL;
goto exit;
@@ -1954,7 +1954,7 @@ signed int rtw_set_key(struct adapter *adapter, struct security_priv *psecurityp
}
if (enqueue) {
- pcmd = kzalloc_obj(*pcmd, GFP_KERNEL);
+ pcmd = kzalloc_obj(*pcmd);
if (!pcmd) {
kfree(psetkeyparm);
res = _FAIL; /* try again */
diff --git a/drivers/staging/rtl8723bs/core/rtw_wlan_util.c b/drivers/staging/rtl8723bs/core/rtw_wlan_util.c
index aceb1bfde8a4..3242978da36c 100644
--- a/drivers/staging/rtl8723bs/core/rtw_wlan_util.c
+++ b/drivers/staging/rtl8723bs/core/rtw_wlan_util.c
@@ -1131,7 +1131,7 @@ int rtw_check_bcn_info(struct adapter *Adapter, u8 *pframe, u32 packet_len)
if (memcmp(cur_network->network.mac_address, pbssid, 6))
return true;
- bssid = kzalloc_obj(*bssid, GFP_KERNEL);
+ bssid = kzalloc_obj(*bssid);
if (!bssid)
return true;
diff --git a/drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c b/drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c
index 64d3cbfb1244..8d259820f103 100644
--- a/drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c
+++ b/drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c
@@ -306,10 +306,10 @@ s32 rtl8723b_FirmwareDownload(struct adapter *padapter, bool bUsedWoWLANFw)
u8 *fwfilepath;
u8 tmp_ps;
- pFirmware = kzalloc_obj(struct rt_firmware, GFP_KERNEL);
+ pFirmware = kzalloc_obj(struct rt_firmware);
if (!pFirmware)
return _FAIL;
- pBTFirmware = kzalloc_obj(struct rt_firmware, GFP_KERNEL);
+ pBTFirmware = kzalloc_obj(struct rt_firmware);
if (!pBTFirmware) {
kfree(pFirmware);
return _FAIL;
diff --git a/drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c b/drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c
index 3922c3920bd8..7cb0c6f22bf3 100644
--- a/drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c
+++ b/drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c
@@ -1248,7 +1248,7 @@ static int cfg80211_rtw_scan(struct wiphy *wiphy
goto check_need_indicate_scan_done;
}
- ssid = kzalloc_objs(*ssid, RTW_SSID_SCAN_AMOUNT, GFP_KERNEL);
+ ssid = kzalloc_objs(*ssid, RTW_SSID_SCAN_AMOUNT);
if (!ssid) {
ret = -ENOMEM;
goto check_need_indicate_scan_done;
@@ -2145,7 +2145,7 @@ static int rtw_cfg80211_add_monitor_if(struct adapter *padapter, char *name, str
pnpi->sizeof_priv = sizeof(struct adapter);
/* wdev */
- mon_wdev = kzalloc_obj(*mon_wdev, GFP_KERNEL);
+ mon_wdev = kzalloc_obj(*mon_wdev);
if (!mon_wdev) {
ret = -ENOMEM;
goto out;
@@ -2726,7 +2726,7 @@ int rtw_wdev_alloc(struct adapter *padapter, struct device *dev)
goto free_wiphy;
/* wdev */
- wdev = kzalloc_obj(*wdev, GFP_KERNEL);
+ wdev = kzalloc_obj(*wdev);
if (!wdev) {
ret = -ENOMEM;
goto unregister_wiphy;
diff --git a/drivers/staging/rtl8723bs/os_dep/os_intfs.c b/drivers/staging/rtl8723bs/os_dep/os_intfs.c
index 6260f8f33c6d..29939bf5a156 100644
--- a/drivers/staging/rtl8723bs/os_dep/os_intfs.c
+++ b/drivers/staging/rtl8723bs/os_dep/os_intfs.c
@@ -568,7 +568,7 @@ struct dvobj_priv *devobj_init(void)
{
struct dvobj_priv *pdvobj = NULL;
- pdvobj = kzalloc_obj(*pdvobj, GFP_KERNEL);
+ pdvobj = kzalloc_obj(*pdvobj);
if (!pdvobj)
return NULL;
diff --git a/drivers/staging/vc04_services/bcm2835-audio/bcm2835-pcm.c b/drivers/staging/vc04_services/bcm2835-audio/bcm2835-pcm.c
index ae9ad7a8815d..bce42bff307f 100644
--- a/drivers/staging/vc04_services/bcm2835-audio/bcm2835-pcm.c
+++ b/drivers/staging/vc04_services/bcm2835-audio/bcm2835-pcm.c
@@ -108,7 +108,7 @@ static int snd_bcm2835_playback_open_generic(struct snd_pcm_substream *substream
goto out;
}
- alsa_stream = kzalloc_obj(*alsa_stream, GFP_KERNEL);
+ alsa_stream = kzalloc_obj(*alsa_stream);
if (!alsa_stream) {
err = -ENOMEM;
goto out;
diff --git a/drivers/staging/vc04_services/bcm2835-audio/bcm2835-vchiq.c b/drivers/staging/vc04_services/bcm2835-audio/bcm2835-vchiq.c
index d9397ac8faca..3156cb8392f4 100644
--- a/drivers/staging/vc04_services/bcm2835-audio/bcm2835-vchiq.c
+++ b/drivers/staging/vc04_services/bcm2835-audio/bcm2835-vchiq.c
@@ -219,7 +219,7 @@ int bcm2835_audio_open(struct bcm2835_alsa_stream *alsa_stream)
int err;
/* Allocate memory for this instance */
- instance = kzalloc_obj(*instance, GFP_KERNEL);
+ instance = kzalloc_obj(*instance);
if (!instance)
return -ENOMEM;
mutex_init(&instance->vchi_mutex);
diff --git a/drivers/staging/vme_user/vme.c b/drivers/staging/vme_user/vme.c
index 4ab3b572bbd7..f10a00c05f12 100644
--- a/drivers/staging/vme_user/vme.c
+++ b/drivers/staging/vme_user/vme.c
@@ -287,7 +287,7 @@ struct vme_resource *vme_slave_request(struct vme_dev *vdev, u32 address,
if (!allocated_image)
goto err_image;
- resource = kmalloc_obj(*resource, GFP_KERNEL);
+ resource = kmalloc_obj(*resource);
if (!resource)
goto err_alloc;
@@ -484,7 +484,7 @@ struct vme_resource *vme_master_request(struct vme_dev *vdev, u32 address,
goto err_image;
}
- resource = kmalloc_obj(*resource, GFP_KERNEL);
+ resource = kmalloc_obj(*resource);
if (!resource)
goto err_alloc;
@@ -854,7 +854,7 @@ struct vme_resource *vme_dma_request(struct vme_dev *vdev, u32 route)
if (!allocated_ctrlr)
goto err_ctrlr;
- resource = kmalloc_obj(*resource, GFP_KERNEL);
+ resource = kmalloc_obj(*resource);
if (!resource)
goto err_alloc;
@@ -894,7 +894,7 @@ struct vme_dma_list *vme_new_dma_list(struct vme_resource *resource)
return NULL;
}
- dma_list = kmalloc_obj(*dma_list, GFP_KERNEL);
+ dma_list = kmalloc_obj(*dma_list);
if (!dma_list)
return NULL;
@@ -924,11 +924,11 @@ struct vme_dma_attr *vme_dma_pattern_attribute(u32 pattern, u32 type)
struct vme_dma_attr *attributes;
struct vme_dma_pattern *pattern_attr;
- attributes = kmalloc_obj(*attributes, GFP_KERNEL);
+ attributes = kmalloc_obj(*attributes);
if (!attributes)
goto err_attr;
- pattern_attr = kmalloc_obj(*pattern_attr, GFP_KERNEL);
+ pattern_attr = kmalloc_obj(*pattern_attr);
if (!pattern_attr)
goto err_pat;
@@ -964,11 +964,11 @@ struct vme_dma_attr *vme_dma_pci_attribute(dma_addr_t address)
/* XXX Run some sanity checks here */
- attributes = kmalloc_obj(*attributes, GFP_KERNEL);
+ attributes = kmalloc_obj(*attributes);
if (!attributes)
goto err_attr;
- pci_attr = kmalloc_obj(*pci_attr, GFP_KERNEL);
+ pci_attr = kmalloc_obj(*pci_attr);
if (!pci_attr)
goto err_pci;
@@ -1005,11 +1005,11 @@ struct vme_dma_attr *vme_dma_vme_attribute(unsigned long long address,
struct vme_dma_attr *attributes;
struct vme_dma_vme *vme_attr;
- attributes = kmalloc_obj(*attributes, GFP_KERNEL);
+ attributes = kmalloc_obj(*attributes);
if (!attributes)
goto err_attr;
- vme_attr = kmalloc_obj(*vme_attr, GFP_KERNEL);
+ vme_attr = kmalloc_obj(*vme_attr);
if (!vme_attr)
goto err_vme;
@@ -1458,7 +1458,7 @@ struct vme_resource *vme_lm_request(struct vme_dev *vdev)
if (!allocated_lm)
goto err_lm;
- resource = kmalloc_obj(*resource, GFP_KERNEL);
+ resource = kmalloc_obj(*resource);
if (!resource)
goto err_alloc;
@@ -1810,7 +1810,7 @@ static int __vme_register_driver_bus(struct vme_driver *drv,
struct vme_dev *tmp;
for (i = 0; i < ndevs; i++) {
- vdev = kzalloc_obj(*vdev, GFP_KERNEL);
+ vdev = kzalloc_obj(*vdev);
if (!vdev) {
err = -ENOMEM;
goto err_devalloc;
diff --git a/drivers/staging/vme_user/vme_fake.c b/drivers/staging/vme_user/vme_fake.c
index 77881a96114f..be4ad47ed526 100644
--- a/drivers/staging/vme_user/vme_fake.c
+++ b/drivers/staging/vme_user/vme_fake.c
@@ -1073,13 +1073,13 @@ static int __init fake_init(void)
/* If we want to support more than one bridge at some point, we need to
* dynamically allocate this so we get one per device.
*/
- fake_bridge = kzalloc_obj(*fake_bridge, GFP_KERNEL);
+ fake_bridge = kzalloc_obj(*fake_bridge);
if (!fake_bridge) {
retval = -ENOMEM;
goto err_struct;
}
- fake_device = kzalloc_obj(*fake_device, GFP_KERNEL);
+ fake_device = kzalloc_obj(*fake_device);
if (!fake_device) {
retval = -ENOMEM;
goto err_driver;
@@ -1102,7 +1102,7 @@ static int __init fake_init(void)
/* Add master windows to list */
INIT_LIST_HEAD(&fake_bridge->master_resources);
for (i = 0; i < FAKE_MAX_MASTER; i++) {
- master_image = kmalloc_obj(*master_image, GFP_KERNEL);
+ master_image = kmalloc_obj(*master_image);
if (!master_image) {
retval = -ENOMEM;
goto err_master;
@@ -1128,7 +1128,7 @@ static int __init fake_init(void)
/* Add slave windows to list */
INIT_LIST_HEAD(&fake_bridge->slave_resources);
for (i = 0; i < FAKE_MAX_SLAVE; i++) {
- slave_image = kmalloc_obj(*slave_image, GFP_KERNEL);
+ slave_image = kmalloc_obj(*slave_image);
if (!slave_image) {
retval = -ENOMEM;
goto err_slave;
@@ -1150,7 +1150,7 @@ static int __init fake_init(void)
/* Add location monitor to list */
INIT_LIST_HEAD(&fake_bridge->lm_resources);
- lm = kmalloc_obj(*lm, GFP_KERNEL);
+ lm = kmalloc_obj(*lm);
if (!lm) {
retval = -ENOMEM;
goto err_lm;
diff --git a/drivers/staging/vme_user/vme_tsi148.c b/drivers/staging/vme_user/vme_tsi148.c
index 123408fffb6f..356f3f5ec69a 100644
--- a/drivers/staging/vme_user/vme_tsi148.c
+++ b/drivers/staging/vme_user/vme_tsi148.c
@@ -1611,7 +1611,7 @@ static int tsi148_dma_list_add(struct vme_dma_list *list, struct vme_dma_attr *s
tsi148_bridge = list->parent->parent;
/* Descriptor must be aligned on 64-bit boundaries */
- entry = kmalloc_obj(*entry, GFP_KERNEL);
+ entry = kmalloc_obj(*entry);
if (!entry) {
retval = -ENOMEM;
goto err_mem;
@@ -2260,14 +2260,14 @@ static int tsi148_probe(struct pci_dev *pdev, const struct pci_device_id *id)
/* If we want to support more than one of each bridge, we need to
* dynamically generate this so we get one per device
*/
- tsi148_bridge = kzalloc_obj(*tsi148_bridge, GFP_KERNEL);
+ tsi148_bridge = kzalloc_obj(*tsi148_bridge);
if (!tsi148_bridge) {
retval = -ENOMEM;
goto err_struct;
}
vme_init_bridge(tsi148_bridge);
- tsi148_device = kzalloc_obj(*tsi148_device, GFP_KERNEL);
+ tsi148_device = kzalloc_obj(*tsi148_device);
if (!tsi148_device) {
retval = -ENOMEM;
goto err_driver;
@@ -2349,7 +2349,7 @@ static int tsi148_probe(struct pci_dev *pdev, const struct pci_device_id *id)
/* Add master windows to list */
for (i = 0; i < master_num; i++) {
- master_image = kmalloc_obj(*master_image, GFP_KERNEL);
+ master_image = kmalloc_obj(*master_image);
if (!master_image) {
retval = -ENOMEM;
goto err_master;
@@ -2375,7 +2375,7 @@ static int tsi148_probe(struct pci_dev *pdev, const struct pci_device_id *id)
/* Add slave windows to list */
for (i = 0; i < TSI148_MAX_SLAVE; i++) {
- slave_image = kmalloc_obj(*slave_image, GFP_KERNEL);
+ slave_image = kmalloc_obj(*slave_image);
if (!slave_image) {
retval = -ENOMEM;
goto err_slave;
@@ -2396,7 +2396,7 @@ static int tsi148_probe(struct pci_dev *pdev, const struct pci_device_id *id)
/* Add dma engines to list */
for (i = 0; i < TSI148_MAX_DMA; i++) {
- dma_ctrlr = kmalloc_obj(*dma_ctrlr, GFP_KERNEL);
+ dma_ctrlr = kmalloc_obj(*dma_ctrlr);
if (!dma_ctrlr) {
retval = -ENOMEM;
goto err_dma;
@@ -2416,7 +2416,7 @@ static int tsi148_probe(struct pci_dev *pdev, const struct pci_device_id *id)
}
/* Add location monitor to list */
- lm = kmalloc_obj(*lm, GFP_KERNEL);
+ lm = kmalloc_obj(*lm);
if (!lm) {
retval = -ENOMEM;
goto err_lm;
diff --git a/drivers/staging/vme_user/vme_user.c b/drivers/staging/vme_user/vme_user.c
index 00da869a8056..d95dd7d9190a 100644
--- a/drivers/staging/vme_user/vme_user.c
+++ b/drivers/staging/vme_user/vme_user.c
@@ -464,7 +464,7 @@ static int vme_user_master_mmap(unsigned int minor, struct vm_area_struct *vma)
return err;
}
- vma_priv = kmalloc_obj(*vma_priv, GFP_KERNEL);
+ vma_priv = kmalloc_obj(*vma_priv);
if (!vma_priv) {
mutex_unlock(&image[minor].mutex);
return -ENOMEM;
diff --git a/drivers/target/iscsi/cxgbit/cxgbit_cm.c b/drivers/target/iscsi/cxgbit/cxgbit_cm.c
index 0aa4cb9e494e..146705845fa3 100644
--- a/drivers/target/iscsi/cxgbit/cxgbit_cm.c
+++ b/drivers/target/iscsi/cxgbit/cxgbit_cm.c
@@ -79,7 +79,7 @@ static struct np_info *
cxgbit_np_hash_add(struct cxgbit_device *cdev, struct cxgbit_np *cnp,
unsigned int stid)
{
- struct np_info *p = kzalloc_obj(*p, GFP_KERNEL);
+ struct np_info *p = kzalloc_obj(*p);
if (p) {
int bucket = cxgbit_np_hashfn(cnp);
@@ -431,7 +431,7 @@ int cxgbit_setup_np(struct iscsi_np *np, struct sockaddr_storage *ksockaddr)
(ksockaddr->ss_family != AF_INET6))
return -EINVAL;
- cnp = kzalloc_obj(*cnp, GFP_KERNEL);
+ cnp = kzalloc_obj(*cnp);
if (!cnp)
return -ENOMEM;
diff --git a/drivers/target/iscsi/cxgbit/cxgbit_main.c b/drivers/target/iscsi/cxgbit/cxgbit_main.c
index e1985e1187b0..b6036820fc95 100644
--- a/drivers/target/iscsi/cxgbit/cxgbit_main.c
+++ b/drivers/target/iscsi/cxgbit/cxgbit_main.c
@@ -57,7 +57,7 @@ static void *cxgbit_uld_add(const struct cxgb4_lld_info *lldi)
if (is_t4(lldi->adapter_type))
return ERR_PTR(-ENODEV);
- cdev = kzalloc_obj(*cdev, GFP_KERNEL);
+ cdev = kzalloc_obj(*cdev);
if (!cdev)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/target/iscsi/iscsi_target.c b/drivers/target/iscsi/iscsi_target.c
index 6ff807754304..e80449f6ce15 100644
--- a/drivers/target/iscsi/iscsi_target.c
+++ b/drivers/target/iscsi/iscsi_target.c
@@ -121,7 +121,7 @@ struct iscsi_tiqn *iscsit_add_tiqn(unsigned char *buf)
return ERR_PTR(-EINVAL);
}
- tiqn = kzalloc_obj(*tiqn, GFP_KERNEL);
+ tiqn = kzalloc_obj(*tiqn);
if (!tiqn)
return ERR_PTR(-ENOMEM);
@@ -352,7 +352,7 @@ struct iscsi_np *iscsit_add_np(
return np;
}
- np = kzalloc_obj(*np, GFP_KERNEL);
+ np = kzalloc_obj(*np);
if (!np) {
mutex_unlock(&np_lock);
return ERR_PTR(-ENOMEM);
@@ -674,7 +674,7 @@ static int __init iscsi_target_init_module(void)
int ret = 0, size;
pr_debug("iSCSI-Target "ISCSIT_VERSION"\n");
- iscsit_global = kzalloc_obj(*iscsit_global, GFP_KERNEL);
+ iscsit_global = kzalloc_obj(*iscsit_global);
if (!iscsit_global)
return -1;
@@ -981,7 +981,7 @@ static int iscsit_allocate_iovecs(struct iscsit_cmd *cmd)
u32 iov_count = max(1UL, DIV_ROUND_UP(cmd->se_cmd.data_length, PAGE_SIZE));
iov_count += ISCSI_IOV_DATA_BUFFER;
- cmd->iov_data = kzalloc_objs(*cmd->iov_data, iov_count, GFP_KERNEL);
+ cmd->iov_data = kzalloc_objs(*cmd->iov_data, iov_count);
if (!cmd->iov_data)
return -ENOMEM;
@@ -1992,7 +1992,7 @@ iscsit_handle_task_mgt_cmd(struct iscsit_conn *conn, struct iscsit_cmd *cmd,
hdr->refcmdsn = cpu_to_be32(ISCSI_RESERVED_TAG);
cmd->data_direction = DMA_NONE;
- cmd->tmr_req = kzalloc_obj(*cmd->tmr_req, GFP_KERNEL);
+ cmd->tmr_req = kzalloc_obj(*cmd->tmr_req);
if (!cmd->tmr_req) {
return iscsit_add_reject_cmd(cmd,
ISCSI_REASON_BOOKMARK_NO_RESOURCES,
diff --git a/drivers/target/iscsi/iscsi_target_auth.c b/drivers/target/iscsi/iscsi_target_auth.c
index d6f3611c0d4b..c46c69a28e97 100644
--- a/drivers/target/iscsi/iscsi_target_auth.c
+++ b/drivers/target/iscsi/iscsi_target_auth.c
@@ -152,7 +152,7 @@ static struct iscsi_chap *chap_server_open(
return NULL;
}
- conn->auth_protocol = kzalloc_obj(struct iscsi_chap, GFP_KERNEL);
+ conn->auth_protocol = kzalloc_obj(struct iscsi_chap);
if (!conn->auth_protocol)
return NULL;
diff --git a/drivers/target/iscsi/iscsi_target_erl2.c b/drivers/target/iscsi/iscsi_target_erl2.c
index 7e7193a40959..bda254a0d4ed 100644
--- a/drivers/target/iscsi/iscsi_target_erl2.c
+++ b/drivers/target/iscsi/iscsi_target_erl2.c
@@ -268,7 +268,7 @@ int iscsit_prepare_cmds_for_reallegiance(struct iscsit_conn *conn)
* (struct iscsit_cmd->cr) so we need to allocate this before preparing the
* connection's command list for connection recovery.
*/
- cr = kzalloc_obj(struct iscsi_conn_recovery, GFP_KERNEL);
+ cr = kzalloc_obj(struct iscsi_conn_recovery);
if (!cr) {
pr_err("Unable to allocate memory for"
" struct iscsi_conn_recovery.\n");
diff --git a/drivers/target/iscsi/iscsi_target_login.c b/drivers/target/iscsi/iscsi_target_login.c
index 8a5a711b505b..aafc94bcb635 100644
--- a/drivers/target/iscsi/iscsi_target_login.c
+++ b/drivers/target/iscsi/iscsi_target_login.c
@@ -38,7 +38,7 @@ static struct iscsi_login *iscsi_login_init_conn(struct iscsit_conn *conn)
{
struct iscsi_login *login;
- login = kzalloc_obj(struct iscsi_login, GFP_KERNEL);
+ login = kzalloc_obj(struct iscsi_login);
if (!login) {
pr_err("Unable to allocate memory for struct iscsi_login.\n");
return NULL;
@@ -219,7 +219,7 @@ static int iscsi_login_zero_tsih_s1(
struct iscsi_login_req *pdu = (struct iscsi_login_req *)buf;
int ret;
- sess = kzalloc_obj(struct iscsit_session, GFP_KERNEL);
+ sess = kzalloc_obj(struct iscsit_session);
if (!sess) {
iscsit_tx_login_rsp(conn, ISCSI_STATUS_CLS_TARGET_ERR,
ISCSI_LOGIN_STATUS_NO_RESOURCES);
@@ -267,7 +267,7 @@ static int iscsi_login_zero_tsih_s1(
*/
atomic_set(&sess->max_cmd_sn, be32_to_cpu(pdu->cmdsn));
- sess->sess_ops = kzalloc_obj(struct iscsi_sess_ops, GFP_KERNEL);
+ sess->sess_ops = kzalloc_obj(struct iscsi_sess_ops);
if (!sess->sess_ops) {
iscsit_tx_login_rsp(conn, ISCSI_STATUS_CLS_TARGET_ERR,
ISCSI_LOGIN_STATUS_NO_RESOURCES);
@@ -1002,7 +1002,7 @@ static struct iscsit_conn *iscsit_alloc_conn(struct iscsi_np *np)
{
struct iscsit_conn *conn;
- conn = kzalloc_obj(struct iscsit_conn, GFP_KERNEL);
+ conn = kzalloc_obj(struct iscsit_conn);
if (!conn) {
pr_err("Could not allocate memory for new connection\n");
return NULL;
@@ -1040,7 +1040,7 @@ static struct iscsit_conn *iscsit_alloc_conn(struct iscsi_np *np)
if (iscsit_conn_set_transport(conn, np->np_transport) < 0)
goto free_conn;
- conn->conn_ops = kzalloc_obj(struct iscsi_conn_ops, GFP_KERNEL);
+ conn->conn_ops = kzalloc_obj(struct iscsi_conn_ops);
if (!conn->conn_ops) {
pr_err("Unable to allocate memory for struct iscsi_conn_ops.\n");
goto put_transport;
diff --git a/drivers/target/iscsi/iscsi_target_parameters.c b/drivers/target/iscsi/iscsi_target_parameters.c
index fce6c91ac157..4ed578c7b98d 100644
--- a/drivers/target/iscsi/iscsi_target_parameters.c
+++ b/drivers/target/iscsi/iscsi_target_parameters.c
@@ -73,7 +73,7 @@ static struct iscsi_param *iscsi_set_default_param(struct iscsi_param_list *para
{
struct iscsi_param *param = NULL;
- param = kzalloc_obj(struct iscsi_param, GFP_KERNEL);
+ param = kzalloc_obj(struct iscsi_param);
if (!param) {
pr_err("Unable to allocate memory for parameter.\n");
goto out;
@@ -148,7 +148,7 @@ int iscsi_create_default_params(struct iscsi_param_list **param_list_ptr)
struct iscsi_param *param = NULL;
struct iscsi_param_list *pl;
- pl = kzalloc_obj(struct iscsi_param_list, GFP_KERNEL);
+ pl = kzalloc_obj(struct iscsi_param_list);
if (!pl) {
pr_err("Unable to allocate memory for"
" struct iscsi_param_list.\n");
@@ -519,7 +519,7 @@ int iscsi_copy_param_list(
struct iscsi_param *new_param = NULL;
struct iscsi_param_list *param_list = NULL;
- param_list = kzalloc_obj(struct iscsi_param_list, GFP_KERNEL);
+ param_list = kzalloc_obj(struct iscsi_param_list);
if (!param_list) {
pr_err("Unable to allocate memory for struct iscsi_param_list.\n");
return -ENOMEM;
@@ -535,7 +535,7 @@ int iscsi_copy_param_list(
continue;
}
- new_param = kzalloc_obj(struct iscsi_param, GFP_KERNEL);
+ new_param = kzalloc_obj(struct iscsi_param);
if (!new_param) {
pr_err("Unable to allocate memory for struct iscsi_param.\n");
goto err_out;
@@ -670,7 +670,7 @@ static int iscsi_add_notunderstood_response(
return -1;
}
- extra_response = kzalloc_obj(struct iscsi_extra_response, GFP_KERNEL);
+ extra_response = kzalloc_obj(struct iscsi_extra_response);
if (!extra_response) {
pr_err("Unable to allocate memory for"
" struct iscsi_extra_response.\n");
diff --git a/drivers/target/iscsi/iscsi_target_tpg.c b/drivers/target/iscsi/iscsi_target_tpg.c
index 82463efca798..99772364c88e 100644
--- a/drivers/target/iscsi/iscsi_target_tpg.c
+++ b/drivers/target/iscsi/iscsi_target_tpg.c
@@ -26,7 +26,7 @@ struct iscsi_portal_group *iscsit_alloc_portal_group(struct iscsi_tiqn *tiqn, u1
{
struct iscsi_portal_group *tpg;
- tpg = kzalloc_obj(struct iscsi_portal_group, GFP_KERNEL);
+ tpg = kzalloc_obj(struct iscsi_portal_group);
if (!tpg) {
pr_err("Unable to allocate struct iscsi_portal_group\n");
return NULL;
@@ -464,7 +464,7 @@ struct iscsi_tpg_np *iscsit_tpg_add_network_portal(
}
}
- tpg_np = kzalloc_obj(struct iscsi_tpg_np, GFP_KERNEL);
+ tpg_np = kzalloc_obj(struct iscsi_tpg_np);
if (!tpg_np) {
pr_err("Unable to allocate memory for"
" struct iscsi_tpg_np.\n");
diff --git a/drivers/target/loopback/tcm_loop.c b/drivers/target/loopback/tcm_loop.c
index 94e191809e1c..d668bd19fd4a 100644
--- a/drivers/target/loopback/tcm_loop.c
+++ b/drivers/target/loopback/tcm_loop.c
@@ -693,7 +693,7 @@ static int tcm_loop_make_nexus(
return -EEXIST;
}
- tl_nexus = kzalloc_obj(*tl_nexus, GFP_KERNEL);
+ tl_nexus = kzalloc_obj(*tl_nexus);
if (!tl_nexus)
return -ENOMEM;
@@ -994,7 +994,7 @@ static struct se_wwn *tcm_loop_make_scsi_hba(
char *ptr;
int ret, off = 0;
- tl_hba = kzalloc_obj(*tl_hba, GFP_KERNEL);
+ tl_hba = kzalloc_obj(*tl_hba);
if (!tl_hba)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/target/sbp/sbp_target.c b/drivers/target/sbp/sbp_target.c
index ef69c1321dd0..ad1da7edbb08 100644
--- a/drivers/target/sbp/sbp_target.c
+++ b/drivers/target/sbp/sbp_target.c
@@ -186,7 +186,7 @@ static struct sbp_session *sbp_session_create(
snprintf(guid_str, sizeof(guid_str), "%016llx", guid);
- sess = kmalloc_obj(*sess, GFP_KERNEL);
+ sess = kmalloc_obj(*sess);
if (!sess)
return ERR_PTR(-ENOMEM);
@@ -391,7 +391,7 @@ static void sbp_management_request_login(
1 << LOGIN_ORB_RECONNECT(be32_to_cpu(req->orb.misc)),
tport->max_reconnect_timeout) - 1;
- login = kmalloc_obj(*login, GFP_KERNEL);
+ login = kmalloc_obj(*login);
if (!login) {
pr_err("failed to allocate login descriptor\n");
@@ -428,7 +428,7 @@ static void sbp_management_request_login(
spin_unlock_bh(&sess->lock);
already_logged_in:
- response = kzalloc_obj(*response, GFP_KERNEL);
+ response = kzalloc_obj(*response);
if (!response) {
pr_err("failed to allocate login response block\n");
@@ -1014,7 +1014,7 @@ static struct sbp_target_agent *sbp_target_agent_register(
struct sbp_target_agent *agent;
int ret;
- agent = kmalloc_obj(*agent, GFP_KERNEL);
+ agent = kmalloc_obj(*agent);
if (!agent)
return ERR_PTR(-ENOMEM);
@@ -1636,7 +1636,7 @@ static struct sbp_management_agent *sbp_management_agent_register(
int ret;
struct sbp_management_agent *agent;
- agent = kmalloc_obj(*agent, GFP_KERNEL);
+ agent = kmalloc_obj(*agent);
if (!agent)
return ERR_PTR(-ENOMEM);
@@ -1973,7 +1973,7 @@ static struct se_portal_group *sbp_make_tpg(struct se_wwn *wwn,
return ERR_PTR(-EBUSY);
}
- tpg = kzalloc_obj(*tpg, GFP_KERNEL);
+ tpg = kzalloc_obj(*tpg);
if (!tpg)
return ERR_PTR(-ENOMEM);
@@ -2030,7 +2030,7 @@ static struct se_wwn *sbp_make_tport(
if (sbp_parse_wwn(name, &guid) < 0)
return ERR_PTR(-EINVAL);
- tport = kzalloc_obj(*tport, GFP_KERNEL);
+ tport = kzalloc_obj(*tport);
if (!tport)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/target/target_core_configfs.c b/drivers/target/target_core_configfs.c
index a63de1b6c2b4..17608ea39d5a 100644
--- a/drivers/target/target_core_configfs.c
+++ b/drivers/target/target_core_configfs.c
@@ -475,12 +475,12 @@ int target_register_template(const struct target_core_fabric_ops *fo)
if (ret)
return ret;
- tf = kzalloc_obj(struct target_fabric_configfs, GFP_KERNEL);
+ tf = kzalloc_obj(struct target_fabric_configfs);
if (!tf) {
pr_err("%s: could not allocate memory!\n", __func__);
return -ENOMEM;
}
- tfo = kzalloc_obj(struct target_core_fabric_ops, GFP_KERNEL);
+ tfo = kzalloc_obj(struct target_core_fabric_ops);
if (!tfo) {
kfree(tf);
pr_err("%s: could not allocate memory!\n", __func__);
diff --git a/drivers/target/target_core_device.c b/drivers/target/target_core_device.c
index f082cbc79751..74c6383f9eed 100644
--- a/drivers/target/target_core_device.c
+++ b/drivers/target/target_core_device.c
@@ -324,7 +324,7 @@ int core_enable_device_list_for_node(
struct se_dev_entry *orig, *new;
int ret = 0;
- new = kzalloc_obj(*new, GFP_KERNEL);
+ new = kzalloc_obj(*new);
if (!new) {
pr_err("Unable to allocate se_dev_entry memory\n");
return -ENOMEM;
@@ -591,7 +591,7 @@ struct se_lun_acl *core_dev_init_initiator_node_lun_acl(
*ret = -EOVERFLOW;
return NULL;
}
- lacl = kzalloc_obj(struct se_lun_acl, GFP_KERNEL);
+ lacl = kzalloc_obj(struct se_lun_acl);
if (!lacl) {
pr_err("Unable to allocate memory for struct se_lun_acl.\n");
*ret = -ENOMEM;
@@ -726,7 +726,7 @@ struct se_device *target_alloc_device(struct se_hba *hba, const char *name)
if (!dev->stats)
goto free_device;
- dev->queues = kzalloc_objs(*dev->queues, nr_cpu_ids, GFP_KERNEL);
+ dev->queues = kzalloc_objs(*dev->queues, nr_cpu_ids);
if (!dev->queues)
goto free_stats;
diff --git a/drivers/target/target_core_fabric_configfs.c b/drivers/target/target_core_fabric_configfs.c
index 69590c570859..331689b30f85 100644
--- a/drivers/target/target_core_fabric_configfs.c
+++ b/drivers/target/target_core_fabric_configfs.c
@@ -899,7 +899,7 @@ target_fabric_setup_tpg_base_cit(struct target_fabric_configfs *tf)
nr_attrs++;
/* + 1 for final NULL in the array */
- attrs = kzalloc_objs(*attrs, nr_attrs + 1, GFP_KERNEL);
+ attrs = kzalloc_objs(*attrs, nr_attrs + 1);
if (!attrs)
return -ENOMEM;
diff --git a/drivers/target/target_core_file.c b/drivers/target/target_core_file.c
index 5347800a276d..80cc9196f145 100644
--- a/drivers/target/target_core_file.c
+++ b/drivers/target/target_core_file.c
@@ -38,7 +38,7 @@ static int fd_attach_hba(struct se_hba *hba, u32 host_id)
{
struct fd_host *fd_host;
- fd_host = kzalloc_obj(struct fd_host, GFP_KERNEL);
+ fd_host = kzalloc_obj(struct fd_host);
if (!fd_host) {
pr_err("Unable to allocate memory for struct fd_host\n");
return -ENOMEM;
@@ -73,7 +73,7 @@ static struct se_device *fd_alloc_device(struct se_hba *hba, const char *name)
struct fd_dev *fd_dev;
struct fd_host *fd_host = hba->hba_ptr;
- fd_dev = kzalloc_obj(struct fd_dev, GFP_KERNEL);
+ fd_dev = kzalloc_obj(struct fd_dev);
if (!fd_dev) {
pr_err("Unable to allocate memory for struct fd_dev\n");
return NULL;
@@ -320,7 +320,7 @@ static int fd_do_rw(struct se_cmd *cmd, struct file *fd,
loff_t pos = (cmd->t_task_lba * block_size);
int ret = 0, i;
- bvec = kzalloc_objs(struct bio_vec, sgl_nents, GFP_KERNEL);
+ bvec = kzalloc_objs(struct bio_vec, sgl_nents);
if (!bvec) {
pr_err("Unable to allocate fd_do_readv iov[]\n");
return -ENOMEM;
@@ -455,7 +455,7 @@ fd_execute_write_same(struct se_cmd *cmd)
return TCM_INVALID_CDB_FIELD;
}
- bvec = kzalloc_objs(struct bio_vec, nolb, GFP_KERNEL);
+ bvec = kzalloc_objs(struct bio_vec, nolb);
if (!bvec)
return TCM_LOGICAL_UNIT_COMMUNICATION_FAILURE;
diff --git a/drivers/target/target_core_hba.c b/drivers/target/target_core_hba.c
index deafced2c804..61c54b489b7f 100644
--- a/drivers/target/target_core_hba.c
+++ b/drivers/target/target_core_hba.c
@@ -39,7 +39,7 @@ int transport_backend_register(const struct target_backend_ops *ops)
{
struct target_backend *tb, *old;
- tb = kzalloc_obj(*tb, GFP_KERNEL);
+ tb = kzalloc_obj(*tb);
if (!tb)
return -ENOMEM;
tb->ops = ops;
@@ -111,7 +111,7 @@ core_alloc_hba(const char *plugin_name, u32 plugin_dep_id, u32 hba_flags)
struct se_hba *hba;
int ret = 0;
- hba = kzalloc_obj(*hba, GFP_KERNEL);
+ hba = kzalloc_obj(*hba);
if (!hba) {
pr_err("Unable to allocate struct se_hba\n");
return ERR_PTR(-ENOMEM);
diff --git a/drivers/target/target_core_iblock.c b/drivers/target/target_core_iblock.c
index 8a333c9bd294..c50828eb844a 100644
--- a/drivers/target/target_core_iblock.c
+++ b/drivers/target/target_core_iblock.c
@@ -59,7 +59,7 @@ static struct se_device *iblock_alloc_device(struct se_hba *hba, const char *nam
{
struct iblock_dev *ib_dev = NULL;
- ib_dev = kzalloc_obj(struct iblock_dev, GFP_KERNEL);
+ ib_dev = kzalloc_obj(struct iblock_dev);
if (!ib_dev) {
pr_err("Unable to allocate struct iblock_dev\n");
return NULL;
@@ -523,7 +523,7 @@ iblock_execute_write_same(struct se_cmd *cmd)
return 0;
}
- ibr = kzalloc_obj(struct iblock_req, GFP_KERNEL);
+ ibr = kzalloc_obj(struct iblock_req);
if (!ibr)
goto fail;
cmd->priv = ibr;
@@ -783,7 +783,7 @@ iblock_execute_rw(struct se_cmd *cmd, struct scatterlist *sgl, u32 sgl_nents,
miter_dir = SG_MITER_FROM_SG;
}
- ibr = kzalloc_obj(struct iblock_req, GFP_KERNEL);
+ ibr = kzalloc_obj(struct iblock_req);
if (!ibr)
goto fail;
cmd->priv = ibr;
diff --git a/drivers/target/target_core_pr.c b/drivers/target/target_core_pr.c
index 1272c24512fa..24e0667483bd 100644
--- a/drivers/target/target_core_pr.c
+++ b/drivers/target/target_core_pr.c
@@ -1490,7 +1490,7 @@ core_scsi3_decode_spec_i_port(
* local_node_acl pointer and add to struct list_head tid_dest_list
* for add registration processing in the loop of tid_dest_list below.
*/
- tidh_new = kzalloc_obj(struct pr_transport_id_holder, GFP_KERNEL);
+ tidh_new = kzalloc_obj(struct pr_transport_id_holder);
if (!tidh_new) {
pr_err("Unable to allocate tidh_new\n");
return TCM_INSUFFICIENT_REGISTRATION_RESOURCES;
diff --git a/drivers/target/target_core_pscsi.c b/drivers/target/target_core_pscsi.c
index 4f86030c9ad5..9ed2818c3028 100644
--- a/drivers/target/target_core_pscsi.c
+++ b/drivers/target/target_core_pscsi.c
@@ -51,7 +51,7 @@ static int pscsi_attach_hba(struct se_hba *hba, u32 host_id)
{
struct pscsi_hba_virt *phv;
- phv = kzalloc_obj(struct pscsi_hba_virt, GFP_KERNEL);
+ phv = kzalloc_obj(struct pscsi_hba_virt);
if (!phv) {
pr_err("Unable to allocate struct pscsi_hba_virt\n");
return -ENOMEM;
@@ -247,7 +247,7 @@ pscsi_get_inquiry_vpd_device_ident(struct scsi_device *sdev,
}
pr_debug("T10 VPD Identifier Length: %d\n", ident_len);
- vpd = kzalloc_obj(struct t10_vpd, GFP_KERNEL);
+ vpd = kzalloc_obj(struct t10_vpd);
if (!vpd) {
pr_err("Unable to allocate memory for"
" struct t10_vpd\n");
@@ -334,7 +334,7 @@ static struct se_device *pscsi_alloc_device(struct se_hba *hba,
{
struct pscsi_dev_virt *pdv;
- pdv = kzalloc_obj(struct pscsi_dev_virt, GFP_KERNEL);
+ pdv = kzalloc_obj(struct pscsi_dev_virt);
if (!pdv) {
pr_err("Unable to allocate memory for struct pscsi_dev_virt\n");
return NULL;
diff --git a/drivers/target/target_core_rd.c b/drivers/target/target_core_rd.c
index 90ee036ad5ce..092d9fe0d4e3 100644
--- a/drivers/target/target_core_rd.c
+++ b/drivers/target/target_core_rd.c
@@ -34,7 +34,7 @@ static int rd_attach_hba(struct se_hba *hba, u32 host_id)
{
struct rd_host *rd_host;
- rd_host = kzalloc_obj(*rd_host, GFP_KERNEL);
+ rd_host = kzalloc_obj(*rd_host);
if (!rd_host)
return -ENOMEM;
@@ -131,7 +131,7 @@ static int rd_allocate_sgl_table(struct rd_dev *rd_dev, struct rd_dev_sg_table *
if (sg_per_table < total_sg_needed)
chain_entry = 1;
- sg = kmalloc_objs(*sg, sg_per_table + chain_entry, GFP_KERNEL);
+ sg = kmalloc_objs(*sg, sg_per_table + chain_entry);
if (!sg)
return -ENOMEM;
@@ -191,7 +191,7 @@ static int rd_build_device_space(struct rd_dev *rd_dev)
total_sg_needed = rd_dev->rd_page_count;
sg_tables = (total_sg_needed / max_sg_per_table) + 1;
- sg_table = kzalloc_objs(*sg_table, sg_tables, GFP_KERNEL);
+ sg_table = kzalloc_objs(*sg_table, sg_tables);
if (!sg_table)
return -ENOMEM;
@@ -248,7 +248,7 @@ static int rd_build_prot_space(struct rd_dev *rd_dev, int prot_length, int block
total_sg_needed = (rd_dev->rd_page_count * prot_length / block_size) + 1;
sg_tables = (total_sg_needed / max_sg_per_table) + 1;
- sg_table = kzalloc_objs(*sg_table, sg_tables, GFP_KERNEL);
+ sg_table = kzalloc_objs(*sg_table, sg_tables);
if (!sg_table)
return -ENOMEM;
@@ -271,7 +271,7 @@ static struct se_device *rd_alloc_device(struct se_hba *hba, const char *name)
struct rd_dev *rd_dev;
struct rd_host *rd_host = hba->hba_ptr;
- rd_dev = kzalloc_obj(*rd_dev, GFP_KERNEL);
+ rd_dev = kzalloc_obj(*rd_dev);
if (!rd_dev)
return NULL;
diff --git a/drivers/target/target_core_tpg.c b/drivers/target/target_core_tpg.c
index bb4eaace5e77..ccff9f6e4826 100644
--- a/drivers/target/target_core_tpg.c
+++ b/drivers/target/target_core_tpg.c
@@ -610,7 +610,7 @@ struct se_lun *core_tpg_alloc_lun(
{
struct se_lun *lun;
- lun = kzalloc_obj(*lun, GFP_KERNEL);
+ lun = kzalloc_obj(*lun);
if (!lun) {
pr_err("Unable to allocate se_lun memory\n");
return ERR_PTR(-ENOMEM);
diff --git a/drivers/target/target_core_transport.c b/drivers/target/target_core_transport.c
index 4b6899a729f7..a7330c4fedde 100644
--- a/drivers/target/target_core_transport.c
+++ b/drivers/target/target_core_transport.c
@@ -233,7 +233,7 @@ struct target_cmd_counter *target_alloc_cmd_counter(void)
struct target_cmd_counter *cmd_cnt;
int rc;
- cmd_cnt = kzalloc_obj(*cmd_cnt, GFP_KERNEL);
+ cmd_cnt = kzalloc_obj(*cmd_cnt);
if (!cmd_cnt)
return NULL;
@@ -2740,7 +2740,7 @@ void *transport_kmap_data_sg(struct se_cmd *cmd)
return kmap(sg_page(sg)) + sg->offset;
/* >1 page. use vmap */
- pages = kmalloc_objs(*pages, cmd->t_data_nents, GFP_KERNEL);
+ pages = kmalloc_objs(*pages, cmd->t_data_nents);
if (!pages)
return NULL;
diff --git a/drivers/target/target_core_user.c b/drivers/target/target_core_user.c
index 062e93231794..af95531ddd35 100644
--- a/drivers/target/target_core_user.c
+++ b/drivers/target/target_core_user.c
@@ -1582,7 +1582,7 @@ static int tcmu_attach_hba(struct se_hba *hba, u32 host_id)
{
struct tcmu_hba *tcmu_hba;
- tcmu_hba = kzalloc_obj(struct tcmu_hba, GFP_KERNEL);
+ tcmu_hba = kzalloc_obj(struct tcmu_hba);
if (!tcmu_hba)
return -ENOMEM;
@@ -1602,7 +1602,7 @@ static struct se_device *tcmu_alloc_device(struct se_hba *hba, const char *name)
{
struct tcmu_dev *udev;
- udev = kzalloc_obj(struct tcmu_dev, GFP_KERNEL);
+ udev = kzalloc_obj(struct tcmu_dev);
if (!udev)
return NULL;
kref_init(&udev->kref);
diff --git a/drivers/target/target_core_xcopy.c b/drivers/target/target_core_xcopy.c
index 2447b4abe2cf..9e5e94f3aa5d 100644
--- a/drivers/target/target_core_xcopy.c
+++ b/drivers/target/target_core_xcopy.c
@@ -898,7 +898,7 @@ sense_reason_t target_do_xcopy(struct se_cmd *se_cmd)
return TCM_PARAMETER_LIST_LENGTH_ERROR;
}
- xop = kzalloc_obj(struct xcopy_op, GFP_KERNEL);
+ xop = kzalloc_obj(struct xcopy_op);
if (!xop)
goto err;
xop->xop_se_cmd = se_cmd;
diff --git a/drivers/target/tcm_fc/tfc_conf.c b/drivers/target/tcm_fc/tfc_conf.c
index 7643503f739c..88cf1e5a5810 100644
--- a/drivers/target/tcm_fc/tfc_conf.c
+++ b/drivers/target/tcm_fc/tfc_conf.c
@@ -244,7 +244,7 @@ static struct se_portal_group *ft_add_tpg(struct se_wwn *wwn, const char *name)
}
ft_wwn = container_of(wwn, struct ft_lport_wwn, se_wwn);
- tpg = kzalloc_obj(*tpg, GFP_KERNEL);
+ tpg = kzalloc_obj(*tpg);
if (!tpg)
return NULL;
tpg->index = index;
@@ -334,7 +334,7 @@ static struct se_wwn *ft_add_wwn(
pr_debug("add wwn %s\n", name);
if (ft_parse_wwn(name, &wwpn, 1) < 0)
return NULL;
- ft_wwn = kzalloc_obj(*ft_wwn, GFP_KERNEL);
+ ft_wwn = kzalloc_obj(*ft_wwn);
if (!ft_wwn)
return NULL;
ft_wwn->wwpn = wwpn;
diff --git a/drivers/target/tcm_fc/tfc_sess.c b/drivers/target/tcm_fc/tfc_sess.c
index 584785ada9a6..797be06ab71b 100644
--- a/drivers/target/tcm_fc/tfc_sess.c
+++ b/drivers/target/tcm_fc/tfc_sess.c
@@ -59,7 +59,7 @@ static struct ft_tport *ft_tport_get(struct fc_lport *lport)
return tport;
}
- tport = kzalloc_obj(*tport, GFP_KERNEL);
+ tport = kzalloc_obj(*tport);
if (!tport)
return NULL;
@@ -219,7 +219,7 @@ static struct ft_sess *ft_sess_create(struct ft_tport *tport, u32 port_id,
if (sess->port_id == port_id)
return sess;
- sess = kzalloc_obj(*sess, GFP_KERNEL);
+ sess = kzalloc_obj(*sess);
if (!sess)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/target/tcm_remote/tcm_remote.c b/drivers/target/tcm_remote/tcm_remote.c
index 480efdccbf67..03b00f6eca58 100644
--- a/drivers/target/tcm_remote/tcm_remote.c
+++ b/drivers/target/tcm_remote/tcm_remote.c
@@ -156,7 +156,7 @@ static struct se_wwn *tcm_remote_make_wwn(
char *ptr;
int ret, off = 0;
- remote_hba = kzalloc_obj(*remote_hba, GFP_KERNEL);
+ remote_hba = kzalloc_obj(*remote_hba);
if (!remote_hba)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/tc/tc.c b/drivers/tc/tc.c
index 0cdb255f4f13..ebc835cf1b2b 100644
--- a/drivers/tc/tc.c
+++ b/drivers/tc/tc.c
@@ -82,7 +82,7 @@ static void __init tc_bus_add_devices(struct tc_bus *tbus)
goto out_err;
/* Found a board, allocate it an entry in the list */
- tdev = kzalloc_obj(*tdev, GFP_KERNEL);
+ tdev = kzalloc_obj(*tdev);
if (!tdev) {
pr_err("tc%x: unable to allocate tc_dev\n", slot);
goto out_err;
diff --git a/drivers/tee/amdtee/call.c b/drivers/tee/amdtee/call.c
index 3d25cee5c7d0..441b2ceaafc3 100644
--- a/drivers/tee/amdtee/call.c
+++ b/drivers/tee/amdtee/call.c
@@ -134,7 +134,7 @@ static u32 get_ta_refcount(u32 ta_handle)
if (ta_data->ta_handle == ta_handle)
return ++ta_data->refcount;
- ta_data = kzalloc_obj(*ta_data, GFP_KERNEL);
+ ta_data = kzalloc_obj(*ta_data);
if (ta_data) {
ta_data->ta_handle = ta_handle;
ta_data->refcount = 1;
@@ -293,7 +293,7 @@ int handle_map_shmem(u32 count, struct shmem_desc *start, u32 *buf_id)
if (!count || !start || !buf_id)
return -EINVAL;
- cmd = kzalloc_obj(*cmd, GFP_KERNEL);
+ cmd = kzalloc_obj(*cmd);
if (!cmd)
return -ENOMEM;
diff --git a/drivers/tee/amdtee/core.c b/drivers/tee/amdtee/core.c
index 1ff4834722f7..a1347d04b3ac 100644
--- a/drivers/tee/amdtee/core.c
+++ b/drivers/tee/amdtee/core.c
@@ -38,7 +38,7 @@ static int amdtee_open(struct tee_context *ctx)
{
struct amdtee_context_data *ctxdata;
- ctxdata = kzalloc_obj(*ctxdata, GFP_KERNEL);
+ ctxdata = kzalloc_obj(*ctxdata);
if (!ctxdata)
return -ENOMEM;
@@ -122,7 +122,7 @@ static struct amdtee_session *alloc_session(struct amdtee_context_data *ctxdata,
}
/* Allocate a new session and add to list */
- sess = kzalloc_obj(*sess, GFP_KERNEL);
+ sess = kzalloc_obj(*sess);
if (sess) {
sess->ta_handle = ta_handle;
kref_init(&sess->refcount);
@@ -351,7 +351,7 @@ int amdtee_map_shmem(struct tee_shm *shm)
if (!shm)
return -EINVAL;
- shmnode = kmalloc_obj(*shmnode, GFP_KERNEL);
+ shmnode = kmalloc_obj(*shmnode);
if (!shmnode)
return -ENOMEM;
@@ -465,11 +465,11 @@ static int __init amdtee_driver_init(void)
return rc;
}
- drv_data = kzalloc_obj(*drv_data, GFP_KERNEL);
+ drv_data = kzalloc_obj(*drv_data);
if (!drv_data)
return -ENOMEM;
- amdtee = kzalloc_obj(*amdtee, GFP_KERNEL);
+ amdtee = kzalloc_obj(*amdtee);
if (!amdtee) {
rc = -ENOMEM;
goto err_kfree_drv_data;
diff --git a/drivers/tee/amdtee/shm_pool.c b/drivers/tee/amdtee/shm_pool.c
index fcb0d5da4bfd..c330e8e9168a 100644
--- a/drivers/tee/amdtee/shm_pool.c
+++ b/drivers/tee/amdtee/shm_pool.c
@@ -59,7 +59,7 @@ static const struct tee_shm_pool_ops pool_ops = {
struct tee_shm_pool *amdtee_config_shm(void)
{
- struct tee_shm_pool *pool = kzalloc_obj(*pool, GFP_KERNEL);
+ struct tee_shm_pool *pool = kzalloc_obj(*pool);
if (!pool)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/tee/optee/call.c b/drivers/tee/optee/call.c
index 5fa3edd9b233..9effe88049e9 100644
--- a/drivers/tee/optee/call.c
+++ b/drivers/tee/optee/call.c
@@ -293,7 +293,7 @@ struct optee_msg_arg *optee_get_msg_arg(struct tee_context *ctx,
/*
* No entry was found, let's allocate a new.
*/
- entry = kzalloc_obj(*entry, GFP_KERNEL);
+ entry = kzalloc_obj(*entry);
if (!entry) {
res = ERR_PTR(-ENOMEM);
goto out;
@@ -404,7 +404,7 @@ int optee_open_session(struct tee_context *ctx,
if (rc)
goto out;
- sess = kzalloc_obj(*sess, GFP_KERNEL);
+ sess = kzalloc_obj(*sess);
if (!sess) {
rc = -ENOMEM;
goto out;
diff --git a/drivers/tee/optee/core.c b/drivers/tee/optee/core.c
index ec07a8e1a585..a52c1f498b99 100644
--- a/drivers/tee/optee/core.c
+++ b/drivers/tee/optee/core.c
@@ -125,7 +125,7 @@ int optee_open(struct tee_context *ctx, bool cap_memref_null)
struct tee_device *teedev = ctx->teedev;
struct optee *optee = tee_get_drvdata(teedev);
- ctxdata = kzalloc_obj(*ctxdata, GFP_KERNEL);
+ ctxdata = kzalloc_obj(*ctxdata);
if (!ctxdata)
return -ENOMEM;
diff --git a/drivers/tee/optee/device.c b/drivers/tee/optee/device.c
index 3f272c356ce4..bae954e79fdc 100644
--- a/drivers/tee/optee/device.c
+++ b/drivers/tee/optee/device.c
@@ -81,7 +81,7 @@ static int optee_register_device(const uuid_t *device_uuid, u32 func)
struct tee_client_device *optee_device = NULL;
int rc;
- optee_device = kzalloc_obj(*optee_device, GFP_KERNEL);
+ optee_device = kzalloc_obj(*optee_device);
if (!optee_device)
return -ENOMEM;
diff --git a/drivers/tee/optee/ffa_abi.c b/drivers/tee/optee/ffa_abi.c
index 53ec3204b075..b4372fa268d0 100644
--- a/drivers/tee/optee/ffa_abi.c
+++ b/drivers/tee/optee/ffa_abi.c
@@ -78,7 +78,7 @@ static int optee_shm_add_ffa_handle(struct optee *optee, struct tee_shm *shm,
struct shm_rhash *r;
int rc;
- r = kmalloc_obj(*r, GFP_KERNEL);
+ r = kmalloc_obj(*r);
if (!r)
return -ENOMEM;
r->shm = shm;
@@ -404,7 +404,7 @@ static const struct tee_shm_pool_ops pool_ffa_ops = {
*/
static struct tee_shm_pool *optee_ffa_shm_pool_alloc_pages(void)
{
- struct tee_shm_pool *pool = kzalloc_obj(*pool, GFP_KERNEL);
+ struct tee_shm_pool *pool = kzalloc_obj(*pool);
if (!pool)
return ERR_PTR(-ENOMEM);
@@ -697,7 +697,7 @@ static int optee_ffa_lend_protmem(struct optee *optee, struct tee_shm *protmem,
unsigned int n;
int rc;
- mem_attr = kzalloc_objs(*mem_attr, ma_count, GFP_KERNEL);
+ mem_attr = kzalloc_objs(*mem_attr, ma_count);
for (n = 0; n < ma_count; n++) {
mem_attr[n].receiver = mem_attrs[n] & U16_MAX;
mem_attr[n].attrs = mem_attrs[n] >> 16;
@@ -1077,7 +1077,7 @@ static int optee_ffa_probe(struct ffa_device *ffa_dev)
if (sec_caps & OPTEE_FFA_SEC_CAP_ARG_OFFSET)
arg_cache_flags |= OPTEE_SHM_ARG_SHARED;
- optee = kzalloc_obj(*optee, GFP_KERNEL);
+ optee = kzalloc_obj(*optee);
if (!optee)
return -ENOMEM;
diff --git a/drivers/tee/optee/notif.c b/drivers/tee/optee/notif.c
index 7ce65c8a07cf..6e85f2f5c516 100644
--- a/drivers/tee/optee/notif.c
+++ b/drivers/tee/optee/notif.c
@@ -38,7 +38,7 @@ int optee_notif_wait(struct optee *optee, u_int key, u32 timeout)
if (key > optee->notif.max_key)
return -EINVAL;
- entry = kmalloc_obj(*entry, GFP_KERNEL);
+ entry = kmalloc_obj(*entry);
if (!entry)
return -ENOMEM;
init_completion(&entry->c);
diff --git a/drivers/tee/optee/protmem.c b/drivers/tee/optee/protmem.c
index 086df220f758..be3abf6e8aa6 100644
--- a/drivers/tee/optee/protmem.c
+++ b/drivers/tee/optee/protmem.c
@@ -294,7 +294,7 @@ struct tee_protmem_pool *optee_protmem_alloc_dyn_pool(struct optee *optee,
u_int pa_width;
int rc;
- rp = kzalloc_obj(*rp, GFP_KERNEL);
+ rp = kzalloc_obj(*rp);
if (!rp)
return ERR_PTR(-ENOMEM);
rp->use_case = id;
diff --git a/drivers/tee/optee/rpc.c b/drivers/tee/optee/rpc.c
index ef80f668a6bc..b0ed4cb49452 100644
--- a/drivers/tee/optee/rpc.c
+++ b/drivers/tee/optee/rpc.c
@@ -55,7 +55,7 @@ static void handle_rpc_func_cmd_i2c_transfer(struct tee_context *ctx,
return;
}
- params = kmalloc_objs(struct tee_param, arg->num_params, GFP_KERNEL);
+ params = kmalloc_objs(struct tee_param, arg->num_params);
if (!params) {
arg->ret = TEEC_ERROR_OUT_OF_MEMORY;
return;
@@ -191,7 +191,7 @@ static void handle_rpc_supp_cmd(struct tee_context *ctx, struct optee *optee,
arg->ret_origin = TEEC_ORIGIN_COMMS;
- params = kmalloc_objs(struct tee_param, arg->num_params, GFP_KERNEL);
+ params = kmalloc_objs(struct tee_param, arg->num_params);
if (!params) {
arg->ret = TEEC_ERROR_OUT_OF_MEMORY;
return;
diff --git a/drivers/tee/optee/smc_abi.c b/drivers/tee/optee/smc_abi.c
index 3d33b8d6af37..b8a2bdac3208 100644
--- a/drivers/tee/optee/smc_abi.c
+++ b/drivers/tee/optee/smc_abi.c
@@ -626,7 +626,7 @@ static const struct tee_shm_pool_ops pool_ops = {
*/
static struct tee_shm_pool *optee_shm_pool_alloc_pages(void)
{
- struct tee_shm_pool *pool = kzalloc_obj(*pool, GFP_KERNEL);
+ struct tee_shm_pool *pool = kzalloc_obj(*pool);
if (!pool)
return ERR_PTR(-ENOMEM);
@@ -1816,7 +1816,7 @@ static int optee_probe(struct platform_device *pdev)
if (IS_ERR(pool))
return PTR_ERR(pool);
- optee = kzalloc_obj(*optee, GFP_KERNEL);
+ optee = kzalloc_obj(*optee);
if (!optee) {
rc = -ENOMEM;
goto err_free_shm_pool;
diff --git a/drivers/tee/optee/supp.c b/drivers/tee/optee/supp.c
index 3562cb80a95a..a3d11b1f90fa 100644
--- a/drivers/tee/optee/supp.c
+++ b/drivers/tee/optee/supp.c
@@ -89,7 +89,7 @@ u32 optee_supp_thrd_req(struct tee_context *ctx, u32 func, size_t num_params,
if (!supp->ctx && ctx->supp_nowait)
return TEEC_ERROR_COMMUNICATION;
- req = kzalloc_obj(*req, GFP_KERNEL);
+ req = kzalloc_obj(*req);
if (!req)
return TEEC_ERROR_OUT_OF_MEMORY;
diff --git a/drivers/tee/qcomtee/call.c b/drivers/tee/qcomtee/call.c
index cd138adb5e17..ba9af41ec8b5 100644
--- a/drivers/tee/qcomtee/call.c
+++ b/drivers/tee/qcomtee/call.c
@@ -707,7 +707,7 @@ static int qcomtee_probe(struct platform_device *pdev)
struct qcomtee *qcomtee;
int err;
- qcomtee = kzalloc_obj(*qcomtee, GFP_KERNEL);
+ qcomtee = kzalloc_obj(*qcomtee);
if (!qcomtee)
return -ENOMEM;
diff --git a/drivers/tee/qcomtee/core.c b/drivers/tee/qcomtee/core.c
index ab477bbc8439..b1cb50e434f0 100644
--- a/drivers/tee/qcomtee/core.c
+++ b/drivers/tee/qcomtee/core.c
@@ -54,7 +54,7 @@ qcomtee_qtee_object_alloc(struct qcomtee_object_invoke_ctx *oic,
struct qcomtee *qcomtee = tee_get_drvdata(oic->ctx->teedev);
struct qcomtee_object *object;
- object = kzalloc_obj(*object, GFP_KERNEL);
+ object = kzalloc_obj(*object);
if (!object)
return NULL_QCOMTEE_OBJECT;
diff --git a/drivers/tee/qcomtee/qcomtee_object.h b/drivers/tee/qcomtee/qcomtee_object.h
index d763f90c62bb..8b4401ecad48 100644
--- a/drivers/tee/qcomtee/qcomtee_object.h
+++ b/drivers/tee/qcomtee/qcomtee_object.h
@@ -176,7 +176,7 @@ qcomtee_object_invoke_ctx_alloc(struct tee_context *ctx)
{
struct qcomtee_object_invoke_ctx *oic;
- oic = kzalloc_obj(*oic, GFP_KERNEL);
+ oic = kzalloc_obj(*oic);
if (oic)
oic->ctx = ctx;
return oic;
diff --git a/drivers/tee/qcomtee/shm.c b/drivers/tee/qcomtee/shm.c
index 7bef13767e25..b67909ef3f46 100644
--- a/drivers/tee/qcomtee/shm.c
+++ b/drivers/tee/qcomtee/shm.c
@@ -140,7 +140,7 @@ struct tee_shm_pool *qcomtee_shm_pool_alloc(void)
{
struct tee_shm_pool *pool;
- pool = kzalloc_obj(*pool, GFP_KERNEL);
+ pool = kzalloc_obj(*pool);
if (!pool)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/tee/qcomtee/user_obj.c b/drivers/tee/qcomtee/user_obj.c
index d19c6589574a..10452fcc7ccb 100644
--- a/drivers/tee/qcomtee/user_obj.c
+++ b/drivers/tee/qcomtee/user_obj.c
@@ -326,7 +326,7 @@ static void qcomtee_user_object_release(struct qcomtee_object *object)
if (!uo->notify)
goto out_no_notify;
- ureq = kzalloc_obj(*ureq, GFP_KERNEL);
+ ureq = kzalloc_obj(*ureq);
if (!ureq)
goto out_no_notify;
@@ -370,7 +370,7 @@ int qcomtee_user_param_to_object(struct qcomtee_object **object,
int err;
struct qcomtee_user_object *user_object __free(kfree) =
- kzalloc_obj(*user_object, GFP_KERNEL);
+ kzalloc_obj(*user_object);
if (!user_object)
return -ENOMEM;
diff --git a/drivers/tee/tee_core.c b/drivers/tee/tee_core.c
index 29df8cd1efd2..3dafbdc8d2c2 100644
--- a/drivers/tee/tee_core.c
+++ b/drivers/tee/tee_core.c
@@ -51,7 +51,7 @@ struct tee_context *teedev_open(struct tee_device *teedev)
if (!tee_device_get(teedev))
return ERR_PTR(-EINVAL);
- ctx = kzalloc_obj(*ctx, GFP_KERNEL);
+ ctx = kzalloc_obj(*ctx);
if (!ctx) {
rc = -ENOMEM;
goto err;
@@ -844,7 +844,7 @@ static int tee_ioctl_supp_recv(struct tee_context *ctx,
if (size_add(sizeof(*uarg), TEE_IOCTL_PARAM_SIZE(num_params)) != buf.buf_len)
return -EINVAL;
- params = kzalloc_objs(struct tee_param, num_params, GFP_KERNEL);
+ params = kzalloc_objs(struct tee_param, num_params);
if (!params)
return -ENOMEM;
@@ -958,7 +958,7 @@ static int tee_ioctl_supp_send(struct tee_context *ctx,
if (size_add(sizeof(*uarg), TEE_IOCTL_PARAM_SIZE(num_params)) > buf.buf_len)
return -EINVAL;
- params = kzalloc_objs(struct tee_param, num_params, GFP_KERNEL);
+ params = kzalloc_objs(struct tee_param, num_params);
if (!params)
return -ENOMEM;
@@ -1052,7 +1052,7 @@ struct tee_device *tee_device_alloc(const struct tee_desc *teedesc,
!teedesc->ops->release)
return ERR_PTR(-EINVAL);
- teedev = kzalloc_obj(*teedev, GFP_KERNEL);
+ teedev = kzalloc_obj(*teedev);
if (!teedev) {
ret = ERR_PTR(-ENOMEM);
goto err;
diff --git a/drivers/tee/tee_heap.c b/drivers/tee/tee_heap.c
index 71e50d9573c7..007c00156520 100644
--- a/drivers/tee/tee_heap.c
+++ b/drivers/tee/tee_heap.c
@@ -94,7 +94,7 @@ static int tee_heap_attach(struct dma_buf *dmabuf,
struct tee_heap_attachment *a;
int ret;
- a = kzalloc_obj(*a, GFP_KERNEL);
+ a = kzalloc_obj(*a);
if (!a)
return -ENOMEM;
@@ -188,7 +188,7 @@ static struct dma_buf *tee_dma_heap_alloc(struct dma_heap *heap,
if (!teedev)
return ERR_PTR(-EINVAL);
- buf = kzalloc_obj(*buf, GFP_KERNEL);
+ buf = kzalloc_obj(*buf);
if (!buf) {
dmabuf = ERR_PTR(-ENOMEM);
goto err;
@@ -260,7 +260,7 @@ static int alloc_dma_heap(struct tee_device *teedev, enum tee_dma_heap_id id,
return -ENOMEM;
}
- h = kzalloc_obj(*h, GFP_KERNEL);
+ h = kzalloc_obj(*h);
if (!h)
return -ENOMEM;
h->id = id;
@@ -472,7 +472,7 @@ struct tee_protmem_pool *tee_protmem_static_pool_alloc(phys_addr_t paddr,
if (!pfn_valid(PHYS_PFN(paddr)))
return ERR_PTR(-EINVAL);
- stp = kzalloc_obj(*stp, GFP_KERNEL);
+ stp = kzalloc_obj(*stp);
if (!stp)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/tee/tee_shm.c b/drivers/tee/tee_shm.c
index 1ed278fc9e4a..6c5b9e352e5e 100644
--- a/drivers/tee/tee_shm.c
+++ b/drivers/tee/tee_shm.c
@@ -106,7 +106,7 @@ static struct tee_shm *shm_alloc_helper(struct tee_context *ctx, size_t size,
goto err_dev_put;
}
- shm = kzalloc_obj(*shm, GFP_KERNEL);
+ shm = kzalloc_obj(*shm);
if (!shm) {
ret = ERR_PTR(-ENOMEM);
goto err_dev_put;
@@ -214,7 +214,7 @@ struct tee_shm *tee_shm_register_fd(struct tee_context *ctx, int fd)
teedev_ctx_get(ctx);
- ref = kzalloc_obj(*ref, GFP_KERNEL);
+ ref = kzalloc_obj(*ref);
if (!ref) {
rc = -ENOMEM;
goto err_put_tee;
@@ -315,7 +315,7 @@ struct tee_shm *tee_shm_alloc_dma_mem(struct tee_context *ctx,
if (!page)
goto err_put_teedev;
- dma_mem = kzalloc_obj(*dma_mem, GFP_KERNEL);
+ dma_mem = kzalloc_obj(*dma_mem);
if (!dma_mem)
goto err_free_pages;
@@ -373,7 +373,7 @@ int tee_dyn_shm_alloc_helper(struct tee_shm *shm, size_t size, size_t align,
shm->paddr = virt_to_phys(shm->kaddr);
shm->size = nr_pages * PAGE_SIZE;
- pages = kzalloc_objs(*pages, nr_pages, GFP_KERNEL);
+ pages = kzalloc_objs(*pages, nr_pages);
if (!pages) {
rc = -ENOMEM;
goto err_pages;
@@ -438,7 +438,7 @@ register_shm_helper(struct tee_context *ctx, struct iov_iter *iter, u32 flags,
teedev_ctx_get(ctx);
- shm = kzalloc_obj(*shm, GFP_KERNEL);
+ shm = kzalloc_obj(*shm);
if (!shm) {
ret = ERR_PTR(-ENOMEM);
goto err_ctx_put;
@@ -456,7 +456,7 @@ register_shm_helper(struct tee_context *ctx, struct iov_iter *iter, u32 flags,
goto err_ctx_put;
}
- shm->pages = kzalloc_objs(*shm->pages, num_pages, GFP_KERNEL);
+ shm->pages = kzalloc_objs(*shm->pages, num_pages);
if (!shm->pages) {
ret = ERR_PTR(-ENOMEM);
goto err_free_shm;
diff --git a/drivers/tee/tee_shm_pool.c b/drivers/tee/tee_shm_pool.c
index fc82c689c29e..1a2a7f47e30f 100644
--- a/drivers/tee/tee_shm_pool.c
+++ b/drivers/tee/tee_shm_pool.c
@@ -65,7 +65,7 @@ struct tee_shm_pool *tee_shm_pool_alloc_res_mem(unsigned long vaddr,
if (vaddr & page_mask || paddr & page_mask || size & page_mask)
return ERR_PTR(-EINVAL);
- pool = kzalloc_obj(*pool, GFP_KERNEL);
+ pool = kzalloc_obj(*pool);
if (!pool)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/tee/tstee/core.c b/drivers/tee/tstee/core.c
index 4a4aa2bc5ab6..79ae5d161638 100644
--- a/drivers/tee/tstee/core.c
+++ b/drivers/tee/tstee/core.c
@@ -59,7 +59,7 @@ static int tstee_open(struct tee_context *ctx)
{
struct ts_context_data *ctxdata;
- ctxdata = kzalloc_obj(*ctxdata, GFP_KERNEL);
+ ctxdata = kzalloc_obj(*ctxdata);
if (!ctxdata)
return -ENOMEM;
@@ -122,7 +122,7 @@ static int tstee_open_session(struct tee_context *ctx,
if (ffa_args[TS_RPC_SERVICE_INFO_IFACE] > U8_MAX)
return -EINVAL;
- sess = kzalloc_obj(*sess, GFP_KERNEL);
+ sess = kzalloc_obj(*sess);
if (!sess)
return -ENOMEM;
@@ -376,7 +376,7 @@ static const struct tee_shm_pool_ops pool_ops = {
static struct tee_shm_pool *tstee_create_shm_pool(void)
{
- struct tee_shm_pool *pool = kzalloc_obj(*pool, GFP_KERNEL);
+ struct tee_shm_pool *pool = kzalloc_obj(*pool);
if (!pool)
return ERR_PTR(-ENOMEM);
@@ -414,7 +414,7 @@ static int tstee_probe(struct ffa_device *ffa_dev)
if (!tstee_check_rpc_compatible(ffa_dev))
return -EINVAL;
- tstee = kzalloc_obj(*tstee, GFP_KERNEL);
+ tstee = kzalloc_obj(*tstee);
if (!tstee)
return -ENOMEM;
diff --git a/drivers/thermal/cpufreq_cooling.c b/drivers/thermal/cpufreq_cooling.c
index d0bb782ff734..3b85f077c364 100644
--- a/drivers/thermal/cpufreq_cooling.c
+++ b/drivers/thermal/cpufreq_cooling.c
@@ -542,7 +542,7 @@ __cpufreq_cooling_register(struct device_node *np,
return ERR_PTR(-ENODEV);
}
- cpufreq_cdev = kzalloc_obj(*cpufreq_cdev, GFP_KERNEL);
+ cpufreq_cdev = kzalloc_obj(*cpufreq_cdev);
if (!cpufreq_cdev)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/thermal/cpuidle_cooling.c b/drivers/thermal/cpuidle_cooling.c
index 5a16d4e7e698..425f596614e8 100644
--- a/drivers/thermal/cpuidle_cooling.c
+++ b/drivers/thermal/cpuidle_cooling.c
@@ -179,7 +179,7 @@ static int __cpuidle_cooling_register(struct device_node *np,
char *name;
int ret;
- idle_cdev = kzalloc_obj(*idle_cdev, GFP_KERNEL);
+ idle_cdev = kzalloc_obj(*idle_cdev);
if (!idle_cdev) {
ret = -ENOMEM;
goto out;
diff --git a/drivers/thermal/devfreq_cooling.c b/drivers/thermal/devfreq_cooling.c
index 72fb23de5f55..597e86d16a4e 100644
--- a/drivers/thermal/devfreq_cooling.c
+++ b/drivers/thermal/devfreq_cooling.c
@@ -402,7 +402,7 @@ of_devfreq_cooling_register_power(struct device_node *np, struct devfreq *df,
int err, num_opps;
- dfc = kzalloc_obj(*dfc, GFP_KERNEL);
+ dfc = kzalloc_obj(*dfc);
if (!dfc)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/thermal/gov_power_allocator.c b/drivers/thermal/gov_power_allocator.c
index 696932ecb489..37f2e22a999e 100644
--- a/drivers/thermal/gov_power_allocator.c
+++ b/drivers/thermal/gov_power_allocator.c
@@ -622,7 +622,7 @@ static int allocate_actors_buffer(struct power_allocator_params *params,
goto clean_state;
}
- params->power = kzalloc_objs(struct power_actor, num_actors, GFP_KERNEL);
+ params->power = kzalloc_objs(struct power_actor, num_actors);
if (!params->power) {
ret = -ENOMEM;
goto clean_state;
@@ -698,7 +698,7 @@ static int power_allocator_bind(struct thermal_zone_device *tz)
struct power_allocator_params *params;
int ret;
- params = kzalloc_obj(*params, GFP_KERNEL);
+ params = kzalloc_obj(*params);
if (!params)
return -ENOMEM;
@@ -719,7 +719,7 @@ static int power_allocator_bind(struct thermal_zone_device *tz)
}
if (!tz->tzp) {
- tz->tzp = kzalloc_obj(*tz->tzp, GFP_KERNEL);
+ tz->tzp = kzalloc_obj(*tz->tzp);
if (!tz->tzp) {
ret = -ENOMEM;
goto free_params;
diff --git a/drivers/thermal/intel/int340x_thermal/acpi_thermal_rel.c b/drivers/thermal/intel/int340x_thermal/acpi_thermal_rel.c
index d1876e76167a..0a548fdc4a7e 100644
--- a/drivers/thermal/intel/int340x_thermal/acpi_thermal_rel.c
+++ b/drivers/thermal/intel/int340x_thermal/acpi_thermal_rel.c
@@ -89,7 +89,7 @@ int acpi_parse_trt(acpi_handle handle, int *trt_count, struct trt **trtp,
}
*trt_count = p->package.count;
- trts = kzalloc_objs(struct trt, *trt_count, GFP_KERNEL);
+ trts = kzalloc_objs(struct trt, *trt_count);
if (!trts) {
result = -ENOMEM;
goto end;
@@ -165,7 +165,7 @@ int acpi_parse_art(acpi_handle handle, int *art_count, struct art **artp,
/* ignore p->package.elements[0], as this is _ART Revision field */
*art_count = p->package.count - 1;
- arts = kzalloc_objs(struct art, *art_count, GFP_KERNEL);
+ arts = kzalloc_objs(struct art, *art_count);
if (!arts) {
result = -ENOMEM;
goto end;
@@ -253,7 +253,7 @@ static int acpi_parse_psvt(acpi_handle handle, int *psvt_count, struct psvt **ps
goto end;
}
- psvts = kzalloc_objs(*psvts, *psvt_count, GFP_KERNEL);
+ psvts = kzalloc_objs(*psvts, *psvt_count);
if (!psvts) {
result = -ENOMEM;
goto end;
diff --git a/drivers/thermal/intel/int340x_thermal/int3400_thermal.c b/drivers/thermal/intel/int340x_thermal/int3400_thermal.c
index 3a97718e2f5c..6742eaf0a447 100644
--- a/drivers/thermal/intel/int340x_thermal/int3400_thermal.c
+++ b/drivers/thermal/intel/int340x_thermal/int3400_thermal.c
@@ -382,7 +382,7 @@ static int evaluate_odvp(struct int3400_thermal_priv *priv)
if (priv->odvp == NULL) {
priv->odvp_count = obj->package.count;
- priv->odvp = kmalloc_objs(int, priv->odvp_count, GFP_KERNEL);
+ priv->odvp = kmalloc_objs(int, priv->odvp_count);
if (!priv->odvp) {
ret = -ENOMEM;
goto out_err;
@@ -561,7 +561,7 @@ static int int3400_thermal_probe(struct platform_device *pdev)
if (!adev)
return -ENODEV;
- priv = kzalloc_obj(*priv, GFP_KERNEL);
+ priv = kzalloc_obj(*priv);
if (!priv)
return -ENOMEM;
diff --git a/drivers/thermal/intel/int340x_thermal/int340x_thermal_zone.c b/drivers/thermal/intel/int340x_thermal/int340x_thermal_zone.c
index 7db8fd86c4fd..4c8888fb0a8b 100644
--- a/drivers/thermal/intel/int340x_thermal/int340x_thermal_zone.c
+++ b/drivers/thermal/intel/int340x_thermal/int340x_thermal_zone.c
@@ -123,7 +123,7 @@ struct int34x_thermal_zone *int340x_thermal_zone_add(struct acpi_device *adev,
acpi_status status;
int i, ret;
- int34x_zone = kzalloc_obj(*int34x_zone, GFP_KERNEL);
+ int34x_zone = kzalloc_obj(*int34x_zone);
if (!int34x_zone)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/thermal/intel/intel_hfi.c b/drivers/thermal/intel/intel_hfi.c
index 5100ad1336ed..35df0fd5562f 100644
--- a/drivers/thermal/intel/intel_hfi.c
+++ b/drivers/thermal/intel/intel_hfi.c
@@ -212,7 +212,7 @@ static void update_capabilities(struct hfi_instance *hfi_instance)
if (!cpu_count)
goto out;
- cpu_caps = kzalloc_objs(*cpu_caps, cpu_count, GFP_KERNEL);
+ cpu_caps = kzalloc_objs(*cpu_caps, cpu_count);
if (!cpu_caps)
goto out;
diff --git a/drivers/thermal/intel/intel_quark_dts_thermal.c b/drivers/thermal/intel/intel_quark_dts_thermal.c
index 38a0ae14b69d..15476699bdda 100644
--- a/drivers/thermal/intel/intel_quark_dts_thermal.c
+++ b/drivers/thermal/intel/intel_quark_dts_thermal.c
@@ -336,7 +336,7 @@ static struct soc_sensor_entry *alloc_soc_dts(void)
int err;
u32 out;
- aux_entry = kzalloc_obj(*aux_entry, GFP_KERNEL);
+ aux_entry = kzalloc_obj(*aux_entry);
if (!aux_entry) {
err = -ENOMEM;
return ERR_PTR(-ENOMEM);
diff --git a/drivers/thermal/intel/intel_soc_dts_iosf.c b/drivers/thermal/intel/intel_soc_dts_iosf.c
index 78123107ac06..93773878398e 100644
--- a/drivers/thermal/intel/intel_soc_dts_iosf.c
+++ b/drivers/thermal/intel/intel_soc_dts_iosf.c
@@ -320,7 +320,7 @@ intel_soc_dts_iosf_init(enum intel_soc_dts_interrupt_type intr_type,
if (tj_max < 0)
return ERR_PTR(tj_max);
- sensors = kzalloc_obj(*sensors, GFP_KERNEL);
+ sensors = kzalloc_obj(*sensors);
if (!sensors)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/thermal/intel/x86_pkg_temp_thermal.c b/drivers/thermal/intel/x86_pkg_temp_thermal.c
index 64cc0361d440..540109761f0a 100644
--- a/drivers/thermal/intel/x86_pkg_temp_thermal.c
+++ b/drivers/thermal/intel/x86_pkg_temp_thermal.c
@@ -335,7 +335,7 @@ static int pkg_temp_thermal_device_add(unsigned int cpu)
return tj_max;
tj_max *= 1000;
- zonedev = kzalloc_obj(*zonedev, GFP_KERNEL);
+ zonedev = kzalloc_obj(*zonedev);
if (!zonedev)
return -ENOMEM;
@@ -492,7 +492,7 @@ static int __init pkg_temp_thermal_init(void)
return -ENODEV;
max_id = topology_max_packages() * topology_max_dies_per_package();
- zones = kzalloc_objs(struct zone_device *, max_id, GFP_KERNEL);
+ zones = kzalloc_objs(struct zone_device *, max_id);
if (!zones)
return -ENOMEM;
diff --git a/drivers/thermal/k3_j72xx_bandgap.c b/drivers/thermal/k3_j72xx_bandgap.c
index 138a8137f790..6aba00d8b8fd 100644
--- a/drivers/thermal/k3_j72xx_bandgap.c
+++ b/drivers/thermal/k3_j72xx_bandgap.c
@@ -462,7 +462,7 @@ static int k3_j72xx_bandgap_probe(struct platform_device *pdev)
goto err_alloc;
}
- ref_table = kzalloc_objs(*ref_table, TABLE_SIZE, GFP_KERNEL);
+ ref_table = kzalloc_objs(*ref_table, TABLE_SIZE);
if (!ref_table) {
ret = -ENOMEM;
goto err_alloc;
diff --git a/drivers/thermal/thermal_core.c b/drivers/thermal/thermal_core.c
index daaba832b2a0..f0b2a2a340a3 100644
--- a/drivers/thermal/thermal_core.c
+++ b/drivers/thermal/thermal_core.c
@@ -844,7 +844,7 @@ static int thermal_bind_cdev_to_trip(struct thermal_zone_device *tz,
if (cool_spec->lower > cool_spec->upper || cool_spec->upper > cdev->max_state)
return -EINVAL;
- dev = kzalloc_obj(*dev, GFP_KERNEL);
+ dev = kzalloc_obj(*dev);
if (!dev)
return -ENOMEM;
@@ -1070,7 +1070,7 @@ __thermal_cooling_device_register(struct device_node *np,
if (!thermal_class)
return ERR_PTR(-ENODEV);
- cdev = kzalloc_obj(*cdev, GFP_KERNEL);
+ cdev = kzalloc_obj(*cdev);
if (!cdev)
return ERR_PTR(-ENOMEM);
@@ -1899,7 +1899,7 @@ static int __init thermal_init(void)
if (result)
goto unregister_netlink;
- thermal_class = kzalloc_obj(*thermal_class, GFP_KERNEL);
+ thermal_class = kzalloc_obj(*thermal_class);
if (!thermal_class) {
result = -ENOMEM;
goto unregister_governors;
diff --git a/drivers/thermal/thermal_debugfs.c b/drivers/thermal/thermal_debugfs.c
index 19b050cb4f70..d1b5a09ed684 100644
--- a/drivers/thermal/thermal_debugfs.c
+++ b/drivers/thermal/thermal_debugfs.c
@@ -193,7 +193,7 @@ static struct thermal_debugfs *thermal_debugfs_add_id(struct dentry *d, int id)
struct thermal_debugfs *thermal_dbg;
char ids[IDSLENGTH];
- thermal_dbg = kzalloc_obj(*thermal_dbg, GFP_KERNEL);
+ thermal_dbg = kzalloc_obj(*thermal_dbg);
if (!thermal_dbg)
return NULL;
@@ -226,7 +226,7 @@ thermal_debugfs_cdev_record_alloc(struct thermal_debugfs *thermal_dbg,
{
struct cdev_record *cdev_record;
- cdev_record = kzalloc_obj(*cdev_record, GFP_KERNEL);
+ cdev_record = kzalloc_obj(*cdev_record);
if (!cdev_record)
return NULL;
@@ -876,7 +876,7 @@ void thermal_debug_tz_add(struct thermal_zone_device *tz)
tz_dbg->tz = tz;
- tz_dbg->trips_crossed = kzalloc_objs(int, tz->num_trips, GFP_KERNEL);
+ tz_dbg->trips_crossed = kzalloc_objs(int, tz->num_trips);
if (!tz_dbg->trips_crossed) {
thermal_debugfs_remove_id(thermal_dbg);
return;
diff --git a/drivers/thermal/thermal_hwmon.c b/drivers/thermal/thermal_hwmon.c
index f377175b2663..b624892bc6d6 100644
--- a/drivers/thermal/thermal_hwmon.c
+++ b/drivers/thermal/thermal_hwmon.c
@@ -145,7 +145,7 @@ int thermal_add_hwmon_sysfs(struct thermal_zone_device *tz)
goto register_sys_interface;
}
- hwmon = kzalloc_obj(*hwmon, GFP_KERNEL);
+ hwmon = kzalloc_obj(*hwmon);
if (!hwmon)
return -ENOMEM;
@@ -160,7 +160,7 @@ int thermal_add_hwmon_sysfs(struct thermal_zone_device *tz)
}
register_sys_interface:
- temp = kzalloc_obj(*temp, GFP_KERNEL);
+ temp = kzalloc_obj(*temp);
if (!temp) {
result = -ENOMEM;
goto unregister_name;
diff --git a/drivers/thermal/thermal_sysfs.c b/drivers/thermal/thermal_sysfs.c
index 057460b2e7bb..46b3b2df935c 100644
--- a/drivers/thermal/thermal_sysfs.c
+++ b/drivers/thermal/thermal_sysfs.c
@@ -392,7 +392,7 @@ static int create_trip_attrs(struct thermal_zone_device *tz)
struct attribute **attrs;
int i;
- attrs = kzalloc_objs(*attrs, tz->num_trips * 3 + 1, GFP_KERNEL);
+ attrs = kzalloc_objs(*attrs, tz->num_trips * 3 + 1);
if (!attrs)
return -ENOMEM;
@@ -465,7 +465,7 @@ int thermal_zone_create_device_groups(struct thermal_zone_device *tz)
/* we need one extra for trips and the NULL to terminate the array */
size = ARRAY_SIZE(thermal_zone_attribute_groups) + 2;
/* This also takes care of API requirement to be NULL terminated */
- groups = kzalloc_objs(*groups, size, GFP_KERNEL);
+ groups = kzalloc_objs(*groups, size);
if (!groups)
return -ENOMEM;
diff --git a/drivers/thermal/thermal_thresholds.c b/drivers/thermal/thermal_thresholds.c
index 421ddf907b6d..970b8fd33847 100644
--- a/drivers/thermal/thermal_thresholds.c
+++ b/drivers/thermal/thermal_thresholds.c
@@ -181,7 +181,7 @@ int thermal_thresholds_add(struct thermal_zone_device *tz,
t->direction |= direction;
} else {
- t = kmalloc_obj(*t, GFP_KERNEL);
+ t = kmalloc_obj(*t);
if (!t)
return -ENOMEM;
diff --git a/drivers/thunderbolt/ctl.c b/drivers/thunderbolt/ctl.c
index 3108727c4ef2..b2fd60fc7bcc 100644
--- a/drivers/thunderbolt/ctl.c
+++ b/drivers/thunderbolt/ctl.c
@@ -89,7 +89,7 @@ struct tb_cfg_request *tb_cfg_request_alloc(void)
{
struct tb_cfg_request *req;
- req = kzalloc_obj(*req, GFP_KERNEL);
+ req = kzalloc_obj(*req);
if (!req)
return NULL;
@@ -333,7 +333,7 @@ static void tb_ctl_pkg_free(struct ctl_pkg *pkg)
static struct ctl_pkg *tb_ctl_pkg_alloc(struct tb_ctl *ctl)
{
- struct ctl_pkg *pkg = kzalloc_obj(*pkg, GFP_KERNEL);
+ struct ctl_pkg *pkg = kzalloc_obj(*pkg);
if (!pkg)
return NULL;
pkg->ctl = ctl;
@@ -654,7 +654,7 @@ struct tb_ctl *tb_ctl_alloc(struct tb_nhi *nhi, int index, int timeout_msec,
event_cb cb, void *cb_data)
{
int i;
- struct tb_ctl *ctl = kzalloc_obj(*ctl, GFP_KERNEL);
+ struct tb_ctl *ctl = kzalloc_obj(*ctl);
if (!ctl)
return NULL;
diff --git a/drivers/thunderbolt/debugfs.c b/drivers/thunderbolt/debugfs.c
index 7e2a59dddbbd..042f6a0d0f7f 100644
--- a/drivers/thunderbolt/debugfs.c
+++ b/drivers/thunderbolt/debugfs.c
@@ -1657,7 +1657,7 @@ static struct tb_margining *margining_alloc(struct tb_port *port,
return NULL;
}
- margining = kzalloc_obj(*margining, GFP_KERNEL);
+ margining = kzalloc_obj(*margining);
if (!margining)
return NULL;
diff --git a/drivers/thunderbolt/dma_port.c b/drivers/thunderbolt/dma_port.c
index ddbf5f9971fb..334fefe21255 100644
--- a/drivers/thunderbolt/dma_port.c
+++ b/drivers/thunderbolt/dma_port.c
@@ -209,7 +209,7 @@ struct tb_dma_port *dma_port_alloc(struct tb_switch *sw)
if (port < 0)
return NULL;
- dma = kzalloc_obj(*dma, GFP_KERNEL);
+ dma = kzalloc_obj(*dma);
if (!dma)
return NULL;
diff --git a/drivers/thunderbolt/dma_test.c b/drivers/thunderbolt/dma_test.c
index 8298f25ef6bd..b4aa79d482a0 100644
--- a/drivers/thunderbolt/dma_test.c
+++ b/drivers/thunderbolt/dma_test.c
@@ -267,7 +267,7 @@ static int dma_test_submit_rx(struct dma_test *dt, size_t npackets)
struct dma_test_frame *tf;
dma_addr_t dma_addr;
- tf = kzalloc_obj(*tf, GFP_KERNEL);
+ tf = kzalloc_obj(*tf);
if (!tf)
return -ENOMEM;
@@ -318,7 +318,7 @@ static int dma_test_submit_tx(struct dma_test *dt, size_t npackets)
struct dma_test_frame *tf;
dma_addr_t dma_addr;
- tf = kzalloc_obj(*tf, GFP_KERNEL);
+ tf = kzalloc_obj(*tf);
if (!tf)
return -ENOMEM;
diff --git a/drivers/thunderbolt/domain.c b/drivers/thunderbolt/domain.c
index 1e7268e26fc2..317780b99992 100644
--- a/drivers/thunderbolt/domain.c
+++ b/drivers/thunderbolt/domain.c
@@ -126,7 +126,7 @@ static ssize_t boot_acl_show(struct device *dev, struct device_attribute *attr,
ssize_t ret;
int i;
- uuids = kzalloc_objs(uuid_t, tb->nboot_acl, GFP_KERNEL);
+ uuids = kzalloc_objs(uuid_t, tb->nboot_acl);
if (!uuids)
return -ENOMEM;
@@ -181,7 +181,7 @@ static ssize_t boot_acl_store(struct device *dev, struct device_attribute *attr,
if (!str)
return -ENOMEM;
- acl = kzalloc_objs(uuid_t, tb->nboot_acl, GFP_KERNEL);
+ acl = kzalloc_objs(uuid_t, tb->nboot_acl);
if (!acl) {
ret = -ENOMEM;
goto err_free_str;
diff --git a/drivers/thunderbolt/icm.c b/drivers/thunderbolt/icm.c
index fda1471c7ef8..9d95bf3ab44c 100644
--- a/drivers/thunderbolt/icm.c
+++ b/drivers/thunderbolt/icm.c
@@ -427,7 +427,7 @@ static int icm_fr_get_route(struct tb *tb, u8 link, u8 depth, u64 *route)
int ret, index;
u8 i;
- switches = kzalloc_objs(*switches, npackets, GFP_KERNEL);
+ switches = kzalloc_objs(*switches, npackets);
if (!switches)
return -ENOMEM;
@@ -1769,7 +1769,7 @@ static void icm_handle_event(struct tb *tb, enum tb_cfg_pkg_type type,
{
struct icm_notification *n;
- n = kmalloc_obj(*n, GFP_KERNEL);
+ n = kmalloc_obj(*n);
if (!n)
return;
@@ -2246,7 +2246,7 @@ static int icm_usb4_switch_nvm_authenticate(struct tb *tb, u64 route)
struct tb_cfg_request *req;
int ret;
- auth = kzalloc_obj(*auth, GFP_KERNEL);
+ auth = kzalloc_obj(*auth);
if (!auth)
return -ENOMEM;
diff --git a/drivers/thunderbolt/nhi.c b/drivers/thunderbolt/nhi.c
index 6431c411fb17..ccce020a2432 100644
--- a/drivers/thunderbolt/nhi.c
+++ b/drivers/thunderbolt/nhi.c
@@ -587,7 +587,7 @@ static struct tb_ring *tb_ring_alloc(struct tb_nhi *nhi, u32 hop, int size,
dev_dbg(&nhi->pdev->dev, "allocating %s ring %d of size %d\n",
transmit ? "TX" : "RX", hop, size);
- ring = kzalloc_obj(*ring, GFP_KERNEL);
+ ring = kzalloc_obj(*ring);
if (!ring)
return NULL;
diff --git a/drivers/thunderbolt/nvm.c b/drivers/thunderbolt/nvm.c
index ac9c5504cfc1..3dfa70ea6570 100644
--- a/drivers/thunderbolt/nvm.c
+++ b/drivers/thunderbolt/nvm.c
@@ -330,7 +330,7 @@ struct tb_nvm *tb_nvm_alloc(struct device *dev)
return ERR_PTR(-EOPNOTSUPP);
}
- nvm = kzalloc_obj(*nvm, GFP_KERNEL);
+ nvm = kzalloc_obj(*nvm);
if (!nvm)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/thunderbolt/path.c b/drivers/thunderbolt/path.c
index 88311c6e599b..22fb4a1e1acd 100644
--- a/drivers/thunderbolt/path.c
+++ b/drivers/thunderbolt/path.c
@@ -150,7 +150,7 @@ struct tb_path *tb_path_discover(struct tb_port *src, int src_hopid,
num_hops++;
}
- path = kzalloc_obj(*path, GFP_KERNEL);
+ path = kzalloc_obj(*path);
if (!path)
return NULL;
@@ -160,7 +160,7 @@ struct tb_path *tb_path_discover(struct tb_port *src, int src_hopid,
path->activated = true;
path->alloc_hopid = alloc_hopid;
- path->hops = kzalloc_objs(*path->hops, num_hops, GFP_KERNEL);
+ path->hops = kzalloc_objs(*path->hops, num_hops);
if (!path->hops) {
kfree(path);
return NULL;
@@ -245,7 +245,7 @@ struct tb_path *tb_path_alloc(struct tb *tb, struct tb_port *src, int src_hopid,
size_t num_hops;
int i, ret;
- path = kzalloc_obj(*path, GFP_KERNEL);
+ path = kzalloc_obj(*path);
if (!path)
return NULL;
@@ -267,7 +267,7 @@ struct tb_path *tb_path_alloc(struct tb *tb, struct tb_port *src, int src_hopid,
/* Each hop takes two ports */
num_hops = i / 2;
- path->hops = kzalloc_objs(*path->hops, num_hops, GFP_KERNEL);
+ path->hops = kzalloc_objs(*path->hops, num_hops);
if (!path->hops) {
kfree(path);
return NULL;
diff --git a/drivers/thunderbolt/property.c b/drivers/thunderbolt/property.c
index a274c02d71c0..50cbfc92fe65 100644
--- a/drivers/thunderbolt/property.c
+++ b/drivers/thunderbolt/property.c
@@ -81,7 +81,7 @@ tb_property_alloc(const char *key, enum tb_property_type type)
{
struct tb_property *property;
- property = kzalloc_obj(*property, GFP_KERNEL);
+ property = kzalloc_obj(*property);
if (!property)
return NULL;
@@ -166,7 +166,7 @@ static struct tb_property_dir *__tb_property_parse_dir(const u32 *block,
unsigned int content_offset;
struct tb_property_dir *dir;
- dir = kzalloc_obj(*dir, GFP_KERNEL);
+ dir = kzalloc_obj(*dir);
if (!dir)
return NULL;
@@ -247,7 +247,7 @@ struct tb_property_dir *tb_property_create_dir(const uuid_t *uuid)
{
struct tb_property_dir *dir;
- dir = kzalloc_obj(*dir, GFP_KERNEL);
+ dir = kzalloc_obj(*dir);
if (!dir)
return NULL;
diff --git a/drivers/thunderbolt/retimer.c b/drivers/thunderbolt/retimer.c
index b95f5c19cca5..b1e8d9d6454d 100644
--- a/drivers/thunderbolt/retimer.c
+++ b/drivers/thunderbolt/retimer.c
@@ -410,7 +410,7 @@ static int tb_retimer_add(struct tb_port *port, u8 index, u32 auth_status,
}
- rt = kzalloc_obj(*rt, GFP_KERNEL);
+ rt = kzalloc_obj(*rt);
if (!rt)
return -ENOMEM;
diff --git a/drivers/thunderbolt/switch.c b/drivers/thunderbolt/switch.c
index 90d62141ecd8..b86ccb5b53fd 100644
--- a/drivers/thunderbolt/switch.c
+++ b/drivers/thunderbolt/switch.c
@@ -69,7 +69,7 @@ static void nvm_set_auth_status(const struct tb_switch *sw, u32 status)
st = __nvm_get_auth_status(sw);
if (!st) {
- st = kzalloc_obj(*st, GFP_KERNEL);
+ st = kzalloc_obj(*st);
if (!st)
goto unlock;
@@ -2475,7 +2475,7 @@ struct tb_switch *tb_switch_alloc(struct tb *tb, struct device *parent,
if (upstream_port < 0)
return ERR_PTR(upstream_port);
- sw = kzalloc_obj(*sw, GFP_KERNEL);
+ sw = kzalloc_obj(*sw);
if (!sw)
return ERR_PTR(-ENOMEM);
@@ -2577,7 +2577,7 @@ tb_switch_alloc_safe_mode(struct tb *tb, struct device *parent, u64 route)
{
struct tb_switch *sw;
- sw = kzalloc_obj(*sw, GFP_KERNEL);
+ sw = kzalloc_obj(*sw);
if (!sw)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/thunderbolt/tb.c b/drivers/thunderbolt/tb.c
index 4c3b2d48c4a0..c69c323e6952 100644
--- a/drivers/thunderbolt/tb.c
+++ b/drivers/thunderbolt/tb.c
@@ -94,7 +94,7 @@ static void tb_queue_hotplug(struct tb *tb, u64 route, u8 port, bool unplug)
{
struct tb_hotplug_event *ev;
- ev = kmalloc_obj(*ev, GFP_KERNEL);
+ ev = kmalloc_obj(*ev);
if (!ev)
return;
@@ -2862,7 +2862,7 @@ static void tb_queue_dp_bandwidth_request(struct tb *tb, u64 route, u8 port,
{
struct tb_hotplug_event *ev;
- ev = kmalloc_obj(*ev, GFP_KERNEL);
+ ev = kmalloc_obj(*ev);
if (!ev)
return;
diff --git a/drivers/thunderbolt/tunnel.c b/drivers/thunderbolt/tunnel.c
index 2d537ada98e1..89676acf1290 100644
--- a/drivers/thunderbolt/tunnel.c
+++ b/drivers/thunderbolt/tunnel.c
@@ -180,11 +180,11 @@ static struct tb_tunnel *tb_tunnel_alloc(struct tb *tb, size_t npaths,
{
struct tb_tunnel *tunnel;
- tunnel = kzalloc_obj(*tunnel, GFP_KERNEL);
+ tunnel = kzalloc_obj(*tunnel);
if (!tunnel)
return NULL;
- tunnel->paths = kzalloc_objs(tunnel->paths[0], npaths, GFP_KERNEL);
+ tunnel->paths = kzalloc_objs(tunnel->paths[0], npaths);
if (!tunnel->paths) {
kfree(tunnel);
return NULL;
diff --git a/drivers/thunderbolt/usb4_port.c b/drivers/thunderbolt/usb4_port.c
index 642822b58b42..c32d3516e780 100644
--- a/drivers/thunderbolt/usb4_port.c
+++ b/drivers/thunderbolt/usb4_port.c
@@ -305,7 +305,7 @@ struct usb4_port *usb4_port_device_add(struct tb_port *port)
struct usb4_port *usb4;
int ret;
- usb4 = kzalloc_obj(*usb4, GFP_KERNEL);
+ usb4 = kzalloc_obj(*usb4);
if (!usb4)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/thunderbolt/xdomain.c b/drivers/thunderbolt/xdomain.c
index 384afd16af72..754808c43f00 100644
--- a/drivers/thunderbolt/xdomain.c
+++ b/drivers/thunderbolt/xdomain.c
@@ -858,7 +858,7 @@ tb_xdp_schedule_request(struct tb *tb, const struct tb_xdp_header *hdr,
{
struct xdomain_request_work *xw;
- xw = kmalloc_obj(*xw, GFP_KERNEL);
+ xw = kmalloc_obj(*xw);
if (!xw)
return false;
@@ -1094,7 +1094,7 @@ static void enumerate_services(struct tb_xdomain *xd)
continue;
}
- svc = kzalloc_obj(*svc, GFP_KERNEL);
+ svc = kzalloc_obj(*svc);
if (!svc)
break;
@@ -1974,7 +1974,7 @@ struct tb_xdomain *tb_xdomain_alloc(struct tb *tb, struct device *parent,
down = tb_port_at(route, parent_sw);
tb_port_unlock(down);
- xd = kzalloc_obj(*xd, GFP_KERNEL);
+ xd = kzalloc_obj(*xd);
if (!xd)
return NULL;
diff --git a/drivers/tty/ehv_bytechan.c b/drivers/tty/ehv_bytechan.c
index 2cbbaed14ee6..2b3ca9f6bf07 100644
--- a/drivers/tty/ehv_bytechan.c
+++ b/drivers/tty/ehv_bytechan.c
@@ -772,7 +772,7 @@ static int __init ehv_bc_init(void)
* array, then you can use pointer math (e.g. "bc - bcs") to get its
* tty index.
*/
- bcs = kzalloc_objs(struct ehv_bc_data, count, GFP_KERNEL);
+ bcs = kzalloc_objs(struct ehv_bc_data, count);
if (!bcs)
return -ENOMEM;
diff --git a/drivers/tty/hvc/hvc_iucv.c b/drivers/tty/hvc/hvc_iucv.c
index 7fd3937d1396..1dcdb9e99bd8 100644
--- a/drivers/tty/hvc/hvc_iucv.c
+++ b/drivers/tty/hvc/hvc_iucv.c
@@ -1050,7 +1050,7 @@ static int __init hvc_iucv_alloc(int id, unsigned int is_console)
char name[9];
int rc;
- priv = kzalloc_obj(struct hvc_iucv_private, GFP_KERNEL);
+ priv = kzalloc_obj(struct hvc_iucv_private);
if (!priv)
return -ENOMEM;
diff --git a/drivers/tty/hvc/hvc_opal.c b/drivers/tty/hvc/hvc_opal.c
index 72dfab77890c..402da9e7c534 100644
--- a/drivers/tty/hvc/hvc_opal.c
+++ b/drivers/tty/hvc/hvc_opal.c
@@ -181,7 +181,7 @@ static int hvc_opal_probe(struct platform_device *dev)
pv = hvc_opal_privs[termno];
boot = 1;
} else if (hvc_opal_privs[termno] == NULL) {
- pv = kzalloc_obj(struct hvc_opal_priv, GFP_KERNEL);
+ pv = kzalloc_obj(struct hvc_opal_priv);
if (!pv)
return -ENOMEM;
pv->proto = proto;
diff --git a/drivers/tty/hvc/hvc_vio.c b/drivers/tty/hvc/hvc_vio.c
index 8725cc77c557..14c6a5564617 100644
--- a/drivers/tty/hvc/hvc_vio.c
+++ b/drivers/tty/hvc/hvc_vio.c
@@ -338,7 +338,7 @@ static int hvc_vio_probe(struct vio_dev *vdev,
pr_devel("->non-boot console, using termno %d\n", termno);
if (termno < 0)
return -ENODEV;
- pv = kzalloc_obj(struct hvterm_priv, GFP_KERNEL);
+ pv = kzalloc_obj(struct hvterm_priv);
if (!pv)
return -ENOMEM;
pv->termno = vdev->unit_address;
diff --git a/drivers/tty/hvc/hvc_xen.c b/drivers/tty/hvc/hvc_xen.c
index 138afdf3bbc4..7f0b6262488c 100644
--- a/drivers/tty/hvc/hvc_xen.c
+++ b/drivers/tty/hvc/hvc_xen.c
@@ -264,7 +264,7 @@ static int xen_hvm_console_init(void)
info = vtermno_to_xencons(HVC_COOKIE);
if (!info) {
- info = kzalloc_obj(struct xencons_info, GFP_KERNEL);
+ info = kzalloc_obj(struct xencons_info);
if (!info)
return -ENOMEM;
spin_lock_init(&info->ring_lock);
@@ -328,7 +328,7 @@ static int xen_pv_console_init(void)
info = vtermno_to_xencons(HVC_COOKIE);
if (!info) {
- info = kzalloc_obj(struct xencons_info, GFP_KERNEL);
+ info = kzalloc_obj(struct xencons_info);
if (!info)
return -ENOMEM;
} else if (info->intf != NULL) {
@@ -352,7 +352,7 @@ static int xen_initial_domain_console_init(void)
info = vtermno_to_xencons(HVC_COOKIE);
if (!info) {
- info = kzalloc_obj(struct xencons_info, GFP_KERNEL);
+ info = kzalloc_obj(struct xencons_info);
if (!info)
return -ENOMEM;
spin_lock_init(&info->ring_lock);
@@ -513,7 +513,7 @@ static int xencons_probe(struct xenbus_device *dev,
if (devid == 0)
return -ENODEV;
- info = kzalloc_obj(struct xencons_info, GFP_KERNEL);
+ info = kzalloc_obj(struct xencons_info);
if (!info)
return -ENOMEM;
spin_lock_init(&info->ring_lock);
diff --git a/drivers/tty/hvc/hvcs.c b/drivers/tty/hvc/hvcs.c
index 7ff3c87354b8..d32b1e3c50bf 100644
--- a/drivers/tty/hvc/hvcs.c
+++ b/drivers/tty/hvc/hvcs.c
@@ -748,7 +748,7 @@ static int hvcs_probe(
return -EFAULT;
}
- hvcsd = kzalloc_obj(*hvcsd, GFP_KERNEL);
+ hvcsd = kzalloc_obj(*hvcsd);
if (!hvcsd)
return -ENODEV;
@@ -1394,7 +1394,7 @@ static int hvcs_alloc_index_list(int n)
{
int i;
- hvcs_index_list = kmalloc_objs(hvcs_index_count, n, GFP_KERNEL);
+ hvcs_index_list = kmalloc_objs(hvcs_index_count, n);
if (!hvcs_index_list)
return -ENOMEM;
hvcs_index_count = n;
diff --git a/drivers/tty/ipwireless/hardware.c b/drivers/tty/ipwireless/hardware.c
index 6e6aa90b33ba..0bfcbca6e2df 100644
--- a/drivers/tty/ipwireless/hardware.c
+++ b/drivers/tty/ipwireless/hardware.c
@@ -1618,7 +1618,7 @@ struct ipw_hardware *ipwireless_hardware_create(void)
{
int i;
struct ipw_hardware *hw =
- kzalloc_obj(struct ipw_hardware, GFP_KERNEL);
+ kzalloc_obj(struct ipw_hardware);
if (!hw)
return NULL;
diff --git a/drivers/tty/ipwireless/main.c b/drivers/tty/ipwireless/main.c
index 3bf160d62a1e..a2875823290e 100644
--- a/drivers/tty/ipwireless/main.c
+++ b/drivers/tty/ipwireless/main.c
@@ -267,7 +267,7 @@ static int ipwireless_attach(struct pcmcia_device *link)
struct ipw_dev *ipw;
int ret;
- ipw = kzalloc_obj(struct ipw_dev, GFP_KERNEL);
+ ipw = kzalloc_obj(struct ipw_dev);
if (!ipw)
return -ENOMEM;
diff --git a/drivers/tty/ipwireless/network.c b/drivers/tty/ipwireless/network.c
index cb864142be09..ad2c5157a018 100644
--- a/drivers/tty/ipwireless/network.c
+++ b/drivers/tty/ipwireless/network.c
@@ -257,7 +257,7 @@ static void do_go_online(struct work_struct *work_go_online)
struct ppp_channel *channel;
spin_unlock_irqrestore(&network->lock, flags);
- channel = kzalloc_obj(struct ppp_channel, GFP_KERNEL);
+ channel = kzalloc_obj(struct ppp_channel);
if (!channel) {
printk(KERN_ERR IPWIRELESS_PCCARD_NAME
": unable to allocate PPP channel\n");
@@ -416,7 +416,7 @@ void ipwireless_network_packet_received(struct ipw_network *network,
struct ipw_network *ipwireless_network_create(struct ipw_hardware *hw)
{
struct ipw_network *network =
- kzalloc_obj(struct ipw_network, GFP_KERNEL);
+ kzalloc_obj(struct ipw_network);
if (!network)
return NULL;
diff --git a/drivers/tty/ipwireless/tty.c b/drivers/tty/ipwireless/tty.c
index 79c01ff49c65..ffdbcdd041a3 100644
--- a/drivers/tty/ipwireless/tty.c
+++ b/drivers/tty/ipwireless/tty.c
@@ -437,7 +437,7 @@ static int add_tty(int j,
struct ipw_network *network, int channel_idx,
int secondary_channel_idx, int tty_type)
{
- ttys[j] = kzalloc_obj(struct ipw_tty, GFP_KERNEL);
+ ttys[j] = kzalloc_obj(struct ipw_tty);
if (!ttys[j])
return -ENOMEM;
ttys[j]->index = j;
diff --git a/drivers/tty/n_gsm.c b/drivers/tty/n_gsm.c
index 815e35a24af9..c13e050de83b 100644
--- a/drivers/tty/n_gsm.c
+++ b/drivers/tty/n_gsm.c
@@ -3275,7 +3275,7 @@ static inline unsigned int mux_line_to_num(unsigned int line)
static struct gsm_mux *gsm_alloc_mux(void)
{
int i;
- struct gsm_mux *gsm = kzalloc_obj(struct gsm_mux, GFP_KERNEL);
+ struct gsm_mux *gsm = kzalloc_obj(struct gsm_mux);
if (gsm == NULL)
return NULL;
gsm->buf = kmalloc(MAX_MRU + 1, GFP_KERNEL);
diff --git a/drivers/tty/n_hdlc.c b/drivers/tty/n_hdlc.c
index 6c685a6d4ddb..bf827ae3e5c8 100644
--- a/drivers/tty/n_hdlc.c
+++ b/drivers/tty/n_hdlc.c
@@ -686,7 +686,7 @@ static void n_hdlc_alloc_buf(struct n_hdlc_buf_list *list, unsigned int count,
*/
static struct n_hdlc *n_hdlc_alloc(void)
{
- struct n_hdlc *n_hdlc = kzalloc_obj(*n_hdlc, GFP_KERNEL);
+ struct n_hdlc *n_hdlc = kzalloc_obj(*n_hdlc);
if (!n_hdlc)
return NULL;
diff --git a/drivers/tty/nozomi.c b/drivers/tty/nozomi.c
index b05f4a8553ac..ed99dbc9f990 100644
--- a/drivers/tty/nozomi.c
+++ b/drivers/tty/nozomi.c
@@ -1298,7 +1298,7 @@ static int nozomi_card_init(struct pci_dev *pdev,
goto err;
}
- dc = kzalloc_obj(struct nozomi, GFP_KERNEL);
+ dc = kzalloc_obj(struct nozomi);
if (unlikely(!dc)) {
dev_err(&pdev->dev, "Could not allocate memory\n");
ret = -ENOMEM;
diff --git a/drivers/tty/pty.c b/drivers/tty/pty.c
index ce58997dae93..cb427e93372d 100644
--- a/drivers/tty/pty.c
+++ b/drivers/tty/pty.c
@@ -364,8 +364,8 @@ static int pty_common_install(struct tty_driver *driver, struct tty_struct *tty,
if (driver->subtype != PTY_TYPE_MASTER)
return -EIO;
- ports[0] = kmalloc_obj(**ports, GFP_KERNEL);
- ports[1] = kmalloc_obj(**ports, GFP_KERNEL);
+ ports[0] = kmalloc_obj(**ports);
+ ports[1] = kmalloc_obj(**ports);
if (!ports[0] || !ports[1])
goto err;
if (!try_module_get(driver->other->owner)) {
diff --git a/drivers/tty/rpmsg_tty.c b/drivers/tty/rpmsg_tty.c
index 6ada8e92bbf2..c5fd6d9b380f 100644
--- a/drivers/tty/rpmsg_tty.c
+++ b/drivers/tty/rpmsg_tty.c
@@ -134,7 +134,7 @@ static struct rpmsg_tty_port *rpmsg_tty_alloc_cport(void)
struct rpmsg_tty_port *cport;
int ret;
- cport = kzalloc_obj(*cport, GFP_KERNEL);
+ cport = kzalloc_obj(*cport);
if (!cport)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/tty/serdev/core.c b/drivers/tty/serdev/core.c
index aced9d895103..8f25510f89b6 100644
--- a/drivers/tty/serdev/core.c
+++ b/drivers/tty/serdev/core.c
@@ -442,7 +442,7 @@ struct serdev_device *serdev_device_alloc(struct serdev_controller *ctrl)
{
struct serdev_device *serdev;
- serdev = kzalloc_obj(*serdev, GFP_KERNEL);
+ serdev = kzalloc_obj(*serdev);
if (!serdev)
return NULL;
diff --git a/drivers/tty/serial/8250/8250_acorn.c b/drivers/tty/serial/8250/8250_acorn.c
index 84889bb952a2..fb596262b9c7 100644
--- a/drivers/tty/serial/8250/8250_acorn.c
+++ b/drivers/tty/serial/8250/8250_acorn.c
@@ -44,7 +44,7 @@ serial_card_probe(struct expansion_card *ec, const struct ecard_id *id)
unsigned long bus_addr;
unsigned int i;
- info = kzalloc_obj(struct serial_card_info, GFP_KERNEL);
+ info = kzalloc_obj(struct serial_card_info);
if (!info)
return -ENOMEM;
diff --git a/drivers/tty/serial/8250/8250_core.c b/drivers/tty/serial/8250/8250_core.c
index 74a358e7ae03..d2e2c5dfef99 100644
--- a/drivers/tty/serial/8250/8250_core.c
+++ b/drivers/tty/serial/8250/8250_core.c
@@ -140,7 +140,7 @@ static struct irq_info *serial_get_or_create_irq_info(const struct uart_8250_por
if (i->irq == up->port.irq)
return i;
- i = kzalloc_obj(*i, GFP_KERNEL);
+ i = kzalloc_obj(*i);
if (i == NULL)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/tty/serial/8250/8250_hp300.c b/drivers/tty/serial/8250/8250_hp300.c
index 732f1a158e62..59ec0c7377a1 100644
--- a/drivers/tty/serial/8250/8250_hp300.c
+++ b/drivers/tty/serial/8250/8250_hp300.c
@@ -240,7 +240,7 @@ static int __init hp300_8250_init(void)
#endif
/* Create new serial device */
- port = kmalloc_obj(struct hp300_port, GFP_KERNEL);
+ port = kmalloc_obj(struct hp300_port);
if (!port)
return -ENOMEM;
diff --git a/drivers/tty/serial/8250/8250_ni.c b/drivers/tty/serial/8250/8250_ni.c
index 3f3dac694e20..0935341dd050 100644
--- a/drivers/tty/serial/8250/8250_ni.c
+++ b/drivers/tty/serial/8250/8250_ni.c
@@ -285,7 +285,7 @@ static int ni16550_probe(struct platform_device *pdev)
bool rs232_property;
int ret;
- uart = kzalloc_obj(*uart, GFP_KERNEL);
+ uart = kzalloc_obj(*uart);
if (!uart)
return -ENOMEM;
diff --git a/drivers/tty/serial/8250/8250_of.c b/drivers/tty/serial/8250/8250_of.c
index 9c721bafbe37..81644d40b09a 100644
--- a/drivers/tty/serial/8250/8250_of.c
+++ b/drivers/tty/serial/8250/8250_of.c
@@ -217,7 +217,7 @@ static int of_platform_serial_probe(struct platform_device *ofdev)
if (of_property_read_bool(ofdev->dev.of_node, "used-by-rtas"))
return -EBUSY;
- info = kzalloc_obj(*info, GFP_KERNEL);
+ info = kzalloc_obj(*info);
if (info == NULL)
return -ENOMEM;
diff --git a/drivers/tty/serial/8250/serial_cs.c b/drivers/tty/serial/8250/serial_cs.c
index 5c372bd7f92a..80483fc7388d 100644
--- a/drivers/tty/serial/8250/serial_cs.c
+++ b/drivers/tty/serial/8250/serial_cs.c
@@ -305,7 +305,7 @@ static int serial_probe(struct pcmcia_device *link)
dev_dbg(&link->dev, "serial_attach()\n");
/* Create new serial device */
- info = kzalloc_obj(*info, GFP_KERNEL);
+ info = kzalloc_obj(*info);
if (!info)
return -ENOMEM;
info->p_dev = link;
diff --git a/drivers/tty/serial/icom.c b/drivers/tty/serial/icom.c
index c0a7f8a0ff55..bcdc07208486 100644
--- a/drivers/tty/serial/icom.c
+++ b/drivers/tty/serial/icom.c
@@ -1632,7 +1632,7 @@ static int icom_alloc_adapter(struct icom_adapter
struct icom_adapter *icom_adapter;
struct icom_adapter *cur_adapter_entry;
- icom_adapter = kzalloc_obj(struct icom_adapter, GFP_KERNEL);
+ icom_adapter = kzalloc_obj(struct icom_adapter);
if (!icom_adapter) {
return -ENOMEM;
diff --git a/drivers/tty/serial/jsm/jsm_driver.c b/drivers/tty/serial/jsm/jsm_driver.c
index 2a048dc62b96..4b73e51f83fb 100644
--- a/drivers/tty/serial/jsm/jsm_driver.c
+++ b/drivers/tty/serial/jsm/jsm_driver.c
@@ -66,7 +66,7 @@ static int jsm_probe_one(struct pci_dev *pdev, const struct pci_device_id *ent)
goto out_disable_device;
}
- brd = kzalloc_obj(*brd, GFP_KERNEL);
+ brd = kzalloc_obj(*brd);
if (!brd) {
rc = -ENOMEM;
goto out_release_regions;
diff --git a/drivers/tty/serial/max3100.c b/drivers/tty/serial/max3100.c
index 68cef83de47d..475b0a6efce4 100644
--- a/drivers/tty/serial/max3100.c
+++ b/drivers/tty/serial/max3100.c
@@ -708,7 +708,7 @@ static int max3100_probe(struct spi_device *spi)
return dev_err_probe(dev, -ENOSPC, "too many MAX3100 chips\n");
}
- max3100s[i] = kzalloc_obj(struct max3100_port, GFP_KERNEL);
+ max3100s[i] = kzalloc_obj(struct max3100_port);
if (!max3100s[i]) {
mutex_unlock(&max3100s_lock);
return -ENOMEM;
diff --git a/drivers/tty/serial/pch_uart.c b/drivers/tty/serial/pch_uart.c
index 2983d74a5cf1..6729d8e83c3c 100644
--- a/drivers/tty/serial/pch_uart.c
+++ b/drivers/tty/serial/pch_uart.c
@@ -1651,7 +1651,7 @@ static struct eg20t_port *pch_uart_init_port(struct pci_dev *pdev,
board = &drv_dat[id->driver_data];
port_type = board->port_type;
- priv = kzalloc_obj(struct eg20t_port, GFP_KERNEL);
+ priv = kzalloc_obj(struct eg20t_port);
if (priv == NULL)
goto init_port_alloc_err;
diff --git a/drivers/tty/serial/pxa.c b/drivers/tty/serial/pxa.c
index 063720ed9716..fea0255067cc 100644
--- a/drivers/tty/serial/pxa.c
+++ b/drivers/tty/serial/pxa.c
@@ -811,7 +811,7 @@ static int serial_pxa_probe(struct platform_device *dev)
if (irq < 0)
return irq;
- sport = kzalloc_obj(struct uart_pxa_port, GFP_KERNEL);
+ sport = kzalloc_obj(struct uart_pxa_port);
if (!sport)
return -ENOMEM;
diff --git a/drivers/tty/serial/serial_base_bus.c b/drivers/tty/serial/serial_base_bus.c
index ffe331831e22..a12935f6b992 100644
--- a/drivers/tty/serial/serial_base_bus.c
+++ b/drivers/tty/serial/serial_base_bus.c
@@ -116,7 +116,7 @@ struct serial_ctrl_device *serial_base_ctrl_add(struct uart_port *port,
struct serial_ctrl_device *ctrl_dev;
int err;
- ctrl_dev = kzalloc_obj(*ctrl_dev, GFP_KERNEL);
+ ctrl_dev = kzalloc_obj(*ctrl_dev);
if (!ctrl_dev)
return ERR_PTR(-ENOMEM);
@@ -156,7 +156,7 @@ struct serial_port_device *serial_base_port_add(struct uart_port *port,
int min = 0, max = -1; /* Use -1 for max to apply IDA defaults */
int err;
- port_dev = kzalloc_obj(*port_dev, GFP_KERNEL);
+ port_dev = kzalloc_obj(*port_dev);
if (!port_dev)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/tty/serial/serial_core.c b/drivers/tty/serial/serial_core.c
index 2047d73858ec..78bb2a5f1cdf 100644
--- a/drivers/tty/serial/serial_core.c
+++ b/drivers/tty/serial/serial_core.c
@@ -2716,7 +2716,7 @@ int uart_register_driver(struct uart_driver *drv)
* Maybe we should be using a slab cache for this, especially if
* we have a large number of ports to handle.
*/
- drv->state = kzalloc_objs(struct uart_state, drv->nr, GFP_KERNEL);
+ drv->state = kzalloc_objs(struct uart_state, drv->nr);
if (!drv->state)
goto out;
diff --git a/drivers/tty/serial/sunhv.c b/drivers/tty/serial/sunhv.c
index 219588a8b1ee..35301d6d5bc6 100644
--- a/drivers/tty/serial/sunhv.c
+++ b/drivers/tty/serial/sunhv.c
@@ -529,7 +529,7 @@ static int hv_probe(struct platform_device *op)
if (op->archdata.irqs[0] == 0xffffffff)
return -ENODEV;
- port = kzalloc_obj(struct uart_port, GFP_KERNEL);
+ port = kzalloc_obj(struct uart_port);
if (unlikely(!port))
return -ENOMEM;
diff --git a/drivers/tty/serial/sunsu.c b/drivers/tty/serial/sunsu.c
index 884985346226..6505a1930da9 100644
--- a/drivers/tty/serial/sunsu.c
+++ b/drivers/tty/serial/sunsu.c
@@ -1398,7 +1398,7 @@ static int su_probe(struct platform_device *op)
return -EINVAL;
up = &sunsu_ports[nr_inst];
} else {
- up = kzalloc_obj(*up, GFP_KERNEL);
+ up = kzalloc_obj(*up);
if (!up)
return -ENOMEM;
}
diff --git a/drivers/tty/serial/timbuart.c b/drivers/tty/serial/timbuart.c
index 48f1ef5e9bac..7a0326e7102a 100644
--- a/drivers/tty/serial/timbuart.c
+++ b/drivers/tty/serial/timbuart.c
@@ -412,7 +412,7 @@ static int timbuart_probe(struct platform_device *dev)
dev_dbg(&dev->dev, "%s\n", __func__);
- uart = kzalloc_obj(*uart, GFP_KERNEL);
+ uart = kzalloc_obj(*uart);
if (!uart) {
err = -EINVAL;
goto err_mem;
diff --git a/drivers/tty/serial/ucc_uart.c b/drivers/tty/serial/ucc_uart.c
index d7a39e36b53c..6b7dcbbacd13 100644
--- a/drivers/tty/serial/ucc_uart.c
+++ b/drivers/tty/serial/ucc_uart.c
@@ -1247,7 +1247,7 @@ static int ucc_uart_probe(struct platform_device *ofdev)
if (ret)
return ret;
- qe_port = kzalloc_obj(struct uart_qe_port, GFP_KERNEL);
+ qe_port = kzalloc_obj(struct uart_qe_port);
if (!qe_port) {
dev_err(&ofdev->dev, "can't allocate QE port structure\n");
return -ENOMEM;
diff --git a/drivers/tty/synclink_gt.c b/drivers/tty/synclink_gt.c
index 06af5c4349ec..bf4f50e0ce94 100644
--- a/drivers/tty/synclink_gt.c
+++ b/drivers/tty/synclink_gt.c
@@ -3477,7 +3477,7 @@ static struct slgt_info *alloc_dev(int adapter_num, int port_num, struct pci_dev
{
struct slgt_info *info;
- info = kzalloc_obj(struct slgt_info, GFP_KERNEL);
+ info = kzalloc_obj(struct slgt_info);
if (!info) {
DBGERR(("%s device alloc failed adapter=%d port=%d\n",
diff --git a/drivers/tty/sysrq.c b/drivers/tty/sysrq.c
index 4aaa3e04e035..c2e4b31b699a 100644
--- a/drivers/tty/sysrq.c
+++ b/drivers/tty/sysrq.c
@@ -971,7 +971,7 @@ static int sysrq_connect(struct input_handler *handler,
struct sysrq_state *sysrq;
int error;
- sysrq = kzalloc_obj(struct sysrq_state, GFP_KERNEL);
+ sysrq = kzalloc_obj(struct sysrq_state);
if (!sysrq)
return -ENOMEM;
diff --git a/drivers/tty/tty_audit.c b/drivers/tty/tty_audit.c
index e7964d319498..d014af6ab060 100644
--- a/drivers/tty/tty_audit.c
+++ b/drivers/tty/tty_audit.c
@@ -35,7 +35,7 @@ static struct tty_audit_buf *tty_audit_buf_alloc(void)
{
struct tty_audit_buf *buf;
- buf = kzalloc_obj(*buf, GFP_KERNEL);
+ buf = kzalloc_obj(*buf);
if (!buf)
goto err;
diff --git a/drivers/tty/tty_io.c b/drivers/tty/tty_io.c
index 506b6c6329c2..0b9a19afc3e7 100644
--- a/drivers/tty/tty_io.c
+++ b/drivers/tty/tty_io.c
@@ -183,7 +183,7 @@ int tty_alloc_file(struct file *file)
{
struct tty_file_private *priv;
- priv = kmalloc_obj(*priv, GFP_KERNEL);
+ priv = kmalloc_obj(*priv);
if (!priv)
return -ENOMEM;
@@ -1471,7 +1471,7 @@ void tty_save_termios(struct tty_struct *tty)
/* Stash the termios data */
tp = tty->driver->termios[idx];
if (tp == NULL) {
- tp = kmalloc_obj(*tp, GFP_KERNEL);
+ tp = kmalloc_obj(*tp);
if (tp == NULL)
return;
tty->driver->termios[idx] = tp;
@@ -3244,7 +3244,7 @@ struct device *tty_register_device_attr(struct tty_driver *driver,
else
tty_line_name(driver, index, name);
- dev = kzalloc_obj(*dev, GFP_KERNEL);
+ dev = kzalloc_obj(*dev);
if (!dev)
return ERR_PTR(-ENOMEM);
@@ -3333,7 +3333,7 @@ struct tty_driver *__tty_alloc_driver(unsigned int lines, struct module *owner,
if (!lines || (flags & TTY_DRIVER_UNNUMBERED_NODE && lines > 1))
return ERR_PTR(-EINVAL);
- driver = kzalloc_obj(*driver, GFP_KERNEL);
+ driver = kzalloc_obj(*driver);
if (!driver)
return ERR_PTR(-ENOMEM);
@@ -3343,7 +3343,7 @@ struct tty_driver *__tty_alloc_driver(unsigned int lines, struct module *owner,
driver->flags = flags;
if (!(flags & TTY_DRIVER_DEVPTS_MEM)) {
- driver->ttys = kzalloc_objs(*driver->ttys, lines, GFP_KERNEL);
+ driver->ttys = kzalloc_objs(*driver->ttys, lines);
driver->termios = kzalloc_objs(*driver->termios, lines,
GFP_KERNEL);
if (!driver->ttys || !driver->termios) {
@@ -3353,7 +3353,7 @@ struct tty_driver *__tty_alloc_driver(unsigned int lines, struct module *owner,
}
if (!(flags & TTY_DRIVER_DYNAMIC_ALLOC)) {
- driver->ports = kzalloc_objs(*driver->ports, lines, GFP_KERNEL);
+ driver->ports = kzalloc_objs(*driver->ports, lines);
if (!driver->ports) {
err = -ENOMEM;
goto err_free_all;
@@ -3361,7 +3361,7 @@ struct tty_driver *__tty_alloc_driver(unsigned int lines, struct module *owner,
cdevs = lines;
}
- driver->cdevs = kzalloc_objs(*driver->cdevs, cdevs, GFP_KERNEL);
+ driver->cdevs = kzalloc_objs(*driver->cdevs, cdevs);
if (!driver->cdevs) {
err = -ENOMEM;
goto err_free_all;
diff --git a/drivers/tty/vcc.c b/drivers/tty/vcc.c
index cd741fbe6fbe..27a55465bf5e 100644
--- a/drivers/tty/vcc.c
+++ b/drivers/tty/vcc.c
@@ -574,7 +574,7 @@ static int vcc_probe(struct vio_dev *vdev, const struct vio_device_id *id)
return -ENODEV;
}
- port = kzalloc_obj(struct vcc_port, GFP_KERNEL);
+ port = kzalloc_obj(struct vcc_port);
if (!port)
return -ENOMEM;
@@ -957,7 +957,7 @@ static int vcc_install(struct tty_driver *driver, struct tty_struct *tty)
if (ret)
return ret;
- port_tty = kzalloc_obj(struct tty_port, GFP_KERNEL);
+ port_tty = kzalloc_obj(struct tty_port);
if (!port_tty)
return -ENOMEM;
diff --git a/drivers/tty/vt/consolemap.c b/drivers/tty/vt/consolemap.c
index 97cf1ceb6709..3fa89a2dbeba 100644
--- a/drivers/tty/vt/consolemap.c
+++ b/drivers/tty/vt/consolemap.c
@@ -539,7 +539,7 @@ static int con_allocate_new(struct vc_data *vc)
{
struct uni_pagedict *new, *old = *vc->uni_pagedict_loc;
- new = kzalloc_obj(*new, GFP_KERNEL);
+ new = kzalloc_obj(*new);
if (!new)
return -ENOMEM;
diff --git a/drivers/tty/vt/vc_screen.c b/drivers/tty/vt/vc_screen.c
index 824a74626548..4d2d46c95fef 100644
--- a/drivers/tty/vt/vc_screen.c
+++ b/drivers/tty/vt/vc_screen.c
@@ -131,7 +131,7 @@ vcs_poll_data_get(struct file *file)
if (poll)
return poll;
- poll = kzalloc_obj(*poll, GFP_KERNEL);
+ poll = kzalloc_obj(*poll);
if (!poll)
return NULL;
poll->cons_num = console(file_inode(file));
diff --git a/drivers/tty/vt/vt.c b/drivers/tty/vt/vt.c
index cca7bdf8f2fe..c1f152d8b03b 100644
--- a/drivers/tty/vt/vt.c
+++ b/drivers/tty/vt/vt.c
@@ -1065,7 +1065,7 @@ int vc_allocate(unsigned int currcons) /* return 0 on success */
/* although the numbers above are not valid since long ago, the
point is still up-to-date and the comment still has its value
even if only as a historical artifact. --mj, July 1998 */
- param.vc = vc = kzalloc_obj(struct vc_data, GFP_KERNEL);
+ param.vc = vc = kzalloc_obj(struct vc_data);
if (!vc)
return -ENOMEM;
diff --git a/drivers/ufs/core/ufs-hwmon.c b/drivers/ufs/core/ufs-hwmon.c
index 1ca027b4caa5..aa0b60a0ee8a 100644
--- a/drivers/ufs/core/ufs-hwmon.c
+++ b/drivers/ufs/core/ufs-hwmon.c
@@ -169,7 +169,7 @@ void ufs_hwmon_probe(struct ufs_hba *hba, u8 mask)
struct ufs_hwmon_data *data;
struct device *hwmon;
- data = kzalloc_obj(*data, GFP_KERNEL);
+ data = kzalloc_obj(*data);
if (!data)
return;
diff --git a/drivers/uio/uio.c b/drivers/uio/uio.c
index 14d14389164e..5a4998e2caf8 100644
--- a/drivers/uio/uio.c
+++ b/drivers/uio/uio.c
@@ -306,7 +306,7 @@ static int uio_dev_add_attributes(struct uio_device *idev)
goto err_map;
}
}
- map = kzalloc_obj(*map, GFP_KERNEL);
+ map = kzalloc_obj(*map);
if (!map) {
ret = -ENOMEM;
goto err_map;
@@ -335,7 +335,7 @@ static int uio_dev_add_attributes(struct uio_device *idev)
goto err_portio;
}
}
- portio = kzalloc_obj(*portio, GFP_KERNEL);
+ portio = kzalloc_obj(*portio);
if (!portio) {
ret = -ENOMEM;
goto err_portio;
@@ -494,7 +494,7 @@ static int uio_open(struct inode *inode, struct file *filep)
goto err_module_get;
}
- listener = kmalloc_obj(*listener, GFP_KERNEL);
+ listener = kmalloc_obj(*listener);
if (!listener) {
ret = -ENOMEM;
goto err_alloc_listener;
@@ -991,7 +991,7 @@ int __uio_register_device(struct module *owner,
info->uio_dev = NULL;
- idev = kzalloc_obj(*idev, GFP_KERNEL);
+ idev = kzalloc_obj(*idev);
if (!idev) {
return -ENOMEM;
}
diff --git a/drivers/usb/atm/cxacru.c b/drivers/usb/atm/cxacru.c
index 909fdb56c09a..f1900c567ba4 100644
--- a/drivers/usb/atm/cxacru.c
+++ b/drivers/usb/atm/cxacru.c
@@ -1130,7 +1130,7 @@ static int cxacru_bind(struct usbatm_data *usbatm_instance,
int ret;
/* instance init */
- instance = kzalloc_obj(*instance, GFP_KERNEL);
+ instance = kzalloc_obj(*instance);
if (!instance)
return -ENOMEM;
diff --git a/drivers/usb/atm/speedtch.c b/drivers/usb/atm/speedtch.c
index d0a2f1361a91..9d28c652bcd8 100644
--- a/drivers/usb/atm/speedtch.c
+++ b/drivers/usb/atm/speedtch.c
@@ -804,7 +804,7 @@ static int speedtch_bind(struct usbatm_data *usbatm,
}
}
- instance = kzalloc_obj(*instance, GFP_KERNEL);
+ instance = kzalloc_obj(*instance);
if (!instance) {
ret = -ENOMEM;
diff --git a/drivers/usb/atm/ueagle-atm.c b/drivers/usb/atm/ueagle-atm.c
index b27a5f8842b6..f3ae72feb5bf 100644
--- a/drivers/usb/atm/ueagle-atm.c
+++ b/drivers/usb/atm/ueagle-atm.c
@@ -2516,7 +2516,7 @@ static int uea_bind(struct usbatm_data *usbatm, struct usb_interface *intf,
return ret;
}
- sc = kzalloc_obj(struct uea_softc, GFP_KERNEL);
+ sc = kzalloc_obj(struct uea_softc);
if (!sc)
return -ENOMEM;
diff --git a/drivers/usb/atm/usbatm.c b/drivers/usb/atm/usbatm.c
index aa4c209cfb91..9600e1ec0993 100644
--- a/drivers/usb/atm/usbatm.c
+++ b/drivers/usb/atm/usbatm.c
@@ -804,7 +804,7 @@ static int usbatm_atm_open(struct atm_vcc *vcc)
goto fail;
}
- new = kzalloc_obj(struct usbatm_vcc_data, GFP_KERNEL);
+ new = kzalloc_obj(struct usbatm_vcc_data);
if (!new) {
ret = -ENOMEM;
goto fail;
diff --git a/drivers/usb/c67x00/c67x00-drv.c b/drivers/usb/c67x00/c67x00-drv.c
index 6b6814c1d557..7ca6682c96c4 100644
--- a/drivers/usb/c67x00/c67x00-drv.c
+++ b/drivers/usb/c67x00/c67x00-drv.c
@@ -121,7 +121,7 @@ static int c67x00_drv_probe(struct platform_device *pdev)
if (!pdata)
return -ENODEV;
- c67x00 = kzalloc_obj(*c67x00, GFP_KERNEL);
+ c67x00 = kzalloc_obj(*c67x00);
if (!c67x00)
return -ENOMEM;
diff --git a/drivers/usb/cdns3/cdns3-gadget.c b/drivers/usb/cdns3/cdns3-gadget.c
index 15b0060ce62d..d59a60a16ec7 100644
--- a/drivers/usb/cdns3/cdns3-gadget.c
+++ b/drivers/usb/cdns3/cdns3-gadget.c
@@ -3287,7 +3287,7 @@ static int cdns3_gadget_start(struct cdns *cdns)
u32 max_speed;
int ret;
- priv_dev = kzalloc_obj(*priv_dev, GFP_KERNEL);
+ priv_dev = kzalloc_obj(*priv_dev);
if (!priv_dev)
return -ENOMEM;
diff --git a/drivers/usb/cdns3/cdns3-pci-wrap.c b/drivers/usb/cdns3/cdns3-pci-wrap.c
index 03c9762ad032..eb5760f75b9d 100644
--- a/drivers/usb/cdns3/cdns3-pci-wrap.c
+++ b/drivers/usb/cdns3/cdns3-pci-wrap.c
@@ -97,7 +97,7 @@ static int cdns3_pci_probe(struct pci_dev *pdev,
if (pci_is_enabled(func)) {
wrap = pci_get_drvdata(func);
} else {
- wrap = kzalloc_obj(*wrap, GFP_KERNEL);
+ wrap = kzalloc_obj(*wrap);
if (!wrap)
return -ENOMEM;
}
diff --git a/drivers/usb/cdns3/cdnsp-gadget.c b/drivers/usb/cdns3/cdnsp-gadget.c
index 475ac61ad4c4..6b3815f8a6e5 100644
--- a/drivers/usb/cdns3/cdnsp-gadget.c
+++ b/drivers/usb/cdns3/cdnsp-gadget.c
@@ -1905,7 +1905,7 @@ static int __cdnsp_gadget_init(struct cdns *cdns)
cdns_drd_gadget_on(cdns);
- pdev = kzalloc_obj(*pdev, GFP_KERNEL);
+ pdev = kzalloc_obj(*pdev);
if (!pdev)
return -ENOMEM;
diff --git a/drivers/usb/cdns3/cdnsp-pci.c b/drivers/usb/cdns3/cdnsp-pci.c
index b6199f98ff77..566d94e49102 100644
--- a/drivers/usb/cdns3/cdnsp-pci.c
+++ b/drivers/usb/cdns3/cdnsp-pci.c
@@ -82,7 +82,7 @@ static int cdnsp_pci_probe(struct pci_dev *pdev,
if (pci_is_enabled(func)) {
cdnsp = pci_get_drvdata(func);
} else {
- cdnsp = kzalloc_obj(*cdnsp, GFP_KERNEL);
+ cdnsp = kzalloc_obj(*cdnsp);
if (!cdnsp) {
ret = -ENOMEM;
goto put_pci;
diff --git a/drivers/usb/class/cdc-acm.c b/drivers/usb/class/cdc-acm.c
index 8816c6eaba1d..ad38c746270a 100644
--- a/drivers/usb/class/cdc-acm.c
+++ b/drivers/usb/class/cdc-acm.c
@@ -1350,7 +1350,7 @@ static int acm_probe(struct usb_interface *intf,
made_compressed_probe:
dev_dbg(&intf->dev, "interfaces are valid\n");
- acm = kzalloc_obj(struct acm, GFP_KERNEL);
+ acm = kzalloc_obj(struct acm);
if (!acm)
return -ENOMEM;
diff --git a/drivers/usb/class/cdc-wdm.c b/drivers/usb/class/cdc-wdm.c
index 28fc93e0c01d..f2d94cfc70af 100644
--- a/drivers/usb/class/cdc-wdm.c
+++ b/drivers/usb/class/cdc-wdm.c
@@ -1027,7 +1027,7 @@ static int wdm_create(struct usb_interface *intf, struct usb_endpoint_descriptor
int rv = -ENOMEM;
struct wdm_device *desc;
- desc = kzalloc_obj(struct wdm_device, GFP_KERNEL);
+ desc = kzalloc_obj(struct wdm_device);
if (!desc)
goto out;
INIT_LIST_HEAD(&desc->device_list);
@@ -1050,10 +1050,10 @@ static int wdm_create(struct usb_interface *intf, struct usb_endpoint_descriptor
desc->wMaxPacketSize = usb_endpoint_maxp(ep);
- desc->orq = kmalloc_obj(struct usb_ctrlrequest, GFP_KERNEL);
+ desc->orq = kmalloc_obj(struct usb_ctrlrequest);
if (!desc->orq)
goto err;
- desc->irq = kmalloc_obj(struct usb_ctrlrequest, GFP_KERNEL);
+ desc->irq = kmalloc_obj(struct usb_ctrlrequest);
if (!desc->irq)
goto err;
diff --git a/drivers/usb/class/usblp.c b/drivers/usb/class/usblp.c
index 653583dc7a8d..669b9e6879bf 100644
--- a/drivers/usb/class/usblp.c
+++ b/drivers/usb/class/usblp.c
@@ -1142,7 +1142,7 @@ static int usblp_probe(struct usb_interface *intf,
/* Malloc and start initializing usblp structure so we can use it
* directly. */
- usblp = kzalloc_obj(struct usblp, GFP_KERNEL);
+ usblp = kzalloc_obj(struct usblp);
if (!usblp) {
retval = -ENOMEM;
goto abort_ret;
diff --git a/drivers/usb/class/usbtmc.c b/drivers/usb/class/usbtmc.c
index 20bc86367660..2526a0e03cde 100644
--- a/drivers/usb/class/usbtmc.c
+++ b/drivers/usb/class/usbtmc.c
@@ -172,7 +172,7 @@ static int usbtmc_open(struct inode *inode, struct file *filp)
return -ENODEV;
}
- file_data = kzalloc_obj(*file_data, GFP_KERNEL);
+ file_data = kzalloc_obj(*file_data);
if (!file_data)
return -ENOMEM;
@@ -2378,7 +2378,7 @@ static int usbtmc_probe(struct usb_interface *intf,
dev_dbg(&intf->dev, "%s called\n", __func__);
- data = kzalloc_obj(*data, GFP_KERNEL);
+ data = kzalloc_obj(*data);
if (!data)
return -ENOMEM;
diff --git a/drivers/usb/common/ulpi.c b/drivers/usb/common/ulpi.c
index 2f414b7c3e2c..56c9bfaf2ea3 100644
--- a/drivers/usb/common/ulpi.c
+++ b/drivers/usb/common/ulpi.c
@@ -324,7 +324,7 @@ struct ulpi *ulpi_register_interface(struct device *dev,
struct ulpi *ulpi;
int ret;
- ulpi = kzalloc_obj(*ulpi, GFP_KERNEL);
+ ulpi = kzalloc_obj(*ulpi);
if (!ulpi)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/usb/core/config.c b/drivers/usb/core/config.c
index 129cbfd74f26..8e88ae8d0e71 100644
--- a/drivers/usb/core/config.c
+++ b/drivers/usb/core/config.c
@@ -1045,7 +1045,7 @@ int usb_get_bos_descriptor(struct usb_device *dev)
return -ENOMSG;
}
- bos = kzalloc_obj(*bos, GFP_KERNEL);
+ bos = kzalloc_obj(*bos);
if (!bos)
return -ENOMEM;
@@ -1066,7 +1066,7 @@ int usb_get_bos_descriptor(struct usb_device *dev)
if (total_len < length)
return -EINVAL;
- dev->bos = kzalloc_obj(*dev->bos, GFP_KERNEL);
+ dev->bos = kzalloc_obj(*dev->bos);
if (!dev->bos)
return -ENOMEM;
diff --git a/drivers/usb/core/devio.c b/drivers/usb/core/devio.c
index d7ac181454f9..e191934623c7 100644
--- a/drivers/usb/core/devio.c
+++ b/drivers/usb/core/devio.c
@@ -245,7 +245,7 @@ static int usbdev_mmap(struct file *file, struct vm_area_struct *vma)
if (ret)
goto error;
- usbm = kzalloc_obj(struct usb_memory, GFP_KERNEL);
+ usbm = kzalloc_obj(struct usb_memory);
if (!usbm) {
ret = -ENOMEM;
goto error_decrease_mem;
@@ -402,7 +402,7 @@ static struct async *alloc_async(unsigned int numisoframes)
{
struct async *as;
- as = kzalloc_obj(struct async, GFP_KERNEL);
+ as = kzalloc_obj(struct async);
if (!as)
return NULL;
as->urb = usb_alloc_urb(numisoframes, GFP_KERNEL);
@@ -970,7 +970,7 @@ static int parse_usbdevfs_streams(struct usb_dev_state *ps,
if (num_streams_ret && (num_streams < 2 || num_streams > 65536))
return -EINVAL;
- eps = kmalloc_objs(*eps, num_eps, GFP_KERNEL);
+ eps = kmalloc_objs(*eps, num_eps);
if (!eps)
return -ENOMEM;
@@ -1039,7 +1039,7 @@ static int usbdev_open(struct inode *inode, struct file *file)
int ret;
ret = -ENOMEM;
- ps = kzalloc_obj(struct usb_dev_state, GFP_KERNEL);
+ ps = kzalloc_obj(struct usb_dev_state);
if (!ps)
goto out_free_ps;
@@ -1670,7 +1670,7 @@ static int proc_do_submiturb(struct usb_dev_state *ps, struct usbdevfs_urb *uurb
/* min 8 byte setup packet */
if (uurb->buffer_length < 8)
return -EINVAL;
- dr = kmalloc_obj(struct usb_ctrlrequest, GFP_KERNEL);
+ dr = kmalloc_obj(struct usb_ctrlrequest);
if (!dr)
return -ENOMEM;
if (copy_from_user(dr, uurb->buffer, 8)) {
diff --git a/drivers/usb/core/driver.c b/drivers/usb/core/driver.c
index db67874879d8..2574e65bc640 100644
--- a/drivers/usb/core/driver.c
+++ b/drivers/usb/core/driver.c
@@ -57,7 +57,7 @@ ssize_t usb_store_new_id(struct usb_dynids *dynids,
if (fields < 2)
return -EINVAL;
- dynid = kzalloc_obj(*dynid, GFP_KERNEL);
+ dynid = kzalloc_obj(*dynid);
if (!dynid)
return -ENOMEM;
diff --git a/drivers/usb/core/endpoint.c b/drivers/usb/core/endpoint.c
index f44f0fffeb41..4137ab47f1cd 100644
--- a/drivers/usb/core/endpoint.c
+++ b/drivers/usb/core/endpoint.c
@@ -154,7 +154,7 @@ int usb_create_ep_devs(struct device *parent,
struct ep_device *ep_dev;
int retval;
- ep_dev = kzalloc_obj(*ep_dev, GFP_KERNEL);
+ ep_dev = kzalloc_obj(*ep_dev);
if (!ep_dev) {
retval = -ENOMEM;
goto exit;
diff --git a/drivers/usb/core/hcd.c b/drivers/usb/core/hcd.c
index f1b2b0e4c437..c0e2fa2bd282 100644
--- a/drivers/usb/core/hcd.c
+++ b/drivers/usb/core/hcd.c
@@ -2193,7 +2193,7 @@ int ehset_single_step_set_feature(struct usb_hcd *hcd, int port)
if (!buf)
return -ENOMEM;
- dr = kmalloc_obj(struct usb_ctrlrequest, GFP_KERNEL);
+ dr = kmalloc_obj(struct usb_ctrlrequest);
if (!dr) {
kfree(buf);
return -ENOMEM;
diff --git a/drivers/usb/core/hub.c b/drivers/usb/core/hub.c
index 22a54c632c26..24960ba9caa9 100644
--- a/drivers/usb/core/hub.c
+++ b/drivers/usb/core/hub.c
@@ -1461,20 +1461,20 @@ static int hub_configure(struct usb_hub *hub,
unsigned full_load;
unsigned maxchild;
- hub->buffer = kmalloc_obj(*hub->buffer, GFP_KERNEL);
+ hub->buffer = kmalloc_obj(*hub->buffer);
if (!hub->buffer) {
ret = -ENOMEM;
goto fail;
}
- hub->status = kmalloc_obj(*hub->status, GFP_KERNEL);
+ hub->status = kmalloc_obj(*hub->status);
if (!hub->status) {
ret = -ENOMEM;
goto fail;
}
mutex_init(&hub->status_mutex);
- hub->descriptor = kzalloc_obj(*hub->descriptor, GFP_KERNEL);
+ hub->descriptor = kzalloc_obj(*hub->descriptor);
if (!hub->descriptor) {
ret = -ENOMEM;
goto fail;
@@ -1522,7 +1522,7 @@ static int hub_configure(struct usb_hub *hub,
dev_info(hub_dev, "%d port%s detected\n", maxchild,
str_plural(maxchild));
- hub->ports = kzalloc_objs(struct usb_port *, maxchild, GFP_KERNEL);
+ hub->ports = kzalloc_objs(struct usb_port *, maxchild);
if (!hub->ports) {
ret = -ENOMEM;
goto fail;
@@ -1958,7 +1958,7 @@ static int hub_probe(struct usb_interface *intf, const struct usb_device_id *id)
/* We found a hub */
dev_info(&intf->dev, "USB hub found\n");
- hub = kzalloc_obj(*hub, GFP_KERNEL);
+ hub = kzalloc_obj(*hub);
if (!hub)
return -ENOMEM;
@@ -5236,7 +5236,7 @@ check_highspeed(struct usb_hub *hub, struct usb_device *udev, int port1)
if (udev->quirks & USB_QUIRK_DEVICE_QUALIFIER)
return;
- qual = kmalloc_obj(*qual, GFP_KERNEL);
+ qual = kmalloc_obj(*qual);
if (qual == NULL)
return;
diff --git a/drivers/usb/core/ledtrig-usbport.c b/drivers/usb/core/ledtrig-usbport.c
index e7de8864a527..8881644777a7 100644
--- a/drivers/usb/core/ledtrig-usbport.c
+++ b/drivers/usb/core/ledtrig-usbport.c
@@ -190,7 +190,7 @@ static int usbport_trig_add_port(struct usbport_trig_data *usbport_data,
size_t len;
int err;
- port = kzalloc_obj(*port, GFP_KERNEL);
+ port = kzalloc_obj(*port);
if (!port) {
err = -ENOMEM;
goto err_out;
@@ -305,7 +305,7 @@ static int usbport_trig_activate(struct led_classdev *led_cdev)
struct usbport_trig_data *usbport_data;
int err;
- usbport_data = kzalloc_obj(*usbport_data, GFP_KERNEL);
+ usbport_data = kzalloc_obj(*usbport_data);
if (!usbport_data)
return -ENOMEM;
usbport_data->led_cdev = led_cdev;
diff --git a/drivers/usb/core/message.c b/drivers/usb/core/message.c
index d8f50d468794..ea970ddf8879 100644
--- a/drivers/usb/core/message.c
+++ b/drivers/usb/core/message.c
@@ -2287,7 +2287,7 @@ int usb_driver_set_configuration(struct usb_device *udev, int config)
{
struct set_config_request *req;
- req = kmalloc_obj(*req, GFP_KERNEL);
+ req = kmalloc_obj(*req);
if (!req)
return -ENOMEM;
req->udev = udev;
diff --git a/drivers/usb/core/port.c b/drivers/usb/core/port.c
index 36096973eb59..44e38f922bc5 100644
--- a/drivers/usb/core/port.c
+++ b/drivers/usb/core/port.c
@@ -739,11 +739,11 @@ int usb_hub_create_port_device(struct usb_hub *hub, int port1)
struct usb_device *hdev = hub->hdev;
int retval;
- port_dev = kzalloc_obj(*port_dev, GFP_KERNEL);
+ port_dev = kzalloc_obj(*port_dev);
if (!port_dev)
return -ENOMEM;
- port_dev->req = kzalloc_obj(*(port_dev->req), GFP_KERNEL);
+ port_dev->req = kzalloc_obj(*(port_dev->req));
if (!port_dev->req) {
kfree(port_dev);
return -ENOMEM;
diff --git a/drivers/usb/core/quirks.c b/drivers/usb/core/quirks.c
index 135a89ab2bfa..9e7e49712739 100644
--- a/drivers/usb/core/quirks.c
+++ b/drivers/usb/core/quirks.c
@@ -61,7 +61,7 @@ static int quirks_param_set(const char *value, const struct kernel_param *kp)
quirk_list = NULL;
}
- quirk_list = kzalloc_objs(struct quirk_entry, quirk_count, GFP_KERNEL);
+ quirk_list = kzalloc_objs(struct quirk_entry, quirk_count);
if (!quirk_list) {
quirk_count = 0;
mutex_unlock(&quirk_mutex);
diff --git a/drivers/usb/core/usb.c b/drivers/usb/core/usb.c
index cfb882b86981..e9a10a33534c 100644
--- a/drivers/usb/core/usb.c
+++ b/drivers/usb/core/usb.c
@@ -648,7 +648,7 @@ struct usb_device *usb_alloc_dev(struct usb_device *parent,
struct usb_hcd *usb_hcd = bus_to_hcd(bus);
unsigned raw_port = port1;
- dev = kzalloc_obj(*dev, GFP_KERNEL);
+ dev = kzalloc_obj(*dev);
if (!dev)
return NULL;
diff --git a/drivers/usb/dwc2/hcd.c b/drivers/usb/dwc2/hcd.c
index 55809a83f8f8..1a763ad4f721 100644
--- a/drivers/usb/dwc2/hcd.c
+++ b/drivers/usb/dwc2/hcd.c
@@ -5218,7 +5218,7 @@ int dwc2_hcd_init(struct dwc2_hsotg *hsotg)
memset(&hsotg->hc_ptr_array[0], 0, sizeof(hsotg->hc_ptr_array));
for (i = 0; i < num_channels; i++) {
- channel = kzalloc_obj(*channel, GFP_KERNEL);
+ channel = kzalloc_obj(*channel);
if (!channel)
goto error3;
channel->hc_num = i;
diff --git a/drivers/usb/dwc3/debugfs.c b/drivers/usb/dwc3/debugfs.c
index a005865862c8..65d909e4b785 100644
--- a/drivers/usb/dwc3/debugfs.c
+++ b/drivers/usb/dwc3/debugfs.c
@@ -1003,7 +1003,7 @@ void dwc3_debugfs_init(struct dwc3 *dwc)
{
struct dentry *root;
- dwc->regset = kzalloc_obj(*dwc->regset, GFP_KERNEL);
+ dwc->regset = kzalloc_obj(*dwc->regset);
if (!dwc->regset)
return;
diff --git a/drivers/usb/dwc3/gadget.c b/drivers/usb/dwc3/gadget.c
index 7bd60fc7cd74..0a688904ce8c 100644
--- a/drivers/usb/dwc3/gadget.c
+++ b/drivers/usb/dwc3/gadget.c
@@ -3373,7 +3373,7 @@ static int dwc3_gadget_init_endpoint(struct dwc3 *dwc, u8 epnum)
int ret;
u8 num = epnum >> 1;
- dep = kzalloc_obj(*dep, GFP_KERNEL);
+ dep = kzalloc_obj(*dep);
if (!dep)
return -ENOMEM;
@@ -4728,7 +4728,7 @@ int dwc3_gadget_init(struct dwc3 *dwc)
}
init_completion(&dwc->ep0_in_setup);
- dwc->gadget = kzalloc_obj(struct usb_gadget, GFP_KERNEL);
+ dwc->gadget = kzalloc_obj(struct usb_gadget);
if (!dwc->gadget) {
ret = -ENOMEM;
goto err3;
diff --git a/drivers/usb/fotg210/fotg210-hcd.c b/drivers/usb/fotg210/fotg210-hcd.c
index 65a16d2cdfd7..1a48329a4e08 100644
--- a/drivers/usb/fotg210/fotg210-hcd.c
+++ b/drivers/usb/fotg210/fotg210-hcd.c
@@ -738,7 +738,7 @@ static struct debug_buffer
{
struct debug_buffer *buf;
- buf = kzalloc_obj(struct debug_buffer, GFP_KERNEL);
+ buf = kzalloc_obj(struct debug_buffer);
if (buf) {
buf->bus = bus;
diff --git a/drivers/usb/fotg210/fotg210-udc.c b/drivers/usb/fotg210/fotg210-udc.c
index 79509ec08be9..d9e024873a42 100644
--- a/drivers/usb/fotg210/fotg210-udc.c
+++ b/drivers/usb/fotg210/fotg210-udc.c
@@ -1183,7 +1183,7 @@ int fotg210_udc_probe(struct platform_device *pdev, struct fotg210 *fotg)
return irq;
/* initialize udc */
- fotg210 = kzalloc_obj(struct fotg210_udc, GFP_KERNEL);
+ fotg210 = kzalloc_obj(struct fotg210_udc);
if (fotg210 == NULL)
return -ENOMEM;
@@ -1207,7 +1207,7 @@ int fotg210_udc_probe(struct platform_device *pdev, struct fotg210 *fotg)
ret = -ENOMEM;
for (i = 0; i < FOTG210_MAX_NUM_EP; i++) {
- fotg210->ep[i] = kzalloc_obj(struct fotg210_ep, GFP_KERNEL);
+ fotg210->ep[i] = kzalloc_obj(struct fotg210_ep);
if (!fotg210->ep[i])
goto err_alloc;
}
diff --git a/drivers/usb/gadget/composite.c b/drivers/usb/gadget/composite.c
index aba08d058ff9..a902184bdf82 100644
--- a/drivers/usb/gadget/composite.c
+++ b/drivers/usb/gadget/composite.c
@@ -2531,7 +2531,7 @@ static int composite_bind(struct usb_gadget *gadget,
struct usb_composite_driver *composite = to_cdriver(gdriver);
int status = -ENOMEM;
- cdev = kzalloc_obj(*cdev, GFP_KERNEL);
+ cdev = kzalloc_obj(*cdev);
if (!cdev)
return status;
diff --git a/drivers/usb/gadget/configfs.c b/drivers/usb/gadget/configfs.c
index 5163a994f9e7..06e892beda88 100644
--- a/drivers/usb/gadget/configfs.c
+++ b/drivers/usb/gadget/configfs.c
@@ -727,7 +727,7 @@ static struct config_group *config_desc_make(
if (ret)
return ERR_PTR(ret);
- cfg = kzalloc_obj(*cfg, GFP_KERNEL);
+ cfg = kzalloc_obj(*cfg);
if (!cfg)
return ERR_PTR(-ENOMEM);
cfg->c.label = kstrdup(buf, GFP_KERNEL);
@@ -870,7 +870,7 @@ static struct config_item *gadget_language_string_make(struct config_group *grou
language = to_gadget_language(&group->cg_item);
- string = kzalloc_obj(*string, GFP_KERNEL);
+ string = kzalloc_obj(*string);
if (!string)
return ERR_PTR(-ENOMEM);
@@ -922,7 +922,7 @@ static struct config_group *gadget_language_make(struct config_group *group,
int langs = 0;
int ret;
- new = kzalloc_obj(*new, GFP_KERNEL);
+ new = kzalloc_obj(*new);
if (!new)
return ERR_PTR(-ENOMEM);
@@ -1992,7 +1992,7 @@ static struct config_group *gadgets_make(
{
struct gadget_info *gi;
- gi = kzalloc_obj(*gi, GFP_KERNEL);
+ gi = kzalloc_obj(*gi);
if (!gi)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/usb/gadget/function/f_acm.c b/drivers/usb/gadget/function/f_acm.c
index d34b4710f962..c628d02bfb1d 100644
--- a/drivers/usb/gadget/function/f_acm.c
+++ b/drivers/usb/gadget/function/f_acm.c
@@ -748,7 +748,7 @@ static struct usb_function *acm_alloc_func(struct usb_function_instance *fi)
struct f_serial_opts *opts;
struct f_acm *acm;
- acm = kzalloc_obj(*acm, GFP_KERNEL);
+ acm = kzalloc_obj(*acm);
if (!acm)
return ERR_PTR(-ENOMEM);
@@ -882,7 +882,7 @@ static struct usb_function_instance *acm_alloc_instance(void)
struct f_serial_opts *opts;
int ret;
- opts = kzalloc_obj(*opts, GFP_KERNEL);
+ opts = kzalloc_obj(*opts);
if (!opts)
return ERR_PTR(-ENOMEM);
opts->protocol = USB_CDC_ACM_PROTO_AT_V25TER;
diff --git a/drivers/usb/gadget/function/f_ecm.c b/drivers/usb/gadget/function/f_ecm.c
index aa91d705bc8d..e0c02121374e 100644
--- a/drivers/usb/gadget/function/f_ecm.c
+++ b/drivers/usb/gadget/function/f_ecm.c
@@ -847,7 +847,7 @@ static struct usb_function_instance *ecm_alloc_inst(void)
{
struct f_ecm_opts *opts;
- opts = kzalloc_obj(*opts, GFP_KERNEL);
+ opts = kzalloc_obj(*opts);
if (!opts)
return ERR_PTR(-ENOMEM);
mutex_init(&opts->lock);
@@ -927,7 +927,7 @@ static struct usb_function *ecm_alloc(struct usb_function_instance *fi)
int status;
/* allocate and initialize one new instance */
- ecm = kzalloc_obj(*ecm, GFP_KERNEL);
+ ecm = kzalloc_obj(*ecm);
if (!ecm)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/usb/gadget/function/f_eem.c b/drivers/usb/gadget/function/f_eem.c
index acdd6c637c7b..0142a0e487ee 100644
--- a/drivers/usb/gadget/function/f_eem.c
+++ b/drivers/usb/gadget/function/f_eem.c
@@ -462,7 +462,7 @@ static int eem_unwrap(struct gether *port,
goto next;
}
- ctx = kmalloc_obj(*ctx, GFP_KERNEL);
+ ctx = kmalloc_obj(*ctx);
if (!ctx) {
kfree(req->buf);
usb_ep_free_request(ep, req);
@@ -608,7 +608,7 @@ static struct usb_function_instance *eem_alloc_inst(void)
{
struct f_eem_opts *opts;
- opts = kzalloc_obj(*opts, GFP_KERNEL);
+ opts = kzalloc_obj(*opts);
if (!opts)
return ERR_PTR(-ENOMEM);
mutex_init(&opts->lock);
@@ -651,7 +651,7 @@ static struct usb_function *eem_alloc(struct usb_function_instance *fi)
struct f_eem_opts *opts;
/* allocate and initialize one new instance */
- eem = kzalloc_obj(*eem, GFP_KERNEL);
+ eem = kzalloc_obj(*eem);
if (!eem)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/usb/gadget/function/f_fs.c b/drivers/usb/gadget/function/f_fs.c
index 84cfa7a8437a..480d73c220a8 100644
--- a/drivers/usb/gadget/function/f_fs.c
+++ b/drivers/usb/gadget/function/f_fs.c
@@ -814,7 +814,7 @@ static void *ffs_build_sg_list(struct sg_table *sgt, size_t sz)
return NULL;
n_pages = PAGE_ALIGN(sz) >> PAGE_SHIFT;
- pages = kvmalloc_objs(struct page *, n_pages, GFP_KERNEL);
+ pages = kvmalloc_objs(struct page *, n_pages);
if (!pages) {
vfree(vaddr);
@@ -1245,7 +1245,7 @@ static ssize_t ffs_epfile_write_iter(struct kiocb *kiocb, struct iov_iter *from)
ssize_t res;
if (!is_sync_kiocb(kiocb)) {
- p = kzalloc_obj(io_data, GFP_KERNEL);
+ p = kzalloc_obj(io_data);
if (!p)
return -ENOMEM;
p->aio = true;
@@ -1280,7 +1280,7 @@ static ssize_t ffs_epfile_read_iter(struct kiocb *kiocb, struct iov_iter *to)
ssize_t res;
if (!is_sync_kiocb(kiocb)) {
- p = kzalloc_obj(io_data, GFP_KERNEL);
+ p = kzalloc_obj(io_data);
if (!p)
return -ENOMEM;
p->aio = true;
@@ -1503,7 +1503,7 @@ static int ffs_dmabuf_attach(struct file *file, int fd)
goto err_dmabuf_put;
}
- priv = kzalloc_obj(*priv, GFP_KERNEL);
+ priv = kzalloc_obj(*priv);
if (!priv) {
err = -ENOMEM;
goto err_dmabuf_detach;
@@ -1652,7 +1652,7 @@ static int ffs_dmabuf_transfer(struct file *file,
if (ret)
goto err_resv_unlock;
- fence = kmalloc_obj(*fence, GFP_KERNEL);
+ fence = kmalloc_obj(*fence);
if (!fence) {
ret = -ENOMEM;
goto err_resv_unlock;
@@ -2067,7 +2067,7 @@ static int ffs_fs_init_fs_context(struct fs_context *fc)
{
struct ffs_sb_fill_data *ctx;
- ctx = kzalloc_obj(struct ffs_sb_fill_data, GFP_KERNEL);
+ ctx = kzalloc_obj(struct ffs_sb_fill_data);
if (!ctx)
return -ENOMEM;
@@ -2183,7 +2183,7 @@ static void ffs_data_closed(struct ffs_data *ffs)
static struct ffs_data *ffs_data_new(const char *dev_name)
{
- struct ffs_data *ffs = kzalloc_obj(*ffs, GFP_KERNEL);
+ struct ffs_data *ffs = kzalloc_obj(*ffs);
if (!ffs)
return NULL;
@@ -2330,7 +2330,7 @@ static int ffs_epfiles_create(struct ffs_data *ffs)
int err;
count = ffs->eps_count;
- epfiles = kzalloc_objs(*epfiles, count, GFP_KERNEL);
+ epfiles = kzalloc_objs(*epfiles, count);
if (!epfiles)
return -ENOMEM;
@@ -4031,7 +4031,7 @@ static struct usb_function_instance *ffs_alloc_inst(void)
struct f_fs_opts *opts;
struct ffs_dev *dev;
- opts = kzalloc_obj(*opts, GFP_KERNEL);
+ opts = kzalloc_obj(*opts);
if (!opts)
return ERR_PTR(-ENOMEM);
@@ -4107,7 +4107,7 @@ static struct usb_function *ffs_alloc(struct usb_function_instance *fi)
{
struct ffs_function *func;
- func = kzalloc_obj(*func, GFP_KERNEL);
+ func = kzalloc_obj(*func);
if (!func)
return ERR_PTR(-ENOMEM);
@@ -4138,7 +4138,7 @@ static struct ffs_dev *_ffs_alloc_dev(void)
if (_ffs_get_single_dev())
return ERR_PTR(-EBUSY);
- dev = kzalloc_obj(*dev, GFP_KERNEL);
+ dev = kzalloc_obj(*dev);
if (!dev)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/usb/gadget/function/f_hid.c b/drivers/usb/gadget/function/f_hid.c
index 93dd678cafe1..8c855c00b887 100644
--- a/drivers/usb/gadget/function/f_hid.c
+++ b/drivers/usb/gadget/function/f_hid.c
@@ -650,7 +650,7 @@ static int f_hidg_get_report(struct file *file, struct usb_hidg_report __user *b
struct report_entry *ptr;
__u8 report_id;
- entry = kmalloc_obj(*entry, GFP_KERNEL);
+ entry = kmalloc_obj(*entry);
if (!entry)
return -ENOMEM;
@@ -1530,7 +1530,7 @@ static struct usb_function_instance *hidg_alloc_inst(void)
struct usb_function_instance *ret;
int status = 0;
- opts = kzalloc_obj(*opts, GFP_KERNEL);
+ opts = kzalloc_obj(*opts);
if (!opts)
return ERR_PTR(-ENOMEM);
mutex_init(&opts->lock);
@@ -1596,7 +1596,7 @@ static struct usb_function *hidg_alloc(struct usb_function_instance *fi)
int ret;
/* allocate and initialize one new instance */
- hidg = kzalloc_obj(*hidg, GFP_KERNEL);
+ hidg = kzalloc_obj(*hidg);
if (!hidg)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/usb/gadget/function/f_loopback.c b/drivers/usb/gadget/function/f_loopback.c
index b8fa60af9385..d2d07fb49e70 100644
--- a/drivers/usb/gadget/function/f_loopback.c
+++ b/drivers/usb/gadget/function/f_loopback.c
@@ -425,7 +425,7 @@ static struct usb_function *loopback_alloc(struct usb_function_instance *fi)
struct f_loopback *loop;
struct f_lb_opts *lb_opts;
- loop = kzalloc_obj(*loop, GFP_KERNEL);
+ loop = kzalloc_obj(*loop);
if (!loop)
return ERR_PTR(-ENOMEM);
@@ -568,7 +568,7 @@ static struct usb_function_instance *loopback_alloc_instance(void)
{
struct f_lb_opts *lb_opts;
- lb_opts = kzalloc_obj(*lb_opts, GFP_KERNEL);
+ lb_opts = kzalloc_obj(*lb_opts);
if (!lb_opts)
return ERR_PTR(-ENOMEM);
mutex_init(&lb_opts->lock);
diff --git a/drivers/usb/gadget/function/f_mass_storage.c b/drivers/usb/gadget/function/f_mass_storage.c
index c894ede6bcd2..6af96e2b44eb 100644
--- a/drivers/usb/gadget/function/f_mass_storage.c
+++ b/drivers/usb/gadget/function/f_mass_storage.c
@@ -2699,7 +2699,7 @@ static void fsg_lun_release(struct device *dev)
static struct fsg_common *fsg_common_setup(struct fsg_common *common)
{
if (!common) {
- common = kzalloc_obj(*common, GFP_KERNEL);
+ common = kzalloc_obj(*common);
if (!common)
return ERR_PTR(-ENOMEM);
common->free_storage_on_release = 1;
@@ -2740,7 +2740,7 @@ int fsg_common_set_num_buffers(struct fsg_common *common, unsigned int n)
struct fsg_buffhd *bh, *buffhds;
int i;
- buffhds = kzalloc_objs(*buffhds, n, GFP_KERNEL);
+ buffhds = kzalloc_objs(*buffhds, n);
if (!buffhds)
return -ENOMEM;
@@ -2887,7 +2887,7 @@ int fsg_common_create_lun(struct fsg_common *common, struct fsg_lun_config *cfg,
return -EINVAL;
}
- lun = kzalloc_obj(*lun, GFP_KERNEL);
+ lun = kzalloc_obj(*lun);
if (!lun)
return -ENOMEM;
@@ -3311,7 +3311,7 @@ static struct config_group *fsg_lun_make(struct config_group *group,
goto out;
}
- opts = kzalloc_obj(*opts, GFP_KERNEL);
+ opts = kzalloc_obj(*opts);
if (!opts) {
ret = -ENOMEM;
goto out;
@@ -3489,7 +3489,7 @@ static struct usb_function_instance *fsg_alloc_inst(void)
struct fsg_lun_config config;
int rc;
- opts = kzalloc_obj(*opts, GFP_KERNEL);
+ opts = kzalloc_obj(*opts);
if (!opts)
return ERR_PTR(-ENOMEM);
mutex_init(&opts->lock);
@@ -3554,7 +3554,7 @@ static struct usb_function *fsg_alloc(struct usb_function_instance *fi)
struct fsg_common *common = opts->common;
struct fsg_dev *fsg;
- fsg = kzalloc_obj(*fsg, GFP_KERNEL);
+ fsg = kzalloc_obj(*fsg);
if (unlikely(!fsg))
return ERR_PTR(-ENOMEM);
diff --git a/drivers/usb/gadget/function/f_midi.c b/drivers/usb/gadget/function/f_midi.c
index d98f946b1621..2a81ae9e6cf2 100644
--- a/drivers/usb/gadget/function/f_midi.c
+++ b/drivers/usb/gadget/function/f_midi.c
@@ -1279,7 +1279,7 @@ static struct usb_function_instance *f_midi_alloc_inst(void)
{
struct f_midi_opts *opts;
- opts = kzalloc_obj(*opts, GFP_KERNEL);
+ opts = kzalloc_obj(*opts);
if (!opts)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/usb/gadget/function/f_midi2.c b/drivers/usb/gadget/function/f_midi2.c
index 1a4feca1f083..61ce54c3392b 100644
--- a/drivers/usb/gadget/function/f_midi2.c
+++ b/drivers/usb/gadget/function/f_midi2.c
@@ -2340,7 +2340,7 @@ static int f_midi2_block_opts_create(struct f_midi2_ep_opts *ep_opts,
goto out;
}
- block_opts = kzalloc_obj(*block_opts, GFP_KERNEL);
+ block_opts = kzalloc_obj(*block_opts);
if (!block_opts) {
ret = -ENOMEM;
goto out;
@@ -2502,7 +2502,7 @@ static int f_midi2_ep_opts_create(struct f_midi2_opts *opts,
{
struct f_midi2_ep_opts *ep_opts;
- ep_opts = kzalloc_obj(*ep_opts, GFP_KERNEL);
+ ep_opts = kzalloc_obj(*ep_opts);
if (!ep_opts)
return -ENOMEM;
@@ -2652,7 +2652,7 @@ static struct usb_function_instance *f_midi2_alloc_inst(void)
struct f_midi2_block_opts *block_opts;
int ret;
- opts = kzalloc_obj(*opts, GFP_KERNEL);
+ opts = kzalloc_obj(*opts);
if (!opts)
return ERR_PTR(-ENOMEM);
@@ -2813,7 +2813,7 @@ static struct usb_function *f_midi2_alloc(struct usb_function_instance *fi)
struct f_midi2_block *bp;
int i, num_eps, blk;
- midi2 = kzalloc_obj(*midi2, GFP_KERNEL);
+ midi2 = kzalloc_obj(*midi2);
if (!midi2)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/usb/gadget/function/f_ncm.c b/drivers/usb/gadget/function/f_ncm.c
index 6bbdb10ce3ca..14fc7dce6f39 100644
--- a/drivers/usb/gadget/function/f_ncm.c
+++ b/drivers/usb/gadget/function/f_ncm.c
@@ -1683,7 +1683,7 @@ static struct usb_function_instance *ncm_alloc_inst(void)
char *names[1];
struct config_group *ncm_interf_group;
- struct f_ncm_opts *opts __free(kfree) = kzalloc_obj(*opts, GFP_KERNEL);
+ struct f_ncm_opts *opts __free(kfree) = kzalloc_obj(*opts);
if (!opts)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/usb/gadget/function/f_obex.c b/drivers/usb/gadget/function/f_obex.c
index e9e9fd70c243..715bb0decd3b 100644
--- a/drivers/usb/gadget/function/f_obex.c
+++ b/drivers/usb/gadget/function/f_obex.c
@@ -426,7 +426,7 @@ static struct usb_function_instance *obex_alloc_inst(void)
struct f_serial_opts *opts;
int ret;
- opts = kzalloc_obj(*opts, GFP_KERNEL);
+ opts = kzalloc_obj(*opts);
if (!opts)
return ERR_PTR(-ENOMEM);
@@ -461,7 +461,7 @@ static struct usb_function *obex_alloc(struct usb_function_instance *fi)
struct f_serial_opts *opts;
/* allocate and initialize one new instance */
- obex = kzalloc_obj(*obex, GFP_KERNEL);
+ obex = kzalloc_obj(*obex);
if (!obex)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/usb/gadget/function/f_phonet.c b/drivers/usb/gadget/function/f_phonet.c
index b427dcae456c..aea572505ad2 100644
--- a/drivers/usb/gadget/function/f_phonet.c
+++ b/drivers/usb/gadget/function/f_phonet.c
@@ -623,7 +623,7 @@ static struct usb_function_instance *phonet_alloc_inst(void)
{
struct f_phonet_opts *opts;
- opts = kzalloc_obj(*opts, GFP_KERNEL);
+ opts = kzalloc_obj(*opts);
if (!opts)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/usb/gadget/function/f_printer.c b/drivers/usb/gadget/function/f_printer.c
index d0e6435ac7a6..e4f7828ae75d 100644
--- a/drivers/usb/gadget/function/f_printer.c
+++ b/drivers/usb/gadget/function/f_printer.c
@@ -1374,7 +1374,7 @@ static struct usb_function_instance *gprinter_alloc_inst(void)
struct usb_function_instance *ret;
int status = 0;
- opts = kzalloc_obj(*opts, GFP_KERNEL);
+ opts = kzalloc_obj(*opts);
if (!opts)
return ERR_PTR(-ENOMEM);
@@ -1482,7 +1482,7 @@ static struct usb_function *gprinter_alloc(struct usb_function_instance *fi)
return ERR_PTR(-ENOENT);
}
- dev = kzalloc_obj(*dev, GFP_KERNEL);
+ dev = kzalloc_obj(*dev);
if (!dev) {
mutex_unlock(&opts->lock);
return ERR_PTR(-ENOMEM);
diff --git a/drivers/usb/gadget/function/f_rndis.c b/drivers/usb/gadget/function/f_rndis.c
index 39a87458bab4..8b11d8d6d89c 100644
--- a/drivers/usb/gadget/function/f_rndis.c
+++ b/drivers/usb/gadget/function/f_rndis.c
@@ -673,7 +673,7 @@ rndis_bind(struct usb_configuration *c, struct usb_function *f)
rndis_opts = container_of(f->fi, struct f_rndis_opts, func_inst);
if (cdev->use_os_string) {
- os_desc_table = kzalloc_obj(*os_desc_table, GFP_KERNEL);
+ os_desc_table = kzalloc_obj(*os_desc_table);
if (!os_desc_table)
return -ENOMEM;
}
@@ -888,7 +888,7 @@ static struct usb_function_instance *rndis_alloc_inst(void)
char *names[1];
struct config_group *rndis_interf_group;
- opts = kzalloc_obj(*opts, GFP_KERNEL);
+ opts = kzalloc_obj(*opts);
if (!opts)
return ERR_PTR(-ENOMEM);
opts->rndis_os_desc.ext_compat_id = opts->rndis_ext_compat_id;
@@ -956,7 +956,7 @@ static struct usb_function *rndis_alloc(struct usb_function_instance *fi)
struct rndis_params *params;
/* allocate and initialize one new instance */
- rndis = kzalloc_obj(*rndis, GFP_KERNEL);
+ rndis = kzalloc_obj(*rndis);
if (!rndis)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/usb/gadget/function/f_serial.c b/drivers/usb/gadget/function/f_serial.c
index 01fc06b29ab2..ae8813c67bc7 100644
--- a/drivers/usb/gadget/function/f_serial.c
+++ b/drivers/usb/gadget/function/f_serial.c
@@ -317,7 +317,7 @@ static struct usb_function_instance *gser_alloc_inst(void)
struct f_serial_opts *opts;
int ret;
- opts = kzalloc_obj(*opts, GFP_KERNEL);
+ opts = kzalloc_obj(*opts);
if (!opts)
return ERR_PTR(-ENOMEM);
@@ -376,7 +376,7 @@ static struct usb_function *gser_alloc(struct usb_function_instance *fi)
struct f_serial_opts *opts;
/* allocate and initialize one new instance */
- gser = kzalloc_obj(*gser, GFP_KERNEL);
+ gser = kzalloc_obj(*gser);
if (!gser)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/usb/gadget/function/f_sourcesink.c b/drivers/usb/gadget/function/f_sourcesink.c
index e77e2e83833f..d2b707e41669 100644
--- a/drivers/usb/gadget/function/f_sourcesink.c
+++ b/drivers/usb/gadget/function/f_sourcesink.c
@@ -844,7 +844,7 @@ static struct usb_function *source_sink_alloc_func(
struct f_sourcesink *ss;
struct f_ss_opts *ss_opts;
- ss = kzalloc_obj(*ss, GFP_KERNEL);
+ ss = kzalloc_obj(*ss);
if (!ss)
return ERR_PTR(-ENOMEM);
@@ -1297,7 +1297,7 @@ static struct usb_function_instance *source_sink_alloc_inst(void)
{
struct f_ss_opts *ss_opts;
- ss_opts = kzalloc_obj(*ss_opts, GFP_KERNEL);
+ ss_opts = kzalloc_obj(*ss_opts);
if (!ss_opts)
return ERR_PTR(-ENOMEM);
mutex_init(&ss_opts->lock);
diff --git a/drivers/usb/gadget/function/f_subset.c b/drivers/usb/gadget/function/f_subset.c
index 4913f60db048..076072386e5e 100644
--- a/drivers/usb/gadget/function/f_subset.c
+++ b/drivers/usb/gadget/function/f_subset.c
@@ -428,7 +428,7 @@ static struct usb_function_instance *geth_alloc_inst(void)
{
struct f_gether_opts *opts;
- opts = kzalloc_obj(*opts, GFP_KERNEL);
+ opts = kzalloc_obj(*opts);
if (!opts)
return ERR_PTR(-ENOMEM);
mutex_init(&opts->lock);
@@ -467,7 +467,7 @@ static struct usb_function *geth_alloc(struct usb_function_instance *fi)
int status;
/* allocate and initialize one new instance */
- geth = kzalloc_obj(*geth, GFP_KERNEL);
+ geth = kzalloc_obj(*geth);
if (!geth)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/usb/gadget/function/f_tcm.c b/drivers/usb/gadget/function/f_tcm.c
index 29d6fd6ce935..ec050d8f99f1 100644
--- a/drivers/usb/gadget/function/f_tcm.c
+++ b/drivers/usb/gadget/function/f_tcm.c
@@ -1676,7 +1676,7 @@ static struct se_portal_group *usbg_make_tpg(struct se_wwn *wwn,
goto unlock_dep;
}
- tpg = kzalloc_obj(struct usbg_tpg, GFP_KERNEL);
+ tpg = kzalloc_obj(struct usbg_tpg);
ret = -ENOMEM;
if (!tpg)
goto unref_dep;
@@ -1768,7 +1768,7 @@ static struct se_wwn *usbg_make_tport(
if (!wnn_name)
return ERR_PTR(-EINVAL);
- tport = kzalloc_obj(struct usbg_tport, GFP_KERNEL);
+ tport = kzalloc_obj(struct usbg_tport);
if (!(tport))
return ERR_PTR(-ENOMEM);
@@ -1861,7 +1861,7 @@ static int tcm_usbg_make_nexus(struct usbg_tpg *tpg, char *name)
goto out_unlock;
}
- tv_nexus = kzalloc_obj(*tv_nexus, GFP_KERNEL);
+ tv_nexus = kzalloc_obj(*tv_nexus);
if (!tv_nexus) {
ret = -ENOMEM;
goto out_unlock;
@@ -2535,7 +2535,7 @@ static struct usb_function_instance *tcm_alloc_inst(void)
int i;
- opts = kzalloc_obj(*opts, GFP_KERNEL);
+ opts = kzalloc_obj(*opts);
if (!opts)
return ERR_PTR(-ENOMEM);
@@ -2590,7 +2590,7 @@ static struct usb_function *tcm_alloc(struct usb_function_instance *fi)
return ERR_PTR(-ENODEV);
}
- fu = kzalloc_obj(*fu, GFP_KERNEL);
+ fu = kzalloc_obj(*fu);
if (!fu) {
mutex_unlock(&tpg_instances_lock);
return ERR_PTR(-ENOMEM);
diff --git a/drivers/usb/gadget/function/f_uac1.c b/drivers/usb/gadget/function/f_uac1.c
index 58ada4855de8..85c502e98f57 100644
--- a/drivers/usb/gadget/function/f_uac1.c
+++ b/drivers/usb/gadget/function/f_uac1.c
@@ -1748,7 +1748,7 @@ static struct usb_function_instance *f_audio_alloc_inst(void)
{
struct f_uac1_opts *opts;
- opts = kzalloc_obj(*opts, GFP_KERNEL);
+ opts = kzalloc_obj(*opts);
if (!opts)
return ERR_PTR(-ENOMEM);
@@ -1831,7 +1831,7 @@ static struct usb_function *f_audio_alloc(struct usb_function_instance *fi)
struct f_uac1_opts *opts;
/* allocate and initialize one new instance */
- uac1 = kzalloc_obj(*uac1, GFP_KERNEL);
+ uac1 = kzalloc_obj(*uac1);
if (!uac1)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/usb/gadget/function/f_uac1_legacy.c b/drivers/usb/gadget/function/f_uac1_legacy.c
index ed7e1f061784..a0c953a99727 100644
--- a/drivers/usb/gadget/function/f_uac1_legacy.c
+++ b/drivers/usb/gadget/function/f_uac1_legacy.c
@@ -942,7 +942,7 @@ static struct usb_function_instance *f_audio_alloc_inst(void)
{
struct f_uac1_legacy_opts *opts;
- opts = kzalloc_obj(*opts, GFP_KERNEL);
+ opts = kzalloc_obj(*opts);
if (!opts)
return ERR_PTR(-ENOMEM);
@@ -985,7 +985,7 @@ static struct usb_function *f_audio_alloc(struct usb_function_instance *fi)
struct f_uac1_legacy_opts *opts;
/* allocate and initialize one new instance */
- audio = kzalloc_obj(*audio, GFP_KERNEL);
+ audio = kzalloc_obj(*audio);
if (!audio)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/usb/gadget/function/f_uac2.c b/drivers/usb/gadget/function/f_uac2.c
index c66908bbe714..897787d0803c 100644
--- a/drivers/usb/gadget/function/f_uac2.c
+++ b/drivers/usb/gadget/function/f_uac2.c
@@ -2189,7 +2189,7 @@ static struct usb_function_instance *afunc_alloc_inst(void)
{
struct f_uac2_opts *opts;
- opts = kzalloc_obj(*opts, GFP_KERNEL);
+ opts = kzalloc_obj(*opts);
if (!opts)
return ERR_PTR(-ENOMEM);
@@ -2278,7 +2278,7 @@ static struct usb_function *afunc_alloc(struct usb_function_instance *fi)
struct f_uac2 *uac2;
struct f_uac2_opts *opts;
- uac2 = kzalloc_obj(*uac2, GFP_KERNEL);
+ uac2 = kzalloc_obj(*uac2);
if (uac2 == NULL)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/usb/gadget/function/f_uvc.c b/drivers/usb/gadget/function/f_uvc.c
index 4b9846ab99f2..494fdbc4e85b 100644
--- a/drivers/usb/gadget/function/f_uvc.c
+++ b/drivers/usb/gadget/function/f_uvc.c
@@ -887,7 +887,7 @@ static struct usb_function_instance *uvc_alloc_inst(void)
struct uvc_descriptor_header **ctl_cls;
int ret;
- opts = kzalloc_obj(*opts, GFP_KERNEL);
+ opts = kzalloc_obj(*opts);
if (!opts)
return ERR_PTR(-ENOMEM);
opts->func_inst.free_func_inst = uvc_free_inst;
@@ -1042,7 +1042,7 @@ static struct usb_function *uvc_alloc(struct usb_function_instance *fi)
struct uvc_descriptor_header **strm_cls;
struct config_item *streaming, *header, *h;
- uvc = kzalloc_obj(*uvc, GFP_KERNEL);
+ uvc = kzalloc_obj(*uvc);
if (uvc == NULL)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/usb/gadget/function/rndis.c b/drivers/usb/gadget/function/rndis.c
index 1e168666a3f5..3da54a7d7aba 100644
--- a/drivers/usb/gadget/function/rndis.c
+++ b/drivers/usb/gadget/function/rndis.c
@@ -892,7 +892,7 @@ struct rndis_params *rndis_register(void (*resp_avail)(void *v), void *v)
return ERR_PTR(-ENODEV);
}
- params = kzalloc_obj(*params, GFP_KERNEL);
+ params = kzalloc_obj(*params);
if (!params) {
rndis_put_nr(i);
diff --git a/drivers/usb/gadget/function/u_audio.c b/drivers/usb/gadget/function/u_audio.c
index 24c934bbf0e5..36d2fedbda11 100644
--- a/drivers/usb/gadget/function/u_audio.c
+++ b/drivers/usb/gadget/function/u_audio.c
@@ -1191,7 +1191,7 @@ int g_audio_setup(struct g_audio *g_audio, const char *pcm_name,
if (!g_audio)
return -EINVAL;
- uac = kzalloc_obj(*uac, GFP_KERNEL);
+ uac = kzalloc_obj(*uac);
if (!uac)
return -ENOMEM;
g_audio->uac = uac;
diff --git a/drivers/usb/gadget/function/u_serial.c b/drivers/usb/gadget/function/u_serial.c
index e61beaa0c53d..e43ad6373846 100644
--- a/drivers/usb/gadget/function/u_serial.c
+++ b/drivers/usb/gadget/function/u_serial.c
@@ -1082,7 +1082,7 @@ static int gs_console_init(struct gs_port *port)
if (port->console)
return 0;
- cons = kzalloc_obj(*port->console, GFP_KERNEL);
+ cons = kzalloc_obj(*port->console);
if (!cons)
return -ENOMEM;
@@ -1215,7 +1215,7 @@ gs_port_alloc(unsigned port_num, struct usb_cdc_line_coding *coding)
goto out;
}
- port = kzalloc_obj(struct gs_port, GFP_KERNEL);
+ port = kzalloc_obj(struct gs_port);
if (port == NULL) {
ret = -ENOMEM;
goto out;
diff --git a/drivers/usb/gadget/function/u_uac1_legacy.c b/drivers/usb/gadget/function/u_uac1_legacy.c
index e95c2fc7fc10..01016102fa17 100644
--- a/drivers/usb/gadget/function/u_uac1_legacy.c
+++ b/drivers/usb/gadget/function/u_uac1_legacy.c
@@ -106,7 +106,7 @@ static int playback_default_hw_params(struct gaudio_snd_dev *snd)
snd->channels = 2;
snd->rate = 48000;
- params = kzalloc_obj(*params, GFP_KERNEL);
+ params = kzalloc_obj(*params);
if (!params)
return -ENOMEM;
diff --git a/drivers/usb/gadget/function/uvc_configfs.c b/drivers/usb/gadget/function/uvc_configfs.c
index 553057cbf63a..70a1415ea401 100644
--- a/drivers/usb/gadget/function/uvc_configfs.c
+++ b/drivers/usb/gadget/function/uvc_configfs.c
@@ -158,7 +158,7 @@ static int uvcg_config_create_group(struct config_group *parent,
{
struct config_group *group;
- group = kzalloc_obj(*group, GFP_KERNEL);
+ group = kzalloc_obj(*group);
if (!group)
return -ENOMEM;
@@ -270,7 +270,7 @@ static struct config_item *uvcg_control_header_make(struct config_group *group,
{
struct uvcg_control_header *h;
- h = kzalloc_obj(*h, GFP_KERNEL);
+ h = kzalloc_obj(*h);
if (!h)
return ERR_PTR(-ENOMEM);
@@ -1273,7 +1273,7 @@ static struct config_item *uvcg_extension_make(struct config_group *group, const
opts_item = group->cg_item.ci_parent->ci_parent;
opts = to_f_uvc_opts(opts_item);
- xu = kzalloc_obj(*xu, GFP_KERNEL);
+ xu = kzalloc_obj(*xu);
if (!xu)
return ERR_PTR(-ENOMEM);
@@ -1437,7 +1437,7 @@ static int uvcg_control_class_create_children(struct config_group *parent)
for (i = 0; i < ARRAY_SIZE(names); ++i) {
struct uvcg_control_class_group *group;
- group = kzalloc_obj(*group, GFP_KERNEL);
+ group = kzalloc_obj(*group);
if (!group)
return -ENOMEM;
@@ -1785,7 +1785,7 @@ static int uvcg_streaming_header_allow_link(struct config_item *src,
uvcg_format_set_indices(to_config_group(target));
- format_ptr = kzalloc_obj(*format_ptr, GFP_KERNEL);
+ format_ptr = kzalloc_obj(*format_ptr);
if (!format_ptr) {
ret = -ENOMEM;
goto out;
@@ -1899,7 +1899,7 @@ static struct config_item
{
struct uvcg_streaming_header *h;
- h = kzalloc_obj(*h, GFP_KERNEL);
+ h = kzalloc_obj(*h);
if (!h)
return ERR_PTR(-ENOMEM);
@@ -2163,7 +2163,7 @@ static struct config_item *uvcg_frame_make(struct config_group *group,
struct config_item *opts_item;
struct uvcg_frame_ptr *frame_ptr;
- h = kzalloc_obj(*h, GFP_KERNEL);
+ h = kzalloc_obj(*h);
if (!h)
return ERR_PTR(-ENOMEM);
@@ -2197,7 +2197,7 @@ static struct config_item *uvcg_frame_make(struct config_group *group,
return ERR_PTR(-EINVAL);
}
- frame_ptr = kzalloc_obj(*frame_ptr, GFP_KERNEL);
+ frame_ptr = kzalloc_obj(*frame_ptr);
if (!frame_ptr) {
mutex_unlock(&opts->lock);
kfree(h);
@@ -2483,7 +2483,7 @@ static struct config_group *uvcg_uncompressed_make(struct config_group *group,
if (!color_match)
return ERR_PTR(-EINVAL);
- h = kzalloc_obj(*h, GFP_KERNEL);
+ h = kzalloc_obj(*h);
if (!h)
return ERR_PTR(-ENOMEM);
@@ -2675,7 +2675,7 @@ static struct config_group *uvcg_mjpeg_make(struct config_group *group,
if (!color_match)
return ERR_PTR(-EINVAL);
- h = kzalloc_obj(*h, GFP_KERNEL);
+ h = kzalloc_obj(*h);
if (!h)
return ERR_PTR(-ENOMEM);
@@ -2926,7 +2926,7 @@ static struct config_group *uvcg_framebased_make(struct config_group *group,
if (!color_match)
return ERR_PTR(-EINVAL);
- h = kzalloc_obj(*h, GFP_KERNEL);
+ h = kzalloc_obj(*h);
if (!h)
return ERR_PTR(-ENOMEM);
@@ -3075,7 +3075,7 @@ static struct config_group *uvcg_color_matching_make(struct config_group *group,
{
struct uvcg_color_matching *color_match;
- color_match = kzalloc_obj(*color_match, GFP_KERNEL);
+ color_match = kzalloc_obj(*color_match);
if (!color_match)
return ERR_PTR(-ENOMEM);
@@ -3097,7 +3097,7 @@ static int uvcg_color_matching_create_children(struct config_group *parent)
{
struct uvcg_color_matching *color_match;
- color_match = kzalloc_obj(*color_match, GFP_KERNEL);
+ color_match = kzalloc_obj(*color_match);
if (!color_match)
return -ENOMEM;
@@ -3553,7 +3553,7 @@ static int uvcg_streaming_class_create_children(struct config_group *parent)
for (i = 0; i < ARRAY_SIZE(names); ++i) {
struct uvcg_streaming_class_group *group;
- group = kzalloc_obj(*group, GFP_KERNEL);
+ group = kzalloc_obj(*group);
if (!group)
return -ENOMEM;
diff --git a/drivers/usb/gadget/function/uvc_v4l2.c b/drivers/usb/gadget/function/uvc_v4l2.c
index 574b3a8986a0..ed48d38498fb 100644
--- a/drivers/usb/gadget/function/uvc_v4l2.c
+++ b/drivers/usb/gadget/function/uvc_v4l2.c
@@ -667,7 +667,7 @@ uvc_v4l2_open(struct file *file)
struct uvc_device *uvc = video_get_drvdata(vdev);
struct uvc_file_handle *handle;
- handle = kzalloc_obj(*handle, GFP_KERNEL);
+ handle = kzalloc_obj(*handle);
if (handle == NULL)
return -ENOMEM;
diff --git a/drivers/usb/gadget/function/uvc_video.c b/drivers/usb/gadget/function/uvc_video.c
index b2784a57dbcd..7cea641b06b4 100644
--- a/drivers/usb/gadget/function/uvc_video.c
+++ b/drivers/usb/gadget/function/uvc_video.c
@@ -559,7 +559,7 @@ uvc_video_alloc_requests(struct uvc_video *video)
uvc_video_prep_requests(video);
for (i = 0; i < video->uvc_num_requests; i++) {
- ureq = kzalloc_obj(struct uvc_request, GFP_KERNEL);
+ ureq = kzalloc_obj(struct uvc_request);
if (ureq == NULL)
goto error;
diff --git a/drivers/usb/gadget/legacy/dbgp.c b/drivers/usb/gadget/legacy/dbgp.c
index af8968ef9380..03032ea6f701 100644
--- a/drivers/usb/gadget/legacy/dbgp.c
+++ b/drivers/usb/gadget/legacy/dbgp.c
@@ -298,7 +298,7 @@ static int dbgp_bind(struct usb_gadget *gadget,
dbgp.req->length = DBGP_REQ_EP0_LEN;
#ifdef CONFIG_USB_G_DBGP_SERIAL
- dbgp.serial = kzalloc_obj(struct gserial, GFP_KERNEL);
+ dbgp.serial = kzalloc_obj(struct gserial);
if (!dbgp.serial) {
stp = 3;
err = -ENOMEM;
diff --git a/drivers/usb/gadget/legacy/g_ffs.c b/drivers/usb/gadget/legacy/g_ffs.c
index 98a08efe86dd..dc59e625aca8 100644
--- a/drivers/usb/gadget/legacy/g_ffs.c
+++ b/drivers/usb/gadget/legacy/g_ffs.c
@@ -188,7 +188,7 @@ static int __init gfs_init(void)
/*
* Allocate in one chunk for easier maintenance
*/
- f_ffs[0] = kzalloc_objs(*f_ffs[0], func_num * N_CONF, GFP_KERNEL);
+ f_ffs[0] = kzalloc_objs(*f_ffs[0], func_num * N_CONF);
if (!f_ffs[0]) {
ret = -ENOMEM;
goto no_func;
@@ -196,7 +196,7 @@ static int __init gfs_init(void)
for (i = 1; i < N_CONF; ++i)
f_ffs[i] = f_ffs[0] + i * func_num;
- fi_ffs = kzalloc_objs(*fi_ffs, func_num, GFP_KERNEL);
+ fi_ffs = kzalloc_objs(*fi_ffs, func_num);
if (!fi_ffs) {
ret = -ENOMEM;
goto no_func;
diff --git a/drivers/usb/gadget/legacy/hid.c b/drivers/usb/gadget/legacy/hid.c
index bc25c04daaaf..89722413e5fd 100644
--- a/drivers/usb/gadget/legacy/hid.c
+++ b/drivers/usb/gadget/legacy/hid.c
@@ -227,7 +227,7 @@ static int hidg_plat_driver_probe(struct platform_device *pdev)
return -ENODEV;
}
- entry = kzalloc_obj(*entry, GFP_KERNEL);
+ entry = kzalloc_obj(*entry);
if (!entry)
return -ENOMEM;
diff --git a/drivers/usb/gadget/legacy/inode.c b/drivers/usb/gadget/legacy/inode.c
index 52512fba80ec..d87a8ab51510 100644
--- a/drivers/usb/gadget/legacy/inode.c
+++ b/drivers/usb/gadget/legacy/inode.c
@@ -173,7 +173,7 @@ static struct dev_data *dev_new (void)
{
struct dev_data *dev;
- dev = kzalloc_obj(*dev, GFP_KERNEL);
+ dev = kzalloc_obj(*dev);
if (!dev)
return NULL;
dev->state = STATE_DEV_DISABLED;
@@ -614,7 +614,7 @@ ep_read_iter(struct kiocb *iocb, struct iov_iter *to)
if (value >= 0 && (copy_to_iter(buf, value, to) != value))
value = -EFAULT;
} else {
- struct kiocb_priv *priv = kzalloc_obj(*priv, GFP_KERNEL);
+ struct kiocb_priv *priv = kzalloc_obj(*priv);
value = -ENOMEM;
if (!priv)
goto fail;
@@ -682,7 +682,7 @@ ep_write_iter(struct kiocb *iocb, struct iov_iter *from)
} else if (is_sync_kiocb(iocb)) {
value = ep_io(epdata, buf, len);
} else {
- struct kiocb_priv *priv = kzalloc_obj(*priv, GFP_KERNEL);
+ struct kiocb_priv *priv = kzalloc_obj(*priv);
value = -ENOMEM;
if (priv) {
value = ep_aio(iocb, priv, epdata, buf, len);
@@ -1598,7 +1598,7 @@ static int activate_ep_files (struct dev_data *dev)
gadget_for_each_ep (ep, dev->gadget) {
- data = kzalloc_obj(*data, GFP_KERNEL);
+ data = kzalloc_obj(*data);
if (!data)
goto enomem0;
data->state = STATE_EP_DISABLED;
diff --git a/drivers/usb/gadget/legacy/raw_gadget.c b/drivers/usb/gadget/legacy/raw_gadget.c
index 5cb8d262329f..4febf8dac7ca 100644
--- a/drivers/usb/gadget/legacy/raw_gadget.c
+++ b/drivers/usb/gadget/legacy/raw_gadget.c
@@ -190,7 +190,7 @@ static struct raw_dev *dev_new(void)
{
struct raw_dev *dev;
- dev = kzalloc_obj(*dev, GFP_KERNEL);
+ dev = kzalloc_obj(*dev);
if (!dev)
return NULL;
/* Matches kref_put() in raw_release(). */
@@ -1251,7 +1251,7 @@ static int raw_ioctl_eps_info(struct raw_dev *dev, unsigned long value)
struct usb_raw_eps_info *info;
struct raw_ep *ep;
- info = kzalloc_obj(*info, GFP_KERNEL);
+ info = kzalloc_obj(*info);
if (!info) {
ret = -ENOMEM;
goto out;
diff --git a/drivers/usb/gadget/udc/amd5536udc_pci.c b/drivers/usb/gadget/udc/amd5536udc_pci.c
index e709bd4976c5..cd767b1e3fe7 100644
--- a/drivers/usb/gadget/udc/amd5536udc_pci.c
+++ b/drivers/usb/gadget/udc/amd5536udc_pci.c
@@ -95,7 +95,7 @@ static int udc_pci_probe(
}
/* init */
- dev = kzalloc_obj(struct udc, GFP_KERNEL);
+ dev = kzalloc_obj(struct udc);
if (!dev)
return -ENOMEM;
diff --git a/drivers/usb/gadget/udc/aspeed-vhub/dev.c b/drivers/usb/gadget/udc/aspeed-vhub/dev.c
index c79522164f18..2ecd049dacc2 100644
--- a/drivers/usb/gadget/udc/aspeed-vhub/dev.c
+++ b/drivers/usb/gadget/udc/aspeed-vhub/dev.c
@@ -560,7 +560,7 @@ int ast_vhub_init_dev(struct ast_vhub *vhub, unsigned int idx)
* endpoint 0.
*/
d->max_epns = min_t(u32, vhub->max_epns, 30);
- d->epns = kzalloc_objs(*d->epns, d->max_epns, GFP_KERNEL);
+ d->epns = kzalloc_objs(*d->epns, d->max_epns);
if (!d->epns)
return -ENOMEM;
@@ -569,7 +569,7 @@ int ast_vhub_init_dev(struct ast_vhub *vhub, unsigned int idx)
* named "parent" devices for each port so we create a sub device
* here for that purpose
*/
- d->port_dev = kzalloc_obj(struct device, GFP_KERNEL);
+ d->port_dev = kzalloc_obj(struct device);
if (!d->port_dev) {
rc = -ENOMEM;
goto fail_alloc;
diff --git a/drivers/usb/gadget/udc/atmel_usba_udc.c b/drivers/usb/gadget/udc/atmel_usba_udc.c
index 427535bf35a6..72a2f95ff018 100644
--- a/drivers/usb/gadget/udc/atmel_usba_udc.c
+++ b/drivers/usb/gadget/udc/atmel_usba_udc.c
@@ -40,7 +40,7 @@ static int queue_dbg_open(struct inode *inode, struct file *file)
struct usba_request *req, *req_copy;
struct list_head *queue_data;
- queue_data = kmalloc_obj(*queue_data, GFP_KERNEL);
+ queue_data = kmalloc_obj(*queue_data);
if (!queue_data)
return -ENOMEM;
INIT_LIST_HEAD(queue_data);
diff --git a/drivers/usb/gadget/udc/bdc/bdc_ep.c b/drivers/usb/gadget/udc/bdc/bdc_ep.c
index a7f2fe29e433..c0ab3347059a 100644
--- a/drivers/usb/gadget/udc/bdc/bdc_ep.c
+++ b/drivers/usb/gadget/udc/bdc/bdc_ep.c
@@ -1945,7 +1945,7 @@ static int init_ep(struct bdc *bdc, u32 epnum, u32 dir)
struct bdc_ep *ep;
dev_dbg(bdc->dev, "%s epnum=%d dir=%d\n", __func__, epnum, dir);
- ep = kzalloc_obj(*ep, GFP_KERNEL);
+ ep = kzalloc_obj(*ep);
if (!ep)
return -ENOMEM;
diff --git a/drivers/usb/gadget/udc/core.c b/drivers/usb/gadget/udc/core.c
index 394ed540c22f..08d2a93b3bba 100644
--- a/drivers/usb/gadget/udc/core.c
+++ b/drivers/usb/gadget/udc/core.c
@@ -1393,7 +1393,7 @@ int usb_add_gadget(struct usb_gadget *gadget)
struct usb_udc *udc;
int ret = -ENOMEM;
- udc = kzalloc_obj(*udc, GFP_KERNEL);
+ udc = kzalloc_obj(*udc);
if (!udc)
goto error;
diff --git a/drivers/usb/gadget/udc/dummy_hcd.c b/drivers/usb/gadget/udc/dummy_hcd.c
index e183f36b2b0b..c9eca90376e2 100644
--- a/drivers/usb/gadget/udc/dummy_hcd.c
+++ b/drivers/usb/gadget/udc/dummy_hcd.c
@@ -2819,7 +2819,7 @@ static int __init dummy_hcd_init(void)
}
}
for (i = 0; i < mod_data.num; i++) {
- dum[i] = kzalloc_obj(struct dummy, GFP_KERNEL);
+ dum[i] = kzalloc_obj(struct dummy);
if (!dum[i]) {
retval = -ENOMEM;
goto err_add_pdata;
diff --git a/drivers/usb/gadget/udc/fsl_qe_udc.c b/drivers/usb/gadget/udc/fsl_qe_udc.c
index edbffafa6fa7..bf87285ad13c 100644
--- a/drivers/usb/gadget/udc/fsl_qe_udc.c
+++ b/drivers/usb/gadget/udc/fsl_qe_udc.c
@@ -2344,7 +2344,7 @@ static struct qe_udc *qe_udc_config(struct platform_device *ofdev)
u64 size;
u32 offset;
- udc = kzalloc_obj(*udc, GFP_KERNEL);
+ udc = kzalloc_obj(*udc);
if (!udc)
goto cleanup;
diff --git a/drivers/usb/gadget/udc/fsl_udc_core.c b/drivers/usb/gadget/udc/fsl_udc_core.c
index 961728e92a88..600ce8cc0fef 100644
--- a/drivers/usb/gadget/udc/fsl_udc_core.c
+++ b/drivers/usb/gadget/udc/fsl_udc_core.c
@@ -2250,7 +2250,7 @@ static int struct_udc_setup(struct fsl_udc *udc,
pdata = dev_get_platdata(&pdev->dev);
udc->phy_mode = pdata->phy_mode;
- udc->eps = kzalloc_objs(struct fsl_ep, udc->max_ep, GFP_KERNEL);
+ udc->eps = kzalloc_objs(struct fsl_ep, udc->max_ep);
if (!udc->eps) {
dev_err(&udc->gadget.dev, "kmalloc udc endpoint status failed\n");
goto eps_alloc_failed;
@@ -2369,7 +2369,7 @@ static int fsl_udc_probe(struct platform_device *pdev)
unsigned int i;
u32 dccparams;
- udc_controller = kzalloc_obj(struct fsl_udc, GFP_KERNEL);
+ udc_controller = kzalloc_obj(struct fsl_udc);
if (udc_controller == NULL)
return -ENOMEM;
diff --git a/drivers/usb/gadget/udc/goku_udc.c b/drivers/usb/gadget/udc/goku_udc.c
index f9ddf22c57ef..db42a5e3e805 100644
--- a/drivers/usb/gadget/udc/goku_udc.c
+++ b/drivers/usb/gadget/udc/goku_udc.c
@@ -1755,7 +1755,7 @@ static int goku_probe(struct pci_dev *pdev, const struct pci_device_id *id)
}
/* alloc, and start init */
- dev = kzalloc_obj(*dev, GFP_KERNEL);
+ dev = kzalloc_obj(*dev);
if (!dev) {
retval = -ENOMEM;
goto err;
diff --git a/drivers/usb/gadget/udc/m66592-udc.c b/drivers/usb/gadget/udc/m66592-udc.c
index 08ae3d5a79ff..d77c11c4eb38 100644
--- a/drivers/usb/gadget/udc/m66592-udc.c
+++ b/drivers/usb/gadget/udc/m66592-udc.c
@@ -1571,7 +1571,7 @@ static int m66592_probe(struct platform_device *pdev)
}
/* initialize ucd */
- m66592 = kzalloc_obj(struct m66592, GFP_KERNEL);
+ m66592 = kzalloc_obj(struct m66592);
if (m66592 == NULL) {
ret = -ENOMEM;
goto clean_up;
diff --git a/drivers/usb/gadget/udc/net2280.c b/drivers/usb/gadget/udc/net2280.c
index aa1a88a2aa3b..d02765bd49ce 100644
--- a/drivers/usb/gadget/udc/net2280.c
+++ b/drivers/usb/gadget/udc/net2280.c
@@ -3625,7 +3625,7 @@ static int net2280_probe(struct pci_dev *pdev, const struct pci_device_id *id)
int retval, i;
/* alloc, and start init */
- dev = kzalloc_obj(*dev, GFP_KERNEL);
+ dev = kzalloc_obj(*dev);
if (dev == NULL) {
retval = -ENOMEM;
goto done;
diff --git a/drivers/usb/gadget/udc/omap_udc.c b/drivers/usb/gadget/udc/omap_udc.c
index 8dda63c38ee5..91139ae668f4 100644
--- a/drivers/usb/gadget/udc/omap_udc.c
+++ b/drivers/usb/gadget/udc/omap_udc.c
@@ -2627,7 +2627,7 @@ omap_udc_setup(struct platform_device *odev, struct usb_phy *xceiv)
/* UDC_PULLUP_EN gates the chip clock */
/* OTG_SYSCON_1 |= DEV_IDLE_EN; */
- udc = kzalloc_obj(*udc, GFP_KERNEL);
+ udc = kzalloc_obj(*udc);
if (!udc)
return -ENOMEM;
diff --git a/drivers/usb/host/ehci-dbg.c b/drivers/usb/host/ehci-dbg.c
index cc3f2da39d71..3cf743c81eb4 100644
--- a/drivers/usb/host/ehci-dbg.c
+++ b/drivers/usb/host/ehci-dbg.c
@@ -917,7 +917,7 @@ static struct debug_buffer *alloc_buffer(struct usb_bus *bus,
{
struct debug_buffer *buf;
- buf = kzalloc_obj(*buf, GFP_KERNEL);
+ buf = kzalloc_obj(*buf);
if (buf) {
buf->bus = bus;
diff --git a/drivers/usb/host/fhci-hcd.c b/drivers/usb/host/fhci-hcd.c
index 445847b92f33..271bcbe9b326 100644
--- a/drivers/usb/host/fhci-hcd.c
+++ b/drivers/usb/host/fhci-hcd.c
@@ -193,7 +193,7 @@ static int fhci_mem_init(struct fhci_hcd *fhci)
{
int i;
- fhci->hc_list = kzalloc_obj(*fhci->hc_list, GFP_KERNEL);
+ fhci->hc_list = kzalloc_obj(*fhci->hc_list);
if (!fhci->hc_list)
goto err;
@@ -203,7 +203,7 @@ static int fhci_mem_init(struct fhci_hcd *fhci)
INIT_LIST_HEAD(&fhci->hc_list->intr_list);
INIT_LIST_HEAD(&fhci->hc_list->done_list);
- fhci->vroot_hub = kzalloc_obj(*fhci->vroot_hub, GFP_KERNEL);
+ fhci->vroot_hub = kzalloc_obj(*fhci->vroot_hub);
if (!fhci->vroot_hub)
goto err;
@@ -217,7 +217,7 @@ static int fhci_mem_init(struct fhci_hcd *fhci)
for (i = 0; i < MAX_TDS; i++) {
struct td *td;
- td = kmalloc_obj(*td, GFP_KERNEL);
+ td = kmalloc_obj(*td);
if (!td)
goto err;
fhci_recycle_empty_td(fhci, td);
@@ -225,7 +225,7 @@ static int fhci_mem_init(struct fhci_hcd *fhci)
for (i = 0; i < MAX_EDS; i++) {
struct ed *ed;
- ed = kmalloc_obj(*ed, GFP_KERNEL);
+ ed = kmalloc_obj(*ed);
if (!ed)
goto err;
fhci_recycle_empty_ed(fhci, ed);
@@ -264,7 +264,7 @@ static int fhci_usb_init(struct fhci_hcd *fhci)
usb->max_frame_usage = FRAME_TIME_USAGE;
usb->sw_transaction_time = SW_FIX_TIME_BETWEEN_TRANSACTION;
- usb->actual_frame = kzalloc_obj(*usb->actual_frame, GFP_KERNEL);
+ usb->actual_frame = kzalloc_obj(*usb->actual_frame);
if (!usb->actual_frame) {
fhci_usb_free(usb);
return -ENOMEM;
@@ -306,7 +306,7 @@ static struct fhci_usb *fhci_create_lld(struct fhci_hcd *fhci)
struct fhci_usb *usb;
/* allocate memory for SCC data structure */
- usb = kzalloc_obj(*usb, GFP_KERNEL);
+ usb = kzalloc_obj(*usb);
if (!usb)
return NULL;
diff --git a/drivers/usb/host/fhci-tds.c b/drivers/usb/host/fhci-tds.c
index 6fb4feb4ad7b..d7482dc0604e 100644
--- a/drivers/usb/host/fhci-tds.c
+++ b/drivers/usb/host/fhci-tds.c
@@ -161,7 +161,7 @@ u32 fhci_create_ep(struct fhci_usb *usb, enum fhci_mem_alloc data_mem,
return -EINVAL;
}
- ep = kzalloc_obj(*ep, GFP_KERNEL);
+ ep = kzalloc_obj(*ep);
if (!ep)
return -ENOMEM;
@@ -183,7 +183,7 @@ u32 fhci_create_ep(struct fhci_usb *usb, enum fhci_mem_alloc data_mem,
struct packet *pkt;
u8 *buff;
- pkt = kmalloc_obj(*pkt, GFP_KERNEL);
+ pkt = kmalloc_obj(*pkt);
if (!pkt) {
err_for = "frame";
goto err;
diff --git a/drivers/usb/host/max3421-hcd.c b/drivers/usb/host/max3421-hcd.c
index 82e231e05dc2..0e17c988d36a 100644
--- a/drivers/usb/host/max3421-hcd.c
+++ b/drivers/usb/host/max3421-hcd.c
@@ -1878,10 +1878,10 @@ max3421_probe(struct spi_device *spi)
INIT_LIST_HEAD(&max3421_hcd->ep_list);
spi_set_drvdata(spi, max3421_hcd);
- max3421_hcd->tx = kmalloc_obj(*max3421_hcd->tx, GFP_KERNEL);
+ max3421_hcd->tx = kmalloc_obj(*max3421_hcd->tx);
if (!max3421_hcd->tx)
goto error;
- max3421_hcd->rx = kmalloc_obj(*max3421_hcd->rx, GFP_KERNEL);
+ max3421_hcd->rx = kmalloc_obj(*max3421_hcd->rx);
if (!max3421_hcd->rx)
goto error;
diff --git a/drivers/usb/host/ohci-dbg.c b/drivers/usb/host/ohci-dbg.c
index 30e22acd9461..9e0e06bbc570 100644
--- a/drivers/usb/host/ohci-dbg.c
+++ b/drivers/usb/host/ohci-dbg.c
@@ -667,7 +667,7 @@ static struct debug_buffer *alloc_buffer(struct ohci_hcd *ohci,
{
struct debug_buffer *buf;
- buf = kzalloc_obj(struct debug_buffer, GFP_KERNEL);
+ buf = kzalloc_obj(struct debug_buffer);
if (buf) {
buf->ohci = ohci;
diff --git a/drivers/usb/host/sl811_cs.c b/drivers/usb/host/sl811_cs.c
index afdbcac3185c..ada91ca33f65 100644
--- a/drivers/usb/host/sl811_cs.c
+++ b/drivers/usb/host/sl811_cs.c
@@ -178,7 +178,7 @@ static int sl811_cs_probe(struct pcmcia_device *link)
{
local_info_t *local;
- local = kzalloc_obj(local_info_t, GFP_KERNEL);
+ local = kzalloc_obj(local_info_t);
if (!local)
return -ENOMEM;
local->p_dev = link;
diff --git a/drivers/usb/host/uhci-debug.c b/drivers/usb/host/uhci-debug.c
index 675107e9bae0..e91ec6a4fa74 100644
--- a/drivers/usb/host/uhci-debug.c
+++ b/drivers/usb/host/uhci-debug.c
@@ -561,7 +561,7 @@ static int uhci_debug_open(struct inode *inode, struct file *file)
struct uhci_debug *up;
unsigned long flags;
- up = kmalloc_obj(*up, GFP_KERNEL);
+ up = kmalloc_obj(*up);
if (!up)
return -ENOMEM;
diff --git a/drivers/usb/host/xhci-dbgcap.c b/drivers/usb/host/xhci-dbgcap.c
index 31995b12598f..7e6f7d72f03e 100644
--- a/drivers/usb/host/xhci-dbgcap.c
+++ b/drivers/usb/host/xhci-dbgcap.c
@@ -1425,7 +1425,7 @@ xhci_alloc_dbc(struct device *dev, void __iomem *base, const struct dbc_driver *
struct xhci_dbc *dbc;
int ret;
- dbc = kzalloc_obj(*dbc, GFP_KERNEL);
+ dbc = kzalloc_obj(*dbc);
if (!dbc)
return NULL;
diff --git a/drivers/usb/host/xhci-dbgtty.c b/drivers/usb/host/xhci-dbgtty.c
index a058277b5ff9..2e7384c6b6ec 100644
--- a/drivers/usb/host/xhci-dbgtty.c
+++ b/drivers/usb/host/xhci-dbgtty.c
@@ -584,7 +584,7 @@ int xhci_dbc_tty_probe(struct device *dev, void __iomem *base, struct xhci_hcd *
if (!dbc_tty_driver)
return -ENODEV;
- port = kzalloc_obj(*port, GFP_KERNEL);
+ port = kzalloc_obj(*port);
if (!port)
return -ENOMEM;
diff --git a/drivers/usb/host/xhci-debugfs.c b/drivers/usb/host/xhci-debugfs.c
index 296ff14d4e9a..890fc5e892f1 100644
--- a/drivers/usb/host/xhci-debugfs.c
+++ b/drivers/usb/host/xhci-debugfs.c
@@ -87,7 +87,7 @@ static struct xhci_regset *xhci_debugfs_alloc_regset(struct xhci_hcd *xhci)
{
struct xhci_regset *regset;
- regset = kzalloc_obj(*regset, GFP_KERNEL);
+ regset = kzalloc_obj(*regset);
if (!regset)
return NULL;
@@ -468,7 +468,7 @@ void xhci_debugfs_create_endpoint(struct xhci_hcd *xhci,
if (spriv->eps[ep_index])
return;
- epriv = kzalloc_obj(*epriv, GFP_KERNEL);
+ epriv = kzalloc_obj(*epriv);
if (!epriv)
return;
@@ -608,7 +608,7 @@ void xhci_debugfs_create_slot(struct xhci_hcd *xhci, int slot_id)
struct xhci_slot_priv *priv;
struct xhci_virt_device *dev = xhci->devs[slot_id];
- priv = kzalloc_obj(*priv, GFP_KERNEL);
+ priv = kzalloc_obj(*priv);
if (!priv)
return;
diff --git a/drivers/usb/host/xhci-mtk-sch.c b/drivers/usb/host/xhci-mtk-sch.c
index ef255b968ab6..9377fb2bd163 100644
--- a/drivers/usb/host/xhci-mtk-sch.c
+++ b/drivers/usb/host/xhci-mtk-sch.c
@@ -193,7 +193,7 @@ static struct mu3h_sch_tt *find_tt(struct usb_device *udev)
tt = *ptt;
if (!tt) { /* Create the mu3h_sch_tt */
- tt = kzalloc_obj(*tt, GFP_KERNEL);
+ tt = kzalloc_obj(*tt);
if (!tt) {
if (allocated_index) {
utt->hcpriv = NULL;
@@ -891,7 +891,7 @@ int xhci_mtk_sch_init(struct xhci_hcd_mtk *mtk)
/* ss IN and OUT are separated */
num_usb_bus = xhci->usb3_rhub.num_ports * 2 + xhci->usb2_rhub.num_ports;
- sch_array = kzalloc_objs(*sch_array, num_usb_bus, GFP_KERNEL);
+ sch_array = kzalloc_objs(*sch_array, num_usb_bus);
if (sch_array == NULL)
return -ENOMEM;
diff --git a/drivers/usb/host/xhci-sideband.c b/drivers/usb/host/xhci-sideband.c
index 3ebe22755693..abbcc0e44f1b 100644
--- a/drivers/usb/host/xhci-sideband.c
+++ b/drivers/usb/host/xhci-sideband.c
@@ -28,11 +28,11 @@ xhci_ring_to_sgtable(struct xhci_sideband *sb, struct xhci_ring *ring)
dev = xhci_to_hcd(sb->xhci)->self.sysdev;
sz = ring->num_segs * TRB_SEGMENT_SIZE;
n_pages = PAGE_ALIGN(sz) >> PAGE_SHIFT;
- pages = kvmalloc_objs(struct page *, n_pages, GFP_KERNEL);
+ pages = kvmalloc_objs(struct page *, n_pages);
if (!pages)
return NULL;
- sgt = kzalloc_obj(*sgt, GFP_KERNEL);
+ sgt = kzalloc_obj(*sgt);
if (!sgt) {
kvfree(pages);
return NULL;
diff --git a/drivers/usb/image/mdc800.c b/drivers/usb/image/mdc800.c
index 9cb74eb91b07..8d8e79afa600 100644
--- a/drivers/usb/image/mdc800.c
+++ b/drivers/usb/image/mdc800.c
@@ -982,7 +982,7 @@ static int __init usb_mdc800_init (void)
{
int retval = -ENODEV;
/* Allocate Memory */
- mdc800=kzalloc_obj(struct mdc800_data, GFP_KERNEL);
+ mdc800=kzalloc_obj(struct mdc800_data);
if (!mdc800)
goto cleanup_on_fail;
diff --git a/drivers/usb/image/microtek.c b/drivers/usb/image/microtek.c
index 20b0b3736322..45dc209f5fe5 100644
--- a/drivers/usb/image/microtek.c
+++ b/drivers/usb/image/microtek.c
@@ -723,7 +723,7 @@ static int mts_usb_probe(struct usb_interface *intf,
}
- new_desc = kzalloc_obj(struct mts_desc, GFP_KERNEL);
+ new_desc = kzalloc_obj(struct mts_desc);
if (!new_desc)
goto out;
diff --git a/drivers/usb/misc/adutux.c b/drivers/usb/misc/adutux.c
index 2c311dc92ab9..369d0d2ee2be 100644
--- a/drivers/usb/misc/adutux.c
+++ b/drivers/usb/misc/adutux.c
@@ -657,7 +657,7 @@ static int adu_probe(struct usb_interface *interface,
int res;
/* allocate memory for our device state and initialize it */
- dev = kzalloc_obj(struct adu_device, GFP_KERNEL);
+ dev = kzalloc_obj(struct adu_device);
if (!dev)
return -ENOMEM;
diff --git a/drivers/usb/misc/apple-mfi-fastcharge.c b/drivers/usb/misc/apple-mfi-fastcharge.c
index 8cf08fbda163..339f6cd2e9b2 100644
--- a/drivers/usb/misc/apple-mfi-fastcharge.c
+++ b/drivers/usb/misc/apple-mfi-fastcharge.c
@@ -184,7 +184,7 @@ static int mfi_fc_probe(struct usb_device *udev)
if (!mfi_fc_match(udev))
return -ENODEV;
- mfi = kzalloc_obj(struct mfi_device, GFP_KERNEL);
+ mfi = kzalloc_obj(struct mfi_device);
if (!mfi)
return -ENOMEM;
diff --git a/drivers/usb/misc/appledisplay.c b/drivers/usb/misc/appledisplay.c
index e9b26cf7bcfc..4beebde59842 100644
--- a/drivers/usb/misc/appledisplay.c
+++ b/drivers/usb/misc/appledisplay.c
@@ -226,7 +226,7 @@ static int appledisplay_probe(struct usb_interface *iface,
int_in_endpointAddr = endpoint->bEndpointAddress;
/* allocate memory for our device state and initialize it */
- pdata = kzalloc_obj(struct appledisplay, GFP_KERNEL);
+ pdata = kzalloc_obj(struct appledisplay);
if (!pdata) {
retval = -ENOMEM;
goto error;
diff --git a/drivers/usb/misc/chaoskey.c b/drivers/usb/misc/chaoskey.c
index 039e2b1bba00..d8016540953f 100644
--- a/drivers/usb/misc/chaoskey.c
+++ b/drivers/usb/misc/chaoskey.c
@@ -143,7 +143,7 @@ static int chaoskey_probe(struct usb_interface *interface,
/* Looks good, allocate and initialize */
- dev = kzalloc_obj(struct chaoskey, GFP_KERNEL);
+ dev = kzalloc_obj(struct chaoskey);
if (dev == NULL)
goto out;
diff --git a/drivers/usb/misc/cypress_cy7c63.c b/drivers/usb/misc/cypress_cy7c63.c
index ace0ec94506c..99185fc3e9df 100644
--- a/drivers/usb/misc/cypress_cy7c63.c
+++ b/drivers/usb/misc/cypress_cy7c63.c
@@ -211,7 +211,7 @@ static int cypress_probe(struct usb_interface *interface,
int retval = -ENOMEM;
/* allocate memory for our device state and initialize it */
- dev = kzalloc_obj(*dev, GFP_KERNEL);
+ dev = kzalloc_obj(*dev);
if (!dev)
goto error_mem;
diff --git a/drivers/usb/misc/cytherm.c b/drivers/usb/misc/cytherm.c
index 6af966118792..2bf082474e9d 100644
--- a/drivers/usb/misc/cytherm.c
+++ b/drivers/usb/misc/cytherm.c
@@ -307,7 +307,7 @@ static int cytherm_probe(struct usb_interface *interface,
struct usb_cytherm *dev;
int retval = -ENOMEM;
- dev = kzalloc_obj(struct usb_cytherm, GFP_KERNEL);
+ dev = kzalloc_obj(struct usb_cytherm);
if (!dev)
goto error_mem;
diff --git a/drivers/usb/misc/idmouse.c b/drivers/usb/misc/idmouse.c
index 1f649eedfa68..0f6b3464c2d6 100644
--- a/drivers/usb/misc/idmouse.c
+++ b/drivers/usb/misc/idmouse.c
@@ -330,7 +330,7 @@ static int idmouse_probe(struct usb_interface *interface,
return -ENODEV;
/* allocate memory for our device state and initialize it */
- dev = kzalloc_obj(*dev, GFP_KERNEL);
+ dev = kzalloc_obj(*dev);
if (dev == NULL)
return -ENOMEM;
diff --git a/drivers/usb/misc/iowarrior.c b/drivers/usb/misc/iowarrior.c
index 5f882cb6ff07..18670dfed2e7 100644
--- a/drivers/usb/misc/iowarrior.c
+++ b/drivers/usb/misc/iowarrior.c
@@ -777,7 +777,7 @@ static int iowarrior_probe(struct usb_interface *interface,
int res;
/* allocate memory for our device state and initialize it */
- dev = kzalloc_obj(struct iowarrior, GFP_KERNEL);
+ dev = kzalloc_obj(struct iowarrior);
if (!dev)
return retval;
diff --git a/drivers/usb/misc/ldusb.c b/drivers/usb/misc/ldusb.c
index cb7125a5b27f..c74f142f6637 100644
--- a/drivers/usb/misc/ldusb.c
+++ b/drivers/usb/misc/ldusb.c
@@ -656,7 +656,7 @@ static int ld_usb_probe(struct usb_interface *intf, const struct usb_device_id *
/* allocate memory for our device state and initialize it */
- dev = kzalloc_obj(*dev, GFP_KERNEL);
+ dev = kzalloc_obj(*dev);
if (!dev)
goto exit;
mutex_init(&dev->mutex);
diff --git a/drivers/usb/misc/legousbtower.c b/drivers/usb/misc/legousbtower.c
index a2909dee0d2a..052ffc2e71ee 100644
--- a/drivers/usb/misc/legousbtower.c
+++ b/drivers/usb/misc/legousbtower.c
@@ -748,7 +748,7 @@ static int tower_probe(struct usb_interface *interface, const struct usb_device_
int result;
/* allocate memory for our device state and initialize it */
- dev = kzalloc_obj(*dev, GFP_KERNEL);
+ dev = kzalloc_obj(*dev);
if (!dev)
goto exit;
diff --git a/drivers/usb/misc/lvstest.c b/drivers/usb/misc/lvstest.c
index 52d84e2d8193..9b6e10177f80 100644
--- a/drivers/usb/misc/lvstest.c
+++ b/drivers/usb/misc/lvstest.c
@@ -260,7 +260,7 @@ static ssize_t get_dev_desc_store(struct device *dev,
struct usb_device_descriptor *descriptor;
int ret;
- descriptor = kmalloc_obj(*descriptor, GFP_KERNEL);
+ descriptor = kmalloc_obj(*descriptor);
if (!descriptor)
return -ENOMEM;
diff --git a/drivers/usb/misc/onboard_usb_dev.c b/drivers/usb/misc/onboard_usb_dev.c
index 40572d7192f6..ba37eb99efba 100644
--- a/drivers/usb/misc/onboard_usb_dev.c
+++ b/drivers/usb/misc/onboard_usb_dev.c
@@ -202,7 +202,7 @@ static int onboard_dev_add_usbdev(struct onboard_dev *onboard_dev,
goto error;
}
- node = kzalloc_obj(*node, GFP_KERNEL);
+ node = kzalloc_obj(*node);
if (!node) {
err = -ENOMEM;
goto error;
diff --git a/drivers/usb/misc/onboard_usb_dev_pdevs.c b/drivers/usb/misc/onboard_usb_dev_pdevs.c
index 2550108bf73c..cdb6949e18ec 100644
--- a/drivers/usb/misc/onboard_usb_dev_pdevs.c
+++ b/drivers/usb/misc/onboard_usb_dev_pdevs.c
@@ -109,7 +109,7 @@ void onboard_dev_create_pdevs(struct usb_device *parent_hub, struct list_head *p
goto node_put;
}
- pdle = kzalloc_obj(*pdle, GFP_KERNEL);
+ pdle = kzalloc_obj(*pdle);
if (!pdle) {
of_platform_device_destroy(&pdev->dev, NULL);
goto node_put;
diff --git a/drivers/usb/misc/sisusbvga/sisusbvga.c b/drivers/usb/misc/sisusbvga/sisusbvga.c
index be7e7abc47c6..3e75a7c24828 100644
--- a/drivers/usb/misc/sisusbvga/sisusbvga.c
+++ b/drivers/usb/misc/sisusbvga/sisusbvga.c
@@ -2797,7 +2797,7 @@ static int sisusb_probe(struct usb_interface *intf,
dev->devnum);
/* Allocate memory for our private */
- sisusb = kzalloc_obj(*sisusb, GFP_KERNEL);
+ sisusb = kzalloc_obj(*sisusb);
if (!sisusb)
return -ENOMEM;
diff --git a/drivers/usb/misc/trancevibrator.c b/drivers/usb/misc/trancevibrator.c
index a43f2ef30433..6aaec2db360b 100644
--- a/drivers/usb/misc/trancevibrator.c
+++ b/drivers/usb/misc/trancevibrator.c
@@ -86,7 +86,7 @@ static int tv_probe(struct usb_interface *interface,
struct trancevibrator *dev;
int retval;
- dev = kzalloc_obj(struct trancevibrator, GFP_KERNEL);
+ dev = kzalloc_obj(struct trancevibrator);
if (!dev) {
retval = -ENOMEM;
goto error;
diff --git a/drivers/usb/misc/usb-ljca.c b/drivers/usb/misc/usb-ljca.c
index a959dd824f0e..7e85fd12da56 100644
--- a/drivers/usb/misc/usb-ljca.c
+++ b/drivers/usb/misc/usb-ljca.c
@@ -529,7 +529,7 @@ static int ljca_new_client_device(struct ljca_adapter *adap, u8 type, u8 id,
struct ljca_client *client;
int ret;
- client = kzalloc_obj(*client, GFP_KERNEL);
+ client = kzalloc_obj(*client);
if (!client) {
kfree(data);
return -ENOMEM;
@@ -597,7 +597,7 @@ static int ljca_enumerate_gpio(struct ljca_adapter *adap)
return -EINVAL;
/* construct platform data */
- gpio_info = kzalloc_obj(*gpio_info, GFP_KERNEL);
+ gpio_info = kzalloc_obj(*gpio_info);
if (!gpio_info)
return -ENOMEM;
gpio_info->num = gpio_num;
@@ -630,7 +630,7 @@ static int ljca_enumerate_i2c(struct ljca_adapter *adap)
for (i = 0; i < desc->num; i++) {
/* construct platform data */
- i2c_info = kzalloc_obj(*i2c_info, GFP_KERNEL);
+ i2c_info = kzalloc_obj(*i2c_info);
if (!i2c_info)
return -ENOMEM;
@@ -669,7 +669,7 @@ static int ljca_enumerate_spi(struct ljca_adapter *adap)
for (i = 0; i < desc->num; i++) {
/* construct platform data */
- spi_info = kzalloc_obj(*spi_info, GFP_KERNEL);
+ spi_info = kzalloc_obj(*spi_info);
if (!spi_info)
return -ENOMEM;
diff --git a/drivers/usb/misc/usbio.c b/drivers/usb/misc/usbio.c
index 50ff9f1ca78f..2e68d48a2cc0 100644
--- a/drivers/usb/misc/usbio.c
+++ b/drivers/usb/misc/usbio.c
@@ -439,7 +439,7 @@ static int usbio_add_client(struct usbio_device *usbio, char *name, u8 id, void
struct auxiliary_device *adev;
int ret;
- client = kzalloc_obj(*client, GFP_KERNEL);
+ client = kzalloc_obj(*client);
if (!client)
return -ENOMEM;
diff --git a/drivers/usb/misc/usblcd.c b/drivers/usb/misc/usblcd.c
index be798a293904..f794695dea9d 100644
--- a/drivers/usb/misc/usblcd.c
+++ b/drivers/usb/misc/usblcd.c
@@ -323,7 +323,7 @@ static int lcd_probe(struct usb_interface *interface,
int retval;
/* allocate memory for our device state and initialize it */
- dev = kzalloc_obj(*dev, GFP_KERNEL);
+ dev = kzalloc_obj(*dev);
if (!dev)
return -ENOMEM;
diff --git a/drivers/usb/misc/usbsevseg.c b/drivers/usb/misc/usbsevseg.c
index 97fcb35513ce..b37bf53dd54f 100644
--- a/drivers/usb/misc/usbsevseg.c
+++ b/drivers/usb/misc/usbsevseg.c
@@ -308,7 +308,7 @@ static int sevseg_probe(struct usb_interface *interface,
struct usb_sevsegdev *mydev;
int rc = -ENOMEM;
- mydev = kzalloc_obj(struct usb_sevsegdev, GFP_KERNEL);
+ mydev = kzalloc_obj(struct usb_sevsegdev);
if (!mydev)
goto error_mem;
diff --git a/drivers/usb/misc/usbtest.c b/drivers/usb/misc/usbtest.c
index 689cf82ce47d..98071b25ac07 100644
--- a/drivers/usb/misc/usbtest.c
+++ b/drivers/usb/misc/usbtest.c
@@ -545,7 +545,7 @@ alloc_sglist(int nents, int max, int vary, struct usbtest_dev *dev, int pipe)
if (max == 0)
return NULL;
- sg = kmalloc_objs(*sg, nents, GFP_KERNEL);
+ sg = kmalloc_objs(*sg, nents);
if (!sg)
return NULL;
sg_init_table(sg, nents);
@@ -1221,7 +1221,7 @@ test_ctrl_queue(struct usbtest_dev *dev, struct usbtest_param_32 *param)
* as with bulk/intr sglists, sglen is the queue depth; it also
* controls which subtests run (more tests than sglen) or rerun.
*/
- urb = kzalloc_objs(struct urb *, param->sglen, GFP_KERNEL);
+ urb = kzalloc_objs(struct urb *, param->sglen);
if (!urb)
return -ENOMEM;
for (i = 0; i < param->sglen; i++) {
@@ -1370,7 +1370,7 @@ test_ctrl_queue(struct usbtest_dev *dev, struct usbtest_param_32 *param)
if (!u)
goto cleanup;
- reqp = kmalloc_obj(*reqp, GFP_KERNEL);
+ reqp = kmalloc_obj(*reqp);
if (!reqp)
goto cleanup;
reqp->setup = req;
@@ -1572,7 +1572,7 @@ static int unlink_queued(struct usbtest_dev *dev, int pipe, unsigned num,
memset(buf, 0, size);
/* Allocate and init the urbs we'll queue */
- ctx.urbs = kzalloc_objs(struct urb *, num, GFP_KERNEL);
+ ctx.urbs = kzalloc_objs(struct urb *, num);
if (!ctx.urbs)
goto free_buf;
for (i = 0; i < num; i++) {
@@ -2052,7 +2052,7 @@ test_queue(struct usbtest_dev *dev, struct usbtest_param_32 *param,
if (param->sglen > MAX_SGLEN)
return -EINVAL;
- urbs = kzalloc_objs(*urbs, param->sglen, GFP_KERNEL);
+ urbs = kzalloc_objs(*urbs, param->sglen);
if (!urbs)
return -ENOMEM;
@@ -2786,7 +2786,7 @@ usbtest_probe(struct usb_interface *intf, const struct usb_device_id *id)
}
#endif
- dev = kzalloc_obj(*dev, GFP_KERNEL);
+ dev = kzalloc_obj(*dev);
if (!dev)
return -ENOMEM;
info = (struct usbtest_info *) id->driver_info;
diff --git a/drivers/usb/misc/uss720.c b/drivers/usb/misc/uss720.c
index 46356d099d26..ec8bd968c4de 100644
--- a/drivers/usb/misc/uss720.c
+++ b/drivers/usb/misc/uss720.c
@@ -701,7 +701,7 @@ static int uss720_probe(struct usb_interface *intf,
/*
* Allocate parport interface
*/
- priv = kzalloc_obj(struct parport_uss720_private, GFP_KERNEL);
+ priv = kzalloc_obj(struct parport_uss720_private);
if (!priv) {
usb_put_dev(usbdev);
return -ENOMEM;
diff --git a/drivers/usb/misc/yurex.c b/drivers/usb/misc/yurex.c
index 2e2057ef5b68..9189e4bb213a 100644
--- a/drivers/usb/misc/yurex.c
+++ b/drivers/usb/misc/yurex.c
@@ -197,7 +197,7 @@ static int yurex_probe(struct usb_interface *interface, const struct usb_device_
int res;
/* allocate memory for our device state and initialize it */
- dev = kzalloc_obj(*dev, GFP_KERNEL);
+ dev = kzalloc_obj(*dev);
if (!dev)
goto error;
kref_init(&dev->kref);
diff --git a/drivers/usb/mon/mon_bin.c b/drivers/usb/mon/mon_bin.c
index c0c4eb0a166d..d84749829963 100644
--- a/drivers/usb/mon/mon_bin.c
+++ b/drivers/usb/mon/mon_bin.c
@@ -694,7 +694,7 @@ static int mon_bin_open(struct inode *inode, struct file *file)
return -ENODEV;
}
- rp = kzalloc_obj(struct mon_reader_bin, GFP_KERNEL);
+ rp = kzalloc_obj(struct mon_reader_bin);
if (rp == NULL) {
rc = -ENOMEM;
goto err_alloc;
diff --git a/drivers/usb/mon/mon_main.c b/drivers/usb/mon/mon_main.c
index b3a68ac6fb98..e4fff194fea0 100644
--- a/drivers/usb/mon/mon_main.c
+++ b/drivers/usb/mon/mon_main.c
@@ -273,7 +273,7 @@ static void mon_bus_init(struct usb_bus *ubus)
{
struct mon_bus *mbus;
- mbus = kzalloc_obj(struct mon_bus, GFP_KERNEL);
+ mbus = kzalloc_obj(struct mon_bus);
if (mbus == NULL)
goto err_alloc;
kref_init(&mbus->ref);
diff --git a/drivers/usb/mon/mon_stat.c b/drivers/usb/mon/mon_stat.c
index 8329c1fc719e..3ee2e483da57 100644
--- a/drivers/usb/mon/mon_stat.c
+++ b/drivers/usb/mon/mon_stat.c
@@ -29,7 +29,7 @@ static int mon_stat_open(struct inode *inode, struct file *file)
struct mon_bus *mbus;
struct snap *sp;
- sp = kmalloc_obj(struct snap, GFP_KERNEL);
+ sp = kmalloc_obj(struct snap);
if (sp == NULL)
return -ENOMEM;
diff --git a/drivers/usb/mon/mon_text.c b/drivers/usb/mon/mon_text.c
index b55016068b47..4c8e2518e407 100644
--- a/drivers/usb/mon/mon_text.c
+++ b/drivers/usb/mon/mon_text.c
@@ -330,7 +330,7 @@ static int mon_text_open(struct inode *inode, struct file *file)
mutex_lock(&mon_lock);
mbus = inode->i_private;
- rp = kzalloc_obj(struct mon_reader_text, GFP_KERNEL);
+ rp = kzalloc_obj(struct mon_reader_text);
if (rp == NULL) {
rc = -ENOMEM;
goto err_alloc;
diff --git a/drivers/usb/mtu3/mtu3_core.c b/drivers/usb/mtu3/mtu3_core.c
index 9215373a9738..66dbfe1705d5 100644
--- a/drivers/usb/mtu3/mtu3_core.c
+++ b/drivers/usb/mtu3/mtu3_core.c
@@ -613,7 +613,7 @@ static int mtu3_mem_alloc(struct mtu3 *mtu)
/* one for ep0, another is reserved */
mtu->num_eps = min(in_ep_num, out_ep_num) + 1;
- ep_array = kzalloc_objs(*ep_array, mtu->num_eps * 2, GFP_KERNEL);
+ ep_array = kzalloc_objs(*ep_array, mtu->num_eps * 2);
if (ep_array == NULL)
return -ENOMEM;
diff --git a/drivers/usb/musb/musb_cppi41.c b/drivers/usb/musb/musb_cppi41.c
index 240953cdf46d..28e958fcc862 100644
--- a/drivers/usb/musb/musb_cppi41.c
+++ b/drivers/usb/musb/musb_cppi41.c
@@ -756,7 +756,7 @@ cppi41_dma_controller_create(struct musb *musb, void __iomem *base)
return NULL;
}
- controller = kzalloc_obj(*controller, GFP_KERNEL);
+ controller = kzalloc_obj(*controller);
if (!controller)
goto kzalloc_fail;
diff --git a/drivers/usb/musb/musbhsdma.c b/drivers/usb/musb/musbhsdma.c
index 9cd4616d853e..8c6c643fcb2c 100644
--- a/drivers/usb/musb/musbhsdma.c
+++ b/drivers/usb/musb/musbhsdma.c
@@ -395,7 +395,7 @@ dma_controller_alloc(struct musb *musb, void __iomem *base)
{
struct musb_dma_controller *controller;
- controller = kzalloc_obj(*controller, GFP_KERNEL);
+ controller = kzalloc_obj(*controller);
if (!controller)
return NULL;
diff --git a/drivers/usb/musb/tusb6010_omap.c b/drivers/usb/musb/tusb6010_omap.c
index ed8fea4738cd..36ee61a52e7e 100644
--- a/drivers/usb/musb/tusb6010_omap.c
+++ b/drivers/usb/musb/tusb6010_omap.c
@@ -596,7 +596,7 @@ tusb_dma_controller_create(struct musb *musb, void __iomem *base)
| TUSB_DMA_REQ_CONF_DMA_REQ_EN(0x3f)
| TUSB_DMA_REQ_CONF_DMA_REQ_ASSER(2));
- tusb_dma = kzalloc_obj(struct tusb_omap_dma, GFP_KERNEL);
+ tusb_dma = kzalloc_obj(struct tusb_omap_dma);
if (!tusb_dma)
goto out;
@@ -615,13 +615,13 @@ tusb_dma_controller_create(struct musb *musb, void __iomem *base)
struct dma_channel *ch;
struct tusb_omap_dma_ch *chdat;
- ch = kzalloc_obj(struct dma_channel, GFP_KERNEL);
+ ch = kzalloc_obj(struct dma_channel);
if (!ch)
goto cleanup;
dma_channel_pool[i] = ch;
- chdat = kzalloc_obj(struct tusb_omap_dma_ch, GFP_KERNEL);
+ chdat = kzalloc_obj(struct tusb_omap_dma_ch);
if (!chdat)
goto cleanup;
diff --git a/drivers/usb/musb/ux500_dma.c b/drivers/usb/musb/ux500_dma.c
index 0621a6c0c6b6..bbb4978c0cd5 100644
--- a/drivers/usb/musb/ux500_dma.c
+++ b/drivers/usb/musb/ux500_dma.c
@@ -362,7 +362,7 @@ ux500_dma_controller_create(struct musb *musb, void __iomem *base)
struct resource *iomem;
int ret;
- controller = kzalloc_obj(*controller, GFP_KERNEL);
+ controller = kzalloc_obj(*controller);
if (!controller)
goto kzalloc_fail;
diff --git a/drivers/usb/phy/phy-fsl-usb.c b/drivers/usb/phy/phy-fsl-usb.c
index f5712dddd1fd..35d79f11b03d 100644
--- a/drivers/usb/phy/phy-fsl-usb.c
+++ b/drivers/usb/phy/phy-fsl-usb.c
@@ -779,11 +779,11 @@ static int fsl_otg_conf(struct platform_device *pdev)
return 0;
/* allocate space to fsl otg device */
- fsl_otg_tc = kzalloc_obj(struct fsl_otg, GFP_KERNEL);
+ fsl_otg_tc = kzalloc_obj(struct fsl_otg);
if (!fsl_otg_tc)
return -ENOMEM;
- fsl_otg_tc->phy.otg = kzalloc_obj(struct usb_otg, GFP_KERNEL);
+ fsl_otg_tc->phy.otg = kzalloc_obj(struct usb_otg);
if (!fsl_otg_tc->phy.otg) {
kfree(fsl_otg_tc);
return -ENOMEM;
diff --git a/drivers/usb/phy/phy-fsl-usb.h b/drivers/usb/phy/phy-fsl-usb.h
index 487a11ff4391..95bfe7f1b83a 100644
--- a/drivers/usb/phy/phy-fsl-usb.h
+++ b/drivers/usb/phy/phy-fsl-usb.h
@@ -345,7 +345,7 @@ inline struct fsl_otg_timer *otg_timer_initializer
{
struct fsl_otg_timer *timer;
- timer = kmalloc_obj(struct fsl_otg_timer, GFP_KERNEL);
+ timer = kmalloc_obj(struct fsl_otg_timer);
if (!timer)
return NULL;
timer->function = function;
diff --git a/drivers/usb/renesas_usbhs/mod_gadget.c b/drivers/usb/renesas_usbhs/mod_gadget.c
index ca96c0164593..1539e8e6901d 100644
--- a/drivers/usb/renesas_usbhs/mod_gadget.c
+++ b/drivers/usb/renesas_usbhs/mod_gadget.c
@@ -1084,11 +1084,11 @@ int usbhs_mod_gadget_probe(struct usbhs_priv *priv)
int i;
int ret;
- gpriv = kzalloc_obj(struct usbhsg_gpriv, GFP_KERNEL);
+ gpriv = kzalloc_obj(struct usbhsg_gpriv);
if (!gpriv)
return -ENOMEM;
- uep = kzalloc_objs(struct usbhsg_uep, pipe_size, GFP_KERNEL);
+ uep = kzalloc_objs(struct usbhsg_uep, pipe_size);
if (!uep) {
ret = -ENOMEM;
goto usbhs_mod_gadget_probe_err_gpriv;
diff --git a/drivers/usb/renesas_usbhs/pipe.c b/drivers/usb/renesas_usbhs/pipe.c
index f48a22037f43..e4e897e8256f 100644
--- a/drivers/usb/renesas_usbhs/pipe.c
+++ b/drivers/usb/renesas_usbhs/pipe.c
@@ -822,7 +822,7 @@ int usbhs_pipe_probe(struct usbhs_priv *priv)
return -EINVAL;
}
- info->pipe = kzalloc_objs(struct usbhs_pipe, pipe_size, GFP_KERNEL);
+ info->pipe = kzalloc_objs(struct usbhs_pipe, pipe_size);
if (!info->pipe)
return -ENOMEM;
diff --git a/drivers/usb/roles/class.c b/drivers/usb/roles/class.c
index 31c2c3e370dd..b8e28ceca51e 100644
--- a/drivers/usb/roles/class.c
+++ b/drivers/usb/roles/class.c
@@ -364,7 +364,7 @@ usb_role_switch_register(struct device *parent,
if (!desc || !desc->set)
return ERR_PTR(-EINVAL);
- sw = kzalloc_obj(*sw, GFP_KERNEL);
+ sw = kzalloc_obj(*sw);
if (!sw)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/usb/serial/ark3116.c b/drivers/usb/serial/ark3116.c
index 336d199e4994..d974da43fba3 100644
--- a/drivers/usb/serial/ark3116.c
+++ b/drivers/usb/serial/ark3116.c
@@ -126,7 +126,7 @@ static int ark3116_port_probe(struct usb_serial_port *port)
struct usb_serial *serial = port->serial;
struct ark3116_private *priv;
- priv = kzalloc_obj(*priv, GFP_KERNEL);
+ priv = kzalloc_obj(*priv);
if (!priv)
return -ENOMEM;
diff --git a/drivers/usb/serial/belkin_sa.c b/drivers/usb/serial/belkin_sa.c
index 334f59c512d7..38ac910b1082 100644
--- a/drivers/usb/serial/belkin_sa.c
+++ b/drivers/usb/serial/belkin_sa.c
@@ -114,7 +114,7 @@ static int belkin_sa_port_probe(struct usb_serial_port *port)
struct usb_device *dev = port->serial->dev;
struct belkin_sa_private *priv;
- priv = kmalloc_obj(struct belkin_sa_private, GFP_KERNEL);
+ priv = kmalloc_obj(struct belkin_sa_private);
if (!priv)
return -ENOMEM;
diff --git a/drivers/usb/serial/ch341.c b/drivers/usb/serial/ch341.c
index ceb2612a9228..569f4aede215 100644
--- a/drivers/usb/serial/ch341.c
+++ b/drivers/usb/serial/ch341.c
@@ -381,7 +381,7 @@ static int ch341_port_probe(struct usb_serial_port *port)
struct ch341_private *priv;
int r;
- priv = kzalloc_obj(struct ch341_private, GFP_KERNEL);
+ priv = kzalloc_obj(struct ch341_private);
if (!priv)
return -ENOMEM;
diff --git a/drivers/usb/serial/console.c b/drivers/usb/serial/console.c
index 4b5f56bd01e8..29f09190846e 100644
--- a/drivers/usb/serial/console.c
+++ b/drivers/usb/serial/console.c
@@ -133,7 +133,7 @@ static int usb_console_setup(struct console *co, char *options)
* the termios structure, then later call set_termios to
* configure according to command line arguments
*/
- tty = kzalloc_obj(*tty, GFP_KERNEL);
+ tty = kzalloc_obj(*tty);
if (!tty) {
retval = -ENOMEM;
goto reset_open_count;
diff --git a/drivers/usb/serial/cp210x.c b/drivers/usb/serial/cp210x.c
index 3c30dd095b32..333b8b463704 100644
--- a/drivers/usb/serial/cp210x.c
+++ b/drivers/usb/serial/cp210x.c
@@ -2006,7 +2006,7 @@ static int cp210x_port_probe(struct usb_serial_port *port)
struct usb_serial *serial = port->serial;
struct cp210x_port_private *port_priv;
- port_priv = kzalloc_obj(*port_priv, GFP_KERNEL);
+ port_priv = kzalloc_obj(*port_priv);
if (!port_priv)
return -ENOMEM;
@@ -2163,7 +2163,7 @@ static int cp210x_attach(struct usb_serial *serial)
int result;
struct cp210x_serial_private *priv;
- priv = kzalloc_obj(*priv, GFP_KERNEL);
+ priv = kzalloc_obj(*priv);
if (!priv)
return -ENOMEM;
diff --git a/drivers/usb/serial/cyberjack.c b/drivers/usb/serial/cyberjack.c
index 609d3a700b70..4e8ceb23c27d 100644
--- a/drivers/usb/serial/cyberjack.c
+++ b/drivers/usb/serial/cyberjack.c
@@ -101,7 +101,7 @@ static int cyberjack_port_probe(struct usb_serial_port *port)
struct cyberjack_private *priv;
int result;
- priv = kmalloc_obj(struct cyberjack_private, GFP_KERNEL);
+ priv = kmalloc_obj(struct cyberjack_private);
if (!priv)
return -ENOMEM;
diff --git a/drivers/usb/serial/cypress_m8.c b/drivers/usb/serial/cypress_m8.c
index 52d52a92b7ea..afff1a0f4298 100644
--- a/drivers/usb/serial/cypress_m8.c
+++ b/drivers/usb/serial/cypress_m8.c
@@ -445,7 +445,7 @@ static int cypress_generic_port_probe(struct usb_serial_port *port)
return -ENODEV;
}
- priv = kzalloc_obj(struct cypress_private, GFP_KERNEL);
+ priv = kzalloc_obj(struct cypress_private);
if (!priv)
return -ENOMEM;
diff --git a/drivers/usb/serial/digi_acceleport.c b/drivers/usb/serial/digi_acceleport.c
index 8a8d4dc899b0..d515df045c4c 100644
--- a/drivers/usb/serial/digi_acceleport.c
+++ b/drivers/usb/serial/digi_acceleport.c
@@ -1209,7 +1209,7 @@ static int digi_port_init(struct usb_serial_port *port, unsigned port_num)
{
struct digi_port *priv;
- priv = kzalloc_obj(*priv, GFP_KERNEL);
+ priv = kzalloc_obj(*priv);
if (!priv)
return -ENOMEM;
@@ -1231,7 +1231,7 @@ static int digi_startup(struct usb_serial *serial)
struct digi_serial *serial_priv;
int ret;
- serial_priv = kzalloc_obj(*serial_priv, GFP_KERNEL);
+ serial_priv = kzalloc_obj(*serial_priv);
if (!serial_priv)
return -ENOMEM;
diff --git a/drivers/usb/serial/ftdi_sio.c b/drivers/usb/serial/ftdi_sio.c
index 7500e1a85c88..af14548fa03d 100644
--- a/drivers/usb/serial/ftdi_sio.c
+++ b/drivers/usb/serial/ftdi_sio.c
@@ -2188,7 +2188,7 @@ static int ftdi_port_probe(struct usb_serial_port *port)
struct ftdi_private *priv;
int result;
- priv = kzalloc_obj(struct ftdi_private, GFP_KERNEL);
+ priv = kzalloc_obj(struct ftdi_private);
if (!priv)
return -ENOMEM;
diff --git a/drivers/usb/serial/garmin_gps.c b/drivers/usb/serial/garmin_gps.c
index aa7561aba927..7205483a0115 100644
--- a/drivers/usb/serial/garmin_gps.c
+++ b/drivers/usb/serial/garmin_gps.c
@@ -1373,7 +1373,7 @@ static int garmin_port_probe(struct usb_serial_port *port)
int status;
struct garmin_data *garmin_data_p;
- garmin_data_p = kzalloc_obj(struct garmin_data, GFP_KERNEL);
+ garmin_data_p = kzalloc_obj(struct garmin_data);
if (!garmin_data_p)
return -ENOMEM;
diff --git a/drivers/usb/serial/io_edgeport.c b/drivers/usb/serial/io_edgeport.c
index b036fcde63e4..58694b8943d1 100644
--- a/drivers/usb/serial/io_edgeport.c
+++ b/drivers/usb/serial/io_edgeport.c
@@ -498,7 +498,7 @@ static int get_epic_descriptor(struct edgeport_serial *ep)
ep->is_epic = 0;
- epic = kmalloc_obj(*epic, GFP_KERNEL);
+ epic = kmalloc_obj(*epic);
if (!epic)
return -ENOMEM;
@@ -2714,7 +2714,7 @@ static int edge_startup(struct usb_serial *serial)
dev = serial->dev;
/* create our private serial structure */
- edge_serial = kzalloc_obj(struct edgeport_serial, GFP_KERNEL);
+ edge_serial = kzalloc_obj(struct edgeport_serial);
if (!edge_serial)
return -ENOMEM;
@@ -2956,7 +2956,7 @@ static int edge_port_probe(struct usb_serial_port *port)
{
struct edgeport_port *edge_port;
- edge_port = kzalloc_obj(*edge_port, GFP_KERNEL);
+ edge_port = kzalloc_obj(*edge_port);
if (!edge_port)
return -ENOMEM;
diff --git a/drivers/usb/serial/io_ti.c b/drivers/usb/serial/io_ti.c
index fed02fdf3dcb..cb55370e036f 100644
--- a/drivers/usb/serial/io_ti.c
+++ b/drivers/usb/serial/io_ti.c
@@ -528,7 +528,7 @@ static int tx_active(struct edgeport_port *port)
u8 *lsr;
int bytes_left = 0;
- oedb = kmalloc_obj(*oedb, GFP_KERNEL);
+ oedb = kmalloc_obj(*oedb);
if (!oedb)
return -ENOMEM;
@@ -680,7 +680,7 @@ static int check_i2c_image(struct edgeport_serial *serial)
u8 *buffer;
u16 ttype;
- rom_desc = kmalloc_obj(*rom_desc, GFP_KERNEL);
+ rom_desc = kmalloc_obj(*rom_desc);
if (!rom_desc)
return -ENOMEM;
@@ -759,7 +759,7 @@ static int get_manuf_info(struct edgeport_serial *serial, u8 *buffer)
struct edge_ti_manuf_descriptor *desc;
struct device *dev = &serial->serial->dev->dev;
- rom_desc = kmalloc_obj(*rom_desc, GFP_KERNEL);
+ rom_desc = kmalloc_obj(*rom_desc);
if (!rom_desc)
return -ENOMEM;
@@ -1089,7 +1089,7 @@ static int do_download_mode(struct edgeport_serial *serial,
* Validate Hardware version number
* Read Manufacturing Descriptor from TI Based Edgeport
*/
- ti_manuf_desc = kmalloc_obj(*ti_manuf_desc, GFP_KERNEL);
+ ti_manuf_desc = kmalloc_obj(*ti_manuf_desc);
if (!ti_manuf_desc)
return -ENOMEM;
@@ -1107,7 +1107,7 @@ static int do_download_mode(struct edgeport_serial *serial,
return -EINVAL;
}
- rom_desc = kmalloc_obj(*rom_desc, GFP_KERNEL);
+ rom_desc = kmalloc_obj(*rom_desc);
if (!rom_desc) {
kfree(ti_manuf_desc);
return -ENOMEM;
@@ -1123,7 +1123,7 @@ static int do_download_mode(struct edgeport_serial *serial,
dev_dbg(dev, "%s - Found Type FIRMWARE (Type 2) record\n",
__func__);
- firmware_version = kmalloc_obj(*firmware_version, GFP_KERNEL);
+ firmware_version = kmalloc_obj(*firmware_version);
if (!firmware_version) {
kfree(rom_desc);
kfree(ti_manuf_desc);
@@ -1418,7 +1418,7 @@ static int do_boot_mode(struct edgeport_serial *serial,
* Validate Hardware version number
* Read Manufacturing Descriptor from TI Based Edgeport
*/
- ti_manuf_desc = kmalloc_obj(*ti_manuf_desc, GFP_KERNEL);
+ ti_manuf_desc = kmalloc_obj(*ti_manuf_desc);
if (!ti_manuf_desc)
return -ENOMEM;
@@ -2218,7 +2218,7 @@ static void change_port_settings(struct tty_struct *tty,
unsigned cflag;
int status;
- config = kmalloc_obj(*config, GFP_KERNEL);
+ config = kmalloc_obj(*config);
if (!config) {
tty->termios = *old_termios;
return;
@@ -2457,7 +2457,7 @@ static void edge_heartbeat_work(struct work_struct *work)
serial = container_of(work, struct edgeport_serial,
heartbeat_work.work);
- rom_desc = kmalloc_obj(*rom_desc, GFP_KERNEL);
+ rom_desc = kmalloc_obj(*rom_desc);
/* Descriptor address request is enough to reset the firmware timer */
if (!rom_desc || !get_descriptor_addr(serial, I2C_DESC_TYPE_ION,
@@ -2496,7 +2496,7 @@ static int edge_startup(struct usb_serial *serial)
u16 product_id;
/* create our private serial structure */
- edge_serial = kzalloc_obj(struct edgeport_serial, GFP_KERNEL);
+ edge_serial = kzalloc_obj(struct edgeport_serial);
if (!edge_serial)
return -ENOMEM;
@@ -2550,7 +2550,7 @@ static int edge_port_probe(struct usb_serial_port *port)
struct edgeport_port *edge_port;
int ret;
- edge_port = kzalloc_obj(*edge_port, GFP_KERNEL);
+ edge_port = kzalloc_obj(*edge_port);
if (!edge_port)
return -ENOMEM;
diff --git a/drivers/usb/serial/ipw.c b/drivers/usb/serial/ipw.c
index ec2b061c0e84..83709d678b3a 100644
--- a/drivers/usb/serial/ipw.c
+++ b/drivers/usb/serial/ipw.c
@@ -198,7 +198,7 @@ static int ipw_attach(struct usb_serial *serial)
{
struct usb_wwan_intf_private *data;
- data = kzalloc_obj(struct usb_wwan_intf_private, GFP_KERNEL);
+ data = kzalloc_obj(struct usb_wwan_intf_private);
if (!data)
return -ENOMEM;
diff --git a/drivers/usb/serial/ir-usb.c b/drivers/usb/serial/ir-usb.c
index 4eeec9c06a11..12e928d25ba1 100644
--- a/drivers/usb/serial/ir-usb.c
+++ b/drivers/usb/serial/ir-usb.c
@@ -126,7 +126,7 @@ irda_usb_find_class_desc(struct usb_serial *serial, unsigned int ifnum)
struct usb_irda_cs_descriptor *desc;
int ret;
- desc = kzalloc_obj(*desc, GFP_KERNEL);
+ desc = kzalloc_obj(*desc);
if (!desc)
return NULL;
diff --git a/drivers/usb/serial/iuu_phoenix.c b/drivers/usb/serial/iuu_phoenix.c
index 6feb886991d6..f8d6aa30a3e1 100644
--- a/drivers/usb/serial/iuu_phoenix.c
+++ b/drivers/usb/serial/iuu_phoenix.c
@@ -67,7 +67,7 @@ static int iuu_port_probe(struct usb_serial_port *port)
struct iuu_private *priv;
int ret;
- priv = kzalloc_obj(struct iuu_private, GFP_KERNEL);
+ priv = kzalloc_obj(struct iuu_private);
if (!priv)
return -ENOMEM;
diff --git a/drivers/usb/serial/keyspan.c b/drivers/usb/serial/keyspan.c
index ba3f80d21e92..46448843541a 100644
--- a/drivers/usb/serial/keyspan.c
+++ b/drivers/usb/serial/keyspan.c
@@ -2789,7 +2789,7 @@ static int keyspan_startup(struct usb_serial *serial)
}
/* Setup private data for serial driver */
- s_priv = kzalloc_obj(struct keyspan_serial_private, GFP_KERNEL);
+ s_priv = kzalloc_obj(struct keyspan_serial_private);
if (!s_priv)
return -ENOMEM;
@@ -2886,7 +2886,7 @@ static int keyspan_port_probe(struct usb_serial_port *port)
s_priv = usb_get_serial_data(serial);
d_details = s_priv->device_details;
- p_priv = kzalloc_obj(*p_priv, GFP_KERNEL);
+ p_priv = kzalloc_obj(*p_priv);
if (!p_priv)
return -ENOMEM;
diff --git a/drivers/usb/serial/keyspan_pda.c b/drivers/usb/serial/keyspan_pda.c
index 8a0f993ec7c6..5036600dd334 100644
--- a/drivers/usb/serial/keyspan_pda.c
+++ b/drivers/usb/serial/keyspan_pda.c
@@ -654,7 +654,7 @@ static int keyspan_pda_port_probe(struct usb_serial_port *port)
struct keyspan_pda_private *priv;
- priv = kmalloc_obj(struct keyspan_pda_private, GFP_KERNEL);
+ priv = kmalloc_obj(struct keyspan_pda_private);
if (!priv)
return -ENOMEM;
diff --git a/drivers/usb/serial/kl5kusb105.c b/drivers/usb/serial/kl5kusb105.c
index d2960271a1f7..ed8531a64768 100644
--- a/drivers/usb/serial/kl5kusb105.c
+++ b/drivers/usb/serial/kl5kusb105.c
@@ -189,7 +189,7 @@ static int klsi_105_port_probe(struct usb_serial_port *port)
{
struct klsi_105_private *priv;
- priv = kmalloc_obj(*priv, GFP_KERNEL);
+ priv = kmalloc_obj(*priv);
if (!priv)
return -ENOMEM;
@@ -378,7 +378,7 @@ static void klsi_105_set_termios(struct tty_struct *tty,
unsigned long flags;
speed_t baud;
- cfg = kmalloc_obj(*cfg, GFP_KERNEL);
+ cfg = kmalloc_obj(*cfg);
if (!cfg)
return;
diff --git a/drivers/usb/serial/kobil_sct.c b/drivers/usb/serial/kobil_sct.c
index 3f9311b3bdf9..6126afd67a7b 100644
--- a/drivers/usb/serial/kobil_sct.c
+++ b/drivers/usb/serial/kobil_sct.c
@@ -130,7 +130,7 @@ static int kobil_port_probe(struct usb_serial_port *port)
struct usb_serial *serial = port->serial;
struct kobil_private *priv;
- priv = kmalloc_obj(struct kobil_private, GFP_KERNEL);
+ priv = kmalloc_obj(struct kobil_private);
if (!priv)
return -ENOMEM;
diff --git a/drivers/usb/serial/mct_u232.c b/drivers/usb/serial/mct_u232.c
index 2bf86c3cc7ff..18844b92bd08 100644
--- a/drivers/usb/serial/mct_u232.c
+++ b/drivers/usb/serial/mct_u232.c
@@ -385,7 +385,7 @@ static int mct_u232_port_probe(struct usb_serial_port *port)
return -ENODEV;
}
- priv = kzalloc_obj(*priv, GFP_KERNEL);
+ priv = kzalloc_obj(*priv);
if (!priv)
return -ENOMEM;
diff --git a/drivers/usb/serial/metro-usb.c b/drivers/usb/serial/metro-usb.c
index 7e7fb49fc3d5..bc834cc48550 100644
--- a/drivers/usb/serial/metro-usb.c
+++ b/drivers/usb/serial/metro-usb.c
@@ -245,7 +245,7 @@ static int metrousb_port_probe(struct usb_serial_port *port)
{
struct metrousb_private *metro_priv;
- metro_priv = kzalloc_obj(*metro_priv, GFP_KERNEL);
+ metro_priv = kzalloc_obj(*metro_priv);
if (!metro_priv)
return -ENOMEM;
diff --git a/drivers/usb/serial/mos7720.c b/drivers/usb/serial/mos7720.c
index 1495d82bf838..94459408e7fb 100644
--- a/drivers/usb/serial/mos7720.c
+++ b/drivers/usb/serial/mos7720.c
@@ -555,7 +555,7 @@ static int mos7715_parport_init(struct usb_serial *serial)
struct mos7715_parport *mos_parport;
/* allocate and initialize parallel port control struct */
- mos_parport = kzalloc_obj(struct mos7715_parport, GFP_KERNEL);
+ mos_parport = kzalloc_obj(struct mos7715_parport);
if (!mos_parport)
return -ENOMEM;
@@ -1703,7 +1703,7 @@ static int mos7720_port_probe(struct usb_serial_port *port)
{
struct moschip_port *mos7720_port;
- mos7720_port = kzalloc_obj(*mos7720_port, GFP_KERNEL);
+ mos7720_port = kzalloc_obj(*mos7720_port);
if (!mos7720_port)
return -ENOMEM;
diff --git a/drivers/usb/serial/mos7840.c b/drivers/usb/serial/mos7840.c
index 065ac3777906..cc663d8191bd 100644
--- a/drivers/usb/serial/mos7840.c
+++ b/drivers/usb/serial/mos7840.c
@@ -1532,7 +1532,7 @@ static int mos7840_port_probe(struct usb_serial_port *port)
pnum = port->port_number;
dev_dbg(&port->dev, "mos7840_startup: configuring port %d\n", pnum);
- mos7840_port = kzalloc_obj(struct moschip_port, GFP_KERNEL);
+ mos7840_port = kzalloc_obj(struct moschip_port);
if (!mos7840_port)
return -ENOMEM;
diff --git a/drivers/usb/serial/omninet.c b/drivers/usb/serial/omninet.c
index 05f5ab767a53..aa1e9745f967 100644
--- a/drivers/usb/serial/omninet.c
+++ b/drivers/usb/serial/omninet.c
@@ -113,7 +113,7 @@ static int omninet_port_probe(struct usb_serial_port *port)
{
struct omninet_data *od;
- od = kzalloc_obj(*od, GFP_KERNEL);
+ od = kzalloc_obj(*od);
if (!od)
return -ENOMEM;
diff --git a/drivers/usb/serial/opticon.c b/drivers/usb/serial/opticon.c
index 0ced33c28545..e2bed477ad57 100644
--- a/drivers/usb/serial/opticon.c
+++ b/drivers/usb/serial/opticon.c
@@ -354,7 +354,7 @@ static int opticon_port_probe(struct usb_serial_port *port)
{
struct opticon_private *priv;
- priv = kzalloc_obj(*priv, GFP_KERNEL);
+ priv = kzalloc_obj(*priv);
if (!priv)
return -ENOMEM;
diff --git a/drivers/usb/serial/option.c b/drivers/usb/serial/option.c
index 261d852aaccf..e349ed66d2ac 100644
--- a/drivers/usb/serial/option.c
+++ b/drivers/usb/serial/option.c
@@ -2606,7 +2606,7 @@ static int option_attach(struct usb_serial *serial)
struct usb_wwan_intf_private *data;
unsigned long device_flags;
- data = kzalloc_obj(struct usb_wwan_intf_private, GFP_KERNEL);
+ data = kzalloc_obj(struct usb_wwan_intf_private);
if (!data)
return -ENOMEM;
diff --git a/drivers/usb/serial/oti6858.c b/drivers/usb/serial/oti6858.c
index 70ddda6a300e..3ef5b5d8ce1a 100644
--- a/drivers/usb/serial/oti6858.c
+++ b/drivers/usb/serial/oti6858.c
@@ -328,7 +328,7 @@ static int oti6858_port_probe(struct usb_serial_port *port)
{
struct oti6858_private *priv;
- priv = kzalloc_obj(*priv, GFP_KERNEL);
+ priv = kzalloc_obj(*priv);
if (!priv)
return -ENOMEM;
diff --git a/drivers/usb/serial/pl2303.c b/drivers/usb/serial/pl2303.c
index 75fd24019cba..50dc838e8115 100644
--- a/drivers/usb/serial/pl2303.c
+++ b/drivers/usb/serial/pl2303.c
@@ -503,7 +503,7 @@ static int pl2303_startup(struct usb_serial *serial)
type = ret;
dev_dbg(&serial->interface->dev, "device type: %s\n", pl2303_type_data[type].name);
- spriv = kzalloc_obj(*spriv, GFP_KERNEL);
+ spriv = kzalloc_obj(*spriv);
if (!spriv)
return -ENOMEM;
@@ -555,7 +555,7 @@ static int pl2303_port_probe(struct usb_serial_port *port)
{
struct pl2303_private *priv;
- priv = kzalloc_obj(*priv, GFP_KERNEL);
+ priv = kzalloc_obj(*priv);
if (!priv)
return -ENOMEM;
diff --git a/drivers/usb/serial/qcserial.c b/drivers/usb/serial/qcserial.c
index bbc3e33a2d81..1a930dc668e4 100644
--- a/drivers/usb/serial/qcserial.c
+++ b/drivers/usb/serial/qcserial.c
@@ -431,7 +431,7 @@ static int qc_attach(struct usb_serial *serial)
struct usb_wwan_intf_private *data;
bool sendsetup;
- data = kzalloc_obj(*data, GFP_KERNEL);
+ data = kzalloc_obj(*data);
if (!data)
return -ENOMEM;
diff --git a/drivers/usb/serial/quatech2.c b/drivers/usb/serial/quatech2.c
index 606beb6e12aa..b05c655b3cc4 100644
--- a/drivers/usb/serial/quatech2.c
+++ b/drivers/usb/serial/quatech2.c
@@ -626,7 +626,7 @@ static int qt2_attach(struct usb_serial *serial)
return status;
}
- serial_priv = kzalloc_obj(*serial_priv, GFP_KERNEL);
+ serial_priv = kzalloc_obj(*serial_priv);
if (!serial_priv)
return -ENOMEM;
@@ -657,7 +657,7 @@ static int qt2_port_probe(struct usb_serial_port *port)
struct qt2_port_private *port_priv;
u8 bEndpointAddress;
- port_priv = kzalloc_obj(*port_priv, GFP_KERNEL);
+ port_priv = kzalloc_obj(*port_priv);
if (!port_priv)
return -ENOMEM;
diff --git a/drivers/usb/serial/sierra.c b/drivers/usb/serial/sierra.c
index 3b6a025cbeb8..6e443aacae07 100644
--- a/drivers/usb/serial/sierra.c
+++ b/drivers/usb/serial/sierra.c
@@ -828,7 +828,7 @@ static int sierra_startup(struct usb_serial *serial)
{
struct sierra_intf_private *intfdata;
- intfdata = kzalloc_obj(*intfdata, GFP_KERNEL);
+ intfdata = kzalloc_obj(*intfdata);
if (!intfdata)
return -ENOMEM;
@@ -861,7 +861,7 @@ static int sierra_port_probe(struct usb_serial_port *port)
const struct sierra_iface_list *himemory_list;
u8 ifnum;
- portdata = kzalloc_obj(*portdata, GFP_KERNEL);
+ portdata = kzalloc_obj(*portdata);
if (!portdata)
return -ENOMEM;
diff --git a/drivers/usb/serial/spcp8x5.c b/drivers/usb/serial/spcp8x5.c
index df1d1eed1236..2fbb48f19efd 100644
--- a/drivers/usb/serial/spcp8x5.c
+++ b/drivers/usb/serial/spcp8x5.c
@@ -145,7 +145,7 @@ static int spcp8x5_port_probe(struct usb_serial_port *port)
const struct usb_device_id *id = usb_get_serial_data(port->serial);
struct spcp8x5_private *priv;
- priv = kzalloc_obj(*priv, GFP_KERNEL);
+ priv = kzalloc_obj(*priv);
if (!priv)
return -ENOMEM;
diff --git a/drivers/usb/serial/ssu100.c b/drivers/usb/serial/ssu100.c
index f73321fd5dfd..da6316410b77 100644
--- a/drivers/usb/serial/ssu100.c
+++ b/drivers/usb/serial/ssu100.c
@@ -326,7 +326,7 @@ static int ssu100_port_probe(struct usb_serial_port *port)
{
struct ssu100_port_private *priv;
- priv = kzalloc_obj(*priv, GFP_KERNEL);
+ priv = kzalloc_obj(*priv);
if (!priv)
return -ENOMEM;
diff --git a/drivers/usb/serial/symbolserial.c b/drivers/usb/serial/symbolserial.c
index 46158cfc546a..7a5aa39172a8 100644
--- a/drivers/usb/serial/symbolserial.c
+++ b/drivers/usb/serial/symbolserial.c
@@ -149,7 +149,7 @@ static int symbol_port_probe(struct usb_serial_port *port)
{
struct symbol_private *priv;
- priv = kzalloc_obj(*priv, GFP_KERNEL);
+ priv = kzalloc_obj(*priv);
if (!priv)
return -ENOMEM;
diff --git a/drivers/usb/serial/ti_usb_3410_5052.c b/drivers/usb/serial/ti_usb_3410_5052.c
index cb6b0c018809..658b54d8fcef 100644
--- a/drivers/usb/serial/ti_usb_3410_5052.c
+++ b/drivers/usb/serial/ti_usb_3410_5052.c
@@ -519,7 +519,7 @@ static int ti_startup(struct usb_serial *serial)
dev->descriptor.bNumConfigurations,
dev->actconfig->desc.bConfigurationValue);
- tdev = kzalloc_obj(struct ti_device, GFP_KERNEL);
+ tdev = kzalloc_obj(struct ti_device);
if (!tdev)
return -ENOMEM;
@@ -598,7 +598,7 @@ static int ti_port_probe(struct usb_serial_port *port)
{
struct ti_port *tport;
- tport = kzalloc_obj(*tport, GFP_KERNEL);
+ tport = kzalloc_obj(*tport);
if (!tport)
return -ENOMEM;
@@ -897,7 +897,7 @@ static void ti_set_termios(struct tty_struct *tty,
u16 wbaudrate;
u16 wflags = 0;
- config = kmalloc_obj(*config, GFP_KERNEL);
+ config = kmalloc_obj(*config);
if (!config)
return;
diff --git a/drivers/usb/serial/upd78f0730.c b/drivers/usb/serial/upd78f0730.c
index ecf0ecfceccb..78c4d3c19a8e 100644
--- a/drivers/usb/serial/upd78f0730.c
+++ b/drivers/usb/serial/upd78f0730.c
@@ -161,7 +161,7 @@ static int upd78f0730_port_probe(struct usb_serial_port *port)
{
struct upd78f0730_port_private *private;
- private = kzalloc_obj(*private, GFP_KERNEL);
+ private = kzalloc_obj(*private);
if (!private)
return -ENOMEM;
diff --git a/drivers/usb/serial/usb-serial.c b/drivers/usb/serial/usb-serial.c
index 26c40f8108e4..0e072fd87c3d 100644
--- a/drivers/usb/serial/usb-serial.c
+++ b/drivers/usb/serial/usb-serial.c
@@ -688,7 +688,7 @@ static struct usb_serial *create_serial(struct usb_device *dev,
{
struct usb_serial *serial;
- serial = kzalloc_obj(*serial, GFP_KERNEL);
+ serial = kzalloc_obj(*serial);
if (!serial)
return NULL;
serial->dev = usb_get_dev(dev);
@@ -1005,7 +1005,7 @@ static int usb_serial_probe(struct usb_interface *interface,
}
/* descriptor matches, let's find the endpoints needed */
- epds = kzalloc_obj(*epds, GFP_KERNEL);
+ epds = kzalloc_obj(*epds);
if (!epds) {
retval = -ENOMEM;
goto err_release_sibling;
@@ -1059,7 +1059,7 @@ static int usb_serial_probe(struct usb_interface *interface,
dev_dbg(ddev, "setting up %d port structure(s)\n", max_endpoints);
for (i = 0; i < max_endpoints; ++i) {
- port = kzalloc_obj(struct usb_serial_port, GFP_KERNEL);
+ port = kzalloc_obj(struct usb_serial_port);
if (!port) {
retval = -ENOMEM;
goto err_free_epds;
@@ -1482,7 +1482,7 @@ int __usb_serial_register_drivers(struct usb_serial_driver *const serial_drivers
* Suspend/resume support is implemented in the usb-serial core,
* so fill in the PM-related fields in udriver.
*/
- udriver = kzalloc_obj(*udriver, GFP_KERNEL);
+ udriver = kzalloc_obj(*udriver);
if (!udriver)
return -ENOMEM;
diff --git a/drivers/usb/serial/usb_wwan.c b/drivers/usb/serial/usb_wwan.c
index ea529a15c1f6..e752ffa4dc62 100644
--- a/drivers/usb/serial/usb_wwan.c
+++ b/drivers/usb/serial/usb_wwan.c
@@ -449,7 +449,7 @@ int usb_wwan_port_probe(struct usb_serial_port *port)
if (!port->bulk_in_size || !port->bulk_out_size)
return -ENODEV;
- portdata = kzalloc_obj(*portdata, GFP_KERNEL);
+ portdata = kzalloc_obj(*portdata);
if (!portdata)
return -ENOMEM;
diff --git a/drivers/usb/serial/whiteheat.c b/drivers/usb/serial/whiteheat.c
index c530e7a85cb4..6e2b52b2b5f8 100644
--- a/drivers/usb/serial/whiteheat.c
+++ b/drivers/usb/serial/whiteheat.c
@@ -278,7 +278,7 @@ static int whiteheat_attach(struct usb_serial *serial)
serial->type->description,
hw_info->sw_major_rev, hw_info->sw_minor_rev);
- command_info = kmalloc_obj(struct whiteheat_command_private, GFP_KERNEL);
+ command_info = kmalloc_obj(struct whiteheat_command_private);
if (!command_info)
goto no_command_private;
@@ -329,7 +329,7 @@ static int whiteheat_port_probe(struct usb_serial_port *port)
{
struct whiteheat_private *info;
- info = kzalloc_obj(*info, GFP_KERNEL);
+ info = kzalloc_obj(*info);
if (!info)
return -ENOMEM;
diff --git a/drivers/usb/serial/xr_serial.c b/drivers/usb/serial/xr_serial.c
index 91c0a8d0097a..9fc4082de770 100644
--- a/drivers/usb/serial/xr_serial.c
+++ b/drivers/usb/serial/xr_serial.c
@@ -756,7 +756,7 @@ static void xr_cdc_set_line_coding(struct tty_struct *tty,
struct usb_cdc_line_coding *lc;
int ret;
- lc = kzalloc_obj(*lc, GFP_KERNEL);
+ lc = kzalloc_obj(*lc);
if (!lc)
return;
@@ -1020,7 +1020,7 @@ static int xr_port_probe(struct usb_serial_port *port)
type_id = (int)(unsigned long)usb_get_serial_data(port->serial);
type = &xr_types[type_id];
- data = kzalloc_obj(*data, GFP_KERNEL);
+ data = kzalloc_obj(*data);
if (!data)
return -ENOMEM;
diff --git a/drivers/usb/storage/ene_ub6250.c b/drivers/usb/storage/ene_ub6250.c
index 5a5f35213c1d..7622bc0426cd 100644
--- a/drivers/usb/storage/ene_ub6250.c
+++ b/drivers/usb/storage/ene_ub6250.c
@@ -2336,7 +2336,7 @@ static int ene_ub6250_probe(struct usb_interface *intf,
return result;
/* FIXME: where should the code alloc extra buf ? */
- us->extra = kzalloc_obj(struct ene_ub6250_info, GFP_KERNEL);
+ us->extra = kzalloc_obj(struct ene_ub6250_info);
if (!us->extra)
return -ENOMEM;
us->extra_destructor = ene_ub6250_info_destructor;
diff --git a/drivers/usb/storage/isd200.c b/drivers/usb/storage/isd200.c
index 92113848913d..a4fd5dda3396 100644
--- a/drivers/usb/storage/isd200.c
+++ b/drivers/usb/storage/isd200.c
@@ -1463,7 +1463,7 @@ static int isd200_init_info(struct us_data *us)
{
struct isd200_info *info;
- info = kzalloc_obj(struct isd200_info, GFP_KERNEL);
+ info = kzalloc_obj(struct isd200_info);
if (!info)
return -ENOMEM;
diff --git a/drivers/usb/storage/onetouch.c b/drivers/usb/storage/onetouch.c
index 083423606ad9..49d281f7bef6 100644
--- a/drivers/usb/storage/onetouch.c
+++ b/drivers/usb/storage/onetouch.c
@@ -183,7 +183,7 @@ static int onetouch_connect_input(struct us_data *ss)
maxp = usb_maxpacket(udev, pipe);
maxp = min(maxp, ONETOUCH_PKT_LEN);
- onetouch = kzalloc_obj(struct usb_onetouch, GFP_KERNEL);
+ onetouch = kzalloc_obj(struct usb_onetouch);
input_dev = input_allocate_device();
if (!onetouch || !input_dev)
goto fail1;
diff --git a/drivers/usb/storage/realtek_cr.c b/drivers/usb/storage/realtek_cr.c
index 12eb1ab224cd..af038b897c6b 100644
--- a/drivers/usb/storage/realtek_cr.c
+++ b/drivers/usb/storage/realtek_cr.c
@@ -976,7 +976,7 @@ static int init_realtek_cr(struct us_data *us)
struct rts51x_chip *chip;
int size, i, retval;
- chip = kzalloc_obj(struct rts51x_chip, GFP_KERNEL);
+ chip = kzalloc_obj(struct rts51x_chip);
if (!chip)
return -ENOMEM;
diff --git a/drivers/usb/storage/sierra_ms.c b/drivers/usb/storage/sierra_ms.c
index 357e5d29da0c..c5e3eeeb2144 100644
--- a/drivers/usb/storage/sierra_ms.c
+++ b/drivers/usb/storage/sierra_ms.c
@@ -100,7 +100,7 @@ static ssize_t truinst_show(struct device *dev, struct device_attribute *attr,
if (swi_tru_install == TRU_FORCE_MS) {
result = sysfs_emit(buf, "Forced Mass Storage\n");
} else {
- swocInfo = kmalloc_obj(struct swoc_info, GFP_KERNEL);
+ swocInfo = kmalloc_obj(struct swoc_info);
if (!swocInfo) {
sysfs_emit(buf, "Error\n");
return -ENOMEM;
@@ -149,7 +149,7 @@ int sierra_ms_init(struct us_data *us)
else {
usb_stor_dbg(us, "SWIMS: Normal SWoC Logic\n");
- swocInfo = kmalloc_obj(struct swoc_info, GFP_KERNEL);
+ swocInfo = kmalloc_obj(struct swoc_info);
if (!swocInfo)
return -ENOMEM;
diff --git a/drivers/usb/storage/usb.c b/drivers/usb/storage/usb.c
index 0d24d426a176..fa83fe0defe2 100644
--- a/drivers/usb/storage/usb.c
+++ b/drivers/usb/storage/usb.c
@@ -537,7 +537,7 @@ static int associate_dev(struct us_data *us, struct usb_interface *intf)
usb_set_intfdata(intf, us);
/* Allocate the control/setup and DMA-mapped buffers */
- us->cr = kmalloc_obj(*us->cr, GFP_KERNEL);
+ us->cr = kmalloc_obj(*us->cr);
if (!us->cr)
return -ENOMEM;
diff --git a/drivers/usb/typec/class.c b/drivers/usb/typec/class.c
index 19f793ac6389..831430909471 100644
--- a/drivers/usb/typec/class.c
+++ b/drivers/usb/typec/class.c
@@ -646,7 +646,7 @@ typec_register_altmode(struct device *parent,
struct altmode *alt;
int ret;
- alt = kzalloc_obj(*alt, GFP_KERNEL);
+ alt = kzalloc_obj(*alt);
if (!alt) {
altmode_id_remove(parent, id);
return ERR_PTR(-ENOMEM);
@@ -1113,7 +1113,7 @@ struct typec_partner *typec_register_partner(struct typec_port *port,
struct typec_partner *partner;
int ret;
- partner = kzalloc_obj(*partner, GFP_KERNEL);
+ partner = kzalloc_obj(*partner);
if (!partner)
return ERR_PTR(-ENOMEM);
@@ -1313,7 +1313,7 @@ struct typec_plug *typec_register_plug(struct typec_cable *cable,
char name[8];
int ret;
- plug = kzalloc_obj(*plug, GFP_KERNEL);
+ plug = kzalloc_obj(*plug);
if (!plug)
return ERR_PTR(-ENOMEM);
@@ -1466,7 +1466,7 @@ struct typec_cable *typec_register_cable(struct typec_port *port,
struct typec_cable *cable;
int ret;
- cable = kzalloc_obj(*cable, GFP_KERNEL);
+ cable = kzalloc_obj(*cable);
if (!cable)
return ERR_PTR(-ENOMEM);
@@ -2703,7 +2703,7 @@ struct typec_port *typec_register_port(struct device *parent,
int ret;
int id;
- port = kzalloc_obj(*port, GFP_KERNEL);
+ port = kzalloc_obj(*port);
if (!port)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/usb/typec/mode_selection.c b/drivers/usb/typec/mode_selection.c
index 56c6eced5666..cd376f67e445 100644
--- a/drivers/usb/typec/mode_selection.c
+++ b/drivers/usb/typec/mode_selection.c
@@ -216,7 +216,7 @@ static int altmode_add_to_list(struct device *dev, void *data)
struct mode_state *ms;
if (pdev && altmode->ops && altmode->ops->activate) {
- ms = kzalloc_obj(*ms, GFP_KERNEL);
+ ms = kzalloc_obj(*ms);
if (!ms)
return -ENOMEM;
ms->svid = pdev->svid;
@@ -240,7 +240,7 @@ int typec_mode_selection_start(struct typec_partner *partner,
if (partner->sel)
return -EALREADY;
- sel = kzalloc_obj(*sel, GFP_KERNEL);
+ sel = kzalloc_obj(*sel);
if (!sel)
return -ENOMEM;
diff --git a/drivers/usb/typec/mux.c b/drivers/usb/typec/mux.c
index e09de0d3f32f..58fb97ea6877 100644
--- a/drivers/usb/typec/mux.c
+++ b/drivers/usb/typec/mux.c
@@ -76,7 +76,7 @@ struct typec_switch *fwnode_typec_switch_get(struct fwnode_handle *fwnode)
int err;
int i;
- sw = kzalloc_obj(*sw, GFP_KERNEL);
+ sw = kzalloc_obj(*sw);
if (!sw)
return ERR_PTR(-ENOMEM);
@@ -171,7 +171,7 @@ typec_switch_register(struct device *parent,
if (!desc || !desc->set)
return ERR_PTR(-EINVAL);
- sw_dev = kzalloc_obj(*sw_dev, GFP_KERNEL);
+ sw_dev = kzalloc_obj(*sw_dev);
if (!sw_dev)
return ERR_PTR(-ENOMEM);
@@ -301,7 +301,7 @@ struct typec_mux *fwnode_typec_mux_get(struct fwnode_handle *fwnode)
int err;
int i;
- mux = kzalloc_obj(*mux, GFP_KERNEL);
+ mux = kzalloc_obj(*mux);
if (!mux)
return ERR_PTR(-ENOMEM);
@@ -415,7 +415,7 @@ typec_mux_register(struct device *parent, const struct typec_mux_desc *desc)
if (!desc || !desc->set)
return ERR_PTR(-EINVAL);
- mux_dev = kzalloc_obj(*mux_dev, GFP_KERNEL);
+ mux_dev = kzalloc_obj(*mux_dev);
if (!mux_dev)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/usb/typec/pd.c b/drivers/usb/typec/pd.c
index e3337ff98ab2..766c76d63328 100644
--- a/drivers/usb/typec/pd.c
+++ b/drivers/usb/typec/pd.c
@@ -480,7 +480,7 @@ static int add_pdo(struct usb_power_delivery_capabilities *cap, u32 pdo, int pos
struct pdo *p;
int ret;
- p = kzalloc_obj(*p, GFP_KERNEL);
+ p = kzalloc_obj(*p);
if (!p)
return -ENOMEM;
@@ -569,7 +569,7 @@ usb_power_delivery_register_capabilities(struct usb_power_delivery *pd,
int ret;
int i;
- cap = kzalloc_obj(*cap, GFP_KERNEL);
+ cap = kzalloc_obj(*cap);
if (!cap)
return ERR_PTR(-ENOMEM);
@@ -697,7 +697,7 @@ usb_power_delivery_register(struct device *parent, struct usb_power_delivery_des
struct usb_power_delivery *pd;
int ret;
- pd = kzalloc_obj(*pd, GFP_KERNEL);
+ pd = kzalloc_obj(*pd);
if (!pd)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/usb/typec/retimer.c b/drivers/usb/typec/retimer.c
index 9bc896160af1..bfd80292b22a 100644
--- a/drivers/usb/typec/retimer.c
+++ b/drivers/usb/typec/retimer.c
@@ -110,7 +110,7 @@ typec_retimer_register(struct device *parent, const struct typec_retimer_desc *d
if (!desc || !desc->set)
return ERR_PTR(-EINVAL);
- retimer = kzalloc_obj(*retimer, GFP_KERNEL);
+ retimer = kzalloc_obj(*retimer);
if (!retimer)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/usb/typec/tcpm/tcpm.c b/drivers/usb/typec/tcpm/tcpm.c
index 13b9873ba92e..1d2f3af034c5 100644
--- a/drivers/usb/typec/tcpm/tcpm.c
+++ b/drivers/usb/typec/tcpm/tcpm.c
@@ -1665,7 +1665,7 @@ static int tcpm_queue_vdm_unlocked(struct tcpm_port *port, const u32 header,
u32 *data_cpy;
int ret = -ENOMEM;
- event = kzalloc_obj(*event, GFP_KERNEL);
+ event = kzalloc_obj(*event);
if (!event)
goto err_event;
diff --git a/drivers/usb/typec/ucsi/debugfs.c b/drivers/usb/typec/ucsi/debugfs.c
index 7549fef83d85..a4b9a6b51649 100644
--- a/drivers/usb/typec/ucsi/debugfs.c
+++ b/drivers/usb/typec/ucsi/debugfs.c
@@ -112,7 +112,7 @@ DEFINE_SHOW_ATTRIBUTE(ucsi_vbus_volt);
void ucsi_debugfs_register(struct ucsi *ucsi)
{
- ucsi->debugfs = kzalloc_obj(*ucsi->debugfs, GFP_KERNEL);
+ ucsi->debugfs = kzalloc_obj(*ucsi->debugfs);
if (!ucsi->debugfs)
return;
diff --git a/drivers/usb/typec/ucsi/ucsi.c b/drivers/usb/typec/ucsi/ucsi.c
index fe01a5e915d9..ba2c1e549968 100644
--- a/drivers/usb/typec/ucsi/ucsi.c
+++ b/drivers/usb/typec/ucsi/ucsi.c
@@ -293,7 +293,7 @@ static int ucsi_partner_task(struct ucsi_connector *con,
if (!con->partner)
return 0;
- uwork = kzalloc_obj(*uwork, GFP_KERNEL);
+ uwork = kzalloc_obj(*uwork);
if (!uwork)
return -ENOMEM;
@@ -2044,7 +2044,7 @@ struct ucsi *ucsi_create(struct device *dev, const struct ucsi_operations *ops)
!ops->read_message_in || !ops->sync_control || !ops->async_control)
return ERR_PTR(-EINVAL);
- ucsi = kzalloc_obj(*ucsi, GFP_KERNEL);
+ ucsi = kzalloc_obj(*ucsi);
if (!ucsi)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/usb/usb-skeleton.c b/drivers/usb/usb-skeleton.c
index 5fe991baffa2..709a24092104 100644
--- a/drivers/usb/usb-skeleton.c
+++ b/drivers/usb/usb-skeleton.c
@@ -493,7 +493,7 @@ static int skel_probe(struct usb_interface *interface,
int retval;
/* allocate memory for our device state and initialize it */
- dev = kzalloc_obj(*dev, GFP_KERNEL);
+ dev = kzalloc_obj(*dev);
if (!dev)
return -ENOMEM;
diff --git a/drivers/usb/usbip/stub_dev.c b/drivers/usb/usbip/stub_dev.c
index e859c51c94e8..34990b7e2d18 100644
--- a/drivers/usb/usbip/stub_dev.c
+++ b/drivers/usb/usbip/stub_dev.c
@@ -263,7 +263,7 @@ static struct stub_device *stub_device_alloc(struct usb_device *udev)
dev_dbg(&udev->dev, "allocating stub device");
/* yes, it's a new device */
- sdev = kzalloc_obj(struct stub_device, GFP_KERNEL);
+ sdev = kzalloc_obj(struct stub_device);
if (!sdev)
return NULL;
diff --git a/drivers/usb/usbip/stub_rx.c b/drivers/usb/usbip/stub_rx.c
index 7df83464a75f..1e9ae578810d 100644
--- a/drivers/usb/usbip/stub_rx.c
+++ b/drivers/usb/usbip/stub_rx.c
@@ -535,7 +535,7 @@ static void stub_recv_cmd_submit(struct stub_device *sdev,
/* allocate urb array */
priv->num_urbs = num_urbs;
- priv->urbs = kmalloc_objs(*priv->urbs, num_urbs, GFP_KERNEL);
+ priv->urbs = kmalloc_objs(*priv->urbs, num_urbs);
if (!priv->urbs)
goto err_urbs;
diff --git a/drivers/usb/usbip/stub_tx.c b/drivers/usb/usbip/stub_tx.c
index 9e6187c3ddb0..4ffd342250b5 100644
--- a/drivers/usb/usbip/stub_tx.c
+++ b/drivers/usb/usbip/stub_tx.c
@@ -191,7 +191,7 @@ static int stub_send_ret_submit(struct stub_device *sdev)
else
iovnum = 2;
- iov = kzalloc_objs(struct kvec, iovnum, GFP_KERNEL);
+ iov = kzalloc_objs(struct kvec, iovnum);
if (!iov) {
usbip_event_add(&sdev->ud, SDEV_EVENT_ERROR_MALLOC);
diff --git a/drivers/usb/usbip/vhci_hcd.c b/drivers/usb/usbip/vhci_hcd.c
index 4dcda9e8316f..39e8faf4c18c 100644
--- a/drivers/usb/usbip/vhci_hcd.c
+++ b/drivers/usb/usbip/vhci_hcd.c
@@ -1537,7 +1537,7 @@ static int __init vhci_hcd_init(void)
if (vhci_num_controllers < 1)
vhci_num_controllers = 1;
- vhcis = kzalloc_objs(struct vhci, vhci_num_controllers, GFP_KERNEL);
+ vhcis = kzalloc_objs(struct vhci, vhci_num_controllers);
if (vhcis == NULL)
return -ENOMEM;
diff --git a/drivers/usb/usbip/vhci_tx.c b/drivers/usb/usbip/vhci_tx.c
index a63805d57d94..32e6fabccf72 100644
--- a/drivers/usb/usbip/vhci_tx.c
+++ b/drivers/usb/usbip/vhci_tx.c
@@ -82,7 +82,7 @@ static int vhci_send_cmd_submit(struct vhci_device *vdev)
else
iovnum = 3;
- iov = kzalloc_objs(*iov, iovnum, GFP_KERNEL);
+ iov = kzalloc_objs(*iov, iovnum);
if (!iov) {
usbip_event_add(&vdev->ud, SDEV_EVENT_ERROR_MALLOC);
return -ENOMEM;
diff --git a/drivers/usb/usbip/vudc_dev.c b/drivers/usb/usbip/vudc_dev.c
index 80ab3d019b87..90383107b660 100644
--- a/drivers/usb/usbip/vudc_dev.c
+++ b/drivers/usb/usbip/vudc_dev.c
@@ -43,7 +43,7 @@ struct urbp *alloc_urbp(void)
{
struct urbp *urb_p;
- urb_p = kzalloc_obj(*urb_p, GFP_KERNEL);
+ urb_p = kzalloc_obj(*urb_p);
if (!urb_p)
return urb_p;
@@ -491,7 +491,7 @@ struct vudc_device *alloc_vudc_device(int devid)
{
struct vudc_device *udc_dev;
- udc_dev = kzalloc_obj(*udc_dev, GFP_KERNEL);
+ udc_dev = kzalloc_obj(*udc_dev);
if (!udc_dev)
return NULL;
@@ -518,7 +518,7 @@ static int init_vudc_hw(struct vudc *udc)
struct usbip_device *ud = &udc->ud;
struct vep *ep;
- udc->ep = kzalloc_objs(*udc->ep, VIRTUAL_ENDPOINTS, GFP_KERNEL);
+ udc->ep = kzalloc_objs(*udc->ep, VIRTUAL_ENDPOINTS);
if (!udc->ep)
goto nomem_ep;
@@ -598,7 +598,7 @@ int vudc_probe(struct platform_device *pdev)
struct vudc *udc;
int ret = -ENOMEM;
- udc = kzalloc_obj(*udc, GFP_KERNEL);
+ udc = kzalloc_obj(*udc);
if (!udc)
goto out;
diff --git a/drivers/usb/usbip/vudc_tx.c b/drivers/usb/usbip/vudc_tx.c
index b4b7796319f1..88edfbcc0035 100644
--- a/drivers/usb/usbip/vudc_tx.c
+++ b/drivers/usb/usbip/vudc_tx.c
@@ -97,7 +97,7 @@ static int v_send_ret_submit(struct vudc *udc, struct urbp *urb_p)
else
iovnum = 2;
- iov = kzalloc_objs(*iov, iovnum, GFP_KERNEL);
+ iov = kzalloc_objs(*iov, iovnum);
if (!iov) {
usbip_event_add(&udc->ud, VUDC_EVENT_ERROR_MALLOC);
ret = -ENOMEM;
diff --git a/drivers/vdpa/ifcvf/ifcvf_main.c b/drivers/vdpa/ifcvf/ifcvf_main.c
index b1b4c6adeef7..d46c1606c97a 100644
--- a/drivers/vdpa/ifcvf/ifcvf_main.c
+++ b/drivers/vdpa/ifcvf/ifcvf_main.c
@@ -793,7 +793,7 @@ static int ifcvf_probe(struct pci_dev *pdev, const struct pci_device_id *id)
}
pci_set_master(pdev);
- ifcvf_mgmt_dev = kzalloc_obj(struct ifcvf_vdpa_mgmt_dev, GFP_KERNEL);
+ ifcvf_mgmt_dev = kzalloc_obj(struct ifcvf_vdpa_mgmt_dev);
if (!ifcvf_mgmt_dev) {
IFCVF_ERR(pdev, "Failed to alloc memory for the vDPA management device\n");
return -ENOMEM;
diff --git a/drivers/vdpa/mlx5/core/mr.c b/drivers/vdpa/mlx5/core/mr.c
index f27316f3fec3..42c2705077a6 100644
--- a/drivers/vdpa/mlx5/core/mr.c
+++ b/drivers/vdpa/mlx5/core/mr.c
@@ -215,7 +215,7 @@ static int create_direct_keys(struct mlx5_vdpa_dev *mvdev, struct mlx5_vdpa_mr *
int err = 0;
int i = 0;
- cmds = kvzalloc_objs(*cmds, mr->num_directs, GFP_KERNEL);
+ cmds = kvzalloc_objs(*cmds, mr->num_directs);
if (!cmds)
return -ENOMEM;
@@ -287,8 +287,8 @@ static int destroy_direct_keys(struct mlx5_vdpa_dev *mvdev, struct mlx5_vdpa_mr
int err = 0;
int i = 0;
- cmds = kvzalloc_objs(*cmds, mr->num_directs, GFP_KERNEL);
- cmd_mem = kvzalloc_objs(*cmd_mem, mr->num_directs, GFP_KERNEL);
+ cmds = kvzalloc_objs(*cmds, mr->num_directs);
+ cmd_mem = kvzalloc_objs(*cmd_mem, mr->num_directs);
if (!cmds || !cmd_mem)
return -ENOMEM;
@@ -456,7 +456,7 @@ static int add_direct_chain(struct mlx5_vdpa_dev *mvdev,
st = start;
while (size) {
sz = (u32)min_t(u64, MAX_KLM_SIZE, size);
- dmr = kzalloc_obj(*dmr, GFP_KERNEL);
+ dmr = kzalloc_obj(*dmr);
if (!dmr) {
err = -ENOMEM;
goto err_alloc;
@@ -817,7 +817,7 @@ struct mlx5_vdpa_mr *mlx5_vdpa_create_mr(struct mlx5_vdpa_dev *mvdev,
struct mlx5_vdpa_mr *mr;
int err;
- mr = kzalloc_obj(*mr, GFP_KERNEL);
+ mr = kzalloc_obj(*mr);
if (!mr)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/vdpa/mlx5/net/mlx5_vnet.c b/drivers/vdpa/mlx5/net/mlx5_vnet.c
index 15a6c91ec335..4acd61285885 100644
--- a/drivers/vdpa/mlx5/net/mlx5_vnet.c
+++ b/drivers/vdpa/mlx5/net/mlx5_vnet.c
@@ -1229,8 +1229,8 @@ static int query_virtqueues(struct mlx5_vdpa_net *ndev,
WARN(start_vq + num_vqs > mvdev->max_vqs, "query vq range invalid [%d, %d), max_vqs: %u\n",
start_vq, start_vq + num_vqs, mvdev->max_vqs);
- cmds = kvzalloc_objs(*cmds, num_vqs, GFP_KERNEL);
- cmd_mem = kvzalloc_objs(*cmd_mem, num_vqs, GFP_KERNEL);
+ cmds = kvzalloc_objs(*cmds, num_vqs);
+ cmd_mem = kvzalloc_objs(*cmd_mem, num_vqs);
if (!cmds || !cmd_mem) {
err = -ENOMEM;
goto done;
@@ -1562,8 +1562,8 @@ static int modify_virtqueues(struct mlx5_vdpa_net *ndev, int start_vq, int num_v
WARN(start_vq + num_vqs > mvdev->max_vqs, "modify vq range invalid [%d, %d), max_vqs: %u\n",
start_vq, start_vq + num_vqs, mvdev->max_vqs);
- cmds = kvzalloc_objs(*cmds, num_vqs, GFP_KERNEL);
- cmd_mem = kvzalloc_objs(*cmd_mem, num_vqs, GFP_KERNEL);
+ cmds = kvzalloc_objs(*cmds, num_vqs);
+ cmd_mem = kvzalloc_objs(*cmd_mem, num_vqs);
if (!cmds || !cmd_mem) {
err = -ENOMEM;
goto done;
@@ -1649,7 +1649,7 @@ static int suspend_vqs(struct mlx5_vdpa_net *ndev, int start_vq, int num_vqs)
if (err)
return err;
- attrs = kzalloc_objs(struct mlx5_virtq_attr, num_vqs, GFP_KERNEL);
+ attrs = kzalloc_objs(struct mlx5_virtq_attr, num_vqs);
if (!attrs)
return -ENOMEM;
@@ -1922,7 +1922,7 @@ static int mlx5_vdpa_add_mac_vlan_rules(struct mlx5_vdpa_net *ndev, u8 *mac,
int err;
u16 vid;
- spec = kvzalloc_obj(*spec, GFP_KERNEL);
+ spec = kvzalloc_obj(*spec);
if (!spec)
return -ENOMEM;
@@ -2034,7 +2034,7 @@ static int mac_vlan_add(struct mlx5_vdpa_net *ndev, u8 *mac, u16 vid, bool tagge
if (mac_vlan_lookup(ndev, val))
return -EEXIST;
- ptr = kzalloc_obj(*ptr, GFP_KERNEL);
+ ptr = kzalloc_obj(*ptr);
if (!ptr)
return -ENOMEM;
@@ -3902,7 +3902,7 @@ static int mlx5_vdpa_dev_add(struct vdpa_mgmt_dev *v_mdev, const char *name,
mlx5_cmd_init_async_ctx(mdev, &mvdev->async_ctx);
- ndev->vqs = kzalloc_objs(*ndev->vqs, max_vqs, GFP_KERNEL);
+ ndev->vqs = kzalloc_objs(*ndev->vqs, max_vqs);
ndev->event_cbs = kzalloc_objs(*ndev->event_cbs, max_vqs + 1,
GFP_KERNEL);
if (!ndev->vqs || !ndev->event_cbs) {
@@ -4104,7 +4104,7 @@ static int mlx5v_probe(struct auxiliary_device *adev,
struct mlx5_vdpa_mgmtdev *mgtdev;
int err;
- mgtdev = kzalloc_obj(*mgtdev, GFP_KERNEL);
+ mgtdev = kzalloc_obj(*mgtdev);
if (!mgtdev)
return -ENOMEM;
diff --git a/drivers/vdpa/pds/aux_drv.c b/drivers/vdpa/pds/aux_drv.c
index 970eec66b117..61314d56095d 100644
--- a/drivers/vdpa/pds/aux_drv.c
+++ b/drivers/vdpa/pds/aux_drv.c
@@ -39,7 +39,7 @@ static int pds_vdpa_probe(struct auxiliary_device *aux_dev,
struct pds_vdpa_aux *vdpa_aux;
int err;
- vdpa_aux = kzalloc_obj(*vdpa_aux, GFP_KERNEL);
+ vdpa_aux = kzalloc_obj(*vdpa_aux);
if (!vdpa_aux)
return -ENOMEM;
diff --git a/drivers/vdpa/solidrun/snet_main.c b/drivers/vdpa/solidrun/snet_main.c
index 527efeed912c..28d55315df2a 100644
--- a/drivers/vdpa/solidrun/snet_main.c
+++ b/drivers/vdpa/solidrun/snet_main.c
@@ -732,7 +732,7 @@ static int psnet_read_cfg(struct pci_dev *pdev, struct psnet *psnet)
/* Load device configuration from BAR */
for (i = 0; i < cfg->devices_num; i++) {
- cfg->devs[i] = kzalloc_obj(*cfg->devs[i], GFP_KERNEL);
+ cfg->devs[i] = kzalloc_obj(*cfg->devs[i]);
if (!cfg->devs[i]) {
snet_free_cfg(cfg);
return -ENOMEM;
@@ -827,7 +827,7 @@ static int snet_build_vqs(struct snet *snet)
/* Allocate the VQs */
for (i = 0; i < snet->cfg->vq_num; i++) {
- snet->vqs[i] = kzalloc_obj(*snet->vqs[i], GFP_KERNEL);
+ snet->vqs[i] = kzalloc_obj(*snet->vqs[i]);
if (!snet->vqs[i]) {
snet_free_vqs(snet);
return -ENOMEM;
@@ -902,7 +902,7 @@ static int snet_vdpa_probe_pf(struct pci_dev *pdev)
}
/* Allocate a PCI physical function device */
- psnet = kzalloc_obj(*psnet, GFP_KERNEL);
+ psnet = kzalloc_obj(*psnet);
if (!psnet)
return -ENOMEM;
diff --git a/drivers/vdpa/vdpa_user/iova_domain.c b/drivers/vdpa/vdpa_user/iova_domain.c
index 44e9babc0b54..806cec32c4bc 100644
--- a/drivers/vdpa/vdpa_user/iova_domain.c
+++ b/drivers/vdpa/vdpa_user/iova_domain.c
@@ -622,7 +622,7 @@ vduse_domain_create(unsigned long iova_limit, size_t bounce_size)
if (iova_limit <= bounce_size)
return NULL;
- domain = kzalloc_obj(*domain, GFP_KERNEL);
+ domain = kzalloc_obj(*domain);
if (!domain)
return NULL;
diff --git a/drivers/vdpa/vdpa_user/vduse_dev.c b/drivers/vdpa/vdpa_user/vduse_dev.c
index 7478aa8d5489..6202f6902fcd 100644
--- a/drivers/vdpa/vdpa_user/vduse_dev.c
+++ b/drivers/vdpa/vdpa_user/vduse_dev.c
@@ -1232,7 +1232,7 @@ static int vduse_dev_reg_umem(struct vduse_dev *dev,
npages = size >> PAGE_SHIFT;
page_list = __vmalloc(array_size(npages, sizeof(struct page *)),
GFP_KERNEL_ACCOUNT);
- umem = kzalloc_obj(*umem, GFP_KERNEL);
+ umem = kzalloc_obj(*umem);
if (!page_list || !umem)
goto unlock;
@@ -1800,12 +1800,12 @@ static int vduse_dev_init_vqs(struct vduse_dev *dev, u32 vq_align, u32 vq_num)
dev->vq_align = vq_align;
dev->vq_num = vq_num;
- dev->vqs = kzalloc_objs(*dev->vqs, dev->vq_num, GFP_KERNEL);
+ dev->vqs = kzalloc_objs(*dev->vqs, dev->vq_num);
if (!dev->vqs)
return -ENOMEM;
for (i = 0; i < vq_num; i++) {
- dev->vqs[i] = kzalloc_obj(*dev->vqs[i], GFP_KERNEL);
+ dev->vqs[i] = kzalloc_obj(*dev->vqs[i]);
if (!dev->vqs[i]) {
ret = -ENOMEM;
goto err;
@@ -1839,7 +1839,7 @@ static int vduse_dev_init_vqs(struct vduse_dev *dev, u32 vq_align, u32 vq_num)
static struct vduse_dev *vduse_dev_create(void)
{
- struct vduse_dev *dev = kzalloc_obj(*dev, GFP_KERNEL);
+ struct vduse_dev *dev = kzalloc_obj(*dev);
if (!dev)
return NULL;
@@ -2076,7 +2076,7 @@ static int vduse_create_dev(struct vduse_dev_config *config,
dev->vendor_id = config->vendor_id;
dev->nas = (dev->api_version < VDUSE_API_VERSION_1) ? 1 : config->nas;
- dev->as = kzalloc_objs(dev->as[0], dev->nas, GFP_KERNEL);
+ dev->as = kzalloc_objs(dev->as[0], dev->nas);
if (!dev->as)
goto err_as;
for (int i = 0; i < dev->nas; i++)
@@ -2085,7 +2085,7 @@ static int vduse_create_dev(struct vduse_dev_config *config,
dev->ngroups = (dev->api_version < VDUSE_API_VERSION_1)
? 1
: config->ngroups;
- dev->groups = kzalloc_objs(dev->groups[0], dev->ngroups, GFP_KERNEL);
+ dev->groups = kzalloc_objs(dev->groups[0], dev->ngroups);
if (!dev->groups)
goto err_vq_groups;
for (u32 i = 0; i < dev->ngroups; ++i) {
@@ -2226,7 +2226,7 @@ static int vduse_open(struct inode *inode, struct file *file)
{
struct vduse_control *control;
- control = kmalloc_obj(struct vduse_control, GFP_KERNEL);
+ control = kmalloc_obj(struct vduse_control);
if (!control)
return -ENOMEM;
@@ -2356,7 +2356,7 @@ static int vduse_mgmtdev_init(void)
{
int ret;
- vduse_mgmt = kzalloc_obj(*vduse_mgmt, GFP_KERNEL);
+ vduse_mgmt = kzalloc_obj(*vduse_mgmt);
if (!vduse_mgmt)
return -ENOMEM;
diff --git a/drivers/vdpa/virtio_pci/vp_vdpa.c b/drivers/vdpa/virtio_pci/vp_vdpa.c
index 102f25ccfddf..51ffc245a038 100644
--- a/drivers/vdpa/virtio_pci/vp_vdpa.c
+++ b/drivers/vdpa/virtio_pci/vp_vdpa.c
@@ -608,7 +608,7 @@ static int vp_vdpa_probe(struct pci_dev *pdev, const struct pci_device_id *id)
struct virtio_device_id *mdev_id = NULL;
int err;
- vp_vdpa_mgtdev = kzalloc_obj(*vp_vdpa_mgtdev, GFP_KERNEL);
+ vp_vdpa_mgtdev = kzalloc_obj(*vp_vdpa_mgtdev);
if (!vp_vdpa_mgtdev)
return -ENOMEM;
@@ -616,7 +616,7 @@ static int vp_vdpa_probe(struct pci_dev *pdev, const struct pci_device_id *id)
mgtdev->ops = &vp_vdpa_mdev_ops;
mgtdev->device = dev;
- mdev = kzalloc_obj(struct virtio_pci_modern_device, GFP_KERNEL);
+ mdev = kzalloc_obj(struct virtio_pci_modern_device);
if (!mdev) {
err = -ENOMEM;
goto mdev_err;
@@ -626,7 +626,7 @@ static int vp_vdpa_probe(struct pci_dev *pdev, const struct pci_device_id *id)
* id_table should be a null terminated array, so allocate one additional
* entry here, see vdpa_mgmtdev_get_classes().
*/
- mdev_id = kzalloc_objs(struct virtio_device_id, 2, GFP_KERNEL);
+ mdev_id = kzalloc_objs(struct virtio_device_id, 2);
if (!mdev_id) {
err = -ENOMEM;
goto mdev_id_err;
diff --git a/drivers/vfio/cdx/intr.c b/drivers/vfio/cdx/intr.c
index 0ae39bda7c35..8f4402cec9c5 100644
--- a/drivers/vfio/cdx/intr.c
+++ b/drivers/vfio/cdx/intr.c
@@ -27,7 +27,7 @@ static int vfio_cdx_msi_enable(struct vfio_cdx_device *vdev, int nvec)
struct device *dev = vdev->vdev.dev;
int msi_idx, ret;
- vdev->cdx_irqs = kzalloc_objs(struct vfio_cdx_irq, nvec, GFP_KERNEL);
+ vdev->cdx_irqs = kzalloc_objs(struct vfio_cdx_irq, nvec);
if (!vdev->cdx_irqs)
return -ENOMEM;
diff --git a/drivers/vfio/container.c b/drivers/vfio/container.c
index 937fc1de5965..003281dbf8bc 100644
--- a/drivers/vfio/container.c
+++ b/drivers/vfio/container.c
@@ -95,7 +95,7 @@ int vfio_register_iommu_driver(const struct vfio_iommu_driver_ops *ops)
if (WARN_ON(!ops->register_device != !ops->unregister_device))
return -EINVAL;
- driver = kzalloc_obj(*driver, GFP_KERNEL);
+ driver = kzalloc_obj(*driver);
if (!driver)
return -ENOMEM;
diff --git a/drivers/vfio/group.c b/drivers/vfio/group.c
index 868e69053050..4f15016d2a5f 100644
--- a/drivers/vfio/group.c
+++ b/drivers/vfio/group.c
@@ -515,7 +515,7 @@ static struct vfio_group *vfio_group_alloc(struct iommu_group *iommu_group,
struct vfio_group *group;
int minor;
- group = kzalloc_obj(*group, GFP_KERNEL);
+ group = kzalloc_obj(*group);
if (!group)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/vfio/mdev/mdev_core.c b/drivers/vfio/mdev/mdev_core.c
index 5b6ac30c02bf..3b4aa0632fcc 100644
--- a/drivers/vfio/mdev/mdev_core.c
+++ b/drivers/vfio/mdev/mdev_core.c
@@ -154,7 +154,7 @@ int mdev_device_create(struct mdev_type *type, const guid_t *uuid)
atomic_dec(&parent->available_instances);
}
- mdev = kzalloc_obj(*mdev, GFP_KERNEL);
+ mdev = kzalloc_obj(*mdev);
if (!mdev) {
mutex_unlock(&mdev_list_lock);
return -ENOMEM;
diff --git a/drivers/vfio/pci/hisilicon/hisi_acc_vfio_pci.c b/drivers/vfio/pci/hisilicon/hisi_acc_vfio_pci.c
index 68b3c1745609..1d367cff7dcf 100644
--- a/drivers/vfio/pci/hisilicon/hisi_acc_vfio_pci.c
+++ b/drivers/vfio/pci/hisilicon/hisi_acc_vfio_pci.c
@@ -1498,7 +1498,7 @@ static int hisi_acc_vf_dev_read(struct seq_file *seq, void *data)
}
mutex_lock(&hisi_acc_vdev->state_mutex);
- vf_data = kzalloc_obj(*vf_data, GFP_KERNEL);
+ vf_data = kzalloc_obj(*vf_data);
if (!vf_data) {
ret = -ENOMEM;
goto mutex_release;
@@ -1679,7 +1679,7 @@ static void hisi_acc_vfio_debug_init(struct hisi_acc_vf_core_device *hisi_acc_vd
return;
}
- migf = kzalloc_obj(*migf, GFP_KERNEL);
+ migf = kzalloc_obj(*migf);
if (!migf) {
dput(vfio_dev_migration);
return;
diff --git a/drivers/vfio/pci/pds/dirty.c b/drivers/vfio/pci/pds/dirty.c
index 7a218948c475..32573f6e8cc6 100644
--- a/drivers/vfio/pci/pds/dirty.c
+++ b/drivers/vfio/pci/pds/dirty.c
@@ -285,7 +285,7 @@ static int pds_vfio_dirty_enable(struct pds_vfio_pci_device *pds_vfio,
num_ranges = max_regions;
}
- region_info = kzalloc_objs(*region_info, num_ranges, GFP_KERNEL);
+ region_info = kzalloc_objs(*region_info, num_ranges);
if (!region_info)
return -ENOMEM;
len = num_ranges * sizeof(*region_info);
@@ -397,7 +397,7 @@ static int pds_vfio_dirty_seq_ack(struct pds_vfio_pci_device *pds_vfio,
* will be enough pages to represent the bmp_bytes
*/
npages = DIV_ROUND_UP_ULL(bmp_bytes + page_offset, PAGE_SIZE);
- pages = kmalloc_objs(*pages, npages, GFP_KERNEL);
+ pages = kmalloc_objs(*pages, npages);
if (!pages)
return -ENOMEM;
diff --git a/drivers/vfio/pci/pds/lm.c b/drivers/vfio/pci/pds/lm.c
index c9a21a049372..08487eab11b0 100644
--- a/drivers/vfio/pci/pds/lm.c
+++ b/drivers/vfio/pci/pds/lm.c
@@ -24,7 +24,7 @@ pds_vfio_get_lm_file(const struct file_operations *fops, int flags, u64 size)
return NULL;
/* Alloc file structure */
- lm_file = kzalloc_obj(*lm_file, GFP_KERNEL);
+ lm_file = kzalloc_obj(*lm_file);
if (!lm_file)
return NULL;
@@ -42,7 +42,7 @@ pds_vfio_get_lm_file(const struct file_operations *fops, int flags, u64 size)
/* Allocate memory for file pages */
npages = DIV_ROUND_UP_ULL(size, PAGE_SIZE);
- pages = kmalloc_objs(*pages, npages, GFP_KERNEL);
+ pages = kmalloc_objs(*pages, npages);
if (!pages)
goto out_put_file;
diff --git a/drivers/vfio/pci/qat/main.c b/drivers/vfio/pci/qat/main.c
index 591349c2edc8..b982d4ae666c 100644
--- a/drivers/vfio/pci/qat/main.c
+++ b/drivers/vfio/pci/qat/main.c
@@ -261,7 +261,7 @@ qat_vf_save_device_data(struct qat_vf_core_device *qat_vdev, bool pre_copy)
struct qat_vf_migration_file *migf;
int ret;
- migf = kzalloc_obj(*migf, GFP_KERNEL);
+ migf = kzalloc_obj(*migf);
if (!migf)
return ERR_PTR(-ENOMEM);
@@ -352,7 +352,7 @@ qat_vf_resume_device_data(struct qat_vf_core_device *qat_vdev)
struct qat_vf_migration_file *migf;
int ret;
- migf = kzalloc_obj(*migf, GFP_KERNEL);
+ migf = kzalloc_obj(*migf);
if (!migf)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/vfio/pci/vfio_pci_core.c b/drivers/vfio/pci/vfio_pci_core.c
index 10bfa76f06e5..d43745fe4c84 100644
--- a/drivers/vfio/pci/vfio_pci_core.c
+++ b/drivers/vfio/pci/vfio_pci_core.c
@@ -1291,7 +1291,7 @@ static int vfio_pci_ioctl_get_pci_hot_reset_info(
goto header;
}
- devices = kzalloc_objs(*devices, count, GFP_KERNEL);
+ devices = kzalloc_objs(*devices, count);
if (!devices)
return -ENOMEM;
@@ -1350,8 +1350,8 @@ vfio_pci_ioctl_pci_hot_reset_groups(struct vfio_pci_core_device *vdev,
if (array_count > count)
return -EINVAL;
- group_fds = kzalloc_objs(*group_fds, array_count, GFP_KERNEL);
- files = kzalloc_objs(*files, array_count, GFP_KERNEL);
+ group_fds = kzalloc_objs(*group_fds, array_count);
+ files = kzalloc_objs(*files, array_count);
if (!group_fds || !files) {
kfree(group_fds);
kfree(files);
@@ -2034,7 +2034,7 @@ static int vfio_pci_vf_init(struct vfio_pci_core_device *vdev)
if (!pdev->is_physfn)
return 0;
- vdev->vf_token = kzalloc_obj(*vdev->vf_token, GFP_KERNEL);
+ vdev->vf_token = kzalloc_obj(*vdev->vf_token);
if (!vdev->vf_token)
return -ENOMEM;
diff --git a/drivers/vfio/pci/vfio_pci_dmabuf.c b/drivers/vfio/pci/vfio_pci_dmabuf.c
index abed6508cd83..12234538254c 100644
--- a/drivers/vfio/pci/vfio_pci_dmabuf.c
+++ b/drivers/vfio/pci/vfio_pci_dmabuf.c
@@ -246,7 +246,7 @@ int vfio_pci_core_feature_dma_buf(struct vfio_pci_core_device *vdev, u32 flags,
if (ret)
goto err_free_ranges;
- priv = kzalloc_obj(*priv, GFP_KERNEL);
+ priv = kzalloc_obj(*priv);
if (!priv) {
ret = -ENOMEM;
goto err_free_ranges;
diff --git a/drivers/vfio/vfio_iommu_spapr_tce.c b/drivers/vfio/vfio_iommu_spapr_tce.c
index 3867928d2f49..1c0eec228cc6 100644
--- a/drivers/vfio/vfio_iommu_spapr_tce.c
+++ b/drivers/vfio/vfio_iommu_spapr_tce.c
@@ -159,7 +159,7 @@ static long tce_iommu_register_pages(struct tce_container *container,
return ret;
}
- tcemem = kzalloc_obj(*tcemem, GFP_KERNEL);
+ tcemem = kzalloc_obj(*tcemem);
if (!tcemem) {
ret = -ENOMEM;
goto put_exit;
@@ -322,7 +322,7 @@ static void *tce_iommu_open(unsigned long arg)
return ERR_PTR(-EINVAL);
}
- container = kzalloc_obj(*container, GFP_KERNEL);
+ container = kzalloc_obj(*container);
if (!container)
return ERR_PTR(-ENOMEM);
@@ -1290,7 +1290,7 @@ static int tce_iommu_attach_group(void *iommu_data,
}
}
- tcegrp = kzalloc_obj(*tcegrp, GFP_KERNEL);
+ tcegrp = kzalloc_obj(*tcegrp);
if (!tcegrp) {
ret = -ENOMEM;
goto unlock_exit;
diff --git a/drivers/vfio/vfio_iommu_type1.c b/drivers/vfio/vfio_iommu_type1.c
index aedbc2fecb23..03cefdf99a4a 100644
--- a/drivers/vfio/vfio_iommu_type1.c
+++ b/drivers/vfio/vfio_iommu_type1.c
@@ -388,7 +388,7 @@ static int vfio_add_to_pfn_list(struct vfio_dma *dma, dma_addr_t iova,
{
struct vfio_pfn *vpfn;
- vpfn = kzalloc_obj(*vpfn, GFP_KERNEL);
+ vpfn = kzalloc_obj(*vpfn);
if (!vpfn)
return -ENOMEM;
@@ -1097,7 +1097,7 @@ static size_t unmap_unpin_fast(struct vfio_domain *domain,
struct iommu_iotlb_gather *iotlb_gather)
{
size_t unmapped = 0;
- struct vfio_regions *entry = kzalloc_obj(*entry, GFP_KERNEL);
+ struct vfio_regions *entry = kzalloc_obj(*entry);
if (entry) {
unmapped = iommu_unmap_fast(domain->domain, iova, len,
@@ -1753,7 +1753,7 @@ static int vfio_dma_do_map(struct vfio_iommu *iommu,
goto out_unlock;
}
- dma = kzalloc_obj(*dma, GFP_KERNEL);
+ dma = kzalloc_obj(*dma);
if (!dma) {
ret = -ENOMEM;
goto out_unlock;
@@ -2017,7 +2017,7 @@ static int vfio_iommu_iova_insert(struct list_head *head,
{
struct vfio_iova *region;
- region = kmalloc_obj(*region, GFP_KERNEL);
+ region = kmalloc_obj(*region);
if (!region)
return -ENOMEM;
@@ -2259,7 +2259,7 @@ static int vfio_iommu_type1_attach_group(void *iommu_data,
goto out_unlock;
ret = -ENOMEM;
- group = kzalloc_obj(*group, GFP_KERNEL);
+ group = kzalloc_obj(*group);
if (!group)
goto out_unlock;
group->iommu_group = iommu_group;
@@ -2278,7 +2278,7 @@ static int vfio_iommu_type1_attach_group(void *iommu_data,
}
ret = -ENOMEM;
- domain = kzalloc_obj(*domain, GFP_KERNEL);
+ domain = kzalloc_obj(*domain);
if (!domain)
goto out_free_group;
@@ -2625,7 +2625,7 @@ static void *vfio_iommu_type1_open(unsigned long arg)
{
struct vfio_iommu *iommu;
- iommu = kzalloc_obj(*iommu, GFP_KERNEL);
+ iommu = kzalloc_obj(*iommu);
if (!iommu)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/vfio/vfio_main.c b/drivers/vfio/vfio_main.c
index 0028abdfe3cb..742477546b15 100644
--- a/drivers/vfio/vfio_main.c
+++ b/drivers/vfio/vfio_main.c
@@ -82,7 +82,7 @@ int vfio_assign_device_set(struct vfio_device *device, void *set_id)
goto found_get_ref;
xa_unlock(&vfio_device_set_xa);
- new_dev_set = kzalloc_obj(*new_dev_set, GFP_KERNEL);
+ new_dev_set = kzalloc_obj(*new_dev_set);
if (!new_dev_set)
return -ENOMEM;
mutex_init(&new_dev_set->lock);
@@ -1083,7 +1083,7 @@ vfio_ioctl_device_feature_logging_start(struct vfio_device *device,
return -E2BIG;
ranges = u64_to_user_ptr(control.ranges);
- nodes = kmalloc_objs(struct interval_tree_node, nnodes, GFP_KERNEL);
+ nodes = kmalloc_objs(struct interval_tree_node, nnodes);
if (!nodes)
return -ENOMEM;
diff --git a/drivers/vhost/iotlb.c b/drivers/vhost/iotlb.c
index 6528d084f42d..e1414c774c34 100644
--- a/drivers/vhost/iotlb.c
+++ b/drivers/vhost/iotlb.c
@@ -151,7 +151,7 @@ EXPORT_SYMBOL_GPL(vhost_iotlb_init);
*/
struct vhost_iotlb *vhost_iotlb_alloc(unsigned int limit, unsigned int flags)
{
- struct vhost_iotlb *iotlb = kzalloc_obj(*iotlb, GFP_KERNEL);
+ struct vhost_iotlb *iotlb = kzalloc_obj(*iotlb);
if (!iotlb)
return NULL;
diff --git a/drivers/vhost/net.c b/drivers/vhost/net.c
index 440d959b6e24..9b2e888a533c 100644
--- a/drivers/vhost/net.c
+++ b/drivers/vhost/net.c
@@ -240,7 +240,7 @@ vhost_net_ubuf_alloc(struct vhost_virtqueue *vq, bool zcopy)
/* No zero copy backend? Nothing to count. */
if (!zcopy)
return NULL;
- ubufs = kmalloc_obj(*ubufs, GFP_KERNEL);
+ ubufs = kmalloc_obj(*ubufs);
if (!ubufs)
return ERR_PTR(-ENOMEM);
atomic_set(&ubufs->refcount, 1);
@@ -1330,7 +1330,7 @@ static int vhost_net_open(struct inode *inode, struct file *f)
n = kvmalloc_obj(*n, GFP_KERNEL | __GFP_RETRY_MAYFAIL);
if (!n)
return -ENOMEM;
- vqs = kmalloc_objs(*vqs, VHOST_NET_VQ_MAX, GFP_KERNEL);
+ vqs = kmalloc_objs(*vqs, VHOST_NET_VQ_MAX);
if (!vqs) {
kvfree(n);
return -ENOMEM;
@@ -1345,7 +1345,7 @@ static int vhost_net_open(struct inode *inode, struct file *f)
}
n->vqs[VHOST_NET_VQ_RX].rxq.queue = queue;
- xdp = kmalloc_objs(*xdp, VHOST_NET_BATCH, GFP_KERNEL);
+ xdp = kmalloc_objs(*xdp, VHOST_NET_BATCH);
if (!xdp) {
kfree(vqs);
kvfree(n);
diff --git a/drivers/vhost/scsi.c b/drivers/vhost/scsi.c
index 36ed704562d7..a3e7930e1ca5 100644
--- a/drivers/vhost/scsi.c
+++ b/drivers/vhost/scsi.c
@@ -548,7 +548,7 @@ vhost_scsi_allocate_evt(struct vhost_scsi *vs,
return NULL;
}
- evt = kzalloc_obj(*evt, GFP_KERNEL);
+ evt = kzalloc_obj(*evt);
if (!evt) {
vq_err(vq, "Failed to allocate vhost_scsi_evt\n");
vs->vs_events_missed = true;
@@ -896,7 +896,7 @@ vhost_scsi_copy_iov_to_sgl(struct vhost_scsi_cmd *cmd, struct iov_iter *iter,
int i, ret;
if (data_dir == DMA_FROM_DEVICE) {
- cmd->read_iter = kzalloc_obj(*cmd->read_iter, GFP_KERNEL);
+ cmd->read_iter = kzalloc_obj(*cmd->read_iter);
if (!cmd->read_iter)
return -ENOMEM;
@@ -1263,7 +1263,7 @@ vhost_scsi_setup_resp_iovs(struct vhost_scsi_cmd *cmd, struct iovec *in_iovs,
* iov per byte.
*/
cnt = min(VHOST_SCSI_MAX_RESP_IOVS, in_iovs_cnt);
- cmd->tvc_resp_iovs = kzalloc_objs(struct iovec, cnt, GFP_KERNEL);
+ cmd->tvc_resp_iovs = kzalloc_objs(struct iovec, cnt);
if (!cmd->tvc_resp_iovs)
return -ENOMEM;
@@ -1601,7 +1601,7 @@ vhost_scsi_handle_tmf(struct vhost_scsi *vs, struct vhost_scsi_tpg *tpg,
goto send_reject;
}
- tmf = kzalloc_obj(*tmf, GFP_KERNEL);
+ tmf = kzalloc_obj(*tmf);
if (!tmf)
goto send_reject;
@@ -1615,7 +1615,7 @@ vhost_scsi_handle_tmf(struct vhost_scsi *vs, struct vhost_scsi_tpg *tpg,
tmf->inflight = vhost_scsi_get_inflight(vq);
if (unlikely(log && log_num)) {
- tmf->tmf_log = kmalloc_objs(*tmf->tmf_log, log_num, GFP_KERNEL);
+ tmf->tmf_log = kmalloc_objs(*tmf->tmf_log, log_num);
if (tmf->tmf_log) {
memcpy(tmf->tmf_log, log, sizeof(*tmf->tmf_log) * log_num);
tmf->tmf_log_num = log_num;
@@ -1933,7 +1933,7 @@ static int vhost_scsi_setup_vq_cmds(struct vhost_virtqueue *vq, int max_cmds)
return -ENOMEM;
svq->max_cmds = max_cmds;
- svq->scsi_cmds = kzalloc_objs(*tv_cmd, max_cmds, GFP_KERNEL);
+ svq->scsi_cmds = kzalloc_objs(*tv_cmd, max_cmds);
if (!svq->scsi_cmds) {
sbitmap_free(&svq->scsi_tags);
return -ENOMEM;
@@ -2279,7 +2279,7 @@ static int vhost_scsi_open(struct inode *inode, struct file *f)
struct vhost_virtqueue **vqs;
int r = -ENOMEM, i, nvqs = vhost_scsi_max_io_vqs;
- vs = kvzalloc_obj(*vs, GFP_KERNEL);
+ vs = kvzalloc_obj(*vs);
if (!vs)
goto err_vs;
vs->inline_sg_cnt = vhost_scsi_inline_sg_cnt;
@@ -2303,7 +2303,7 @@ static int vhost_scsi_open(struct inode *inode, struct file *f)
if (!vs->vqs)
goto err_vqs;
- vqs = kmalloc_objs(*vqs, nvqs, GFP_KERNEL);
+ vqs = kmalloc_objs(*vqs, nvqs);
if (!vqs)
goto err_local_vqs;
@@ -2599,7 +2599,7 @@ static int vhost_scsi_make_nexus(struct vhost_scsi_tpg *tpg,
return -EEXIST;
}
- tv_nexus = kzalloc_obj(*tv_nexus, GFP_KERNEL);
+ tv_nexus = kzalloc_obj(*tv_nexus);
if (!tv_nexus) {
mutex_unlock(&tpg->tv_tpg_mutex);
pr_err("Unable to allocate struct vhost_scsi_nexus\n");
@@ -2794,7 +2794,7 @@ vhost_scsi_make_tpg(struct se_wwn *wwn, const char *name)
if (kstrtou16(name + 5, 10, &tpgt) || tpgt >= VHOST_SCSI_MAX_TARGET)
return ERR_PTR(-EINVAL);
- tpg = kzalloc_obj(*tpg, GFP_KERNEL);
+ tpg = kzalloc_obj(*tpg);
if (!tpg) {
pr_err("Unable to allocate struct vhost_scsi_tpg");
return ERR_PTR(-ENOMEM);
@@ -2848,7 +2848,7 @@ vhost_scsi_make_tport(struct target_fabric_configfs *tf,
/* if (vhost_scsi_parse_wwn(name, &wwpn, 1) < 0)
return ERR_PTR(-EINVAL); */
- tport = kzalloc_obj(*tport, GFP_KERNEL);
+ tport = kzalloc_obj(*tport);
if (!tport) {
pr_err("Unable to allocate struct vhost_scsi_tport");
return ERR_PTR(-ENOMEM);
diff --git a/drivers/vhost/test.c b/drivers/vhost/test.c
index fc11a048a620..24514c8fdee4 100644
--- a/drivers/vhost/test.c
+++ b/drivers/vhost/test.c
@@ -110,13 +110,13 @@ static void handle_vq_kick(struct vhost_work *work)
static int vhost_test_open(struct inode *inode, struct file *f)
{
- struct vhost_test *n = kmalloc_obj(*n, GFP_KERNEL);
+ struct vhost_test *n = kmalloc_obj(*n);
struct vhost_dev *dev;
struct vhost_virtqueue **vqs;
if (!n)
return -ENOMEM;
- vqs = kmalloc_objs(*vqs, VHOST_TEST_VQ_MAX, GFP_KERNEL);
+ vqs = kmalloc_objs(*vqs, VHOST_TEST_VQ_MAX);
if (!vqs) {
kfree(n);
return -ENOMEM;
diff --git a/drivers/vhost/vdpa.c b/drivers/vhost/vdpa.c
index a9f85f05874f..692564b1bcbb 100644
--- a/drivers/vhost/vdpa.c
+++ b/drivers/vhost/vdpa.c
@@ -110,7 +110,7 @@ static struct vhost_vdpa_as *vhost_vdpa_alloc_as(struct vhost_vdpa *v, u32 asid)
if (asid >= v->vdpa->nas)
return NULL;
- as = kmalloc_obj(*as, GFP_KERNEL);
+ as = kmalloc_obj(*as);
if (!as)
return NULL;
@@ -1064,7 +1064,7 @@ static int vhost_vdpa_va_map(struct vhost_vdpa *v,
!(vma->vm_flags & (VM_IO | VM_PFNMAP))))
goto next;
- map_file = kzalloc_obj(*map_file, GFP_KERNEL);
+ map_file = kzalloc_obj(*map_file);
if (!map_file) {
ret = -ENOMEM;
break;
@@ -1420,7 +1420,7 @@ static int vhost_vdpa_open(struct inode *inode, struct file *filep)
if (r)
goto err;
- vqs = kmalloc_objs(*vqs, nvqs, GFP_KERNEL);
+ vqs = kmalloc_objs(*vqs, nvqs);
if (!vqs) {
r = -ENOMEM;
goto err;
@@ -1593,7 +1593,7 @@ static int vhost_vdpa_probe(struct vdpa_device *vdpa)
v->dev.release = vhost_vdpa_release_dev;
v->dev.parent = &vdpa->dev;
v->dev.devt = MKDEV(MAJOR(vhost_vdpa_major), minor);
- v->vqs = kmalloc_objs(struct vhost_virtqueue, v->nvqs, GFP_KERNEL);
+ v->vqs = kmalloc_objs(struct vhost_virtqueue, v->nvqs);
if (!v->vqs) {
r = -ENOMEM;
goto err;
diff --git a/drivers/vhost/vhost.c b/drivers/vhost/vhost.c
index dafbc3dd3805..7260cdb92716 100644
--- a/drivers/vhost/vhost.c
+++ b/drivers/vhost/vhost.c
@@ -516,8 +516,8 @@ static long vhost_dev_alloc_iovecs(struct vhost_dev *dev)
vq = dev->vqs[i];
vq->indirect = kmalloc_objs(*vq->indirect, UIO_MAXIOV,
GFP_KERNEL);
- vq->log = kmalloc_objs(*vq->log, dev->iov_limit, GFP_KERNEL);
- vq->heads = kmalloc_objs(*vq->heads, dev->iov_limit, GFP_KERNEL);
+ vq->log = kmalloc_objs(*vq->log, dev->iov_limit);
+ vq->heads = kmalloc_objs(*vq->heads, dev->iov_limit);
vq->nheads = kmalloc_array(dev->iov_limit, sizeof(*vq->nheads),
GFP_KERNEL);
if (!vq->indirect || !vq->log || !vq->heads || !vq->nheads)
@@ -3268,7 +3268,7 @@ EXPORT_SYMBOL_GPL(vhost_disable_notify);
struct vhost_msg_node *vhost_new_msg(struct vhost_virtqueue *vq, int type)
{
/* Make sure all padding within the structure is initialized. */
- struct vhost_msg_node *node = kzalloc_obj(*node, GFP_KERNEL);
+ struct vhost_msg_node *node = kzalloc_obj(*node);
if (!node)
return NULL;
diff --git a/drivers/vhost/vsock.c b/drivers/vhost/vsock.c
index 0bb4e3fdc71c..054f7a718f50 100644
--- a/drivers/vhost/vsock.c
+++ b/drivers/vhost/vsock.c
@@ -680,7 +680,7 @@ static int vhost_vsock_dev_open(struct inode *inode, struct file *file)
if (!vsock)
return -ENOMEM;
- vqs = kmalloc_objs(*vqs, ARRAY_SIZE(vsock->vqs), GFP_KERNEL);
+ vqs = kmalloc_objs(*vqs, ARRAY_SIZE(vsock->vqs));
if (!vqs) {
ret = -ENOMEM;
goto out;
diff --git a/drivers/video/backlight/backlight.c b/drivers/video/backlight/backlight.c
index c6e155a150a5..a22d0bbb6e63 100644
--- a/drivers/video/backlight/backlight.c
+++ b/drivers/video/backlight/backlight.c
@@ -371,7 +371,7 @@ struct backlight_device *backlight_device_register(const char *name,
pr_debug("backlight_device_register: name=%s\n", name);
- new_bd = kzalloc_obj(struct backlight_device, GFP_KERNEL);
+ new_bd = kzalloc_obj(struct backlight_device);
if (!new_bd)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/video/backlight/lcd.c b/drivers/video/backlight/lcd.c
index d33c4f370075..e918f57608ef 100644
--- a/drivers/video/backlight/lcd.c
+++ b/drivers/video/backlight/lcd.c
@@ -197,7 +197,7 @@ struct lcd_device *lcd_device_register(const char *name, struct device *parent,
pr_debug("lcd_device_register: name=%s\n", name);
- new_ld = kzalloc_obj(struct lcd_device, GFP_KERNEL);
+ new_ld = kzalloc_obj(struct lcd_device);
if (!new_ld)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/video/console/sticon.c b/drivers/video/console/sticon.c
index 98df1ddfd1e9..6f58e6a9e76a 100644
--- a/drivers/video/console/sticon.c
+++ b/drivers/video/console/sticon.c
@@ -186,7 +186,7 @@ static int sticon_set_font(struct vc_data *vc, const struct console_font *op,
new_font->underline_height = 0;
new_font->underline_pos = 0;
- cooked_font = kzalloc_obj(*cooked_font, GFP_KERNEL);
+ cooked_font = kzalloc_obj(*cooked_font);
if (!cooked_font) {
kfree(new_font);
return -ENOMEM;
diff --git a/drivers/video/fbdev/aty/radeon_backlight.c b/drivers/video/fbdev/aty/radeon_backlight.c
index 908b2be850ac..32d7f32db46a 100644
--- a/drivers/video/fbdev/aty/radeon_backlight.c
+++ b/drivers/video/fbdev/aty/radeon_backlight.c
@@ -136,7 +136,7 @@ void radeonfb_bl_init(struct radeonfb_info *rinfo)
return;
#endif
- pdata = kmalloc_obj(struct radeon_bl_privdata, GFP_KERNEL);
+ pdata = kmalloc_obj(struct radeon_bl_privdata);
if (!pdata) {
printk("radeonfb: Memory allocation failed\n");
goto error;
diff --git a/drivers/video/fbdev/aty/radeon_base.c b/drivers/video/fbdev/aty/radeon_base.c
index 979e8eb6cda4..cb006484831b 100644
--- a/drivers/video/fbdev/aty/radeon_base.c
+++ b/drivers/video/fbdev/aty/radeon_base.c
@@ -1653,7 +1653,7 @@ static int radeonfb_set_par(struct fb_info *info)
int depth = var_to_depth(mode);
int use_rmx = 0;
- newmode = kmalloc_obj(struct radeon_regs, GFP_KERNEL);
+ newmode = kmalloc_obj(struct radeon_regs);
if (!newmode)
return -ENOMEM;
diff --git a/drivers/video/fbdev/carminefb.c b/drivers/video/fbdev/carminefb.c
index 82836c327f05..bd4bff6a2484 100644
--- a/drivers/video/fbdev/carminefb.c
+++ b/drivers/video/fbdev/carminefb.c
@@ -620,7 +620,7 @@ static int carminefb_probe(struct pci_dev *dev, const struct pci_device_id *ent)
return ret;
ret = -ENOMEM;
- hw = kzalloc_obj(*hw, GFP_KERNEL);
+ hw = kzalloc_obj(*hw);
if (!hw)
goto err_enable_pci;
diff --git a/drivers/video/fbdev/controlfb.c b/drivers/video/fbdev/controlfb.c
index b589f46178a2..4bb821d7f284 100644
--- a/drivers/video/fbdev/controlfb.c
+++ b/drivers/video/fbdev/controlfb.c
@@ -944,7 +944,7 @@ static int __init control_of_init(struct device_node *dp)
printk(KERN_ERR "can't get 2 addresses for control\n");
return -ENXIO;
}
- p = kzalloc_obj(*p, GFP_KERNEL);
+ p = kzalloc_obj(*p);
if (!p)
return -ENOMEM;
control_fb = p; /* save it for cleanups */
diff --git a/drivers/video/fbdev/core/fb_defio.c b/drivers/video/fbdev/core/fb_defio.c
index 2b2604255b90..ca48b89a323d 100644
--- a/drivers/video/fbdev/core/fb_defio.c
+++ b/drivers/video/fbdev/core/fb_defio.c
@@ -307,7 +307,7 @@ int fb_deferred_io_init(struct fb_info *info)
npagerefs = DIV_ROUND_UP(info->fix.smem_len, PAGE_SIZE);
/* alloc a page ref for each page of the display memory */
- pagerefs = kvzalloc_objs(*pagerefs, npagerefs, GFP_KERNEL);
+ pagerefs = kvzalloc_objs(*pagerefs, npagerefs);
if (!pagerefs) {
ret = -ENOMEM;
goto err;
diff --git a/drivers/video/fbdev/core/fbcon.c b/drivers/video/fbdev/core/fbcon.c
index 29ed5b152ac6..666261ae59d8 100644
--- a/drivers/video/fbdev/core/fbcon.c
+++ b/drivers/video/fbdev/core/fbcon.c
@@ -769,7 +769,7 @@ static int fbcon_open(struct fb_info *info)
}
unlock_fb_info(info);
- par = kzalloc_obj(*par, GFP_KERNEL);
+ par = kzalloc_obj(*par);
if (!par) {
fbcon_release(info);
return -ENOMEM;
diff --git a/drivers/video/fbdev/core/fbmon.c b/drivers/video/fbdev/core/fbmon.c
index 67ccb5607ded..f96b4e7b7f21 100644
--- a/drivers/video/fbdev/core/fbmon.c
+++ b/drivers/video/fbdev/core/fbmon.c
@@ -388,7 +388,7 @@ static void calc_mode_timings(int xres, int yres, int refresh,
{
struct fb_var_screeninfo *var;
- var = kzalloc_obj(struct fb_var_screeninfo, GFP_KERNEL);
+ var = kzalloc_obj(struct fb_var_screeninfo);
if (var) {
var->xres = xres;
@@ -626,7 +626,7 @@ static struct fb_videomode *fb_create_modedb(unsigned char *edid, int *dbsize,
int num = 0, i, first = 1;
int ver, rev;
- mode = kzalloc_objs(struct fb_videomode, 50, GFP_KERNEL);
+ mode = kzalloc_objs(struct fb_videomode, 50);
if (mode == NULL)
return NULL;
@@ -677,7 +677,7 @@ static struct fb_videomode *fb_create_modedb(unsigned char *edid, int *dbsize,
}
*dbsize = num;
- m = kmalloc_objs(struct fb_videomode, num, GFP_KERNEL);
+ m = kmalloc_objs(struct fb_videomode, num);
if (!m)
return mode;
memmove(m, mode, num * sizeof(struct fb_videomode));
@@ -1224,7 +1224,7 @@ int fb_get_mode(int flags, u32 val, struct fb_var_screeninfo *var, struct fb_inf
u32 hfmin, hfmax, vfmin, vfmax, dclkmin, dclkmax, err = 0;
- timings = kzalloc_obj(struct __fb_timings, GFP_KERNEL);
+ timings = kzalloc_obj(struct __fb_timings);
if (!timings)
return -ENOMEM;
diff --git a/drivers/video/fbdev/core/modedb.c b/drivers/video/fbdev/core/modedb.c
index fda6066eec99..703d0b7aec32 100644
--- a/drivers/video/fbdev/core/modedb.c
+++ b/drivers/video/fbdev/core/modedb.c
@@ -1070,7 +1070,7 @@ int fb_add_videomode(const struct fb_videomode *mode, struct list_head *head)
}
}
if (!found) {
- modelist = kmalloc_obj(struct fb_modelist, GFP_KERNEL);
+ modelist = kmalloc_obj(struct fb_modelist);
if (!modelist)
return -ENOMEM;
diff --git a/drivers/video/fbdev/cyber2000fb.c b/drivers/video/fbdev/cyber2000fb.c
index 172ca6bc2c05..2d12f8e96c7e 100644
--- a/drivers/video/fbdev/cyber2000fb.c
+++ b/drivers/video/fbdev/cyber2000fb.c
@@ -1363,7 +1363,7 @@ static struct cfb_info *cyberpro_alloc_fb_info(unsigned int id, char *name)
{
struct cfb_info *cfb;
- cfb = kzalloc_obj(struct cfb_info, GFP_KERNEL);
+ cfb = kzalloc_obj(struct cfb_info);
if (!cfb)
return NULL;
diff --git a/drivers/video/fbdev/goldfishfb.c b/drivers/video/fbdev/goldfishfb.c
index fcba50a6f65b..ffe33a36b944 100644
--- a/drivers/video/fbdev/goldfishfb.c
+++ b/drivers/video/fbdev/goldfishfb.c
@@ -180,7 +180,7 @@ static int goldfish_fb_probe(struct platform_device *pdev)
u32 width, height;
dma_addr_t fbpaddr;
- fb = kzalloc_obj(*fb, GFP_KERNEL);
+ fb = kzalloc_obj(*fb);
if (fb == NULL) {
ret = -ENOMEM;
goto err_fb_alloc_failed;
diff --git a/drivers/video/fbdev/matrox/i2c-matroxfb.c b/drivers/video/fbdev/matrox/i2c-matroxfb.c
index 6741028d2d0c..e02dd11b090e 100644
--- a/drivers/video/fbdev/matrox/i2c-matroxfb.c
+++ b/drivers/video/fbdev/matrox/i2c-matroxfb.c
@@ -144,7 +144,7 @@ static void* i2c_matroxfb_probe(struct matrox_fb_info* minfo) {
unsigned long flags;
struct matroxfb_dh_maven_info* m2info;
- m2info = kzalloc_obj(*m2info, GFP_KERNEL);
+ m2info = kzalloc_obj(*m2info);
if (!m2info)
return NULL;
diff --git a/drivers/video/fbdev/matrox/matroxfb_base.c b/drivers/video/fbdev/matrox/matroxfb_base.c
index e7d8e13d1945..e1a4bc7c2318 100644
--- a/drivers/video/fbdev/matrox/matroxfb_base.c
+++ b/drivers/video/fbdev/matrox/matroxfb_base.c
@@ -2073,7 +2073,7 @@ static int matroxfb_probe(struct pci_dev* pdev, const struct pci_device_id* dumm
return -1;
}
- minfo = kzalloc_obj(*minfo, GFP_KERNEL);
+ minfo = kzalloc_obj(*minfo);
if (!minfo)
return -ENOMEM;
diff --git a/drivers/video/fbdev/matrox/matroxfb_crtc2.c b/drivers/video/fbdev/matrox/matroxfb_crtc2.c
index 6043ebb2bc96..8de882b09a24 100644
--- a/drivers/video/fbdev/matrox/matroxfb_crtc2.c
+++ b/drivers/video/fbdev/matrox/matroxfb_crtc2.c
@@ -693,7 +693,7 @@ static void* matroxfb_crtc2_probe(struct matrox_fb_info* minfo) {
/* hardware is CRTC2 incapable... */
if (!minfo->devflags.crtc2)
return NULL;
- m2info = kzalloc_obj(*m2info, GFP_KERNEL);
+ m2info = kzalloc_obj(*m2info);
if (!m2info)
return NULL;
diff --git a/drivers/video/fbdev/matrox/matroxfb_maven.c b/drivers/video/fbdev/matrox/matroxfb_maven.c
index 63cc77ac74ea..2ea65da6075c 100644
--- a/drivers/video/fbdev/matrox/matroxfb_maven.c
+++ b/drivers/video/fbdev/matrox/matroxfb_maven.c
@@ -1260,7 +1260,7 @@ static int maven_probe(struct i2c_client *client)
I2C_FUNC_NOSTART |
I2C_FUNC_PROTOCOL_MANGLING))
goto ERROR0;
- if (!(data = kzalloc_obj(*data, GFP_KERNEL))) {
+ if (!(data = kzalloc_obj(*data))) {
err = -ENOMEM;
goto ERROR0;
}
diff --git a/drivers/video/fbdev/mmp/hw/mmp_ctrl.c b/drivers/video/fbdev/mmp/hw/mmp_ctrl.c
index 2cd152f7a4be..75bbdc0b4aa6 100644
--- a/drivers/video/fbdev/mmp/hw/mmp_ctrl.c
+++ b/drivers/video/fbdev/mmp/hw/mmp_ctrl.c
@@ -402,7 +402,7 @@ static int path_init(struct mmphw_path_plat *path_plat,
dev_info(ctrl->dev, "%s: %s\n", __func__, config->name);
/* init driver data */
- path_info = kzalloc_obj(*path_info, GFP_KERNEL);
+ path_info = kzalloc_obj(*path_info);
if (!path_info)
return 0;
diff --git a/drivers/video/fbdev/mmp/panel/tpo_tj032md01bw.c b/drivers/video/fbdev/mmp/panel/tpo_tj032md01bw.c
index 40194c60987d..d111ec2a4703 100644
--- a/drivers/video/fbdev/mmp/panel/tpo_tj032md01bw.c
+++ b/drivers/video/fbdev/mmp/panel/tpo_tj032md01bw.c
@@ -144,7 +144,7 @@ static int tpohvga_probe(struct spi_device *spi)
return ret;
}
- plat_data = kzalloc_obj(*plat_data, GFP_KERNEL);
+ plat_data = kzalloc_obj(*plat_data);
if (plat_data == NULL)
return -ENOMEM;
diff --git a/drivers/video/fbdev/neofb.c b/drivers/video/fbdev/neofb.c
index 7b7a2b2d1a40..c1cd028b8991 100644
--- a/drivers/video/fbdev/neofb.c
+++ b/drivers/video/fbdev/neofb.c
@@ -1768,7 +1768,7 @@ static int neo_scan_monitor(struct fb_info *info)
int w;
// Eventually we will have i2c support.
- info->monspecs.modedb = kmalloc_obj(struct fb_videomode, GFP_KERNEL);
+ info->monspecs.modedb = kmalloc_obj(struct fb_videomode);
if (!info->monspecs.modedb)
return -ENOMEM;
info->monspecs.modedb_len = 1;
diff --git a/drivers/video/fbdev/nvidia/nv_setup.c b/drivers/video/fbdev/nvidia/nv_setup.c
index f392da4761da..281c7f2ee650 100644
--- a/drivers/video/fbdev/nvidia/nv_setup.c
+++ b/drivers/video/fbdev/nvidia/nv_setup.c
@@ -283,9 +283,9 @@ int NVCommonSetup(struct fb_info *info)
int Television = 0;
int err = 0;
- var = kzalloc_obj(struct fb_var_screeninfo, GFP_KERNEL);
- monitorA = kzalloc_obj(struct fb_monspecs, GFP_KERNEL);
- monitorB = kzalloc_obj(struct fb_monspecs, GFP_KERNEL);
+ var = kzalloc_obj(struct fb_var_screeninfo);
+ monitorA = kzalloc_obj(struct fb_monspecs);
+ monitorB = kzalloc_obj(struct fb_monspecs);
if (!var || !monitorA || !monitorB) {
err = -ENOMEM;
diff --git a/drivers/video/fbdev/omap/lcd_mipid.c b/drivers/video/fbdev/omap/lcd_mipid.c
index ffe0ce489adb..72c2a56943c2 100644
--- a/drivers/video/fbdev/omap/lcd_mipid.c
+++ b/drivers/video/fbdev/omap/lcd_mipid.c
@@ -552,7 +552,7 @@ static int mipid_spi_probe(struct spi_device *spi)
struct mipid_device *md;
int r;
- md = kzalloc_obj(*md, GFP_KERNEL);
+ md = kzalloc_obj(*md);
if (md == NULL) {
dev_err(&spi->dev, "out of memory\n");
return -ENOMEM;
diff --git a/drivers/video/fbdev/omap/omapfb_main.c b/drivers/video/fbdev/omap/omapfb_main.c
index 8306faf01f40..cafe859d6e5a 100644
--- a/drivers/video/fbdev/omap/omapfb_main.c
+++ b/drivers/video/fbdev/omap/omapfb_main.c
@@ -1630,7 +1630,7 @@ static int omapfb_do_probe(struct platform_device *pdev,
goto cleanup;
}
- fbdev = kzalloc_obj(*fbdev, GFP_KERNEL);
+ fbdev = kzalloc_obj(*fbdev);
if (fbdev == NULL) {
dev_err(&pdev->dev,
"unable to allocate memory for device info\n");
diff --git a/drivers/video/fbdev/omap2/omapfb/dss/dsi.c b/drivers/video/fbdev/omap2/omapfb/dss/dsi.c
index 19498b7ccb14..330d9fb7d2b0 100644
--- a/drivers/video/fbdev/omap2/omapfb/dss/dsi.c
+++ b/drivers/video/fbdev/omap2/omapfb/dss/dsi.c
@@ -1539,7 +1539,7 @@ static void dsi_dump_dsidev_irqs(struct platform_device *dsidev,
unsigned long flags;
struct dsi_irq_stats *stats;
- stats = kzalloc_obj(*stats, GFP_KERNEL);
+ stats = kzalloc_obj(*stats);
if (!stats) {
seq_printf(s, "out of memory\n");
return;
diff --git a/drivers/video/fbdev/omap2/omapfb/dss/omapdss-boot-init.c b/drivers/video/fbdev/omap2/omapfb/dss/omapdss-boot-init.c
index 098c02164428..154347e5ddaf 100644
--- a/drivers/video/fbdev/omap2/omapfb/dss/omapdss-boot-init.c
+++ b/drivers/video/fbdev/omap2/omapfb/dss/omapdss-boot-init.c
@@ -46,7 +46,7 @@ static void __init omapdss_update_prop(struct device_node *node, char *compat,
{
struct property *prop;
- prop = kzalloc_obj(*prop, GFP_KERNEL);
+ prop = kzalloc_obj(*prop);
if (!prop)
return;
@@ -110,7 +110,7 @@ static void __init omapdss_omapify_node(struct device_node *node)
static void __init omapdss_add_to_list(struct device_node *node, bool root)
{
- struct dss_conv_node *n = kmalloc_obj(struct dss_conv_node, GFP_KERNEL);
+ struct dss_conv_node *n = kmalloc_obj(struct dss_conv_node);
if (n) {
n->node = node;
n->root = root;
diff --git a/drivers/video/fbdev/omap2/omapfb/dss/overlay.c b/drivers/video/fbdev/omap2/omapfb/dss/overlay.c
index cb2a230c57a1..6b04162aa9fc 100644
--- a/drivers/video/fbdev/omap2/omapfb/dss/overlay.c
+++ b/drivers/video/fbdev/omap2/omapfb/dss/overlay.c
@@ -49,7 +49,7 @@ void dss_init_overlays(struct platform_device *pdev)
num_overlays = dss_feat_get_num_ovls();
- overlays = kzalloc_objs(struct omap_overlay, num_overlays, GFP_KERNEL);
+ overlays = kzalloc_objs(struct omap_overlay, num_overlays);
BUG_ON(overlays == NULL);
diff --git a/drivers/video/fbdev/omap2/omapfb/omapfb-main.c b/drivers/video/fbdev/omap2/omapfb/omapfb-main.c
index 599a7d6a6114..a8b2930290e1 100644
--- a/drivers/video/fbdev/omap2/omapfb/omapfb-main.c
+++ b/drivers/video/fbdev/omap2/omapfb/omapfb-main.c
@@ -2023,19 +2023,19 @@ static int omapfb_mode_to_timings(const char *mode_str,
var = NULL;
fbops = NULL;
- fbi = kzalloc_obj(*fbi, GFP_KERNEL);
+ fbi = kzalloc_obj(*fbi);
if (fbi == NULL) {
r = -ENOMEM;
goto err;
}
- var = kzalloc_obj(*var, GFP_KERNEL);
+ var = kzalloc_obj(*var);
if (var == NULL) {
r = -ENOMEM;
goto err;
}
- fbops = kzalloc_obj(*fbops, GFP_KERNEL);
+ fbops = kzalloc_obj(*fbops);
if (fbops == NULL) {
r = -ENOMEM;
goto err;
@@ -2244,7 +2244,7 @@ static int omapfb_find_best_mode(struct omap_dss_device *display,
if (r < 0)
goto err1;
- specs = kzalloc_obj(*specs, GFP_KERNEL);
+ specs = kzalloc_obj(*specs);
if (specs == NULL) {
r = -ENOMEM;
goto err1;
diff --git a/drivers/video/fbdev/pvr2fb.c b/drivers/video/fbdev/pvr2fb.c
index d47c173fd8e0..3f6384e631b1 100644
--- a/drivers/video/fbdev/pvr2fb.c
+++ b/drivers/video/fbdev/pvr2fb.c
@@ -652,7 +652,7 @@ static ssize_t pvr2fb_write(struct fb_info *info, const char *buf,
nr_pages = (count + PAGE_SIZE - 1) >> PAGE_SHIFT;
- pages = kmalloc_objs(struct page *, nr_pages, GFP_KERNEL);
+ pages = kmalloc_objs(struct page *, nr_pages);
if (!pages)
return -ENOMEM;
diff --git a/drivers/video/fbdev/pxa3xx-gcu.c b/drivers/video/fbdev/pxa3xx-gcu.c
index c2aec9419ae9..a2320e2fb8f2 100644
--- a/drivers/video/fbdev/pxa3xx-gcu.c
+++ b/drivers/video/fbdev/pxa3xx-gcu.c
@@ -530,7 +530,7 @@ pxa3xx_gcu_add_buffer(struct device *dev,
{
struct pxa3xx_gcu_batch *buffer;
- buffer = kzalloc_obj(struct pxa3xx_gcu_batch, GFP_KERNEL);
+ buffer = kzalloc_obj(struct pxa3xx_gcu_batch);
if (!buffer)
return -ENOMEM;
diff --git a/drivers/video/fbdev/sh_mobile_lcdcfb.c b/drivers/video/fbdev/sh_mobile_lcdcfb.c
index c52391f9893b..72969fe8e513 100644
--- a/drivers/video/fbdev/sh_mobile_lcdcfb.c
+++ b/drivers/video/fbdev/sh_mobile_lcdcfb.c
@@ -2512,7 +2512,7 @@ static int sh_mobile_lcdc_probe(struct platform_device *pdev)
return -ENOENT;
}
- priv = kzalloc_obj(*priv, GFP_KERNEL);
+ priv = kzalloc_obj(*priv);
if (!priv)
return -ENOMEM;
diff --git a/drivers/video/fbdev/simplefb.c b/drivers/video/fbdev/simplefb.c
index 67f3f2df2064..60e5dcec201f 100644
--- a/drivers/video/fbdev/simplefb.c
+++ b/drivers/video/fbdev/simplefb.c
@@ -249,7 +249,7 @@ static int simplefb_clocks_get(struct simplefb_par *par,
if (!par->clk_count)
return 0;
- par->clks = kzalloc_objs(struct clk *, par->clk_count, GFP_KERNEL);
+ par->clks = kzalloc_objs(struct clk *, par->clk_count);
if (!par->clks)
return -ENOMEM;
diff --git a/drivers/video/fbdev/sm501fb.c b/drivers/video/fbdev/sm501fb.c
index abc9bcfe579b..fee4b9f84592 100644
--- a/drivers/video/fbdev/sm501fb.c
+++ b/drivers/video/fbdev/sm501fb.c
@@ -1947,7 +1947,7 @@ static int sm501fb_probe(struct platform_device *pdev)
int ret;
/* allocate our framebuffers */
- info = kzalloc_obj(*info, GFP_KERNEL);
+ info = kzalloc_obj(*info);
if (!info) {
dev_err(dev, "failed to allocate state\n");
return -ENOMEM;
diff --git a/drivers/video/fbdev/smscufx.c b/drivers/video/fbdev/smscufx.c
index ddc45d9a2ca2..fa0d105841b3 100644
--- a/drivers/video/fbdev/smscufx.c
+++ b/drivers/video/fbdev/smscufx.c
@@ -1038,7 +1038,7 @@ static int ufx_ops_open(struct fb_info *info, int user)
struct fb_deferred_io *fbdefio;
- fbdefio = kzalloc_obj(*fbdefio, GFP_KERNEL);
+ fbdefio = kzalloc_obj(*fbdefio);
if (fbdefio) {
fbdefio->delay = UFX_DEFIO_WRITE_DELAY;
fbdefio->deferred_io = ufx_dpy_deferred_io;
@@ -1595,7 +1595,7 @@ static int ufx_usb_probe(struct usb_interface *interface,
usbdev = interface_to_usbdev(interface);
BUG_ON(!usbdev);
- dev = kzalloc_obj(*dev, GFP_KERNEL);
+ dev = kzalloc_obj(*dev);
if (dev == NULL) {
dev_err(&usbdev->dev, "ufx_usb_probe: failed alloc of dev struct\n");
return -ENOMEM;
@@ -1852,7 +1852,7 @@ static int ufx_alloc_urb_list(struct ufx_data *dev, int count, size_t size)
INIT_LIST_HEAD(&dev->urbs.list);
while (i < count) {
- unode = kzalloc_obj(*unode, GFP_KERNEL);
+ unode = kzalloc_obj(*unode);
if (!unode)
break;
unode->dev = dev;
diff --git a/drivers/video/fbdev/udlfb.c b/drivers/video/fbdev/udlfb.c
index ba060af2b09f..db14827aebdd 100644
--- a/drivers/video/fbdev/udlfb.c
+++ b/drivers/video/fbdev/udlfb.c
@@ -918,7 +918,7 @@ static int dlfb_ops_open(struct fb_info *info, int user)
struct fb_deferred_io *fbdefio;
- fbdefio = kzalloc_obj(struct fb_deferred_io, GFP_KERNEL);
+ fbdefio = kzalloc_obj(struct fb_deferred_io);
if (fbdefio) {
fbdefio->delay = DL_DEFIO_WRITE_DELAY;
@@ -1607,7 +1607,7 @@ static int dlfb_usb_probe(struct usb_interface *intf,
static u8 out_ep[] = {OUT_EP_NUM + USB_DIR_OUT, 0};
/* usb initialization */
- dlfb = kzalloc_obj(*dlfb, GFP_KERNEL);
+ dlfb = kzalloc_obj(*dlfb);
if (!dlfb) {
dev_err(&intf->dev, "%s: failed to allocate dlfb\n", __func__);
return -ENOMEM;
@@ -1853,7 +1853,7 @@ static int dlfb_alloc_urb_list(struct dlfb_data *dlfb, int count, size_t size)
dlfb->urbs.available = 0;
while (dlfb->urbs.count * size < wanted_size) {
- unode = kzalloc_obj(*unode, GFP_KERNEL);
+ unode = kzalloc_obj(*unode);
if (!unode)
break;
unode->dlfb = dlfb;
diff --git a/drivers/video/fbdev/uvesafb.c b/drivers/video/fbdev/uvesafb.c
index c9e299afc02b..610a355dcb05 100644
--- a/drivers/video/fbdev/uvesafb.c
+++ b/drivers/video/fbdev/uvesafb.c
@@ -258,9 +258,9 @@ static struct uvesafb_ktask *uvesafb_prep(void)
{
struct uvesafb_ktask *task;
- task = kzalloc_obj(*task, GFP_KERNEL);
+ task = kzalloc_obj(*task);
if (task) {
- task->done = kzalloc_obj(*task->done, GFP_KERNEL);
+ task->done = kzalloc_obj(*task->done);
if (!task->done) {
kfree(task);
task = NULL;
@@ -861,7 +861,7 @@ static int uvesafb_vbe_init_mode(struct fb_info *info)
* Convert the modelist into a modedb so that we can use it with
* fb_find_mode().
*/
- mode = kzalloc_objs(*mode, i, GFP_KERNEL);
+ mode = kzalloc_objs(*mode, i);
if (mode) {
i = 0;
list_for_each(pos, &info->modelist) {
@@ -1047,7 +1047,7 @@ static int uvesafb_setcmap(struct fb_cmap *cmap, struct fb_info *info)
info->cmap.len || cmap->start < info->cmap.start)
return -EINVAL;
- entries = kmalloc_objs(*entries, cmap->len, GFP_KERNEL);
+ entries = kmalloc_objs(*entries, cmap->len);
if (!entries)
return -ENOMEM;
@@ -1241,7 +1241,7 @@ static int uvesafb_set_par(struct fb_info *info)
info->var.pixclock != 0) {
task->t.regs.ebx |= 0x0800; /* use CRTC data */
task->t.flags = TF_BUF_ESDI;
- crtc = kzalloc_obj(struct vbe_crtc_ib, GFP_KERNEL);
+ crtc = kzalloc_obj(struct vbe_crtc_ib);
if (!crtc) {
err = -ENOMEM;
goto out;
diff --git a/drivers/video/fbdev/via/via_aux.c b/drivers/video/fbdev/via/via_aux.c
index 11f28a16e9b1..47f88a2c4524 100644
--- a/drivers/video/fbdev/via/via_aux.c
+++ b/drivers/video/fbdev/via/via_aux.c
@@ -17,7 +17,7 @@ struct via_aux_bus *via_aux_probe(struct i2c_adapter *adap)
if (!adap)
return NULL;
- bus = kmalloc_obj(*bus, GFP_KERNEL);
+ bus = kmalloc_obj(*bus);
if (!bus)
return NULL;
diff --git a/drivers/video/fbdev/via/via_aux.h b/drivers/video/fbdev/via/via_aux.h
index cb28fb21b1c7..6453d6a4fb4e 100644
--- a/drivers/video/fbdev/via/via_aux.h
+++ b/drivers/video/fbdev/via/via_aux.h
@@ -42,7 +42,7 @@ const struct fb_videomode *via_aux_get_preferred_mode(struct via_aux_bus *bus);
static inline bool via_aux_add(struct via_aux_drv *drv)
{
- struct via_aux_drv *data = kmalloc_obj(*data, GFP_KERNEL);
+ struct via_aux_drv *data = kmalloc_obj(*data);
if (!data)
return false;
diff --git a/drivers/video/fbdev/via/via_aux_edid.c b/drivers/video/fbdev/via/via_aux_edid.c
index 75c40aede6f2..c4abfb1bcf52 100644
--- a/drivers/video/fbdev/via/via_aux_edid.c
+++ b/drivers/video/fbdev/via/via_aux_edid.c
@@ -24,7 +24,7 @@ static void query_edid(struct via_aux_drv *drv)
if (spec) {
fb_destroy_modedb(spec->modedb);
} else {
- spec = kmalloc_obj(*spec, GFP_KERNEL);
+ spec = kmalloc_obj(*spec);
if (!spec)
return;
}
diff --git a/drivers/video/fbdev/xen-fbfront.c b/drivers/video/fbdev/xen-fbfront.c
index a432b487bb76..4385976277ac 100644
--- a/drivers/video/fbdev/xen-fbfront.c
+++ b/drivers/video/fbdev/xen-fbfront.c
@@ -348,7 +348,7 @@ static int xenfb_probe(struct xenbus_device *dev,
int val;
int ret = 0;
- info = kzalloc_obj(*info, GFP_KERNEL);
+ info = kzalloc_obj(*info);
if (info == NULL) {
xenbus_dev_fatal(dev, -ENOMEM, "allocating info structure");
return -ENOMEM;
diff --git a/drivers/video/of_display_timing.c b/drivers/video/of_display_timing.c
index 54b6595e8758..c1d0a495ea1c 100644
--- a/drivers/video/of_display_timing.c
+++ b/drivers/video/of_display_timing.c
@@ -157,7 +157,7 @@ struct display_timings *of_get_display_timings(const struct device_node *np)
return NULL;
}
- disp = kzalloc_obj(*disp, GFP_KERNEL);
+ disp = kzalloc_obj(*disp);
if (!disp) {
pr_err("%pOF: could not allocate struct disp'\n", np);
goto dispfail;
@@ -198,7 +198,7 @@ struct display_timings *of_get_display_timings(const struct device_node *np)
struct display_timing *dt;
int r;
- dt = kmalloc_obj(*dt, GFP_KERNEL);
+ dt = kmalloc_obj(*dt);
if (!dt) {
pr_err("%pOF: could not allocate display_timing struct\n",
np);
diff --git a/drivers/video/sticore.c b/drivers/video/sticore.c
index 8920c1fa2546..0d37e4b10447 100644
--- a/drivers/video/sticore.c
+++ b/drivers/video/sticore.c
@@ -558,7 +558,7 @@ sti_select_fbfont(struct sti_cooked_rom *cooked_rom, const char *fbfont_name)
dest += sizeof(struct sti_rom_font);
memcpy(dest, fbfont->data, bpc * fbfont->charcount);
- cooked_font = kzalloc_obj(*cooked_font, GFP_KERNEL);
+ cooked_font = kzalloc_obj(*cooked_font);
if (!cooked_font) {
kfree(nf);
return NULL;
@@ -678,7 +678,7 @@ static int sti_cook_fonts(struct sti_cooked_rom *cooked_rom,
struct sti_rom_font *raw_font, *font_start;
struct sti_cooked_font *cooked_font;
- cooked_font = kzalloc_obj(*cooked_font, GFP_KERNEL);
+ cooked_font = kzalloc_obj(*cooked_font);
if (!cooked_font)
return 0;
@@ -692,7 +692,7 @@ static int sti_cook_fonts(struct sti_cooked_rom *cooked_rom,
while (raw_font->next_font) {
raw_font = ((void *)font_start) + (raw_font->next_font);
- cooked_font->next_font = kzalloc_obj(*cooked_font, GFP_KERNEL);
+ cooked_font->next_font = kzalloc_obj(*cooked_font);
if (!cooked_font->next_font)
return 1;
@@ -806,7 +806,7 @@ static int sti_read_rom(int wordmode, struct sti_struct *sti,
struct sti_rom *raw = NULL;
unsigned long revno;
- cooked = kmalloc_obj(*cooked, GFP_KERNEL);
+ cooked = kmalloc_obj(*cooked);
if (!cooked)
goto out_err;
@@ -915,7 +915,7 @@ static struct sti_struct *sti_try_rom_generic(unsigned long address,
return NULL;
}
- sti = kzalloc_obj(*sti, GFP_KERNEL);
+ sti = kzalloc_obj(*sti);
if (!sti)
return NULL;
diff --git a/drivers/video/vgastate.c b/drivers/video/vgastate.c
index 0727716cf5fd..6a29d198f62c 100644
--- a/drivers/video/vgastate.c
+++ b/drivers/video/vgastate.c
@@ -351,7 +351,7 @@ int save_vga(struct vgastate *state)
{
struct regstate *saved;
- saved = kzalloc_obj(struct regstate, GFP_KERNEL);
+ saved = kzalloc_obj(struct regstate);
if (saved == NULL)
return 1;
diff --git a/drivers/virt/acrn/hsm.c b/drivers/virt/acrn/hsm.c
index c73a566d135d..74f2086fa59f 100644
--- a/drivers/virt/acrn/hsm.c
+++ b/drivers/virt/acrn/hsm.c
@@ -30,7 +30,7 @@ static int acrn_dev_open(struct inode *inode, struct file *filp)
{
struct acrn_vm *vm;
- vm = kzalloc_obj(*vm, GFP_KERNEL);
+ vm = kzalloc_obj(*vm);
if (!vm)
return -ENOMEM;
@@ -64,7 +64,7 @@ static int pmcmd_ioctl(u64 cmd, void __user *uptr)
kfree(pm_info);
break;
case ACRN_PMCMD_GET_PX_DATA:
- px_data = kzalloc_obj(*px_data, GFP_KERNEL);
+ px_data = kzalloc_obj(*px_data);
if (!px_data)
return -ENOMEM;
@@ -79,7 +79,7 @@ static int pmcmd_ioctl(u64 cmd, void __user *uptr)
kfree(px_data);
break;
case ACRN_PMCMD_GET_CX_DATA:
- cx_data = kzalloc_obj(*cx_data, GFP_KERNEL);
+ cx_data = kzalloc_obj(*cx_data);
if (!cx_data)
return -ENOMEM;
diff --git a/drivers/virt/acrn/ioeventfd.c b/drivers/virt/acrn/ioeventfd.c
index 5daccfaa127b..66fe9f3cef99 100644
--- a/drivers/virt/acrn/ioeventfd.c
+++ b/drivers/virt/acrn/ioeventfd.c
@@ -96,7 +96,7 @@ static int acrn_ioeventfd_assign(struct acrn_vm *vm,
if (IS_ERR(eventfd))
return PTR_ERR(eventfd);
- p = kzalloc_obj(*p, GFP_KERNEL);
+ p = kzalloc_obj(*p);
if (!p) {
ret = -ENOMEM;
goto fail;
diff --git a/drivers/virt/acrn/ioreq.c b/drivers/virt/acrn/ioreq.c
index 2216e62406e0..584698d30607 100644
--- a/drivers/virt/acrn/ioreq.c
+++ b/drivers/virt/acrn/ioreq.c
@@ -123,7 +123,7 @@ int acrn_ioreq_range_add(struct acrn_ioreq_client *client,
return -EINVAL;
}
- range = kzalloc_obj(*range, GFP_KERNEL);
+ range = kzalloc_obj(*range);
if (!range)
return -ENOMEM;
@@ -424,7 +424,7 @@ struct acrn_ioreq_client *acrn_ioreq_client_create(struct acrn_vm *vm,
"Cannot create non-default client w/o handler!\n");
return NULL;
}
- client = kzalloc_obj(*client, GFP_KERNEL);
+ client = kzalloc_obj(*client);
if (!client)
return NULL;
@@ -602,7 +602,7 @@ int acrn_ioreq_init(struct acrn_vm *vm, u64 buf_vma)
if (vm->ioreq_buf)
return -EEXIST;
- set_buffer = kzalloc_obj(*set_buffer, GFP_KERNEL);
+ set_buffer = kzalloc_obj(*set_buffer);
if (!set_buffer)
return -ENOMEM;
diff --git a/drivers/virt/acrn/irqfd.c b/drivers/virt/acrn/irqfd.c
index f0ff5140699f..acf8cd5f8f8c 100644
--- a/drivers/virt/acrn/irqfd.c
+++ b/drivers/virt/acrn/irqfd.c
@@ -112,7 +112,7 @@ static int acrn_irqfd_assign(struct acrn_vm *vm, struct acrn_irqfd *args)
__poll_t events;
int ret = 0;
- irqfd = kzalloc_obj(*irqfd, GFP_KERNEL);
+ irqfd = kzalloc_obj(*irqfd);
if (!irqfd)
return -ENOMEM;
diff --git a/drivers/virt/acrn/mm.c b/drivers/virt/acrn/mm.c
index 86b386761ee3..757cd84eff3b 100644
--- a/drivers/virt/acrn/mm.c
+++ b/drivers/virt/acrn/mm.c
@@ -21,7 +21,7 @@ static int modify_region(struct acrn_vm *vm, struct vm_memory_region_op *region)
struct vm_memory_region_batch *regions;
int ret;
- regions = kzalloc_obj(*regions, GFP_KERNEL);
+ regions = kzalloc_obj(*regions);
if (!regions)
return -ENOMEM;
@@ -55,7 +55,7 @@ int acrn_mm_region_add(struct acrn_vm *vm, u64 user_gpa, u64 service_gpa,
struct vm_memory_region_op *region;
int ret = 0;
- region = kzalloc_obj(*region, GFP_KERNEL);
+ region = kzalloc_obj(*region);
if (!region)
return -ENOMEM;
@@ -87,7 +87,7 @@ int acrn_mm_region_del(struct acrn_vm *vm, u64 user_gpa, u64 size)
struct vm_memory_region_op *region;
int ret = 0;
- region = kzalloc_obj(*region, GFP_KERNEL);
+ region = kzalloc_obj(*region);
if (!region)
return -ENOMEM;
diff --git a/drivers/virt/coco/guest/report.c b/drivers/virt/coco/guest/report.c
index ab50adfec7ec..b254a1416286 100644
--- a/drivers/virt/coco/guest/report.c
+++ b/drivers/virt/coco/guest/report.c
@@ -428,7 +428,7 @@ static struct config_item *tsm_report_make_item(struct config_group *group,
if (!provider.ops)
return ERR_PTR(-ENXIO);
- state = kzalloc_obj(*state, GFP_KERNEL);
+ state = kzalloc_obj(*state);
if (!state)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/virt/coco/tsm-core.c b/drivers/virt/coco/tsm-core.c
index b783fd36fc7e..98dcf7d836df 100644
--- a/drivers/virt/coco/tsm-core.c
+++ b/drivers/virt/coco/tsm-core.c
@@ -35,7 +35,7 @@ static struct tsm_dev *alloc_tsm_dev(struct device *parent)
int id;
struct tsm_dev *tsm_dev __free(kfree) =
- kzalloc_obj(*tsm_dev, GFP_KERNEL);
+ kzalloc_obj(*tsm_dev);
if (!tsm_dev)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/virt/fsl_hypervisor.c b/drivers/virt/fsl_hypervisor.c
index 541ee3a4909c..f472c94806da 100644
--- a/drivers/virt/fsl_hypervisor.c
+++ b/drivers/virt/fsl_hypervisor.c
@@ -226,7 +226,7 @@ static long ioctl_memcpy(struct fsl_hv_ioctl_memcpy __user *p)
* 'pages' is an array of struct page pointers that's initialized by
* get_user_pages_fast().
*/
- pages = kzalloc_objs(struct page *, num_pages, GFP_KERNEL);
+ pages = kzalloc_objs(struct page *, num_pages);
if (!pages) {
pr_debug("fsl-hv: could not allocate page list\n");
return -ENOMEM;
@@ -660,7 +660,7 @@ static int fsl_hv_open(struct inode *inode, struct file *filp)
struct doorbell_queue *dbq;
unsigned long flags;
- dbq = kzalloc_obj(struct doorbell_queue, GFP_KERNEL);
+ dbq = kzalloc_obj(struct doorbell_queue);
if (!dbq) {
pr_err("fsl-hv: out of memory\n");
return -ENOMEM;
@@ -845,7 +845,7 @@ static int __init fsl_hypervisor_init(void)
continue;
}
- dbisr = kzalloc_obj(*dbisr, GFP_KERNEL);
+ dbisr = kzalloc_obj(*dbisr);
if (!dbisr)
goto out_of_memory;
diff --git a/drivers/virt/nitro_enclaves/ne_misc_dev.c b/drivers/virt/nitro_enclaves/ne_misc_dev.c
index 1ad44e92348a..e96d32f4eef8 100644
--- a/drivers/virt/nitro_enclaves/ne_misc_dev.c
+++ b/drivers/virt/nitro_enclaves/ne_misc_dev.c
@@ -928,7 +928,7 @@ static int ne_set_user_memory_region_ioctl(struct ne_enclave *ne_enclave,
if (rc < 0)
return rc;
- ne_mem_region = kzalloc_obj(*ne_mem_region, GFP_KERNEL);
+ ne_mem_region = kzalloc_obj(*ne_mem_region);
if (!ne_mem_region)
return -ENOMEM;
@@ -1616,7 +1616,7 @@ static int ne_create_vm_ioctl(struct ne_pci_dev *ne_pci_dev, u64 __user *slot_ui
mutex_unlock(&ne_cpu_pool.mutex);
- ne_enclave = kzalloc_obj(*ne_enclave, GFP_KERNEL);
+ ne_enclave = kzalloc_obj(*ne_enclave);
if (!ne_enclave)
return -ENOMEM;
diff --git a/drivers/virt/nitro_enclaves/ne_pci_dev.c b/drivers/virt/nitro_enclaves/ne_pci_dev.c
index a219657ace80..3e1455d50526 100644
--- a/drivers/virt/nitro_enclaves/ne_pci_dev.c
+++ b/drivers/virt/nitro_enclaves/ne_pci_dev.c
@@ -468,7 +468,7 @@ static int ne_pci_probe(struct pci_dev *pdev, const struct pci_device_id *id)
struct ne_pci_dev *ne_pci_dev = NULL;
int rc = -EINVAL;
- ne_pci_dev = kzalloc_obj(*ne_pci_dev, GFP_KERNEL);
+ ne_pci_dev = kzalloc_obj(*ne_pci_dev);
if (!ne_pci_dev)
return -ENOMEM;
diff --git a/drivers/virt/vboxguest/vboxguest_core.c b/drivers/virt/vboxguest/vboxguest_core.c
index 9621606fc5db..b5dc0d01facd 100644
--- a/drivers/virt/vboxguest/vboxguest_core.c
+++ b/drivers/virt/vboxguest/vboxguest_core.c
@@ -74,7 +74,7 @@ static void vbg_guest_mappings_init(struct vbg_dev *gdev)
/* Add 4M so that we can align the vmap to 4MiB as the host requires. */
size = PAGE_ALIGN(req->hypervisor_size) + SZ_4M;
- pages = kmalloc_objs(*pages, size >> PAGE_SHIFT, GFP_KERNEL);
+ pages = kmalloc_objs(*pages, size >> PAGE_SHIFT);
if (!pages)
goto out;
@@ -1080,7 +1080,7 @@ struct vbg_session *vbg_core_open_session(struct vbg_dev *gdev, u32 requestor)
{
struct vbg_session *session;
- session = kzalloc_obj(*session, GFP_KERNEL);
+ session = kzalloc_obj(*session);
if (!session)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/virtio/virtio_balloon.c b/drivers/virtio/virtio_balloon.c
index 4151aeebe766..d1fbc8fe8470 100644
--- a/drivers/virtio/virtio_balloon.c
+++ b/drivers/virtio/virtio_balloon.c
@@ -927,7 +927,7 @@ static int virtballoon_probe(struct virtio_device *vdev)
return -EINVAL;
}
- vdev->priv = vb = kzalloc_obj(*vb, GFP_KERNEL);
+ vdev->priv = vb = kzalloc_obj(*vb);
if (!vb) {
err = -ENOMEM;
goto out;
diff --git a/drivers/virtio/virtio_input.c b/drivers/virtio/virtio_input.c
index 2386021e6dc5..deec24e8e682 100644
--- a/drivers/virtio/virtio_input.c
+++ b/drivers/virtio/virtio_input.c
@@ -229,7 +229,7 @@ static int virtinput_probe(struct virtio_device *vdev)
if (!virtio_has_feature(vdev, VIRTIO_F_VERSION_1))
return -ENODEV;
- vi = kzalloc_obj(*vi, GFP_KERNEL);
+ vi = kzalloc_obj(*vi);
if (!vi)
return -ENOMEM;
diff --git a/drivers/virtio/virtio_mem.c b/drivers/virtio/virtio_mem.c
index 065027783822..48051e9e98ab 100644
--- a/drivers/virtio/virtio_mem.c
+++ b/drivers/virtio/virtio_mem.c
@@ -2940,7 +2940,7 @@ static int virtio_mem_probe(struct virtio_device *vdev)
BUILD_BUG_ON(sizeof(struct virtio_mem_req) != 24);
BUILD_BUG_ON(sizeof(struct virtio_mem_resp) != 10);
- vdev->priv = vm = kzalloc_obj(*vm, GFP_KERNEL);
+ vdev->priv = vm = kzalloc_obj(*vm);
if (!vm)
return -ENOMEM;
diff --git a/drivers/virtio/virtio_mmio.c b/drivers/virtio/virtio_mmio.c
index 7b063ea8b7f1..595c2274fbb5 100644
--- a/drivers/virtio/virtio_mmio.c
+++ b/drivers/virtio/virtio_mmio.c
@@ -575,7 +575,7 @@ static int virtio_mmio_probe(struct platform_device *pdev)
unsigned long magic;
int rc;
- vm_dev = kzalloc_obj(*vm_dev, GFP_KERNEL);
+ vm_dev = kzalloc_obj(*vm_dev);
if (!vm_dev)
return -ENOMEM;
diff --git a/drivers/virtio/virtio_pci_admin_legacy_io.c b/drivers/virtio/virtio_pci_admin_legacy_io.c
index 24733b098703..e3a9d261812a 100644
--- a/drivers/virtio/virtio_pci_admin_legacy_io.c
+++ b/drivers/virtio/virtio_pci_admin_legacy_io.c
@@ -124,7 +124,7 @@ static int virtio_pci_admin_legacy_io_read(struct pci_dev *pdev, u16 opcode,
if (vf_id < 0)
return vf_id;
- data = kzalloc_obj(*data, GFP_KERNEL);
+ data = kzalloc_obj(*data);
if (!data)
return -ENOMEM;
@@ -210,7 +210,7 @@ int virtio_pci_admin_legacy_io_notify_info(struct pci_dev *pdev,
if (vf_id < 0)
return vf_id;
- result = kzalloc_obj(*result, GFP_KERNEL);
+ result = kzalloc_obj(*result);
if (!result)
return -ENOMEM;
diff --git a/drivers/virtio/virtio_pci_common.c b/drivers/virtio/virtio_pci_common.c
index 2749bd6500fb..d3bdd68d4b6a 100644
--- a/drivers/virtio/virtio_pci_common.c
+++ b/drivers/virtio/virtio_pci_common.c
@@ -210,7 +210,7 @@ static struct virtqueue *vp_setup_vq(struct virtio_device *vdev, unsigned int in
struct virtio_pci_vq_info **p_info)
{
struct virtio_pci_device *vp_dev = to_vp_device(vdev);
- struct virtio_pci_vq_info *info = kmalloc_obj(*info, GFP_KERNEL);
+ struct virtio_pci_vq_info *info = kmalloc_obj(*info);
struct virtqueue *vq;
unsigned long flags;
@@ -386,7 +386,7 @@ static int vp_find_vqs_msix(struct virtio_device *vdev, unsigned int nvqs,
bool per_vq_vectors;
u16 avq_num = 0;
- vp_dev->vqs = kzalloc_objs(*vp_dev->vqs, nvqs, GFP_KERNEL);
+ vp_dev->vqs = kzalloc_objs(*vp_dev->vqs, nvqs);
if (!vp_dev->vqs)
return -ENOMEM;
@@ -463,7 +463,7 @@ static int vp_find_vqs_intx(struct virtio_device *vdev, unsigned int nvqs,
struct virtqueue *vq;
u16 avq_num = 0;
- vp_dev->vqs = kzalloc_objs(*vp_dev->vqs, nvqs, GFP_KERNEL);
+ vp_dev->vqs = kzalloc_objs(*vp_dev->vqs, nvqs);
if (!vp_dev->vqs)
return -ENOMEM;
@@ -685,7 +685,7 @@ static int virtio_pci_probe(struct pci_dev *pci_dev,
int rc;
/* allocate our structure and fill it out */
- vp_dev = kzalloc_obj(struct virtio_pci_device, GFP_KERNEL);
+ vp_dev = kzalloc_obj(struct virtio_pci_device);
if (!vp_dev)
return -ENOMEM;
diff --git a/drivers/virtio/virtio_pci_modern.c b/drivers/virtio/virtio_pci_modern.c
index 041a7fd72835..6d8ae2a6a8ca 100644
--- a/drivers/virtio/virtio_pci_modern.c
+++ b/drivers/virtio/virtio_pci_modern.c
@@ -137,11 +137,11 @@ int vp_modern_admin_cmd_exec(struct virtio_device *vdev,
if (!virtio_has_feature(vdev, VIRTIO_F_ADMIN_VQ))
return -EOPNOTSUPP;
- va_status = kzalloc_obj(*va_status, GFP_KERNEL);
+ va_status = kzalloc_obj(*va_status);
if (!va_status)
return -ENOMEM;
- va_hdr = kzalloc_obj(*va_hdr, GFP_KERNEL);
+ va_hdr = kzalloc_obj(*va_hdr);
if (!va_hdr) {
ret = -ENOMEM;
goto err_alloc;
@@ -204,7 +204,7 @@ static void virtio_pci_admin_cmd_list_init(struct virtio_device *virtio_dev)
__le64 *data;
int ret;
- data = kzalloc_obj(*data, GFP_KERNEL);
+ data = kzalloc_obj(*data);
if (!data)
return;
@@ -246,11 +246,11 @@ virtio_pci_admin_cmd_dev_parts_objects_enable(struct virtio_device *virtio_dev)
u16 set_data_size;
int ret;
- get_data = kzalloc_obj(*get_data, GFP_KERNEL);
+ get_data = kzalloc_obj(*get_data);
if (!get_data)
return;
- result = kzalloc_obj(*result, GFP_KERNEL);
+ result = kzalloc_obj(*result);
if (!result)
goto end;
@@ -310,7 +310,7 @@ static void virtio_pci_admin_cmd_cap_init(struct virtio_device *virtio_dev)
struct scatterlist result_sg;
int ret;
- data = kzalloc_obj(*data, GFP_KERNEL);
+ data = kzalloc_obj(*data);
if (!data)
return;
@@ -929,7 +929,7 @@ int virtio_pci_admin_mode_set(struct pci_dev *pdev, u8 flags)
if (vf_id < 0)
return vf_id;
- data = kzalloc_obj(*data, GFP_KERNEL);
+ data = kzalloc_obj(*data);
if (!data)
return -ENOMEM;
@@ -1054,7 +1054,7 @@ int virtio_pci_admin_obj_destroy(struct pci_dev *pdev, u16 obj_type, u32 id)
if (obj_type != VIRTIO_RESOURCE_OBJ_DEV_PARTS)
return -EINVAL;
- data = kzalloc_obj(*data, GFP_KERNEL);
+ data = kzalloc_obj(*data);
if (!data)
return -ENOMEM;
@@ -1109,11 +1109,11 @@ int virtio_pci_admin_dev_parts_metadata_get(struct pci_dev *pdev, u16 obj_type,
if (vf_id < 0)
return vf_id;
- data = kzalloc_obj(*data, GFP_KERNEL);
+ data = kzalloc_obj(*data);
if (!data)
return -ENOMEM;
- result = kzalloc_obj(*result, GFP_KERNEL);
+ result = kzalloc_obj(*result);
if (!result) {
ret = -ENOMEM;
goto end;
@@ -1173,7 +1173,7 @@ int virtio_pci_admin_dev_parts_get(struct pci_dev *pdev, u16 obj_type, u32 id,
if (vf_id < 0)
return vf_id;
- data = kzalloc_obj(*data, GFP_KERNEL);
+ data = kzalloc_obj(*data);
if (!data)
return -ENOMEM;
diff --git a/drivers/virtio/virtio_ring.c b/drivers/virtio/virtio_ring.c
index 2cab954906cd..335692d41617 100644
--- a/drivers/virtio/virtio_ring.c
+++ b/drivers/virtio/virtio_ring.c
@@ -1209,7 +1209,7 @@ static int vring_alloc_state_extra_split(struct vring_virtqueue_split *vring_spl
struct vring_desc_extra *extra;
u32 num = vring_split->vring.num;
- state = kmalloc_objs(struct vring_desc_state_split, num, GFP_KERNEL);
+ state = kmalloc_objs(struct vring_desc_state_split, num);
if (!state)
goto err_state;
@@ -1308,7 +1308,7 @@ static struct virtqueue *__vring_new_virtqueue_split(unsigned int index,
struct vring_virtqueue *vq;
int err;
- vq = kmalloc_obj(*vq, GFP_KERNEL);
+ vq = kmalloc_obj(*vq);
if (!vq)
return NULL;
@@ -2349,7 +2349,7 @@ static struct vring_desc_extra *vring_alloc_desc_extra(unsigned int num)
struct vring_desc_extra *desc_extra;
unsigned int i;
- desc_extra = kmalloc_objs(struct vring_desc_extra, num, GFP_KERNEL);
+ desc_extra = kmalloc_objs(struct vring_desc_extra, num);
if (!desc_extra)
return NULL;
@@ -2449,7 +2449,7 @@ static int vring_alloc_state_extra_packed(struct vring_virtqueue_packed *vring_p
struct vring_desc_extra *extra;
u32 num = vring_packed->vring.num;
- state = kmalloc_objs(struct vring_desc_state_packed, num, GFP_KERNEL);
+ state = kmalloc_objs(struct vring_desc_state_packed, num);
if (!state)
goto err_desc_state;
@@ -2528,7 +2528,7 @@ static struct virtqueue *__vring_new_virtqueue_packed(unsigned int index,
struct vring_virtqueue *vq;
int err;
- vq = kmalloc_obj(*vq, GFP_KERNEL);
+ vq = kmalloc_obj(*vq);
if (!vq)
return NULL;
diff --git a/drivers/virtio/virtio_vdpa.c b/drivers/virtio/virtio_vdpa.c
index 6c0d2f946817..de2af696de6c 100644
--- a/drivers/virtio/virtio_vdpa.c
+++ b/drivers/virtio/virtio_vdpa.c
@@ -287,7 +287,7 @@ create_affinity_masks(unsigned int nvecs, struct irq_affinity *affd)
if (!affvecs)
return NULL;
- masks = kzalloc_objs(*masks, nvecs, GFP_KERNEL);
+ masks = kzalloc_objs(*masks, nvecs);
if (!masks)
return NULL;
@@ -462,7 +462,7 @@ static int virtio_vdpa_probe(struct vdpa_device *vdpa)
struct virtio_vdpa_device *vd_dev, *reg_dev = NULL;
int ret = -EINVAL;
- vd_dev = kzalloc_obj(*vd_dev, GFP_KERNEL);
+ vd_dev = kzalloc_obj(*vd_dev);
if (!vd_dev)
return -ENOMEM;
diff --git a/drivers/w1/masters/ds2490.c b/drivers/w1/masters/ds2490.c
index 68501b0a2c4d..35e75d07ef5d 100644
--- a/drivers/w1/masters/ds2490.c
+++ b/drivers/w1/masters/ds2490.c
@@ -1018,7 +1018,7 @@ static int ds_probe(struct usb_interface *intf,
struct ds_device *dev;
int i, err, alt;
- dev = kzalloc_obj(struct ds_device, GFP_KERNEL);
+ dev = kzalloc_obj(struct ds_device);
if (!dev)
return -ENOMEM;
diff --git a/drivers/w1/slaves/w1_ds2433.c b/drivers/w1/slaves/w1_ds2433.c
index 54d78060d6ff..ff61ea4f2030 100644
--- a/drivers/w1/slaves/w1_ds2433.c
+++ b/drivers/w1/slaves/w1_ds2433.c
@@ -320,7 +320,7 @@ static int w1_f23_add_slave(struct w1_slave *sl)
{
struct w1_f23_data *data;
- data = kzalloc_obj(struct w1_f23_data, GFP_KERNEL);
+ data = kzalloc_obj(struct w1_f23_data);
if (!data)
return -ENOMEM;
diff --git a/drivers/w1/slaves/w1_ds28e04.c b/drivers/w1/slaves/w1_ds28e04.c
index cb198414d47b..3b3c0789e1ad 100644
--- a/drivers/w1/slaves/w1_ds28e04.c
+++ b/drivers/w1/slaves/w1_ds28e04.c
@@ -384,7 +384,7 @@ static int w1_f1C_add_slave(struct w1_slave *sl)
struct w1_f1C_data *data = NULL;
if (w1_enable_crccheck) {
- data = kzalloc_obj(struct w1_f1C_data, GFP_KERNEL);
+ data = kzalloc_obj(struct w1_f1C_data);
if (!data)
return -ENOMEM;
sl->family_data = data;
diff --git a/drivers/w1/slaves/w1_therm.c b/drivers/w1/slaves/w1_therm.c
index f72e9b57fe79..d96b224e2215 100644
--- a/drivers/w1/slaves/w1_therm.c
+++ b/drivers/w1/slaves/w1_therm.c
@@ -973,7 +973,7 @@ static int w1_therm_add_slave(struct w1_slave *sl)
struct w1_therm_family_converter *sl_family_conv;
/* Allocate memory */
- sl->family_data = kzalloc_obj(struct w1_therm_family_data, GFP_KERNEL);
+ sl->family_data = kzalloc_obj(struct w1_therm_family_data);
if (!sl->family_data)
return -ENOMEM;
diff --git a/drivers/w1/w1.c b/drivers/w1/w1.c
index a08d5b420f31..486f321eadc8 100644
--- a/drivers/w1/w1.c
+++ b/drivers/w1/w1.c
@@ -715,7 +715,7 @@ int w1_attach_slave_device(struct w1_master *dev, struct w1_reg_num *rn)
int err;
struct w1_netlink_msg msg;
- sl = kzalloc_obj(struct w1_slave, GFP_KERNEL);
+ sl = kzalloc_obj(struct w1_slave);
if (!sl) {
dev_err(&dev->dev,
"%s: failed to allocate new slave device.\n",
diff --git a/drivers/watchdog/exar_wdt.c b/drivers/watchdog/exar_wdt.c
index 30fa33a4c08d..db62c9797406 100644
--- a/drivers/watchdog/exar_wdt.c
+++ b/drivers/watchdog/exar_wdt.c
@@ -342,7 +342,7 @@ static int __init exar_wdt_register(struct wdt_priv *priv, const int idx)
{
struct wdt_pdev_node *n;
- n = kzalloc_obj(*n, GFP_KERNEL);
+ n = kzalloc_obj(*n);
if (!n)
return -ENOMEM;
diff --git a/drivers/watchdog/mei_wdt.c b/drivers/watchdog/mei_wdt.c
index 01c44881608c..db45b53929a9 100644
--- a/drivers/watchdog/mei_wdt.c
+++ b/drivers/watchdog/mei_wdt.c
@@ -563,7 +563,7 @@ static int mei_wdt_probe(struct mei_cl_device *cldev,
struct mei_wdt *wdt;
int ret;
- wdt = kzalloc_obj(struct mei_wdt, GFP_KERNEL);
+ wdt = kzalloc_obj(struct mei_wdt);
if (!wdt)
return -ENOMEM;
diff --git a/drivers/watchdog/pcwd_usb.c b/drivers/watchdog/pcwd_usb.c
index dbefe9a690d7..d7c18c990649 100644
--- a/drivers/watchdog/pcwd_usb.c
+++ b/drivers/watchdog/pcwd_usb.c
@@ -641,7 +641,7 @@ static int usb_pcwd_probe(struct usb_interface *interface,
pipe = usb_rcvintpipe(udev, endpoint->bEndpointAddress);
/* allocate memory for our device and initialize it */
- usb_pcwd = kzalloc_obj(struct usb_pcwd_private, GFP_KERNEL);
+ usb_pcwd = kzalloc_obj(struct usb_pcwd_private);
if (usb_pcwd == NULL)
goto error;
diff --git a/drivers/watchdog/watchdog_dev.c b/drivers/watchdog/watchdog_dev.c
index cd4c7342a172..834f65f4b59a 100644
--- a/drivers/watchdog/watchdog_dev.c
+++ b/drivers/watchdog/watchdog_dev.c
@@ -1019,7 +1019,7 @@ static int watchdog_cdev_register(struct watchdog_device *wdd)
struct watchdog_core_data *wd_data;
int err;
- wd_data = kzalloc_obj(struct watchdog_core_data, GFP_KERNEL);
+ wd_data = kzalloc_obj(struct watchdog_core_data);
if (!wd_data)
return -ENOMEM;
mutex_init(&wd_data->lock);
diff --git a/drivers/watchdog/watchdog_pretimeout.c b/drivers/watchdog/watchdog_pretimeout.c
index 3957b6ba63b7..19eb2ed2c7cb 100644
--- a/drivers/watchdog/watchdog_pretimeout.c
+++ b/drivers/watchdog/watchdog_pretimeout.c
@@ -119,7 +119,7 @@ int watchdog_register_governor(struct watchdog_governor *gov)
struct watchdog_pretimeout *p;
struct governor_priv *priv;
- priv = kzalloc_obj(*priv, GFP_KERNEL);
+ priv = kzalloc_obj(*priv);
if (!priv)
return -ENOMEM;
@@ -183,7 +183,7 @@ int watchdog_register_pretimeout(struct watchdog_device *wdd)
if (!watchdog_have_pretimeout(wdd))
return 0;
- p = kzalloc_obj(*p, GFP_KERNEL);
+ p = kzalloc_obj(*p);
if (!p)
return -ENOMEM;
diff --git a/drivers/xen/arm-device.c b/drivers/xen/arm-device.c
index 009c76546d85..7bc0fc400fd1 100644
--- a/drivers/xen/arm-device.c
+++ b/drivers/xen/arm-device.c
@@ -59,9 +59,9 @@ static int xen_map_device_mmio(const struct resource *resources,
if ((resource_type(r) != IORESOURCE_MEM) || (nr == 0))
continue;
- gpfns = kzalloc_objs(xen_pfn_t, nr, GFP_KERNEL);
- idxs = kzalloc_objs(xen_ulong_t, nr, GFP_KERNEL);
- errs = kzalloc_objs(int, nr, GFP_KERNEL);
+ gpfns = kzalloc_objs(xen_pfn_t, nr);
+ idxs = kzalloc_objs(xen_ulong_t, nr);
+ errs = kzalloc_objs(int, nr);
if (!gpfns || !idxs || !errs) {
kfree(gpfns);
kfree(idxs);
diff --git a/drivers/xen/balloon.c b/drivers/xen/balloon.c
index 6cbff7e90947..e7f1d4ca6d75 100644
--- a/drivers/xen/balloon.c
+++ b/drivers/xen/balloon.c
@@ -242,7 +242,7 @@ static struct resource *additional_memory_resource(phys_addr_t size)
struct resource *res;
int ret;
- res = kzalloc_obj(*res, GFP_KERNEL);
+ res = kzalloc_obj(*res);
if (!res)
return NULL;
diff --git a/drivers/xen/events/events_base.c b/drivers/xen/events/events_base.c
index 515bb5708e7f..679e807c3663 100644
--- a/drivers/xen/events/events_base.c
+++ b/drivers/xen/events/events_base.c
@@ -714,7 +714,7 @@ static struct irq_info *xen_irq_init(unsigned int irq)
{
struct irq_info *info;
- info = kzalloc_obj(*info, GFP_KERNEL);
+ info = kzalloc_obj(*info);
if (info) {
info->irq = irq;
info->type = IRQT_UNBOUND;
diff --git a/drivers/xen/evtchn.c b/drivers/xen/evtchn.c
index 568f1830f3a3..b7665bf2774c 100644
--- a/drivers/xen/evtchn.c
+++ b/drivers/xen/evtchn.c
@@ -332,7 +332,7 @@ static int evtchn_resize_ring(struct per_user_data *u)
else
new_size = 2 * u->ring_size;
- new_ring = kvmalloc_objs(*new_ring, new_size, GFP_KERNEL);
+ new_ring = kvmalloc_objs(*new_ring, new_size);
if (!new_ring)
return -ENOMEM;
@@ -386,7 +386,7 @@ static int evtchn_bind_to_user(struct per_user_data *u, evtchn_port_t port,
* serialized bind operations.)
*/
- evtchn = kzalloc_obj(*evtchn, GFP_KERNEL);
+ evtchn = kzalloc_obj(*evtchn);
if (!evtchn)
return -ENOMEM;
@@ -642,7 +642,7 @@ static int evtchn_open(struct inode *inode, struct file *filp)
{
struct per_user_data *u;
- u = kzalloc_obj(*u, GFP_KERNEL);
+ u = kzalloc_obj(*u);
if (u == NULL)
return -ENOMEM;
diff --git a/drivers/xen/gntalloc.c b/drivers/xen/gntalloc.c
index 8204135c31f9..eadedd1e963e 100644
--- a/drivers/xen/gntalloc.c
+++ b/drivers/xen/gntalloc.c
@@ -128,7 +128,7 @@ static int add_grefs(struct ioctl_gntalloc_alloc_gref *op,
readonly = !(op->flags & GNTALLOC_FLAG_WRITABLE);
for (i = 0; i < op->count; i++) {
- gref = kzalloc_obj(*gref, GFP_KERNEL);
+ gref = kzalloc_obj(*gref);
if (!gref) {
rc = -ENOMEM;
goto undo;
@@ -229,7 +229,7 @@ static int gntalloc_open(struct inode *inode, struct file *filp)
{
struct gntalloc_file_private_data *priv;
- priv = kzalloc_obj(*priv, GFP_KERNEL);
+ priv = kzalloc_obj(*priv);
if (!priv)
goto out_nomem;
INIT_LIST_HEAD(&priv->list);
@@ -501,7 +501,7 @@ static int gntalloc_mmap(struct file *filp, struct vm_area_struct *vma)
return -EINVAL;
}
- vm_priv = kmalloc_obj(*vm_priv, GFP_KERNEL);
+ vm_priv = kmalloc_obj(*vm_priv);
if (!vm_priv)
return -ENOMEM;
diff --git a/drivers/xen/gntdev-dmabuf.c b/drivers/xen/gntdev-dmabuf.c
index 649d3a912d20..4a6f4325ad04 100644
--- a/drivers/xen/gntdev-dmabuf.c
+++ b/drivers/xen/gntdev-dmabuf.c
@@ -95,7 +95,7 @@ dmabuf_exp_wait_obj_new(struct gntdev_dmabuf_priv *priv,
{
struct gntdev_dmabuf_wait_obj *obj;
- obj = kzalloc_obj(*obj, GFP_KERNEL);
+ obj = kzalloc_obj(*obj);
if (!obj)
return ERR_PTR(-ENOMEM);
@@ -198,7 +198,7 @@ dmabuf_pages_to_sgt(struct page **pages, unsigned int nr_pages)
struct sg_table *sgt;
int ret;
- sgt = kmalloc_obj(*sgt, GFP_KERNEL);
+ sgt = kmalloc_obj(*sgt);
if (!sgt) {
ret = -ENOMEM;
goto out;
@@ -222,7 +222,7 @@ static int dmabuf_exp_ops_attach(struct dma_buf *dma_buf,
{
struct gntdev_dmabuf_attachment *gntdev_dmabuf_attach;
- gntdev_dmabuf_attach = kzalloc_obj(*gntdev_dmabuf_attach, GFP_KERNEL);
+ gntdev_dmabuf_attach = kzalloc_obj(*gntdev_dmabuf_attach);
if (!gntdev_dmabuf_attach)
return -ENOMEM;
@@ -362,7 +362,7 @@ static int dmabuf_exp_from_pages(struct gntdev_dmabuf_export_args *args)
if (ret < 0)
return ret;
- gntdev_dmabuf = kzalloc_obj(*gntdev_dmabuf, GFP_KERNEL);
+ gntdev_dmabuf = kzalloc_obj(*gntdev_dmabuf);
if (!gntdev_dmabuf)
return -ENOMEM;
@@ -530,7 +530,7 @@ static struct gntdev_dmabuf *dmabuf_imp_alloc_storage(int count)
struct gntdev_dmabuf *gntdev_dmabuf;
int i;
- gntdev_dmabuf = kzalloc_obj(*gntdev_dmabuf, GFP_KERNEL);
+ gntdev_dmabuf = kzalloc_obj(*gntdev_dmabuf);
if (!gntdev_dmabuf)
goto fail_no_free;
@@ -816,7 +816,7 @@ struct gntdev_dmabuf_priv *gntdev_dmabuf_init(struct file *filp)
{
struct gntdev_dmabuf_priv *priv;
- priv = kzalloc_obj(*priv, GFP_KERNEL);
+ priv = kzalloc_obj(*priv);
if (!priv)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/xen/gntdev.c b/drivers/xen/gntdev.c
index 1a986cb7324a..a16e21d2ca91 100644
--- a/drivers/xen/gntdev.c
+++ b/drivers/xen/gntdev.c
@@ -141,16 +141,16 @@ struct gntdev_grant_map *gntdev_alloc_map(struct gntdev_priv *priv, int count,
struct gntdev_grant_map *add;
int i;
- add = kzalloc_obj(*add, GFP_KERNEL);
+ add = kzalloc_obj(*add);
if (NULL == add)
return NULL;
- add->grants = kvmalloc_objs(add->grants[0], count, GFP_KERNEL);
- add->map_ops = kvmalloc_objs(add->map_ops[0], count, GFP_KERNEL);
- add->unmap_ops = kvmalloc_objs(add->unmap_ops[0], count, GFP_KERNEL);
- add->pages = kvzalloc_objs(add->pages[0], count, GFP_KERNEL);
+ add->grants = kvmalloc_objs(add->grants[0], count);
+ add->map_ops = kvmalloc_objs(add->map_ops[0], count);
+ add->unmap_ops = kvmalloc_objs(add->unmap_ops[0], count);
+ add->pages = kvzalloc_objs(add->pages[0], count);
add->being_removed =
- kvzalloc_objs(add->being_removed[0], count, GFP_KERNEL);
+ kvzalloc_objs(add->being_removed[0], count);
if (NULL == add->grants ||
NULL == add->map_ops ||
NULL == add->unmap_ops ||
@@ -176,7 +176,7 @@ struct gntdev_grant_map *gntdev_alloc_map(struct gntdev_priv *priv, int count,
if (dma_flags & (GNTDEV_DMA_FLAG_WC | GNTDEV_DMA_FLAG_COHERENT)) {
struct gnttab_dma_alloc_args args;
- add->frames = kvzalloc_objs(add->frames[0], count, GFP_KERNEL);
+ add->frames = kvzalloc_objs(add->frames[0], count);
if (!add->frames)
goto err;
@@ -583,7 +583,7 @@ static int gntdev_open(struct inode *inode, struct file *flip)
{
struct gntdev_priv *priv;
- priv = kzalloc_obj(*priv, GFP_KERNEL);
+ priv = kzalloc_obj(*priv);
if (!priv)
return -ENOMEM;
@@ -968,7 +968,7 @@ static long gntdev_ioctl_grant_copy(struct gntdev_priv *priv, void __user *u)
mutex_lock(&priv->batch_lock);
if (!priv->batch) {
- batch = kmalloc_obj(*batch, GFP_KERNEL);
+ batch = kmalloc_obj(*batch);
} else {
batch = priv->batch;
priv->batch = batch->next;
diff --git a/drivers/xen/grant-table.c b/drivers/xen/grant-table.c
index 6fcd5a7f6605..908d009f70fd 100644
--- a/drivers/xen/grant-table.c
+++ b/drivers/xen/grant-table.c
@@ -831,7 +831,7 @@ int gnttab_setup_auto_xlat_frames(phys_addr_t addr)
&addr);
return -ENOMEM;
}
- pfn = kzalloc_objs(pfn[0], max_nr_gframes, GFP_KERNEL);
+ pfn = kzalloc_objs(pfn[0], max_nr_gframes);
if (!pfn) {
memunmap(vaddr);
return -ENOMEM;
@@ -868,7 +868,7 @@ int gnttab_pages_set_private(int nr_pages, struct page **pages)
#if BITS_PER_LONG < 64
struct xen_page_foreign *foreign;
- foreign = kzalloc_obj(*foreign, GFP_KERNEL);
+ foreign = kzalloc_obj(*foreign);
if (!foreign)
return -ENOMEM;
diff --git a/drivers/xen/mcelog.c b/drivers/xen/mcelog.c
index ca8dbb9be419..53a8720f5cae 100644
--- a/drivers/xen/mcelog.c
+++ b/drivers/xen/mcelog.c
@@ -373,7 +373,7 @@ static int bind_virq_for_mce(void)
/* Fetch each CPU Physical Info for later reference*/
ncpus = mc_op.u.mc_physcpuinfo.ncpus;
- g_physinfo = kzalloc_objs(struct mcinfo_logical_cpu, ncpus, GFP_KERNEL);
+ g_physinfo = kzalloc_objs(struct mcinfo_logical_cpu, ncpus);
if (!g_physinfo)
return -ENOMEM;
set_xen_guest_handle(mc_op.u.mc_physcpuinfo.info, g_physinfo);
diff --git a/drivers/xen/pci.c b/drivers/xen/pci.c
index 07e6b811c9d3..385d2587bd1b 100644
--- a/drivers/xen/pci.c
+++ b/drivers/xen/pci.c
@@ -336,7 +336,7 @@ int xen_register_device_domain_owner(struct pci_dev *dev, uint16_t domain)
{
struct xen_device_domain_owner *owner;
- owner = kzalloc_obj(struct xen_device_domain_owner, GFP_KERNEL);
+ owner = kzalloc_obj(struct xen_device_domain_owner);
if (!owner)
return -ENODEV;
diff --git a/drivers/xen/pcpu.c b/drivers/xen/pcpu.c
index 1d9f3874d099..0a20bb7c5438 100644
--- a/drivers/xen/pcpu.c
+++ b/drivers/xen/pcpu.c
@@ -247,7 +247,7 @@ static struct pcpu *create_and_register_pcpu(struct xenpf_pcpuinfo *info)
if (info->flags & XEN_PCPU_FLAGS_INVALID)
return ERR_PTR(-ENODEV);
- pcpu = kzalloc_obj(struct pcpu, GFP_KERNEL);
+ pcpu = kzalloc_obj(struct pcpu);
if (!pcpu)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/xen/privcmd-buf.c b/drivers/xen/privcmd-buf.c
index 95d2d5ca5e4f..c0178ea010cf 100644
--- a/drivers/xen/privcmd-buf.c
+++ b/drivers/xen/privcmd-buf.c
@@ -39,7 +39,7 @@ static int privcmd_buf_open(struct inode *ino, struct file *file)
{
struct privcmd_buf_private *file_priv;
- file_priv = kzalloc_obj(*file_priv, GFP_KERNEL);
+ file_priv = kzalloc_obj(*file_priv);
if (!file_priv)
return -ENOMEM;
diff --git a/drivers/xen/privcmd.c b/drivers/xen/privcmd.c
index a5d9211f36c3..1759cc18753f 100644
--- a/drivers/xen/privcmd.c
+++ b/drivers/xen/privcmd.c
@@ -433,7 +433,7 @@ static int alloc_empty_pages(struct vm_area_struct *vma, int numpgs)
int rc;
struct page **pages;
- pages = kvzalloc_objs(pages[0], numpgs, GFP_KERNEL);
+ pages = kvzalloc_objs(pages[0], numpgs);
if (pages == NULL)
return -ENOMEM;
@@ -653,7 +653,7 @@ static long privcmd_ioctl_dm_op(struct file *file, void __user *udata)
if (kdata.num > privcmd_dm_op_max_num)
return -E2BIG;
- kbufs = kzalloc_objs(*kbufs, kdata.num, GFP_KERNEL);
+ kbufs = kzalloc_objs(*kbufs, kdata.num);
if (!kbufs)
return -ENOMEM;
@@ -680,13 +680,13 @@ static long privcmd_ioctl_dm_op(struct file *file, void __user *udata)
PAGE_SIZE);
}
- pages = kzalloc_objs(*pages, nr_pages, GFP_KERNEL);
+ pages = kzalloc_objs(*pages, nr_pages);
if (!pages) {
rc = -ENOMEM;
goto out;
}
- xbufs = kzalloc_objs(*xbufs, kdata.num, GFP_KERNEL);
+ xbufs = kzalloc_objs(*xbufs, kdata.num);
if (!xbufs) {
rc = -ENOMEM;
goto out;
@@ -1355,7 +1355,7 @@ static int privcmd_ioeventfd_assign(struct privcmd_ioeventfd *ioeventfd)
if (!ioeventfd->vcpus || ioeventfd->vcpus > 4096)
return -EINVAL;
- kioeventfd = kzalloc_obj(*kioeventfd, GFP_KERNEL);
+ kioeventfd = kzalloc_obj(*kioeventfd);
if (!kioeventfd)
return -ENOMEM;
@@ -1563,7 +1563,7 @@ static long privcmd_ioctl(struct file *file,
static int privcmd_open(struct inode *ino, struct file *file)
{
- struct privcmd_data *data = kzalloc_obj(*data, GFP_KERNEL);
+ struct privcmd_data *data = kzalloc_obj(*data);
if (!data)
return -ENOMEM;
diff --git a/drivers/xen/pvcalls-back.c b/drivers/xen/pvcalls-back.c
index 8a5dafcaab03..ba62651a7f33 100644
--- a/drivers/xen/pvcalls-back.c
+++ b/drivers/xen/pvcalls-back.c
@@ -324,7 +324,7 @@ static struct sock_mapping *pvcalls_new_active_socket(
struct sock_mapping *map;
void *page;
- map = kzalloc_obj(*map, GFP_KERNEL);
+ map = kzalloc_obj(*map);
if (map == NULL) {
sock_release(sock);
return NULL;
@@ -632,7 +632,7 @@ static int pvcalls_back_bind(struct xenbus_device *dev,
fedata = dev_get_drvdata(&dev->dev);
- map = kzalloc_obj(*map, GFP_KERNEL);
+ map = kzalloc_obj(*map);
if (map == NULL) {
ret = -ENOMEM;
goto out;
@@ -934,7 +934,7 @@ static int backend_connect(struct xenbus_device *dev)
grant_ref_t ring_ref;
struct pvcalls_fedata *fedata = NULL;
- fedata = kzalloc_obj(struct pvcalls_fedata, GFP_KERNEL);
+ fedata = kzalloc_obj(struct pvcalls_fedata);
if (!fedata)
return -ENOMEM;
diff --git a/drivers/xen/pvcalls-front.c b/drivers/xen/pvcalls-front.c
index c32fd69482e9..50ce4820f7ee 100644
--- a/drivers/xen/pvcalls-front.c
+++ b/drivers/xen/pvcalls-front.c
@@ -291,7 +291,7 @@ int pvcalls_front_socket(struct socket *sock)
}
bedata = dev_get_drvdata(&pvcalls_front_dev->dev);
- map = kzalloc_obj(*map, GFP_KERNEL);
+ map = kzalloc_obj(*map);
if (map == NULL) {
pvcalls_exit();
return -ENOMEM;
@@ -820,7 +820,7 @@ int pvcalls_front_accept(struct socket *sock, struct socket *newsock,
}
}
- map2 = kzalloc_obj(*map2, GFP_KERNEL);
+ map2 = kzalloc_obj(*map2);
if (map2 == NULL) {
clear_bit(PVCALLS_FLAG_ACCEPT_INFLIGHT,
(void *)&map->passive.flags);
@@ -1179,7 +1179,7 @@ static int pvcalls_front_probe(struct xenbus_device *dev,
return -ENODEV;
pr_info("%s max-page-order is %u\n", __func__, max_page_order);
- bedata = kzalloc_obj(struct pvcalls_bedata, GFP_KERNEL);
+ bedata = kzalloc_obj(struct pvcalls_bedata);
if (!bedata)
return -ENOMEM;
diff --git a/drivers/xen/sys-hypervisor.c b/drivers/xen/sys-hypervisor.c
index 25f4e1ff13f6..b1bb01ba82f8 100644
--- a/drivers/xen/sys-hypervisor.c
+++ b/drivers/xen/sys-hypervisor.c
@@ -182,7 +182,7 @@ static ssize_t compiler_show(struct hyp_sysfs_attr *attr, char *buffer)
int ret = -ENOMEM;
struct xen_compile_info *info;
- info = kmalloc_obj(struct xen_compile_info, GFP_KERNEL);
+ info = kmalloc_obj(struct xen_compile_info);
if (info) {
ret = HYPERVISOR_xen_version(XENVER_compile_info, info);
if (!ret)
@@ -200,7 +200,7 @@ static ssize_t compiled_by_show(struct hyp_sysfs_attr *attr, char *buffer)
int ret = -ENOMEM;
struct xen_compile_info *info;
- info = kmalloc_obj(struct xen_compile_info, GFP_KERNEL);
+ info = kmalloc_obj(struct xen_compile_info);
if (info) {
ret = HYPERVISOR_xen_version(XENVER_compile_info, info);
if (!ret)
@@ -218,7 +218,7 @@ static ssize_t compile_date_show(struct hyp_sysfs_attr *attr, char *buffer)
int ret = -ENOMEM;
struct xen_compile_info *info;
- info = kmalloc_obj(struct xen_compile_info, GFP_KERNEL);
+ info = kmalloc_obj(struct xen_compile_info);
if (info) {
ret = HYPERVISOR_xen_version(XENVER_compile_info, info);
if (!ret)
@@ -291,7 +291,7 @@ static ssize_t virtual_start_show(struct hyp_sysfs_attr *attr, char *buffer)
int ret = -ENOMEM;
struct xen_platform_parameters *parms;
- parms = kmalloc_obj(struct xen_platform_parameters, GFP_KERNEL);
+ parms = kmalloc_obj(struct xen_platform_parameters);
if (parms) {
ret = HYPERVISOR_xen_version(XENVER_platform_parameters,
parms);
diff --git a/drivers/xen/unpopulated-alloc.c b/drivers/xen/unpopulated-alloc.c
index 4cfb6abdc3d8..9cdabf18451e 100644
--- a/drivers/xen/unpopulated-alloc.c
+++ b/drivers/xen/unpopulated-alloc.c
@@ -43,7 +43,7 @@ static int fill_list(unsigned int nr_pages)
struct range mhp_range;
int ret;
- res = kzalloc_obj(*res, GFP_KERNEL);
+ res = kzalloc_obj(*res);
if (!res)
return -ENOMEM;
@@ -65,7 +65,7 @@ static int fill_list(unsigned int nr_pages)
* re-using it by someone else.
*/
if (target_resource != &iomem_resource) {
- tmp_res = kzalloc_obj(*tmp_res, GFP_KERNEL);
+ tmp_res = kzalloc_obj(*tmp_res);
if (!tmp_res) {
ret = -ENOMEM;
goto err_insert;
@@ -84,7 +84,7 @@ static int fill_list(unsigned int nr_pages)
}
}
- pgmap = kzalloc_obj(*pgmap, GFP_KERNEL);
+ pgmap = kzalloc_obj(*pgmap);
if (!pgmap) {
ret = -ENOMEM;
goto err_pgmap;
diff --git a/drivers/xen/xen-front-pgdir-shbuf.c b/drivers/xen/xen-front-pgdir-shbuf.c
index 32e28f044b33..f693b963a2e8 100644
--- a/drivers/xen/xen-front-pgdir-shbuf.c
+++ b/drivers/xen/xen-front-pgdir-shbuf.c
@@ -205,7 +205,7 @@ static int backend_unmap(struct xen_front_pgdir_shbuf *buf)
if (!buf->pages || !buf->backend_map_handles || !buf->grefs)
return 0;
- unmap_ops = kzalloc_objs(*unmap_ops, buf->num_pages, GFP_KERNEL);
+ unmap_ops = kzalloc_objs(*unmap_ops, buf->num_pages);
if (!unmap_ops)
return -ENOMEM;
@@ -249,7 +249,7 @@ static int backend_map(struct xen_front_pgdir_shbuf *buf)
unsigned char *ptr;
int ret, cur_gref, cur_dir_page, cur_page, grefs_left;
- map_ops = kzalloc_objs(*map_ops, buf->num_pages, GFP_KERNEL);
+ map_ops = kzalloc_objs(*map_ops, buf->num_pages);
if (!map_ops)
return -ENOMEM;
@@ -472,7 +472,7 @@ static int grant_references(struct xen_front_pgdir_shbuf *buf)
*/
static int alloc_storage(struct xen_front_pgdir_shbuf *buf)
{
- buf->grefs = kzalloc_objs(*buf->grefs, buf->num_grefs, GFP_KERNEL);
+ buf->grefs = kzalloc_objs(*buf->grefs, buf->num_grefs);
if (!buf->grefs)
return -ENOMEM;
diff --git a/drivers/xen/xen-pciback/conf_space.c b/drivers/xen/xen-pciback/conf_space.c
index fbc40acd593f..a2ae8de6f9e2 100644
--- a/drivers/xen/xen-pciback/conf_space.c
+++ b/drivers/xen/xen-pciback/conf_space.c
@@ -401,7 +401,7 @@ int xen_pcibk_config_add_field_offset(struct pci_dev *dev,
struct config_field_entry *cfg_entry;
void *tmp;
- cfg_entry = kmalloc_obj(*cfg_entry, GFP_KERNEL);
+ cfg_entry = kmalloc_obj(*cfg_entry);
if (!cfg_entry) {
err = -ENOMEM;
goto out;
diff --git a/drivers/xen/xen-pciback/conf_space_header.c b/drivers/xen/xen-pciback/conf_space_header.c
index 0efbd85cf7e1..8b50cbcbdfe1 100644
--- a/drivers/xen/xen-pciback/conf_space_header.c
+++ b/drivers/xen/xen-pciback/conf_space_header.c
@@ -33,7 +33,7 @@ struct pci_bar_info {
static void *command_init(struct pci_dev *dev, int offset)
{
- struct pci_cmd_info *cmd = kmalloc_obj(*cmd, GFP_KERNEL);
+ struct pci_cmd_info *cmd = kmalloc_obj(*cmd);
int err;
if (!cmd)
@@ -211,7 +211,7 @@ static void *bar_init(struct pci_dev *dev, int offset)
{
unsigned int pos;
const struct resource *res = dev->resource;
- struct pci_bar_info *bar = kzalloc_obj(*bar, GFP_KERNEL);
+ struct pci_bar_info *bar = kzalloc_obj(*bar);
if (!bar)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/xen/xen-pciback/conf_space_quirks.c b/drivers/xen/xen-pciback/conf_space_quirks.c
index 52c8d38cb434..675519b51287 100644
--- a/drivers/xen/xen-pciback/conf_space_quirks.c
+++ b/drivers/xen/xen-pciback/conf_space_quirks.c
@@ -97,7 +97,7 @@ int xen_pcibk_config_quirks_init(struct pci_dev *dev)
struct xen_pcibk_config_quirk *quirk;
int ret = 0;
- quirk = kzalloc_obj(*quirk, GFP_KERNEL);
+ quirk = kzalloc_obj(*quirk);
if (!quirk) {
ret = -ENOMEM;
goto out;
diff --git a/drivers/xen/xen-pciback/passthrough.c b/drivers/xen/xen-pciback/passthrough.c
index 9d2583a7a19a..7a6df524c071 100644
--- a/drivers/xen/xen-pciback/passthrough.c
+++ b/drivers/xen/xen-pciback/passthrough.c
@@ -51,7 +51,7 @@ static int __xen_pcibk_add_pci_dev(struct xen_pcibk_device *pdev,
unsigned int domain, bus, devfn;
int err;
- dev_entry = kmalloc_obj(*dev_entry, GFP_KERNEL);
+ dev_entry = kmalloc_obj(*dev_entry);
if (!dev_entry)
return -ENOMEM;
dev_entry->dev = dev;
@@ -101,7 +101,7 @@ static int __xen_pcibk_init_devices(struct xen_pcibk_device *pdev)
{
struct passthrough_dev_data *dev_data;
- dev_data = kmalloc_obj(*dev_data, GFP_KERNEL);
+ dev_data = kmalloc_obj(*dev_data);
if (!dev_data)
return -ENOMEM;
diff --git a/drivers/xen/xen-pciback/pci_stub.c b/drivers/xen/xen-pciback/pci_stub.c
index ffc70ce61c8f..e4b27aecbf05 100644
--- a/drivers/xen/xen-pciback/pci_stub.c
+++ b/drivers/xen/xen-pciback/pci_stub.c
@@ -79,7 +79,7 @@ static struct pcistub_device *pcistub_device_alloc(struct pci_dev *dev)
dev_dbg(&dev->dev, "pcistub_device_alloc\n");
- psdev = kzalloc_obj(*psdev, GFP_KERNEL);
+ psdev = kzalloc_obj(*psdev);
if (!psdev)
return NULL;
@@ -623,7 +623,7 @@ static int pcistub_probe(struct pci_dev *dev, const struct pci_device_id *id)
}
if (!match) {
- pci_dev_id = kmalloc_obj(*pci_dev_id, GFP_KERNEL);
+ pci_dev_id = kmalloc_obj(*pci_dev_id);
if (!pci_dev_id) {
err = -ENOMEM;
goto out;
@@ -1129,7 +1129,7 @@ static int pcistub_device_id_add(int domain, int bus, int slot, int func)
|| PCI_FUNC(devfn) != func)
return -EINVAL;
- pci_dev_id = kmalloc_obj(*pci_dev_id, GFP_KERNEL);
+ pci_dev_id = kmalloc_obj(*pci_dev_id);
if (!pci_dev_id)
return -ENOMEM;
@@ -1189,7 +1189,7 @@ static int pcistub_reg_add(int domain, int bus, int slot, int func,
}
dev = psdev->dev;
- field = kzalloc_obj(*field, GFP_KERNEL);
+ field = kzalloc_obj(*field);
if (!field) {
err = -ENOMEM;
goto out;
diff --git a/drivers/xen/xen-pciback/pciback_ops.c b/drivers/xen/xen-pciback/pciback_ops.c
index 2755ab0b0d85..bfc186bf05bc 100644
--- a/drivers/xen/xen-pciback/pciback_ops.c
+++ b/drivers/xen/xen-pciback/pciback_ops.c
@@ -219,7 +219,7 @@ int xen_pcibk_enable_msix(struct xen_pcibk_device *pdev,
if (dev->msi_enabled || !(cmd & PCI_COMMAND_MEMORY))
return -ENXIO;
- entries = kmalloc_objs(*entries, op->value, GFP_KERNEL);
+ entries = kmalloc_objs(*entries, op->value);
if (entries == NULL)
return -ENOMEM;
diff --git a/drivers/xen/xen-pciback/vpci.c b/drivers/xen/xen-pciback/vpci.c
index 391ea1040b16..df292c19effb 100644
--- a/drivers/xen/xen-pciback/vpci.c
+++ b/drivers/xen/xen-pciback/vpci.c
@@ -81,7 +81,7 @@ static int __xen_pcibk_add_pci_dev(struct xen_pcibk_device *pdev,
goto out;
}
- dev_entry = kmalloc_obj(*dev_entry, GFP_KERNEL);
+ dev_entry = kmalloc_obj(*dev_entry);
if (!dev_entry) {
err = -ENOMEM;
xenbus_dev_fatal(pdev->xdev, err,
@@ -186,7 +186,7 @@ static int __xen_pcibk_init_devices(struct xen_pcibk_device *pdev)
int slot;
struct vpci_dev_data *vpci_dev;
- vpci_dev = kmalloc_obj(*vpci_dev, GFP_KERNEL);
+ vpci_dev = kmalloc_obj(*vpci_dev);
if (!vpci_dev)
return -ENOMEM;
diff --git a/drivers/xen/xen-pciback/xenbus.c b/drivers/xen/xen-pciback/xenbus.c
index d5e001ff0489..22ff9cf35fc4 100644
--- a/drivers/xen/xen-pciback/xenbus.c
+++ b/drivers/xen/xen-pciback/xenbus.c
@@ -38,7 +38,7 @@ static struct xen_pcibk_device *alloc_pdev(struct xenbus_device *xdev)
{
struct xen_pcibk_device *pdev;
- pdev = kzalloc_obj(struct xen_pcibk_device, GFP_KERNEL);
+ pdev = kzalloc_obj(struct xen_pcibk_device);
if (pdev == NULL)
goto out;
dev_dbg(&xdev->dev, "allocated pdev @ 0x%p\n", pdev);
diff --git a/drivers/xen/xen-scsiback.c b/drivers/xen/xen-scsiback.c
index 66758c72d5d1..dee1a05fdd44 100644
--- a/drivers/xen/xen-scsiback.c
+++ b/drivers/xen/xen-scsiback.c
@@ -974,7 +974,7 @@ static int scsiback_add_translation_entry(struct vscsibk_info *info,
return -ENODEV;
}
- new = kmalloc_obj(struct v2p_entry, GFP_KERNEL);
+ new = kmalloc_obj(struct v2p_entry);
if (new == NULL) {
err = -ENOMEM;
goto out_free;
@@ -1270,7 +1270,7 @@ static int scsiback_probe(struct xenbus_device *dev,
{
int err;
- struct vscsibk_info *info = kzalloc_obj(struct vscsibk_info, GFP_KERNEL);
+ struct vscsibk_info *info = kzalloc_obj(struct vscsibk_info);
pr_debug("%s %p %d\n", __func__, dev, dev->otherend_id);
@@ -1351,7 +1351,7 @@ scsiback_make_tport(struct target_fabric_configfs *tf,
u64 wwpn = 0;
int off = 0;
- tport = kzalloc_obj(struct scsiback_tport, GFP_KERNEL);
+ tport = kzalloc_obj(struct scsiback_tport);
if (!tport)
return ERR_PTR(-ENOMEM);
@@ -1531,7 +1531,7 @@ static int scsiback_make_nexus(struct scsiback_tpg *tpg,
goto out_unlock;
}
- tv_nexus = kzalloc_obj(struct scsiback_nexus, GFP_KERNEL);
+ tv_nexus = kzalloc_obj(struct scsiback_nexus);
if (!tv_nexus) {
ret = -ENOMEM;
goto out_unlock;
@@ -1758,7 +1758,7 @@ scsiback_make_tpg(struct se_wwn *wwn, const char *name)
if (ret)
return ERR_PTR(ret);
- tpg = kzalloc_obj(struct scsiback_tpg, GFP_KERNEL);
+ tpg = kzalloc_obj(struct scsiback_tpg);
if (!tpg)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/xen/xenbus/xenbus_client.c b/drivers/xen/xenbus/xenbus_client.c
index 61739961838c..0ab1329e79de 100644
--- a/drivers/xen/xenbus/xenbus_client.c
+++ b/drivers/xen/xenbus/xenbus_client.c
@@ -535,11 +535,11 @@ int xenbus_map_ring_valloc(struct xenbus_device *dev, grant_ref_t *gnt_refs,
if (nr_grefs > XENBUS_MAX_RING_GRANTS)
return -EINVAL;
- info = kzalloc_obj(*info, GFP_KERNEL);
+ info = kzalloc_obj(*info);
if (!info)
return -ENOMEM;
- info->node = kzalloc_obj(*info->node, GFP_KERNEL);
+ info->node = kzalloc_obj(*info->node);
if (!info->node)
err = -ENOMEM;
else
diff --git a/drivers/xen/xenbus/xenbus_dev_frontend.c b/drivers/xen/xenbus/xenbus_dev_frontend.c
index 7b37d80b82ed..417631350eb0 100644
--- a/drivers/xen/xenbus/xenbus_dev_frontend.c
+++ b/drivers/xen/xenbus/xenbus_dev_frontend.c
@@ -242,7 +242,7 @@ static struct watch_adapter *alloc_watch_adapter(const char *path,
{
struct watch_adapter *watch;
- watch = kzalloc_obj(*watch, GFP_KERNEL);
+ watch = kzalloc_obj(*watch);
if (watch == NULL)
goto out_fail;
@@ -454,7 +454,7 @@ static int xenbus_write_transaction(unsigned msg_type,
} *msg = (void *)u->u.buffer;
if (msg_type == XS_TRANSACTION_START) {
- trans = kzalloc_obj(*trans, GFP_KERNEL);
+ trans = kzalloc_obj(*trans);
if (!trans) {
rc = -ENOMEM;
goto out;
@@ -655,7 +655,7 @@ static int xenbus_file_open(struct inode *inode, struct file *filp)
stream_open(inode, filp);
- u = kzalloc_obj(*u, GFP_KERNEL);
+ u = kzalloc_obj(*u);
if (u == NULL)
return -ENOMEM;
diff --git a/drivers/xen/xlate_mmu.c b/drivers/xen/xlate_mmu.c
index b40ec40eb9a2..8efd7b55223f 100644
--- a/drivers/xen/xlate_mmu.c
+++ b/drivers/xen/xlate_mmu.c
@@ -223,11 +223,11 @@ int __init xen_xlate_map_ballooned_pages(xen_pfn_t **gfns, void **virt,
BUG_ON(nr_grant_frames == 0);
nr_pages = DIV_ROUND_UP(nr_grant_frames, XEN_PFN_PER_PAGE);
- pages = kzalloc_objs(pages[0], nr_pages, GFP_KERNEL);
+ pages = kzalloc_objs(pages[0], nr_pages);
if (!pages)
return -ENOMEM;
- pfns = kzalloc_objs(pfns[0], nr_grant_frames, GFP_KERNEL);
+ pfns = kzalloc_objs(pfns[0], nr_grant_frames);
if (!pfns) {
kfree(pages);
return -ENOMEM;
diff --git a/fs/9p/vfs_super.c b/fs/9p/vfs_super.c
index b9872016deae..0a1c4f7cb001 100644
--- a/fs/9p/vfs_super.c
+++ b/fs/9p/vfs_super.c
@@ -90,7 +90,7 @@ static int v9fs_get_tree(struct fs_context *fc)
p9_debug(P9_DEBUG_VFS, "\n");
- v9ses = kzalloc_obj(struct v9fs_session_info, GFP_KERNEL);
+ v9ses = kzalloc_obj(struct v9fs_session_info);
if (!v9ses)
return -ENOMEM;
@@ -308,7 +308,7 @@ static int v9fs_init_fs_context(struct fs_context *fc)
{
struct v9fs_context *ctx;
- ctx = kzalloc_obj(*ctx, GFP_KERNEL);
+ ctx = kzalloc_obj(*ctx);
if (!ctx)
return -ENOMEM;
diff --git a/fs/adfs/dir.c b/fs/adfs/dir.c
index 366fb93c7b38..493500f37cb9 100644
--- a/fs/adfs/dir.c
+++ b/fs/adfs/dir.c
@@ -108,7 +108,7 @@ int adfs_dir_read_buffers(struct super_block *sb, u32 indaddr,
if (dir->bhs != dir->bh)
return -EINVAL;
- bhs = kzalloc_objs(*bhs, num, GFP_KERNEL);
+ bhs = kzalloc_objs(*bhs, num);
if (!bhs)
return -ENOMEM;
diff --git a/fs/adfs/map.c b/fs/adfs/map.c
index 9e24e212b3e1..9d535a2ca2d1 100644
--- a/fs/adfs/map.c
+++ b/fs/adfs/map.c
@@ -373,7 +373,7 @@ struct adfs_discmap *adfs_read_map(struct super_block *sb, struct adfs_discrecor
((nzones > 1) ? ADFS_DR_SIZE_BITS : 0);
map_addr = signed_asl(map_addr, asb->s_map2blk);
- dm = kmalloc_objs(*dm, nzones, GFP_KERNEL);
+ dm = kmalloc_objs(*dm, nzones);
if (dm == NULL) {
adfs_error(sb, "not enough memory");
return ERR_PTR(-ENOMEM);
diff --git a/fs/adfs/super.c b/fs/adfs/super.c
index a8e73e980abb..2c5b2076acf9 100644
--- a/fs/adfs/super.c
+++ b/fs/adfs/super.c
@@ -437,7 +437,7 @@ static int adfs_init_fs_context(struct fs_context *fc)
{
struct adfs_sb_info *asb;
- asb = kzalloc_obj(struct adfs_sb_info, GFP_KERNEL);
+ asb = kzalloc_obj(struct adfs_sb_info);
if (!asb)
return -ENOMEM;
diff --git a/fs/affs/dir.c b/fs/affs/dir.c
index 39b6ddc4e4b1..5c8d83387a39 100644
--- a/fs/affs/dir.c
+++ b/fs/affs/dir.c
@@ -36,7 +36,7 @@ static int affs_dir_open(struct inode *inode, struct file *file)
{
struct affs_dir_data *data;
- data = kzalloc_obj(struct affs_dir_data, GFP_KERNEL);
+ data = kzalloc_obj(struct affs_dir_data);
if (!data)
return -ENOMEM;
file->private_data = data;
diff --git a/fs/affs/super.c b/fs/affs/super.c
index 1a2f72fea1ab..8451647f3fea 100644
--- a/fs/affs/super.c
+++ b/fs/affs/super.c
@@ -327,7 +327,7 @@ static int affs_fill_super(struct super_block *sb, struct fs_context *fc)
sb->s_time_min = sys_tz.tz_minuteswest * 60 + AFFS_EPOCH_DELTA;
sb->s_time_max = 86400LL * U32_MAX + 86400 + sb->s_time_min;
- sbi = kzalloc_obj(struct affs_sb_info, GFP_KERNEL);
+ sbi = kzalloc_obj(struct affs_sb_info);
if (!sbi)
return -ENOMEM;
@@ -615,7 +615,7 @@ static int affs_init_fs_context(struct fs_context *fc)
{
struct affs_context *ctx;
- ctx = kzalloc_obj(struct affs_context, GFP_KERNEL);
+ ctx = kzalloc_obj(struct affs_context);
if (!ctx)
return -ENOMEM;
diff --git a/fs/afs/cell.c b/fs/afs/cell.c
index 4331bf8e1dbd..9738684dbdd2 100644
--- a/fs/afs/cell.c
+++ b/fs/afs/cell.c
@@ -134,7 +134,7 @@ static struct afs_cell *afs_alloc_cell(struct afs_net *net,
_enter("%*.*s,%s", namelen, namelen, name, addresses);
- cell = kzalloc_obj(struct afs_cell, GFP_KERNEL);
+ cell = kzalloc_obj(struct afs_cell);
if (!cell) {
_leave(" = -ENOMEM");
return ERR_PTR(-ENOMEM);
diff --git a/fs/afs/cmservice.c b/fs/afs/cmservice.c
index a32e7c2864d2..322a80b43f32 100644
--- a/fs/afs/cmservice.c
+++ b/fs/afs/cmservice.c
@@ -339,7 +339,7 @@ static int afs_deliver_cb_init_call_back_state3(struct afs_call *call)
}
_debug("unmarshall UUID");
- call->request = kmalloc_obj(struct afs_uuid, GFP_KERNEL);
+ call->request = kmalloc_obj(struct afs_uuid);
if (!call->request)
return -ENOMEM;
@@ -456,7 +456,7 @@ static int afs_deliver_cb_probe_uuid(struct afs_call *call)
}
_debug("unmarshall UUID");
- call->request = kmalloc_obj(struct afs_uuid, GFP_KERNEL);
+ call->request = kmalloc_obj(struct afs_uuid);
if (!call->request)
return -ENOMEM;
diff --git a/fs/afs/dir.c b/fs/afs/dir.c
index 6f7380f25365..e778a575e1ca 100644
--- a/fs/afs/dir.c
+++ b/fs/afs/dir.c
@@ -785,7 +785,7 @@ static struct inode *afs_do_lookup(struct inode *dir, struct dentry *dentry)
_enter("{%lu},%p{%pd},", dir->i_ino, dentry, dentry);
- cookie = kzalloc_obj(struct afs_lookup_cookie, GFP_KERNEL);
+ cookie = kzalloc_obj(struct afs_lookup_cookie);
if (!cookie)
return ERR_PTR(-ENOMEM);
@@ -2094,7 +2094,7 @@ static int afs_rename(struct mnt_idmap *idmap, struct inode *old_dir,
goto error;
ret = -ENOMEM;
- op->more_files = kvzalloc_objs(struct afs_vnode_param, 2, GFP_KERNEL);
+ op->more_files = kvzalloc_objs(struct afs_vnode_param, 2);
if (!op->more_files)
goto error;
diff --git a/fs/afs/dir_silly.c b/fs/afs/dir_silly.c
index f77bed45e808..a748fd133faf 100644
--- a/fs/afs/dir_silly.c
+++ b/fs/afs/dir_silly.c
@@ -69,7 +69,7 @@ static int afs_do_silly_rename(struct afs_vnode *dvnode, struct afs_vnode *vnode
if (IS_ERR(op))
return PTR_ERR(op);
- op->more_files = kvzalloc_objs(struct afs_vnode_param, 2, GFP_KERNEL);
+ op->more_files = kvzalloc_objs(struct afs_vnode_param, 2);
if (!op->more_files) {
afs_put_operation(op);
return -ENOMEM;
diff --git a/fs/afs/file.c b/fs/afs/file.c
index 5c429a746d76..f609366fd2ac 100644
--- a/fs/afs/file.c
+++ b/fs/afs/file.c
@@ -86,7 +86,7 @@ int afs_cache_wb_key(struct afs_vnode *vnode, struct afs_file *af)
{
struct afs_wb_key *wbk, *p;
- wbk = kzalloc_obj(struct afs_wb_key, GFP_KERNEL);
+ wbk = kzalloc_obj(struct afs_wb_key);
if (!wbk)
return -ENOMEM;
refcount_set(&wbk->usage, 2);
@@ -130,7 +130,7 @@ int afs_open(struct inode *inode, struct file *file)
goto error;
}
- af = kzalloc_obj(*af, GFP_KERNEL);
+ af = kzalloc_obj(*af);
if (!af) {
ret = -ENOMEM;
goto error_key;
diff --git a/fs/afs/fs_operation.c b/fs/afs/fs_operation.c
index 0ffd19f5279d..c0dbbc6d3716 100644
--- a/fs/afs/fs_operation.c
+++ b/fs/afs/fs_operation.c
@@ -21,7 +21,7 @@ struct afs_operation *afs_alloc_operation(struct key *key, struct afs_volume *vo
_enter("");
- op = kzalloc_obj(*op, GFP_KERNEL);
+ op = kzalloc_obj(*op);
if (!op)
return ERR_PTR(-ENOMEM);
diff --git a/fs/afs/fs_probe.c b/fs/afs/fs_probe.c
index 0100ce4c62a0..a91ad1938d07 100644
--- a/fs/afs/fs_probe.c
+++ b/fs/afs/fs_probe.c
@@ -244,7 +244,7 @@ int afs_fs_probe_fileserver(struct afs_net *net, struct afs_server *server,
_enter("%pU", &server->uuid);
- estate = kzalloc_obj(*estate, GFP_KERNEL);
+ estate = kzalloc_obj(*estate);
if (!estate)
return -ENOMEM;
diff --git a/fs/afs/main.c b/fs/afs/main.c
index 7e09bf7aa03b..7a883c59976f 100644
--- a/fs/afs/main.c
+++ b/fs/afs/main.c
@@ -93,7 +93,7 @@ static int __net_init afs_net_init(struct net *net_ns)
atomic_set(&net->servers_outstanding, 1);
ret = -ENOMEM;
- sysnames = kzalloc_obj(*sysnames, GFP_KERNEL);
+ sysnames = kzalloc_obj(*sysnames);
if (!sysnames)
goto error_sysnames;
sysnames->subs[0] = (char *)&afs_init_sysname;
diff --git a/fs/afs/proc.c b/fs/afs/proc.c
index 52e8195ef2b8..a9cc5cdb4ca2 100644
--- a/fs/afs/proc.c
+++ b/fs/afs/proc.c
@@ -572,7 +572,7 @@ static int afs_proc_sysname_write(struct file *file, char *buf, size_t size)
char *s, *p, *sub;
int ret, len;
- sysnames = kzalloc_obj(*sysnames, GFP_KERNEL);
+ sysnames = kzalloc_obj(*sysnames);
if (!sysnames)
return -ENOMEM;
refcount_set(&sysnames->usage, 1);
diff --git a/fs/afs/server.c b/fs/afs/server.c
index 8777c566d12d..0fe162ea2a36 100644
--- a/fs/afs/server.c
+++ b/fs/afs/server.c
@@ -117,7 +117,7 @@ static struct afs_server *afs_alloc_server(struct afs_cell *cell, const uuid_t *
_enter("");
- server = kzalloc_obj(struct afs_server, GFP_KERNEL);
+ server = kzalloc_obj(struct afs_server);
if (!server)
return NULL;
diff --git a/fs/afs/super.c b/fs/afs/super.c
index 2b567fe5b4cb..942f3e9800d7 100644
--- a/fs/afs/super.c
+++ b/fs/afs/super.c
@@ -502,7 +502,7 @@ static struct afs_super_info *afs_alloc_sbi(struct fs_context *fc)
struct afs_fs_context *ctx = fc->fs_private;
struct afs_super_info *as;
- as = kzalloc_obj(struct afs_super_info, GFP_KERNEL);
+ as = kzalloc_obj(struct afs_super_info);
if (as) {
as->net_ns = get_net(fc->net_ns);
as->flock_mode = ctx->flock_mode;
@@ -623,7 +623,7 @@ static int afs_init_fs_context(struct fs_context *fc)
struct afs_fs_context *ctx;
struct afs_cell *cell;
- ctx = kzalloc_obj(struct afs_fs_context, GFP_KERNEL);
+ ctx = kzalloc_obj(struct afs_fs_context);
if (!ctx)
return -ENOMEM;
diff --git a/fs/afs/vlclient.c b/fs/afs/vlclient.c
index 05abd50e4057..a40b43464cfa 100644
--- a/fs/afs/vlclient.c
+++ b/fs/afs/vlclient.c
@@ -122,7 +122,7 @@ struct afs_vldb_entry *afs_vl_get_entry_by_name_u(struct afs_vl_cursor *vc,
padsz = (4 - (volnamesz & 3)) & 3;
reqsz = 8 + volnamesz + padsz;
- entry = kzalloc_obj(struct afs_vldb_entry, GFP_KERNEL);
+ entry = kzalloc_obj(struct afs_vldb_entry);
if (!entry)
return ERR_PTR(-ENOMEM);
diff --git a/fs/afs/volume.c b/fs/afs/volume.c
index 260df046143a..9ae5c8ad2e04 100644
--- a/fs/afs/volume.c
+++ b/fs/afs/volume.c
@@ -81,7 +81,7 @@ static struct afs_volume *afs_alloc_volume(struct afs_fs_context *params,
struct afs_volume *volume;
int ret = -ENOMEM, i;
- volume = kzalloc_obj(struct afs_volume, GFP_KERNEL);
+ volume = kzalloc_obj(struct afs_volume);
if (!volume)
goto error_0;
diff --git a/fs/afs/xattr.c b/fs/afs/xattr.c
index 2daf23af01e5..af9398d48e39 100644
--- a/fs/afs/xattr.c
+++ b/fs/afs/xattr.c
@@ -157,7 +157,7 @@ static int afs_xattr_get_yfs(const struct xattr_handler *handler,
else
return -EOPNOTSUPP;
- yacl = kzalloc_obj(struct yfs_acl, GFP_KERNEL);
+ yacl = kzalloc_obj(struct yfs_acl);
if (!yacl)
goto error;
diff --git a/fs/autofs/inode.c b/fs/autofs/inode.c
index 5134a042044c..c53dc551053b 100644
--- a/fs/autofs/inode.c
+++ b/fs/autofs/inode.c
@@ -13,7 +13,7 @@ struct autofs_info *autofs_new_ino(struct autofs_sb_info *sbi)
{
struct autofs_info *ino;
- ino = kzalloc_obj(*ino, GFP_KERNEL);
+ ino = kzalloc_obj(*ino);
if (ino) {
INIT_LIST_HEAD(&ino->active);
INIT_LIST_HEAD(&ino->expiring);
@@ -242,7 +242,7 @@ static struct autofs_sb_info *autofs_alloc_sbi(void)
{
struct autofs_sb_info *sbi;
- sbi = kzalloc_obj(*sbi, GFP_KERNEL);
+ sbi = kzalloc_obj(*sbi);
if (!sbi)
return NULL;
@@ -405,7 +405,7 @@ int autofs_init_fs_context(struct fs_context *fc)
struct autofs_fs_context *ctx;
struct autofs_sb_info *sbi;
- ctx = kzalloc_obj(struct autofs_fs_context, GFP_KERNEL);
+ ctx = kzalloc_obj(struct autofs_fs_context);
if (!ctx)
goto nomem;
diff --git a/fs/autofs/waitq.c b/fs/autofs/waitq.c
index 21ecd0bbc0ca..d46241342dfc 100644
--- a/fs/autofs/waitq.c
+++ b/fs/autofs/waitq.c
@@ -376,7 +376,7 @@ int autofs_wait(struct autofs_sb_info *sbi,
if (!wq) {
/* Create a new wait queue */
- wq = kmalloc_obj(struct autofs_wait_queue, GFP_KERNEL);
+ wq = kmalloc_obj(struct autofs_wait_queue);
if (!wq) {
kfree(name);
mutex_unlock(&sbi->wq_mutex);
diff --git a/fs/befs/linuxvfs.c b/fs/befs/linuxvfs.c
index df54c52d2f19..cecbc92f959a 100644
--- a/fs/befs/linuxvfs.c
+++ b/fs/befs/linuxvfs.c
@@ -790,7 +790,7 @@ befs_fill_super(struct super_block *sb, struct fs_context *fc)
struct befs_mount_options *parsed_opts = fc->fs_private;
int silent = fc->sb_flags & SB_SILENT;
- sb->s_fs_info = kzalloc_obj(*befs_sb, GFP_KERNEL);
+ sb->s_fs_info = kzalloc_obj(*befs_sb);
if (sb->s_fs_info == NULL)
goto unacquire_none;
@@ -956,7 +956,7 @@ static int befs_init_fs_context(struct fs_context *fc)
{
struct befs_mount_options *opts;
- opts = kzalloc_obj(*opts, GFP_KERNEL);
+ opts = kzalloc_obj(*opts);
if (!opts)
return -ENOMEM;
diff --git a/fs/bfs/inode.c b/fs/bfs/inode.c
index 6ed07d892e3d..9da02f5cb6cd 100644
--- a/fs/bfs/inode.c
+++ b/fs/bfs/inode.c
@@ -334,7 +334,7 @@ static int bfs_fill_super(struct super_block *s, struct fs_context *fc)
unsigned long i_sblock, i_eblock, i_eoff, s_size;
int silent = fc->sb_flags & SB_SILENT;
- info = kzalloc_obj(*info, GFP_KERNEL);
+ info = kzalloc_obj(*info);
if (!info)
return -ENOMEM;
mutex_init(&info->bfs_lock);
diff --git a/fs/binfmt_elf.c b/fs/binfmt_elf.c
index 6ea9681cab33..49a196721cc7 100644
--- a/fs/binfmt_elf.c
+++ b/fs/binfmt_elf.c
@@ -916,7 +916,7 @@ static int load_elf_binary(struct linux_binprm *bprm)
*/
would_dump(bprm, interpreter);
- interp_elf_ex = kmalloc_obj(*interp_elf_ex, GFP_KERNEL);
+ interp_elf_ex = kmalloc_obj(*interp_elf_ex);
if (!interp_elf_ex) {
retval = -ENOMEM;
goto out_free_file;
@@ -1798,7 +1798,7 @@ static int fill_thread_core_info(struct elf_thread_core_info *t,
fill_note(&t->notes[0], PRSTATUS, sizeof(t->prstatus), &t->prstatus);
info->size += notesize(&t->notes[0]);
- fpu = kzalloc_obj(elf_fpregset_t, GFP_KERNEL);
+ fpu = kzalloc_obj(elf_fpregset_t);
if (!fpu || !elf_core_copy_task_fpregs(p, fpu)) {
kfree(fpu);
return 1;
@@ -1824,7 +1824,7 @@ static int fill_note_info(struct elfhdr *elf, int phdrs,
u16 machine;
u32 flags;
- psinfo = kmalloc_obj(*psinfo, GFP_KERNEL);
+ psinfo = kmalloc_obj(*psinfo);
if (!psinfo)
return 0;
fill_note(&info->psinfo, PRPSINFO, sizeof(*psinfo), psinfo);
@@ -2036,7 +2036,7 @@ static int elf_core_dump(struct coredump_params *cprm)
/* For cell spufs and x86 xstate */
sz += elf_coredump_extra_notes_size();
- phdr4note = kmalloc_obj(*phdr4note, GFP_KERNEL);
+ phdr4note = kmalloc_obj(*phdr4note);
if (!phdr4note)
goto end_coredump;
@@ -2051,7 +2051,7 @@ static int elf_core_dump(struct coredump_params *cprm)
e_shoff = offset;
if (e_phnum == PN_XNUM) {
- shdr4extnum = kmalloc_obj(*shdr4extnum, GFP_KERNEL);
+ shdr4extnum = kmalloc_obj(*shdr4extnum);
if (!shdr4extnum)
goto end_coredump;
fill_extnum_info(&elf, shdr4extnum, e_shoff, segs);
diff --git a/fs/binfmt_elf_fdpic.c b/fs/binfmt_elf_fdpic.c
index cee0871b0164..526e048e2956 100644
--- a/fs/binfmt_elf_fdpic.c
+++ b/fs/binfmt_elf_fdpic.c
@@ -1391,7 +1391,7 @@ static struct elf_thread_status *elf_dump_thread_status(long signr, struct task_
struct elf_thread_status *t;
int i, ret;
- t = kzalloc_obj(struct elf_thread_status, GFP_KERNEL);
+ t = kzalloc_obj(struct elf_thread_status);
if (!t)
return t;
@@ -1486,10 +1486,10 @@ static int elf_fdpic_core_dump(struct coredump_params *cprm)
struct elf_thread_status *tmp;
/* alloc memory for large data structures: too large to be on stack */
- elf = kmalloc_obj(*elf, GFP_KERNEL);
+ elf = kmalloc_obj(*elf);
if (!elf)
goto end_coredump;
- psinfo = kmalloc_obj(*psinfo, GFP_KERNEL);
+ psinfo = kmalloc_obj(*psinfo);
if (!psinfo)
goto end_coredump;
@@ -1547,7 +1547,7 @@ static int elf_fdpic_core_dump(struct coredump_params *cprm)
offset += segs * sizeof(struct elf_phdr); /* Program headers */
/* Write notes phdr entry */
- phdr4note = kmalloc_obj(*phdr4note, GFP_KERNEL);
+ phdr4note = kmalloc_obj(*phdr4note);
if (!phdr4note)
goto end_coredump;
@@ -1562,7 +1562,7 @@ static int elf_fdpic_core_dump(struct coredump_params *cprm)
e_shoff = offset;
if (e_phnum == PN_XNUM) {
- shdr4extnum = kmalloc_obj(*shdr4extnum, GFP_KERNEL);
+ shdr4extnum = kmalloc_obj(*shdr4extnum);
if (!shdr4extnum)
goto end_coredump;
fill_extnum_info(elf, shdr4extnum, e_shoff, segs);
diff --git a/fs/binfmt_misc.c b/fs/binfmt_misc.c
index 4a15e09bc398..b3d8fd70e8b1 100644
--- a/fs/binfmt_misc.c
+++ b/fs/binfmt_misc.c
@@ -961,7 +961,7 @@ static int bm_fill_super(struct super_block *sb, struct fs_context *fc)
* create their own separate binfmt_misc mounts we should
* consider turning this into a kmem cache.
*/
- misc = kzalloc_obj(struct binfmt_misc, GFP_KERNEL);
+ misc = kzalloc_obj(struct binfmt_misc);
if (!misc)
return -ENOMEM;
diff --git a/fs/btrfs/async-thread.c b/fs/btrfs/async-thread.c
index cce7b2610364..e6f33d09497f 100644
--- a/fs/btrfs/async-thread.c
+++ b/fs/btrfs/async-thread.c
@@ -85,7 +85,7 @@ struct btrfs_workqueue *btrfs_alloc_workqueue(struct btrfs_fs_info *fs_info,
const char *name, unsigned int flags,
int limit_active, int thresh)
{
- struct btrfs_workqueue *ret = kzalloc_obj(*ret, GFP_KERNEL);
+ struct btrfs_workqueue *ret = kzalloc_obj(*ret);
if (!ret)
return NULL;
@@ -126,7 +126,7 @@ struct btrfs_workqueue *btrfs_alloc_ordered_workqueue(
{
struct btrfs_workqueue *ret;
- ret = kzalloc_obj(*ret, GFP_KERNEL);
+ ret = kzalloc_obj(*ret);
if (!ret)
return NULL;
diff --git a/fs/btrfs/backref.c b/fs/btrfs/backref.c
index 78bf0cad1d2d..af98421e7922 100644
--- a/fs/btrfs/backref.c
+++ b/fs/btrfs/backref.c
@@ -1805,7 +1805,7 @@ struct btrfs_backref_share_check_ctx *btrfs_alloc_backref_share_check_ctx(void)
{
struct btrfs_backref_share_check_ctx *ctx;
- ctx = kzalloc_obj(*ctx, GFP_KERNEL);
+ ctx = kzalloc_obj(*ctx);
if (!ctx)
return NULL;
@@ -2797,7 +2797,7 @@ struct inode_fs_paths *init_ipath(s32 total_bytes, struct btrfs_root *fs_root,
if (IS_ERR(fspath))
return ERR_CAST(fspath);
- ifp = kmalloc_obj(*ifp, GFP_KERNEL);
+ ifp = kmalloc_obj(*ifp);
if (!ifp) {
kvfree(fspath);
return ERR_PTR(-ENOMEM);
diff --git a/fs/btrfs/compression.c b/fs/btrfs/compression.c
index 7fde7698c331..790518a8c803 100644
--- a/fs/btrfs/compression.c
+++ b/fs/btrfs/compression.c
@@ -662,7 +662,7 @@ static struct list_head *alloc_heuristic_ws(struct btrfs_fs_info *fs_info)
{
struct heuristic_ws *ws;
- ws = kzalloc_obj(*ws, GFP_KERNEL);
+ ws = kzalloc_obj(*ws);
if (!ws)
return ERR_PTR(-ENOMEM);
@@ -670,11 +670,11 @@ static struct list_head *alloc_heuristic_ws(struct btrfs_fs_info *fs_info)
if (!ws->sample)
goto fail;
- ws->bucket = kzalloc_objs(*ws->bucket, BUCKET_SIZE, GFP_KERNEL);
+ ws->bucket = kzalloc_objs(*ws->bucket, BUCKET_SIZE);
if (!ws->bucket)
goto fail;
- ws->bucket_b = kzalloc_objs(*ws->bucket_b, BUCKET_SIZE, GFP_KERNEL);
+ ws->bucket_b = kzalloc_objs(*ws->bucket_b, BUCKET_SIZE);
if (!ws->bucket_b)
goto fail;
@@ -734,7 +734,7 @@ static int alloc_workspace_manager(struct btrfs_fs_info *fs_info,
struct list_head *workspace;
ASSERT(fs_info->compr_wsm[type] == NULL);
- gwsm = kzalloc_obj(*gwsm, GFP_KERNEL);
+ gwsm = kzalloc_obj(*gwsm);
if (!gwsm)
return -ENOMEM;
diff --git a/fs/btrfs/extent_io.h b/fs/btrfs/extent_io.h
index a9b0b596429d..8d05f1a58b7c 100644
--- a/fs/btrfs/extent_io.h
+++ b/fs/btrfs/extent_io.h
@@ -200,7 +200,7 @@ static inline struct extent_changeset *extent_changeset_alloc(void)
{
struct extent_changeset *ret;
- ret = kmalloc_obj(*ret, GFP_KERNEL);
+ ret = kmalloc_obj(*ret);
if (!ret)
return NULL;
diff --git a/fs/btrfs/file.c b/fs/btrfs/file.c
index 21cb45e23a6f..a4cb9d3cfc4e 100644
--- a/fs/btrfs/file.c
+++ b/fs/btrfs/file.c
@@ -2842,7 +2842,7 @@ static int add_falloc_range(struct list_head *head, u64 start, u64 len)
}
}
- range = kmalloc_obj(*range, GFP_KERNEL);
+ range = kmalloc_obj(*range);
if (!range)
return -ENOMEM;
range->start = start;
@@ -3572,7 +3572,7 @@ static loff_t find_desired_extent(struct file *file, loff_t offset, int whence)
*/
private = NULL;
} else if (!private) {
- private = kzalloc_obj(*private, GFP_KERNEL);
+ private = kzalloc_obj(*private);
/*
* No worries if memory allocation failed.
* The private structure is used only for speeding up multiple
diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c
index da4be08d133e..f3ecbca47edb 100644
--- a/fs/btrfs/inode.c
+++ b/fs/btrfs/inode.c
@@ -3967,7 +3967,7 @@ static int btrfs_init_file_extent_tree(struct btrfs_inode *inode)
if (btrfs_is_free_space_inode(inode))
return 0;
- inode->file_extent_tree = kmalloc_obj(struct extent_io_tree, GFP_KERNEL);
+ inode->file_extent_tree = kmalloc_obj(struct extent_io_tree);
if (!inode->file_extent_tree)
return -ENOMEM;
@@ -6221,7 +6221,7 @@ static int btrfs_opendir(struct inode *inode, struct file *file)
if (ret)
return ret;
- private = kzalloc_obj(struct btrfs_file_private, GFP_KERNEL);
+ private = kzalloc_obj(struct btrfs_file_private);
if (!private)
return -ENOMEM;
private->last_index = last_index;
diff --git a/fs/btrfs/ioctl.c b/fs/btrfs/ioctl.c
index af8a9c698b07..2bd0178c95a2 100644
--- a/fs/btrfs/ioctl.c
+++ b/fs/btrfs/ioctl.c
@@ -726,7 +726,7 @@ static int create_snapshot(struct btrfs_root *root, struct inode *dir,
return -ETXTBSY;
}
- pending_snapshot = kzalloc_obj(*pending_snapshot, GFP_KERNEL);
+ pending_snapshot = kzalloc_obj(*pending_snapshot);
if (!pending_snapshot)
return -ENOMEM;
@@ -1958,7 +1958,7 @@ static int btrfs_ioctl_get_subvol_info(struct inode *inode, void __user *argp)
if (!path)
return -ENOMEM;
- subvol_info = kzalloc_obj(*subvol_info, GFP_KERNEL);
+ subvol_info = kzalloc_obj(*subvol_info);
if (!subvol_info) {
btrfs_free_path(path);
return -ENOMEM;
@@ -3423,7 +3423,7 @@ static long btrfs_ioctl_balance(struct file *file, void __user *arg)
goto out_unlock;
}
- bctl = kzalloc_obj(*bctl, GFP_KERNEL);
+ bctl = kzalloc_obj(*bctl);
if (!bctl) {
ret = -ENOMEM;
goto out_unlock;
@@ -3604,7 +3604,7 @@ static long btrfs_ioctl_qgroup_assign(struct file *file, void __user *arg)
}
if (sa->assign) {
- prealloc = kzalloc_obj(*prealloc, GFP_KERNEL);
+ prealloc = kzalloc_obj(*prealloc);
if (!prealloc) {
ret = -ENOMEM;
goto out;
@@ -3924,7 +3924,7 @@ static long btrfs_ioctl_set_received_subvol_32(struct file *file,
if (IS_ERR(args32))
return PTR_ERR(args32);
- args64 = kmalloc_obj(*args64, GFP_KERNEL);
+ args64 = kmalloc_obj(*args64);
if (!args64) {
ret = -ENOMEM;
goto out;
@@ -4234,7 +4234,7 @@ static int _btrfs_ioctl_send(struct btrfs_root *root, void __user *argp, bool co
ret = copy_from_user(&args32, argp, sizeof(args32));
if (ret)
return -EFAULT;
- arg = kzalloc_obj(*arg, GFP_KERNEL);
+ arg = kzalloc_obj(*arg);
if (!arg)
return -ENOMEM;
arg->send_fd = args32.send_fd;
diff --git a/fs/btrfs/lzo.c b/fs/btrfs/lzo.c
index e37d986f26be..049a940ba449 100644
--- a/fs/btrfs/lzo.c
+++ b/fs/btrfs/lzo.c
@@ -88,7 +88,7 @@ struct list_head *lzo_alloc_workspace(struct btrfs_fs_info *fs_info)
{
struct workspace *workspace;
- workspace = kzalloc_obj(*workspace, GFP_KERNEL);
+ workspace = kzalloc_obj(*workspace);
if (!workspace)
return ERR_PTR(-ENOMEM);
diff --git a/fs/btrfs/qgroup.c b/fs/btrfs/qgroup.c
index 6bd8739097d3..3cdd9755dc52 100644
--- a/fs/btrfs/qgroup.c
+++ b/fs/btrfs/qgroup.c
@@ -495,7 +495,7 @@ int btrfs_read_qgroup_config(struct btrfs_fs_info *fs_info)
struct btrfs_qgroup *prealloc;
struct btrfs_root *tree_root = fs_info->tree_root;
- prealloc = kzalloc_obj(*prealloc, GFP_KERNEL);
+ prealloc = kzalloc_obj(*prealloc);
if (!prealloc) {
ret = -ENOMEM;
goto out;
@@ -585,7 +585,7 @@ int btrfs_read_qgroup_config(struct btrfs_fs_info *fs_info)
goto next2;
}
- list = kzalloc_obj(*list, GFP_KERNEL);
+ list = kzalloc_obj(*list);
if (!list) {
ret = -ENOMEM;
goto out;
diff --git a/fs/btrfs/scrub.c b/fs/btrfs/scrub.c
index dfed8eaf938e..865dc30002cd 100644
--- a/fs/btrfs/scrub.c
+++ b/fs/btrfs/scrub.c
@@ -455,7 +455,7 @@ static noinline_for_stack struct scrub_ctx *scrub_setup_ctx(
/* Since sctx has inline 128 stripes, it can go beyond 64K easily. Use
* kvzalloc().
*/
- sctx = kvzalloc_obj(*sctx, GFP_KERNEL);
+ sctx = kvzalloc_obj(*sctx);
if (!sctx)
goto nomem;
refcount_set(&sctx->refs, 1);
diff --git a/fs/btrfs/send.c b/fs/btrfs/send.c
index 23b0b06ac71c..7b2ea38b62dd 100644
--- a/fs/btrfs/send.c
+++ b/fs/btrfs/send.c
@@ -450,7 +450,7 @@ static struct fs_path *fs_path_alloc(void)
{
struct fs_path *p;
- p = kmalloc_obj(*p, GFP_KERNEL);
+ p = kmalloc_obj(*p);
if (!p)
return NULL;
init_path(p);
@@ -2743,7 +2743,7 @@ static int cache_dir_utimes(struct send_ctx *sctx, u64 dir, u64 gen)
return 0;
/* Caching is optional, don't fail if we can't allocate memory. */
- entry = kmalloc_obj(*entry, GFP_KERNEL);
+ entry = kmalloc_obj(*entry);
if (!entry)
return send_utimes(sctx, dir, gen);
@@ -2870,7 +2870,7 @@ static void cache_dir_created(struct send_ctx *sctx, u64 dir)
int ret;
/* Caching is optional, ignore any failures. */
- entry = kmalloc_obj(*entry, GFP_KERNEL);
+ entry = kmalloc_obj(*entry);
if (!entry)
return;
@@ -2974,7 +2974,7 @@ static struct recorded_ref *recorded_ref_alloc(void)
{
struct recorded_ref *ref;
- ref = kzalloc_obj(*ref, GFP_KERNEL);
+ ref = kzalloc_obj(*ref);
if (!ref)
return NULL;
RB_CLEAR_NODE(&ref->node);
@@ -3083,7 +3083,7 @@ static struct orphan_dir_info *add_orphan_dir_info(struct send_ctx *sctx,
return entry;
}
- odi = kmalloc_obj(*odi, GFP_KERNEL);
+ odi = kmalloc_obj(*odi);
if (!odi)
return ERR_PTR(-ENOMEM);
odi->ino = dir_ino;
@@ -3284,7 +3284,7 @@ static int add_waiting_dir_move(struct send_ctx *sctx, u64 ino, bool orphanized)
struct rb_node *parent = NULL;
struct waiting_dir_move *entry, *dm;
- dm = kmalloc_obj(*dm, GFP_KERNEL);
+ dm = kmalloc_obj(*dm);
if (!dm)
return -ENOMEM;
dm->ino = ino;
@@ -3352,7 +3352,7 @@ static int add_pending_dir_move(struct send_ctx *sctx,
int exists = 0;
int ret;
- pm = kmalloc_obj(*pm, GFP_KERNEL);
+ pm = kmalloc_obj(*pm);
if (!pm)
return -ENOMEM;
pm->parent_ino = parent_ino;
@@ -8035,7 +8035,7 @@ long btrfs_ioctl_send(struct btrfs_root *send_root, const struct btrfs_ioctl_sen
goto out;
}
- sctx = kzalloc_obj(struct send_ctx, GFP_KERNEL);
+ sctx = kzalloc_obj(struct send_ctx);
if (!sctx) {
ret = -ENOMEM;
goto out;
diff --git a/fs/btrfs/super.c b/fs/btrfs/super.c
index 3f9523563259..b4d26ca9220a 100644
--- a/fs/btrfs/super.c
+++ b/fs/btrfs/super.c
@@ -2054,7 +2054,7 @@ static int btrfs_get_tree_subvol(struct fs_context *fc)
* of the fs_info (locks and such) to make cleanup easier if we find a
* superblock with our given fs_devices later on at sget() time.
*/
- fs_info = kvzalloc_obj(struct btrfs_fs_info, GFP_KERNEL);
+ fs_info = kvzalloc_obj(struct btrfs_fs_info);
if (!fs_info)
return -ENOMEM;
@@ -2173,7 +2173,7 @@ static int btrfs_init_fs_context(struct fs_context *fc)
{
struct btrfs_fs_context *ctx;
- ctx = kzalloc_obj(struct btrfs_fs_context, GFP_KERNEL);
+ ctx = kzalloc_obj(struct btrfs_fs_context);
if (!ctx)
return -ENOMEM;
diff --git a/fs/btrfs/sysfs.c b/fs/btrfs/sysfs.c
index f62278f0c191..0d14570c8bc2 100644
--- a/fs/btrfs/sysfs.c
+++ b/fs/btrfs/sysfs.c
@@ -2597,7 +2597,7 @@ int btrfs_sysfs_add_qgroups(struct btrfs_fs_info *fs_info)
if (fs_info->qgroups_kobj)
return 0;
- fs_info->qgroups_kobj = kzalloc_obj(struct kobject, GFP_KERNEL);
+ fs_info->qgroups_kobj = kzalloc_obj(struct kobject);
if (!fs_info->qgroups_kobj)
return -ENOMEM;
diff --git a/fs/btrfs/tests/btrfs-tests.c b/fs/btrfs/tests/btrfs-tests.c
index c5b1bc0f7f91..fa177070d2d0 100644
--- a/fs/btrfs/tests/btrfs-tests.c
+++ b/fs/btrfs/tests/btrfs-tests.c
@@ -98,7 +98,7 @@ struct btrfs_device *btrfs_alloc_dummy_device(struct btrfs_fs_info *fs_info)
{
struct btrfs_device *dev;
- dev = kzalloc_obj(*dev, GFP_KERNEL);
+ dev = kzalloc_obj(*dev);
if (!dev)
return ERR_PTR(-ENOMEM);
@@ -122,14 +122,14 @@ struct btrfs_fs_info *btrfs_alloc_dummy_fs_info(u32 nodesize, u32 sectorsize)
if (!fs_info)
return fs_info;
- fs_info->fs_devices = kzalloc_obj(struct btrfs_fs_devices, GFP_KERNEL);
+ fs_info->fs_devices = kzalloc_obj(struct btrfs_fs_devices);
if (!fs_info->fs_devices) {
kfree(fs_info);
return NULL;
}
INIT_LIST_HEAD(&fs_info->fs_devices->devices);
- fs_info->super_copy = kzalloc_obj(struct btrfs_super_block, GFP_KERNEL);
+ fs_info->super_copy = kzalloc_obj(struct btrfs_super_block);
if (!fs_info->super_copy) {
kfree(fs_info->fs_devices);
kfree(fs_info);
@@ -206,10 +206,10 @@ btrfs_alloc_dummy_block_group(struct btrfs_fs_info *fs_info,
{
struct btrfs_block_group *cache;
- cache = kzalloc_obj(*cache, GFP_KERNEL);
+ cache = kzalloc_obj(*cache);
if (!cache)
return NULL;
- cache->free_space_ctl = kzalloc_obj(*cache->free_space_ctl, GFP_KERNEL);
+ cache->free_space_ctl = kzalloc_obj(*cache->free_space_ctl);
if (!cache->free_space_ctl) {
kfree(cache);
return NULL;
diff --git a/fs/btrfs/tests/delayed-refs-tests.c b/fs/btrfs/tests/delayed-refs-tests.c
index fdc183ebc6da..ccab45d849bb 100644
--- a/fs/btrfs/tests/delayed-refs-tests.c
+++ b/fs/btrfs/tests/delayed-refs-tests.c
@@ -985,7 +985,7 @@ int btrfs_test_delayed_refs(u32 sectorsize, u32 nodesize)
test_std_err(TEST_ALLOC_FS_INFO);
return -ENOMEM;
}
- transaction = kmalloc_obj(*transaction, GFP_KERNEL);
+ transaction = kmalloc_obj(*transaction);
if (!transaction) {
test_std_err(TEST_ALLOC_TRANSACTION);
ret = -ENOMEM;
diff --git a/fs/btrfs/volumes.c b/fs/btrfs/volumes.c
index 71ff7006ca6b..6fb0c4cd50ff 100644
--- a/fs/btrfs/volumes.c
+++ b/fs/btrfs/volumes.c
@@ -382,7 +382,7 @@ static struct btrfs_fs_devices *alloc_fs_devices(const u8 *fsid)
{
struct btrfs_fs_devices *fs_devs;
- fs_devs = kzalloc_obj(*fs_devs, GFP_KERNEL);
+ fs_devs = kzalloc_obj(*fs_devs);
if (!fs_devs)
return ERR_PTR(-ENOMEM);
@@ -7202,7 +7202,7 @@ struct btrfs_device *btrfs_alloc_device(struct btrfs_fs_info *fs_info,
if (WARN_ON(!devid && !fs_info))
return ERR_PTR(-EINVAL);
- dev = kzalloc_obj(*dev, GFP_KERNEL);
+ dev = kzalloc_obj(*dev);
if (!dev)
return ERR_PTR(-ENOMEM);
diff --git a/fs/btrfs/zlib.c b/fs/btrfs/zlib.c
index 5a0913a31991..1b7544aa88a2 100644
--- a/fs/btrfs/zlib.c
+++ b/fs/btrfs/zlib.c
@@ -75,7 +75,7 @@ struct list_head *zlib_alloc_workspace(struct btrfs_fs_info *fs_info, unsigned i
struct workspace *workspace;
int workspacesize;
- workspace = kzalloc_obj(*workspace, GFP_KERNEL);
+ workspace = kzalloc_obj(*workspace);
if (!workspace)
return ERR_PTR(-ENOMEM);
diff --git a/fs/btrfs/zoned.c b/fs/btrfs/zoned.c
index fcdfb831b484..a27db827d87b 100644
--- a/fs/btrfs/zoned.c
+++ b/fs/btrfs/zoned.c
@@ -377,7 +377,7 @@ int btrfs_get_dev_zone_info(struct btrfs_device *device, bool populate_cache)
if (device->zone_info)
return 0;
- zone_info = kzalloc_obj(*zone_info, GFP_KERNEL);
+ zone_info = kzalloc_obj(*zone_info);
if (!zone_info)
return -ENOMEM;
diff --git a/fs/btrfs/zstd.c b/fs/btrfs/zstd.c
index a7a41dd320d9..6f076fa8f3f9 100644
--- a/fs/btrfs/zstd.c
+++ b/fs/btrfs/zstd.c
@@ -185,7 +185,7 @@ int zstd_alloc_workspace_manager(struct btrfs_fs_info *fs_info)
struct list_head *ws;
ASSERT(fs_info->compr_wsm[BTRFS_COMPRESS_ZSTD] == NULL);
- zwsm = kzalloc_obj(*zwsm, GFP_KERNEL);
+ zwsm = kzalloc_obj(*zwsm);
if (!zwsm)
return -ENOMEM;
zstd_calc_ws_mem_sizes();
@@ -373,7 +373,7 @@ struct list_head *zstd_alloc_workspace(struct btrfs_fs_info *fs_info, int level)
const u32 blocksize = fs_info->sectorsize;
struct workspace *workspace;
- workspace = kzalloc_obj(*workspace, GFP_KERNEL);
+ workspace = kzalloc_obj(*workspace);
if (!workspace)
return ERR_PTR(-ENOMEM);
diff --git a/fs/cachefiles/daemon.c b/fs/cachefiles/daemon.c
index 99795864bcb3..4117b145ac94 100644
--- a/fs/cachefiles/daemon.c
+++ b/fs/cachefiles/daemon.c
@@ -102,7 +102,7 @@ static int cachefiles_daemon_open(struct inode *inode, struct file *file)
return -EBUSY;
/* allocate a cache record */
- cache = kzalloc_obj(struct cachefiles_cache, GFP_KERNEL);
+ cache = kzalloc_obj(struct cachefiles_cache);
if (!cache) {
cachefiles_open = 0;
return -ENOMEM;
diff --git a/fs/cachefiles/io.c b/fs/cachefiles/io.c
index 7b9d547ecee6..eaf47851c65f 100644
--- a/fs/cachefiles/io.c
+++ b/fs/cachefiles/io.c
@@ -132,7 +132,7 @@ static int cachefiles_read(struct netfs_cache_resources *cres,
}
ret = -ENOMEM;
- ki = kzalloc_obj(struct cachefiles_kiocb, GFP_KERNEL);
+ ki = kzalloc_obj(struct cachefiles_kiocb);
if (!ki)
goto presubmission_error;
@@ -298,7 +298,7 @@ int __cachefiles_write(struct cachefiles_object *object,
file, file_inode(file)->i_ino, start_pos, len,
i_size_read(file_inode(file)));
- ki = kzalloc_obj(struct cachefiles_kiocb, GFP_KERNEL);
+ ki = kzalloc_obj(struct cachefiles_kiocb);
if (!ki) {
if (term_func)
term_func(term_func_priv, -ENOMEM);
diff --git a/fs/cachefiles/volume.c b/fs/cachefiles/volume.c
index 655de0cef530..6c0da61362ee 100644
--- a/fs/cachefiles/volume.c
+++ b/fs/cachefiles/volume.c
@@ -28,7 +28,7 @@ void cachefiles_acquire_volume(struct fscache_volume *vcookie)
_enter("");
- volume = kzalloc_obj(struct cachefiles_volume, GFP_KERNEL);
+ volume = kzalloc_obj(struct cachefiles_volume);
if (!volume)
return;
volume->vcookie = vcookie;
diff --git a/fs/ceph/caps.c b/fs/ceph/caps.c
index 5d7c2ffae8fa..d51454e995a8 100644
--- a/fs/ceph/caps.c
+++ b/fs/ceph/caps.c
@@ -2395,7 +2395,7 @@ static int flush_mdlog_and_wait_inode_unsafe_requests(struct inode *inode)
mutex_lock(&mdsc->mutex);
max_sessions = mdsc->max_sessions;
- sessions = kzalloc_objs(s, max_sessions, GFP_KERNEL);
+ sessions = kzalloc_objs(s, max_sessions);
if (!sessions) {
mutex_unlock(&mdsc->mutex);
err = -ENOMEM;
diff --git a/fs/ceph/crypto.c b/fs/ceph/crypto.c
index 643c8ba28ae7..f3de43ccb470 100644
--- a/fs/ceph/crypto.c
+++ b/fs/ceph/crypto.c
@@ -50,7 +50,7 @@ static int ceph_crypt_set_context(struct inode *inode, const void *ctx,
if (len > FSCRYPT_SET_CONTEXT_MAX_SIZE)
return -EINVAL;
- cfa = kzalloc_obj(*cfa, GFP_KERNEL);
+ cfa = kzalloc_obj(*cfa);
if (!cfa)
return -ENOMEM;
@@ -112,7 +112,7 @@ int ceph_fscrypt_prepare_context(struct inode *dir, struct inode *inode,
if (!encrypted)
return 0;
- as->fscrypt_auth = kzalloc_obj(*as->fscrypt_auth, GFP_KERNEL);
+ as->fscrypt_auth = kzalloc_obj(*as->fscrypt_auth);
if (!as->fscrypt_auth)
return -ENOMEM;
diff --git a/fs/ceph/file.c b/fs/ceph/file.c
index fdbf4aeaa408..66bbf6d517a9 100644
--- a/fs/ceph/file.c
+++ b/fs/ceph/file.c
@@ -1572,7 +1572,7 @@ ceph_direct_read_write(struct kiocb *iocb, struct iov_iter *iter,
*/
if (pos == iocb->ki_pos && !is_sync_kiocb(iocb) &&
(len == count || pos + count <= i_size_read(inode))) {
- aio_req = kzalloc_obj(*aio_req, GFP_KERNEL);
+ aio_req = kzalloc_obj(*aio_req);
if (aio_req) {
aio_req->iocb = iocb;
aio_req->write = write;
diff --git a/fs/ceph/quota.c b/fs/ceph/quota.c
index 514da29469b8..4dc9426643e8 100644
--- a/fs/ceph/quota.c
+++ b/fs/ceph/quota.c
@@ -103,7 +103,7 @@ find_quotarealm_inode(struct ceph_mds_client *mdsc, u64 ino)
}
if (!qri || (qri->ino != ino)) {
/* Not found, create a new one and insert it */
- qri = kmalloc_obj(*qri, GFP_KERNEL);
+ qri = kmalloc_obj(*qri);
if (qri) {
qri->ino = ino;
qri->inode = NULL;
diff --git a/fs/ceph/super.c b/fs/ceph/super.c
index 57320e830eda..2aed6b3359b6 100644
--- a/fs/ceph/super.c
+++ b/fs/ceph/super.c
@@ -809,7 +809,7 @@ static struct ceph_fs_client *create_fs_client(struct ceph_mount_options *fsopt,
struct ceph_fs_client *fsc;
int err;
- fsc = kzalloc_obj(*fsc, GFP_KERNEL);
+ fsc = kzalloc_obj(*fsc);
if (!fsc) {
err = -ENOMEM;
goto fail;
@@ -1429,7 +1429,7 @@ static int ceph_init_fs_context(struct fs_context *fc)
struct ceph_parse_opts_ctx *pctx;
struct ceph_mount_options *fsopt;
- pctx = kzalloc_obj(*pctx, GFP_KERNEL);
+ pctx = kzalloc_obj(*pctx);
if (!pctx)
return -ENOMEM;
@@ -1437,7 +1437,7 @@ static int ceph_init_fs_context(struct fs_context *fc)
if (!pctx->copts)
goto nomem;
- pctx->opts = kzalloc_obj(*pctx->opts, GFP_KERNEL);
+ pctx->opts = kzalloc_obj(*pctx->opts);
if (!pctx->opts)
goto nomem;
diff --git a/fs/char_dev.c b/fs/char_dev.c
index 49b2641bbe03..00229e25c10f 100644
--- a/fs/char_dev.c
+++ b/fs/char_dev.c
@@ -115,7 +115,7 @@ __register_chrdev_region(unsigned int major, unsigned int baseminor,
return ERR_PTR(-EINVAL);
}
- cd = kzalloc_obj(struct char_device_struct, GFP_KERNEL);
+ cd = kzalloc_obj(struct char_device_struct);
if (cd == NULL)
return ERR_PTR(-ENOMEM);
@@ -636,7 +636,7 @@ static struct kobj_type ktype_cdev_dynamic = {
*/
struct cdev *cdev_alloc(void)
{
- struct cdev *p = kzalloc_obj(struct cdev, GFP_KERNEL);
+ struct cdev *p = kzalloc_obj(struct cdev);
if (p) {
INIT_LIST_HEAD(&p->list);
kobject_init(&p->kobj, &ktype_cdev_dynamic);
diff --git a/fs/coda/dir.c b/fs/coda/dir.c
index 329cefb16fb5..c64b8cd81568 100644
--- a/fs/coda/dir.c
+++ b/fs/coda/dir.c
@@ -362,7 +362,7 @@ static int coda_venus_readdir(struct file *coda_file, struct dir_context *ctx)
cii = ITOC(file_inode(coda_file));
- vdir = kmalloc_obj(*vdir, GFP_KERNEL);
+ vdir = kmalloc_obj(*vdir);
if (!vdir) return -ENOMEM;
if (!dir_emit_dots(coda_file, ctx))
diff --git a/fs/coda/file.c b/fs/coda/file.c
index a40ba8d0b14b..6ca8bfcb58f2 100644
--- a/fs/coda/file.c
+++ b/fs/coda/file.c
@@ -175,7 +175,7 @@ coda_file_mmap(struct file *coda_file, struct vm_area_struct *vma)
if (ret)
return ret;
- cvm_ops = kmalloc_obj(struct coda_vm_ops, GFP_KERNEL);
+ cvm_ops = kmalloc_obj(struct coda_vm_ops);
if (!cvm_ops)
return -ENOMEM;
@@ -231,7 +231,7 @@ int coda_open(struct inode *coda_inode, struct file *coda_file)
unsigned short coda_flags = coda_flags_to_cflags(flags);
struct coda_file_info *cfi;
- cfi = kmalloc_obj(struct coda_file_info, GFP_KERNEL);
+ cfi = kmalloc_obj(struct coda_file_info);
if (!cfi)
return -ENOMEM;
diff --git a/fs/coda/inode.c b/fs/coda/inode.c
index d95ae651f528..ad1654f3adf8 100644
--- a/fs/coda/inode.c
+++ b/fs/coda/inode.c
@@ -381,7 +381,7 @@ static int coda_init_fs_context(struct fs_context *fc)
{
struct coda_fs_context *ctx;
- ctx = kzalloc_obj(struct coda_fs_context, GFP_KERNEL);
+ ctx = kzalloc_obj(struct coda_fs_context);
if (!ctx)
return -ENOMEM;
diff --git a/fs/coda/upcall.c b/fs/coda/upcall.c
index 0abde29b4f47..3438119b5dcf 100644
--- a/fs/coda/upcall.c
+++ b/fs/coda/upcall.c
@@ -724,7 +724,7 @@ static int coda_upcall(struct venus_comm *vcp,
}
/* Format the request message. */
- req = kmalloc_obj(struct upc_req, GFP_KERNEL);
+ req = kmalloc_obj(struct upc_req);
if (!req) {
error = -ENOMEM;
goto exit;
@@ -788,10 +788,10 @@ static int coda_upcall(struct venus_comm *vcp,
}
error = -ENOMEM;
- sig_req = kmalloc_obj(struct upc_req, GFP_KERNEL);
+ sig_req = kmalloc_obj(struct upc_req);
if (!sig_req) goto exit;
- sig_inputArgs = kvzalloc_obj(*sig_inputArgs, GFP_KERNEL);
+ sig_inputArgs = kvzalloc_obj(*sig_inputArgs);
if (!sig_inputArgs) {
kfree(sig_req);
goto exit;
diff --git a/fs/configfs/dir.c b/fs/configfs/dir.c
index f437b1ab3b68..362b6ff9b908 100644
--- a/fs/configfs/dir.c
+++ b/fs/configfs/dir.c
@@ -159,7 +159,7 @@ static struct configfs_fragment *new_fragment(void)
{
struct configfs_fragment *p;
- p = kmalloc_obj(struct configfs_fragment, GFP_KERNEL);
+ p = kmalloc_obj(struct configfs_fragment);
if (p) {
atomic_set(&p->frag_count, 1);
init_rwsem(&p->frag_sem);
@@ -1847,7 +1847,7 @@ configfs_register_default_group(struct config_group *parent_group,
int ret;
struct config_group *group;
- group = kzalloc_obj(*group, GFP_KERNEL);
+ group = kzalloc_obj(*group);
if (!group)
return ERR_PTR(-ENOMEM);
config_group_init_type_name(group, name, item_type);
diff --git a/fs/configfs/file.c b/fs/configfs/file.c
index a83d1981e96f..ef8c3cd10cc6 100644
--- a/fs/configfs/file.c
+++ b/fs/configfs/file.c
@@ -296,7 +296,7 @@ static int __configfs_open_file(struct inode *inode, struct file *file, int type
int error;
error = -ENOMEM;
- buffer = kzalloc_obj(struct configfs_buffer, GFP_KERNEL);
+ buffer = kzalloc_obj(struct configfs_buffer);
if (!buffer)
goto out;
diff --git a/fs/configfs/inode.c b/fs/configfs/inode.c
index e7d8500fee7d..bc507b720a01 100644
--- a/fs/configfs/inode.c
+++ b/fs/configfs/inode.c
@@ -47,7 +47,7 @@ int configfs_setattr(struct mnt_idmap *idmap, struct dentry *dentry,
sd_iattr = sd->s_iattr;
if (!sd_iattr) {
/* setting attributes for the first time, allocate now */
- sd_iattr = kzalloc_obj(struct iattr, GFP_KERNEL);
+ sd_iattr = kzalloc_obj(struct iattr);
if (!sd_iattr)
return -ENOMEM;
/* assign default attributes */
diff --git a/fs/coredump.c b/fs/coredump.c
index c5b81cacbabb..55b700517e9f 100644
--- a/fs/coredump.c
+++ b/fs/coredump.c
@@ -262,7 +262,7 @@ static bool coredump_parse(struct core_name *cn, struct coredump_params *cprm,
switch (cn->core_type) {
case COREDUMP_PIPE: {
int argvs = sizeof(core_pattern) / 2;
- (*argv) = kmalloc_objs(**argv, argvs, GFP_KERNEL);
+ (*argv) = kmalloc_objs(**argv, argvs);
if (!(*argv))
return false;
(*argv)[(*argc)++] = 0;
diff --git a/fs/cramfs/inode.c b/fs/cramfs/inode.c
index 10403cb81182..e0ba9cd640dc 100644
--- a/fs/cramfs/inode.c
+++ b/fs/cramfs/inode.c
@@ -619,7 +619,7 @@ static int cramfs_blkdev_fill_super(struct super_block *sb, struct fs_context *f
struct cramfs_super super;
int i, err;
- sbi = kzalloc_obj(struct cramfs_sb_info, GFP_KERNEL);
+ sbi = kzalloc_obj(struct cramfs_sb_info);
if (!sbi)
return -ENOMEM;
sb->s_fs_info = sbi;
@@ -640,7 +640,7 @@ static int cramfs_mtd_fill_super(struct super_block *sb, struct fs_context *fc)
struct cramfs_super super;
int err;
- sbi = kzalloc_obj(struct cramfs_sb_info, GFP_KERNEL);
+ sbi = kzalloc_obj(struct cramfs_sb_info);
if (!sbi)
return -ENOMEM;
sb->s_fs_info = sbi;
diff --git a/fs/crypto/inline_crypt.c b/fs/crypto/inline_crypt.c
index e286d9fd17f3..c0852b920dbc 100644
--- a/fs/crypto/inline_crypt.c
+++ b/fs/crypto/inline_crypt.c
@@ -32,7 +32,7 @@ static struct block_device **fscrypt_get_devices(struct super_block *sb,
if (devs)
return devs;
}
- devs = kmalloc_obj(*devs, GFP_KERNEL);
+ devs = kmalloc_obj(*devs);
if (!devs)
return ERR_PTR(-ENOMEM);
devs[0] = sb->s_bdev;
@@ -169,7 +169,7 @@ int fscrypt_prepare_inline_crypt_key(struct fscrypt_prepared_key *prep_key,
unsigned int i;
int err;
- blk_key = kmalloc_obj(*blk_key, GFP_KERNEL);
+ blk_key = kmalloc_obj(*blk_key);
if (!blk_key)
return -ENOMEM;
diff --git a/fs/crypto/keyring.c b/fs/crypto/keyring.c
index 855314a28b18..9ec6e5ef0947 100644
--- a/fs/crypto/keyring.c
+++ b/fs/crypto/keyring.c
@@ -209,7 +209,7 @@ static int allocate_filesystem_keyring(struct super_block *sb)
if (sb->s_master_keys)
return 0;
- keyring = kzalloc_obj(*keyring, GFP_KERNEL);
+ keyring = kzalloc_obj(*keyring);
if (!keyring)
return -ENOMEM;
spin_lock_init(&keyring->lock);
@@ -434,7 +434,7 @@ static int add_new_master_key(struct super_block *sb,
struct fscrypt_master_key *mk;
int err;
- mk = kzalloc_obj(*mk, GFP_KERNEL);
+ mk = kzalloc_obj(*mk);
if (!mk)
return -ENOMEM;
diff --git a/fs/crypto/keysetup_v1.c b/fs/crypto/keysetup_v1.c
index 93fc2ab7ee97..3d673c36b678 100644
--- a/fs/crypto/keysetup_v1.c
+++ b/fs/crypto/keysetup_v1.c
@@ -221,7 +221,7 @@ fscrypt_get_direct_key(const struct fscrypt_inode_info *ci, const u8 *raw_key)
return dk;
/* Nope, allocate one. */
- dk = kzalloc_obj(*dk, GFP_KERNEL);
+ dk = kzalloc_obj(*dk);
if (!dk)
return ERR_PTR(-ENOMEM);
dk->dk_sb = ci->ci_inode->i_sb;
diff --git a/fs/crypto/policy.c b/fs/crypto/policy.c
index 49309e9da4ea..9915e39362db 100644
--- a/fs/crypto/policy.c
+++ b/fs/crypto/policy.c
@@ -813,7 +813,7 @@ int fscrypt_parse_test_dummy_encryption(const struct fs_parameter *param,
if (param->type == fs_value_is_string && *param->string)
arg = param->string;
- policy = kzalloc_obj(*policy, GFP_KERNEL);
+ policy = kzalloc_obj(*policy);
if (!policy)
return -ENOMEM;
diff --git a/fs/debugfs/file.c b/fs/debugfs/file.c
index 70b8dcd3599d..3376ab6a519d 100644
--- a/fs/debugfs/file.c
+++ b/fs/debugfs/file.c
@@ -82,7 +82,7 @@ static int __debugfs_file_get(struct dentry *dentry, enum dbgfs_get_mode mode)
if (WARN_ON(mode == DBGFS_GET_ALREADY))
return -EINVAL;
- fsd = kmalloc_obj(*fsd, GFP_KERNEL);
+ fsd = kmalloc_obj(*fsd);
if (!fsd)
return -ENOMEM;
diff --git a/fs/debugfs/inode.c b/fs/debugfs/inode.c
index a9e161f6fb7d..4598142355b9 100644
--- a/fs/debugfs/inode.c
+++ b/fs/debugfs/inode.c
@@ -310,7 +310,7 @@ static int debugfs_init_fs_context(struct fs_context *fc)
{
struct debugfs_fs_info *fsi;
- fsi = kzalloc_obj(struct debugfs_fs_info, GFP_KERNEL);
+ fsi = kzalloc_obj(struct debugfs_fs_info);
if (!fsi)
return -ENOMEM;
diff --git a/fs/devpts/inode.c b/fs/devpts/inode.c
index 93af356408ee..9844dcf354ee 100644
--- a/fs/devpts/inode.c
+++ b/fs/devpts/inode.c
@@ -420,7 +420,7 @@ static int devpts_init_fs_context(struct fs_context *fc)
{
struct pts_fs_info *fsi;
- fsi = kzalloc_obj(struct pts_fs_info, GFP_KERNEL);
+ fsi = kzalloc_obj(struct pts_fs_info);
if (!fsi)
return -ENOMEM;
diff --git a/fs/dlm/config.c b/fs/dlm/config.c
index 0f80fda98227..53cd33293042 100644
--- a/fs/dlm/config.c
+++ b/fs/dlm/config.c
@@ -602,7 +602,7 @@ static void drop_node(struct config_group *g, struct config_item *i)
struct dlm_node *nd = config_item_to_node(i);
struct dlm_member_gone *mb_gone;
- mb_gone = kzalloc_obj(*mb_gone, GFP_KERNEL);
+ mb_gone = kzalloc_obj(*mb_gone);
if (!mb_gone)
return;
diff --git a/fs/dlm/lock.c b/fs/dlm/lock.c
index 3b6e6a29eab8..c381e1028446 100644
--- a/fs/dlm/lock.c
+++ b/fs/dlm/lock.c
@@ -5050,7 +5050,7 @@ void dlm_recover_waiters_pre(struct dlm_ls *ls)
int wait_type, local_unlock_result, local_cancel_result;
int dir_nodeid;
- ms_local = kmalloc_obj(*ms_local, GFP_KERNEL);
+ ms_local = kmalloc_obj(*ms_local);
if (!ms_local)
return;
diff --git a/fs/dlm/member.c b/fs/dlm/member.c
index 812d889f1ce5..f84233a0fe4a 100644
--- a/fs/dlm/member.c
+++ b/fs/dlm/member.c
@@ -511,7 +511,7 @@ void dlm_lsop_recover_done(struct dlm_ls *ls)
return;
num = ls->ls_num_nodes;
- slots = kzalloc_objs(*slots, num, GFP_KERNEL);
+ slots = kzalloc_objs(*slots, num);
if (!slots)
return;
diff --git a/fs/ecryptfs/crypto.c b/fs/ecryptfs/crypto.c
index 6ada136f3f3f..3b59346d68c5 100644
--- a/fs/ecryptfs/crypto.c
+++ b/fs/ecryptfs/crypto.c
@@ -1793,7 +1793,7 @@ int ecryptfs_encrypt_and_encode_filename(
& ECRYPTFS_GLOBAL_ENCRYPT_FILENAMES)) {
struct ecryptfs_filename *filename;
- filename = kzalloc_obj(*filename, GFP_KERNEL);
+ filename = kzalloc_obj(*filename);
if (!filename) {
rc = -ENOMEM;
goto out;
diff --git a/fs/ecryptfs/keystore.c b/fs/ecryptfs/keystore.c
index 04b6d296a3fa..e8494903bb42 100644
--- a/fs/ecryptfs/keystore.c
+++ b/fs/ecryptfs/keystore.c
@@ -623,7 +623,7 @@ ecryptfs_write_tag_70_packet(char *dest, size_t *remaining_bytes,
struct key *auth_tok_key = NULL;
int rc = 0;
- s = kzalloc_obj(*s, GFP_KERNEL);
+ s = kzalloc_obj(*s);
if (!s)
return -ENOMEM;
@@ -860,7 +860,7 @@ ecryptfs_parse_tag_70_packet(char **filename, size_t *filename_size,
(*packet_size) = 0;
(*filename_size) = 0;
(*filename) = NULL;
- s = kzalloc_obj(*s, GFP_KERNEL);
+ s = kzalloc_obj(*s);
if (!s)
return -ENOMEM;
diff --git a/fs/ecryptfs/main.c b/fs/ecryptfs/main.c
index dcfa607fbf15..f4ab387eb4ed 100644
--- a/fs/ecryptfs/main.c
+++ b/fs/ecryptfs/main.c
@@ -610,7 +610,7 @@ static int ecryptfs_init_fs_context(struct fs_context *fc)
struct ecryptfs_fs_context *ctx;
struct ecryptfs_sb_info *sbi = NULL;
- ctx = kzalloc_obj(struct ecryptfs_fs_context, GFP_KERNEL);
+ ctx = kzalloc_obj(struct ecryptfs_fs_context);
if (!ctx)
return -ENOMEM;
sbi = kmem_cache_zalloc(ecryptfs_sb_info_cache, GFP_KERNEL);
diff --git a/fs/ecryptfs/messaging.c b/fs/ecryptfs/messaging.c
index 6cf3052e9370..30c8e15d87b5 100644
--- a/fs/ecryptfs/messaging.c
+++ b/fs/ecryptfs/messaging.c
@@ -131,7 +131,7 @@ ecryptfs_spawn_daemon(struct ecryptfs_daemon **daemon, struct file *file)
{
int rc = 0;
- (*daemon) = kzalloc_obj(**daemon, GFP_KERNEL);
+ (*daemon) = kzalloc_obj(**daemon);
if (!(*daemon)) {
rc = -ENOMEM;
goto out;
diff --git a/fs/efivarfs/super.c b/fs/efivarfs/super.c
index 14c2752831c8..1c5224cf183e 100644
--- a/fs/efivarfs/super.c
+++ b/fs/efivarfs/super.c
@@ -44,7 +44,7 @@ static int efivarfs_ops_notifier(struct notifier_block *nb, unsigned long event,
static struct inode *efivarfs_alloc_inode(struct super_block *sb)
{
- struct efivar_entry *entry = kzalloc_obj(*entry, GFP_KERNEL);
+ struct efivar_entry *entry = kzalloc_obj(*entry);
if (!entry)
return NULL;
@@ -505,7 +505,7 @@ static int efivarfs_init_fs_context(struct fs_context *fc)
if (!efivar_is_available())
return -EOPNOTSUPP;
- sfi = kzalloc_obj(*sfi, GFP_KERNEL);
+ sfi = kzalloc_obj(*sfi);
if (!sfi)
return -ENOMEM;
diff --git a/fs/efs/super.c b/fs/efs/super.c
index 54252bccd6a3..11fea3bbce7c 100644
--- a/fs/efs/super.c
+++ b/fs/efs/super.c
@@ -243,7 +243,7 @@ static int efs_fill_super(struct super_block *s, struct fs_context *fc)
struct buffer_head *bh;
struct inode *root;
- sb = kzalloc_obj(struct efs_sb_info, GFP_KERNEL);
+ sb = kzalloc_obj(struct efs_sb_info);
if (!sb)
return -ENOMEM;
s->s_fs_info = sb;
diff --git a/fs/erofs/decompressor_deflate.c b/fs/erofs/decompressor_deflate.c
index 787eb8fc6262..6167af1ffeb9 100644
--- a/fs/erofs/decompressor_deflate.c
+++ b/fs/erofs/decompressor_deflate.c
@@ -71,7 +71,7 @@ static int z_erofs_load_deflate_config(struct super_block *sb,
++z_erofs_deflate_avail_strms) {
struct z_erofs_deflate *strm;
- strm = kzalloc_obj(*strm, GFP_KERNEL);
+ strm = kzalloc_obj(*strm);
if (!strm)
goto failed;
/* XXX: in-kernel zlib cannot customize windowbits */
diff --git a/fs/erofs/decompressor_lzma.c b/fs/erofs/decompressor_lzma.c
index c1c908d7b6ef..f6692d0f2f04 100644
--- a/fs/erofs/decompressor_lzma.c
+++ b/fs/erofs/decompressor_lzma.c
@@ -54,7 +54,7 @@ static int __init z_erofs_lzma_init(void)
z_erofs_lzma_nstrms = num_possible_cpus();
for (i = 0; i < z_erofs_lzma_nstrms; ++i) {
- struct z_erofs_lzma *strm = kzalloc_obj(*strm, GFP_KERNEL);
+ struct z_erofs_lzma *strm = kzalloc_obj(*strm);
if (!strm) {
z_erofs_lzma_exit();
diff --git a/fs/erofs/decompressor_zstd.c b/fs/erofs/decompressor_zstd.c
index 6da93f74431b..ab318a2400f9 100644
--- a/fs/erofs/decompressor_zstd.c
+++ b/fs/erofs/decompressor_zstd.c
@@ -59,7 +59,7 @@ static int __init z_erofs_zstd_init(void)
++z_erofs_zstd_avail_strms) {
struct z_erofs_zstd *strm;
- strm = kzalloc_obj(*strm, GFP_KERNEL);
+ strm = kzalloc_obj(*strm);
if (!strm) {
z_erofs_zstd_exit();
return -ENOMEM;
diff --git a/fs/erofs/fscache.c b/fs/erofs/fscache.c
index 0a231063b341..685c68774379 100644
--- a/fs/erofs/fscache.c
+++ b/fs/erofs/fscache.c
@@ -70,7 +70,7 @@ static void erofs_fscache_req_put(struct erofs_fscache_rq *req)
static struct erofs_fscache_rq *erofs_fscache_req_alloc(struct address_space *mapping,
loff_t start, size_t len)
{
- struct erofs_fscache_rq *req = kzalloc_obj(*req, GFP_KERNEL);
+ struct erofs_fscache_rq *req = kzalloc_obj(*req);
if (!req)
return NULL;
@@ -101,7 +101,7 @@ static void erofs_fscache_req_end_io(void *priv, ssize_t transferred_or_error)
static struct erofs_fscache_io *erofs_fscache_req_io_alloc(struct erofs_fscache_rq *req)
{
- struct erofs_fscache_io *io = kzalloc_obj(*io, GFP_KERNEL);
+ struct erofs_fscache_io *io = kzalloc_obj(*io);
if (!io)
return NULL;
@@ -417,7 +417,7 @@ static int erofs_fscache_init_domain(struct super_block *sb)
struct erofs_domain *domain;
struct erofs_sb_info *sbi = EROFS_SB(sb);
- domain = kzalloc_obj(struct erofs_domain, GFP_KERNEL);
+ domain = kzalloc_obj(struct erofs_domain);
if (!domain)
return -ENOMEM;
@@ -482,7 +482,7 @@ static struct erofs_fscache *erofs_fscache_acquire_cookie(struct super_block *sb
struct inode *inode;
int ret;
- ctx = kzalloc_obj(*ctx, GFP_KERNEL);
+ ctx = kzalloc_obj(*ctx);
if (!ctx)
return ERR_PTR(-ENOMEM);
INIT_LIST_HEAD(&ctx->node);
diff --git a/fs/erofs/super.c b/fs/erofs/super.c
index a333456c7d5d..d4995686ac6c 100644
--- a/fs/erofs/super.c
+++ b/fs/erofs/super.c
@@ -226,7 +226,7 @@ static int erofs_scan_devices(struct super_block *sb,
}
} else {
for (id = 0; id < ondisk_extradevs; id++) {
- dif = kzalloc_obj(*dif, GFP_KERNEL);
+ dif = kzalloc_obj(*dif);
if (!dif) {
err = -ENOMEM;
break;
@@ -495,7 +495,7 @@ static int erofs_fc_parse_param(struct fs_context *fc,
return -EINVAL;
break;
case Opt_device:
- dif = kzalloc_obj(*dif, GFP_KERNEL);
+ dif = kzalloc_obj(*dif);
if (!dif)
return -ENOMEM;
dif->path = kstrdup(param->string, GFP_KERNEL);
@@ -903,11 +903,11 @@ static int erofs_init_fs_context(struct fs_context *fc)
{
struct erofs_sb_info *sbi;
- sbi = kzalloc_obj(*sbi, GFP_KERNEL);
+ sbi = kzalloc_obj(*sbi);
if (!sbi)
return -ENOMEM;
- sbi->devs = kzalloc_obj(struct erofs_dev_context, GFP_KERNEL);
+ sbi->devs = kzalloc_obj(struct erofs_dev_context);
if (!sbi->devs) {
kfree(sbi);
return -ENOMEM;
diff --git a/fs/erofs/xattr.c b/fs/erofs/xattr.c
index 5997a7ae19d9..211aa9336e5a 100644
--- a/fs/erofs/xattr.c
+++ b/fs/erofs/xattr.c
@@ -498,7 +498,7 @@ int erofs_xattr_prefixes_init(struct super_block *sb)
if (!sbi->xattr_prefix_count)
return 0;
- pfs = kzalloc_objs(*pfs, sbi->xattr_prefix_count, GFP_KERNEL);
+ pfs = kzalloc_objs(*pfs, sbi->xattr_prefix_count);
if (!pfs)
return -ENOMEM;
diff --git a/fs/erofs/zutil.c b/fs/erofs/zutil.c
index 9a15088744f0..0facb0e77e33 100644
--- a/fs/erofs/zutil.c
+++ b/fs/erofs/zutil.c
@@ -79,7 +79,7 @@ int z_erofs_gbuf_growsize(unsigned int nrpages)
for (i = 0; i < z_erofs_gbuf_count; ++i) {
gbuf = &z_erofs_gbufpool[i];
- tmp_pages = kzalloc_objs(*tmp_pages, nrpages, GFP_KERNEL);
+ tmp_pages = kzalloc_objs(*tmp_pages, nrpages);
if (!tmp_pages)
goto out;
@@ -131,7 +131,7 @@ int __init z_erofs_gbuf_init(void)
/* The last (special) global buffer is the reserved buffer */
total += !!z_erofs_rsv_nrpages;
- z_erofs_gbufpool = kzalloc_objs(*z_erofs_gbufpool, total, GFP_KERNEL);
+ z_erofs_gbufpool = kzalloc_objs(*z_erofs_gbufpool, total);
if (!z_erofs_gbufpool)
return -ENOMEM;
diff --git a/fs/eventfd.c b/fs/eventfd.c
index a0ea7f30c76f..9d33a02757d5 100644
--- a/fs/eventfd.c
+++ b/fs/eventfd.c
@@ -388,7 +388,7 @@ static int do_eventfd(unsigned int count, int flags)
if (flags & ~EFD_FLAGS_SET)
return -EINVAL;
- ctx = kmalloc_obj(*ctx, GFP_KERNEL);
+ ctx = kmalloc_obj(*ctx);
if (!ctx)
return -ENOMEM;
diff --git a/fs/eventpoll.c b/fs/eventpoll.c
index 4d0c0ce43cb3..a8c278c50083 100644
--- a/fs/eventpoll.c
+++ b/fs/eventpoll.c
@@ -1147,7 +1147,7 @@ static int ep_alloc(struct eventpoll **pep)
{
struct eventpoll *ep;
- ep = kzalloc_obj(*ep, GFP_KERNEL);
+ ep = kzalloc_obj(*ep);
if (unlikely(!ep))
return -ENOMEM;
diff --git a/fs/exec.c b/fs/exec.c
index c367e74cf103..9ea3a775d51e 100644
--- a/fs/exec.c
+++ b/fs/exec.c
@@ -1402,7 +1402,7 @@ static struct linux_binprm *alloc_bprm(int fd, struct filename *filename, int fl
if (IS_ERR(file))
return ERR_CAST(file);
- bprm = kzalloc_obj(*bprm, GFP_KERNEL);
+ bprm = kzalloc_obj(*bprm);
if (!bprm) {
do_close_execat(file);
return ERR_PTR(-ENOMEM);
diff --git a/fs/exfat/super.c b/fs/exfat/super.c
index 42a232394afb..83396fd265cd 100644
--- a/fs/exfat/super.c
+++ b/fs/exfat/super.c
@@ -815,7 +815,7 @@ static int exfat_init_fs_context(struct fs_context *fc)
{
struct exfat_sb_info *sbi;
- sbi = kzalloc_obj(struct exfat_sb_info, GFP_KERNEL);
+ sbi = kzalloc_obj(struct exfat_sb_info);
if (!sbi)
return -ENOMEM;
diff --git a/fs/ext2/balloc.c b/fs/ext2/balloc.c
index 2bac6dcb1792..007eee794bd1 100644
--- a/fs/ext2/balloc.c
+++ b/fs/ext2/balloc.c
@@ -419,7 +419,7 @@ void ext2_init_block_alloc_info(struct inode *inode)
struct ext2_block_alloc_info *block_i;
struct super_block *sb = inode->i_sb;
- block_i = kmalloc_obj(*block_i, GFP_KERNEL);
+ block_i = kmalloc_obj(*block_i);
if (block_i) {
struct ext2_reserve_window_node *rsv = &block_i->rsv_window_node;
diff --git a/fs/ext2/super.c b/fs/ext2/super.c
index 9bb4c63f5628..b20a6eb6822b 100644
--- a/fs/ext2/super.c
+++ b/fs/ext2/super.c
@@ -893,12 +893,12 @@ static int ext2_fill_super(struct super_block *sb, struct fs_context *fc)
__le32 features;
int err;
- sbi = kzalloc_obj(*sbi, GFP_KERNEL);
+ sbi = kzalloc_obj(*sbi);
if (!sbi)
return -ENOMEM;
sbi->s_blockgroup_lock =
- kzalloc_obj(struct blockgroup_lock, GFP_KERNEL);
+ kzalloc_obj(struct blockgroup_lock);
if (!sbi->s_blockgroup_lock) {
kfree(sbi);
return -ENOMEM;
@@ -1669,7 +1669,7 @@ static int ext2_init_fs_context(struct fs_context *fc)
{
struct ext2_fs_context *ctx;
- ctx = kzalloc_obj(*ctx, GFP_KERNEL);
+ ctx = kzalloc_obj(*ctx);
if (!ctx)
return -ENOMEM;
diff --git a/fs/ext4/block_validity.c b/fs/ext4/block_validity.c
index 75179be4a488..3a31e3d718c9 100644
--- a/fs/ext4/block_validity.c
+++ b/fs/ext4/block_validity.c
@@ -217,7 +217,7 @@ int ext4_setup_system_zone(struct super_block *sb)
ext4_group_t i;
int ret;
- system_blks = kzalloc_obj(*system_blks, GFP_KERNEL);
+ system_blks = kzalloc_obj(*system_blks);
if (!system_blks)
return -ENOMEM;
diff --git a/fs/ext4/dir.c b/fs/ext4/dir.c
index b285ce18b183..36dc53df0fb2 100644
--- a/fs/ext4/dir.c
+++ b/fs/ext4/dir.c
@@ -672,7 +672,7 @@ static int ext4_dir_open(struct inode *inode, struct file *file)
{
struct dir_private_info *info;
- info = kzalloc_obj(*info, GFP_KERNEL);
+ info = kzalloc_obj(*info);
if (!info)
return -ENOMEM;
file->private_data = info;
diff --git a/fs/ext4/extents-test.c b/fs/ext4/extents-test.c
index 913103089799..7c4690eb7dad 100644
--- a/fs/ext4/extents-test.c
+++ b/fs/ext4/extents-test.c
@@ -229,7 +229,7 @@ static int extents_kunit_init(struct kunit *test)
sb->s_blocksize = 4096;
sb->s_blocksize_bits = 12;
- sbi = kzalloc_obj(struct ext4_sb_info, GFP_KERNEL);
+ sbi = kzalloc_obj(struct ext4_sb_info);
if (sbi == NULL)
return -ENOMEM;
@@ -240,7 +240,7 @@ static int extents_kunit_init(struct kunit *test)
sbi->s_extent_max_zeroout_kb = 32;
/* setup the mock inode */
- k_ctx.k_ei = kzalloc_obj(struct ext4_inode_info, GFP_KERNEL);
+ k_ctx.k_ei = kzalloc_obj(struct ext4_inode_info);
if (k_ctx.k_ei == NULL)
return -ENOMEM;
ei = k_ctx.k_ei;
diff --git a/fs/ext4/mballoc-test.c b/fs/ext4/mballoc-test.c
index 6b448aad6f63..9fbdf6a09489 100644
--- a/fs/ext4/mballoc-test.c
+++ b/fs/ext4/mballoc-test.c
@@ -34,7 +34,7 @@ static struct inode *mbt_alloc_inode(struct super_block *sb)
{
struct ext4_inode_info *ei;
- ei = kmalloc_obj(struct ext4_inode_info, GFP_KERNEL);
+ ei = kmalloc_obj(struct ext4_inode_info);
if (!ei)
return NULL;
@@ -73,11 +73,11 @@ static int mbt_mb_init(struct super_block *sb)
int ret;
/* needed by ext4_mb_init->bdev_nonrot(sb->s_bdev) */
- sb->s_bdev = kzalloc_obj(*sb->s_bdev, GFP_KERNEL);
+ sb->s_bdev = kzalloc_obj(*sb->s_bdev);
if (sb->s_bdev == NULL)
return -ENOMEM;
- sb->s_bdev->bd_queue = kzalloc_obj(struct request_queue, GFP_KERNEL);
+ sb->s_bdev->bd_queue = kzalloc_obj(struct request_queue);
if (sb->s_bdev->bd_queue == NULL) {
kfree(sb->s_bdev);
return -ENOMEM;
@@ -137,7 +137,7 @@ static struct super_block *mbt_ext4_alloc_super_block(void)
struct super_block *sb;
struct ext4_sb_info *sbi;
- fsb = kzalloc_obj(*fsb, GFP_KERNEL);
+ fsb = kzalloc_obj(*fsb);
if (fsb == NULL)
return NULL;
@@ -148,7 +148,7 @@ static struct super_block *mbt_ext4_alloc_super_block(void)
sbi = &fsb->sbi;
sbi->s_blockgroup_lock =
- kzalloc_obj(struct blockgroup_lock, GFP_KERNEL);
+ kzalloc_obj(struct blockgroup_lock);
if (!sbi->s_blockgroup_lock)
goto out_deactivate;
@@ -252,7 +252,7 @@ static int mbt_ctx_init(struct super_block *sb)
struct mbt_ctx *ctx = MBT_CTX(sb);
ext4_group_t i, ngroups = ext4_get_groups_count(sb);
- ctx->grp_ctx = kzalloc_objs(struct mbt_grp_ctx, ngroups, GFP_KERNEL);
+ ctx->grp_ctx = kzalloc_objs(struct mbt_grp_ctx, ngroups);
if (ctx->grp_ctx == NULL)
return -ENOMEM;
diff --git a/fs/ext4/mballoc.c b/fs/ext4/mballoc.c
index 4d0bf2fcf2d3..b6d59385e13d 100644
--- a/fs/ext4/mballoc.c
+++ b/fs/ext4/mballoc.c
@@ -3754,7 +3754,7 @@ int ext4_mb_init(struct super_block *sb)
} while (i < MB_NUM_ORDERS(sb));
sbi->s_mb_avg_fragment_size =
- kmalloc_objs(struct xarray, MB_NUM_ORDERS(sb), GFP_KERNEL);
+ kmalloc_objs(struct xarray, MB_NUM_ORDERS(sb));
if (!sbi->s_mb_avg_fragment_size) {
ret = -ENOMEM;
goto out;
@@ -3763,7 +3763,7 @@ int ext4_mb_init(struct super_block *sb)
xa_init(&sbi->s_mb_avg_fragment_size[i]);
sbi->s_mb_largest_free_orders =
- kmalloc_objs(struct xarray, MB_NUM_ORDERS(sb), GFP_KERNEL);
+ kmalloc_objs(struct xarray, MB_NUM_ORDERS(sb));
if (!sbi->s_mb_largest_free_orders) {
ret = -ENOMEM;
goto out;
diff --git a/fs/ext4/resize.c b/fs/ext4/resize.c
index 780679645b6e..2c5b851c552a 100644
--- a/fs/ext4/resize.c
+++ b/fs/ext4/resize.c
@@ -32,7 +32,7 @@ static void ext4_rcu_ptr_callback(struct rcu_head *head)
void ext4_kvfree_array_rcu(void *to_free)
{
- struct ext4_rcu_ptr *ptr = kzalloc_obj(*ptr, GFP_KERNEL);
+ struct ext4_rcu_ptr *ptr = kzalloc_obj(*ptr);
if (ptr) {
ptr->ptr = to_free;
diff --git a/fs/ext4/super.c b/fs/ext4/super.c
index 63784d9b1874..43f680c750ae 100644
--- a/fs/ext4/super.c
+++ b/fs/ext4/super.c
@@ -2016,7 +2016,7 @@ int ext4_init_fs_context(struct fs_context *fc)
{
struct ext4_fs_context *ctx;
- ctx = kzalloc_obj(struct ext4_fs_context, GFP_KERNEL);
+ ctx = kzalloc_obj(struct ext4_fs_context);
if (!ctx)
return -ENOMEM;
@@ -2496,11 +2496,11 @@ static int parse_apply_sb_mount_options(struct super_block *sb,
if (strscpy_pad(s_mount_opts, sbi->s_es->s_mount_opts) < 0)
return -E2BIG;
- fc = kzalloc_obj(struct fs_context, GFP_KERNEL);
+ fc = kzalloc_obj(struct fs_context);
if (!fc)
return -ENOMEM;
- s_ctx = kzalloc_obj(struct ext4_fs_context, GFP_KERNEL);
+ s_ctx = kzalloc_obj(struct ext4_fs_context);
if (!s_ctx)
goto out_free;
@@ -3962,7 +3962,7 @@ static int ext4_li_info_new(void)
{
struct ext4_lazy_init *eli = NULL;
- eli = kzalloc_obj(*eli, GFP_KERNEL);
+ eli = kzalloc_obj(*eli);
if (!eli)
return -ENOMEM;
@@ -3981,7 +3981,7 @@ static struct ext4_li_request *ext4_li_request_new(struct super_block *sb,
{
struct ext4_li_request *elr;
- elr = kzalloc_obj(*elr, GFP_KERNEL);
+ elr = kzalloc_obj(*elr);
if (!elr)
return NULL;
@@ -4328,7 +4328,7 @@ static struct ext4_sb_info *ext4_alloc_sbi(struct super_block *sb)
{
struct ext4_sb_info *sbi;
- sbi = kzalloc_obj(*sbi, GFP_KERNEL);
+ sbi = kzalloc_obj(*sbi);
if (!sbi)
return NULL;
@@ -4336,7 +4336,7 @@ static struct ext4_sb_info *ext4_alloc_sbi(struct super_block *sb)
NULL, NULL);
sbi->s_blockgroup_lock =
- kzalloc_obj(struct blockgroup_lock, GFP_KERNEL);
+ kzalloc_obj(struct blockgroup_lock);
if (!sbi->s_blockgroup_lock)
goto err_out;
@@ -4879,7 +4879,7 @@ static int ext4_group_desc_init(struct super_block *sb,
}
}
rcu_assign_pointer(sbi->s_group_desc,
- kvmalloc_objs(struct buffer_head *, db_count, GFP_KERNEL));
+ kvmalloc_objs(struct buffer_head *, db_count));
if (sbi->s_group_desc == NULL) {
ext4_msg(sb, KERN_ERR, "not enough memory");
return -ENOMEM;
diff --git a/fs/ext4/sysfs.c b/fs/ext4/sysfs.c
index cdf78da85861..b87d7bdab06a 100644
--- a/fs/ext4/sysfs.c
+++ b/fs/ext4/sysfs.c
@@ -655,7 +655,7 @@ int __init ext4_init_sysfs(void)
if (!ext4_root)
return -ENOMEM;
- ext4_feat = kzalloc_obj(*ext4_feat, GFP_KERNEL);
+ ext4_feat = kzalloc_obj(*ext4_feat);
if (!ext4_feat) {
ret = -ENOMEM;
goto root_err;
diff --git a/fs/f2fs/super.c b/fs/f2fs/super.c
index 2a12fe8eb668..8774c60b4be4 100644
--- a/fs/f2fs/super.c
+++ b/fs/f2fs/super.c
@@ -3725,7 +3725,7 @@ static struct block_device **f2fs_get_devices(struct super_block *sb,
if (!f2fs_is_multi_device(sbi))
return NULL;
- devs = kmalloc_objs(*devs, sbi->s_ndevs, GFP_KERNEL);
+ devs = kmalloc_objs(*devs, sbi->s_ndevs);
if (!devs)
return ERR_PTR(-ENOMEM);
@@ -4501,7 +4501,7 @@ static int read_raw_super_block(struct f2fs_sb_info *sbi,
struct f2fs_super_block *super;
int err = 0;
- super = kzalloc_obj(struct f2fs_super_block, GFP_KERNEL);
+ super = kzalloc_obj(struct f2fs_super_block);
if (!super)
return -ENOMEM;
@@ -4938,7 +4938,7 @@ static int f2fs_fill_super(struct super_block *sb, struct fs_context *fc)
recovery = 0;
/* allocate memory for f2fs-specific super block info */
- sbi = kzalloc_obj(struct f2fs_sb_info, GFP_KERNEL);
+ sbi = kzalloc_obj(struct f2fs_sb_info);
if (!sbi)
return -ENOMEM;
@@ -5509,7 +5509,7 @@ static int f2fs_init_fs_context(struct fs_context *fc)
{
struct f2fs_fs_context *ctx;
- ctx = kzalloc_obj(struct f2fs_fs_context, GFP_KERNEL);
+ ctx = kzalloc_obj(struct f2fs_fs_context);
if (!ctx)
return -ENOMEM;
diff --git a/fs/fat/inode.c b/fs/fat/inode.c
index 175e8e66c29f..3cc5fb01afa1 100644
--- a/fs/fat/inode.c
+++ b/fs/fat/inode.c
@@ -1554,7 +1554,7 @@ int fat_fill_super(struct super_block *sb, struct fs_context *fc,
* the filesystem, since we're only just about to mount
* it and have no inodes etc active!
*/
- sbi = kzalloc_obj(struct msdos_sb_info, GFP_KERNEL);
+ sbi = kzalloc_obj(struct msdos_sb_info);
if (!sbi)
return -ENOMEM;
sb->s_fs_info = sbi;
@@ -1905,7 +1905,7 @@ int fat_init_fs_context(struct fs_context *fc, bool is_vfat)
{
struct fat_mount_options *opts;
- opts = kzalloc_obj(*opts, GFP_KERNEL);
+ opts = kzalloc_obj(*opts);
if (!opts)
return -ENOMEM;
diff --git a/fs/fcntl.c b/fs/fcntl.c
index c9c73305011e..beab8080badf 100644
--- a/fs/fcntl.c
+++ b/fs/fcntl.c
@@ -100,7 +100,7 @@ int file_f_owner_allocate(struct file *file)
if (f_owner)
return 0;
- f_owner = kzalloc_obj(struct fown_struct, GFP_KERNEL);
+ f_owner = kzalloc_obj(struct fown_struct);
if (!f_owner)
return -ENOMEM;
diff --git a/fs/freevxfs/vxfs_fshead.c b/fs/freevxfs/vxfs_fshead.c
index c1d90905b7b2..e6ab8bdf7a6c 100644
--- a/fs/freevxfs/vxfs_fshead.c
+++ b/fs/freevxfs/vxfs_fshead.c
@@ -58,7 +58,7 @@ vxfs_getfsh(struct inode *ip, int which)
if (bp) {
struct vxfs_fsh *fhp;
- if (!(fhp = kmalloc_obj(*fhp, GFP_KERNEL)))
+ if (!(fhp = kmalloc_obj(*fhp)))
goto out;
memcpy(fhp, bp->b_data, sizeof(*fhp));
diff --git a/fs/freevxfs/vxfs_super.c b/fs/freevxfs/vxfs_super.c
index 44b4958277ce..d7d847d75c3d 100644
--- a/fs/freevxfs/vxfs_super.c
+++ b/fs/freevxfs/vxfs_super.c
@@ -193,7 +193,7 @@ static int vxfs_fill_super(struct super_block *sbp, struct fs_context *fc)
sbp->s_flags |= SB_RDONLY;
- infp = kzalloc_obj(*infp, GFP_KERNEL);
+ infp = kzalloc_obj(*infp);
if (!infp) {
warnf(fc, "vxfs: unable to allocate incore superblock");
return -ENOMEM;
diff --git a/fs/fsopen.c b/fs/fsopen.c
index a23f003ae056..ae19e5136598 100644
--- a/fs/fsopen.c
+++ b/fs/fsopen.c
@@ -102,7 +102,7 @@ static int fscontext_create_fd(struct fs_context *fc, unsigned int o_flags)
static int fscontext_alloc_log(struct fs_context *fc)
{
- fc->log.log = kzalloc_obj(*fc->log.log, GFP_KERNEL);
+ fc->log.log = kzalloc_obj(*fc->log.log);
if (!fc->log.log)
return -ENOMEM;
refcount_set(&fc->log.log->usage, 1);
diff --git a/fs/fuse/backing.c b/fs/fuse/backing.c
index 45a78ee15e3c..d95dfa48483f 100644
--- a/fs/fuse/backing.c
+++ b/fs/fuse/backing.c
@@ -112,7 +112,7 @@ int fuse_backing_open(struct fuse_conn *fc, struct fuse_backing_map *map)
if (backing_sb->s_stack_depth >= fc->max_stack_depth)
goto out_fput;
- fb = kmalloc_obj(struct fuse_backing, GFP_KERNEL);
+ fb = kmalloc_obj(struct fuse_backing);
res = -ENOMEM;
if (!fb)
goto out_fput;
diff --git a/fs/fuse/cuse.c b/fs/fuse/cuse.c
index 0aace951541b..dfcb98a654d8 100644
--- a/fs/fuse/cuse.c
+++ b/fs/fuse/cuse.c
@@ -362,7 +362,7 @@ static void cuse_process_init_reply(struct fuse_mount *fm,
/* devt determined, create device */
rc = -ENOMEM;
- dev = kzalloc_obj(*dev, GFP_KERNEL);
+ dev = kzalloc_obj(*dev);
if (!dev)
goto err_region;
@@ -443,7 +443,7 @@ static int cuse_send_init(struct cuse_conn *cc)
if (!folio)
goto err;
- ia = kzalloc_obj(*ia, GFP_KERNEL);
+ ia = kzalloc_obj(*ia);
if (!ia)
goto err_free_folio;
@@ -505,7 +505,7 @@ static int cuse_channel_open(struct inode *inode, struct file *file)
int rc;
/* set up cuse_conn */
- cc = kzalloc_obj(*cc, GFP_KERNEL);
+ cc = kzalloc_obj(*cc);
if (!cc)
return -ENOMEM;
diff --git a/fs/fuse/dax.c b/fs/fuse/dax.c
index 7d11eac4f629..f6cf00a8938c 100644
--- a/fs/fuse/dax.c
+++ b/fs/fuse/dax.c
@@ -1219,7 +1219,7 @@ static int fuse_dax_mem_range_init(struct fuse_conn_dax *fcd)
__func__, nr_pages, nr_ranges);
for (i = 0; i < nr_ranges; i++) {
- range = kzalloc_obj(struct fuse_dax_mapping, GFP_KERNEL);
+ range = kzalloc_obj(struct fuse_dax_mapping);
ret = -ENOMEM;
if (!range)
goto out_err;
@@ -1255,7 +1255,7 @@ int fuse_dax_conn_alloc(struct fuse_conn *fc, enum fuse_dax_mode dax_mode,
if (!dax_dev)
return 0;
- fcd = kzalloc_obj(*fcd, GFP_KERNEL);
+ fcd = kzalloc_obj(*fcd);
if (!fcd)
return -ENOMEM;
diff --git a/fs/fuse/dev.c b/fs/fuse/dev.c
index 3ec0fa236da0..0b0241f47170 100644
--- a/fs/fuse/dev.c
+++ b/fs/fuse/dev.c
@@ -1598,7 +1598,7 @@ static ssize_t fuse_dev_splice_read(struct file *in, loff_t *ppos,
if (IS_ERR(fud))
return PTR_ERR(fud);
- bufs = kvmalloc_objs(struct pipe_buffer, pipe->max_usage, GFP_KERNEL);
+ bufs = kvmalloc_objs(struct pipe_buffer, pipe->max_usage);
if (!bufs)
return -ENOMEM;
@@ -2310,7 +2310,7 @@ static ssize_t fuse_dev_splice_write(struct pipe_inode_info *pipe,
tail = pipe->tail;
count = pipe_occupancy(head, tail);
- bufs = kvmalloc_objs(struct pipe_buffer, count, GFP_KERNEL);
+ bufs = kvmalloc_objs(struct pipe_buffer, count);
if (!bufs) {
pipe_unlock(pipe);
return -ENOMEM;
diff --git a/fs/fuse/dev_uring.c b/fs/fuse/dev_uring.c
index 68067eaedda9..3a38b61aac26 100644
--- a/fs/fuse/dev_uring.c
+++ b/fs/fuse/dev_uring.c
@@ -277,7 +277,7 @@ static struct fuse_ring_queue *fuse_uring_create_queue(struct fuse_ring *ring,
queue = kzalloc_obj(*queue, GFP_KERNEL_ACCOUNT);
if (!queue)
return NULL;
- pq = kzalloc_objs(struct list_head, FUSE_PQ_HASH_SIZE, GFP_KERNEL);
+ pq = kzalloc_objs(struct list_head, FUSE_PQ_HASH_SIZE);
if (!pq) {
kfree(queue);
return NULL;
diff --git a/fs/fuse/file.c b/fs/fuse/file.c
index e29aecdab97e..b1bb7153cb78 100644
--- a/fs/fuse/file.c
+++ b/fs/fuse/file.c
@@ -684,7 +684,7 @@ static struct fuse_io_args *fuse_io_alloc(struct fuse_io_priv *io,
{
struct fuse_io_args *ia;
- ia = kzalloc_obj(*ia, GFP_KERNEL);
+ ia = kzalloc_obj(*ia);
if (ia) {
ia->io = io;
ia->ap.folios = fuse_folios_alloc(nfolios, GFP_KERNEL,
@@ -2834,7 +2834,7 @@ fuse_direct_IO(struct kiocb *iocb, struct iov_iter *iter)
if ((iov_iter_rw(iter) == READ) && (offset >= i_size))
return 0;
- io = kmalloc_obj(struct fuse_io_priv, GFP_KERNEL);
+ io = kmalloc_obj(struct fuse_io_priv);
if (!io)
return -ENOMEM;
spin_lock_init(&io->lock);
diff --git a/fs/fuse/inode.c b/fs/fuse/inode.c
index 3db0fe0d764b..e57b8af06be9 100644
--- a/fs/fuse/inode.c
+++ b/fs/fuse/inode.c
@@ -1618,11 +1618,11 @@ struct fuse_dev *fuse_dev_alloc(void)
struct fuse_dev *fud;
struct list_head *pq;
- fud = kzalloc_obj(struct fuse_dev, GFP_KERNEL);
+ fud = kzalloc_obj(struct fuse_dev);
if (!fud)
return NULL;
- pq = kzalloc_objs(struct list_head, FUSE_PQ_HASH_SIZE, GFP_KERNEL);
+ pq = kzalloc_objs(struct list_head, FUSE_PQ_HASH_SIZE);
if (!pq) {
kfree(fud);
return NULL;
@@ -1780,7 +1780,7 @@ static int fuse_get_tree_submount(struct fs_context *fsc)
struct super_block *sb;
int err;
- fm = kzalloc_obj(struct fuse_mount, GFP_KERNEL);
+ fm = kzalloc_obj(struct fuse_mount);
if (!fm)
return -ENOMEM;
@@ -1981,11 +1981,11 @@ static int fuse_get_tree(struct fs_context *fsc)
struct super_block *sb;
int err;
- fc = kmalloc_obj(*fc, GFP_KERNEL);
+ fc = kmalloc_obj(*fc);
if (!fc)
return -ENOMEM;
- fm = kzalloc_obj(*fm, GFP_KERNEL);
+ fm = kzalloc_obj(*fm);
if (!fm) {
kfree(fc);
return -ENOMEM;
@@ -2047,7 +2047,7 @@ static int fuse_init_fs_context(struct fs_context *fsc)
{
struct fuse_fs_context *ctx;
- ctx = kzalloc_obj(struct fuse_fs_context, GFP_KERNEL);
+ ctx = kzalloc_obj(struct fuse_fs_context);
if (!ctx)
return -ENOMEM;
diff --git a/fs/fuse/virtio_fs.c b/fs/fuse/virtio_fs.c
index dc96ee0b952a..057e65b51b99 100644
--- a/fs/fuse/virtio_fs.c
+++ b/fs/fuse/virtio_fs.c
@@ -947,14 +947,14 @@ static int virtio_fs_setup_vqs(struct virtio_device *vdev,
fs->num_request_queues = min_t(unsigned int, fs->num_request_queues,
nr_cpu_ids);
fs->nvqs = VQ_REQUEST + fs->num_request_queues;
- fs->vqs = kzalloc_objs(fs->vqs[VQ_HIPRIO], fs->nvqs, GFP_KERNEL);
+ fs->vqs = kzalloc_objs(fs->vqs[VQ_HIPRIO], fs->nvqs);
if (!fs->vqs)
return -ENOMEM;
- vqs = kmalloc_objs(vqs[VQ_HIPRIO], fs->nvqs, GFP_KERNEL);
+ vqs = kmalloc_objs(vqs[VQ_HIPRIO], fs->nvqs);
fs->mq_map = kcalloc_node(nr_cpu_ids, sizeof(*fs->mq_map), GFP_KERNEL,
dev_to_node(&vdev->dev));
- vqs_info = kzalloc_objs(*vqs_info, fs->nvqs, GFP_KERNEL);
+ vqs_info = kzalloc_objs(*vqs_info, fs->nvqs);
if (!vqs || !vqs_info || !fs->mq_map) {
ret = -ENOMEM;
goto out;
@@ -1120,7 +1120,7 @@ static int virtio_fs_probe(struct virtio_device *vdev)
struct virtio_fs *fs;
int ret;
- fs = kzalloc_obj(*fs, GFP_KERNEL);
+ fs = kzalloc_obj(*fs);
if (!fs)
return -ENOMEM;
kobject_init(&fs->kobj, &virtio_fs_ktype);
@@ -1684,11 +1684,11 @@ static int virtio_fs_get_tree(struct fs_context *fsc)
goto out_err;
err = -ENOMEM;
- fc = kzalloc_obj(struct fuse_conn, GFP_KERNEL);
+ fc = kzalloc_obj(struct fuse_conn);
if (!fc)
goto out_err;
- fm = kzalloc_obj(struct fuse_mount, GFP_KERNEL);
+ fm = kzalloc_obj(struct fuse_mount);
if (!fm)
goto out_err;
@@ -1743,7 +1743,7 @@ static int virtio_fs_init_fs_context(struct fs_context *fsc)
if (fsc->purpose == FS_CONTEXT_FOR_SUBMOUNT)
return fuse_init_fs_context_submount(fsc);
- ctx = kzalloc_obj(struct fuse_fs_context, GFP_KERNEL);
+ ctx = kzalloc_obj(struct fuse_fs_context);
if (!ctx)
return -ENOMEM;
fsc->fs_private = ctx;
diff --git a/fs/gfs2/ops_fstype.c b/fs/gfs2/ops_fstype.c
index f3f649fc5cb1..9b9e70f14d25 100644
--- a/fs/gfs2/ops_fstype.c
+++ b/fs/gfs2/ops_fstype.c
@@ -76,7 +76,7 @@ static struct gfs2_sbd *init_sbd(struct super_block *sb)
{
struct gfs2_sbd *sdp;
- sdp = kzalloc_obj(struct gfs2_sbd, GFP_KERNEL);
+ sdp = kzalloc_obj(struct gfs2_sbd);
if (!sdp)
return NULL;
@@ -562,7 +562,7 @@ static int gfs2_jindex_hold(struct gfs2_sbd *sdp, struct gfs2_holder *ji_gh)
break;
error = -ENOMEM;
- jd = kzalloc_obj(struct gfs2_jdesc, GFP_KERNEL);
+ jd = kzalloc_obj(struct gfs2_jdesc);
if (!jd)
break;
@@ -1637,7 +1637,7 @@ static int gfs2_init_fs_context(struct fs_context *fc)
{
struct gfs2_args *args;
- args = kmalloc_obj(*args, GFP_KERNEL);
+ args = kmalloc_obj(*args);
if (args == NULL)
return -ENOMEM;
diff --git a/fs/gfs2/quota.c b/fs/gfs2/quota.c
index af3dfeed62fe..5290865f27f1 100644
--- a/fs/gfs2/quota.c
+++ b/fs/gfs2/quota.c
@@ -1318,7 +1318,7 @@ int gfs2_quota_sync(struct super_block *sb, int type)
if (sb_rdonly(sdp->sd_vfs))
return 0;
- qda = kzalloc_objs(struct gfs2_quota_data *, max_qd, GFP_KERNEL);
+ qda = kzalloc_objs(struct gfs2_quota_data *, max_qd);
if (!qda)
return -ENOMEM;
diff --git a/fs/gfs2/super.c b/fs/gfs2/super.c
index 9a655588c0c5..bc191b55b18e 100644
--- a/fs/gfs2/super.c
+++ b/fs/gfs2/super.c
@@ -336,7 +336,7 @@ static int gfs2_lock_fs_check_clean(struct gfs2_sbd *sdp)
*/
list_for_each_entry(jd, &sdp->sd_jindex_list, jd_list) {
- lfcc = kmalloc_obj(struct lfcc, GFP_KERNEL);
+ lfcc = kmalloc_obj(struct lfcc);
if (!lfcc) {
error = -ENOMEM;
goto out;
@@ -860,7 +860,7 @@ static int gfs2_statfs_slow(struct gfs2_sbd *sdp, struct gfs2_statfs_change_host
int error = 0, err;
memset(sc, 0, sizeof(struct gfs2_statfs_change_host));
- gha = kmalloc_objs(struct gfs2_holder, slots, GFP_KERNEL);
+ gha = kmalloc_objs(struct gfs2_holder, slots);
if (!gha)
return -ENOMEM;
for (x = 0; x < slots; x++)
diff --git a/fs/hfs/btree.c b/fs/hfs/btree.c
index b5ee0e072935..2eb37a2f64e8 100644
--- a/fs/hfs/btree.c
+++ b/fs/hfs/btree.c
@@ -28,7 +28,7 @@ struct hfs_btree *hfs_btree_open(struct super_block *sb, u32 id, btree_keycmp ke
sector_t start_block;
loff_t offset;
- tree = kzalloc_obj(*tree, GFP_KERNEL);
+ tree = kzalloc_obj(*tree);
if (!tree)
return NULL;
diff --git a/fs/hfs/dir.c b/fs/hfs/dir.c
index 80277979c09c..f5e7efe924e7 100644
--- a/fs/hfs/dir.c
+++ b/fs/hfs/dir.c
@@ -148,7 +148,7 @@ static int hfs_readdir(struct file *file, struct dir_context *ctx)
}
rd = file->private_data;
if (!rd) {
- rd = kmalloc_obj(struct hfs_readdir_data, GFP_KERNEL);
+ rd = kmalloc_obj(struct hfs_readdir_data);
if (!rd) {
err = -ENOMEM;
goto out;
diff --git a/fs/hfs/super.c b/fs/hfs/super.c
index 78dc9dabb0c1..a4f2a2bfa6d3 100644
--- a/fs/hfs/super.c
+++ b/fs/hfs/super.c
@@ -411,7 +411,7 @@ static int hfs_init_fs_context(struct fs_context *fc)
{
struct hfs_sb_info *hsb;
- hsb = kzalloc_obj(struct hfs_sb_info, GFP_KERNEL);
+ hsb = kzalloc_obj(struct hfs_sb_info);
if (!hsb)
return -ENOMEM;
diff --git a/fs/hfsplus/btree.c b/fs/hfsplus/btree.c
index 5016d97290c8..1220a2f22737 100644
--- a/fs/hfsplus/btree.c
+++ b/fs/hfsplus/btree.c
@@ -139,7 +139,7 @@ struct hfs_btree *hfs_btree_open(struct super_block *sb, u32 id)
struct page *page;
unsigned int size;
- tree = kzalloc_obj(*tree, GFP_KERNEL);
+ tree = kzalloc_obj(*tree);
if (!tree)
return NULL;
diff --git a/fs/hfsplus/dir.c b/fs/hfsplus/dir.c
index 9998b28aa8f7..d559bf8625f8 100644
--- a/fs/hfsplus/dir.c
+++ b/fs/hfsplus/dir.c
@@ -263,7 +263,7 @@ static int hfsplus_readdir(struct file *file, struct dir_context *ctx)
}
rd = file->private_data;
if (!rd) {
- rd = kmalloc_obj(struct hfsplus_readdir_data, GFP_KERNEL);
+ rd = kmalloc_obj(struct hfsplus_readdir_data);
if (!rd) {
err = -ENOMEM;
goto out;
diff --git a/fs/hfsplus/super.c b/fs/hfsplus/super.c
index f60f37caea65..7229a8ae89f9 100644
--- a/fs/hfsplus/super.c
+++ b/fs/hfsplus/super.c
@@ -698,7 +698,7 @@ static int hfsplus_init_fs_context(struct fs_context *fc)
{
struct hfsplus_sb_info *sbi;
- sbi = kzalloc_obj(struct hfsplus_sb_info, GFP_KERNEL);
+ sbi = kzalloc_obj(struct hfsplus_sb_info);
if (!sbi)
return -ENOMEM;
diff --git a/fs/hfsplus/unicode_test.c b/fs/hfsplus/unicode_test.c
index c162c0fea4a8..26145bf88946 100644
--- a/fs/hfsplus/unicode_test.c
+++ b/fs/hfsplus/unicode_test.c
@@ -22,7 +22,7 @@ static struct test_mock_string_env *setup_mock_str_env(u32 buf_size)
{
struct test_mock_string_env *env;
- env = kzalloc_obj(struct test_mock_string_env, GFP_KERNEL);
+ env = kzalloc_obj(struct test_mock_string_env);
if (!env)
return NULL;
@@ -393,7 +393,7 @@ static struct test_mock_sb *setup_mock_sb(void)
{
struct test_mock_sb *ptr;
- ptr = kzalloc_obj(struct test_mock_sb, GFP_KERNEL);
+ ptr = kzalloc_obj(struct test_mock_sb);
if (!ptr)
return NULL;
diff --git a/fs/hostfs/hostfs_kern.c b/fs/hostfs/hostfs_kern.c
index 2c463a8c0ab4..abe86d72d9ef 100644
--- a/fs/hostfs/hostfs_kern.c
+++ b/fs/hostfs/hostfs_kern.c
@@ -1047,7 +1047,7 @@ static int hostfs_init_fs_context(struct fs_context *fc)
{
struct hostfs_fs_info *fsi;
- fsi = kzalloc_obj(*fsi, GFP_KERNEL);
+ fsi = kzalloc_obj(*fsi);
if (!fsi)
return -ENOMEM;
diff --git a/fs/hpfs/super.c b/fs/hpfs/super.c
index 0f17b7710ae5..c16d5d4caead 100644
--- a/fs/hpfs/super.c
+++ b/fs/hpfs/super.c
@@ -513,7 +513,7 @@ static int hpfs_fill_super(struct super_block *s, struct fs_context *fc)
struct hpfs_dirent *de = NULL;
struct quad_buffer_head qbh;
- sbi = kzalloc_obj(*sbi, GFP_KERNEL);
+ sbi = kzalloc_obj(*sbi);
if (!sbi) {
return -ENOMEM;
}
@@ -715,7 +715,7 @@ static int hpfs_init_fs_context(struct fs_context *fc)
{
struct hpfs_fc_context *ctx;
- ctx = kzalloc_obj(struct hpfs_fc_context, GFP_KERNEL);
+ ctx = kzalloc_obj(struct hpfs_fc_context);
if (!ctx)
return -ENOMEM;
diff --git a/fs/hugetlbfs/inode.c b/fs/hugetlbfs/inode.c
index 8e2c1fbdfd86..3f70c47981de 100644
--- a/fs/hugetlbfs/inode.c
+++ b/fs/hugetlbfs/inode.c
@@ -1407,7 +1407,7 @@ hugetlbfs_fill_super(struct super_block *sb, struct fs_context *fc)
struct hugetlbfs_fs_context *ctx = fc->fs_private;
struct hugetlbfs_sb_info *sbinfo;
- sbinfo = kmalloc_obj(struct hugetlbfs_sb_info, GFP_KERNEL);
+ sbinfo = kmalloc_obj(struct hugetlbfs_sb_info);
if (!sbinfo)
return -ENOMEM;
sb->s_fs_info = sbinfo;
@@ -1478,7 +1478,7 @@ static int hugetlbfs_init_fs_context(struct fs_context *fc)
{
struct hugetlbfs_fs_context *ctx;
- ctx = kzalloc_obj(struct hugetlbfs_fs_context, GFP_KERNEL);
+ ctx = kzalloc_obj(struct hugetlbfs_fs_context);
if (!ctx)
return -ENOMEM;
diff --git a/fs/iomap/direct-io.c b/fs/iomap/direct-io.c
index 438c00e526c6..95254aa1b654 100644
--- a/fs/iomap/direct-io.c
+++ b/fs/iomap/direct-io.c
@@ -677,7 +677,7 @@ __iomap_dio_rw(struct kiocb *iocb, struct iov_iter *iter,
if (!iomi.len)
return NULL;
- dio = kmalloc_obj(*dio, GFP_KERNEL);
+ dio = kmalloc_obj(*dio);
if (!dio)
return ERR_PTR(-ENOMEM);
diff --git a/fs/isofs/compress.c b/fs/isofs/compress.c
index 4aa8f0734456..a17f0f590151 100644
--- a/fs/isofs/compress.c
+++ b/fs/isofs/compress.c
@@ -75,7 +75,7 @@ static loff_t zisofs_uncompress_block(struct inode *inode, loff_t block_start,
/* Because zlib is not thread-safe, do all the I/O at the top. */
blocknum = block_start >> bufshift;
- bhs = kzalloc_objs(*bhs, needblocks + 1, GFP_KERNEL);
+ bhs = kzalloc_objs(*bhs, needblocks + 1);
if (!bhs) {
*errp = -ENOMEM;
return 0;
diff --git a/fs/isofs/inode.c b/fs/isofs/inode.c
index 6597d0224835..5c01536c5e8f 100644
--- a/fs/isofs/inode.c
+++ b/fs/isofs/inode.c
@@ -589,7 +589,7 @@ static int isofs_fill_super(struct super_block *s, struct fs_context *fc)
unsigned int vol_desc_start;
int silent = fc->sb_flags & SB_SILENT;
- sbi = kzalloc_obj(*sbi, GFP_KERNEL);
+ sbi = kzalloc_obj(*sbi);
if (!sbi)
return -ENOMEM;
s->s_fs_info = sbi;
@@ -1557,7 +1557,7 @@ static int isofs_init_fs_context(struct fs_context *fc)
{
struct isofs_options *opt;
- opt = kzalloc_obj(*opt, GFP_KERNEL);
+ opt = kzalloc_obj(*opt);
if (!opt)
return -ENOMEM;
diff --git a/fs/jbd2/journal.c b/fs/jbd2/journal.c
index 05ea1e5af80d..0fbd9a47ae67 100644
--- a/fs/jbd2/journal.c
+++ b/fs/jbd2/journal.c
@@ -1175,7 +1175,7 @@ static int jbd2_seq_info_open(struct inode *inode, struct file *file)
struct jbd2_stats_proc_session *s;
int rc, size;
- s = kmalloc_obj(*s, GFP_KERNEL);
+ s = kmalloc_obj(*s);
if (s == NULL)
return -ENOMEM;
size = sizeof(struct transaction_stats_s);
@@ -1525,7 +1525,7 @@ static journal_t *journal_init_common(struct block_device *bdev,
int err;
int n;
- journal = kzalloc_obj(*journal, GFP_KERNEL);
+ journal = kzalloc_obj(*journal);
if (!journal)
return ERR_PTR(-ENOMEM);
@@ -1578,7 +1578,7 @@ static journal_t *journal_init_common(struct block_device *bdev,
n = journal->j_blocksize / jbd2_min_tag_size();
journal->j_wbufsize = n;
journal->j_fc_wbuf = NULL;
- journal->j_wbuf = kmalloc_objs(struct buffer_head *, n, GFP_KERNEL);
+ journal->j_wbuf = kmalloc_objs(struct buffer_head *, n);
if (!journal->j_wbuf)
goto err_cleanup;
diff --git a/fs/jbd2/revoke.c b/fs/jbd2/revoke.c
index 3aa9f82a8ef7..9016ddb82447 100644
--- a/fs/jbd2/revoke.c
+++ b/fs/jbd2/revoke.c
@@ -231,7 +231,7 @@ struct jbd2_revoke_table_s *jbd2_journal_init_revoke_table(int hash_size)
table->hash_size = hash_size;
table->hash_shift = shift;
table->hash_table =
- kvmalloc_objs(struct list_head, hash_size, GFP_KERNEL);
+ kvmalloc_objs(struct list_head, hash_size);
if (!table->hash_table) {
kmem_cache_free(jbd2_revoke_table_cache, table);
table = NULL;
diff --git a/fs/jffs2/erase.c b/fs/jffs2/erase.c
index d451c8a1fdac..a99ee831bab8 100644
--- a/fs/jffs2/erase.c
+++ b/fs/jffs2/erase.c
@@ -43,7 +43,7 @@ static void jffs2_erase_block(struct jffs2_sb_info *c,
jffs2_dbg(1, "%s(): erase block %#08x (range %#08x-%#08x)\n",
__func__,
jeb->offset, jeb->offset, jeb->offset + c->sector_size);
- instr = kzalloc_obj(struct erase_info, GFP_KERNEL);
+ instr = kzalloc_obj(struct erase_info);
if (!instr) {
pr_warn("kzalloc for struct erase_info in jffs2_erase_block failed. Refiling block for later\n");
mutex_lock(&c->erase_free_sem);
diff --git a/fs/jffs2/readinode.c b/fs/jffs2/readinode.c
index eeca922d4da4..1caabff9dc91 100644
--- a/fs/jffs2/readinode.c
+++ b/fs/jffs2/readinode.c
@@ -1392,7 +1392,7 @@ int jffs2_do_read_inode(struct jffs2_sb_info *c, struct jffs2_inode_info *f,
int jffs2_do_crccheck_inode(struct jffs2_sb_info *c, struct jffs2_inode_cache *ic)
{
struct jffs2_raw_inode n;
- struct jffs2_inode_info *f = kzalloc_obj(*f, GFP_KERNEL);
+ struct jffs2_inode_info *f = kzalloc_obj(*f);
int ret;
if (!f)
diff --git a/fs/jffs2/scan.c b/fs/jffs2/scan.c
index 39063e2131d6..06e494797724 100644
--- a/fs/jffs2/scan.c
+++ b/fs/jffs2/scan.c
@@ -132,7 +132,7 @@ int jffs2_scan_medium(struct jffs2_sb_info *c)
}
if (jffs2_sum_active()) {
- s = kzalloc_obj(struct jffs2_summary, GFP_KERNEL);
+ s = kzalloc_obj(struct jffs2_summary);
if (!s) {
JFFS2_WARNING("Can't allocate memory for summary\n");
ret = -ENOMEM;
diff --git a/fs/jffs2/summary.c b/fs/jffs2/summary.c
index b9df829eff56..d0b689ee8d32 100644
--- a/fs/jffs2/summary.c
+++ b/fs/jffs2/summary.c
@@ -27,7 +27,7 @@ int jffs2_sum_init(struct jffs2_sb_info *c)
{
uint32_t sum_size = min_t(uint32_t, c->sector_size, MAX_SUMMARY_SIZE);
- c->summary = kzalloc_obj(struct jffs2_summary, GFP_KERNEL);
+ c->summary = kzalloc_obj(struct jffs2_summary);
if (!c->summary) {
JFFS2_WARNING("Can't allocate memory for summary information!\n");
@@ -160,7 +160,7 @@ int jffs2_sum_add_xattr_mem(struct jffs2_summary *s, struct jffs2_raw_xattr *rx,
{
struct jffs2_sum_xattr_mem *temp;
- temp = kmalloc_obj(struct jffs2_sum_xattr_mem, GFP_KERNEL);
+ temp = kmalloc_obj(struct jffs2_sum_xattr_mem);
if (!temp)
return -ENOMEM;
@@ -178,7 +178,7 @@ int jffs2_sum_add_xref_mem(struct jffs2_summary *s, struct jffs2_raw_xref *rr, u
{
struct jffs2_sum_xref_mem *temp;
- temp = kmalloc_obj(struct jffs2_sum_xref_mem, GFP_KERNEL);
+ temp = kmalloc_obj(struct jffs2_sum_xref_mem);
if (!temp)
return -ENOMEM;
diff --git a/fs/jffs2/super.c b/fs/jffs2/super.c
index 48fbf1594ce8..81396a092ba8 100644
--- a/fs/jffs2/super.c
+++ b/fs/jffs2/super.c
@@ -311,7 +311,7 @@ static int jffs2_init_fs_context(struct fs_context *fc)
{
struct jffs2_sb_info *ctx;
- ctx = kzalloc_obj(struct jffs2_sb_info, GFP_KERNEL);
+ ctx = kzalloc_obj(struct jffs2_sb_info);
if (!ctx)
return -ENOMEM;
diff --git a/fs/jffs2/wbuf.c b/fs/jffs2/wbuf.c
index 9775b9b84504..8ff7a0b6add2 100644
--- a/fs/jffs2/wbuf.c
+++ b/fs/jffs2/wbuf.c
@@ -92,7 +92,7 @@ static void jffs2_wbuf_dirties_inode(struct jffs2_sb_info *c, uint32_t ino)
if (jffs2_wbuf_pending_for_ino(c, ino))
return;
- new = kmalloc_obj(*new, GFP_KERNEL);
+ new = kmalloc_obj(*new);
if (!new) {
jffs2_dbg(1, "No memory to allocate inodirty. Fallback to all considered dirty\n");
jffs2_clear_wbuf_ino_list(c);
diff --git a/fs/jfs/jfs_dmap.c b/fs/jfs/jfs_dmap.c
index 368fcdd8c328..2abe8cc02ee6 100644
--- a/fs/jfs/jfs_dmap.c
+++ b/fs/jfs/jfs_dmap.c
@@ -161,7 +161,7 @@ int dbMount(struct inode *ipbmap)
* allocate/initialize the in-memory bmap descriptor
*/
/* allocate memory for the in-memory bmap descriptor */
- bmp = kmalloc_obj(struct bmap, GFP_KERNEL);
+ bmp = kmalloc_obj(struct bmap);
if (bmp == NULL)
return -ENOMEM;
diff --git a/fs/jfs/jfs_imap.c b/fs/jfs/jfs_imap.c
index 739fcb4a6fc8..294a67327c73 100644
--- a/fs/jfs/jfs_imap.c
+++ b/fs/jfs/jfs_imap.c
@@ -102,7 +102,7 @@ int diMount(struct inode *ipimap)
* allocate/initialize the in-memory inode map control structure
*/
/* allocate the in-memory inode map control structure. */
- imap = kzalloc_obj(struct inomap, GFP_KERNEL);
+ imap = kzalloc_obj(struct inomap);
if (imap == NULL)
return -ENOMEM;
diff --git a/fs/jfs/jfs_logmgr.c b/fs/jfs/jfs_logmgr.c
index 204cca8dd5d4..ada00d5bc214 100644
--- a/fs/jfs/jfs_logmgr.c
+++ b/fs/jfs/jfs_logmgr.c
@@ -1087,7 +1087,7 @@ int lmLogOpen(struct super_block *sb)
}
}
- if (!(log = kzalloc_obj(struct jfs_log, GFP_KERNEL))) {
+ if (!(log = kzalloc_obj(struct jfs_log))) {
mutex_unlock(&jfs_log_mutex);
return -ENOMEM;
}
@@ -1156,7 +1156,7 @@ static int open_inline_log(struct super_block *sb)
struct jfs_log *log;
int rc;
- if (!(log = kzalloc_obj(struct jfs_log, GFP_KERNEL)))
+ if (!(log = kzalloc_obj(struct jfs_log)))
return -ENOMEM;
INIT_LIST_HEAD(&log->sb_list);
init_waitqueue_head(&log->syncwait);
@@ -1190,7 +1190,7 @@ static int open_dummy_log(struct super_block *sb)
mutex_lock(&jfs_log_mutex);
if (!dummy_log) {
- dummy_log = kzalloc_obj(struct jfs_log, GFP_KERNEL);
+ dummy_log = kzalloc_obj(struct jfs_log);
if (!dummy_log) {
mutex_unlock(&jfs_log_mutex);
return -ENOMEM;
@@ -1818,7 +1818,7 @@ static int lbmLogInit(struct jfs_log * log)
goto error;
buffer = page_address(page);
for (offset = 0; offset < PAGE_SIZE; offset += LOGPSIZE) {
- lbuf = kmalloc_obj(struct lbuf, GFP_KERNEL);
+ lbuf = kmalloc_obj(struct lbuf);
if (lbuf == NULL) {
if (offset == 0)
__free_page(page);
diff --git a/fs/jfs/super.c b/fs/jfs/super.c
index 4c1510091fe2..61575f7397ae 100644
--- a/fs/jfs/super.c
+++ b/fs/jfs/super.c
@@ -449,7 +449,7 @@ static int jfs_fill_super(struct super_block *sb, struct fs_context *fc)
jfs_info("In jfs_read_super: s_flags=0x%lx", sb->s_flags);
- sbi = kzalloc_obj(struct jfs_sb_info, GFP_KERNEL);
+ sbi = kzalloc_obj(struct jfs_sb_info);
if (!sbi)
return -ENOMEM;
@@ -912,7 +912,7 @@ static int jfs_init_fs_context(struct fs_context *fc)
{
struct jfs_context *ctx;
- ctx = kzalloc_obj(*ctx, GFP_KERNEL);
+ ctx = kzalloc_obj(*ctx);
if (!ctx)
return -ENOMEM;
diff --git a/fs/kernfs/dir.c b/fs/kernfs/dir.c
index 3d0704e21f71..8d40c4b1db9f 100644
--- a/fs/kernfs/dir.c
+++ b/fs/kernfs/dir.c
@@ -989,7 +989,7 @@ struct kernfs_root *kernfs_create_root(struct kernfs_syscall_ops *scops,
struct kernfs_root *root;
struct kernfs_node *kn;
- root = kzalloc_obj(*root, GFP_KERNEL);
+ root = kzalloc_obj(*root);
if (!root)
return ERR_PTR(-ENOMEM);
diff --git a/fs/kernfs/file.c b/fs/kernfs/file.c
index d338875f0258..e32406d62c0d 100644
--- a/fs/kernfs/file.c
+++ b/fs/kernfs/file.c
@@ -540,7 +540,7 @@ static int kernfs_get_open_node(struct kernfs_node *kn,
if (!on) {
/* not there, initialize a new one */
- on = kzalloc_obj(*on, GFP_KERNEL);
+ on = kzalloc_obj(*on);
if (!on) {
mutex_unlock(mutex);
return -ENOMEM;
@@ -638,7 +638,7 @@ static int kernfs_fop_open(struct inode *inode, struct file *file)
/* allocate a kernfs_open_file for the file */
error = -ENOMEM;
- of = kzalloc_obj(struct kernfs_open_file, GFP_KERNEL);
+ of = kzalloc_obj(struct kernfs_open_file);
if (!of)
goto err_out;
diff --git a/fs/kernfs/mount.c b/fs/kernfs/mount.c
index dd38e2e21a17..048f00b73b71 100644
--- a/fs/kernfs/mount.c
+++ b/fs/kernfs/mount.c
@@ -370,7 +370,7 @@ int kernfs_get_tree(struct fs_context *fc)
struct kernfs_super_info *info;
int error;
- info = kzalloc_obj(*info, GFP_KERNEL);
+ info = kzalloc_obj(*info);
if (!info)
return -ENOMEM;
@@ -451,7 +451,7 @@ static void __init kernfs_mutex_init(void)
static void __init kernfs_lock_init(void)
{
- kernfs_locks = kmalloc_obj(struct kernfs_global_locks, GFP_KERNEL);
+ kernfs_locks = kmalloc_obj(struct kernfs_global_locks);
WARN_ON(!kernfs_locks);
kernfs_mutex_init();
diff --git a/fs/libfs.c b/fs/libfs.c
index 361d5203e464..74134ba2e8d1 100644
--- a/fs/libfs.c
+++ b/fs/libfs.c
@@ -731,7 +731,7 @@ struct pseudo_fs_context *init_pseudo(struct fs_context *fc,
{
struct pseudo_fs_context *ctx;
- ctx = kzalloc_obj(struct pseudo_fs_context, GFP_KERNEL);
+ ctx = kzalloc_obj(struct pseudo_fs_context);
if (likely(ctx)) {
ctx->magic = magic;
fc->fs_private = ctx;
@@ -1320,7 +1320,7 @@ int simple_attr_open(struct inode *inode, struct file *file,
{
struct simple_attr *attr;
- attr = kzalloc_obj(*attr, GFP_KERNEL);
+ attr = kzalloc_obj(*attr);
if (!attr)
return -ENOMEM;
diff --git a/fs/lockd/clntlock.c b/fs/lockd/clntlock.c
index 372fe0cf830f..85bc0f3e91df 100644
--- a/fs/lockd/clntlock.c
+++ b/fs/lockd/clntlock.c
@@ -233,7 +233,7 @@ reclaimer(void *ptr)
u32 nsmstate;
struct net *net = host->net;
- req = kmalloc_obj(*req, GFP_KERNEL);
+ req = kmalloc_obj(*req);
if (!req)
return 0;
diff --git a/fs/lockd/clntproc.c b/fs/lockd/clntproc.c
index e189b3ddfedf..fb4d0752c9bb 100644
--- a/fs/lockd/clntproc.c
+++ b/fs/lockd/clntproc.c
@@ -105,7 +105,7 @@ static struct nlm_lockowner *nlmclnt_find_lockowner(struct nlm_host *host, fl_ow
res = __nlmclnt_find_lockowner(host, owner);
if (res == NULL) {
spin_unlock(&host->h_lock);
- new = kmalloc_obj(*new, GFP_KERNEL);
+ new = kmalloc_obj(*new);
spin_lock(&host->h_lock);
res = __nlmclnt_find_lockowner(host, owner);
if (res == NULL && new != NULL) {
@@ -208,7 +208,7 @@ struct nlm_rqst *nlm_alloc_call(struct nlm_host *host)
struct nlm_rqst *call;
for(;;) {
- call = kzalloc_obj(*call, GFP_KERNEL);
+ call = kzalloc_obj(*call);
if (call != NULL) {
refcount_set(&call->a_count, 1);
locks_init_lock(&call->a_args.lock.fl);
diff --git a/fs/lockd/host.c b/fs/lockd/host.c
index 12a745a543e0..1a9582a10a86 100644
--- a/fs/lockd/host.c
+++ b/fs/lockd/host.c
@@ -126,7 +126,7 @@ static struct nlm_host *nlm_alloc_host(struct nlm_lookup_host_info *ni,
}
}
- host = kmalloc_obj(*host, GFP_KERNEL);
+ host = kmalloc_obj(*host);
if (unlikely(host == NULL)) {
dprintk("lockd: %s failed; no memory\n", __func__);
nsm_release(nsm);
diff --git a/fs/lockd/svclock.c b/fs/lockd/svclock.c
index 1dee1da9ee0f..255a847ca0b6 100644
--- a/fs/lockd/svclock.c
+++ b/fs/lockd/svclock.c
@@ -233,7 +233,7 @@ nlmsvc_create_block(struct svc_rqst *rqstp, struct nlm_host *host,
return NULL;
/* Allocate memory for block, and initialize arguments */
- block = kzalloc_obj(*block, GFP_KERNEL);
+ block = kzalloc_obj(*block);
if (block == NULL)
goto failed;
kref_init(&block->b_count);
@@ -380,7 +380,7 @@ static struct nlm_lockowner *nlmsvc_find_lockowner(struct nlm_host *host, pid_t
if (res == NULL) {
spin_unlock(&host->h_lock);
- new = kmalloc_obj(*res, GFP_KERNEL);
+ new = kmalloc_obj(*res);
spin_lock(&host->h_lock);
res = __nlmsvc_find_lockowner(host, pid);
if (res == NULL && new != NULL) {
diff --git a/fs/lockd/svcsubs.c b/fs/lockd/svcsubs.c
index fcfeaf6d6855..dd0214dcb695 100644
--- a/fs/lockd/svcsubs.c
+++ b/fs/lockd/svcsubs.c
@@ -128,7 +128,7 @@ nlm_lookup_file(struct svc_rqst *rqstp, struct nlm_file **result,
nlm_debug_print_fh("creating file for", &lock->fh);
nfserr = nlm_lck_denied_nolocks;
- file = kzalloc_obj(*file, GFP_KERNEL);
+ file = kzalloc_obj(*file);
if (!file)
goto out_free;
diff --git a/fs/mbcache.c b/fs/mbcache.c
index 19cb8eb6744e..d6707fbdeb50 100644
--- a/fs/mbcache.c
+++ b/fs/mbcache.c
@@ -358,7 +358,7 @@ struct mb_cache *mb_cache_create(int bucket_bits)
unsigned long bucket_count = 1UL << bucket_bits;
unsigned long i;
- cache = kzalloc_obj(struct mb_cache, GFP_KERNEL);
+ cache = kzalloc_obj(struct mb_cache);
if (!cache)
goto err_out;
cache->c_bucket_bits = bucket_bits;
diff --git a/fs/minix/inode.c b/fs/minix/inode.c
index 495d31b8cd0e..99541c6a5bbf 100644
--- a/fs/minix/inode.c
+++ b/fs/minix/inode.c
@@ -226,7 +226,7 @@ static int minix_fill_super(struct super_block *s, struct fs_context *fc)
int ret = -EINVAL;
int silent = fc->sb_flags & SB_SILENT;
- sbi = kzalloc_obj(struct minix_sb_info, GFP_KERNEL);
+ sbi = kzalloc_obj(struct minix_sb_info);
if (!sbi)
return -ENOMEM;
s->s_fs_info = sbi;
diff --git a/fs/namespace.c b/fs/namespace.c
index 1cb7fa1a02ed..ebe19ded293a 100644
--- a/fs/namespace.c
+++ b/fs/namespace.c
@@ -889,7 +889,7 @@ static int get_mountpoint(struct dentry *dentry, struct pinned_mountpoint *m)
}
if (!mp)
- mp = kmalloc_obj(struct mountpoint, GFP_KERNEL);
+ mp = kmalloc_obj(struct mountpoint);
if (!mp)
return -ENOMEM;
@@ -2226,7 +2226,7 @@ static inline bool extend_array(struct path **res, struct path **to_free,
if (likely(n < *count))
return true;
- p = kmalloc_objs(struct path, new_count, GFP_KERNEL);
+ p = kmalloc_objs(struct path, new_count);
if (p && *count)
memcpy(p, *res, *count * sizeof(struct path));
*count = new_count;
diff --git a/fs/netfs/buffered_read.c b/fs/netfs/buffered_read.c
index 60073d41a387..88a0d801525f 100644
--- a/fs/netfs/buffered_read.c
+++ b/fs/netfs/buffered_read.c
@@ -429,7 +429,7 @@ static int netfs_read_gaps(struct file *file, struct folio *folio)
* end get copied to, but the middle is discarded.
*/
ret = -ENOMEM;
- bvec = kmalloc_objs(*bvec, nr_bvec, GFP_KERNEL);
+ bvec = kmalloc_objs(*bvec, nr_bvec);
if (!bvec)
goto discard;
diff --git a/fs/netfs/buffered_write.c b/fs/netfs/buffered_write.c
index 8fe514447df6..22a4d61631c9 100644
--- a/fs/netfs/buffered_write.c
+++ b/fs/netfs/buffered_write.c
@@ -302,7 +302,7 @@ ssize_t netfs_perform_write(struct kiocb *iocb, struct iov_iter *iter,
goto copied;
}
- finfo = kzalloc_obj(*finfo, GFP_KERNEL);
+ finfo = kzalloc_obj(*finfo);
if (!finfo) {
iov_iter_revert(iter, copied);
ret = -ENOMEM;
diff --git a/fs/netfs/fscache_cache.c b/fs/netfs/fscache_cache.c
index e709617b64d5..15b54d133633 100644
--- a/fs/netfs/fscache_cache.c
+++ b/fs/netfs/fscache_cache.c
@@ -25,7 +25,7 @@ static struct fscache_cache *fscache_alloc_cache(const char *name)
{
struct fscache_cache *cache;
- cache = kzalloc_obj(*cache, GFP_KERNEL);
+ cache = kzalloc_obj(*cache);
if (cache) {
if (name) {
cache->name = kstrdup(name, GFP_KERNEL);
diff --git a/fs/nfs/cache_lib.c b/fs/nfs/cache_lib.c
index 90fa1e4440be..9738a1ae92ca 100644
--- a/fs/nfs/cache_lib.c
+++ b/fs/nfs/cache_lib.c
@@ -96,7 +96,7 @@ struct nfs_cache_defer_req *nfs_cache_defer_req_alloc(void)
{
struct nfs_cache_defer_req *dreq;
- dreq = kzalloc_obj(*dreq, GFP_KERNEL);
+ dreq = kzalloc_obj(*dreq);
if (dreq) {
init_completion(&dreq->completion);
refcount_set(&dreq->count, 1);
diff --git a/fs/nfs/callback_proc.c b/fs/nfs/callback_proc.c
index 1c94a97efd31..4ea9221ded42 100644
--- a/fs/nfs/callback_proc.c
+++ b/fs/nfs/callback_proc.c
@@ -718,7 +718,7 @@ __be32 nfs4_callback_offload(void *data, void *dummy,
struct nfs4_copy_state *copy, *tmp_copy;
bool found = false;
- copy = kzalloc_obj(struct nfs4_copy_state, GFP_KERNEL);
+ copy = kzalloc_obj(struct nfs4_copy_state);
if (!copy)
return cpu_to_be32(NFS4ERR_DELAY);
diff --git a/fs/nfs/callback_xdr.c b/fs/nfs/callback_xdr.c
index 857393803e71..7f317ffa17c2 100644
--- a/fs/nfs/callback_xdr.c
+++ b/fs/nfs/callback_xdr.c
@@ -272,7 +272,7 @@ __be32 decode_devicenotify_args(struct svc_rqst *rqstp,
if (n == 0)
goto out;
- args->devs = kmalloc_objs(*args->devs, n, GFP_KERNEL);
+ args->devs = kmalloc_objs(*args->devs, n);
if (!args->devs) {
status = htonl(NFS4ERR_DELAY);
goto out;
diff --git a/fs/nfs/client.c b/fs/nfs/client.c
index be6e3b61735d..be02bb227741 100644
--- a/fs/nfs/client.c
+++ b/fs/nfs/client.c
@@ -150,7 +150,7 @@ struct nfs_client *nfs_alloc_client(const struct nfs_client_initdata *cl_init)
struct nfs_client *clp;
int err = -ENOMEM;
- if ((clp = kzalloc_obj(*clp, GFP_KERNEL)) == NULL)
+ if ((clp = kzalloc_obj(*clp)) == NULL)
goto error_0;
clp->cl_minorversion = cl_init->minorversion;
@@ -1044,7 +1044,7 @@ struct nfs_server *nfs_alloc_server(void)
{
struct nfs_server *server;
- server = kzalloc_obj(struct nfs_server, GFP_KERNEL);
+ server = kzalloc_obj(struct nfs_server);
if (!server)
return NULL;
diff --git a/fs/nfs/dir.c b/fs/nfs/dir.c
index 624ee989929d..2402f57c8e7d 100644
--- a/fs/nfs/dir.c
+++ b/fs/nfs/dir.c
@@ -912,7 +912,7 @@ static struct page **nfs_readdir_alloc_pages(size_t npages)
struct page **pages;
size_t i;
- pages = kmalloc_objs(*pages, npages, GFP_KERNEL);
+ pages = kmalloc_objs(*pages, npages);
if (!pages)
return NULL;
for (i = 0; i < npages; i++) {
@@ -942,7 +942,7 @@ static int nfs_readdir_xdr_to_array(struct nfs_readdir_descriptor *desc,
unsigned int pglen;
int status = -ENOMEM;
- entry = kzalloc_obj(*entry, GFP_KERNEL);
+ entry = kzalloc_obj(*entry);
if (!entry)
return -ENOMEM;
entry->cookie = nfs_readdir_folio_last_cookie(folio);
@@ -1154,7 +1154,7 @@ static int uncached_readdir(struct nfs_readdir_descriptor *desc)
dfprintk(DIRCACHE, "NFS: uncached_readdir() searching for cookie %llu\n",
(unsigned long long)desc->dir_cookie);
- arrays = kzalloc_objs(*arrays, sz, GFP_KERNEL);
+ arrays = kzalloc_objs(*arrays, sz);
if (!arrays)
goto out;
arrays[0] = nfs_readdir_folio_array_alloc(desc->dir_cookie, GFP_KERNEL);
@@ -1245,7 +1245,7 @@ static int nfs_readdir(struct file *file, struct dir_context *ctx)
nfs_revalidate_mapping(inode, file->f_mapping);
res = -ENOMEM;
- desc = kzalloc_obj(*desc, GFP_KERNEL);
+ desc = kzalloc_obj(*desc);
if (!desc)
goto out;
desc->file = file;
@@ -3216,7 +3216,7 @@ static void nfs_access_add_rbtree(struct inode *inode,
void nfs_access_add_cache(struct inode *inode, struct nfs_access_entry *set,
const struct cred *cred)
{
- struct nfs_access_entry *cache = kmalloc_obj(*cache, GFP_KERNEL);
+ struct nfs_access_entry *cache = kmalloc_obj(*cache);
if (cache == NULL)
return;
RB_CLEAR_NODE(&cache->rb_node);
diff --git a/fs/nfs/dns_resolve.c b/fs/nfs/dns_resolve.c
index 9bce45de1cb4..2ed2126201f4 100644
--- a/fs/nfs/dns_resolve.c
+++ b/fs/nfs/dns_resolve.c
@@ -120,7 +120,7 @@ static void nfs_dns_ent_put(struct kref *ref)
static struct cache_head *nfs_dns_ent_alloc(void)
{
- struct nfs_dns_ent *item = kmalloc_obj(*item, GFP_KERNEL);
+ struct nfs_dns_ent *item = kmalloc_obj(*item);
if (item != NULL) {
item->hostname = NULL;
diff --git a/fs/nfs/fs_context.c b/fs/nfs/fs_context.c
index 2fc851abd187..c105882edd16 100644
--- a/fs/nfs/fs_context.c
+++ b/fs/nfs/fs_context.c
@@ -1692,7 +1692,7 @@ static int nfs_init_fs_context(struct fs_context *fc)
{
struct nfs_fs_context *ctx;
- ctx = kzalloc_obj(struct nfs_fs_context, GFP_KERNEL);
+ ctx = kzalloc_obj(struct nfs_fs_context);
if (unlikely(!ctx))
return -ENOMEM;
diff --git a/fs/nfs/inode.c b/fs/nfs/inode.c
index ea215fc2ed21..4786343eeee0 100644
--- a/fs/nfs/inode.c
+++ b/fs/nfs/inode.c
@@ -1777,7 +1777,7 @@ struct nfs_fattr *nfs_alloc_fattr(void)
{
struct nfs_fattr *fattr;
- fattr = kmalloc_obj(*fattr, GFP_KERNEL);
+ fattr = kmalloc_obj(*fattr);
if (fattr != NULL) {
nfs_fattr_init(fattr);
fattr->label = NULL;
@@ -1807,7 +1807,7 @@ struct nfs_fh *nfs_alloc_fhandle(void)
{
struct nfs_fh *fh;
- fh = kmalloc_obj(struct nfs_fh, GFP_KERNEL);
+ fh = kmalloc_obj(struct nfs_fh);
if (fh != NULL)
fh->size = 0;
return fh;
diff --git a/fs/nfs/nfs3proc.c b/fs/nfs/nfs3proc.c
index eb9cac652550..3e2de45c95fe 100644
--- a/fs/nfs/nfs3proc.c
+++ b/fs/nfs/nfs3proc.c
@@ -299,7 +299,7 @@ static struct nfs3_createdata *nfs3_alloc_createdata(void)
{
struct nfs3_createdata *data;
- data = kzalloc_obj(*data, GFP_KERNEL);
+ data = kzalloc_obj(*data);
if (data != NULL) {
data->msg.rpc_argp = &data->arg;
data->msg.rpc_resp = &data->res;
diff --git a/fs/nfs/nfs40proc.c b/fs/nfs/nfs40proc.c
index 53f54081942e..b07f2d6ccde4 100644
--- a/fs/nfs/nfs40proc.c
+++ b/fs/nfs/nfs40proc.c
@@ -320,7 +320,7 @@ nfs4_release_lockowner(struct nfs_server *server, struct nfs4_lock_state *lsp)
if (clp->cl_mvops->minor_version != 0)
return;
- data = kmalloc_obj(*data, GFP_KERNEL);
+ data = kmalloc_obj(*data);
if (!data)
return;
data->lsp = lsp;
diff --git a/fs/nfs/nfs42proc.c b/fs/nfs/nfs42proc.c
index 46298606e509..7b3ca68fb4bb 100644
--- a/fs/nfs/nfs42proc.c
+++ b/fs/nfs/nfs42proc.c
@@ -247,7 +247,7 @@ static int handle_async_copy(struct nfs42_copy_res *res,
int status = NFS4_OK;
u64 copied;
- copy = kzalloc_obj(struct nfs4_copy_state, GFP_KERNEL);
+ copy = kzalloc_obj(struct nfs4_copy_state);
if (!copy)
return -ENOMEM;
@@ -351,7 +351,7 @@ static int process_copy_commit(struct file *dst, loff_t pos_dst,
struct nfs_commitres cres;
int status = -ENOMEM;
- cres.verf = kzalloc_obj(struct nfs_writeverf, GFP_KERNEL);
+ cres.verf = kzalloc_obj(struct nfs_writeverf);
if (!cres.verf)
goto out;
@@ -461,7 +461,7 @@ static ssize_t _nfs42_proc_copy(struct file *src,
res->commit_res.verf = NULL;
if (args->sync) {
res->commit_res.verf =
- kzalloc_obj(struct nfs_writeverf, GFP_KERNEL);
+ kzalloc_obj(struct nfs_writeverf);
if (!res->commit_res.verf)
return -ENOMEM;
}
@@ -659,7 +659,7 @@ static int nfs42_do_offload_cancel_async(struct file *dst,
if (!(dst_server->caps & NFS_CAP_OFFLOAD_CANCEL))
return -EOPNOTSUPP;
- data = kzalloc_obj(struct nfs42_offload_data, GFP_KERNEL);
+ data = kzalloc_obj(struct nfs42_offload_data);
if (data == NULL)
return -ENOMEM;
@@ -756,7 +756,7 @@ nfs42_proc_offload_status(struct file *dst, nfs4_stateid *stateid, u64 *copied)
if (!(server->caps & NFS_CAP_OFFLOAD_STATUS))
return -EOPNOTSUPP;
- data = kzalloc_obj(*data, GFP_KERNEL);
+ data = kzalloc_obj(*data);
if (!data)
return -ENOMEM;
data->seq_server = server;
@@ -838,7 +838,7 @@ int nfs42_proc_copy_notify(struct file *src, struct file *dst,
if (!(src_server->caps & NFS_CAP_COPY_NOTIFY))
return -EOPNOTSUPP;
- args = kzalloc_obj(struct nfs42_copy_notify_args, GFP_KERNEL);
+ args = kzalloc_obj(struct nfs42_copy_notify_args);
if (args == NULL)
return -ENOMEM;
@@ -1535,7 +1535,7 @@ static ssize_t _nfs42_proc_listxattrs(struct inode *inode, void *buf,
xdrlen = server->lxasize;
np = xdrlen / PAGE_SIZE + 1;
- pages = kzalloc_objs(struct page *, np, GFP_KERNEL);
+ pages = kzalloc_objs(struct page *, np);
if (!pages)
goto out_free_scratch;
for (i = 0; i < np; i++) {
@@ -1578,7 +1578,7 @@ ssize_t nfs42_proc_getxattr(struct inode *inode, const char *name,
struct page **pages;
np = nfs_page_array_len(0, buflen ?: XATTR_SIZE_MAX);
- pages = kmalloc_objs(*pages, np, GFP_KERNEL);
+ pages = kmalloc_objs(*pages, np);
if (!pages)
return -ENOMEM;
diff --git a/fs/nfs/nfs42xdr.c b/fs/nfs/nfs42xdr.c
index 432cfeebeba4..5c7452ce6e8a 100644
--- a/fs/nfs/nfs42xdr.c
+++ b/fs/nfs/nfs42xdr.c
@@ -1159,7 +1159,7 @@ static int decode_read_plus(struct xdr_stream *xdr, struct nfs_pgio_res *res)
if (segments == 0)
return 0;
- segs = kmalloc_objs(*segs, segments, GFP_KERNEL);
+ segs = kmalloc_objs(*segs, segments);
if (!segs)
return -ENOMEM;
diff --git a/fs/nfs/nfs4file.c b/fs/nfs/nfs4file.c
index bd079b4a6523..be40e126c539 100644
--- a/fs/nfs/nfs4file.c
+++ b/fs/nfs/nfs4file.c
@@ -164,7 +164,7 @@ static ssize_t __nfs4_copy_file_range(struct file *file_in, loff_t pos_in,
*/
if (sync)
return -EOPNOTSUPP;
- cn_resp = kzalloc_obj(struct nfs42_copy_notify_res, GFP_KERNEL);
+ cn_resp = kzalloc_obj(struct nfs42_copy_notify_res);
if (unlikely(cn_resp == NULL))
return -ENOMEM;
diff --git a/fs/nfs/nfs4idmap.c b/fs/nfs/nfs4idmap.c
index 01fb53132279..bc397110d977 100644
--- a/fs/nfs/nfs4idmap.c
+++ b/fs/nfs/nfs4idmap.c
@@ -445,7 +445,7 @@ nfs_idmap_new(struct nfs_client *clp)
struct rpc_pipe *pipe;
int error;
- idmap = kzalloc_obj(*idmap, GFP_KERNEL);
+ idmap = kzalloc_obj(*idmap);
if (idmap == NULL)
return -ENOMEM;
@@ -579,7 +579,7 @@ static int nfs_idmap_legacy_upcall(struct key *authkey, void *aux)
/* msg and im are freed in idmap_pipe_destroy_msg */
ret = -ENOMEM;
- data = kzalloc_obj(*data, GFP_KERNEL);
+ data = kzalloc_obj(*data);
if (!data)
goto out1;
diff --git a/fs/nfs/nfs4namespace.c b/fs/nfs/nfs4namespace.c
index 7366f2e6bc12..14f72baf3b30 100644
--- a/fs/nfs/nfs4namespace.c
+++ b/fs/nfs/nfs4namespace.c
@@ -415,7 +415,7 @@ static int nfs_do_refmount(struct fs_context *fc, struct rpc_clnt *client)
if (!page)
return -ENOMEM;
- fs_locations = kmalloc_obj(struct nfs4_fs_locations, GFP_KERNEL);
+ fs_locations = kmalloc_obj(struct nfs4_fs_locations);
if (!fs_locations)
goto out_free;
fs_locations->fattr = nfs_alloc_fattr();
@@ -490,7 +490,7 @@ static int nfs4_try_replacing_one_location(struct nfs_server *server,
size_t salen;
int error;
- sap = kmalloc_obj(*sap, GFP_KERNEL);
+ sap = kmalloc_obj(*sap);
if (sap == NULL)
return -ENOMEM;
diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c
index df9ae871726d..91bcf67bd743 100644
--- a/fs/nfs/nfs4proc.c
+++ b/fs/nfs/nfs4proc.c
@@ -4107,7 +4107,7 @@ static int _nfs4_discover_trunking(struct nfs_server *server,
page = alloc_page(GFP_KERNEL);
if (!page)
goto out_put_cred;
- locations = kmalloc_obj(struct nfs4_fs_locations, GFP_KERNEL);
+ locations = kmalloc_obj(struct nfs4_fs_locations);
if (!locations)
goto out_free;
locations->fattr = nfs_alloc_fattr();
@@ -4341,7 +4341,7 @@ static int nfs4_get_referral(struct rpc_clnt *client, struct inode *dir,
page = alloc_page(GFP_KERNEL);
if (page == NULL)
goto out;
- locations = kmalloc_obj(struct nfs4_fs_locations, GFP_KERNEL);
+ locations = kmalloc_obj(struct nfs4_fs_locations);
if (locations == NULL)
goto out;
@@ -5130,7 +5130,7 @@ static struct nfs4_createdata *nfs4_alloc_createdata(struct inode *dir,
{
struct nfs4_createdata *data;
- data = kzalloc_obj(*data, GFP_KERNEL);
+ data = kzalloc_obj(*data);
if (data != NULL) {
struct nfs_server *server = NFS_SERVER(dir);
@@ -6023,7 +6023,7 @@ static void nfs4_write_cached_acl(struct inode *inode, struct page **pages,
acl->cached = 1;
_copy_from_pages(acl->data, pages, pgbase, acl_len);
} else {
- acl = kmalloc_obj(*acl, GFP_KERNEL);
+ acl = kmalloc_obj(*acl);
if (acl == NULL)
goto out;
acl->cached = 0;
@@ -6070,7 +6070,7 @@ static ssize_t __nfs4_get_acl_uncached(struct inode *inode, void *buf,
buflen = server->rsize;
npages = DIV_ROUND_UP(buflen, PAGE_SIZE) + 1;
- pages = kmalloc_objs(struct page *, npages, GFP_KERNEL);
+ pages = kmalloc_objs(struct page *, npages);
if (!pages)
return -ENOMEM;
@@ -6822,7 +6822,7 @@ static int _nfs4_proc_delegreturn(struct inode *inode, const struct cred *cred,
if (nfs_server_capable(inode, NFS_CAP_MOVEABLE))
task_setup_data.flags |= RPC_TASK_MOVEABLE;
- data = kzalloc_obj(*data, GFP_KERNEL);
+ data = kzalloc_obj(*data);
if (data == NULL)
return -ENOMEM;
@@ -7026,7 +7026,7 @@ static struct nfs4_unlockdata *nfs4_alloc_unlockdata(struct file_lock *fl,
struct inode *inode = state->inode;
struct nfs_lock_context *l_ctx;
- p = kzalloc_obj(*p, GFP_KERNEL);
+ p = kzalloc_obj(*p);
if (p == NULL)
return NULL;
l_ctx = nfs_get_lock_context(ctx);
@@ -9396,7 +9396,7 @@ static struct rpc_task *_nfs41_proc_sequence(struct nfs_client *clp,
goto out_err;
ret = ERR_PTR(-ENOMEM);
- calldata = kzalloc_obj(*calldata, GFP_KERNEL);
+ calldata = kzalloc_obj(*calldata);
if (calldata == NULL)
goto out_put_clp;
nfs4_init_sequence(clp, &calldata->args, &calldata->res, 0, is_privileged);
@@ -10358,7 +10358,7 @@ static int nfs41_free_stateid(struct nfs_server *server,
&task_setup.rpc_client, &msg);
dprintk("NFS call free_stateid %p\n", stateid);
- data = kmalloc_obj(*data, GFP_KERNEL);
+ data = kmalloc_obj(*data);
if (!data)
return -ENOMEM;
data->server = server;
diff --git a/fs/nfs/nfs4state.c b/fs/nfs/nfs4state.c
index 7e1f14fad898..305a772e5497 100644
--- a/fs/nfs/nfs4state.c
+++ b/fs/nfs/nfs4state.c
@@ -2054,7 +2054,7 @@ static int nfs4_try_migration(struct nfs_server *server, const struct cred *cred
clp->cl_hostname);
page = alloc_page(GFP_KERNEL);
- locations = kmalloc_obj(struct nfs4_fs_locations, GFP_KERNEL);
+ locations = kmalloc_obj(struct nfs4_fs_locations);
fattr = nfs_alloc_fattr();
if (page == NULL || locations == NULL || fattr == NULL) {
dprintk("<-- %s: no memory\n", __func__);
diff --git a/fs/nfs/nfs4super.c b/fs/nfs/nfs4super.c
index 678f1f6c62bc..9c5895b551a1 100644
--- a/fs/nfs/nfs4super.c
+++ b/fs/nfs/nfs4super.c
@@ -100,7 +100,7 @@ static int nfs_referral_loop_protect(void)
struct nfs_referral_count *p, *new;
int ret = -ENOMEM;
- new = kmalloc_obj(*new, GFP_KERNEL);
+ new = kmalloc_obj(*new);
if (!new)
goto out;
new->task = current;
diff --git a/fs/nfs/proc.c b/fs/nfs/proc.c
index 523f44a2a416..8c3d2efa2636 100644
--- a/fs/nfs/proc.c
+++ b/fs/nfs/proc.c
@@ -217,7 +217,7 @@ static struct nfs_createdata *nfs_alloc_createdata(struct inode *dir,
{
struct nfs_createdata *data;
- data = kmalloc_obj(*data, GFP_KERNEL);
+ data = kmalloc_obj(*data);
if (data != NULL) {
data->arg.fh = NFS_FH(dir);
diff --git a/fs/nfs/sysfs.c b/fs/nfs/sysfs.c
index 2c723d41b7a7..7d8921f524a6 100644
--- a/fs/nfs/sysfs.c
+++ b/fs/nfs/sysfs.c
@@ -43,7 +43,7 @@ int nfs_sysfs_init(void)
{
int ret;
- nfs_kset = kzalloc_obj(*nfs_kset, GFP_KERNEL);
+ nfs_kset = kzalloc_obj(*nfs_kset);
if (!nfs_kset)
return -ENOMEM;
@@ -172,7 +172,7 @@ static struct nfs_netns_client *nfs_netns_client_alloc(struct kobject *parent,
{
struct nfs_netns_client *p;
- p = kzalloc_obj(*p, GFP_KERNEL);
+ p = kzalloc_obj(*p);
if (p) {
p->net = net;
p->kobject.kset = nfs_kset;
diff --git a/fs/nfs/unlink.c b/fs/nfs/unlink.c
index 2a07899c69af..df3ca4669df6 100644
--- a/fs/nfs/unlink.c
+++ b/fs/nfs/unlink.c
@@ -175,7 +175,7 @@ nfs_async_unlink(struct dentry *dentry, const struct qstr *name)
int status = -ENOMEM;
void *devname_garbage = NULL;
- data = kzalloc_obj(*data, GFP_KERNEL);
+ data = kzalloc_obj(*data);
if (data == NULL)
goto out;
data->args.name.name = kstrdup(name->name, GFP_KERNEL);
@@ -355,7 +355,7 @@ nfs_async_rename(struct inode *old_dir, struct inode *new_dir,
nfs_server_capable(new_dir, NFS_CAP_MOVEABLE))
task_setup_data.flags |= RPC_TASK_MOVEABLE;
- data = kzalloc_obj(*data, GFP_KERNEL);
+ data = kzalloc_obj(*data);
if (data == NULL)
return ERR_PTR(-ENOMEM);
task_setup_data.task = &data->task;
diff --git a/fs/nfsd/blocklayoutxdr.c b/fs/nfsd/blocklayoutxdr.c
index 3c145146a0c8..f80dbc41fd5f 100644
--- a/fs/nfsd/blocklayoutxdr.c
+++ b/fs/nfsd/blocklayoutxdr.c
@@ -164,7 +164,7 @@ nfsd4_block_decode_layoutupdate(struct xdr_stream *xdr, struct iomap **iomapp,
if (len != expected)
return nfserr_bad_xdr;
- iomaps = kzalloc_objs(*iomaps, nr_iomaps, GFP_KERNEL);
+ iomaps = kzalloc_objs(*iomaps, nr_iomaps);
if (!iomaps)
return nfserr_delay;
@@ -258,7 +258,7 @@ nfsd4_scsi_decode_layoutupdate(struct xdr_stream *xdr, struct iomap **iomapp,
if (len != expected)
return nfserr_bad_xdr;
- iomaps = kzalloc_objs(*iomaps, nr_iomaps, GFP_KERNEL);
+ iomaps = kzalloc_objs(*iomaps, nr_iomaps);
if (!iomaps)
return nfserr_delay;
diff --git a/fs/nfsd/export.c b/fs/nfsd/export.c
index 8fb394afc3f5..e8441fae01bf 100644
--- a/fs/nfsd/export.c
+++ b/fs/nfsd/export.c
@@ -234,7 +234,7 @@ static inline void expkey_update(struct cache_head *cnew,
static struct cache_head *expkey_alloc(void)
{
- struct svc_expkey *i = kmalloc_obj(*i, GFP_KERNEL);
+ struct svc_expkey *i = kmalloc_obj(*i);
if (i)
return &i->h;
else
@@ -870,11 +870,11 @@ static void export_update(struct cache_head *cnew, struct cache_head *citem)
static struct cache_head *svc_export_alloc(void)
{
- struct svc_export *i = kmalloc_obj(*i, GFP_KERNEL);
+ struct svc_export *i = kmalloc_obj(*i);
if (!i)
return NULL;
- i->ex_stats = kmalloc_obj(*(i->ex_stats), GFP_KERNEL);
+ i->ex_stats = kmalloc_obj(*(i->ex_stats));
if (!i->ex_stats) {
kfree(i);
return NULL;
diff --git a/fs/nfsd/filecache.c b/fs/nfsd/filecache.c
index 6b4eeb28c88b..1e2b38ed1d35 100644
--- a/fs/nfsd/filecache.c
+++ b/fs/nfsd/filecache.c
@@ -899,7 +899,7 @@ nfsd_alloc_fcache_disposal(void)
{
struct nfsd_fcache_disposal *l;
- l = kmalloc_obj(*l, GFP_KERNEL);
+ l = kmalloc_obj(*l);
if (!l)
return NULL;
spin_lock_init(&l->lock);
diff --git a/fs/nfsd/flexfilelayout.c b/fs/nfsd/flexfilelayout.c
index a65d55bcdc02..6d531285ab43 100644
--- a/fs/nfsd/flexfilelayout.c
+++ b/fs/nfsd/flexfilelayout.c
@@ -36,7 +36,7 @@ nfsd4_ff_proc_layoutget(struct svc_rqst *rqstp, struct inode *inode,
* Zero it out for the stateid - don't want junk in there!
*/
error = -ENOMEM;
- fl = kzalloc_obj(*fl, GFP_KERNEL);
+ fl = kzalloc_obj(*fl);
if (!fl)
goto out_error;
args->lg_content = fl;
@@ -86,7 +86,7 @@ nfsd4_ff_proc_getdeviceinfo(struct super_block *sb, struct svc_rqst *rqstp,
u16 port;
char addr[INET6_ADDRSTRLEN];
- da = kzalloc_obj(struct pnfs_ff_device_addr, GFP_KERNEL);
+ da = kzalloc_obj(struct pnfs_ff_device_addr);
if (!da)
return nfserrno(-ENOMEM);
diff --git a/fs/nfsd/nfs4callback.c b/fs/nfsd/nfs4callback.c
index 88782df7c3a1..aea8bdd2fdc4 100644
--- a/fs/nfsd/nfs4callback.c
+++ b/fs/nfsd/nfs4callback.c
@@ -1378,7 +1378,7 @@ void nfsd41_cb_referring_call(struct nfsd4_callback *cb,
}
}
if (!found) {
- rcl = kmalloc_obj(*rcl, GFP_KERNEL);
+ rcl = kmalloc_obj(*rcl);
if (!rcl)
return;
memcpy(rcl->rcl_sessionid.data, sessionid->data,
@@ -1397,7 +1397,7 @@ void nfsd41_cb_referring_call(struct nfsd4_callback *cb,
}
}
if (!found) {
- rc = kmalloc_obj(*rc, GFP_KERNEL);
+ rc = kmalloc_obj(*rc);
if (!rc)
goto out;
rc->rc_sequenceid = seqno;
diff --git a/fs/nfsd/nfs4idmap.c b/fs/nfsd/nfs4idmap.c
index 6415b847a939..ba06d3d3e6dd 100644
--- a/fs/nfsd/nfs4idmap.c
+++ b/fs/nfsd/nfs4idmap.c
@@ -97,7 +97,7 @@ ent_put(struct kref *ref)
static struct cache_head *
ent_alloc(void)
{
- struct ent *e = kmalloc_obj(*e, GFP_KERNEL);
+ struct ent *e = kmalloc_obj(*e);
if (e)
return &e->h;
else
diff --git a/fs/nfsd/nfs4proc.c b/fs/nfsd/nfs4proc.c
index 7dbb1dc184db..1d7b50c2cc3d 100644
--- a/fs/nfsd/nfs4proc.c
+++ b/fs/nfsd/nfs4proc.c
@@ -451,7 +451,7 @@ do_open_lookup(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate, stru
int accmode;
__be32 status;
- *resfh = kmalloc_obj(struct svc_fh, GFP_KERNEL);
+ *resfh = kmalloc_obj(struct svc_fh);
if (!*resfh)
return nfserr_jukebox;
fh_init(*resfh, NFS4_FHSIZE);
@@ -1630,7 +1630,7 @@ static __be32 nfsd4_ssc_setup_dul(struct nfsd_net *nn, char *ipaddr,
__be32 status = 0;
*nsui = NULL;
- work = kzalloc_obj(*work, GFP_KERNEL);
+ work = kzalloc_obj(*work);
try_again:
spin_lock(&nn->nfsd_ssc_lock);
list_for_each_entry_safe(ni, tmp, &nn->nfsd_ssc_mount_list, nsui_list) {
@@ -2160,7 +2160,7 @@ nfsd4_copy(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate,
memcpy(©->fh, &cstate->current_fh.fh_handle,
sizeof(struct knfsd_fh));
if (nfsd4_copy_is_async(copy)) {
- async_copy = kzalloc_obj(struct nfsd4_copy, GFP_KERNEL);
+ async_copy = kzalloc_obj(struct nfsd4_copy);
if (!async_copy)
goto out_err;
async_copy->cp_nn = nn;
diff --git a/fs/nfsd/nfs4recover.c b/fs/nfsd/nfs4recover.c
index 87de08c7f405..f72bffca6e0e 100644
--- a/fs/nfsd/nfs4recover.c
+++ b/fs/nfsd/nfs4recover.c
@@ -203,7 +203,7 @@ nfsd4_build_namelist(struct dir_context *__ctx, const char *name, int namlen,
if (namlen != HEXDIR_LEN - 1)
return true;
- entry = kmalloc_obj(struct name_list, GFP_KERNEL);
+ entry = kmalloc_obj(struct name_list);
if (entry == NULL)
return false;
memcpy(entry->name, name, HEXDIR_LEN - 1);
@@ -897,7 +897,7 @@ __nfsd4_init_cld_pipe(struct net *net)
if (nn->cld_net)
return 0;
- cn = kzalloc_obj(*cn, GFP_KERNEL);
+ cn = kzalloc_obj(*cn);
if (!cn) {
ret = -ENOMEM;
goto err;
@@ -959,7 +959,7 @@ alloc_cld_upcall(struct nfsd_net *nn)
struct cld_upcall *new, *tmp;
struct cld_net *cn = nn->cld_net;
- new = kzalloc_obj(*new, GFP_KERNEL);
+ new = kzalloc_obj(*new);
if (!new)
return new;
diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c
index fb5b2ff4201e..90dc841c2157 100644
--- a/fs/nfsd/nfs4state.c
+++ b/fs/nfsd/nfs4state.c
@@ -299,7 +299,7 @@ find_or_allocate_block(struct nfs4_lockowner *lo, struct knfsd_fh *fh,
nbl = find_blocked_lock(lo, fh, nn);
if (!nbl) {
- nbl = kmalloc_obj(*nbl, GFP_KERNEL);
+ nbl = kmalloc_obj(*nbl);
if (nbl) {
INIT_LIST_HEAD(&nbl->nbl_list);
INIT_LIST_HEAD(&nbl->nbl_lru);
@@ -974,7 +974,7 @@ struct nfs4_cpntf_state *nfs4_alloc_init_cpntf_state(struct nfsd_net *nn,
{
struct nfs4_cpntf_state *cps;
- cps = kzalloc_obj(struct nfs4_cpntf_state, GFP_KERNEL);
+ cps = kzalloc_obj(struct nfs4_cpntf_state);
if (!cps)
return NULL;
cps->cpntf_time = ktime_get_boottime_seconds();
@@ -2047,7 +2047,7 @@ static struct nfsd4_session *alloc_session(struct nfsd4_channel_attrs *fattrs,
struct nfsd4_slot *slot;
int i;
- new = kzalloc_obj(*new, GFP_KERNEL);
+ new = kzalloc_obj(*new);
if (!new)
return NULL;
xa_init(&new->se_slots);
@@ -2108,7 +2108,7 @@ static struct nfsd4_conn *alloc_conn(struct svc_rqst *rqstp, u32 flags)
{
struct nfsd4_conn *conn;
- conn = kmalloc_obj(struct nfsd4_conn, GFP_KERNEL);
+ conn = kmalloc_obj(struct nfsd4_conn);
if (!conn)
return NULL;
svc_xprt_get(rqstp->rq_xprt);
@@ -3308,7 +3308,7 @@ static struct nfs4_client *create_client(struct xdr_netobj name,
free_client(clp);
return NULL;
}
- clp->cl_ra = kzalloc_obj(*clp->cl_ra, GFP_KERNEL);
+ clp->cl_ra = kzalloc_obj(*clp->cl_ra);
if (!clp->cl_ra) {
free_client(clp);
return NULL;
@@ -8822,7 +8822,7 @@ nfsd4_release_lockowner(struct svc_rqst *rqstp,
static inline struct nfs4_client_reclaim *
alloc_reclaim(void)
{
- return kmalloc_obj(struct nfs4_client_reclaim, GFP_KERNEL);
+ return kmalloc_obj(struct nfs4_client_reclaim);
}
bool
diff --git a/fs/nfsd/nfs4xdr.c b/fs/nfsd/nfs4xdr.c
index c96d31b7846e..1bee0870d1c7 100644
--- a/fs/nfsd/nfs4xdr.c
+++ b/fs/nfsd/nfs4xdr.c
@@ -2184,7 +2184,7 @@ nfsd4_decode_copy(struct nfsd4_compoundargs *argp, union nfsd4_op_u *u)
if (status)
return status;
- ns_dummy = kmalloc_obj(struct nl4_server, GFP_KERNEL);
+ ns_dummy = kmalloc_obj(struct nl4_server);
if (ns_dummy == NULL)
return nfserr_jukebox;
for (i = 0; i < count - 1; i++) {
@@ -3956,7 +3956,7 @@ nfsd4_encode_fattr4(struct svc_rqst *rqstp, struct xdr_stream *xdr,
}
if ((attrmask[0] & (FATTR4_WORD0_FILEHANDLE | FATTR4_WORD0_FSID)) &&
!fhp) {
- tempfh = kmalloc_obj(struct svc_fh, GFP_KERNEL);
+ tempfh = kmalloc_obj(struct svc_fh);
status = nfserr_jukebox;
if (!tempfh)
goto out;
diff --git a/fs/nfsd/nfsctl.c b/fs/nfsd/nfsctl.c
index 777b7bb9aeca..e9acd2cd602c 100644
--- a/fs/nfsd/nfsctl.c
+++ b/fs/nfsd/nfsctl.c
@@ -477,7 +477,7 @@ static ssize_t write_pool_threads(struct file *file, char *buf, size_t size)
return strlen(buf);
}
- nthreads = kzalloc_objs(int, npools, GFP_KERNEL);
+ nthreads = kzalloc_objs(int, npools);
rv = -ENOMEM;
if (nthreads == NULL)
goto out_free;
@@ -1596,7 +1596,7 @@ int nfsd_nl_threads_set_doit(struct sk_buff *skb, struct genl_info *info)
mutex_lock(&nfsd_mutex);
- nthreads = kzalloc_objs(int, nrpools, GFP_KERNEL);
+ nthreads = kzalloc_objs(int, nrpools);
if (!nthreads) {
ret = -ENOMEM;
goto out_unlock;
diff --git a/fs/nilfs2/segment.c b/fs/nilfs2/segment.c
index 21c5539c7e84..098a3bd103e0 100644
--- a/fs/nilfs2/segment.c
+++ b/fs/nilfs2/segment.c
@@ -2701,7 +2701,7 @@ static struct nilfs_sc_info *nilfs_segctor_new(struct super_block *sb,
struct the_nilfs *nilfs = sb->s_fs_info;
struct nilfs_sc_info *sci;
- sci = kzalloc_obj(*sci, GFP_KERNEL);
+ sci = kzalloc_obj(*sci);
if (!sci)
return NULL;
diff --git a/fs/nilfs2/super.c b/fs/nilfs2/super.c
index 55fac3f83232..7aa5ef8606cd 100644
--- a/fs/nilfs2/super.c
+++ b/fs/nilfs2/super.c
@@ -1292,7 +1292,7 @@ static int nilfs_init_fs_context(struct fs_context *fc)
{
struct nilfs_fs_context *ctx;
- ctx = kzalloc_obj(*ctx, GFP_KERNEL);
+ ctx = kzalloc_obj(*ctx);
if (!ctx)
return -ENOMEM;
diff --git a/fs/nilfs2/the_nilfs.c b/fs/nilfs2/the_nilfs.c
index f481532ea8e9..7b23e373a106 100644
--- a/fs/nilfs2/the_nilfs.c
+++ b/fs/nilfs2/the_nilfs.c
@@ -56,7 +56,7 @@ struct the_nilfs *alloc_nilfs(struct super_block *sb)
{
struct the_nilfs *nilfs;
- nilfs = kzalloc_obj(*nilfs, GFP_KERNEL);
+ nilfs = kzalloc_obj(*nilfs);
if (!nilfs)
return NULL;
@@ -877,7 +877,7 @@ nilfs_find_or_create_root(struct the_nilfs *nilfs, __u64 cno)
if (root)
return root;
- new = kzalloc_obj(*root, GFP_KERNEL);
+ new = kzalloc_obj(*root);
if (!new)
return NULL;
diff --git a/fs/notify/mark.c b/fs/notify/mark.c
index 691d36104ae2..c2ed5b11b0fe 100644
--- a/fs/notify/mark.c
+++ b/fs/notify/mark.c
@@ -644,7 +644,7 @@ static int fsnotify_attach_info_to_sb(struct super_block *sb)
struct fsnotify_sb_info *sbinfo;
/* sb info is freed on fsnotify_sb_delete() */
- sbinfo = kzalloc_obj(*sbinfo, GFP_KERNEL);
+ sbinfo = kzalloc_obj(*sbinfo);
if (!sbinfo)
return -ENOMEM;
diff --git a/fs/ocfs2/alloc.c b/fs/ocfs2/alloc.c
index ce8ce1470981..344fd4d95fbc 100644
--- a/fs/ocfs2/alloc.c
+++ b/fs/ocfs2/alloc.c
@@ -1202,7 +1202,7 @@ static int ocfs2_add_branch(handle_t *handle,
}
/* allocate the number of new eb blocks we need */
- new_eb_bhs = kzalloc_objs(struct buffer_head *, new_blocks, GFP_KERNEL);
+ new_eb_bhs = kzalloc_objs(struct buffer_head *, new_blocks);
if (!new_eb_bhs) {
status = -ENOMEM;
mlog_errno(status);
diff --git a/fs/ocfs2/cluster/heartbeat.c b/fs/ocfs2/cluster/heartbeat.c
index 91fb76a43900..ace7debb2f0d 100644
--- a/fs/ocfs2/cluster/heartbeat.c
+++ b/fs/ocfs2/cluster/heartbeat.c
@@ -2001,7 +2001,7 @@ static struct config_item *o2hb_heartbeat_group_make_item(struct config_group *g
struct o2hb_region *reg = NULL;
int ret;
- reg = kzalloc_obj(struct o2hb_region, GFP_KERNEL);
+ reg = kzalloc_obj(struct o2hb_region);
if (reg == NULL)
return ERR_PTR(-ENOMEM);
@@ -2211,7 +2211,7 @@ struct config_group *o2hb_alloc_hb_set(void)
struct o2hb_heartbeat_group *hs = NULL;
struct config_group *ret = NULL;
- hs = kzalloc_obj(struct o2hb_heartbeat_group, GFP_KERNEL);
+ hs = kzalloc_obj(struct o2hb_heartbeat_group);
if (hs == NULL)
goto out;
diff --git a/fs/ocfs2/cluster/netdebug.c b/fs/ocfs2/cluster/netdebug.c
index 2cb3162aeb89..f7ab66e70799 100644
--- a/fs/ocfs2/cluster/netdebug.c
+++ b/fs/ocfs2/cluster/netdebug.c
@@ -380,7 +380,7 @@ static int sc_common_open(struct file *file, int ctxt)
struct o2net_sock_debug *sd;
struct o2net_sock_container *dummy_sc;
- dummy_sc = kzalloc_obj(*dummy_sc, GFP_KERNEL);
+ dummy_sc = kzalloc_obj(*dummy_sc);
if (!dummy_sc)
return -ENOMEM;
diff --git a/fs/ocfs2/cluster/nodemanager.c b/fs/ocfs2/cluster/nodemanager.c
index 6fb8bc38c0f7..402563154550 100644
--- a/fs/ocfs2/cluster/nodemanager.c
+++ b/fs/ocfs2/cluster/nodemanager.c
@@ -587,7 +587,7 @@ static struct config_item *o2nm_node_group_make_item(struct config_group *group,
if (strlen(name) > O2NM_MAX_NAME_LEN)
return ERR_PTR(-ENAMETOOLONG);
- node = kzalloc_obj(struct o2nm_node, GFP_KERNEL);
+ node = kzalloc_obj(struct o2nm_node);
if (node == NULL)
return ERR_PTR(-ENOMEM);
@@ -695,8 +695,8 @@ static struct config_group *o2nm_cluster_group_make_group(struct config_group *g
if (o2nm_single_cluster)
return ERR_PTR(-ENOSPC);
- cluster = kzalloc_obj(struct o2nm_cluster, GFP_KERNEL);
- ns = kzalloc_obj(struct o2nm_node_group, GFP_KERNEL);
+ cluster = kzalloc_obj(struct o2nm_cluster);
+ ns = kzalloc_obj(struct o2nm_node_group);
o2hb_group = o2hb_alloc_hb_set();
if (cluster == NULL || ns == NULL || o2hb_group == NULL)
goto out;
diff --git a/fs/ocfs2/dlm/dlmdomain.c b/fs/ocfs2/dlm/dlmdomain.c
index ff4868619d35..70ca79e4bdc3 100644
--- a/fs/ocfs2/dlm/dlmdomain.c
+++ b/fs/ocfs2/dlm/dlmdomain.c
@@ -1048,7 +1048,7 @@ static int dlm_send_regions(struct dlm_ctxt *dlm, unsigned long *node_map)
if (find_first_bit(node_map, O2NM_MAX_NODES) >= O2NM_MAX_NODES)
goto bail;
- qr = kzalloc_obj(struct dlm_query_region, GFP_KERNEL);
+ qr = kzalloc_obj(struct dlm_query_region);
if (!qr) {
ret = -ENOMEM;
mlog_errno(ret);
@@ -1220,7 +1220,7 @@ static int dlm_send_nodeinfo(struct dlm_ctxt *dlm, unsigned long *node_map)
if (find_first_bit(node_map, O2NM_MAX_NODES) >= O2NM_MAX_NODES)
goto bail;
- qn = kzalloc_obj(struct dlm_query_nodeinfo, GFP_KERNEL);
+ qn = kzalloc_obj(struct dlm_query_nodeinfo);
if (!qn) {
ret = -ENOMEM;
mlog_errno(ret);
@@ -1592,7 +1592,7 @@ static int dlm_try_to_join_domain(struct dlm_ctxt *dlm)
mlog(0, "%p", dlm);
- ctxt = kzalloc_obj(*ctxt, GFP_KERNEL);
+ ctxt = kzalloc_obj(*ctxt);
if (!ctxt) {
status = -ENOMEM;
mlog_errno(status);
@@ -1946,7 +1946,7 @@ static struct dlm_ctxt *dlm_alloc_ctxt(const char *domain,
int ret;
struct dlm_ctxt *dlm = NULL;
- dlm = kzalloc_obj(*dlm, GFP_KERNEL);
+ dlm = kzalloc_obj(*dlm);
if (!dlm) {
ret = -ENOMEM;
mlog_errno(ret);
diff --git a/fs/ocfs2/dlmglue.c b/fs/ocfs2/dlmglue.c
index 627d488b0148..bd2ddb7d841d 100644
--- a/fs/ocfs2/dlmglue.c
+++ b/fs/ocfs2/dlmglue.c
@@ -3030,7 +3030,7 @@ struct ocfs2_dlm_debug *ocfs2_new_dlm_debug(void)
{
struct ocfs2_dlm_debug *dlm_debug;
- dlm_debug = kmalloc_obj(struct ocfs2_dlm_debug, GFP_KERNEL);
+ dlm_debug = kmalloc_obj(struct ocfs2_dlm_debug);
if (!dlm_debug) {
mlog_errno(-ENOMEM);
goto out;
diff --git a/fs/ocfs2/file.c b/fs/ocfs2/file.c
index 70879058b0c9..7df9921c1a38 100644
--- a/fs/ocfs2/file.c
+++ b/fs/ocfs2/file.c
@@ -54,7 +54,7 @@ static int ocfs2_init_file_private(struct inode *inode, struct file *file)
{
struct ocfs2_file_private *fp;
- fp = kzalloc_obj(struct ocfs2_file_private, GFP_KERNEL);
+ fp = kzalloc_obj(struct ocfs2_file_private);
if (!fp)
return -ENOMEM;
diff --git a/fs/ocfs2/ioctl.c b/fs/ocfs2/ioctl.c
index 872b826979ec..bfed0fb35f9b 100644
--- a/fs/ocfs2/ioctl.c
+++ b/fs/ocfs2/ioctl.c
@@ -334,7 +334,7 @@ static int ocfs2_info_handle_freeinode(struct inode *inode,
struct ocfs2_super *osb = OCFS2_SB(inode->i_sb);
struct inode *inode_alloc = NULL;
- oifi = kzalloc_obj(struct ocfs2_info_freeinode, GFP_KERNEL);
+ oifi = kzalloc_obj(struct ocfs2_info_freeinode);
if (!oifi) {
status = -ENOMEM;
mlog_errno(status);
@@ -620,7 +620,7 @@ static int ocfs2_info_handle_freefrag(struct inode *inode,
struct ocfs2_super *osb = OCFS2_SB(inode->i_sb);
struct inode *gb_inode = NULL;
- oiff = kzalloc_obj(struct ocfs2_info_freefrag, GFP_KERNEL);
+ oiff = kzalloc_obj(struct ocfs2_info_freefrag);
if (!oiff) {
status = -ENOMEM;
mlog_errno(status);
diff --git a/fs/ocfs2/journal.c b/fs/ocfs2/journal.c
index 1b9359304aef..6755f38920bc 100644
--- a/fs/ocfs2/journal.c
+++ b/fs/ocfs2/journal.c
@@ -876,7 +876,7 @@ int ocfs2_journal_alloc(struct ocfs2_super *osb)
int status = 0;
struct ocfs2_journal *journal;
- journal = kzalloc_obj(struct ocfs2_journal, GFP_KERNEL);
+ journal = kzalloc_obj(struct ocfs2_journal);
if (!journal) {
mlog(ML_ERROR, "unable to alloc journal\n");
status = -ENOMEM;
diff --git a/fs/ocfs2/localalloc.c b/fs/ocfs2/localalloc.c
index 29fa6fb11ea5..82d290cf4432 100644
--- a/fs/ocfs2/localalloc.c
+++ b/fs/ocfs2/localalloc.c
@@ -1094,7 +1094,7 @@ static int ocfs2_local_alloc_reserve_for_window(struct ocfs2_super *osb,
{
int status;
- *ac = kzalloc_obj(struct ocfs2_alloc_context, GFP_KERNEL);
+ *ac = kzalloc_obj(struct ocfs2_alloc_context);
if (!(*ac)) {
status = -ENOMEM;
mlog_errno(status);
diff --git a/fs/ocfs2/namei.c b/fs/ocfs2/namei.c
index 85ad1a9db734..268b79339a51 100644
--- a/fs/ocfs2/namei.c
+++ b/fs/ocfs2/namei.c
@@ -1736,7 +1736,7 @@ static int ocfs2_create_symlink_data(struct ocfs2_super *osb,
goto bail;
}
- bhs = kzalloc_objs(struct buffer_head *, blocks, GFP_KERNEL);
+ bhs = kzalloc_objs(struct buffer_head *, blocks);
if (!bhs) {
status = -ENOMEM;
mlog_errno(status);
diff --git a/fs/ocfs2/stack_o2cb.c b/fs/ocfs2/stack_o2cb.c
index 78a97c37398b..7a55b1a071db 100644
--- a/fs/ocfs2/stack_o2cb.c
+++ b/fs/ocfs2/stack_o2cb.c
@@ -334,7 +334,7 @@ static int o2cb_cluster_connect(struct ocfs2_cluster_connection *conn)
goto out;
}
- priv = kzalloc_obj(struct o2dlm_private, GFP_KERNEL);
+ priv = kzalloc_obj(struct o2dlm_private);
if (!priv) {
rc = -ENOMEM;
goto out_free;
diff --git a/fs/ocfs2/stack_user.c b/fs/ocfs2/stack_user.c
index 11b34407de36..5803f1dee679 100644
--- a/fs/ocfs2/stack_user.c
+++ b/fs/ocfs2/stack_user.c
@@ -593,7 +593,7 @@ static int ocfs2_control_open(struct inode *inode, struct file *file)
{
struct ocfs2_control_private *p;
- p = kzalloc_obj(struct ocfs2_control_private, GFP_KERNEL);
+ p = kzalloc_obj(struct ocfs2_control_private);
if (!p)
return -ENOMEM;
p->op_this_node = -1;
@@ -967,7 +967,7 @@ static int user_cluster_connect(struct ocfs2_cluster_connection *conn)
BUG_ON(conn == NULL);
- lc = kzalloc_obj(struct ocfs2_live_connection, GFP_KERNEL);
+ lc = kzalloc_obj(struct ocfs2_live_connection);
if (!lc)
return -ENOMEM;
diff --git a/fs/ocfs2/stackglue.c b/fs/ocfs2/stackglue.c
index 46ff5835da2e..741d6191d871 100644
--- a/fs/ocfs2/stackglue.c
+++ b/fs/ocfs2/stackglue.c
@@ -328,7 +328,7 @@ int ocfs2_cluster_connect(const char *stack_name,
goto out;
}
- new_conn = kzalloc_obj(struct ocfs2_cluster_connection, GFP_KERNEL);
+ new_conn = kzalloc_obj(struct ocfs2_cluster_connection);
if (!new_conn) {
rc = -ENOMEM;
goto out;
diff --git a/fs/ocfs2/suballoc.c b/fs/ocfs2/suballoc.c
index 872c7b303a3c..bb98bd51338e 100644
--- a/fs/ocfs2/suballoc.c
+++ b/fs/ocfs2/suballoc.c
@@ -1034,7 +1034,7 @@ int ocfs2_reserve_new_metadata_blocks(struct ocfs2_super *osb,
int status;
int slot = ocfs2_get_meta_steal_slot(osb);
- *ac = kzalloc_obj(struct ocfs2_alloc_context, GFP_KERNEL);
+ *ac = kzalloc_obj(struct ocfs2_alloc_context);
if (!(*ac)) {
status = -ENOMEM;
mlog_errno(status);
@@ -1105,7 +1105,7 @@ int ocfs2_reserve_new_inode(struct ocfs2_super *osb,
int slot = ocfs2_get_inode_steal_slot(osb);
u64 alloc_group;
- *ac = kzalloc_obj(struct ocfs2_alloc_context, GFP_KERNEL);
+ *ac = kzalloc_obj(struct ocfs2_alloc_context);
if (!(*ac)) {
status = -ENOMEM;
mlog_errno(status);
@@ -1221,7 +1221,7 @@ static int ocfs2_reserve_clusters_with_limit(struct ocfs2_super *osb,
int status, ret = 0;
int retried = 0;
- *ac = kzalloc_obj(struct ocfs2_alloc_context, GFP_KERNEL);
+ *ac = kzalloc_obj(struct ocfs2_alloc_context);
if (!(*ac)) {
status = -ENOMEM;
mlog_errno(status);
diff --git a/fs/ocfs2/super.c b/fs/ocfs2/super.c
index 9779f524ff1a..d7c58fd7d438 100644
--- a/fs/ocfs2/super.c
+++ b/fs/ocfs2/super.c
@@ -1200,7 +1200,7 @@ static int ocfs2_init_fs_context(struct fs_context *fc)
{
struct mount_options *mopt;
- mopt = kzalloc_obj(struct mount_options, GFP_KERNEL);
+ mopt = kzalloc_obj(struct mount_options);
if (!mopt)
return -EINVAL;
@@ -1953,7 +1953,7 @@ static int ocfs2_initialize_super(struct super_block *sb,
struct ocfs2_super *osb;
u64 total_blocks;
- osb = kzalloc_obj(struct ocfs2_super, GFP_KERNEL);
+ osb = kzalloc_obj(struct ocfs2_super);
if (!osb) {
status = -ENOMEM;
mlog_errno(status);
diff --git a/fs/omfs/inode.c b/fs/omfs/inode.c
index ba2a581f7ab7..90ae07c69349 100644
--- a/fs/omfs/inode.c
+++ b/fs/omfs/inode.c
@@ -464,7 +464,7 @@ static int omfs_fill_super(struct super_block *sb, struct fs_context *fc)
int ret = -EINVAL;
int silent = fc->sb_flags & SB_SILENT;
- sbi = kzalloc_obj(struct omfs_sb_info, GFP_KERNEL);
+ sbi = kzalloc_obj(struct omfs_sb_info);
if (!sbi)
return -ENOMEM;
@@ -612,7 +612,7 @@ static int omfs_init_fs_context(struct fs_context *fc)
{
struct omfs_mount_options *opts;
- opts = kzalloc_obj(*opts, GFP_KERNEL);
+ opts = kzalloc_obj(*opts);
if (!opts)
return -ENOMEM;
diff --git a/fs/orangefs/dir.c b/fs/orangefs/dir.c
index 84db9f0db9df..6e2ebc8b9867 100644
--- a/fs/orangefs/dir.c
+++ b/fs/orangefs/dir.c
@@ -363,7 +363,7 @@ static int orangefs_dir_iterate(struct file *file,
static int orangefs_dir_open(struct inode *inode, struct file *file)
{
struct orangefs_dir *od;
- file->private_data = kmalloc_obj(struct orangefs_dir, GFP_KERNEL);
+ file->private_data = kmalloc_obj(struct orangefs_dir);
if (!file->private_data)
return -ENOMEM;
od = file->private_data;
diff --git a/fs/orangefs/inode.c b/fs/orangefs/inode.c
index 50836be41cd2..2d4710d0e05e 100644
--- a/fs/orangefs/inode.c
+++ b/fs/orangefs/inode.c
@@ -184,16 +184,16 @@ static int orangefs_writepages(struct address_space *mapping,
int error;
struct folio *folio = NULL;
- ow = kzalloc_obj(struct orangefs_writepages, GFP_KERNEL);
+ ow = kzalloc_obj(struct orangefs_writepages);
if (!ow)
return -ENOMEM;
ow->maxpages = orangefs_bufmap_size_query()/PAGE_SIZE;
- ow->folios = kzalloc_objs(struct folio *, ow->maxpages, GFP_KERNEL);
+ ow->folios = kzalloc_objs(struct folio *, ow->maxpages);
if (!ow->folios) {
kfree(ow);
return -ENOMEM;
}
- ow->bv = kzalloc_objs(struct bio_vec, ow->maxpages, GFP_KERNEL);
+ ow->bv = kzalloc_objs(struct bio_vec, ow->maxpages);
if (!ow->bv) {
kfree(ow->folios);
kfree(ow);
@@ -328,7 +328,7 @@ static int orangefs_write_begin(const struct kiocb *iocb,
}
}
- wr = kmalloc_obj(*wr, GFP_KERNEL);
+ wr = kmalloc_obj(*wr);
if (!wr)
return -ENOMEM;
@@ -644,7 +644,7 @@ vm_fault_t orangefs_page_mkwrite(struct vm_fault *vmf)
}
}
}
- wr = kmalloc_obj(*wr, GFP_KERNEL);
+ wr = kmalloc_obj(*wr);
if (!wr) {
ret = VM_FAULT_LOCKED|VM_FAULT_RETRY;
goto out;
diff --git a/fs/orangefs/orangefs-bufmap.c b/fs/orangefs/orangefs-bufmap.c
index bad105dd10fa..c54266c75eed 100644
--- a/fs/orangefs/orangefs-bufmap.c
+++ b/fs/orangefs/orangefs-bufmap.c
@@ -205,7 +205,7 @@ orangefs_bufmap_alloc(struct ORANGEFS_dev_map_desc *user_desc)
{
struct orangefs_bufmap *bufmap;
- bufmap = kzalloc_obj(*bufmap, GFP_KERNEL);
+ bufmap = kzalloc_obj(*bufmap);
if (!bufmap)
goto out;
@@ -228,7 +228,7 @@ orangefs_bufmap_alloc(struct ORANGEFS_dev_map_desc *user_desc)
/* allocate storage to track our page mappings */
bufmap->page_array =
- kzalloc_objs(struct page *, bufmap->page_count, GFP_KERNEL);
+ kzalloc_objs(struct page *, bufmap->page_count);
if (!bufmap->page_array)
goto out_free_desc_array;
diff --git a/fs/orangefs/orangefs-debugfs.c b/fs/orangefs/orangefs-debugfs.c
index 229981c310bd..e82b934ed074 100644
--- a/fs/orangefs/orangefs-debugfs.c
+++ b/fs/orangefs/orangefs-debugfs.c
@@ -560,7 +560,7 @@ static int orangefs_prepare_cdm_array(char *debug_array_string)
goto out;
}
- cdm_array = kzalloc_objs(*cdm_array, cdm_element_count, GFP_KERNEL);
+ cdm_array = kzalloc_objs(*cdm_array, cdm_element_count);
if (!cdm_array) {
rc = -ENOMEM;
goto out;
diff --git a/fs/orangefs/orangefs-mod.c b/fs/orangefs/orangefs-mod.c
index 30bc3c17daa4..f591f09531da 100644
--- a/fs/orangefs/orangefs-mod.c
+++ b/fs/orangefs/orangefs-mod.c
@@ -99,7 +99,7 @@ static int __init orangefs_init(void)
goto cleanup_op;
orangefs_htable_ops_in_progress =
- kzalloc_objs(struct list_head, hash_table_size, GFP_KERNEL);
+ kzalloc_objs(struct list_head, hash_table_size);
if (!orangefs_htable_ops_in_progress) {
ret = -ENOMEM;
goto cleanup_inode;
diff --git a/fs/orangefs/orangefs-sysfs.c b/fs/orangefs/orangefs-sysfs.c
index 8ea25b71b1fb..a02bfc7b3542 100644
--- a/fs/orangefs/orangefs-sysfs.c
+++ b/fs/orangefs/orangefs-sysfs.c
@@ -1170,7 +1170,7 @@ int orangefs_sysfs_init(void)
gossip_debug(GOSSIP_SYSFS_DEBUG, "orangefs_sysfs_init: start\n");
/* create /sys/fs/orangefs. */
- orangefs_obj = kzalloc_obj(*orangefs_obj, GFP_KERNEL);
+ orangefs_obj = kzalloc_obj(*orangefs_obj);
if (!orangefs_obj)
goto out;
@@ -1185,7 +1185,7 @@ int orangefs_sysfs_init(void)
kobject_uevent(orangefs_obj, KOBJ_ADD);
/* create /sys/fs/orangefs/acache. */
- acache_orangefs_obj = kzalloc_obj(*acache_orangefs_obj, GFP_KERNEL);
+ acache_orangefs_obj = kzalloc_obj(*acache_orangefs_obj);
if (!acache_orangefs_obj) {
rc = -EINVAL;
goto ofs_obj_bail;
@@ -1202,7 +1202,7 @@ int orangefs_sysfs_init(void)
kobject_uevent(acache_orangefs_obj, KOBJ_ADD);
/* create /sys/fs/orangefs/capcache. */
- capcache_orangefs_obj = kzalloc_obj(*capcache_orangefs_obj, GFP_KERNEL);
+ capcache_orangefs_obj = kzalloc_obj(*capcache_orangefs_obj);
if (!capcache_orangefs_obj) {
rc = -EINVAL;
goto acache_obj_bail;
@@ -1218,7 +1218,7 @@ int orangefs_sysfs_init(void)
kobject_uevent(capcache_orangefs_obj, KOBJ_ADD);
/* create /sys/fs/orangefs/ccache. */
- ccache_orangefs_obj = kzalloc_obj(*ccache_orangefs_obj, GFP_KERNEL);
+ ccache_orangefs_obj = kzalloc_obj(*ccache_orangefs_obj);
if (!ccache_orangefs_obj) {
rc = -EINVAL;
goto capcache_obj_bail;
@@ -1234,7 +1234,7 @@ int orangefs_sysfs_init(void)
kobject_uevent(ccache_orangefs_obj, KOBJ_ADD);
/* create /sys/fs/orangefs/ncache. */
- ncache_orangefs_obj = kzalloc_obj(*ncache_orangefs_obj, GFP_KERNEL);
+ ncache_orangefs_obj = kzalloc_obj(*ncache_orangefs_obj);
if (!ncache_orangefs_obj) {
rc = -EINVAL;
goto ccache_obj_bail;
@@ -1251,7 +1251,7 @@ int orangefs_sysfs_init(void)
kobject_uevent(ncache_orangefs_obj, KOBJ_ADD);
/* create /sys/fs/orangefs/perf_counters. */
- pc_orangefs_obj = kzalloc_obj(*pc_orangefs_obj, GFP_KERNEL);
+ pc_orangefs_obj = kzalloc_obj(*pc_orangefs_obj);
if (!pc_orangefs_obj) {
rc = -EINVAL;
goto ncache_obj_bail;
@@ -1268,7 +1268,7 @@ int orangefs_sysfs_init(void)
kobject_uevent(pc_orangefs_obj, KOBJ_ADD);
/* create /sys/fs/orangefs/stats. */
- stats_orangefs_obj = kzalloc_obj(*stats_orangefs_obj, GFP_KERNEL);
+ stats_orangefs_obj = kzalloc_obj(*stats_orangefs_obj);
if (!stats_orangefs_obj) {
rc = -EINVAL;
goto pc_obj_bail;
diff --git a/fs/orangefs/super.c b/fs/orangefs/super.c
index 3030509ddeaf..4ec7329b41f6 100644
--- a/fs/orangefs/super.c
+++ b/fs/orangefs/super.c
@@ -578,7 +578,7 @@ int orangefs_init_fs_context(struct fs_context *fc)
{
struct orangefs_sb_info_s *osi;
- osi = kzalloc_obj(struct orangefs_sb_info_s, GFP_KERNEL);
+ osi = kzalloc_obj(struct orangefs_sb_info_s);
if (!osi)
return -ENOMEM;
diff --git a/fs/orangefs/xattr.c b/fs/orangefs/xattr.c
index 44712bcdcef7..1b372189cd10 100644
--- a/fs/orangefs/xattr.c
+++ b/fs/orangefs/xattr.c
@@ -171,7 +171,7 @@ ssize_t orangefs_inode_getxattr(struct inode *inode, const char *name,
" does not exist!\n",
get_khandle_from_ino(inode),
(char *)new_op->upcall.req.getxattr.key);
- cx = kmalloc_obj(*cx, GFP_KERNEL);
+ cx = kmalloc_obj(*cx);
if (cx) {
strscpy(cx->key, name);
cx->length = -1;
@@ -225,7 +225,7 @@ ssize_t orangefs_inode_getxattr(struct inode *inode, const char *name,
cx->length = length;
cx->timeout = jiffies + HZ;
} else {
- cx = kmalloc_obj(*cx, GFP_KERNEL);
+ cx = kmalloc_obj(*cx);
if (cx) {
strscpy(cx->key, name);
memcpy(cx->val, buffer, length);
diff --git a/fs/overlayfs/file.c b/fs/overlayfs/file.c
index 7f7a2c2a7937..97bed2286030 100644
--- a/fs/overlayfs/file.c
+++ b/fs/overlayfs/file.c
@@ -96,7 +96,7 @@ struct ovl_file {
struct ovl_file *ovl_file_alloc(struct file *realfile)
{
- struct ovl_file *of = kzalloc_obj(struct ovl_file, GFP_KERNEL);
+ struct ovl_file *of = kzalloc_obj(struct ovl_file);
if (unlikely(!of))
return NULL;
diff --git a/fs/overlayfs/namei.c b/fs/overlayfs/namei.c
index f30b81ee0d9b..d8dd4b052984 100644
--- a/fs/overlayfs/namei.c
+++ b/fs/overlayfs/namei.c
@@ -481,7 +481,7 @@ int ovl_check_origin_fh(struct ovl_fs *ofs, struct ovl_fh *fh, bool connected,
goto invalid;
if (!*stackp)
- *stackp = kmalloc_obj(struct ovl_path, GFP_KERNEL);
+ *stackp = kmalloc_obj(struct ovl_path);
if (!*stackp) {
dput(origin);
return -ENOMEM;
diff --git a/fs/overlayfs/params.c b/fs/overlayfs/params.c
index af735a0c310a..8111b437ae5d 100644
--- a/fs/overlayfs/params.c
+++ b/fs/overlayfs/params.c
@@ -790,7 +790,7 @@ int ovl_init_fs_context(struct fs_context *fc)
goto out_err;
ctx->capacity = 3;
- ofs = kzalloc_obj(struct ovl_fs, GFP_KERNEL);
+ ofs = kzalloc_obj(struct ovl_fs);
if (!ofs)
goto out_err;
diff --git a/fs/overlayfs/readdir.c b/fs/overlayfs/readdir.c
index 953c2cdca1b4..a4271e5fb8e6 100644
--- a/fs/overlayfs/readdir.c
+++ b/fs/overlayfs/readdir.c
@@ -493,7 +493,7 @@ static struct ovl_dir_cache *ovl_cache_get(struct dentry *dentry)
}
ovl_set_dir_cache(d_inode(dentry), NULL);
- cache = kzalloc_obj(struct ovl_dir_cache, GFP_KERNEL);
+ cache = kzalloc_obj(struct ovl_dir_cache);
if (!cache)
return ERR_PTR(-ENOMEM);
@@ -706,7 +706,7 @@ static struct ovl_dir_cache *ovl_cache_get_impure(const struct path *path)
ovl_dir_cache_free(inode);
ovl_set_dir_cache(inode, NULL);
- cache = kzalloc_obj(struct ovl_dir_cache, GFP_KERNEL);
+ cache = kzalloc_obj(struct ovl_dir_cache);
if (!cache)
return ERR_PTR(-ENOMEM);
diff --git a/fs/overlayfs/super.c b/fs/overlayfs/super.c
index f3a39b7703f5..d4c12feec039 100644
--- a/fs/overlayfs/super.c
+++ b/fs/overlayfs/super.c
@@ -1031,7 +1031,7 @@ static int ovl_get_layers(struct super_block *sb, struct ovl_fs *ofs,
unsigned int i;
size_t nr_merged_lower;
- ofs->fs = kzalloc_objs(struct ovl_sb, ctx->nr + 2, GFP_KERNEL);
+ ofs->fs = kzalloc_objs(struct ovl_sb, ctx->nr + 2);
if (ofs->fs == NULL)
return -ENOMEM;
@@ -1393,7 +1393,7 @@ static int ovl_fill_super_creds(struct fs_context *fc, struct super_block *sb)
}
err = -ENOMEM;
- layers = kzalloc_objs(struct ovl_layer, ctx->nr + 1, GFP_KERNEL);
+ layers = kzalloc_objs(struct ovl_layer, ctx->nr + 1);
if (!layers)
return err;
diff --git a/fs/overlayfs/util.c b/fs/overlayfs/util.c
index a28524e83662..4eeafd943fb9 100644
--- a/fs/overlayfs/util.c
+++ b/fs/overlayfs/util.c
@@ -113,7 +113,7 @@ bool ovl_verify_lower(struct super_block *sb)
struct ovl_path *ovl_stack_alloc(unsigned int n)
{
- return kzalloc_objs(struct ovl_path, n, GFP_KERNEL);
+ return kzalloc_objs(struct ovl_path, n);
}
void ovl_stack_cpy(struct ovl_path *dst, struct ovl_path *src, unsigned int n)
diff --git a/fs/proc/kcore.c b/fs/proc/kcore.c
index 55438bc0afc8..390547b992ac 100644
--- a/fs/proc/kcore.c
+++ b/fs/proc/kcore.c
@@ -143,7 +143,7 @@ static int kcore_ram_list(struct list_head *head)
{
struct kcore_list *ent;
- ent = kmalloc_obj(*ent, GFP_KERNEL);
+ ent = kmalloc_obj(*ent);
if (!ent)
return -ENOMEM;
ent->addr = (unsigned long)__va(0);
@@ -178,7 +178,7 @@ get_sparsemem_vmemmap_info(struct kcore_list *ent, struct list_head *head)
end = tmp->addr;
}
if (start < end) {
- vmm = kmalloc_obj(*vmm, GFP_KERNEL);
+ vmm = kmalloc_obj(*vmm);
if (!vmm)
return 0;
vmm->addr = start;
@@ -210,7 +210,7 @@ kclist_add_private(unsigned long pfn, unsigned long nr_pages, void *arg)
p = pfn_to_page(pfn);
- ent = kmalloc_obj(*ent, GFP_KERNEL);
+ ent = kmalloc_obj(*ent);
if (!ent)
return -ENOMEM;
ent->addr = (unsigned long)page_to_virt(p);
diff --git a/fs/proc/root.c b/fs/proc/root.c
index fb0ccacb08e6..0f9100559471 100644
--- a/fs/proc/root.c
+++ b/fs/proc/root.c
@@ -249,7 +249,7 @@ static int proc_fill_super(struct super_block *s, struct fs_context *fc)
struct proc_fs_info *fs_info;
int ret;
- fs_info = kzalloc_obj(*fs_info, GFP_KERNEL);
+ fs_info = kzalloc_obj(*fs_info);
if (!fs_info)
return -ENOMEM;
@@ -331,7 +331,7 @@ static int proc_init_fs_context(struct fs_context *fc)
{
struct proc_fs_context *ctx;
- ctx = kzalloc_obj(struct proc_fs_context, GFP_KERNEL);
+ ctx = kzalloc_obj(struct proc_fs_context);
if (!ctx)
return -ENOMEM;
diff --git a/fs/proc/task_mmu.c b/fs/proc/task_mmu.c
index 0418511f69fe..e091931d7ca1 100644
--- a/fs/proc/task_mmu.c
+++ b/fs/proc/task_mmu.c
@@ -2981,7 +2981,7 @@ static int pagemap_scan_init_bounce_buffer(struct pagemap_scan_private *p)
p->vec_buf_len = min_t(size_t, PAGEMAP_WALK_SIZE >> PAGE_SHIFT,
p->arg.vec_len);
- p->vec_buf = kmalloc_objs(*p->vec_buf, p->vec_buf_len, GFP_KERNEL);
+ p->vec_buf = kmalloc_objs(*p->vec_buf, p->vec_buf_len);
if (!p->vec_buf)
return -ENOMEM;
diff --git a/fs/pstore/blk.c b/fs/pstore/blk.c
index 0c9c8b6fdbb8..12070b6a7b11 100644
--- a/fs/pstore/blk.c
+++ b/fs/pstore/blk.c
@@ -297,7 +297,7 @@ static int __init __best_effort_init(void)
return -EINVAL;
}
- best_effort_dev = kzalloc_obj(*best_effort_dev, GFP_KERNEL);
+ best_effort_dev = kzalloc_obj(*best_effort_dev);
if (!best_effort_dev)
return -ENOMEM;
diff --git a/fs/pstore/inode.c b/fs/pstore/inode.c
index 8ebcd231e09a..83fa0bb3435a 100644
--- a/fs/pstore/inode.c
+++ b/fs/pstore/inode.c
@@ -70,7 +70,7 @@ static void *pstore_ftrace_seq_start(struct seq_file *s, loff_t *pos)
struct pstore_private *ps = s->private;
struct pstore_ftrace_seq_data *data __free(kfree) = NULL;
- data = kzalloc_obj(*data, GFP_KERNEL);
+ data = kzalloc_obj(*data);
if (!data)
return NULL;
@@ -365,7 +365,7 @@ int pstore_mkfile(struct dentry *root, struct pstore_record *record)
record->psi->name, record->id,
record->compressed ? ".enc.z" : "");
- private = kzalloc_obj(*private, GFP_KERNEL);
+ private = kzalloc_obj(*private);
if (!private)
return -ENOMEM;
@@ -477,7 +477,7 @@ static int pstore_init_fs_context(struct fs_context *fc)
{
struct pstore_context *ctx;
- ctx = kzalloc_obj(struct pstore_context, GFP_KERNEL);
+ ctx = kzalloc_obj(struct pstore_context);
if (!ctx)
return -ENOMEM;
diff --git a/fs/pstore/platform.c b/fs/pstore/platform.c
index ff9603bb89db..1d76c9d92056 100644
--- a/fs/pstore/platform.c
+++ b/fs/pstore/platform.c
@@ -683,7 +683,7 @@ void pstore_get_backend_records(struct pstore_info *psi,
struct pstore_record *record;
int rc;
- record = kzalloc_obj(*record, GFP_KERNEL);
+ record = kzalloc_obj(*record);
if (!record) {
pr_err("out of memory creating record\n");
break;
diff --git a/fs/pstore/ram.c b/fs/pstore/ram.c
index 79f801c913bf..c1cbf2fd1c0f 100644
--- a/fs/pstore/ram.c
+++ b/fs/pstore/ram.c
@@ -539,7 +539,7 @@ static int ramoops_init_przs(const char *name,
goto fail;
}
- prz_ar = kzalloc_objs(**przs, *cnt, GFP_KERNEL);
+ prz_ar = kzalloc_objs(**przs, *cnt);
if (!prz_ar)
goto fail;
diff --git a/fs/pstore/ram_core.c b/fs/pstore/ram_core.c
index 49d022b85d8a..7930c886dbf5 100644
--- a/fs/pstore/ram_core.c
+++ b/fs/pstore/ram_core.c
@@ -438,7 +438,7 @@ static void *persistent_ram_vmap(phys_addr_t start, size_t size,
return NULL;
}
- pages = kmalloc_objs(struct page *, page_count, GFP_KERNEL);
+ pages = kmalloc_objs(struct page *, page_count);
if (!pages) {
pr_err("%s: Failed to allocate array for %u pages\n",
__func__, page_count);
@@ -605,7 +605,7 @@ struct persistent_ram_zone *persistent_ram_new(phys_addr_t start, size_t size,
struct persistent_ram_zone *prz;
int ret = -ENOMEM;
- prz = kzalloc_obj(struct persistent_ram_zone, GFP_KERNEL);
+ prz = kzalloc_obj(struct persistent_ram_zone);
if (!prz) {
pr_err("failed to allocate persistent ram zone\n");
goto err;
diff --git a/fs/pstore/zone.c b/fs/pstore/zone.c
index 6687d255a36b..a3b003f9a3a0 100644
--- a/fs/pstore/zone.c
+++ b/fs/pstore/zone.c
@@ -1166,7 +1166,7 @@ static struct pstore_zone *psz_init_zone(enum pstore_type_id type,
return ERR_PTR(-ENOMEM);
}
- zone = kzalloc_obj(struct pstore_zone, GFP_KERNEL);
+ zone = kzalloc_obj(struct pstore_zone);
if (!zone)
return ERR_PTR(-ENOMEM);
@@ -1218,7 +1218,7 @@ static struct pstore_zone **psz_init_zones(enum pstore_type_id type,
return ERR_PTR(-EINVAL);
}
- zones = kzalloc_objs(*zones, c, GFP_KERNEL);
+ zones = kzalloc_objs(*zones, c);
if (!zones) {
pr_err("allocate for zones %s failed\n", name);
return ERR_PTR(-ENOMEM);
diff --git a/fs/qnx4/inode.c b/fs/qnx4/inode.c
index e8c4de5de7be..8aeb63d397cf 100644
--- a/fs/qnx4/inode.c
+++ b/fs/qnx4/inode.c
@@ -197,7 +197,7 @@ static int qnx4_fill_super(struct super_block *s, struct fs_context *fc)
struct qnx4_sb_info *qs;
int silent = fc->sb_flags & SB_SILENT;
- qs = kzalloc_obj(struct qnx4_sb_info, GFP_KERNEL);
+ qs = kzalloc_obj(struct qnx4_sb_info);
if (!qs)
return -ENOMEM;
s->s_fs_info = qs;
diff --git a/fs/qnx6/inode.c b/fs/qnx6/inode.c
index de1e1a61810d..c4049bb8bd60 100644
--- a/fs/qnx6/inode.c
+++ b/fs/qnx6/inode.c
@@ -302,7 +302,7 @@ static int qnx6_fill_super(struct super_block *s, struct fs_context *fc)
int bootblock_offset = QNX6_BOOTBLOCK_SIZE;
int silent = fc->sb_flags & SB_SILENT;
- qs = kzalloc_obj(struct qnx6_sb_info, GFP_KERNEL);
+ qs = kzalloc_obj(struct qnx6_sb_info);
if (!qs)
return -ENOMEM;
s->s_fs_info = qs;
@@ -645,7 +645,7 @@ static int qnx6_init_fs_context(struct fs_context *fc)
{
struct qnx6_context *ctx;
- ctx = kzalloc_obj(struct qnx6_context, GFP_KERNEL);
+ ctx = kzalloc_obj(struct qnx6_context);
if (!ctx)
return -ENOMEM;
fc->ops = &qnx6_context_ops;
diff --git a/fs/qnx6/super_mmi.c b/fs/qnx6/super_mmi.c
index d36ade7fc477..b8afb6f388b2 100644
--- a/fs/qnx6/super_mmi.c
+++ b/fs/qnx6/super_mmi.c
@@ -100,7 +100,7 @@ struct qnx6_super_block *qnx6_mmi_fill_super(struct super_block *s, int silent)
goto out;
}
- qsb = kmalloc_obj(*qsb, GFP_KERNEL);
+ qsb = kmalloc_obj(*qsb);
if (!qsb) {
pr_err("unable to allocate memory.\n");
goto out;
diff --git a/fs/quota/quota_v2.c b/fs/quota/quota_v2.c
index d022b18782c6..a24fab5f9f80 100644
--- a/fs/quota/quota_v2.c
+++ b/fs/quota/quota_v2.c
@@ -121,7 +121,7 @@ static int v2_read_file_info(struct super_block *sb, int type)
ret = -EIO;
goto out;
}
- info->dqi_priv = kmalloc_obj(struct qtree_mem_dqinfo, GFP_KERNEL);
+ info->dqi_priv = kmalloc_obj(struct qtree_mem_dqinfo);
if (!info->dqi_priv) {
ret = -ENOMEM;
goto out;
diff --git a/fs/ramfs/inode.c b/fs/ramfs/inode.c
index d084b6804b65..3987639ed132 100644
--- a/fs/ramfs/inode.c
+++ b/fs/ramfs/inode.c
@@ -298,7 +298,7 @@ int ramfs_init_fs_context(struct fs_context *fc)
{
struct ramfs_fs_info *fsi;
- fsi = kzalloc_obj(*fsi, GFP_KERNEL);
+ fsi = kzalloc_obj(*fsi);
if (!fsi)
return -ENOMEM;
diff --git a/fs/resctrl/monitor.c b/fs/resctrl/monitor.c
index 6fd5c0e8a0dd..49f3f6b846b2 100644
--- a/fs/resctrl/monitor.c
+++ b/fs/resctrl/monitor.c
@@ -923,7 +923,7 @@ int setup_rmid_lru_list(void)
return 0;
idx_limit = resctrl_arch_system_num_rmid_idx();
- rmid_ptrs = kzalloc_objs(struct rmid_entry, idx_limit, GFP_KERNEL);
+ rmid_ptrs = kzalloc_objs(struct rmid_entry, idx_limit);
if (!rmid_ptrs)
return -ENOMEM;
diff --git a/fs/resctrl/pseudo_lock.c b/fs/resctrl/pseudo_lock.c
index 55e71d257324..fa3687d69ebd 100644
--- a/fs/resctrl/pseudo_lock.c
+++ b/fs/resctrl/pseudo_lock.c
@@ -154,7 +154,7 @@ static int pseudo_lock_cstates_constrain(struct pseudo_lock_region *plr)
int ret;
for_each_cpu(cpu, &plr->d->hdr.cpu_mask) {
- pm_req = kzalloc_obj(*pm_req, GFP_KERNEL);
+ pm_req = kzalloc_obj(*pm_req);
if (!pm_req) {
rdt_last_cmd_puts("Failure to allocate memory for PM QoS\n");
ret = -ENOMEM;
@@ -270,7 +270,7 @@ static int pseudo_lock_init(struct rdtgroup *rdtgrp)
{
struct pseudo_lock_region *plr;
- plr = kzalloc_obj(*plr, GFP_KERNEL);
+ plr = kzalloc_obj(*plr);
if (!plr)
return -ENOMEM;
diff --git a/fs/resctrl/rdtgroup.c b/fs/resctrl/rdtgroup.c
index 1135208adafb..5da305bd36c9 100644
--- a/fs/resctrl/rdtgroup.c
+++ b/fs/resctrl/rdtgroup.c
@@ -2686,7 +2686,7 @@ static int schemata_list_add(struct rdt_resource *r, enum resctrl_conf_type type
const char *suffix = "";
int ret, cl;
- s = kzalloc_obj(*s, GFP_KERNEL);
+ s = kzalloc_obj(*s);
if (!s)
return -ENOMEM;
@@ -2966,7 +2966,7 @@ static int rdt_init_fs_context(struct fs_context *fc)
{
struct rdt_fs_context *ctx;
- ctx = kzalloc_obj(*ctx, GFP_KERNEL);
+ ctx = kzalloc_obj(*ctx);
if (!ctx)
return -ENOMEM;
@@ -3117,7 +3117,7 @@ static struct mon_data *mon_get_kn_priv(enum resctrl_res_level rid, int domid,
return priv;
}
- priv = kzalloc_obj(*priv, GFP_KERNEL);
+ priv = kzalloc_obj(*priv);
if (!priv)
return NULL;
@@ -3753,7 +3753,7 @@ static int mkdir_rdt_prepare(struct kernfs_node *parent_kn,
}
/* allocate the rdtgroup. */
- rdtgrp = kzalloc_obj(*rdtgrp, GFP_KERNEL);
+ rdtgrp = kzalloc_obj(*rdtgrp);
if (!rdtgrp) {
ret = -ENOSPC;
rdt_last_cmd_puts("Kernel out of memory\n");
diff --git a/fs/signalfd.c b/fs/signalfd.c
index 0b663f9c1cff..dff53745e352 100644
--- a/fs/signalfd.c
+++ b/fs/signalfd.c
@@ -264,7 +264,7 @@ static int do_signalfd4(int ufd, sigset_t *mask, int flags)
int fd;
struct signalfd_ctx *ctx __free(kfree) = NULL;
- ctx = kmalloc_obj(*ctx, GFP_KERNEL);
+ ctx = kmalloc_obj(*ctx);
if (!ctx)
return -ENOMEM;
diff --git a/fs/smb/client/cached_dir.c b/fs/smb/client/cached_dir.c
index 94574dab56f6..c327c246a9b4 100644
--- a/fs/smb/client/cached_dir.c
+++ b/fs/smb/client/cached_dir.c
@@ -813,7 +813,7 @@ struct cached_fids *init_cached_dirs(void)
{
struct cached_fids *cfids;
- cfids = kzalloc_obj(*cfids, GFP_KERNEL);
+ cfids = kzalloc_obj(*cfids);
if (!cfids)
return NULL;
spin_lock_init(&cfids->cfid_list_lock);
diff --git a/fs/smb/client/cifsacl.c b/fs/smb/client/cifsacl.c
index 85ffb8cfe320..6fa12c901c14 100644
--- a/fs/smb/client/cifsacl.c
+++ b/fs/smb/client/cifsacl.c
@@ -805,7 +805,7 @@ static void parse_dacl(struct smb_acl *pdacl, char *end_of_acl,
offsetof(struct smb_sid, sub_auth) + sizeof(__le16)))
return;
- ppace = kmalloc_objs(struct smb_ace *, num_aces, GFP_KERNEL);
+ ppace = kmalloc_objs(struct smb_ace *, num_aces);
if (!ppace)
return;
@@ -1331,7 +1331,7 @@ static int build_sec_desc(struct smb_ntsd *pntsd, struct smb_ntsd *pnntsd,
if (uid_valid(uid)) { /* chown */
uid_t id;
- nowner_sid_ptr = kzalloc_obj(struct smb_sid, GFP_KERNEL);
+ nowner_sid_ptr = kzalloc_obj(struct smb_sid);
if (!nowner_sid_ptr) {
rc = -ENOMEM;
goto chown_chgrp_exit;
@@ -1359,7 +1359,7 @@ static int build_sec_desc(struct smb_ntsd *pntsd, struct smb_ntsd *pnntsd,
}
if (gid_valid(gid)) { /* chgrp */
gid_t id;
- ngroup_sid_ptr = kzalloc_obj(struct smb_sid, GFP_KERNEL);
+ ngroup_sid_ptr = kzalloc_obj(struct smb_sid);
if (!ngroup_sid_ptr) {
rc = -ENOMEM;
goto chown_chgrp_exit;
diff --git a/fs/smb/client/cifsencrypt.c b/fs/smb/client/cifsencrypt.c
index b717b348e98e..3d731f3af235 100644
--- a/fs/smb/client/cifsencrypt.c
+++ b/fs/smb/client/cifsencrypt.c
@@ -500,7 +500,7 @@ calc_seckey(struct cifs_ses *ses)
get_random_bytes(sec_key, CIFS_SESS_KEY_SIZE);
- ctx_arc4 = kmalloc_obj(*ctx_arc4, GFP_KERNEL);
+ ctx_arc4 = kmalloc_obj(*ctx_arc4);
if (!ctx_arc4) {
cifs_dbg(VFS, "Could not allocate arc4 context\n");
return -ENOMEM;
diff --git a/fs/smb/client/cifsfs.c b/fs/smb/client/cifsfs.c
index 85a53cd77f9e..99b04234a08e 100644
--- a/fs/smb/client/cifsfs.c
+++ b/fs/smb/client/cifsfs.c
@@ -1016,11 +1016,11 @@ cifs_smb3_do_mount(struct file_system_type *fs_type,
} else {
cifs_info("Attempting to mount %s\n", old_ctx->source);
}
- cifs_sb = kzalloc_obj(*cifs_sb, GFP_KERNEL);
+ cifs_sb = kzalloc_obj(*cifs_sb);
if (!cifs_sb)
return ERR_PTR(-ENOMEM);
- cifs_sb->ctx = kzalloc_obj(struct smb3_fs_context, GFP_KERNEL);
+ cifs_sb->ctx = kzalloc_obj(struct smb3_fs_context);
if (!cifs_sb->ctx) {
root = ERR_PTR(-ENOMEM);
goto out;
diff --git a/fs/smb/client/compress.c b/fs/smb/client/compress.c
index ae536aa63ef1..3d1e73f5d9af 100644
--- a/fs/smb/client/compress.c
+++ b/fs/smb/client/compress.c
@@ -229,7 +229,7 @@ static bool is_compressible(const struct iov_iter *data)
if (has_repeated_data(sample, len))
goto out;
- bkt = kzalloc_objs(*bkt, bkt_size, GFP_KERNEL);
+ bkt = kzalloc_objs(*bkt, bkt_size);
if (!bkt) {
WARN_ON_ONCE(1);
ret = false;
diff --git a/fs/smb/client/connect.c b/fs/smb/client/connect.c
index c7ed2ffb66ee..33dfe116ca52 100644
--- a/fs/smb/client/connect.c
+++ b/fs/smb/client/connect.c
@@ -1755,7 +1755,7 @@ cifs_get_tcp_session(struct smb3_fs_context *ctx,
if (tcp_ses)
return tcp_ses;
- tcp_ses = kzalloc_obj(struct TCP_Server_Info, GFP_KERNEL);
+ tcp_ses = kzalloc_obj(struct TCP_Server_Info);
if (!tcp_ses) {
rc = -ENOMEM;
goto out_err;
@@ -3674,7 +3674,7 @@ static int mount_setup_tlink(struct cifs_sb_info *cifs_sb, struct cifs_ses *ses,
struct tcon_link *tlink;
/* hang the tcon off of the superblock */
- tlink = kzalloc_obj(*tlink, GFP_KERNEL);
+ tlink = kzalloc_obj(*tlink);
if (tlink == NULL)
return -ENOMEM;
@@ -3798,7 +3798,7 @@ mchan_mount_alloc(struct cifs_ses *ses)
{
struct mchan_mount *mchan_mount;
- mchan_mount = kzalloc_obj(*mchan_mount, GFP_KERNEL);
+ mchan_mount = kzalloc_obj(*mchan_mount);
if (!mchan_mount)
return ERR_PTR(-ENOMEM);
@@ -4193,7 +4193,7 @@ cifs_construct_tcon(struct cifs_sb_info *cifs_sb, kuid_t fsuid)
struct smb3_fs_context *ctx;
char *origin_fullpath = NULL;
- ctx = kzalloc_obj(*ctx, GFP_KERNEL);
+ ctx = kzalloc_obj(*ctx);
if (ctx == NULL)
return ERR_PTR(-ENOMEM);
@@ -4367,7 +4367,7 @@ cifs_sb_tlink(struct cifs_sb_info *cifs_sb)
spin_unlock(&cifs_sb->tlink_tree_lock);
if (tlink == NULL) {
- newtlink = kzalloc_obj(*tlink, GFP_KERNEL);
+ newtlink = kzalloc_obj(*tlink);
if (newtlink == NULL)
return ERR_PTR(-ENOMEM);
newtlink->tl_uid = fsuid;
diff --git a/fs/smb/client/dfs.h b/fs/smb/client/dfs.h
index 0401c55517b8..16ac2cdd5c82 100644
--- a/fs/smb/client/dfs.h
+++ b/fs/smb/client/dfs.h
@@ -46,7 +46,7 @@ static inline struct dfs_ref_walk *ref_walk_alloc(void)
{
struct dfs_ref_walk *rw;
- rw = kmalloc_obj(*rw, GFP_KERNEL);
+ rw = kmalloc_obj(*rw);
if (!rw)
return ERR_PTR(-ENOMEM);
return rw;
diff --git a/fs/smb/client/file.c b/fs/smb/client/file.c
index 43b5b48f5a67..18f31d4eb98d 100644
--- a/fs/smb/client/file.c
+++ b/fs/smb/client/file.c
@@ -489,7 +489,7 @@ int cifs_posix_open(const char *full_path, struct inode **pinode,
cifs_dbg(FYI, "posix open %s\n", full_path);
- presp_data = kzalloc_obj(FILE_UNIX_BASIC_INFO, GFP_KERNEL);
+ presp_data = kzalloc_obj(FILE_UNIX_BASIC_INFO);
if (presp_data == NULL)
return -ENOMEM;
@@ -673,11 +673,11 @@ struct cifsFileInfo *cifs_new_fileinfo(struct cifs_fid *fid, struct file *file,
struct cifs_tcon *tcon = tlink_tcon(tlink);
struct TCP_Server_Info *server = tcon->ses->server;
- cfile = kzalloc_obj(struct cifsFileInfo, GFP_KERNEL);
+ cfile = kzalloc_obj(struct cifsFileInfo);
if (cfile == NULL)
return cfile;
- fdlocks = kzalloc_obj(struct cifs_fid_locks, GFP_KERNEL);
+ fdlocks = kzalloc_obj(struct cifs_fid_locks);
if (!fdlocks) {
kfree(cfile);
return NULL;
@@ -1458,7 +1458,7 @@ int cifs_close(struct inode *inode, struct file *file)
if (file->private_data != NULL) {
cfile = file->private_data;
file->private_data = NULL;
- dclose = kmalloc_obj(struct cifs_deferred_close, GFP_KERNEL);
+ dclose = kmalloc_obj(struct cifs_deferred_close);
if ((cfile->status_file_deleted == false) &&
(smb2_can_defer_close(inode, dclose))) {
if (test_and_clear_bit(NETFS_ICTX_MODIFIED_ATTR, &cinode->netfs.flags)) {
@@ -1582,7 +1582,7 @@ static struct cifsLockInfo *
cifs_lock_init(__u64 offset, __u64 length, __u8 type, __u16 flags)
{
struct cifsLockInfo *lock =
- kmalloc_obj(struct cifsLockInfo, GFP_KERNEL);
+ kmalloc_obj(struct cifsLockInfo);
if (!lock)
return lock;
lock->offset = offset;
@@ -1853,7 +1853,7 @@ cifs_push_mandatory_locks(struct cifsFileInfo *cfile)
PAGE_SIZE);
max_num = (max_buf - sizeof(struct smb_hdr)) /
sizeof(LOCKING_ANDX_RANGE);
- buf = kzalloc_objs(LOCKING_ANDX_RANGE, max_num, GFP_KERNEL);
+ buf = kzalloc_objs(LOCKING_ANDX_RANGE, max_num);
if (!buf) {
free_xid(xid);
return -ENOMEM;
@@ -1945,7 +1945,7 @@ cifs_push_posix_locks(struct cifsFileInfo *cfile)
* protects locking operations of this inode.
*/
for (i = 0; i < count; i++) {
- lck = kmalloc_obj(struct lock_to_push, GFP_KERNEL);
+ lck = kmalloc_obj(struct lock_to_push);
if (!lck) {
rc = -ENOMEM;
goto err_out;
@@ -2229,7 +2229,7 @@ cifs_unlock_range(struct cifsFileInfo *cfile, struct file_lock *flock,
PAGE_SIZE);
max_num = (max_buf - sizeof(struct smb_hdr)) /
sizeof(LOCKING_ANDX_RANGE);
- buf = kzalloc_objs(LOCKING_ANDX_RANGE, max_num, GFP_KERNEL);
+ buf = kzalloc_objs(LOCKING_ANDX_RANGE, max_num);
if (!buf)
return -ENOMEM;
diff --git a/fs/smb/client/fs_context.c b/fs/smb/client/fs_context.c
index 4810f926dccb..09fe749e97ee 100644
--- a/fs/smb/client/fs_context.c
+++ b/fs/smb/client/fs_context.c
@@ -1924,7 +1924,7 @@ int smb3_init_fs_context(struct fs_context *fc)
char *nodename = utsname()->nodename;
int i;
- ctx = kzalloc_obj(struct smb3_fs_context, GFP_KERNEL);
+ ctx = kzalloc_obj(struct smb3_fs_context);
if (unlikely(!ctx))
return -ENOMEM;
diff --git a/fs/smb/client/inode.c b/fs/smb/client/inode.c
index d40f39f9547c..d4d3cfeb6c90 100644
--- a/fs/smb/client/inode.c
+++ b/fs/smb/client/inode.c
@@ -1841,7 +1841,7 @@ cifs_rename_pending_delete(const char *full_path, struct dentry *dentry,
/* set ATTR_HIDDEN and clear ATTR_READONLY, but only if needed */
if (dosattr != origattr) {
- info_buf = kzalloc_obj(*info_buf, GFP_KERNEL);
+ info_buf = kzalloc_obj(*info_buf);
if (info_buf == NULL) {
rc = -ENOMEM;
goto out_close;
@@ -2041,7 +2041,7 @@ static int __cifs_unlink(struct inode *dir, struct dentry *dentry, bool sillyren
}
}
} else if ((rc == -EACCES) && (dosattr == 0) && inode) {
- attrs = kzalloc_obj(*attrs, GFP_KERNEL);
+ attrs = kzalloc_obj(*attrs);
if (attrs == NULL) {
rc = -ENOMEM;
goto out_reval;
@@ -2197,7 +2197,7 @@ cifs_posix_mkdir(struct inode *inode, struct dentry *dentry, umode_t mode,
struct inode *newinode = NULL;
struct cifs_fattr fattr;
- info = kzalloc_obj(FILE_UNIX_BASIC_INFO, GFP_KERNEL);
+ info = kzalloc_obj(FILE_UNIX_BASIC_INFO);
if (info == NULL) {
rc = -ENOMEM;
goto posix_mkdir_out;
@@ -2585,7 +2585,7 @@ cifs_rename2(struct mnt_idmap *idmap, struct inode *source_dir,
* with unix extensions enabled.
*/
info_buf_source =
- kmalloc_objs(FILE_UNIX_BASIC_INFO, 2, GFP_KERNEL);
+ kmalloc_objs(FILE_UNIX_BASIC_INFO, 2);
if (info_buf_source == NULL) {
rc = -ENOMEM;
goto cifs_rename_exit;
@@ -3166,7 +3166,7 @@ cifs_setattr_unix(struct dentry *direntry, struct iattr *attrs)
if (attrs->ia_valid & (ATTR_KILL_SUID|ATTR_KILL_SGID))
attrs->ia_valid &= ~ATTR_MODE;
- args = kmalloc_obj(*args, GFP_KERNEL);
+ args = kmalloc_obj(*args);
if (args == NULL) {
rc = -ENOMEM;
goto out;
diff --git a/fs/smb/client/ioctl.c b/fs/smb/client/ioctl.c
index 6d24184c8735..8dc2651e237f 100644
--- a/fs/smb/client/ioctl.c
+++ b/fs/smb/client/ioctl.c
@@ -133,7 +133,7 @@ static long smb_mnt_get_fsinfo(unsigned int xid, struct cifs_tcon *tcon,
int rc = 0;
struct smb_mnt_fs_info *fsinf;
- fsinf = kzalloc_obj(struct smb_mnt_fs_info, GFP_KERNEL);
+ fsinf = kzalloc_obj(struct smb_mnt_fs_info);
if (fsinf == NULL)
return -ENOMEM;
diff --git a/fs/smb/client/misc.c b/fs/smb/client/misc.c
index 290d0a0bea53..aec6f2c52408 100644
--- a/fs/smb/client/misc.c
+++ b/fs/smb/client/misc.c
@@ -67,7 +67,7 @@ sesInfoAlloc(void)
{
struct cifs_ses *ret_buf;
- ret_buf = kzalloc_obj(struct cifs_ses, GFP_KERNEL);
+ ret_buf = kzalloc_obj(struct cifs_ses);
if (ret_buf) {
atomic_inc(&sesInfoAllocCount);
spin_lock_init(&ret_buf->ses_lock);
@@ -118,7 +118,7 @@ tcon_info_alloc(bool dir_leases_enabled, enum smb3_tcon_ref_trace trace)
struct cifs_tcon *ret_buf;
static atomic_t tcon_debug_id;
- ret_buf = kzalloc_obj(*ret_buf, GFP_KERNEL);
+ ret_buf = kzalloc_obj(*ret_buf);
if (!ret_buf)
return NULL;
diff --git a/fs/smb/client/readdir.c b/fs/smb/client/readdir.c
index 53e17fb2b6ee..8615a8747b7f 100644
--- a/fs/smb/client/readdir.c
+++ b/fs/smb/client/readdir.c
@@ -358,7 +358,7 @@ _initiate_cifs_search(const unsigned int xid, struct file *file,
if (IS_ERR(tlink))
return PTR_ERR(tlink);
- cifsFile = kzalloc_obj(struct cifsFileInfo, GFP_KERNEL);
+ cifsFile = kzalloc_obj(struct cifsFileInfo);
if (cifsFile == NULL) {
rc = -ENOMEM;
goto error_exit;
diff --git a/fs/smb/client/sess.c b/fs/smb/client/sess.c
index e32f9e185499..698bd27119ae 100644
--- a/fs/smb/client/sess.c
+++ b/fs/smb/client/sess.c
@@ -510,7 +510,7 @@ cifs_ses_add_channel(struct cifs_ses *ses,
* the session and server without caring about memory
* management.
*/
- ctx = kzalloc_obj(*ctx, GFP_KERNEL);
+ ctx = kzalloc_obj(*ctx);
if (!ctx) {
rc = -ENOMEM;
goto out_free_xid;
diff --git a/fs/smb/client/smb1ops.c b/fs/smb/client/smb1ops.c
index 689e052c2809..aed49aaef8c4 100644
--- a/fs/smb/client/smb1ops.c
+++ b/fs/smb/client/smb1ops.c
@@ -506,7 +506,7 @@ cifs_is_path_accessible(const unsigned int xid, struct cifs_tcon *tcon,
int rc;
FILE_ALL_INFO *file_info;
- file_info = kmalloc_obj(FILE_ALL_INFO, GFP_KERNEL);
+ file_info = kmalloc_obj(FILE_ALL_INFO);
if (file_info == NULL)
return -ENOMEM;
diff --git a/fs/smb/client/smb1session.c b/fs/smb/client/smb1session.c
index f5ef07d24b5f..83bfbf0c068e 100644
--- a/fs/smb/client/smb1session.c
+++ b/fs/smb/client/smb1session.c
@@ -725,7 +725,7 @@ sess_auth_rawntlmssp_negotiate(struct sess_data *sess_data)
* if memory allocation is successful, caller of this function
* frees it.
*/
- ses->ntlmssp = kmalloc_obj(struct ntlmssp_auth, GFP_KERNEL);
+ ses->ntlmssp = kmalloc_obj(struct ntlmssp_auth);
if (!ses->ntlmssp) {
rc = -ENOMEM;
goto out;
@@ -969,7 +969,7 @@ int CIFS_SessSetup(const unsigned int xid, struct cifs_ses *ses,
return -EINVAL;
}
- sess_data = kzalloc_obj(struct sess_data, GFP_KERNEL);
+ sess_data = kzalloc_obj(struct sess_data);
if (!sess_data)
return -ENOMEM;
diff --git a/fs/smb/client/smb2file.c b/fs/smb/client/smb2file.c
index 6dba874156aa..1ab41de2b634 100644
--- a/fs/smb/client/smb2file.c
+++ b/fs/smb/client/smb2file.c
@@ -281,7 +281,7 @@ smb2_unlock_range(struct cifsFileInfo *cfile, struct file_lock *flock,
BUILD_BUG_ON(sizeof(struct smb2_lock_element) > PAGE_SIZE);
max_buf = min_t(unsigned int, max_buf, PAGE_SIZE);
max_num = max_buf / sizeof(struct smb2_lock_element);
- buf = kzalloc_objs(struct smb2_lock_element, max_num, GFP_KERNEL);
+ buf = kzalloc_objs(struct smb2_lock_element, max_num);
if (!buf)
return -ENOMEM;
@@ -424,7 +424,7 @@ smb2_push_mandatory_locks(struct cifsFileInfo *cfile)
BUILD_BUG_ON(sizeof(struct smb2_lock_element) > PAGE_SIZE);
max_buf = min_t(unsigned int, max_buf, PAGE_SIZE);
max_num = max_buf / sizeof(struct smb2_lock_element);
- buf = kzalloc_objs(struct smb2_lock_element, max_num, GFP_KERNEL);
+ buf = kzalloc_objs(struct smb2_lock_element, max_num);
if (!buf) {
free_xid(xid);
return -ENOMEM;
diff --git a/fs/smb/client/smb2misc.c b/fs/smb/client/smb2misc.c
index efba7cb9fb70..e19674d9b92b 100644
--- a/fs/smb/client/smb2misc.c
+++ b/fs/smb/client/smb2misc.c
@@ -526,7 +526,7 @@ smb2_queue_pending_open_break(struct tcon_link *tlink, __u8 *lease_key,
{
struct smb2_lease_break_work *lw;
- lw = kmalloc_obj(struct smb2_lease_break_work, GFP_KERNEL);
+ lw = kmalloc_obj(struct smb2_lease_break_work);
if (!lw) {
cifs_put_tlink(tlink);
return;
@@ -798,7 +798,7 @@ __smb2_handle_cancelled_cmd(struct cifs_tcon *tcon, __u16 cmd, __u64 mid,
{
struct close_cancelled_open *cancelled;
- cancelled = kzalloc_obj(*cancelled, GFP_KERNEL);
+ cancelled = kzalloc_obj(*cancelled);
if (!cancelled)
return -ENOMEM;
diff --git a/fs/smb/client/smb2ops.c b/fs/smb/client/smb2ops.c
index 071df7465a8b..1ba66e1f6ffa 100644
--- a/fs/smb/client/smb2ops.c
+++ b/fs/smb/client/smb2ops.c
@@ -731,7 +731,7 @@ parse_server_interfaces(struct network_interface_info_ioctl_rsp *buf,
spin_unlock(&ses->iface_lock);
/* no match. insert the entry in the list */
- info = kmalloc_obj(struct cifs_server_iface, GFP_KERNEL);
+ info = kmalloc_obj(struct cifs_server_iface);
if (!info) {
rc = -ENOMEM;
goto out;
@@ -1201,7 +1201,7 @@ smb2_set_ea(const unsigned int xid, struct cifs_tcon *tcon,
ea = NULL;
resp_buftype[0] = resp_buftype[1] = resp_buftype[2] = CIFS_NO_BUFFER;
- vars = kzalloc_obj(*vars, GFP_KERNEL);
+ vars = kzalloc_obj(*vars);
if (!vars) {
rc = -ENOMEM;
goto out_free_path;
@@ -2849,7 +2849,7 @@ smb2_query_info_compound(const unsigned int xid, struct cifs_tcon *tcon,
flags |= CIFS_TRANSFORM_REQ;
resp_buftype[0] = resp_buftype[1] = resp_buftype[2] = CIFS_NO_BUFFER;
- vars = kzalloc_obj(*vars, GFP_KERNEL);
+ vars = kzalloc_obj(*vars);
if (!vars) {
rc = -ENOMEM;
goto out_free_path;
@@ -4220,7 +4220,7 @@ smb2_create_lease_buf(u8 *lease_key, u8 oplock, u8 *parent_lease_key, __le32 fla
{
struct create_lease *buf;
- buf = kzalloc_obj(struct create_lease, GFP_KERNEL);
+ buf = kzalloc_obj(struct create_lease);
if (!buf)
return NULL;
@@ -4246,7 +4246,7 @@ smb3_create_lease_buf(u8 *lease_key, u8 oplock, u8 *parent_lease_key, __le32 fla
{
struct create_lease_v2 *buf;
- buf = kzalloc_obj(struct create_lease_v2, GFP_KERNEL);
+ buf = kzalloc_obj(struct create_lease_v2);
if (!buf)
return NULL;
@@ -4930,7 +4930,7 @@ receive_encrypted_read(struct TCP_Server_Info *server, struct mid_q_entry **mid,
int rc;
struct smb2_decrypt_work *dw;
- dw = kzalloc_obj(struct smb2_decrypt_work, GFP_KERNEL);
+ dw = kzalloc_obj(struct smb2_decrypt_work);
if (!dw)
return -ENOMEM;
INIT_WORK(&dw->decrypt, smb2_decrypt_offload);
diff --git a/fs/smb/client/smb2pdu.c b/fs/smb/client/smb2pdu.c
index 0ebfdfebc5e9..ef655acf673d 100644
--- a/fs/smb/client/smb2pdu.c
+++ b/fs/smb/client/smb2pdu.c
@@ -1009,7 +1009,7 @@ create_posix_buf(umode_t mode)
{
struct create_posix *buf;
- buf = kzalloc_obj(struct create_posix, GFP_KERNEL);
+ buf = kzalloc_obj(struct create_posix);
if (!buf)
return NULL;
@@ -1785,7 +1785,7 @@ SMB2_sess_auth_rawntlmssp_negotiate(struct SMB2_sess_data *sess_data)
* If memory allocation is successful, caller of this function
* frees it.
*/
- ses->ntlmssp = kmalloc_obj(struct ntlmssp_auth, GFP_KERNEL);
+ ses->ntlmssp = kmalloc_obj(struct ntlmssp_auth);
if (!ses->ntlmssp) {
rc = -ENOMEM;
goto out_err;
@@ -1983,7 +1983,7 @@ SMB2_sess_setup(const unsigned int xid, struct cifs_ses *ses,
return smb_EIO(smb_eio_trace_null_pointers);
}
- sess_data = kzalloc_obj(struct SMB2_sess_data, GFP_KERNEL);
+ sess_data = kzalloc_obj(struct SMB2_sess_data);
if (!sess_data)
return -ENOMEM;
@@ -2297,7 +2297,7 @@ create_durable_buf(void)
{
create_durable_req_t *buf;
- buf = kzalloc_obj(create_durable_req_t, GFP_KERNEL);
+ buf = kzalloc_obj(create_durable_req_t);
if (!buf)
return NULL;
@@ -2320,7 +2320,7 @@ create_reconnect_durable_buf(struct cifs_fid *fid)
{
create_durable_req_t *buf;
- buf = kzalloc_obj(create_durable_req_t, GFP_KERNEL);
+ buf = kzalloc_obj(create_durable_req_t);
if (!buf)
return NULL;
@@ -2492,7 +2492,7 @@ create_durable_v2_buf(struct cifs_open_parms *oparms)
struct cifs_fid *pfid = oparms->fid;
struct create_durable_req_v2 *buf;
- buf = kzalloc_obj(struct create_durable_req_v2, GFP_KERNEL);
+ buf = kzalloc_obj(struct create_durable_req_v2);
if (!buf)
return NULL;
@@ -2533,7 +2533,7 @@ create_reconnect_durable_v2_buf(struct cifs_fid *fid)
{
struct create_durable_handle_reconnect_v2 *buf;
- buf = kzalloc_obj(struct create_durable_handle_reconnect_v2, GFP_KERNEL);
+ buf = kzalloc_obj(struct create_durable_handle_reconnect_v2);
if (!buf)
return NULL;
@@ -2624,7 +2624,7 @@ create_twarp_buf(__u64 timewarp)
{
struct crt_twarp_ctxt *buf;
- buf = kzalloc_obj(struct crt_twarp_ctxt, GFP_KERNEL);
+ buf = kzalloc_obj(struct crt_twarp_ctxt);
if (!buf)
return NULL;
@@ -2791,7 +2791,7 @@ create_query_id_buf(void)
{
struct crt_query_id_ctxt *buf;
- buf = kzalloc_obj(struct crt_query_id_ctxt, GFP_KERNEL);
+ buf = kzalloc_obj(struct crt_query_id_ctxt);
if (!buf)
return NULL;
@@ -5843,7 +5843,7 @@ send_set_info(const unsigned int xid, struct cifs_tcon *tcon,
if (smb3_encryption_required(tcon))
flags |= CIFS_TRANSFORM_REQ;
- iov = kmalloc_objs(struct kvec, num, GFP_KERNEL);
+ iov = kmalloc_objs(struct kvec, num);
if (!iov)
return -ENOMEM;
diff --git a/fs/smb/client/smbdirect.c b/fs/smb/client/smbdirect.c
index e2df73c719fd..77f36d68621b 100644
--- a/fs/smb/client/smbdirect.c
+++ b/fs/smb/client/smbdirect.c
@@ -2098,7 +2098,7 @@ static struct smbd_connection *_smbd_get_connection(
char wq_name[80];
struct workqueue_struct *workqueue;
- info = kzalloc_obj(struct smbd_connection, GFP_KERNEL);
+ info = kzalloc_obj(struct smbd_connection);
if (!info)
return NULL;
sc = &info->socket;
@@ -2786,7 +2786,7 @@ static int allocate_mr_list(struct smbdirect_socket *sc)
/* Allocate more MRs (2x) than hardware responder_resources */
for (i = 0; i < sp->responder_resources * 2; i++) {
- mr = kzalloc_obj(*mr, GFP_KERNEL);
+ mr = kzalloc_obj(*mr);
if (!mr) {
ret = -ENOMEM;
goto kzalloc_mr_failed;
diff --git a/fs/splice.c b/fs/splice.c
index cad3779fa35c..9d8f63e2fd1a 100644
--- a/fs/splice.c
+++ b/fs/splice.c
@@ -275,8 +275,8 @@ int splice_grow_spd(const struct pipe_inode_info *pipe, struct splice_pipe_desc
if (max_usage <= PIPE_DEF_BUFFERS)
return 0;
- spd->pages = kmalloc_objs(struct page *, max_usage, GFP_KERNEL);
- spd->partial = kmalloc_objs(struct partial_page, max_usage, GFP_KERNEL);
+ spd->pages = kmalloc_objs(struct page *, max_usage);
+ spd->partial = kmalloc_objs(struct partial_page, max_usage);
if (spd->pages && spd->partial)
return 0;
@@ -675,7 +675,7 @@ iter_file_splice_write(struct pipe_inode_info *pipe, struct file *out,
if (!out->f_op->write_iter)
return -EINVAL;
- array = kzalloc_objs(struct bio_vec, nbufs, GFP_KERNEL);
+ array = kzalloc_objs(struct bio_vec, nbufs);
if (unlikely(!array))
return -ENOMEM;
@@ -696,7 +696,7 @@ iter_file_splice_write(struct pipe_inode_info *pipe, struct file *out,
if (unlikely(nbufs < pipe->max_usage)) {
kfree(array);
nbufs = pipe->max_usage;
- array = kzalloc_objs(struct bio_vec, nbufs, GFP_KERNEL);
+ array = kzalloc_objs(struct bio_vec, nbufs);
if (!array) {
ret = -ENOMEM;
break;
diff --git a/fs/squashfs/cache.c b/fs/squashfs/cache.c
index 5d97b22ce297..8e958db5f786 100644
--- a/fs/squashfs/cache.c
+++ b/fs/squashfs/cache.c
@@ -229,13 +229,13 @@ struct squashfs_cache *squashfs_cache_init(char *name, int entries,
if (entries == 0)
return NULL;
- cache = kzalloc_obj(*cache, GFP_KERNEL);
+ cache = kzalloc_obj(*cache);
if (cache == NULL) {
ERROR("Failed to allocate %s cache\n", name);
return ERR_PTR(-ENOMEM);
}
- cache->entry = kzalloc_objs(*(cache->entry), entries, GFP_KERNEL);
+ cache->entry = kzalloc_objs(*(cache->entry), entries);
if (cache->entry == NULL) {
ERROR("Failed to allocate %s cache\n", name);
goto cleanup;
diff --git a/fs/squashfs/decompressor_multi.c b/fs/squashfs/decompressor_multi.c
index 4d7bc620bef5..5c1aede1eddb 100644
--- a/fs/squashfs/decompressor_multi.c
+++ b/fs/squashfs/decompressor_multi.c
@@ -65,7 +65,7 @@ static void *squashfs_decompressor_create(struct squashfs_sb_info *msblk,
struct decomp_stream *decomp_strm = NULL;
int err = -ENOMEM;
- stream = kzalloc_obj(*stream, GFP_KERNEL);
+ stream = kzalloc_obj(*stream);
if (!stream)
goto out;
@@ -80,7 +80,7 @@ static void *squashfs_decompressor_create(struct squashfs_sb_info *msblk,
* we could always fall back to default decompressor and
* file system works.
*/
- decomp_strm = kmalloc_obj(*decomp_strm, GFP_KERNEL);
+ decomp_strm = kmalloc_obj(*decomp_strm);
if (!decomp_strm)
goto out;
@@ -148,7 +148,7 @@ static struct decomp_stream *get_decomp_stream(struct squashfs_sb_info *msblk,
goto wait;
/* Let's allocate new decomp */
- decomp_strm = kmalloc_obj(*decomp_strm, GFP_KERNEL);
+ decomp_strm = kmalloc_obj(*decomp_strm);
if (!decomp_strm)
goto wait;
diff --git a/fs/squashfs/decompressor_single.c b/fs/squashfs/decompressor_single.c
index 1f1597104ca8..48501ba55fce 100644
--- a/fs/squashfs/decompressor_single.c
+++ b/fs/squashfs/decompressor_single.c
@@ -30,7 +30,7 @@ static void *squashfs_decompressor_create(struct squashfs_sb_info *msblk,
struct squashfs_stream *stream;
int err = -ENOMEM;
- stream = kmalloc_obj(*stream, GFP_KERNEL);
+ stream = kmalloc_obj(*stream);
if (stream == NULL)
goto out;
diff --git a/fs/squashfs/lz4_wrapper.c b/fs/squashfs/lz4_wrapper.c
index e482757d8f2c..1646bbee290e 100644
--- a/fs/squashfs/lz4_wrapper.c
+++ b/fs/squashfs/lz4_wrapper.c
@@ -54,7 +54,7 @@ static void *lz4_init(struct squashfs_sb_info *msblk, void *buff)
int block_size = max_t(int, msblk->block_size, SQUASHFS_METADATA_SIZE);
struct squashfs_lz4 *stream;
- stream = kzalloc_obj(*stream, GFP_KERNEL);
+ stream = kzalloc_obj(*stream);
if (stream == NULL)
goto failed;
stream->input = vmalloc(block_size);
diff --git a/fs/squashfs/lzo_wrapper.c b/fs/squashfs/lzo_wrapper.c
index 961fda720c14..be1df7a25046 100644
--- a/fs/squashfs/lzo_wrapper.c
+++ b/fs/squashfs/lzo_wrapper.c
@@ -29,7 +29,7 @@ static void *lzo_init(struct squashfs_sb_info *msblk, void *buff)
{
int block_size = max_t(int, msblk->block_size, SQUASHFS_METADATA_SIZE);
- struct squashfs_lzo *stream = kzalloc_obj(*stream, GFP_KERNEL);
+ struct squashfs_lzo *stream = kzalloc_obj(*stream);
if (stream == NULL)
goto failed;
stream->input = vmalloc(block_size);
diff --git a/fs/squashfs/page_actor.c b/fs/squashfs/page_actor.c
index 3d8f0225e240..79b73e98abab 100644
--- a/fs/squashfs/page_actor.c
+++ b/fs/squashfs/page_actor.c
@@ -43,7 +43,7 @@ static void cache_finish_page(struct squashfs_page_actor *actor)
struct squashfs_page_actor *squashfs_page_actor_init(void **buffer,
int pages, int length)
{
- struct squashfs_page_actor *actor = kmalloc_obj(*actor, GFP_KERNEL);
+ struct squashfs_page_actor *actor = kmalloc_obj(*actor);
if (actor == NULL)
return NULL;
@@ -110,7 +110,7 @@ static void direct_finish_page(struct squashfs_page_actor *actor)
struct squashfs_page_actor *squashfs_page_actor_init_special(struct squashfs_sb_info *msblk,
struct page **page, int pages, int length, loff_t start_index)
{
- struct squashfs_page_actor *actor = kmalloc_obj(*actor, GFP_KERNEL);
+ struct squashfs_page_actor *actor = kmalloc_obj(*actor);
if (actor == NULL)
return NULL;
diff --git a/fs/squashfs/super.c b/fs/squashfs/super.c
index 69217e752bc5..5dabc5770f1b 100644
--- a/fs/squashfs/super.c
+++ b/fs/squashfs/super.c
@@ -196,7 +196,7 @@ static int squashfs_fill_super(struct super_block *sb, struct fs_context *fc)
return -EINVAL;
}
- sb->s_fs_info = kzalloc_obj(*msblk, GFP_KERNEL);
+ sb->s_fs_info = kzalloc_obj(*msblk);
if (sb->s_fs_info == NULL) {
ERROR("Failed to allocate squashfs_sb_info\n");
return -ENOMEM;
@@ -549,7 +549,7 @@ static int squashfs_init_fs_context(struct fs_context *fc)
{
struct squashfs_mount_opts *opts;
- opts = kzalloc_obj(*opts, GFP_KERNEL);
+ opts = kzalloc_obj(*opts);
if (!opts)
return -ENOMEM;
diff --git a/fs/squashfs/xz_wrapper.c b/fs/squashfs/xz_wrapper.c
index d258f4726d2e..0a4ff3ec9c8c 100644
--- a/fs/squashfs/xz_wrapper.c
+++ b/fs/squashfs/xz_wrapper.c
@@ -42,7 +42,7 @@ static void *squashfs_xz_comp_opts(struct squashfs_sb_info *msblk,
struct comp_opts *opts;
int err = 0, n;
- opts = kmalloc_obj(*opts, GFP_KERNEL);
+ opts = kmalloc_obj(*opts);
if (opts == NULL) {
err = -ENOMEM;
goto out2;
@@ -84,7 +84,7 @@ static void *squashfs_xz_init(struct squashfs_sb_info *msblk, void *buff)
struct squashfs_xz *stream;
int err;
- stream = kmalloc_obj(*stream, GFP_KERNEL);
+ stream = kmalloc_obj(*stream);
if (stream == NULL) {
err = -ENOMEM;
goto failed;
diff --git a/fs/squashfs/zlib_wrapper.c b/fs/squashfs/zlib_wrapper.c
index 899629c54d97..a29001311939 100644
--- a/fs/squashfs/zlib_wrapper.c
+++ b/fs/squashfs/zlib_wrapper.c
@@ -23,7 +23,7 @@
static void *zlib_init(struct squashfs_sb_info *dummy, void *buff)
{
- z_stream *stream = kmalloc_obj(z_stream, GFP_KERNEL);
+ z_stream *stream = kmalloc_obj(z_stream);
if (stream == NULL)
goto failed;
stream->workspace = vmalloc(zlib_inflate_workspacesize());
diff --git a/fs/squashfs/zstd_wrapper.c b/fs/squashfs/zstd_wrapper.c
index 632560e4d6b0..487fbc51d264 100644
--- a/fs/squashfs/zstd_wrapper.c
+++ b/fs/squashfs/zstd_wrapper.c
@@ -28,7 +28,7 @@ struct workspace {
static void *zstd_init(struct squashfs_sb_info *msblk, void *buff)
{
- struct workspace *wksp = kmalloc_obj(*wksp, GFP_KERNEL);
+ struct workspace *wksp = kmalloc_obj(*wksp);
if (wksp == NULL)
goto failed;
diff --git a/fs/super.c b/fs/super.c
index b8a6e156359d..378e81efe643 100644
--- a/fs/super.c
+++ b/fs/super.c
@@ -317,7 +317,7 @@ static void destroy_unused_super(struct super_block *s)
static struct super_block *alloc_super(struct file_system_type *type, int flags,
struct user_namespace *user_ns)
{
- struct super_block *s = kzalloc_obj(struct super_block, GFP_KERNEL);
+ struct super_block *s = kzalloc_obj(struct super_block);
static const struct super_operations default_op;
int i;
diff --git a/fs/sysfs/mount.c b/fs/sysfs/mount.c
index a6de7d945fba..e65c60158a04 100644
--- a/fs/sysfs/mount.c
+++ b/fs/sysfs/mount.c
@@ -62,7 +62,7 @@ static int sysfs_init_fs_context(struct fs_context *fc)
return -EPERM;
}
- kfc = kzalloc_obj(struct kernfs_fs_context, GFP_KERNEL);
+ kfc = kzalloc_obj(struct kernfs_fs_context);
if (!kfc)
return -ENOMEM;
diff --git a/fs/timerfd.c b/fs/timerfd.c
index f379edab7c02..73104f36bcae 100644
--- a/fs/timerfd.c
+++ b/fs/timerfd.c
@@ -413,7 +413,7 @@ SYSCALL_DEFINE2(timerfd_create, int, clockid, int, flags)
!capable(CAP_WAKE_ALARM))
return -EPERM;
- ctx = kzalloc_obj(*ctx, GFP_KERNEL);
+ ctx = kzalloc_obj(*ctx);
if (!ctx)
return -ENOMEM;
diff --git a/fs/tracefs/event_inode.c b/fs/tracefs/event_inode.c
index 81a3a7dcf6ce..8e5ac464b328 100644
--- a/fs/tracefs/event_inode.c
+++ b/fs/tracefs/event_inode.c
@@ -439,7 +439,7 @@ static inline struct eventfs_inode *init_ei(struct eventfs_inode *ei, const char
static inline struct eventfs_inode *alloc_ei(const char *name)
{
- struct eventfs_inode *ei = kzalloc_obj(*ei, GFP_KERNEL);
+ struct eventfs_inode *ei = kzalloc_obj(*ei);
struct eventfs_inode *result;
if (!ei)
@@ -454,7 +454,7 @@ static inline struct eventfs_inode *alloc_ei(const char *name)
static inline struct eventfs_inode *alloc_root_ei(const char *name)
{
- struct eventfs_root_inode *rei = kzalloc_obj(*rei, GFP_KERNEL);
+ struct eventfs_root_inode *rei = kzalloc_obj(*rei);
struct eventfs_inode *ei;
if (!rei)
diff --git a/fs/tracefs/inode.c b/fs/tracefs/inode.c
index 780f38c1b52d..51c00c8fa175 100644
--- a/fs/tracefs/inode.c
+++ b/fs/tracefs/inode.c
@@ -522,7 +522,7 @@ static int tracefs_init_fs_context(struct fs_context *fc)
{
struct tracefs_fs_info *fsi;
- fsi = kzalloc_obj(struct tracefs_fs_info, GFP_KERNEL);
+ fsi = kzalloc_obj(struct tracefs_fs_info);
if (!fsi)
return -ENOMEM;
diff --git a/fs/ubifs/debug.c b/fs/ubifs/debug.c
index cb24592753b0..160c16aa7b6e 100644
--- a/fs/ubifs/debug.c
+++ b/fs/ubifs/debug.c
@@ -3035,7 +3035,7 @@ void ubifs_assert_failed(struct ubifs_info *c, const char *expr,
*/
int ubifs_debugging_init(struct ubifs_info *c)
{
- c->dbg = kzalloc_obj(struct ubifs_debug_info, GFP_KERNEL);
+ c->dbg = kzalloc_obj(struct ubifs_debug_info);
if (!c->dbg)
return -ENOMEM;
diff --git a/fs/ubifs/dir.c b/fs/ubifs/dir.c
index 0e088aa661af..4c9f57f3b2ad 100644
--- a/fs/ubifs/dir.c
+++ b/fs/ubifs/dir.c
@@ -1725,7 +1725,7 @@ static int ubifs_dir_open(struct inode *inode, struct file *file)
{
struct ubifs_dir_data *data;
- data = kzalloc_obj(struct ubifs_dir_data, GFP_KERNEL);
+ data = kzalloc_obj(struct ubifs_dir_data);
if (!data)
return -ENOMEM;
file->private_data = data;
diff --git a/fs/ubifs/lpt.c b/fs/ubifs/lpt.c
index a9cb92e3ee9c..b3986705cfa0 100644
--- a/fs/ubifs/lpt.c
+++ b/fs/ubifs/lpt.c
@@ -624,9 +624,9 @@ int ubifs_create_dflt_lpt(struct ubifs_info *c, int *main_lebs, int lpt_first,
if (IS_ERR(desc))
return PTR_ERR(desc);
- lsave = kmalloc_objs(int, c->lsave_cnt, GFP_KERNEL);
- pnode = kzalloc_obj(struct ubifs_pnode, GFP_KERNEL);
- nnode = kzalloc_obj(struct ubifs_nnode, GFP_KERNEL);
+ lsave = kmalloc_objs(int, c->lsave_cnt);
+ pnode = kzalloc_obj(struct ubifs_pnode);
+ nnode = kzalloc_obj(struct ubifs_nnode);
buf = vmalloc(c->leb_size);
ltab = vmalloc_array(c->lpt_lebs,
sizeof(struct ubifs_lpt_lprops));
diff --git a/fs/ubifs/recovery.c b/fs/ubifs/recovery.c
index d92aed9fbad7..5c9dbf0a0806 100644
--- a/fs/ubifs/recovery.c
+++ b/fs/ubifs/recovery.c
@@ -1258,7 +1258,7 @@ static int add_ino(struct ubifs_info *c, ino_t inum, loff_t i_size,
p = &(*p)->rb_right;
}
- e = kzalloc_obj(struct size_entry, GFP_KERNEL);
+ e = kzalloc_obj(struct size_entry);
if (!e)
return -ENOMEM;
diff --git a/fs/ubifs/replay.c b/fs/ubifs/replay.c
index 7e5435dab283..a9a568f4a868 100644
--- a/fs/ubifs/replay.c
+++ b/fs/ubifs/replay.c
@@ -393,7 +393,7 @@ static int insert_node(struct ubifs_info *c, int lnum, int offs, int len,
if (key_inum(c, key) >= c->highest_inum)
c->highest_inum = key_inum(c, key);
- r = kzalloc_obj(struct replay_entry, GFP_KERNEL);
+ r = kzalloc_obj(struct replay_entry);
if (!r)
return -ENOMEM;
@@ -443,7 +443,7 @@ static int insert_dent(struct ubifs_info *c, int lnum, int offs, int len,
if (key_inum(c, key) >= c->highest_inum)
c->highest_inum = key_inum(c, key);
- r = kzalloc_obj(struct replay_entry, GFP_KERNEL);
+ r = kzalloc_obj(struct replay_entry);
if (!r)
return -ENOMEM;
@@ -897,11 +897,11 @@ static int add_replay_bud(struct ubifs_info *c, int lnum, int offs, int jhead,
dbg_mnt("add replay bud LEB %d:%d, head %d", lnum, offs, jhead);
- bud = kmalloc_obj(struct ubifs_bud, GFP_KERNEL);
+ bud = kmalloc_obj(struct ubifs_bud);
if (!bud)
return -ENOMEM;
- b = kmalloc_obj(struct bud_entry, GFP_KERNEL);
+ b = kmalloc_obj(struct bud_entry);
if (!b) {
err = -ENOMEM;
goto out;
diff --git a/fs/ubifs/super.c b/fs/ubifs/super.c
index b86b65fcd615..03bf924756ca 100644
--- a/fs/ubifs/super.c
+++ b/fs/ubifs/super.c
@@ -819,7 +819,7 @@ static int alloc_wbufs(struct ubifs_info *c)
{
int i, err;
- c->jheads = kzalloc_objs(struct ubifs_jhead, c->jhead_cnt, GFP_KERNEL);
+ c->jheads = kzalloc_objs(struct ubifs_jhead, c->jhead_cnt);
if (!c->jheads)
return -ENOMEM;
@@ -1245,7 +1245,7 @@ static int mount_ubifs(struct ubifs_info *c)
* never exceed 64.
*/
err = -ENOMEM;
- c->bottom_up_buf = kmalloc_objs(int, BOTTOM_UP_HEIGHT, GFP_KERNEL);
+ c->bottom_up_buf = kmalloc_objs(int, BOTTOM_UP_HEIGHT);
if (!c->bottom_up_buf)
goto out_free;
@@ -2081,7 +2081,7 @@ static struct ubifs_info *alloc_ubifs_info(struct ubi_volume_desc *ubi)
{
struct ubifs_info *c;
- c = kzalloc_obj(struct ubifs_info, GFP_KERNEL);
+ c = kzalloc_obj(struct ubifs_info);
if (c) {
spin_lock_init(&c->cnt_lock);
spin_lock_init(&c->cs_lock);
@@ -2334,7 +2334,7 @@ static int ubifs_init_fs_context(struct fs_context *fc)
{
struct ubifs_fs_context *ctx;
- ctx = kzalloc_obj(struct ubifs_fs_context, GFP_KERNEL);
+ ctx = kzalloc_obj(struct ubifs_fs_context);
if (!ctx)
return -ENOMEM;
diff --git a/fs/ubifs/sysfs.c b/fs/ubifs/sysfs.c
index 1c926e865be3..dbf967dcf26e 100644
--- a/fs/ubifs/sysfs.c
+++ b/fs/ubifs/sysfs.c
@@ -93,7 +93,7 @@ int ubifs_sysfs_register(struct ubifs_info *c)
int ret, n;
char dfs_dir_name[UBIFS_DFS_DIR_LEN];
- c->stats = kzalloc_obj(struct ubifs_stats_info, GFP_KERNEL);
+ c->stats = kzalloc_obj(struct ubifs_stats_info);
if (!c->stats) {
ret = -ENOMEM;
goto out_last;
diff --git a/fs/udf/super.c b/fs/udf/super.c
index 365cb78097d3..e4220ce08742 100644
--- a/fs/udf/super.c
+++ b/fs/udf/super.c
@@ -270,7 +270,7 @@ static int udf_init_fs_context(struct fs_context *fc)
{
struct udf_options *uopt;
- uopt = kzalloc_obj(*uopt, GFP_KERNEL);
+ uopt = kzalloc_obj(*uopt);
if (!uopt)
return -ENOMEM;
@@ -320,7 +320,7 @@ static int udf_sb_alloc_partition_maps(struct super_block *sb, u32 count)
{
struct udf_sb_info *sbi = UDF_SB(sb);
- sbi->s_partmaps = kzalloc_objs(*sbi->s_partmaps, count, GFP_KERNEL);
+ sbi->s_partmaps = kzalloc_objs(*sbi->s_partmaps, count);
if (!sbi->s_partmaps) {
sbi->s_partitions = 0;
return -ENOMEM;
@@ -1696,7 +1696,7 @@ static struct udf_vds_record *handle_partition_descriptor(
struct part_desc_seq_scan_data *new_loc;
unsigned int new_size = ALIGN(partnum, PART_DESC_ALLOC_STEP);
- new_loc = kzalloc_objs(*new_loc, new_size, GFP_KERNEL);
+ new_loc = kzalloc_objs(*new_loc, new_size);
if (!new_loc)
return ERR_PTR(-ENOMEM);
memcpy(new_loc, data->part_descs_loc,
@@ -2156,7 +2156,7 @@ static int udf_fill_super(struct super_block *sb, struct fs_context *fc)
bool lvid_open = false;
int silent = fc->sb_flags & SB_SILENT;
- sbi = kzalloc_obj(*sbi, GFP_KERNEL);
+ sbi = kzalloc_obj(*sbi);
if (!sbi)
return -ENOMEM;
diff --git a/fs/ufs/super.c b/fs/ufs/super.c
index 2937221f7942..c4831a8b9b3f 100644
--- a/fs/ufs/super.c
+++ b/fs/ufs/super.c
@@ -743,7 +743,7 @@ static int ufs_fill_super(struct super_block *sb, struct fs_context *fc)
}
#endif
- sbi = kzalloc_obj(struct ufs_sb_info, GFP_KERNEL);
+ sbi = kzalloc_obj(struct ufs_sb_info);
if (!sbi)
goto failed_nomem;
sb->s_fs_info = sbi;
@@ -768,7 +768,7 @@ static int ufs_fill_super(struct super_block *sb, struct fs_context *fc)
sbi->s_flavour = UFS_MOUNT_UFSTYPE_OLD;
}
- uspi = kzalloc_obj(struct ufs_sb_private_info, GFP_KERNEL);
+ uspi = kzalloc_obj(struct ufs_sb_private_info);
sbi->s_uspi = uspi;
if (!uspi)
goto failed;
@@ -1437,7 +1437,7 @@ static int ufs_init_fs_context(struct fs_context *fc)
{
struct ufs_fs_context *ctx;
- ctx = kzalloc_obj(*ctx, GFP_KERNEL);
+ ctx = kzalloc_obj(*ctx);
if (!ctx)
return -ENOMEM;
diff --git a/fs/unicode/utf8-core.c b/fs/unicode/utf8-core.c
index 3755b8067ad3..543c60c12461 100644
--- a/fs/unicode/utf8-core.c
+++ b/fs/unicode/utf8-core.c
@@ -176,7 +176,7 @@ struct unicode_map *utf8_load(unsigned int version)
{
struct unicode_map *um;
- um = kzalloc_obj(struct unicode_map, GFP_KERNEL);
+ um = kzalloc_obj(struct unicode_map);
if (!um)
return ERR_PTR(-ENOMEM);
um->version = version;
diff --git a/fs/userfaultfd.c b/fs/userfaultfd.c
index e90c4a762917..bdc84e5219cd 100644
--- a/fs/userfaultfd.c
+++ b/fs/userfaultfd.c
@@ -653,7 +653,7 @@ int dup_userfaultfd(struct vm_area_struct *vma, struct list_head *fcs)
}
if (!ctx) {
- fctx = kmalloc_obj(*fctx, GFP_KERNEL);
+ fctx = kmalloc_obj(*fctx);
if (!fctx)
return -ENOMEM;
@@ -840,7 +840,7 @@ int userfaultfd_unmap_prep(struct vm_area_struct *vma, unsigned long start,
has_unmap_ctx(ctx, unmaps, start, end))
return 0;
- unmap_ctx = kzalloc_obj(*unmap_ctx, GFP_KERNEL);
+ unmap_ctx = kzalloc_obj(*unmap_ctx);
if (!unmap_ctx)
return -ENOMEM;
diff --git a/fs/vboxsf/file.c b/fs/vboxsf/file.c
index 174ede512d30..7a7a3fbb2651 100644
--- a/fs/vboxsf/file.c
+++ b/fs/vboxsf/file.c
@@ -26,7 +26,7 @@ struct vboxsf_handle *vboxsf_create_sf_handle(struct inode *inode,
struct vboxsf_inode *sf_i = VBOXSF_I(inode);
struct vboxsf_handle *sf_handle;
- sf_handle = kmalloc_obj(*sf_handle, GFP_KERNEL);
+ sf_handle = kmalloc_obj(*sf_handle);
if (!sf_handle)
return ERR_PTR(-ENOMEM);
diff --git a/fs/vboxsf/super.c b/fs/vboxsf/super.c
index fe048ab05c48..a618cb093e00 100644
--- a/fs/vboxsf/super.c
+++ b/fs/vboxsf/super.c
@@ -122,7 +122,7 @@ static int vboxsf_fill_super(struct super_block *sb, struct fs_context *fc)
if (!fc->source)
return -EINVAL;
- sbi = kzalloc_obj(*sbi, GFP_KERNEL);
+ sbi = kzalloc_obj(*sbi);
if (!sbi)
return -ENOMEM;
@@ -427,7 +427,7 @@ static int vboxsf_init_fs_context(struct fs_context *fc)
{
struct vboxsf_fs_context *ctx;
- ctx = kzalloc_obj(*ctx, GFP_KERNEL);
+ ctx = kzalloc_obj(*ctx);
if (!ctx)
return -ENOMEM;
diff --git a/fs/vboxsf/utils.c b/fs/vboxsf/utils.c
index b95c1e42d073..440e8c50629d 100644
--- a/fs/vboxsf/utils.c
+++ b/fs/vboxsf/utils.c
@@ -478,7 +478,7 @@ static struct vboxsf_dir_buf *vboxsf_dir_buf_alloc(struct list_head *list)
{
struct vboxsf_dir_buf *b;
- b = kmalloc_obj(*b, GFP_KERNEL);
+ b = kmalloc_obj(*b);
if (!b)
return NULL;
@@ -507,7 +507,7 @@ struct vboxsf_dir_info *vboxsf_dir_info_alloc(void)
{
struct vboxsf_dir_info *p;
- p = kmalloc_obj(*p, GFP_KERNEL);
+ p = kmalloc_obj(*p);
if (!p)
return NULL;
diff --git a/fs/xfs/libxfs/xfs_ag.c b/fs/xfs/libxfs/xfs_ag.c
index 759da639d386..9c6765cc2d44 100644
--- a/fs/xfs/libxfs/xfs_ag.c
+++ b/fs/xfs/libxfs/xfs_ag.c
@@ -224,7 +224,7 @@ xfs_perag_alloc(
struct xfs_perag *pag;
int error;
- pag = kzalloc_obj(*pag, GFP_KERNEL);
+ pag = kzalloc_obj(*pag);
if (!pag)
return -ENOMEM;
diff --git a/fs/xfs/libxfs/xfs_rtgroup.c b/fs/xfs/libxfs/xfs_rtgroup.c
index 3b7f4819b85b..c85d50953218 100644
--- a/fs/xfs/libxfs/xfs_rtgroup.c
+++ b/fs/xfs/libxfs/xfs_rtgroup.c
@@ -98,7 +98,7 @@ xfs_rtgroup_alloc(
struct xfs_rtgroup *rtg;
int error;
- rtg = kzalloc_obj(struct xfs_rtgroup, GFP_KERNEL);
+ rtg = kzalloc_obj(struct xfs_rtgroup);
if (!rtg)
return -ENOMEM;
diff --git a/fs/xfs/scrub/stats.c b/fs/xfs/scrub/stats.c
index 8cd018bac5d6..ef3f6abdb706 100644
--- a/fs/xfs/scrub/stats.c
+++ b/fs/xfs/scrub/stats.c
@@ -389,7 +389,7 @@ xchk_mount_stats_alloc(
struct xchk_stats *cs;
int error;
- cs = kvzalloc_obj(struct xchk_stats, GFP_KERNEL);
+ cs = kvzalloc_obj(struct xchk_stats);
if (!cs)
return -ENOMEM;
diff --git a/fs/xfs/xfs_buf_item_recover.c b/fs/xfs/xfs_buf_item_recover.c
index 5f391372f188..02b95b89d1b5 100644
--- a/fs/xfs/xfs_buf_item_recover.c
+++ b/fs/xfs/xfs_buf_item_recover.c
@@ -1180,7 +1180,7 @@ xlog_alloc_buf_cancel_table(
ASSERT(log->l_buf_cancel_table == NULL);
- p = kmalloc_objs(struct list_head, XLOG_BC_TABLE_SIZE, GFP_KERNEL);
+ p = kmalloc_objs(struct list_head, XLOG_BC_TABLE_SIZE);
if (!p)
return -ENOMEM;
diff --git a/fs/xfs/xfs_discard.c b/fs/xfs/xfs_discard.c
index 3ecbb4e0f2c8..906221ffe9ba 100644
--- a/fs/xfs/xfs_discard.c
+++ b/fs/xfs/xfs_discard.c
@@ -349,7 +349,7 @@ xfs_trim_perag_extents(
do {
struct xfs_busy_extents *extents;
- extents = kzalloc_obj(*extents, GFP_KERNEL);
+ extents = kzalloc_obj(*extents);
if (!extents) {
error = -ENOMEM;
break;
@@ -537,7 +537,7 @@ xfs_trim_gather_rtextent(
return 0;
}
- busyp = kzalloc_obj(struct xfs_rtx_busy, GFP_KERNEL);
+ busyp = kzalloc_obj(struct xfs_rtx_busy);
if (!busyp)
return -ENOMEM;
@@ -689,7 +689,7 @@ xfs_trim_rtgroup_extents(
* trims the extents returned.
*/
do {
- tr.extents = kzalloc_obj(*tr.extents, GFP_KERNEL);
+ tr.extents = kzalloc_obj(*tr.extents);
if (!tr.extents) {
error = -ENOMEM;
break;
diff --git a/fs/xfs/xfs_extent_busy.c b/fs/xfs/xfs_extent_busy.c
index a5f02cac9d31..3efdca3d675b 100644
--- a/fs/xfs/xfs_extent_busy.c
+++ b/fs/xfs/xfs_extent_busy.c
@@ -717,7 +717,7 @@ xfs_extent_busy_alloc(void)
{
struct xfs_extent_busy_tree *eb;
- eb = kzalloc_obj(*eb, GFP_KERNEL);
+ eb = kzalloc_obj(*eb);
if (!eb)
return NULL;
spin_lock_init(&eb->eb_lock);
diff --git a/fs/xfs/xfs_fsmap.c b/fs/xfs/xfs_fsmap.c
index 3724e64898f3..b6a3bc9f143c 100644
--- a/fs/xfs/xfs_fsmap.c
+++ b/fs/xfs/xfs_fsmap.c
@@ -1326,11 +1326,11 @@ xfs_ioc_getfsmap(
*/
count = min_t(unsigned int, head.fmh_count,
131072 / sizeof(struct fsmap));
- recs = kvzalloc_objs(struct fsmap, count, GFP_KERNEL);
+ recs = kvzalloc_objs(struct fsmap, count);
if (!recs) {
count = min_t(unsigned int, head.fmh_count,
PAGE_SIZE / sizeof(struct fsmap));
- recs = kvzalloc_objs(struct fsmap, count, GFP_KERNEL);
+ recs = kvzalloc_objs(struct fsmap, count);
if (!recs)
return -ENOMEM;
}
diff --git a/fs/xfs/xfs_healthmon.c b/fs/xfs/xfs_healthmon.c
index 757a4213b2d0..e37c18cec372 100644
--- a/fs/xfs/xfs_healthmon.c
+++ b/fs/xfs/xfs_healthmon.c
@@ -1187,7 +1187,7 @@ xfs_ioc_health_monitor(
if (!xfs_healthmon_validate(&hmo))
return -EINVAL;
- hm = kzalloc_obj(*hm, GFP_KERNEL);
+ hm = kzalloc_obj(*hm);
if (!hm)
return -ENOMEM;
hm->dev = mp->m_super->s_dev;
diff --git a/fs/xfs/xfs_ioctl.c b/fs/xfs/xfs_ioctl.c
index 1074e36fa240..facffdc8dca8 100644
--- a/fs/xfs/xfs_ioctl.c
+++ b/fs/xfs/xfs_ioctl.c
@@ -896,7 +896,7 @@ xfs_ioc_getbmap(
if (bmx.bmv_count >= INT_MAX / recsize)
return -ENOMEM;
- buf = kvzalloc_objs(*buf, bmx.bmv_count, GFP_KERNEL);
+ buf = kvzalloc_objs(*buf, bmx.bmv_count);
if (!buf)
return -ENOMEM;
diff --git a/fs/xfs/xfs_super.c b/fs/xfs/xfs_super.c
index 0ce953b45852..011525a2cbc8 100644
--- a/fs/xfs/xfs_super.c
+++ b/fs/xfs/xfs_super.c
@@ -2235,7 +2235,7 @@ xfs_init_fs_context(
struct xfs_mount *mp;
int i;
- mp = kzalloc_obj(struct xfs_mount, GFP_KERNEL);
+ mp = kzalloc_obj(struct xfs_mount);
if (!mp)
return -ENOMEM;
#ifdef DEBUG
diff --git a/fs/xfs/xfs_zone_alloc.c b/fs/xfs/xfs_zone_alloc.c
index 5d45d88f1f03..67e0c8f5800f 100644
--- a/fs/xfs/xfs_zone_alloc.c
+++ b/fs/xfs/xfs_zone_alloc.c
@@ -1196,7 +1196,7 @@ xfs_alloc_zone_info(
struct xfs_zone_info *zi;
int i;
- zi = kzalloc_obj(*zi, GFP_KERNEL);
+ zi = kzalloc_obj(*zi);
if (!zi)
return NULL;
INIT_LIST_HEAD(&zi->zi_open_zones);
diff --git a/fs/xfs/xfs_zone_gc.c b/fs/xfs/xfs_zone_gc.c
index b8b9c72e955a..8604c8a2d86b 100644
--- a/fs/xfs/xfs_zone_gc.c
+++ b/fs/xfs/xfs_zone_gc.c
@@ -199,7 +199,7 @@ xfs_zone_gc_data_alloc(
struct xfs_zone_gc_data *data;
int i;
- data = kzalloc_obj(*data, GFP_KERNEL);
+ data = kzalloc_obj(*data);
if (!data)
return NULL;
data->iter.recs = kzalloc_objs(*data->iter.recs, XFS_ZONE_GC_RECS,
diff --git a/fs/zonefs/super.c b/fs/zonefs/super.c
index 28be57db6e4b..9b7676553751 100644
--- a/fs/zonefs/super.c
+++ b/fs/zonefs/super.c
@@ -1243,7 +1243,7 @@ static int zonefs_fill_super(struct super_block *sb, struct fs_context *fc)
* ZONEFS_F_AGGRCNV which increases the maximum file size of a file
* beyond the zone size is taken into account.
*/
- sbi = kzalloc_obj(*sbi, GFP_KERNEL);
+ sbi = kzalloc_obj(*sbi);
if (!sbi)
return -ENOMEM;
@@ -1388,7 +1388,7 @@ static int zonefs_init_fs_context(struct fs_context *fc)
{
struct zonefs_context *ctx;
- ctx = kzalloc_obj(struct zonefs_context, GFP_KERNEL);
+ ctx = kzalloc_obj(struct zonefs_context);
if (!ctx)
return -ENOMEM;
ctx->s_mount_opts = ZONEFS_MNTOPT_ERRORS_RO;
diff --git a/include/linux/acpi.h b/include/linux/acpi.h
index 8b1d8993793d..4d2f0bed7a06 100644
--- a/include/linux/acpi.h
+++ b/include/linux/acpi.h
@@ -66,7 +66,7 @@ static inline struct fwnode_handle *acpi_alloc_fwnode_static(void)
{
struct fwnode_handle *fwnode;
- fwnode = kzalloc_obj(struct fwnode_handle, GFP_KERNEL);
+ fwnode = kzalloc_obj(struct fwnode_handle);
if (!fwnode)
return NULL;
diff --git a/include/linux/crash_dump.h b/include/linux/crash_dump.h
index 2cb211617ecc..8315270e27b7 100644
--- a/include/linux/crash_dump.h
+++ b/include/linux/crash_dump.h
@@ -136,7 +136,7 @@ struct vmcore_range {
static inline int vmcore_alloc_add_range(struct list_head *list,
unsigned long long paddr, unsigned long long size)
{
- struct vmcore_range *m = kzalloc_obj(*m, GFP_KERNEL);
+ struct vmcore_range *m = kzalloc_obj(*m);
if (!m)
return -ENOMEM;
diff --git a/include/linux/dma-fence-chain.h b/include/linux/dma-fence-chain.h
index e5f4451a6375..5cd3ba53b4a1 100644
--- a/include/linux/dma-fence-chain.h
+++ b/include/linux/dma-fence-chain.h
@@ -91,7 +91,7 @@ dma_fence_chain_contained(struct dma_fence *fence)
* intentional to enforce typesafety.
*/
#define dma_fence_chain_alloc() \
- kmalloc_obj(struct dma_fence_chain, GFP_KERNEL)
+ kmalloc_obj(struct dma_fence_chain)
/**
* dma_fence_chain_free
diff --git a/include/linux/gameport.h b/include/linux/gameport.h
index 09a1a59034e0..9625347c7ac0 100644
--- a/include/linux/gameport.h
+++ b/include/linux/gameport.h
@@ -97,7 +97,7 @@ void gameport_set_phys(struct gameport *gameport, const char *fmt, ...)
static inline struct gameport *gameport_allocate_port(void)
{
- struct gameport *gameport = kzalloc_obj(struct gameport, GFP_KERNEL);
+ struct gameport *gameport = kzalloc_obj(struct gameport);
return gameport;
}
diff --git a/include/linux/io-mapping.h b/include/linux/io-mapping.h
index ff9012c6a93a..e5a884e72f29 100644
--- a/include/linux/io-mapping.h
+++ b/include/linux/io-mapping.h
@@ -206,7 +206,7 @@ io_mapping_create_wc(resource_size_t base,
{
struct io_mapping *iomap;
- iomap = kmalloc_obj(*iomap, GFP_KERNEL);
+ iomap = kmalloc_obj(*iomap);
if (!iomap)
return NULL;
diff --git a/include/net/act_api.h b/include/net/act_api.h
index 453d6e18851b..e1e8f0f7dacb 100644
--- a/include/net/act_api.h
+++ b/include/net/act_api.h
@@ -159,7 +159,7 @@ int tc_action_net_init(struct net *net, struct tc_action_net *tn,
{
int err = 0;
- tn->idrinfo = kmalloc_obj(*tn->idrinfo, GFP_KERNEL);
+ tn->idrinfo = kmalloc_obj(*tn->idrinfo);
if (!tn->idrinfo)
return -ENOMEM;
tn->ops = ops;
diff --git a/include/net/fq_impl.h b/include/net/fq_impl.h
index 171ee6f7aa83..8aca881937da 100644
--- a/include/net/fq_impl.h
+++ b/include/net/fq_impl.h
@@ -358,7 +358,7 @@ static int fq_init(struct fq *fq, int flows_cnt)
fq->limit = 8192;
fq->memory_limit = 16 << 20; /* 16 MBytes */
- fq->flows = kvzalloc_objs(fq->flows[0], fq->flows_cnt, GFP_KERNEL);
+ fq->flows = kvzalloc_objs(fq->flows[0], fq->flows_cnt);
if (!fq->flows)
return -ENOMEM;
diff --git a/init/initramfs.c b/init/initramfs.c
index 3d89e31e0d8a..7568e4f3c029 100644
--- a/init/initramfs.c
+++ b/init/initramfs.c
@@ -102,7 +102,7 @@ static char __init *find_link(int major, int minor, int ino,
continue;
return (*p)->name;
}
- q = kmalloc_obj(struct hash, GFP_KERNEL);
+ q = kmalloc_obj(struct hash);
if (!q)
panic_show_mem("can't allocate link hash entry");
q->major = major;
@@ -517,7 +517,7 @@ char * __init unpack_to_rootfs(char *buf, unsigned long len)
char header[CPIO_HDRLEN];
char symlink[PATH_MAX + N_ALIGN(PATH_MAX) + 1];
char name[N_ALIGN(PATH_MAX)];
- } *bufs = kmalloc_obj(*bufs, GFP_KERNEL);
+ } *bufs = kmalloc_obj(*bufs);
if (!bufs)
panic_show_mem("can't allocate buffers");
diff --git a/init/initramfs_test.c b/init/initramfs_test.c
index 1e75faec678b..2ce38d9a8fd0 100644
--- a/init/initramfs_test.c
+++ b/init/initramfs_test.c
@@ -403,7 +403,7 @@ static void __init initramfs_test_fname_pad(struct kunit *test)
struct test_fname_pad {
char padded_fname[4096 - CPIO_HDRLEN];
char cpio_srcbuf[CPIO_HDRLEN + PATH_MAX + 3 + sizeof(fdata)];
- } *tbufs = kzalloc_obj(struct test_fname_pad, GFP_KERNEL);
+ } *tbufs = kzalloc_obj(struct test_fname_pad);
struct initramfs_test_cpio c[] = { {
.magic = "070701",
.ino = 1,
@@ -457,7 +457,7 @@ static void __init initramfs_test_fname_path_max(struct kunit *test)
char fname_oversize[PATH_MAX + 1];
char fname_ok[PATH_MAX];
char cpio_src[(CPIO_HDRLEN + PATH_MAX + 3 + sizeof(fdata)) * 2];
- } *tbufs = kzalloc_obj(struct test_fname_path_max, GFP_KERNEL);
+ } *tbufs = kzalloc_obj(struct test_fname_path_max);
struct initramfs_test_cpio c[] = { {
.magic = "070701",
.ino = 1,
diff --git a/io_uring/eventfd.c b/io_uring/eventfd.c
index 0120ecd97321..cbea1c289485 100644
--- a/io_uring/eventfd.c
+++ b/io_uring/eventfd.c
@@ -127,7 +127,7 @@ int io_eventfd_register(struct io_ring_ctx *ctx, void __user *arg,
if (copy_from_user(&fd, fds, sizeof(*fds)))
return -EFAULT;
- ev_fd = kmalloc_obj(*ev_fd, GFP_KERNEL);
+ ev_fd = kmalloc_obj(*ev_fd);
if (!ev_fd)
return -ENOMEM;
diff --git a/io_uring/io-wq.c b/io_uring/io-wq.c
index 2d04ff565920..7a9f94a0ce6f 100644
--- a/io_uring/io-wq.c
+++ b/io_uring/io-wq.c
@@ -897,7 +897,7 @@ static bool create_io_worker(struct io_wq *wq, struct io_wq_acct *acct)
__set_current_state(TASK_RUNNING);
- worker = kzalloc_obj(*worker, GFP_KERNEL);
+ worker = kzalloc_obj(*worker);
if (!worker) {
fail:
atomic_dec(&acct->nr_running);
@@ -1255,7 +1255,7 @@ struct io_wq *io_wq_create(unsigned bounded, struct io_wq_data *data)
if (WARN_ON_ONCE(!bounded))
return ERR_PTR(-EINVAL);
- wq = kzalloc_obj(struct io_wq, GFP_KERNEL);
+ wq = kzalloc_obj(struct io_wq);
if (!wq)
return ERR_PTR(-ENOMEM);
diff --git a/io_uring/io_uring.c b/io_uring/io_uring.c
index 3c64c458a281..aa95703165f1 100644
--- a/io_uring/io_uring.c
+++ b/io_uring/io_uring.c
@@ -226,7 +226,7 @@ static __cold struct io_ring_ctx *io_ring_ctx_alloc(struct io_uring_params *p)
int hash_bits;
bool ret;
- ctx = kzalloc_obj(*ctx, GFP_KERNEL);
+ ctx = kzalloc_obj(*ctx);
if (!ctx)
return NULL;
diff --git a/io_uring/kbuf.c b/io_uring/kbuf.c
index aea1794dc5f6..2ffa95b1c601 100644
--- a/io_uring/kbuf.c
+++ b/io_uring/kbuf.c
@@ -265,7 +265,7 @@ static int io_ring_buffers_peek(struct io_kiocb *req, struct buf_sel_arg *arg,
* a speculative peek operation.
*/
if (arg->mode & KBUF_MODE_EXPAND && nr_avail > nr_iovs && arg->max_len) {
- iov = kmalloc_objs(struct iovec, nr_avail, GFP_KERNEL);
+ iov = kmalloc_objs(struct iovec, nr_avail);
if (unlikely(!iov))
return -ENOMEM;
if (arg->mode & KBUF_MODE_FREE)
diff --git a/io_uring/mock_file.c b/io_uring/mock_file.c
index 221b60ad0723..b318ed697998 100644
--- a/io_uring/mock_file.c
+++ b/io_uring/mock_file.c
@@ -115,7 +115,7 @@ static ssize_t io_mock_delay_rw(struct kiocb *iocb, size_t len)
struct io_mock_file *mf = iocb->ki_filp->private_data;
struct io_mock_iocb *mio;
- mio = kzalloc_obj(*mio, GFP_KERNEL);
+ mio = kzalloc_obj(*mio);
if (!mio)
return -ENOMEM;
diff --git a/io_uring/rsrc.c b/io_uring/rsrc.c
index 9b799e7ba889..d84f48d90d40 100644
--- a/io_uring/rsrc.c
+++ b/io_uring/rsrc.c
@@ -683,7 +683,7 @@ static bool io_coalesce_buffer(struct page ***pages, int *nr_pages,
unsigned i, j;
/* Store head pages only*/
- new_array = kvmalloc_objs(struct page *, nr_folios, GFP_KERNEL);
+ new_array = kvmalloc_objs(struct page *, nr_folios);
if (!new_array)
return false;
diff --git a/io_uring/sqpoll.c b/io_uring/sqpoll.c
index 97e64d7d029f..c6bb938ec5ea 100644
--- a/io_uring/sqpoll.c
+++ b/io_uring/sqpoll.c
@@ -153,7 +153,7 @@ static struct io_sq_data *io_get_sq_data(struct io_uring_params *p,
return sqd;
}
- sqd = kzalloc_obj(*sqd, GFP_KERNEL);
+ sqd = kzalloc_obj(*sqd);
if (!sqd)
return ERR_PTR(-ENOMEM);
diff --git a/io_uring/tctx.c b/io_uring/tctx.c
index fa97bc7db6a3..7cbcb82aedfb 100644
--- a/io_uring/tctx.c
+++ b/io_uring/tctx.c
@@ -23,7 +23,7 @@ static struct io_wq *io_init_wq_offload(struct io_ring_ctx *ctx,
mutex_lock(&ctx->uring_lock);
hash = ctx->hash_map;
if (!hash) {
- hash = kzalloc_obj(*hash, GFP_KERNEL);
+ hash = kzalloc_obj(*hash);
if (!hash) {
mutex_unlock(&ctx->uring_lock);
return ERR_PTR(-ENOMEM);
@@ -80,7 +80,7 @@ __cold int io_uring_alloc_task_context(struct task_struct *task,
struct io_uring_task *tctx;
int ret;
- tctx = kzalloc_obj(*tctx, GFP_KERNEL);
+ tctx = kzalloc_obj(*tctx);
if (unlikely(!tctx))
return -ENOMEM;
@@ -139,7 +139,7 @@ int __io_uring_add_tctx_node(struct io_ring_ctx *ctx)
if (tctx->io_wq)
io_wq_set_exit_on_idle(tctx->io_wq, false);
if (!xa_load(&tctx->xa, (unsigned long)ctx)) {
- node = kmalloc_obj(*node, GFP_KERNEL);
+ node = kmalloc_obj(*node);
if (!node)
return -ENOMEM;
node->ctx = ctx;
diff --git a/io_uring/xattr.c b/io_uring/xattr.c
index 28475bf8ed47..5303df3f247f 100644
--- a/io_uring/xattr.c
+++ b/io_uring/xattr.c
@@ -56,7 +56,7 @@ static int __io_getxattr_prep(struct io_kiocb *req,
if (ix->ctx.flags)
return -EINVAL;
- ix->ctx.kname = kmalloc_obj(*ix->ctx.kname, GFP_KERNEL);
+ ix->ctx.kname = kmalloc_obj(*ix->ctx.kname);
if (!ix->ctx.kname)
return -ENOMEM;
@@ -133,7 +133,7 @@ static int __io_setxattr_prep(struct io_kiocb *req,
ix->ctx.size = READ_ONCE(sqe->len);
ix->ctx.flags = READ_ONCE(sqe->xattr_flags);
- ix->ctx.kname = kmalloc_obj(*ix->ctx.kname, GFP_KERNEL);
+ ix->ctx.kname = kmalloc_obj(*ix->ctx.kname);
if (!ix->ctx.kname)
return -ENOMEM;
diff --git a/io_uring/zcrx.c b/io_uring/zcrx.c
index affb802fa2da..cf5bec065aaf 100644
--- a/io_uring/zcrx.c
+++ b/io_uring/zcrx.c
@@ -452,7 +452,7 @@ static int io_zcrx_create_area(struct io_zcrx_ifq *ifq,
}
ret = -ENOMEM;
- area = kzalloc_obj(*area, GFP_KERNEL);
+ area = kzalloc_obj(*area);
if (!area)
goto err;
area->ifq = ifq;
@@ -514,7 +514,7 @@ static struct io_zcrx_ifq *io_zcrx_ifq_alloc(struct io_ring_ctx *ctx)
{
struct io_zcrx_ifq *ifq;
- ifq = kzalloc_obj(*ifq, GFP_KERNEL);
+ ifq = kzalloc_obj(*ifq);
if (!ifq)
return NULL;
diff --git a/ipc/mqueue.c b/ipc/mqueue.c
index a90aa6803f1b..4798b375972b 100644
--- a/ipc/mqueue.c
+++ b/ipc/mqueue.c
@@ -449,7 +449,7 @@ static int mqueue_init_fs_context(struct fs_context *fc)
{
struct mqueue_fs_context *ctx;
- ctx = kzalloc_obj(struct mqueue_fs_context, GFP_KERNEL);
+ ctx = kzalloc_obj(struct mqueue_fs_context);
if (!ctx)
return -ENOMEM;
@@ -1088,7 +1088,7 @@ static int do_mq_timedsend(mqd_t mqdes, const char __user *u_msg_ptr,
* fall back to that if necessary.
*/
if (!info->node_cache)
- new_leaf = kmalloc_obj(*new_leaf, GFP_KERNEL);
+ new_leaf = kmalloc_obj(*new_leaf);
spin_lock(&info->lock);
@@ -1181,7 +1181,7 @@ static int do_mq_timedreceive(mqd_t mqdes, char __user *u_msg_ptr,
* fall back to that if necessary.
*/
if (!info->node_cache)
- new_leaf = kmalloc_obj(*new_leaf, GFP_KERNEL);
+ new_leaf = kmalloc_obj(*new_leaf);
spin_lock(&info->lock);
diff --git a/ipc/sem.c b/ipc/sem.c
index 2a19244cff22..6cdf862b1f5c 100644
--- a/ipc/sem.c
+++ b/ipc/sem.c
@@ -2234,7 +2234,7 @@ static long do_semtimedop(int semid, struct sembuf __user *tsops,
return -EINVAL;
if (nsops > SEMOPM_FAST) {
- sops = kvmalloc_objs(*sops, nsops, GFP_KERNEL);
+ sops = kvmalloc_objs(*sops, nsops);
if (sops == NULL)
return -ENOMEM;
}
diff --git a/ipc/shm.c b/ipc/shm.c
index b94248570304..a95dae447707 100644
--- a/ipc/shm.c
+++ b/ipc/shm.c
@@ -1618,7 +1618,7 @@ long do_shmat(int shmid, char __user *shmaddr, int shmflg,
rcu_read_unlock();
err = -ENOMEM;
- sfd = kzalloc_obj(*sfd, GFP_KERNEL);
+ sfd = kzalloc_obj(*sfd);
if (!sfd) {
fput(base);
goto out_nattch;
diff --git a/ipc/util.c b/ipc/util.c
index 59235ffba0d9..9eb89820594e 100644
--- a/ipc/util.c
+++ b/ipc/util.c
@@ -141,7 +141,7 @@ void __init ipc_init_proc_interface(const char *path, const char *header,
struct proc_dir_entry *pde;
struct ipc_proc_iface *iface;
- iface = kmalloc_obj(*iface, GFP_KERNEL);
+ iface = kmalloc_obj(*iface);
if (!iface)
return;
iface->path = path;
diff --git a/kernel/acct.c b/kernel/acct.c
index 06e8b79eaf7e..1e19722c64c3 100644
--- a/kernel/acct.c
+++ b/kernel/acct.c
@@ -255,7 +255,7 @@ static int acct_on(const char __user *name)
if (!(file->f_mode & FMODE_CAN_WRITE))
return -EIO;
- acct = kzalloc_obj(struct bsd_acct_struct, GFP_KERNEL);
+ acct = kzalloc_obj(struct bsd_acct_struct);
if (!acct)
return -ENOMEM;
diff --git a/kernel/async.c b/kernel/async.c
index 862532ad328a..0e3a783dc991 100644
--- a/kernel/async.c
+++ b/kernel/async.c
@@ -261,7 +261,7 @@ bool async_schedule_dev_nocall(async_func_t func, struct device *dev)
{
struct async_entry *entry;
- entry = kzalloc_obj(struct async_entry, GFP_KERNEL);
+ entry = kzalloc_obj(struct async_entry);
/* Give up if there is no memory or too much work. */
if (!entry || atomic_read(&entry_count) > MAX_WORK) {
diff --git a/kernel/audit.c b/kernel/audit.c
index 838ca1648f7b..ad46aa11d42c 100644
--- a/kernel/audit.c
+++ b/kernel/audit.c
@@ -545,7 +545,7 @@ static int auditd_set(struct pid *pid, u32 portid, struct net *net,
if (!pid || !net)
return -EINVAL;
- ac_new = kzalloc_obj(*ac_new, GFP_KERNEL);
+ ac_new = kzalloc_obj(*ac_new);
if (!ac_new)
return -ENOMEM;
ac_new->pid = get_pid(pid);
@@ -1044,7 +1044,7 @@ static void audit_send_reply(struct sk_buff *request_skb, int seq, int type, int
struct task_struct *tsk;
struct audit_reply *reply;
- reply = kzalloc_obj(*reply, GFP_KERNEL);
+ reply = kzalloc_obj(*reply);
if (!reply)
return;
diff --git a/kernel/audit_fsnotify.c b/kernel/audit_fsnotify.c
index 7b89e1ccb5a4..a4401f651060 100644
--- a/kernel/audit_fsnotify.c
+++ b/kernel/audit_fsnotify.c
@@ -89,7 +89,7 @@ struct audit_fsnotify_mark *audit_alloc_mark(struct audit_krule *krule, char *pa
goto out;
}
- audit_mark = kzalloc_obj(*audit_mark, GFP_KERNEL);
+ audit_mark = kzalloc_obj(*audit_mark);
if (unlikely(!audit_mark)) {
audit_mark = ERR_PTR(-ENOMEM);
goto out;
diff --git a/kernel/audit_watch.c b/kernel/audit_watch.c
index 6a73b30929c0..096faac2435c 100644
--- a/kernel/audit_watch.c
+++ b/kernel/audit_watch.c
@@ -139,7 +139,7 @@ static struct audit_parent *audit_init_parent(const struct path *path)
struct audit_parent *parent;
int ret;
- parent = kzalloc_obj(*parent, GFP_KERNEL);
+ parent = kzalloc_obj(*parent);
if (unlikely(!parent))
return ERR_PTR(-ENOMEM);
@@ -161,7 +161,7 @@ static struct audit_watch *audit_init_watch(char *path)
{
struct audit_watch *watch;
- watch = kzalloc_obj(*watch, GFP_KERNEL);
+ watch = kzalloc_obj(*watch);
if (unlikely(!watch))
return ERR_PTR(-ENOMEM);
diff --git a/kernel/auditfilter.c b/kernel/auditfilter.c
index e2d6f9a91a49..2bffaef0011b 100644
--- a/kernel/auditfilter.c
+++ b/kernel/auditfilter.c
@@ -108,11 +108,11 @@ static inline struct audit_entry *audit_init_entry(u32 field_count)
struct audit_entry *entry;
struct audit_field *fields;
- entry = kzalloc_obj(*entry, GFP_KERNEL);
+ entry = kzalloc_obj(*entry);
if (unlikely(!entry))
return NULL;
- fields = kzalloc_objs(*fields, field_count, GFP_KERNEL);
+ fields = kzalloc_objs(*fields, field_count);
if (unlikely(!fields)) {
kfree(entry);
return NULL;
@@ -1180,7 +1180,7 @@ int audit_list_rules_send(struct sk_buff *request_skb, int seq)
* happen if we're actually running in the context of auditctl
* trying to _send_ the stuff */
- dest = kmalloc_obj(*dest, GFP_KERNEL);
+ dest = kmalloc_obj(*dest);
if (!dest)
return -ENOMEM;
dest->net = get_net(sock_net(NETLINK_CB(request_skb).sk));
diff --git a/kernel/auditsc.c b/kernel/auditsc.c
index e45883de200f..f6af6a8f68c4 100644
--- a/kernel/auditsc.c
+++ b/kernel/auditsc.c
@@ -255,7 +255,7 @@ static int grow_tree_refs(struct audit_context *ctx)
{
struct audit_tree_refs *p = ctx->trees;
- ctx->trees = kzalloc_obj(struct audit_tree_refs, GFP_KERNEL);
+ ctx->trees = kzalloc_obj(struct audit_tree_refs);
if (!ctx->trees) {
ctx->trees = p;
return 0;
@@ -1032,7 +1032,7 @@ static inline struct audit_context *audit_alloc_context(enum audit_state state)
{
struct audit_context *context;
- context = kzalloc_obj(*context, GFP_KERNEL);
+ context = kzalloc_obj(*context);
if (!context)
return NULL;
context->context = AUDIT_CTX_UNUSED;
@@ -2650,7 +2650,7 @@ int __audit_sockaddr(int len, void *a)
struct audit_context *context = audit_context();
if (!context->sockaddr) {
- void *p = kmalloc_obj(struct sockaddr_storage, GFP_KERNEL);
+ void *p = kmalloc_obj(struct sockaddr_storage);
if (!p)
return -ENOMEM;
@@ -2743,7 +2743,7 @@ int __audit_log_bprm_fcaps(struct linux_binprm *bprm,
struct audit_context *context = audit_context();
struct cpu_vfs_cap_data vcaps;
- ax = kmalloc_obj(*ax, GFP_KERNEL);
+ ax = kmalloc_obj(*ax);
if (!ax)
return -ENOMEM;
diff --git a/kernel/bpf/arena.c b/kernel/bpf/arena.c
index 5baea15cb07d..144f30e740e8 100644
--- a/kernel/bpf/arena.c
+++ b/kernel/bpf/arena.c
@@ -324,7 +324,7 @@ static int remember_vma(struct bpf_arena *arena, struct vm_area_struct *vma)
{
struct vma_list *vml;
- vml = kmalloc_obj(*vml, GFP_KERNEL);
+ vml = kmalloc_obj(*vml);
if (!vml)
return -ENOMEM;
refcount_set(&vml->mmap_count, 1);
diff --git a/kernel/bpf/arraymap.c b/kernel/bpf/arraymap.c
index 188b0e35f856..26763df6134a 100644
--- a/kernel/bpf/arraymap.c
+++ b/kernel/bpf/arraymap.c
@@ -1061,7 +1061,7 @@ static int prog_array_map_poke_track(struct bpf_map *map,
goto out;
}
- elem = kmalloc_obj(*elem, GFP_KERNEL);
+ elem = kmalloc_obj(*elem);
if (!elem) {
ret = -ENOMEM;
goto out;
@@ -1237,7 +1237,7 @@ static struct bpf_event_entry *bpf_event_entry_gen(struct file *perf_file,
{
struct bpf_event_entry *ee;
- ee = kzalloc_obj(*ee, GFP_KERNEL);
+ ee = kzalloc_obj(*ee);
if (ee) {
ee->event = perf_file->private_data;
ee->perf_file = perf_file;
diff --git a/kernel/bpf/bpf_iter.c b/kernel/bpf/bpf_iter.c
index b5d16050f7b3..f5eaeb2493d4 100644
--- a/kernel/bpf/bpf_iter.c
+++ b/kernel/bpf/bpf_iter.c
@@ -295,7 +295,7 @@ int bpf_iter_reg_target(const struct bpf_iter_reg *reg_info)
{
struct bpf_iter_target_info *tinfo;
- tinfo = kzalloc_obj(*tinfo, GFP_KERNEL);
+ tinfo = kzalloc_obj(*tinfo);
if (!tinfo)
return -ENOMEM;
diff --git a/kernel/bpf/bpf_struct_ops.c b/kernel/bpf/bpf_struct_ops.c
index 1ff292a6f3ed..05b366b821c3 100644
--- a/kernel/bpf/bpf_struct_ops.c
+++ b/kernel/bpf/bpf_struct_ops.c
@@ -218,7 +218,7 @@ static int prepare_arg_info(struct btf *btf,
args = btf_params(func_proto);
stub_args = btf_params(stub_func_proto);
- info_buf = kzalloc_objs(*info_buf, nargs, GFP_KERNEL);
+ info_buf = kzalloc_objs(*info_buf, nargs);
if (!info_buf)
return -ENOMEM;
@@ -378,7 +378,7 @@ int bpf_struct_ops_desc_init(struct bpf_struct_ops_desc *st_ops_desc,
if (!is_valid_value_type(btf, value_id, t, value_name))
return -EINVAL;
- arg_info = kzalloc_objs(*arg_info, btf_type_vlen(t), GFP_KERNEL);
+ arg_info = kzalloc_objs(*arg_info, btf_type_vlen(t));
if (!arg_info)
return -ENOMEM;
@@ -720,7 +720,7 @@ static long bpf_struct_ops_map_update_elem(struct bpf_map *map, void *key,
if (uvalue->common.state || refcount_read(&uvalue->common.refcnt))
return -EINVAL;
- tlinks = kzalloc_objs(*tlinks, BPF_TRAMP_MAX, GFP_KERNEL);
+ tlinks = kzalloc_objs(*tlinks, BPF_TRAMP_MAX);
if (!tlinks)
return -ENOMEM;
diff --git a/kernel/bpf/btf.c b/kernel/bpf/btf.c
index ee9037aa9ab7..319916f8fc64 100644
--- a/kernel/bpf/btf.c
+++ b/kernel/bpf/btf.c
@@ -8306,7 +8306,7 @@ static int btf_module_notify(struct notifier_block *nb, unsigned long op,
switch (op) {
case MODULE_STATE_COMING:
- btf_mod = kzalloc_obj(*btf_mod, GFP_KERNEL);
+ btf_mod = kzalloc_obj(*btf_mod);
if (!btf_mod) {
err = -ENOMEM;
goto out;
@@ -8341,7 +8341,7 @@ static int btf_module_notify(struct notifier_block *nb, unsigned long op,
if (IS_ENABLED(CONFIG_SYSFS)) {
struct bin_attribute *attr;
- attr = kzalloc_obj(*attr, GFP_KERNEL);
+ attr = kzalloc_obj(*attr);
if (!attr)
goto out;
diff --git a/kernel/bpf/cgroup.c b/kernel/bpf/cgroup.c
index 5d7a35e476e9..876f6a81a9b6 100644
--- a/kernel/bpf/cgroup.c
+++ b/kernel/bpf/cgroup.c
@@ -845,7 +845,7 @@ static int __cgroup_bpf_attach(struct cgroup *cgrp,
if (pl) {
old_prog = pl->prog;
} else {
- pl = kmalloc_obj(*pl, GFP_KERNEL);
+ pl = kmalloc_obj(*pl);
if (!pl) {
bpf_cgroup_storages_free(new_storage);
return -ENOMEM;
diff --git a/kernel/bpf/crypto.c b/kernel/bpf/crypto.c
index 2b0660c32c92..51f89cecefb4 100644
--- a/kernel/bpf/crypto.c
+++ b/kernel/bpf/crypto.c
@@ -68,7 +68,7 @@ int bpf_crypto_register_type(const struct bpf_crypto_type *type)
goto unlock;
}
- node = kmalloc_obj(*node, GFP_KERNEL);
+ node = kmalloc_obj(*node);
err = -ENOMEM;
if (!node)
goto unlock;
@@ -176,7 +176,7 @@ bpf_crypto_ctx_create(const struct bpf_crypto_params *params, u32 params__sz,
goto err_module_put;
}
- ctx = kzalloc_obj(*ctx, GFP_KERNEL);
+ ctx = kzalloc_obj(*ctx);
if (!ctx) {
*err = -ENOMEM;
goto err_module_put;
diff --git a/kernel/bpf/helpers.c b/kernel/bpf/helpers.c
index 42a692682f18..6eb6c82ed2ee 100644
--- a/kernel/bpf/helpers.c
+++ b/kernel/bpf/helpers.c
@@ -3993,7 +3993,7 @@ __bpf_kfunc struct bpf_key *bpf_lookup_user_key(s32 serial, u64 flags)
if (IS_ERR(key_ref))
return NULL;
- bkey = kmalloc_obj(*bkey, GFP_KERNEL);
+ bkey = kmalloc_obj(*bkey);
if (!bkey) {
key_put(key_ref_to_ptr(key_ref));
return NULL;
diff --git a/kernel/bpf/inode.c b/kernel/bpf/inode.c
index a111b0e9214e..25c06a011825 100644
--- a/kernel/bpf/inode.c
+++ b/kernel/bpf/inode.c
@@ -1044,7 +1044,7 @@ static int bpf_init_fs_context(struct fs_context *fc)
{
struct bpf_mount_opts *opts;
- opts = kzalloc_obj(struct bpf_mount_opts, GFP_KERNEL);
+ opts = kzalloc_obj(struct bpf_mount_opts);
if (!opts)
return -ENOMEM;
diff --git a/kernel/bpf/offload.c b/kernel/bpf/offload.c
index 7fcbbe0ad925..0ad97d643bf4 100644
--- a/kernel/bpf/offload.c
+++ b/kernel/bpf/offload.c
@@ -72,7 +72,7 @@ static int __bpf_offload_dev_netdev_register(struct bpf_offload_dev *offdev,
struct bpf_offload_netdev *ondev;
int err;
- ondev = kzalloc_obj(*ondev, GFP_KERNEL);
+ ondev = kzalloc_obj(*ondev);
if (!ondev)
return -ENOMEM;
@@ -777,7 +777,7 @@ bpf_offload_dev_create(const struct bpf_prog_offload_ops *ops, void *priv)
{
struct bpf_offload_dev *offdev;
- offdev = kzalloc_obj(*offdev, GFP_KERNEL);
+ offdev = kzalloc_obj(*offdev);
if (!offdev)
return ERR_PTR(-ENOMEM);
diff --git a/kernel/bpf/trampoline.c b/kernel/bpf/trampoline.c
index b94565843f77..84db9e658e52 100644
--- a/kernel/bpf/trampoline.c
+++ b/kernel/bpf/trampoline.c
@@ -256,7 +256,7 @@ static int direct_ops_mod(struct bpf_trampoline *tr, void *addr, bool lock_direc
*/
static int direct_ops_alloc(struct bpf_trampoline *tr)
{
- tr->fops = kzalloc_obj(struct ftrace_ops, GFP_KERNEL);
+ tr->fops = kzalloc_obj(struct ftrace_ops);
if (!tr->fops)
return -ENOMEM;
tr->fops->private = tr;
@@ -342,7 +342,7 @@ static struct bpf_trampoline *bpf_trampoline_lookup(u64 key, unsigned long ip)
goto out;
}
}
- tr = kzalloc_obj(*tr, GFP_KERNEL);
+ tr = kzalloc_obj(*tr);
if (!tr)
goto out;
if (direct_ops_alloc(tr)) {
@@ -446,7 +446,7 @@ bpf_trampoline_get_progs(const struct bpf_trampoline *tr, int *total, bool *ip_a
int kind;
*total = 0;
- tlinks = kzalloc_objs(*tlinks, BPF_TRAMP_MAX, GFP_KERNEL);
+ tlinks = kzalloc_objs(*tlinks, BPF_TRAMP_MAX);
if (!tlinks)
return ERR_PTR(-ENOMEM);
@@ -569,7 +569,7 @@ static struct bpf_tramp_image *bpf_tramp_image_alloc(u64 key, int size)
void *image;
int err = -ENOMEM;
- im = kzalloc_obj(*im, GFP_KERNEL);
+ im = kzalloc_obj(*im);
if (!im)
goto out;
diff --git a/kernel/bpf/verifier.c b/kernel/bpf/verifier.c
index 63f05d90e708..bb12ba020649 100644
--- a/kernel/bpf/verifier.c
+++ b/kernel/bpf/verifier.c
@@ -22769,7 +22769,7 @@ static int jit_subprogs(struct bpf_verifier_env *env)
goto out_undo_insn;
err = -ENOMEM;
- func = kzalloc_objs(prog, env->subprog_cnt, GFP_KERNEL);
+ func = kzalloc_objs(prog, env->subprog_cnt);
if (!func)
goto out_undo_insn;
diff --git a/kernel/cgroup/cgroup-v1.c b/kernel/cgroup/cgroup-v1.c
index 0449b062dd1c..a4337c9b5287 100644
--- a/kernel/cgroup/cgroup-v1.c
+++ b/kernel/cgroup/cgroup-v1.c
@@ -317,7 +317,7 @@ static struct cgroup_pidlist *cgroup_pidlist_find_create(struct cgroup *cgrp,
return l;
/* entry not found; create a new one */
- l = kzalloc_obj(struct cgroup_pidlist, GFP_KERNEL);
+ l = kzalloc_obj(struct cgroup_pidlist);
if (!l)
return l;
@@ -352,7 +352,7 @@ static int pidlist_array_load(struct cgroup *cgrp, enum cgroup_filetype type,
* show up until sometime later on.
*/
length = cgroup_task_count(cgrp);
- array = kvmalloc_objs(pid_t, length, GFP_KERNEL);
+ array = kvmalloc_objs(pid_t, length);
if (!array)
return -ENOMEM;
/* now, populate the array */
@@ -1237,7 +1237,7 @@ static int cgroup1_root_to_use(struct fs_context *fc)
if (ctx->ns != &init_cgroup_ns)
return -EPERM;
- root = kzalloc_obj(*root, GFP_KERNEL);
+ root = kzalloc_obj(*root);
if (!root)
return -ENOMEM;
diff --git a/kernel/cgroup/cgroup.c b/kernel/cgroup/cgroup.c
index 7d220276d019..c14fbdc4cdbe 100644
--- a/kernel/cgroup/cgroup.c
+++ b/kernel/cgroup/cgroup.c
@@ -1168,7 +1168,7 @@ static int allocate_cgrp_cset_links(int count, struct list_head *tmp_links)
INIT_LIST_HEAD(tmp_links);
for (i = 0; i < count; i++) {
- link = kzalloc_obj(*link, GFP_KERNEL);
+ link = kzalloc_obj(*link);
if (!link) {
free_cgrp_cset_links(tmp_links);
return -ENOMEM;
@@ -1241,7 +1241,7 @@ static struct css_set *find_css_set(struct css_set *old_cset,
if (cset)
return cset;
- cset = kzalloc_obj(*cset, GFP_KERNEL);
+ cset = kzalloc_obj(*cset);
if (!cset)
return NULL;
@@ -2350,7 +2350,7 @@ static int cgroup_init_fs_context(struct fs_context *fc)
{
struct cgroup_fs_context *ctx;
- ctx = kzalloc_obj(struct cgroup_fs_context, GFP_KERNEL);
+ ctx = kzalloc_obj(struct cgroup_fs_context);
if (!ctx)
return -ENOMEM;
@@ -4251,7 +4251,7 @@ static int cgroup_file_open(struct kernfs_open_file *of)
struct cgroup_file_ctx *ctx;
int ret;
- ctx = kzalloc_obj(*ctx, GFP_KERNEL);
+ ctx = kzalloc_obj(*ctx);
if (!ctx)
return -ENOMEM;
diff --git a/kernel/cgroup/cpuset-v1.c b/kernel/cgroup/cpuset-v1.c
index 8e7ffc205c3b..7308e9b02495 100644
--- a/kernel/cgroup/cpuset-v1.c
+++ b/kernel/cgroup/cpuset-v1.c
@@ -316,7 +316,7 @@ void cpuset1_hotplug_update_tasks(struct cpuset *cs,
css_tryget_online(&cs->css)) {
struct cpuset_remove_tasks_struct *s;
- s = kzalloc_obj(*s, GFP_KERNEL);
+ s = kzalloc_obj(*s);
if (WARN_ON_ONCE(!s)) {
css_put(&cs->css);
return;
@@ -653,7 +653,7 @@ int cpuset1_generate_sched_domains(cpumask_var_t **domains,
if (!doms)
goto done;
- dattr = kmalloc_obj(struct sched_domain_attr, GFP_KERNEL);
+ dattr = kmalloc_obj(struct sched_domain_attr);
if (dattr) {
*dattr = SD_ATTR_INIT;
update_domain_attr_tree(dattr, &top_cpuset);
@@ -664,7 +664,7 @@ int cpuset1_generate_sched_domains(cpumask_var_t **domains,
goto done;
}
- csa = kmalloc_objs(cp, nr_cpusets(), GFP_KERNEL);
+ csa = kmalloc_objs(cp, nr_cpusets());
if (!csa)
goto done;
csn = 0;
@@ -727,7 +727,7 @@ int cpuset1_generate_sched_domains(cpumask_var_t **domains,
* The rest of the code, including the scheduler, can deal with
* dattr==NULL case. No need to abort if alloc fails.
*/
- dattr = kmalloc_objs(struct sched_domain_attr, ndoms, GFP_KERNEL);
+ dattr = kmalloc_objs(struct sched_domain_attr, ndoms);
for (nslot = 0, i = 0; i < csn; i++) {
nslot_update = 0;
diff --git a/kernel/cgroup/cpuset.c b/kernel/cgroup/cpuset.c
index 384d9d6e323b..9faf34377a88 100644
--- a/kernel/cgroup/cpuset.c
+++ b/kernel/cgroup/cpuset.c
@@ -536,7 +536,7 @@ static struct cpuset *dup_or_alloc_cpuset(struct cpuset *cs)
/* Allocate base structure */
trial = cs ? kmemdup(cs, sizeof(*cs), GFP_KERNEL) :
- kzalloc_obj(*cs, GFP_KERNEL);
+ kzalloc_obj(*cs);
if (!trial)
return NULL;
@@ -791,7 +791,7 @@ static int generate_sched_domains(cpumask_var_t **domains,
goto generate_doms;
}
- csa = kmalloc_objs(cp, nr_cpusets(), GFP_KERNEL);
+ csa = kmalloc_objs(cp, nr_cpusets());
if (!csa)
goto done;
@@ -835,7 +835,7 @@ static int generate_sched_domains(cpumask_var_t **domains,
* The rest of the code, including the scheduler, can deal with
* dattr==NULL case. No need to abort if alloc fails.
*/
- dattr = kmalloc_objs(struct sched_domain_attr, ndoms, GFP_KERNEL);
+ dattr = kmalloc_objs(struct sched_domain_attr, ndoms);
/*
* Cgroup v2 doesn't support domain attributes, just set all of them
@@ -2478,7 +2478,7 @@ static void cpuset_migrate_mm(struct mm_struct *mm, const nodemask_t *from,
return;
}
- mwork = kzalloc_obj(*mwork, GFP_KERNEL);
+ mwork = kzalloc_obj(*mwork);
if (mwork) {
mwork->mm = mm;
mwork->from = *from;
@@ -2500,7 +2500,7 @@ static void schedule_flush_migrate_mm(void)
{
struct callback_head *flush_cb;
- flush_cb = kzalloc_obj(struct callback_head, GFP_KERNEL);
+ flush_cb = kzalloc_obj(struct callback_head);
if (!flush_cb)
return;
diff --git a/kernel/cgroup/debug.c b/kernel/cgroup/debug.c
index 78429dd9e9c6..883347b87842 100644
--- a/kernel/cgroup/debug.c
+++ b/kernel/cgroup/debug.c
@@ -14,7 +14,7 @@
static struct cgroup_subsys_state *
debug_css_alloc(struct cgroup_subsys_state *parent_css)
{
- struct cgroup_subsys_state *css = kzalloc_obj(*css, GFP_KERNEL);
+ struct cgroup_subsys_state *css = kzalloc_obj(*css);
if (!css)
return ERR_PTR(-ENOMEM);
diff --git a/kernel/cgroup/dmem.c b/kernel/cgroup/dmem.c
index 0c8c0a135231..9d95824dc6fa 100644
--- a/kernel/cgroup/dmem.c
+++ b/kernel/cgroup/dmem.c
@@ -222,7 +222,7 @@ static void dmemcs_free(struct cgroup_subsys_state *css)
static struct cgroup_subsys_state *
dmemcs_alloc(struct cgroup_subsys_state *parent_css)
{
- struct dmemcg_state *dmemcs = kzalloc_obj(*dmemcs, GFP_KERNEL);
+ struct dmemcg_state *dmemcs = kzalloc_obj(*dmemcs);
if (!dmemcs)
return ERR_PTR(-ENOMEM);
@@ -521,7 +521,7 @@ struct dmem_cgroup_region *dmem_cgroup_register_region(u64 size, const char *fmt
if (!region_name)
return ERR_PTR(-ENOMEM);
- ret = kzalloc_obj(*ret, GFP_KERNEL);
+ ret = kzalloc_obj(*ret);
if (!ret) {
kfree(region_name);
return ERR_PTR(-ENOMEM);
@@ -597,7 +597,7 @@ get_cg_pool_unlocked(struct dmemcg_state *cg, struct dmem_cgroup_region *region)
if (WARN_ON(allocpool))
continue;
- allocpool = kzalloc_obj(*allocpool, GFP_KERNEL);
+ allocpool = kzalloc_obj(*allocpool);
if (allocpool) {
pool = NULL;
continue;
diff --git a/kernel/cgroup/legacy_freezer.c b/kernel/cgroup/legacy_freezer.c
index 85344b107873..8545e0d1ba3d 100644
--- a/kernel/cgroup/legacy_freezer.c
+++ b/kernel/cgroup/legacy_freezer.c
@@ -81,7 +81,7 @@ freezer_css_alloc(struct cgroup_subsys_state *parent_css)
{
struct freezer *freezer;
- freezer = kzalloc_obj(struct freezer, GFP_KERNEL);
+ freezer = kzalloc_obj(struct freezer);
if (!freezer)
return ERR_PTR(-ENOMEM);
diff --git a/kernel/cgroup/misc.c b/kernel/cgroup/misc.c
index 7c3ae3a76c8d..4a9e2557141c 100644
--- a/kernel/cgroup/misc.c
+++ b/kernel/cgroup/misc.c
@@ -445,7 +445,7 @@ misc_cg_alloc(struct cgroup_subsys_state *parent_css)
if (!parent_css) {
cg = &root_cg;
} else {
- cg = kzalloc_obj(*cg, GFP_KERNEL);
+ cg = kzalloc_obj(*cg);
if (!cg)
return ERR_PTR(-ENOMEM);
}
diff --git a/kernel/cgroup/pids.c b/kernel/cgroup/pids.c
index 6221573fc6ad..ecbb839d2acb 100644
--- a/kernel/cgroup/pids.c
+++ b/kernel/cgroup/pids.c
@@ -80,7 +80,7 @@ pids_css_alloc(struct cgroup_subsys_state *parent)
{
struct pids_cgroup *pids;
- pids = kzalloc_obj(struct pids_cgroup, GFP_KERNEL);
+ pids = kzalloc_obj(struct pids_cgroup);
if (!pids)
return ERR_PTR(-ENOMEM);
diff --git a/kernel/cgroup/rdma.c b/kernel/cgroup/rdma.c
index 9d3693574b11..09258eebb5c7 100644
--- a/kernel/cgroup/rdma.c
+++ b/kernel/cgroup/rdma.c
@@ -134,7 +134,7 @@ get_cg_rpool_locked(struct rdma_cgroup *cg, struct rdmacg_device *device)
if (rpool)
return rpool;
- rpool = kzalloc_obj(*rpool, GFP_KERNEL);
+ rpool = kzalloc_obj(*rpool);
if (!rpool)
return ERR_PTR(-ENOMEM);
@@ -443,7 +443,7 @@ static ssize_t rdmacg_resource_set_max(struct kernfs_open_file *of,
goto err;
}
- new_limits = kzalloc_objs(int, RDMACG_RESOURCE_MAX, GFP_KERNEL);
+ new_limits = kzalloc_objs(int, RDMACG_RESOURCE_MAX);
if (!new_limits) {
ret = -ENOMEM;
goto err;
@@ -566,7 +566,7 @@ rdmacg_css_alloc(struct cgroup_subsys_state *parent)
{
struct rdma_cgroup *cg;
- cg = kzalloc_obj(*cg, GFP_KERNEL);
+ cg = kzalloc_obj(*cg);
if (!cg)
return ERR_PTR(-ENOMEM);
diff --git a/kernel/crash_core.c b/kernel/crash_core.c
index 2146ca0f0ed8..2c1a3791e410 100644
--- a/kernel/crash_core.c
+++ b/kernel/crash_core.c
@@ -368,7 +368,7 @@ static int __crash_shrink_memory(struct resource *old_res,
{
struct resource *ram_res;
- ram_res = kzalloc_obj(*ram_res, GFP_KERNEL);
+ ram_res = kzalloc_obj(*ram_res);
if (!ram_res)
return -ENOMEM;
diff --git a/kernel/crash_dump_dm_crypt.c b/kernel/crash_dump_dm_crypt.c
index 13191d7c7a32..1f4067fbdb94 100644
--- a/kernel/crash_dump_dm_crypt.c
+++ b/kernel/crash_dump_dm_crypt.c
@@ -252,7 +252,7 @@ static struct config_item *config_keys_make_item(struct config_group *group,
return ERR_PTR(-EINVAL);
}
- config_key = kzalloc_obj(struct config_key, GFP_KERNEL);
+ config_key = kzalloc_obj(struct config_key);
if (!config_key)
return ERR_PTR(-ENOMEM);
diff --git a/kernel/dma/coherent.c b/kernel/dma/coherent.c
index d580ab6d2e33..1147497bc512 100644
--- a/kernel/dma/coherent.c
+++ b/kernel/dma/coherent.c
@@ -49,7 +49,7 @@ static struct dma_coherent_mem *dma_init_coherent_memory(phys_addr_t phys_addr,
if (!mem_base)
return ERR_PTR(-EINVAL);
- dma_mem = kzalloc_obj(struct dma_coherent_mem, GFP_KERNEL);
+ dma_mem = kzalloc_obj(struct dma_coherent_mem);
if (!dma_mem)
goto out_unmap_membase;
dma_mem->bitmap = bitmap_zalloc(pages, GFP_KERNEL);
diff --git a/kernel/dma/debug.c b/kernel/dma/debug.c
index 3be263d7afd6..86f87e43438c 100644
--- a/kernel/dma/debug.c
+++ b/kernel/dma/debug.c
@@ -900,7 +900,7 @@ void dma_debug_add_bus(const struct bus_type *bus)
if (dma_debug_disabled())
return;
- nb = kzalloc_obj(struct notifier_block, GFP_KERNEL);
+ nb = kzalloc_obj(struct notifier_block);
if (nb == NULL) {
pr_err("dma_debug_add_bus: out of memory\n");
return;
diff --git a/kernel/dma/direct.c b/kernel/dma/direct.c
index 280ec952c5e1..8f43a930716d 100644
--- a/kernel/dma/direct.c
+++ b/kernel/dma/direct.c
@@ -654,7 +654,7 @@ int dma_direct_set_offset(struct device *dev, phys_addr_t cpu_start,
if (!offset)
return 0;
- map = kzalloc_objs(*map, 2, GFP_KERNEL);
+ map = kzalloc_objs(*map, 2);
if (!map)
return -ENOMEM;
map[0].cpu_start = cpu_start;
diff --git a/kernel/dma/map_benchmark.c b/kernel/dma/map_benchmark.c
index 48ab3d957960..0f33b3ea7daf 100644
--- a/kernel/dma/map_benchmark.c
+++ b/kernel/dma/map_benchmark.c
@@ -121,7 +121,7 @@ static int do_map_benchmark(struct map_benchmark_data *map)
int ret = 0;
int i;
- tsk = kmalloc_objs(*tsk, threads, GFP_KERNEL);
+ tsk = kmalloc_objs(*tsk, threads);
if (!tsk)
return -ENOMEM;
diff --git a/kernel/dma/remap.c b/kernel/dma/remap.c
index b53e66417e5f..205c0c0ba2fe 100644
--- a/kernel/dma/remap.c
+++ b/kernel/dma/remap.c
@@ -45,7 +45,7 @@ void *dma_common_contiguous_remap(struct page *page, size_t size,
void *vaddr;
int i;
- pages = kvmalloc_objs(struct page *, count, GFP_KERNEL);
+ pages = kvmalloc_objs(struct page *, count);
if (!pages)
return NULL;
for (i = 0; i < count; i++)
diff --git a/kernel/dma/swiotlb.c b/kernel/dma/swiotlb.c
index cb8efc059e6a..d8e6f1d889d5 100644
--- a/kernel/dma/swiotlb.c
+++ b/kernel/dma/swiotlb.c
@@ -1809,18 +1809,18 @@ static int rmem_swiotlb_device_init(struct reserved_mem *rmem,
if (!mem) {
struct io_tlb_pool *pool;
- mem = kzalloc_obj(*mem, GFP_KERNEL);
+ mem = kzalloc_obj(*mem);
if (!mem)
return -ENOMEM;
pool = &mem->defpool;
- pool->slots = kzalloc_objs(*pool->slots, nslabs, GFP_KERNEL);
+ pool->slots = kzalloc_objs(*pool->slots, nslabs);
if (!pool->slots) {
kfree(mem);
return -ENOMEM;
}
- pool->areas = kzalloc_objs(*pool->areas, nareas, GFP_KERNEL);
+ pool->areas = kzalloc_objs(*pool->areas, nareas);
if (!pool->areas) {
kfree(pool->slots);
kfree(mem);
diff --git a/kernel/events/core.c b/kernel/events/core.c
index 33c84a605799..ac70d68217b6 100644
--- a/kernel/events/core.c
+++ b/kernel/events/core.c
@@ -5058,7 +5058,7 @@ alloc_perf_context(struct task_struct *task)
{
struct perf_event_context *ctx;
- ctx = kzalloc_obj(struct perf_event_context, GFP_KERNEL);
+ ctx = kzalloc_obj(struct perf_event_context);
if (!ctx)
return NULL;
@@ -5198,7 +5198,7 @@ find_get_pmu_context(struct pmu *pmu, struct perf_event_context *ctx,
return epc;
}
- new = kzalloc_obj(*epc, GFP_KERNEL);
+ new = kzalloc_obj(*epc);
if (!new)
return ERR_PTR(-ENOMEM);
@@ -5374,7 +5374,7 @@ alloc_perf_ctx_data(struct kmem_cache *ctx_cache, bool global)
{
struct perf_ctx_data *cd;
- cd = kzalloc_obj(*cd, GFP_KERNEL);
+ cd = kzalloc_obj(*cd);
if (!cd)
return NULL;
@@ -11111,7 +11111,7 @@ static int swevent_hlist_get_cpu(int cpu)
cpumask_test_cpu(cpu, perf_online_mask)) {
struct swevent_hlist *hlist;
- hlist = kzalloc_obj(*hlist, GFP_KERNEL);
+ hlist = kzalloc_obj(*hlist);
if (!hlist) {
err = -ENOMEM;
goto exit;
@@ -12634,7 +12634,7 @@ static int pmu_dev_alloc(struct pmu *pmu)
{
int ret = -ENOMEM;
- pmu->dev = kzalloc_obj(struct device, GFP_KERNEL);
+ pmu->dev = kzalloc_obj(struct device);
if (!pmu->dev)
goto out;
@@ -15269,7 +15269,7 @@ perf_cgroup_css_alloc(struct cgroup_subsys_state *parent_css)
{
struct perf_cgroup *jc;
- jc = kzalloc_obj(*jc, GFP_KERNEL);
+ jc = kzalloc_obj(*jc);
if (!jc)
return ERR_PTR(-ENOMEM);
diff --git a/kernel/events/uprobes.c b/kernel/events/uprobes.c
index d39dcc19d21e..923b24b321cc 100644
--- a/kernel/events/uprobes.c
+++ b/kernel/events/uprobes.c
@@ -238,7 +238,7 @@ static int delayed_uprobe_add(struct uprobe *uprobe, struct mm_struct *mm)
if (delayed_uprobe_check(uprobe, mm))
return 0;
- du = kzalloc_obj(*du, GFP_KERNEL);
+ du = kzalloc_obj(*du);
if (!du)
return -ENOMEM;
@@ -994,7 +994,7 @@ static struct uprobe *alloc_uprobe(struct inode *inode, loff_t offset,
{
struct uprobe *uprobe, *cur_uprobe;
- uprobe = kzalloc_obj(struct uprobe, GFP_KERNEL);
+ uprobe = kzalloc_obj(struct uprobe);
if (!uprobe)
return ERR_PTR(-ENOMEM);
@@ -1252,7 +1252,7 @@ build_map_info(struct address_space *mapping, loff_t offset, bool is_register)
}
do {
- info = kmalloc_obj(struct map_info, GFP_KERNEL);
+ info = kmalloc_obj(struct map_info);
if (!info) {
curr = ERR_PTR(-ENOMEM);
goto out;
@@ -1755,7 +1755,7 @@ static struct xol_area *__create_xol_area(unsigned long vaddr)
struct xol_area *area;
void *insns;
- area = kzalloc_obj(*area, GFP_KERNEL);
+ area = kzalloc_obj(*area);
if (unlikely(!area))
goto out;
@@ -2069,7 +2069,7 @@ static struct uprobe_task *alloc_utask(void)
{
struct uprobe_task *utask;
- utask = kzalloc_obj(*utask, GFP_KERNEL);
+ utask = kzalloc_obj(*utask);
if (!utask)
return NULL;
@@ -2102,7 +2102,7 @@ static struct return_instance *alloc_return_instance(struct uprobe_task *utask)
if (ri)
return ri;
- ri = kzalloc_obj(*ri, GFP_KERNEL);
+ ri = kzalloc_obj(*ri);
if (!ri)
return ZERO_SIZE_PTR;
diff --git a/kernel/fail_function.c b/kernel/fail_function.c
index 18993fcbdbda..2eaf55005f49 100644
--- a/kernel/fail_function.c
+++ b/kernel/fail_function.c
@@ -57,7 +57,7 @@ static struct fei_attr *fei_attr_new(const char *sym, unsigned long addr)
{
struct fei_attr *attr;
- attr = kzalloc_obj(*attr, GFP_KERNEL);
+ attr = kzalloc_obj(*attr);
if (attr) {
attr->kp.symbol_name = kstrdup(sym, GFP_KERNEL);
if (!attr->kp.symbol_name) {
diff --git a/kernel/futex/pi.c b/kernel/futex/pi.c
index a73b6c713d83..bc1f7e83a37e 100644
--- a/kernel/futex/pi.c
+++ b/kernel/futex/pi.c
@@ -17,7 +17,7 @@ int refill_pi_state_cache(void)
if (likely(current->pi_state_cache))
return 0;
- pi_state = kzalloc_obj(*pi_state, GFP_KERNEL);
+ pi_state = kzalloc_obj(*pi_state);
if (!pi_state)
return -ENOMEM;
diff --git a/kernel/futex/syscalls.c b/kernel/futex/syscalls.c
index aec0495adabe..743c7a728237 100644
--- a/kernel/futex/syscalls.c
+++ b/kernel/futex/syscalls.c
@@ -333,7 +333,7 @@ SYSCALL_DEFINE5(futex_waitv, struct futex_waitv __user *, waiters,
if (timeout && (ret = futex2_setup_timeout(timeout, clockid, &to)))
return ret;
- futexv = kzalloc_objs(*futexv, nr_futexes, GFP_KERNEL);
+ futexv = kzalloc_objs(*futexv, nr_futexes);
if (!futexv) {
ret = -ENOMEM;
goto destroy_timer;
diff --git a/kernel/gcov/clang.c b/kernel/gcov/clang.c
index 4cfdeb2c9dc2..fd98ced0e51d 100644
--- a/kernel/gcov/clang.c
+++ b/kernel/gcov/clang.c
@@ -81,7 +81,7 @@ static LIST_HEAD(clang_gcov_list);
void llvm_gcov_init(llvm_gcov_callback writeout, llvm_gcov_callback flush)
{
- struct gcov_info *info = kzalloc_obj(*info, GFP_KERNEL);
+ struct gcov_info *info = kzalloc_obj(*info);
if (!info)
return;
@@ -112,7 +112,7 @@ EXPORT_SYMBOL(llvm_gcda_start_file);
void llvm_gcda_emit_function(u32 ident, u32 func_checksum, u32 cfg_checksum)
{
- struct gcov_fn_info *info = kzalloc_obj(*info, GFP_KERNEL);
+ struct gcov_fn_info *info = kzalloc_obj(*info);
if (!info)
return;
diff --git a/kernel/gcov/fs.c b/kernel/gcov/fs.c
index 8430f5cd21b6..2acf677171b1 100644
--- a/kernel/gcov/fs.c
+++ b/kernel/gcov/fs.c
@@ -482,7 +482,7 @@ static void add_links(struct gcov_node *node, struct dentry *parent)
for (num = 0; gcov_link[num].ext; num++)
/* Nothing. */;
- node->links = kzalloc_objs(struct dentry *, num, GFP_KERNEL);
+ node->links = kzalloc_objs(struct dentry *, num);
if (!node->links)
return;
for (i = 0; i < num; i++) {
@@ -731,7 +731,7 @@ static void add_info(struct gcov_node *node, struct gcov_info *info)
* case the new data set is incompatible, the node only contains
* unloaded data sets and there's not enough memory for the array.
*/
- loaded_info = kzalloc_objs(struct gcov_info *, num + 1, GFP_KERNEL);
+ loaded_info = kzalloc_objs(struct gcov_info *, num + 1);
if (!loaded_info) {
pr_warn("could not add '%s' (out of memory)\n",
gcov_info_filename(info));
diff --git a/kernel/irq/affinity.c b/kernel/irq/affinity.c
index cf6729888ee3..85c45cfe7223 100644
--- a/kernel/irq/affinity.c
+++ b/kernel/irq/affinity.c
@@ -56,7 +56,7 @@ irq_create_affinity_masks(unsigned int nvecs, struct irq_affinity *affd)
if (!affvecs)
return NULL;
- masks = kzalloc_objs(*masks, nvecs, GFP_KERNEL);
+ masks = kzalloc_objs(*masks, nvecs);
if (!masks)
return NULL;
diff --git a/kernel/irq/irq_sim.c b/kernel/irq/irq_sim.c
index 59b84a10465c..44747754530d 100644
--- a/kernel/irq/irq_sim.c
+++ b/kernel/irq/irq_sim.c
@@ -148,7 +148,7 @@ static int irq_sim_domain_map(struct irq_domain *domain,
struct irq_sim_work_ctx *work_ctx = domain->host_data;
struct irq_sim_irq_ctx *irq_ctx;
- irq_ctx = kzalloc_obj(*irq_ctx, GFP_KERNEL);
+ irq_ctx = kzalloc_obj(*irq_ctx);
if (!irq_ctx)
return -ENOMEM;
@@ -202,7 +202,7 @@ struct irq_domain *irq_domain_create_sim_full(struct fwnode_handle *fwnode,
void *data)
{
struct irq_sim_work_ctx *work_ctx __free(kfree) =
- kzalloc_obj(*work_ctx, GFP_KERNEL);
+ kzalloc_obj(*work_ctx);
if (!work_ctx)
return ERR_PTR(-ENOMEM);
diff --git a/kernel/irq/irqdesc.c b/kernel/irq/irqdesc.c
index ddc9d01b3091..7173b8b634f2 100644
--- a/kernel/irq/irqdesc.c
+++ b/kernel/irq/irqdesc.c
@@ -969,7 +969,7 @@ int irq_set_percpu_devid(unsigned int irq)
if (!desc || desc->percpu_enabled)
return -EINVAL;
- desc->percpu_enabled = kzalloc_obj(*desc->percpu_enabled, GFP_KERNEL);
+ desc->percpu_enabled = kzalloc_obj(*desc->percpu_enabled);
if (!desc->percpu_enabled)
return -ENOMEM;
diff --git a/kernel/irq/irqdomain.c b/kernel/irq/irqdomain.c
index 857fcd74ebda..cc93abf009e8 100644
--- a/kernel/irq/irqdomain.c
+++ b/kernel/irq/irqdomain.c
@@ -92,7 +92,7 @@ struct fwnode_handle *__irq_domain_alloc_fwnode(unsigned int type, int id,
struct irqchip_fwid *fwid;
char *n;
- fwid = kzalloc_obj(*fwid, GFP_KERNEL);
+ fwid = kzalloc_obj(*fwid);
switch (type) {
case IRQCHIP_FWNODE_NAMED:
diff --git a/kernel/irq/manage.c b/kernel/irq/manage.c
index 2b05c45be1b3..2e8072437826 100644
--- a/kernel/irq/manage.c
+++ b/kernel/irq/manage.c
@@ -1332,7 +1332,7 @@ static int irq_setup_forced_threading(struct irqaction *new)
*/
if (new->handler && new->thread_fn) {
/* Allocate the secondary action */
- new->secondary = kzalloc_obj(struct irqaction, GFP_KERNEL);
+ new->secondary = kzalloc_obj(struct irqaction);
if (!new->secondary)
return -ENOMEM;
new->secondary->handler = irq_forced_secondary_handler;
@@ -2156,7 +2156,7 @@ int request_threaded_irq(unsigned int irq, irq_handler_t handler,
handler = irq_default_primary_handler;
}
- action = kzalloc_obj(struct irqaction, GFP_KERNEL);
+ action = kzalloc_obj(struct irqaction);
if (!action)
return -ENOMEM;
@@ -2486,7 +2486,7 @@ struct irqaction *create_percpu_irqaction(irq_handler_t handler, unsigned long f
if (!affinity)
affinity = cpu_possible_mask;
- action = kzalloc_obj(struct irqaction, GFP_KERNEL);
+ action = kzalloc_obj(struct irqaction);
if (!action)
return NULL;
diff --git a/kernel/irq/msi.c b/kernel/irq/msi.c
index e4bae8f1c414..3cafa40e6ce3 100644
--- a/kernel/irq/msi.c
+++ b/kernel/irq/msi.c
@@ -76,7 +76,7 @@ static int msi_domain_prepare_irqs(struct irq_domain *domain, struct device *dev
static struct msi_desc *msi_alloc_desc(struct device *dev, int nvec,
const struct irq_affinity_desc *affinity)
{
- struct msi_desc *desc = kzalloc_obj(*desc, GFP_KERNEL);
+ struct msi_desc *desc = kzalloc_obj(*desc);
if (!desc)
return NULL;
@@ -530,7 +530,7 @@ static int msi_sysfs_populate_desc(struct device *dev, struct msi_desc *desc)
struct device_attribute *attrs;
int ret, i;
- attrs = kzalloc_objs(*attrs, desc->nvec_used, GFP_KERNEL);
+ attrs = kzalloc_objs(*attrs, desc->nvec_used);
if (!attrs)
return -ENOMEM;
diff --git a/kernel/kallsyms_selftest.c b/kernel/kallsyms_selftest.c
index d2aeb6b7c393..8f6c4e9b3a1c 100644
--- a/kernel/kallsyms_selftest.c
+++ b/kernel/kallsyms_selftest.c
@@ -264,7 +264,7 @@ static int test_kallsyms_basic_function(void)
char namebuf[KSYM_NAME_LEN];
struct test_stat *stat, *stat2;
- stat = kmalloc_objs(*stat, 2, GFP_KERNEL);
+ stat = kmalloc_objs(*stat, 2);
if (!stat)
return -ENOMEM;
stat2 = stat + 1;
diff --git a/kernel/kcov.c b/kernel/kcov.c
index b9d4db7ea439..0b369e88c7c9 100644
--- a/kernel/kcov.c
+++ b/kernel/kcov.c
@@ -527,7 +527,7 @@ static int kcov_open(struct inode *inode, struct file *filep)
{
struct kcov *kcov;
- kcov = kzalloc_obj(*kcov, GFP_KERNEL);
+ kcov = kzalloc_obj(*kcov);
if (!kcov)
return -ENOMEM;
guard(spinlock_init)(&kcov->lock);
diff --git a/kernel/kcsan/kcsan_test.c b/kernel/kcsan/kcsan_test.c
index edb062fb43b4..79e655ea4ca1 100644
--- a/kernel/kcsan/kcsan_test.c
+++ b/kernel/kcsan/kcsan_test.c
@@ -168,7 +168,7 @@ static bool __report_matches(const struct expect_report *r)
if (!report_available())
return false;
- expect = kmalloc_obj(observed.lines, GFP_KERNEL);
+ expect = kmalloc_obj(observed.lines);
if (WARN_ON(!expect))
return false;
@@ -1538,7 +1538,7 @@ static int test_init(struct kunit *test)
if (WARN_ON(!nthreads))
goto err;
- threads = kzalloc_objs(struct task_struct *, nthreads + 1, GFP_KERNEL);
+ threads = kzalloc_objs(struct task_struct *, nthreads + 1);
if (WARN_ON(!threads))
goto err;
diff --git a/kernel/kexec.c b/kernel/kexec.c
index 3902e7bb99fe..90756dc6339b 100644
--- a/kernel/kexec.c
+++ b/kernel/kexec.c
@@ -284,7 +284,7 @@ COMPAT_SYSCALL_DEFINE4(kexec_load, compat_ulong_t, entry,
if ((flags & KEXEC_ARCH_MASK) == KEXEC_ARCH_DEFAULT)
return -EINVAL;
- ksegments = kmalloc_objs(ksegments[0], nr_segments, GFP_KERNEL);
+ ksegments = kmalloc_objs(ksegments[0], nr_segments);
if (!ksegments)
return -ENOMEM;
diff --git a/kernel/kexec_core.c b/kernel/kexec_core.c
index 76e4287a4f1d..2fea396d29b9 100644
--- a/kernel/kexec_core.c
+++ b/kernel/kexec_core.c
@@ -231,7 +231,7 @@ struct kimage *do_kimage_alloc_init(void)
struct kimage *image;
/* Allocate a controlling structure */
- image = kzalloc_obj(*image, GFP_KERNEL);
+ image = kzalloc_obj(*image);
if (!image)
return NULL;
@@ -975,7 +975,7 @@ void *kimage_map_segment(struct kimage *image, int idx)
* Collect the source pages and map them in a contiguous VA range.
*/
npages = PFN_UP(eaddr) - PFN_DOWN(addr);
- src_pages = kmalloc_objs(*src_pages, npages, GFP_KERNEL);
+ src_pages = kmalloc_objs(*src_pages, npages);
if (!src_pages) {
pr_err("Could not allocate ima pages array.\n");
return NULL;
diff --git a/kernel/kprobes.c b/kernel/kprobes.c
index b6744137b11e..15cc289a6fdf 100644
--- a/kernel/kprobes.c
+++ b/kernel/kprobes.c
@@ -900,7 +900,7 @@ static struct kprobe *alloc_aggr_kprobe(struct kprobe *p)
{
struct optimized_kprobe *op;
- op = kzalloc_obj(struct optimized_kprobe, GFP_KERNEL);
+ op = kzalloc_obj(struct optimized_kprobe);
if (!op)
return NULL;
@@ -1117,7 +1117,7 @@ static void free_aggr_kprobe(struct kprobe *p)
static struct kprobe *alloc_aggr_kprobe(struct kprobe *p)
{
- return kzalloc_obj(struct kprobe, GFP_KERNEL);
+ return kzalloc_obj(struct kprobe);
}
#endif /* CONFIG_OPTPROBES */
@@ -2295,7 +2295,7 @@ int register_kretprobe(struct kretprobe *rp)
rp->rh = NULL;
}
#else /* !CONFIG_KRETPROBE_ON_RETHOOK */
- rp->rph = kzalloc_obj(struct kretprobe_holder, GFP_KERNEL);
+ rp->rph = kzalloc_obj(struct kretprobe_holder);
if (!rp->rph)
return -ENOMEM;
@@ -2499,7 +2499,7 @@ int kprobe_add_ksym_blacklist(unsigned long entry)
!kallsyms_lookup_size_offset(entry, &size, &offset))
return -EINVAL;
- ent = kmalloc_obj(*ent, GFP_KERNEL);
+ ent = kmalloc_obj(*ent);
if (!ent)
return -ENOMEM;
ent->start_addr = entry;
diff --git a/kernel/kthread.c b/kernel/kthread.c
index 0b4f7328096f..20451b624b67 100644
--- a/kernel/kthread.c
+++ b/kernel/kthread.c
@@ -122,7 +122,7 @@ bool set_kthread_struct(struct task_struct *p)
if (WARN_ON_ONCE(to_kthread(p)))
return false;
- kthread = kzalloc_obj(*kthread, GFP_KERNEL);
+ kthread = kzalloc_obj(*kthread);
if (!kthread)
return false;
@@ -511,7 +511,7 @@ struct task_struct *__kthread_create_on_node(int (*threadfn)(void *data),
{
DECLARE_COMPLETION_ONSTACK(done);
struct task_struct *task;
- struct kthread_create_info *create = kmalloc_obj(*create, GFP_KERNEL);
+ struct kthread_create_info *create = kmalloc_obj(*create);
if (!create)
return ERR_PTR(-ENOMEM);
@@ -1083,7 +1083,7 @@ __kthread_create_worker_on_node(unsigned int flags, int node,
struct kthread_worker *worker;
struct task_struct *task;
- worker = kzalloc_obj(*worker, GFP_KERNEL);
+ worker = kzalloc_obj(*worker);
if (!worker)
return ERR_PTR(-ENOMEM);
diff --git a/kernel/livepatch/core.c b/kernel/livepatch/core.c
index 0d52e48918eb..28d15ba58a26 100644
--- a/kernel/livepatch/core.c
+++ b/kernel/livepatch/core.c
@@ -525,7 +525,7 @@ static struct klp_object *klp_alloc_object_dynamic(const char *name,
{
struct klp_object *obj;
- obj = kzalloc_obj(*obj, GFP_KERNEL);
+ obj = kzalloc_obj(*obj);
if (!obj)
return NULL;
@@ -554,7 +554,7 @@ static struct klp_func *klp_alloc_func_nop(struct klp_func *old_func,
{
struct klp_func *func;
- func = kzalloc_obj(*func, GFP_KERNEL);
+ func = kzalloc_obj(*func);
if (!func)
return NULL;
diff --git a/kernel/livepatch/patch.c b/kernel/livepatch/patch.c
index 1149840cd538..3f54a017bbf6 100644
--- a/kernel/livepatch/patch.c
+++ b/kernel/livepatch/patch.c
@@ -179,7 +179,7 @@ static int klp_patch_func(struct klp_func *func)
return -EINVAL;
}
- ops = kzalloc_obj(*ops, GFP_KERNEL);
+ ops = kzalloc_obj(*ops);
if (!ops)
return -ENOMEM;
diff --git a/kernel/liveupdate/kexec_handover.c b/kernel/liveupdate/kexec_handover.c
index 23d76678d233..cc68a3692905 100644
--- a/kernel/liveupdate/kexec_handover.c
+++ b/kernel/liveupdate/kexec_handover.c
@@ -187,7 +187,7 @@ static int __kho_preserve_order(struct kho_mem_track *track, unsigned long pfn,
if (!physxa) {
int err;
- new_physxa = kzalloc_obj(*physxa, GFP_KERNEL);
+ new_physxa = kzalloc_obj(*physxa);
if (!new_physxa)
return -ENOMEM;
@@ -1090,7 +1090,7 @@ void *kho_restore_vmalloc(const struct kho_vmalloc *preservation)
return NULL;
total_pages = preservation->total_pages;
- pages = kvmalloc_objs(*pages, total_pages, GFP_KERNEL);
+ pages = kvmalloc_objs(*pages, total_pages);
if (!pages)
return NULL;
order = preservation->order;
diff --git a/kernel/liveupdate/kexec_handover_debugfs.c b/kernel/liveupdate/kexec_handover_debugfs.c
index d42fc940d14d..2f93939168ab 100644
--- a/kernel/liveupdate/kexec_handover_debugfs.c
+++ b/kernel/liveupdate/kexec_handover_debugfs.c
@@ -29,7 +29,7 @@ static int __kho_debugfs_fdt_add(struct list_head *list, struct dentry *dir,
struct fdt_debugfs *f;
struct dentry *file;
- f = kmalloc_obj(*f, GFP_KERNEL);
+ f = kmalloc_obj(*f);
if (!f)
return -ENOMEM;
diff --git a/kernel/liveupdate/luo_file.c b/kernel/liveupdate/luo_file.c
index ca96edb3b4e5..8c79058253e1 100644
--- a/kernel/liveupdate/luo_file.c
+++ b/kernel/liveupdate/luo_file.c
@@ -289,7 +289,7 @@ int luo_preserve_file(struct luo_file_set *file_set, u64 token, int fd)
if (err)
goto err_free_files_mem;
- luo_file = kzalloc_obj(*luo_file, GFP_KERNEL);
+ luo_file = kzalloc_obj(*luo_file);
if (!luo_file) {
err = -ENOMEM;
goto err_flb_unpreserve;
@@ -780,7 +780,7 @@ int luo_file_deserialize(struct luo_file_set *file_set,
return -ENOENT;
}
- luo_file = kzalloc_obj(*luo_file, GFP_KERNEL);
+ luo_file = kzalloc_obj(*luo_file);
if (!luo_file)
return -ENOMEM;
diff --git a/kernel/liveupdate/luo_flb.c b/kernel/liveupdate/luo_flb.c
index 5f2cdf9caa7b..f52e8114837e 100644
--- a/kernel/liveupdate/luo_flb.c
+++ b/kernel/liveupdate/luo_flb.c
@@ -343,7 +343,7 @@ int liveupdate_register_flb(struct liveupdate_file_handler *fh,
if (WARN_ON(list_empty(&ACCESS_PRIVATE(fh, list))))
return -EINVAL;
- link = kzalloc_obj(*link, GFP_KERNEL);
+ link = kzalloc_obj(*link);
if (!link)
return -ENOMEM;
diff --git a/kernel/liveupdate/luo_session.c b/kernel/liveupdate/luo_session.c
index c0262ca00533..783677295640 100644
--- a/kernel/liveupdate/luo_session.c
+++ b/kernel/liveupdate/luo_session.c
@@ -119,7 +119,7 @@ static struct luo_session_global luo_session_global = {
static struct luo_session *luo_session_alloc(const char *name)
{
- struct luo_session *session = kzalloc_obj(*session, GFP_KERNEL);
+ struct luo_session *session = kzalloc_obj(*session);
if (!session)
return ERR_PTR(-ENOMEM);
diff --git a/kernel/locking/test-ww_mutex.c b/kernel/locking/test-ww_mutex.c
index 2cc6d1937670..838d631544ed 100644
--- a/kernel/locking/test-ww_mutex.c
+++ b/kernel/locking/test-ww_mutex.c
@@ -324,7 +324,7 @@ static int __test_cycle(struct ww_class *class, unsigned int nthreads)
unsigned int n, last = nthreads - 1;
int ret;
- cycles = kmalloc_objs(*cycles, nthreads, GFP_KERNEL);
+ cycles = kmalloc_objs(*cycles, nthreads);
if (!cycles)
return -ENOMEM;
@@ -412,7 +412,7 @@ static int *get_random_order(int count)
int *order;
int n, r;
- order = kmalloc_objs(*order, count, GFP_KERNEL);
+ order = kmalloc_objs(*order, count);
if (!order)
return order;
@@ -506,7 +506,7 @@ static void stress_reorder_work(struct work_struct *work)
return;
for (n = 0; n < stress->nlocks; n++) {
- ll = kmalloc_obj(*ll, GFP_KERNEL);
+ ll = kmalloc_obj(*ll);
if (!ll)
goto out;
@@ -582,11 +582,11 @@ static int stress(struct ww_class *class, int nlocks, int nthreads, unsigned int
struct stress *stress_array;
int n, count;
- locks = kmalloc_objs(*locks, nlocks, GFP_KERNEL);
+ locks = kmalloc_objs(*locks, nlocks);
if (!locks)
return -ENOMEM;
- stress_array = kmalloc_objs(*stress_array, nthreads, GFP_KERNEL);
+ stress_array = kmalloc_objs(*stress_array, nthreads);
if (!stress_array) {
kfree(locks);
return -ENOMEM;
diff --git a/kernel/module/dups.c b/kernel/module/dups.c
index bbc72ad93058..1d720a5311ba 100644
--- a/kernel/module/dups.c
+++ b/kernel/module/dups.c
@@ -125,7 +125,7 @@ bool kmod_dup_request_exists_wait(char *module_name, bool wait, int *dup_ret)
* Pre-allocate the entry in case we have to use it later
* to avoid contention with the mutex.
*/
- new_kmod_req = kzalloc_obj(*new_kmod_req, GFP_KERNEL);
+ new_kmod_req = kzalloc_obj(*new_kmod_req);
if (!new_kmod_req)
return false;
diff --git a/kernel/module/main.c b/kernel/module/main.c
index b2ac20299915..2bac4c7cd019 100644
--- a/kernel/module/main.c
+++ b/kernel/module/main.c
@@ -3024,7 +3024,7 @@ static noinline int do_init_module(struct module *mod)
}
#endif
- freeinit = kmalloc_obj(*freeinit, GFP_KERNEL);
+ freeinit = kmalloc_obj(*freeinit);
if (!freeinit) {
ret = -ENOMEM;
goto fail;
diff --git a/kernel/module/stats.c b/kernel/module/stats.c
index 2fc64f2729e6..3a9672f93a8e 100644
--- a/kernel/module/stats.c
+++ b/kernel/module/stats.c
@@ -250,7 +250,7 @@ int try_add_failed_module(const char *name, enum fail_dup_mod_reason reason)
}
}
- mod_fail = kzalloc_obj(*mod_fail, GFP_KERNEL);
+ mod_fail = kzalloc_obj(*mod_fail);
if (!mod_fail)
return -ENOMEM;
memcpy(mod_fail->name, name, strlen(name));
diff --git a/kernel/module/sysfs.c b/kernel/module/sysfs.c
index 734ea3180478..768f74e99026 100644
--- a/kernel/module/sysfs.c
+++ b/kernel/module/sysfs.c
@@ -78,7 +78,7 @@ static int add_sect_attrs(struct module *mod, const struct load_info *info)
if (!sect_attrs)
return -ENOMEM;
- gattr = kzalloc_objs(*gattr, nloaded + 1, GFP_KERNEL);
+ gattr = kzalloc_objs(*gattr, nloaded + 1);
if (!gattr) {
kfree(sect_attrs);
return -ENOMEM;
@@ -170,7 +170,7 @@ static int add_notes_attrs(struct module *mod, const struct load_info *info)
if (!notes_attrs)
return -ENOMEM;
- gattr = kzalloc_objs(*gattr, notes + 1, GFP_KERNEL);
+ gattr = kzalloc_objs(*gattr, notes + 1);
if (!gattr) {
kfree(notes_attrs);
return -ENOMEM;
diff --git a/kernel/module/tracking.c b/kernel/module/tracking.c
index 41425054a97a..9033ff54c4e2 100644
--- a/kernel/module/tracking.c
+++ b/kernel/module/tracking.c
@@ -33,7 +33,7 @@ int try_add_tainted_module(struct module *mod)
}
}
- mod_taint = kmalloc_obj(*mod_taint, GFP_KERNEL);
+ mod_taint = kmalloc_obj(*mod_taint);
if (unlikely(!mod_taint))
return -ENOMEM;
strscpy(mod_taint->name, mod->name, MODULE_NAME_LEN);
diff --git a/kernel/padata.c b/kernel/padata.c
index f0bf62e9a1f2..0af32c78ea69 100644
--- a/kernel/padata.c
+++ b/kernel/padata.c
@@ -540,7 +540,7 @@ static struct parallel_data *padata_alloc_pd(struct padata_shell *ps)
struct padata_instance *pinst = ps->pinst;
struct parallel_data *pd;
- pd = kzalloc_obj(struct parallel_data, GFP_KERNEL);
+ pd = kzalloc_obj(struct parallel_data);
if (!pd)
goto err;
@@ -952,7 +952,7 @@ struct padata_instance *padata_alloc(const char *name)
{
struct padata_instance *pinst;
- pinst = kzalloc_obj(struct padata_instance, GFP_KERNEL);
+ pinst = kzalloc_obj(struct padata_instance);
if (!pinst)
goto err;
@@ -1038,7 +1038,7 @@ struct padata_shell *padata_alloc_shell(struct padata_instance *pinst)
struct parallel_data *pd;
struct padata_shell *ps;
- ps = kzalloc_obj(*ps, GFP_KERNEL);
+ ps = kzalloc_obj(*ps);
if (!ps)
goto out;
diff --git a/kernel/params.c b/kernel/params.c
index d26bdfae96e5..5d1cd7d0b51a 100644
--- a/kernel/params.c
+++ b/kernel/params.c
@@ -633,7 +633,7 @@ static __init_or_module int add_sysfs_param(struct module_kobject *mk,
if (!mk->mp) {
/* First allocation. */
- mk->mp = kzalloc_obj(*mk->mp, GFP_KERNEL);
+ mk->mp = kzalloc_obj(*mk->mp);
if (!mk->mp)
return -ENOMEM;
mk->mp->grp.name = "parameters";
@@ -766,7 +766,7 @@ lookup_or_create_module_kobject(const char *name)
if (kobj)
return to_module_kobject(kobj);
- mk = kzalloc_obj(struct module_kobject, GFP_KERNEL);
+ mk = kzalloc_obj(struct module_kobject);
if (!mk)
return NULL;
diff --git a/kernel/power/console.c b/kernel/power/console.c
index 5ed9e1be1560..33ace63b1088 100644
--- a/kernel/power/console.c
+++ b/kernel/power/console.c
@@ -58,7 +58,7 @@ int pm_vt_switch_required(struct device *dev, bool required)
}
}
- entry = kmalloc_obj(*entry, GFP_KERNEL);
+ entry = kmalloc_obj(*entry);
if (!entry) {
ret = -ENOMEM;
goto out;
diff --git a/kernel/power/energy_model.c b/kernel/power/energy_model.c
index 43ddfc11b84a..e610cf8e9a06 100644
--- a/kernel/power/energy_model.c
+++ b/kernel/power/energy_model.c
@@ -439,7 +439,7 @@ static int em_create_pd(struct device *dev, int nr_states,
cpumask_copy(em_span_cpus(pd), cpus);
} else {
- pd = kzalloc_obj(*pd, GFP_KERNEL);
+ pd = kzalloc_obj(*pd);
if (!pd)
return -ENOMEM;
}
diff --git a/kernel/power/qos.c b/kernel/power/qos.c
index 750b80f45b9f..398b994b73aa 100644
--- a/kernel/power/qos.c
+++ b/kernel/power/qos.c
@@ -341,7 +341,7 @@ static int cpu_latency_qos_open(struct inode *inode, struct file *filp)
{
struct pm_qos_request *req;
- req = kzalloc_obj(*req, GFP_KERNEL);
+ req = kzalloc_obj(*req);
if (!req)
return -ENOMEM;
@@ -440,7 +440,7 @@ static int cpu_wakeup_latency_qos_open(struct inode *inode, struct file *filp)
{
struct pm_qos_request *req;
- req = kzalloc_obj(*req, GFP_KERNEL);
+ req = kzalloc_obj(*req);
if (!req)
return -ENOMEM;
diff --git a/kernel/power/snapshot.c b/kernel/power/snapshot.c
index be0b3304339f..6e1321837c66 100644
--- a/kernel/power/snapshot.c
+++ b/kernel/power/snapshot.c
@@ -1124,7 +1124,7 @@ int create_basic_memory_bitmaps(void)
else
BUG_ON(forbidden_pages_map || free_pages_map);
- bm1 = kzalloc_obj(struct memory_bitmap, GFP_KERNEL);
+ bm1 = kzalloc_obj(struct memory_bitmap);
if (!bm1)
return -ENOMEM;
@@ -1132,7 +1132,7 @@ int create_basic_memory_bitmaps(void)
if (error)
goto Free_first_object;
- bm2 = kzalloc_obj(struct memory_bitmap, GFP_KERNEL);
+ bm2 = kzalloc_obj(struct memory_bitmap);
if (!bm2)
goto Free_first_bitmap;
diff --git a/kernel/power/swap.c b/kernel/power/swap.c
index 9bc1241259d3..2e64869bb5a0 100644
--- a/kernel/power/swap.c
+++ b/kernel/power/swap.c
@@ -155,7 +155,7 @@ static int swsusp_extents_insert(unsigned long swap_offset)
}
}
/* Add the new node and rebalance the tree. */
- ext = kzalloc_obj(struct swsusp_extent, GFP_KERNEL);
+ ext = kzalloc_obj(struct swsusp_extent);
if (!ext)
return -ENOMEM;
@@ -577,7 +577,7 @@ static struct crc_data *alloc_crc_data(int nr_threads)
{
struct crc_data *crc;
- crc = kzalloc_obj(*crc, GFP_KERNEL);
+ crc = kzalloc_obj(*crc);
if (!crc)
return NULL;
@@ -585,7 +585,7 @@ static struct crc_data *alloc_crc_data(int nr_threads)
if (!crc->unc)
goto err_free_crc;
- crc->unc_len = kzalloc_objs(*crc->unc_len, nr_threads, GFP_KERNEL);
+ crc->unc_len = kzalloc_objs(*crc->unc_len, nr_threads);
if (!crc->unc_len)
goto err_free_unc;
@@ -1016,7 +1016,7 @@ static int get_swap_reader(struct swap_map_handle *handle,
last = handle->maps = NULL;
offset = swsusp_header->image;
while (offset) {
- tmp = kzalloc_obj(*handle->maps, GFP_KERNEL);
+ tmp = kzalloc_obj(*handle->maps);
if (!tmp) {
release_swap_reader(handle);
return -ENOMEM;
diff --git a/kernel/power/wakelock.c b/kernel/power/wakelock.c
index 49712d9e7cfa..fd763da06a87 100644
--- a/kernel/power/wakelock.c
+++ b/kernel/power/wakelock.c
@@ -178,7 +178,7 @@ static struct wakelock *wakelock_lookup_add(const char *name, size_t len,
return ERR_PTR(-ENOSPC);
/* Not found, we have to add a new one. */
- wl = kzalloc_obj(*wl, GFP_KERNEL);
+ wl = kzalloc_obj(*wl);
if (!wl)
return ERR_PTR(-ENOMEM);
diff --git a/kernel/printk/nbcon.c b/kernel/printk/nbcon.c
index c98241238f2a..d7044a7a214b 100644
--- a/kernel/printk/nbcon.c
+++ b/kernel/printk/nbcon.c
@@ -1801,7 +1801,7 @@ bool nbcon_alloc(struct console *con)
*/
con->pbufs = &printk_shared_pbufs;
} else {
- con->pbufs = kmalloc_obj(*con->pbufs, GFP_KERNEL);
+ con->pbufs = kmalloc_obj(*con->pbufs);
if (!con->pbufs) {
con_printk(KERN_ERR, con, "failed to allocate printing buffer\n");
return false;
diff --git a/kernel/printk/printk.c b/kernel/printk/printk.c
index 599d56300ded..0323149548f6 100644
--- a/kernel/printk/printk.c
+++ b/kernel/printk/printk.c
@@ -933,7 +933,7 @@ static int devkmsg_open(struct inode *inode, struct file *file)
return err;
}
- user = kvmalloc_obj(struct devkmsg_user, GFP_KERNEL);
+ user = kvmalloc_obj(struct devkmsg_user);
if (!user)
return -ENOMEM;
diff --git a/kernel/rcu/rcuscale.c b/kernel/rcu/rcuscale.c
index 5512686be5d0..6c1acf9ba69b 100644
--- a/kernel/rcu/rcuscale.c
+++ b/kernel/rcu/rcuscale.c
@@ -1130,7 +1130,7 @@ rcu_scale_init(void)
goto unwind;
schedule_timeout_uninterruptible(1);
}
- reader_tasks = kzalloc_objs(reader_tasks[0], nrealreaders, GFP_KERNEL);
+ reader_tasks = kzalloc_objs(reader_tasks[0], nrealreaders);
if (reader_tasks == NULL) {
SCALEOUT_ERRSTRING("out of memory");
firsterr = -ENOMEM;
@@ -1144,11 +1144,11 @@ rcu_scale_init(void)
}
while (atomic_read(&n_rcu_scale_reader_started) < nrealreaders)
schedule_timeout_uninterruptible(1);
- writer_tasks = kzalloc_objs(writer_tasks[0], nrealwriters, GFP_KERNEL);
+ writer_tasks = kzalloc_objs(writer_tasks[0], nrealwriters);
writer_durations = kcalloc(nrealwriters, sizeof(*writer_durations), GFP_KERNEL);
writer_n_durations = kzalloc_objs(*writer_n_durations, nrealwriters,
GFP_KERNEL);
- writer_done = kzalloc_objs(writer_done[0], nrealwriters, GFP_KERNEL);
+ writer_done = kzalloc_objs(writer_done[0], nrealwriters);
if (gp_async) {
if (gp_async_max <= 0) {
pr_warn("%s: gp_async_max = %d must be greater than zero.\n",
diff --git a/kernel/rcu/rcutorture.c b/kernel/rcu/rcutorture.c
index d2e673771295..197cea4d1f26 100644
--- a/kernel/rcu/rcutorture.c
+++ b/kernel/rcu/rcutorture.c
@@ -1626,7 +1626,7 @@ rcu_torture_writer(void *arg)
ulo_size = cur_ops->poll_active;
}
if (cur_ops->poll_active_full > 0) {
- rgo = kzalloc_objs(*rgo, cur_ops->poll_active_full, GFP_KERNEL);
+ rgo = kzalloc_objs(*rgo, cur_ops->poll_active_full);
if (!WARN_ON(!rgo))
rgo_size = cur_ops->poll_active_full;
}
@@ -2558,7 +2558,7 @@ static int rcu_torture_updown_init(void)
VERBOSE_TOROUT_STRING("rcu_torture_updown_init: Disabling up/down reader tests due to lack of primitives");
return 0;
}
- updownreaders = kzalloc_objs(*updownreaders, n_up_down, GFP_KERNEL);
+ updownreaders = kzalloc_objs(*updownreaders, n_up_down);
if (!updownreaders) {
VERBOSE_TOROUT_STRING("rcu_torture_updown_init: Out of memory, disabling up/down reader tests");
return -ENOMEM;
@@ -2891,7 +2891,7 @@ static void rcu_torture_mem_dump_obj(void)
mem_dump_obj(&z);
kmem_cache_free(kcp, rhp);
kmem_cache_destroy(kcp);
- rhp = kmalloc_obj(*rhp, GFP_KERNEL);
+ rhp = kmalloc_obj(*rhp);
if (WARN_ON_ONCE(!rhp))
return;
pr_alert("mem_dump_obj() kmalloc test: rcu_torture_stats = %px, &rhp = %px, rhp = %px\n", stats_task, &rhp, rhp);
@@ -3399,7 +3399,7 @@ static void rcu_torture_fwd_prog_cr(struct rcu_fwd *rfp)
n_launders++;
n_launders_sa++;
} else if (!cur_ops->cbflood_max || cur_ops->cbflood_max > n_max_cbs) {
- rfcp = kmalloc_obj(*rfcp, GFP_KERNEL);
+ rfcp = kmalloc_obj(*rfcp);
if (WARN_ON_ONCE(!rfcp)) {
schedule_timeout_interruptible(1);
continue;
@@ -3587,8 +3587,8 @@ static int __init rcu_torture_fwd_prog_init(void)
fwd_progress_holdoff = 1;
if (fwd_progress_div <= 0)
fwd_progress_div = 4;
- rfp = kzalloc_objs(*rfp, fwd_progress, GFP_KERNEL);
- fwd_prog_tasks = kzalloc_objs(*fwd_prog_tasks, fwd_progress, GFP_KERNEL);
+ rfp = kzalloc_objs(*rfp, fwd_progress);
+ fwd_prog_tasks = kzalloc_objs(*fwd_prog_tasks, fwd_progress);
if (!rfp || !fwd_prog_tasks) {
kfree(rfp);
kfree(fwd_prog_tasks);
@@ -3754,9 +3754,9 @@ static int rcu_torture_barrier_init(void)
atomic_set(&barrier_cbs_count, 0);
atomic_set(&barrier_cbs_invoked, 0);
barrier_cbs_tasks =
- kzalloc_objs(barrier_cbs_tasks[0], n_barrier_cbs, GFP_KERNEL);
+ kzalloc_objs(barrier_cbs_tasks[0], n_barrier_cbs);
barrier_cbs_wq =
- kzalloc_objs(barrier_cbs_wq[0], n_barrier_cbs, GFP_KERNEL);
+ kzalloc_objs(barrier_cbs_wq[0], n_barrier_cbs);
if (barrier_cbs_tasks == NULL || !barrier_cbs_wq)
return -ENOMEM;
for (i = 0; i < n_barrier_cbs; i++) {
@@ -4223,7 +4223,7 @@ static void rcu_test_debug_objects(void)
(!cur_ops->call || !cur_ops->cb_barrier)))
return;
- struct rcu_head *rhp = kmalloc_obj(*rhp, GFP_KERNEL);
+ struct rcu_head *rhp = kmalloc_obj(*rhp);
init_rcu_head_on_stack(&rh1);
init_rcu_head_on_stack(&rh2);
@@ -4562,7 +4562,7 @@ rcu_torture_init(void)
if (torture_init_error(firsterr))
goto unwind;
}
- reader_tasks = kzalloc_objs(reader_tasks[0], nrealreaders, GFP_KERNEL);
+ reader_tasks = kzalloc_objs(reader_tasks[0], nrealreaders);
rcu_torture_reader_mbchk = kzalloc_objs(*rcu_torture_reader_mbchk,
nrealreaders, GFP_KERNEL);
if (!reader_tasks || !rcu_torture_reader_mbchk) {
diff --git a/kernel/rcu/refscale.c b/kernel/rcu/refscale.c
index 39d679a4c17e..c158b6a947cd 100644
--- a/kernel/rcu/refscale.c
+++ b/kernel/rcu/refscale.c
@@ -1143,7 +1143,7 @@ static bool typesafe_init(void)
else if (si == 0)
si = nr_cpu_ids;
rtsarray_size = si;
- rtsarray = kzalloc_objs(*rtsarray, si, GFP_KERNEL);
+ rtsarray = kzalloc_objs(*rtsarray, si);
if (!rtsarray)
return false;
for (idx = 0; idx < rtsarray_size; idx++) {
@@ -1575,7 +1575,7 @@ ref_scale_init(void)
"%s: nreaders * loops will overflow, adjusted loops to %d",
__func__, INT_MAX / nreaders))
loops = INT_MAX / nreaders;
- reader_tasks = kzalloc_objs(reader_tasks[0], nreaders, GFP_KERNEL);
+ reader_tasks = kzalloc_objs(reader_tasks[0], nreaders);
if (!reader_tasks) {
SCALEOUT_ERRSTRING("out of memory");
firsterr = -ENOMEM;
diff --git a/kernel/rcu/srcutree.c b/kernel/rcu/srcutree.c
index 0faf35f393a3..aef8e91ad33e 100644
--- a/kernel/rcu/srcutree.c
+++ b/kernel/rcu/srcutree.c
@@ -238,7 +238,7 @@ static bool init_srcu_struct_nodes(struct srcu_struct *ssp, gfp_t gfp_flags)
static int init_srcu_struct_fields(struct srcu_struct *ssp, bool is_static)
{
if (!is_static)
- ssp->srcu_sup = kzalloc_obj(*ssp->srcu_sup, GFP_KERNEL);
+ ssp->srcu_sup = kzalloc_obj(*ssp->srcu_sup);
if (!ssp->srcu_sup)
return -ENOMEM;
if (!is_static)
diff --git a/kernel/rcu/update.c b/kernel/rcu/update.c
index 14150f09fd61..d98a5c38e19c 100644
--- a/kernel/rcu/update.c
+++ b/kernel/rcu/update.c
@@ -614,7 +614,7 @@ static void early_boot_test_call_rcu(void)
call_rcu(&head, test_callback);
early_srcu_cookie = start_poll_synchronize_srcu(&early_srcu);
call_srcu(&early_srcu, &shead, test_callback);
- rhp = kmalloc_obj(*rhp, GFP_KERNEL);
+ rhp = kmalloc_obj(*rhp);
if (!WARN_ON_ONCE(!rhp))
kfree_rcu(rhp, rh);
}
diff --git a/kernel/relay.c b/kernel/relay.c
index c28fc5dd3ded..62b059ff2759 100644
--- a/kernel/relay.c
+++ b/kernel/relay.c
@@ -59,7 +59,7 @@ static const struct vm_operations_struct relay_file_mmap_ops = {
*/
static struct page **relay_alloc_page_array(unsigned int n_pages)
{
- return kvzalloc_objs(struct page *, n_pages, GFP_KERNEL);
+ return kvzalloc_objs(struct page *, n_pages);
}
/*
@@ -150,10 +150,10 @@ static struct rchan_buf *relay_create_buf(struct rchan *chan)
if (chan->n_subbufs > KMALLOC_MAX_SIZE / sizeof(size_t))
return NULL;
- buf = kzalloc_obj(struct rchan_buf, GFP_KERNEL);
+ buf = kzalloc_obj(struct rchan_buf);
if (!buf)
return NULL;
- buf->padding = kmalloc_objs(size_t, chan->n_subbufs, GFP_KERNEL);
+ buf->padding = kmalloc_objs(size_t, chan->n_subbufs);
if (!buf->padding)
goto free_buf;
@@ -489,7 +489,7 @@ struct rchan *relay_open(const char *base_filename,
if (!cb || !cb->create_buf_file || !cb->remove_buf_file)
return NULL;
- chan = kzalloc_obj(struct rchan, GFP_KERNEL);
+ chan = kzalloc_obj(struct rchan);
if (!chan)
return NULL;
diff --git a/kernel/resource.c b/kernel/resource.c
index d591e76c1535..bb966699da31 100644
--- a/kernel/resource.c
+++ b/kernel/resource.c
@@ -502,7 +502,7 @@ int walk_system_ram_res_rev(u64 start, u64 end, void *arg,
int ret = -1;
/* create a list */
- rams = kvzalloc_objs(struct resource, rams_size, GFP_KERNEL);
+ rams = kvzalloc_objs(struct resource, rams_size);
if (!rams)
return ret;
diff --git a/kernel/resource_kunit.c b/kernel/resource_kunit.c
index 378218df2427..42785796f1db 100644
--- a/kernel/resource_kunit.c
+++ b/kernel/resource_kunit.c
@@ -204,7 +204,7 @@ static void resource_test_insert_resource(struct kunit *test, struct resource *p
{
struct resource *res;
- res = kzalloc_obj(*res, GFP_KERNEL);
+ res = kzalloc_obj(*res);
KUNIT_ASSERT_NOT_NULL(test, res);
res->name = name;
diff --git a/kernel/scftorture.c b/kernel/scftorture.c
index 02b3a5d2f0aa..327c315f411c 100644
--- a/kernel/scftorture.c
+++ b/kernel/scftorture.c
@@ -661,7 +661,7 @@ static int __init scf_torture_init(void)
// Worker tasks invoking smp_call_function().
if (nthreads < 0)
nthreads = num_online_cpus();
- scf_stats_p = kzalloc_objs(scf_stats_p[0], nthreads, GFP_KERNEL);
+ scf_stats_p = kzalloc_objs(scf_stats_p[0], nthreads);
if (!scf_stats_p) {
SCFTORTOUT_ERRSTRING("out of memory");
firsterr = -ENOMEM;
diff --git a/kernel/sched/autogroup.c b/kernel/sched/autogroup.c
index c5a1019cbe83..e380cf9372bb 100644
--- a/kernel/sched/autogroup.c
+++ b/kernel/sched/autogroup.c
@@ -86,7 +86,7 @@ static inline struct autogroup *autogroup_task_get(struct task_struct *p)
static inline struct autogroup *autogroup_create(void)
{
- struct autogroup *ag = kzalloc_obj(*ag, GFP_KERNEL);
+ struct autogroup *ag = kzalloc_obj(*ag);
struct task_group *tg;
if (!ag)
diff --git a/kernel/sched/core_sched.c b/kernel/sched/core_sched.c
index 6065cf725eee..73b6b2426911 100644
--- a/kernel/sched/core_sched.c
+++ b/kernel/sched/core_sched.c
@@ -12,7 +12,7 @@ struct sched_core_cookie {
static unsigned long sched_core_alloc_cookie(void)
{
- struct sched_core_cookie *ck = kmalloc_obj(*ck, GFP_KERNEL);
+ struct sched_core_cookie *ck = kmalloc_obj(*ck);
if (!ck)
return 0;
diff --git a/kernel/sched/cpuacct.c b/kernel/sched/cpuacct.c
index 6e9a2e067886..ca9d52cb1ebb 100644
--- a/kernel/sched/cpuacct.c
+++ b/kernel/sched/cpuacct.c
@@ -61,7 +61,7 @@ cpuacct_css_alloc(struct cgroup_subsys_state *parent_css)
if (!parent_css)
return &root_cpuacct.css;
- ca = kzalloc_obj(*ca, GFP_KERNEL);
+ ca = kzalloc_obj(*ca);
if (!ca)
goto out;
diff --git a/kernel/sched/cpudeadline.c b/kernel/sched/cpudeadline.c
index bbb2d68df86a..0a2b7e30fd10 100644
--- a/kernel/sched/cpudeadline.c
+++ b/kernel/sched/cpudeadline.c
@@ -252,7 +252,7 @@ int cpudl_init(struct cpudl *cp)
raw_spin_lock_init(&cp->lock);
cp->size = 0;
- cp->elements = kzalloc_objs(struct cpudl_item, nr_cpu_ids, GFP_KERNEL);
+ cp->elements = kzalloc_objs(struct cpudl_item, nr_cpu_ids);
if (!cp->elements)
return -ENOMEM;
diff --git a/kernel/sched/cpufreq_schedutil.c b/kernel/sched/cpufreq_schedutil.c
index d71d09ed1b3b..153232dd8276 100644
--- a/kernel/sched/cpufreq_schedutil.c
+++ b/kernel/sched/cpufreq_schedutil.c
@@ -638,7 +638,7 @@ static struct sugov_policy *sugov_policy_alloc(struct cpufreq_policy *policy)
{
struct sugov_policy *sg_policy;
- sg_policy = kzalloc_obj(*sg_policy, GFP_KERNEL);
+ sg_policy = kzalloc_obj(*sg_policy);
if (!sg_policy)
return NULL;
@@ -722,7 +722,7 @@ static struct sugov_tunables *sugov_tunables_alloc(struct sugov_policy *sg_polic
{
struct sugov_tunables *tunables;
- tunables = kzalloc_obj(*tunables, GFP_KERNEL);
+ tunables = kzalloc_obj(*tunables);
if (tunables) {
gov_attr_set_init(&tunables->attr_set, &sg_policy->tunables_hook);
if (!have_governor_per_policy())
diff --git a/kernel/sched/cpupri.c b/kernel/sched/cpupri.c
index c2642deeaabc..8f2237e8b484 100644
--- a/kernel/sched/cpupri.c
+++ b/kernel/sched/cpupri.c
@@ -288,7 +288,7 @@ int cpupri_init(struct cpupri *cp)
goto cleanup;
}
- cp->cpu_to_pri = kzalloc_objs(int, nr_cpu_ids, GFP_KERNEL);
+ cp->cpu_to_pri = kzalloc_objs(int, nr_cpu_ids);
if (!cp->cpu_to_pri)
goto cleanup;
diff --git a/kernel/sched/ext.c b/kernel/sched/ext.c
index b9fadb2583ea..5a812b510d5d 100644
--- a/kernel/sched/ext.c
+++ b/kernel/sched/ext.c
@@ -4223,11 +4223,11 @@ static struct scx_exit_info *alloc_exit_info(size_t exit_dump_len)
{
struct scx_exit_info *ei;
- ei = kzalloc_obj(*ei, GFP_KERNEL);
+ ei = kzalloc_obj(*ei);
if (!ei)
return NULL;
- ei->bt = kzalloc_objs(ei->bt[0], SCX_EXIT_BT_LEN, GFP_KERNEL);
+ ei->bt = kzalloc_objs(ei->bt[0], SCX_EXIT_BT_LEN);
ei->msg = kzalloc(SCX_EXIT_MSG_LEN, GFP_KERNEL);
ei->dump = kvzalloc(exit_dump_len, GFP_KERNEL);
@@ -4824,7 +4824,7 @@ static struct scx_sched *scx_alloc_and_add_sched(struct sched_ext_ops *ops)
struct scx_sched *sch;
int node, ret;
- sch = kzalloc_obj(*sch, GFP_KERNEL);
+ sch = kzalloc_obj(*sch);
if (!sch)
return ERR_PTR(-ENOMEM);
diff --git a/kernel/sched/fair.c b/kernel/sched/fair.c
index f6f050f2faec..eea99ec01a3f 100644
--- a/kernel/sched/fair.c
+++ b/kernel/sched/fair.c
@@ -3427,7 +3427,7 @@ static void task_numa_work(struct callback_head *work)
if (!vma->numab_state) {
struct vma_numab_state *ptr;
- ptr = kzalloc_obj(*ptr, GFP_KERNEL);
+ ptr = kzalloc_obj(*ptr);
if (!ptr)
continue;
@@ -13622,10 +13622,10 @@ int alloc_fair_sched_group(struct task_group *tg, struct task_group *parent)
struct cfs_rq *cfs_rq;
int i;
- tg->cfs_rq = kzalloc_objs(cfs_rq, nr_cpu_ids, GFP_KERNEL);
+ tg->cfs_rq = kzalloc_objs(cfs_rq, nr_cpu_ids);
if (!tg->cfs_rq)
goto err;
- tg->se = kzalloc_objs(se, nr_cpu_ids, GFP_KERNEL);
+ tg->se = kzalloc_objs(se, nr_cpu_ids);
if (!tg->se)
goto err;
diff --git a/kernel/sched/psi.c b/kernel/sched/psi.c
index bf8a70598a09..d9c9d9480a45 100644
--- a/kernel/sched/psi.c
+++ b/kernel/sched/psi.c
@@ -1114,7 +1114,7 @@ int psi_cgroup_alloc(struct cgroup *cgroup)
if (!static_branch_likely(&psi_cgroups_enabled))
return 0;
- cgroup->psi = kzalloc_obj(struct psi_group, GFP_KERNEL);
+ cgroup->psi = kzalloc_obj(struct psi_group);
if (!cgroup->psi)
return -ENOMEM;
@@ -1340,7 +1340,7 @@ struct psi_trigger *psi_trigger_create(struct psi_group *group, char *buf,
if (threshold_us == 0 || threshold_us > window_us)
return ERR_PTR(-EINVAL);
- t = kmalloc_obj(*t, GFP_KERNEL);
+ t = kmalloc_obj(*t);
if (!t)
return ERR_PTR(-ENOMEM);
diff --git a/kernel/sched/rt.c b/kernel/sched/rt.c
index e72df7045592..f69e1f16d923 100644
--- a/kernel/sched/rt.c
+++ b/kernel/sched/rt.c
@@ -259,10 +259,10 @@ int alloc_rt_sched_group(struct task_group *tg, struct task_group *parent)
if (!rt_group_sched_enabled())
return 1;
- tg->rt_rq = kzalloc_objs(rt_rq, nr_cpu_ids, GFP_KERNEL);
+ tg->rt_rq = kzalloc_objs(rt_rq, nr_cpu_ids);
if (!tg->rt_rq)
goto err;
- tg->rt_se = kzalloc_objs(rt_se, nr_cpu_ids, GFP_KERNEL);
+ tg->rt_se = kzalloc_objs(rt_se, nr_cpu_ids);
if (!tg->rt_se)
goto err;
diff --git a/kernel/sched/topology.c b/kernel/sched/topology.c
index ac54fcae5de7..32dcddaead82 100644
--- a/kernel/sched/topology.c
+++ b/kernel/sched/topology.c
@@ -350,7 +350,7 @@ static struct perf_domain *pd_init(int cpu)
return NULL;
}
- pd = kzalloc_obj(*pd, GFP_KERNEL);
+ pd = kzalloc_obj(*pd);
if (!pd)
return NULL;
pd->em_pd = obj;
@@ -589,7 +589,7 @@ static struct root_domain *alloc_rootdomain(void)
{
struct root_domain *rd;
- rd = kzalloc_obj(*rd, GFP_KERNEL);
+ rd = kzalloc_obj(*rd);
if (!rd)
return NULL;
@@ -1998,7 +1998,7 @@ static int sched_record_numa_dist(int offline_node, int (*n_dist)(int, int),
*/
nr_levels = bitmap_weight(distance_map, NR_DISTANCE_VALUES);
- distances = kzalloc_objs(int, nr_levels, GFP_KERNEL);
+ distances = kzalloc_objs(int, nr_levels);
if (!distances)
return -ENOMEM;
@@ -2734,7 +2734,7 @@ cpumask_var_t *alloc_sched_domains(unsigned int ndoms)
int i;
cpumask_var_t *doms;
- doms = kmalloc_objs(*doms, ndoms, GFP_KERNEL);
+ doms = kmalloc_objs(*doms, ndoms);
if (!doms)
return NULL;
for (i = 0; i < ndoms; i++) {
diff --git a/kernel/seccomp.c b/kernel/seccomp.c
index b2297243071d..066909393c38 100644
--- a/kernel/seccomp.c
+++ b/kernel/seccomp.c
@@ -1893,7 +1893,7 @@ static struct file *init_listener(struct seccomp_filter *filter)
struct file *ret;
ret = ERR_PTR(-ENOMEM);
- filter->notif = kzalloc_obj(*(filter->notif), GFP_KERNEL);
+ filter->notif = kzalloc_obj(*(filter->notif));
if (!filter->notif)
goto out;
diff --git a/kernel/static_call_inline.c b/kernel/static_call_inline.c
index 864ae2da708f..2b6a0d99cdbe 100644
--- a/kernel/static_call_inline.c
+++ b/kernel/static_call_inline.c
@@ -255,7 +255,7 @@ static int __static_call_init(struct module *mod,
goto do_transform;
}
- site_mod = kzalloc_obj(*site_mod, GFP_KERNEL);
+ site_mod = kzalloc_obj(*site_mod);
if (!site_mod)
return -ENOMEM;
@@ -271,7 +271,7 @@ static int __static_call_init(struct module *mod,
key->mods = site_mod;
- site_mod = kzalloc_obj(*site_mod, GFP_KERNEL);
+ site_mod = kzalloc_obj(*site_mod);
if (!site_mod)
return -ENOMEM;
}
diff --git a/kernel/time/posix-clock.c b/kernel/time/posix-clock.c
index 3a67e7e4c875..dab37295c8c2 100644
--- a/kernel/time/posix-clock.c
+++ b/kernel/time/posix-clock.c
@@ -103,7 +103,7 @@ static int posix_clock_open(struct inode *inode, struct file *fp)
err = -ENODEV;
goto out;
}
- pccontext = kzalloc_obj(*pccontext, GFP_KERNEL);
+ pccontext = kzalloc_obj(*pccontext);
if (!pccontext) {
err = -ENOMEM;
goto out;
diff --git a/kernel/time/timer_migration.c b/kernel/time/timer_migration.c
index 21e72318aeb8..a8421f3025cd 100644
--- a/kernel/time/timer_migration.c
+++ b/kernel/time/timer_migration.c
@@ -1766,7 +1766,7 @@ static int tmigr_setup_groups(unsigned int cpu, unsigned int node,
int i, top = 0, err = 0, start_lvl = 0;
bool root_mismatch = false;
- stack = kzalloc_objs(*stack, tmigr_hierarchy_levels, GFP_KERNEL);
+ stack = kzalloc_objs(*stack, tmigr_hierarchy_levels);
if (!stack)
return -ENOMEM;
diff --git a/kernel/torture.c b/kernel/torture.c
index 27c9bb6122d8..ec3370986976 100644
--- a/kernel/torture.c
+++ b/kernel/torture.c
@@ -494,7 +494,7 @@ void torture_shuffle_task_register(struct task_struct *tp)
if (WARN_ON_ONCE(tp == NULL))
return;
- stp = kmalloc_obj(*stp, GFP_KERNEL);
+ stp = kmalloc_obj(*stp);
if (WARN_ON_ONCE(stp == NULL))
return;
stp->st_t = tp;
diff --git a/kernel/trace/blktrace.c b/kernel/trace/blktrace.c
index 5526b141b433..30259dcaa838 100644
--- a/kernel/trace/blktrace.c
+++ b/kernel/trace/blktrace.c
@@ -671,7 +671,7 @@ static struct blk_trace *blk_trace_setup_prepare(struct request_queue *q,
return ERR_PTR(-EBUSY);
}
- bt = kzalloc_obj(*bt, GFP_KERNEL);
+ bt = kzalloc_obj(*bt);
if (!bt)
return ERR_PTR(-ENOMEM);
@@ -1904,7 +1904,7 @@ static int blk_trace_setup_queue(struct request_queue *q,
struct blk_trace *bt = NULL;
int ret = -ENOMEM;
- bt = kzalloc_obj(*bt, GFP_KERNEL);
+ bt = kzalloc_obj(*bt);
if (!bt)
return -ENOMEM;
diff --git a/kernel/trace/bpf_trace.c b/kernel/trace/bpf_trace.c
index c09268c6e9b7..9bc0dfd235af 100644
--- a/kernel/trace/bpf_trace.c
+++ b/kernel/trace/bpf_trace.c
@@ -2243,7 +2243,7 @@ static int bpf_event_notify(struct notifier_block *nb, unsigned long op,
switch (op) {
case MODULE_STATE_COMING:
- btm = kzalloc_obj(*btm, GFP_KERNEL);
+ btm = kzalloc_obj(*btm);
if (btm) {
btm->module = module;
list_add(&btm->list, &bpf_trace_modules);
@@ -2819,7 +2819,7 @@ int bpf_kprobe_multi_link_attach(const union bpf_attr *attr, struct bpf_prog *pr
goto error;
}
- link = kzalloc_obj(*link, GFP_KERNEL);
+ link = kzalloc_obj(*link);
if (!link) {
err = -ENOMEM;
goto error;
@@ -3238,8 +3238,8 @@ int bpf_uprobe_multi_link_attach(const union bpf_attr *attr, struct bpf_prog *pr
err = -ENOMEM;
- link = kzalloc_obj(*link, GFP_KERNEL);
- uprobes = kvzalloc_objs(*uprobes, cnt, GFP_KERNEL);
+ link = kzalloc_obj(*link);
+ uprobes = kvzalloc_objs(*uprobes, cnt);
if (!uprobes || !link)
goto error_free;
diff --git a/kernel/trace/fprobe.c b/kernel/trace/fprobe.c
index 0d649ca71ce0..ec90ba215405 100644
--- a/kernel/trace/fprobe.c
+++ b/kernel/trace/fprobe.c
@@ -805,7 +805,7 @@ int register_fprobe(struct fprobe *fp, const char *filter, const char *notfilter
if (!addrs)
return -ENOMEM;
- mods = kzalloc_objs(*mods, num, GFP_KERNEL);
+ mods = kzalloc_objs(*mods, num);
if (!mods)
return -ENOMEM;
diff --git a/kernel/trace/ftrace.c b/kernel/trace/ftrace.c
index fb3915a67013..827fb9a0bf0d 100644
--- a/kernel/trace/ftrace.c
+++ b/kernel/trace/ftrace.c
@@ -702,7 +702,7 @@ static int ftrace_profile_init_cpu(int cpu)
*/
size = FTRACE_PROFILE_HASH_SIZE;
- stat->hash = kzalloc_objs(struct hlist_head, size, GFP_KERNEL);
+ stat->hash = kzalloc_objs(struct hlist_head, size);
if (!stat->hash)
return -ENOMEM;
@@ -1215,7 +1215,7 @@ add_ftrace_hash_entry_direct(struct ftrace_hash *hash, unsigned long ip, unsigne
{
struct ftrace_func_entry *entry;
- entry = kmalloc_obj(*entry, GFP_KERNEL);
+ entry = kmalloc_obj(*entry);
if (!entry)
return NULL;
@@ -1335,12 +1335,12 @@ struct ftrace_hash *alloc_ftrace_hash(int size_bits)
struct ftrace_hash *hash;
int size;
- hash = kzalloc_obj(*hash, GFP_KERNEL);
+ hash = kzalloc_obj(*hash);
if (!hash)
return NULL;
size = 1 << size_bits;
- hash->buckets = kzalloc_objs(*hash->buckets, size, GFP_KERNEL);
+ hash->buckets = kzalloc_objs(*hash->buckets, size);
if (!hash->buckets) {
kfree(hash);
@@ -1360,7 +1360,7 @@ static int ftrace_add_mod(struct trace_array *tr,
struct ftrace_mod_load *ftrace_mod;
struct list_head *mod_head = enable ? &tr->mod_trace : &tr->mod_notrace;
- ftrace_mod = kzalloc_obj(*ftrace_mod, GFP_KERNEL);
+ ftrace_mod = kzalloc_obj(*ftrace_mod);
if (!ftrace_mod)
return -ENOMEM;
@@ -3911,7 +3911,7 @@ ftrace_allocate_pages(unsigned long num_to_init, unsigned long *num_pages)
if (!num_to_init)
return NULL;
- start_pg = pg = kzalloc_obj(*pg, GFP_KERNEL);
+ start_pg = pg = kzalloc_obj(*pg);
if (!pg)
return NULL;
@@ -3929,7 +3929,7 @@ ftrace_allocate_pages(unsigned long num_to_init, unsigned long *num_pages)
if (!num_to_init)
break;
- pg->next = kzalloc_obj(*pg, GFP_KERNEL);
+ pg->next = kzalloc_obj(*pg);
if (!pg->next)
goto free_pages;
@@ -4686,7 +4686,7 @@ ftrace_regex_open(struct ftrace_ops *ops, int flag,
if (tracing_check_open_get_tr(tr))
return -ENODEV;
- iter = kzalloc_obj(*iter, GFP_KERNEL);
+ iter = kzalloc_obj(*iter);
if (!iter)
goto out;
@@ -5334,7 +5334,7 @@ int ftrace_func_mapper_add_ip(struct ftrace_func_mapper *mapper,
if (entry)
return -EBUSY;
- map = kmalloc_obj(*map, GFP_KERNEL);
+ map = kmalloc_obj(*map);
if (!map)
return -ENOMEM;
@@ -5474,7 +5474,7 @@ register_ftrace_function_probe(char *glob, struct trace_array *tr,
}
}
if (!probe) {
- probe = kzalloc_obj(*probe, GFP_KERNEL);
+ probe = kzalloc_obj(*probe);
if (!probe) {
mutex_unlock(&ftrace_lock);
return -ENOMEM;
@@ -7223,7 +7223,7 @@ ftrace_graph_open(struct inode *inode, struct file *file)
if (unlikely(ftrace_disabled))
return -ENODEV;
- fgd = kmalloc_obj(*fgd, GFP_KERNEL);
+ fgd = kmalloc_obj(*fgd);
if (fgd == NULL)
return -ENOMEM;
@@ -7251,7 +7251,7 @@ ftrace_graph_notrace_open(struct inode *inode, struct file *file)
if (unlikely(ftrace_disabled))
return -ENODEV;
- fgd = kmalloc_obj(*fgd, GFP_KERNEL);
+ fgd = kmalloc_obj(*fgd);
if (fgd == NULL)
return -ENOMEM;
@@ -8041,7 +8041,7 @@ static void save_ftrace_mod_rec(struct ftrace_mod_map *mod_map,
if (!ret)
return;
- mod_func = kmalloc_obj(*mod_func, GFP_KERNEL);
+ mod_func = kmalloc_obj(*mod_func);
if (!mod_func)
return;
@@ -8068,7 +8068,7 @@ allocate_ftrace_mod_map(struct module *mod,
if (ftrace_disabled)
return NULL;
- mod_map = kmalloc_obj(*mod_map, GFP_KERNEL);
+ mod_map = kmalloc_obj(*mod_map);
if (!mod_map)
return NULL;
@@ -8241,7 +8241,7 @@ static void add_to_clear_hash_list(struct list_head *clear_list,
{
struct ftrace_init_func *func;
- func = kmalloc_obj(*func, GFP_KERNEL);
+ func = kmalloc_obj(*func);
if (!func) {
MEM_FAIL(1, "alloc failure, ftrace filter could be stale\n");
return;
diff --git a/kernel/trace/pid_list.c b/kernel/trace/pid_list.c
index 6d12855b0277..30e3fdae6a17 100644
--- a/kernel/trace/pid_list.c
+++ b/kernel/trace/pid_list.c
@@ -423,7 +423,7 @@ struct trace_pid_list *trace_pid_list_alloc(void)
/* According to linux/thread.h, pids can be no bigger that 30 bits */
WARN_ON_ONCE(init_pid_ns.pid_max > (1 << 30));
- pid_list = kzalloc_obj(*pid_list, GFP_KERNEL);
+ pid_list = kzalloc_obj(*pid_list);
if (!pid_list)
return NULL;
@@ -435,7 +435,7 @@ struct trace_pid_list *trace_pid_list_alloc(void)
for (i = 0; i < CHUNK_ALLOC; i++) {
union upper_chunk *chunk;
- chunk = kzalloc_obj(*chunk, GFP_KERNEL);
+ chunk = kzalloc_obj(*chunk);
if (!chunk)
break;
chunk->next = pid_list->upper_list;
@@ -446,7 +446,7 @@ struct trace_pid_list *trace_pid_list_alloc(void)
for (i = 0; i < CHUNK_ALLOC; i++) {
union lower_chunk *chunk;
- chunk = kzalloc_obj(*chunk, GFP_KERNEL);
+ chunk = kzalloc_obj(*chunk);
if (!chunk)
break;
chunk->next = pid_list->lower_list;
diff --git a/kernel/trace/rethook.c b/kernel/trace/rethook.c
index d09d5a204627..5a8bdf88999a 100644
--- a/kernel/trace/rethook.c
+++ b/kernel/trace/rethook.c
@@ -108,7 +108,7 @@ struct rethook *rethook_alloc(void *data, rethook_handler_t handler,
if (!handler || num <= 0 || size < sizeof(struct rethook_node))
return ERR_PTR(-EINVAL);
- rh = kzalloc_obj(struct rethook, GFP_KERNEL);
+ rh = kzalloc_obj(struct rethook);
if (!rh)
return ERR_PTR(-ENOMEM);
diff --git a/kernel/trace/ring_buffer.c b/kernel/trace/ring_buffer.c
index e1395834886e..f16f053ef77d 100644
--- a/kernel/trace/ring_buffer.c
+++ b/kernel/trace/ring_buffer.c
@@ -6509,7 +6509,7 @@ ring_buffer_alloc_read_page(struct trace_buffer *buffer, int cpu)
if (!cpumask_test_cpu(cpu, buffer->cpumask))
return ERR_PTR(-ENODEV);
- bpage = kzalloc_obj(*bpage, GFP_KERNEL);
+ bpage = kzalloc_obj(*bpage);
if (!bpage)
return ERR_PTR(-ENOMEM);
@@ -7190,7 +7190,7 @@ static int __rb_map_vma(struct ring_buffer_per_cpu *cpu_buffer,
nr_pages = nr_vma_pages;
- pages = kzalloc_objs(*pages, nr_pages, GFP_KERNEL);
+ pages = kzalloc_objs(*pages, nr_pages);
if (!pages)
return -ENOMEM;
diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c
index 83ae2e8e931c..b44f5ae8958e 100644
--- a/kernel/trace/trace.c
+++ b/kernel/trace/trace.c
@@ -1064,7 +1064,7 @@ int tracing_snapshot_cond_enable(struct trace_array *tr, void *cond_data,
cond_update_fn_t update)
{
struct cond_snapshot *cond_snapshot __free(kfree) =
- kzalloc_obj(*cond_snapshot, GFP_KERNEL);
+ kzalloc_obj(*cond_snapshot);
int ret;
if (!cond_snapshot)
@@ -5132,7 +5132,7 @@ trace_insert_eval_map_file(struct module *mod, struct trace_eval_map **start,
* where the head holds the module and length of array, and the
* tail holds a pointer to the next list.
*/
- map_array = kmalloc_objs(*map_array, len + 2, GFP_KERNEL);
+ map_array = kmalloc_objs(*map_array, len + 2);
if (!map_array) {
pr_warn("Unable to allocate trace eval mapping\n");
return;
@@ -5809,7 +5809,7 @@ static int tracing_open_pipe(struct inode *inode, struct file *filp)
goto fail_pipe_on_cpu;
/* create a buffer to store the information to pass to userspace */
- iter = kzalloc_obj(*iter, GFP_KERNEL);
+ iter = kzalloc_obj(*iter);
if (!iter) {
ret = -ENOMEM;
goto fail_alloc_iter;
@@ -6628,7 +6628,7 @@ static int user_buffer_init(struct trace_user_buf_info **tinfo, size_t size)
if (!*tinfo) {
alloc = true;
- *tinfo = kzalloc_obj(**tinfo, GFP_KERNEL);
+ *tinfo = kzalloc_obj(**tinfo);
if (!*tinfo)
return -ENOMEM;
}
@@ -7153,10 +7153,10 @@ static int tracing_snapshot_open(struct inode *inode, struct file *file)
} else {
/* Writes still need the seq_file to hold the private data */
ret = -ENOMEM;
- m = kzalloc_obj(*m, GFP_KERNEL);
+ m = kzalloc_obj(*m);
if (!m)
goto out;
- iter = kzalloc_obj(*iter, GFP_KERNEL);
+ iter = kzalloc_obj(*iter);
if (!iter) {
kfree(m);
goto out;
@@ -7545,7 +7545,7 @@ static struct tracing_log_err *alloc_tracing_log_err(int len)
{
struct tracing_log_err *err;
- err = kzalloc_obj(*err, GFP_KERNEL);
+ err = kzalloc_obj(*err);
if (!err)
return ERR_PTR(-ENOMEM);
@@ -7804,7 +7804,7 @@ static int tracing_buffers_open(struct inode *inode, struct file *filp)
if (ret)
return ret;
- info = kvzalloc_obj(*info, GFP_KERNEL);
+ info = kvzalloc_obj(*info);
if (!info) {
trace_array_put(tr);
return -ENOMEM;
@@ -8065,7 +8065,7 @@ tracing_buffers_splice_read(struct file *file, loff_t *ppos,
struct page *page;
int r;
- ref = kzalloc_obj(*ref, GFP_KERNEL);
+ ref = kzalloc_obj(*ref);
if (!ref) {
ret = -ENOMEM;
break;
@@ -8284,7 +8284,7 @@ tracing_stats_read(struct file *filp, char __user *ubuf,
unsigned long long t;
unsigned long usec_rem;
- s = kmalloc_obj(*s, GFP_KERNEL);
+ s = kmalloc_obj(*s);
if (!s)
return -ENOMEM;
@@ -8878,7 +8878,7 @@ create_trace_option_files(struct trace_array *tr, struct tracer *tracer,
for (cnt = 0; opts[cnt].name; cnt++)
;
- topts = kzalloc_objs(*topts, cnt + 1, GFP_KERNEL);
+ topts = kzalloc_objs(*topts, cnt + 1);
if (!topts)
return 0;
@@ -8950,7 +8950,7 @@ static int add_tracer(struct trace_array *tr, struct tracer *tracer)
if (!trace_ok_for_array(tracer, tr))
return 0;
- t = kmalloc_obj(*t, GFP_KERNEL);
+ t = kmalloc_obj(*t);
if (!t)
return -ENOMEM;
@@ -8967,7 +8967,7 @@ static int add_tracer(struct trace_array *tr, struct tracer *tracer)
* If the tracer defines default flags, it means the flags are
* per trace instance.
*/
- flags = kmalloc_obj(*flags, GFP_KERNEL);
+ flags = kmalloc_obj(*flags);
if (!flags)
return -ENOMEM;
@@ -9538,7 +9538,7 @@ trace_array_create_systems(const char *name, const char *systems,
int ret;
ret = -ENOMEM;
- tr = kzalloc_obj(*tr, GFP_KERNEL);
+ tr = kzalloc_obj(*tr);
if (!tr)
return ERR_PTR(ret);
diff --git a/kernel/trace/trace_btf.c b/kernel/trace/trace_btf.c
index 1d3c42527736..00172f301f25 100644
--- a/kernel/trace/trace_btf.c
+++ b/kernel/trace/trace_btf.c
@@ -78,7 +78,7 @@ const struct btf_member *btf_find_struct_member(struct btf *btf,
const char *name;
int i, top = 0;
- anon_stack = kzalloc_objs(*anon_stack, BTF_ANON_STACK_MAX, GFP_KERNEL);
+ anon_stack = kzalloc_objs(*anon_stack, BTF_ANON_STACK_MAX);
if (!anon_stack)
return ERR_PTR(-ENOMEM);
diff --git a/kernel/trace/trace_eprobe.c b/kernel/trace/trace_eprobe.c
index 3adc9a8c29a9..3eeaa5df7fc8 100644
--- a/kernel/trace/trace_eprobe.c
+++ b/kernel/trace/trace_eprobe.c
@@ -529,8 +529,8 @@ new_eprobe_trigger(struct trace_eprobe *ep, struct trace_event_file *file)
struct eprobe_data *edata;
int ret;
- edata = kzalloc_obj(*edata, GFP_KERNEL);
- trigger = kzalloc_obj(*trigger, GFP_KERNEL);
+ edata = kzalloc_obj(*edata);
+ trigger = kzalloc_obj(*trigger);
if (!trigger || !edata) {
ret = -ENOMEM;
goto error;
diff --git a/kernel/trace/trace_events.c b/kernel/trace/trace_events.c
index 1d5ce0244f8c..9928da636c9d 100644
--- a/kernel/trace/trace_events.c
+++ b/kernel/trace/trace_events.c
@@ -976,7 +976,7 @@ static int cache_mod(struct trace_array *tr, const char *mod, int set,
if (!set)
return remove_cache_mod(tr, mod, match, system, event);
- event_mod = kzalloc_obj(*event_mod, GFP_KERNEL);
+ event_mod = kzalloc_obj(*event_mod);
if (!event_mod)
return -ENOMEM;
@@ -1648,7 +1648,7 @@ static void *s_start(struct seq_file *m, loff_t *pos)
struct set_event_iter *iter;
loff_t l;
- iter = kzalloc_obj(*iter, GFP_KERNEL);
+ iter = kzalloc_obj(*iter);
mutex_lock(&event_mutex);
if (!iter)
return NULL;
@@ -2206,7 +2206,7 @@ event_filter_read(struct file *filp, char __user *ubuf, size_t cnt,
if (*ppos)
return 0;
- s = kmalloc_obj(*s, GFP_KERNEL);
+ s = kmalloc_obj(*s);
if (!s)
return -ENOMEM;
@@ -2320,7 +2320,7 @@ static int system_tr_open(struct inode *inode, struct file *filp)
int ret;
/* Make a temporary dir that has no system but points to tr */
- dir = kzalloc_obj(*dir, GFP_KERNEL);
+ dir = kzalloc_obj(*dir);
if (!dir)
return -ENOMEM;
@@ -2366,7 +2366,7 @@ subsystem_filter_read(struct file *filp, char __user *ubuf, size_t cnt,
if (*ppos)
return 0;
- s = kmalloc_obj(*s, GFP_KERNEL);
+ s = kmalloc_obj(*s);
if (!s)
return -ENOMEM;
@@ -2416,7 +2416,7 @@ show_header_page_file(struct file *filp, char __user *ubuf, size_t cnt, loff_t *
if (*ppos)
return 0;
- s = kmalloc_obj(*s, GFP_KERNEL);
+ s = kmalloc_obj(*s);
if (!s)
return -ENOMEM;
@@ -2440,7 +2440,7 @@ show_header_event_file(struct file *filp, char __user *ubuf, size_t cnt, loff_t
if (*ppos)
return 0;
- s = kmalloc_obj(*s, GFP_KERNEL);
+ s = kmalloc_obj(*s);
if (!s)
return -ENOMEM;
@@ -2881,7 +2881,7 @@ create_new_subsystem(const char *name)
struct event_subsystem *system;
/* need to create new entry */
- system = kmalloc_obj(*system, GFP_KERNEL);
+ system = kmalloc_obj(*system);
if (!system)
return NULL;
@@ -2892,7 +2892,7 @@ create_new_subsystem(const char *name)
if (!system->name)
goto out_free;
- system->filter = kzalloc_obj(struct event_filter, GFP_KERNEL);
+ system->filter = kzalloc_obj(struct event_filter);
if (!system->filter)
goto out_free;
@@ -2960,7 +2960,7 @@ event_subsystem_dir(struct trace_array *tr, const char *name,
}
}
- dir = kmalloc_obj(*dir, GFP_KERNEL);
+ dir = kmalloc_obj(*dir);
if (!dir)
goto out_fail;
@@ -3403,7 +3403,7 @@ static void add_str_to_module(struct module *module, char *str)
{
struct module_string *modstr;
- modstr = kmalloc_obj(*modstr, GFP_KERNEL);
+ modstr = kmalloc_obj(*modstr);
/*
* If we failed to allocate memory here, then we'll just
@@ -4365,7 +4365,7 @@ event_enable_func(struct trace_array *tr, struct ftrace_hash *hash,
goto out_put;
ret = -ENOMEM;
- data = kzalloc_obj(*data, GFP_KERNEL);
+ data = kzalloc_obj(*data);
if (!data)
goto out_put;
diff --git a/kernel/trace/trace_events_filter.c b/kernel/trace/trace_events_filter.c
index b84bdad362e9..609325f57942 100644
--- a/kernel/trace/trace_events_filter.c
+++ b/kernel/trace/trace_events_filter.c
@@ -485,10 +485,10 @@ predicate_parse(const char *str, int nr_parens, int nr_preds,
nr_preds += 2; /* For TRUE and FALSE */
- op_stack = kmalloc_objs(*op_stack, nr_parens, GFP_KERNEL);
+ op_stack = kmalloc_objs(*op_stack, nr_parens);
if (!op_stack)
return ERR_PTR(-ENOMEM);
- prog_stack = kzalloc_objs(*prog_stack, nr_preds, GFP_KERNEL);
+ prog_stack = kzalloc_objs(*prog_stack, nr_preds);
if (!prog_stack) {
parse_error(pe, -ENOMEM, 0);
goto out_free;
@@ -1213,7 +1213,7 @@ static void append_filter_err(struct trace_array *tr,
if (WARN_ON(!filter->filter_string))
return;
- s = kmalloc_obj(*s, GFP_KERNEL);
+ s = kmalloc_obj(*s);
if (!s)
return;
trace_seq_init(s);
@@ -1394,13 +1394,13 @@ static void try_delay_free_filter(struct event_filter *filter)
struct filter_head *head;
struct filter_list *item;
- head = kmalloc_obj(*head, GFP_KERNEL);
+ head = kmalloc_obj(*head);
if (!head)
goto free_now;
INIT_LIST_HEAD(&head->list);
- item = kmalloc_obj(*item, GFP_KERNEL);
+ item = kmalloc_obj(*item);
if (!item) {
kfree(head);
goto free_now;
@@ -1442,7 +1442,7 @@ static void filter_free_subsystem_filters(struct trace_subsystem_dir *dir,
struct filter_head *head;
struct filter_list *item;
- head = kmalloc_obj(*head, GFP_KERNEL);
+ head = kmalloc_obj(*head);
if (!head)
goto free_now;
@@ -1451,7 +1451,7 @@ static void filter_free_subsystem_filters(struct trace_subsystem_dir *dir,
list_for_each_entry(file, &tr->events, list) {
if (file->system != dir)
continue;
- item = kmalloc_obj(*item, GFP_KERNEL);
+ item = kmalloc_obj(*item);
if (!item)
goto free_now;
item->filter = event_filter(file);
@@ -1459,7 +1459,7 @@ static void filter_free_subsystem_filters(struct trace_subsystem_dir *dir,
event_clear_filter(file);
}
- item = kmalloc_obj(*item, GFP_KERNEL);
+ item = kmalloc_obj(*item);
if (!item)
goto free_now;
@@ -1708,7 +1708,7 @@ static int parse_pred(const char *str, void *data,
s = i;
- pred = kzalloc_obj(*pred, GFP_KERNEL);
+ pred = kzalloc_obj(*pred);
if (!pred)
return -ENOMEM;
@@ -1819,7 +1819,7 @@ static int parse_pred(const char *str, void *data,
goto err_free;
}
- pred->regex = kzalloc_obj(*pred->regex, GFP_KERNEL);
+ pred->regex = kzalloc_obj(*pred->regex);
if (!pred->regex)
goto err_mem;
pred->regex->len = len;
@@ -1984,7 +1984,7 @@ static int parse_pred(const char *str, void *data,
goto err_free;
}
- pred->regex = kzalloc_obj(*pred->regex, GFP_KERNEL);
+ pred->regex = kzalloc_obj(*pred->regex);
if (!pred->regex)
goto err_mem;
pred->regex->len = len;
@@ -2261,7 +2261,7 @@ static int process_system_preds(struct trace_subsystem_dir *dir,
bool fail = true;
int err;
- filter_list = kmalloc_obj(*filter_list, GFP_KERNEL);
+ filter_list = kmalloc_obj(*filter_list);
if (!filter_list)
return -ENOMEM;
@@ -2272,7 +2272,7 @@ static int process_system_preds(struct trace_subsystem_dir *dir,
if (file->system != dir)
continue;
- filter = kzalloc_obj(*filter, GFP_KERNEL);
+ filter = kzalloc_obj(*filter);
if (!filter)
goto fail_mem;
@@ -2289,7 +2289,7 @@ static int process_system_preds(struct trace_subsystem_dir *dir,
event_set_filtered_flag(file);
- filter_item = kzalloc_obj(*filter_item, GFP_KERNEL);
+ filter_item = kzalloc_obj(*filter_item);
if (!filter_item)
goto fail_mem;
@@ -2343,14 +2343,14 @@ static int create_filter_start(char *filter_string, bool set_str,
if (WARN_ON_ONCE(*pse || *filterp))
return -EINVAL;
- filter = kzalloc_obj(*filter, GFP_KERNEL);
+ filter = kzalloc_obj(*filter);
if (filter && set_str) {
filter->filter_string = kstrdup(filter_string, GFP_KERNEL);
if (!filter->filter_string)
err = -ENOMEM;
}
- pe = kzalloc_obj(*pe, GFP_KERNEL);
+ pe = kzalloc_obj(*pe);
if (!filter || !pe || err) {
kfree(pe);
diff --git a/kernel/trace/trace_events_hist.c b/kernel/trace/trace_events_hist.c
index da42a087d646..a45cdd05123b 100644
--- a/kernel/trace/trace_events_hist.c
+++ b/kernel/trace/trace_events_hist.c
@@ -732,7 +732,7 @@ static struct track_data *track_data_alloc(unsigned int key_len,
struct action_data *action_data,
struct hist_trigger_data *hist_data)
{
- struct track_data *data = kzalloc_obj(*data, GFP_KERNEL);
+ struct track_data *data = kzalloc_obj(*data);
struct hist_elt_data *elt_data;
if (!data)
@@ -748,7 +748,7 @@ static struct track_data *track_data_alloc(unsigned int key_len,
data->action_data = action_data;
data->hist_data = hist_data;
- elt_data = kzalloc_obj(*elt_data, GFP_KERNEL);
+ elt_data = kzalloc_obj(*elt_data);
if (!elt_data) {
track_data_free(data);
return ERR_PTR(-ENOMEM);
@@ -1086,7 +1086,7 @@ static int save_hist_vars(struct hist_trigger_data *hist_data)
if (tracing_check_open_get_tr(tr))
return -ENODEV;
- var_data = kzalloc_obj(*var_data, GFP_KERNEL);
+ var_data = kzalloc_obj(*var_data);
if (!var_data) {
trace_array_put(tr);
return -ENOMEM;
@@ -1548,7 +1548,7 @@ parse_hist_trigger_attrs(struct trace_array *tr, char *trigger_str)
struct hist_trigger_attrs *attrs;
int ret = 0;
- attrs = kzalloc_obj(*attrs, GFP_KERNEL);
+ attrs = kzalloc_obj(*attrs);
if (!attrs)
return ERR_PTR(-ENOMEM);
@@ -1646,7 +1646,7 @@ static int hist_trigger_elt_data_alloc(struct tracing_map_elt *elt)
struct hist_field *hist_field;
unsigned int i, n_str;
- elt_data = kzalloc_obj(*elt_data, GFP_KERNEL);
+ elt_data = kzalloc_obj(*elt_data);
if (!elt_data)
return -ENOMEM;
@@ -1962,7 +1962,7 @@ static struct hist_field *create_hist_field(struct hist_trigger_data *hist_data,
if (field && is_function_field(field))
return NULL;
- hist_field = kzalloc_obj(struct hist_field, GFP_KERNEL);
+ hist_field = kzalloc_obj(struct hist_field);
if (!hist_field)
return NULL;
@@ -3049,7 +3049,7 @@ create_field_var_hist(struct hist_trigger_data *target_hist_data,
if (!IS_ERR_OR_NULL(event_var))
return event_var;
- var_hist = kzalloc_obj(*var_hist, GFP_KERNEL);
+ var_hist = kzalloc_obj(*var_hist);
if (!var_hist)
return ERR_PTR(-ENOMEM);
@@ -3231,7 +3231,7 @@ static struct hist_field *create_var(struct hist_trigger_data *hist_data,
goto out;
}
- var = kzalloc_obj(struct hist_field, GFP_KERNEL);
+ var = kzalloc_obj(struct hist_field);
if (!var) {
var = ERR_PTR(-ENOMEM);
goto out;
@@ -3292,7 +3292,7 @@ static struct field_var *create_field_var(struct hist_trigger_data *hist_data,
goto err;
}
- field_var = kzalloc_obj(struct field_var, GFP_KERNEL);
+ field_var = kzalloc_obj(struct field_var);
if (!field_var) {
destroy_hist_field(val, 0);
kfree_const(var->type);
@@ -3831,7 +3831,7 @@ static struct action_data *track_data_parse(struct hist_trigger_data *hist_data,
int ret = -EINVAL;
char *var_str;
- data = kzalloc_obj(*data, GFP_KERNEL);
+ data = kzalloc_obj(*data);
if (!data)
return ERR_PTR(-ENOMEM);
@@ -4198,7 +4198,7 @@ static struct action_data *onmatch_parse(struct trace_array *tr, char *str)
struct action_data *data;
int ret = -EINVAL;
- data = kzalloc_obj(*data, GFP_KERNEL);
+ data = kzalloc_obj(*data);
if (!data)
return ERR_PTR(-ENOMEM);
@@ -5136,7 +5136,7 @@ create_hist_data(unsigned int map_bits,
struct hist_trigger_data *hist_data;
int ret = 0;
- hist_data = kzalloc_obj(*hist_data, GFP_KERNEL);
+ hist_data = kzalloc_obj(*hist_data);
if (!hist_data)
return ERR_PTR(-ENOMEM);
@@ -5828,7 +5828,7 @@ static int event_hist_open(struct inode *inode, struct file *file)
goto err;
}
- hist_file = kzalloc_obj(*hist_file, GFP_KERNEL);
+ hist_file = kzalloc_obj(*hist_file);
if (!hist_file) {
ret = -ENOMEM;
goto err;
@@ -6602,7 +6602,7 @@ static int hist_register_trigger(char *glob,
data->private_data = named_data->private_data;
set_named_trigger_data(data, named_data);
/* Copy the command ops and update some of the functions */
- cmd_ops = kmalloc_obj(*cmd_ops, GFP_KERNEL);
+ cmd_ops = kmalloc_obj(*cmd_ops);
if (!cmd_ops) {
ret = -ENOMEM;
goto out;
diff --git a/kernel/trace/trace_events_synth.c b/kernel/trace/trace_events_synth.c
index db74b2c663f8..7303491e299d 100644
--- a/kernel/trace/trace_events_synth.c
+++ b/kernel/trace/trace_events_synth.c
@@ -711,7 +711,7 @@ static struct synth_field *parse_synth_field(int argc, char **argv,
*field_version = check_field_version(prefix, field_type, field_name);
- field = kzalloc_obj(*field, GFP_KERNEL);
+ field = kzalloc_obj(*field);
if (!field)
return ERR_PTR(-ENOMEM);
@@ -819,7 +819,7 @@ static struct tracepoint *alloc_synth_tracepoint(char *name)
{
struct tracepoint *tp;
- tp = kzalloc_obj(*tp, GFP_KERNEL);
+ tp = kzalloc_obj(*tp);
if (!tp)
return ERR_PTR(-ENOMEM);
@@ -973,7 +973,7 @@ static struct synth_event *alloc_synth_event(const char *name, int n_fields,
unsigned int i, j, n_dynamic_fields = 0;
struct synth_event *event;
- event = kzalloc_obj(*event, GFP_KERNEL);
+ event = kzalloc_obj(*event);
if (!event) {
event = ERR_PTR(-ENOMEM);
goto out;
@@ -986,7 +986,7 @@ static struct synth_event *alloc_synth_event(const char *name, int n_fields,
goto out;
}
- event->fields = kzalloc_objs(*event->fields, n_fields, GFP_KERNEL);
+ event->fields = kzalloc_objs(*event->fields, n_fields);
if (!event->fields) {
free_synth_event(event);
event = ERR_PTR(-ENOMEM);
diff --git a/kernel/trace/trace_events_trigger.c b/kernel/trace/trace_events_trigger.c
index 7ba3548a2f60..fecbd679d432 100644
--- a/kernel/trace/trace_events_trigger.c
+++ b/kernel/trace/trace_events_trigger.c
@@ -914,7 +914,7 @@ struct event_trigger_data *trigger_data_alloc(struct event_command *cmd_ops,
{
struct event_trigger_data *trigger_data;
- trigger_data = kzalloc_obj(*trigger_data, GFP_KERNEL);
+ trigger_data = kzalloc_obj(*trigger_data);
if (!trigger_data)
return NULL;
@@ -1724,7 +1724,7 @@ int event_enable_trigger_parse(struct event_command *cmd_ops,
#endif
ret = -ENOMEM;
- enable_data = kzalloc_obj(*enable_data, GFP_KERNEL);
+ enable_data = kzalloc_obj(*enable_data);
if (!enable_data)
return ret;
diff --git a/kernel/trace/trace_events_user.c b/kernel/trace/trace_events_user.c
index c35182cb7286..c4ba484f7b38 100644
--- a/kernel/trace/trace_events_user.c
+++ b/kernel/trace/trace_events_user.c
@@ -370,7 +370,7 @@ static struct user_event_group *user_event_group_create(void)
{
struct user_event_group *group;
- group = kzalloc_obj(*group, GFP_KERNEL);
+ group = kzalloc_obj(*group);
if (!group)
return NULL;
diff --git a/kernel/trace/trace_fprobe.c b/kernel/trace/trace_fprobe.c
index 7decd8383d67..8cd7eb790071 100644
--- a/kernel/trace/trace_fprobe.c
+++ b/kernel/trace/trace_fprobe.c
@@ -99,7 +99,7 @@ static struct tracepoint_user *__tracepoint_user_init(const char *name, struct t
struct tracepoint_user *tuser __free(tuser_free) = NULL;
int ret;
- tuser = kzalloc_obj(*tuser, GFP_KERNEL);
+ tuser = kzalloc_obj(*tuser);
if (!tuser)
return NULL;
tuser->name = kstrdup(name, GFP_KERNEL);
@@ -1403,7 +1403,7 @@ static int trace_fprobe_create_cb(int argc, const char *argv[])
struct traceprobe_parse_context *ctx __free(traceprobe_parse_context) = NULL;
int ret;
- ctx = kzalloc_obj(*ctx, GFP_KERNEL);
+ ctx = kzalloc_obj(*ctx);
if (!ctx)
return -ENOMEM;
diff --git a/kernel/trace/trace_functions.c b/kernel/trace/trace_functions.c
index a7e4ad088acf..f283391a4dc8 100644
--- a/kernel/trace/trace_functions.c
+++ b/kernel/trace/trace_functions.c
@@ -61,7 +61,7 @@ int ftrace_allocate_ftrace_ops(struct trace_array *tr)
if (tr->flags & TRACE_ARRAY_FL_GLOBAL)
return 0;
- ops = kzalloc_obj(*ops, GFP_KERNEL);
+ ops = kzalloc_obj(*ops);
if (!ops)
return -ENOMEM;
diff --git a/kernel/trace/trace_functions_graph.c b/kernel/trace/trace_functions_graph.c
index 73f0479aeac0..3d8239fee004 100644
--- a/kernel/trace/trace_functions_graph.c
+++ b/kernel/trace/trace_functions_graph.c
@@ -434,7 +434,7 @@ int allocate_fgraph_ops(struct trace_array *tr, struct ftrace_ops *ops)
{
struct fgraph_ops *gops;
- gops = kzalloc_obj(*gops, GFP_KERNEL);
+ gops = kzalloc_obj(*gops);
if (!gops)
return -ENOMEM;
diff --git a/kernel/trace/trace_kprobe.c b/kernel/trace/trace_kprobe.c
index 808b91873bd6..84539e1cd27e 100644
--- a/kernel/trace/trace_kprobe.c
+++ b/kernel/trace/trace_kprobe.c
@@ -1082,7 +1082,7 @@ static int trace_kprobe_create_cb(int argc, const char *argv[])
struct traceprobe_parse_context *ctx __free(traceprobe_parse_context) = NULL;
int ret;
- ctx = kzalloc_obj(*ctx, GFP_KERNEL);
+ ctx = kzalloc_obj(*ctx);
if (!ctx)
return -ENOMEM;
ctx->flags = TPARG_FL_KERNEL;
diff --git a/kernel/trace/trace_mmiotrace.c b/kernel/trace/trace_mmiotrace.c
index 1c752a691317..226cf66e0d68 100644
--- a/kernel/trace/trace_mmiotrace.c
+++ b/kernel/trace/trace_mmiotrace.c
@@ -101,7 +101,7 @@ static void mmio_pipe_open(struct trace_iterator *iter)
trace_seq_puts(s, "VERSION 20070824\n");
- hiter = kzalloc_obj(*hiter, GFP_KERNEL);
+ hiter = kzalloc_obj(*hiter);
if (!hiter)
return;
diff --git a/kernel/trace/trace_osnoise.c b/kernel/trace/trace_osnoise.c
index 51e7b0476a7f..dee610e465b9 100644
--- a/kernel/trace/trace_osnoise.c
+++ b/kernel/trace/trace_osnoise.c
@@ -122,7 +122,7 @@ static int osnoise_register_instance(struct trace_array *tr)
*/
lockdep_assert_held(&trace_types_lock);
- inst = kmalloc_obj(*inst, GFP_KERNEL);
+ inst = kmalloc_obj(*inst);
if (!inst)
return -ENOMEM;
diff --git a/kernel/trace/trace_printk.c b/kernel/trace/trace_printk.c
index 05b61ec67622..5ea5e0d76f00 100644
--- a/kernel/trace/trace_printk.c
+++ b/kernel/trace/trace_printk.c
@@ -69,7 +69,7 @@ void hold_module_trace_bprintk_format(const char **start, const char **end)
}
fmt = NULL;
- tb_fmt = kmalloc_obj(*tb_fmt, GFP_KERNEL);
+ tb_fmt = kmalloc_obj(*tb_fmt);
if (tb_fmt) {
fmt = kmalloc(strlen(*iter) + 1, GFP_KERNEL);
if (fmt) {
diff --git a/kernel/trace/trace_probe.c b/kernel/trace/trace_probe.c
index fff0879cb0e9..b3ce9bb0b971 100644
--- a/kernel/trace/trace_probe.c
+++ b/kernel/trace/trace_probe.c
@@ -838,7 +838,7 @@ static int __store_entry_arg(struct trace_probe *tp, int argnum)
int i, offset, last_offset = 0;
if (!earg) {
- earg = kzalloc_obj(*tp->entry_arg, GFP_KERNEL);
+ earg = kzalloc_obj(*tp->entry_arg);
if (!earg)
return -ENOMEM;
earg->size = 2 * tp->nr_args + 1;
@@ -1499,7 +1499,7 @@ static int traceprobe_parse_probe_arg_body(const char *argv, ssize_t *size,
if (IS_ERR(type))
return PTR_ERR(type);
- code = tmp = kzalloc_objs(*code, FETCH_INSN_MAX, GFP_KERNEL);
+ code = tmp = kzalloc_objs(*code, FETCH_INSN_MAX);
if (!code)
return -ENOMEM;
code[FETCH_INSN_MAX - 1].op = FETCH_OP_END;
@@ -1543,7 +1543,7 @@ static int traceprobe_parse_probe_arg_body(const char *argv, ssize_t *size,
if (code->op == FETCH_OP_END)
break;
/* Shrink down the code buffer */
- parg->code = kzalloc_objs(*code, code - tmp + 1, GFP_KERNEL);
+ parg->code = kzalloc_objs(*code, code - tmp + 1);
if (!parg->code)
ret = -ENOMEM;
else
@@ -2149,7 +2149,7 @@ int trace_probe_add_file(struct trace_probe *tp, struct trace_event_file *file)
{
struct event_file_link *link;
- link = kmalloc_obj(*link, GFP_KERNEL);
+ link = kmalloc_obj(*link);
if (!link)
return -ENOMEM;
diff --git a/kernel/trace/trace_recursion_record.c b/kernel/trace/trace_recursion_record.c
index 852069484060..784fe1fbb866 100644
--- a/kernel/trace/trace_recursion_record.c
+++ b/kernel/trace/trace_recursion_record.c
@@ -129,7 +129,7 @@ static void *recursed_function_seq_start(struct seq_file *m, loff_t *pos)
ret = &recursed_functions[*pos];
}
- tseq = kzalloc_obj(*tseq, GFP_KERNEL);
+ tseq = kzalloc_obj(*tseq);
if (!tseq)
return ERR_PTR(-ENOMEM);
diff --git a/kernel/trace/trace_sched_switch.c b/kernel/trace/trace_sched_switch.c
index ded84f1d8121..e9f0ff962660 100644
--- a/kernel/trace/trace_sched_switch.c
+++ b/kernel/trace/trace_sched_switch.c
@@ -444,7 +444,7 @@ int trace_alloc_tgid_map(void)
return 0;
tgid_map_max = init_pid_ns.pid_max;
- map = kvzalloc_objs(*tgid_map, tgid_map_max + 1, GFP_KERNEL);
+ map = kvzalloc_objs(*tgid_map, tgid_map_max + 1);
if (!map)
return -ENOMEM;
diff --git a/kernel/trace/trace_selftest.c b/kernel/trace/trace_selftest.c
index 43ed16b3b160..929c84075315 100644
--- a/kernel/trace/trace_selftest.c
+++ b/kernel/trace/trace_selftest.c
@@ -248,7 +248,7 @@ static int trace_selftest_ops(struct trace_array *tr, int cnt)
goto out;
/* Add a dynamic probe */
- dyn_ops = kzalloc_obj(*dyn_ops, GFP_KERNEL);
+ dyn_ops = kzalloc_obj(*dyn_ops);
if (!dyn_ops) {
printk("MEMORY ERROR ");
goto out;
diff --git a/kernel/trace/trace_stat.c b/kernel/trace/trace_stat.c
index 3fec69e8a6d4..856ece13b7dc 100644
--- a/kernel/trace/trace_stat.c
+++ b/kernel/trace/trace_stat.c
@@ -77,7 +77,7 @@ static int insert_stat(struct rb_root *root, void *stat, cmp_func_t cmp)
struct rb_node **new = &(root->rb_node), *parent = NULL;
struct stat_node *data;
- data = kzalloc_obj(*data, GFP_KERNEL);
+ data = kzalloc_obj(*data);
if (!data)
return -ENOMEM;
data->stat = stat;
@@ -322,7 +322,7 @@ int register_stat_tracer(struct tracer_stat *trace)
}
/* Init the session */
- session = kzalloc_obj(*session, GFP_KERNEL);
+ session = kzalloc_obj(*session);
if (!session)
return -ENOMEM;
diff --git a/kernel/trace/trace_syscalls.c b/kernel/trace/trace_syscalls.c
index 2f495e46034f..6ecae3e6d10a 100644
--- a/kernel/trace/trace_syscalls.c
+++ b/kernel/trace/trace_syscalls.c
@@ -617,7 +617,7 @@ static int syscall_fault_buffer_enable(void)
return 0;
}
- sbuf = kmalloc_obj(*sbuf, GFP_KERNEL);
+ sbuf = kmalloc_obj(*sbuf);
if (!sbuf)
return -ENOMEM;
diff --git a/kernel/trace/trace_uprobe.c b/kernel/trace/trace_uprobe.c
index 83c17b90daad..00ca63934763 100644
--- a/kernel/trace/trace_uprobe.c
+++ b/kernel/trace/trace_uprobe.c
@@ -699,7 +699,7 @@ static int __trace_uprobe_create(int argc, const char **argv)
memset(&path, 0, sizeof(path));
tu->filename = no_free_ptr(filename);
- ctx = kzalloc_obj(*ctx, GFP_KERNEL);
+ ctx = kzalloc_obj(*ctx);
if (!ctx)
return -ENOMEM;
ctx->flags = (is_return ? TPARG_FL_RETURN : 0) | TPARG_FL_USER;
diff --git a/kernel/trace/tracing_map.c b/kernel/trace/tracing_map.c
index ef28c6c52295..bf1a507695b6 100644
--- a/kernel/trace/tracing_map.c
+++ b/kernel/trace/tracing_map.c
@@ -324,7 +324,7 @@ static struct tracing_map_array *tracing_map_array_alloc(unsigned int n_elts,
struct tracing_map_array *a;
unsigned int i;
- a = kzalloc_obj(*a, GFP_KERNEL);
+ a = kzalloc_obj(*a);
if (!a)
return NULL;
@@ -405,7 +405,7 @@ static struct tracing_map_elt *tracing_map_elt_alloc(struct tracing_map *map)
struct tracing_map_elt *elt;
int err = 0;
- elt = kzalloc_obj(*elt, GFP_KERNEL);
+ elt = kzalloc_obj(*elt);
if (!elt)
return ERR_PTR(-ENOMEM);
@@ -417,19 +417,19 @@ static struct tracing_map_elt *tracing_map_elt_alloc(struct tracing_map *map)
goto free;
}
- elt->fields = kzalloc_objs(*elt->fields, map->n_fields, GFP_KERNEL);
+ elt->fields = kzalloc_objs(*elt->fields, map->n_fields);
if (!elt->fields) {
err = -ENOMEM;
goto free;
}
- elt->vars = kzalloc_objs(*elt->vars, map->n_vars, GFP_KERNEL);
+ elt->vars = kzalloc_objs(*elt->vars, map->n_vars);
if (!elt->vars) {
err = -ENOMEM;
goto free;
}
- elt->var_set = kzalloc_objs(*elt->var_set, map->n_vars, GFP_KERNEL);
+ elt->var_set = kzalloc_objs(*elt->var_set, map->n_vars);
if (!elt->var_set) {
err = -ENOMEM;
goto free;
@@ -777,7 +777,7 @@ struct tracing_map *tracing_map_create(unsigned int map_bits,
map_bits > TRACING_MAP_BITS_MAX)
return ERR_PTR(-EINVAL);
- map = kzalloc_obj(*map, GFP_KERNEL);
+ map = kzalloc_obj(*map);
if (!map)
return ERR_PTR(-ENOMEM);
@@ -949,7 +949,7 @@ create_sort_entry(void *key, struct tracing_map_elt *elt)
{
struct tracing_map_sort_entry *sort_entry;
- sort_entry = kzalloc_obj(*sort_entry, GFP_KERNEL);
+ sort_entry = kzalloc_obj(*sort_entry);
if (!sort_entry)
return NULL;
diff --git a/kernel/tracepoint.c b/kernel/tracepoint.c
index 8287a4ff3f18..df7ab773c7f3 100644
--- a/kernel/tracepoint.c
+++ b/kernel/tracepoint.c
@@ -614,7 +614,7 @@ static int tracepoint_module_coming(struct module *mod)
if (trace_module_has_bad_taint(mod))
return 0;
- tp_mod = kmalloc_obj(struct tp_module, GFP_KERNEL);
+ tp_mod = kmalloc_obj(struct tp_module);
if (!tp_mod)
return -ENOMEM;
tp_mod->mod = mod;
diff --git a/kernel/ucount.c b/kernel/ucount.c
index d1f723805c6d..d6dc3e859f12 100644
--- a/kernel/ucount.c
+++ b/kernel/ucount.c
@@ -163,7 +163,7 @@ struct ucounts *alloc_ucounts(struct user_namespace *ns, kuid_t uid)
if (ucounts)
return ucounts;
- new = kzalloc_obj(*new, GFP_KERNEL);
+ new = kzalloc_obj(*new);
if (!new)
return NULL;
diff --git a/kernel/vhost_task.c b/kernel/vhost_task.c
index bf84af48dce8..3f1ed7ef0582 100644
--- a/kernel/vhost_task.c
+++ b/kernel/vhost_task.c
@@ -132,7 +132,7 @@ struct vhost_task *vhost_task_create(bool (*fn)(void *),
struct vhost_task *vtsk;
struct task_struct *tsk;
- vtsk = kzalloc_obj(*vtsk, GFP_KERNEL);
+ vtsk = kzalloc_obj(*vtsk);
if (!vtsk)
return ERR_PTR(-ENOMEM);
init_completion(&vtsk->exited);
diff --git a/kernel/watch_queue.c b/kernel/watch_queue.c
index d966b8c99052..765c152f6084 100644
--- a/kernel/watch_queue.c
+++ b/kernel/watch_queue.c
@@ -278,7 +278,7 @@ long watch_queue_set_size(struct pipe_inode_info *pipe, unsigned int nr_notes)
pipe->nr_accounted = nr_pages;
ret = -ENOMEM;
- pages = kzalloc_objs(struct page *, nr_pages, GFP_KERNEL);
+ pages = kzalloc_objs(struct page *, nr_pages);
if (!pages)
goto error;
@@ -692,7 +692,7 @@ int watch_queue_init(struct pipe_inode_info *pipe)
{
struct watch_queue *wqueue;
- wqueue = kzalloc_obj(*wqueue, GFP_KERNEL);
+ wqueue = kzalloc_obj(*wqueue);
if (!wqueue)
return -ENOMEM;
diff --git a/kernel/workqueue.c b/kernel/workqueue.c
index ee3e81133f78..399b0375a66a 100644
--- a/kernel/workqueue.c
+++ b/kernel/workqueue.c
@@ -4714,7 +4714,7 @@ struct workqueue_attrs *alloc_workqueue_attrs_noprof(void)
{
struct workqueue_attrs *attrs;
- attrs = kzalloc_obj(*attrs, GFP_KERNEL);
+ attrs = kzalloc_obj(*attrs);
if (!attrs)
goto fail;
if (!alloc_cpumask_var(&attrs->cpumask, GFP_KERNEL))
@@ -7486,7 +7486,7 @@ int workqueue_sysfs_register(struct workqueue_struct *wq)
if (WARN_ON(wq->flags & __WQ_ORDERED))
return -EINVAL;
- wq->wq_dev = wq_dev = kzalloc_obj(*wq_dev, GFP_KERNEL);
+ wq->wq_dev = wq_dev = kzalloc_obj(*wq_dev);
if (!wq_dev)
return -ENOMEM;
@@ -7879,9 +7879,9 @@ void __init workqueue_init_early(void)
wq_power_efficient = true;
/* initialize WQ_AFFN_SYSTEM pods */
- pt->pod_cpus = kzalloc_objs(pt->pod_cpus[0], 1, GFP_KERNEL);
- pt->pod_node = kzalloc_objs(pt->pod_node[0], 1, GFP_KERNEL);
- pt->cpu_pod = kzalloc_objs(pt->cpu_pod[0], nr_cpu_ids, GFP_KERNEL);
+ pt->pod_cpus = kzalloc_objs(pt->pod_cpus[0], 1);
+ pt->pod_node = kzalloc_objs(pt->pod_node[0], 1);
+ pt->cpu_pod = kzalloc_objs(pt->cpu_pod[0], nr_cpu_ids);
BUG_ON(!pt->pod_cpus || !pt->pod_node || !pt->cpu_pod);
BUG_ON(!zalloc_cpumask_var_node(&pt->pod_cpus[0], GFP_KERNEL, NUMA_NO_NODE));
@@ -8063,7 +8063,7 @@ static void __init init_pod_type(struct wq_pod_type *pt,
pt->nr_pods = 0;
/* init @pt->cpu_pod[] according to @cpus_share_pod() */
- pt->cpu_pod = kzalloc_objs(pt->cpu_pod[0], nr_cpu_ids, GFP_KERNEL);
+ pt->cpu_pod = kzalloc_objs(pt->cpu_pod[0], nr_cpu_ids);
BUG_ON(!pt->cpu_pod);
for_each_possible_cpu(cur) {
@@ -8080,8 +8080,8 @@ static void __init init_pod_type(struct wq_pod_type *pt,
}
/* init the rest to match @pt->cpu_pod[] */
- pt->pod_cpus = kzalloc_objs(pt->pod_cpus[0], pt->nr_pods, GFP_KERNEL);
- pt->pod_node = kzalloc_objs(pt->pod_node[0], pt->nr_pods, GFP_KERNEL);
+ pt->pod_cpus = kzalloc_objs(pt->pod_cpus[0], pt->nr_pods);
+ pt->pod_node = kzalloc_objs(pt->pod_node[0], pt->nr_pods);
BUG_ON(!pt->pod_cpus || !pt->pod_node);
for (pod = 0; pod < pt->nr_pods; pod++)
diff --git a/lib/assoc_array.c b/lib/assoc_array.c
index 6cd376ad5030..45d24dde71b6 100644
--- a/lib/assoc_array.c
+++ b/lib/assoc_array.c
@@ -454,7 +454,7 @@ static bool assoc_array_insert_in_empty_tree(struct assoc_array_edit *edit)
pr_devel("-->%s()\n", __func__);
- new_n0 = kzalloc_obj(struct assoc_array_node, GFP_KERNEL);
+ new_n0 = kzalloc_obj(struct assoc_array_node);
if (!new_n0)
return false;
@@ -536,11 +536,11 @@ static bool assoc_array_insert_into_terminal_node(struct assoc_array_edit *edit,
* those now. We may also need a new shortcut, but we deal with that
* when we need it.
*/
- new_n0 = kzalloc_obj(struct assoc_array_node, GFP_KERNEL);
+ new_n0 = kzalloc_obj(struct assoc_array_node);
if (!new_n0)
return false;
edit->new_meta[0] = assoc_array_node_to_ptr(new_n0);
- new_n1 = kzalloc_obj(struct assoc_array_node, GFP_KERNEL);
+ new_n1 = kzalloc_obj(struct assoc_array_node);
if (!new_n1)
return false;
edit->new_meta[1] = assoc_array_node_to_ptr(new_n1);
@@ -832,7 +832,7 @@ static bool assoc_array_insert_mid_shortcut(struct assoc_array_edit *edit,
edit->excised_meta[0] = assoc_array_shortcut_to_ptr(shortcut);
/* Create a new node now since we're going to need it anyway */
- new_n0 = kzalloc_obj(struct assoc_array_node, GFP_KERNEL);
+ new_n0 = kzalloc_obj(struct assoc_array_node);
if (!new_n0)
return false;
edit->new_meta[0] = assoc_array_node_to_ptr(new_n0);
@@ -975,7 +975,7 @@ struct assoc_array_edit *assoc_array_insert(struct assoc_array *array,
*/
BUG_ON(assoc_array_ptr_is_meta(object));
- edit = kzalloc_obj(struct assoc_array_edit, GFP_KERNEL);
+ edit = kzalloc_obj(struct assoc_array_edit);
if (!edit)
return ERR_PTR(-ENOMEM);
edit->array = array;
@@ -1087,7 +1087,7 @@ struct assoc_array_edit *assoc_array_delete(struct assoc_array *array,
pr_devel("-->%s()\n", __func__);
- edit = kzalloc_obj(struct assoc_array_edit, GFP_KERNEL);
+ edit = kzalloc_obj(struct assoc_array_edit);
if (!edit)
return ERR_PTR(-ENOMEM);
edit->array = array;
@@ -1280,7 +1280,7 @@ struct assoc_array_edit *assoc_array_clear(struct assoc_array *array,
if (!array->root)
return NULL;
- edit = kzalloc_obj(struct assoc_array_edit, GFP_KERNEL);
+ edit = kzalloc_obj(struct assoc_array_edit);
if (!edit)
return ERR_PTR(-ENOMEM);
edit->array = array;
@@ -1468,7 +1468,7 @@ int assoc_array_gc(struct assoc_array *array,
if (!array->root)
return 0;
- edit = kzalloc_obj(struct assoc_array_edit, GFP_KERNEL);
+ edit = kzalloc_obj(struct assoc_array_edit);
if (!edit)
return -ENOMEM;
edit->array = array;
@@ -1503,7 +1503,7 @@ int assoc_array_gc(struct assoc_array *array,
/* Duplicate the node at this position */
node = assoc_array_ptr_to_node(cursor);
- new_n = kzalloc_obj(struct assoc_array_node, GFP_KERNEL);
+ new_n = kzalloc_obj(struct assoc_array_node);
if (!new_n)
goto enomem;
pr_devel("dup node %p -> %p\n", node, new_n);
diff --git a/lib/bch.c b/lib/bch.c
index 82a363dc73c4..9561c0828802 100644
--- a/lib/bch.c
+++ b/lib/bch.c
@@ -1320,7 +1320,7 @@ struct bch_control *bch_init(int m, int t, unsigned int prim_poly,
if (prim_poly == 0)
prim_poly = prim_poly_tab[m-min_m];
- bch = kzalloc_obj(*bch, GFP_KERNEL);
+ bch = kzalloc_obj(*bch);
if (bch == NULL)
goto fail;
diff --git a/lib/codetag.c b/lib/codetag.c
index 465952125bcb..304667897ad4 100644
--- a/lib/codetag.c
+++ b/lib/codetag.c
@@ -193,7 +193,7 @@ static int codetag_module_init(struct codetag_type *cttype, struct module *mod)
BUG_ON(range.start > range.stop);
- cmod = kmalloc_obj(*cmod, GFP_KERNEL);
+ cmod = kmalloc_obj(*cmod);
if (unlikely(!cmod))
return -ENOMEM;
@@ -383,7 +383,7 @@ codetag_register_type(const struct codetag_type_desc *desc)
BUG_ON(desc->tag_size <= 0);
- cttype = kzalloc_obj(*cttype, GFP_KERNEL);
+ cttype = kzalloc_obj(*cttype);
if (unlikely(!cttype))
return ERR_PTR(-ENOMEM);
diff --git a/lib/cpu_rmap.c b/lib/cpu_rmap.c
index dfc6219532b9..c86ab6e55d17 100644
--- a/lib/cpu_rmap.c
+++ b/lib/cpu_rmap.c
@@ -309,7 +309,7 @@ EXPORT_SYMBOL(irq_cpu_rmap_remove);
*/
int irq_cpu_rmap_add(struct cpu_rmap *rmap, int irq)
{
- struct irq_glue *glue = kzalloc_obj(*glue, GFP_KERNEL);
+ struct irq_glue *glue = kzalloc_obj(*glue);
int rc;
if (!glue)
diff --git a/lib/crypto/gf128mul.c b/lib/crypto/gf128mul.c
index 42c5fdc2d4ca..e5a727b15f07 100644
--- a/lib/crypto/gf128mul.c
+++ b/lib/crypto/gf128mul.c
@@ -245,12 +245,12 @@ struct gf128mul_64k *gf128mul_init_64k_bbe(const be128 *g)
struct gf128mul_64k *t;
int i, j, k;
- t = kzalloc_obj(*t, GFP_KERNEL);
+ t = kzalloc_obj(*t);
if (!t)
goto out;
for (i = 0; i < 16; i++) {
- t->t[i] = kzalloc_obj(*t->t[i], GFP_KERNEL);
+ t->t[i] = kzalloc_obj(*t->t[i]);
if (!t->t[i]) {
gf128mul_free_64k(t);
t = NULL;
@@ -326,7 +326,7 @@ struct gf128mul_4k *gf128mul_init_4k_lle(const be128 *g)
struct gf128mul_4k *t;
int j, k;
- t = kzalloc_obj(*t, GFP_KERNEL);
+ t = kzalloc_obj(*t);
if (!t)
goto out;
diff --git a/lib/crypto/mpi/mpih-mul.c b/lib/crypto/mpi/mpih-mul.c
index 9cd0843e9d36..29dd80609c47 100644
--- a/lib/crypto/mpi/mpih-mul.c
+++ b/lib/crypto/mpi/mpih-mul.c
@@ -372,7 +372,7 @@ mpihelp_mul_karatsuba_case(mpi_ptr_t prodp,
return -ENOMEM;
} else {
if (!ctx->next) {
- ctx->next = kzalloc_obj(*ctx, GFP_KERNEL);
+ ctx->next = kzalloc_obj(*ctx);
if (!ctx->next)
return -ENOMEM;
}
diff --git a/lib/crypto/mpi/mpiutil.c b/lib/crypto/mpi/mpiutil.c
index 4999f756f50e..f4faf7c903f9 100644
--- a/lib/crypto/mpi/mpiutil.c
+++ b/lib/crypto/mpi/mpiutil.c
@@ -33,7 +33,7 @@ MPI mpi_alloc(unsigned nlimbs)
{
MPI a;
- a = kmalloc_obj(*a, GFP_KERNEL);
+ a = kmalloc_obj(*a);
if (!a)
return a;
@@ -93,14 +93,14 @@ int mpi_resize(MPI a, unsigned nlimbs)
return 0; /* no need to do it */
if (a->d) {
- p = kzalloc_objs(mpi_limb_t, nlimbs, GFP_KERNEL);
+ p = kzalloc_objs(mpi_limb_t, nlimbs);
if (!p)
return -ENOMEM;
memcpy(p, a->d, a->alloced * sizeof(mpi_limb_t));
kfree_sensitive(a->d);
a->d = p;
} else {
- a->d = kzalloc_objs(mpi_limb_t, nlimbs, GFP_KERNEL);
+ a->d = kzalloc_objs(mpi_limb_t, nlimbs);
if (!a->d)
return -ENOMEM;
}
diff --git a/lib/dim/net_dim.c b/lib/dim/net_dim.c
index d66940b0c165..d8d4f6553559 100644
--- a/lib/dim/net_dim.c
+++ b/lib/dim/net_dim.c
@@ -105,7 +105,7 @@ int net_dim_init_irq_moder(struct net_device *dev, u8 profile_flags,
struct dim_irq_moder *moder;
int len;
- dev->irq_moder = kzalloc_obj(*dev->irq_moder, GFP_KERNEL);
+ dev->irq_moder = kzalloc_obj(*dev->irq_moder);
if (!dev->irq_moder)
return -ENOMEM;
diff --git a/lib/dynamic_debug.c b/lib/dynamic_debug.c
index a5b5e936e2ab..18a71a9108d3 100644
--- a/lib/dynamic_debug.c
+++ b/lib/dynamic_debug.c
@@ -1241,7 +1241,7 @@ static int ddebug_add_module(struct _ddebug_info *di, const char *modname)
return 0;
}
- dt = kzalloc_obj(*dt, GFP_KERNEL);
+ dt = kzalloc_obj(*dt);
if (dt == NULL) {
pr_err("error adding module: %s\n", modname);
return -ENOMEM;
diff --git a/lib/error-inject.c b/lib/error-inject.c
index 06c913ec2c1f..f3d1b70be605 100644
--- a/lib/error-inject.c
+++ b/lib/error-inject.c
@@ -80,7 +80,7 @@ static void populate_error_injection_list(struct error_injection_entry *start,
continue;
}
- ent = kmalloc_obj(*ent, GFP_KERNEL);
+ ent = kmalloc_obj(*ent);
if (!ent)
break;
ent->start_addr = entry;
diff --git a/lib/group_cpus.c b/lib/group_cpus.c
index 5d1758a05407..e6e18d7a49bb 100644
--- a/lib/group_cpus.c
+++ b/lib/group_cpus.c
@@ -47,7 +47,7 @@ static cpumask_var_t *alloc_node_to_cpumask(void)
cpumask_var_t *masks;
int node;
- masks = kzalloc_objs(cpumask_var_t, nr_node_ids, GFP_KERNEL);
+ masks = kzalloc_objs(cpumask_var_t, nr_node_ids);
if (!masks)
return NULL;
@@ -320,10 +320,10 @@ static int alloc_cluster_groups(unsigned int ncpus,
goto no_cluster;
/* Allocate memory based on cluster number. */
- clusters = kzalloc_objs(*clusters, ncluster, GFP_KERNEL);
+ clusters = kzalloc_objs(*clusters, ncluster);
if (!clusters)
goto no_cluster;
- cluster_groups = kzalloc_objs(struct node_groups, ncluster, GFP_KERNEL);
+ cluster_groups = kzalloc_objs(struct node_groups, ncluster);
if (!cluster_groups)
goto fail_cluster_groups;
@@ -432,7 +432,7 @@ static int __group_cpus_evenly(unsigned int startgrp, unsigned int numgrps,
return numgrps;
}
- node_groups = kzalloc_objs(struct node_groups, nr_node_ids, GFP_KERNEL);
+ node_groups = kzalloc_objs(struct node_groups, nr_node_ids);
if (!node_groups)
return -ENOMEM;
@@ -506,7 +506,7 @@ struct cpumask *group_cpus_evenly(unsigned int numgrps, unsigned int *nummasks)
if (!node_to_cpumask)
goto fail_npresmsk;
- masks = kzalloc_objs(*masks, numgrps, GFP_KERNEL);
+ masks = kzalloc_objs(*masks, numgrps);
if (!masks)
goto fail_node_to_cpumask;
@@ -572,7 +572,7 @@ struct cpumask *group_cpus_evenly(unsigned int numgrps, unsigned int *nummasks)
if (numgrps == 0)
return NULL;
- masks = kzalloc_objs(*masks, numgrps, GFP_KERNEL);
+ masks = kzalloc_objs(*masks, numgrps);
if (!masks)
return NULL;
diff --git a/lib/interval_tree_test.c b/lib/interval_tree_test.c
index d1ab3d40a645..16200feacbf3 100644
--- a/lib/interval_tree_test.c
+++ b/lib/interval_tree_test.c
@@ -311,7 +311,7 @@ static inline int span_iteration_check(void) {return 0; }
static int interval_tree_test_init(void)
{
- nodes = kmalloc_objs(struct interval_tree_node, nnodes, GFP_KERNEL);
+ nodes = kmalloc_objs(struct interval_tree_node, nnodes);
if (!nodes)
return -ENOMEM;
diff --git a/lib/iov_iter.c b/lib/iov_iter.c
index a9768fae1f44..0a63c7fba313 100644
--- a/lib/iov_iter.c
+++ b/lib/iov_iter.c
@@ -903,7 +903,7 @@ static int want_pages_array(struct page ***res, size_t size,
count = maxpages;
WARN_ON(!count); // caller should've prevented that
if (!*res) {
- *res = kvmalloc_objs(struct page *, count, GFP_KERNEL);
+ *res = kvmalloc_objs(struct page *, count);
if (!*res)
return 0;
}
@@ -1318,7 +1318,7 @@ struct iovec *iovec_from_user(const struct iovec __user *uvec,
if (nr_segs > UIO_MAXIOV)
return ERR_PTR(-EINVAL);
if (nr_segs > fast_segs) {
- iov = kmalloc_objs(struct iovec, nr_segs, GFP_KERNEL);
+ iov = kmalloc_objs(struct iovec, nr_segs);
if (!iov)
return ERR_PTR(-ENOMEM);
}
diff --git a/lib/kobject.c b/lib/kobject.c
index b178d248617b..cfdb2c3f20a2 100644
--- a/lib/kobject.c
+++ b/lib/kobject.c
@@ -765,7 +765,7 @@ static struct kobject *kobject_create(void)
{
struct kobject *kobj;
- kobj = kzalloc_obj(*kobj, GFP_KERNEL);
+ kobj = kzalloc_obj(*kobj);
if (!kobj)
return NULL;
@@ -962,7 +962,7 @@ static struct kset *kset_create(const char *name,
struct kset *kset;
int retval;
- kset = kzalloc_obj(*kset, GFP_KERNEL);
+ kset = kzalloc_obj(*kset);
if (!kset)
return NULL;
retval = kobject_set_name(&kset->kobj, "%s", name);
diff --git a/lib/kobject_uevent.c b/lib/kobject_uevent.c
index 29a28a3b957f..871941c9830c 100644
--- a/lib/kobject_uevent.c
+++ b/lib/kobject_uevent.c
@@ -124,7 +124,7 @@ static int kobject_action_args(const char *buf, size_t count,
if (!count)
return -EINVAL;
- env = kzalloc_obj(*env, GFP_KERNEL);
+ env = kzalloc_obj(*env);
if (!env)
return -ENOMEM;
@@ -537,7 +537,7 @@ int kobject_uevent_env(struct kobject *kobj, enum kobject_action action,
}
/* environment buffer */
- env = kzalloc_obj(struct kobj_uevent_env, GFP_KERNEL);
+ env = kzalloc_obj(struct kobj_uevent_env);
if (!env)
return -ENOMEM;
@@ -776,7 +776,7 @@ static int uevent_net_init(struct net *net)
.flags = NL_CFG_F_NONROOT_RECV
};
- ue_sk = kzalloc_obj(*ue_sk, GFP_KERNEL);
+ ue_sk = kzalloc_obj(*ue_sk);
if (!ue_sk)
return -ENOMEM;
diff --git a/lib/kunit/attributes.c b/lib/kunit/attributes.c
index 6b7803a16e22..6d7a53af94a9 100644
--- a/lib/kunit/attributes.c
+++ b/lib/kunit/attributes.c
@@ -410,7 +410,7 @@ struct kunit_suite *kunit_filter_attr_tests(const struct kunit_suite *const suit
kunit_suite_for_each_test_case(suite, test_case) { n++; }
- filtered = kzalloc_objs(*filtered, n + 1, GFP_KERNEL);
+ filtered = kzalloc_objs(*filtered, n + 1);
if (!filtered) {
kfree(copy);
return ERR_PTR(-ENOMEM);
diff --git a/lib/kunit/device.c b/lib/kunit/device.c
index 7c18d4ae2de3..85d57ad34045 100644
--- a/lib/kunit/device.c
+++ b/lib/kunit/device.c
@@ -111,7 +111,7 @@ static struct kunit_device *kunit_device_register_internal(struct kunit *test,
struct kunit_device *kunit_dev;
int err = -ENOMEM;
- kunit_dev = kzalloc_obj(*kunit_dev, GFP_KERNEL);
+ kunit_dev = kzalloc_obj(*kunit_dev);
if (!kunit_dev)
return ERR_PTR(err);
diff --git a/lib/kunit/executor.c b/lib/kunit/executor.c
index 27740d975082..04736a804e4c 100644
--- a/lib/kunit/executor.c
+++ b/lib/kunit/executor.c
@@ -131,7 +131,7 @@ kunit_filter_glob_tests(const struct kunit_suite *const suite, const char *test_
if (!copy)
return ERR_PTR(-ENOMEM);
- filtered = kzalloc_objs(*filtered, n + 1, GFP_KERNEL);
+ filtered = kzalloc_objs(*filtered, n + 1);
if (!filtered) {
kfree(copy);
return ERR_PTR(-ENOMEM);
@@ -179,7 +179,7 @@ kunit_filter_suites(const struct kunit_suite_set *suite_set,
const size_t max = suite_set->end - suite_set->start;
- copy = kzalloc_objs(*copy, max, GFP_KERNEL);
+ copy = kzalloc_objs(*copy, max);
if (!copy) { /* won't be able to run anything, return an empty set */
return filtered;
}
diff --git a/lib/kunit/executor_test.c b/lib/kunit/executor_test.c
index f28093153516..4cb119ad8f64 100644
--- a/lib/kunit/executor_test.c
+++ b/lib/kunit/executor_test.c
@@ -272,7 +272,7 @@ static void free_suite_set_at_end(struct kunit *test, const void *to_free)
if (!((struct kunit_suite_set *)to_free)->start)
return;
- free = kzalloc_obj(struct kunit_suite_set, GFP_KERNEL);
+ free = kzalloc_obj(struct kunit_suite_set);
*free = *(struct kunit_suite_set *)to_free;
kunit_add_action(test, free_suite_set, (void *)free);
diff --git a/lib/kunit/kunit-example-test.c b/lib/kunit/kunit-example-test.c
index 34ba0bd74504..0bae7b7ca0b0 100644
--- a/lib/kunit/kunit-example-test.c
+++ b/lib/kunit/kunit-example-test.c
@@ -283,7 +283,7 @@ static void example_slow_test(struct kunit *test)
*/
static int example_resource_init(struct kunit_resource *res, void *context)
{
- int *info = kmalloc_obj(*info, GFP_KERNEL);
+ int *info = kmalloc_obj(*info);
if (!info)
return -ENOMEM;
diff --git a/lib/kunit/kunit-test.c b/lib/kunit/kunit-test.c
index 393b90bd2ec2..126e30879dad 100644
--- a/lib/kunit/kunit-test.c
+++ b/lib/kunit/kunit-test.c
@@ -538,7 +538,7 @@ static void kunit_resource_test_action_ordering(struct kunit *test)
static int kunit_resource_test_init(struct kunit *test)
{
- struct kunit_test_resource_context *ctx = kzalloc_obj(*ctx, GFP_KERNEL);
+ struct kunit_test_resource_context *ctx = kzalloc_obj(*ctx);
KUNIT_ASSERT_NOT_ERR_OR_NULL(test, ctx);
diff --git a/lib/kunit/resource.c b/lib/kunit/resource.c
index 08a16622a2c9..45e55238ccf6 100644
--- a/lib/kunit/resource.c
+++ b/lib/kunit/resource.c
@@ -98,7 +98,7 @@ int kunit_add_action(struct kunit *test, void (*action)(void *), void *ctx)
KUNIT_ASSERT_NOT_NULL_MSG(test, action, "Tried to action a NULL function!");
- action_ctx = kzalloc_obj(*action_ctx, GFP_KERNEL);
+ action_ctx = kzalloc_obj(*action_ctx);
if (!action_ctx)
return -ENOMEM;
diff --git a/lib/kunit/static_stub.c b/lib/kunit/static_stub.c
index 29a91129d7a3..d9dd6377aa38 100644
--- a/lib/kunit/static_stub.c
+++ b/lib/kunit/static_stub.c
@@ -111,7 +111,7 @@ void __kunit_activate_static_stub(struct kunit *test,
/* We got an extra reference from find_resource(), so put it. */
kunit_put_resource(res);
} else {
- ctx = kmalloc_obj(*ctx, GFP_KERNEL);
+ ctx = kmalloc_obj(*ctx);
KUNIT_ASSERT_NOT_ERR_OR_NULL(test, ctx);
ctx->real_fn_addr = real_fn_addr;
ctx->replacement_addr = replacement_addr;
diff --git a/lib/logic_iomem.c b/lib/logic_iomem.c
index d0ba023f79fb..42a571d05670 100644
--- a/lib/logic_iomem.c
+++ b/lib/logic_iomem.c
@@ -48,7 +48,7 @@ int logic_iomem_add_region(struct resource *resource,
if (WARN_ON((resource->flags & IORESOURCE_TYPE_BITS) != IORESOURCE_MEM))
return -EINVAL;
- rreg = kzalloc_obj(*rreg, GFP_KERNEL);
+ rreg = kzalloc_obj(*rreg);
if (!rreg)
return -ENOMEM;
diff --git a/lib/lru_cache.c b/lib/lru_cache.c
index b1ee3b2540c9..82f775044056 100644
--- a/lib/lru_cache.c
+++ b/lib/lru_cache.c
@@ -94,14 +94,14 @@ struct lru_cache *lc_create(const char *name, struct kmem_cache *cache,
if (e_count > LC_MAX_ACTIVE)
return NULL;
- slot = kzalloc_objs(struct hlist_head, e_count, GFP_KERNEL);
+ slot = kzalloc_objs(struct hlist_head, e_count);
if (!slot)
goto out_fail;
- element = kzalloc_objs(struct lc_element *, e_count, GFP_KERNEL);
+ element = kzalloc_objs(struct lc_element *, e_count);
if (!element)
goto out_fail;
- lc = kzalloc_obj(*lc, GFP_KERNEL);
+ lc = kzalloc_obj(*lc);
if (!lc)
goto out_fail;
diff --git a/lib/lwq.c b/lib/lwq.c
index 3a8fc05d9420..c1e11ba6f254 100644
--- a/lib/lwq.c
+++ b/lib/lwq.c
@@ -110,7 +110,7 @@ static int lwq_test(void)
for (i = 0; i < ARRAY_SIZE(threads); i++)
threads[i] = kthread_run(lwq_exercise, &q, "lwq-test-%d", i);
for (i = 0; i < 100; i++) {
- t = kmalloc_obj(*t, GFP_KERNEL);
+ t = kmalloc_obj(*t);
if (!t)
break;
t->i = i;
diff --git a/lib/objagg.c b/lib/objagg.c
index c508b78850c0..e00cb6758c31 100644
--- a/lib/objagg.c
+++ b/lib/objagg.c
@@ -525,7 +525,7 @@ struct objagg *objagg_create(const struct objagg_ops *ops,
!ops->delta_destroy))
return ERR_PTR(-EINVAL);
- objagg = kzalloc_obj(*objagg, GFP_KERNEL);
+ objagg = kzalloc_obj(*objagg);
if (!objagg)
return ERR_PTR(-ENOMEM);
objagg->ops = ops;
@@ -786,11 +786,11 @@ static struct objagg_tmp_graph *objagg_tmp_graph_create(struct objagg *objagg)
struct objagg_obj *objagg_obj;
int i, j;
- graph = kzalloc_obj(*graph, GFP_KERNEL);
+ graph = kzalloc_obj(*graph);
if (!graph)
return NULL;
- graph->nodes = kzalloc_objs(*graph->nodes, nodes_count, GFP_KERNEL);
+ graph->nodes = kzalloc_objs(*graph->nodes, nodes_count);
if (!graph->nodes)
goto err_nodes_alloc;
graph->nodes_count = nodes_count;
@@ -930,7 +930,7 @@ struct objagg_hints *objagg_hints_get(struct objagg *objagg,
struct objagg_hints *objagg_hints;
int err;
- objagg_hints = kzalloc_obj(*objagg_hints, GFP_KERNEL);
+ objagg_hints = kzalloc_obj(*objagg_hints);
if (!objagg_hints)
return ERR_PTR(-ENOMEM);
diff --git a/lib/parman.c b/lib/parman.c
index e93b82b73522..0de691c202ab 100644
--- a/lib/parman.c
+++ b/lib/parman.c
@@ -268,7 +268,7 @@ struct parman *parman_create(const struct parman_ops *ops, void *priv)
{
struct parman *parman;
- parman = kzalloc_obj(*parman, GFP_KERNEL);
+ parman = kzalloc_obj(*parman);
if (!parman)
return NULL;
INIT_LIST_HEAD(&parman->prio_list);
diff --git a/lib/pldmfw/pldmfw.c b/lib/pldmfw/pldmfw.c
index c1222c11f6a8..e4612ea147bb 100644
--- a/lib/pldmfw/pldmfw.c
+++ b/lib/pldmfw/pldmfw.c
@@ -287,7 +287,7 @@ pldm_parse_desc_tlvs(struct pldmfw_priv *data, struct pldmfw_record *record, u8
if (err)
return err;
- desc = kzalloc_obj(*desc, GFP_KERNEL);
+ desc = kzalloc_obj(*desc);
if (!desc)
return -ENOMEM;
@@ -328,7 +328,7 @@ pldm_parse_one_record(struct pldmfw_priv *data,
int i;
/* Make a copy and insert it into the record list */
- record = kzalloc_obj(*record, GFP_KERNEL);
+ record = kzalloc_obj(*record);
if (!record)
return -ENOMEM;
@@ -465,7 +465,7 @@ static int pldm_parse_components(struct pldmfw_priv *data)
if (err)
return err;
- component = kzalloc_obj(*component, GFP_KERNEL);
+ component = kzalloc_obj(*component);
if (!component)
return -ENOMEM;
@@ -848,7 +848,7 @@ int pldmfw_flash_image(struct pldmfw *context, const struct firmware *fw)
struct pldmfw_priv *data;
int err;
- data = kzalloc_obj(*data, GFP_KERNEL);
+ data = kzalloc_obj(*data);
if (!data)
return -ENOMEM;
diff --git a/lib/rbtree_test.c b/lib/rbtree_test.c
index 862318e99c9a..768c5e6453f3 100644
--- a/lib/rbtree_test.c
+++ b/lib/rbtree_test.c
@@ -399,7 +399,7 @@ static int augmented_check(void)
static int __init rbtree_test_init(void)
{
- nodes = kmalloc_objs(*nodes, nnodes, GFP_KERNEL);
+ nodes = kmalloc_objs(*nodes, nnodes);
if (!nodes)
return -ENOMEM;
diff --git a/lib/reed_solomon/test_rslib.c b/lib/reed_solomon/test_rslib.c
index 3c17b04a0a0a..42b856e6c8a8 100644
--- a/lib/reed_solomon/test_rslib.c
+++ b/lib/reed_solomon/test_rslib.c
@@ -111,7 +111,7 @@ static struct wspace *alloc_ws(struct rs_codec *rs)
struct wspace *ws;
int nn = rs->nn;
- ws = kzalloc_obj(*ws, GFP_KERNEL);
+ ws = kzalloc_obj(*ws);
if (!ws)
return NULL;
@@ -124,7 +124,7 @@ static struct wspace *alloc_ws(struct rs_codec *rs)
ws->s = ws->r + nn;
ws->corr = ws->s + nroots;
- ws->errlocs = kmalloc_objs(int, nn + nroots, GFP_KERNEL);
+ ws->errlocs = kmalloc_objs(int, nn + nroots);
if (!ws->errlocs)
goto err;
diff --git a/lib/stackdepot.c b/lib/stackdepot.c
index b58f01c2ca7e..dd2717ff94bf 100644
--- a/lib/stackdepot.c
+++ b/lib/stackdepot.c
@@ -260,7 +260,7 @@ int stack_depot_init(void)
entries = 1UL << STACK_BUCKET_NUMBER_ORDER_MAX;
pr_info("allocating hash table of %lu entries via kvcalloc\n", entries);
- stack_table = kvzalloc_objs(struct list_head, entries, GFP_KERNEL);
+ stack_table = kvzalloc_objs(struct list_head, entries);
if (!stack_table) {
pr_err("hash table allocation failed, disabling\n");
stack_depot_disabled = true;
diff --git a/lib/string_helpers.c b/lib/string_helpers.c
index 72a15e7132b9..169eaf583494 100644
--- a/lib/string_helpers.c
+++ b/lib/string_helpers.c
@@ -147,7 +147,7 @@ int parse_int_array(const char *buf, size_t count, int **array)
if (!nints)
return -ENOENT;
- ints = kzalloc_objs(*ints, nints + 1, GFP_KERNEL);
+ ints = kzalloc_objs(*ints, nints + 1);
if (!ints)
return -ENOMEM;
diff --git a/lib/test_bpf.c b/lib/test_bpf.c
index e4cb339f322e..f5b08273c4f3 100644
--- a/lib/test_bpf.c
+++ b/lib/test_bpf.c
@@ -94,7 +94,7 @@ static int bpf_fill_maxinsns1(struct bpf_test *self)
__u32 k = ~0;
int i;
- insn = kmalloc_objs(*insn, len, GFP_KERNEL);
+ insn = kmalloc_objs(*insn, len);
if (!insn)
return -ENOMEM;
@@ -113,7 +113,7 @@ static int bpf_fill_maxinsns2(struct bpf_test *self)
struct sock_filter *insn;
int i;
- insn = kmalloc_objs(*insn, len, GFP_KERNEL);
+ insn = kmalloc_objs(*insn, len);
if (!insn)
return -ENOMEM;
@@ -133,7 +133,7 @@ static int bpf_fill_maxinsns3(struct bpf_test *self)
struct rnd_state rnd;
int i;
- insn = kmalloc_objs(*insn, len, GFP_KERNEL);
+ insn = kmalloc_objs(*insn, len);
if (!insn)
return -ENOMEM;
@@ -159,7 +159,7 @@ static int bpf_fill_maxinsns4(struct bpf_test *self)
struct sock_filter *insn;
int i;
- insn = kmalloc_objs(*insn, len, GFP_KERNEL);
+ insn = kmalloc_objs(*insn, len);
if (!insn)
return -ENOMEM;
@@ -178,7 +178,7 @@ static int bpf_fill_maxinsns5(struct bpf_test *self)
struct sock_filter *insn;
int i;
- insn = kmalloc_objs(*insn, len, GFP_KERNEL);
+ insn = kmalloc_objs(*insn, len);
if (!insn)
return -ENOMEM;
@@ -201,7 +201,7 @@ static int bpf_fill_maxinsns6(struct bpf_test *self)
struct sock_filter *insn;
int i;
- insn = kmalloc_objs(*insn, len, GFP_KERNEL);
+ insn = kmalloc_objs(*insn, len);
if (!insn)
return -ENOMEM;
@@ -223,7 +223,7 @@ static int bpf_fill_maxinsns7(struct bpf_test *self)
struct sock_filter *insn;
int i;
- insn = kmalloc_objs(*insn, len, GFP_KERNEL);
+ insn = kmalloc_objs(*insn, len);
if (!insn)
return -ENOMEM;
@@ -249,7 +249,7 @@ static int bpf_fill_maxinsns8(struct bpf_test *self)
struct sock_filter *insn;
int i, jmp_off = len - 3;
- insn = kmalloc_objs(*insn, len, GFP_KERNEL);
+ insn = kmalloc_objs(*insn, len);
if (!insn)
return -ENOMEM;
@@ -272,7 +272,7 @@ static int bpf_fill_maxinsns9(struct bpf_test *self)
struct bpf_insn *insn;
int i;
- insn = kmalloc_objs(*insn, len, GFP_KERNEL);
+ insn = kmalloc_objs(*insn, len);
if (!insn)
return -ENOMEM;
@@ -298,7 +298,7 @@ static int bpf_fill_maxinsns10(struct bpf_test *self)
struct bpf_insn *insn;
int i;
- insn = kmalloc_objs(*insn, len, GFP_KERNEL);
+ insn = kmalloc_objs(*insn, len);
if (!insn)
return -ENOMEM;
@@ -324,7 +324,7 @@ static int __bpf_fill_ja(struct bpf_test *self, unsigned int len,
unsigned int rlen;
int i, j;
- insn = kmalloc_objs(*insn, len, GFP_KERNEL);
+ insn = kmalloc_objs(*insn, len);
if (!insn)
return -ENOMEM;
@@ -358,7 +358,7 @@ static int bpf_fill_maxinsns12(struct bpf_test *self)
struct sock_filter *insn;
int i = 0;
- insn = kmalloc_objs(*insn, len, GFP_KERNEL);
+ insn = kmalloc_objs(*insn, len);
if (!insn)
return -ENOMEM;
@@ -381,7 +381,7 @@ static int bpf_fill_maxinsns13(struct bpf_test *self)
struct sock_filter *insn;
int i = 0;
- insn = kmalloc_objs(*insn, len, GFP_KERNEL);
+ insn = kmalloc_objs(*insn, len);
if (!insn)
return -ENOMEM;
@@ -410,7 +410,7 @@ static int bpf_fill_ld_abs_get_processor_id(struct bpf_test *self)
struct sock_filter *insn;
int i;
- insn = kmalloc_objs(*insn, len, GFP_KERNEL);
+ insn = kmalloc_objs(*insn, len);
if (!insn)
return -ENOMEM;
@@ -434,7 +434,7 @@ static int __bpf_fill_stxdw(struct bpf_test *self, int size)
struct bpf_insn *insn;
int i;
- insn = kmalloc_objs(*insn, len, GFP_KERNEL);
+ insn = kmalloc_objs(*insn, len);
if (!insn)
return -ENOMEM;
@@ -484,7 +484,7 @@ static int __bpf_fill_max_jmp(struct bpf_test *self, int jmp, int imm, bool alu3
int len = S16_MAX + 5;
int i;
- insns = kmalloc_objs(*insns, len, GFP_KERNEL);
+ insns = kmalloc_objs(*insns, len);
if (!insns)
return -ENOMEM;
@@ -626,7 +626,7 @@ static int __bpf_fill_alu_shift(struct bpf_test *self, u8 op,
int imm, k;
int i = 0;
- insn = kmalloc_objs(*insn, len, GFP_KERNEL);
+ insn = kmalloc_objs(*insn, len);
if (!insn)
return -ENOMEM;
@@ -759,7 +759,7 @@ static int __bpf_fill_alu_shift_same_reg(struct bpf_test *self, u8 op,
int i = 0;
u64 val;
- insn = kmalloc_objs(*insn, len, GFP_KERNEL);
+ insn = kmalloc_objs(*insn, len);
if (!insn)
return -ENOMEM;
@@ -1244,7 +1244,7 @@ static int __bpf_fill_alu_imm_regs(struct bpf_test *self, u8 op, bool alu32)
u32 imm;
int rd;
- insns = kmalloc_objs(*insns, len, GFP_KERNEL);
+ insns = kmalloc_objs(*insns, len);
if (!insns)
return -ENOMEM;
@@ -1426,7 +1426,7 @@ static int __bpf_fill_alu_reg_pairs(struct bpf_test *self, u8 op, bool alu32)
int rd, rs;
int i = 0;
- insns = kmalloc_objs(*insns, len, GFP_KERNEL);
+ insns = kmalloc_objs(*insns, len);
if (!insns)
return -ENOMEM;
@@ -1917,7 +1917,7 @@ static int __bpf_fill_atomic_reg_pairs(struct bpf_test *self, u8 width, u8 op)
u64 mem, upd, res;
int rd, rs, i = 0;
- insn = kmalloc_objs(*insn, len, GFP_KERNEL);
+ insn = kmalloc_objs(*insn, len);
if (!insn)
return -ENOMEM;
@@ -2163,7 +2163,7 @@ static int bpf_fill_ld_imm64_magn(struct bpf_test *self)
int bit, adj, sign;
int i = 0;
- insn = kmalloc_objs(*insn, len, GFP_KERNEL);
+ insn = kmalloc_objs(*insn, len);
if (!insn)
return -ENOMEM;
@@ -2217,7 +2217,7 @@ static int __bpf_fill_ld_imm64_bytes(struct bpf_test *self,
u32 rand = 1;
int i = 0;
- insn = kmalloc_objs(*insn, len, GFP_KERNEL);
+ insn = kmalloc_objs(*insn, len);
if (!insn)
return -ENOMEM;
@@ -2724,7 +2724,7 @@ static int __bpf_fill_staggered_jumps(struct bpf_test *self,
struct bpf_insn *insns;
int off, ind;
- insns = kmalloc_objs(*insns, len, GFP_KERNEL);
+ insns = kmalloc_objs(*insns, len);
if (!insns)
return -ENOMEM;
diff --git a/lib/test_debug_virtual.c b/lib/test_debug_virtual.c
index 288d5510406c..518ee8d213cd 100644
--- a/lib/test_debug_virtual.c
+++ b/lib/test_debug_virtual.c
@@ -29,7 +29,7 @@ static int __init test_debug_virtual_init(void)
pr_info("PA: %pa for VA: 0x%lx\n", &pa, (unsigned long)va);
- foo = kzalloc_obj(*foo, GFP_KERNEL);
+ foo = kzalloc_obj(*foo);
if (!foo)
return -ENOMEM;
diff --git a/lib/test_firmware.c b/lib/test_firmware.c
index 1a933a874148..b471d720879a 100644
--- a/lib/test_firmware.c
+++ b/lib/test_firmware.c
@@ -1309,7 +1309,7 @@ static ssize_t upload_register_store(struct device *dev,
goto free_name;
}
- tst = kzalloc_obj(*tst, GFP_KERNEL);
+ tst = kzalloc_obj(*tst);
if (!tst) {
ret = -ENOMEM;
goto free_name;
@@ -1526,7 +1526,7 @@ static int __init test_firmware_init(void)
{
int rc;
- test_fw_config = kzalloc_obj(struct test_config, GFP_KERNEL);
+ test_fw_config = kzalloc_obj(struct test_config);
if (!test_fw_config)
return -ENOMEM;
diff --git a/lib/test_hmm.c b/lib/test_hmm.c
index 0f9eb1c16ef0..0964d53365e6 100644
--- a/lib/test_hmm.c
+++ b/lib/test_hmm.c
@@ -166,7 +166,7 @@ static int dmirror_fops_open(struct inode *inode, struct file *filp)
int ret;
/* Mirror this process address space */
- dmirror = kzalloc_obj(*dmirror, GFP_KERNEL);
+ dmirror = kzalloc_obj(*dmirror);
if (dmirror == NULL)
return -ENOMEM;
@@ -504,7 +504,7 @@ static int dmirror_allocate_chunk(struct dmirror_device *mdevice,
void *ptr;
int ret = -ENOMEM;
- devmem = kzalloc_obj(*devmem, GFP_KERNEL);
+ devmem = kzalloc_obj(*devmem);
if (!devmem)
return ret;
diff --git a/lib/test_kho.c b/lib/test_kho.c
index 601f2323ef7e..7ef9e4061869 100644
--- a/lib/test_kho.c
+++ b/lib/test_kho.c
@@ -211,7 +211,7 @@ static int kho_test_save(void)
max_mem = PAGE_ALIGN(max_mem);
max_nr = max_mem >> PAGE_SHIFT;
- folios = kvmalloc_objs(*state->folios, max_nr, GFP_KERNEL);
+ folios = kvmalloc_objs(*state->folios, max_nr);
if (!folios)
return -ENOMEM;
state->folios = folios;
diff --git a/lib/test_memcat_p.c b/lib/test_memcat_p.c
index 0f0a15fea6e2..62f1633b30f8 100644
--- a/lib/test_memcat_p.c
+++ b/lib/test_memcat_p.c
@@ -24,20 +24,20 @@ static int __init test_memcat_p_init(void)
struct test_struct **in0, **in1, **out, **p;
int err = -ENOMEM, i, r, total = 0;
- in0 = kzalloc_objs(*in0, INPUT_MAX, GFP_KERNEL);
+ in0 = kzalloc_objs(*in0, INPUT_MAX);
if (!in0)
return err;
- in1 = kzalloc_objs(*in1, INPUT_MAX, GFP_KERNEL);
+ in1 = kzalloc_objs(*in1, INPUT_MAX);
if (!in1)
goto err_free_in0;
for (i = 0, r = 1; i < INPUT_MAX - 1; i++) {
- in0[i] = kmalloc_obj(**in0, GFP_KERNEL);
+ in0[i] = kmalloc_obj(**in0);
if (!in0[i])
goto err_free_elements;
- in1[i] = kmalloc_obj(**in1, GFP_KERNEL);
+ in1[i] = kmalloc_obj(**in1);
if (!in1[i]) {
kfree(in0[i]);
goto err_free_elements;
diff --git a/lib/test_objagg.c b/lib/test_objagg.c
index a391f0b998c9..f21e3ae01395 100644
--- a/lib/test_objagg.c
+++ b/lib/test_objagg.c
@@ -107,7 +107,7 @@ static void *delta_create(void *priv, void *parent_obj, void *obj)
if (!delta_check(priv, parent_obj, obj))
return ERR_PTR(-EINVAL);
- delta = kzalloc_obj(*delta, GFP_KERNEL);
+ delta = kzalloc_obj(*delta);
if (!delta)
return ERR_PTR(-ENOMEM);
delta->key_id_diff = diff;
@@ -130,7 +130,7 @@ static void *root_create(void *priv, void *obj, unsigned int id)
struct tokey *key = obj;
struct root *root;
- root = kzalloc_obj(*root, GFP_KERNEL);
+ root = kzalloc_obj(*root);
if (!root)
return ERR_PTR(-ENOMEM);
memcpy(&root->key, key, sizeof(root->key));
diff --git a/lib/test_parman.c b/lib/test_parman.c
index ae5a0a2f63c3..28f0951189ab 100644
--- a/lib/test_parman.c
+++ b/lib/test_parman.c
@@ -219,7 +219,7 @@ static struct test_parman *test_parman_create(const struct parman_ops *ops)
struct test_parman *test_parman;
int err;
- test_parman = kzalloc_obj(*test_parman, GFP_KERNEL);
+ test_parman = kzalloc_obj(*test_parman);
if (!test_parman)
return ERR_PTR(-ENOMEM);
err = test_parman_resize(test_parman, TEST_PARMAN_BASE_COUNT);
diff --git a/lib/test_rhashtable.c b/lib/test_rhashtable.c
index 12de6388cd9b..0b33559a910b 100644
--- a/lib/test_rhashtable.c
+++ b/lib/test_rhashtable.c
@@ -524,7 +524,7 @@ static int __init test_insert_dup(struct test_obj_rhl *rhl_test_objects,
const char *key;
int err = 0;
- rhlt = kmalloc_obj(*rhlt, GFP_KERNEL);
+ rhlt = kmalloc_obj(*rhlt);
if (WARN_ON(!rhlt))
return -EINVAL;
diff --git a/lib/test_vmalloc.c b/lib/test_vmalloc.c
index 5ed369a92c75..876c72c18a0c 100644
--- a/lib/test_vmalloc.c
+++ b/lib/test_vmalloc.c
@@ -396,7 +396,7 @@ vm_map_ram_test(void)
int i;
map_nr_pages = nr_pages > 0 ? nr_pages:1;
- pages = kzalloc_objs(struct page *, map_nr_pages, GFP_KERNEL);
+ pages = kzalloc_objs(struct page *, map_nr_pages);
if (!pages)
return -1;
@@ -542,7 +542,7 @@ init_test_configuration(void)
nr_threads = clamp(nr_threads, 1, (int) USHRT_MAX);
/* Allocate the space for test instances. */
- tdriver = kvzalloc_objs(*tdriver, nr_threads, GFP_KERNEL);
+ tdriver = kvzalloc_objs(*tdriver, nr_threads);
if (tdriver == NULL)
return -1;
diff --git a/lib/tests/kunit_iov_iter.c b/lib/tests/kunit_iov_iter.c
index 500565631cbd..bb847e5010eb 100644
--- a/lib/tests/kunit_iov_iter.c
+++ b/lib/tests/kunit_iov_iter.c
@@ -387,7 +387,7 @@ static void __init iov_kunit_load_folioq(struct kunit *test,
for (i = 0; i < npages; i++) {
if (folioq_full(p)) {
- p->next = kzalloc_obj(struct folio_queue, GFP_KERNEL);
+ p->next = kzalloc_obj(struct folio_queue);
KUNIT_ASSERT_NOT_ERR_OR_NULL(test, p->next);
folioq_init(p->next, 0);
p->next->prev = p;
@@ -403,7 +403,7 @@ static struct folio_queue *iov_kunit_create_folioq(struct kunit *test)
{
struct folio_queue *folioq;
- folioq = kzalloc_obj(struct folio_queue, GFP_KERNEL);
+ folioq = kzalloc_obj(struct folio_queue);
KUNIT_ASSERT_NOT_ERR_OR_NULL(test, folioq);
kunit_add_action_or_reset(test, iov_kunit_destroy_folioq, folioq);
folioq_init(folioq, 0);
@@ -565,7 +565,7 @@ static struct xarray *iov_kunit_create_xarray(struct kunit *test)
{
struct xarray *xarray;
- xarray = kzalloc_obj(struct xarray, GFP_KERNEL);
+ xarray = kzalloc_obj(struct xarray);
xa_init(xarray);
KUNIT_ASSERT_NOT_ERR_OR_NULL(test, xarray);
kunit_add_action_or_reset(test, iov_kunit_destroy_xarray, xarray);
diff --git a/lib/xz/xz_dec_bcj.c b/lib/xz/xz_dec_bcj.c
index 6e0fa5bef841..cc49a300a5b2 100644
--- a/lib/xz/xz_dec_bcj.c
+++ b/lib/xz/xz_dec_bcj.c
@@ -591,7 +591,7 @@ enum xz_ret xz_dec_bcj_run(struct xz_dec_bcj *s, struct xz_dec_lzma2 *lzma2,
struct xz_dec_bcj *xz_dec_bcj_create(bool single_call)
{
- struct xz_dec_bcj *s = kmalloc_obj(*s, GFP_KERNEL);
+ struct xz_dec_bcj *s = kmalloc_obj(*s);
if (s != NULL)
s->single_call = single_call;
diff --git a/lib/xz/xz_dec_lzma2.c b/lib/xz/xz_dec_lzma2.c
index 02fccb7795b5..4b783ac94e71 100644
--- a/lib/xz/xz_dec_lzma2.c
+++ b/lib/xz/xz_dec_lzma2.c
@@ -1138,7 +1138,7 @@ enum xz_ret xz_dec_lzma2_run(struct xz_dec_lzma2 *s, struct xz_buf *b)
struct xz_dec_lzma2 *xz_dec_lzma2_create(enum xz_mode mode, uint32_t dict_max)
{
- struct xz_dec_lzma2 *s = kmalloc_obj(*s, GFP_KERNEL);
+ struct xz_dec_lzma2 *s = kmalloc_obj(*s);
if (s == NULL)
return NULL;
@@ -1296,7 +1296,7 @@ struct xz_dec_microlzma *xz_dec_microlzma_alloc(enum xz_mode mode,
if (dict_size < 4096 || dict_size > (3U << 30))
return NULL;
- s = kmalloc_obj(*s, GFP_KERNEL);
+ s = kmalloc_obj(*s);
if (s == NULL)
return NULL;
diff --git a/lib/xz/xz_dec_stream.c b/lib/xz/xz_dec_stream.c
index 0844eb6e990c..59bfd54ffee7 100644
--- a/lib/xz/xz_dec_stream.c
+++ b/lib/xz/xz_dec_stream.c
@@ -784,7 +784,7 @@ enum xz_ret xz_dec_run(struct xz_dec *s, struct xz_buf *b)
struct xz_dec *xz_dec_init(enum xz_mode mode, uint32_t dict_max)
{
- struct xz_dec *s = kmalloc_obj(*s, GFP_KERNEL);
+ struct xz_dec *s = kmalloc_obj(*s);
if (s == NULL)
return NULL;
diff --git a/lib/zlib_inflate/infutil.c b/lib/zlib_inflate/infutil.c
index d5f9a77e41c6..12169aacd3f1 100644
--- a/lib/zlib_inflate/infutil.c
+++ b/lib/zlib_inflate/infutil.c
@@ -14,7 +14,7 @@ int zlib_inflate_blob(void *gunzip_buf, unsigned int sz,
int rc;
rc = -ENOMEM;
- strm = kmalloc_obj(*strm, GFP_KERNEL);
+ strm = kmalloc_obj(*strm);
if (strm == NULL)
goto gunzip_nomem1;
strm->workspace = kmalloc(zlib_inflate_workspacesize(), GFP_KERNEL);
diff --git a/mm/cma_debug.c b/mm/cma_debug.c
index cb94f897169d..5ae38f5abbcc 100644
--- a/mm/cma_debug.c
+++ b/mm/cma_debug.c
@@ -131,7 +131,7 @@ static int cma_alloc_mem(struct cma *cma, int count)
struct cma_mem *mem;
struct page *p;
- mem = kzalloc_obj(*mem, GFP_KERNEL);
+ mem = kzalloc_obj(*mem);
if (!mem)
return -ENOMEM;
diff --git a/mm/cma_sysfs.c b/mm/cma_sysfs.c
index ee76baaf843c..f52b696bc46d 100644
--- a/mm/cma_sysfs.c
+++ b/mm/cma_sysfs.c
@@ -117,7 +117,7 @@ static int __init cma_sysfs_init(void)
return -ENOMEM;
for (i = 0; i < cma_area_count; i++) {
- cma_kobj = kzalloc_obj(*cma_kobj, GFP_KERNEL);
+ cma_kobj = kzalloc_obj(*cma_kobj);
if (!cma_kobj) {
err = -ENOMEM;
goto out;
diff --git a/mm/damon/core.c b/mm/damon/core.c
index 2d73d7effa3b..01eba1a547d4 100644
--- a/mm/damon/core.c
+++ b/mm/damon/core.c
@@ -273,7 +273,7 @@ struct damos_filter *damos_new_filter(enum damos_filter_type type,
{
struct damos_filter *filter;
- filter = kmalloc_obj(*filter, GFP_KERNEL);
+ filter = kmalloc_obj(*filter);
if (!filter)
return NULL;
filter->type = type;
@@ -332,7 +332,7 @@ struct damos_quota_goal *damos_new_quota_goal(
{
struct damos_quota_goal *goal;
- goal = kmalloc_obj(*goal, GFP_KERNEL);
+ goal = kmalloc_obj(*goal);
if (!goal)
return NULL;
goal->metric = metric;
@@ -385,7 +385,7 @@ struct damos *damon_new_scheme(struct damos_access_pattern *pattern,
{
struct damos *scheme;
- scheme = kmalloc_obj(*scheme, GFP_KERNEL);
+ scheme = kmalloc_obj(*scheme);
if (!scheme)
return NULL;
scheme->pattern = *pattern;
@@ -473,7 +473,7 @@ struct damon_target *damon_new_target(void)
{
struct damon_target *t;
- t = kmalloc_obj(*t, GFP_KERNEL);
+ t = kmalloc_obj(*t);
if (!t)
return NULL;
@@ -529,7 +529,7 @@ struct damon_ctx *damon_new_ctx(void)
{
struct damon_ctx *ctx;
- ctx = kzalloc_obj(*ctx, GFP_KERNEL);
+ ctx = kzalloc_obj(*ctx);
if (!ctx)
return NULL;
diff --git a/mm/damon/sysfs-common.c b/mm/damon/sysfs-common.c
index 2149008135ef..83e24a9b5a0d 100644
--- a/mm/damon/sysfs-common.c
+++ b/mm/damon/sysfs-common.c
@@ -19,7 +19,7 @@ struct damon_sysfs_ul_range *damon_sysfs_ul_range_alloc(
unsigned long min,
unsigned long max)
{
- struct damon_sysfs_ul_range *range = kmalloc_obj(*range, GFP_KERNEL);
+ struct damon_sysfs_ul_range *range = kmalloc_obj(*range);
if (!range)
return NULL;
diff --git a/mm/damon/sysfs-schemes.c b/mm/damon/sysfs-schemes.c
index ba700da545af..5a12d1103d33 100644
--- a/mm/damon/sysfs-schemes.c
+++ b/mm/damon/sysfs-schemes.c
@@ -210,7 +210,7 @@ struct damon_sysfs_stats {
static struct damon_sysfs_stats *damon_sysfs_stats_alloc(void)
{
- return kzalloc_obj(struct damon_sysfs_stats, GFP_KERNEL);
+ return kzalloc_obj(struct damon_sysfs_stats);
}
static ssize_t nr_tried_show(struct kobject *kobj, struct kobj_attribute *attr,
@@ -376,7 +376,7 @@ static struct damon_sysfs_scheme_filter *damon_sysfs_scheme_filter_alloc(
{
struct damon_sysfs_scheme_filter *filter;
- filter = kzalloc_obj(struct damon_sysfs_scheme_filter, GFP_KERNEL);
+ filter = kzalloc_obj(struct damon_sysfs_scheme_filter);
if (filter)
filter->handle_layer = layer;
return filter;
@@ -724,7 +724,7 @@ damon_sysfs_scheme_filters_alloc(enum damos_sysfs_filter_handle_layer layer)
{
struct damon_sysfs_scheme_filters *filters;
- filters = kzalloc_obj(struct damon_sysfs_scheme_filters, GFP_KERNEL);
+ filters = kzalloc_obj(struct damon_sysfs_scheme_filters);
if (filters)
filters->handle_layer = layer;
return filters;
@@ -1045,7 +1045,7 @@ struct damos_sysfs_quota_goal {
static struct damos_sysfs_quota_goal *damos_sysfs_quota_goal_alloc(void)
{
- return kzalloc_obj(struct damos_sysfs_quota_goal, GFP_KERNEL);
+ return kzalloc_obj(struct damos_sysfs_quota_goal);
}
struct damos_sysfs_qgoal_metric_name {
@@ -1263,7 +1263,7 @@ struct damos_sysfs_quota_goals {
static struct damos_sysfs_quota_goals *damos_sysfs_quota_goals_alloc(void)
{
- return kzalloc_obj(struct damos_sysfs_quota_goals, GFP_KERNEL);
+ return kzalloc_obj(struct damos_sysfs_quota_goals);
}
static void damos_sysfs_quota_goals_rm_dirs(
@@ -1383,7 +1383,7 @@ struct damon_sysfs_weights {
static struct damon_sysfs_weights *damon_sysfs_weights_alloc(unsigned int sz,
unsigned int nr_accesses, unsigned int age)
{
- struct damon_sysfs_weights *weights = kmalloc_obj(*weights, GFP_KERNEL);
+ struct damon_sysfs_weights *weights = kmalloc_obj(*weights);
if (!weights)
return NULL;
@@ -1495,7 +1495,7 @@ struct damon_sysfs_quotas {
static struct damon_sysfs_quotas *damon_sysfs_quotas_alloc(void)
{
- return kzalloc_obj(struct damon_sysfs_quotas, GFP_KERNEL);
+ return kzalloc_obj(struct damon_sysfs_quotas);
}
static int damon_sysfs_quotas_add_dirs(struct damon_sysfs_quotas *quotas)
@@ -1756,7 +1756,7 @@ struct damos_sysfs_dest {
static struct damos_sysfs_dest *damos_sysfs_dest_alloc(void)
{
- return kzalloc_obj(struct damos_sysfs_dest, GFP_KERNEL);
+ return kzalloc_obj(struct damos_sysfs_dest);
}
static ssize_t id_show(
@@ -1836,7 +1836,7 @@ struct damos_sysfs_dests {
static struct damos_sysfs_dests *
damos_sysfs_dests_alloc(void)
{
- return kzalloc_obj(struct damos_sysfs_dests, GFP_KERNEL);
+ return kzalloc_obj(struct damos_sysfs_dests);
}
static void damos_sysfs_dests_rm_dirs(
@@ -2013,7 +2013,7 @@ static struct damos_sysfs_action_name damos_sysfs_action_names[] = {
static struct damon_sysfs_scheme *damon_sysfs_scheme_alloc(
enum damos_action action, unsigned long apply_interval_us)
{
- struct damon_sysfs_scheme *scheme = kmalloc_obj(*scheme, GFP_KERNEL);
+ struct damon_sysfs_scheme *scheme = kmalloc_obj(*scheme);
if (!scheme)
return NULL;
@@ -2374,7 +2374,7 @@ static const struct kobj_type damon_sysfs_scheme_ktype = {
struct damon_sysfs_schemes *damon_sysfs_schemes_alloc(void)
{
- return kzalloc_obj(struct damon_sysfs_schemes, GFP_KERNEL);
+ return kzalloc_obj(struct damon_sysfs_schemes);
}
void damon_sysfs_schemes_rm_dirs(struct damon_sysfs_schemes *schemes)
diff --git a/mm/damon/sysfs.c b/mm/damon/sysfs.c
index 9561ad8b7852..f2e7551eea3f 100644
--- a/mm/damon/sysfs.c
+++ b/mm/damon/sysfs.c
@@ -22,7 +22,7 @@ struct damon_sysfs_region {
static struct damon_sysfs_region *damon_sysfs_region_alloc(void)
{
- return kzalloc_obj(struct damon_sysfs_region, GFP_KERNEL);
+ return kzalloc_obj(struct damon_sysfs_region);
}
static ssize_t start_show(struct kobject *kobj, struct kobj_attribute *attr,
@@ -99,7 +99,7 @@ struct damon_sysfs_regions {
static struct damon_sysfs_regions *damon_sysfs_regions_alloc(void)
{
- return kzalloc_obj(struct damon_sysfs_regions, GFP_KERNEL);
+ return kzalloc_obj(struct damon_sysfs_regions);
}
static void damon_sysfs_regions_rm_dirs(struct damon_sysfs_regions *regions)
@@ -217,7 +217,7 @@ struct damon_sysfs_target {
static struct damon_sysfs_target *damon_sysfs_target_alloc(void)
{
- return kzalloc_obj(struct damon_sysfs_target, GFP_KERNEL);
+ return kzalloc_obj(struct damon_sysfs_target);
}
static int damon_sysfs_target_add_dirs(struct damon_sysfs_target *target)
@@ -323,7 +323,7 @@ struct damon_sysfs_targets {
static struct damon_sysfs_targets *damon_sysfs_targets_alloc(void)
{
- return kzalloc_obj(struct damon_sysfs_targets, GFP_KERNEL);
+ return kzalloc_obj(struct damon_sysfs_targets);
}
static void damon_sysfs_targets_rm_dirs(struct damon_sysfs_targets *targets)
@@ -452,7 +452,7 @@ static struct damon_sysfs_intervals_goal *damon_sysfs_intervals_goal_alloc(
unsigned long access_bp, unsigned long aggrs,
unsigned long min_sample_us, unsigned long max_sample_us)
{
- struct damon_sysfs_intervals_goal *goal = kmalloc_obj(*goal, GFP_KERNEL);
+ struct damon_sysfs_intervals_goal *goal = kmalloc_obj(*goal);
if (!goal)
return NULL;
@@ -760,7 +760,7 @@ struct damon_sysfs_attrs {
static struct damon_sysfs_attrs *damon_sysfs_attrs_alloc(void)
{
- struct damon_sysfs_attrs *attrs = kmalloc_obj(*attrs, GFP_KERNEL);
+ struct damon_sysfs_attrs *attrs = kmalloc_obj(*attrs);
if (!attrs)
return NULL;
@@ -872,7 +872,7 @@ struct damon_sysfs_context {
static struct damon_sysfs_context *damon_sysfs_context_alloc(
enum damon_ops_id ops_id)
{
- struct damon_sysfs_context *context = kmalloc_obj(*context, GFP_KERNEL);
+ struct damon_sysfs_context *context = kmalloc_obj(*context);
if (!context)
return NULL;
@@ -1094,7 +1094,7 @@ struct damon_sysfs_contexts {
static struct damon_sysfs_contexts *damon_sysfs_contexts_alloc(void)
{
- return kzalloc_obj(struct damon_sysfs_contexts, GFP_KERNEL);
+ return kzalloc_obj(struct damon_sysfs_contexts);
}
static void damon_sysfs_contexts_rm_dirs(struct damon_sysfs_contexts *contexts)
@@ -1221,7 +1221,7 @@ struct damon_sysfs_kdamond {
static struct damon_sysfs_kdamond *damon_sysfs_kdamond_alloc(void)
{
- return kzalloc_obj(struct damon_sysfs_kdamond, GFP_KERNEL);
+ return kzalloc_obj(struct damon_sysfs_kdamond);
}
static int damon_sysfs_kdamond_add_dirs(struct damon_sysfs_kdamond *kdamond)
@@ -1642,7 +1642,7 @@ static int damon_sysfs_turn_damon_on(struct damon_sysfs_kdamond *kdamond)
damon_destroy_ctx(kdamond->damon_ctx);
kdamond->damon_ctx = NULL;
- repeat_call_control = kmalloc_obj(*repeat_call_control, GFP_KERNEL);
+ repeat_call_control = kmalloc_obj(*repeat_call_control);
if (!repeat_call_control)
return -ENOMEM;
@@ -1895,7 +1895,7 @@ struct damon_sysfs_kdamonds {
static struct damon_sysfs_kdamonds *damon_sysfs_kdamonds_alloc(void)
{
- return kzalloc_obj(struct damon_sysfs_kdamonds, GFP_KERNEL);
+ return kzalloc_obj(struct damon_sysfs_kdamonds);
}
static void damon_sysfs_kdamonds_rm_dirs(struct damon_sysfs_kdamonds *kdamonds)
@@ -2036,7 +2036,7 @@ struct damon_sysfs_ui_dir {
static struct damon_sysfs_ui_dir *damon_sysfs_ui_dir_alloc(void)
{
- return kzalloc_obj(struct damon_sysfs_ui_dir, GFP_KERNEL);
+ return kzalloc_obj(struct damon_sysfs_ui_dir);
}
static int damon_sysfs_ui_dir_add_dirs(struct damon_sysfs_ui_dir *ui_dir)
diff --git a/mm/dmapool_test.c b/mm/dmapool_test.c
index 454952ac9f0e..d829d99aa194 100644
--- a/mm/dmapool_test.c
+++ b/mm/dmapool_test.c
@@ -67,7 +67,7 @@ static int dmapool_test_block(const struct dmapool_parms *parms)
struct dma_pool_pair *p;
int i, ret;
- p = kzalloc_objs(*p, blocks, GFP_KERNEL);
+ p = kzalloc_objs(*p, blocks);
if (!p)
return -ENOMEM;
diff --git a/mm/huge_memory.c b/mm/huge_memory.c
index 809c99ee81b9..d4ca8cfd7f9d 100644
--- a/mm/huge_memory.c
+++ b/mm/huge_memory.c
@@ -718,7 +718,7 @@ static struct thpsize *thpsize_create(int order, struct kobject *parent)
struct thpsize *thpsize;
int ret = -ENOMEM;
- thpsize = kzalloc_obj(*thpsize, GFP_KERNEL);
+ thpsize = kzalloc_obj(*thpsize);
if (!thpsize)
goto err;
diff --git a/mm/hugetlb.c b/mm/hugetlb.c
index 6793a5b07882..0beb6e22bc26 100644
--- a/mm/hugetlb.c
+++ b/mm/hugetlb.c
@@ -154,7 +154,7 @@ struct hugepage_subpool *hugepage_new_subpool(struct hstate *h, long max_hpages,
{
struct hugepage_subpool *spool;
- spool = kzalloc_obj(*spool, GFP_KERNEL);
+ spool = kzalloc_obj(*spool);
if (!spool)
return NULL;
@@ -429,7 +429,7 @@ int hugetlb_vma_lock_alloc(struct vm_area_struct *vma)
if (vma->vm_private_data)
return -EINVAL;
- vma_lock = kmalloc_obj(*vma_lock, GFP_KERNEL);
+ vma_lock = kmalloc_obj(*vma_lock);
if (!vma_lock) {
/*
* If we can not allocate structure, then vma can not
@@ -687,7 +687,7 @@ static int allocate_file_region_entries(struct resv_map *resv,
spin_unlock(&resv->lock);
for (i = 0; i < to_allocate; i++) {
- trg = kmalloc_obj(*trg, GFP_KERNEL);
+ trg = kmalloc_obj(*trg);
if (!trg)
goto out_of_memory;
list_add(&trg->link, &allocated_regions);
@@ -891,7 +891,7 @@ static long region_del(struct resv_map *resv, long f, long t)
if (!nrg) {
spin_unlock(&resv->lock);
- nrg = kmalloc_obj(*nrg, GFP_KERNEL);
+ nrg = kmalloc_obj(*nrg);
if (!nrg)
return -ENOMEM;
goto retry;
@@ -1105,8 +1105,8 @@ resv_map_set_hugetlb_cgroup_uncharge_info(struct resv_map *resv_map,
struct resv_map *resv_map_alloc(void)
{
- struct resv_map *resv_map = kmalloc_obj(*resv_map, GFP_KERNEL);
- struct file_region *rg = kmalloc_obj(*rg, GFP_KERNEL);
+ struct resv_map *resv_map = kmalloc_obj(*resv_map);
+ struct file_region *rg = kmalloc_obj(*rg);
if (!resv_map || !rg) {
kfree(resv_map);
@@ -4190,7 +4190,7 @@ static int __init hugetlb_init(void)
num_fault_mutexes = 1;
#endif
hugetlb_fault_mutex_table =
- kmalloc_objs(struct mutex, num_fault_mutexes, GFP_KERNEL);
+ kmalloc_objs(struct mutex, num_fault_mutexes);
BUG_ON(!hugetlb_fault_mutex_table);
for (i = 0; i < num_fault_mutexes; i++)
diff --git a/mm/hugetlb_cgroup.c b/mm/hugetlb_cgroup.c
index 6e4706d6ee82..12239d5fd042 100644
--- a/mm/hugetlb_cgroup.c
+++ b/mm/hugetlb_cgroup.c
@@ -856,10 +856,10 @@ static void __init __hugetlb_cgroup_file_pre_init(void)
int cft_count;
cft_count = hugetlb_max_hstate * DFL_TMPL_SIZE + 1; /* add terminator */
- dfl_files = kzalloc_objs(struct cftype, cft_count, GFP_KERNEL);
+ dfl_files = kzalloc_objs(struct cftype, cft_count);
BUG_ON(!dfl_files);
cft_count = hugetlb_max_hstate * LEGACY_TMPL_SIZE + 1; /* add terminator */
- legacy_files = kzalloc_objs(struct cftype, cft_count, GFP_KERNEL);
+ legacy_files = kzalloc_objs(struct cftype, cft_count);
BUG_ON(!legacy_files);
}
diff --git a/mm/kasan/kasan_test_c.c b/mm/kasan/kasan_test_c.c
index cb9c95ed7821..32d06cbf6a31 100644
--- a/mm/kasan/kasan_test_c.c
+++ b/mm/kasan/kasan_test_c.c
@@ -511,7 +511,7 @@ static void kmalloc_oob_16(struct kunit *test)
ptr1 = RELOC_HIDE(kmalloc(sizeof(*ptr1) - 3, GFP_KERNEL), 0);
KUNIT_ASSERT_NOT_ERR_OR_NULL(test, ptr1);
- ptr2 = kmalloc_obj(*ptr2, GFP_KERNEL);
+ ptr2 = kmalloc_obj(*ptr2);
KUNIT_ASSERT_NOT_ERR_OR_NULL(test, ptr2);
OPTIMIZER_HIDE_VAR(ptr1);
@@ -529,10 +529,10 @@ static void kmalloc_uaf_16(struct kunit *test)
KASAN_TEST_NEEDS_CHECKED_MEMINTRINSICS(test);
- ptr1 = kmalloc_obj(*ptr1, GFP_KERNEL);
+ ptr1 = kmalloc_obj(*ptr1);
KUNIT_ASSERT_NOT_ERR_OR_NULL(test, ptr1);
- ptr2 = kmalloc_obj(*ptr2, GFP_KERNEL);
+ ptr2 = kmalloc_obj(*ptr2);
KUNIT_ASSERT_NOT_ERR_OR_NULL(test, ptr2);
kfree(ptr2);
@@ -859,7 +859,7 @@ static void kasan_atomics(struct kunit *test)
*/
a1 = kzalloc(48, GFP_KERNEL);
KUNIT_ASSERT_NOT_ERR_OR_NULL(test, a1);
- a2 = kzalloc_obj(atomic_long_t, GFP_KERNEL);
+ a2 = kzalloc_obj(atomic_long_t);
KUNIT_ASSERT_NOT_ERR_OR_NULL(test, a2);
/* Use atomics to access the redzone. */
@@ -954,7 +954,7 @@ static void rcu_uaf(struct kunit *test)
{
struct kasan_rcu_info *ptr;
- ptr = kmalloc_obj(struct kasan_rcu_info, GFP_KERNEL);
+ ptr = kmalloc_obj(struct kasan_rcu_info);
KUNIT_ASSERT_NOT_ERR_OR_NULL(test, ptr);
global_rcu_ptr = rcu_dereference_protected(
@@ -978,7 +978,7 @@ static void workqueue_uaf(struct kunit *test)
workqueue = create_workqueue("kasan_workqueue_test");
KUNIT_ASSERT_NOT_ERR_OR_NULL(test, workqueue);
- work = kmalloc_obj(struct work_struct, GFP_KERNEL);
+ work = kmalloc_obj(struct work_struct);
KUNIT_ASSERT_NOT_ERR_OR_NULL(test, work);
INIT_WORK(work, workqueue_uaf_work);
diff --git a/mm/khugepaged.c b/mm/khugepaged.c
index f2f95b32317c..1dd3cfca610d 100644
--- a/mm/khugepaged.c
+++ b/mm/khugepaged.c
@@ -2769,7 +2769,7 @@ int madvise_collapse(struct vm_area_struct *vma, unsigned long start,
if (!thp_vma_allowable_order(vma, vma->vm_flags, TVA_FORCED_COLLAPSE, PMD_ORDER))
return -EINVAL;
- cc = kmalloc_obj(*cc, GFP_KERNEL);
+ cc = kmalloc_obj(*cc);
if (!cc)
return -ENOMEM;
cc->is_khugepaged = false;
diff --git a/mm/kmsan/kmsan_test.c b/mm/kmsan/kmsan_test.c
index 27cc936176ea..31f47cc4dab4 100644
--- a/mm/kmsan/kmsan_test.c
+++ b/mm/kmsan/kmsan_test.c
@@ -168,7 +168,7 @@ static void test_uninit_kmalloc(struct kunit *test)
int *ptr;
kunit_info(test, "uninitialized kmalloc test (UMR report)\n");
- ptr = kmalloc_obj(*ptr, GFP_KERNEL);
+ ptr = kmalloc_obj(*ptr);
USE(*ptr);
KUNIT_EXPECT_TRUE(test, report_matches(&expect));
}
@@ -182,7 +182,7 @@ static void test_init_kmalloc(struct kunit *test)
int *ptr;
kunit_info(test, "initialized kmalloc test (no reports)\n");
- ptr = kmalloc_obj(*ptr, GFP_KERNEL);
+ ptr = kmalloc_obj(*ptr);
memset(ptr, 0, sizeof(*ptr));
USE(*ptr);
KUNIT_EXPECT_TRUE(test, report_matches(&expect));
@@ -195,7 +195,7 @@ static void test_init_kzalloc(struct kunit *test)
int *ptr;
kunit_info(test, "initialized kzalloc test (no reports)\n");
- ptr = kzalloc_obj(*ptr, GFP_KERNEL);
+ ptr = kzalloc_obj(*ptr);
USE(*ptr);
KUNIT_EXPECT_TRUE(test, report_matches(&expect));
}
@@ -322,7 +322,7 @@ static void test_init_kmsan_vmap_vunmap(struct kunit *test)
kunit_info(test, "pages initialized via vmap (no reports)\n");
- pages = kmalloc_objs(*pages, npages, GFP_KERNEL);
+ pages = kmalloc_objs(*pages, npages);
for (int i = 0; i < npages; i++)
pages[i] = alloc_page(GFP_KERNEL);
vbuf = vmap(pages, npages, VM_MAP, PAGE_KERNEL);
diff --git a/mm/list_lru.c b/mm/list_lru.c
index 16526b9d71b5..26463ae29c64 100644
--- a/mm/list_lru.c
+++ b/mm/list_lru.c
@@ -585,7 +585,7 @@ int __list_lru_init(struct list_lru *lru, bool memcg_aware, struct shrinker *shr
memcg_aware = false;
#endif
- lru->node = kzalloc_objs(*lru->node, nr_node_ids, GFP_KERNEL);
+ lru->node = kzalloc_objs(*lru->node, nr_node_ids);
if (!lru->node)
return -ENOMEM;
diff --git a/mm/memcontrol.c b/mm/memcontrol.c
index 63773a0b91f7..a52da3a5e4fd 100644
--- a/mm/memcontrol.c
+++ b/mm/memcontrol.c
@@ -192,7 +192,7 @@ static struct obj_cgroup *obj_cgroup_alloc(void)
struct obj_cgroup *objcg;
int ret;
- objcg = kzalloc_obj(struct obj_cgroup, GFP_KERNEL);
+ objcg = kzalloc_obj(struct obj_cgroup);
if (!objcg)
return NULL;
diff --git a/mm/memfd_luo.c b/mm/memfd_luo.c
index c69774c19c88..5c17da3880c5 100644
--- a/mm/memfd_luo.c
+++ b/mm/memfd_luo.c
@@ -112,7 +112,7 @@ static int memfd_luo_preserve_folios(struct file *file,
* up being smaller if there are higher order folios.
*/
max_folios = PAGE_ALIGN(size) / PAGE_SIZE;
- folios = kvmalloc_objs(*folios, max_folios, GFP_KERNEL);
+ folios = kvmalloc_objs(*folios, max_folios);
if (!folios)
return -ENOMEM;
diff --git a/mm/memory-tiers.c b/mm/memory-tiers.c
index b05c916fa5f4..631df0614331 100644
--- a/mm/memory-tiers.c
+++ b/mm/memory-tiers.c
@@ -227,7 +227,7 @@ static struct memory_tier *find_create_memory_tier(struct memory_dev_type *memty
}
}
- new_memtier = kzalloc_obj(struct memory_tier, GFP_KERNEL);
+ new_memtier = kzalloc_obj(struct memory_tier);
if (!new_memtier)
return ERR_PTR(-ENOMEM);
@@ -625,7 +625,7 @@ struct memory_dev_type *alloc_memory_type(int adistance)
{
struct memory_dev_type *memtype;
- memtype = kmalloc_obj(*memtype, GFP_KERNEL);
+ memtype = kmalloc_obj(*memtype);
if (!memtype)
return ERR_PTR(-ENOMEM);
diff --git a/mm/memory.c b/mm/memory.c
index 144e30d2825f..07778814b4a8 100644
--- a/mm/memory.c
+++ b/mm/memory.c
@@ -3035,7 +3035,7 @@ static inline struct pfnmap_track_ctx *pfnmap_track_ctx_alloc(unsigned long pfn,
if (pfnmap_track(pfn, size, prot))
return ERR_PTR(-EINVAL);
- ctx = kmalloc_obj(*ctx, GFP_KERNEL);
+ ctx = kmalloc_obj(*ctx);
if (unlikely(!ctx)) {
pfnmap_untrack(pfn, size);
return ERR_PTR(-ENOMEM);
diff --git a/mm/mempolicy.c b/mm/mempolicy.c
index 0835743f6575..3b2d6b77a383 100644
--- a/mm/mempolicy.c
+++ b/mm/mempolicy.c
@@ -3815,7 +3815,7 @@ static int sysfs_wi_node_add(int nid)
return -EINVAL;
}
- new_attr = kzalloc_obj(*new_attr, GFP_KERNEL);
+ new_attr = kzalloc_obj(*new_attr);
if (!new_attr)
return -ENOMEM;
diff --git a/mm/mempool.c b/mm/mempool.c
index c22c63ccbbcd..db23e0eef652 100644
--- a/mm/mempool.c
+++ b/mm/mempool.c
@@ -371,7 +371,7 @@ int mempool_resize(struct mempool *pool, int new_min_nr)
spin_unlock_irqrestore(&pool->lock, flags);
/* Grow the pool */
- new_elements = kmalloc_objs(*new_elements, new_min_nr, GFP_KERNEL);
+ new_elements = kmalloc_objs(*new_elements, new_min_nr);
if (!new_elements)
return -ENOMEM;
diff --git a/mm/page_reporting.c b/mm/page_reporting.c
index 7323284d2f7d..f0042d5743af 100644
--- a/mm/page_reporting.c
+++ b/mm/page_reporting.c
@@ -322,7 +322,7 @@ static void page_reporting_process(struct work_struct *work)
atomic_set(&prdev->state, state);
/* allocate scatterlist to store pages being reported on */
- sgl = kmalloc_objs(*sgl, PAGE_REPORTING_CAPACITY, GFP_KERNEL);
+ sgl = kmalloc_objs(*sgl, PAGE_REPORTING_CAPACITY);
if (!sgl)
goto err_out;
diff --git a/mm/shmem.c b/mm/shmem.c
index 5f2e8e3d5b75..b40f3cd48961 100644
--- a/mm/shmem.c
+++ b/mm/shmem.c
@@ -5328,7 +5328,7 @@ int shmem_init_fs_context(struct fs_context *fc)
{
struct shmem_options *ctx;
- ctx = kzalloc_obj(struct shmem_options, GFP_KERNEL);
+ ctx = kzalloc_obj(struct shmem_options);
if (!ctx)
return -ENOMEM;
diff --git a/mm/shrinker.c b/mm/shrinker.c
index 52e7bebe4579..7b61fc0ee78f 100644
--- a/mm/shrinker.c
+++ b/mm/shrinker.c
@@ -682,7 +682,7 @@ struct shrinker *shrinker_alloc(unsigned int flags, const char *fmt, ...)
va_list ap;
int err;
- shrinker = kzalloc_obj(struct shrinker, GFP_KERNEL);
+ shrinker = kzalloc_obj(struct shrinker);
if (!shrinker)
return NULL;
diff --git a/mm/slub.c b/mm/slub.c
index b8e9c0b62435..862642c165ed 100644
--- a/mm/slub.c
+++ b/mm/slub.c
@@ -9139,7 +9139,7 @@ static int show_stat(struct kmem_cache *s, char *buf, enum stat_item si)
unsigned long sum = 0;
int cpu;
int len = 0;
- int *data = kmalloc_objs(int, nr_cpu_ids, GFP_KERNEL);
+ int *data = kmalloc_objs(int, nr_cpu_ids);
if (!data)
return -ENOMEM;
@@ -9510,7 +9510,7 @@ int sysfs_slab_alias(struct kmem_cache *s, const char *name)
return sysfs_create_link(&slab_kset->kobj, &s->kobj, name);
}
- al = kmalloc_obj(struct saved_alias, GFP_KERNEL);
+ al = kmalloc_obj(struct saved_alias);
if (!al)
return -ENOMEM;
diff --git a/mm/swapfile.c b/mm/swapfile.c
index 8a1e2af356ba..a94aa1054fd8 100644
--- a/mm/swapfile.c
+++ b/mm/swapfile.c
@@ -2575,7 +2575,7 @@ add_swap_extent(struct swap_info_struct *sis, unsigned long start_page,
}
/* No merge, insert a new extent. */
- new_se = kmalloc_obj(*se, GFP_KERNEL);
+ new_se = kmalloc_obj(*se);
if (new_se == NULL)
return -ENOMEM;
new_se->start_page = start_page;
@@ -3048,7 +3048,7 @@ static struct swap_info_struct *alloc_swap_info(void)
struct swap_info_struct *defer = NULL;
unsigned int type;
- p = kvzalloc_obj(struct swap_info_struct, GFP_KERNEL);
+ p = kvzalloc_obj(struct swap_info_struct);
if (!p)
return ERR_PTR(-ENOMEM);
@@ -3257,7 +3257,7 @@ static struct swap_cluster_info *setup_clusters(struct swap_info_struct *si,
int err = -ENOMEM;
unsigned long i;
- cluster_info = kvzalloc_objs(*cluster_info, nr_clusters, GFP_KERNEL);
+ cluster_info = kvzalloc_objs(*cluster_info, nr_clusters);
if (!cluster_info)
goto err;
diff --git a/mm/vmalloc.c b/mm/vmalloc.c
index 672c56d8bfe1..61caa55a4402 100644
--- a/mm/vmalloc.c
+++ b/mm/vmalloc.c
@@ -4920,14 +4920,14 @@ struct vm_struct **pcpu_get_vm_areas(const unsigned long *offsets,
return NULL;
}
- vms = kzalloc_objs(vms[0], nr_vms, GFP_KERNEL);
- vas = kzalloc_objs(vas[0], nr_vms, GFP_KERNEL);
+ vms = kzalloc_objs(vms[0], nr_vms);
+ vas = kzalloc_objs(vas[0], nr_vms);
if (!vas || !vms)
goto err_free2;
for (area = 0; area < nr_vms; area++) {
vas[area] = kmem_cache_zalloc(vmap_area_cachep, GFP_KERNEL);
- vms[area] = kzalloc_obj(struct vm_struct, GFP_KERNEL);
+ vms[area] = kzalloc_obj(struct vm_struct);
if (!vas[area] || !vms[area])
goto err_free;
}
diff --git a/mm/vmpressure.c b/mm/vmpressure.c
index 035e0384e39b..3fbb86996c4d 100644
--- a/mm/vmpressure.c
+++ b/mm/vmpressure.c
@@ -402,7 +402,7 @@ int vmpressure_register_event(struct mem_cgroup *memcg,
mode = ret;
}
- ev = kzalloc_obj(*ev, GFP_KERNEL);
+ ev = kzalloc_obj(*ev);
if (!ev) {
ret = -ENOMEM;
goto out;
diff --git a/mm/zsmalloc.c b/mm/zsmalloc.c
index fa0b726dcec7..2c1430bf8d57 100644
--- a/mm/zsmalloc.c
+++ b/mm/zsmalloc.c
@@ -2062,7 +2062,7 @@ struct zs_pool *zs_create_pool(const char *name)
struct zs_pool *pool;
struct size_class *prev_class = NULL;
- pool = kzalloc_obj(*pool, GFP_KERNEL);
+ pool = kzalloc_obj(*pool);
if (!pool)
return NULL;
@@ -2128,7 +2128,7 @@ struct zs_pool *zs_create_pool(const char *name)
}
}
- class = kzalloc_obj(struct size_class, GFP_KERNEL);
+ class = kzalloc_obj(struct size_class);
if (!class)
goto err;
diff --git a/mm/zswap.c b/mm/zswap.c
index bbfd8a51e4c8..e6ec3295bdb0 100644
--- a/mm/zswap.c
+++ b/mm/zswap.c
@@ -251,7 +251,7 @@ static struct zswap_pool *zswap_pool_create(char *compressor)
if (!zswap_has_pool && !strcmp(compressor, ZSWAP_PARAM_UNSET))
return NULL;
- pool = kzalloc_obj(*pool, GFP_KERNEL);
+ pool = kzalloc_obj(*pool);
if (!pool)
return NULL;
@@ -1665,7 +1665,7 @@ int zswap_swapon(int type, unsigned long nr_pages)
unsigned int nr, i;
nr = DIV_ROUND_UP(nr_pages, ZSWAP_ADDRESS_SPACE_PAGES);
- trees = kvzalloc_objs(*tree, nr, GFP_KERNEL);
+ trees = kvzalloc_objs(*tree, nr);
if (!trees) {
pr_err("alloc failed, zswap disabled for swap type %d\n", type);
return -ENOMEM;
diff --git a/net/802/garp.c b/net/802/garp.c
index ceeb5f5fac02..6f563b6797d9 100644
--- a/net/802/garp.c
+++ b/net/802/garp.c
@@ -547,7 +547,7 @@ static int garp_init_port(struct net_device *dev)
{
struct garp_port *port;
- port = kzalloc_obj(*port, GFP_KERNEL);
+ port = kzalloc_obj(*port);
if (!port)
return -ENOMEM;
rcu_assign_pointer(dev->garp_port, port);
@@ -581,7 +581,7 @@ int garp_init_applicant(struct net_device *dev, struct garp_application *appl)
}
err = -ENOMEM;
- app = kzalloc_obj(*app, GFP_KERNEL);
+ app = kzalloc_obj(*app);
if (!app)
goto err2;
diff --git a/net/802/mrp.c b/net/802/mrp.c
index f65c95d43a4e..ff0e80574e6b 100644
--- a/net/802/mrp.c
+++ b/net/802/mrp.c
@@ -832,7 +832,7 @@ static int mrp_init_port(struct net_device *dev)
{
struct mrp_port *port;
- port = kzalloc_obj(*port, GFP_KERNEL);
+ port = kzalloc_obj(*port);
if (!port)
return -ENOMEM;
rcu_assign_pointer(dev->mrp_port, port);
@@ -866,7 +866,7 @@ int mrp_init_applicant(struct net_device *dev, struct mrp_application *appl)
}
err = -ENOMEM;
- app = kzalloc_obj(*app, GFP_KERNEL);
+ app = kzalloc_obj(*app);
if (!app)
goto err2;
diff --git a/net/8021q/vlan_core.c b/net/8021q/vlan_core.c
index d7849667ddf0..d23965e76c16 100644
--- a/net/8021q/vlan_core.c
+++ b/net/8021q/vlan_core.c
@@ -150,7 +150,7 @@ static struct vlan_info *vlan_info_alloc(struct net_device *dev)
{
struct vlan_info *vlan_info;
- vlan_info = kzalloc_obj(struct vlan_info, GFP_KERNEL);
+ vlan_info = kzalloc_obj(struct vlan_info);
if (!vlan_info)
return NULL;
@@ -193,7 +193,7 @@ static struct vlan_vid_info *vlan_vid_info_alloc(__be16 proto, u16 vid)
{
struct vlan_vid_info *vid_info;
- vid_info = kzalloc_obj(struct vlan_vid_info, GFP_KERNEL);
+ vid_info = kzalloc_obj(struct vlan_vid_info);
if (!vid_info)
return NULL;
vid_info->proto = proto;
diff --git a/net/8021q/vlan_dev.c b/net/8021q/vlan_dev.c
index 176912c62915..c40f7d5c4fca 100644
--- a/net/8021q/vlan_dev.c
+++ b/net/8021q/vlan_dev.c
@@ -192,7 +192,7 @@ int vlan_dev_set_egress_priority(const struct net_device *dev,
/* Create a new mapping then. */
mp = vlan->egress_priority_map[skb_prio & 0xF];
- np = kmalloc_obj(struct vlan_priority_tci_mapping, GFP_KERNEL);
+ np = kmalloc_obj(struct vlan_priority_tci_mapping);
if (!np)
return -ENOBUFS;
@@ -708,7 +708,7 @@ static int vlan_dev_netpoll_setup(struct net_device *dev)
struct netpoll *netpoll;
int err = 0;
- netpoll = kzalloc_obj(*netpoll, GFP_KERNEL);
+ netpoll = kzalloc_obj(*netpoll);
err = -ENOMEM;
if (!netpoll)
goto out;
diff --git a/net/9p/client.c b/net/9p/client.c
index 3e8de85c7f7f..f0dcf252af7e 100644
--- a/net/9p/client.c
+++ b/net/9p/client.c
@@ -730,7 +730,7 @@ static struct p9_fid *p9_fid_create(struct p9_client *clnt)
struct p9_fid *fid;
p9_debug(P9_DEBUG_FID, "clnt %p\n", clnt);
- fid = kzalloc_obj(*fid, GFP_KERNEL);
+ fid = kzalloc_obj(*fid);
if (!fid)
return NULL;
@@ -859,7 +859,7 @@ struct p9_client *p9_client_create(struct fs_context *fc)
char *client_id;
char *cache_name;
- clnt = kmalloc_obj(*clnt, GFP_KERNEL);
+ clnt = kmalloc_obj(*clnt);
if (!clnt)
return ERR_PTR(-ENOMEM);
@@ -1615,7 +1615,7 @@ struct p9_wstat *p9_client_stat(struct p9_fid *fid)
p9_debug(P9_DEBUG_9P, ">>> TSTAT fid %d\n", fid->fid);
- ret = kmalloc_obj(*ret, GFP_KERNEL);
+ ret = kmalloc_obj(*ret);
if (!ret)
return ERR_PTR(-ENOMEM);
@@ -1667,7 +1667,7 @@ struct p9_stat_dotl *p9_client_getattr_dotl(struct p9_fid *fid,
p9_debug(P9_DEBUG_9P, ">>> TGETATTR fid %d, request_mask %lld\n",
fid->fid, request_mask);
- ret = kmalloc_obj(*ret, GFP_KERNEL);
+ ret = kmalloc_obj(*ret);
if (!ret)
return ERR_PTR(-ENOMEM);
diff --git a/net/9p/trans_fd.c b/net/9p/trans_fd.c
index 4e0f4a382ac4..dbad3213ba84 100644
--- a/net/9p/trans_fd.c
+++ b/net/9p/trans_fd.c
@@ -719,7 +719,7 @@ static int p9_fd_show_options(struct seq_file *m, struct p9_client *clnt)
static int p9_fd_open(struct p9_client *client, int rfd, int wfd)
{
- struct p9_trans_fd *ts = kzalloc_obj(struct p9_trans_fd, GFP_KERNEL);
+ struct p9_trans_fd *ts = kzalloc_obj(struct p9_trans_fd);
if (!ts)
return -ENOMEM;
@@ -763,7 +763,7 @@ static int p9_socket_open(struct p9_client *client, struct socket *csocket)
struct p9_trans_fd *p;
struct file *file;
- p = kzalloc_obj(struct p9_trans_fd, GFP_KERNEL);
+ p = kzalloc_obj(struct p9_trans_fd);
if (!p) {
sock_release(csocket);
return -ENOMEM;
diff --git a/net/9p/trans_rdma.c b/net/9p/trans_rdma.c
index c8e27c08a3a2..aa5bd74d333f 100644
--- a/net/9p/trans_rdma.c
+++ b/net/9p/trans_rdma.c
@@ -460,7 +460,7 @@ static struct p9_trans_rdma *alloc_rdma(struct p9_rdma_opts *opts)
{
struct p9_trans_rdma *rdma;
- rdma = kzalloc_obj(struct p9_trans_rdma, GFP_KERNEL);
+ rdma = kzalloc_obj(struct p9_trans_rdma);
if (!rdma)
return NULL;
diff --git a/net/9p/trans_usbg.c b/net/9p/trans_usbg.c
index e167f9f23d65..1ce70338999c 100644
--- a/net/9p/trans_usbg.c
+++ b/net/9p/trans_usbg.c
@@ -757,7 +757,7 @@ static struct usb_function *usb9pfs_alloc(struct usb_function_instance *fi)
struct f_usb9pfs_opts *usb9pfs_opts;
struct f_usb9pfs *usb9pfs;
- usb9pfs = kzalloc_obj(*usb9pfs, GFP_KERNEL);
+ usb9pfs = kzalloc_obj(*usb9pfs);
if (!usb9pfs)
return ERR_PTR(-ENOMEM);
@@ -910,7 +910,7 @@ static struct usb_function_instance *usb9pfs_alloc_instance(void)
struct f_usb9pfs_opts *usb9pfs_opts;
struct f_usb9pfs_dev *dev;
- usb9pfs_opts = kzalloc_obj(*usb9pfs_opts, GFP_KERNEL);
+ usb9pfs_opts = kzalloc_obj(*usb9pfs_opts);
if (!usb9pfs_opts)
return ERR_PTR(-ENOMEM);
@@ -921,7 +921,7 @@ static struct usb_function_instance *usb9pfs_alloc_instance(void)
usb9pfs_opts->buflen = DEFAULT_BUFLEN;
- dev = kzalloc_obj(*dev, GFP_KERNEL);
+ dev = kzalloc_obj(*dev);
if (!dev) {
kfree(usb9pfs_opts);
return ERR_PTR(-ENOMEM);
diff --git a/net/9p/trans_virtio.c b/net/9p/trans_virtio.c
index 0577bdcb67bf..4cdab7094b27 100644
--- a/net/9p/trans_virtio.c
+++ b/net/9p/trans_virtio.c
@@ -601,7 +601,7 @@ static int p9_virtio_probe(struct virtio_device *vdev)
return -EINVAL;
}
- chan = kmalloc_obj(struct virtio_chan, GFP_KERNEL);
+ chan = kmalloc_obj(struct virtio_chan);
if (!chan) {
pr_err("Failed to allocate virtio 9P channel\n");
err = -ENOMEM;
@@ -641,7 +641,7 @@ static int p9_virtio_probe(struct virtio_device *vdev)
if (err) {
goto out_free_tag;
}
- chan->vc_wq = kmalloc_obj(wait_queue_head_t, GFP_KERNEL);
+ chan->vc_wq = kmalloc_obj(wait_queue_head_t);
if (!chan->vc_wq) {
err = -ENOMEM;
goto out_remove_file;
diff --git a/net/9p/trans_xen.c b/net/9p/trans_xen.c
index fd6ac8658549..47af5a10e921 100644
--- a/net/9p/trans_xen.c
+++ b/net/9p/trans_xen.c
@@ -417,11 +417,11 @@ static int xen_9pfs_front_init(struct xenbus_device *dev)
if (p9_xen_trans.maxsize > XEN_FLEX_RING_SIZE(max_ring_order))
p9_xen_trans.maxsize = XEN_FLEX_RING_SIZE(max_ring_order) / 2;
- priv = kzalloc_obj(*priv, GFP_KERNEL);
+ priv = kzalloc_obj(*priv);
if (!priv)
return -ENOMEM;
priv->dev = dev;
- priv->rings = kzalloc_objs(*priv->rings, XEN_9PFS_NUM_RINGS, GFP_KERNEL);
+ priv->rings = kzalloc_objs(*priv->rings, XEN_9PFS_NUM_RINGS);
if (!priv->rings) {
kfree(priv);
return -ENOMEM;
diff --git a/net/appletalk/ddp.c b/net/appletalk/ddp.c
index 53c613e36245..30a6dc06291c 100644
--- a/net/appletalk/ddp.c
+++ b/net/appletalk/ddp.c
@@ -233,7 +233,7 @@ static void atif_drop_device(struct net_device *dev)
static struct atalk_iface *atif_add_device(struct net_device *dev,
struct atalk_addr *sa)
{
- struct atalk_iface *iface = kzalloc_obj(*iface, GFP_KERNEL);
+ struct atalk_iface *iface = kzalloc_obj(*iface);
if (!iface)
goto out;
diff --git a/net/atm/br2684.c b/net/atm/br2684.c
index 8fdc25271708..6580d67c3456 100644
--- a/net/atm/br2684.c
+++ b/net/atm/br2684.c
@@ -538,7 +538,7 @@ static int br2684_regvcc(struct atm_vcc *atmvcc, void __user * arg)
if (copy_from_user(&be, arg, sizeof be))
return -EFAULT;
- brvcc = kzalloc_obj(struct br2684_vcc, GFP_KERNEL);
+ brvcc = kzalloc_obj(struct br2684_vcc);
if (!brvcc)
return -ENOMEM;
/*
diff --git a/net/atm/clip.c b/net/atm/clip.c
index 40553fcab389..516b2214680b 100644
--- a/net/atm/clip.c
+++ b/net/atm/clip.c
@@ -431,7 +431,7 @@ static int clip_mkip(struct atm_vcc *vcc, int timeout)
return -EBADFD;
if (vcc->user_back)
return -EINVAL;
- clip_vcc = kmalloc_obj(struct clip_vcc, GFP_KERNEL);
+ clip_vcc = kmalloc_obj(struct clip_vcc);
if (!clip_vcc)
return -ENOMEM;
pr_debug("%p vcc %p\n", clip_vcc, vcc);
diff --git a/net/atm/lec.c b/net/atm/lec.c
index cba26158c4ad..a107375c0629 100644
--- a/net/atm/lec.c
+++ b/net/atm/lec.c
@@ -696,7 +696,7 @@ static int lec_vcc_attach(struct atm_vcc *vcc, void __user *arg)
ioc_data.dev_num = array_index_nospec(ioc_data.dev_num, MAX_LEC_ITF);
if (!dev_lec[ioc_data.dev_num])
return -EINVAL;
- vpriv = kmalloc_obj(struct lec_vcc_priv, GFP_KERNEL);
+ vpriv = kmalloc_obj(struct lec_vcc_priv);
if (!vpriv)
return -ENOMEM;
vpriv->xoff = 0;
@@ -2125,7 +2125,7 @@ static int lec_mcast_make(struct lec_priv *priv, struct atm_vcc *vcc)
struct lec_vcc_priv *vpriv;
int err = 0;
- vpriv = kmalloc_obj(struct lec_vcc_priv, GFP_KERNEL);
+ vpriv = kmalloc_obj(struct lec_vcc_priv);
if (!vpriv)
return -ENOMEM;
vpriv->xoff = 0;
diff --git a/net/atm/mpc.c b/net/atm/mpc.c
index 3e2b13734fc4..ce8e9780373b 100644
--- a/net/atm/mpc.c
+++ b/net/atm/mpc.c
@@ -184,7 +184,7 @@ struct atm_mpoa_qos *atm_mpoa_add_qos(__be32 dst_ip, struct atm_qos *qos)
return entry;
}
- entry = kmalloc_obj(struct atm_mpoa_qos, GFP_KERNEL);
+ entry = kmalloc_obj(struct atm_mpoa_qos);
if (entry == NULL) {
pr_info("mpoa: out of memory\n");
return entry;
@@ -282,7 +282,7 @@ static struct mpoa_client *alloc_mpc(void)
{
struct mpoa_client *mpc;
- mpc = kzalloc_obj(struct mpoa_client, GFP_KERNEL);
+ mpc = kzalloc_obj(struct mpoa_client);
if (mpc == NULL)
return NULL;
rwlock_init(&mpc->ingress_lock);
diff --git a/net/atm/mpoa_caches.c b/net/atm/mpoa_caches.c
index b584ab72ed2f..c8d4e6f2e831 100644
--- a/net/atm/mpoa_caches.c
+++ b/net/atm/mpoa_caches.c
@@ -97,7 +97,7 @@ static in_cache_entry *in_cache_get_by_vcc(struct atm_vcc *vcc,
static in_cache_entry *in_cache_add_entry(__be32 dst_ip,
struct mpoa_client *client)
{
- in_cache_entry *entry = kzalloc_obj(in_cache_entry, GFP_KERNEL);
+ in_cache_entry *entry = kzalloc_obj(in_cache_entry);
if (entry == NULL) {
pr_info("mpoa: mpoa_caches.c: new_in_cache_entry: out of memory\n");
@@ -456,7 +456,7 @@ static void eg_cache_remove_entry(eg_cache_entry *entry,
static eg_cache_entry *eg_cache_add_entry(struct k_message *msg,
struct mpoa_client *client)
{
- eg_cache_entry *entry = kzalloc_obj(eg_cache_entry, GFP_KERNEL);
+ eg_cache_entry *entry = kzalloc_obj(eg_cache_entry);
if (entry == NULL) {
pr_info("out of memory\n");
diff --git a/net/atm/pppoatm.c b/net/atm/pppoatm.c
index 133b0cda7063..2574aae3e066 100644
--- a/net/atm/pppoatm.c
+++ b/net/atm/pppoatm.c
@@ -397,7 +397,7 @@ static int pppoatm_assign_vcc(struct atm_vcc *atmvcc, void __user *arg)
if (be.encaps != PPPOATM_ENCAPS_AUTODETECT &&
be.encaps != PPPOATM_ENCAPS_VC && be.encaps != PPPOATM_ENCAPS_LLC)
return -EINVAL;
- pvcc = kzalloc_obj(*pvcc, GFP_KERNEL);
+ pvcc = kzalloc_obj(*pvcc);
if (pvcc == NULL)
return -ENOMEM;
pvcc->atmvcc = atmvcc;
diff --git a/net/atm/resources.c b/net/atm/resources.c
index 9849521feaf3..939452a610c0 100644
--- a/net/atm/resources.c
+++ b/net/atm/resources.c
@@ -36,7 +36,7 @@ static struct atm_dev *__alloc_atm_dev(const char *type)
{
struct atm_dev *dev;
- dev = kzalloc_obj(*dev, GFP_KERNEL);
+ dev = kzalloc_obj(*dev);
if (!dev)
return NULL;
dev->type = type;
diff --git a/net/ax25/af_ax25.c b/net/ax25/af_ax25.c
index 855ae9df824d..a76f4793aed2 100644
--- a/net/ax25/af_ax25.c
+++ b/net/ax25/af_ax25.c
@@ -1249,7 +1249,7 @@ static int __must_check ax25_connect(struct socket *sock,
goto out_release;
}
- if ((digi = kmalloc_obj(ax25_digi, GFP_KERNEL)) == NULL) {
+ if ((digi = kmalloc_obj(ax25_digi)) == NULL) {
err = -ENOBUFS;
goto out_release;
}
diff --git a/net/ax25/ax25_dev.c b/net/ax25/ax25_dev.c
index 56f605ddd88d..3c0544fc4ad5 100644
--- a/net/ax25/ax25_dev.c
+++ b/net/ax25/ax25_dev.c
@@ -54,7 +54,7 @@ void ax25_dev_device_up(struct net_device *dev)
{
ax25_dev *ax25_dev;
- ax25_dev = kzalloc_obj(*ax25_dev, GFP_KERNEL);
+ ax25_dev = kzalloc_obj(*ax25_dev);
if (!ax25_dev) {
printk(KERN_ERR "AX.25: ax25_dev_device_up - out of memory\n");
return;
diff --git a/net/ax25/ax25_uid.c b/net/ax25/ax25_uid.c
index 95c5915f1ab9..159ce74273f0 100644
--- a/net/ax25/ax25_uid.c
+++ b/net/ax25/ax25_uid.c
@@ -101,7 +101,7 @@ int ax25_uid_ioctl(int cmd, struct sockaddr_ax25 *sax)
}
if (sax->sax25_uid == 0)
return -EINVAL;
- if ((ax25_uid = kmalloc_obj(*ax25_uid, GFP_KERNEL)) == NULL)
+ if ((ax25_uid = kmalloc_obj(*ax25_uid)) == NULL)
return -ENOMEM;
refcount_set(&ax25_uid->refcount, 1);
diff --git a/net/bluetooth/6lowpan.c b/net/bluetooth/6lowpan.c
index acaf7c9e4a69..2f03b780b40d 100644
--- a/net/bluetooth/6lowpan.c
+++ b/net/bluetooth/6lowpan.c
@@ -1107,7 +1107,7 @@ static int lowpan_enable_set(void *data, u64 val)
{
struct set_enable *set_enable;
- set_enable = kzalloc_obj(*set_enable, GFP_KERNEL);
+ set_enable = kzalloc_obj(*set_enable);
if (!set_enable)
return -ENOMEM;
diff --git a/net/bluetooth/cmtp/capi.c b/net/bluetooth/cmtp/capi.c
index df4edd43176e..b95413bffa16 100644
--- a/net/bluetooth/cmtp/capi.c
+++ b/net/bluetooth/cmtp/capi.c
@@ -72,7 +72,7 @@
static struct cmtp_application *cmtp_application_add(struct cmtp_session *session, __u16 appl)
{
- struct cmtp_application *app = kzalloc_obj(*app, GFP_KERNEL);
+ struct cmtp_application *app = kzalloc_obj(*app);
BT_DBG("session %p application %p appl %u", session, app, appl);
diff --git a/net/bluetooth/cmtp/core.c b/net/bluetooth/cmtp/core.c
index ebfa049598dc..261aeeda3236 100644
--- a/net/bluetooth/cmtp/core.c
+++ b/net/bluetooth/cmtp/core.c
@@ -341,7 +341,7 @@ int cmtp_add_connection(struct cmtp_connadd_req *req, struct socket *sock)
if (req->flags & ~valid_flags)
return -EINVAL;
- session = kzalloc_obj(struct cmtp_session, GFP_KERNEL);
+ session = kzalloc_obj(struct cmtp_session);
if (!session)
return -ENOMEM;
diff --git a/net/bluetooth/hci_conn.c b/net/bluetooth/hci_conn.c
index 02d33fe11042..4719dac07190 100644
--- a/net/bluetooth/hci_conn.c
+++ b/net/bluetooth/hci_conn.c
@@ -462,7 +462,7 @@ bool hci_setup_sync(struct hci_conn *conn, __u16 handle)
struct conn_handle_t *conn_handle;
if (enhanced_sync_conn_capable(conn->hdev)) {
- conn_handle = kzalloc_obj(*conn_handle, GFP_KERNEL);
+ conn_handle = kzalloc_obj(*conn_handle);
if (!conn_handle)
return false;
@@ -726,7 +726,7 @@ static int hci_le_terminate_big(struct hci_dev *hdev, struct hci_conn *conn)
bt_dev_dbg(hdev, "big 0x%2.2x bis 0x%2.2x", conn->iso_qos.bcast.big,
conn->iso_qos.bcast.bis);
- d = kzalloc_obj(*d, GFP_KERNEL);
+ d = kzalloc_obj(*d);
if (!d)
return -ENOMEM;
@@ -777,7 +777,7 @@ static int hci_le_big_terminate(struct hci_dev *hdev, struct hci_conn *conn)
bt_dev_dbg(hdev, "hcon %p big 0x%2.2x sync_handle 0x%4.4x", conn,
conn->iso_qos.bcast.big, conn->sync_handle);
- d = kzalloc_obj(*d, GFP_KERNEL);
+ d = kzalloc_obj(*d);
if (!d)
return -ENOMEM;
@@ -960,7 +960,7 @@ static struct hci_conn *__hci_conn_add(struct hci_dev *hdev, int type,
bt_dev_dbg(hdev, "dst %pMR handle 0x%4.4x", dst, handle);
- conn = kzalloc_obj(*conn, GFP_KERNEL);
+ conn = kzalloc_obj(*conn);
if (!conn)
return ERR_PTR(-ENOMEM);
@@ -1739,7 +1739,7 @@ static struct hci_link *hci_conn_link(struct hci_conn *parent,
if (conn->parent)
return NULL;
- link = kzalloc_obj(*link, GFP_KERNEL);
+ link = kzalloc_obj(*link);
if (!link)
return NULL;
@@ -2781,7 +2781,7 @@ struct hci_chan *hci_chan_create(struct hci_conn *conn)
return NULL;
}
- chan = kzalloc_obj(*chan, GFP_KERNEL);
+ chan = kzalloc_obj(*chan);
if (!chan)
return NULL;
diff --git a/net/bluetooth/hci_core.c b/net/bluetooth/hci_core.c
index a0cad792be0b..7094f80de24e 100644
--- a/net/bluetooth/hci_core.c
+++ b/net/bluetooth/hci_core.c
@@ -262,7 +262,7 @@ u32 hci_inquiry_cache_update(struct hci_dev *hdev, struct inquiry_data *data,
}
/* Entry not in the cache. Add new one. */
- ie = kzalloc_obj(*ie, GFP_KERNEL);
+ ie = kzalloc_obj(*ie);
if (!ie) {
flags |= MGMT_DEV_FOUND_CONFIRM_NAME;
goto done;
@@ -1286,7 +1286,7 @@ struct link_key *hci_add_link_key(struct hci_dev *hdev, struct hci_conn *conn,
key = old_key;
} else {
old_key_type = conn ? conn->key_type : 0xff;
- key = kzalloc_obj(*key, GFP_KERNEL);
+ key = kzalloc_obj(*key);
if (!key)
return NULL;
list_add_rcu(&key->list, &hdev->link_keys);
@@ -1331,7 +1331,7 @@ struct smp_ltk *hci_add_ltk(struct hci_dev *hdev, bdaddr_t *bdaddr,
if (old_key)
key = old_key;
else {
- key = kzalloc_obj(*key, GFP_KERNEL);
+ key = kzalloc_obj(*key);
if (!key)
return NULL;
list_add_rcu(&key->list, &hdev->long_term_keys);
@@ -1356,7 +1356,7 @@ struct smp_irk *hci_add_irk(struct hci_dev *hdev, bdaddr_t *bdaddr,
irk = hci_find_irk_by_addr(hdev, bdaddr, addr_type);
if (!irk) {
- irk = kzalloc_obj(*irk, GFP_KERNEL);
+ irk = kzalloc_obj(*irk);
if (!irk)
return NULL;
@@ -1550,7 +1550,7 @@ int hci_add_remote_oob_data(struct hci_dev *hdev, bdaddr_t *bdaddr,
data = hci_find_remote_oob_data(hdev, bdaddr, bdaddr_type);
if (!data) {
- data = kmalloc_obj(*data, GFP_KERNEL);
+ data = kmalloc_obj(*data);
if (!data)
return -ENOMEM;
@@ -1718,7 +1718,7 @@ struct adv_info *hci_add_adv_instance(struct hci_dev *hdev, u8 instance,
instance < 1 || instance > hdev->le_num_of_adv_sets + 1)
return ERR_PTR(-EOVERFLOW);
- adv = kzalloc_obj(*adv, GFP_KERNEL);
+ adv = kzalloc_obj(*adv);
if (!adv)
return ERR_PTR(-ENOMEM);
@@ -2107,7 +2107,7 @@ int hci_bdaddr_list_add(struct list_head *list, bdaddr_t *bdaddr, u8 type)
if (hci_bdaddr_list_lookup(list, bdaddr, type))
return -EEXIST;
- entry = kzalloc_obj(*entry, GFP_KERNEL);
+ entry = kzalloc_obj(*entry);
if (!entry)
return -ENOMEM;
@@ -2130,7 +2130,7 @@ int hci_bdaddr_list_add_with_irk(struct list_head *list, bdaddr_t *bdaddr,
if (hci_bdaddr_list_lookup(list, bdaddr, type))
return -EEXIST;
- entry = kzalloc_obj(*entry, GFP_KERNEL);
+ entry = kzalloc_obj(*entry);
if (!entry)
return -ENOMEM;
@@ -2159,7 +2159,7 @@ int hci_bdaddr_list_add_with_flags(struct list_head *list, bdaddr_t *bdaddr,
if (hci_bdaddr_list_lookup(list, bdaddr, type))
return -EEXIST;
- entry = kzalloc_obj(*entry, GFP_KERNEL);
+ entry = kzalloc_obj(*entry);
if (!entry)
return -ENOMEM;
@@ -2276,7 +2276,7 @@ struct hci_conn_params *hci_conn_params_add(struct hci_dev *hdev,
if (params)
return params;
- params = kzalloc_obj(*params, GFP_KERNEL);
+ params = kzalloc_obj(*params);
if (!params) {
bt_dev_err(hdev, "out of memory");
return NULL;
diff --git a/net/bluetooth/hci_sync.c b/net/bluetooth/hci_sync.c
index ed5db3eb3df3..44c205ff9fa8 100644
--- a/net/bluetooth/hci_sync.c
+++ b/net/bluetooth/hci_sync.c
@@ -711,7 +711,7 @@ int hci_cmd_sync_submit(struct hci_dev *hdev, hci_cmd_sync_work_func_t func,
goto unlock;
}
- entry = kmalloc_obj(*entry, GFP_KERNEL);
+ entry = kmalloc_obj(*entry);
if (!entry) {
err = -ENOMEM;
goto unlock;
@@ -2685,7 +2685,7 @@ static struct conn_params *conn_params_copy(struct list_head *list, size_t *n)
rcu_read_unlock();
- p = kvzalloc_objs(struct conn_params, *n, GFP_KERNEL);
+ p = kvzalloc_objs(struct conn_params, *n);
if (!p)
return NULL;
@@ -7341,7 +7341,7 @@ int hci_past_sync(struct hci_conn *conn, struct hci_conn *le)
if (!past_sender_capable(conn->hdev))
return -EOPNOTSUPP;
- data = kmalloc_obj(*data, GFP_KERNEL);
+ data = kmalloc_obj(*data);
if (!data)
return -ENOMEM;
@@ -7473,7 +7473,7 @@ int hci_acl_change_pkt_type(struct hci_conn *conn, u16 pkt_type)
struct hci_dev *hdev = conn->hdev;
struct hci_cp_change_conn_ptype *cp;
- cp = kmalloc_obj(*cp, GFP_KERNEL);
+ cp = kmalloc_obj(*cp);
if (!cp)
return -ENOMEM;
@@ -7508,7 +7508,7 @@ int hci_le_set_phy(struct hci_conn *conn, u8 tx_phys, u8 rx_phys)
struct hci_dev *hdev = conn->hdev;
struct hci_cp_le_set_phy *cp;
- cp = kmalloc_obj(*cp, GFP_KERNEL);
+ cp = kmalloc_obj(*cp);
if (!cp)
return -ENOMEM;
diff --git a/net/bluetooth/hidp/core.c b/net/bluetooth/hidp/core.c
index a91d5452f24a..6fe815241b01 100644
--- a/net/bluetooth/hidp/core.c
+++ b/net/bluetooth/hidp/core.c
@@ -920,7 +920,7 @@ static int hidp_session_new(struct hidp_session **out, const bdaddr_t *bdaddr,
ctrl = bt_sk(ctrl_sock->sk);
intr = bt_sk(intr_sock->sk);
- session = kzalloc_obj(*session, GFP_KERNEL);
+ session = kzalloc_obj(*session);
if (!session)
return -ENOMEM;
diff --git a/net/bluetooth/iso.c b/net/bluetooth/iso.c
index 693271af6c22..ec61db89936b 100644
--- a/net/bluetooth/iso.c
+++ b/net/bluetooth/iso.c
@@ -212,7 +212,7 @@ static struct iso_conn *iso_conn_add(struct hci_conn *hcon)
return conn;
}
- conn = kzalloc_obj(*conn, GFP_KERNEL);
+ conn = kzalloc_obj(*conn);
if (!conn)
return NULL;
diff --git a/net/bluetooth/l2cap_core.c b/net/bluetooth/l2cap_core.c
index 4804377781b6..2ad1cb4cbde7 100644
--- a/net/bluetooth/l2cap_core.c
+++ b/net/bluetooth/l2cap_core.c
@@ -6902,7 +6902,7 @@ static struct l2cap_conn *l2cap_conn_add(struct hci_conn *hcon)
if (!hchan)
return NULL;
- conn = kzalloc_obj(*conn, GFP_KERNEL);
+ conn = kzalloc_obj(*conn);
if (!conn) {
hci_chan_del(hchan);
return NULL;
diff --git a/net/bluetooth/mgmt.c b/net/bluetooth/mgmt.c
index c9725ca3356c..1cfe03260d50 100644
--- a/net/bluetooth/mgmt.c
+++ b/net/bluetooth/mgmt.c
@@ -2767,7 +2767,7 @@ static int add_uuid(struct sock *sk, struct hci_dev *hdev, void *data, u16 len)
goto failed;
}
- uuid = kmalloc_obj(*uuid, GFP_KERNEL);
+ uuid = kmalloc_obj(*uuid);
if (!uuid) {
err = -ENOMEM;
goto failed;
@@ -4377,7 +4377,7 @@ static int set_blocked_keys(struct sock *sk, struct hci_dev *hdev, void *data,
hci_blocked_keys_clear(hdev);
for (i = 0; i < key_count; ++i) {
- struct blocked_key *b = kzalloc_obj(*b, GFP_KERNEL);
+ struct blocked_key *b = kzalloc_obj(*b);
if (!b) {
err = MGMT_STATUS_NO_RESOURCES;
@@ -5490,7 +5490,7 @@ static u8 parse_adv_monitor_pattern(struct adv_monitor *m, u8 pattern_count,
(offset + length) > HCI_MAX_AD_LENGTH)
return MGMT_STATUS_INVALID_PARAMS;
- p = kmalloc_obj(*p, GFP_KERNEL);
+ p = kmalloc_obj(*p);
if (!p)
return MGMT_STATUS_NO_RESOURCES;
@@ -5527,7 +5527,7 @@ static int add_adv_patterns_monitor(struct sock *sk, struct hci_dev *hdev,
goto done;
}
- m = kzalloc_obj(*m, GFP_KERNEL);
+ m = kzalloc_obj(*m);
if (!m) {
status = MGMT_STATUS_NO_RESOURCES;
goto done;
@@ -5564,7 +5564,7 @@ static int add_adv_patterns_monitor_rssi(struct sock *sk, struct hci_dev *hdev,
goto done;
}
- m = kzalloc_obj(*m, GFP_KERNEL);
+ m = kzalloc_obj(*m);
if (!m) {
status = MGMT_STATUS_NO_RESOURCES;
goto done;
diff --git a/net/bluetooth/mgmt_util.c b/net/bluetooth/mgmt_util.c
index 4ed16ca8771d..4f19654d41a9 100644
--- a/net/bluetooth/mgmt_util.c
+++ b/net/bluetooth/mgmt_util.c
@@ -266,7 +266,7 @@ struct mgmt_pending_cmd *mgmt_pending_new(struct sock *sk, u16 opcode,
{
struct mgmt_pending_cmd *cmd;
- cmd = kzalloc_obj(*cmd, GFP_KERNEL);
+ cmd = kzalloc_obj(*cmd);
if (!cmd)
return NULL;
@@ -413,7 +413,7 @@ struct mgmt_mesh_tx *mgmt_mesh_add(struct sock *sk, struct hci_dev *hdev,
{
struct mgmt_mesh_tx *mesh_tx;
- mesh_tx = kzalloc_obj(*mesh_tx, GFP_KERNEL);
+ mesh_tx = kzalloc_obj(*mesh_tx);
if (!mesh_tx)
return NULL;
diff --git a/net/bluetooth/msft.c b/net/bluetooth/msft.c
index 25cde1ea5d23..2f008167cbaa 100644
--- a/net/bluetooth/msft.c
+++ b/net/bluetooth/msft.c
@@ -276,7 +276,7 @@ static int msft_le_monitor_advertisement_cb(struct hci_dev *hdev, u16 opcode,
if (status)
goto unlock;
- handle_data = kmalloc_obj(*handle_data, GFP_KERNEL);
+ handle_data = kmalloc_obj(*handle_data);
if (!handle_data) {
status = HCI_ERROR_UNSPECIFIED;
goto unlock;
@@ -756,7 +756,7 @@ void msft_register(struct hci_dev *hdev)
bt_dev_dbg(hdev, "Register MSFT extension");
- msft = kzalloc_obj(*msft, GFP_KERNEL);
+ msft = kzalloc_obj(*msft);
if (!msft) {
bt_dev_err(hdev, "Failed to register MSFT extension");
return;
@@ -790,7 +790,7 @@ static void msft_device_found(struct hci_dev *hdev, bdaddr_t *bdaddr,
{
struct monitored_device *dev;
- dev = kmalloc_obj(*dev, GFP_KERNEL);
+ dev = kmalloc_obj(*dev);
if (!dev) {
bt_dev_err(hdev, "MSFT vendor event %u: no memory",
MSFT_EV_LE_MONITOR_DEVICE);
@@ -932,7 +932,7 @@ static struct msft_monitor_addr_filter_data *msft_add_address_filter
struct msft_data *msft = hdev->msft_data;
int err;
- address_filter = kzalloc_obj(*address_filter, GFP_KERNEL);
+ address_filter = kzalloc_obj(*address_filter);
if (!address_filter)
return NULL;
diff --git a/net/bluetooth/rfcomm/core.c b/net/bluetooth/rfcomm/core.c
index d7718844c520..611a9a94151e 100644
--- a/net/bluetooth/rfcomm/core.c
+++ b/net/bluetooth/rfcomm/core.c
@@ -680,7 +680,7 @@ int rfcomm_dlc_get_modem_status(struct rfcomm_dlc *d, u8 *v24_sig)
/* ---- RFCOMM sessions ---- */
static struct rfcomm_session *rfcomm_session_add(struct socket *sock, int state)
{
- struct rfcomm_session *s = kzalloc_obj(*s, GFP_KERNEL);
+ struct rfcomm_session *s = kzalloc_obj(*s);
if (!s)
return NULL;
diff --git a/net/bluetooth/rfcomm/tty.c b/net/bluetooth/rfcomm/tty.c
index 4d8ab1a49e92..b65feeba1b30 100644
--- a/net/bluetooth/rfcomm/tty.c
+++ b/net/bluetooth/rfcomm/tty.c
@@ -221,7 +221,7 @@ static struct rfcomm_dev *__rfcomm_dev_add(struct rfcomm_dev_req *req,
struct list_head *head = &rfcomm_dev_list;
int err = 0;
- dev = kzalloc_obj(struct rfcomm_dev, GFP_KERNEL);
+ dev = kzalloc_obj(struct rfcomm_dev);
if (!dev)
return ERR_PTR(-ENOMEM);
diff --git a/net/bluetooth/sco.c b/net/bluetooth/sco.c
index 26c5c5fe7c5a..70a378ff168e 100644
--- a/net/bluetooth/sco.c
+++ b/net/bluetooth/sco.c
@@ -204,7 +204,7 @@ static struct sco_conn *sco_conn_add(struct hci_conn *hcon)
return conn;
}
- conn = kzalloc_obj(struct sco_conn, GFP_KERNEL);
+ conn = kzalloc_obj(struct sco_conn);
if (!conn)
return NULL;
diff --git a/net/bluetooth/smp.c b/net/bluetooth/smp.c
index e0e66dc95007..e67bf7b34ea7 100644
--- a/net/bluetooth/smp.c
+++ b/net/bluetooth/smp.c
@@ -1344,7 +1344,7 @@ static void smp_distribute_keys(struct smp_chan *smp)
/* Generate a new random key */
get_random_bytes(sign.csrk, sizeof(sign.csrk));
- csrk = kzalloc_obj(*csrk, GFP_KERNEL);
+ csrk = kzalloc_obj(*csrk);
if (csrk) {
if (hcon->sec_level > BT_SECURITY_MEDIUM)
csrk->type = MGMT_CSRK_LOCAL_AUTHENTICATED;
@@ -2664,7 +2664,7 @@ static int smp_cmd_sign_info(struct l2cap_conn *conn, struct sk_buff *skb)
skb_pull(skb, sizeof(*rp));
- csrk = kzalloc_obj(*csrk, GFP_KERNEL);
+ csrk = kzalloc_obj(*csrk);
if (csrk) {
if (conn->hcon->sec_level > BT_SECURITY_MEDIUM)
csrk->type = MGMT_CSRK_REMOTE_AUTHENTICATED;
@@ -3293,7 +3293,7 @@ static struct l2cap_chan *smp_add_cid(struct hci_dev *hdev, u16 cid)
goto create_chan;
}
- smp = kzalloc_obj(*smp, GFP_KERNEL);
+ smp = kzalloc_obj(*smp);
if (!smp)
return ERR_PTR(-ENOMEM);
diff --git a/net/bpf/bpf_dummy_struct_ops.c b/net/bpf/bpf_dummy_struct_ops.c
index 52117422e0f2..ae5a54c350b9 100644
--- a/net/bpf/bpf_dummy_struct_ops.c
+++ b/net/bpf/bpf_dummy_struct_ops.c
@@ -36,7 +36,7 @@ dummy_ops_init_args(const union bpf_attr *kattr, unsigned int nr)
if (size_in != sizeof(u64) * nr)
return ERR_PTR(-EINVAL);
- args = kzalloc_obj(*args, GFP_KERNEL);
+ args = kzalloc_obj(*args);
if (!args)
return ERR_PTR(-ENOMEM);
@@ -158,7 +158,7 @@ int bpf_struct_ops_test_run(struct bpf_prog *prog, const union bpf_attr *kattr,
if (err)
goto out;
- tlinks = kzalloc_objs(*tlinks, BPF_TRAMP_MAX, GFP_KERNEL);
+ tlinks = kzalloc_objs(*tlinks, BPF_TRAMP_MAX);
if (!tlinks) {
err = -ENOMEM;
goto out;
diff --git a/net/bridge/br_cfm.c b/net/bridge/br_cfm.c
index a2276ce350fa..2c70fe47de38 100644
--- a/net/bridge/br_cfm.c
+++ b/net/bridge/br_cfm.c
@@ -547,7 +547,7 @@ int br_cfm_mep_create(struct net_bridge *br,
}
}
- mep = kzalloc_obj(*mep, GFP_KERNEL);
+ mep = kzalloc_obj(*mep);
if (!mep)
return -ENOMEM;
@@ -693,7 +693,7 @@ int br_cfm_cc_peer_mep_add(struct net_bridge *br, const u32 instance,
return -EEXIST;
}
- peer_mep = kzalloc_obj(*peer_mep, GFP_KERNEL);
+ peer_mep = kzalloc_obj(*peer_mep);
if (!peer_mep)
return -ENOMEM;
diff --git a/net/bridge/br_device.c b/net/bridge/br_device.c
index 1a3bcb5dd955..ee01122f466f 100644
--- a/net/bridge/br_device.c
+++ b/net/bridge/br_device.c
@@ -308,7 +308,7 @@ static int __br_netpoll_enable(struct net_bridge_port *p)
struct netpoll *np;
int err;
- np = kzalloc_obj(*p->np, GFP_KERNEL);
+ np = kzalloc_obj(*p->np);
if (!np)
return -ENOMEM;
diff --git a/net/bridge/br_if.c b/net/bridge/br_if.c
index 4737ee16bebb..d39571e13744 100644
--- a/net/bridge/br_if.c
+++ b/net/bridge/br_if.c
@@ -429,7 +429,7 @@ static struct net_bridge_port *new_nbp(struct net_bridge *br,
if (index < 0)
return ERR_PTR(index);
- p = kzalloc_obj(*p, GFP_KERNEL);
+ p = kzalloc_obj(*p);
if (p == NULL)
return ERR_PTR(-ENOMEM);
diff --git a/net/bridge/br_ioctl.c b/net/bridge/br_ioctl.c
index 7245ca29c5ea..766c43b327af 100644
--- a/net/bridge/br_ioctl.c
+++ b/net/bridge/br_ioctl.c
@@ -204,7 +204,7 @@ int br_dev_siocdevprivate(struct net_device *dev, struct ifreq *rq,
if (num > BR_MAX_PORTS)
num = BR_MAX_PORTS;
- indices = kzalloc_objs(int, num, GFP_KERNEL);
+ indices = kzalloc_objs(int, num);
if (indices == NULL)
return -ENOMEM;
@@ -357,7 +357,7 @@ static int old_deviceless(struct net *net, void __user *data)
if (args[2] >= 2048)
return -ENOMEM;
- indices = kzalloc_objs(int, args[2], GFP_KERNEL);
+ indices = kzalloc_objs(int, args[2]);
if (indices == NULL)
return -ENOMEM;
diff --git a/net/bridge/br_mrp.c b/net/bridge/br_mrp.c
index d587f99afef6..f1aa67f7a051 100644
--- a/net/bridge/br_mrp.c
+++ b/net/bridge/br_mrp.c
@@ -516,7 +516,7 @@ int br_mrp_add(struct net_bridge *br, struct br_mrp_instance *instance)
!br_mrp_unique_ifindex(br, instance->s_ifindex))
return -EINVAL;
- mrp = kzalloc_obj(*mrp, GFP_KERNEL);
+ mrp = kzalloc_obj(*mrp);
if (!mrp)
return -ENOMEM;
diff --git a/net/bridge/br_vlan.c b/net/bridge/br_vlan.c
index e3a5eb9e6ed1..326933b455b3 100644
--- a/net/bridge/br_vlan.c
+++ b/net/bridge/br_vlan.c
@@ -787,7 +787,7 @@ int br_vlan_add(struct net_bridge *br, u16 vid, u16 flags, bool *changed,
return br_vlan_add_existing(br, vg, vlan, flags, changed,
extack);
- vlan = kzalloc_obj(*vlan, GFP_KERNEL);
+ vlan = kzalloc_obj(*vlan);
if (!vlan)
return -ENOMEM;
@@ -1224,7 +1224,7 @@ int br_vlan_init(struct net_bridge *br)
struct net_bridge_vlan_group *vg;
int ret = -ENOMEM;
- vg = kzalloc_obj(*vg, GFP_KERNEL);
+ vg = kzalloc_obj(*vg);
if (!vg)
goto out;
ret = rhashtable_init(&vg->vlan_hash, &br_vlan_rht_params);
@@ -1260,7 +1260,7 @@ int nbp_vlan_init(struct net_bridge_port *p, struct netlink_ext_ack *extack)
struct net_bridge_vlan_group *vg;
int ret = -ENOMEM;
- vg = kzalloc_obj(struct net_bridge_vlan_group, GFP_KERNEL);
+ vg = kzalloc_obj(struct net_bridge_vlan_group);
if (!vg)
goto out;
@@ -1334,7 +1334,7 @@ int nbp_vlan_add(struct net_bridge_port *port, u16 vid, u16 flags,
return 0;
}
- vlan = kzalloc_obj(*vlan, GFP_KERNEL);
+ vlan = kzalloc_obj(*vlan);
if (!vlan)
return -ENOMEM;
diff --git a/net/bridge/netfilter/ebtables.c b/net/bridge/netfilter/ebtables.c
index f01efd0b139e..aea3e19875c6 100644
--- a/net/bridge/netfilter/ebtables.c
+++ b/net/bridge/netfilter/ebtables.c
@@ -1303,7 +1303,7 @@ int ebt_register_template(const struct ebt_table *t, int (*table_init)(struct ne
}
}
- tmpl = kzalloc_obj(*tmpl, GFP_KERNEL);
+ tmpl = kzalloc_obj(*tmpl);
if (!tmpl) {
mutex_unlock(&ebt_mutex);
return -ENOMEM;
diff --git a/net/caif/caif_dev.c b/net/caif/caif_dev.c
index 18f7769405f9..922de3d611c0 100644
--- a/net/caif/caif_dev.c
+++ b/net/caif/caif_dev.c
@@ -94,7 +94,7 @@ static struct caif_device_entry *caif_device_alloc(struct net_device *dev)
{
struct caif_device_entry *caifd;
- caifd = kzalloc_obj(*caifd, GFP_KERNEL);
+ caifd = kzalloc_obj(*caifd);
if (!caifd)
return NULL;
caifd->pcpu_refcnt = alloc_percpu(int);
diff --git a/net/caif/cfctrl.c b/net/caif/cfctrl.c
index 566546da4152..c6cc2bfed65d 100644
--- a/net/caif/cfctrl.c
+++ b/net/caif/cfctrl.c
@@ -270,7 +270,7 @@ int cfctrl_linkup_request(struct cflayer *layer,
cfpkt_destroy(pkt);
return -EINVAL;
}
- req = kzalloc_obj(*req, GFP_KERNEL);
+ req = kzalloc_obj(*req);
if (!req) {
cfpkt_destroy(pkt);
return -ENOMEM;
diff --git a/net/can/af_can.c b/net/can/af_can.c
index 6fa0dd649d0c..e80e516bfde9 100644
--- a/net/can/af_can.c
+++ b/net/can/af_can.c
@@ -802,7 +802,7 @@ static int can_pernet_init(struct net *net)
GFP_KERNEL);
if (!net->can.rx_alldev_list)
goto out;
- net->can.pkg_stats = kzalloc_obj(*net->can.pkg_stats, GFP_KERNEL);
+ net->can.pkg_stats = kzalloc_obj(*net->can.pkg_stats);
if (!net->can.pkg_stats)
goto out_free_rx_alldev_list;
net->can.rcv_lists_stats = kzalloc_obj(*net->can.rcv_lists_stats,
diff --git a/net/can/gw.c b/net/can/gw.c
index c6cf4cb72891..8ee4d67a07d3 100644
--- a/net/can/gw.c
+++ b/net/can/gw.c
@@ -1099,7 +1099,7 @@ static int cgw_create_job(struct sk_buff *skb, struct nlmsghdr *nlh,
if (r->gwtype != CGW_TYPE_CAN_CAN)
return -EINVAL;
- mod = kmalloc_obj(*mod, GFP_KERNEL);
+ mod = kmalloc_obj(*mod);
if (!mod)
return -ENOMEM;
diff --git a/net/can/j1939/main.c b/net/can/j1939/main.c
index 45b718c680e0..9937c04241bc 100644
--- a/net/can/j1939/main.c
+++ b/net/can/j1939/main.c
@@ -128,7 +128,7 @@ static struct j1939_priv *j1939_priv_create(struct net_device *ndev)
{
struct j1939_priv *priv;
- priv = kzalloc_obj(*priv, GFP_KERNEL);
+ priv = kzalloc_obj(*priv);
if (!priv)
return NULL;
diff --git a/net/ceph/ceph_common.c b/net/ceph/ceph_common.c
index 455787422784..952121849180 100644
--- a/net/ceph/ceph_common.c
+++ b/net/ceph/ceph_common.c
@@ -309,12 +309,12 @@ struct ceph_options *ceph_alloc_options(void)
{
struct ceph_options *opt;
- opt = kzalloc_obj(*opt, GFP_KERNEL);
+ opt = kzalloc_obj(*opt);
if (!opt)
return NULL;
opt->crush_locs = RB_ROOT;
- opt->mon_addr = kzalloc_objs(*opt->mon_addr, CEPH_MAX_MON, GFP_KERNEL);
+ opt->mon_addr = kzalloc_objs(*opt->mon_addr, CEPH_MAX_MON);
if (!opt->mon_addr) {
kfree(opt);
return NULL;
@@ -455,7 +455,7 @@ int ceph_parse_param(struct fs_parameter *param, struct ceph_options *opt,
ceph_crypto_key_destroy(opt->key);
kfree(opt->key);
- opt->key = kzalloc_obj(*opt->key, GFP_KERNEL);
+ opt->key = kzalloc_obj(*opt->key);
if (!opt->key)
return -ENOMEM;
err = ceph_crypto_key_unarmor(opt->key, param->string);
@@ -468,7 +468,7 @@ int ceph_parse_param(struct fs_parameter *param, struct ceph_options *opt,
ceph_crypto_key_destroy(opt->key);
kfree(opt->key);
- opt->key = kzalloc_obj(*opt->key, GFP_KERNEL);
+ opt->key = kzalloc_obj(*opt->key);
if (!opt->key)
return -ENOMEM;
return get_secret(opt->key, param->string, &log);
@@ -713,7 +713,7 @@ struct ceph_client *ceph_create_client(struct ceph_options *opt, void *private)
if (err < 0)
return ERR_PTR(err);
- client = kzalloc_obj(*client, GFP_KERNEL);
+ client = kzalloc_obj(*client);
if (client == NULL)
return ERR_PTR(-ENOMEM);
diff --git a/net/ceph/crypto.c b/net/ceph/crypto.c
index ef8a98c1174f..de7496791c91 100644
--- a/net/ceph/crypto.c
+++ b/net/ceph/crypto.c
@@ -466,7 +466,7 @@ static int ceph_key_preparse(struct key_preparsed_payload *prep)
goto err;
ret = -ENOMEM;
- ckey = kzalloc_obj(*ckey, GFP_KERNEL);
+ ckey = kzalloc_obj(*ckey);
if (!ckey)
goto err;
diff --git a/net/core/dev.c b/net/core/dev.c
index 525cf5952101..b91aabb18bbe 100644
--- a/net/core/dev.c
+++ b/net/core/dev.c
@@ -273,7 +273,7 @@ static struct netdev_name_node *netdev_name_node_alloc(struct net_device *dev,
{
struct netdev_name_node *name_node;
- name_node = kmalloc_obj(*name_node, GFP_KERNEL);
+ name_node = kmalloc_obj(*name_node);
if (!name_node)
return NULL;
INIT_HLIST_NODE(&name_node->hlist);
@@ -8693,7 +8693,7 @@ static int __netdev_adjacent_dev_insert(struct net_device *dev,
return 0;
}
- adj = kmalloc_obj(*adj, GFP_KERNEL);
+ adj = kmalloc_obj(*adj);
if (!adj)
return -ENOMEM;
@@ -11940,7 +11940,7 @@ struct netdev_queue *dev_ingress_queue_create(struct net_device *dev)
#ifdef CONFIG_NET_CLS_ACT
if (queue)
return queue;
- queue = kzalloc_obj(*queue, GFP_KERNEL);
+ queue = kzalloc_obj(*queue);
if (!queue)
return NULL;
netdev_init_one_queue(dev, queue, NULL);
@@ -12857,7 +12857,7 @@ static struct hlist_head * __net_init netdev_create_hash(void)
int i;
struct hlist_head *hash;
- hash = kmalloc_objs(*hash, NETDEV_HASHENTRIES, GFP_KERNEL);
+ hash = kmalloc_objs(*hash, NETDEV_HASHENTRIES);
if (hash != NULL)
for (i = 0; i < NETDEV_HASHENTRIES; i++)
INIT_HLIST_HEAD(&hash[i]);
diff --git a/net/core/drop_monitor.c b/net/core/drop_monitor.c
index 99f9d4dfb866..da0d231e1952 100644
--- a/net/core/drop_monitor.c
+++ b/net/core/drop_monitor.c
@@ -1583,7 +1583,7 @@ static int dropmon_net_event(struct notifier_block *ev_block,
case NETDEV_REGISTER:
if (WARN_ON_ONCE(rtnl_dereference(dev->dm_private)))
break;
- stat = kzalloc_obj(*stat, GFP_KERNEL);
+ stat = kzalloc_obj(*stat);
if (!stat)
break;
diff --git a/net/core/failover.c b/net/core/failover.c
index fcc04e6995d0..0eb2e0ec875b 100644
--- a/net/core/failover.c
+++ b/net/core/failover.c
@@ -247,7 +247,7 @@ struct failover *failover_register(struct net_device *dev,
if (dev->type != ARPHRD_ETHER)
return ERR_PTR(-EINVAL);
- failover = kzalloc_obj(*failover, GFP_KERNEL);
+ failover = kzalloc_obj(*failover);
if (!failover)
return ERR_PTR(-ENOMEM);
diff --git a/net/core/filter.c b/net/core/filter.c
index 6957d3449f2c..0d5d5a17acb2 100644
--- a/net/core/filter.c
+++ b/net/core/filter.c
@@ -1161,7 +1161,7 @@ static int bpf_prog_store_orig_filter(struct bpf_prog *fp,
unsigned int fsize = bpf_classic_proglen(fprog);
struct sock_fprog_kern *fkprog;
- fp->orig_prog = kmalloc_obj(*fkprog, GFP_KERNEL);
+ fp->orig_prog = kmalloc_obj(*fkprog);
if (!fp->orig_prog)
return -ENOMEM;
@@ -1481,7 +1481,7 @@ static int __sk_attach_prog(struct bpf_prog *prog, struct sock *sk)
{
struct sk_filter *fp, *old_fp;
- fp = kmalloc_obj(*fp, GFP_KERNEL);
+ fp = kmalloc_obj(*fp);
if (!fp)
return -ENOMEM;
diff --git a/net/core/flow_offload.c b/net/core/flow_offload.c
index 630f94e2c2c1..c55bf9d5ac8c 100644
--- a/net/core/flow_offload.c
+++ b/net/core/flow_offload.c
@@ -263,7 +263,7 @@ struct flow_block_cb *flow_block_cb_alloc(flow_setup_cb_t *cb,
{
struct flow_block_cb *block_cb;
- block_cb = kzalloc_obj(*block_cb, GFP_KERNEL);
+ block_cb = kzalloc_obj(*block_cb);
if (!block_cb)
return ERR_PTR(-ENOMEM);
@@ -390,7 +390,7 @@ static struct flow_indr_dev *flow_indr_dev_alloc(flow_indr_block_bind_cb_t *cb,
{
struct flow_indr_dev *indr_dev;
- indr_dev = kmalloc_obj(*indr_dev, GFP_KERNEL);
+ indr_dev = kmalloc_obj(*indr_dev);
if (!indr_dev)
return NULL;
@@ -570,7 +570,7 @@ static int indir_dev_add(void *data, struct net_device *dev, struct Qdisc *sch,
if (info)
return -EEXIST;
- info = kzalloc_obj(*info, GFP_KERNEL);
+ info = kzalloc_obj(*info);
if (!info)
return -ENOMEM;
diff --git a/net/core/gen_estimator.c b/net/core/gen_estimator.c
index 64d0d55fa2b2..c34e58c6c3e6 100644
--- a/net/core/gen_estimator.c
+++ b/net/core/gen_estimator.c
@@ -154,7 +154,7 @@ int gen_new_estimator(struct gnet_stats_basic_sync *bstats,
if (parm->ewma_log == 0 || parm->ewma_log >= 31)
return -EINVAL;
- est = kzalloc_obj(*est, GFP_KERNEL);
+ est = kzalloc_obj(*est);
if (!est)
return -ENOBUFS;
diff --git a/net/core/net_namespace.c b/net/core/net_namespace.c
index 7a040a9233e7..1057d16d5dd2 100644
--- a/net/core/net_namespace.c
+++ b/net/core/net_namespace.c
@@ -492,7 +492,7 @@ static struct net *net_alloc(void)
goto out_free;
#ifdef CONFIG_KEYS
- net->key_domain = kzalloc_obj(struct key_tag, GFP_KERNEL);
+ net->key_domain = kzalloc_obj(struct key_tag);
if (!net->key_domain)
goto out_free_2;
refcount_set(&net->key_domain->usage, 1);
diff --git a/net/core/netclassid_cgroup.c b/net/core/netclassid_cgroup.c
index 9267880a0a17..e1e30f0b60cd 100644
--- a/net/core/netclassid_cgroup.c
+++ b/net/core/netclassid_cgroup.c
@@ -32,7 +32,7 @@ cgrp_css_alloc(struct cgroup_subsys_state *parent_css)
{
struct cgroup_cls_state *cs;
- cs = kzalloc_obj(*cs, GFP_KERNEL);
+ cs = kzalloc_obj(*cs);
if (!cs)
return ERR_PTR(-ENOMEM);
diff --git a/net/core/netpoll.c b/net/core/netpoll.c
index 70e458893ea5..a8558a52884f 100644
--- a/net/core/netpoll.c
+++ b/net/core/netpoll.c
@@ -565,7 +565,7 @@ int __netpoll_setup(struct netpoll *np, struct net_device *ndev)
npinfo = rtnl_dereference(ndev->npinfo);
if (!npinfo) {
- npinfo = kmalloc_obj(*npinfo, GFP_KERNEL);
+ npinfo = kmalloc_obj(*npinfo);
if (!npinfo) {
err = -ENOMEM;
goto out;
diff --git a/net/core/netprio_cgroup.c b/net/core/netprio_cgroup.c
index fb3cd2886e1f..76c33ab44761 100644
--- a/net/core/netprio_cgroup.c
+++ b/net/core/netprio_cgroup.c
@@ -135,7 +135,7 @@ cgrp_css_alloc(struct cgroup_subsys_state *parent_css)
{
struct cgroup_subsys_state *css;
- css = kzalloc_obj(*css, GFP_KERNEL);
+ css = kzalloc_obj(*css);
if (!css)
return ERR_PTR(-ENOMEM);
diff --git a/net/core/rtnetlink.c b/net/core/rtnetlink.c
index da268fc45356..dad4b1054955 100644
--- a/net/core/rtnetlink.c
+++ b/net/core/rtnetlink.c
@@ -414,7 +414,7 @@ static int rtnl_register_internal(struct module *owner,
if (!link)
goto unlock;
} else {
- link = kzalloc_obj(*link, GFP_KERNEL);
+ link = kzalloc_obj(*link);
if (!link)
goto unlock;
}
@@ -3969,7 +3969,7 @@ static int rtnl_newlink(struct sk_buff *skb, struct nlmsghdr *nlh,
int ops_srcu_index;
int ret;
- tbs = kmalloc_obj(*tbs, GFP_KERNEL);
+ tbs = kmalloc_obj(*tbs);
if (!tbs)
return -ENOMEM;
diff --git a/net/core/selftests.c b/net/core/selftests.c
index 248112bd51a8..0a203d3fb9dc 100644
--- a/net/core/selftests.c
+++ b/net/core/selftests.c
@@ -237,7 +237,7 @@ static int __net_test_loopback(struct net_device *ndev,
struct sk_buff *skb = NULL;
int ret = 0;
- tpriv = kzalloc_obj(*tpriv, GFP_KERNEL);
+ tpriv = kzalloc_obj(*tpriv);
if (!tpriv)
return -ENOMEM;
diff --git a/net/core/sock.c b/net/core/sock.c
index b62e509e06d9..5976100a9d55 100644
--- a/net/core/sock.c
+++ b/net/core/sock.c
@@ -1097,7 +1097,7 @@ sock_devmem_dontneed(struct sock *sk, sockptr_t optval, unsigned int optlen)
return -EINVAL;
num_tokens = optlen / sizeof(*tokens);
- tokens = kvmalloc_objs(*tokens, num_tokens, GFP_KERNEL);
+ tokens = kvmalloc_objs(*tokens, num_tokens);
if (!tokens)
return -ENOMEM;
diff --git a/net/core/xdp.c b/net/core/xdp.c
index 8c65d7dafd89..9890a30584ba 100644
--- a/net/core/xdp.c
+++ b/net/core/xdp.c
@@ -214,7 +214,7 @@ static int __mem_id_init_hash_table(void)
if (unlikely(mem_id_init))
return 0;
- rht = kzalloc_obj(*rht, GFP_KERNEL);
+ rht = kzalloc_obj(*rht);
if (!rht)
return -ENOMEM;
diff --git a/net/dcb/dcbnl.c b/net/dcb/dcbnl.c
index ff2198133213..35164bfa563d 100644
--- a/net/dcb/dcbnl.c
+++ b/net/dcb/dcbnl.c
@@ -1021,7 +1021,7 @@ static int dcbnl_build_peer_app(struct net_device *netdev, struct sk_buff* skb,
*/
err = ops->peer_getappinfo(netdev, &info, &app_count);
if (!err && app_count) {
- table = kmalloc_objs(struct dcb_app, app_count, GFP_KERNEL);
+ table = kmalloc_objs(struct dcb_app, app_count);
if (!table)
return -ENOMEM;
diff --git a/net/devlink/core.c b/net/devlink/core.c
index 44584f3613ca..0b020f69cef1 100644
--- a/net/devlink/core.c
+++ b/net/devlink/core.c
@@ -111,7 +111,7 @@ static struct devlink_rel *devlink_rel_alloc(void)
static u32 next;
int err;
- rel = kzalloc_obj(*rel, GFP_KERNEL);
+ rel = kzalloc_obj(*rel);
if (!rel)
return ERR_PTR(-ENOMEM);
diff --git a/net/devlink/dpipe.c b/net/devlink/dpipe.c
index 3b86dc25e7f2..c8d4a4374ae1 100644
--- a/net/devlink/dpipe.c
+++ b/net/devlink/dpipe.c
@@ -851,7 +851,7 @@ int devl_dpipe_table_register(struct devlink *devlink,
devlink))
return -EEXIST;
- table = kzalloc_obj(*table, GFP_KERNEL);
+ table = kzalloc_obj(*table);
if (!table)
return -ENOMEM;
diff --git a/net/devlink/health.c b/net/devlink/health.c
index 0578f7b460f5..449c7611c640 100644
--- a/net/devlink/health.c
+++ b/net/devlink/health.c
@@ -32,7 +32,7 @@ static struct devlink_fmsg *devlink_fmsg_alloc(void)
{
struct devlink_fmsg *fmsg;
- fmsg = kzalloc_obj(*fmsg, GFP_KERNEL);
+ fmsg = kzalloc_obj(*fmsg);
if (!fmsg)
return NULL;
@@ -119,7 +119,7 @@ __devlink_health_reporter_create(struct devlink *devlink,
if (WARN_ON(ops->default_burst_period && !ops->default_graceful_period))
return ERR_PTR(-EINVAL);
- reporter = kzalloc_obj(*reporter, GFP_KERNEL);
+ reporter = kzalloc_obj(*reporter);
if (!reporter)
return ERR_PTR(-ENOMEM);
@@ -738,7 +738,7 @@ static void devlink_fmsg_nest_common(struct devlink_fmsg *fmsg, int attrtype)
if (fmsg->err)
return;
- item = kzalloc_obj(*item, GFP_KERNEL);
+ item = kzalloc_obj(*item);
if (!item) {
fmsg->err = -ENOMEM;
return;
diff --git a/net/devlink/linecard.c b/net/devlink/linecard.c
index 110f1347b9c6..8315d35cb91d 100644
--- a/net/devlink/linecard.c
+++ b/net/devlink/linecard.c
@@ -404,7 +404,7 @@ static int devlink_linecard_types_init(struct devlink_linecard *linecard)
int i;
count = linecard->ops->types_count(linecard, linecard->priv);
- linecard->types = kmalloc_objs(*linecard_type, count, GFP_KERNEL);
+ linecard->types = kmalloc_objs(*linecard_type, count);
if (!linecard->types)
return -ENOMEM;
linecard->types_count = count;
@@ -450,7 +450,7 @@ devl_linecard_create(struct devlink *devlink, unsigned int linecard_index,
if (devlink_linecard_index_exists(devlink, linecard_index))
return ERR_PTR(-EEXIST);
- linecard = kzalloc_obj(*linecard, GFP_KERNEL);
+ linecard = kzalloc_obj(*linecard);
if (!linecard)
return ERR_PTR(-ENOMEM);
diff --git a/net/devlink/param.c b/net/devlink/param.c
index 74adb0fdb5f7..cf95268da5b0 100644
--- a/net/devlink/param.c
+++ b/net/devlink/param.c
@@ -718,7 +718,7 @@ static int devlink_param_register(struct devlink *devlink,
else
WARN_ON(!param->get || !param->set);
- param_item = kzalloc_obj(*param_item, GFP_KERNEL);
+ param_item = kzalloc_obj(*param_item);
if (!param_item)
return -ENOMEM;
diff --git a/net/devlink/rate.c b/net/devlink/rate.c
index 8d8a688ad140..41be2d6c2954 100644
--- a/net/devlink/rate.c
+++ b/net/devlink/rate.c
@@ -627,7 +627,7 @@ int devlink_nl_rate_new_doit(struct sk_buff *skb, struct genl_info *info)
else if (rate_node == ERR_PTR(-EINVAL))
return -EINVAL;
- rate_node = kzalloc_obj(*rate_node, GFP_KERNEL);
+ rate_node = kzalloc_obj(*rate_node);
if (!rate_node)
return -ENOMEM;
@@ -721,7 +721,7 @@ devl_rate_node_create(struct devlink *devlink, void *priv, char *node_name,
if (!IS_ERR(rate_node))
return ERR_PTR(-EEXIST);
- rate_node = kzalloc_obj(*rate_node, GFP_KERNEL);
+ rate_node = kzalloc_obj(*rate_node);
if (!rate_node)
return ERR_PTR(-ENOMEM);
@@ -766,7 +766,7 @@ int devl_rate_leaf_create(struct devlink_port *devlink_port, void *priv,
if (WARN_ON(devlink_port->devlink_rate))
return -EBUSY;
- devlink_rate = kzalloc_obj(*devlink_rate, GFP_KERNEL);
+ devlink_rate = kzalloc_obj(*devlink_rate);
if (!devlink_rate)
return -ENOMEM;
diff --git a/net/devlink/region.c b/net/devlink/region.c
index 654e3766710f..5588e3d560b9 100644
--- a/net/devlink/region.c
+++ b/net/devlink/region.c
@@ -428,7 +428,7 @@ __devlink_region_snapshot_create(struct devlink_region *region,
if (devlink_region_snapshot_get_by_id(region, snapshot_id))
return -EEXIST;
- snapshot = kzalloc_obj(*snapshot, GFP_KERNEL);
+ snapshot = kzalloc_obj(*snapshot);
if (!snapshot)
return -ENOMEM;
@@ -1055,7 +1055,7 @@ struct devlink_region *devl_region_create(struct devlink *devlink,
if (devlink_region_get_by_name(devlink, ops->name))
return ERR_PTR(-EEXIST);
- region = kzalloc_obj(*region, GFP_KERNEL);
+ region = kzalloc_obj(*region);
if (!region)
return ERR_PTR(-ENOMEM);
@@ -1128,7 +1128,7 @@ devlink_port_region_create(struct devlink_port *port,
goto unlock;
}
- region = kzalloc_obj(*region, GFP_KERNEL);
+ region = kzalloc_obj(*region);
if (!region) {
err = -ENOMEM;
goto unlock;
diff --git a/net/devlink/resource.c b/net/devlink/resource.c
index aa3621c28a00..351835a710b1 100644
--- a/net/devlink/resource.c
+++ b/net/devlink/resource.c
@@ -347,7 +347,7 @@ int devl_resource_register(struct devlink *devlink,
if (resource)
return -EEXIST;
- resource = kzalloc_obj(*resource, GFP_KERNEL);
+ resource = kzalloc_obj(*resource);
if (!resource)
return -ENOMEM;
diff --git a/net/devlink/sb.c b/net/devlink/sb.c
index bcfeed079433..49fcbfe08f15 100644
--- a/net/devlink/sb.c
+++ b/net/devlink/sb.c
@@ -943,7 +943,7 @@ int devl_sb_register(struct devlink *devlink, unsigned int sb_index,
if (devlink_sb_index_exists(devlink, sb_index))
return -EEXIST;
- devlink_sb = kzalloc_obj(*devlink_sb, GFP_KERNEL);
+ devlink_sb = kzalloc_obj(*devlink_sb);
if (!devlink_sb)
return -ENOMEM;
devlink_sb->index = sb_index;
diff --git a/net/devlink/trap.c b/net/devlink/trap.c
index e4255c0a6a30..8edb31654a68 100644
--- a/net/devlink/trap.c
+++ b/net/devlink/trap.c
@@ -1271,7 +1271,7 @@ devlink_trap_register(struct devlink *devlink,
if (devlink_trap_item_lookup(devlink, trap->name))
return -EEXIST;
- trap_item = kzalloc_obj(*trap_item, GFP_KERNEL);
+ trap_item = kzalloc_obj(*trap_item);
if (!trap_item)
return -ENOMEM;
@@ -1545,7 +1545,7 @@ devlink_trap_group_register(struct devlink *devlink,
if (devlink_trap_group_item_lookup(devlink, group->name))
return -EEXIST;
- group_item = kzalloc_obj(*group_item, GFP_KERNEL);
+ group_item = kzalloc_obj(*group_item);
if (!group_item)
return -ENOMEM;
@@ -1751,7 +1751,7 @@ devlink_trap_policer_register(struct devlink *devlink,
if (devlink_trap_policer_item_lookup(devlink, policer->id))
return -EEXIST;
- policer_item = kzalloc_obj(*policer_item, GFP_KERNEL);
+ policer_item = kzalloc_obj(*policer_item);
if (!policer_item)
return -ENOMEM;
diff --git a/net/dsa/dsa.c b/net/dsa/dsa.c
index b0ae980ca684..9cb732f6b1e3 100644
--- a/net/dsa/dsa.c
+++ b/net/dsa/dsa.c
@@ -213,7 +213,7 @@ static struct dsa_switch_tree *dsa_tree_alloc(int index)
{
struct dsa_switch_tree *dst;
- dst = kzalloc_obj(*dst, GFP_KERNEL);
+ dst = kzalloc_obj(*dst);
if (!dst)
return NULL;
@@ -298,7 +298,7 @@ static struct dsa_link *dsa_link_touch(struct dsa_port *dp,
if (dl->dp == dp && dl->link_dp == link_dp)
return dl;
- dl = kzalloc_obj(*dl, GFP_KERNEL);
+ dl = kzalloc_obj(*dl);
if (!dl)
return NULL;
@@ -844,7 +844,7 @@ static int dsa_tree_setup_lags(struct dsa_switch_tree *dst)
if (!len)
return 0;
- dst->lags = kzalloc_objs(*dst->lags, len, GFP_KERNEL);
+ dst->lags = kzalloc_objs(*dst->lags, len);
if (!dst->lags)
return -ENOMEM;
@@ -1092,7 +1092,7 @@ static struct dsa_port *dsa_port_touch(struct dsa_switch *ds, int index)
if (dp->index == index)
return dp;
- dp = kzalloc_obj(*dp, GFP_KERNEL);
+ dp = kzalloc_obj(*dp);
if (!dp)
return NULL;
diff --git a/net/dsa/port.c b/net/dsa/port.c
index 4da911edc512..1f5536c0dffc 100644
--- a/net/dsa/port.c
+++ b/net/dsa/port.c
@@ -431,7 +431,7 @@ static int dsa_port_bridge_create(struct dsa_port *dp,
return 0;
}
- bridge = kzalloc_obj(*bridge, GFP_KERNEL);
+ bridge = kzalloc_obj(*bridge);
if (!bridge)
return -ENOMEM;
@@ -617,7 +617,7 @@ static int dsa_port_lag_create(struct dsa_port *dp,
return 0;
}
- lag = kzalloc_obj(*lag, GFP_KERNEL);
+ lag = kzalloc_obj(*lag);
if (!lag)
return -ENOMEM;
diff --git a/net/dsa/switch.c b/net/dsa/switch.c
index e00997977c93..a670a04edb72 100644
--- a/net/dsa/switch.c
+++ b/net/dsa/switch.c
@@ -182,7 +182,7 @@ static int dsa_port_do_mdb_add(struct dsa_port *dp,
goto out;
}
- a = kzalloc_obj(*a, GFP_KERNEL);
+ a = kzalloc_obj(*a);
if (!a) {
err = -ENOMEM;
goto out;
@@ -280,7 +280,7 @@ static int dsa_port_do_fdb_add(struct dsa_port *dp, const unsigned char *addr,
goto out;
}
- a = kzalloc_obj(*a, GFP_KERNEL);
+ a = kzalloc_obj(*a);
if (!a) {
err = -ENOMEM;
goto out;
@@ -368,7 +368,7 @@ static int dsa_switch_do_lag_fdb_add(struct dsa_switch *ds, struct dsa_lag *lag,
goto out;
}
- a = kzalloc_obj(*a, GFP_KERNEL);
+ a = kzalloc_obj(*a);
if (!a) {
err = -ENOMEM;
goto out;
@@ -719,7 +719,7 @@ static int dsa_port_do_vlan_add(struct dsa_port *dp,
goto out;
}
- v = kzalloc_obj(*v, GFP_KERNEL);
+ v = kzalloc_obj(*v);
if (!v) {
err = -ENOMEM;
goto out;
diff --git a/net/dsa/tag_8021q.c b/net/dsa/tag_8021q.c
index c9bea6808da3..f91646e60246 100644
--- a/net/dsa/tag_8021q.c
+++ b/net/dsa/tag_8021q.c
@@ -158,7 +158,7 @@ static int dsa_port_do_tag_8021q_vlan_add(struct dsa_port *dp, u16 vid,
return 0;
}
- v = kzalloc_obj(*v, GFP_KERNEL);
+ v = kzalloc_obj(*v);
if (!v)
return -ENOMEM;
@@ -420,7 +420,7 @@ int dsa_tag_8021q_register(struct dsa_switch *ds, __be16 proto)
struct dsa_8021q_context *ctx;
int err;
- ctx = kzalloc_obj(*ctx, GFP_KERNEL);
+ ctx = kzalloc_obj(*ctx);
if (!ctx)
return -ENOMEM;
diff --git a/net/dsa/tag_ksz.c b/net/dsa/tag_ksz.c
index 15aa44478807..d2475c3bbb7d 100644
--- a/net/dsa/tag_ksz.c
+++ b/net/dsa/tag_ksz.c
@@ -62,7 +62,7 @@ static int ksz_connect(struct dsa_switch *ds)
struct ksz_tagger_private *priv;
int ret;
- priv = kzalloc_obj(*priv, GFP_KERNEL);
+ priv = kzalloc_obj(*priv);
if (!priv)
return -ENOMEM;
diff --git a/net/dsa/tag_ocelot_8021q.c b/net/dsa/tag_ocelot_8021q.c
index b9bf2895309a..e89d9254e90a 100644
--- a/net/dsa/tag_ocelot_8021q.c
+++ b/net/dsa/tag_ocelot_8021q.c
@@ -106,7 +106,7 @@ static int ocelot_connect(struct dsa_switch *ds)
struct ocelot_8021q_tagger_private *priv;
int err;
- priv = kzalloc_obj(*priv, GFP_KERNEL);
+ priv = kzalloc_obj(*priv);
if (!priv)
return -ENOMEM;
diff --git a/net/dsa/tag_qca.c b/net/dsa/tag_qca.c
index 4326487c1f29..9e3b429e8b36 100644
--- a/net/dsa/tag_qca.c
+++ b/net/dsa/tag_qca.c
@@ -92,7 +92,7 @@ static int qca_tag_connect(struct dsa_switch *ds)
{
struct qca_tagger_data *tagger_data;
- tagger_data = kzalloc_obj(*tagger_data, GFP_KERNEL);
+ tagger_data = kzalloc_obj(*tagger_data);
if (!tagger_data)
return -ENOMEM;
diff --git a/net/dsa/tag_sja1105.c b/net/dsa/tag_sja1105.c
index 2083ef3b4b90..de6d4ce8668b 100644
--- a/net/dsa/tag_sja1105.c
+++ b/net/dsa/tag_sja1105.c
@@ -701,7 +701,7 @@ static int sja1105_connect(struct dsa_switch *ds)
struct kthread_worker *xmit_worker;
int err;
- priv = kzalloc_obj(*priv, GFP_KERNEL);
+ priv = kzalloc_obj(*priv);
if (!priv)
return -ENOMEM;
diff --git a/net/dsa/user.c b/net/dsa/user.c
index 5df8cb69295d..c4bd6fe90b45 100644
--- a/net/dsa/user.c
+++ b/net/dsa/user.c
@@ -1318,7 +1318,7 @@ static int dsa_user_netpoll_setup(struct net_device *dev)
struct netpoll *netpoll;
int err = 0;
- netpoll = kzalloc_obj(*netpoll, GFP_KERNEL);
+ netpoll = kzalloc_obj(*netpoll);
if (!netpoll)
return -ENOMEM;
@@ -1430,7 +1430,7 @@ dsa_user_add_cls_matchall_mirred(struct net_device *dev,
return -EOPNOTSUPP;
}
- mall_tc_entry = kzalloc_obj(*mall_tc_entry, GFP_KERNEL);
+ mall_tc_entry = kzalloc_obj(*mall_tc_entry);
if (!mall_tc_entry)
return -ENOMEM;
@@ -1490,7 +1490,7 @@ dsa_user_add_cls_matchall_police(struct net_device *dev,
act = &cls->rule->action.entries[0];
- mall_tc_entry = kzalloc_obj(*mall_tc_entry, GFP_KERNEL);
+ mall_tc_entry = kzalloc_obj(*mall_tc_entry);
if (!mall_tc_entry)
return -ENOMEM;
@@ -1823,7 +1823,7 @@ static int dsa_user_vlan_rx_add_vid(struct net_device *dev, __be16 proto,
!dsa_switch_supports_mc_filtering(ds))
return 0;
- v = kzalloc_obj(*v, GFP_KERNEL);
+ v = kzalloc_obj(*v);
if (!v) {
ret = -ENOMEM;
goto rollback;
@@ -2070,7 +2070,7 @@ static void dsa_bridge_mtu_normalization(struct dsa_port *dp)
if (min_mtu > user->mtu)
min_mtu = user->mtu;
- hw_port = kzalloc_obj(*hw_port, GFP_KERNEL);
+ hw_port = kzalloc_obj(*hw_port);
if (!hw_port)
goto out;
diff --git a/net/ethtool/cmis_cdb.c b/net/ethtool/cmis_cdb.c
index 674439bedd49..3670ca42dd40 100644
--- a/net/ethtool/cmis_cdb.c
+++ b/net/ethtool/cmis_cdb.c
@@ -276,7 +276,7 @@ ethtool_cmis_cdb_init(struct net_device *dev,
struct ethtool_cmis_cdb *cdb;
int err;
- cdb = kzalloc_obj(*cdb, GFP_KERNEL);
+ cdb = kzalloc_obj(*cdb);
if (!cdb)
return ERR_PTR(-ENOMEM);
diff --git a/net/ethtool/ioctl.c b/net/ethtool/ioctl.c
index b4e7c6ccf9f3..ff4b4780d6af 100644
--- a/net/ethtool/ioctl.c
+++ b/net/ethtool/ioctl.c
@@ -3040,7 +3040,7 @@ ethtool_set_per_queue_coalesce(struct net_device *dev,
bitmap_from_arr32(queue_mask, per_queue_opt->queue_mask, MAX_NUM_QUEUE);
n_queue = bitmap_weight(queue_mask, MAX_NUM_QUEUE);
- tmp = backup = kmalloc_objs(*backup, n_queue, GFP_KERNEL);
+ tmp = backup = kmalloc_objs(*backup, n_queue);
if (!backup)
return -ENOMEM;
@@ -3554,7 +3554,7 @@ int dev_ethtool(struct net *net, struct ifreq *ifr, void __user *useraddr)
if (copy_from_user(ðcmd, useraddr, sizeof(ethcmd)))
return -EFAULT;
- state = kzalloc_obj(*state, GFP_KERNEL);
+ state = kzalloc_obj(*state);
if (!state)
return -ENOMEM;
diff --git a/net/ethtool/module.c b/net/ethtool/module.c
index d033a20aa48c..0a761bf4771e 100644
--- a/net/ethtool/module.c
+++ b/net/ethtool/module.c
@@ -301,7 +301,7 @@ module_flash_fw_schedule(struct net_device *dev, const char *file_name,
struct ethtool_module_fw_flash *module_fw;
int err;
- module_fw = kzalloc_obj(*module_fw, GFP_KERNEL);
+ module_fw = kzalloc_obj(*module_fw);
if (!module_fw)
return -ENOMEM;
diff --git a/net/ethtool/tsconfig.c b/net/ethtool/tsconfig.c
index acd0477b3a2d..e49e612a68c2 100644
--- a/net/ethtool/tsconfig.c
+++ b/net/ethtool/tsconfig.c
@@ -202,10 +202,10 @@ static int tsconfig_send_reply(struct net_device *dev, struct genl_info *info)
int reply_len = 0;
int ret;
- req_info = kzalloc_obj(*req_info, GFP_KERNEL);
+ req_info = kzalloc_obj(*req_info);
if (!req_info)
return -ENOMEM;
- reply_data = kmalloc_obj(*reply_data, GFP_KERNEL);
+ reply_data = kmalloc_obj(*reply_data);
if (!reply_data) {
kfree(req_info);
return -ENOMEM;
@@ -280,7 +280,7 @@ tsconfig_set_hwprov_from_desc(struct net_device *dev,
source = HWTSTAMP_SOURCE_PHYLIB;
}
- hwprov = kzalloc_obj(*hwprov, GFP_KERNEL);
+ hwprov = kzalloc_obj(*hwprov);
if (!hwprov)
return ERR_PTR(-ENOMEM);
diff --git a/net/ethtool/tsinfo.c b/net/ethtool/tsinfo.c
index df9c7de9a640..c0145c752d2f 100644
--- a/net/ethtool/tsinfo.c
+++ b/net/ethtool/tsinfo.c
@@ -505,10 +505,10 @@ int ethnl_tsinfo_start(struct netlink_callback *cb)
BUILD_BUG_ON(sizeof(*ctx) > sizeof(cb->ctx));
- req_info = kzalloc_obj(*req_info, GFP_KERNEL);
+ req_info = kzalloc_obj(*req_info);
if (!req_info)
return -ENOMEM;
- reply_data = kzalloc_obj(*reply_data, GFP_KERNEL);
+ reply_data = kzalloc_obj(*reply_data);
if (!reply_data) {
ret = -ENOMEM;
goto free_req_info;
diff --git a/net/hsr/hsr_framereg.c b/net/hsr/hsr_framereg.c
index d5a742cb77d1..50996f4de7f9 100644
--- a/net/hsr/hsr_framereg.c
+++ b/net/hsr/hsr_framereg.c
@@ -80,7 +80,7 @@ int hsr_create_self_node(struct hsr_priv *hsr,
{
struct hsr_self_node *sn, *old;
- sn = kmalloc_obj(*sn, GFP_KERNEL);
+ sn = kmalloc_obj(*sn);
if (!sn)
return -ENOMEM;
diff --git a/net/hsr/hsr_slave.c b/net/hsr/hsr_slave.c
index 9a3f3add4b47..44f83c8c56a7 100644
--- a/net/hsr/hsr_slave.c
+++ b/net/hsr/hsr_slave.c
@@ -198,7 +198,7 @@ int hsr_add_port(struct hsr_priv *hsr, struct net_device *dev,
if (port)
return -EBUSY; /* This port already exists */
- port = kzalloc_obj(*port, GFP_KERNEL);
+ port = kzalloc_obj(*port);
if (!port)
return -ENOMEM;
diff --git a/net/ieee802154/nl802154.c b/net/ieee802154/nl802154.c
index f743d1568f3f..115f43d0e158 100644
--- a/net/ieee802154/nl802154.c
+++ b/net/ieee802154/nl802154.c
@@ -603,7 +603,7 @@ nl802154_dump_wpan_phy(struct sk_buff *skb, struct netlink_callback *cb)
rtnl_lock();
if (!state) {
- state = kzalloc_obj(*state, GFP_KERNEL);
+ state = kzalloc_obj(*state);
if (!state) {
rtnl_unlock();
return -ENOMEM;
@@ -1418,7 +1418,7 @@ static int nl802154_trigger_scan(struct sk_buff *skb, struct genl_info *info)
return -EOPNOTSUPP;
}
- request = kzalloc_obj(*request, GFP_KERNEL);
+ request = kzalloc_obj(*request);
if (!request)
return -ENOMEM;
@@ -1586,7 +1586,7 @@ nl802154_send_beacons(struct sk_buff *skb, struct genl_info *info)
return -EOPNOTSUPP;
}
- request = kzalloc_obj(*request, GFP_KERNEL);
+ request = kzalloc_obj(*request);
if (!request)
return -ENOMEM;
diff --git a/net/ipv4/ah4.c b/net/ipv4/ah4.c
index f4a207c7cfc6..5fb812443a08 100644
--- a/net/ipv4/ah4.c
+++ b/net/ipv4/ah4.c
@@ -484,7 +484,7 @@ static int ah_init_state(struct xfrm_state *x, struct netlink_ext_ack *extack)
goto error;
}
- ahp = kzalloc_obj(*ahp, GFP_KERNEL);
+ ahp = kzalloc_obj(*ahp);
if (!ahp)
return -ENOMEM;
diff --git a/net/ipv4/devinet.c b/net/ipv4/devinet.c
index 9fd41dfbe788..8f4190c7c9ab 100644
--- a/net/ipv4/devinet.c
+++ b/net/ipv4/devinet.c
@@ -270,7 +270,7 @@ static struct in_device *inetdev_init(struct net_device *dev)
ASSERT_RTNL();
- in_dev = kzalloc_obj(*in_dev, GFP_KERNEL);
+ in_dev = kzalloc_obj(*in_dev);
if (!in_dev)
goto out;
memcpy(&in_dev->cnf, dev_net(dev)->ipv4.devconf_dflt,
diff --git a/net/ipv4/fou_core.c b/net/ipv4/fou_core.c
index 885f3b06f6e9..3baaa4df7e42 100644
--- a/net/ipv4/fou_core.c
+++ b/net/ipv4/fou_core.c
@@ -581,7 +581,7 @@ static int fou_create(struct net *net, struct fou_cfg *cfg,
goto error;
/* Allocate FOU port structure */
- fou = kzalloc_obj(*fou, GFP_KERNEL);
+ fou = kzalloc_obj(*fou);
if (!fou) {
err = -ENOMEM;
goto error;
diff --git a/net/ipv4/inet_diag.c b/net/ipv4/inet_diag.c
index 89f99c7ee69e..9d215485b5c7 100644
--- a/net/ipv4/inet_diag.c
+++ b/net/ipv4/inet_diag.c
@@ -845,7 +845,7 @@ static int __inet_diag_dump_start(struct netlink_callback *cb, int hdrlen)
struct nlattr *nla;
int err;
- cb_data = kzalloc_obj(*cb_data, GFP_KERNEL);
+ cb_data = kzalloc_obj(*cb_data);
if (!cb_data)
return -ENOMEM;
diff --git a/net/ipv4/inet_fragment.c b/net/ipv4/inet_fragment.c
index b006606ebb1d..393770920abd 100644
--- a/net/ipv4/inet_fragment.c
+++ b/net/ipv4/inet_fragment.c
@@ -188,7 +188,7 @@ static void fqdir_work_fn(struct work_struct *work)
int fqdir_init(struct fqdir **fqdirp, struct inet_frags *f, struct net *net)
{
- struct fqdir *fqdir = kzalloc_obj(*fqdir, GFP_KERNEL);
+ struct fqdir *fqdir = kzalloc_obj(*fqdir);
int res;
if (!fqdir)
diff --git a/net/ipv4/inet_hashtables.c b/net/ipv4/inet_hashtables.c
index 50bf4ec8213a..fca980772c81 100644
--- a/net/ipv4/inet_hashtables.c
+++ b/net/ipv4/inet_hashtables.c
@@ -1284,7 +1284,7 @@ void __init inet_hashinfo2_init(struct inet_hashinfo *h, const char *name,
int inet_hashinfo2_init_mod(struct inet_hashinfo *h)
{
- h->lhash2 = kmalloc_objs(*h->lhash2, INET_LHTABLE_SIZE, GFP_KERNEL);
+ h->lhash2 = kmalloc_objs(*h->lhash2, INET_LHTABLE_SIZE);
if (!h->lhash2)
return -ENOMEM;
diff --git a/net/ipv4/ip_sockglue.c b/net/ipv4/ip_sockglue.c
index d09377780942..697e18242d6c 100644
--- a/net/ipv4/ip_sockglue.c
+++ b/net/ipv4/ip_sockglue.c
@@ -350,7 +350,7 @@ int ip_ra_control(struct sock *sk, unsigned char on,
if (sk->sk_type != SOCK_RAW || inet_sk(sk)->inet_num == IPPROTO_RAW)
return -EINVAL;
- new_ra = on ? kmalloc_obj(*new_ra, GFP_KERNEL) : NULL;
+ new_ra = on ? kmalloc_obj(*new_ra) : NULL;
if (on && !new_ra)
return -ENOMEM;
diff --git a/net/ipv4/ipconfig.c b/net/ipv4/ipconfig.c
index 5dcac1fb4209..a35ffedacc7c 100644
--- a/net/ipv4/ipconfig.c
+++ b/net/ipv4/ipconfig.c
@@ -244,7 +244,7 @@ static int __init ic_open_devs(void)
dev->name);
continue;
}
- if (!(d = kmalloc_obj(struct ic_device, GFP_KERNEL))) {
+ if (!(d = kmalloc_obj(struct ic_device))) {
rtnl_unlock();
return -ENOMEM;
}
diff --git a/net/ipv4/ipmr_base.c b/net/ipv4/ipmr_base.c
index 77b7717b9c14..2d62526406ca 100644
--- a/net/ipv4/ipmr_base.c
+++ b/net/ipv4/ipmr_base.c
@@ -38,7 +38,7 @@ mr_table_alloc(struct net *net, u32 id,
struct mr_table *mrt;
int err;
- mrt = kzalloc_obj(*mrt, GFP_KERNEL);
+ mrt = kzalloc_obj(*mrt);
if (!mrt)
return ERR_PTR(-ENOMEM);
mrt->id = id;
diff --git a/net/ipv4/metrics.c b/net/ipv4/metrics.c
index 8b88d674a1ea..c1463add48c4 100644
--- a/net/ipv4/metrics.c
+++ b/net/ipv4/metrics.c
@@ -73,7 +73,7 @@ struct dst_metrics *ip_fib_metrics_init(struct nlattr *fc_mx,
if (!fc_mx)
return (struct dst_metrics *)&dst_default_metrics;
- fib_metrics = kzalloc_obj(*fib_metrics, GFP_KERNEL);
+ fib_metrics = kzalloc_obj(*fib_metrics);
if (unlikely(!fib_metrics))
return ERR_PTR(-ENOMEM);
diff --git a/net/ipv4/nexthop.c b/net/ipv4/nexthop.c
index 36b52a92e999..b9873370c69e 100644
--- a/net/ipv4/nexthop.c
+++ b/net/ipv4/nexthop.c
@@ -116,7 +116,7 @@ static int nh_notifier_single_info_init(struct nh_notifier_info *info,
struct nh_info *nhi = rtnl_dereference(nh->nh_info);
info->type = NH_NOTIFIER_INFO_TYPE_SINGLE;
- info->nh = kzalloc_obj(*info->nh, GFP_KERNEL);
+ info->nh = kzalloc_obj(*info->nh);
if (!info->nh)
return -ENOMEM;
@@ -318,7 +318,7 @@ static int nh_notifier_res_bucket_info_init(struct nh_notifier_info *info,
return err;
info->type = NH_NOTIFIER_INFO_TYPE_RES_BUCKET;
- info->nh_res_bucket = kzalloc_obj(*info->nh_res_bucket, GFP_KERNEL);
+ info->nh_res_bucket = kzalloc_obj(*info->nh_res_bucket);
if (!info->nh_res_bucket)
return -ENOMEM;
@@ -534,7 +534,7 @@ static struct nexthop *nexthop_alloc(void)
{
struct nexthop *nh;
- nh = kzalloc_obj(struct nexthop, GFP_KERNEL);
+ nh = kzalloc_obj(struct nexthop);
if (nh) {
INIT_LIST_HEAD(&nh->fi_list);
INIT_LIST_HEAD(&nh->f6i_list);
@@ -2895,7 +2895,7 @@ static struct nexthop *nexthop_create(struct net *net, struct nh_config *cfg,
if (!nh)
return ERR_PTR(-ENOMEM);
- nhi = kzalloc_obj(*nhi, GFP_KERNEL);
+ nhi = kzalloc_obj(*nhi);
if (!nhi) {
kfree(nh);
return ERR_PTR(-ENOMEM);
diff --git a/net/ipv4/route.c b/net/ipv4/route.c
index c75b92f60742..463236e0dc2d 100644
--- a/net/ipv4/route.c
+++ b/net/ipv4/route.c
@@ -315,7 +315,7 @@ static int rt_acct_proc_show(struct seq_file *m, void *v)
struct ip_rt_acct *dst, *src;
unsigned int i, j;
- dst = kzalloc_objs(struct ip_rt_acct, 256, GFP_KERNEL);
+ dst = kzalloc_objs(struct ip_rt_acct, 256);
if (!dst)
return -ENOMEM;
@@ -3687,7 +3687,7 @@ static __net_initdata struct pernet_operations rt_genid_ops = {
static int __net_init ipv4_inetpeer_init(struct net *net)
{
- struct inet_peer_base *bp = kmalloc_obj(*bp, GFP_KERNEL);
+ struct inet_peer_base *bp = kmalloc_obj(*bp);
if (!bp)
return -ENOMEM;
diff --git a/net/ipv4/tcp_fastopen.c b/net/ipv4/tcp_fastopen.c
index b4309dc4b9c5..1b7ba2cf3efe 100644
--- a/net/ipv4/tcp_fastopen.c
+++ b/net/ipv4/tcp_fastopen.c
@@ -149,7 +149,7 @@ int tcp_fastopen_reset_cipher(struct net *net, struct sock *sk,
struct fastopen_queue *q;
int err = 0;
- ctx = kmalloc_obj(*ctx, GFP_KERNEL);
+ ctx = kmalloc_obj(*ctx);
if (!ctx) {
err = -ENOMEM;
goto out;
diff --git a/net/ipv4/udp.c b/net/ipv4/udp.c
index 5fcf81a833e8..6c6b68a66dcd 100644
--- a/net/ipv4/udp.c
+++ b/net/ipv4/udp.c
@@ -3859,7 +3859,7 @@ static struct udp_table __net_init *udp_pernet_table_alloc(unsigned int hash_ent
unsigned int slot_size;
int i;
- udptable = kmalloc_obj(*udptable, GFP_KERNEL);
+ udptable = kmalloc_obj(*udptable);
if (!udptable)
goto out;
diff --git a/net/ipv4/udp_tunnel_nic.c b/net/ipv4/udp_tunnel_nic.c
index ae674e3ed9b8..75d9b6d3f51a 100644
--- a/net/ipv4/udp_tunnel_nic.c
+++ b/net/ipv4/udp_tunnel_nic.c
@@ -821,7 +821,7 @@ static int udp_tunnel_nic_register(struct net_device *dev)
/* Create UDP tunnel state structures */
if (info->shared) {
- node = kzalloc_obj(*node, GFP_KERNEL);
+ node = kzalloc_obj(*node);
if (!node)
return -ENOMEM;
diff --git a/net/ipv6/addrlabel.c b/net/ipv6/addrlabel.c
index e3b6b9a3f02e..f4b2618446bd 100644
--- a/net/ipv6/addrlabel.c
+++ b/net/ipv6/addrlabel.c
@@ -180,7 +180,7 @@ static struct ip6addrlbl_entry *ip6addrlbl_alloc(const struct in6_addr *prefix,
break;
}
- newp = kmalloc_obj(*newp, GFP_KERNEL);
+ newp = kmalloc_obj(*newp);
if (!newp)
return ERR_PTR(-ENOMEM);
diff --git a/net/ipv6/ah6.c b/net/ipv6/ah6.c
index 7ad0c894f2fd..cb26beea4398 100644
--- a/net/ipv6/ah6.c
+++ b/net/ipv6/ah6.c
@@ -691,7 +691,7 @@ static int ah6_init_state(struct xfrm_state *x, struct netlink_ext_ack *extack)
goto error;
}
- ahp = kzalloc_obj(*ahp, GFP_KERNEL);
+ ahp = kzalloc_obj(*ahp);
if (!ahp)
return -ENOMEM;
diff --git a/net/ipv6/ila/ila_xlat.c b/net/ipv6/ila/ila_xlat.c
index c5ff34040175..8991805fc3d6 100644
--- a/net/ipv6/ila/ila_xlat.c
+++ b/net/ipv6/ila/ila_xlat.c
@@ -220,7 +220,7 @@ static int ila_add_mapping(struct net *net, struct ila_xlat_params *xp)
return err;
}
- ila = kzalloc_obj(*ila, GFP_KERNEL);
+ ila = kzalloc_obj(*ila);
if (!ila)
return -ENOMEM;
@@ -509,7 +509,7 @@ int ila_xlat_nl_dump_start(struct netlink_callback *cb)
struct ila_net *ilan = net_generic(net, ila_net_id);
struct ila_dump_iter *iter;
- iter = kmalloc_obj(*iter, GFP_KERNEL);
+ iter = kmalloc_obj(*iter);
if (!iter)
return -ENOMEM;
diff --git a/net/ipv6/ioam6.c b/net/ipv6/ioam6.c
index b6c9e48891fe..b76f89d92e7b 100644
--- a/net/ipv6/ioam6.c
+++ b/net/ipv6/ioam6.c
@@ -127,7 +127,7 @@ static int ioam6_genl_addns(struct sk_buff *skb, struct genl_info *info)
goto out_unlock;
}
- ns = kzalloc_obj(*ns, GFP_KERNEL);
+ ns = kzalloc_obj(*ns);
if (!ns) {
err = -ENOMEM;
goto out_unlock;
@@ -245,7 +245,7 @@ static int ioam6_genl_dumpns_start(struct netlink_callback *cb)
struct rhashtable_iter *iter = (struct rhashtable_iter *)cb->args[0];
if (!iter) {
- iter = kmalloc_obj(*iter, GFP_KERNEL);
+ iter = kmalloc_obj(*iter);
if (!iter)
return -ENOMEM;
@@ -431,7 +431,7 @@ static int ioam6_genl_dumpsc_start(struct netlink_callback *cb)
struct rhashtable_iter *iter = (struct rhashtable_iter *)cb->args[0];
if (!iter) {
- iter = kmalloc_obj(*iter, GFP_KERNEL);
+ iter = kmalloc_obj(*iter);
if (!iter)
return -ENOMEM;
@@ -975,7 +975,7 @@ static int __net_init ioam6_net_init(struct net *net)
struct ioam6_pernet_data *nsdata;
int err = -ENOMEM;
- nsdata = kzalloc_obj(*nsdata, GFP_KERNEL);
+ nsdata = kzalloc_obj(*nsdata);
if (!nsdata)
goto out;
diff --git a/net/ipv6/ip6_fib.c b/net/ipv6/ip6_fib.c
index 6a26d9448395..2029d40a9d2c 100644
--- a/net/ipv6/ip6_fib.c
+++ b/net/ipv6/ip6_fib.c
@@ -2464,7 +2464,7 @@ static int __net_init fib6_net_init(struct net *net)
INIT_LIST_HEAD(&net->ipv6.fib6_walkers);
timer_setup(&net->ipv6.ip6_fib_timer, fib6_gc_timer_cb, 0);
- net->ipv6.rt6_stats = kzalloc_obj(*net->ipv6.rt6_stats, GFP_KERNEL);
+ net->ipv6.rt6_stats = kzalloc_obj(*net->ipv6.rt6_stats);
if (!net->ipv6.rt6_stats)
goto out_notifier;
diff --git a/net/ipv6/ip6_flowlabel.c b/net/ipv6/ip6_flowlabel.c
index f89e0af5a9ed..7c12bf75beed 100644
--- a/net/ipv6/ip6_flowlabel.c
+++ b/net/ipv6/ip6_flowlabel.c
@@ -386,7 +386,7 @@ fl_create(struct net *net, struct sock *sk, struct in6_flowlabel_req *freq,
goto done;
err = -ENOMEM;
- fl = kzalloc_obj(*fl, GFP_KERNEL);
+ fl = kzalloc_obj(*fl);
if (!fl)
goto done;
@@ -638,7 +638,7 @@ static int ipv6_flowlabel_get(struct sock *sk, struct in6_flowlabel_req *freq,
if (!fl)
return err;
- sfl1 = kmalloc_obj(*sfl1, GFP_KERNEL);
+ sfl1 = kmalloc_obj(*sfl1);
if (freq->flr_label) {
err = -EEXIST;
diff --git a/net/ipv6/ipv6_sockglue.c b/net/ipv6/ipv6_sockglue.c
index 152388dc96ec..02c4cab60c69 100644
--- a/net/ipv6/ipv6_sockglue.c
+++ b/net/ipv6/ipv6_sockglue.c
@@ -66,7 +66,7 @@ int ip6_ra_control(struct sock *sk, int sel)
if (sk->sk_type != SOCK_RAW || inet_sk(sk)->inet_num != IPPROTO_RAW)
return -ENOPROTOOPT;
- new_ra = (sel >= 0) ? kmalloc_obj(*new_ra, GFP_KERNEL) : NULL;
+ new_ra = (sel >= 0) ? kmalloc_obj(*new_ra) : NULL;
if (sel >= 0 && !new_ra)
return -ENOMEM;
diff --git a/net/ipv6/mcast.c b/net/ipv6/mcast.c
index f982f3b71435..3330adcf26db 100644
--- a/net/ipv6/mcast.c
+++ b/net/ipv6/mcast.c
@@ -740,7 +740,7 @@ static void mld_add_delrec(struct inet6_dev *idev, struct ifmcaddr6 *im)
* for deleted items allows change reports to use common code with
* non-deleted or query-response MCA's.
*/
- pmc = kzalloc_obj(*pmc, GFP_KERNEL);
+ pmc = kzalloc_obj(*pmc);
if (!pmc)
return;
@@ -868,7 +868,7 @@ static struct ifmcaddr6 *mca_alloc(struct inet6_dev *idev,
mc_assert_locked(idev);
- mc = kzalloc_obj(*mc, GFP_KERNEL);
+ mc = kzalloc_obj(*mc);
if (!mc)
return NULL;
@@ -2415,7 +2415,7 @@ static int ip6_mc_add1_src(struct ifmcaddr6 *pmc, int sfmode,
psf_prev = psf;
}
if (!psf) {
- psf = kzalloc_obj(*psf, GFP_KERNEL);
+ psf = kzalloc_obj(*psf);
if (!psf)
return -ENOBUFS;
@@ -2500,7 +2500,7 @@ static int sf_setstate(struct ifmcaddr6 *pmc)
&psf->sf_addr))
break;
if (!dpsf) {
- dpsf = kmalloc_obj(*dpsf, GFP_KERNEL);
+ dpsf = kmalloc_obj(*dpsf);
if (!dpsf)
continue;
*dpsf = *psf;
diff --git a/net/ipv6/route.c b/net/ipv6/route.c
index dd50cf2bf6ef..85df25c36409 100644
--- a/net/ipv6/route.c
+++ b/net/ipv6/route.c
@@ -5331,7 +5331,7 @@ static int ip6_route_info_append(struct list_head *rt6_nh_list,
return -EEXIST;
}
- nh = kzalloc_obj(*nh, GFP_KERNEL);
+ nh = kzalloc_obj(*nh);
if (!nh)
return -ENOMEM;
@@ -6778,7 +6778,7 @@ static struct pernet_operations ip6_route_net_ops = {
static int __net_init ipv6_inetpeer_init(struct net *net)
{
- struct inet_peer_base *bp = kmalloc_obj(*bp, GFP_KERNEL);
+ struct inet_peer_base *bp = kmalloc_obj(*bp);
if (!bp)
return -ENOMEM;
diff --git a/net/ipv6/seg6.c b/net/ipv6/seg6.c
index b53c491079cd..1c3ad25700c4 100644
--- a/net/ipv6/seg6.c
+++ b/net/ipv6/seg6.c
@@ -202,7 +202,7 @@ static int seg6_genl_sethmac(struct sk_buff *skb, struct genl_info *info)
secret = (char *)nla_data(info->attrs[SEG6_ATTR_SECRET]);
- hinfo = kzalloc_obj(*hinfo, GFP_KERNEL);
+ hinfo = kzalloc_obj(*hinfo);
if (!hinfo) {
err = -ENOMEM;
goto out_unlock;
@@ -339,7 +339,7 @@ static int seg6_genl_dumphmac_start(struct netlink_callback *cb)
iter = (struct rhashtable_iter *)cb->args[0];
if (!iter) {
- iter = kmalloc_obj(*iter, GFP_KERNEL);
+ iter = kmalloc_obj(*iter);
if (!iter)
return -ENOMEM;
@@ -421,13 +421,13 @@ static int __net_init seg6_net_init(struct net *net)
{
struct seg6_pernet_data *sdata;
- sdata = kzalloc_obj(*sdata, GFP_KERNEL);
+ sdata = kzalloc_obj(*sdata);
if (!sdata)
return -ENOMEM;
mutex_init(&sdata->lock);
- sdata->tun_src = kzalloc_obj(*sdata->tun_src, GFP_KERNEL);
+ sdata->tun_src = kzalloc_obj(*sdata->tun_src);
if (!sdata->tun_src) {
kfree(sdata);
return -ENOMEM;
diff --git a/net/ipv6/sit.c b/net/ipv6/sit.c
index ca7955831c28..6a7b8abb0477 100644
--- a/net/ipv6/sit.c
+++ b/net/ipv6/sit.c
@@ -394,7 +394,7 @@ ipip6_tunnel_add_prl(struct ip_tunnel *t, struct ip_tunnel_prl *a, int chg)
goto out;
}
- p = kzalloc_obj(struct ip_tunnel_prl_entry, GFP_KERNEL);
+ p = kzalloc_obj(struct ip_tunnel_prl_entry);
if (!p) {
err = -ENOBUFS;
goto out;
diff --git a/net/iucv/iucv.c b/net/iucv/iucv.c
index 0c3492c873ca..6641c49b09ac 100644
--- a/net/iucv/iucv.c
+++ b/net/iucv/iucv.c
@@ -90,7 +90,7 @@ struct device *iucv_alloc_device(const struct attribute_group **attrs,
char buf[20];
int rc;
- dev = kzalloc_obj(*dev, GFP_KERNEL);
+ dev = kzalloc_obj(*dev);
if (!dev)
goto out_error;
va_start(vargs, fmt);
diff --git a/net/key/af_key.c b/net/key/af_key.c
index 83c7697c679a..0756bac62f7c 100644
--- a/net/key/af_key.c
+++ b/net/key/af_key.c
@@ -1196,7 +1196,7 @@ static struct xfrm_state * pfkey_msg2xfrm_state(struct net *net,
err = -ENOSYS;
goto out;
}
- x->calg = kmalloc_obj(*x->calg, GFP_KERNEL);
+ x->calg = kmalloc_obj(*x->calg);
if (!x->calg) {
err = -ENOMEM;
goto out;
@@ -1261,7 +1261,7 @@ static struct xfrm_state * pfkey_msg2xfrm_state(struct net *net,
const struct sadb_x_nat_t_type* n_type;
struct xfrm_encap_tmpl *natt;
- x->encap = kzalloc_obj(*x->encap, GFP_KERNEL);
+ x->encap = kzalloc_obj(*x->encap);
if (!x->encap) {
err = -ENOMEM;
goto out;
@@ -1855,7 +1855,7 @@ static int pfkey_dump(struct sock *sk, struct sk_buff *skb, const struct sadb_ms
mutex_unlock(&pfk->dump_lock);
return -EINVAL;
}
- filter = kmalloc_obj(*filter, GFP_KERNEL);
+ filter = kmalloc_obj(*filter);
if (filter == NULL) {
mutex_unlock(&pfk->dump_lock);
return -ENOMEM;
diff --git a/net/l2tp/l2tp_core.c b/net/l2tp/l2tp_core.c
index 1b84338f2a90..c89ae52764b8 100644
--- a/net/l2tp/l2tp_core.c
+++ b/net/l2tp/l2tp_core.c
@@ -1572,7 +1572,7 @@ int l2tp_tunnel_create(int fd, int version, u32 tunnel_id, u32 peer_tunnel_id,
if (cfg)
encap = cfg->encap;
- tunnel = kzalloc_obj(*tunnel, GFP_KERNEL);
+ tunnel = kzalloc_obj(*tunnel);
if (!tunnel) {
err = -ENOMEM;
goto err;
diff --git a/net/l2tp/l2tp_debugfs.c b/net/l2tp/l2tp_debugfs.c
index 56ea3ed20581..b26986fda9d6 100644
--- a/net/l2tp/l2tp_debugfs.c
+++ b/net/l2tp/l2tp_debugfs.c
@@ -269,7 +269,7 @@ static int l2tp_dfs_seq_open(struct inode *inode, struct file *file)
struct seq_file *seq;
int rc = -ENOMEM;
- pd = kzalloc_obj(*pd, GFP_KERNEL);
+ pd = kzalloc_obj(*pd);
if (!pd)
goto out;
diff --git a/net/mac80211/agg-rx.c b/net/mac80211/agg-rx.c
index e8670a46371c..f301a8622bee 100644
--- a/net/mac80211/agg-rx.c
+++ b/net/mac80211/agg-rx.c
@@ -395,7 +395,7 @@ void __ieee80211_start_rx_ba_session(struct sta_info *sta,
}
/* prepare A-MPDU MLME for Rx aggregation */
- tid_agg_rx = kzalloc_obj(*tid_agg_rx, GFP_KERNEL);
+ tid_agg_rx = kzalloc_obj(*tid_agg_rx);
if (!tid_agg_rx)
goto end;
@@ -411,7 +411,7 @@ void __ieee80211_start_rx_ba_session(struct sta_info *sta,
/* prepare reordering buffer */
tid_agg_rx->reorder_buf =
- kzalloc_objs(struct sk_buff_head, buf_size, GFP_KERNEL);
+ kzalloc_objs(struct sk_buff_head, buf_size);
tid_agg_rx->reorder_time =
kcalloc(buf_size, sizeof(unsigned long), GFP_KERNEL);
if (!tid_agg_rx->reorder_buf || !tid_agg_rx->reorder_time) {
diff --git a/net/mac80211/cfg.c b/net/mac80211/cfg.c
index d1adbc4984d1..8b76525c56ee 100644
--- a/net/mac80211/cfg.c
+++ b/net/mac80211/cfg.c
@@ -4742,7 +4742,7 @@ static int ieee80211_set_qos_map(struct wiphy *wiphy,
struct mac80211_qos_map *new_qos_map, *old_qos_map;
if (qos_map) {
- new_qos_map = kzalloc_obj(*new_qos_map, GFP_KERNEL);
+ new_qos_map = kzalloc_obj(*new_qos_map);
if (!new_qos_map)
return -ENOMEM;
memcpy(&new_qos_map->qos_map, qos_map, sizeof(*qos_map));
diff --git a/net/mac80211/chan.c b/net/mac80211/chan.c
index 60654b0b542d..4447cf03c41b 100644
--- a/net/mac80211/chan.c
+++ b/net/mac80211/chan.c
@@ -1612,7 +1612,7 @@ static int ieee80211_chsw_switch_vifs(struct ieee80211_local *local,
lockdep_assert_wiphy(local->hw.wiphy);
- vif_chsw = kzalloc_objs(vif_chsw[0], n_vifs, GFP_KERNEL);
+ vif_chsw = kzalloc_objs(vif_chsw[0], n_vifs);
if (!vif_chsw)
return -ENOMEM;
diff --git a/net/mac80211/led.c b/net/mac80211/led.c
index f93fe928c4bc..b5600d223452 100644
--- a/net/mac80211/led.c
+++ b/net/mac80211/led.c
@@ -298,7 +298,7 @@ __ieee80211_create_tpt_led_trigger(struct ieee80211_hw *hw,
if (WARN_ON(local->tpt_led_trigger))
return NULL;
- tpt_trig = kzalloc_obj(struct tpt_led_trigger, GFP_KERNEL);
+ tpt_trig = kzalloc_obj(struct tpt_led_trigger);
if (!tpt_trig)
return NULL;
diff --git a/net/mac80211/link.c b/net/mac80211/link.c
index 7102d113d89d..f589450754a9 100644
--- a/net/mac80211/link.c
+++ b/net/mac80211/link.c
@@ -295,7 +295,7 @@ static int ieee80211_vif_update_links(struct ieee80211_sub_if_data *sdata,
/* allocate new link structures first */
for_each_set_bit(link_id, &add, IEEE80211_MLD_MAX_NUM_LINKS) {
- link = kzalloc_obj(*link, GFP_KERNEL);
+ link = kzalloc_obj(*link);
if (!link) {
ret = -ENOMEM;
goto free;
diff --git a/net/mac80211/mesh.c b/net/mac80211/mesh.c
index a7bd4dd9aa19..a7e71eef3660 100644
--- a/net/mac80211/mesh.c
+++ b/net/mac80211/mesh.c
@@ -178,7 +178,7 @@ int mesh_rmc_init(struct ieee80211_sub_if_data *sdata)
{
int i;
- sdata->u.mesh.rmc = kmalloc_obj(struct mesh_rmc, GFP_KERNEL);
+ sdata->u.mesh.rmc = kmalloc_obj(struct mesh_rmc);
if (!sdata->u.mesh.rmc)
return -ENOMEM;
sdata->u.mesh.rmc->idx_mask = RMC_BUCKETS - 1;
diff --git a/net/mac80211/mlme.c b/net/mac80211/mlme.c
index c1d0808f2545..e8edcee0e08a 100644
--- a/net/mac80211/mlme.c
+++ b/net/mac80211/mlme.c
@@ -10839,7 +10839,7 @@ int ieee80211_mgd_assoc_ml_reconf(struct ieee80211_sub_if_data *sdata,
if (added_links) {
bool uapsd_supported;
- data = kzalloc_obj(*data, GFP_KERNEL);
+ data = kzalloc_obj(*data);
if (!data)
return -ENOMEM;
diff --git a/net/mac80211/offchannel.c b/net/mac80211/offchannel.c
index 00ef339f7de4..f60f6a58948b 100644
--- a/net/mac80211/offchannel.c
+++ b/net/mac80211/offchannel.c
@@ -579,7 +579,7 @@ static int ieee80211_start_roc_work(struct ieee80211_local *local,
if (!local->emulate_chanctx && !local->ops->remain_on_channel)
return -EOPNOTSUPP;
- roc = kzalloc_obj(*roc, GFP_KERNEL);
+ roc = kzalloc_obj(*roc);
if (!roc)
return -ENOMEM;
diff --git a/net/mac80211/rate.c b/net/mac80211/rate.c
index 3ae891be800b..31af7dd6aedc 100644
--- a/net/mac80211/rate.c
+++ b/net/mac80211/rate.c
@@ -163,7 +163,7 @@ int ieee80211_rate_control_register(const struct rate_control_ops *ops)
}
}
- alg = kzalloc_obj(*alg, GFP_KERNEL);
+ alg = kzalloc_obj(*alg);
if (alg == NULL) {
mutex_unlock(&rate_ctrl_mutex);
return -ENOMEM;
@@ -263,7 +263,7 @@ rate_control_alloc(const char *name, struct ieee80211_local *local)
{
struct rate_control_ref *ref;
- ref = kmalloc_obj(struct rate_control_ref, GFP_KERNEL);
+ ref = kmalloc_obj(struct rate_control_ref);
if (!ref)
return NULL;
ref->ops = ieee80211_rate_control_ops_get(name);
diff --git a/net/mac80211/sta_info.c b/net/mac80211/sta_info.c
index 6abcf410a0ca..6dc22f1593be 100644
--- a/net/mac80211/sta_info.c
+++ b/net/mac80211/sta_info.c
@@ -903,7 +903,7 @@ static int sta_info_insert_finish(struct sta_info *sta) __acquires(RCU)
goto out_cleanup;
}
- sinfo = kzalloc_obj(struct station_info, GFP_KERNEL);
+ sinfo = kzalloc_obj(struct station_info);
if (!sinfo) {
err = -ENOMEM;
goto out_cleanup;
@@ -1545,7 +1545,7 @@ static void __sta_info_destroy_part2(struct sta_info *sta, bool recalc)
}
}
- sinfo = kzalloc_obj(*sinfo, GFP_KERNEL);
+ sinfo = kzalloc_obj(*sinfo);
if (sinfo)
sta_set_sinfo(sta, sinfo, true);
@@ -3306,7 +3306,7 @@ int ieee80211_sta_allocate_link(struct sta_info *sta, unsigned int link_id)
sta->link[link_id]))
return -EBUSY;
- alloc = kzalloc_obj(*alloc, GFP_KERNEL);
+ alloc = kzalloc_obj(*alloc);
if (!alloc)
return -ENOMEM;
diff --git a/net/mac80211/tests/util.c b/net/mac80211/tests/util.c
index cddc46eeb648..0b01264af577 100644
--- a/net/mac80211/tests/util.c
+++ b/net/mac80211/tests/util.c
@@ -195,16 +195,16 @@ int t_sdata_init(struct kunit_resource *resource, void *ctx)
struct kunit *test = kunit_get_current_test();
struct t_sdata *t_sdata;
- t_sdata = kzalloc_obj(*t_sdata, GFP_KERNEL);
+ t_sdata = kzalloc_obj(*t_sdata);
KUNIT_ASSERT_NOT_NULL(test, t_sdata);
resource->data = t_sdata;
resource->name = "sdata";
- t_sdata->sdata = kzalloc_obj(*t_sdata->sdata, GFP_KERNEL);
+ t_sdata->sdata = kzalloc_obj(*t_sdata->sdata);
KUNIT_ASSERT_NOT_NULL(test, t_sdata->sdata);
- t_sdata->wiphy = kzalloc_obj(*t_sdata->wiphy, GFP_KERNEL);
+ t_sdata->wiphy = kzalloc_obj(*t_sdata->wiphy);
KUNIT_ASSERT_NOT_NULL(test, t_sdata->wiphy);
strscpy(t_sdata->sdata->name, "kunit");
diff --git a/net/mac80211/tx.c b/net/mac80211/tx.c
index a3113e1d9829..8cdbd417d7be 100644
--- a/net/mac80211/tx.c
+++ b/net/mac80211/tx.c
@@ -1611,7 +1611,7 @@ int ieee80211_txq_setup_flows(struct ieee80211_local *local)
local->cparams.target = MS2TIME(20);
local->cparams.ecn = true;
- local->cvars = kvzalloc_objs(local->cvars[0], fq->flows_cnt, GFP_KERNEL);
+ local->cvars = kvzalloc_objs(local->cvars[0], fq->flows_cnt);
if (!local->cvars) {
spin_lock_bh(&fq->lock);
fq_reset(fq, fq_skb_free_func);
diff --git a/net/mac802154/cfg.c b/net/mac802154/cfg.c
index 44ad05726db3..e8484031a390 100644
--- a/net/mac802154/cfg.c
+++ b/net/mac802154/cfg.c
@@ -339,7 +339,7 @@ static int mac802154_associate(struct wpan_phy *wpan_phy,
if (coord->mode == IEEE802154_SHORT_ADDRESSING)
return -EINVAL;
- parent = kzalloc_obj(*parent, GFP_KERNEL);
+ parent = kzalloc_obj(*parent);
if (!parent)
return -ENOMEM;
diff --git a/net/mac802154/llsec.c b/net/mac802154/llsec.c
index 0489f2515eb6..e8512578398e 100644
--- a/net/mac802154/llsec.c
+++ b/net/mac802154/llsec.c
@@ -117,7 +117,7 @@ llsec_key_alloc(const struct ieee802154_llsec_key *template)
struct mac802154_llsec_key *key;
int i;
- key = kzalloc_obj(*key, GFP_KERNEL);
+ key = kzalloc_obj(*key);
if (!key)
return NULL;
@@ -241,7 +241,7 @@ int mac802154_llsec_key_add(struct mac802154_llsec *sec,
break;
}
- new = kzalloc_obj(*new, GFP_KERNEL);
+ new = kzalloc_obj(*new);
if (!new)
return -ENOMEM;
@@ -369,7 +369,7 @@ int mac802154_llsec_dev_add(struct mac802154_llsec *sec,
llsec_dev_find_long(sec, dev->hwaddr))
return -EEXIST;
- entry = kmalloc_obj(*entry, GFP_KERNEL);
+ entry = kmalloc_obj(*entry);
if (!entry)
return -ENOMEM;
@@ -441,7 +441,7 @@ int mac802154_llsec_devkey_add(struct mac802154_llsec *sec,
if (llsec_devkey_find(dev, &key->key_id))
return -EEXIST;
- devkey = kmalloc_obj(*devkey, GFP_KERNEL);
+ devkey = kmalloc_obj(*devkey);
if (!devkey)
return -ENOMEM;
@@ -500,7 +500,7 @@ int mac802154_llsec_seclevel_add(struct mac802154_llsec *sec,
if (llsec_find_seclevel(sec, sl))
return -EEXIST;
- entry = kmalloc_obj(*entry, GFP_KERNEL);
+ entry = kmalloc_obj(*entry);
if (!entry)
return -ENOMEM;
diff --git a/net/mac802154/scan.c b/net/mac802154/scan.c
index 583178784c9b..0a31ac8d8415 100644
--- a/net/mac802154/scan.c
+++ b/net/mac802154/scan.c
@@ -798,7 +798,7 @@ int mac802154_process_association_req(struct ieee802154_sub_if_data *sdata,
goto unlock;
}
- child = kzalloc_obj(*child, GFP_KERNEL);
+ child = kzalloc_obj(*child);
if (!child) {
ret = -ENOMEM;
goto unlock;
diff --git a/net/mctp/device.c b/net/mctp/device.c
index 08f3d35fa45b..2c84df674669 100644
--- a/net/mctp/device.c
+++ b/net/mctp/device.c
@@ -336,7 +336,7 @@ static struct mctp_dev *mctp_add_dev(struct net_device *dev)
ASSERT_RTNL();
- mdev = kzalloc_obj(*mdev, GFP_KERNEL);
+ mdev = kzalloc_obj(*mdev);
if (!mdev)
return ERR_PTR(-ENOMEM);
diff --git a/net/mctp/neigh.c b/net/mctp/neigh.c
index 5894433535eb..87e40db0f078 100644
--- a/net/mctp/neigh.c
+++ b/net/mctp/neigh.c
@@ -40,7 +40,7 @@ static int mctp_neigh_add(struct mctp_dev *mdev, mctp_eid_t eid,
goto out;
}
- neigh = kzalloc_obj(*neigh, GFP_KERNEL);
+ neigh = kzalloc_obj(*neigh);
if (!neigh) {
rc = -ENOMEM;
goto out;
diff --git a/net/mctp/route.c b/net/mctp/route.c
index 349fc650a805..0381377ab760 100644
--- a/net/mctp/route.c
+++ b/net/mctp/route.c
@@ -675,7 +675,7 @@ static struct mctp_route *mctp_route_alloc(void)
{
struct mctp_route *rt;
- rt = kzalloc_obj(*rt, GFP_KERNEL);
+ rt = kzalloc_obj(*rt);
if (!rt)
return NULL;
diff --git a/net/mctp/test/utils.c b/net/mctp/test/utils.c
index 922b2c353a4e..97afe8cd2b05 100644
--- a/net/mctp/test/utils.c
+++ b/net/mctp/test/utils.c
@@ -106,7 +106,7 @@ static struct mctp_test_route *mctp_route_test_alloc(void)
{
struct mctp_test_route *rt;
- rt = kzalloc_obj(*rt, GFP_KERNEL);
+ rt = kzalloc_obj(*rt);
if (!rt)
return NULL;
diff --git a/net/mpls/af_mpls.c b/net/mpls/af_mpls.c
index 82d885b8478a..ef9e749d5e08 100644
--- a/net/mpls/af_mpls.c
+++ b/net/mpls/af_mpls.c
@@ -1470,7 +1470,7 @@ static struct mpls_dev *mpls_add_dev(struct net_device *dev)
int err = -ENOMEM;
int i;
- mdev = kzalloc_obj(*mdev, GFP_KERNEL);
+ mdev = kzalloc_obj(*mdev);
if (!mdev)
return ERR_PTR(err);
@@ -1977,7 +1977,7 @@ static int mpls_rtm_delroute(struct sk_buff *skb, struct nlmsghdr *nlh,
struct mpls_route_config *cfg;
int err;
- cfg = kzalloc_obj(*cfg, GFP_KERNEL);
+ cfg = kzalloc_obj(*cfg);
if (!cfg)
return -ENOMEM;
@@ -2002,7 +2002,7 @@ static int mpls_rtm_newroute(struct sk_buff *skb, struct nlmsghdr *nlh,
struct mpls_route_config *cfg;
int err;
- cfg = kzalloc_obj(*cfg, GFP_KERNEL);
+ cfg = kzalloc_obj(*cfg);
if (!cfg)
return -ENOMEM;
diff --git a/net/ncsi/ncsi-manage.c b/net/ncsi/ncsi-manage.c
index dec9812c3fbb..54d0df0a9efe 100644
--- a/net/ncsi/ncsi-manage.c
+++ b/net/ncsi/ncsi-manage.c
@@ -1697,7 +1697,7 @@ int ncsi_vlan_rx_add_vid(struct net_device *dev, __be16 proto, u16 vid)
return -ENOSPC;
}
- vlan = kzalloc_obj(*vlan, GFP_KERNEL);
+ vlan = kzalloc_obj(*vlan);
if (!vlan)
return -ENOMEM;
diff --git a/net/netfilter/ipset/ip_set_core.c b/net/netfilter/ipset/ip_set_core.c
index c3beef6155b6..a2fe711cb5e3 100644
--- a/net/netfilter/ipset/ip_set_core.c
+++ b/net/netfilter/ipset/ip_set_core.c
@@ -1077,7 +1077,7 @@ static int ip_set_create(struct sk_buff *skb, const struct nfnl_info *info,
/* First, and without any locks, allocate and initialize
* a normal base set structure.
*/
- set = kzalloc_obj(*set, GFP_KERNEL);
+ set = kzalloc_obj(*set);
if (!set)
return -ENOMEM;
spin_lock_init(&set->lock);
@@ -1135,7 +1135,7 @@ static int ip_set_create(struct sk_buff *skb, const struct nfnl_info *info,
/* Wraparound */
goto cleanup;
- list = kvzalloc_objs(struct ip_set *, i, GFP_KERNEL);
+ list = kvzalloc_objs(struct ip_set *, i);
if (!list)
goto cleanup;
/* nfnl mutex is held, both lists are valid */
@@ -2377,7 +2377,7 @@ ip_set_net_init(struct net *net)
if (inst->ip_set_max >= IPSET_INVALID_ID)
inst->ip_set_max = IPSET_INVALID_ID - 1;
- list = kvzalloc_objs(struct ip_set *, inst->ip_set_max, GFP_KERNEL);
+ list = kvzalloc_objs(struct ip_set *, inst->ip_set_max);
if (!list)
return -ENOMEM;
inst->is_deleted = false;
diff --git a/net/netfilter/ipset/ip_set_list_set.c b/net/netfilter/ipset/ip_set_list_set.c
index 39165c014bd9..98b91b34c314 100644
--- a/net/netfilter/ipset/ip_set_list_set.c
+++ b/net/netfilter/ipset/ip_set_list_set.c
@@ -598,7 +598,7 @@ init_list_set(struct net *net, struct ip_set *set, u32 size)
{
struct list_set *map;
- map = kzalloc_obj(*map, GFP_KERNEL);
+ map = kzalloc_obj(*map);
if (!map)
return false;
diff --git a/net/netfilter/ipvs/ip_vs_ctl.c b/net/netfilter/ipvs/ip_vs_ctl.c
index d38867c52180..35642de2a0fe 100644
--- a/net/netfilter/ipvs/ip_vs_ctl.c
+++ b/net/netfilter/ipvs/ip_vs_ctl.c
@@ -938,7 +938,7 @@ int ip_vs_stats_init_alloc(struct ip_vs_stats *s)
struct ip_vs_stats *ip_vs_stats_alloc(void)
{
- struct ip_vs_stats *s = kzalloc_obj(*s, GFP_KERNEL);
+ struct ip_vs_stats *s = kzalloc_obj(*s);
if (s && ip_vs_stats_init_alloc(s) >= 0)
return s;
@@ -1079,7 +1079,7 @@ ip_vs_new_dest(struct ip_vs_service *svc, struct ip_vs_dest_user_kern *udest)
return -EINVAL;
}
- dest = kzalloc_obj(struct ip_vs_dest, GFP_KERNEL);
+ dest = kzalloc_obj(struct ip_vs_dest);
if (dest == NULL)
return -ENOMEM;
@@ -1421,7 +1421,7 @@ ip_vs_add_service(struct netns_ipvs *ipvs, struct ip_vs_service_user_kern *u,
ret_hooks = ret;
}
- svc = kzalloc_obj(struct ip_vs_service, GFP_KERNEL);
+ svc = kzalloc_obj(struct ip_vs_service);
if (svc == NULL) {
IP_VS_DBG(1, "%s(): no memory\n", __func__);
ret = -ENOMEM;
@@ -4439,7 +4439,7 @@ int __net_init ip_vs_control_net_init(struct netns_ipvs *ipvs)
INIT_DELAYED_WORK(&ipvs->est_reload_work, est_reload_work_handler);
/* procfs stats */
- ipvs->tot_stats = kzalloc_obj(*ipvs->tot_stats, GFP_KERNEL);
+ ipvs->tot_stats = kzalloc_obj(*ipvs->tot_stats);
if (!ipvs->tot_stats)
goto out;
if (ip_vs_stats_init_alloc(&ipvs->tot_stats->s) < 0)
diff --git a/net/netfilter/ipvs/ip_vs_dh.c b/net/netfilter/ipvs/ip_vs_dh.c
index ac1d6f5bfe8a..e1f62f6b25e2 100644
--- a/net/netfilter/ipvs/ip_vs_dh.c
+++ b/net/netfilter/ipvs/ip_vs_dh.c
@@ -153,7 +153,7 @@ static int ip_vs_dh_init_svc(struct ip_vs_service *svc)
struct ip_vs_dh_state *s;
/* allocate the DH table for this service */
- s = kzalloc_obj(struct ip_vs_dh_state, GFP_KERNEL);
+ s = kzalloc_obj(struct ip_vs_dh_state);
if (s == NULL)
return -ENOMEM;
diff --git a/net/netfilter/ipvs/ip_vs_est.c b/net/netfilter/ipvs/ip_vs_est.c
index 06999a17519b..b17de33314da 100644
--- a/net/netfilter/ipvs/ip_vs_est.c
+++ b/net/netfilter/ipvs/ip_vs_est.c
@@ -325,7 +325,7 @@ static int ip_vs_est_add_kthread(struct netns_ipvs *ipvs)
id = i;
}
- kd = kzalloc_obj(*kd, GFP_KERNEL);
+ kd = kzalloc_obj(*kd);
if (!kd)
goto out;
kd->ipvs = ipvs;
@@ -443,7 +443,7 @@ static int ip_vs_enqueue_estimator(struct netns_ipvs *ipvs,
td = rcu_dereference_protected(kd->ticks[row], 1);
if (!td) {
- td = kzalloc_obj(*td, GFP_KERNEL);
+ td = kzalloc_obj(*td);
if (!td) {
ret = -ENOMEM;
goto out;
diff --git a/net/netfilter/ipvs/ip_vs_lblc.c b/net/netfilter/ipvs/ip_vs_lblc.c
index 36d91153712c..15ccb2b2fa1f 100644
--- a/net/netfilter/ipvs/ip_vs_lblc.c
+++ b/net/netfilter/ipvs/ip_vs_lblc.c
@@ -347,7 +347,7 @@ static int ip_vs_lblc_init_svc(struct ip_vs_service *svc)
/*
* Allocate the ip_vs_lblc_table for this service
*/
- tbl = kmalloc_obj(*tbl, GFP_KERNEL);
+ tbl = kmalloc_obj(*tbl);
if (tbl == NULL)
return -ENOMEM;
diff --git a/net/netfilter/ipvs/ip_vs_lblcr.c b/net/netfilter/ipvs/ip_vs_lblcr.c
index eba6600decbe..c90ea897c3f7 100644
--- a/net/netfilter/ipvs/ip_vs_lblcr.c
+++ b/net/netfilter/ipvs/ip_vs_lblcr.c
@@ -510,7 +510,7 @@ static int ip_vs_lblcr_init_svc(struct ip_vs_service *svc)
/*
* Allocate the ip_vs_lblcr_table for this service
*/
- tbl = kmalloc_obj(*tbl, GFP_KERNEL);
+ tbl = kmalloc_obj(*tbl);
if (tbl == NULL)
return -ENOMEM;
diff --git a/net/netfilter/ipvs/ip_vs_mh.c b/net/netfilter/ipvs/ip_vs_mh.c
index 7f5be86bab4d..c029ff6b3eb2 100644
--- a/net/netfilter/ipvs/ip_vs_mh.c
+++ b/net/netfilter/ipvs/ip_vs_mh.c
@@ -382,7 +382,7 @@ static int ip_vs_mh_init_svc(struct ip_vs_service *svc)
struct ip_vs_mh_state *s;
/* Allocate the MH table for this service */
- s = kzalloc_obj(*s, GFP_KERNEL);
+ s = kzalloc_obj(*s);
if (!s)
return -ENOMEM;
diff --git a/net/netfilter/ipvs/ip_vs_proto.c b/net/netfilter/ipvs/ip_vs_proto.c
index a62c1e8fc1da..0046aed1fb38 100644
--- a/net/netfilter/ipvs/ip_vs_proto.c
+++ b/net/netfilter/ipvs/ip_vs_proto.c
@@ -66,7 +66,7 @@ register_ip_vs_proto_netns(struct netns_ipvs *ipvs, struct ip_vs_protocol *pp)
{
unsigned int hash = IP_VS_PROTO_HASH(pp->protocol);
struct ip_vs_proto_data *pd =
- kzalloc_obj(struct ip_vs_proto_data, GFP_KERNEL);
+ kzalloc_obj(struct ip_vs_proto_data);
if (!pd)
return -ENOMEM;
diff --git a/net/netfilter/ipvs/ip_vs_sh.c b/net/netfilter/ipvs/ip_vs_sh.c
index a4616433b445..cd67066e3b26 100644
--- a/net/netfilter/ipvs/ip_vs_sh.c
+++ b/net/netfilter/ipvs/ip_vs_sh.c
@@ -229,7 +229,7 @@ static int ip_vs_sh_init_svc(struct ip_vs_service *svc)
struct ip_vs_sh_state *s;
/* allocate the SH table for this service */
- s = kzalloc_obj(struct ip_vs_sh_state, GFP_KERNEL);
+ s = kzalloc_obj(struct ip_vs_sh_state);
if (s == NULL)
return -ENOMEM;
diff --git a/net/netfilter/ipvs/ip_vs_sync.c b/net/netfilter/ipvs/ip_vs_sync.c
index f83732777228..b2ba3befbd55 100644
--- a/net/netfilter/ipvs/ip_vs_sync.c
+++ b/net/netfilter/ipvs/ip_vs_sync.c
@@ -1827,7 +1827,7 @@ int start_sync_thread(struct netns_ipvs *ipvs, struct ipvs_sync_daemon_cfg *c,
struct ipvs_master_sync_state *ms;
result = -ENOMEM;
- ipvs->ms = kzalloc_objs(ipvs->ms[0], count, GFP_KERNEL);
+ ipvs->ms = kzalloc_objs(ipvs->ms[0], count);
if (!ipvs->ms)
goto out;
ms = ipvs->ms;
@@ -1841,7 +1841,7 @@ int start_sync_thread(struct netns_ipvs *ipvs, struct ipvs_sync_daemon_cfg *c,
}
}
result = -ENOMEM;
- ti = kzalloc_objs(struct ip_vs_sync_thread_data, count, GFP_KERNEL);
+ ti = kzalloc_objs(struct ip_vs_sync_thread_data, count);
if (!ti)
goto out;
diff --git a/net/netfilter/ipvs/ip_vs_wrr.c b/net/netfilter/ipvs/ip_vs_wrr.c
index 58c65af9830a..2dcff1040da5 100644
--- a/net/netfilter/ipvs/ip_vs_wrr.c
+++ b/net/netfilter/ipvs/ip_vs_wrr.c
@@ -109,7 +109,7 @@ static int ip_vs_wrr_init_svc(struct ip_vs_service *svc)
/*
* Allocate the mark variable for WRR scheduling
*/
- mark = kmalloc_obj(struct ip_vs_wrr_mark, GFP_KERNEL);
+ mark = kmalloc_obj(struct ip_vs_wrr_mark);
if (mark == NULL)
return -ENOMEM;
diff --git a/net/netfilter/nf_conncount.c b/net/netfilter/nf_conncount.c
index 520781335fc8..00eed5b4d1b1 100644
--- a/net/netfilter/nf_conncount.c
+++ b/net/netfilter/nf_conncount.c
@@ -632,7 +632,7 @@ struct nf_conncount_data *nf_conncount_init(struct net *net, unsigned int keylen
net_get_random_once(&conncount_rnd, sizeof(conncount_rnd));
- data = kmalloc_obj(*data, GFP_KERNEL);
+ data = kmalloc_obj(*data);
if (!data)
return ERR_PTR(-ENOMEM);
diff --git a/net/netfilter/nf_conntrack_core.c b/net/netfilter/nf_conntrack_core.c
index 42da155ab028..27ce5fda8993 100644
--- a/net/netfilter/nf_conntrack_core.c
+++ b/net/netfilter/nf_conntrack_core.c
@@ -2535,7 +2535,7 @@ void *nf_ct_alloc_hashtable(unsigned int *sizep, int nulls)
if (nr_slots > (INT_MAX / sizeof(struct hlist_nulls_head)))
return NULL;
- hash = kvzalloc_objs(struct hlist_nulls_head, nr_slots, GFP_KERNEL);
+ hash = kvzalloc_objs(struct hlist_nulls_head, nr_slots);
if (hash && nulls)
for (i = 0; i < nr_slots; i++)
diff --git a/net/netfilter/nf_conntrack_netlink.c b/net/netfilter/nf_conntrack_netlink.c
index cd1ab584fb2f..c9d725fc2d71 100644
--- a/net/netfilter/nf_conntrack_netlink.c
+++ b/net/netfilter/nf_conntrack_netlink.c
@@ -999,7 +999,7 @@ ctnetlink_alloc_filter(const struct nlattr * const cda[], u8 family)
return ERR_PTR(-EOPNOTSUPP);
#endif
- filter = kzalloc_obj(*filter, GFP_KERNEL);
+ filter = kzalloc_obj(*filter);
if (filter == NULL)
return ERR_PTR(-ENOMEM);
diff --git a/net/netfilter/nf_flow_table_offload.c b/net/netfilter/nf_flow_table_offload.c
index c95a18ca178b..9b677e116487 100644
--- a/net/netfilter/nf_flow_table_offload.c
+++ b/net/netfilter/nf_flow_table_offload.c
@@ -741,7 +741,7 @@ nf_flow_offload_rule_alloc(struct net *net,
struct nf_flow_rule *flow_rule;
int err = -ENOMEM;
- flow_rule = kzalloc_obj(*flow_rule, GFP_KERNEL);
+ flow_rule = kzalloc_obj(*flow_rule);
if (!flow_rule)
goto err_flow;
diff --git a/net/netfilter/nf_nat_core.c b/net/netfilter/nf_nat_core.c
index b4053e5ee07f..3b5434e4ec9c 100644
--- a/net/netfilter/nf_nat_core.c
+++ b/net/netfilter/nf_nat_core.c
@@ -1213,7 +1213,7 @@ int nf_nat_register_fn(struct net *net, u8 pf, const struct nf_hook_ops *ops,
}
for (i = 0; i < ops_count; i++) {
- priv = kzalloc_obj(*priv, GFP_KERNEL);
+ priv = kzalloc_obj(*priv);
if (priv) {
nat_ops[i].priv = priv;
continue;
diff --git a/net/netfilter/nf_tables_api.c b/net/netfilter/nf_tables_api.c
index 6044f1ec6953..06bd4d6eefeb 100644
--- a/net/netfilter/nf_tables_api.c
+++ b/net/netfilter/nf_tables_api.c
@@ -1104,7 +1104,7 @@ __printf(2, 3) int nft_request_module(struct net *net, const char *fmt,
}
}
- req = kmalloc_obj(*req, GFP_KERNEL);
+ req = kmalloc_obj(*req);
if (!req)
return -ENOMEM;
@@ -8075,7 +8075,7 @@ static struct nft_object *nft_obj_init(const struct nft_ctx *ctx,
struct nft_object *obj;
int err = -ENOMEM;
- tb = kmalloc_objs(*tb, type->maxattr + 1, GFP_KERNEL);
+ tb = kmalloc_objs(*tb, type->maxattr + 1);
if (!tb)
goto err1;
@@ -10688,7 +10688,7 @@ static int nf_tables_commit_audit_alloc(struct list_head *adl,
if (adp->table == table)
return 0;
}
- adp = kzalloc_obj(*adp, GFP_KERNEL);
+ adp = kzalloc_obj(*adp);
if (!adp)
return -ENOMEM;
adp->table = table;
diff --git a/net/netfilter/nf_tables_offload.c b/net/netfilter/nf_tables_offload.c
index 42f11cb0c0f5..9101b1703b52 100644
--- a/net/netfilter/nf_tables_offload.c
+++ b/net/netfilter/nf_tables_offload.c
@@ -11,7 +11,7 @@ static struct nft_flow_rule *nft_flow_rule_alloc(int num_actions)
{
struct nft_flow_rule *flow;
- flow = kzalloc_obj(struct nft_flow_rule, GFP_KERNEL);
+ flow = kzalloc_obj(struct nft_flow_rule);
if (!flow)
return NULL;
@@ -111,7 +111,7 @@ struct nft_flow_rule *nft_flow_rule_create(struct net *net,
expr = nft_expr_first(rule);
- ctx = kzalloc_obj(struct nft_offload_ctx, GFP_KERNEL);
+ ctx = kzalloc_obj(struct nft_offload_ctx);
if (!ctx) {
err = -ENOMEM;
goto err_out;
diff --git a/net/netfilter/nfnetlink.c b/net/netfilter/nfnetlink.c
index 39c3d54de9f6..e62a0dea24ea 100644
--- a/net/netfilter/nfnetlink.c
+++ b/net/netfilter/nfnetlink.c
@@ -325,7 +325,7 @@ static int nfnl_err_add(struct list_head *list, struct nlmsghdr *nlh, int err,
{
struct nfnl_err *nfnl_err;
- nfnl_err = kmalloc_obj(struct nfnl_err, GFP_KERNEL);
+ nfnl_err = kmalloc_obj(struct nfnl_err);
if (nfnl_err == NULL)
return -ENOMEM;
diff --git a/net/netfilter/nfnetlink_acct.c b/net/netfilter/nfnetlink_acct.c
index bd3d960a1adb..2bfaa773d82f 100644
--- a/net/netfilter/nfnetlink_acct.c
+++ b/net/netfilter/nfnetlink_acct.c
@@ -260,7 +260,7 @@ static int nfnl_acct_start(struct netlink_callback *cb)
if (!tb[NFACCT_FILTER_MASK] || !tb[NFACCT_FILTER_VALUE])
return -EINVAL;
- filter = kzalloc_obj(struct nfacct_filter, GFP_KERNEL);
+ filter = kzalloc_obj(struct nfacct_filter);
if (!filter)
return -ENOMEM;
diff --git a/net/netfilter/nfnetlink_cthelper.c b/net/netfilter/nfnetlink_cthelper.c
index 1a3d333e45dd..5efffc52d981 100644
--- a/net/netfilter/nfnetlink_cthelper.c
+++ b/net/netfilter/nfnetlink_cthelper.c
@@ -227,7 +227,7 @@ nfnl_cthelper_create(const struct nlattr * const tb[],
if (!tb[NFCTH_TUPLE] || !tb[NFCTH_POLICY] || !tb[NFCTH_PRIV_DATA_LEN])
return -EINVAL;
- nfcth = kzalloc_obj(*nfcth, GFP_KERNEL);
+ nfcth = kzalloc_obj(*nfcth);
if (nfcth == NULL)
return -ENOMEM;
helper = &nfcth->helper;
diff --git a/net/netfilter/nfnetlink_cttimeout.c b/net/netfilter/nfnetlink_cttimeout.c
index 6b91f9d3161a..fd8652aa7e88 100644
--- a/net/netfilter/nfnetlink_cttimeout.c
+++ b/net/netfilter/nfnetlink_cttimeout.c
@@ -74,7 +74,7 @@ ctnl_timeout_parse_policy(void *timeout,
struct nlattr **tb;
int ret = 0;
- tb = kzalloc_objs(*tb, l4proto->ctnl_timeout.nlattr_max + 1, GFP_KERNEL);
+ tb = kzalloc_objs(*tb, l4proto->ctnl_timeout.nlattr_max + 1);
if (!tb)
return -ENOMEM;
diff --git a/net/netfilter/nfnetlink_hook.c b/net/netfilter/nfnetlink_hook.c
index c2a572d86853..531706982859 100644
--- a/net/netfilter/nfnetlink_hook.c
+++ b/net/netfilter/nfnetlink_hook.c
@@ -408,7 +408,7 @@ static int nfnl_hook_dump_start(struct netlink_callback *cb)
if (head && IS_ERR(head))
return PTR_ERR(head);
- ctx = kzalloc_obj(*ctx, GFP_KERNEL);
+ ctx = kzalloc_obj(*ctx);
if (!ctx)
return -ENOMEM;
diff --git a/net/netfilter/nfnetlink_osf.c b/net/netfilter/nfnetlink_osf.c
index 1ba43e562a5e..94e3eac5743a 100644
--- a/net/netfilter/nfnetlink_osf.c
+++ b/net/netfilter/nfnetlink_osf.c
@@ -323,7 +323,7 @@ static int nfnl_osf_add_callback(struct sk_buff *skb,
!memchr(f->version, 0, MAXGENRELEN))
return -EINVAL;
- kf = kmalloc_obj(struct nf_osf_finger, GFP_KERNEL);
+ kf = kmalloc_obj(struct nf_osf_finger);
if (!kf)
return -ENOMEM;
diff --git a/net/netfilter/nft_ct.c b/net/netfilter/nft_ct.c
index 8d7f6c8e8aad..47d3ef109a99 100644
--- a/net/netfilter/nft_ct.c
+++ b/net/netfilter/nft_ct.c
@@ -894,7 +894,7 @@ nft_ct_timeout_parse_policy(void *timeouts,
struct nlattr **tb;
int ret = 0;
- tb = kzalloc_objs(*tb, l4proto->ctnl_timeout.nlattr_max + 1, GFP_KERNEL);
+ tb = kzalloc_objs(*tb, l4proto->ctnl_timeout.nlattr_max + 1);
if (!tb)
return -ENOMEM;
diff --git a/net/netfilter/x_tables.c b/net/netfilter/x_tables.c
index f5d720c9ee32..e594b3b7ad82 100644
--- a/net/netfilter/x_tables.c
+++ b/net/netfilter/x_tables.c
@@ -1742,7 +1742,7 @@ xt_hook_ops_alloc(const struct xt_table *table, nf_hookfn *fn)
if (!num_hooks)
return ERR_PTR(-EINVAL);
- ops = kzalloc_objs(*ops, num_hooks, GFP_KERNEL);
+ ops = kzalloc_objs(*ops, num_hooks);
if (ops == NULL)
return ERR_PTR(-ENOMEM);
@@ -1775,7 +1775,7 @@ int xt_register_template(const struct xt_table *table,
}
ret = -ENOMEM;
- t = kzalloc_obj(*t, GFP_KERNEL);
+ t = kzalloc_obj(*t);
if (!t)
goto out_unlock;
@@ -1993,7 +1993,7 @@ static int __init xt_init(void)
}
}
- xt = kzalloc_objs(struct xt_af, NFPROTO_NUMPROTO, GFP_KERNEL);
+ xt = kzalloc_objs(struct xt_af, NFPROTO_NUMPROTO);
if (!xt)
return -ENOMEM;
diff --git a/net/netfilter/xt_IDLETIMER.c b/net/netfilter/xt_IDLETIMER.c
index 746abeee6775..5d93e225d0f8 100644
--- a/net/netfilter/xt_IDLETIMER.c
+++ b/net/netfilter/xt_IDLETIMER.c
@@ -135,7 +135,7 @@ static int idletimer_tg_create(struct idletimer_tg_info *info)
{
int ret;
- info->timer = kzalloc_obj(*info->timer, GFP_KERNEL);
+ info->timer = kzalloc_obj(*info->timer);
if (!info->timer) {
ret = -ENOMEM;
goto out;
@@ -184,7 +184,7 @@ static int idletimer_tg_create_v1(struct idletimer_tg_info_v1 *info)
{
int ret;
- info->timer = kmalloc_obj(*info->timer, GFP_KERNEL);
+ info->timer = kmalloc_obj(*info->timer);
if (!info->timer) {
ret = -ENOMEM;
goto out;
diff --git a/net/netfilter/xt_LED.c b/net/netfilter/xt_LED.c
index 6b21810e1b97..caaaf4d2c584 100644
--- a/net/netfilter/xt_LED.c
+++ b/net/netfilter/xt_LED.c
@@ -111,7 +111,7 @@ static int led_tg_check(const struct xt_tgchk_param *par)
}
err = -ENOMEM;
- ledinternal = kzalloc_obj(struct xt_led_info_internal, GFP_KERNEL);
+ ledinternal = kzalloc_obj(struct xt_led_info_internal);
if (!ledinternal)
goto exit_mutex_only;
diff --git a/net/netfilter/xt_RATEEST.c b/net/netfilter/xt_RATEEST.c
index d75b1e101a5b..91270d467ffd 100644
--- a/net/netfilter/xt_RATEEST.c
+++ b/net/netfilter/xt_RATEEST.c
@@ -139,7 +139,7 @@ static int xt_rateest_tg_checkentry(const struct xt_tgchk_param *par)
}
ret = -ENOMEM;
- est = kzalloc_obj(*est, GFP_KERNEL);
+ est = kzalloc_obj(*est);
if (!est)
goto err1;
diff --git a/net/netfilter/xt_TEE.c b/net/netfilter/xt_TEE.c
index c6044ea31d16..5d34ceb893ed 100644
--- a/net/netfilter/xt_TEE.c
+++ b/net/netfilter/xt_TEE.c
@@ -106,7 +106,7 @@ static int tee_tg_check(const struct xt_tgchk_param *par)
if (info->oif[sizeof(info->oif)-1] != '\0')
return -EINVAL;
- priv = kzalloc_obj(*priv, GFP_KERNEL);
+ priv = kzalloc_obj(*priv);
if (priv == NULL)
return -ENOMEM;
diff --git a/net/netfilter/xt_limit.c b/net/netfilter/xt_limit.c
index 203f8bb28132..87d74da14c0b 100644
--- a/net/netfilter/xt_limit.c
+++ b/net/netfilter/xt_limit.c
@@ -115,7 +115,7 @@ static int limit_mt_check(const struct xt_mtchk_param *par)
return -ERANGE;
}
- priv = kmalloc_obj(*priv, GFP_KERNEL);
+ priv = kmalloc_obj(*priv);
if (priv == NULL)
return -ENOMEM;
diff --git a/net/netfilter/xt_quota.c b/net/netfilter/xt_quota.c
index 7952a4ef4c51..b05c5c8dac78 100644
--- a/net/netfilter/xt_quota.c
+++ b/net/netfilter/xt_quota.c
@@ -50,7 +50,7 @@ static int quota_mt_check(const struct xt_mtchk_param *par)
if (q->flags & ~XT_QUOTA_MASK)
return -EINVAL;
- q->master = kmalloc_obj(*q->master, GFP_KERNEL);
+ q->master = kmalloc_obj(*q->master);
if (q->master == NULL)
return -ENOMEM;
diff --git a/net/netfilter/xt_statistic.c b/net/netfilter/xt_statistic.c
index e80ddc317ca5..334e09771abf 100644
--- a/net/netfilter/xt_statistic.c
+++ b/net/netfilter/xt_statistic.c
@@ -58,7 +58,7 @@ static int statistic_mt_check(const struct xt_mtchk_param *par)
info->flags & ~XT_STATISTIC_MASK)
return -EINVAL;
- info->master = kzalloc_obj(*info->master, GFP_KERNEL);
+ info->master = kzalloc_obj(*info->master);
if (info->master == NULL)
return -ENOMEM;
atomic_set(&info->master->count, info->u.nth.count);
diff --git a/net/netlabel/netlabel_calipso.c b/net/netlabel/netlabel_calipso.c
index fae0bee5c065..e1efd888b4a2 100644
--- a/net/netlabel/netlabel_calipso.c
+++ b/net/netlabel/netlabel_calipso.c
@@ -95,7 +95,7 @@ static int netlbl_calipso_add_pass(struct genl_info *info,
int ret_val;
struct calipso_doi *doi_def = NULL;
- doi_def = kmalloc_obj(*doi_def, GFP_KERNEL);
+ doi_def = kmalloc_obj(*doi_def);
if (!doi_def)
return -ENOMEM;
doi_def->type = CALIPSO_MAP_PASS;
diff --git a/net/netlabel/netlabel_cipso_v4.c b/net/netlabel/netlabel_cipso_v4.c
index 526f3dc3e67a..b080e666523f 100644
--- a/net/netlabel/netlabel_cipso_v4.c
+++ b/net/netlabel/netlabel_cipso_v4.c
@@ -139,10 +139,10 @@ static int netlbl_cipsov4_add_std(struct genl_info *info,
NULL) != 0)
return -EINVAL;
- doi_def = kmalloc_obj(*doi_def, GFP_KERNEL);
+ doi_def = kmalloc_obj(*doi_def);
if (doi_def == NULL)
return -ENOMEM;
- doi_def->map.std = kzalloc_obj(*doi_def->map.std, GFP_KERNEL);
+ doi_def->map.std = kzalloc_obj(*doi_def->map.std);
if (doi_def->map.std == NULL) {
kfree(doi_def);
return -ENOMEM;
@@ -332,7 +332,7 @@ static int netlbl_cipsov4_add_pass(struct genl_info *info,
if (!info->attrs[NLBL_CIPSOV4_A_TAGLST])
return -EINVAL;
- doi_def = kmalloc_obj(*doi_def, GFP_KERNEL);
+ doi_def = kmalloc_obj(*doi_def);
if (doi_def == NULL)
return -ENOMEM;
doi_def->type = CIPSO_V4_MAP_PASS;
@@ -371,7 +371,7 @@ static int netlbl_cipsov4_add_local(struct genl_info *info,
if (!info->attrs[NLBL_CIPSOV4_A_TAGLST])
return -EINVAL;
- doi_def = kmalloc_obj(*doi_def, GFP_KERNEL);
+ doi_def = kmalloc_obj(*doi_def);
if (doi_def == NULL)
return -ENOMEM;
doi_def->type = CIPSO_V4_MAP_LOCAL;
diff --git a/net/netlabel/netlabel_domainhash.c b/net/netlabel/netlabel_domainhash.c
index fc014849d6b3..3fe31648ba2d 100644
--- a/net/netlabel/netlabel_domainhash.c
+++ b/net/netlabel/netlabel_domainhash.c
@@ -367,11 +367,11 @@ int __init netlbl_domhsh_init(u32 size)
if (size == 0)
return -EINVAL;
- hsh_tbl = kmalloc_obj(*hsh_tbl, GFP_KERNEL);
+ hsh_tbl = kmalloc_obj(*hsh_tbl);
if (hsh_tbl == NULL)
return -ENOMEM;
hsh_tbl->size = 1 << size;
- hsh_tbl->tbl = kzalloc_objs(struct list_head, hsh_tbl->size, GFP_KERNEL);
+ hsh_tbl->tbl = kzalloc_objs(struct list_head, hsh_tbl->size);
if (hsh_tbl->tbl == NULL) {
kfree(hsh_tbl);
return -ENOMEM;
diff --git a/net/netlabel/netlabel_mgmt.c b/net/netlabel/netlabel_mgmt.c
index 13f45fbff824..3e89c3b3a1a4 100644
--- a/net/netlabel/netlabel_mgmt.c
+++ b/net/netlabel/netlabel_mgmt.c
@@ -84,7 +84,7 @@ static int netlbl_mgmt_add_common(struct genl_info *info,
struct calipso_doi *calipso = NULL;
#endif
u32 tmp_val;
- struct netlbl_dom_map *entry = kzalloc_obj(*entry, GFP_KERNEL);
+ struct netlbl_dom_map *entry = kzalloc_obj(*entry);
if (!entry)
return -ENOMEM;
@@ -148,7 +148,7 @@ static int netlbl_mgmt_add_common(struct genl_info *info,
struct in_addr *mask;
struct netlbl_domaddr4_map *map;
- addrmap = kzalloc_obj(*addrmap, GFP_KERNEL);
+ addrmap = kzalloc_obj(*addrmap);
if (addrmap == NULL) {
ret_val = -ENOMEM;
goto add_doi_put_def;
@@ -169,7 +169,7 @@ static int netlbl_mgmt_add_common(struct genl_info *info,
addr = nla_data(info->attrs[NLBL_MGMT_A_IPV4ADDR]);
mask = nla_data(info->attrs[NLBL_MGMT_A_IPV4MASK]);
- map = kzalloc_obj(*map, GFP_KERNEL);
+ map = kzalloc_obj(*map);
if (map == NULL) {
ret_val = -ENOMEM;
goto add_free_addrmap;
@@ -195,7 +195,7 @@ static int netlbl_mgmt_add_common(struct genl_info *info,
struct in6_addr *mask;
struct netlbl_domaddr6_map *map;
- addrmap = kzalloc_obj(*addrmap, GFP_KERNEL);
+ addrmap = kzalloc_obj(*addrmap);
if (addrmap == NULL) {
ret_val = -ENOMEM;
goto add_doi_put_def;
@@ -216,7 +216,7 @@ static int netlbl_mgmt_add_common(struct genl_info *info,
addr = nla_data(info->attrs[NLBL_MGMT_A_IPV6ADDR]);
mask = nla_data(info->attrs[NLBL_MGMT_A_IPV6MASK]);
- map = kzalloc_obj(*map, GFP_KERNEL);
+ map = kzalloc_obj(*map);
if (map == NULL) {
ret_val = -ENOMEM;
goto add_free_addrmap;
diff --git a/net/netlabel/netlabel_unlabeled.c b/net/netlabel/netlabel_unlabeled.c
index ab68324c08d9..ca7a9e2a3de7 100644
--- a/net/netlabel/netlabel_unlabeled.c
+++ b/net/netlabel/netlabel_unlabeled.c
@@ -1413,11 +1413,11 @@ int __init netlbl_unlabel_init(u32 size)
if (size == 0)
return -EINVAL;
- hsh_tbl = kmalloc_obj(*hsh_tbl, GFP_KERNEL);
+ hsh_tbl = kmalloc_obj(*hsh_tbl);
if (hsh_tbl == NULL)
return -ENOMEM;
hsh_tbl->size = 1 << size;
- hsh_tbl->tbl = kzalloc_objs(struct list_head, hsh_tbl->size, GFP_KERNEL);
+ hsh_tbl->tbl = kzalloc_objs(struct list_head, hsh_tbl->size);
if (hsh_tbl->tbl == NULL) {
kfree(hsh_tbl);
return -ENOMEM;
@@ -1532,7 +1532,7 @@ int __init netlbl_unlabel_defconf(void)
audit_info.loginuid = GLOBAL_ROOT_UID;
audit_info.sessionid = 0;
- entry = kzalloc_obj(*entry, GFP_KERNEL);
+ entry = kzalloc_obj(*entry);
if (entry == NULL)
return -ENOMEM;
entry->family = AF_UNSPEC;
diff --git a/net/netlink/af_netlink.c b/net/netlink/af_netlink.c
index 2d91b8b8ba9a..4d609d5cf406 100644
--- a/net/netlink/af_netlink.c
+++ b/net/netlink/af_netlink.c
@@ -2927,7 +2927,7 @@ static int __init netlink_proto_init(void)
BUILD_BUG_ON(sizeof(struct netlink_skb_parms) > sizeof_field(struct sk_buff, cb));
- nl_table = kzalloc_objs(*nl_table, MAX_LINKS, GFP_KERNEL);
+ nl_table = kzalloc_objs(*nl_table, MAX_LINKS);
if (!nl_table)
goto panic;
diff --git a/net/netlink/diag.c b/net/netlink/diag.c
index 25e930a64d07..1dfc340736b8 100644
--- a/net/netlink/diag.c
+++ b/net/netlink/diag.c
@@ -107,7 +107,7 @@ static int __netlink_diag_dump(struct sk_buff *skb, struct netlink_callback *cb,
num--;
if (!hti) {
- hti = kmalloc_obj(*hti, GFP_KERNEL);
+ hti = kmalloc_obj(*hti);
if (!hti)
return -ENOMEM;
diff --git a/net/netlink/genetlink.c b/net/netlink/genetlink.c
index ac1fdf7d7327..a23d4c51c089 100644
--- a/net/netlink/genetlink.c
+++ b/net/netlink/genetlink.c
@@ -659,7 +659,7 @@ static int genl_sk_privs_alloc(struct genl_family *family)
if (!family->sock_priv_size)
return 0;
- family->sock_privs = kzalloc_obj(*family->sock_privs, GFP_KERNEL);
+ family->sock_privs = kzalloc_obj(*family->sock_privs);
if (!family->sock_privs)
return -ENOMEM;
xa_init(family->sock_privs);
@@ -912,7 +912,7 @@ EXPORT_SYMBOL(genlmsg_put);
static struct genl_dumpit_info *genl_dumpit_info_alloc(void)
{
- return kmalloc_obj(struct genl_dumpit_info, GFP_KERNEL);
+ return kmalloc_obj(struct genl_dumpit_info);
}
static void genl_dumpit_info_free(const struct genl_dumpit_info *info)
@@ -937,7 +937,7 @@ genl_family_rcv_msg_attrs_parse(const struct genl_family *family,
if (!ops->maxattr)
return NULL;
- attrbuf = kmalloc_objs(struct nlattr *, ops->maxattr + 1, GFP_KERNEL);
+ attrbuf = kmalloc_objs(struct nlattr *, ops->maxattr + 1);
if (!attrbuf)
return ERR_PTR(-ENOMEM);
@@ -1590,7 +1590,7 @@ static int ctrl_dumppolicy_start(struct netlink_callback *cb)
return 0;
}
- ctx->op_iter = kmalloc_obj(*ctx->op_iter, GFP_KERNEL);
+ ctx->op_iter = kmalloc_obj(*ctx->op_iter);
if (!ctx->op_iter)
return -ENOMEM;
diff --git a/net/netrom/af_netrom.c b/net/netrom/af_netrom.c
index d7090dad8113..b816c56124ab 100644
--- a/net/netrom/af_netrom.c
+++ b/net/netrom/af_netrom.c
@@ -1401,7 +1401,7 @@ static int __init nr_proto_init(void)
goto unregister_proto;
}
- dev_nr = kzalloc_objs(struct net_device *, nr_ndevs, GFP_KERNEL);
+ dev_nr = kzalloc_objs(struct net_device *, nr_ndevs);
if (!dev_nr) {
pr_err("NET/ROM: %s - unable to allocate device array\n",
__func__);
diff --git a/net/nfc/core.c b/net/nfc/core.c
index c39d00b2a0d7..a92a6566e6a0 100644
--- a/net/nfc/core.c
+++ b/net/nfc/core.c
@@ -879,7 +879,7 @@ int nfc_add_se(struct nfc_dev *dev, u32 se_idx, u16 type)
if (se)
return -EALREADY;
- se = kzalloc_obj(struct nfc_se, GFP_KERNEL);
+ se = kzalloc_obj(struct nfc_se);
if (!se)
return -ENOMEM;
@@ -1062,7 +1062,7 @@ struct nfc_dev *nfc_allocate_device(const struct nfc_ops *ops,
if (!supported_protocols)
return NULL;
- dev = kzalloc_obj(struct nfc_dev, GFP_KERNEL);
+ dev = kzalloc_obj(struct nfc_dev);
if (!dev)
return NULL;
diff --git a/net/nfc/digital_core.c b/net/nfc/digital_core.c
index be9a048b583b..3670bb33732e 100644
--- a/net/nfc/digital_core.c
+++ b/net/nfc/digital_core.c
@@ -231,7 +231,7 @@ int digital_send_cmd(struct nfc_digital_dev *ddev, u8 cmd_type,
{
struct digital_cmd *cmd;
- cmd = kzalloc_obj(*cmd, GFP_KERNEL);
+ cmd = kzalloc_obj(*cmd);
if (!cmd)
return -ENOMEM;
@@ -279,7 +279,7 @@ static int digital_tg_listen_mdaa(struct nfc_digital_dev *ddev, u8 rf_tech)
struct digital_tg_mdaa_params *params;
int rc;
- params = kzalloc_obj(*params, GFP_KERNEL);
+ params = kzalloc_obj(*params);
if (!params)
return -ENOMEM;
@@ -706,7 +706,7 @@ static int digital_in_send(struct nfc_dev *nfc_dev, struct nfc_target *target,
struct digital_data_exch *data_exch;
int rc;
- data_exch = kzalloc_obj(*data_exch, GFP_KERNEL);
+ data_exch = kzalloc_obj(*data_exch);
if (!data_exch)
return -ENOMEM;
@@ -762,7 +762,7 @@ struct nfc_digital_dev *nfc_digital_allocate_device(const struct nfc_digital_ops
!ops->switch_rf || (ops->tg_listen_md && !ops->tg_get_rf_tech))
return NULL;
- ddev = kzalloc_obj(*ddev, GFP_KERNEL);
+ ddev = kzalloc_obj(*ddev);
if (!ddev)
return NULL;
diff --git a/net/nfc/digital_technology.c b/net/nfc/digital_technology.c
index df2bfb4734c5..63f1b721c71d 100644
--- a/net/nfc/digital_technology.c
+++ b/net/nfc/digital_technology.c
@@ -490,7 +490,7 @@ static void digital_in_recv_sens_res(struct nfc_digital_dev *ddev, void *arg,
goto exit;
}
- target = kzalloc_obj(struct nfc_target, GFP_KERNEL);
+ target = kzalloc_obj(struct nfc_target);
if (!target) {
rc = -ENOMEM;
goto exit;
@@ -688,7 +688,7 @@ static void digital_in_recv_sensb_res(struct nfc_digital_dev *ddev, void *arg,
else
ddev->target_fsc = digital_ats_fsc[fsci];
- target = kzalloc_obj(struct nfc_target, GFP_KERNEL);
+ target = kzalloc_obj(struct nfc_target);
if (!target) {
rc = -ENOMEM;
goto exit;
@@ -863,7 +863,7 @@ static void digital_in_recv_iso15693_inv_res(struct nfc_digital_dev *ddev,
goto out_free_skb;
}
- target = kzalloc_obj(*target, GFP_KERNEL);
+ target = kzalloc_obj(*target);
if (!target) {
rc = -ENOMEM;
goto out_free_skb;
diff --git a/net/nfc/hci/core.c b/net/nfc/hci/core.c
index 10bcd9d2576a..0d33c81a15fe 100644
--- a/net/nfc/hci/core.c
+++ b/net/nfc/hci/core.c
@@ -291,7 +291,7 @@ int nfc_hci_target_discovered(struct nfc_hci_dev *hdev, u8 gate)
pr_debug("from gate %d\n", gate);
- targets = kzalloc_obj(struct nfc_target, GFP_KERNEL);
+ targets = kzalloc_obj(struct nfc_target);
if (targets == NULL)
return -ENOMEM;
@@ -964,7 +964,7 @@ struct nfc_hci_dev *nfc_hci_allocate_device(const struct nfc_hci_ops *ops,
if (protocols == 0)
return NULL;
- hdev = kzalloc_obj(struct nfc_hci_dev, GFP_KERNEL);
+ hdev = kzalloc_obj(struct nfc_hci_dev);
if (hdev == NULL)
return NULL;
diff --git a/net/nfc/hci/hcp.c b/net/nfc/hci/hcp.c
index 903fb134cd80..4d19c697d6ec 100644
--- a/net/nfc/hci/hcp.c
+++ b/net/nfc/hci/hcp.c
@@ -30,7 +30,7 @@ int nfc_hci_hcp_message_tx(struct nfc_hci_dev *hdev, u8 pipe,
int hci_len, err;
bool firstfrag = true;
- cmd = kzalloc_obj(struct hci_msg, GFP_KERNEL);
+ cmd = kzalloc_obj(struct hci_msg);
if (cmd == NULL)
return -ENOMEM;
diff --git a/net/nfc/hci/llc.c b/net/nfc/hci/llc.c
index 12d7940c6217..51dfa0d5dfa2 100644
--- a/net/nfc/hci/llc.c
+++ b/net/nfc/hci/llc.c
@@ -49,7 +49,7 @@ int nfc_llc_register(const char *name, const struct nfc_llc_ops *ops)
{
struct nfc_llc_engine *llc_engine;
- llc_engine = kzalloc_obj(struct nfc_llc_engine, GFP_KERNEL);
+ llc_engine = kzalloc_obj(struct nfc_llc_engine);
if (llc_engine == NULL)
return -ENOMEM;
@@ -90,7 +90,7 @@ struct nfc_llc *nfc_llc_allocate(const char *name, struct nfc_hci_dev *hdev,
if (llc_engine == NULL)
return NULL;
- llc = kzalloc_obj(struct nfc_llc, GFP_KERNEL);
+ llc = kzalloc_obj(struct nfc_llc);
if (llc == NULL)
return NULL;
diff --git a/net/nfc/hci/llc_nop.c b/net/nfc/hci/llc_nop.c
index eb940330fd5d..f9c826a138e5 100644
--- a/net/nfc/hci/llc_nop.c
+++ b/net/nfc/hci/llc_nop.c
@@ -28,7 +28,7 @@ static void *llc_nop_init(struct nfc_hci_dev *hdev, xmit_to_drv_t xmit_to_drv,
*rx_headroom = 0;
*rx_tailroom = 0;
- llc_nop = kzalloc_obj(struct llc_nop, GFP_KERNEL);
+ llc_nop = kzalloc_obj(struct llc_nop);
if (llc_nop == NULL)
return NULL;
diff --git a/net/nfc/hci/llc_shdlc.c b/net/nfc/hci/llc_shdlc.c
index 7e0d84c29cb1..6819695d993c 100644
--- a/net/nfc/hci/llc_shdlc.c
+++ b/net/nfc/hci/llc_shdlc.c
@@ -728,7 +728,7 @@ static void *llc_shdlc_init(struct nfc_hci_dev *hdev, xmit_to_drv_t xmit_to_drv,
*rx_headroom = SHDLC_LLC_HEAD_ROOM;
*rx_tailroom = 0;
- shdlc = kzalloc_obj(struct llc_shdlc, GFP_KERNEL);
+ shdlc = kzalloc_obj(struct llc_shdlc);
if (shdlc == NULL)
return NULL;
diff --git a/net/nfc/llcp_commands.c b/net/nfc/llcp_commands.c
index 90f68199ecca..291f26facbf3 100644
--- a/net/nfc/llcp_commands.c
+++ b/net/nfc/llcp_commands.c
@@ -108,7 +108,7 @@ struct nfc_llcp_sdp_tlv *nfc_llcp_build_sdres_tlv(u8 tid, u8 sap)
struct nfc_llcp_sdp_tlv *sdres;
u8 value[2];
- sdres = kzalloc_obj(struct nfc_llcp_sdp_tlv, GFP_KERNEL);
+ sdres = kzalloc_obj(struct nfc_llcp_sdp_tlv);
if (sdres == NULL)
return NULL;
@@ -141,7 +141,7 @@ struct nfc_llcp_sdp_tlv *nfc_llcp_build_sdreq_tlv(u8 tid, const char *uri,
if (WARN_ON_ONCE(uri_len > U8_MAX - 4))
return NULL;
- sdreq = kzalloc_obj(struct nfc_llcp_sdp_tlv, GFP_KERNEL);
+ sdreq = kzalloc_obj(struct nfc_llcp_sdp_tlv);
if (sdreq == NULL)
return NULL;
diff --git a/net/nfc/llcp_core.c b/net/nfc/llcp_core.c
index 98f0c3281281..366d7566308c 100644
--- a/net/nfc/llcp_core.c
+++ b/net/nfc/llcp_core.c
@@ -1621,7 +1621,7 @@ int nfc_llcp_register_device(struct nfc_dev *ndev)
{
struct nfc_llcp_local *local;
- local = kzalloc_obj(struct nfc_llcp_local, GFP_KERNEL);
+ local = kzalloc_obj(struct nfc_llcp_local);
if (local == NULL)
return -ENOMEM;
diff --git a/net/nfc/nci/core.c b/net/nfc/nci/core.c
index dc17ed8be242..6e9b76e2cc56 100644
--- a/net/nfc/nci/core.c
+++ b/net/nfc/nci/core.c
@@ -1171,7 +1171,7 @@ struct nci_dev *nci_allocate_device(const struct nci_ops *ops,
if (!supported_protocols)
return NULL;
- ndev = kzalloc_obj(struct nci_dev, GFP_KERNEL);
+ ndev = kzalloc_obj(struct nci_dev);
if (!ndev)
return NULL;
diff --git a/net/nfc/nci/hci.c b/net/nfc/nci/hci.c
index cd3e87b2dd3e..40ae8e5a7ec7 100644
--- a/net/nfc/nci/hci.c
+++ b/net/nfc/nci/hci.c
@@ -777,7 +777,7 @@ struct nci_hci_dev *nci_hci_allocate(struct nci_dev *ndev)
{
struct nci_hci_dev *hdev;
- hdev = kzalloc_obj(*hdev, GFP_KERNEL);
+ hdev = kzalloc_obj(*hdev);
if (!hdev)
return NULL;
diff --git a/net/nfc/nci/uart.c b/net/nfc/nci/uart.c
index 25dc2868fd27..5a3aed7f84f5 100644
--- a/net/nfc/nci/uart.c
+++ b/net/nfc/nci/uart.c
@@ -113,7 +113,7 @@ static int nci_uart_set_driver(struct tty_struct *tty, unsigned int driver)
if (!nci_uart_drivers[driver])
return -ENOENT;
- nu = kzalloc_obj(*nu, GFP_KERNEL);
+ nu = kzalloc_obj(*nu);
if (!nu)
return -ENOMEM;
diff --git a/net/nfc/netlink.c b/net/nfc/netlink.c
index a69322721c31..0c58824cb150 100644
--- a/net/nfc/netlink.c
+++ b/net/nfc/netlink.c
@@ -604,7 +604,7 @@ static int nfc_genl_dump_devices(struct sk_buff *skb,
if (!iter) {
first_call = true;
- iter = kmalloc_obj(struct class_dev_iter, GFP_KERNEL);
+ iter = kmalloc_obj(struct class_dev_iter);
if (!iter)
return -ENOMEM;
cb->args[0] = (long) iter;
@@ -1370,7 +1370,7 @@ static int nfc_genl_dump_ses(struct sk_buff *skb,
if (!iter) {
first_call = true;
- iter = kmalloc_obj(struct class_dev_iter, GFP_KERNEL);
+ iter = kmalloc_obj(struct class_dev_iter);
if (!iter)
return -ENOMEM;
cb->args[0] = (long) iter;
@@ -1541,7 +1541,7 @@ static int nfc_genl_se_io(struct sk_buff *skb, struct genl_info *info)
apdu = nla_data(info->attrs[NFC_ATTR_SE_APDU]);
- ctx = kzalloc_obj(struct se_io_ctx, GFP_KERNEL);
+ ctx = kzalloc_obj(struct se_io_ctx);
if (!ctx) {
rc = -ENOMEM;
goto put_dev;
diff --git a/net/openvswitch/datapath.c b/net/openvswitch/datapath.c
index b4fb83c3c0f9..bbb9b52861c0 100644
--- a/net/openvswitch/datapath.c
+++ b/net/openvswitch/datapath.c
@@ -1029,7 +1029,7 @@ static int ovs_flow_cmd_new(struct sk_buff *skb, struct genl_info *info)
}
/* Extract key. */
- key = kzalloc_obj(*key, GFP_KERNEL);
+ key = kzalloc_obj(*key);
if (!key) {
error = -ENOMEM;
goto err_kfree_flow;
@@ -1827,7 +1827,7 @@ static int ovs_dp_cmd_new(struct sk_buff *skb, struct genl_info *info)
return -ENOMEM;
err = -ENOMEM;
- dp = kzalloc_obj(*dp, GFP_KERNEL);
+ dp = kzalloc_obj(*dp);
if (dp == NULL)
goto err_destroy_reply;
diff --git a/net/openvswitch/flow_netlink.c b/net/openvswitch/flow_netlink.c
index 54fd208a1a68..67fbf6e48a30 100644
--- a/net/openvswitch/flow_netlink.c
+++ b/net/openvswitch/flow_netlink.c
@@ -1890,7 +1890,7 @@ int ovs_nla_get_identifier(struct sw_flow_id *sfid, const struct nlattr *ufid,
return 0;
/* If UFID was not provided, use unmasked key. */
- new_key = kmalloc_obj(*new_key, GFP_KERNEL);
+ new_key = kmalloc_obj(*new_key);
if (!new_key)
return -ENOMEM;
memcpy(new_key, key, sizeof(*key));
diff --git a/net/openvswitch/flow_table.c b/net/openvswitch/flow_table.c
index b75236aa4414..61c6a5f77c2e 100644
--- a/net/openvswitch/flow_table.c
+++ b/net/openvswitch/flow_table.c
@@ -150,13 +150,13 @@ static void __table_instance_destroy(struct table_instance *ti)
static struct table_instance *table_instance_alloc(int new_size)
{
- struct table_instance *ti = kmalloc_obj(*ti, GFP_KERNEL);
+ struct table_instance *ti = kmalloc_obj(*ti);
int i;
if (!ti)
return NULL;
- ti->buckets = kvmalloc_objs(struct hlist_head, new_size, GFP_KERNEL);
+ ti->buckets = kvmalloc_objs(struct hlist_head, new_size);
if (!ti->buckets) {
kfree(ti);
return NULL;
@@ -366,7 +366,7 @@ static struct mask_cache *tbl_mask_cache_alloc(u32 size)
(size * sizeof(struct mask_cache_entry)) > PCPU_MIN_UNIT_SIZE)
return NULL;
- new = kzalloc_obj(*new, GFP_KERNEL);
+ new = kzalloc_obj(*new);
if (!new)
return NULL;
@@ -964,7 +964,7 @@ static struct sw_flow_mask *mask_alloc(void)
{
struct sw_flow_mask *mask;
- mask = kmalloc_obj(*mask, GFP_KERNEL);
+ mask = kmalloc_obj(*mask);
if (mask)
mask->ref_count = 1;
@@ -1109,7 +1109,7 @@ void ovs_flow_masks_rebalance(struct flow_table *table)
int i;
/* Build array of all current entries with use counters. */
- masks_and_count = kmalloc_objs(*masks_and_count, ma->max, GFP_KERNEL);
+ masks_and_count = kmalloc_objs(*masks_and_count, ma->max);
if (!masks_and_count)
return;
diff --git a/net/packet/af_packet.c b/net/packet/af_packet.c
index a78c5122a3d7..753f3bb25970 100644
--- a/net/packet/af_packet.c
+++ b/net/packet/af_packet.c
@@ -1711,7 +1711,7 @@ static int fanout_add(struct sock *sk, struct fanout_args *args)
if (type == PACKET_FANOUT_ROLLOVER ||
(type_flags & PACKET_FANOUT_FLAG_ROLLOVER)) {
err = -ENOMEM;
- rollover = kzalloc_obj(*rollover, GFP_KERNEL);
+ rollover = kzalloc_obj(*rollover);
if (!rollover)
goto out;
atomic_long_set(&rollover->num, 0);
@@ -3693,7 +3693,7 @@ static int packet_mc_add(struct sock *sk, struct packet_mreq_max *mreq)
goto done;
err = -ENOBUFS;
- i = kmalloc_obj(*i, GFP_KERNEL);
+ i = kmalloc_obj(*i);
if (i == NULL)
goto done;
diff --git a/net/psp/psp_main.c b/net/psp/psp_main.c
index 08decafee7a6..c5c42b5a00d5 100644
--- a/net/psp/psp_main.c
+++ b/net/psp/psp_main.c
@@ -64,7 +64,7 @@ psp_dev_create(struct net_device *netdev,
!psd_ops->get_stats))
return ERR_PTR(-EINVAL);
- psd = kzalloc_obj(*psd, GFP_KERNEL);
+ psd = kzalloc_obj(*psd);
if (!psd)
return ERR_PTR(-ENOMEM);
diff --git a/net/qrtr/af_qrtr.c b/net/qrtr/af_qrtr.c
index 70e7a210fd42..55fd2dd37588 100644
--- a/net/qrtr/af_qrtr.c
+++ b/net/qrtr/af_qrtr.c
@@ -271,7 +271,7 @@ static int qrtr_tx_wait(struct qrtr_node *node, int dest_node, int dest_port,
mutex_lock(&node->qrtr_tx_lock);
flow = radix_tree_lookup(&node->qrtr_tx_flow, key);
if (!flow) {
- flow = kzalloc_obj(*flow, GFP_KERNEL);
+ flow = kzalloc_obj(*flow);
if (flow) {
init_waitqueue_head(&flow->resume_tx);
if (radix_tree_insert(&node->qrtr_tx_flow, key, flow)) {
@@ -589,7 +589,7 @@ int qrtr_endpoint_register(struct qrtr_endpoint *ep, unsigned int nid)
if (!ep || !ep->xmit)
return -EINVAL;
- node = kzalloc_obj(*node, GFP_KERNEL);
+ node = kzalloc_obj(*node);
if (!node)
return -ENOMEM;
diff --git a/net/qrtr/ns.c b/net/qrtr/ns.c
index 36b5c1990bf5..3203b2220860 100644
--- a/net/qrtr/ns.c
+++ b/net/qrtr/ns.c
@@ -78,7 +78,7 @@ static struct qrtr_node *node_get(unsigned int node_id)
return node;
/* If node didn't exist, allocate and insert it to the tree */
- node = kzalloc_obj(*node, GFP_KERNEL);
+ node = kzalloc_obj(*node);
if (!node)
return NULL;
@@ -229,7 +229,7 @@ static struct qrtr_server *server_add(unsigned int service,
if (!service || !port)
return NULL;
- srv = kzalloc_obj(*srv, GFP_KERNEL);
+ srv = kzalloc_obj(*srv);
if (!srv)
return NULL;
@@ -534,7 +534,7 @@ static int ctrl_cmd_new_lookup(struct sockaddr_qrtr *from,
if (from->sq_node != qrtr_ns.local_node)
return -EINVAL;
- lookup = kzalloc_obj(*lookup, GFP_KERNEL);
+ lookup = kzalloc_obj(*lookup);
if (!lookup)
return -ENOMEM;
diff --git a/net/qrtr/tun.c b/net/qrtr/tun.c
index 9ad17a773593..9726db31fc7e 100644
--- a/net/qrtr/tun.c
+++ b/net/qrtr/tun.c
@@ -33,7 +33,7 @@ static int qrtr_tun_open(struct inode *inode, struct file *filp)
struct qrtr_tun *tun;
int ret;
- tun = kzalloc_obj(*tun, GFP_KERNEL);
+ tun = kzalloc_obj(*tun);
if (!tun)
return -ENOMEM;
diff --git a/net/rds/cong.c b/net/rds/cong.c
index e7f019c3a625..3133b91f9e69 100644
--- a/net/rds/cong.c
+++ b/net/rds/cong.c
@@ -143,7 +143,7 @@ static struct rds_cong_map *rds_cong_from_addr(const struct in6_addr *addr)
unsigned long i;
unsigned long flags;
- map = kzalloc_obj(struct rds_cong_map, GFP_KERNEL);
+ map = kzalloc_obj(struct rds_cong_map);
if (!map)
return NULL;
diff --git a/net/rds/ib_rdma.c b/net/rds/ib_rdma.c
index 651f658a6a0a..077f7041df15 100644
--- a/net/rds/ib_rdma.c
+++ b/net/rds/ib_rdma.c
@@ -67,7 +67,7 @@ static int rds_ib_add_ipaddr(struct rds_ib_device *rds_ibdev, __be32 ipaddr)
{
struct rds_ib_ipaddr *i_ipaddr;
- i_ipaddr = kmalloc_obj(*i_ipaddr, GFP_KERNEL);
+ i_ipaddr = kmalloc_obj(*i_ipaddr);
if (!i_ipaddr)
return -ENOMEM;
@@ -585,7 +585,7 @@ void *rds_ib_get_mr(struct scatterlist *sg, unsigned long nents,
if (key_ret)
*key_ret = ib_mr->rkey;
- ibmr = kzalloc_obj(*ibmr, GFP_KERNEL);
+ ibmr = kzalloc_obj(*ibmr);
if (!ibmr) {
ib_dereg_mr(ib_mr);
ret = -ENOMEM;
@@ -641,7 +641,7 @@ struct rds_ib_mr_pool *rds_ib_create_mr_pool(struct rds_ib_device *rds_ibdev,
{
struct rds_ib_mr_pool *pool;
- pool = kzalloc_obj(*pool, GFP_KERNEL);
+ pool = kzalloc_obj(*pool);
if (!pool)
return ERR_PTR(-ENOMEM);
diff --git a/net/rds/info.c b/net/rds/info.c
index 696e957c41a9..f1b29994934a 100644
--- a/net/rds/info.c
+++ b/net/rds/info.c
@@ -187,7 +187,7 @@ int rds_info_getsockopt(struct socket *sock, int optname, char __user *optval,
nr_pages = (PAGE_ALIGN(start + len) - (start & PAGE_MASK))
>> PAGE_SHIFT;
- pages = kmalloc_objs(struct page *, nr_pages, GFP_KERNEL);
+ pages = kmalloc_objs(struct page *, nr_pages);
if (!pages) {
ret = -ENOMEM;
goto out;
diff --git a/net/rds/message.c b/net/rds/message.c
index e367ca4f4f31..eaa6f22601a4 100644
--- a/net/rds/message.c
+++ b/net/rds/message.c
@@ -415,7 +415,7 @@ static int rds_message_zcopy_from_user(struct rds_message *rm, struct iov_iter *
*/
sg = rm->data.op_sg;
- info = kzalloc_obj(*info, GFP_KERNEL);
+ info = kzalloc_obj(*info);
if (!info)
return -ENOMEM;
INIT_LIST_HEAD(&info->rs_zcookie_next);
diff --git a/net/rds/rdma.c b/net/rds/rdma.c
index 0015531aff05..0206492014b7 100644
--- a/net/rds/rdma.c
+++ b/net/rds/rdma.c
@@ -228,13 +228,13 @@ static int __rds_rdma_map(struct rds_sock *rs, struct rds_get_mr_args *args,
args->vec.addr, args->vec.bytes, nr_pages);
/* XXX clamp nr_pages to limit the size of this alloc? */
- pages = kzalloc_objs(struct page *, nr_pages, GFP_KERNEL);
+ pages = kzalloc_objs(struct page *, nr_pages);
if (!pages) {
ret = -ENOMEM;
goto out;
}
- mr = kzalloc_obj(struct rds_mr, GFP_KERNEL);
+ mr = kzalloc_obj(struct rds_mr);
if (!mr) {
ret = -ENOMEM;
goto out;
@@ -269,7 +269,7 @@ static int __rds_rdma_map(struct rds_sock *rs, struct rds_get_mr_args *args,
goto out;
} else {
nents = ret;
- sg = kmalloc_objs(*sg, nents, GFP_KERNEL);
+ sg = kmalloc_objs(*sg, nents);
if (!sg) {
ret = -ENOMEM;
goto out;
@@ -571,7 +571,7 @@ int rds_rdma_extra_size(struct rds_rdma_args *args,
if (args->nr_local > UIO_MAXIOV)
return -EMSGSIZE;
- iov->iov = kzalloc_objs(struct rds_iovec, args->nr_local, GFP_KERNEL);
+ iov->iov = kzalloc_objs(struct rds_iovec, args->nr_local);
if (!iov->iov)
return -ENOMEM;
@@ -652,7 +652,7 @@ int rds_cmsg_rdma_args(struct rds_sock *rs, struct rds_message *rm,
goto out_ret;
}
- pages = kzalloc_objs(struct page *, nr_pages, GFP_KERNEL);
+ pages = kzalloc_objs(struct page *, nr_pages);
if (!pages) {
ret = -ENOMEM;
goto out_ret;
@@ -679,7 +679,7 @@ int rds_cmsg_rdma_args(struct rds_sock *rs, struct rds_message *rm,
* would have to use GFP_ATOMIC there, and don't want to deal
* with failed allocations.
*/
- op->op_notifier = kmalloc_obj(struct rds_notifier, GFP_KERNEL);
+ op->op_notifier = kmalloc_obj(struct rds_notifier);
if (!op->op_notifier) {
ret = -ENOMEM;
goto out_pages;
@@ -728,7 +728,7 @@ int rds_cmsg_rdma_args(struct rds_sock *rs, struct rds_message *rm,
ret = -EOPNOTSUPP;
goto out_pages;
}
- local_odp_mr = kzalloc_obj(*local_odp_mr, GFP_KERNEL);
+ local_odp_mr = kzalloc_obj(*local_odp_mr);
if (!local_odp_mr) {
ret = -ENOMEM;
goto out_pages;
diff --git a/net/rfkill/core.c b/net/rfkill/core.c
index 0f64aa4797f7..2444237bc36a 100644
--- a/net/rfkill/core.c
+++ b/net/rfkill/core.c
@@ -279,7 +279,7 @@ static void rfkill_send_events(struct rfkill *rfkill, enum rfkill_operation op)
struct rfkill_int_event *ev;
list_for_each_entry(data, &rfkill_fds, list) {
- ev = kzalloc_obj(*ev, GFP_KERNEL);
+ ev = kzalloc_obj(*ev);
if (!ev)
continue;
rfkill_fill_event(&ev->ev, rfkill, op);
@@ -1165,7 +1165,7 @@ static int rfkill_fop_open(struct inode *inode, struct file *file)
struct rfkill *rfkill;
struct rfkill_int_event *ev, *tmp;
- data = kzalloc_obj(*data, GFP_KERNEL);
+ data = kzalloc_obj(*data);
if (!data)
return -ENOMEM;
@@ -1182,7 +1182,7 @@ static int rfkill_fop_open(struct inode *inode, struct file *file)
*/
list_for_each_entry(rfkill, &rfkill_list, node) {
- ev = kzalloc_obj(*ev, GFP_KERNEL);
+ ev = kzalloc_obj(*ev);
if (!ev)
goto free;
rfkill_sync(rfkill);
diff --git a/net/rfkill/input.c b/net/rfkill/input.c
index 2be6d13ba6ba..f7cb24ce7754 100644
--- a/net/rfkill/input.c
+++ b/net/rfkill/input.c
@@ -221,7 +221,7 @@ static int rfkill_connect(struct input_handler *handler, struct input_dev *dev,
struct input_handle *handle;
int error;
- handle = kzalloc_obj(struct input_handle, GFP_KERNEL);
+ handle = kzalloc_obj(struct input_handle);
if (!handle)
return -ENOMEM;
diff --git a/net/rose/af_rose.c b/net/rose/af_rose.c
index 83c62af80d7c..841d62481048 100644
--- a/net/rose/af_rose.c
+++ b/net/rose/af_rose.c
@@ -1571,7 +1571,7 @@ static int __init rose_proto_init(void)
rose_callsign = null_ax25_address;
- dev_rose = kzalloc_objs(struct net_device *, rose_ndevs, GFP_KERNEL);
+ dev_rose = kzalloc_objs(struct net_device *, rose_ndevs);
if (dev_rose == NULL) {
printk(KERN_ERR "ROSE: rose_proto_init - unable to allocate device structure\n");
rc = -ENOMEM;
diff --git a/net/rose/rose_route.c b/net/rose/rose_route.c
index 4330df1b1b59..e31842e6b3c8 100644
--- a/net/rose/rose_route.c
+++ b/net/rose/rose_route.c
@@ -368,7 +368,7 @@ void rose_add_loopback_neigh(void)
{
struct rose_neigh *sn;
- rose_loopback_neigh = kmalloc_obj(struct rose_neigh, GFP_KERNEL);
+ rose_loopback_neigh = kmalloc_obj(struct rose_neigh);
if (!rose_loopback_neigh)
return;
sn = rose_loopback_neigh;
diff --git a/net/rxrpc/key.c b/net/rxrpc/key.c
index cd65bff97a8e..85078114b2dd 100644
--- a/net/rxrpc/key.c
+++ b/net/rxrpc/key.c
@@ -75,7 +75,7 @@ static int rxrpc_preparse_xdr_rxkad(struct key_preparsed_payload *prep,
prep->quotalen = datalen + plen;
plen -= sizeof(*token);
- token = kzalloc_obj(*token, GFP_KERNEL);
+ token = kzalloc_obj(*token);
if (!token)
return -ENOMEM;
@@ -202,7 +202,7 @@ static int rxrpc_preparse_xdr_yfs_rxgk(struct key_preparsed_payload *prep,
prep->quotalen = datalen + plen;
plen -= sizeof(*token);
- token = kzalloc_obj(*token, GFP_KERNEL);
+ token = kzalloc_obj(*token);
if (!token)
goto nomem;
@@ -500,7 +500,7 @@ static int rxrpc_preparse(struct key_preparsed_payload *prep)
prep->quotalen = plen + sizeof(*token);
ret = -ENOMEM;
- token = kzalloc_obj(*token, GFP_KERNEL);
+ token = kzalloc_obj(*token);
if (!token)
goto error;
token->kad = kzalloc(plen, GFP_KERNEL);
diff --git a/net/rxrpc/local_object.c b/net/rxrpc/local_object.c
index 6f799b26d4d5..111f574fe667 100644
--- a/net/rxrpc/local_object.c
+++ b/net/rxrpc/local_object.c
@@ -112,7 +112,7 @@ static struct rxrpc_local *rxrpc_alloc_local(struct net *net,
struct rxrpc_local *local;
u32 tmp;
- local = kzalloc_obj(struct rxrpc_local, GFP_KERNEL);
+ local = kzalloc_obj(struct rxrpc_local);
if (local) {
refcount_set(&local->ref, 1);
atomic_set(&local->active_users, 1);
diff --git a/net/rxrpc/rxgk_kdf.c b/net/rxrpc/rxgk_kdf.c
index 6011fa7cf221..677981d1ad79 100644
--- a/net/rxrpc/rxgk_kdf.c
+++ b/net/rxrpc/rxgk_kdf.c
@@ -213,7 +213,7 @@ struct rxgk_context *rxgk_generate_transport_key(struct rxrpc_connection *conn,
_enter("");
- gk = kzalloc_obj(*gk, GFP_KERNEL);
+ gk = kzalloc_obj(*gk);
if (!gk)
return ERR_PTR(-ENOMEM);
refcount_set(&gk->usage, 1);
diff --git a/net/rxrpc/rxperf.c b/net/rxrpc/rxperf.c
index 1345ffffb109..b8df6d22314d 100644
--- a/net/rxrpc/rxperf.c
+++ b/net/rxrpc/rxperf.c
@@ -151,7 +151,7 @@ static void rxperf_charge_preallocation(struct work_struct *work)
struct rxperf_call *call;
for (;;) {
- call = kzalloc_obj(*call, GFP_KERNEL);
+ call = kzalloc_obj(*call);
if (!call)
break;
diff --git a/net/sched/act_api.c b/net/sched/act_api.c
index 389874842982..332fd9695e54 100644
--- a/net/sched/act_api.c
+++ b/net/sched/act_api.c
@@ -985,7 +985,7 @@ static int tcf_pernet_add_id_list(unsigned int id)
}
}
- id_ptr = kzalloc_obj(*id_ptr, GFP_KERNEL);
+ id_ptr = kzalloc_obj(*id_ptr);
if (!id_ptr) {
ret = -ENOMEM;
goto err_out;
@@ -1272,7 +1272,7 @@ int tcf_action_dump(struct sk_buff *skb, struct tc_action *actions[],
static struct tc_cookie *nla_memdup_cookie(struct nlattr **tb)
{
- struct tc_cookie *c = kzalloc_obj(*c, GFP_KERNEL);
+ struct tc_cookie *c = kzalloc_obj(*c);
if (!c)
return NULL;
diff --git a/net/sched/act_connmark.c b/net/sched/act_connmark.c
index 19eea8daa6b5..c634af5edfcd 100644
--- a/net/sched/act_connmark.c
+++ b/net/sched/act_connmark.c
@@ -121,7 +121,7 @@ static int tcf_connmark_init(struct net *net, struct nlattr *nla,
if (!tb[TCA_CONNMARK_PARMS])
return -EINVAL;
- nparms = kzalloc_obj(*nparms, GFP_KERNEL);
+ nparms = kzalloc_obj(*nparms);
if (!nparms)
return -ENOMEM;
diff --git a/net/sched/act_csum.c b/net/sched/act_csum.c
index 1cd3336eeeea..213e1ce9d2da 100644
--- a/net/sched/act_csum.c
+++ b/net/sched/act_csum.c
@@ -93,7 +93,7 @@ static int tcf_csum_init(struct net *net, struct nlattr *nla,
p = to_tcf_csum(*a);
- params_new = kzalloc_obj(*params_new, GFP_KERNEL);
+ params_new = kzalloc_obj(*params_new);
if (unlikely(!params_new)) {
err = -ENOMEM;
goto put_chain;
diff --git a/net/sched/act_ct.c b/net/sched/act_ct.c
index 5f45bec69c50..bd51522c7953 100644
--- a/net/sched/act_ct.c
+++ b/net/sched/act_ct.c
@@ -332,7 +332,7 @@ static int tcf_ct_flow_table_get(struct net *net, struct tcf_ct_params *params)
if (ct_ft && refcount_inc_not_zero(&ct_ft->ref))
goto out_unlock;
- ct_ft = kzalloc_obj(*ct_ft, GFP_KERNEL);
+ ct_ft = kzalloc_obj(*ct_ft);
if (!ct_ft)
goto err_alloc;
refcount_set(&ct_ft->ref, 1);
@@ -1397,7 +1397,7 @@ static int tcf_ct_init(struct net *net, struct nlattr *nla,
c = to_ct(*a);
- params = kzalloc_obj(*params, GFP_KERNEL);
+ params = kzalloc_obj(*params);
if (unlikely(!params)) {
err = -ENOMEM;
goto cleanup;
diff --git a/net/sched/act_ctinfo.c b/net/sched/act_ctinfo.c
index 00e303a01241..1886ffd2ca95 100644
--- a/net/sched/act_ctinfo.c
+++ b/net/sched/act_ctinfo.c
@@ -236,7 +236,7 @@ static int tcf_ctinfo_init(struct net *net, struct nlattr *nla,
ci = to_ctinfo(*a);
- cp_new = kzalloc_obj(*cp_new, GFP_KERNEL);
+ cp_new = kzalloc_obj(*cp_new);
if (unlikely(!cp_new)) {
err = -ENOMEM;
goto put_chain;
diff --git a/net/sched/act_ife.c b/net/sched/act_ife.c
index 6895834a929c..79df81d12894 100644
--- a/net/sched/act_ife.c
+++ b/net/sched/act_ife.c
@@ -520,7 +520,7 @@ static int tcf_ife_init(struct net *net, struct nlattr *nla,
if (parm->flags & ~IFE_ENCODE)
return -EINVAL;
- p = kzalloc_obj(*p, GFP_KERNEL);
+ p = kzalloc_obj(*p);
if (!p)
return -ENOMEM;
diff --git a/net/sched/act_mpls.c b/net/sched/act_mpls.c
index 30c915d43432..1abfaf9d99f1 100644
--- a/net/sched/act_mpls.c
+++ b/net/sched/act_mpls.c
@@ -279,7 +279,7 @@ static int tcf_mpls_init(struct net *net, struct nlattr *nla,
m = to_mpls(*a);
- p = kzalloc_obj(*p, GFP_KERNEL);
+ p = kzalloc_obj(*p);
if (!p) {
err = -ENOMEM;
goto put_chain;
diff --git a/net/sched/act_nat.c b/net/sched/act_nat.c
index 7ca2af5a10c3..abb332dee836 100644
--- a/net/sched/act_nat.c
+++ b/net/sched/act_nat.c
@@ -81,7 +81,7 @@ static int tcf_nat_init(struct net *net, struct nlattr *nla, struct nlattr *est,
if (err < 0)
goto release_idr;
- nparm = kzalloc_obj(*nparm, GFP_KERNEL);
+ nparm = kzalloc_obj(*nparm);
if (!nparm) {
err = -ENOMEM;
goto release_idr;
diff --git a/net/sched/act_pedit.c b/net/sched/act_pedit.c
index fb960a05cbc8..bc20f08a2789 100644
--- a/net/sched/act_pedit.c
+++ b/net/sched/act_pedit.c
@@ -51,7 +51,7 @@ static struct tcf_pedit_key_ex *tcf_pedit_keys_ex_parse(struct nlattr *nla,
if (!nla)
return NULL;
- keys_ex = kzalloc_objs(*k, n, GFP_KERNEL);
+ keys_ex = kzalloc_objs(*k, n);
if (!keys_ex)
return ERR_PTR(-ENOMEM);
@@ -223,7 +223,7 @@ static int tcf_pedit_init(struct net *net, struct nlattr *nla,
goto out_release;
}
- nparms = kzalloc_obj(*nparms, GFP_KERNEL);
+ nparms = kzalloc_obj(*nparms);
if (!nparms) {
ret = -ENOMEM;
goto out_release;
diff --git a/net/sched/act_police.c b/net/sched/act_police.c
index 4778c3ebd5db..12ea9e5a6005 100644
--- a/net/sched/act_police.c
+++ b/net/sched/act_police.c
@@ -151,7 +151,7 @@ static int tcf_police_init(struct net *net, struct nlattr *nla,
goto failure;
}
- new = kzalloc_obj(*new, GFP_KERNEL);
+ new = kzalloc_obj(*new);
if (unlikely(!new)) {
err = -ENOMEM;
goto failure;
diff --git a/net/sched/act_skbedit.c b/net/sched/act_skbedit.c
index e3764d9862ad..a778cdba9258 100644
--- a/net/sched/act_skbedit.c
+++ b/net/sched/act_skbedit.c
@@ -242,7 +242,7 @@ static int tcf_skbedit_init(struct net *net, struct nlattr *nla,
if (err < 0)
goto release_idr;
- params_new = kzalloc_obj(*params_new, GFP_KERNEL);
+ params_new = kzalloc_obj(*params_new);
if (unlikely(!params_new)) {
err = -ENOMEM;
goto put_chain;
diff --git a/net/sched/act_skbmod.c b/net/sched/act_skbmod.c
index 2eaf82dc2179..23ca46138f04 100644
--- a/net/sched/act_skbmod.c
+++ b/net/sched/act_skbmod.c
@@ -185,7 +185,7 @@ static int tcf_skbmod_init(struct net *net, struct nlattr *nla,
d = to_skbmod(*a);
- p = kzalloc_obj(struct tcf_skbmod_params, GFP_KERNEL);
+ p = kzalloc_obj(struct tcf_skbmod_params);
if (unlikely(!p)) {
err = -ENOMEM;
goto put_chain;
diff --git a/net/sched/act_vlan.c b/net/sched/act_vlan.c
index 51ac783f7d6c..6a375fdc63dd 100644
--- a/net/sched/act_vlan.c
+++ b/net/sched/act_vlan.c
@@ -233,7 +233,7 @@ static int tcf_vlan_init(struct net *net, struct nlattr *nla,
v = to_vlan(*a);
- p = kzalloc_obj(*p, GFP_KERNEL);
+ p = kzalloc_obj(*p);
if (!p) {
err = -ENOMEM;
goto put_chain;
diff --git a/net/sched/cls_api.c b/net/sched/cls_api.c
index 22e8527657af..a6729e87bc25 100644
--- a/net/sched/cls_api.c
+++ b/net/sched/cls_api.c
@@ -84,7 +84,7 @@ tcf_exts_miss_cookie_base_alloc(struct tcf_exts *exts, struct tcf_proto *tp,
if (WARN_ON(!handle || !tp->ops->get_exts))
return -EINVAL;
- n = kzalloc_obj(*n, GFP_KERNEL);
+ n = kzalloc_obj(*n);
if (!n)
return -ENOMEM;
@@ -377,7 +377,7 @@ static struct tcf_proto *tcf_proto_create(const char *kind, u32 protocol,
struct tcf_proto *tp;
int err;
- tp = kzalloc_obj(*tp, GFP_KERNEL);
+ tp = kzalloc_obj(*tp);
if (!tp)
return ERR_PTR(-ENOBUFS);
@@ -502,7 +502,7 @@ static struct tcf_chain *tcf_chain_create(struct tcf_block *block,
ASSERT_BLOCK_LOCKED(block);
- chain = kzalloc_obj(*chain, GFP_KERNEL);
+ chain = kzalloc_obj(*chain);
if (!chain)
return NULL;
list_add_tail_rcu(&chain->list, &block->chain_list);
@@ -918,7 +918,7 @@ tcf_chain0_head_change_cb_add(struct tcf_block *block,
struct tcf_filter_chain_list_item *item;
struct tcf_chain *chain0;
- item = kmalloc_obj(*item, GFP_KERNEL);
+ item = kmalloc_obj(*item);
if (!item) {
NL_SET_ERR_MSG(extack, "Memory allocation for head change callback item failed");
return -ENOMEM;
@@ -1016,7 +1016,7 @@ static struct tcf_block *tcf_block_create(struct net *net, struct Qdisc *q,
{
struct tcf_block *block;
- block = kzalloc_obj(*block, GFP_KERNEL);
+ block = kzalloc_obj(*block);
if (!block) {
NL_SET_ERR_MSG(extack, "Memory allocation for block failed");
return ERR_PTR(-ENOMEM);
@@ -1428,7 +1428,7 @@ static int tcf_block_owner_add(struct tcf_block *block,
{
struct tcf_block_owner_item *item;
- item = kmalloc_obj(*item, GFP_KERNEL);
+ item = kmalloc_obj(*item);
if (!item)
return -ENOMEM;
item->q = q;
diff --git a/net/sched/cls_basic.c b/net/sched/cls_basic.c
index 5479fd5341b2..492cd9ce8d46 100644
--- a/net/sched/cls_basic.c
+++ b/net/sched/cls_basic.c
@@ -77,7 +77,7 @@ static int basic_init(struct tcf_proto *tp)
{
struct basic_head *head;
- head = kzalloc_obj(*head, GFP_KERNEL);
+ head = kzalloc_obj(*head);
if (head == NULL)
return -ENOBUFS;
INIT_LIST_HEAD(&head->flist);
@@ -193,7 +193,7 @@ static int basic_change(struct net *net, struct sk_buff *in_skb,
return -EINVAL;
}
- fnew = kzalloc_obj(*fnew, GFP_KERNEL);
+ fnew = kzalloc_obj(*fnew);
if (!fnew)
return -ENOBUFS;
diff --git a/net/sched/cls_bpf.c b/net/sched/cls_bpf.c
index f42b89ba10a8..9a346b6221b3 100644
--- a/net/sched/cls_bpf.c
+++ b/net/sched/cls_bpf.c
@@ -242,7 +242,7 @@ static int cls_bpf_init(struct tcf_proto *tp)
{
struct cls_bpf_head *head;
- head = kzalloc_obj(*head, GFP_KERNEL);
+ head = kzalloc_obj(*head);
if (head == NULL)
return -ENOBUFS;
@@ -427,7 +427,7 @@ static int cls_bpf_change(struct net *net, struct sk_buff *in_skb,
if (ret < 0)
return ret;
- prog = kzalloc_obj(*prog, GFP_KERNEL);
+ prog = kzalloc_obj(*prog);
if (!prog)
return -ENOBUFS;
diff --git a/net/sched/cls_cgroup.c b/net/sched/cls_cgroup.c
index d177b1cfde60..680a5c308094 100644
--- a/net/sched/cls_cgroup.c
+++ b/net/sched/cls_cgroup.c
@@ -95,7 +95,7 @@ static int cls_cgroup_change(struct net *net, struct sk_buff *in_skb,
if (head && handle != head->handle)
return -ENOENT;
- new = kzalloc_obj(*head, GFP_KERNEL);
+ new = kzalloc_obj(*head);
if (!new)
return -ENOBUFS;
diff --git a/net/sched/cls_flow.c b/net/sched/cls_flow.c
index 83d837c4bced..339c664beff6 100644
--- a/net/sched/cls_flow.c
+++ b/net/sched/cls_flow.c
@@ -433,7 +433,7 @@ static int flow_change(struct net *net, struct sk_buff *in_skb,
return -EOPNOTSUPP;
}
- fnew = kzalloc_obj(*fnew, GFP_KERNEL);
+ fnew = kzalloc_obj(*fnew);
if (!fnew)
return -ENOBUFS;
@@ -583,7 +583,7 @@ static int flow_init(struct tcf_proto *tp)
{
struct flow_head *head;
- head = kzalloc_obj(*head, GFP_KERNEL);
+ head = kzalloc_obj(*head);
if (head == NULL)
return -ENOBUFS;
INIT_LIST_HEAD(&head->filters);
diff --git a/net/sched/cls_flower.c b/net/sched/cls_flower.c
index 3c930039bacb..26070c892305 100644
--- a/net/sched/cls_flower.c
+++ b/net/sched/cls_flower.c
@@ -363,7 +363,7 @@ static int fl_init(struct tcf_proto *tp)
{
struct cls_fl_head *head;
- head = kzalloc_obj(*head, GFP_KERNEL);
+ head = kzalloc_obj(*head);
if (!head)
return -ENOBUFS;
@@ -2237,7 +2237,7 @@ static struct fl_flow_mask *fl_create_new_mask(struct cls_fl_head *head,
struct fl_flow_mask *newmask;
int err;
- newmask = kzalloc_obj(*newmask, GFP_KERNEL);
+ newmask = kzalloc_obj(*newmask);
if (!newmask)
return ERR_PTR(-ENOMEM);
@@ -2376,13 +2376,13 @@ static int fl_change(struct net *net, struct sk_buff *in_skb,
goto errout_fold;
}
- mask = kzalloc_obj(struct fl_flow_mask, GFP_KERNEL);
+ mask = kzalloc_obj(struct fl_flow_mask);
if (!mask) {
err = -ENOBUFS;
goto errout_fold;
}
- tb = kzalloc_objs(struct nlattr *, TCA_FLOWER_MAX + 1, GFP_KERNEL);
+ tb = kzalloc_objs(struct nlattr *, TCA_FLOWER_MAX + 1);
if (!tb) {
err = -ENOBUFS;
goto errout_mask_alloc;
@@ -2398,7 +2398,7 @@ static int fl_change(struct net *net, struct sk_buff *in_skb,
goto errout_tb;
}
- fnew = kzalloc_obj(*fnew, GFP_KERNEL);
+ fnew = kzalloc_obj(*fnew);
if (!fnew) {
err = -ENOBUFS;
goto errout_tb;
@@ -2815,7 +2815,7 @@ static void *fl_tmplt_create(struct net *net, struct tcf_chain *chain,
if (!tca_opts)
return ERR_PTR(-EINVAL);
- tb = kzalloc_objs(struct nlattr *, TCA_FLOWER_MAX + 1, GFP_KERNEL);
+ tb = kzalloc_objs(struct nlattr *, TCA_FLOWER_MAX + 1);
if (!tb)
return ERR_PTR(-ENOBUFS);
err = nla_parse_nested_deprecated(tb, TCA_FLOWER_MAX,
@@ -2823,7 +2823,7 @@ static void *fl_tmplt_create(struct net *net, struct tcf_chain *chain,
if (err)
goto errout_tb;
- tmplt = kzalloc_obj(*tmplt, GFP_KERNEL);
+ tmplt = kzalloc_obj(*tmplt);
if (!tmplt) {
err = -ENOMEM;
goto errout_tb;
diff --git a/net/sched/cls_fw.c b/net/sched/cls_fw.c
index 8eb3bea06e3b..be81c108179d 100644
--- a/net/sched/cls_fw.c
+++ b/net/sched/cls_fw.c
@@ -262,7 +262,7 @@ static int fw_change(struct net *net, struct sk_buff *in_skb,
if (f->id != handle && handle)
return -EINVAL;
- fnew = kzalloc_obj(struct fw_filter, GFP_KERNEL);
+ fnew = kzalloc_obj(struct fw_filter);
if (!fnew)
return -ENOBUFS;
@@ -308,7 +308,7 @@ static int fw_change(struct net *net, struct sk_buff *in_skb,
if (tb[TCA_FW_MASK])
mask = nla_get_u32(tb[TCA_FW_MASK]);
- head = kzalloc_obj(*head, GFP_KERNEL);
+ head = kzalloc_obj(*head);
if (!head)
return -ENOBUFS;
head->mask = mask;
@@ -316,7 +316,7 @@ static int fw_change(struct net *net, struct sk_buff *in_skb,
rcu_assign_pointer(tp->root, head);
}
- f = kzalloc_obj(struct fw_filter, GFP_KERNEL);
+ f = kzalloc_obj(struct fw_filter);
if (f == NULL)
return -ENOBUFS;
diff --git a/net/sched/cls_matchall.c b/net/sched/cls_matchall.c
index e78b6da59782..6f126872c14a 100644
--- a/net/sched/cls_matchall.c
+++ b/net/sched/cls_matchall.c
@@ -189,7 +189,7 @@ static int mall_change(struct net *net, struct sk_buff *in_skb,
return -EINVAL;
}
- new = kzalloc_obj(*new, GFP_KERNEL);
+ new = kzalloc_obj(*new);
if (!new)
return -ENOBUFS;
diff --git a/net/sched/cls_route.c b/net/sched/cls_route.c
index 6e16819ba91f..bd6f945bd388 100644
--- a/net/sched/cls_route.c
+++ b/net/sched/cls_route.c
@@ -244,7 +244,7 @@ static int route4_init(struct tcf_proto *tp)
{
struct route4_head *head;
- head = kzalloc_obj(struct route4_head, GFP_KERNEL);
+ head = kzalloc_obj(struct route4_head);
if (head == NULL)
return -ENOBUFS;
@@ -438,7 +438,7 @@ static int route4_set_parms(struct net *net, struct tcf_proto *tp,
h1 = to_hash(nhandle);
b = rtnl_dereference(head->table[h1]);
if (!b) {
- b = kzalloc_obj(struct route4_bucket, GFP_KERNEL);
+ b = kzalloc_obj(struct route4_bucket);
if (b == NULL)
return -ENOBUFS;
@@ -507,7 +507,7 @@ static int route4_change(struct net *net, struct sk_buff *in_skb,
return -EINVAL;
err = -ENOBUFS;
- f = kzalloc_obj(struct route4_filter, GFP_KERNEL);
+ f = kzalloc_obj(struct route4_filter);
if (!f)
goto errout;
diff --git a/net/sched/cls_u32.c b/net/sched/cls_u32.c
index 2bdc14c5e533..75a1c8c8ace1 100644
--- a/net/sched/cls_u32.c
+++ b/net/sched/cls_u32.c
@@ -375,7 +375,7 @@ static int u32_init(struct tcf_proto *tp)
idr_init(&root_ht->handle_idr);
if (tp_c == NULL) {
- tp_c = kzalloc_obj(*tp_c, GFP_KERNEL);
+ tp_c = kzalloc_obj(*tp_c);
if (tp_c == NULL) {
kfree(root_ht);
return -ENOBUFS;
diff --git a/net/sched/em_meta.c b/net/sched/em_meta.c
index bc47af8a45c6..48bdd77df0a3 100644
--- a/net/sched/em_meta.c
+++ b/net/sched/em_meta.c
@@ -927,7 +927,7 @@ static int em_meta_change(struct net *net, void *data, int len,
TCF_META_ID(hdr->right.kind) > TCF_META_ID_MAX)
goto errout;
- meta = kzalloc_obj(*meta, GFP_KERNEL);
+ meta = kzalloc_obj(*meta);
if (meta == NULL) {
err = -ENOMEM;
goto errout;
diff --git a/net/sched/em_text.c b/net/sched/em_text.c
index a69889159537..343f1aebeec2 100644
--- a/net/sched/em_text.c
+++ b/net/sched/em_text.c
@@ -84,7 +84,7 @@ static int em_text_change(struct net *net, void *data, int len,
return -EAGAIN;
}
- tm = kmalloc_obj(*tm, GFP_KERNEL);
+ tm = kmalloc_obj(*tm);
if (tm == NULL) {
textsearch_destroy(ts_conf);
return -ENOBUFS;
diff --git a/net/sched/sch_api.c b/net/sched/sch_api.c
index bcf82bbc60fd..deb8ebc4401a 100644
--- a/net/sched/sch_api.c
+++ b/net/sched/sch_api.c
@@ -437,7 +437,7 @@ struct qdisc_rate_table *qdisc_get_rtab(struct tc_ratespec *r,
}
}
- rtab = kmalloc_obj(*rtab, GFP_KERNEL);
+ rtab = kmalloc_obj(*rtab);
if (rtab) {
rtab->rate = *r;
rtab->refcnt = 1;
@@ -668,7 +668,7 @@ static struct hlist_head *qdisc_class_hash_alloc(unsigned int n)
struct hlist_head *h;
unsigned int i;
- h = kvmalloc_objs(struct hlist_head, n, GFP_KERNEL);
+ h = kvmalloc_objs(struct hlist_head, n);
if (h != NULL) {
for (i = 0; i < n; i++)
diff --git a/net/sched/sch_choke.c b/net/sched/sch_choke.c
index 8d2dd1c4f3dc..94df8e741a97 100644
--- a/net/sched/sch_choke.c
+++ b/net/sched/sch_choke.c
@@ -370,7 +370,7 @@ static int choke_change(struct Qdisc *sch, struct nlattr *opt,
if (mask != q->tab_mask) {
struct sk_buff **ntab;
- ntab = kvzalloc_objs(struct sk_buff *, mask + 1, GFP_KERNEL);
+ ntab = kvzalloc_objs(struct sk_buff *, mask + 1);
if (!ntab)
return -ENOMEM;
diff --git a/net/sched/sch_drr.c b/net/sched/sch_drr.c
index 80d845dfbe80..01335a49e091 100644
--- a/net/sched/sch_drr.c
+++ b/net/sched/sch_drr.c
@@ -105,7 +105,7 @@ static int drr_change_class(struct Qdisc *sch, u32 classid, u32 parentid,
return 0;
}
- cl = kzalloc_obj(struct drr_class, GFP_KERNEL);
+ cl = kzalloc_obj(struct drr_class);
if (cl == NULL)
return -ENOBUFS;
diff --git a/net/sched/sch_fq_pie.c b/net/sched/sch_fq_pie.c
index 8784f89619d0..d8ac3519e937 100644
--- a/net/sched/sch_fq_pie.c
+++ b/net/sched/sch_fq_pie.c
@@ -448,7 +448,7 @@ static int fq_pie_init(struct Qdisc *sch, struct nlattr *opt,
if (err)
goto init_failure;
- q->flows = kvzalloc_objs(struct fq_pie_flow, q->flows_cnt, GFP_KERNEL);
+ q->flows = kvzalloc_objs(struct fq_pie_flow, q->flows_cnt);
if (!q->flows) {
err = -ENOMEM;
goto init_failure;
diff --git a/net/sched/sch_gred.c b/net/sched/sch_gred.c
index ec4c8513e617..6706faba95b9 100644
--- a/net/sched/sch_gred.c
+++ b/net/sched/sch_gred.c
@@ -359,7 +359,7 @@ static int gred_offload_dump_stats(struct Qdisc *sch)
unsigned int i;
int ret;
- hw_stats = kzalloc_obj(*hw_stats, GFP_KERNEL);
+ hw_stats = kzalloc_obj(*hw_stats);
if (!hw_stats)
return -ENOMEM;
@@ -700,7 +700,7 @@ static int gred_change(struct Qdisc *sch, struct nlattr *opt,
prio = ctl->prio;
}
- prealloc = kzalloc_obj(*prealloc, GFP_KERNEL);
+ prealloc = kzalloc_obj(*prealloc);
sch_tree_lock(sch);
err = gred_change_vq(sch, ctl->DP, ctl, prio, stab, max_P, &prealloc,
@@ -757,7 +757,7 @@ static int gred_init(struct Qdisc *sch, struct nlattr *opt,
* psched_mtu(qdisc_dev(sch));
if (qdisc_dev(sch)->netdev_ops->ndo_setup_tc) {
- table->opt = kzalloc_obj(*table->opt, GFP_KERNEL);
+ table->opt = kzalloc_obj(*table->opt);
if (!table->opt)
return -ENOMEM;
}
diff --git a/net/sched/sch_hfsc.c b/net/sched/sch_hfsc.c
index 3f08daae26d8..b5657ffbbf84 100644
--- a/net/sched/sch_hfsc.c
+++ b/net/sched/sch_hfsc.c
@@ -1025,7 +1025,7 @@ hfsc_change_class(struct Qdisc *sch, u32 classid, u32 parentid,
if (rsc == NULL && fsc == NULL)
return -EINVAL;
- cl = kzalloc_obj(struct hfsc_class, GFP_KERNEL);
+ cl = kzalloc_obj(struct hfsc_class);
if (cl == NULL)
return -ENOBUFS;
diff --git a/net/sched/sch_htb.c b/net/sched/sch_htb.c
index 7b34e40d4bd2..0926a9ccfa2d 100644
--- a/net/sched/sch_htb.c
+++ b/net/sched/sch_htb.c
@@ -1845,7 +1845,7 @@ static int htb_change_class(struct Qdisc *sch, u32 classid,
goto failure;
}
err = -ENOBUFS;
- cl = kzalloc_obj(*cl, GFP_KERNEL);
+ cl = kzalloc_obj(*cl);
if (!cl)
goto failure;
diff --git a/net/sched/sch_multiq.c b/net/sched/sch_multiq.c
index e61e53e3711f..9f822fee113d 100644
--- a/net/sched/sch_multiq.c
+++ b/net/sched/sch_multiq.c
@@ -249,7 +249,7 @@ static int multiq_init(struct Qdisc *sch, struct nlattr *opt,
q->max_bands = qdisc_dev(sch)->num_tx_queues;
- q->queues = kzalloc_objs(struct Qdisc *, q->max_bands, GFP_KERNEL);
+ q->queues = kzalloc_objs(struct Qdisc *, q->max_bands);
if (!q->queues)
return -ENOBUFS;
for (i = 0; i < q->max_bands; i++)
diff --git a/net/sched/sch_qfq.c b/net/sched/sch_qfq.c
index 6eb71d3f03dd..699e45873f86 100644
--- a/net/sched/sch_qfq.c
+++ b/net/sched/sch_qfq.c
@@ -476,7 +476,7 @@ static int qfq_change_class(struct Qdisc *sch, u32 classid, u32 parentid,
}
/* create and init new class */
- cl = kzalloc_obj(struct qfq_class, GFP_KERNEL);
+ cl = kzalloc_obj(struct qfq_class);
if (cl == NULL)
return -ENOBUFS;
@@ -508,7 +508,7 @@ static int qfq_change_class(struct Qdisc *sch, u32 classid, u32 parentid,
new_agg = qfq_find_agg(q, lmax, weight);
if (new_agg == NULL) { /* create new aggregate */
sch_tree_unlock(sch);
- new_agg = kzalloc_obj(*new_agg, GFP_KERNEL);
+ new_agg = kzalloc_obj(*new_agg);
if (new_agg == NULL) {
err = -ENOBUFS;
gen_kill_estimator(&cl->rate_est);
diff --git a/net/sched/sch_sfq.c b/net/sched/sch_sfq.c
index 31ee70314431..503d7d3ca081 100644
--- a/net/sched/sch_sfq.c
+++ b/net/sched/sch_sfq.c
@@ -668,7 +668,7 @@ static int sfq_change(struct Qdisc *sch, struct nlattr *opt,
ctl_v1->Wlog, ctl_v1->Scell_log, NULL))
return -EINVAL;
if (ctl_v1 && ctl_v1->qth_min) {
- p = kmalloc_obj(*p, GFP_KERNEL);
+ p = kmalloc_obj(*p);
if (!p)
return -ENOMEM;
}
diff --git a/net/sched/sch_taprio.c b/net/sched/sch_taprio.c
index 31e59e875932..2e42a6801d5b 100644
--- a/net/sched/sch_taprio.c
+++ b/net/sched/sch_taprio.c
@@ -1103,7 +1103,7 @@ static int parse_sched_list(struct taprio_sched *q, struct nlattr *list,
continue;
}
- entry = kzalloc_obj(*entry, GFP_KERNEL);
+ entry = kzalloc_obj(*entry);
if (!entry) {
NL_SET_ERR_MSG(extack, "Not enough memory for entry");
return -ENOMEM;
@@ -1870,7 +1870,7 @@ static int taprio_change(struct Qdisc *sch, struct nlattr *opt,
if (err)
return err;
- new_admin = kzalloc_obj(*new_admin, GFP_KERNEL);
+ new_admin = kzalloc_obj(*new_admin);
if (!new_admin) {
NL_SET_ERR_MSG(extack, "Not enough memory for a new schedule");
return -ENOMEM;
@@ -2091,7 +2091,7 @@ static int taprio_init(struct Qdisc *sch, struct nlattr *opt,
return -EOPNOTSUPP;
}
- q->qdiscs = kzalloc_objs(q->qdiscs[0], dev->num_tx_queues, GFP_KERNEL);
+ q->qdiscs = kzalloc_objs(q->qdiscs[0], dev->num_tx_queues);
if (!q->qdiscs)
return -ENOMEM;
diff --git a/net/sctp/protocol.c b/net/sctp/protocol.c
index 0723cbdbc366..828a59b8e7bf 100644
--- a/net/sctp/protocol.c
+++ b/net/sctp/protocol.c
@@ -1538,7 +1538,7 @@ static __init int sctp_init(void)
/* Allocate and initialize the endpoint hash table. */
sctp_ep_hashsize = 64;
sctp_ep_hashtable =
- kmalloc_objs(struct sctp_hashbucket, 64, GFP_KERNEL);
+ kmalloc_objs(struct sctp_hashbucket, 64);
if (!sctp_ep_hashtable) {
pr_err("Failed endpoint_hash alloc\n");
status = -ENOMEM;
diff --git a/net/sctp/stream.c b/net/sctp/stream.c
index 03636bed60ff..c2247793c88b 100644
--- a/net/sctp/stream.c
+++ b/net/sctp/stream.c
@@ -166,7 +166,7 @@ int sctp_stream_init_ext(struct sctp_stream *stream, __u16 sid)
struct sctp_stream_out_ext *soute;
int ret;
- soute = kzalloc_obj(*soute, GFP_KERNEL);
+ soute = kzalloc_obj(*soute);
if (!soute)
return -ENOMEM;
SCTP_SO(stream, sid)->ext = soute;
diff --git a/net/shaper/shaper.c b/net/shaper/shaper.c
index ca7a6167702d..005bfc766e22 100644
--- a/net/shaper/shaper.c
+++ b/net/shaper/shaper.c
@@ -272,7 +272,7 @@ net_shaper_hierarchy_setup(struct net_shaper_binding *binding)
if (hierarchy)
return hierarchy;
- hierarchy = kmalloc_obj(*hierarchy, GFP_KERNEL);
+ hierarchy = kmalloc_obj(*hierarchy);
if (!hierarchy)
return NULL;
@@ -329,7 +329,7 @@ static int net_shaper_pre_insert(struct net_shaper_binding *binding,
id_allocated = true;
}
- cur = kzalloc_obj(*cur, GFP_KERNEL);
+ cur = kzalloc_obj(*cur);
if (!cur) {
ret = -ENOMEM;
goto free_id;
@@ -1033,7 +1033,7 @@ static int net_shaper_pre_del_node(struct net_shaper_binding *binding,
return -EINVAL;
}
- leaves = kzalloc_objs(struct net_shaper, shaper->leaves, GFP_KERNEL);
+ leaves = kzalloc_objs(struct net_shaper, shaper->leaves);
if (!leaves)
return -ENOMEM;
diff --git a/net/smc/af_smc.c b/net/smc/af_smc.c
index 242101f269c3..7072556b38f6 100644
--- a/net/smc/af_smc.c
+++ b/net/smc/af_smc.c
@@ -1195,7 +1195,7 @@ void smc_fill_gid_list(struct smc_link_group *lgr,
memset(gidlist, 0, sizeof(*gidlist));
memcpy(gidlist->list[gidlist->len++], known_gid, SMC_GID_SIZE);
- alt_ini = kzalloc_obj(*alt_ini, GFP_KERNEL);
+ alt_ini = kzalloc_obj(*alt_ini);
if (!alt_ini)
goto out;
@@ -1522,7 +1522,7 @@ static int __smc_connect(struct smc_sock *smc)
return smc_connect_decline_fallback(smc, SMC_CLC_DECL_IPSEC,
version);
- ini = kzalloc_obj(*ini, GFP_KERNEL);
+ ini = kzalloc_obj(*ini);
if (!ini)
return smc_connect_decline_fallback(smc, SMC_CLC_DECL_MEM,
version);
@@ -2470,7 +2470,7 @@ static void smc_listen_work(struct work_struct *work)
/* do inband token exchange -
* wait for and receive SMC Proposal CLC message
*/
- buf = kzalloc_obj(*buf, GFP_KERNEL);
+ buf = kzalloc_obj(*buf);
if (!buf) {
rc = SMC_CLC_DECL_MEM;
goto out_decl;
@@ -2490,7 +2490,7 @@ static void smc_listen_work(struct work_struct *work)
goto out_decl;
}
- ini = kzalloc_obj(*ini, GFP_KERNEL);
+ ini = kzalloc_obj(*ini);
if (!ini) {
rc = SMC_CLC_DECL_MEM;
goto out_decl;
diff --git a/net/smc/smc_clc.c b/net/smc/smc_clc.c
index 992fd2b9f05f..c38fc7bf0a7e 100644
--- a/net/smc/smc_clc.c
+++ b/net/smc/smc_clc.c
@@ -88,7 +88,7 @@ static int smc_clc_ueid_add(char *ueid)
return -EINVAL;
/* add a new ueid entry to the ueid table if there isn't one */
- new_ueid = kzalloc_obj(*new_ueid, GFP_KERNEL);
+ new_ueid = kzalloc_obj(*new_ueid);
if (!new_ueid)
return -ENOMEM;
memcpy(new_ueid->eid, ueid, SMC_MAX_EID_LEN);
@@ -861,7 +861,7 @@ int smc_clc_send_proposal(struct smc_sock *smc, struct smc_init_info *ini)
struct kvec vec[8];
struct msghdr msg;
- pclc = kzalloc_obj(*pclc, GFP_KERNEL);
+ pclc = kzalloc_obj(*pclc);
if (!pclc)
return -ENOMEM;
diff --git a/net/smc/smc_core.c b/net/smc/smc_core.c
index 50d01a573042..e2d083daeb7e 100644
--- a/net/smc/smc_core.c
+++ b/net/smc/smc_core.c
@@ -905,7 +905,7 @@ static int smc_lgr_create(struct smc_sock *smc, struct smc_init_info *ini)
}
}
- lgr = kzalloc_obj(*lgr, GFP_KERNEL);
+ lgr = kzalloc_obj(*lgr);
if (!lgr) {
rc = SMC_CLC_DECL_MEM;
goto ism_put_vlan;
@@ -2320,7 +2320,7 @@ static struct smc_buf_desc *smcr_new_buf_create(struct smc_link_group *lgr,
struct smc_buf_desc *buf_desc;
/* try to alloc a new buffer */
- buf_desc = kzalloc_obj(*buf_desc, GFP_KERNEL);
+ buf_desc = kzalloc_obj(*buf_desc);
if (!buf_desc)
return ERR_PTR(-ENOMEM);
@@ -2394,7 +2394,7 @@ static struct smc_buf_desc *smcd_new_buf_create(struct smc_link_group *lgr,
int rc;
/* try to alloc a new DMB */
- buf_desc = kzalloc_obj(*buf_desc, GFP_KERNEL);
+ buf_desc = kzalloc_obj(*buf_desc);
if (!buf_desc)
return ERR_PTR(-ENOMEM);
if (is_dmb) {
@@ -2578,7 +2578,7 @@ int smcd_buf_attach(struct smc_sock *smc)
struct smc_buf_desc *buf_desc;
int rc;
- buf_desc = kzalloc_obj(*buf_desc, GFP_KERNEL);
+ buf_desc = kzalloc_obj(*buf_desc);
if (!buf_desc)
return -ENOMEM;
diff --git a/net/smc/smc_ib.c b/net/smc/smc_ib.c
index 5a1384126f91..9bb495707445 100644
--- a/net/smc/smc_ib.c
+++ b/net/smc/smc_ib.c
@@ -944,7 +944,7 @@ static int smc_ib_add_dev(struct ib_device *ibdev)
if (ibdev->node_type != RDMA_NODE_IB_CA)
return -EOPNOTSUPP;
- smcibdev = kzalloc_obj(*smcibdev, GFP_KERNEL);
+ smcibdev = kzalloc_obj(*smcibdev);
if (!smcibdev)
return -ENOMEM;
diff --git a/net/smc/smc_ism.c b/net/smc/smc_ism.c
index 4ee7362e91c5..e0dba2c7b6e3 100644
--- a/net/smc/smc_ism.c
+++ b/net/smc/smc_ism.c
@@ -142,7 +142,7 @@ int smc_ism_get_vlan(struct smcd_dev *smcd, unsigned short vlanid)
return -EOPNOTSUPP;
/* create new vlan entry, in case we need it */
- new_vlan = kzalloc_obj(*new_vlan, GFP_KERNEL);
+ new_vlan = kzalloc_obj(*new_vlan);
if (!new_vlan)
return -ENOMEM;
new_vlan->vlanid = vlanid;
@@ -467,10 +467,10 @@ static struct smcd_dev *smcd_alloc_dev(const char *name, int max_dmbs)
{
struct smcd_dev *smcd;
- smcd = kzalloc_obj(*smcd, GFP_KERNEL);
+ smcd = kzalloc_obj(*smcd);
if (!smcd)
return NULL;
- smcd->conn = kzalloc_objs(struct smc_connection *, max_dmbs, GFP_KERNEL);
+ smcd->conn = kzalloc_objs(struct smc_connection *, max_dmbs);
if (!smcd->conn)
goto free_smcd;
diff --git a/net/smc/smc_llc.c b/net/smc/smc_llc.c
index f82d5fc7f068..954b2ff1815c 100644
--- a/net/smc/smc_llc.c
+++ b/net/smc/smc_llc.c
@@ -1040,7 +1040,7 @@ int smc_llc_cli_add_link(struct smc_link *link, struct smc_llc_qentry *qentry)
if (!llc->qp_mtu)
goto out_reject;
- ini = kzalloc_obj(*ini, GFP_KERNEL);
+ ini = kzalloc_obj(*ini);
if (!ini) {
rc = -ENOMEM;
goto out_reject;
@@ -1180,7 +1180,7 @@ static void smc_llc_cli_add_link_invite(struct smc_link *link,
if (lgr->type == SMC_LGR_SINGLE && lgr->max_links <= 1)
goto out;
- ini = kzalloc_obj(*ini, GFP_KERNEL);
+ ini = kzalloc_obj(*ini);
if (!ini)
goto out;
@@ -1419,7 +1419,7 @@ int smc_llc_srv_add_link(struct smc_link *link,
req_qentry->msg.raw.hdr.common.llc_type == SMC_LLC_REQ_ADD_LINK)
send_req_add_link_resp = true;
- ini = kzalloc_obj(*ini, GFP_KERNEL);
+ ini = kzalloc_obj(*ini);
if (!ini) {
rc = -ENOMEM;
goto out;
diff --git a/net/smc/smc_pnet.c b/net/smc/smc_pnet.c
index 239da54ba01c..63e286e2dfaa 100644
--- a/net/smc/smc_pnet.c
+++ b/net/smc/smc_pnet.c
@@ -368,7 +368,7 @@ static int smc_pnet_add_eth(struct smc_pnettable *pnettable, struct net *net,
/* add a new netdev entry to the pnet table if there isn't one */
rc = -ENOMEM;
- new_pe = kzalloc_obj(*new_pe, GFP_KERNEL);
+ new_pe = kzalloc_obj(*new_pe);
if (!new_pe)
goto out_put;
new_pe->type = SMC_PNET_ETH;
@@ -445,7 +445,7 @@ static int smc_pnet_add_ib(struct smc_pnettable *pnettable, char *ib_name,
return -EEXIST;
/* add a new ib entry to the pnet table if there isn't one */
- new_pe = kzalloc_obj(*new_pe, GFP_KERNEL);
+ new_pe = kzalloc_obj(*new_pe);
if (!new_pe)
return -ENOMEM;
new_pe->type = SMC_PNET_IB;
@@ -747,7 +747,7 @@ static int smc_pnet_add_pnetid(struct net *net, u8 *pnetid)
struct smc_net *sn = net_generic(net, smc_net_id);
struct smc_pnetids_ndev_entry *pe, *pi;
- pe = kzalloc_obj(*pe, GFP_KERNEL);
+ pe = kzalloc_obj(*pe);
if (!pe)
return -ENOMEM;
diff --git a/net/smc/smc_rx.c b/net/smc/smc_rx.c
index bde9bc1ed4c0..d833e36f7fd4 100644
--- a/net/smc/smc_rx.c
+++ b/net/smc/smc_rx.c
@@ -161,17 +161,17 @@ static int smc_rx_splice(struct pipe_inode_info *pipe, char *src, size_t len,
nr_pages = !lgr->is_smcd && smc->conn.rmb_desc->is_vm ?
PAGE_ALIGN(len + offset) / PAGE_SIZE : 1;
- pages = kzalloc_objs(*pages, nr_pages, GFP_KERNEL);
+ pages = kzalloc_objs(*pages, nr_pages);
if (!pages)
goto out;
- partial = kzalloc_objs(*partial, nr_pages, GFP_KERNEL);
+ partial = kzalloc_objs(*partial, nr_pages);
if (!partial)
goto out_page;
- priv = kzalloc_objs(*priv, nr_pages, GFP_KERNEL);
+ priv = kzalloc_objs(*priv, nr_pages);
if (!priv)
goto out_part;
for (i = 0; i < nr_pages; i++) {
- priv[i] = kzalloc_obj(**priv, GFP_KERNEL);
+ priv[i] = kzalloc_obj(**priv);
if (!priv[i])
goto out_priv;
}
diff --git a/net/smc/smc_stats.c b/net/smc/smc_stats.c
index aeb462dbbb2c..59db611821f6 100644
--- a/net/smc/smc_stats.c
+++ b/net/smc/smc_stats.c
@@ -20,7 +20,7 @@
int smc_stats_init(struct net *net)
{
- net->smc.fback_rsn = kzalloc_obj(*net->smc.fback_rsn, GFP_KERNEL);
+ net->smc.fback_rsn = kzalloc_obj(*net->smc.fback_rsn);
if (!net->smc.fback_rsn)
goto err_fback;
net->smc.smc_stats = alloc_percpu(struct smc_stats);
@@ -285,7 +285,7 @@ int smc_nl_get_stats(struct sk_buff *skb,
attrs = nla_nest_start(skb, SMC_GEN_STATS);
if (!attrs)
goto errnest;
- stats = kzalloc_obj(*stats, GFP_KERNEL);
+ stats = kzalloc_obj(*stats);
if (!stats)
goto erralloc;
size = sizeof(*stats) / sizeof(u64);
diff --git a/net/smc/smc_wr.c b/net/smc/smc_wr.c
index bad014f353b3..b423abb4210d 100644
--- a/net/smc/smc_wr.c
+++ b/net/smc/smc_wr.c
@@ -787,7 +787,7 @@ int smc_wr_alloc_link_mem(struct smc_link *link)
goto no_mem_wr_tx_pends;
if (link->lgr->smc_version == SMC_V2) {
- link->wr_tx_v2_ib = kzalloc_obj(*link->wr_tx_v2_ib, GFP_KERNEL);
+ link->wr_tx_v2_ib = kzalloc_obj(*link->wr_tx_v2_ib);
if (!link->wr_tx_v2_ib)
goto no_mem_tx_compl;
link->wr_tx_v2_sge = kzalloc_obj(*link->wr_tx_v2_sge,
diff --git a/net/sunrpc/auth.c b/net/sunrpc/auth.c
index fb33a4d0cdc7..68c0595ea2fd 100644
--- a/net/sunrpc/auth.c
+++ b/net/sunrpc/auth.c
@@ -290,12 +290,12 @@ rpcauth_init_credcache(struct rpc_auth *auth)
struct rpc_cred_cache *new;
unsigned int hashsize;
- new = kmalloc_obj(*new, GFP_KERNEL);
+ new = kmalloc_obj(*new);
if (!new)
goto out_nocache;
new->hashbits = auth_hashbits;
hashsize = 1U << new->hashbits;
- new->hashtable = kzalloc_objs(new->hashtable[0], hashsize, GFP_KERNEL);
+ new->hashtable = kzalloc_objs(new->hashtable[0], hashsize);
if (!new->hashtable)
goto out_nohashtbl;
spin_lock_init(&new->lock);
diff --git a/net/sunrpc/auth_gss/auth_gss.c b/net/sunrpc/auth_gss/auth_gss.c
index f8a0d6386635..932908c1ef67 100644
--- a/net/sunrpc/auth_gss/auth_gss.c
+++ b/net/sunrpc/auth_gss/auth_gss.c
@@ -164,7 +164,7 @@ gss_alloc_context(void)
{
struct gss_cl_ctx *ctx;
- ctx = kzalloc_obj(*ctx, GFP_KERNEL);
+ ctx = kzalloc_obj(*ctx);
if (ctx != NULL) {
ctx->gc_proc = RPC_GSS_PROC_DATA;
ctx->gc_seq = 1; /* NetApp 6.4R1 doesn't accept seq. no. 0 */
@@ -529,7 +529,7 @@ gss_alloc_msg(struct gss_auth *gss_auth,
int vers;
int err = -ENOMEM;
- gss_msg = kzalloc_obj(*gss_msg, GFP_KERNEL);
+ gss_msg = kzalloc_obj(*gss_msg);
if (gss_msg == NULL)
goto err;
vers = get_pipe_version(gss_auth->net);
@@ -914,7 +914,7 @@ static struct gss_pipe *gss_pipe_alloc(struct rpc_clnt *clnt,
struct gss_pipe *p;
int err = -ENOMEM;
- p = kmalloc_obj(*p, GFP_KERNEL);
+ p = kmalloc_obj(*p);
if (p == NULL)
goto err;
p->pipe = rpc_mkpipe_data(upcall_ops, RPC_PIPE_WAIT_FOR_OPEN);
@@ -1029,7 +1029,7 @@ gss_create_new(const struct rpc_auth_create_args *args, struct rpc_clnt *clnt)
if (!try_module_get(THIS_MODULE))
return ERR_PTR(err);
- if (!(gss_auth = kmalloc_obj(*gss_auth, GFP_KERNEL)))
+ if (!(gss_auth = kmalloc_obj(*gss_auth)))
goto out_dec;
INIT_HLIST_NODE(&gss_auth->hash);
gss_auth->target_name = NULL;
@@ -1246,7 +1246,7 @@ gss_dup_cred(struct gss_auth *gss_auth, struct gss_cred *gss_cred)
struct gss_cred *new;
/* Make a copy of the cred so that we can reference count it */
- new = kzalloc_obj(*gss_cred, GFP_KERNEL);
+ new = kzalloc_obj(*gss_cred);
if (new) {
struct auth_cred acred = {
.cred = gss_cred->gc_base.cr_cred,
diff --git a/net/sunrpc/auth_gss/gss_rpc_upcall.c b/net/sunrpc/auth_gss/gss_rpc_upcall.c
index e02e6d4a3185..0fa4778620d9 100644
--- a/net/sunrpc/auth_gss/gss_rpc_upcall.c
+++ b/net/sunrpc/auth_gss/gss_rpc_upcall.c
@@ -214,7 +214,7 @@ static int gssp_alloc_receive_pages(struct gssx_arg_accept_sec_context *arg)
unsigned int i;
arg->npages = DIV_ROUND_UP(NGROUPS_MAX * 4, PAGE_SIZE);
- arg->pages = kzalloc_objs(struct page *, arg->npages, GFP_KERNEL);
+ arg->pages = kzalloc_objs(struct page *, arg->npages);
if (!arg->pages)
return -ENOMEM;
for (i = 0; i < arg->npages; i++) {
diff --git a/net/sunrpc/auth_gss/gss_rpc_xdr.c b/net/sunrpc/auth_gss/gss_rpc_xdr.c
index e1e01965ef58..fceee648d545 100644
--- a/net/sunrpc/auth_gss/gss_rpc_xdr.c
+++ b/net/sunrpc/auth_gss/gss_rpc_xdr.c
@@ -244,11 +244,11 @@ static int gssx_dec_option_array(struct xdr_stream *xdr,
/* we recognize only 1 currently: CREDS_VALUE */
oa->count = 1;
- oa->data = kmalloc_obj(struct gssx_option, GFP_KERNEL);
+ oa->data = kmalloc_obj(struct gssx_option);
if (!oa->data)
return -ENOMEM;
- creds = kzalloc_obj(struct svc_cred, GFP_KERNEL);
+ creds = kzalloc_obj(struct svc_cred);
if (!creds) {
err = -ENOMEM;
goto free_oa;
diff --git a/net/sunrpc/auth_gss/svcauth_gss.c b/net/sunrpc/auth_gss/svcauth_gss.c
index 411297c9527d..161d02cc1c2c 100644
--- a/net/sunrpc/auth_gss/svcauth_gss.c
+++ b/net/sunrpc/auth_gss/svcauth_gss.c
@@ -197,7 +197,7 @@ static void update_rsi(struct cache_head *cnew, struct cache_head *citem)
static struct cache_head *rsi_alloc(void)
{
- struct rsi *rsii = kmalloc_obj(*rsii, GFP_KERNEL);
+ struct rsi *rsii = kmalloc_obj(*rsii);
if (rsii)
return &rsii->h;
else
@@ -449,7 +449,7 @@ update_rsc(struct cache_head *cnew, struct cache_head *ctmp)
static struct cache_head *
rsc_alloc(void)
{
- struct rsc *rsci = kmalloc_obj(*rsci, GFP_KERNEL);
+ struct rsc *rsci = kmalloc_obj(*rsci);
if (rsci)
return &rsci->h;
else
@@ -814,7 +814,7 @@ svcauth_gss_register_pseudoflavor(u32 pseudoflavor, char * name)
struct auth_domain *test;
int stat = -ENOMEM;
- new = kmalloc_obj(*new, GFP_KERNEL);
+ new = kmalloc_obj(*new);
if (!new)
goto out;
kref_init(&new->h.ref);
@@ -1069,7 +1069,7 @@ static int gss_read_proxy_verf(struct svc_rqst *rqstp,
goto out_denied_free;
pages = DIV_ROUND_UP(inlen, PAGE_SIZE);
- in_token->pages = kzalloc_objs(struct page *, pages + 1, GFP_KERNEL);
+ in_token->pages = kzalloc_objs(struct page *, pages + 1);
if (!in_token->pages)
goto out_denied_free;
in_token->page_base = 0;
@@ -1631,7 +1631,7 @@ svcauth_gss_accept(struct svc_rqst *rqstp)
rqstp->rq_auth_stat = rpc_autherr_failed;
if (!svcdata)
- svcdata = kmalloc_obj(*svcdata, GFP_KERNEL);
+ svcdata = kmalloc_obj(*svcdata);
if (!svcdata)
goto auth_err;
rqstp->rq_auth_data = svcdata;
diff --git a/net/sunrpc/cache.c b/net/sunrpc/cache.c
index 5129f3dace8c..9b27b533a3c0 100644
--- a/net/sunrpc/cache.c
+++ b/net/sunrpc/cache.c
@@ -1038,7 +1038,7 @@ static int cache_open(struct inode *inode, struct file *filp,
return -EACCES;
nonseekable_open(inode, filp);
if (filp->f_mode & FMODE_READ) {
- rp = kmalloc_obj(*rp, GFP_KERNEL);
+ rp = kmalloc_obj(*rp);
if (!rp) {
module_put(cd->owner);
return -ENOMEM;
@@ -1225,7 +1225,7 @@ static int cache_pipe_upcall(struct cache_detail *detail, struct cache_head *h)
if (!buf)
return -EAGAIN;
- crq = kmalloc_obj(*crq, GFP_KERNEL);
+ crq = kmalloc_obj(*crq);
if (!crq) {
kfree(buf);
return -EAGAIN;
diff --git a/net/sunrpc/clnt.c b/net/sunrpc/clnt.c
index f6e086b62053..bc8ca470718b 100644
--- a/net/sunrpc/clnt.c
+++ b/net/sunrpc/clnt.c
@@ -374,7 +374,7 @@ static struct rpc_clnt * rpc_new_client(const struct rpc_create_args *args,
goto out_err;
err = -ENOMEM;
- clnt = kzalloc_obj(*clnt, GFP_KERNEL);
+ clnt = kzalloc_obj(*clnt);
if (!clnt)
goto out_err;
clnt->cl_parent = parent ? : clnt;
@@ -2976,7 +2976,7 @@ int rpc_clnt_test_and_add_xprt(struct rpc_clnt *clnt,
return -EINVAL;
}
- data = kmalloc_obj(*data, GFP_KERNEL);
+ data = kmalloc_obj(*data);
if (!data)
return -ENOMEM;
data->xps = xprt_switch_get(xps);
diff --git a/net/sunrpc/rpc_pipe.c b/net/sunrpc/rpc_pipe.c
index a4b3c51be0f3..9d349cfbc483 100644
--- a/net/sunrpc/rpc_pipe.c
+++ b/net/sunrpc/rpc_pipe.c
@@ -511,7 +511,7 @@ struct rpc_pipe *rpc_mkpipe_data(const struct rpc_pipe_ops *ops, int flags)
{
struct rpc_pipe *pipe;
- pipe = kzalloc_obj(struct rpc_pipe, GFP_KERNEL);
+ pipe = kzalloc_obj(struct rpc_pipe);
if (!pipe)
return ERR_PTR(-ENOMEM);
init_pipe(pipe);
diff --git a/net/sunrpc/stats.c b/net/sunrpc/stats.c
index 36308711e0e9..7093e18ac26c 100644
--- a/net/sunrpc/stats.c
+++ b/net/sunrpc/stats.c
@@ -126,7 +126,7 @@ struct rpc_iostats *rpc_alloc_iostats(struct rpc_clnt *clnt)
struct rpc_iostats *stats;
int i;
- stats = kzalloc_objs(*stats, clnt->cl_maxproc, GFP_KERNEL);
+ stats = kzalloc_objs(*stats, clnt->cl_maxproc);
if (stats) {
for (i = 0; i < clnt->cl_maxproc; i++)
spin_lock_init(&stats[i].om_lock);
diff --git a/net/sunrpc/svc.c b/net/sunrpc/svc.c
index bc160368a7dc..d8ccb8e4b5c2 100644
--- a/net/sunrpc/svc.c
+++ b/net/sunrpc/svc.c
@@ -488,7 +488,7 @@ __svc_create(struct svc_program *prog, int nprogs, struct svc_stat *stats,
unsigned int xdrsize;
unsigned int i;
- if (!(serv = kzalloc_obj(*serv, GFP_KERNEL)))
+ if (!(serv = kzalloc_obj(*serv)))
return NULL;
serv->sv_name = prog->pg_name;
serv->sv_programs = prog;
@@ -523,7 +523,7 @@ __svc_create(struct svc_program *prog, int nprogs, struct svc_stat *stats,
serv->sv_nrpools = npools;
serv->sv_pools =
- kzalloc_objs(struct svc_pool, serv->sv_nrpools, GFP_KERNEL);
+ kzalloc_objs(struct svc_pool, serv->sv_nrpools);
if (!serv->sv_pools) {
kfree(serv);
return NULL;
diff --git a/net/sunrpc/svcauth_unix.c b/net/sunrpc/svcauth_unix.c
index 7f952d9201f5..3be69c145d2a 100644
--- a/net/sunrpc/svcauth_unix.c
+++ b/net/sunrpc/svcauth_unix.c
@@ -72,7 +72,7 @@ struct auth_domain *unix_domain_find(char *name)
return rv;
}
- new = kmalloc_obj(*new, GFP_KERNEL);
+ new = kmalloc_obj(*new);
if (new == NULL)
return NULL;
kref_init(&new->h.ref);
@@ -143,7 +143,7 @@ static void update(struct cache_head *cnew, struct cache_head *citem)
}
static struct cache_head *ip_map_alloc(void)
{
- struct ip_map *i = kmalloc_obj(*i, GFP_KERNEL);
+ struct ip_map *i = kmalloc_obj(*i);
if (i)
return &i->h;
else
@@ -458,7 +458,7 @@ static void unix_gid_update(struct cache_head *cnew, struct cache_head *citem)
}
static struct cache_head *unix_gid_alloc(void)
{
- struct unix_gid *g = kmalloc_obj(*g, GFP_KERNEL);
+ struct unix_gid *g = kmalloc_obj(*g);
if (g)
return &g->h;
else
diff --git a/net/sunrpc/sysfs.c b/net/sunrpc/sysfs.c
index ec6ddfa11f86..af8fac9cedd4 100644
--- a/net/sunrpc/sysfs.c
+++ b/net/sunrpc/sysfs.c
@@ -48,7 +48,7 @@ static struct kobject *rpc_sysfs_object_alloc(const char *name,
{
struct kobject *kobj;
- kobj = kzalloc_obj(*kobj, GFP_KERNEL);
+ kobj = kzalloc_obj(*kobj);
if (kobj) {
kobj->kset = kset;
if (kobject_init_and_add(kobj, &rpc_sysfs_object_type,
@@ -397,7 +397,7 @@ static ssize_t rpc_sysfs_xprt_dstaddr_store(struct kobject *kobj,
dst_addr = kstrndup(buf, buf_len, GFP_KERNEL);
if (!dst_addr)
goto out_err;
- saved_addr = kzalloc_obj(*saved_addr, GFP_KERNEL);
+ saved_addr = kzalloc_obj(*saved_addr);
if (!saved_addr)
goto out_err_free;
saved_addr->addr =
@@ -663,7 +663,7 @@ static struct rpc_sysfs_client *rpc_sysfs_client_alloc(struct kobject *parent,
{
struct rpc_sysfs_client *p;
- p = kzalloc_obj(*p, GFP_KERNEL);
+ p = kzalloc_obj(*p);
if (p) {
p->net = net;
p->kobject.kset = rpc_sunrpc_kset;
diff --git a/net/sunrpc/xprt.c b/net/sunrpc/xprt.c
index 16f6989a0a2d..4fbb57a29704 100644
--- a/net/sunrpc/xprt.c
+++ b/net/sunrpc/xprt.c
@@ -1829,7 +1829,7 @@ struct rpc_xprt *xprt_alloc(struct net *net, size_t size,
xprt_init(xprt, net);
for (i = 0; i < num_prealloc; i++) {
- req = kzalloc_obj(struct rpc_rqst, GFP_KERNEL);
+ req = kzalloc_obj(struct rpc_rqst);
if (!req)
goto out_free;
list_add(&req->rq_list, &xprt->free);
diff --git a/net/sunrpc/xprtrdma/ib_client.c b/net/sunrpc/xprtrdma/ib_client.c
index e5b6dfaf01aa..de49ad02053d 100644
--- a/net/sunrpc/xprtrdma/ib_client.c
+++ b/net/sunrpc/xprtrdma/ib_client.c
@@ -108,7 +108,7 @@ static int rpcrdma_add_one(struct ib_device *device)
{
struct rpcrdma_device *rd;
- rd = kzalloc_obj(*rd, GFP_KERNEL);
+ rd = kzalloc_obj(*rd);
if (!rd)
return -ENOMEM;
diff --git a/net/tipc/bcast.c b/net/tipc/bcast.c
index c7c7f08eee9a..76a1585d3f6b 100644
--- a/net/tipc/bcast.c
+++ b/net/tipc/bcast.c
@@ -692,7 +692,7 @@ int tipc_bcast_init(struct net *net)
struct tipc_bc_base *bb = NULL;
struct tipc_link *l = NULL;
- bb = kzalloc_obj(*bb, GFP_KERNEL);
+ bb = kzalloc_obj(*bb);
if (!bb)
goto enomem;
tn->bcbase = bb;
diff --git a/net/tipc/crypto.c b/net/tipc/crypto.c
index abd191a3ac4a..d3046a39ff72 100644
--- a/net/tipc/crypto.c
+++ b/net/tipc/crypto.c
@@ -560,7 +560,7 @@ static int tipc_aead_init(struct tipc_aead **aead, struct tipc_aead_key *ukey,
break;
}
- tfm_entry = kmalloc_obj(*tfm_entry, GFP_KERNEL);
+ tfm_entry = kmalloc_obj(*tfm_entry);
if (unlikely(!tfm_entry)) {
crypto_free_aead(tfm);
err = -ENOMEM;
diff --git a/net/tipc/name_table.c b/net/tipc/name_table.c
index ec0ac85ca70b..8e129cf52245 100644
--- a/net/tipc/name_table.c
+++ b/net/tipc/name_table.c
@@ -888,7 +888,7 @@ int tipc_nametbl_init(struct net *net)
struct name_table *nt;
int i;
- nt = kzalloc_obj(*nt, GFP_KERNEL);
+ nt = kzalloc_obj(*nt);
if (!nt)
return -ENOMEM;
diff --git a/net/tipc/socket.c b/net/tipc/socket.c
index d52f700b5493..4c618c2b871d 100644
--- a/net/tipc/socket.c
+++ b/net/tipc/socket.c
@@ -3595,7 +3595,7 @@ int __tipc_dump_start(struct netlink_callback *cb, struct net *net)
struct tipc_net *tn = tipc_net(net);
if (!iter) {
- iter = kmalloc_obj(*iter, GFP_KERNEL);
+ iter = kmalloc_obj(*iter);
if (!iter)
return -ENOMEM;
diff --git a/net/tls/tls_device.c b/net/tls/tls_device.c
index 7a85ef064e4c..99c8eff9783e 100644
--- a/net/tls/tls_device.c
+++ b/net/tls/tls_device.c
@@ -346,7 +346,7 @@ static int tls_create_new_record(struct tls_offload_context_tx *offload_ctx,
struct tls_record_info *record;
skb_frag_t *frag;
- record = kmalloc_obj(*record, GFP_KERNEL);
+ record = kmalloc_obj(*record);
if (!record)
return -ENOMEM;
@@ -1040,7 +1040,7 @@ static struct tls_offload_context_tx *alloc_offload_ctx_tx(struct tls_context *c
struct tls_offload_context_tx *offload_ctx;
__be64 rcd_sn;
- offload_ctx = kzalloc_obj(*offload_ctx, GFP_KERNEL);
+ offload_ctx = kzalloc_obj(*offload_ctx);
if (!offload_ctx)
return NULL;
@@ -1110,7 +1110,7 @@ int tls_set_device_offload(struct sock *sk)
memcpy(ctx->tx.iv + cipher_desc->salt, iv, cipher_desc->iv);
memcpy(ctx->tx.rec_seq, rec_seq, cipher_desc->rec_seq);
- start_marker_record = kmalloc_obj(*start_marker_record, GFP_KERNEL);
+ start_marker_record = kmalloc_obj(*start_marker_record);
if (!start_marker_record) {
rc = -ENOMEM;
goto release_netdev;
@@ -1224,7 +1224,7 @@ int tls_set_device_offload_rx(struct sock *sk, struct tls_context *ctx)
goto release_lock;
}
- context = kzalloc_obj(*context, GFP_KERNEL);
+ context = kzalloc_obj(*context);
if (!context) {
rc = -ENOMEM;
goto release_lock;
diff --git a/net/tls/tls_sw.c b/net/tls/tls_sw.c
index 36bacedd6177..7877c238e758 100644
--- a/net/tls/tls_sw.c
+++ b/net/tls/tls_sw.c
@@ -2698,7 +2698,7 @@ static struct tls_sw_context_tx *init_ctx_tx(struct tls_context *ctx, struct soc
struct tls_sw_context_tx *sw_ctx_tx;
if (!ctx->priv_ctx_tx) {
- sw_ctx_tx = kzalloc_obj(*sw_ctx_tx, GFP_KERNEL);
+ sw_ctx_tx = kzalloc_obj(*sw_ctx_tx);
if (!sw_ctx_tx)
return NULL;
} else {
@@ -2719,7 +2719,7 @@ static struct tls_sw_context_rx *init_ctx_rx(struct tls_context *ctx)
struct tls_sw_context_rx *sw_ctx_rx;
if (!ctx->priv_ctx_rx) {
- sw_ctx_rx = kzalloc_obj(*sw_ctx_rx, GFP_KERNEL);
+ sw_ctx_rx = kzalloc_obj(*sw_ctx_rx);
if (!sw_ctx_rx)
return NULL;
} else {
diff --git a/net/unix/garbage.c b/net/unix/garbage.c
index a15e7eb50851..816e8fa2b062 100644
--- a/net/unix/garbage.c
+++ b/net/unix/garbage.c
@@ -288,7 +288,7 @@ int unix_prepare_fpl(struct scm_fp_list *fpl)
return 0;
for (i = 0; i < fpl->count_unix; i++) {
- vertex = kmalloc_obj(*vertex, GFP_KERNEL);
+ vertex = kmalloc_obj(*vertex);
if (!vertex)
goto err;
diff --git a/net/vmw_vsock/hyperv_transport.c b/net/vmw_vsock/hyperv_transport.c
index b1bf64b5cc97..069386a74557 100644
--- a/net/vmw_vsock/hyperv_transport.c
+++ b/net/vmw_vsock/hyperv_transport.c
@@ -444,7 +444,7 @@ static int hvs_sock_init(struct vsock_sock *vsk, struct vsock_sock *psk)
struct hvsock *hvs;
struct sock *sk = sk_vsock(vsk);
- hvs = kzalloc_obj(*hvs, GFP_KERNEL);
+ hvs = kzalloc_obj(*hvs);
if (!hvs)
return -ENOMEM;
@@ -655,7 +655,7 @@ static ssize_t hvs_stream_enqueue(struct vsock_sock *vsk, struct msghdr *msg,
BUILD_BUG_ON(sizeof(*send_buf) != HV_HYP_PAGE_SIZE);
- send_buf = kmalloc_obj(*send_buf, GFP_KERNEL);
+ send_buf = kmalloc_obj(*send_buf);
if (!send_buf)
return -ENOMEM;
diff --git a/net/vmw_vsock/virtio_transport.c b/net/vmw_vsock/virtio_transport.c
index d6c07334bf94..77fe5b7b066c 100644
--- a/net/vmw_vsock/virtio_transport.c
+++ b/net/vmw_vsock/virtio_transport.c
@@ -805,7 +805,7 @@ static int virtio_vsock_probe(struct virtio_device *vdev)
goto out;
}
- vsock = kzalloc_obj(*vsock, GFP_KERNEL);
+ vsock = kzalloc_obj(*vsock);
if (!vsock) {
ret = -ENOMEM;
goto out;
diff --git a/net/vmw_vsock/virtio_transport_common.c b/net/vmw_vsock/virtio_transport_common.c
index 925ed086058c..8a9fb23c6e85 100644
--- a/net/vmw_vsock/virtio_transport_common.c
+++ b/net/vmw_vsock/virtio_transport_common.c
@@ -920,7 +920,7 @@ int virtio_transport_do_socket_init(struct vsock_sock *vsk,
{
struct virtio_vsock_sock *vvs;
- vvs = kzalloc_obj(*vvs, GFP_KERNEL);
+ vvs = kzalloc_obj(*vvs);
if (!vvs)
return -ENOMEM;
diff --git a/net/vmw_vsock/vmci_transport.c b/net/vmw_vsock/vmci_transport.c
index 3e80639b7c08..4296ca1183f1 100644
--- a/net/vmw_vsock/vmci_transport.c
+++ b/net/vmw_vsock/vmci_transport.c
@@ -262,7 +262,7 @@ vmci_transport_alloc_send_control_pkt(struct sockaddr_vm *src,
struct vmci_transport_packet *pkt;
int err;
- pkt = kmalloc_obj(*pkt, GFP_KERNEL);
+ pkt = kmalloc_obj(*pkt);
if (!pkt)
return -ENOMEM;
@@ -1583,7 +1583,7 @@ static int vmci_transport_recv_connected(struct sock *sk,
static int vmci_transport_socket_init(struct vsock_sock *vsk,
struct vsock_sock *psk)
{
- vsk->trans = kmalloc_obj(struct vmci_transport, GFP_KERNEL);
+ vsk->trans = kmalloc_obj(struct vmci_transport);
if (!vsk->trans)
return -ENOMEM;
diff --git a/net/wireless/nl80211.c b/net/wireless/nl80211.c
index 33782370fbaf..e25a15b9267d 100644
--- a/net/wireless/nl80211.c
+++ b/net/wireless/nl80211.c
@@ -1615,7 +1615,7 @@ nl80211_parse_connkeys(struct cfg80211_registered_device *rdev,
if (!have_key)
return NULL;
- result = kzalloc_obj(*result, GFP_KERNEL);
+ result = kzalloc_obj(*result);
if (!result)
return ERR_PTR(-ENOMEM);
@@ -3367,7 +3367,7 @@ static int nl80211_dump_wiphy_parse(struct sk_buff *skb,
struct netlink_callback *cb,
struct nl80211_dump_wiphy_state *state)
{
- struct nlattr **tb = kzalloc_objs(*tb, NUM_NL80211_ATTR, GFP_KERNEL);
+ struct nlattr **tb = kzalloc_objs(*tb, NUM_NL80211_ATTR);
int ret;
if (!tb)
@@ -3419,7 +3419,7 @@ static int nl80211_dump_wiphy(struct sk_buff *skb, struct netlink_callback *cb)
rtnl_lock();
if (!state) {
- state = kzalloc_obj(*state, GFP_KERNEL);
+ state = kzalloc_obj(*state);
if (!state) {
rtnl_unlock();
return -ENOMEM;
@@ -6702,7 +6702,7 @@ static int nl80211_start_ap(struct sk_buff *skb, struct genl_info *info)
nla_get_u8(info->attrs[NL80211_ATTR_SMPS_MODE]) != NL80211_SMPS_OFF)
return -EOPNOTSUPP;
- params = kzalloc_obj(*params, GFP_KERNEL);
+ params = kzalloc_obj(*params);
if (!params)
return -ENOMEM;
@@ -6995,7 +6995,7 @@ static int nl80211_set_beacon(struct sk_buff *skb, struct genl_info *info)
if (!wdev->links[link_id].ap.beacon_interval)
return -EINVAL;
- params = kzalloc_obj(*params, GFP_KERNEL);
+ params = kzalloc_obj(*params);
if (!params)
return -ENOMEM;
@@ -7985,7 +7985,7 @@ static int nl80211_dump_station(struct sk_buff *skb,
for (i = 0; i < IEEE80211_MLD_MAX_NUM_LINKS; i++) {
sinfo.links[i] =
- kzalloc_obj(*sinfo.links[0], GFP_KERNEL);
+ kzalloc_obj(*sinfo.links[0]);
if (!sinfo.links[i]) {
err = -ENOMEM;
goto out_err;
@@ -8049,7 +8049,7 @@ static int nl80211_get_station(struct sk_buff *skb, struct genl_info *info)
return -EOPNOTSUPP;
for (i = 0; i < IEEE80211_MLD_MAX_NUM_LINKS; i++) {
- sinfo.links[i] = kzalloc_obj(*sinfo.links[0], GFP_KERNEL);
+ sinfo.links[i] = kzalloc_obj(*sinfo.links[0]);
if (!sinfo.links[i]) {
cfg80211_sinfo_release_content(&sinfo);
return -ENOMEM;
@@ -11520,7 +11520,7 @@ static int nl80211_channel_switch(struct sk_buff *skb, struct genl_info *info)
if (err)
goto free;
- csa_attrs = kzalloc_objs(*csa_attrs, NL80211_ATTR_MAX + 1, GFP_KERNEL);
+ csa_attrs = kzalloc_objs(*csa_attrs, NL80211_ATTR_MAX + 1);
if (!csa_attrs) {
err = -ENOMEM;
goto free;
@@ -11780,7 +11780,7 @@ static int nl80211_dump_scan(struct sk_buff *skb, struct netlink_callback *cb)
bool dump_include_use_data;
int err;
- attrbuf = kzalloc_objs(*attrbuf, NUM_NL80211_ATTR, GFP_KERNEL);
+ attrbuf = kzalloc_objs(*attrbuf, NUM_NL80211_ATTR);
if (!attrbuf)
return -ENOMEM;
@@ -11920,7 +11920,7 @@ static int nl80211_dump_survey(struct sk_buff *skb, struct netlink_callback *cb)
int res;
bool radio_stats;
- attrbuf = kzalloc_objs(*attrbuf, NUM_NL80211_ATTR, GFP_KERNEL);
+ attrbuf = kzalloc_objs(*attrbuf, NUM_NL80211_ATTR);
if (!attrbuf)
return -ENOMEM;
@@ -13111,7 +13111,7 @@ static int nl80211_testmode_dump(struct sk_buff *skb,
goto out_err;
}
} else {
- attrbuf = kzalloc_objs(*attrbuf, NUM_NL80211_ATTR, GFP_KERNEL);
+ attrbuf = kzalloc_objs(*attrbuf, NUM_NL80211_ATTR);
if (!attrbuf) {
err = -ENOMEM;
goto out_err;
@@ -14935,7 +14935,7 @@ static int nl80211_parse_wowlan_nd(struct cfg80211_registered_device *rdev,
struct nlattr **tb;
int err;
- tb = kzalloc_objs(*tb, NUM_NL80211_ATTR, GFP_KERNEL);
+ tb = kzalloc_objs(*tb, NUM_NL80211_ATTR);
if (!tb)
return -ENOMEM;
@@ -15538,7 +15538,7 @@ static int nl80211_register_beacons(struct sk_buff *skb, struct genl_info *info)
if (!(rdev->wiphy.flags & WIPHY_FLAG_REPORTS_OBSS))
return -EOPNOTSUPP;
- nreg = kzalloc_obj(*nreg, GFP_KERNEL);
+ nreg = kzalloc_obj(*nreg);
if (!nreg)
return -ENOMEM;
@@ -15895,7 +15895,7 @@ static int handle_nan_filter(struct nlattr *attr_filter,
BUILD_BUG_ON(sizeof(*func->rx_filters) != sizeof(*func->tx_filters));
- filter = kzalloc_objs(*func->rx_filters, n_entries, GFP_KERNEL);
+ filter = kzalloc_objs(*func->rx_filters, n_entries);
if (!filter)
return -ENOMEM;
@@ -15955,7 +15955,7 @@ static int nl80211_nan_add_func(struct sk_buff *skb,
if (err)
return err;
- func = kzalloc_obj(*func, GFP_KERNEL);
+ func = kzalloc_obj(*func);
if (!func)
return -ENOMEM;
@@ -16597,7 +16597,7 @@ static int nl80211_prepare_vendor_dump(struct sk_buff *skb,
return 0;
}
- attrbuf = kzalloc_objs(*attrbuf, NUM_NL80211_ATTR, GFP_KERNEL);
+ attrbuf = kzalloc_objs(*attrbuf, NUM_NL80211_ATTR);
if (!attrbuf)
return -ENOMEM;
@@ -16828,7 +16828,7 @@ static int nl80211_set_qos_map(struct sk_buff *skb,
if (len % 2)
return -EINVAL;
- qos_map = kzalloc_obj(struct cfg80211_qos_map, GFP_KERNEL);
+ qos_map = kzalloc_obj(struct cfg80211_qos_map);
if (!qos_map)
return -ENOMEM;
@@ -17528,7 +17528,7 @@ static int nl80211_color_change(struct sk_buff *skb, struct genl_info *info)
if (err)
return err;
- tb = kzalloc_objs(*tb, NL80211_ATTR_MAX + 1, GFP_KERNEL);
+ tb = kzalloc_objs(*tb, NL80211_ATTR_MAX + 1);
if (!tb)
return -ENOMEM;
diff --git a/net/wireless/of.c b/net/wireless/of.c
index 35a3bcd84b6f..60a864465331 100644
--- a/net/wireless/of.c
+++ b/net/wireless/of.c
@@ -98,7 +98,7 @@ void wiphy_read_of_freq_limits(struct wiphy *wiphy)
}
n_freq_limits = len / sizeof(u32) / 2;
- freq_limits = kzalloc_objs(*freq_limits, n_freq_limits, GFP_KERNEL);
+ freq_limits = kzalloc_objs(*freq_limits, n_freq_limits);
if (!freq_limits) {
err = -ENOMEM;
goto out_kfree;
diff --git a/net/wireless/reg.c b/net/wireless/reg.c
index d6f3282fe986..4d7479ffda36 100644
--- a/net/wireless/reg.c
+++ b/net/wireless/reg.c
@@ -509,7 +509,7 @@ static int reg_schedule_apply(const struct ieee80211_regdomain *regdom)
{
struct reg_regdb_apply_request *request;
- request = kzalloc_obj(struct reg_regdb_apply_request, GFP_KERNEL);
+ request = kzalloc_obj(struct reg_regdb_apply_request);
if (!request) {
kfree(regdom);
return -ENOMEM;
@@ -1098,7 +1098,7 @@ int reg_reload_regdb(void)
/* reset regulatory domain */
current_regdomain = get_cfg80211_regdom();
- request = kzalloc_obj(*request, GFP_KERNEL);
+ request = kzalloc_obj(*request);
if (!request) {
err = -ENOMEM;
goto out_unlock;
@@ -3222,7 +3222,7 @@ static int regulatory_hint_core(const char *alpha2)
{
struct regulatory_request *request;
- request = kzalloc_obj(struct regulatory_request, GFP_KERNEL);
+ request = kzalloc_obj(struct regulatory_request);
if (!request)
return -ENOMEM;
@@ -3248,7 +3248,7 @@ int regulatory_hint_user(const char *alpha2,
if (!is_world_regdom(alpha2) && !is_an_alpha2(alpha2))
return -EINVAL;
- request = kzalloc_obj(struct regulatory_request, GFP_KERNEL);
+ request = kzalloc_obj(struct regulatory_request);
if (!request)
return -ENOMEM;
@@ -3318,7 +3318,7 @@ int regulatory_hint(struct wiphy *wiphy, const char *alpha2)
wiphy->regulatory_flags &= ~REGULATORY_CUSTOM_REG;
- request = kzalloc_obj(struct regulatory_request, GFP_KERNEL);
+ request = kzalloc_obj(struct regulatory_request);
if (!request)
return -ENOMEM;
@@ -3351,7 +3351,7 @@ void regulatory_hint_country_ie(struct wiphy *wiphy, enum nl80211_band band,
if (country_ie_len < IEEE80211_COUNTRY_IE_MIN_LEN)
return;
- request = kzalloc_obj(*request, GFP_KERNEL);
+ request = kzalloc_obj(*request);
if (!request)
return;
diff --git a/net/wireless/sme.c b/net/wireless/sme.c
index cb1a75fda5ca..5b21432450d5 100644
--- a/net/wireless/sme.c
+++ b/net/wireless/sme.c
@@ -570,7 +570,7 @@ static int cfg80211_sme_connect(struct wireless_dev *wdev,
if (wdev->conn)
return -EINPROGRESS;
- wdev->conn = kzalloc_obj(*wdev->conn, GFP_KERNEL);
+ wdev->conn = kzalloc_obj(*wdev->conn);
if (!wdev->conn)
return -ENOMEM;
diff --git a/net/wireless/tests/util.c b/net/wireless/tests/util.c
index 6f870b06307d..118f7fb4226d 100644
--- a/net/wireless/tests/util.c
+++ b/net/wireless/tests/util.c
@@ -17,7 +17,7 @@ int t_wiphy_init(struct kunit_resource *resource, void *ctx)
struct wiphy *wiphy;
struct t_wiphy_priv *priv;
- ops = kzalloc_obj(*ops, GFP_KERNEL);
+ ops = kzalloc_obj(*ops);
KUNIT_ASSERT_NOT_NULL(test, ops);
wiphy = wiphy_new_nm(ops, sizeof(*priv), "kunit");
diff --git a/net/wireless/wext-compat.c b/net/wireless/wext-compat.c
index 3ce845cd1936..55783a7f51c2 100644
--- a/net/wireless/wext-compat.c
+++ b/net/wireless/wext-compat.c
@@ -414,7 +414,7 @@ static int cfg80211_set_encryption(struct cfg80211_registered_device *rdev,
* to do it first in case the allocation fails. Don't use wext.
*/
if (!wdev->wext.keys) {
- wdev->wext.keys = kzalloc_obj(*wdev->wext.keys, GFP_KERNEL);
+ wdev->wext.keys = kzalloc_obj(*wdev->wext.keys);
if (!wdev->wext.keys)
return -ENOMEM;
for (i = 0; i < 4; i++)
diff --git a/net/xdp/xdp_umem.c b/net/xdp/xdp_umem.c
index 4c94ec312d75..066ce07c506d 100644
--- a/net/xdp/xdp_umem.c
+++ b/net/xdp/xdp_umem.c
@@ -250,7 +250,7 @@ struct xdp_umem *xdp_umem_create(struct xdp_umem_reg *mr)
struct xdp_umem *umem;
int err;
- umem = kzalloc_obj(*umem, GFP_KERNEL);
+ umem = kzalloc_obj(*umem);
if (!umem)
return ERR_PTR(-ENOMEM);
diff --git a/net/xdp/xsk_buff_pool.c b/net/xdp/xsk_buff_pool.c
index a8f932b28ee3..c5015802f946 100644
--- a/net/xdp/xsk_buff_pool.c
+++ b/net/xdp/xsk_buff_pool.c
@@ -63,7 +63,7 @@ struct xsk_buff_pool *xp_create_and_assign_umem(struct xdp_sock *xs,
if (!pool)
goto out;
- pool->heads = kvzalloc_objs(*pool->heads, umem->chunks, GFP_KERNEL);
+ pool->heads = kvzalloc_objs(*pool->heads, umem->chunks);
if (!pool->heads)
goto out;
@@ -328,7 +328,7 @@ static struct xsk_dma_map *xp_create_dma_map(struct device *dev, struct net_devi
{
struct xsk_dma_map *dma_map;
- dma_map = kzalloc_obj(*dma_map, GFP_KERNEL);
+ dma_map = kzalloc_obj(*dma_map);
if (!dma_map)
return NULL;
diff --git a/net/xdp/xsk_queue.c b/net/xdp/xsk_queue.c
index ef089b9c4fc8..4dd01b7d858e 100644
--- a/net/xdp/xsk_queue.c
+++ b/net/xdp/xsk_queue.c
@@ -26,7 +26,7 @@ struct xsk_queue *xskq_create(u32 nentries, bool umem_queue)
struct xsk_queue *q;
size_t size;
- q = kzalloc_obj(*q, GFP_KERNEL);
+ q = kzalloc_obj(*q);
if (!q)
return NULL;
diff --git a/net/xfrm/espintcp.c b/net/xfrm/espintcp.c
index 3f6eda9364ec..61f1cef89bc1 100644
--- a/net/xfrm/espintcp.c
+++ b/net/xfrm/espintcp.c
@@ -465,7 +465,7 @@ static int espintcp_init_sk(struct sock *sk)
if (sk->sk_user_data)
return -EBUSY;
- ctx = kzalloc_obj(*ctx, GFP_KERNEL);
+ ctx = kzalloc_obj(*ctx);
if (!ctx)
return -ENOMEM;
diff --git a/net/xfrm/xfrm_ipcomp.c b/net/xfrm/xfrm_ipcomp.c
index 35f8236059a7..5f38dff16177 100644
--- a/net/xfrm/xfrm_ipcomp.c
+++ b/net/xfrm/xfrm_ipcomp.c
@@ -336,7 +336,7 @@ int ipcomp_init_state(struct xfrm_state *x, struct netlink_ext_ack *extack)
}
err = -ENOMEM;
- ipcd = kzalloc_obj(*ipcd, GFP_KERNEL);
+ ipcd = kzalloc_obj(*ipcd);
if (!ipcd)
goto out;
diff --git a/net/xfrm/xfrm_iptfs.c b/net/xfrm/xfrm_iptfs.c
index 92b9a5b80804..5c9e56e525f2 100644
--- a/net/xfrm/xfrm_iptfs.c
+++ b/net/xfrm/xfrm_iptfs.c
@@ -2678,7 +2678,7 @@ static int iptfs_init_state(struct xfrm_state *x)
/* We have arrived here from xfrm_state_clone() */
xtfs = x->mode_data;
} else {
- xtfs = kzalloc_obj(*xtfs, GFP_KERNEL);
+ xtfs = kzalloc_obj(*xtfs);
if (!xtfs)
return -ENOMEM;
}
diff --git a/scripts/livepatch/init.c b/scripts/livepatch/init.c
index bbfd2e479099..f14d8c8fb35f 100644
--- a/scripts/livepatch/init.c
+++ b/scripts/livepatch/init.c
@@ -28,7 +28,7 @@ static int __init livepatch_mod_init(void)
goto err;
}
- patch = kzalloc_obj(*patch, GFP_KERNEL);
+ patch = kzalloc_obj(*patch);
if (!patch) {
ret = -ENOMEM;
goto err;
diff --git a/security/apparmor/apparmorfs.c b/security/apparmor/apparmorfs.c
index 283e622a7ccc..2f84bd23edb6 100644
--- a/security/apparmor/apparmorfs.c
+++ b/security/apparmor/apparmorfs.c
@@ -570,7 +570,7 @@ static ssize_t ns_revision_read(struct file *file, char __user *buf,
static int ns_revision_open(struct inode *inode, struct file *file)
{
- struct aa_revision *rev = kzalloc_obj(*rev, GFP_KERNEL);
+ struct aa_revision *rev = kzalloc_obj(*rev);
if (!rev)
return -ENOMEM;
diff --git a/security/apparmor/lsm.c b/security/apparmor/lsm.c
index 92ea1bc7b9e0..c1d42fc72fdb 100644
--- a/security/apparmor/lsm.c
+++ b/security/apparmor/lsm.c
@@ -2468,7 +2468,7 @@ static int __init aa_setup_dfa_engine(void)
goto fail;
}
nullpdb->dfa = aa_get_dfa(nulldfa);
- nullpdb->perms = kzalloc_objs(struct aa_perms, 2, GFP_KERNEL);
+ nullpdb->perms = kzalloc_objs(struct aa_perms, 2);
if (!nullpdb->perms)
goto fail;
nullpdb->size = 2;
diff --git a/security/apparmor/match.c b/security/apparmor/match.c
index 5ee25d4016e0..8fa0a1494acd 100644
--- a/security/apparmor/match.c
+++ b/security/apparmor/match.c
@@ -301,7 +301,7 @@ struct aa_dfa *aa_dfa_unpack(void *blob, size_t size, int flags)
int error = -ENOMEM;
char *data = blob;
struct table_header *table = NULL;
- struct aa_dfa *dfa = kzalloc_obj(struct aa_dfa, GFP_KERNEL);
+ struct aa_dfa *dfa = kzalloc_obj(struct aa_dfa);
if (!dfa)
goto fail;
diff --git a/security/apparmor/policy_compat.c b/security/apparmor/policy_compat.c
index 928dbb10cec1..5fc16d56fbf4 100644
--- a/security/apparmor/policy_compat.c
+++ b/security/apparmor/policy_compat.c
@@ -158,7 +158,7 @@ static struct aa_perms *compute_fperms(struct aa_dfa *dfa,
state_count = dfa->tables[YYTD_ID_BASE]->td_lolen;
/* DFAs are restricted from having a state_count of less than 2 */
- table = kvzalloc_objs(struct aa_perms, state_count * 2, GFP_KERNEL);
+ table = kvzalloc_objs(struct aa_perms, state_count * 2);
if (!table)
return NULL;
*size = state_count * 2;
@@ -182,7 +182,7 @@ static struct aa_perms *compute_xmatch_perms(struct aa_dfa *xmatch,
state_count = xmatch->tables[YYTD_ID_BASE]->td_lolen;
/* DFAs are restricted from having a state_count of less than 2 */
- perms = kvzalloc_objs(struct aa_perms, state_count, GFP_KERNEL);
+ perms = kvzalloc_objs(struct aa_perms, state_count);
if (!perms)
return NULL;
*size = state_count;
@@ -257,7 +257,7 @@ static struct aa_perms *compute_perms(struct aa_dfa *dfa, u32 version,
state_count = dfa->tables[YYTD_ID_BASE]->td_lolen;
/* DFAs are restricted from having a state_count of less than 2 */
- table = kvzalloc_objs(struct aa_perms, state_count, GFP_KERNEL);
+ table = kvzalloc_objs(struct aa_perms, state_count);
if (!table)
return NULL;
*size = state_count;
diff --git a/security/apparmor/policy_ns.c b/security/apparmor/policy_ns.c
index 099b71957ccb..01b653a3609b 100644
--- a/security/apparmor/policy_ns.c
+++ b/security/apparmor/policy_ns.c
@@ -106,7 +106,7 @@ static struct aa_ns *alloc_ns(const char *prefix, const char *name)
{
struct aa_ns *ns;
- ns = kzalloc_obj(*ns, GFP_KERNEL);
+ ns = kzalloc_obj(*ns);
AA_DEBUG(DEBUG_POLICY, "%s(%p)\n", __func__, ns);
if (!ns)
return NULL;
diff --git a/security/apparmor/policy_unpack.c b/security/apparmor/policy_unpack.c
index 9001c6ebc235..2b7ccc4e3853 100644
--- a/security/apparmor/policy_unpack.c
+++ b/security/apparmor/policy_unpack.c
@@ -145,7 +145,7 @@ struct aa_loaddata *aa_loaddata_alloc(size_t size)
{
struct aa_loaddata *d;
- d = kzalloc_obj(*d, GFP_KERNEL);
+ d = kzalloc_obj(*d);
if (d == NULL)
return ERR_PTR(-ENOMEM);
d->data = kvzalloc(size, GFP_KERNEL);
@@ -528,7 +528,7 @@ static int unpack_strs_table(struct aa_ext *e, const char *name, bool multi,
* for size check here
*/
goto fail;
- table = kzalloc_objs(struct aa_str_table_ent, size, GFP_KERNEL);
+ table = kzalloc_objs(struct aa_str_table_ent, size);
if (!table) {
error = -ENOMEM;
goto fail;
@@ -809,7 +809,7 @@ static int unpack_tag_headers(struct aa_ext *e, struct aa_tags_struct *tags)
if (!aa_unpack_array(e, "hdrs", &size))
goto fail_reset;
- hdrs = kzalloc_objs(struct aa_tags_header, size, GFP_KERNEL);
+ hdrs = kzalloc_objs(struct aa_tags_header, size);
if (!hdrs) {
error = -ENOMEM;
goto fail_reset;
@@ -922,7 +922,7 @@ static ssize_t unpack_perms_table(struct aa_ext *e, struct aa_perms **perms)
goto fail_reset;
if (!aa_unpack_array(e, NULL, &size))
goto fail_reset;
- *perms = kzalloc_objs(struct aa_perms, size, GFP_KERNEL);
+ *perms = kzalloc_objs(struct aa_perms, size);
if (!*perms) {
e->pos = pos;
return -ENOMEM;
@@ -1320,7 +1320,7 @@ static struct aa_profile *unpack_profile(struct aa_ext *e, char **ns_name)
error = -EPROTO;
if (aa_unpack_nameX(e, AA_STRUCT, "data")) {
info = "out of memory";
- profile->data = kzalloc_obj(*profile->data, GFP_KERNEL);
+ profile->data = kzalloc_obj(*profile->data);
if (!profile->data) {
error = -ENOMEM;
goto fail;
@@ -1338,7 +1338,7 @@ static struct aa_profile *unpack_profile(struct aa_ext *e, char **ns_name)
}
while (aa_unpack_strdup(e, &key, NULL)) {
- data = kzalloc_obj(*data, GFP_KERNEL);
+ data = kzalloc_obj(*data);
if (!data) {
kfree_sensitive(key);
error = -ENOMEM;
@@ -1583,7 +1583,7 @@ void aa_load_ent_free(struct aa_load_ent *ent)
struct aa_load_ent *aa_load_ent_alloc(void)
{
- struct aa_load_ent *ent = kzalloc_obj(*ent, GFP_KERNEL);
+ struct aa_load_ent *ent = kzalloc_obj(*ent);
if (ent)
INIT_LIST_HEAD(&ent->list);
return ent;
diff --git a/security/device_cgroup.c b/security/device_cgroup.c
index 27610fa31b61..cd166dee66b7 100644
--- a/security/device_cgroup.c
+++ b/security/device_cgroup.c
@@ -223,7 +223,7 @@ devcgroup_css_alloc(struct cgroup_subsys_state *parent_css)
{
struct dev_cgroup *dev_cgroup;
- dev_cgroup = kzalloc_obj(*dev_cgroup, GFP_KERNEL);
+ dev_cgroup = kzalloc_obj(*dev_cgroup);
if (!dev_cgroup)
return ERR_PTR(-ENOMEM);
INIT_LIST_HEAD(&dev_cgroup->exceptions);
diff --git a/security/integrity/digsig.c b/security/integrity/digsig.c
index aec350abad86..75c684cce370 100644
--- a/security/integrity/digsig.c
+++ b/security/integrity/digsig.c
@@ -141,7 +141,7 @@ int __init integrity_init_keyring(const unsigned int id)
if (!IS_ENABLED(CONFIG_INTEGRITY_TRUSTED_KEYRING))
return 0;
- restriction = kzalloc_obj(struct key_restriction, GFP_KERNEL);
+ restriction = kzalloc_obj(struct key_restriction);
if (!restriction)
return -ENOMEM;
diff --git a/security/integrity/evm/evm_secfs.c b/security/integrity/evm/evm_secfs.c
index a8893b90a0fa..acd840461902 100644
--- a/security/integrity/evm/evm_secfs.c
+++ b/security/integrity/evm/evm_secfs.c
@@ -199,7 +199,7 @@ static ssize_t evm_write_xattrs(struct file *file, const char __user *buf,
if (!ab && IS_ENABLED(CONFIG_AUDIT))
return -ENOMEM;
- xattr = kmalloc_obj(struct xattr_list, GFP_KERNEL);
+ xattr = kmalloc_obj(struct xattr_list);
if (!xattr) {
err = -ENOMEM;
goto out;
diff --git a/security/integrity/ima/ima_mok.c b/security/integrity/ima/ima_mok.c
index c647f4fd114d..14d93d573a6a 100644
--- a/security/integrity/ima/ima_mok.c
+++ b/security/integrity/ima/ima_mok.c
@@ -27,7 +27,7 @@ static __init int ima_mok_init(void)
pr_notice("Allocating IMA blacklist keyring.\n");
- restriction = kzalloc_obj(struct key_restriction, GFP_KERNEL);
+ restriction = kzalloc_obj(struct key_restriction);
if (!restriction)
panic("Can't allocate IMA blacklist restriction.");
diff --git a/security/integrity/ima/ima_policy.c b/security/integrity/ima/ima_policy.c
index c99f52458cd5..420642f96cab 100644
--- a/security/integrity/ima/ima_policy.c
+++ b/security/integrity/ima/ima_policy.c
@@ -1976,7 +1976,7 @@ ssize_t ima_parse_add_rule(char *rule)
if (*p == '#' || *p == '\0')
return len;
- entry = kzalloc_obj(*entry, GFP_KERNEL);
+ entry = kzalloc_obj(*entry);
if (!entry) {
integrity_audit_msg(AUDIT_INTEGRITY_STATUS, NULL,
NULL, op, "-ENOMEM", -ENOMEM, audit_info);
diff --git a/security/integrity/ima/ima_queue.c b/security/integrity/ima/ima_queue.c
index 859c83ab5a2b..319522450854 100644
--- a/security/integrity/ima/ima_queue.c
+++ b/security/integrity/ima/ima_queue.c
@@ -103,7 +103,7 @@ static int ima_add_digest_entry(struct ima_template_entry *entry,
struct ima_queue_entry *qe;
unsigned int key;
- qe = kmalloc_obj(*qe, GFP_KERNEL);
+ qe = kmalloc_obj(*qe);
if (qe == NULL) {
pr_err("OUT OF MEMORY ERROR creating queue entry\n");
return -ENOMEM;
diff --git a/security/integrity/ima/ima_queue_keys.c b/security/integrity/ima/ima_queue_keys.c
index da29e5b8f6df..b5ed33cbb272 100644
--- a/security/integrity/ima/ima_queue_keys.c
+++ b/security/integrity/ima/ima_queue_keys.c
@@ -72,7 +72,7 @@ static struct ima_key_entry *ima_alloc_key_entry(struct key *keyring,
const char *audit_cause = "ENOMEM";
struct ima_key_entry *entry;
- entry = kzalloc_obj(*entry, GFP_KERNEL);
+ entry = kzalloc_obj(*entry);
if (entry) {
entry->payload = kmemdup(payload, payload_len, GFP_KERNEL);
entry->keyring_name = kstrdup(keyring->description,
diff --git a/security/integrity/ima/ima_template.c b/security/integrity/ima/ima_template.c
index 9712eb6b4b88..7034573fb41e 100644
--- a/security/integrity/ima/ima_template.c
+++ b/security/integrity/ima/ima_template.c
@@ -245,7 +245,7 @@ int template_desc_init_fields(const char *template_fmt,
}
if (fields && num_fields) {
- *fields = kmalloc_objs(**fields, i, GFP_KERNEL);
+ *fields = kmalloc_objs(**fields, i);
if (*fields == NULL)
return -ENOMEM;
@@ -334,7 +334,7 @@ static struct ima_template_desc *restore_template_fmt(char *template_name)
goto out;
}
- template_desc = kzalloc_obj(*template_desc, GFP_KERNEL);
+ template_desc = kzalloc_obj(*template_desc);
if (!template_desc)
goto out;
diff --git a/security/ipe/digest.c b/security/ipe/digest.c
index 747768ba0e52..6e597a6b7633 100644
--- a/security/ipe/digest.c
+++ b/security/ipe/digest.c
@@ -29,7 +29,7 @@ struct digest_info *ipe_digest_parse(const char *valstr)
char *alg = NULL;
int rc = 0;
- info = kzalloc_obj(*info, GFP_KERNEL);
+ info = kzalloc_obj(*info);
if (!info)
return ERR_PTR(-ENOMEM);
diff --git a/security/ipe/hooks.c b/security/ipe/hooks.c
index b8d677f87845..0ae54a880405 100644
--- a/security/ipe/hooks.c
+++ b/security/ipe/hooks.c
@@ -287,7 +287,7 @@ int ipe_bdev_setintegrity(struct block_device *bdev, enum lsm_integrity_type typ
}
digest = value;
- info = kzalloc_obj(*info, GFP_KERNEL);
+ info = kzalloc_obj(*info);
if (!info)
return -ENOMEM;
diff --git a/security/ipe/policy.c b/security/ipe/policy.c
index c2ff142aed37..827867be4fac 100644
--- a/security/ipe/policy.c
+++ b/security/ipe/policy.c
@@ -162,7 +162,7 @@ struct ipe_policy *ipe_new_policy(const char *text, size_t textlen,
struct ipe_policy *new = NULL;
int rc = 0;
- new = kzalloc_obj(*new, GFP_KERNEL);
+ new = kzalloc_obj(*new);
if (!new)
return ERR_PTR(-ENOMEM);
diff --git a/security/ipe/policy_parser.c b/security/ipe/policy_parser.c
index 180de3e5f200..6fa5bebf8471 100644
--- a/security/ipe/policy_parser.c
+++ b/security/ipe/policy_parser.c
@@ -30,7 +30,7 @@ static struct ipe_parsed_policy *new_parsed_policy(void)
struct ipe_op_table *t = NULL;
size_t i = 0;
- p = kzalloc_obj(*p, GFP_KERNEL);
+ p = kzalloc_obj(*p);
if (!p)
return ERR_PTR(-ENOMEM);
@@ -305,7 +305,7 @@ static int parse_property(char *t, struct ipe_rule *r)
int token;
char *dup = NULL;
- p = kzalloc_obj(*p, GFP_KERNEL);
+ p = kzalloc_obj(*p);
if (!p)
return -ENOMEM;
@@ -373,7 +373,7 @@ static int parse_rule(char *line, struct ipe_parsed_policy *p)
if (IS_ERR_OR_NULL(line))
return -EBADMSG;
- r = kzalloc_obj(*r, GFP_KERNEL);
+ r = kzalloc_obj(*r);
if (!r)
return -ENOMEM;
diff --git a/security/keys/key.c b/security/keys/key.c
index 8ca0777f22d3..091ee084bc30 100644
--- a/security/keys/key.c
+++ b/security/keys/key.c
@@ -77,7 +77,7 @@ struct key_user *key_user_lookup(kuid_t uid)
spin_unlock(&key_user_lock);
user = NULL;
- candidate = kmalloc_obj(struct key_user, GFP_KERNEL);
+ candidate = kmalloc_obj(struct key_user);
if (unlikely(!candidate))
goto out;
diff --git a/security/keys/keyctl.c b/security/keys/keyctl.c
index 7d8a0de7c7c4..ef855d69c97a 100644
--- a/security/keys/keyctl.c
+++ b/security/keys/keyctl.c
@@ -1796,13 +1796,13 @@ long keyctl_watch_key(key_serial_t id, int watch_queue_fd, int watch_id)
if (watch_id >= 0) {
ret = -ENOMEM;
if (!key->watchers) {
- wlist = kzalloc_obj(*wlist, GFP_KERNEL);
+ wlist = kzalloc_obj(*wlist);
if (!wlist)
goto err_wqueue;
init_watch_list(wlist, NULL);
}
- watch = kzalloc_obj(*watch, GFP_KERNEL);
+ watch = kzalloc_obj(*watch);
if (!watch)
goto err_wlist;
diff --git a/security/keys/keyring.c b/security/keys/keyring.c
index 9a1685035be5..b39038f7dd31 100644
--- a/security/keys/keyring.c
+++ b/security/keys/keyring.c
@@ -977,7 +977,7 @@ static struct key_restriction *keyring_restriction_alloc(
key_restrict_link_func_t check)
{
struct key_restriction *keyres =
- kzalloc_obj(struct key_restriction, GFP_KERNEL);
+ kzalloc_obj(struct key_restriction);
if (!keyres)
return ERR_PTR(-ENOMEM);
diff --git a/security/keys/request_key_auth.c b/security/keys/request_key_auth.c
index f0de3e9d9743..a7d7538c1f70 100644
--- a/security/keys/request_key_auth.c
+++ b/security/keys/request_key_auth.c
@@ -171,7 +171,7 @@ struct key *request_key_auth_new(struct key *target, const char *op,
kenter("%d,", target->serial);
/* allocate a auth record */
- rka = kzalloc_obj(*rka, GFP_KERNEL);
+ rka = kzalloc_obj(*rka);
if (!rka)
goto error;
rka->callout_info = kmemdup(callout_info, callout_len, GFP_KERNEL);
diff --git a/security/keys/trusted-keys/trusted_core.c b/security/keys/trusted-keys/trusted_core.c
index fb9ff3d18292..0b142d941cd2 100644
--- a/security/keys/trusted-keys/trusted_core.c
+++ b/security/keys/trusted-keys/trusted_core.c
@@ -134,7 +134,7 @@ static struct trusted_key_payload *trusted_payload_alloc(struct key *key)
ret = key_payload_reserve(key, sizeof(*p));
if (ret < 0)
goto err;
- p = kzalloc_obj(*p, GFP_KERNEL);
+ p = kzalloc_obj(*p);
if (!p)
goto err;
diff --git a/security/keys/trusted-keys/trusted_pkwm.c b/security/keys/trusted-keys/trusted_pkwm.c
index aab8fbc49280..bf42c6679245 100644
--- a/security/keys/trusted-keys/trusted_pkwm.c
+++ b/security/keys/trusted-keys/trusted_pkwm.c
@@ -62,10 +62,10 @@ static struct trusted_key_options *trusted_options_alloc(void)
struct trusted_key_options *options;
struct trusted_pkwm_options *pkwm;
- options = kzalloc_obj(*options, GFP_KERNEL);
+ options = kzalloc_obj(*options);
if (options) {
- pkwm = kzalloc_obj(*pkwm, GFP_KERNEL);
+ pkwm = kzalloc_obj(*pkwm);
if (!pkwm) {
kfree_sensitive(options);
diff --git a/security/keys/trusted-keys/trusted_tpm1.c b/security/keys/trusted-keys/trusted_tpm1.c
index ce9b26dd846e..6ea728f1eae6 100644
--- a/security/keys/trusted-keys/trusted_tpm1.c
+++ b/security/keys/trusted-keys/trusted_tpm1.c
@@ -440,7 +440,7 @@ static int tpm_seal(struct tpm_buf *tb, uint16_t keytype,
int i;
/* alloc some work space for all the hashes */
- td = kmalloc_obj(*td, GFP_KERNEL);
+ td = kmalloc_obj(*td);
if (!td)
return -ENOMEM;
@@ -838,7 +838,7 @@ static struct trusted_key_options *trusted_options_alloc(void)
if (tpm2 < 0)
return NULL;
- options = kzalloc_obj(*options, GFP_KERNEL);
+ options = kzalloc_obj(*options);
if (options) {
/* set any non-zero defaults */
options->keytype = SRK_keytype;
@@ -946,7 +946,7 @@ static int __init init_digests(void)
{
int i;
- digests = kzalloc_objs(*digests, chip->nr_allocated_banks, GFP_KERNEL);
+ digests = kzalloc_objs(*digests, chip->nr_allocated_banks);
if (!digests)
return -ENOMEM;
diff --git a/security/safesetid/securityfs.c b/security/safesetid/securityfs.c
index 8cc2bcb07324..a71e548065a9 100644
--- a/security/safesetid/securityfs.c
+++ b/security/safesetid/securityfs.c
@@ -118,7 +118,7 @@ static int verify_ruleset(struct setid_ruleset *pol)
res = -EINVAL;
/* fix it up */
- nrule = kmalloc_obj(struct setid_rule, GFP_KERNEL);
+ nrule = kmalloc_obj(struct setid_rule);
if (!nrule)
return -ENOMEM;
if (pol->type == UID){
@@ -146,7 +146,7 @@ static ssize_t handle_policy_update(struct file *file,
if (len >= KMALLOC_MAX_SIZE)
return -EINVAL;
- pol = kmalloc_obj(struct setid_ruleset, GFP_KERNEL);
+ pol = kmalloc_obj(struct setid_ruleset);
if (!pol)
return -ENOMEM;
pol->policy_str = NULL;
@@ -175,7 +175,7 @@ static ssize_t handle_policy_update(struct file *file,
}
*end = '\0';
- rule = kmalloc_obj(struct setid_rule, GFP_KERNEL);
+ rule = kmalloc_obj(struct setid_rule);
if (!rule) {
err = -ENOMEM;
goto out_free_buf;
diff --git a/security/selinux/avc.c b/security/selinux/avc.c
index 584b1d6bdff1..813e82bcfc27 100644
--- a/security/selinux/avc.c
+++ b/security/selinux/avc.c
@@ -794,7 +794,7 @@ int __init avc_add_callback(int (*callback)(u32 event), u32 events)
struct avc_callback_node *c;
int rc = 0;
- c = kmalloc_obj(*c, GFP_KERNEL);
+ c = kmalloc_obj(*c);
if (!c) {
rc = -ENOMEM;
goto out;
diff --git a/security/selinux/hooks.c b/security/selinux/hooks.c
index 58ce110272ef..d8224ea113d1 100644
--- a/security/selinux/hooks.c
+++ b/security/selinux/hooks.c
@@ -1030,7 +1030,7 @@ static int selinux_add_opt(int token, const char *s, void **mnt_opts)
}
if (!opts) {
- opts = kzalloc_obj(*opts, GFP_KERNEL);
+ opts = kzalloc_obj(*opts);
if (!opts)
return -ENOMEM;
*mnt_opts = opts;
@@ -2822,7 +2822,7 @@ static int selinux_fs_context_submount(struct fs_context *fc,
if (!(sbsec->flags & (FSCONTEXT_MNT|CONTEXT_MNT|DEFCONTEXT_MNT)))
return 0;
- opts = kzalloc_obj(*opts, GFP_KERNEL);
+ opts = kzalloc_obj(*opts);
if (!opts)
return -ENOMEM;
diff --git a/security/selinux/selinuxfs.c b/security/selinux/selinuxfs.c
index 010499520d38..3245cc531555 100644
--- a/security/selinux/selinuxfs.c
+++ b/security/selinux/selinuxfs.c
@@ -85,7 +85,7 @@ static int selinux_fs_info_create(struct super_block *sb)
{
struct selinux_fs_info *fsi;
- fsi = kzalloc_obj(*fsi, GFP_KERNEL);
+ fsi = kzalloc_obj(*fsi);
if (!fsi)
return -ENOMEM;
@@ -380,7 +380,7 @@ static int sel_open_policy(struct inode *inode, struct file *filp)
goto err;
rc = -ENOMEM;
- plm = kzalloc_obj(*plm, GFP_KERNEL);
+ plm = kzalloc_obj(*plm);
if (!plm)
goto err;
diff --git a/security/selinux/ss/conditional.c b/security/selinux/ss/conditional.c
index b238fa9756cf..807e464340c7 100644
--- a/security/selinux/ss/conditional.c
+++ b/security/selinux/ss/conditional.c
@@ -214,7 +214,7 @@ int cond_read_bool(struct policydb *p, struct symtab *s, struct policy_file *fp)
u32 len;
int rc;
- booldatum = kzalloc_obj(*booldatum, GFP_KERNEL);
+ booldatum = kzalloc_obj(*booldatum);
if (!booldatum)
return -ENOMEM;
@@ -334,7 +334,7 @@ static int cond_read_av_list(struct policydb *p, struct policy_file *fp,
if (len == 0)
return 0;
- list->nodes = kzalloc_objs(*list->nodes, len, GFP_KERNEL);
+ list->nodes = kzalloc_objs(*list->nodes, len);
if (!list->nodes)
return -ENOMEM;
@@ -383,7 +383,7 @@ static int cond_read_node(struct policydb *p, struct cond_node *node, struct pol
/* expr */
len = le32_to_cpu(buf[1]);
- node->expr.nodes = kzalloc_objs(*node->expr.nodes, len, GFP_KERNEL);
+ node->expr.nodes = kzalloc_objs(*node->expr.nodes, len);
if (!node->expr.nodes)
return -ENOMEM;
@@ -421,7 +421,7 @@ int cond_read_list(struct policydb *p, struct policy_file *fp)
len = le32_to_cpu(buf[0]);
- p->cond_list = kzalloc_objs(*p->cond_list, len, GFP_KERNEL);
+ p->cond_list = kzalloc_objs(*p->cond_list, len);
if (!p->cond_list)
return -ENOMEM;
@@ -605,7 +605,7 @@ static int cond_dup_av_list(struct cond_av_list *new,
memset(new, 0, sizeof(*new));
- new->nodes = kzalloc_objs(*new->nodes, orig->len, GFP_KERNEL);
+ new->nodes = kzalloc_objs(*new->nodes, orig->len);
if (!new->nodes)
return -ENOMEM;
diff --git a/security/selinux/ss/hashtab.c b/security/selinux/ss/hashtab.c
index 1eb542725c94..9ffc8a371e23 100644
--- a/security/selinux/ss/hashtab.c
+++ b/security/selinux/ss/hashtab.c
@@ -149,7 +149,7 @@ int hashtab_duplicate(struct hashtab *new, const struct hashtab *orig,
memset(new, 0, sizeof(*new));
- new->htable = kzalloc_objs(*new->htable, orig->size, GFP_KERNEL);
+ new->htable = kzalloc_objs(*new->htable, orig->size);
if (!new->htable)
return -ENOMEM;
diff --git a/security/selinux/ss/policydb.c b/security/selinux/ss/policydb.c
index a96c671d0d51..661322ff1669 100644
--- a/security/selinux/ss/policydb.c
+++ b/security/selinux/ss/policydb.c
@@ -390,7 +390,7 @@ static int roles_init(struct policydb *p)
int rc;
struct role_datum *role;
- role = kzalloc_obj(*role, GFP_KERNEL);
+ role = kzalloc_obj(*role);
if (!role)
return -ENOMEM;
@@ -1130,7 +1130,7 @@ static int perm_read(struct policydb *p, struct symtab *s, struct policy_file *f
__le32 buf[2];
u32 len;
- perdatum = kzalloc_obj(*perdatum, GFP_KERNEL);
+ perdatum = kzalloc_obj(*perdatum);
if (!perdatum)
return -ENOMEM;
@@ -1163,7 +1163,7 @@ static int common_read(struct policydb *p, struct symtab *s, struct policy_file
u32 i, len, nel;
int rc;
- comdatum = kzalloc_obj(*comdatum, GFP_KERNEL);
+ comdatum = kzalloc_obj(*comdatum);
if (!comdatum)
return -ENOMEM;
@@ -1236,7 +1236,7 @@ static int read_cons_helper(struct policydb *p, struct constraint_node **nodep,
lc = NULL;
for (i = 0; i < ncons; i++) {
- c = kzalloc_obj(*c, GFP_KERNEL);
+ c = kzalloc_obj(*c);
if (!c)
return -ENOMEM;
@@ -1253,7 +1253,7 @@ static int read_cons_helper(struct policydb *p, struct constraint_node **nodep,
le = NULL;
depth = -1;
for (j = 0; j < nexpr; j++) {
- e = kzalloc_obj(*e, GFP_KERNEL);
+ e = kzalloc_obj(*e);
if (!e)
return -ENOMEM;
@@ -1327,7 +1327,7 @@ static int class_read(struct policydb *p, struct symtab *s, struct policy_file *
u32 i, len, len2, ncons, nel;
int rc;
- cladatum = kzalloc_obj(*cladatum, GFP_KERNEL);
+ cladatum = kzalloc_obj(*cladatum);
if (!cladatum)
return -ENOMEM;
@@ -1425,7 +1425,7 @@ static int role_read(struct policydb *p, struct symtab *s, struct policy_file *f
__le32 buf[3];
u32 len;
- role = kzalloc_obj(*role, GFP_KERNEL);
+ role = kzalloc_obj(*role);
if (!role)
return -ENOMEM;
@@ -1482,7 +1482,7 @@ static int type_read(struct policydb *p, struct symtab *s, struct policy_file *f
__le32 buf[4];
u32 len;
- typdatum = kzalloc_obj(*typdatum, GFP_KERNEL);
+ typdatum = kzalloc_obj(*typdatum);
if (!typdatum)
return -ENOMEM;
@@ -1556,7 +1556,7 @@ static int user_read(struct policydb *p, struct symtab *s, struct policy_file *f
__le32 buf[3];
u32 len;
- usrdatum = kzalloc_obj(*usrdatum, GFP_KERNEL);
+ usrdatum = kzalloc_obj(*usrdatum);
if (!usrdatum)
return -ENOMEM;
@@ -1606,7 +1606,7 @@ static int sens_read(struct policydb *p, struct symtab *s, struct policy_file *f
__le32 buf[2];
u32 len;
- levdatum = kzalloc_obj(*levdatum, GFP_KERNEL);
+ levdatum = kzalloc_obj(*levdatum);
if (!levdatum)
return -ENOMEM;
@@ -1642,7 +1642,7 @@ static int cat_read(struct policydb *p, struct symtab *s, struct policy_file *fp
__le32 buf[3];
u32 len;
- catdatum = kzalloc_obj(*catdatum, GFP_KERNEL);
+ catdatum = kzalloc_obj(*catdatum);
if (!catdatum)
return -ENOMEM;
@@ -1862,7 +1862,7 @@ static int range_read(struct policydb *p, struct policy_file *fp)
for (i = 0; i < nel; i++) {
rc = -ENOMEM;
- rt = kzalloc_obj(*rt, GFP_KERNEL);
+ rt = kzalloc_obj(*rt);
if (!rt)
goto out;
@@ -1887,7 +1887,7 @@ static int range_read(struct policydb *p, struct policy_file *fp)
goto out;
rc = -ENOMEM;
- r = kzalloc_obj(*r, GFP_KERNEL);
+ r = kzalloc_obj(*r);
if (!r)
goto out;
@@ -1963,7 +1963,7 @@ static int filename_trans_read_helper_compat(struct policydb *p, struct policy_f
}
if (!datum) {
rc = -ENOMEM;
- datum = kmalloc_obj(*datum, GFP_KERNEL);
+ datum = kmalloc_obj(*datum);
if (!datum)
goto out;
@@ -2038,7 +2038,7 @@ static int filename_trans_read_helper(struct policydb *p, struct policy_file *fp
dst = &first;
for (i = 0; i < ndatum; i++) {
rc = -ENOMEM;
- datum = kmalloc_obj(*datum, GFP_KERNEL);
+ datum = kmalloc_obj(*datum);
if (!datum)
goto out;
@@ -2060,7 +2060,7 @@ static int filename_trans_read_helper(struct policydb *p, struct policy_file *fp
}
rc = -ENOMEM;
- ft = kmalloc_obj(*ft, GFP_KERNEL);
+ ft = kmalloc_obj(*ft);
if (!ft)
goto out;
@@ -2153,7 +2153,7 @@ static int genfs_read(struct policydb *p, struct policy_file *fp)
len = le32_to_cpu(buf[0]);
rc = -ENOMEM;
- newgenfs = kzalloc_obj(*newgenfs, GFP_KERNEL);
+ newgenfs = kzalloc_obj(*newgenfs);
if (!newgenfs)
goto out;
@@ -2192,7 +2192,7 @@ static int genfs_read(struct policydb *p, struct policy_file *fp)
len = le32_to_cpu(buf[0]);
rc = -ENOMEM;
- newc = kzalloc_obj(*newc, GFP_KERNEL);
+ newc = kzalloc_obj(*newc);
if (!newc)
goto out;
@@ -2264,7 +2264,7 @@ static int ocontext_read(struct policydb *p,
l = NULL;
for (j = 0; j < nel; j++) {
rc = -ENOMEM;
- c = kzalloc_obj(*c, GFP_KERNEL);
+ c = kzalloc_obj(*c);
if (!c)
goto out;
if (l)
@@ -2621,12 +2621,12 @@ int policydb_read(struct policydb *p, struct policy_file *fp)
goto bad;
for (i = 0; i < nel; i++) {
rc = -ENOMEM;
- rtk = kmalloc_obj(*rtk, GFP_KERNEL);
+ rtk = kmalloc_obj(*rtk);
if (!rtk)
goto bad;
rc = -ENOMEM;
- rtd = kmalloc_obj(*rtd, GFP_KERNEL);
+ rtd = kmalloc_obj(*rtd);
if (!rtd)
goto bad;
@@ -2669,7 +2669,7 @@ int policydb_read(struct policydb *p, struct policy_file *fp)
lra = NULL;
for (i = 0; i < nel; i++) {
rc = -ENOMEM;
- ra = kzalloc_obj(*ra, GFP_KERNEL);
+ ra = kzalloc_obj(*ra);
if (!ra)
goto bad;
if (lra)
diff --git a/security/selinux/ss/services.c b/security/selinux/ss/services.c
index 6f20e941c059..e8e7ccbd1e44 100644
--- a/security/selinux/ss/services.c
+++ b/security/selinux/ss/services.c
@@ -2312,11 +2312,11 @@ int security_load_policy(void *data, size_t len,
int rc = 0;
struct policy_file file = { data, len }, *fp = &file;
- newpolicy = kzalloc_obj(*newpolicy, GFP_KERNEL);
+ newpolicy = kzalloc_obj(*newpolicy);
if (!newpolicy)
return -ENOMEM;
- newpolicy->sidtab = kzalloc_obj(*newpolicy->sidtab, GFP_KERNEL);
+ newpolicy->sidtab = kzalloc_obj(*newpolicy->sidtab);
if (!newpolicy->sidtab) {
rc = -ENOMEM;
goto err_policy;
@@ -2360,7 +2360,7 @@ int security_load_policy(void *data, size_t len,
* in the new SID table.
*/
- convert_data = kmalloc_obj(*convert_data, GFP_KERNEL);
+ convert_data = kmalloc_obj(*convert_data);
if (!convert_data) {
rc = -ENOMEM;
goto err_free_isids;
diff --git a/security/smack/smack_lsm.c b/security/smack/smack_lsm.c
index e2add0c8c739..98af9d7b9434 100644
--- a/security/smack/smack_lsm.c
+++ b/security/smack/smack_lsm.c
@@ -562,7 +562,7 @@ static int smack_add_opt(int token, const char *s, void **mnt_opts)
struct smack_known *skp;
if (!opts) {
- opts = kzalloc_obj(struct smack_mnt_opts, GFP_KERNEL);
+ opts = kzalloc_obj(struct smack_mnt_opts);
if (!opts)
return -ENOMEM;
*mnt_opts = opts;
@@ -622,7 +622,7 @@ static int smack_fs_context_submount(struct fs_context *fc,
struct smack_mnt_opts *ctx;
struct inode_smack *isp;
- ctx = kzalloc_obj(*ctx, GFP_KERNEL);
+ ctx = kzalloc_obj(*ctx);
if (!ctx)
return -ENOMEM;
fc->security = ctx;
@@ -673,7 +673,7 @@ static int smack_fs_context_dup(struct fs_context *fc,
if (!src)
return 0;
- fc->security = kzalloc_obj(struct smack_mnt_opts, GFP_KERNEL);
+ fc->security = kzalloc_obj(struct smack_mnt_opts);
if (!fc->security)
return -ENOMEM;
@@ -2817,7 +2817,7 @@ static void smk_ipv6_port_label(struct socket *sock, struct sockaddr *address)
/*
* A new port entry is required.
*/
- spp = kzalloc_obj(*spp, GFP_KERNEL);
+ spp = kzalloc_obj(*spp);
if (spp == NULL)
return;
diff --git a/security/smack/smackfs.c b/security/smack/smackfs.c
index 35b98f11e32d..6e62dcb36f74 100644
--- a/security/smack/smackfs.c
+++ b/security/smack/smackfs.c
@@ -1249,7 +1249,7 @@ static ssize_t smk_write_net4addr(struct file *file, const char __user *buf,
smk_netlabel_audit_set(&audit_info);
if (found == 0) {
- snp = kzalloc_obj(*snp, GFP_KERNEL);
+ snp = kzalloc_obj(*snp);
if (snp == NULL)
rc = -ENOMEM;
else {
@@ -1526,7 +1526,7 @@ static ssize_t smk_write_net6addr(struct file *file, const char __user *buf,
break;
}
if (found == 0) {
- snp = kzalloc_obj(*snp, GFP_KERNEL);
+ snp = kzalloc_obj(*snp);
if (snp == NULL)
rc = -ENOMEM;
else {
@@ -1970,7 +1970,7 @@ static int smk_parse_label_list(char *data, struct list_head *list)
if (IS_ERR(skp))
return PTR_ERR(skp);
- sklep = kzalloc_obj(*sklep, GFP_KERNEL);
+ sklep = kzalloc_obj(*sklep);
if (sklep == NULL)
return -ENOMEM;
diff --git a/security/yama/yama_lsm.c b/security/yama/yama_lsm.c
index 57fd421f8c31..cef3776cf3b2 100644
--- a/security/yama/yama_lsm.c
+++ b/security/yama/yama_lsm.c
@@ -143,7 +143,7 @@ static int yama_ptracer_add(struct task_struct *tracer,
{
struct ptrace_relation *relation, *added;
- added = kmalloc_obj(*added, GFP_KERNEL);
+ added = kmalloc_obj(*added);
if (!added)
return -ENOMEM;
diff --git a/sound/ac97/bus.c b/sound/ac97/bus.c
index 0dda1f4d5cbd..15487837e894 100644
--- a/sound/ac97/bus.c
+++ b/sound/ac97/bus.c
@@ -104,7 +104,7 @@ static int ac97_codec_add(struct ac97_controller *ac97_ctrl, int idx,
struct ac97_codec_device *codec;
int ret;
- codec = kzalloc_obj(*codec, GFP_KERNEL);
+ codec = kzalloc_obj(*codec);
if (!codec)
return -ENOMEM;
ac97_ctrl->codecs[idx] = codec;
@@ -351,7 +351,7 @@ struct ac97_controller *snd_ac97_controller_register(
struct ac97_controller *ac97_ctrl;
int ret, i;
- ac97_ctrl = kzalloc_obj(*ac97_ctrl, GFP_KERNEL);
+ ac97_ctrl = kzalloc_obj(*ac97_ctrl);
if (!ac97_ctrl)
return ERR_PTR(-ENOMEM);
diff --git a/sound/ac97/snd_ac97_compat.c b/sound/ac97/snd_ac97_compat.c
index e6c43556c8f6..1a89286d1b67 100644
--- a/sound/ac97/snd_ac97_compat.c
+++ b/sound/ac97/snd_ac97_compat.c
@@ -69,7 +69,7 @@ struct snd_ac97 *snd_ac97_compat_alloc(struct ac97_codec_device *adev)
struct snd_ac97 *ac97;
int ret;
- ac97 = kzalloc_obj(struct snd_ac97, GFP_KERNEL);
+ ac97 = kzalloc_obj(struct snd_ac97);
if (ac97 == NULL)
return ERR_PTR(-ENOMEM);
diff --git a/sound/aoa/codecs/onyx.c b/sound/aoa/codecs/onyx.c
index bce8b35c5c27..3ae8408cd303 100644
--- a/sound/aoa/codecs/onyx.c
+++ b/sound/aoa/codecs/onyx.c
@@ -959,7 +959,7 @@ static int onyx_i2c_probe(struct i2c_client *client)
struct onyx *onyx;
u8 dummy;
- onyx = kzalloc_obj(struct onyx, GFP_KERNEL);
+ onyx = kzalloc_obj(struct onyx);
if (!onyx)
return -ENOMEM;
diff --git a/sound/aoa/codecs/tas.c b/sound/aoa/codecs/tas.c
index 9c9b35cb5b6a..13da2b159ad0 100644
--- a/sound/aoa/codecs/tas.c
+++ b/sound/aoa/codecs/tas.c
@@ -845,7 +845,7 @@ static int tas_i2c_probe(struct i2c_client *client)
struct device_node *node = client->dev.of_node;
struct tas *tas;
- tas = kzalloc_obj(struct tas, GFP_KERNEL);
+ tas = kzalloc_obj(struct tas);
if (!tas)
return -ENOMEM;
diff --git a/sound/aoa/codecs/toonie.c b/sound/aoa/codecs/toonie.c
index 19653cf19292..6aaf4c9debdd 100644
--- a/sound/aoa/codecs/toonie.c
+++ b/sound/aoa/codecs/toonie.c
@@ -121,7 +121,7 @@ static struct toonie *toonie;
static int __init toonie_init(void)
{
- toonie = kzalloc_obj(struct toonie, GFP_KERNEL);
+ toonie = kzalloc_obj(struct toonie);
if (!toonie)
return -ENOMEM;
diff --git a/sound/aoa/core/gpio-pmf.c b/sound/aoa/core/gpio-pmf.c
index 155a503e1e9b..2995876df534 100644
--- a/sound/aoa/core/gpio-pmf.c
+++ b/sound/aoa/core/gpio-pmf.c
@@ -173,7 +173,7 @@ static int pmf_set_notify(struct gpio_runtime *rt,
notif->gpio_private = NULL;
}
if (!old && notify) {
- irq_client = kzalloc_obj(struct pmf_irq_client, GFP_KERNEL);
+ irq_client = kzalloc_obj(struct pmf_irq_client);
if (!irq_client)
return -ENOMEM;
irq_client->data = notif;
diff --git a/sound/aoa/fabrics/layout.c b/sound/aoa/fabrics/layout.c
index 0b73ecda1b1d..c18b55305294 100644
--- a/sound/aoa/fabrics/layout.c
+++ b/sound/aoa/fabrics/layout.c
@@ -1025,7 +1025,7 @@ static int aoa_fabric_layout_probe(struct soundbus_dev *sdev)
goto outnodev;
}
- ldev = kzalloc_obj(struct layout_dev, GFP_KERNEL);
+ ldev = kzalloc_obj(struct layout_dev);
if (!ldev)
goto outnodev;
diff --git a/sound/aoa/soundbus/i2sbus/control.c b/sound/aoa/soundbus/i2sbus/control.c
index 09e5070e0ae2..1e9f258b5e67 100644
--- a/sound/aoa/soundbus/i2sbus/control.c
+++ b/sound/aoa/soundbus/i2sbus/control.c
@@ -19,7 +19,7 @@
int i2sbus_control_init(struct macio_dev* dev, struct i2sbus_control **c)
{
- *c = kzalloc_obj(struct i2sbus_control, GFP_KERNEL);
+ *c = kzalloc_obj(struct i2sbus_control);
if (!*c)
return -ENOMEM;
diff --git a/sound/aoa/soundbus/i2sbus/core.c b/sound/aoa/soundbus/i2sbus/core.c
index 8941f3266947..f974b96e98cd 100644
--- a/sound/aoa/soundbus/i2sbus/core.c
+++ b/sound/aoa/soundbus/i2sbus/core.c
@@ -171,7 +171,7 @@ static int i2sbus_add_dev(struct macio_dev *macio,
if (strncmp(node_name, "i2s-", 4))
return 0;
- dev = kzalloc_obj(struct i2sbus_dev, GFP_KERNEL);
+ dev = kzalloc_obj(struct i2sbus_dev);
if (!dev)
return 0;
diff --git a/sound/aoa/soundbus/i2sbus/pcm.c b/sound/aoa/soundbus/i2sbus/pcm.c
index ceee3320a932..aff99003d833 100644
--- a/sound/aoa/soundbus/i2sbus/pcm.c
+++ b/sound/aoa/soundbus/i2sbus/pcm.c
@@ -879,7 +879,7 @@ i2sbus_attach_codec(struct soundbus_dev *dev, struct snd_card *card,
tmp++;
}
- cii = kzalloc_obj(struct codec_info_item, GFP_KERNEL);
+ cii = kzalloc_obj(struct codec_info_item);
if (!cii)
return -ENOMEM;
diff --git a/sound/core/compress_offload.c b/sound/core/compress_offload.c
index 27d916c8fb29..fdba6e4b25fd 100644
--- a/sound/core/compress_offload.c
+++ b/sound/core/compress_offload.c
@@ -519,7 +519,7 @@ snd_compr_get_codec_caps(struct snd_compr_stream *stream, unsigned long arg)
return -ENXIO;
struct snd_compr_codec_caps *caps __free(kfree) =
- kzalloc_obj(*caps, GFP_KERNEL);
+ kzalloc_obj(*caps);
if (!caps)
return -ENOMEM;
@@ -539,7 +539,7 @@ int snd_compr_malloc_pages(struct snd_compr_stream *stream, size_t size)
if (snd_BUG_ON(!(stream) || !(stream)->runtime))
return -EINVAL;
- dmab = kzalloc_obj(*dmab, GFP_KERNEL);
+ dmab = kzalloc_obj(*dmab);
if (!dmab)
return -ENOMEM;
dmab->dev = stream->dma_buffer.dev;
@@ -694,7 +694,7 @@ snd_compr_get_params(struct snd_compr_stream *stream, unsigned long arg)
return -EBADFD;
struct snd_codec *params __free(kfree) =
- kzalloc_obj(*params, GFP_KERNEL);
+ kzalloc_obj(*params);
if (!params)
return -ENOMEM;
retval = stream->ops->get_params(stream, params);
@@ -1066,7 +1066,7 @@ static int snd_compr_task_new(struct snd_compr_stream *stream, struct snd_compr_
return -EBUSY;
if (utask->origin_seqno != 0 || utask->input_size != 0)
return -EINVAL;
- task = kzalloc_obj(*task, GFP_KERNEL);
+ task = kzalloc_obj(*task);
if (task == NULL)
return -ENOMEM;
task->seqno = utask->seqno = snd_compr_seqno_next(stream);
diff --git a/sound/core/control.c b/sound/core/control.c
index eb4a3c1214fb..ffefc5ec6d6b 100644
--- a/sound/core/control.c
+++ b/sound/core/control.c
@@ -2057,7 +2057,7 @@ static int _snd_ctl_register_ioctl(snd_kctl_ioctl_func_t fcn, struct list_head *
{
struct snd_kctl_ioctl *pn;
- pn = kzalloc_obj(struct snd_kctl_ioctl, GFP_KERNEL);
+ pn = kzalloc_obj(struct snd_kctl_ioctl);
if (pn == NULL)
return -ENOMEM;
pn->fioctl = fcn;
diff --git a/sound/core/control_compat.c b/sound/core/control_compat.c
index 174395322c51..16bc80555f26 100644
--- a/sound/core/control_compat.c
+++ b/sound/core/control_compat.c
@@ -82,7 +82,7 @@ static int snd_ctl_elem_info_compat(struct snd_ctl_file *ctl,
struct snd_card *card = ctl->card;
int err;
struct snd_ctl_elem_info *data __free(kfree) =
- kzalloc_obj(*data, GFP_KERNEL);
+ kzalloc_obj(*data);
if (! data)
return -ENOMEM;
@@ -177,7 +177,7 @@ static int get_ctl_type(struct snd_card *card, struct snd_ctl_elem_id *id,
return -ENOENT;
struct snd_ctl_elem_info *info __free(kfree) =
- kzalloc_obj(*info, GFP_KERNEL);
+ kzalloc_obj(*info);
if (info == NULL)
return -ENOMEM;
info->id = *id;
@@ -283,7 +283,7 @@ static int __ctl_elem_read_user(struct snd_card *card,
{
int err, type, count;
struct snd_ctl_elem_value *data __free(kfree) =
- kzalloc_obj(*data, GFP_KERNEL);
+ kzalloc_obj(*data);
if (data == NULL)
return -ENOMEM;
@@ -318,7 +318,7 @@ static int __ctl_elem_write_user(struct snd_ctl_file *file,
struct snd_card *card = file->card;
int err, type, count;
struct snd_ctl_elem_value *data __free(kfree) =
- kzalloc_obj(*data, GFP_KERNEL);
+ kzalloc_obj(*data);
if (data == NULL)
return -ENOMEM;
@@ -380,7 +380,7 @@ static int snd_ctl_elem_add_compat(struct snd_ctl_file *file,
int replace)
{
struct snd_ctl_elem_info *data __free(kfree) =
- kzalloc_obj(*data, GFP_KERNEL);
+ kzalloc_obj(*data);
if (! data)
return -ENOMEM;
diff --git a/sound/core/control_led.c b/sound/core/control_led.c
index 07eebf849ae3..d92b36ab5ec6 100644
--- a/sound/core/control_led.c
+++ b/sound/core/control_led.c
@@ -653,7 +653,7 @@ static void snd_ctl_led_sysfs_add(struct snd_card *card)
for (group = 0; group < MAX_LED; group++) {
led = &snd_ctl_leds[group];
- led_card = kzalloc_obj(*led_card, GFP_KERNEL);
+ led_card = kzalloc_obj(*led_card);
if (!led_card)
goto cerr2;
led_card->number = card->number;
diff --git a/sound/core/device.c b/sound/core/device.c
index 80c02914877f..5f2aa476d89b 100644
--- a/sound/core/device.c
+++ b/sound/core/device.c
@@ -34,7 +34,7 @@ int snd_device_new(struct snd_card *card, enum snd_device_type type,
if (snd_BUG_ON(!card || !device_data || !ops))
return -ENXIO;
- dev = kzalloc_obj(*dev, GFP_KERNEL);
+ dev = kzalloc_obj(*dev);
if (!dev)
return -ENOMEM;
INIT_LIST_HEAD(&dev->list);
diff --git a/sound/core/hrtimer.c b/sound/core/hrtimer.c
index a98de8d9ce16..9fcd1c03dc5b 100644
--- a/sound/core/hrtimer.c
+++ b/sound/core/hrtimer.c
@@ -64,7 +64,7 @@ static int snd_hrtimer_open(struct snd_timer *t)
{
struct snd_hrtimer *stime;
- stime = kzalloc_obj(*stime, GFP_KERNEL);
+ stime = kzalloc_obj(*stime);
if (!stime)
return -ENOMEM;
stime->timer = t;
diff --git a/sound/core/hwdep.c b/sound/core/hwdep.c
index a493db2160ed..973d11732bfd 100644
--- a/sound/core/hwdep.c
+++ b/sound/core/hwdep.c
@@ -375,7 +375,7 @@ int snd_hwdep_new(struct snd_card *card, char *id, int device,
return -ENXIO;
if (rhwdep)
*rhwdep = NULL;
- hwdep = kzalloc_obj(*hwdep, GFP_KERNEL);
+ hwdep = kzalloc_obj(*hwdep);
if (!hwdep)
return -ENOMEM;
diff --git a/sound/core/info.c b/sound/core/info.c
index de8ec34360ee..54834dbe6b59 100644
--- a/sound/core/info.c
+++ b/sound/core/info.c
@@ -79,7 +79,7 @@ static int alloc_info_private(struct snd_info_entry *entry,
return -ENODEV;
if (!try_module_get(entry->module))
return -EFAULT;
- data = kzalloc_obj(*data, GFP_KERNEL);
+ data = kzalloc_obj(*data);
if (!data) {
module_put(entry->module);
return -ENOMEM;
@@ -311,7 +311,7 @@ static ssize_t snd_info_text_entry_write(struct file *file,
guard(mutex)(&entry->access);
buf = data->wbuffer;
if (!buf) {
- data->wbuffer = buf = kzalloc_obj(*buf, GFP_KERNEL);
+ data->wbuffer = buf = kzalloc_obj(*buf);
if (!buf)
return -ENOMEM;
}
@@ -355,7 +355,7 @@ static int snd_info_text_entry_open(struct inode *inode, struct file *file)
if (err < 0)
return err;
- data->rbuffer = kzalloc_obj(*data->rbuffer, GFP_KERNEL);
+ data->rbuffer = kzalloc_obj(*data->rbuffer);
if (!data->rbuffer) {
err = -ENOMEM;
goto error;
@@ -663,7 +663,7 @@ snd_info_create_entry(const char *name, struct snd_info_entry *parent,
struct module *module)
{
struct snd_info_entry *entry;
- entry = kzalloc_obj(*entry, GFP_KERNEL);
+ entry = kzalloc_obj(*entry);
if (entry == NULL)
return NULL;
entry->name = kstrdup(name, GFP_KERNEL);
diff --git a/sound/core/init.c b/sound/core/init.c
index 84c11bd49a95..2f1bd9cbdbed 100644
--- a/sound/core/init.c
+++ b/sound/core/init.c
@@ -129,7 +129,7 @@ int snd_device_alloc(struct device **dev_p, struct snd_card *card)
struct device *dev;
*dev_p = NULL;
- dev = kzalloc_obj(*dev, GFP_KERNEL);
+ dev = kzalloc_obj(*dev);
if (!dev)
return -ENOMEM;
device_initialize(dev);
@@ -1060,7 +1060,7 @@ int snd_card_file_add(struct snd_card *card, struct file *file)
{
struct snd_monitor_file *mfile;
- mfile = kmalloc_obj(*mfile, GFP_KERNEL);
+ mfile = kmalloc_obj(*mfile);
if (mfile == NULL)
return -ENOMEM;
mfile->file = file;
diff --git a/sound/core/jack.c b/sound/core/jack.c
index 7160c260d06c..5e8a2f3f4196 100644
--- a/sound/core/jack.c
+++ b/sound/core/jack.c
@@ -440,7 +440,7 @@ static struct snd_jack_kctl * snd_jack_kctl_new(struct snd_card *card, const cha
if (err < 0)
return NULL;
- jack_kctl = kzalloc_obj(*jack_kctl, GFP_KERNEL);
+ jack_kctl = kzalloc_obj(*jack_kctl);
if (!jack_kctl)
goto error;
@@ -516,7 +516,7 @@ int snd_jack_new(struct snd_card *card, const char *id, int type,
return -ENOMEM;
}
- jack = kzalloc_obj(struct snd_jack, GFP_KERNEL);
+ jack = kzalloc_obj(struct snd_jack);
if (jack == NULL)
return -ENOMEM;
diff --git a/sound/core/memalloc.c b/sound/core/memalloc.c
index bb483a2d7ff2..9320671dfcc8 100644
--- a/sound/core/memalloc.c
+++ b/sound/core/memalloc.c
@@ -719,12 +719,12 @@ static void *snd_dma_sg_fallback_alloc(struct snd_dma_buffer *dmab, size_t size)
unsigned int idx, npages;
void *p;
- sgbuf = kzalloc_obj(*sgbuf, GFP_KERNEL);
+ sgbuf = kzalloc_obj(*sgbuf);
if (!sgbuf)
return NULL;
size = PAGE_ALIGN(size);
sgbuf->count = size >> PAGE_SHIFT;
- sgbuf->pages = kvzalloc_objs(*sgbuf->pages, sgbuf->count, GFP_KERNEL);
+ sgbuf->pages = kvzalloc_objs(*sgbuf->pages, sgbuf->count);
sgbuf->npages = kvcalloc(sgbuf->count, sizeof(*sgbuf->npages), GFP_KERNEL);
if (!sgbuf->pages || !sgbuf->npages)
goto error;
diff --git a/sound/core/oss/mixer_oss.c b/sound/core/oss/mixer_oss.c
index 05c8e44cd428..591cff800329 100644
--- a/sound/core/oss/mixer_oss.c
+++ b/sound/core/oss/mixer_oss.c
@@ -47,7 +47,7 @@ static int snd_mixer_oss_open(struct inode *inode, struct file *file)
snd_card_unref(card);
return err;
}
- fmixer = kzalloc_obj(*fmixer, GFP_KERNEL);
+ fmixer = kzalloc_obj(*fmixer);
if (fmixer == NULL) {
snd_card_file_remove(card, file);
snd_card_unref(card);
@@ -530,9 +530,9 @@ static void snd_mixer_oss_get_volume1_vol(struct snd_mixer_oss_file *fmixer,
return;
struct snd_ctl_elem_info *uinfo __free(kfree) =
- kzalloc_obj(*uinfo, GFP_KERNEL);
+ kzalloc_obj(*uinfo);
struct snd_ctl_elem_value *uctl __free(kfree) =
- kzalloc_obj(*uctl, GFP_KERNEL);
+ kzalloc_obj(*uctl);
if (uinfo == NULL || uctl == NULL)
return;
if (kctl->info(kctl, uinfo))
@@ -566,9 +566,9 @@ static void snd_mixer_oss_get_volume1_sw(struct snd_mixer_oss_file *fmixer,
return;
struct snd_ctl_elem_info *uinfo __free(kfree) =
- kzalloc_obj(*uinfo, GFP_KERNEL);
+ kzalloc_obj(*uinfo);
struct snd_ctl_elem_value *uctl __free(kfree) =
- kzalloc_obj(*uctl, GFP_KERNEL);
+ kzalloc_obj(*uctl);
if (uinfo == NULL || uctl == NULL)
return;
if (kctl->info(kctl, uinfo))
@@ -629,9 +629,9 @@ static void snd_mixer_oss_put_volume1_vol(struct snd_mixer_oss_file *fmixer,
return;
struct snd_ctl_elem_info *uinfo __free(kfree) =
- kzalloc_obj(*uinfo, GFP_KERNEL);
+ kzalloc_obj(*uinfo);
struct snd_ctl_elem_value *uctl __free(kfree) =
- kzalloc_obj(*uctl, GFP_KERNEL);
+ kzalloc_obj(*uctl);
if (uinfo == NULL || uctl == NULL)
return;
if (kctl->info(kctl, uinfo))
@@ -669,9 +669,9 @@ static void snd_mixer_oss_put_volume1_sw(struct snd_mixer_oss_file *fmixer,
return;
struct snd_ctl_elem_info *uinfo __free(kfree) =
- kzalloc_obj(*uinfo, GFP_KERNEL);
+ kzalloc_obj(*uinfo);
struct snd_ctl_elem_value *uctl __free(kfree) =
- kzalloc_obj(*uctl, GFP_KERNEL);
+ kzalloc_obj(*uctl);
if (uinfo == NULL || uctl == NULL)
return;
if (kctl->info(kctl, uinfo))
@@ -798,9 +798,9 @@ static int snd_mixer_oss_get_recsrc2(struct snd_mixer_oss_file *fmixer, unsigned
int err, idx;
struct snd_ctl_elem_info *uinfo __free(kfree) =
- kzalloc_obj(*uinfo, GFP_KERNEL);
+ kzalloc_obj(*uinfo);
struct snd_ctl_elem_value *uctl __free(kfree) =
- kzalloc_obj(*uctl, GFP_KERNEL);
+ kzalloc_obj(*uctl);
if (uinfo == NULL || uctl == NULL)
return -ENOMEM;
guard(rwsem_read)(&card->controls_rwsem);
@@ -843,9 +843,9 @@ static int snd_mixer_oss_put_recsrc2(struct snd_mixer_oss_file *fmixer, unsigned
unsigned int idx;
struct snd_ctl_elem_info *uinfo __free(kfree) =
- kzalloc_obj(*uinfo, GFP_KERNEL);
+ kzalloc_obj(*uinfo);
struct snd_ctl_elem_value *uctl __free(kfree) =
- kzalloc_obj(*uctl, GFP_KERNEL);
+ kzalloc_obj(*uctl);
if (uinfo == NULL || uctl == NULL)
return -ENOMEM;
guard(rwsem_read)(&card->controls_rwsem);
@@ -1027,7 +1027,7 @@ static int snd_mixer_oss_build_input(struct snd_mixer_oss *mixer,
kctl = snd_mixer_oss_test_id(mixer, "Capture Source", 0);
if (kctl) {
struct snd_ctl_elem_info *uinfo __free(kfree) =
- kzalloc_obj(*uinfo, GFP_KERNEL);
+ kzalloc_obj(*uinfo);
if (!uinfo)
return -ENOMEM;
@@ -1055,7 +1055,7 @@ static int snd_mixer_oss_build_input(struct snd_mixer_oss *mixer,
}
}
if (slot.present != 0) {
- pslot = kmalloc_obj(slot, GFP_KERNEL);
+ pslot = kmalloc_obj(slot);
if (! pslot)
return -ENOMEM;
*pslot = slot;
@@ -1315,7 +1315,7 @@ static int snd_mixer_oss_notify_handler(struct snd_card *card, int cmd)
if (cmd == SND_MIXER_OSS_NOTIFY_REGISTER) {
int idx, err;
- mixer = kzalloc_objs(*mixer, 2, GFP_KERNEL);
+ mixer = kzalloc_objs(*mixer, 2);
if (mixer == NULL)
return -ENOMEM;
mutex_init(&mixer->reg_mutex);
diff --git a/sound/core/oss/pcm_oss.c b/sound/core/oss/pcm_oss.c
index cf3509c2be15..d4fd4dfc7fc3 100644
--- a/sound/core/oss/pcm_oss.c
+++ b/sound/core/oss/pcm_oss.c
@@ -398,7 +398,7 @@ static int snd_pcm_hw_param_near(struct snd_pcm_substream *pcm,
}
struct snd_pcm_hw_params *save __free(kfree) =
- kmalloc_obj(*save, GFP_KERNEL);
+ kmalloc_obj(*save);
if (save == NULL)
return -ENOMEM;
*save = *params;
@@ -411,7 +411,7 @@ static int snd_pcm_hw_param_near(struct snd_pcm_substream *pcm,
goto _end;
struct snd_pcm_hw_params *params1 __free(kfree) =
- kmalloc_obj(*params1, GFP_KERNEL);
+ kmalloc_obj(*params1);
if (params1 == NULL)
return -ENOMEM;
*params1 = *save;
@@ -786,7 +786,7 @@ static int choose_rate(struct snd_pcm_substream *substream,
unsigned int rate, prev;
struct snd_pcm_hw_params *save __free(kfree) =
- kmalloc_obj(*save, GFP_KERNEL);
+ kmalloc_obj(*save);
if (save == NULL)
return -ENOMEM;
*save = *params;
@@ -861,9 +861,9 @@ static int snd_pcm_oss_change_params_locked(struct snd_pcm_substream *substream)
if (!runtime->oss.params)
return 0;
- sw_params = kzalloc_obj(*sw_params, GFP_KERNEL);
- params = kmalloc_obj(*params, GFP_KERNEL);
- sparams = kmalloc_obj(*sparams, GFP_KERNEL);
+ sw_params = kzalloc_obj(*sw_params);
+ params = kmalloc_obj(*params);
+ sparams = kmalloc_obj(*sparams);
if (!sw_params || !params || !sparams) {
err = -ENOMEM;
goto failure;
@@ -1859,7 +1859,7 @@ static int snd_pcm_oss_get_formats(struct snd_pcm_oss_file *pcm_oss_file)
AFMT_S24_PACKED;
struct snd_pcm_hw_params *params __free(kfree) =
- kmalloc_obj(*params, GFP_KERNEL);
+ kmalloc_obj(*params);
if (!params)
return -ENOMEM;
_snd_pcm_hw_params_any(params);
@@ -2418,7 +2418,7 @@ static int snd_pcm_oss_open_file(struct file *file,
if (rpcm_oss_file)
*rpcm_oss_file = NULL;
- pcm_oss_file = kzalloc_obj(*pcm_oss_file, GFP_KERNEL);
+ pcm_oss_file = kzalloc_obj(*pcm_oss_file);
if (pcm_oss_file == NULL)
return -ENOMEM;
@@ -3032,7 +3032,7 @@ static void snd_pcm_oss_proc_write(struct snd_info_entry *entry,
}
} while (*str);
if (setup == NULL) {
- setup = kmalloc_obj(*setup, GFP_KERNEL);
+ setup = kmalloc_obj(*setup);
if (! setup) {
buffer->error = -ENOMEM;
return;
diff --git a/sound/core/pcm.c b/sound/core/pcm.c
index e3c43b365207..bfedf571e021 100644
--- a/sound/core/pcm.c
+++ b/sound/core/pcm.c
@@ -334,7 +334,7 @@ static void snd_pcm_proc_info_read(struct snd_pcm_substream *substream,
return;
struct snd_pcm_info *info __free(kfree) =
- kmalloc_obj(*info, GFP_KERNEL);
+ kmalloc_obj(*info);
if (!info)
return;
@@ -657,7 +657,7 @@ int snd_pcm_new_stream(struct snd_pcm *pcm, int stream, int substream_count)
}
prev = NULL;
for (idx = 0, prev = NULL; idx < substream_count; idx++) {
- substream = kzalloc_obj(*substream, GFP_KERNEL);
+ substream = kzalloc_obj(*substream);
if (!substream)
return -ENOMEM;
substream->pcm = pcm;
@@ -713,7 +713,7 @@ static int _snd_pcm_new(struct snd_card *card, const char *id, int device,
return -ENXIO;
if (rpcm)
*rpcm = NULL;
- pcm = kzalloc_obj(*pcm, GFP_KERNEL);
+ pcm = kzalloc_obj(*pcm);
if (!pcm)
return -ENOMEM;
pcm->card = card;
@@ -935,7 +935,7 @@ int snd_pcm_attach_substream(struct snd_pcm *pcm, int stream,
if (substream == NULL)
return -EAGAIN;
- runtime = kzalloc_obj(*runtime, GFP_KERNEL);
+ runtime = kzalloc_obj(*runtime);
if (runtime == NULL)
return -ENOMEM;
diff --git a/sound/core/pcm_compat.c b/sound/core/pcm_compat.c
index 71c74830083e..e71f393d3b01 100644
--- a/sound/core/pcm_compat.c
+++ b/sound/core/pcm_compat.c
@@ -243,7 +243,7 @@ static int snd_pcm_ioctl_hw_params_compat(struct snd_pcm_substream *substream,
return -ENOTTY;
struct snd_pcm_hw_params *data __free(kfree) =
- kmalloc_obj(*data, GFP_KERNEL);
+ kmalloc_obj(*data);
if (!data)
return -ENOMEM;
diff --git a/sound/core/pcm_dmaengine.c b/sound/core/pcm_dmaengine.c
index cc6ce33f4ff7..1306b04be171 100644
--- a/sound/core/pcm_dmaengine.c
+++ b/sound/core/pcm_dmaengine.c
@@ -318,7 +318,7 @@ int snd_dmaengine_pcm_open(struct snd_pcm_substream *substream,
if (ret < 0)
return ret;
- prtd = kzalloc_obj(*prtd, GFP_KERNEL);
+ prtd = kzalloc_obj(*prtd);
if (!prtd)
return -ENOMEM;
diff --git a/sound/core/pcm_lib.c b/sound/core/pcm_lib.c
index 70f279865adc..09c421cd9319 100644
--- a/sound/core/pcm_lib.c
+++ b/sound/core/pcm_lib.c
@@ -2601,7 +2601,7 @@ int snd_pcm_add_chmap_ctls(struct snd_pcm *pcm, int stream,
if (WARN_ON(pcm->streams[stream].chmap_kctl))
return -EBUSY;
- info = kzalloc_obj(*info, GFP_KERNEL);
+ info = kzalloc_obj(*info);
if (!info)
return -ENOMEM;
info->pcm = pcm;
diff --git a/sound/core/pcm_memory.c b/sound/core/pcm_memory.c
index 2ef02871f84f..cfe9f10e7359 100644
--- a/sound/core/pcm_memory.c
+++ b/sound/core/pcm_memory.c
@@ -448,7 +448,7 @@ int snd_pcm_lib_malloc_pages(struct snd_pcm_substream *substream, size_t size)
/* dma_max=0 means the fixed size preallocation */
if (substream->dma_buffer.area && !substream->dma_max)
return -ENOMEM;
- dmab = kzalloc_obj(*dmab, GFP_KERNEL);
+ dmab = kzalloc_obj(*dmab);
if (! dmab)
return -ENOMEM;
dmab->dev = substream->dma_buffer.dev;
diff --git a/sound/core/pcm_native.c b/sound/core/pcm_native.c
index a7e24be8c7db..67cf6a0e17ba 100644
--- a/sound/core/pcm_native.c
+++ b/sound/core/pcm_native.c
@@ -244,7 +244,7 @@ int snd_pcm_info_user(struct snd_pcm_substream *substream,
{
int err;
struct snd_pcm_info *info __free(kfree) =
- kmalloc_obj(*info, GFP_KERNEL);
+ kmalloc_obj(*info);
if (! info)
return -ENOMEM;
@@ -2812,7 +2812,7 @@ static int snd_pcm_open_file(struct file *file,
if (err < 0)
return err;
- pcm_file = kzalloc_obj(*pcm_file, GFP_KERNEL);
+ pcm_file = kzalloc_obj(*pcm_file);
if (pcm_file == NULL) {
snd_pcm_release_substream(substream);
return -ENOMEM;
@@ -4111,7 +4111,7 @@ static int snd_pcm_hw_refine_old_user(struct snd_pcm_substream *substream,
int err;
struct snd_pcm_hw_params *params __free(kfree) =
- kmalloc_obj(*params, GFP_KERNEL);
+ kmalloc_obj(*params);
if (!params)
return -ENOMEM;
@@ -4140,7 +4140,7 @@ static int snd_pcm_hw_params_old_user(struct snd_pcm_substream *substream,
int err;
struct snd_pcm_hw_params *params __free(kfree) =
- kmalloc_obj(*params, GFP_KERNEL);
+ kmalloc_obj(*params);
if (!params)
return -ENOMEM;
diff --git a/sound/core/rawmidi.c b/sound/core/rawmidi.c
index ae93d968e083..3b1034a44938 100644
--- a/sound/core/rawmidi.c
+++ b/sound/core/rawmidi.c
@@ -159,7 +159,7 @@ static int snd_rawmidi_runtime_create(struct snd_rawmidi_substream *substream)
{
struct snd_rawmidi_runtime *runtime;
- runtime = kzalloc_obj(*runtime, GFP_KERNEL);
+ runtime = kzalloc_obj(*runtime);
if (!runtime)
return -ENOMEM;
runtime->substream = substream;
@@ -472,7 +472,7 @@ static int snd_rawmidi_open(struct inode *inode, struct file *file)
fflags = snd_rawmidi_file_flags(file);
if ((file->f_flags & O_APPEND) || maj == SOUND_MAJOR) /* OSS emul? */
fflags |= SNDRV_RAWMIDI_LFLG_APPEND;
- rawmidi_file = kmalloc_obj(*rawmidi_file, GFP_KERNEL);
+ rawmidi_file = kmalloc_obj(*rawmidi_file);
if (rawmidi_file == NULL) {
err = -ENOMEM;
goto __error;
@@ -1803,7 +1803,7 @@ static int snd_rawmidi_alloc_substreams(struct snd_rawmidi *rmidi,
int idx;
for (idx = 0; idx < count; idx++) {
- substream = kzalloc_obj(*substream, GFP_KERNEL);
+ substream = kzalloc_obj(*substream);
if (!substream)
return -ENOMEM;
substream->stream = direction;
@@ -1891,7 +1891,7 @@ int snd_rawmidi_new(struct snd_card *card, char *id, int device,
if (rrawmidi)
*rrawmidi = NULL;
- rmidi = kzalloc_obj(*rmidi, GFP_KERNEL);
+ rmidi = kzalloc_obj(*rmidi);
if (!rmidi)
return -ENOMEM;
err = snd_rawmidi_init(rmidi, card, id, device,
diff --git a/sound/core/seq/oss/seq_oss_init.c b/sound/core/seq/oss/seq_oss_init.c
index af8e14325239..d3e6a8a8d823 100644
--- a/sound/core/seq/oss/seq_oss_init.c
+++ b/sound/core/seq/oss/seq_oss_init.c
@@ -65,7 +65,7 @@ snd_seq_oss_create_client(void)
int rc;
struct snd_seq_port_callback port_callback;
struct snd_seq_port_info *port __free(kfree) =
- kzalloc_obj(*port, GFP_KERNEL);
+ kzalloc_obj(*port);
if (!port)
return -ENOMEM;
@@ -168,7 +168,7 @@ snd_seq_oss_open(struct file *file, int level)
int i, rc;
struct seq_oss_devinfo *dp;
- dp = kzalloc_obj(*dp, GFP_KERNEL);
+ dp = kzalloc_obj(*dp);
if (!dp)
return -ENOMEM;
diff --git a/sound/core/seq/oss/seq_oss_midi.c b/sound/core/seq/oss/seq_oss_midi.c
index 989e9a7069e3..b50a49ca42ff 100644
--- a/sound/core/seq/oss/seq_oss_midi.c
+++ b/sound/core/seq/oss/seq_oss_midi.c
@@ -66,9 +66,9 @@ int
snd_seq_oss_midi_lookup_ports(int client)
{
struct snd_seq_client_info *clinfo __free(kfree) =
- kzalloc_obj(*clinfo, GFP_KERNEL);
+ kzalloc_obj(*clinfo);
struct snd_seq_port_info *pinfo __free(kfree) =
- kzalloc_obj(*pinfo, GFP_KERNEL);
+ kzalloc_obj(*pinfo);
if (!clinfo || !pinfo)
return -ENOMEM;
@@ -153,7 +153,7 @@ snd_seq_oss_midi_check_new_port(struct snd_seq_port_info *pinfo)
/*
* allocate midi info record
*/
- mdev = kzalloc_obj(*mdev, GFP_KERNEL);
+ mdev = kzalloc_obj(*mdev);
if (!mdev)
return -ENOMEM;
diff --git a/sound/core/seq/oss/seq_oss_readq.c b/sound/core/seq/oss/seq_oss_readq.c
index 014efc191c71..c880d4771169 100644
--- a/sound/core/seq/oss/seq_oss_readq.c
+++ b/sound/core/seq/oss/seq_oss_readq.c
@@ -34,11 +34,11 @@ snd_seq_oss_readq_new(struct seq_oss_devinfo *dp, int maxlen)
{
struct seq_oss_readq *q;
- q = kzalloc_obj(*q, GFP_KERNEL);
+ q = kzalloc_obj(*q);
if (!q)
return NULL;
- q->q = kzalloc_objs(union evrec, maxlen, GFP_KERNEL);
+ q->q = kzalloc_objs(union evrec, maxlen);
if (!q->q) {
kfree(q);
return NULL;
diff --git a/sound/core/seq/oss/seq_oss_timer.c b/sound/core/seq/oss/seq_oss_timer.c
index 32f1ff225cf5..44c04795204e 100644
--- a/sound/core/seq/oss/seq_oss_timer.c
+++ b/sound/core/seq/oss/seq_oss_timer.c
@@ -34,7 +34,7 @@ snd_seq_oss_timer_new(struct seq_oss_devinfo *dp)
{
struct seq_oss_timer *rec;
- rec = kzalloc_obj(*rec, GFP_KERNEL);
+ rec = kzalloc_obj(*rec);
if (rec == NULL)
return NULL;
diff --git a/sound/core/seq/oss/seq_oss_writeq.c b/sound/core/seq/oss/seq_oss_writeq.c
index dfc20d9bcc30..09239ea4b5ea 100644
--- a/sound/core/seq/oss/seq_oss_writeq.c
+++ b/sound/core/seq/oss/seq_oss_writeq.c
@@ -27,7 +27,7 @@ snd_seq_oss_writeq_new(struct seq_oss_devinfo *dp, int maxlen)
struct seq_oss_writeq *q;
struct snd_seq_client_pool pool;
- q = kzalloc_obj(*q, GFP_KERNEL);
+ q = kzalloc_obj(*q);
if (!q)
return NULL;
q->dp = dp;
diff --git a/sound/core/seq/seq_compat.c b/sound/core/seq/seq_compat.c
index a771684eac34..22679dca9aae 100644
--- a/sound/core/seq/seq_compat.c
+++ b/sound/core/seq/seq_compat.c
@@ -33,7 +33,7 @@ static int snd_seq_call_port_info_ioctl(struct snd_seq_client *client, unsigned
{
int err;
struct snd_seq_port_info *data __free(kfree) =
- kmalloc_obj(*data, GFP_KERNEL);
+ kmalloc_obj(*data);
if (!data)
return -ENOMEM;
diff --git a/sound/core/seq/seq_dummy.c b/sound/core/seq/seq_dummy.c
index d8b77385aa3f..af45f328ae99 100644
--- a/sound/core/seq/seq_dummy.c
+++ b/sound/core/seq/seq_dummy.c
@@ -115,7 +115,7 @@ create_port(int idx, int type)
struct snd_seq_port_callback pcb;
struct snd_seq_dummy_port *rec;
- rec = kzalloc_obj(*rec, GFP_KERNEL);
+ rec = kzalloc_obj(*rec);
if (!rec)
return NULL;
diff --git a/sound/core/seq/seq_fifo.c b/sound/core/seq/seq_fifo.c
index ad15d001cef7..ebe1394c18a9 100644
--- a/sound/core/seq/seq_fifo.c
+++ b/sound/core/seq/seq_fifo.c
@@ -19,7 +19,7 @@ struct snd_seq_fifo *snd_seq_fifo_new(int poolsize)
{
struct snd_seq_fifo *f;
- f = kzalloc_obj(*f, GFP_KERNEL);
+ f = kzalloc_obj(*f);
if (!f)
return NULL;
diff --git a/sound/core/seq/seq_memory.c b/sound/core/seq/seq_memory.c
index 8a14d6e59c82..48b0aa0c3395 100644
--- a/sound/core/seq/seq_memory.c
+++ b/sound/core/seq/seq_memory.c
@@ -517,7 +517,7 @@ struct snd_seq_pool *snd_seq_pool_new(int poolsize)
struct snd_seq_pool *pool;
/* create pool block */
- pool = kzalloc_obj(*pool, GFP_KERNEL);
+ pool = kzalloc_obj(*pool);
if (!pool)
return NULL;
spin_lock_init(&pool->lock);
diff --git a/sound/core/seq/seq_midi.c b/sound/core/seq/seq_midi.c
index 72e798ddbe4e..ca3f5fc30992 100644
--- a/sound/core/seq/seq_midi.c
+++ b/sound/core/seq/seq_midi.c
@@ -281,7 +281,7 @@ snd_seq_midisynth_probe(struct snd_seq_device *dev)
return -EINVAL;
struct snd_rawmidi_info *info __free(kfree) =
- kmalloc_obj(*info, GFP_KERNEL);
+ kmalloc_obj(*info);
if (! info)
return -ENOMEM;
info->device = device;
@@ -305,7 +305,7 @@ snd_seq_midisynth_probe(struct snd_seq_device *dev)
client = synths[card->number];
if (client == NULL) {
newclient = 1;
- client = kzalloc_obj(*client, GFP_KERNEL);
+ client = kzalloc_obj(*client);
if (client == NULL)
return -ENOMEM;
client->seq_client =
@@ -318,10 +318,10 @@ snd_seq_midisynth_probe(struct snd_seq_device *dev)
}
}
- msynth = kzalloc_objs(struct seq_midisynth, ports, GFP_KERNEL);
+ msynth = kzalloc_objs(struct seq_midisynth, ports);
struct snd_seq_port_info *port __free(kfree) =
- kmalloc_obj(*port, GFP_KERNEL);
+ kmalloc_obj(*port);
if (msynth == NULL || port == NULL)
goto __nomem;
diff --git a/sound/core/seq/seq_midi_emul.c b/sound/core/seq/seq_midi_emul.c
index 0e9461d0f9f8..fd067c85c524 100644
--- a/sound/core/seq/seq_midi_emul.c
+++ b/sound/core/seq/seq_midi_emul.c
@@ -650,7 +650,7 @@ static struct snd_midi_channel *snd_midi_channel_init_set(int n)
struct snd_midi_channel *chan;
int i;
- chan = kmalloc_objs(struct snd_midi_channel, n, GFP_KERNEL);
+ chan = kmalloc_objs(struct snd_midi_channel, n);
if (chan) {
for (i = 0; i < n; i++)
snd_midi_channel_init(chan+i, i);
@@ -688,7 +688,7 @@ struct snd_midi_channel_set *snd_midi_channel_alloc_set(int n)
{
struct snd_midi_channel_set *chset;
- chset = kmalloc_obj(*chset, GFP_KERNEL);
+ chset = kmalloc_obj(*chset);
if (chset) {
chset->channels = snd_midi_channel_init_set(n);
chset->private_data = NULL;
diff --git a/sound/core/seq/seq_midi_event.c b/sound/core/seq/seq_midi_event.c
index c2a9b0540c09..0d9269b47b59 100644
--- a/sound/core/seq/seq_midi_event.c
+++ b/sound/core/seq/seq_midi_event.c
@@ -104,7 +104,7 @@ int snd_midi_event_new(int bufsize, struct snd_midi_event **rdev)
struct snd_midi_event *dev;
*rdev = NULL;
- dev = kzalloc_obj(*dev, GFP_KERNEL);
+ dev = kzalloc_obj(*dev);
if (dev == NULL)
return -ENOMEM;
if (bufsize > 0) {
diff --git a/sound/core/seq/seq_ports.c b/sound/core/seq/seq_ports.c
index 1b395caaae49..da8d358958f1 100644
--- a/sound/core/seq/seq_ports.c
+++ b/sound/core/seq/seq_ports.c
@@ -129,7 +129,7 @@ int snd_seq_create_port(struct snd_seq_client *client, int port,
}
/* create a new port */
- new_port = kzalloc_obj(*new_port, GFP_KERNEL);
+ new_port = kzalloc_obj(*new_port);
if (!new_port)
return -ENOMEM; /* failure, out of memory */
/* init port data */
@@ -572,7 +572,7 @@ int snd_seq_port_connect(struct snd_seq_client *connector,
bool exclusive;
int err;
- subs = kzalloc_obj(*subs, GFP_KERNEL);
+ subs = kzalloc_obj(*subs);
if (!subs)
return -ENOMEM;
diff --git a/sound/core/seq/seq_prioq.c b/sound/core/seq/seq_prioq.c
index 805c4ebbfdac..25c0ed8f9f0f 100644
--- a/sound/core/seq/seq_prioq.c
+++ b/sound/core/seq/seq_prioq.c
@@ -43,7 +43,7 @@ struct snd_seq_prioq *snd_seq_prioq_new(void)
{
struct snd_seq_prioq *f;
- f = kzalloc_obj(*f, GFP_KERNEL);
+ f = kzalloc_obj(*f);
if (!f)
return NULL;
diff --git a/sound/core/seq/seq_queue.c b/sound/core/seq/seq_queue.c
index 8c7b24a9421a..2c420d249c96 100644
--- a/sound/core/seq/seq_queue.c
+++ b/sound/core/seq/seq_queue.c
@@ -89,7 +89,7 @@ static struct snd_seq_queue *queue_new(int owner, int locked)
{
struct snd_seq_queue *q;
- q = kzalloc_obj(*q, GFP_KERNEL);
+ q = kzalloc_obj(*q);
if (!q)
return NULL;
diff --git a/sound/core/seq/seq_system.c b/sound/core/seq/seq_system.c
index d7d84576c3d6..f6132a120048 100644
--- a/sound/core/seq/seq_system.c
+++ b/sound/core/seq/seq_system.c
@@ -130,7 +130,7 @@ int __init snd_seq_system_client_init(void)
struct snd_seq_port_info *port;
int err;
- port = kzalloc_obj(*port, GFP_KERNEL);
+ port = kzalloc_obj(*port);
if (!port)
return -ENOMEM;
diff --git a/sound/core/seq/seq_timer.c b/sound/core/seq/seq_timer.c
index c5728efa05af..9bef2f792498 100644
--- a/sound/core/seq/seq_timer.c
+++ b/sound/core/seq/seq_timer.c
@@ -43,7 +43,7 @@ struct snd_seq_timer *snd_seq_timer_new(void)
{
struct snd_seq_timer *tmr;
- tmr = kzalloc_obj(*tmr, GFP_KERNEL);
+ tmr = kzalloc_obj(*tmr);
if (!tmr)
return NULL;
spin_lock_init(&tmr->lock);
diff --git a/sound/core/seq/seq_ump_client.c b/sound/core/seq/seq_ump_client.c
index 3ca808c787e2..fdc76f23e03f 100644
--- a/sound/core/seq/seq_ump_client.c
+++ b/sound/core/seq/seq_ump_client.c
@@ -220,7 +220,7 @@ static int seq_ump_group_init(struct seq_ump_client *client, int group_index)
return 0;
struct snd_seq_port_info *port __free(kfree) =
- kzalloc_obj(*port, GFP_KERNEL);
+ kzalloc_obj(*port);
if (!port)
return -ENOMEM;
@@ -246,9 +246,9 @@ static void update_port_infos(struct seq_ump_client *client)
int i, err;
struct snd_seq_port_info *old __free(kfree) =
- kzalloc_obj(*old, GFP_KERNEL);
+ kzalloc_obj(*old);
struct snd_seq_port_info *new __free(kfree) =
- kzalloc_obj(*new, GFP_KERNEL);
+ kzalloc_obj(*new);
if (!old || !new)
return;
@@ -283,7 +283,7 @@ static int create_ump_endpoint_port(struct seq_ump_client *client)
int err;
struct snd_seq_port_info *port __free(kfree) =
- kzalloc_obj(*port, GFP_KERNEL);
+ kzalloc_obj(*port);
if (!port)
return -ENOMEM;
@@ -461,7 +461,7 @@ static int snd_seq_ump_probe(struct snd_seq_device *dev)
struct snd_seq_client *cptr;
int p, err;
- client = kzalloc_obj(*client, GFP_KERNEL);
+ client = kzalloc_obj(*client);
if (!client)
return -ENOMEM;
diff --git a/sound/core/seq/seq_virmidi.c b/sound/core/seq/seq_virmidi.c
index 16d61847c7fe..982828650d41 100644
--- a/sound/core/seq/seq_virmidi.c
+++ b/sound/core/seq/seq_virmidi.c
@@ -216,7 +216,7 @@ static int snd_virmidi_output_open(struct snd_rawmidi_substream *substream)
struct snd_rawmidi_runtime *runtime = substream->runtime;
struct snd_virmidi *vmidi;
- vmidi = kzalloc_obj(*vmidi, GFP_KERNEL);
+ vmidi = kzalloc_obj(*vmidi);
if (vmidi == NULL)
return -ENOMEM;
vmidi->substream = substream;
@@ -367,7 +367,7 @@ static int snd_virmidi_dev_attach_seq(struct snd_virmidi_dev *rdev)
return 0;
struct snd_seq_port_info *pinfo __free(kfree) =
- kzalloc_obj(*pinfo, GFP_KERNEL);
+ kzalloc_obj(*pinfo);
if (!pinfo)
return -ENOMEM;
@@ -498,7 +498,7 @@ int snd_virmidi_new(struct snd_card *card, int device, struct snd_rawmidi **rrmi
if (err < 0)
return err;
strscpy(rmidi->name, rmidi->id);
- rdev = kzalloc_obj(*rdev, GFP_KERNEL);
+ rdev = kzalloc_obj(*rdev);
if (rdev == NULL) {
snd_device_free(card, rmidi);
return -ENOMEM;
diff --git a/sound/core/sound.c b/sound/core/sound.c
index 876fac770749..93436db24710 100644
--- a/sound/core/sound.c
+++ b/sound/core/sound.c
@@ -257,7 +257,7 @@ int snd_register_device(int type, struct snd_card *card, int dev,
if (snd_BUG_ON(!device))
return -EINVAL;
- preg = kmalloc_obj(*preg, GFP_KERNEL);
+ preg = kmalloc_obj(*preg);
if (preg == NULL)
return -ENOMEM;
preg->type = type;
diff --git a/sound/core/sound_oss.c b/sound/core/sound_oss.c
index 6d4e44656e19..7eb49f2cada5 100644
--- a/sound/core/sound_oss.c
+++ b/sound/core/sound_oss.c
@@ -96,7 +96,7 @@ int snd_register_oss_device(int type, struct snd_card *card, int dev,
return 0; /* ignore silently */
if (minor < 0)
return minor;
- preg = kmalloc_obj(struct snd_minor, GFP_KERNEL);
+ preg = kmalloc_obj(struct snd_minor);
if (preg == NULL)
return -ENOMEM;
preg->type = type;
diff --git a/sound/core/timer.c b/sound/core/timer.c
index 7d10f079b5b3..6a70df7ae019 100644
--- a/sound/core/timer.c
+++ b/sound/core/timer.c
@@ -151,7 +151,7 @@ struct snd_timer_instance *snd_timer_instance_new(const char *owner)
{
struct snd_timer_instance *timeri;
- timeri = kzalloc_obj(*timeri, GFP_KERNEL);
+ timeri = kzalloc_obj(*timeri);
if (timeri == NULL)
return NULL;
timeri->owner = kstrdup(owner, GFP_KERNEL);
@@ -930,7 +930,7 @@ int snd_timer_new(struct snd_card *card, char *id, struct snd_timer_id *tid,
}
if (rtimer)
*rtimer = NULL;
- timer = kzalloc_obj(*timer, GFP_KERNEL);
+ timer = kzalloc_obj(*timer);
if (!timer)
return -ENOMEM;
timer->tmr_class = tid->dev_class;
@@ -1197,7 +1197,7 @@ static int snd_timer_register_system(void)
return err;
strscpy(timer->name, "system timer");
timer->hw = snd_timer_system;
- priv = kzalloc_obj(*priv, GFP_KERNEL);
+ priv = kzalloc_obj(*priv);
if (priv == NULL) {
snd_timer_free(timer);
return -ENOMEM;
@@ -1432,11 +1432,11 @@ static int realloc_user_queue(struct snd_timer_user *tu, int size)
struct snd_timer_tread64 *tqueue = NULL;
if (tu->tread) {
- tqueue = kzalloc_objs(*tqueue, size, GFP_KERNEL);
+ tqueue = kzalloc_objs(*tqueue, size);
if (!tqueue)
return -ENOMEM;
} else {
- queue = kzalloc_objs(*queue, size, GFP_KERNEL);
+ queue = kzalloc_objs(*queue, size);
if (!queue)
return -ENOMEM;
}
@@ -1461,7 +1461,7 @@ static int snd_timer_user_open(struct inode *inode, struct file *file)
if (err < 0)
return err;
- tu = kzalloc_obj(*tu, GFP_KERNEL);
+ tu = kzalloc_obj(*tu);
if (tu == NULL)
return -ENOMEM;
spin_lock_init(&tu->qlock);
@@ -2128,7 +2128,7 @@ static int snd_utimer_create(struct snd_timer_uinfo *utimer_info,
if (!utimer_info || utimer_info->resolution == 0)
return -EINVAL;
- utimer = kzalloc_obj(*utimer, GFP_KERNEL);
+ utimer = kzalloc_obj(*utimer);
if (!utimer)
return -ENOMEM;
diff --git a/sound/core/ump.c b/sound/core/ump.c
index 543330c67b69..114ebf8c3a51 100644
--- a/sound/core/ump.c
+++ b/sound/core/ump.c
@@ -166,7 +166,7 @@ int snd_ump_endpoint_new(struct snd_card *card, char *id, int device,
if (input && output)
info_flags |= SNDRV_RAWMIDI_INFO_DUPLEX;
- ump = kzalloc_obj(*ump, GFP_KERNEL);
+ ump = kzalloc_obj(*ump);
if (!ump)
return -ENOMEM;
INIT_LIST_HEAD(&ump->block_list);
@@ -408,7 +408,7 @@ int snd_ump_block_new(struct snd_ump_endpoint *ump, unsigned int blk,
if (snd_ump_get_block(ump, blk))
return -EBUSY;
- fb = kzalloc_obj(*fb, GFP_KERNEL);
+ fb = kzalloc_obj(*fb);
if (!fb)
return -ENOMEM;
diff --git a/sound/core/vmaster.c b/sound/core/vmaster.c
index e4185c3a2629..fe7683c9c31a 100644
--- a/sound/core/vmaster.c
+++ b/sound/core/vmaster.c
@@ -58,7 +58,7 @@ static int follower_update(struct link_follower *follower)
{
int err, ch;
struct snd_ctl_elem_value *uctl __free(kfree) =
- kzalloc_obj(*uctl, GFP_KERNEL);
+ kzalloc_obj(*uctl);
if (!uctl)
return -ENOMEM;
@@ -84,7 +84,7 @@ static int follower_init(struct link_follower *follower)
}
struct snd_ctl_elem_info *uinfo __free(kfree) =
- kmalloc_obj(*uinfo, GFP_KERNEL);
+ kmalloc_obj(*uinfo);
if (!uinfo)
return -ENOMEM;
uinfo->id = follower->follower.id;
@@ -341,7 +341,7 @@ static int sync_followers(struct link_master *master, int old_val, int new_val)
{
struct link_follower *follower;
struct snd_ctl_elem_value *uval __free(kfree) =
- kmalloc_obj(*uval, GFP_KERNEL);
+ kmalloc_obj(*uval);
if (!uval)
return -ENOMEM;
@@ -429,7 +429,7 @@ struct snd_kcontrol *snd_ctl_make_virtual_master(char *name,
knew.name = name;
knew.info = master_info;
- master = kzalloc_obj(*master, GFP_KERNEL);
+ master = kzalloc_obj(*master);
if (!master)
return NULL;
INIT_LIST_HEAD(&master->followers);
diff --git a/sound/drivers/dummy.c b/sound/drivers/dummy.c
index 33323c1f8dfe..7283f0f18813 100644
--- a/sound/drivers/dummy.c
+++ b/sound/drivers/dummy.c
@@ -329,7 +329,7 @@ static int dummy_systimer_create(struct snd_pcm_substream *substream)
{
struct dummy_systimer_pcm *dpcm;
- dpcm = kzalloc_obj(*dpcm, GFP_KERNEL);
+ dpcm = kzalloc_obj(*dpcm);
if (!dpcm)
return -ENOMEM;
substream->runtime->private_data = dpcm;
@@ -450,7 +450,7 @@ static int dummy_hrtimer_create(struct snd_pcm_substream *substream)
{
struct dummy_hrtimer_pcm *dpcm;
- dpcm = kzalloc_obj(*dpcm, GFP_KERNEL);
+ dpcm = kzalloc_obj(*dpcm);
if (!dpcm)
return -ENOMEM;
substream->runtime->private_data = dpcm;
diff --git a/sound/drivers/mpu401/mpu401_uart.c b/sound/drivers/mpu401/mpu401_uart.c
index 1b573969918f..6de03d72a908 100644
--- a/sound/drivers/mpu401/mpu401_uart.c
+++ b/sound/drivers/mpu401/mpu401_uart.c
@@ -518,7 +518,7 @@ int snd_mpu401_uart_new(struct snd_card *card, int device,
out_enable, in_enable, &rmidi);
if (err < 0)
return err;
- mpu = kzalloc_obj(*mpu, GFP_KERNEL);
+ mpu = kzalloc_obj(*mpu);
if (!mpu) {
err = -ENOMEM;
goto free_device;
diff --git a/sound/drivers/mts64.c b/sound/drivers/mts64.c
index eeaa05ad9e5b..36e9eab204ca 100644
--- a/sound/drivers/mts64.c
+++ b/sound/drivers/mts64.c
@@ -75,7 +75,7 @@ static int snd_mts64_create(struct snd_card *card,
*rchip = NULL;
- mts = kzalloc_obj(struct mts64, GFP_KERNEL);
+ mts = kzalloc_obj(struct mts64);
if (mts == NULL)
return -ENOMEM;
diff --git a/sound/drivers/opl3/opl3_lib.c b/sound/drivers/opl3/opl3_lib.c
index ce96b0fd1f43..ea9b258b1e4b 100644
--- a/sound/drivers/opl3/opl3_lib.c
+++ b/sound/drivers/opl3/opl3_lib.c
@@ -324,7 +324,7 @@ int snd_opl3_new(struct snd_card *card,
int err;
*ropl3 = NULL;
- opl3 = kzalloc_obj(*opl3, GFP_KERNEL);
+ opl3 = kzalloc_obj(*opl3);
if (!opl3)
return -ENOMEM;
diff --git a/sound/drivers/opl3/opl3_synth.c b/sound/drivers/opl3/opl3_synth.c
index 7cdd4abb0b7c..47a2486be46d 100644
--- a/sound/drivers/opl3/opl3_synth.c
+++ b/sound/drivers/opl3/opl3_synth.c
@@ -313,7 +313,7 @@ struct fm_patch *snd_opl3_find_patch(struct snd_opl3 *opl3, int prog, int bank,
if (!create_patch)
return NULL;
- patch = kzalloc_obj(*patch, GFP_KERNEL);
+ patch = kzalloc_obj(*patch);
if (!patch)
return NULL;
patch->prog = prog;
diff --git a/sound/drivers/opl4/opl4_lib.c b/sound/drivers/opl4/opl4_lib.c
index d476fb7be15e..6364475a368a 100644
--- a/sound/drivers/opl4/opl4_lib.c
+++ b/sound/drivers/opl4/opl4_lib.c
@@ -187,7 +187,7 @@ int snd_opl4_create(struct snd_card *card,
if (ropl4)
*ropl4 = NULL;
- opl4 = kzalloc_obj(*opl4, GFP_KERNEL);
+ opl4 = kzalloc_obj(*opl4);
if (!opl4)
return -ENOMEM;
diff --git a/sound/drivers/pcmtest.c b/sound/drivers/pcmtest.c
index 8d3a19b628a2..768bb698adfb 100644
--- a/sound/drivers/pcmtest.c
+++ b/sound/drivers/pcmtest.c
@@ -377,7 +377,7 @@ static int snd_pcmtst_pcm_open(struct snd_pcm_substream *substream)
if (inject_open_err)
return -EBUSY;
- v_iter = kzalloc_obj(*v_iter, GFP_KERNEL);
+ v_iter = kzalloc_obj(*v_iter);
if (!v_iter)
return -ENOMEM;
@@ -575,7 +575,7 @@ static int snd_pcmtst_create(struct snd_card *card, struct platform_device *pdev
.dev_free = snd_pcmtst_dev_free,
};
- pcmtst = kzalloc_obj(*pcmtst, GFP_KERNEL);
+ pcmtst = kzalloc_obj(*pcmtst);
if (!pcmtst)
return -ENOMEM;
pcmtst->card = card;
diff --git a/sound/drivers/portman2x4.c b/sound/drivers/portman2x4.c
index 3dac519c4c45..dcc0899cfb99 100644
--- a/sound/drivers/portman2x4.c
+++ b/sound/drivers/portman2x4.c
@@ -88,7 +88,7 @@ static int portman_create(struct snd_card *card,
*rchip = NULL;
- pm = kzalloc_obj(struct portman, GFP_KERNEL);
+ pm = kzalloc_obj(struct portman);
if (pm == NULL)
return -ENOMEM;
diff --git a/sound/drivers/vx/vx_pcm.c b/sound/drivers/vx/vx_pcm.c
index 0e7a4cdc1390..d337f5990e5c 100644
--- a/sound/drivers/vx/vx_pcm.c
+++ b/sound/drivers/vx/vx_pcm.c
@@ -414,7 +414,7 @@ static int vx_alloc_pipe(struct vx_core *chip, int capture,
return err;
/* initialize the pipe record */
- pipe = kzalloc_obj(*pipe, GFP_KERNEL);
+ pipe = kzalloc_obj(*pipe);
if (! pipe) {
/* release the pipe */
vx_init_rmh(&rmh, CMD_FREE_PIPE);
diff --git a/sound/firewire/amdtp-stream.c b/sound/firewire/amdtp-stream.c
index 3f9471694b04..f33c08e7c659 100644
--- a/sound/firewire/amdtp-stream.c
+++ b/sound/firewire/amdtp-stream.c
@@ -1783,7 +1783,7 @@ static int amdtp_stream_start(struct amdtp_stream *s, int channel, int speed,
// for runtime of PCM substream in the interval equivalent to the size of PCM buffer. It
// could take a round over queue of AMDTP packet descriptors and small loss of history. For
// safe, keep more 8 elements for the queue, equivalent to 1 ms.
- descs = kzalloc_objs(*descs, s->queue_size + 8, GFP_KERNEL);
+ descs = kzalloc_objs(*descs, s->queue_size + 8);
if (!descs) {
err = -ENOMEM;
goto err_context;
diff --git a/sound/firewire/bebob/bebob_proc.c b/sound/firewire/bebob/bebob_proc.c
index c5e060728fdc..ad03734afcb1 100644
--- a/sound/firewire/bebob/bebob_proc.c
+++ b/sound/firewire/bebob/bebob_proc.c
@@ -38,7 +38,7 @@ proc_read_hw_info(struct snd_info_entry *entry,
struct snd_bebob *bebob = entry->private_data;
struct hw_info *info;
- info = kzalloc_obj(struct hw_info, GFP_KERNEL);
+ info = kzalloc_obj(struct hw_info);
if (info == NULL)
return;
diff --git a/sound/firewire/fireworks/fireworks.c b/sound/firewire/fireworks/fireworks.c
index 8b6b0e5ba497..d69435722abb 100644
--- a/sound/firewire/fireworks/fireworks.c
+++ b/sound/firewire/fireworks/fireworks.c
@@ -76,7 +76,7 @@ get_hardware_info(struct snd_efw *efw)
char version[12] = {0};
int err;
- hwinfo = kzalloc_obj(struct snd_efw_hwinfo, GFP_KERNEL);
+ hwinfo = kzalloc_obj(struct snd_efw_hwinfo);
if (hwinfo == NULL)
return -ENOMEM;
diff --git a/sound/firewire/fireworks/fireworks_proc.c b/sound/firewire/fireworks/fireworks_proc.c
index 179b7110c8e2..aba544b86b99 100644
--- a/sound/firewire/fireworks/fireworks_proc.c
+++ b/sound/firewire/fireworks/fireworks_proc.c
@@ -31,7 +31,7 @@ proc_read_hwinfo(struct snd_info_entry *entry, struct snd_info_buffer *buffer)
unsigned short i;
struct snd_efw_hwinfo *hwinfo;
- hwinfo = kmalloc_obj(struct snd_efw_hwinfo, GFP_KERNEL);
+ hwinfo = kmalloc_obj(struct snd_efw_hwinfo);
if (hwinfo == NULL)
return;
diff --git a/sound/firewire/motu/motu-hwdep.c b/sound/firewire/motu/motu-hwdep.c
index ea7f5d215060..56a6f3493f6f 100644
--- a/sound/firewire/motu/motu-hwdep.c
+++ b/sound/firewire/motu/motu-hwdep.c
@@ -185,7 +185,7 @@ static int hwdep_ioctl(struct snd_hwdep *hwdep, struct file *file,
if (!(motu->spec->flags & SND_MOTU_SPEC_REGISTER_DSP))
return -ENXIO;
- meter = kzalloc_obj(*meter, GFP_KERNEL);
+ meter = kzalloc_obj(*meter);
if (!meter)
return -ENOMEM;
@@ -207,7 +207,7 @@ static int hwdep_ioctl(struct snd_hwdep *hwdep, struct file *file,
if (!(motu->spec->flags & SND_MOTU_SPEC_COMMAND_DSP))
return -ENXIO;
- meter = kzalloc_obj(*meter, GFP_KERNEL);
+ meter = kzalloc_obj(*meter);
if (!meter)
return -ENOMEM;
@@ -229,7 +229,7 @@ static int hwdep_ioctl(struct snd_hwdep *hwdep, struct file *file,
if (!(motu->spec->flags & SND_MOTU_SPEC_REGISTER_DSP))
return -ENXIO;
- param = kzalloc_obj(*param, GFP_KERNEL);
+ param = kzalloc_obj(*param);
if (!param)
return -ENOMEM;
diff --git a/sound/firewire/packets-buffer.c b/sound/firewire/packets-buffer.c
index 3d5c3baf7e48..2093a5fbd81d 100644
--- a/sound/firewire/packets-buffer.c
+++ b/sound/firewire/packets-buffer.c
@@ -27,7 +27,7 @@ int iso_packets_buffer_init(struct iso_packets_buffer *b, struct fw_unit *unit,
void *p;
int err;
- b->packets = kmalloc_objs(*b->packets, count, GFP_KERNEL);
+ b->packets = kmalloc_objs(*b->packets, count);
if (!b->packets) {
err = -ENOMEM;
goto error;
diff --git a/sound/hda/codecs/analog.c b/sound/hda/codecs/analog.c
index 122d14e57313..11b1d30b23fd 100644
--- a/sound/hda/codecs/analog.c
+++ b/sound/hda/codecs/analog.c
@@ -191,7 +191,7 @@ static int alloc_ad_spec(struct hda_codec *codec)
{
struct ad198x_spec *spec;
- spec = kzalloc_obj(*spec, GFP_KERNEL);
+ spec = kzalloc_obj(*spec);
if (!spec)
return -ENOMEM;
codec->spec = spec;
diff --git a/sound/hda/codecs/ca0110.c b/sound/hda/codecs/ca0110.c
index 8638cef4ef20..d17fc38784e1 100644
--- a/sound/hda/codecs/ca0110.c
+++ b/sound/hda/codecs/ca0110.c
@@ -35,7 +35,7 @@ static int ca0110_probe(struct hda_codec *codec, const struct hda_device_id *id)
struct hda_gen_spec *spec;
int err;
- spec = kzalloc_obj(*spec, GFP_KERNEL);
+ spec = kzalloc_obj(*spec);
if (!spec)
return -ENOMEM;
snd_hda_gen_spec_init(spec);
diff --git a/sound/hda/codecs/ca0132.c b/sound/hda/codecs/ca0132.c
index af9236c56db4..e4f174d0ebb1 100644
--- a/sound/hda/codecs/ca0132.c
+++ b/sound/hda/codecs/ca0132.c
@@ -3392,11 +3392,11 @@ static int dspxfr_image(struct hda_codec *codec,
if (fls_data == NULL)
return -EINVAL;
- dma_engine = kzalloc_obj(*dma_engine, GFP_KERNEL);
+ dma_engine = kzalloc_obj(*dma_engine);
if (!dma_engine)
return -ENOMEM;
- dma_engine->dmab = kzalloc_obj(*dma_engine->dmab, GFP_KERNEL);
+ dma_engine->dmab = kzalloc_obj(*dma_engine->dmab);
if (!dma_engine->dmab) {
kfree(dma_engine);
return -ENOMEM;
@@ -9899,7 +9899,7 @@ static int ca0132_codec_probe(struct hda_codec *codec,
codec_dbg(codec, "%s\n", __func__);
- spec = kzalloc_obj(*spec, GFP_KERNEL);
+ spec = kzalloc_obj(*spec);
if (!spec)
return -ENOMEM;
codec->spec = spec;
diff --git a/sound/hda/codecs/cirrus/cs420x.c b/sound/hda/codecs/cirrus/cs420x.c
index 454b6946b4a3..52eda0a338ea 100644
--- a/sound/hda/codecs/cirrus/cs420x.c
+++ b/sound/hda/codecs/cirrus/cs420x.c
@@ -524,7 +524,7 @@ static struct cs_spec *cs_alloc_spec(struct hda_codec *codec, int vendor_nid)
{
struct cs_spec *spec;
- spec = kzalloc_obj(*spec, GFP_KERNEL);
+ spec = kzalloc_obj(*spec);
if (!spec)
return NULL;
codec->spec = spec;
diff --git a/sound/hda/codecs/cirrus/cs421x.c b/sound/hda/codecs/cirrus/cs421x.c
index 28f3317a9ffd..c8349a2c5a36 100644
--- a/sound/hda/codecs/cirrus/cs421x.c
+++ b/sound/hda/codecs/cirrus/cs421x.c
@@ -162,7 +162,7 @@ static struct cs_spec *cs_alloc_spec(struct hda_codec *codec, int vendor_nid)
{
struct cs_spec *spec;
- spec = kzalloc_obj(*spec, GFP_KERNEL);
+ spec = kzalloc_obj(*spec);
if (!spec)
return NULL;
codec->spec = spec;
diff --git a/sound/hda/codecs/cirrus/cs8409.c b/sound/hda/codecs/cirrus/cs8409.c
index 24b224c70e9f..fad705092777 100644
--- a/sound/hda/codecs/cirrus/cs8409.c
+++ b/sound/hda/codecs/cirrus/cs8409.c
@@ -61,7 +61,7 @@ static struct cs8409_spec *cs8409_alloc_spec(struct hda_codec *codec)
{
struct cs8409_spec *spec;
- spec = kzalloc_obj(*spec, GFP_KERNEL);
+ spec = kzalloc_obj(*spec);
if (!spec)
return NULL;
codec->spec = spec;
diff --git a/sound/hda/codecs/cm9825.c b/sound/hda/codecs/cm9825.c
index a5330cff42ec..eeb9ca38d2d8 100644
--- a/sound/hda/codecs/cm9825.c
+++ b/sound/hda/codecs/cm9825.c
@@ -488,7 +488,7 @@ static int cm9825_probe(struct hda_codec *codec, const struct hda_device_id *id)
struct auto_pin_cfg *cfg;
int err = 0;
- spec = kzalloc_obj(*spec, GFP_KERNEL);
+ spec = kzalloc_obj(*spec);
if (spec == NULL)
return -ENOMEM;
diff --git a/sound/hda/codecs/cmedia.c b/sound/hda/codecs/cmedia.c
index 0494bbe15431..e6e12c01339f 100644
--- a/sound/hda/codecs/cmedia.c
+++ b/sound/hda/codecs/cmedia.c
@@ -24,7 +24,7 @@ static int cmedia_probe(struct hda_codec *codec, const struct hda_device_id *id)
bool is_cmi8888 = id->vendor_id == 0x13f68888;
int err;
- spec = kzalloc_obj(*spec, GFP_KERNEL);
+ spec = kzalloc_obj(*spec);
if (spec == NULL)
return -ENOMEM;
diff --git a/sound/hda/codecs/conexant.c b/sound/hda/codecs/conexant.c
index 8f032102e558..aa726eb323eb 100644
--- a/sound/hda/codecs/conexant.c
+++ b/sound/hda/codecs/conexant.c
@@ -1187,7 +1187,7 @@ static int cx_probe(struct hda_codec *codec, const struct hda_device_id *id)
codec_info(codec, "%s: BIOS auto-probing.\n", codec->core.chip_name);
- spec = kzalloc_obj(*spec, GFP_KERNEL);
+ spec = kzalloc_obj(*spec);
if (!spec)
return -ENOMEM;
snd_hda_gen_spec_init(&spec->gen);
diff --git a/sound/hda/codecs/generic.c b/sound/hda/codecs/generic.c
index 147582c5e51f..092428ada29d 100644
--- a/sound/hda/codecs/generic.c
+++ b/sound/hda/codecs/generic.c
@@ -1991,7 +1991,7 @@ static int parse_output_paths(struct hda_codec *codec)
bool best_wired = true, best_mio = true;
bool hp_spk_swapped = false;
struct auto_pin_cfg *best_cfg __free(kfree) =
- kmalloc_obj(*best_cfg, GFP_KERNEL);
+ kmalloc_obj(*best_cfg);
if (!best_cfg)
return -ENOMEM;
@@ -6095,7 +6095,7 @@ static int snd_hda_gen_probe(struct hda_codec *codec,
struct hda_gen_spec *spec;
int err;
- spec = kzalloc_obj(*spec, GFP_KERNEL);
+ spec = kzalloc_obj(*spec);
if (!spec)
return -ENOMEM;
snd_hda_gen_spec_init(spec);
diff --git a/sound/hda/codecs/hdmi/hdmi.c b/sound/hda/codecs/hdmi/hdmi.c
index bcc81018fff3..f20d1715da62 100644
--- a/sound/hda/codecs/hdmi/hdmi.c
+++ b/sound/hda/codecs/hdmi/hdmi.c
@@ -2105,7 +2105,7 @@ int snd_hda_hdmi_generic_alloc(struct hda_codec *codec)
{
struct hdmi_spec *spec;
- spec = kzalloc_obj(*spec, GFP_KERNEL);
+ spec = kzalloc_obj(*spec);
if (!spec)
return -ENOMEM;
diff --git a/sound/hda/codecs/hdmi/simplehdmi.c b/sound/hda/codecs/hdmi/simplehdmi.c
index fe4e73c3d6e6..7bb002113898 100644
--- a/sound/hda/codecs/hdmi/simplehdmi.c
+++ b/sound/hda/codecs/hdmi/simplehdmi.c
@@ -175,7 +175,7 @@ int snd_hda_hdmi_simple_probe(struct hda_codec *codec,
struct hdmi_spec_per_cvt *per_cvt;
struct hdmi_spec_per_pin *per_pin;
- spec = kzalloc_obj(*spec, GFP_KERNEL);
+ spec = kzalloc_obj(*spec);
if (!spec)
return -ENOMEM;
diff --git a/sound/hda/codecs/realtek/realtek.c b/sound/hda/codecs/realtek/realtek.c
index 3356fd95fb7f..aad265c0a5b6 100644
--- a/sound/hda/codecs/realtek/realtek.c
+++ b/sound/hda/codecs/realtek/realtek.c
@@ -221,7 +221,7 @@ void alc_update_knob_master(struct hda_codec *codec,
return;
struct snd_ctl_elem_value *uctl __free(kfree) =
- kzalloc_obj(*uctl, GFP_KERNEL);
+ kzalloc_obj(*uctl);
if (!uctl)
return;
val = snd_hda_codec_read(codec, jack->nid, 0,
@@ -1028,7 +1028,7 @@ EXPORT_SYMBOL_NS_GPL(alc_parse_auto_config, "SND_HDA_CODEC_REALTEK");
/* common preparation job for alc_spec */
int alc_alloc_spec(struct hda_codec *codec, hda_nid_t mixer_nid)
{
- struct alc_spec *spec = kzalloc_obj(*spec, GFP_KERNEL);
+ struct alc_spec *spec = kzalloc_obj(*spec);
int err;
if (!spec)
diff --git a/sound/hda/codecs/senarytech.c b/sound/hda/codecs/senarytech.c
index ed3d9cbb3ea6..3a50d4b3a064 100644
--- a/sound/hda/codecs/senarytech.c
+++ b/sound/hda/codecs/senarytech.c
@@ -170,7 +170,7 @@ static int senary_probe(struct hda_codec *codec, const struct hda_device_id *id)
codec_info(codec, "%s: BIOS auto-probing.\n", codec->core.chip_name);
- spec = kzalloc_obj(*spec, GFP_KERNEL);
+ spec = kzalloc_obj(*spec);
if (!spec)
return -ENOMEM;
snd_hda_gen_spec_init(&spec->gen);
diff --git a/sound/hda/codecs/si3054.c b/sound/hda/codecs/si3054.c
index 9074c74a0ed0..471260e8deb1 100644
--- a/sound/hda/codecs/si3054.c
+++ b/sound/hda/codecs/si3054.c
@@ -256,7 +256,7 @@ static void si3054_remove(struct hda_codec *codec)
static int si3054_probe(struct hda_codec *codec, const struct hda_device_id *id)
{
- codec->spec = kzalloc_obj(struct si3054_spec, GFP_KERNEL);
+ codec->spec = kzalloc_obj(struct si3054_spec);
if (!codec->spec)
return -ENOMEM;
return 0;
diff --git a/sound/hda/codecs/sigmatel.c b/sound/hda/codecs/sigmatel.c
index 69d75cc63bd6..acbbc7c3508b 100644
--- a/sound/hda/codecs/sigmatel.c
+++ b/sound/hda/codecs/sigmatel.c
@@ -4456,7 +4456,7 @@ static int alloc_stac_spec(struct hda_codec *codec)
{
struct sigmatel_spec *spec;
- spec = kzalloc_obj(*spec, GFP_KERNEL);
+ spec = kzalloc_obj(*spec);
if (!spec)
return -ENOMEM;
snd_hda_gen_spec_init(&spec->gen);
diff --git a/sound/hda/codecs/via.c b/sound/hda/codecs/via.c
index 42cce9f51931..807312cffd35 100644
--- a/sound/hda/codecs/via.c
+++ b/sound/hda/codecs/via.c
@@ -102,7 +102,7 @@ static struct via_spec *via_new_spec(struct hda_codec *codec)
{
struct via_spec *spec;
- spec = kzalloc_obj(*spec, GFP_KERNEL);
+ spec = kzalloc_obj(*spec);
if (spec == NULL)
return NULL;
diff --git a/sound/hda/common/beep.c b/sound/hda/common/beep.c
index 006eef5ceea8..4cb21ec9035c 100644
--- a/sound/hda/common/beep.c
+++ b/sound/hda/common/beep.c
@@ -220,7 +220,7 @@ int snd_hda_attach_beep_device(struct hda_codec *codec, int nid)
return 0; /* disabled by module option */
}
- beep = kzalloc_obj(*beep, GFP_KERNEL);
+ beep = kzalloc_obj(*beep);
if (beep == NULL)
return -ENOMEM;
snprintf(beep->phys, sizeof(beep->phys),
diff --git a/sound/hda/common/codec.c b/sound/hda/common/codec.c
index 6c787b603179..feebe56cba67 100644
--- a/sound/hda/common/codec.c
+++ b/sound/hda/common/codec.c
@@ -147,7 +147,7 @@ static int read_and_add_raw_conns(struct hda_codec *codec, hda_nid_t nid)
len = snd_hda_get_raw_connections(codec, nid, list, ARRAY_SIZE(list));
if (len == -ENOSPC) {
len = snd_hda_get_num_raw_conns(codec, nid);
- result = kmalloc_objs(hda_nid_t, len, GFP_KERNEL);
+ result = kmalloc_objs(hda_nid_t, len);
if (!result)
return -ENOMEM;
len = snd_hda_get_raw_connections(codec, nid, result, len);
@@ -703,7 +703,7 @@ struct hda_pcm *snd_hda_codec_pcm_new(struct hda_codec *codec,
struct hda_pcm *pcm;
va_list args;
- pcm = kzalloc_obj(*pcm, GFP_KERNEL);
+ pcm = kzalloc_obj(*pcm);
if (!pcm)
return NULL;
@@ -895,7 +895,7 @@ snd_hda_codec_device_init(struct hda_bus *bus, unsigned int codec_addr,
if (snd_BUG_ON(codec_addr > HDA_MAX_CODEC_ADDRESS))
return ERR_PTR(-EINVAL);
- codec = kzalloc_obj(*codec, GFP_KERNEL);
+ codec = kzalloc_obj(*codec);
if (!codec)
return ERR_PTR(-ENOMEM);
@@ -1855,7 +1855,7 @@ static int check_follower_present(struct hda_codec *codec,
static int put_kctl_with_value(struct snd_kcontrol *kctl, int val)
{
struct snd_ctl_elem_value *ucontrol __free(kfree) =
- kzalloc_obj(*ucontrol, GFP_KERNEL);
+ kzalloc_obj(*ucontrol);
if (!ucontrol)
return -ENOMEM;
diff --git a/sound/hda/common/controller.c b/sound/hda/common/controller.c
index cf8502834484..5934e5cdfdfd 100644
--- a/sound/hda/common/controller.c
+++ b/sound/hda/common/controller.c
@@ -715,7 +715,7 @@ int snd_hda_attach_pcm_stream(struct hda_bus *_bus, struct hda_codec *codec,
if (err < 0)
return err;
strscpy(pcm->name, cpcm->name, sizeof(pcm->name));
- apcm = kzalloc_obj(*apcm, GFP_KERNEL);
+ apcm = kzalloc_obj(*apcm);
if (apcm == NULL) {
snd_device_free(chip->card, pcm);
return -ENOMEM;
@@ -1283,7 +1283,7 @@ int azx_init_streams(struct azx *chip)
* and initialize
*/
for (i = 0; i < chip->num_streams; i++) {
- struct azx_dev *azx_dev = kzalloc_obj(*azx_dev, GFP_KERNEL);
+ struct azx_dev *azx_dev = kzalloc_obj(*azx_dev);
int dir, tag;
if (!azx_dev)
diff --git a/sound/hda/common/jack.c b/sound/hda/common/jack.c
index 87120868d123..98ba1c4d5ba4 100644
--- a/sound/hda/common/jack.c
+++ b/sound/hda/common/jack.c
@@ -329,7 +329,7 @@ snd_hda_jack_detect_enable_callback_mst(struct hda_codec *codec, hda_nid_t nid,
callback = find_callback_from_list(jack, func);
if (func && !callback) {
- callback = kzalloc_obj(*callback, GFP_KERNEL);
+ callback = kzalloc_obj(*callback);
if (!callback)
return ERR_PTR(-ENOMEM);
callback->func = func;
diff --git a/sound/hda/common/proc.c b/sound/hda/common/proc.c
index 98cad7ea8cf1..ce76b8190b9f 100644
--- a/sound/hda/common/proc.c
+++ b/sound/hda/common/proc.c
@@ -689,7 +689,7 @@ static void print_dpmst_connections(struct snd_info_buffer *buffer, struct hda_c
if (conn_len <= 0)
return;
- conn = kmalloc_objs(hda_nid_t, conn_len, GFP_KERNEL);
+ conn = kmalloc_objs(hda_nid_t, conn_len);
if (!conn)
return;
diff --git a/sound/hda/core/ext/controller.c b/sound/hda/core/ext/controller.c
index 0c12ff36d992..b1f1eff1d181 100644
--- a/sound/hda/core/ext/controller.c
+++ b/sound/hda/core/ext/controller.c
@@ -89,7 +89,7 @@ int snd_hdac_ext_bus_get_ml_capabilities(struct hdac_bus *bus)
dev_dbg(bus->dev, "In %s Link count: %d\n", __func__, link_count);
for (idx = 0; idx < link_count; idx++) {
- hlink = kzalloc_obj(*hlink, GFP_KERNEL);
+ hlink = kzalloc_obj(*hlink);
if (!hlink)
return -ENOMEM;
hlink->index = idx;
diff --git a/sound/hda/core/sysfs.c b/sound/hda/core/sysfs.c
index 443f00d037a3..09d88f22957a 100644
--- a/sound/hda/core/sysfs.c
+++ b/sound/hda/core/sysfs.c
@@ -339,7 +339,7 @@ static int add_widget_node(struct kobject *parent, hda_nid_t nid,
const struct attribute_group *group,
struct kobject **res)
{
- struct kobject *kobj = kzalloc_obj(*kobj, GFP_KERNEL);
+ struct kobject *kobj = kzalloc_obj(*kobj);
int err;
if (!kobj)
@@ -366,7 +366,7 @@ static int widget_tree_create(struct hdac_device *codec)
int i, err;
hda_nid_t nid;
- tree = codec->widgets = kzalloc_obj(*tree, GFP_KERNEL);
+ tree = codec->widgets = kzalloc_obj(*tree);
if (!tree)
return -ENOMEM;
@@ -436,7 +436,7 @@ int hda_widget_sysfs_reinit(struct hdac_device *codec,
if (!tree)
return -ENOMEM;
- tree->nodes = kzalloc_objs(*tree->nodes, num_nodes + 1, GFP_KERNEL);
+ tree->nodes = kzalloc_objs(*tree->nodes, num_nodes + 1);
if (!tree->nodes) {
kfree(tree);
return -ENOMEM;
diff --git a/sound/i2c/cs8427.c b/sound/i2c/cs8427.c
index a4717449cc2f..1de985ba85d9 100644
--- a/sound/i2c/cs8427.c
+++ b/sound/i2c/cs8427.c
@@ -269,7 +269,7 @@ int snd_cs8427_create(struct snd_i2c_bus *bus,
&device);
if (err < 0)
return err;
- chip = device->private_data = kzalloc_obj(*chip, GFP_KERNEL);
+ chip = device->private_data = kzalloc_obj(*chip);
if (chip == NULL) {
snd_i2c_device_free(device);
return -ENOMEM;
diff --git a/sound/i2c/i2c.c b/sound/i2c/i2c.c
index 8bb49f0d97e6..46b201188c56 100644
--- a/sound/i2c/i2c.c
+++ b/sound/i2c/i2c.c
@@ -72,7 +72,7 @@ int snd_i2c_bus_create(struct snd_card *card, const char *name,
};
*ri2c = NULL;
- bus = kzalloc_obj(*bus, GFP_KERNEL);
+ bus = kzalloc_obj(*bus);
if (bus == NULL)
return -ENOMEM;
mutex_init(&bus->lock_mutex);
@@ -104,7 +104,7 @@ int snd_i2c_device_create(struct snd_i2c_bus *bus, const char *name,
*rdevice = NULL;
if (snd_BUG_ON(!bus))
return -EINVAL;
- device = kzalloc_obj(*device, GFP_KERNEL);
+ device = kzalloc_obj(*device);
if (device == NULL)
return -ENOMEM;
device->addr = addr;
diff --git a/sound/i2c/other/ak4113.c b/sound/i2c/other/ak4113.c
index b1bfc71aab22..6ef5fffda8d7 100644
--- a/sound/i2c/other/ak4113.c
+++ b/sound/i2c/other/ak4113.c
@@ -64,7 +64,7 @@ int snd_ak4113_create(struct snd_card *card, ak4113_read_t *read,
.dev_free = snd_ak4113_dev_free,
};
- chip = kzalloc_obj(*chip, GFP_KERNEL);
+ chip = kzalloc_obj(*chip);
if (chip == NULL)
return -ENOMEM;
spin_lock_init(&chip->lock);
diff --git a/sound/i2c/other/ak4114.c b/sound/i2c/other/ak4114.c
index 6d51e2a8db2b..71efb29b6c7c 100644
--- a/sound/i2c/other/ak4114.c
+++ b/sound/i2c/other/ak4114.c
@@ -64,7 +64,7 @@ int snd_ak4114_create(struct snd_card *card,
.dev_free = snd_ak4114_dev_free,
};
- chip = kzalloc_obj(*chip, GFP_KERNEL);
+ chip = kzalloc_obj(*chip);
if (chip == NULL)
return -ENOMEM;
spin_lock_init(&chip->lock);
diff --git a/sound/i2c/other/ak4117.c b/sound/i2c/other/ak4117.c
index 8f4657aa6525..7ff3730d2a64 100644
--- a/sound/i2c/other/ak4117.c
+++ b/sound/i2c/other/ak4117.c
@@ -57,7 +57,7 @@ int snd_ak4117_create(struct snd_card *card, ak4117_read_t *read, ak4117_write_t
.dev_free = snd_ak4117_dev_free,
};
- chip = kzalloc_obj(*chip, GFP_KERNEL);
+ chip = kzalloc_obj(*chip);
if (chip == NULL)
return -ENOMEM;
spin_lock_init(&chip->lock);
diff --git a/sound/i2c/tea6330t.c b/sound/i2c/tea6330t.c
index b63dfc50c1c2..e8c50a036bea 100644
--- a/sound/i2c/tea6330t.c
+++ b/sound/i2c/tea6330t.c
@@ -285,7 +285,7 @@ int snd_tea6330t_update_mixer(struct snd_card *card,
u8 default_treble, default_bass;
unsigned char bytes[7];
- tea = kzalloc_obj(*tea, GFP_KERNEL);
+ tea = kzalloc_obj(*tea);
if (tea == NULL)
return -ENOMEM;
err = snd_i2c_device_create(bus, "TEA6330T", TEA6330T_ADDR, &device);
diff --git a/sound/isa/gus/gus_main.c b/sound/isa/gus/gus_main.c
index 0b6e56c16e38..b2b189c83569 100644
--- a/sound/isa/gus/gus_main.c
+++ b/sound/isa/gus/gus_main.c
@@ -116,7 +116,7 @@ int snd_gus_create(struct snd_card *card,
};
*rgus = NULL;
- gus = kzalloc_obj(*gus, GFP_KERNEL);
+ gus = kzalloc_obj(*gus);
if (gus == NULL)
return -ENOMEM;
spin_lock_init(&gus->reg_lock);
diff --git a/sound/isa/gus/gus_mem.c b/sound/isa/gus/gus_mem.c
index 65e5426a43fd..927a2bc80511 100644
--- a/sound/isa/gus/gus_mem.c
+++ b/sound/isa/gus/gus_mem.c
@@ -21,7 +21,7 @@ snd_gf1_mem_xalloc(struct snd_gf1_mem *alloc, struct snd_gf1_mem_block *block,
{
struct snd_gf1_mem_block *pblock, *nblock;
- nblock = kmalloc_obj(struct snd_gf1_mem_block, GFP_KERNEL);
+ nblock = kmalloc_obj(struct snd_gf1_mem_block);
if (nblock == NULL)
return NULL;
*nblock = *block;
diff --git a/sound/isa/gus/gus_mem_proc.c b/sound/isa/gus/gus_mem_proc.c
index fdb14acaddcf..04c212882718 100644
--- a/sound/isa/gus/gus_mem_proc.c
+++ b/sound/isa/gus/gus_mem_proc.c
@@ -50,7 +50,7 @@ int snd_gf1_mem_proc_init(struct snd_gus_card * gus)
for (idx = 0; idx < 4; idx++) {
if (gus->gf1.mem_alloc.banks_8[idx].size > 0) {
- priv = kzalloc_obj(*priv, GFP_KERNEL);
+ priv = kzalloc_obj(*priv);
if (priv == NULL)
return -ENOMEM;
priv->gus = gus;
@@ -67,7 +67,7 @@ int snd_gf1_mem_proc_init(struct snd_gus_card * gus)
}
for (idx = 0; idx < 4; idx++) {
if (gus->gf1.rom_present & (1 << idx)) {
- priv = kzalloc_obj(*priv, GFP_KERNEL);
+ priv = kzalloc_obj(*priv);
if (priv == NULL)
return -ENOMEM;
priv->rom = 1;
diff --git a/sound/isa/gus/gus_pcm.c b/sound/isa/gus/gus_pcm.c
index b5da8d970b3f..caf371897b78 100644
--- a/sound/isa/gus/gus_pcm.c
+++ b/sound/isa/gus/gus_pcm.c
@@ -638,7 +638,7 @@ static int snd_gf1_pcm_playback_open(struct snd_pcm_substream *substream)
struct snd_pcm_runtime *runtime = substream->runtime;
int err;
- pcmp = kzalloc_obj(*pcmp, GFP_KERNEL);
+ pcmp = kzalloc_obj(*pcmp);
if (pcmp == NULL)
return -ENOMEM;
pcmp->gus = gus;
diff --git a/sound/isa/sb/emu8000_pcm.c b/sound/isa/sb/emu8000_pcm.c
index a3071cd2e9a8..d2ca70aad162 100644
--- a/sound/isa/sb/emu8000_pcm.c
+++ b/sound/isa/sb/emu8000_pcm.c
@@ -221,7 +221,7 @@ static int emu8k_pcm_open(struct snd_pcm_substream *subs)
struct snd_emu8k_pcm *rec;
struct snd_pcm_runtime *runtime = subs->runtime;
- rec = kzalloc_obj(*rec, GFP_KERNEL);
+ rec = kzalloc_obj(*rec);
if (! rec)
return -ENOMEM;
diff --git a/sound/isa/sb/sb16_csp.c b/sound/isa/sb/sb16_csp.c
index 834b38de9afd..bece60051e41 100644
--- a/sound/isa/sb/sb16_csp.c
+++ b/sound/isa/sb/sb16_csp.c
@@ -117,7 +117,7 @@ int snd_sb_csp_new(struct snd_sb *chip, int device, struct snd_hwdep ** rhwdep)
if (err < 0)
return err;
- p = kzalloc_obj(*p, GFP_KERNEL);
+ p = kzalloc_obj(*p);
if (!p) {
snd_device_free(chip->card, hw);
return -ENOMEM;
diff --git a/sound/isa/wavefront/wavefront_synth.c b/sound/isa/wavefront/wavefront_synth.c
index 0b91b3b28f7f..33b563707a58 100644
--- a/sound/isa/wavefront/wavefront_synth.c
+++ b/sound/isa/wavefront/wavefront_synth.c
@@ -1381,7 +1381,7 @@ wavefront_load_patch (snd_wavefront_t *dev, const char __user *addr)
wavefront_patch_info *header;
int err;
- header = kmalloc_obj(*header, GFP_KERNEL);
+ header = kmalloc_obj(*header);
if (! header)
return -ENOMEM;
diff --git a/sound/mips/hal2.c b/sound/mips/hal2.c
index c865c7ba3636..2beb6a0dc3b7 100644
--- a/sound/mips/hal2.c
+++ b/sound/mips/hal2.c
@@ -773,7 +773,7 @@ static int hal2_create(struct snd_card *card, struct snd_hal2 **rchip)
struct hpc3_regs *hpc3 = hpc3c0;
int err;
- hal2 = kzalloc_obj(*hal2, GFP_KERNEL);
+ hal2 = kzalloc_obj(*hal2);
if (!hal2)
return -ENOMEM;
diff --git a/sound/mips/sgio2audio.c b/sound/mips/sgio2audio.c
index af2690d901b4..497d84cff12f 100644
--- a/sound/mips/sgio2audio.c
+++ b/sound/mips/sgio2audio.c
@@ -788,7 +788,7 @@ static int snd_sgio2audio_create(struct snd_card *card,
if (!(readq(&mace->perif.audio.control) & AUDIO_CONTROL_CODEC_PRESENT))
return -ENOENT;
- chip = kzalloc_obj(*chip, GFP_KERNEL);
+ chip = kzalloc_obj(*chip);
if (chip == NULL)
return -ENOMEM;
diff --git a/sound/parisc/harmony.c b/sound/parisc/harmony.c
index e9f30201cf4b..fb40476c6c91 100644
--- a/sound/parisc/harmony.c
+++ b/sound/parisc/harmony.c
@@ -852,7 +852,7 @@ snd_harmony_create(struct snd_card *card,
*rchip = NULL;
- h = kzalloc_obj(*h, GFP_KERNEL);
+ h = kzalloc_obj(*h);
if (h == NULL)
return -ENOMEM;
diff --git a/sound/pci/ac97/ac97_codec.c b/sound/pci/ac97/ac97_codec.c
index 7392bc15affa..0bb65be021d9 100644
--- a/sound/pci/ac97/ac97_codec.c
+++ b/sound/pci/ac97/ac97_codec.c
@@ -1957,7 +1957,7 @@ int snd_ac97_bus(struct snd_card *card, int num,
if (snd_BUG_ON(!card))
return -EINVAL;
- bus = kzalloc_obj(*bus, GFP_KERNEL);
+ bus = kzalloc_obj(*bus);
if (bus == NULL)
return -ENOMEM;
bus->card = card;
@@ -2069,7 +2069,7 @@ int snd_ac97_mixer(struct snd_ac97_bus *bus, struct snd_ac97_template *template,
return -EBUSY;
card = bus->card;
- ac97 = kzalloc_obj(*ac97, GFP_KERNEL);
+ ac97 = kzalloc_obj(*ac97);
if (ac97 == NULL)
return -ENOMEM;
ac97->private_data = template->private_data;
diff --git a/sound/pci/ac97/ac97_pcm.c b/sound/pci/ac97/ac97_pcm.c
index 9df21c42d624..cbfbabb02818 100644
--- a/sound/pci/ac97/ac97_pcm.c
+++ b/sound/pci/ac97/ac97_pcm.c
@@ -441,7 +441,7 @@ int snd_ac97_pcm_assign(struct snd_ac97_bus *bus,
unsigned int rates;
struct snd_ac97 *codec;
- rpcms = kzalloc_objs(struct ac97_pcm, pcms_count, GFP_KERNEL);
+ rpcms = kzalloc_objs(struct ac97_pcm, pcms_count);
if (rpcms == NULL)
return -ENOMEM;
memset(avail_slots, 0, sizeof(avail_slots));
diff --git a/sound/pci/ak4531_codec.c b/sound/pci/ak4531_codec.c
index c7f32b1de462..6f35b616efc6 100644
--- a/sound/pci/ak4531_codec.c
+++ b/sound/pci/ak4531_codec.c
@@ -373,7 +373,7 @@ int snd_ak4531_mixer(struct snd_card *card,
return -EINVAL;
if (rak4531)
*rak4531 = NULL;
- ak4531 = kzalloc_obj(*ak4531, GFP_KERNEL);
+ ak4531 = kzalloc_obj(*ak4531);
if (ak4531 == NULL)
return -ENOMEM;
*ak4531 = *_ak4531;
diff --git a/sound/pci/als300.c b/sound/pci/als300.c
index 5b82777522d8..a73893a2cbd6 100644
--- a/sound/pci/als300.c
+++ b/sound/pci/als300.c
@@ -342,7 +342,7 @@ static int snd_als300_playback_open(struct snd_pcm_substream *substream)
{
struct snd_als300 *chip = snd_pcm_substream_chip(substream);
struct snd_pcm_runtime *runtime = substream->runtime;
- struct snd_als300_substream_data *data = kzalloc_obj(*data, GFP_KERNEL);
+ struct snd_als300_substream_data *data = kzalloc_obj(*data);
if (!data)
return -ENOMEM;
@@ -369,7 +369,7 @@ static int snd_als300_capture_open(struct snd_pcm_substream *substream)
{
struct snd_als300 *chip = snd_pcm_substream_chip(substream);
struct snd_pcm_runtime *runtime = substream->runtime;
- struct snd_als300_substream_data *data = kzalloc_obj(*data, GFP_KERNEL);
+ struct snd_als300_substream_data *data = kzalloc_obj(*data);
if (!data)
return -ENOMEM;
diff --git a/sound/pci/asihpi/asihpi.c b/sound/pci/asihpi/asihpi.c
index c5f38fc88c86..3a64d0562803 100644
--- a/sound/pci/asihpi/asihpi.c
+++ b/sound/pci/asihpi/asihpi.c
@@ -975,7 +975,7 @@ static int snd_card_asihpi_playback_open(struct snd_pcm_substream *substream)
struct snd_pcm_hardware snd_card_asihpi_playback;
int err;
- dpcm = kzalloc_obj(*dpcm, GFP_KERNEL);
+ dpcm = kzalloc_obj(*dpcm);
if (dpcm == NULL)
return -ENOMEM;
@@ -1145,7 +1145,7 @@ static int snd_card_asihpi_capture_open(struct snd_pcm_substream *substream)
struct snd_pcm_hardware snd_card_asihpi_capture;
int err;
- dpcm = kzalloc_obj(*dpcm, GFP_KERNEL);
+ dpcm = kzalloc_obj(*dpcm);
if (dpcm == NULL)
return -ENOMEM;
diff --git a/sound/pci/asihpi/hpi6000.c b/sound/pci/asihpi/hpi6000.c
index 41b2892a9312..c8d1518ee3e7 100644
--- a/sound/pci/asihpi/hpi6000.c
+++ b/sound/pci/asihpi/hpi6000.c
@@ -406,7 +406,7 @@ static void subsys_create_adapter(struct hpi_message *phm,
memset(&ao, 0, sizeof(ao));
- ao.priv = kzalloc_obj(struct hpi_hw_obj, GFP_KERNEL);
+ ao.priv = kzalloc_obj(struct hpi_hw_obj);
if (!ao.priv) {
HPI_DEBUG_LOG(ERROR, "can't get mem for adapter object\n");
phr->error = HPI_ERROR_MEMORY_ALLOC;
diff --git a/sound/pci/asihpi/hpi6205.c b/sound/pci/asihpi/hpi6205.c
index c484d929d6da..98e7f7fa75c3 100644
--- a/sound/pci/asihpi/hpi6205.c
+++ b/sound/pci/asihpi/hpi6205.c
@@ -461,7 +461,7 @@ static void subsys_create_adapter(struct hpi_message *phm,
memset(&ao, 0, sizeof(ao));
- ao.priv = kzalloc_obj(struct hpi_hw_obj, GFP_KERNEL);
+ ao.priv = kzalloc_obj(struct hpi_hw_obj);
if (!ao.priv) {
HPI_DEBUG_LOG(ERROR, "can't get mem for adapter object\n");
phr->error = HPI_ERROR_MEMORY_ALLOC;
diff --git a/sound/pci/asihpi/hpicmn.c b/sound/pci/asihpi/hpicmn.c
index 2378bdeb1f23..d846777e7462 100644
--- a/sound/pci/asihpi/hpicmn.c
+++ b/sound/pci/asihpi/hpicmn.c
@@ -641,12 +641,12 @@ void hpi_cmn_control_cache_sync_to_msg(struct hpi_control_cache *p_cache,
struct hpi_control_cache *hpi_alloc_control_cache(const u32 control_count,
const u32 size_in_bytes, u8 *p_dsp_control_buffer)
{
- struct hpi_control_cache *p_cache = kmalloc_obj(*p_cache, GFP_KERNEL);
+ struct hpi_control_cache *p_cache = kmalloc_obj(*p_cache);
if (!p_cache)
return NULL;
p_cache->p_info =
- kzalloc_objs(*p_cache->p_info, control_count, GFP_KERNEL);
+ kzalloc_objs(*p_cache->p_info, control_count);
if (!p_cache->p_info) {
kfree(p_cache);
return NULL;
diff --git a/sound/pci/asihpi/hpidspcd.c b/sound/pci/asihpi/hpidspcd.c
index 8eda87107b28..b1b5a131f626 100644
--- a/sound/pci/asihpi/hpidspcd.c
+++ b/sound/pci/asihpi/hpidspcd.c
@@ -69,7 +69,7 @@ short hpi_dsp_code_open(u32 adapter, void *os_data, struct dsp_code *dsp_code,
}
HPI_DEBUG_LOG(DEBUG, "dsp code %s opened\n", fw_name);
- dsp_code->pvt = kmalloc_obj(*dsp_code->pvt, GFP_KERNEL);
+ dsp_code->pvt = kmalloc_obj(*dsp_code->pvt);
if (!dsp_code->pvt) {
err_ret = HPI_ERROR_MEMORY_ALLOC;
goto error2;
diff --git a/sound/pci/asihpi/hpioctl.c b/sound/pci/asihpi/hpioctl.c
index 24c116ab9cf5..9de9ae7032b8 100644
--- a/sound/pci/asihpi/hpioctl.c
+++ b/sound/pci/asihpi/hpioctl.c
@@ -105,8 +105,8 @@ long asihpi_hpi_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
if (cmd != HPI_IOCTL_LINUX)
return -EINVAL;
- hm = kmalloc_obj(*hm, GFP_KERNEL);
- hr = kzalloc_obj(*hr, GFP_KERNEL);
+ hm = kmalloc_obj(*hm);
+ hr = kzalloc_obj(*hr);
if (!hm || !hr) {
err = -ENOMEM;
goto out;
diff --git a/sound/pci/ca0106/ca0106_main.c b/sound/pci/ca0106/ca0106_main.c
index bdf9453939f3..35392f6525b3 100644
--- a/sound/pci/ca0106/ca0106_main.c
+++ b/sound/pci/ca0106/ca0106_main.c
@@ -543,7 +543,7 @@ static int snd_ca0106_pcm_open_playback_channel(struct snd_pcm_substream *substr
struct snd_pcm_runtime *runtime = substream->runtime;
int err;
- epcm = kzalloc_obj(*epcm, GFP_KERNEL);
+ epcm = kzalloc_obj(*epcm);
if (epcm == NULL)
return -ENOMEM;
@@ -638,7 +638,7 @@ static int snd_ca0106_pcm_open_capture_channel(struct snd_pcm_substream *substre
struct snd_pcm_runtime *runtime = substream->runtime;
int err;
- epcm = kzalloc_obj(*epcm, GFP_KERNEL);
+ epcm = kzalloc_obj(*epcm);
if (!epcm)
return -ENOMEM;
diff --git a/sound/pci/cmipci.c b/sound/pci/cmipci.c
index 189948f70d84..cd73b6833639 100644
--- a/sound/pci/cmipci.c
+++ b/sound/pci/cmipci.c
@@ -1096,7 +1096,7 @@ static int save_mixer_state(struct cmipci *cm)
struct snd_ctl_elem_value *val;
unsigned int i;
- val = kmalloc_obj(*val, GFP_KERNEL);
+ val = kmalloc_obj(*val);
if (!val)
return -ENOMEM;
for (i = 0; i < CM_SAVED_MIXERS; i++) {
@@ -1130,7 +1130,7 @@ static void restore_mixer_state(struct cmipci *cm)
struct snd_ctl_elem_value *val;
unsigned int i;
- val = kmalloc_obj(*val, GFP_KERNEL);
+ val = kmalloc_obj(*val);
if (!val)
return;
cm->mixer_insensitive = 0; /* at first clear this;
diff --git a/sound/pci/cs46xx/cs46xx_lib.c b/sound/pci/cs46xx/cs46xx_lib.c
index d7bed722d939..1c11023184ac 100644
--- a/sound/pci/cs46xx/cs46xx_lib.c
+++ b/sound/pci/cs46xx/cs46xx_lib.c
@@ -401,7 +401,7 @@ static int load_firmware(struct snd_cs46xx *chip,
}
err = -ENOMEM;
- module = kzalloc_obj(*module, GFP_KERNEL);
+ module = kzalloc_obj(*module);
if (!module)
goto error;
module->module_name = kstrdup(fw_name, GFP_KERNEL);
@@ -414,7 +414,7 @@ static int load_firmware(struct snd_cs46xx *chip,
if (nums >= 40)
goto error_inval;
module->symbol_table.symbols =
- kzalloc_objs(struct dsp_symbol_entry, nums, GFP_KERNEL);
+ kzalloc_objs(struct dsp_symbol_entry, nums);
if (!module->symbol_table.symbols)
goto error;
for (i = 0; i < nums; i++) {
@@ -434,7 +434,7 @@ static int load_firmware(struct snd_cs46xx *chip,
if (nums > 10)
goto error_inval;
module->segments =
- kzalloc_objs(struct dsp_segment_desc, nums, GFP_KERNEL);
+ kzalloc_objs(struct dsp_segment_desc, nums);
if (!module->segments)
goto error;
for (i = 0; i < nums; i++) {
diff --git a/sound/pci/cs46xx/dsp_spos_scb_lib.c b/sound/pci/cs46xx/dsp_spos_scb_lib.c
index c55ff043d1d7..fd19365026b4 100644
--- a/sound/pci/cs46xx/dsp_spos_scb_lib.c
+++ b/sound/pci/cs46xx/dsp_spos_scb_lib.c
@@ -234,7 +234,7 @@ void cs46xx_dsp_proc_register_scb_desc (struct snd_cs46xx *chip,
entry = snd_info_create_card_entry(ins->snd_card, scb->scb_name,
ins->proc_dsp_dir);
if (entry) {
- scb_info = kmalloc_obj(struct proc_scb_info, GFP_KERNEL);
+ scb_info = kmalloc_obj(struct proc_scb_info);
if (!scb_info) {
snd_info_free_entry(entry);
entry = NULL;
diff --git a/sound/pci/ctxfi/ctamixer.c b/sound/pci/ctxfi/ctamixer.c
index c22e3173ec1b..5fc1c922620a 100644
--- a/sound/pci/ctxfi/ctamixer.c
+++ b/sound/pci/ctxfi/ctamixer.c
@@ -296,7 +296,7 @@ int amixer_mgr_create(struct hw *hw, void **ramixer_mgr)
struct amixer_mgr *amixer_mgr;
*ramixer_mgr = NULL;
- amixer_mgr = kzalloc_obj(*amixer_mgr, GFP_KERNEL);
+ amixer_mgr = kzalloc_obj(*amixer_mgr);
if (!amixer_mgr)
return -ENOMEM;
@@ -448,7 +448,7 @@ int sum_mgr_create(struct hw *hw, void **rsum_mgr)
struct sum_mgr *sum_mgr;
*rsum_mgr = NULL;
- sum_mgr = kzalloc_obj(*sum_mgr, GFP_KERNEL);
+ sum_mgr = kzalloc_obj(*sum_mgr);
if (!sum_mgr)
return -ENOMEM;
diff --git a/sound/pci/ctxfi/ctatc.c b/sound/pci/ctxfi/ctatc.c
index f130a2722a70..f122e396bc55 100644
--- a/sound/pci/ctxfi/ctatc.c
+++ b/sound/pci/ctxfi/ctatc.c
@@ -1723,7 +1723,7 @@ int ct_atc_create(struct snd_card *card, struct pci_dev *pci,
*ratc = NULL;
- atc = kzalloc_obj(*atc, GFP_KERNEL);
+ atc = kzalloc_obj(*atc);
if (!atc)
return -ENOMEM;
diff --git a/sound/pci/ctxfi/ctdaio.c b/sound/pci/ctxfi/ctdaio.c
index 12653f7cd9e8..b8bde27f3a1d 100644
--- a/sound/pci/ctxfi/ctdaio.c
+++ b/sound/pci/ctxfi/ctdaio.c
@@ -159,7 +159,7 @@ static int dao_set_left_input(struct dao *dao, struct rsc *input)
struct daio *daio = &dao->daio;
int i;
- entry = kzalloc_objs(*entry, daio->rscl.msr, GFP_KERNEL);
+ entry = kzalloc_objs(*entry, daio->rscl.msr);
if (!entry)
return -ENOMEM;
@@ -188,7 +188,7 @@ static int dao_set_right_input(struct dao *dao, struct rsc *input)
struct daio *daio = &dao->daio;
int i;
- entry = kzalloc_objs(*entry, daio->rscr.msr, GFP_KERNEL);
+ entry = kzalloc_objs(*entry, daio->rscr.msr);
if (!entry)
return -ENOMEM;
@@ -660,7 +660,7 @@ int daio_mgr_create(struct hw *hw, void **rdaio_mgr)
struct imapper *entry;
*rdaio_mgr = NULL;
- daio_mgr = kzalloc_obj(*daio_mgr, GFP_KERNEL);
+ daio_mgr = kzalloc_obj(*daio_mgr);
if (!daio_mgr)
return -ENOMEM;
@@ -671,7 +671,7 @@ int daio_mgr_create(struct hw *hw, void **rdaio_mgr)
spin_lock_init(&daio_mgr->mgr_lock);
spin_lock_init(&daio_mgr->imap_lock);
INIT_LIST_HEAD(&daio_mgr->imappers);
- entry = kzalloc_obj(*entry, GFP_KERNEL);
+ entry = kzalloc_obj(*entry);
if (!entry) {
err = -ENOMEM;
goto error2;
diff --git a/sound/pci/ctxfi/cthw20k1.c b/sound/pci/ctxfi/cthw20k1.c
index 0851453b8565..06753f555944 100644
--- a/sound/pci/ctxfi/cthw20k1.c
+++ b/sound/pci/ctxfi/cthw20k1.c
@@ -157,7 +157,7 @@ static int src_get_rsc_ctrl_blk(void **rblk)
struct src_rsc_ctrl_blk *blk;
*rblk = NULL;
- blk = kzalloc_obj(*blk, GFP_KERNEL);
+ blk = kzalloc_obj(*blk);
if (!blk)
return -ENOMEM;
@@ -483,7 +483,7 @@ static int src_mgr_get_ctrl_blk(void **rblk)
struct src_mgr_ctrl_blk *blk;
*rblk = NULL;
- blk = kzalloc_obj(*blk, GFP_KERNEL);
+ blk = kzalloc_obj(*blk);
if (!blk)
return -ENOMEM;
@@ -504,7 +504,7 @@ static int srcimp_mgr_get_ctrl_blk(void **rblk)
struct srcimp_mgr_ctrl_blk *blk;
*rblk = NULL;
- blk = kzalloc_obj(*blk, GFP_KERNEL);
+ blk = kzalloc_obj(*blk);
if (!blk)
return -ENOMEM;
@@ -691,7 +691,7 @@ static int amixer_rsc_get_ctrl_blk(void **rblk)
struct amixer_rsc_ctrl_blk *blk;
*rblk = NULL;
- blk = kzalloc_obj(*blk, GFP_KERNEL);
+ blk = kzalloc_obj(*blk);
if (!blk)
return -ENOMEM;
@@ -898,7 +898,7 @@ static int dai_get_ctrl_blk(void **rblk)
struct dai_ctrl_blk *blk;
*rblk = NULL;
- blk = kzalloc_obj(*blk, GFP_KERNEL);
+ blk = kzalloc_obj(*blk);
if (!blk)
return -ENOMEM;
@@ -947,7 +947,7 @@ static int dao_get_ctrl_blk(void **rblk)
struct dao_ctrl_blk *blk;
*rblk = NULL;
- blk = kzalloc_obj(*blk, GFP_KERNEL);
+ blk = kzalloc_obj(*blk);
if (!blk)
return -ENOMEM;
@@ -1141,7 +1141,7 @@ static int daio_mgr_get_ctrl_blk(struct hw *hw, void **rblk)
struct daio_mgr_ctrl_blk *blk;
*rblk = NULL;
- blk = kzalloc_obj(*blk, GFP_KERNEL);
+ blk = kzalloc_obj(*blk);
if (!blk)
return -ENOMEM;
@@ -2227,7 +2227,7 @@ int create_20k1_hw_obj(struct hw **rhw)
struct hw20k1 *hw20k1;
*rhw = NULL;
- hw20k1 = kzalloc_obj(*hw20k1, GFP_KERNEL);
+ hw20k1 = kzalloc_obj(*hw20k1);
if (!hw20k1)
return -ENOMEM;
diff --git a/sound/pci/ctxfi/cthw20k2.c b/sound/pci/ctxfi/cthw20k2.c
index 1d558914a26a..07e1490a6d17 100644
--- a/sound/pci/ctxfi/cthw20k2.c
+++ b/sound/pci/ctxfi/cthw20k2.c
@@ -157,7 +157,7 @@ static int src_get_rsc_ctrl_blk(void **rblk)
struct src_rsc_ctrl_blk *blk;
*rblk = NULL;
- blk = kzalloc_obj(*blk, GFP_KERNEL);
+ blk = kzalloc_obj(*blk);
if (!blk)
return -ENOMEM;
@@ -483,7 +483,7 @@ static int src_mgr_get_ctrl_blk(void **rblk)
struct src_mgr_ctrl_blk *blk;
*rblk = NULL;
- blk = kzalloc_obj(*blk, GFP_KERNEL);
+ blk = kzalloc_obj(*blk);
if (!blk)
return -ENOMEM;
@@ -504,7 +504,7 @@ static int srcimp_mgr_get_ctrl_blk(void **rblk)
struct srcimp_mgr_ctrl_blk *blk;
*rblk = NULL;
- blk = kzalloc_obj(*blk, GFP_KERNEL);
+ blk = kzalloc_obj(*blk);
if (!blk)
return -ENOMEM;
@@ -693,7 +693,7 @@ static int amixer_rsc_get_ctrl_blk(void **rblk)
struct amixer_rsc_ctrl_blk *blk;
*rblk = NULL;
- blk = kzalloc_obj(*blk, GFP_KERNEL);
+ blk = kzalloc_obj(*blk);
if (!blk)
return -ENOMEM;
@@ -882,7 +882,7 @@ static int dai_get_ctrl_blk(void **rblk)
struct dai_ctrl_blk *blk;
*rblk = NULL;
- blk = kzalloc_obj(*blk, GFP_KERNEL);
+ blk = kzalloc_obj(*blk);
if (!blk)
return -ENOMEM;
@@ -932,7 +932,7 @@ static int dao_get_ctrl_blk(void **rblk)
struct dao_ctrl_blk *blk;
*rblk = NULL;
- blk = kzalloc_obj(*blk, GFP_KERNEL);
+ blk = kzalloc_obj(*blk);
if (!blk)
return -ENOMEM;
@@ -1084,7 +1084,7 @@ static int daio_mgr_get_ctrl_blk(struct hw *hw, void **rblk)
int i;
*rblk = NULL;
- blk = kzalloc_obj(*blk, GFP_KERNEL);
+ blk = kzalloc_obj(*blk);
if (!blk)
return -ENOMEM;
@@ -2369,7 +2369,7 @@ int create_20k2_hw_obj(struct hw **rhw)
struct hw20k2 *hw20k2;
*rhw = NULL;
- hw20k2 = kzalloc_obj(*hw20k2, GFP_KERNEL);
+ hw20k2 = kzalloc_obj(*hw20k2);
if (!hw20k2)
return -ENOMEM;
diff --git a/sound/pci/ctxfi/ctmixer.c b/sound/pci/ctxfi/ctmixer.c
index 3c5b89f3eae3..e3ee76bd8482 100644
--- a/sound/pci/ctxfi/ctmixer.c
+++ b/sound/pci/ctxfi/ctmixer.c
@@ -969,7 +969,7 @@ static int ct_mixer_get_mem(struct ct_mixer **rmixer)
*rmixer = NULL;
/* Allocate mem for mixer obj */
- mixer = kzalloc_obj(*mixer, GFP_KERNEL);
+ mixer = kzalloc_obj(*mixer);
if (!mixer)
return -ENOMEM;
diff --git a/sound/pci/ctxfi/ctpcm.c b/sound/pci/ctxfi/ctpcm.c
index 2b0f4130642c..fea6024f920e 100644
--- a/sound/pci/ctxfi/ctpcm.c
+++ b/sound/pci/ctxfi/ctpcm.c
@@ -119,7 +119,7 @@ static int ct_pcm_playback_open(struct snd_pcm_substream *substream)
struct ct_atc_pcm *apcm;
int err;
- apcm = kzalloc_obj(*apcm, GFP_KERNEL);
+ apcm = kzalloc_obj(*apcm);
if (!apcm)
return -ENOMEM;
@@ -265,7 +265,7 @@ static int ct_pcm_capture_open(struct snd_pcm_substream *substream)
struct ct_atc_pcm *apcm;
int err;
- apcm = kzalloc_obj(*apcm, GFP_KERNEL);
+ apcm = kzalloc_obj(*apcm);
if (!apcm)
return -ENOMEM;
diff --git a/sound/pci/ctxfi/ctsrc.c b/sound/pci/ctxfi/ctsrc.c
index b781201c7f0e..326997bb885d 100644
--- a/sound/pci/ctxfi/ctsrc.c
+++ b/sound/pci/ctxfi/ctsrc.c
@@ -540,7 +540,7 @@ int src_mgr_create(struct hw *hw, void **rsrc_mgr)
struct src_mgr *src_mgr;
*rsrc_mgr = NULL;
- src_mgr = kzalloc_obj(*src_mgr, GFP_KERNEL);
+ src_mgr = kzalloc_obj(*src_mgr);
if (!src_mgr)
return -ENOMEM;
@@ -669,7 +669,7 @@ static int srcimp_rsc_init(struct srcimp *srcimp,
return err;
/* Reserve memory for imapper nodes */
- srcimp->imappers = kzalloc_objs(struct imapper, desc->msr, GFP_KERNEL);
+ srcimp->imappers = kzalloc_objs(struct imapper, desc->msr);
if (!srcimp->imappers) {
err = -ENOMEM;
goto error1;
@@ -810,7 +810,7 @@ int srcimp_mgr_create(struct hw *hw, void **rsrcimp_mgr)
struct imapper *entry;
*rsrcimp_mgr = NULL;
- srcimp_mgr = kzalloc_obj(*srcimp_mgr, GFP_KERNEL);
+ srcimp_mgr = kzalloc_obj(*srcimp_mgr);
if (!srcimp_mgr)
return -ENOMEM;
@@ -821,7 +821,7 @@ int srcimp_mgr_create(struct hw *hw, void **rsrcimp_mgr)
spin_lock_init(&srcimp_mgr->mgr_lock);
spin_lock_init(&srcimp_mgr->imap_lock);
INIT_LIST_HEAD(&srcimp_mgr->imappers);
- entry = kzalloc_obj(*entry, GFP_KERNEL);
+ entry = kzalloc_obj(*entry);
if (!entry) {
err = -ENOMEM;
goto error2;
diff --git a/sound/pci/ctxfi/cttimer.c b/sound/pci/ctxfi/cttimer.c
index 53d16f575c38..cc379d880cad 100644
--- a/sound/pci/ctxfi/cttimer.c
+++ b/sound/pci/ctxfi/cttimer.c
@@ -390,7 +390,7 @@ struct ct_timer *ct_timer_new(struct ct_atc *atc)
struct ct_timer *atimer;
struct hw *hw;
- atimer = kzalloc_obj(*atimer, GFP_KERNEL);
+ atimer = kzalloc_obj(*atimer);
if (!atimer)
return NULL;
spin_lock_init(&atimer->lock);
diff --git a/sound/pci/ctxfi/ctvmem.c b/sound/pci/ctxfi/ctvmem.c
index 316072863dbf..25e071cae08b 100644
--- a/sound/pci/ctxfi/ctvmem.c
+++ b/sound/pci/ctxfi/ctvmem.c
@@ -55,7 +55,7 @@ get_vm_block(struct ct_vm *vm, unsigned int size, struct ct_atc *atc)
return entry;
}
- block = kzalloc_obj(*block, GFP_KERNEL);
+ block = kzalloc_obj(*block);
if (!block)
return NULL;
@@ -170,7 +170,7 @@ int ct_vm_create(struct ct_vm **rvm, struct pci_dev *pci)
*rvm = NULL;
- vm = kzalloc_obj(*vm, GFP_KERNEL);
+ vm = kzalloc_obj(*vm);
if (!vm)
return -ENOMEM;
@@ -195,7 +195,7 @@ int ct_vm_create(struct ct_vm **rvm, struct pci_dev *pci)
vm->get_ptp_phys = ct_get_ptp_phys;
INIT_LIST_HEAD(&vm->unused);
INIT_LIST_HEAD(&vm->used);
- block = kzalloc_obj(*block, GFP_KERNEL);
+ block = kzalloc_obj(*block);
if (NULL != block) {
block->addr = 0;
block->size = vm->size;
diff --git a/sound/pci/echoaudio/echoaudio.c b/sound/pci/echoaudio/echoaudio.c
index fdf309633c8a..214d68657707 100644
--- a/sound/pci/echoaudio/echoaudio.c
+++ b/sound/pci/echoaudio/echoaudio.c
@@ -265,7 +265,7 @@ static int pcm_open(struct snd_pcm_substream *substream,
chip = snd_pcm_substream_chip(substream);
runtime = substream->runtime;
- pipe = kzalloc_obj(struct audiopipe, GFP_KERNEL);
+ pipe = kzalloc_obj(struct audiopipe);
if (!pipe)
return -ENOMEM;
pipe->index = -1; /* Not configured yet */
diff --git a/sound/pci/emu10k1/emu10k1x.c b/sound/pci/emu10k1/emu10k1x.c
index e79f773941cd..1b207ca25814 100644
--- a/sound/pci/emu10k1/emu10k1x.c
+++ b/sound/pci/emu10k1/emu10k1x.c
@@ -367,7 +367,7 @@ static int snd_emu10k1x_playback_open(struct snd_pcm_substream *substream)
if (err < 0)
return err;
- epcm = kzalloc_obj(*epcm, GFP_KERNEL);
+ epcm = kzalloc_obj(*epcm);
if (epcm == NULL)
return -ENOMEM;
epcm->emu = chip;
@@ -547,7 +547,7 @@ static int snd_emu10k1x_pcm_open_capture(struct snd_pcm_substream *substream)
if (err < 0)
return err;
- epcm = kzalloc_obj(*epcm, GFP_KERNEL);
+ epcm = kzalloc_obj(*epcm);
if (epcm == NULL)
return -ENOMEM;
diff --git a/sound/pci/emu10k1/emufx.c b/sound/pci/emu10k1/emufx.c
index a9c786fe638a..080c5fedc850 100644
--- a/sound/pci/emu10k1/emufx.c
+++ b/sound/pci/emu10k1/emufx.c
@@ -776,7 +776,7 @@ static int snd_emu10k1_verify_controls(struct snd_emu10k1 *emu,
if (snd_emu10k1_look_for_ctl(emu, &id) == NULL)
return -ENOENT;
}
- gctl = kmalloc_obj(*gctl, GFP_KERNEL);
+ gctl = kmalloc_obj(*gctl);
if (! gctl)
return -ENOMEM;
err = 0;
@@ -864,9 +864,9 @@ static int snd_emu10k1_add_controls(struct snd_emu10k1 *emu,
struct snd_ctl_elem_value *val;
int err = 0;
- val = kmalloc_obj(*val, GFP_KERNEL);
- gctl = kmalloc_obj(*gctl, GFP_KERNEL);
- nctl = kmalloc_obj(*nctl, GFP_KERNEL);
+ val = kmalloc_obj(*val);
+ gctl = kmalloc_obj(*gctl);
+ nctl = kmalloc_obj(*nctl);
if (!val || !gctl || !nctl) {
err = -ENOMEM;
goto __error;
@@ -914,7 +914,7 @@ static int snd_emu10k1_add_controls(struct snd_emu10k1 *emu,
nctl->max = gctl->max;
nctl->translation = gctl->translation;
if (ctl == NULL) {
- ctl = kmalloc_obj(*ctl, GFP_KERNEL);
+ ctl = kmalloc_obj(*ctl);
if (ctl == NULL) {
err = -ENOMEM;
kfree(knew.tlv.p);
@@ -980,7 +980,7 @@ static int snd_emu10k1_list_controls(struct snd_emu10k1 *emu,
struct snd_emu10k1_fx8010_ctl *ctl;
struct snd_ctl_elem_id *id;
- gctl = kmalloc_obj(*gctl, GFP_KERNEL);
+ gctl = kmalloc_obj(*gctl);
if (! gctl)
return -ENOMEM;
@@ -1282,7 +1282,7 @@ static int _snd_emu10k1_audigy_init_efx(struct snd_emu10k1 *emu)
u32 *gpr_map;
err = -ENOMEM;
- icode = kzalloc_obj(*icode, GFP_KERNEL);
+ icode = kzalloc_obj(*icode);
if (!icode)
return err;
@@ -1290,7 +1290,7 @@ static int _snd_emu10k1_audigy_init_efx(struct snd_emu10k1 *emu)
GFP_KERNEL);
if (!icode->gpr_map)
goto __err_gpr;
- controls = kzalloc_objs(*controls, SND_EMU10K1_GPR_CONTROLS, GFP_KERNEL);
+ controls = kzalloc_objs(*controls, SND_EMU10K1_GPR_CONTROLS);
if (!controls)
goto __err_ctrls;
@@ -1799,7 +1799,7 @@ static int _snd_emu10k1_init_efx(struct snd_emu10k1 *emu)
u32 *gpr_map;
err = -ENOMEM;
- icode = kzalloc_obj(*icode, GFP_KERNEL);
+ icode = kzalloc_obj(*icode);
if (!icode)
return err;
@@ -1813,7 +1813,7 @@ static int _snd_emu10k1_init_efx(struct snd_emu10k1 *emu)
if (!controls)
goto __err_ctrls;
- ipcm = kzalloc_obj(*ipcm, GFP_KERNEL);
+ ipcm = kzalloc_obj(*ipcm);
if (!ipcm)
goto __err_ipcm;
diff --git a/sound/pci/emu10k1/emupcm.c b/sound/pci/emu10k1/emupcm.c
index 1a0fd2014691..9023f3444d20 100644
--- a/sound/pci/emu10k1/emupcm.c
+++ b/sound/pci/emu10k1/emupcm.c
@@ -1132,7 +1132,7 @@ static int snd_emu10k1_efx_playback_open(struct snd_pcm_substream *substream)
struct snd_pcm_runtime *runtime = substream->runtime;
int i, j, err;
- epcm = kzalloc_obj(*epcm, GFP_KERNEL);
+ epcm = kzalloc_obj(*epcm);
if (epcm == NULL)
return -ENOMEM;
epcm->emu = emu;
@@ -1171,7 +1171,7 @@ static int snd_emu10k1_playback_open(struct snd_pcm_substream *substream)
struct snd_pcm_runtime *runtime = substream->runtime;
int i, err, sample_rate;
- epcm = kzalloc_obj(*epcm, GFP_KERNEL);
+ epcm = kzalloc_obj(*epcm);
if (epcm == NULL)
return -ENOMEM;
epcm->emu = emu;
@@ -1222,7 +1222,7 @@ static int snd_emu10k1_capture_open(struct snd_pcm_substream *substream)
struct snd_pcm_runtime *runtime = substream->runtime;
struct snd_emu10k1_pcm *epcm;
- epcm = kzalloc_obj(*epcm, GFP_KERNEL);
+ epcm = kzalloc_obj(*epcm);
if (epcm == NULL)
return -ENOMEM;
epcm->emu = emu;
@@ -1259,7 +1259,7 @@ static int snd_emu10k1_capture_mic_open(struct snd_pcm_substream *substream)
struct snd_emu10k1_pcm *epcm;
struct snd_pcm_runtime *runtime = substream->runtime;
- epcm = kzalloc_obj(*epcm, GFP_KERNEL);
+ epcm = kzalloc_obj(*epcm);
if (epcm == NULL)
return -ENOMEM;
epcm->emu = emu;
@@ -1299,7 +1299,7 @@ static int snd_emu10k1_capture_efx_open(struct snd_pcm_substream *substream)
int nefx = emu->audigy ? 64 : 32;
int idx, err;
- epcm = kzalloc_obj(*epcm, GFP_KERNEL);
+ epcm = kzalloc_obj(*epcm);
if (epcm == NULL)
return -ENOMEM;
epcm->emu = emu;
diff --git a/sound/pci/es1968.c b/sound/pci/es1968.c
index 6650f0192281..b7282b3fa1b1 100644
--- a/sound/pci/es1968.c
+++ b/sound/pci/es1968.c
@@ -1307,7 +1307,7 @@ static struct esm_memory *snd_es1968_new_memory(struct es1968 *chip, int size)
__found:
if (buf->buf.bytes > size) {
- struct esm_memory *chunk = kmalloc_obj(*chunk, GFP_KERNEL);
+ struct esm_memory *chunk = kmalloc_obj(*chunk);
if (chunk == NULL)
return NULL;
chunk->buf = buf->buf;
@@ -1385,7 +1385,7 @@ snd_es1968_init_dmabuf(struct es1968 *chip)
INIT_LIST_HEAD(&chip->buf_list);
/* allocate an empty chunk */
- chunk = kmalloc_obj(*chunk, GFP_KERNEL);
+ chunk = kmalloc_obj(*chunk);
if (chunk == NULL) {
snd_es1968_free_dmabuf(chip);
return -ENOMEM;
@@ -1488,7 +1488,7 @@ static int snd_es1968_playback_open(struct snd_pcm_substream *substream)
if (apu1 < 0)
return apu1;
- es = kzalloc_obj(*es, GFP_KERNEL);
+ es = kzalloc_obj(*es);
if (!es) {
snd_es1968_free_apu_pair(chip, apu1);
return -ENOMEM;
@@ -1529,7 +1529,7 @@ static int snd_es1968_capture_open(struct snd_pcm_substream *substream)
return apu2;
}
- es = kzalloc_obj(*es, GFP_KERNEL);
+ es = kzalloc_obj(*es);
if (!es) {
snd_es1968_free_apu_pair(chip, apu1);
snd_es1968_free_apu_pair(chip, apu2);
diff --git a/sound/pci/ice1712/ak4xxx.c b/sound/pci/ice1712/ak4xxx.c
index e82bfc02599e..bcafa16ce547 100644
--- a/sound/pci/ice1712/ak4xxx.c
+++ b/sound/pci/ice1712/ak4xxx.c
@@ -115,7 +115,7 @@ int snd_ice1712_akm4xxx_init(struct snd_akm4xxx *ak, const struct snd_akm4xxx *t
struct snd_ak4xxx_private *priv;
if (_priv != NULL) {
- priv = kmalloc_obj(*priv, GFP_KERNEL);
+ priv = kmalloc_obj(*priv);
if (priv == NULL)
return -ENOMEM;
*priv = *_priv;
diff --git a/sound/pci/ice1712/aureon.c b/sound/pci/ice1712/aureon.c
index 92c4950137b0..1191a2686dfd 100644
--- a/sound/pci/ice1712/aureon.c
+++ b/sound/pci/ice1712/aureon.c
@@ -2076,7 +2076,7 @@ static int aureon_init(struct snd_ice1712 *ice)
struct aureon_spec *spec;
int i, err;
- spec = kzalloc_obj(*spec, GFP_KERNEL);
+ spec = kzalloc_obj(*spec);
if (!spec)
return -ENOMEM;
ice->spec = spec;
@@ -2091,7 +2091,7 @@ static int aureon_init(struct snd_ice1712 *ice)
}
/* to remember the register values of CS8415 */
- ice->akm = kzalloc_obj(struct snd_akm4xxx, GFP_KERNEL);
+ ice->akm = kzalloc_obj(struct snd_akm4xxx);
if (!ice->akm)
return -ENOMEM;
ice->akm_codecs = 1;
diff --git a/sound/pci/ice1712/delta.c b/sound/pci/ice1712/delta.c
index 5ea80bd596e6..897b749c70b5 100644
--- a/sound/pci/ice1712/delta.c
+++ b/sound/pci/ice1712/delta.c
@@ -707,7 +707,7 @@ static int snd_ice1712_delta_init(struct snd_ice1712 *ice)
}
/* second stage of initialization, analog parts and others */
- ak = ice->akm = kmalloc_obj(struct snd_akm4xxx, GFP_KERNEL);
+ ak = ice->akm = kmalloc_obj(struct snd_akm4xxx);
if (! ak)
return -ENOMEM;
ice->akm_codecs = 1;
diff --git a/sound/pci/ice1712/ews.c b/sound/pci/ice1712/ews.c
index 43a0a569de1b..26f5d5528e27 100644
--- a/sound/pci/ice1712/ews.c
+++ b/sound/pci/ice1712/ews.c
@@ -431,7 +431,7 @@ static int snd_ice1712_ews_init(struct snd_ice1712 *ice)
break;
}
- spec = kzalloc_obj(*spec, GFP_KERNEL);
+ spec = kzalloc_obj(*spec);
if (!spec)
return -ENOMEM;
ice->spec = spec;
@@ -530,7 +530,7 @@ static int snd_ice1712_ews_init(struct snd_ice1712 *ice)
}
/* analog section */
- ak = ice->akm = kzalloc_obj(struct snd_akm4xxx, GFP_KERNEL);
+ ak = ice->akm = kzalloc_obj(struct snd_akm4xxx);
if (! ak)
return -ENOMEM;
ice->akm_codecs = 1;
diff --git a/sound/pci/ice1712/hoontech.c b/sound/pci/ice1712/hoontech.c
index ab651526aba9..5294c9dd782d 100644
--- a/sound/pci/ice1712/hoontech.c
+++ b/sound/pci/ice1712/hoontech.c
@@ -156,7 +156,7 @@ static int hoontech_init(struct snd_ice1712 *ice, bool staudio)
ice->num_total_dacs = 8;
ice->num_total_adcs = 8;
- spec = kzalloc_obj(*spec, GFP_KERNEL);
+ spec = kzalloc_obj(*spec);
if (!spec)
return -ENOMEM;
ice->spec = spec;
@@ -301,7 +301,7 @@ static int snd_ice1712_value_init(struct snd_ice1712 *ice)
ice->num_total_adcs = 2;
/* analog section */
- ak = ice->akm = kmalloc_obj(struct snd_akm4xxx, GFP_KERNEL);
+ ak = ice->akm = kmalloc_obj(struct snd_akm4xxx);
if (! ak)
return -ENOMEM;
ice->akm_codecs = 1;
diff --git a/sound/pci/ice1712/juli.c b/sound/pci/ice1712/juli.c
index 10f0eb7b347d..ab1c8ac07160 100644
--- a/sound/pci/ice1712/juli.c
+++ b/sound/pci/ice1712/juli.c
@@ -560,7 +560,7 @@ static int juli_init(struct snd_ice1712 *ice)
struct juli_spec *spec;
struct snd_akm4xxx *ak;
- spec = kzalloc_obj(*spec, GFP_KERNEL);
+ spec = kzalloc_obj(*spec);
if (!spec)
return -ENOMEM;
ice->spec = spec;
@@ -594,7 +594,7 @@ static int juli_init(struct snd_ice1712 *ice)
ice->num_total_dacs = 2;
ice->num_total_adcs = 2;
- ice->akm = kzalloc_obj(struct snd_akm4xxx, GFP_KERNEL);
+ ice->akm = kzalloc_obj(struct snd_akm4xxx);
ak = ice->akm;
if (!ak)
return -ENOMEM;
diff --git a/sound/pci/ice1712/maya44.c b/sound/pci/ice1712/maya44.c
index b854fec347c4..fd1427d64a7b 100644
--- a/sound/pci/ice1712/maya44.c
+++ b/sound/pci/ice1712/maya44.c
@@ -668,7 +668,7 @@ static int maya44_init(struct snd_ice1712 *ice)
int i;
struct snd_maya44 *chip;
- chip = kzalloc_obj(*chip, GFP_KERNEL);
+ chip = kzalloc_obj(*chip);
if (!chip)
return -ENOMEM;
mutex_init(&chip->mutex);
diff --git a/sound/pci/ice1712/phase.c b/sound/pci/ice1712/phase.c
index 00f97b87b06c..37756d06218d 100644
--- a/sound/pci/ice1712/phase.c
+++ b/sound/pci/ice1712/phase.c
@@ -125,7 +125,7 @@ static int phase22_init(struct snd_ice1712 *ice)
}
/* Initialize analog chips */
- ice->akm = kzalloc_obj(struct snd_akm4xxx, GFP_KERNEL);
+ ice->akm = kzalloc_obj(struct snd_akm4xxx);
ak = ice->akm;
if (!ak)
return -ENOMEM;
@@ -411,13 +411,13 @@ static int phase28_init(struct snd_ice1712 *ice)
ice->num_total_dacs = 8;
ice->num_total_adcs = 2;
- spec = kzalloc_obj(*spec, GFP_KERNEL);
+ spec = kzalloc_obj(*spec);
if (!spec)
return -ENOMEM;
ice->spec = spec;
/* Initialize analog chips */
- ice->akm = kzalloc_obj(struct snd_akm4xxx, GFP_KERNEL);
+ ice->akm = kzalloc_obj(struct snd_akm4xxx);
ak = ice->akm;
if (!ak)
return -ENOMEM;
diff --git a/sound/pci/ice1712/pontis.c b/sound/pci/ice1712/pontis.c
index 80f7bb3af420..b2bd64ece862 100644
--- a/sound/pci/ice1712/pontis.c
+++ b/sound/pci/ice1712/pontis.c
@@ -728,7 +728,7 @@ static int pontis_init(struct snd_ice1712 *ice)
ice->num_total_adcs = 2;
/* to remember the register values */
- ice->akm = kzalloc_obj(struct snd_akm4xxx, GFP_KERNEL);
+ ice->akm = kzalloc_obj(struct snd_akm4xxx);
if (! ice->akm)
return -ENOMEM;
ice->akm_codecs = 1;
diff --git a/sound/pci/ice1712/prodigy192.c b/sound/pci/ice1712/prodigy192.c
index 039ead80dd64..6c4783b9a983 100644
--- a/sound/pci/ice1712/prodigy192.c
+++ b/sound/pci/ice1712/prodigy192.c
@@ -713,7 +713,7 @@ static int prodigy192_init(struct snd_ice1712 *ice)
ice->num_total_adcs = 2;
ice->vt1720 = 0; /* ice1724, e.g. 23 GPIOs */
- spec = kzalloc_obj(*spec, GFP_KERNEL);
+ spec = kzalloc_obj(*spec);
if (!spec)
return -ENOMEM;
ice->spec = spec;
diff --git a/sound/pci/ice1712/prodigy_hifi.c b/sound/pci/ice1712/prodigy_hifi.c
index 105409daf071..bb5169a69b18 100644
--- a/sound/pci/ice1712/prodigy_hifi.c
+++ b/sound/pci/ice1712/prodigy_hifi.c
@@ -1060,12 +1060,12 @@ static int prodigy_hifi_init(struct snd_ice1712 *ice)
ice->gpio.saved[0] = 0;
/* to remember the register values */
- ice->akm = kzalloc_obj(struct snd_akm4xxx, GFP_KERNEL);
+ ice->akm = kzalloc_obj(struct snd_akm4xxx);
if (! ice->akm)
return -ENOMEM;
ice->akm_codecs = 1;
- spec = kzalloc_obj(*spec, GFP_KERNEL);
+ spec = kzalloc_obj(*spec);
if (!spec)
return -ENOMEM;
ice->spec = spec;
@@ -1143,12 +1143,12 @@ static int prodigy_hd2_init(struct snd_ice1712 *ice)
ice->gpio.saved[0] = 0;
/* to remember the register values */
- ice->akm = kzalloc_obj(struct snd_akm4xxx, GFP_KERNEL);
+ ice->akm = kzalloc_obj(struct snd_akm4xxx);
if (! ice->akm)
return -ENOMEM;
ice->akm_codecs = 1;
- spec = kzalloc_obj(*spec, GFP_KERNEL);
+ spec = kzalloc_obj(*spec);
if (!spec)
return -ENOMEM;
ice->spec = spec;
diff --git a/sound/pci/ice1712/psc724.c b/sound/pci/ice1712/psc724.c
index bb69d5173983..7842bf98af19 100644
--- a/sound/pci/ice1712/psc724.c
+++ b/sound/pci/ice1712/psc724.c
@@ -383,7 +383,7 @@ static int psc724_init(struct snd_ice1712 *ice)
{
struct psc724_spec *spec;
- spec = kzalloc_obj(*spec, GFP_KERNEL);
+ spec = kzalloc_obj(*spec);
if (!spec)
return -ENOMEM;
ice->spec = spec;
diff --git a/sound/pci/ice1712/quartet.c b/sound/pci/ice1712/quartet.c
index a4f13a3ed6cf..6a44ae969d15 100644
--- a/sound/pci/ice1712/quartet.c
+++ b/sound/pci/ice1712/quartet.c
@@ -969,7 +969,7 @@ static int qtet_init(struct snd_ice1712 *ice)
val = inb(ICEMT1724(ice, RATE));
outb(val | VT1724_SPDIF_MASTER, ICEMT1724(ice, RATE));
- spec = kzalloc_obj(*spec, GFP_KERNEL);
+ spec = kzalloc_obj(*spec);
if (!spec)
return -ENOMEM;
/* qtet is clocked by Xilinx array */
@@ -1005,7 +1005,7 @@ static int qtet_init(struct snd_ice1712 *ice)
ice->num_total_dacs = 2;
ice->num_total_adcs = 2;
- ice->akm = kzalloc_objs(struct snd_akm4xxx, 2, GFP_KERNEL);
+ ice->akm = kzalloc_objs(struct snd_akm4xxx, 2);
ak = ice->akm;
if (!ak)
return -ENOMEM;
diff --git a/sound/pci/ice1712/revo.c b/sound/pci/ice1712/revo.c
index 37556ff6fb36..d9723c297d40 100644
--- a/sound/pci/ice1712/revo.c
+++ b/sound/pci/ice1712/revo.c
@@ -147,7 +147,7 @@ static int revo51_i2c_init(struct snd_ice1712 *ice,
struct revo51_spec *spec;
int err;
- spec = kzalloc_obj(*spec, GFP_KERNEL);
+ spec = kzalloc_obj(*spec);
if (!spec)
return -ENOMEM;
ice->spec = spec;
@@ -470,7 +470,7 @@ static int ap192_ak4114_init(struct snd_ice1712 *ice)
int err;
struct revo51_spec *spec;
- spec = kzalloc_obj(*spec, GFP_KERNEL);
+ spec = kzalloc_obj(*spec);
if (!spec)
return -ENOMEM;
ice->spec = spec;
@@ -515,7 +515,7 @@ static int revo_init(struct snd_ice1712 *ice)
}
/* second stage of initialization, analog parts and others */
- ak = ice->akm = kzalloc_objs(struct snd_akm4xxx, 2, GFP_KERNEL);
+ ak = ice->akm = kzalloc_objs(struct snd_akm4xxx, 2);
if (! ak)
return -ENOMEM;
switch (ice->eeprom.subvendor) {
diff --git a/sound/pci/ice1712/se.c b/sound/pci/ice1712/se.c
index 09f5085d2dde..d78328288fc6 100644
--- a/sound/pci/ice1712/se.c
+++ b/sound/pci/ice1712/se.c
@@ -660,7 +660,7 @@ static int se_init(struct snd_ice1712 *ice)
{
struct se_spec *spec;
- spec = kzalloc_obj(*spec, GFP_KERNEL);
+ spec = kzalloc_obj(*spec);
if (!spec)
return -ENOMEM;
ice->spec = spec;
diff --git a/sound/pci/ice1712/wtm.c b/sound/pci/ice1712/wtm.c
index 0c961b588cd2..c38f1bd1948d 100644
--- a/sound/pci/ice1712/wtm.c
+++ b/sound/pci/ice1712/wtm.c
@@ -579,7 +579,7 @@ static int wtm_init(struct snd_ice1712 *ice)
ice->force_rdma1 = 1;
/*init mutex for dac mute conflict*/
- spec = kzalloc_obj(*spec, GFP_KERNEL);
+ spec = kzalloc_obj(*spec);
if (!spec)
return -ENOMEM;
ice->spec = spec;
diff --git a/sound/pci/mixart/mixart.c b/sound/pci/mixart/mixart.c
index bcf36b102f6f..a7760a23bfe9 100644
--- a/sound/pci/mixart/mixart.c
+++ b/sound/pci/mixart/mixart.c
@@ -255,7 +255,7 @@ snd_mixart_add_ref_pipe(struct snd_mixart *chip, int pcm_number, int capture,
"add_ref_pipe audio chip(%d) pcm(%d)\n",
chip->chip_idx, pcm_number);
- buf = kmalloc_obj(*buf, GFP_KERNEL);
+ buf = kmalloc_obj(*buf);
if (!buf)
return NULL;
@@ -1017,7 +1017,7 @@ static int snd_mixart_create(struct mixart_mgr *mgr, struct snd_card *card, int
.dev_free = snd_mixart_chip_dev_free,
};
- chip = kzalloc_obj(*chip, GFP_KERNEL);
+ chip = kzalloc_obj(*chip);
if (!chip)
return -ENOMEM;
@@ -1243,7 +1243,7 @@ static int snd_mixart_probe(struct pci_dev *pci,
/*
*/
- mgr = kzalloc_obj(*mgr, GFP_KERNEL);
+ mgr = kzalloc_obj(*mgr);
if (! mgr) {
pci_disable_device(pci);
return -ENOMEM;
diff --git a/sound/pci/mixart/mixart_hwdep.c b/sound/pci/mixart/mixart_hwdep.c
index 9b19c83a26c5..439e3ff05fe1 100644
--- a/sound/pci/mixart/mixart_hwdep.c
+++ b/sound/pci/mixart/mixart_hwdep.c
@@ -135,9 +135,9 @@ static int mixart_enum_connectors(struct mixart_mgr *mgr)
struct mixart_audio_info_req *audio_info_req;
struct mixart_audio_info_resp *audio_info;
- connector = kmalloc_obj(*connector, GFP_KERNEL);
- audio_info_req = kmalloc_obj(*audio_info_req, GFP_KERNEL);
- audio_info = kmalloc_obj(*audio_info, GFP_KERNEL);
+ connector = kmalloc_obj(*connector);
+ audio_info_req = kmalloc_obj(*audio_info_req);
+ audio_info = kmalloc_obj(*audio_info);
if (! connector || ! audio_info_req || ! audio_info) {
err = -ENOMEM;
goto __error;
diff --git a/sound/pci/pcxhr/pcxhr.c b/sound/pci/pcxhr/pcxhr.c
index 66e71bdfbc77..e7d63972c2ca 100644
--- a/sound/pci/pcxhr/pcxhr.c
+++ b/sound/pci/pcxhr/pcxhr.c
@@ -1163,7 +1163,7 @@ static int pcxhr_create(struct pcxhr_mgr *mgr,
.dev_free = pcxhr_chip_dev_free,
};
- chip = kzalloc_obj(*chip, GFP_KERNEL);
+ chip = kzalloc_obj(*chip);
if (!chip)
return -ENOMEM;
@@ -1488,7 +1488,7 @@ static int pcxhr_probe(struct pci_dev *pci,
}
/* alloc card manager */
- mgr = kzalloc_obj(*mgr, GFP_KERNEL);
+ mgr = kzalloc_obj(*mgr);
if (! mgr) {
pci_disable_device(pci);
return -ENOMEM;
diff --git a/sound/pci/riptide/riptide.c b/sound/pci/riptide/riptide.c
index 8217a42c5bb7..99c00e46ce23 100644
--- a/sound/pci/riptide/riptide.c
+++ b/sound/pci/riptide/riptide.c
@@ -1595,7 +1595,7 @@ static int snd_riptide_playback_open(struct snd_pcm_substream *substream)
chip->playback_substream[sub_num] = substream;
runtime->hw = snd_riptide_playback;
- data = kzalloc_obj(struct pcmhw, GFP_KERNEL);
+ data = kzalloc_obj(struct pcmhw);
if (data == NULL)
return -ENOMEM;
data->paths = lbus_play_paths[sub_num];
@@ -1618,7 +1618,7 @@ static int snd_riptide_capture_open(struct snd_pcm_substream *substream)
chip->capture_substream = substream;
runtime->hw = snd_riptide_capture;
- data = kzalloc_obj(struct pcmhw, GFP_KERNEL);
+ data = kzalloc_obj(struct pcmhw);
if (data == NULL)
return -ENOMEM;
data->paths = lbus_rec_path;
@@ -1768,7 +1768,7 @@ static int snd_riptide_initialize(struct snd_riptide *chip)
cif = chip->cif;
if (!cif) {
- cif = kzalloc_obj(struct cmdif, GFP_KERNEL);
+ cif = kzalloc_obj(struct cmdif);
if (!cif)
return -ENOMEM;
cif->dev = chip->card->dev;
diff --git a/sound/pci/rme9652/hdspm.c b/sound/pci/rme9652/hdspm.c
index 2978036aa8c5..d8bbedbc8ff6 100644
--- a/sound/pci/rme9652/hdspm.c
+++ b/sound/pci/rme9652/hdspm.c
@@ -6671,7 +6671,7 @@ static int snd_hdspm_create(struct snd_card *card,
if (hdspm_read(hdspm, HDSPM_statusRegister2) &
HDSPM_s2_tco_detect) {
hdspm->midiPorts++;
- hdspm->tco = kzalloc_obj(*hdspm->tco, GFP_KERNEL);
+ hdspm->tco = kzalloc_obj(*hdspm->tco);
if (hdspm->tco)
hdspm_tco_write(hdspm);
@@ -6685,7 +6685,7 @@ static int snd_hdspm_create(struct snd_card *card,
case AES32:
if (hdspm_read(hdspm, HDSPM_statusRegister) & HDSPM_tco_detect) {
hdspm->midiPorts++;
- hdspm->tco = kzalloc_obj(*hdspm->tco, GFP_KERNEL);
+ hdspm->tco = kzalloc_obj(*hdspm->tco);
if (hdspm->tco)
hdspm_tco_write(hdspm);
diff --git a/sound/pci/trident/trident_main.c b/sound/pci/trident/trident_main.c
index b0f1433e530f..fa8d7f271eaf 100644
--- a/sound/pci/trident/trident_main.c
+++ b/sound/pci/trident/trident_main.c
@@ -2888,7 +2888,7 @@ static int snd_trident_mixer(struct snd_trident *trident, int pcm_spdif_device)
.read = snd_trident_codec_read,
};
- uctl = kzalloc_obj(*uctl, GFP_KERNEL);
+ uctl = kzalloc_obj(*uctl);
if (!uctl)
return -ENOMEM;
diff --git a/sound/pci/ymfpci/ymfpci_main.c b/sound/pci/ymfpci/ymfpci_main.c
index dc6f603160ac..b9a09568afc9 100644
--- a/sound/pci/ymfpci/ymfpci_main.c
+++ b/sound/pci/ymfpci/ymfpci_main.c
@@ -864,7 +864,7 @@ static int snd_ymfpci_playback_open_1(struct snd_pcm_substream *substream)
if (err < 0)
return err;
- ypcm = kzalloc_obj(*ypcm, GFP_KERNEL);
+ ypcm = kzalloc_obj(*ypcm);
if (ypcm == NULL)
return -ENOMEM;
ypcm->chip = chip;
@@ -990,7 +990,7 @@ static int snd_ymfpci_capture_open(struct snd_pcm_substream *substream,
if (err < 0)
return err;
- ypcm = kzalloc_obj(*ypcm, GFP_KERNEL);
+ ypcm = kzalloc_obj(*ypcm);
if (ypcm == NULL)
return -ENOMEM;
ypcm->chip = chip;
diff --git a/sound/pcmcia/pdaudiocf/pdaudiocf_core.c b/sound/pcmcia/pdaudiocf/pdaudiocf_core.c
index c0ae099963c8..f6fdebcff716 100644
--- a/sound/pcmcia/pdaudiocf/pdaudiocf_core.c
+++ b/sound/pcmcia/pdaudiocf/pdaudiocf_core.c
@@ -142,7 +142,7 @@ struct snd_pdacf *snd_pdacf_create(struct snd_card *card)
{
struct snd_pdacf *chip;
- chip = kzalloc_obj(*chip, GFP_KERNEL);
+ chip = kzalloc_obj(*chip);
if (chip == NULL)
return NULL;
chip->card = card;
diff --git a/sound/ppc/awacs.c b/sound/ppc/awacs.c
index 5d5fccb71d70..ee36ea2842cd 100644
--- a/sound/ppc/awacs.c
+++ b/sound/ppc/awacs.c
@@ -896,7 +896,7 @@ snd_pmac_awacs_init(struct snd_pmac *chip)
chip->revision = (in_le32(&chip->awacs->codec_stat) >> 12) & 0xf;
#ifdef PMAC_AMP_AVAIL
if (chip->revision == 3 && chip->has_iic && CHECK_CUDA_AMP()) {
- struct awacs_amp *amp = kzalloc_obj(*amp, GFP_KERNEL);
+ struct awacs_amp *amp = kzalloc_obj(*amp);
if (! amp)
return -ENOMEM;
chip->mixer_data = amp;
diff --git a/sound/ppc/beep.c b/sound/ppc/beep.c
index 5e5370e83d56..1b03a7961727 100644
--- a/sound/ppc/beep.c
+++ b/sound/ppc/beep.c
@@ -208,7 +208,7 @@ int snd_pmac_attach_beep(struct snd_pmac *chip)
void *dmabuf;
int err = -ENOMEM;
- beep = kzalloc_obj(*beep, GFP_KERNEL);
+ beep = kzalloc_obj(*beep);
if (! beep)
return -ENOMEM;
dmabuf = dma_alloc_coherent(&chip->pdev->dev, BEEP_BUFLEN * 4,
diff --git a/sound/ppc/daca.c b/sound/ppc/daca.c
index 12829f724d86..f35cb870d26d 100644
--- a/sound/ppc/daca.c
+++ b/sound/ppc/daca.c
@@ -244,7 +244,7 @@ int snd_pmac_daca_init(struct snd_pmac *chip)
request_module("i2c-powermac");
- mix = kzalloc_obj(*mix, GFP_KERNEL);
+ mix = kzalloc_obj(*mix);
if (! mix)
return -ENOMEM;
chip->mixer_data = mix;
diff --git a/sound/ppc/pmac.c b/sound/ppc/pmac.c
index 1384484fd996..ba2048ee6550 100644
--- a/sound/ppc/pmac.c
+++ b/sound/ppc/pmac.c
@@ -1143,7 +1143,7 @@ int snd_pmac_new(struct snd_card *card, struct snd_pmac **chip_return)
*chip_return = NULL;
- chip = kzalloc_obj(*chip, GFP_KERNEL);
+ chip = kzalloc_obj(*chip);
if (chip == NULL)
return -ENOMEM;
chip->card = card;
diff --git a/sound/ppc/tumbler.c b/sound/ppc/tumbler.c
index 6cc51dcecb7e..139c7b25927a 100644
--- a/sound/ppc/tumbler.c
+++ b/sound/ppc/tumbler.c
@@ -1348,7 +1348,7 @@ int snd_pmac_tumbler_init(struct snd_pmac *chip)
request_module("i2c-powermac");
- mix = kzalloc_obj(*mix, GFP_KERNEL);
+ mix = kzalloc_obj(*mix);
if (! mix)
return -ENOMEM;
mix->headphone_irq = -1;
diff --git a/sound/sh/aica.c b/sound/sh/aica.c
index f6a80f04d043..9438c3a68ee9 100644
--- a/sound/sh/aica.c
+++ b/sound/sh/aica.c
@@ -330,7 +330,7 @@ static int snd_aicapcm_pcm_open(struct snd_pcm_substream
if (!enable)
return -ENOENT;
dreamcastcard = substream->pcm->private_data;
- channel = kmalloc_obj(struct aica_channel, GFP_KERNEL);
+ channel = kmalloc_obj(struct aica_channel);
if (!channel)
return -ENOMEM;
/* set defaults for channel */
@@ -559,7 +559,7 @@ static int snd_aica_probe(struct platform_device *devptr)
{
int err;
struct snd_card_aica *dreamcastcard;
- dreamcastcard = kzalloc_obj(struct snd_card_aica, GFP_KERNEL);
+ dreamcastcard = kzalloc_obj(struct snd_card_aica);
if (unlikely(!dreamcastcard))
return -ENOMEM;
err = snd_card_new(&devptr->dev, index, SND_AICA_DRIVER,
diff --git a/sound/sh/sh_dac_audio.c b/sound/sh/sh_dac_audio.c
index e0ba12662da1..2d9a2d5b824e 100644
--- a/sound/sh/sh_dac_audio.c
+++ b/sound/sh/sh_dac_audio.c
@@ -306,7 +306,7 @@ static int snd_sh_dac_create(struct snd_card *card,
*rchip = NULL;
- chip = kzalloc_obj(*chip, GFP_KERNEL);
+ chip = kzalloc_obj(*chip);
if (chip == NULL)
return -ENOMEM;
diff --git a/sound/soc/amd/acp-pcm-dma.c b/sound/soc/amd/acp-pcm-dma.c
index 19c09ba2b510..c76a4bcc9645 100644
--- a/sound/soc/amd/acp-pcm-dma.c
+++ b/sound/soc/amd/acp-pcm-dma.c
@@ -775,7 +775,7 @@ static int acp_dma_open(struct snd_soc_component *component,
struct snd_pcm_runtime *runtime = substream->runtime;
struct audio_drv_data *intr_data = dev_get_drvdata(component->dev);
struct audio_substream_data *adata =
- kzalloc_obj(struct audio_substream_data, GFP_KERNEL);
+ kzalloc_obj(struct audio_substream_data);
if (!adata)
return -ENOMEM;
diff --git a/sound/soc/amd/acp/acp-platform.c b/sound/soc/amd/acp/acp-platform.c
index 66a30da4b801..88613569fd64 100644
--- a/sound/soc/amd/acp/acp-platform.c
+++ b/sound/soc/amd/acp/acp-platform.c
@@ -196,7 +196,7 @@ static int acp_dma_open(struct snd_soc_component *component, struct snd_pcm_subs
struct acp_stream *stream;
int ret;
- stream = kzalloc_obj(*stream, GFP_KERNEL);
+ stream = kzalloc_obj(*stream);
if (!stream)
return -ENOMEM;
diff --git a/sound/soc/amd/acp/acp-sdw-legacy-mach.c b/sound/soc/amd/acp/acp-sdw-legacy-mach.c
index c1c28fee0496..c30ccf23005a 100644
--- a/sound/soc/amd/acp/acp-sdw-legacy-mach.c
+++ b/sound/soc/amd/acp/acp-sdw-legacy-mach.c
@@ -395,13 +395,13 @@ static int soc_card_dai_links_create(struct snd_soc_card *card)
/* One per DAI link, worst case is a DAI link for every endpoint */
struct asoc_sdw_dailink *soc_dais __free(kfree) =
- kzalloc_objs(*soc_dais, num_ends, GFP_KERNEL);
+ kzalloc_objs(*soc_dais, num_ends);
if (!soc_dais)
return -ENOMEM;
/* One per endpoint, ie. each DAI on each codec/amp */
struct asoc_sdw_endpoint *soc_ends __free(kfree) =
- kzalloc_objs(*soc_ends, num_ends, GFP_KERNEL);
+ kzalloc_objs(*soc_ends, num_ends);
if (!soc_ends)
return -ENOMEM;
diff --git a/sound/soc/amd/acp/acp-sdw-sof-mach.c b/sound/soc/amd/acp/acp-sdw-sof-mach.c
index 3319f0996fe6..a0fd8a6f9970 100644
--- a/sound/soc/amd/acp/acp-sdw-sof-mach.c
+++ b/sound/soc/amd/acp/acp-sdw-sof-mach.c
@@ -288,13 +288,13 @@ static int sof_card_dai_links_create(struct snd_soc_card *card)
/* One per DAI link, worst case is a DAI link for every endpoint */
struct asoc_sdw_dailink *sof_dais __free(kfree) =
- kzalloc_objs(*sof_dais, num_ends, GFP_KERNEL);
+ kzalloc_objs(*sof_dais, num_ends);
if (!sof_dais)
return -ENOMEM;
/* One per endpoint, ie. each DAI on each codec/amp */
struct asoc_sdw_endpoint *sof_ends __free(kfree) =
- kzalloc_objs(*sof_ends, num_ends, GFP_KERNEL);
+ kzalloc_objs(*sof_ends, num_ends);
if (!sof_ends)
return -ENOMEM;
diff --git a/sound/soc/amd/ps/ps-pdm-dma.c b/sound/soc/amd/ps/ps-pdm-dma.c
index 5a4ba65847fd..7c529fc6ba99 100644
--- a/sound/soc/amd/ps/ps-pdm-dma.c
+++ b/sound/soc/amd/ps/ps-pdm-dma.c
@@ -189,7 +189,7 @@ static int acp63_pdm_dma_open(struct snd_soc_component *component,
runtime = substream->runtime;
adata = dev_get_drvdata(component->dev);
- pdm_data = kzalloc_obj(*pdm_data, GFP_KERNEL);
+ pdm_data = kzalloc_obj(*pdm_data);
if (!pdm_data)
return -EINVAL;
diff --git a/sound/soc/amd/ps/ps-sdw-dma.c b/sound/soc/amd/ps/ps-sdw-dma.c
index 0c7af398de3a..366d7c4bb07e 100644
--- a/sound/soc/amd/ps/ps-sdw-dma.c
+++ b/sound/soc/amd/ps/ps-sdw-dma.c
@@ -318,7 +318,7 @@ static int acp63_sdw_dma_open(struct snd_soc_component *component,
runtime = substream->runtime;
cpu_dai = snd_soc_rtd_to_cpu(prtd, 0);
amd_manager = snd_soc_dai_get_drvdata(cpu_dai);
- stream = kzalloc_obj(*stream, GFP_KERNEL);
+ stream = kzalloc_obj(*stream);
if (!stream)
return -ENOMEM;
diff --git a/sound/soc/amd/raven/acp3x-pcm-dma.c b/sound/soc/amd/raven/acp3x-pcm-dma.c
index 2716c4e18c1f..4529404ebd93 100644
--- a/sound/soc/amd/raven/acp3x-pcm-dma.c
+++ b/sound/soc/amd/raven/acp3x-pcm-dma.c
@@ -218,7 +218,7 @@ static int acp3x_dma_open(struct snd_soc_component *component,
prtd = snd_soc_substream_to_rtd(substream);
component = snd_soc_rtdcom_lookup(prtd, DRV_NAME);
adata = dev_get_drvdata(component->dev);
- i2s_data = kzalloc_obj(*i2s_data, GFP_KERNEL);
+ i2s_data = kzalloc_obj(*i2s_data);
if (!i2s_data)
return -EINVAL;
diff --git a/sound/soc/amd/renoir/acp3x-pdm-dma.c b/sound/soc/amd/renoir/acp3x-pdm-dma.c
index c2dd512118ad..e832c7c4b96f 100644
--- a/sound/soc/amd/renoir/acp3x-pdm-dma.c
+++ b/sound/soc/amd/renoir/acp3x-pdm-dma.c
@@ -211,7 +211,7 @@ static int acp_pdm_dma_open(struct snd_soc_component *component,
runtime = substream->runtime;
adata = dev_get_drvdata(component->dev);
- pdm_data = kzalloc_obj(*pdm_data, GFP_KERNEL);
+ pdm_data = kzalloc_obj(*pdm_data);
if (!pdm_data)
return -EINVAL;
diff --git a/sound/soc/amd/vangogh/acp5x-pcm-dma.c b/sound/soc/amd/vangogh/acp5x-pcm-dma.c
index c52d2bed5c6c..6ce82cd8859b 100644
--- a/sound/soc/amd/vangogh/acp5x-pcm-dma.c
+++ b/sound/soc/amd/vangogh/acp5x-pcm-dma.c
@@ -213,7 +213,7 @@ static int acp5x_dma_open(struct snd_soc_component *component,
component = snd_soc_rtdcom_lookup(prtd, DRV_NAME);
adata = dev_get_drvdata(component->dev);
- i2s_data = kzalloc_obj(*i2s_data, GFP_KERNEL);
+ i2s_data = kzalloc_obj(*i2s_data);
if (!i2s_data)
return -ENOMEM;
diff --git a/sound/soc/amd/yc/acp6x-pdm-dma.c b/sound/soc/amd/yc/acp6x-pdm-dma.c
index b4fece9d3fac..1c8aad849916 100644
--- a/sound/soc/amd/yc/acp6x-pdm-dma.c
+++ b/sound/soc/amd/yc/acp6x-pdm-dma.c
@@ -187,7 +187,7 @@ static int acp6x_pdm_dma_open(struct snd_soc_component *component,
runtime = substream->runtime;
adata = dev_get_drvdata(component->dev);
- pdm_data = kzalloc_obj(*pdm_data, GFP_KERNEL);
+ pdm_data = kzalloc_obj(*pdm_data);
if (!pdm_data)
return -EINVAL;
diff --git a/sound/soc/atmel/atmel-pcm-pdc.c b/sound/soc/atmel/atmel-pcm-pdc.c
index 3b3e6b2b3a50..1a0c584801f0 100644
--- a/sound/soc/atmel/atmel-pcm-pdc.c
+++ b/sound/soc/atmel/atmel-pcm-pdc.c
@@ -288,7 +288,7 @@ static int atmel_pcm_open(struct snd_soc_component *component,
if (ret < 0)
goto out;
- prtd = kzalloc_obj(struct atmel_runtime_data, GFP_KERNEL);
+ prtd = kzalloc_obj(struct atmel_runtime_data);
if (prtd == NULL) {
ret = -ENOMEM;
goto out;
diff --git a/sound/soc/atmel/mchp-pdmc.c b/sound/soc/atmel/mchp-pdmc.c
index d31508419fe3..ec7233ce1f78 100644
--- a/sound/soc/atmel/mchp-pdmc.c
+++ b/sound/soc/atmel/mchp-pdmc.c
@@ -706,7 +706,7 @@ static int mchp_pdmc_add_chmap_ctls(struct snd_pcm *pcm, struct mchp_pdmc *dd)
if (WARN_ON(pcm->streams[SNDRV_PCM_STREAM_CAPTURE].chmap_kctl))
return -EBUSY;
- info = kzalloc_obj(*info, GFP_KERNEL);
+ info = kzalloc_obj(*info);
if (!info)
return -ENOMEM;
info->pcm = pcm;
diff --git a/sound/soc/au1x/dma.c b/sound/soc/au1x/dma.c
index 46bcdaa0532c..bf5f2185c526 100644
--- a/sound/soc/au1x/dma.c
+++ b/sound/soc/au1x/dma.c
@@ -81,7 +81,7 @@ static int au1000_setup_dma_link(struct audio_stream *stream,
stream->period_size = period_bytes;
stream->periods = periods;
- stream->buffer = kmalloc_obj(struct pcm_period, GFP_KERNEL);
+ stream->buffer = kmalloc_obj(struct pcm_period);
if (!stream->buffer)
return -ENOMEM;
pointer = stream->buffer;
diff --git a/sound/soc/bcm/bcm63xx-pcm-whistler.c b/sound/soc/bcm/bcm63xx-pcm-whistler.c
index a7bc7060f742..6a3fd0d89365 100644
--- a/sound/soc/bcm/bcm63xx-pcm-whistler.c
+++ b/sound/soc/bcm/bcm63xx-pcm-whistler.c
@@ -210,7 +210,7 @@ static int bcm63xx_pcm_open(struct snd_soc_component *component,
goto out;
ret = -ENOMEM;
- prtd = kzalloc_obj(*prtd, GFP_KERNEL);
+ prtd = kzalloc_obj(*prtd);
if (!prtd)
goto out;
diff --git a/sound/soc/codecs/cx20442.c b/sound/soc/codecs/cx20442.c
index b0383eb47407..c0dc69ce4d0e 100644
--- a/sound/soc/codecs/cx20442.c
+++ b/sound/soc/codecs/cx20442.c
@@ -346,7 +346,7 @@ static int cx20442_component_probe(struct snd_soc_component *component)
{
struct cx20442_priv *cx20442;
- cx20442 = kzalloc_obj(struct cx20442_priv, GFP_KERNEL);
+ cx20442 = kzalloc_obj(struct cx20442_priv);
if (cx20442 == NULL)
return -ENOMEM;
diff --git a/sound/soc/codecs/pcm6240.c b/sound/soc/codecs/pcm6240.c
index 6911de5a8c7e..9d86793f1958 100644
--- a/sound/soc/codecs/pcm6240.c
+++ b/sound/soc/codecs/pcm6240.c
@@ -1234,7 +1234,7 @@ static struct pcmdevice_config_info *pcmdevice_add_config(void *ctxt,
struct pcmdevice_block_data **bk_da;
unsigned int config_offset = 0, i;
- cfg_info = kzalloc_obj(struct pcmdevice_config_info, GFP_KERNEL);
+ cfg_info = kzalloc_obj(struct pcmdevice_config_info);
if (!cfg_info) {
*status = -ENOMEM;
goto out;
@@ -1276,7 +1276,7 @@ static struct pcmdevice_config_info *pcmdevice_add_config(void *ctxt,
__func__, i, cfg_info->nblocks);
break;
}
- bk_da[i] = kzalloc_obj(struct pcmdevice_block_data, GFP_KERNEL);
+ bk_da[i] = kzalloc_obj(struct pcmdevice_block_data);
if (!bk_da[i]) {
*status = -ENOMEM;
break;
@@ -1548,7 +1548,7 @@ static int pcmdev_regbin_ready(const struct firmware *fmw, void *ctxt)
ret = -EINVAL;
goto out;
}
- cfg_info = kzalloc_objs(*cfg_info, fw_hdr->nconfig, GFP_KERNEL);
+ cfg_info = kzalloc_objs(*cfg_info, fw_hdr->nconfig);
if (!cfg_info) {
pcm_dev->fw_state = PCMDEVICE_FW_LOAD_FAILED;
ret = -ENOMEM;
diff --git a/sound/soc/codecs/tas2781-fmwlib.c b/sound/soc/codecs/tas2781-fmwlib.c
index d3ded7d5efa1..3304d20ab2ad 100644
--- a/sound/soc/codecs/tas2781-fmwlib.c
+++ b/sound/soc/codecs/tas2781-fmwlib.c
@@ -176,7 +176,7 @@ static struct tasdevice_config_info *tasdevice_add_config(
* of audio cases, flexible configs have been introduced in the
* dsp firmware.
*/
- cfg_info = kzalloc_obj(struct tasdevice_config_info, GFP_KERNEL);
+ cfg_info = kzalloc_obj(struct tasdevice_config_info);
if (!cfg_info) {
*status = -ENOMEM;
goto out;
@@ -232,7 +232,7 @@ static struct tasdevice_config_info *tasdevice_add_config(
__func__, i, cfg_info->nblocks);
break;
}
- bk_da[i] = kzalloc_obj(struct tasdev_blk_data, GFP_KERNEL);
+ bk_da[i] = kzalloc_obj(struct tasdev_blk_data);
if (!bk_da[i]) {
*status = -ENOMEM;
break;
@@ -379,7 +379,7 @@ int tasdevice_rca_parser(void *context, const struct firmware *fmw)
goto out;
}
- cfg_info = kzalloc_objs(*cfg_info, fw_hdr->nconfig, GFP_KERNEL);
+ cfg_info = kzalloc_objs(*cfg_info, fw_hdr->nconfig);
if (!cfg_info) {
ret = -ENOMEM;
tas_priv->fw_state = TASDEVICE_DSP_FW_FAIL;
@@ -2268,7 +2268,7 @@ static int tasdevice_dspfw_ready(const struct firmware *fmw,
return -EINVAL;
}
- tas_priv->fmw = kzalloc_obj(struct tasdevice_fw, GFP_KERNEL);
+ tas_priv->fmw = kzalloc_obj(struct tasdevice_fw);
if (!tas_priv->fmw)
return -ENOMEM;
diff --git a/sound/soc/codecs/tas2783-sdw.c b/sound/soc/codecs/tas2783-sdw.c
index ab3620761f5d..90008d2d06e2 100644
--- a/sound/soc/codecs/tas2783-sdw.c
+++ b/sound/soc/codecs/tas2783-sdw.c
@@ -733,8 +733,8 @@ static void tas2783_fw_ready(const struct firmware *fmw, void *context)
s32 img_sz, ret = 0, cur_file = 0;
s32 offset = 0;
- struct tas_fw_hdr *hdr __free(kfree) = kzalloc_obj(*hdr, GFP_KERNEL);
- struct tas_fw_file *file __free(kfree) = kzalloc_obj(*file, GFP_KERNEL);
+ struct tas_fw_hdr *hdr __free(kfree) = kzalloc_obj(*hdr);
+ struct tas_fw_file *file __free(kfree) = kzalloc_obj(*file);
if (!file || !hdr) {
ret = -ENOMEM;
goto out;
diff --git a/sound/soc/codecs/wcd-clsh-v2.c b/sound/soc/codecs/wcd-clsh-v2.c
index 1da1a85cbe6b..13d07296916f 100644
--- a/sound/soc/codecs/wcd-clsh-v2.c
+++ b/sound/soc/codecs/wcd-clsh-v2.c
@@ -883,7 +883,7 @@ struct wcd_clsh_ctrl *wcd_clsh_ctrl_alloc(struct snd_soc_component *comp,
{
struct wcd_clsh_ctrl *ctrl;
- ctrl = kzalloc_obj(*ctrl, GFP_KERNEL);
+ ctrl = kzalloc_obj(*ctrl);
if (!ctrl)
return ERR_PTR(-ENOMEM);
diff --git a/sound/soc/codecs/wcd-mbhc-v2.c b/sound/soc/codecs/wcd-mbhc-v2.c
index 56b112946b37..bb0c8478a8eb 100644
--- a/sound/soc/codecs/wcd-mbhc-v2.c
+++ b/sound/soc/codecs/wcd-mbhc-v2.c
@@ -1515,7 +1515,7 @@ struct wcd_mbhc *wcd_mbhc_init(struct snd_soc_component *component,
return ERR_PTR(-EINVAL);
}
- mbhc = kzalloc_obj(*mbhc, GFP_KERNEL);
+ mbhc = kzalloc_obj(*mbhc);
if (!mbhc)
return ERR_PTR(-ENOMEM);
diff --git a/sound/soc/codecs/wm0010.c b/sound/soc/codecs/wm0010.c
index f6166428a000..2a8c61a72c17 100644
--- a/sound/soc/codecs/wm0010.c
+++ b/sound/soc/codecs/wm0010.c
@@ -396,7 +396,7 @@ static int wm0010_firmware_load(const char *name, struct snd_soc_component *comp
rec->command, rec->length);
len = rec->length + 8;
- xfer = kzalloc_obj(*xfer, GFP_KERNEL);
+ xfer = kzalloc_obj(*xfer);
if (!xfer) {
ret = -ENOMEM;
goto abort;
diff --git a/sound/soc/codecs/wm_adsp.c b/sound/soc/codecs/wm_adsp.c
index 8a584fd8f5de..1f4aac4017cf 100644
--- a/sound/soc/codecs/wm_adsp.c
+++ b/sound/soc/codecs/wm_adsp.c
@@ -542,7 +542,7 @@ static void wm_adsp_ctl_work(struct work_struct *work)
cs_dsp);
struct snd_kcontrol_new *kcontrol;
- kcontrol = kzalloc_obj(*kcontrol, GFP_KERNEL);
+ kcontrol = kzalloc_obj(*kcontrol);
if (!kcontrol)
return;
@@ -627,7 +627,7 @@ int wm_adsp_control_add(struct cs_dsp_coeff_ctl *cs_ctl)
" %.*s", cs_ctl->subname_len - skip, cs_ctl->subname + skip);
}
- ctl = kzalloc_obj(*ctl, GFP_KERNEL);
+ ctl = kzalloc_obj(*ctl);
if (!ctl)
return -ENOMEM;
ctl->cs_ctl = cs_ctl;
@@ -1259,7 +1259,7 @@ int wm_adsp_compr_open(struct wm_adsp *dsp, struct snd_compr_stream *stream)
}
}
- compr = kzalloc_obj(*compr, GFP_KERNEL);
+ compr = kzalloc_obj(*compr);
if (!compr) {
ret = -ENOMEM;
goto out;
@@ -1477,7 +1477,7 @@ static struct wm_adsp_compr_buf *wm_adsp_buffer_alloc(struct wm_adsp *dsp)
{
struct wm_adsp_compr_buf *buf;
- buf = kzalloc_obj(*buf, GFP_KERNEL);
+ buf = kzalloc_obj(*buf);
if (!buf)
return NULL;
diff --git a/sound/soc/fsl/fsl_asrc_m2m.c b/sound/soc/fsl/fsl_asrc_m2m.c
index 7a16a895cb0e..7d39378c0622 100644
--- a/sound/soc/fsl/fsl_asrc_m2m.c
+++ b/sound/soc/fsl/fsl_asrc_m2m.c
@@ -155,7 +155,7 @@ static int asrc_dmaconfig(struct fsl_asrc_pair *pair,
if (buf_len % max_period_size)
sg_len += 1;
- sg = kmalloc_objs(*sg, sg_len, GFP_KERNEL);
+ sg = kmalloc_objs(*sg, sg_len);
if (!sg)
return -ENOMEM;
@@ -420,7 +420,7 @@ static struct sg_table *fsl_asrc_m2m_map_dma_buf(struct dma_buf_attachment *atta
struct snd_dma_buffer *dmab = attachment->dmabuf->priv;
struct sg_table *sgt;
- sgt = kmalloc_obj(*sgt, GFP_KERNEL);
+ sgt = kmalloc_obj(*sgt);
if (!sgt)
return NULL;
diff --git a/sound/soc/fsl/fsl_dma.c b/sound/soc/fsl/fsl_dma.c
index 44834dba4cb7..26ddbe867b58 100644
--- a/sound/soc/fsl/fsl_dma.c
+++ b/sound/soc/fsl/fsl_dma.c
@@ -848,7 +848,7 @@ static int fsl_soc_dma_probe(struct platform_device *pdev)
return ret;
}
- dma = kzalloc_obj(*dma, GFP_KERNEL);
+ dma = kzalloc_obj(*dma);
if (!dma) {
of_node_put(ssi_np);
return -ENOMEM;
diff --git a/sound/soc/fsl/fsl_qmc_audio.c b/sound/soc/fsl/fsl_qmc_audio.c
index 747c8253b77b..43d401ae2d03 100644
--- a/sound/soc/fsl/fsl_qmc_audio.c
+++ b/sound/soc/fsl/fsl_qmc_audio.c
@@ -316,7 +316,7 @@ static int qmc_audio_pcm_open(struct snd_soc_component *component,
if (ret < 0)
return ret;
- prtd = kzalloc_obj(*prtd, GFP_KERNEL);
+ prtd = kzalloc_obj(*prtd);
if (!prtd)
return -ENOMEM;
diff --git a/sound/soc/fsl/imx-pcm-fiq.c b/sound/soc/fsl/imx-pcm-fiq.c
index 8a1a7c89781f..d51a3de493cb 100644
--- a/sound/soc/fsl/imx-pcm-fiq.c
+++ b/sound/soc/fsl/imx-pcm-fiq.c
@@ -176,7 +176,7 @@ static int snd_imx_open(struct snd_soc_component *component,
struct imx_pcm_runtime_data *iprtd;
int ret;
- iprtd = kzalloc_obj(*iprtd, GFP_KERNEL);
+ iprtd = kzalloc_obj(*iprtd);
if (iprtd == NULL)
return -ENOMEM;
runtime->private_data = iprtd;
diff --git a/sound/soc/fsl/mpc5200_dma.c b/sound/soc/fsl/mpc5200_dma.c
index 41255ff305b3..a593a95aa532 100644
--- a/sound/soc/fsl/mpc5200_dma.c
+++ b/sound/soc/fsl/mpc5200_dma.c
@@ -333,7 +333,7 @@ int mpc5200_audio_dma_create(struct platform_device *op)
}
/* Allocate and initialize the driver private data */
- psc_dma = kzalloc_obj(*psc_dma, GFP_KERNEL);
+ psc_dma = kzalloc_obj(*psc_dma);
if (!psc_dma) {
ret = -ENOMEM;
goto out_unmap;
diff --git a/sound/soc/fsl/p1022_ds.c b/sound/soc/fsl/p1022_ds.c
index 44b62f5615f2..db07817a8024 100644
--- a/sound/soc/fsl/p1022_ds.c
+++ b/sound/soc/fsl/p1022_ds.c
@@ -211,7 +211,7 @@ static int p1022_ds_probe(struct platform_device *pdev)
return -EINVAL;
}
- mdata = kzalloc_obj(struct machine_data, GFP_KERNEL);
+ mdata = kzalloc_obj(struct machine_data);
if (!mdata) {
ret = -ENOMEM;
goto error_put;
diff --git a/sound/soc/fsl/p1022_rdk.c b/sound/soc/fsl/p1022_rdk.c
index 43a95cd590cf..f80d6d04e791 100644
--- a/sound/soc/fsl/p1022_rdk.c
+++ b/sound/soc/fsl/p1022_rdk.c
@@ -226,7 +226,7 @@ static int p1022_rdk_probe(struct platform_device *pdev)
return -EINVAL;
}
- mdata = kzalloc_obj(struct machine_data, GFP_KERNEL);
+ mdata = kzalloc_obj(struct machine_data);
if (!mdata) {
ret = -ENOMEM;
goto error_put;
diff --git a/sound/soc/generic/audio-graph-card.c b/sound/soc/generic/audio-graph-card.c
index 965d7bb55929..8a5f41704739 100644
--- a/sound/soc/generic/audio-graph-card.c
+++ b/sound/soc/generic/audio-graph-card.c
@@ -553,7 +553,7 @@ int audio_graph_parse_of(struct simple_util_priv *priv, struct device *dev)
struct snd_soc_card *card = simple_priv_to_card(priv);
int ret = -ENOMEM;
- struct link_info *li __free(kfree) = kzalloc_obj(*li, GFP_KERNEL);
+ struct link_info *li __free(kfree) = kzalloc_obj(*li);
if (!li)
goto end;
diff --git a/sound/soc/generic/audio-graph-card2.c b/sound/soc/generic/audio-graph-card2.c
index 85043bc3c3d3..0202ed0ee78e 100644
--- a/sound/soc/generic/audio-graph-card2.c
+++ b/sound/soc/generic/audio-graph-card2.c
@@ -1305,7 +1305,7 @@ int audio_graph2_parse_of(struct simple_util_priv *priv, struct device *dev,
struct snd_soc_card *card = simple_priv_to_card(priv);
int ret;
- struct link_info *li __free(kfree) = kzalloc_obj(*li, GFP_KERNEL);
+ struct link_info *li __free(kfree) = kzalloc_obj(*li);
if (!li)
return -ENOMEM;
diff --git a/sound/soc/generic/simple-card.c b/sound/soc/generic/simple-card.c
index 5bc6d7cd1921..06638f9a74b8 100644
--- a/sound/soc/generic/simple-card.c
+++ b/sound/soc/generic/simple-card.c
@@ -726,7 +726,7 @@ static int simple_probe(struct platform_device *pdev)
card->driver_name = "simple-card";
ret = -ENOMEM;
- struct link_info *li __free(kfree) = kzalloc_obj(*li, GFP_KERNEL);
+ struct link_info *li __free(kfree) = kzalloc_obj(*li);
if (!li)
goto end;
diff --git a/sound/soc/intel/atom/sst-mfld-platform-compress.c b/sound/soc/intel/atom/sst-mfld-platform-compress.c
index 877df5ce156d..b0ba1af0a65f 100644
--- a/sound/soc/intel/atom/sst-mfld-platform-compress.c
+++ b/sound/soc/intel/atom/sst-mfld-platform-compress.c
@@ -47,7 +47,7 @@ static int sst_platform_compr_open(struct snd_soc_component *component,
struct snd_compr_runtime *runtime = cstream->runtime;
struct sst_runtime_stream *stream;
- stream = kzalloc_obj(*stream, GFP_KERNEL);
+ stream = kzalloc_obj(*stream);
if (!stream)
return -ENOMEM;
diff --git a/sound/soc/intel/atom/sst-mfld-platform-pcm.c b/sound/soc/intel/atom/sst-mfld-platform-pcm.c
index e007db432b49..67caea39b557 100644
--- a/sound/soc/intel/atom/sst-mfld-platform-pcm.c
+++ b/sound/soc/intel/atom/sst-mfld-platform-pcm.c
@@ -306,7 +306,7 @@ static int sst_media_open(struct snd_pcm_substream *substream,
struct snd_pcm_runtime *runtime = substream->runtime;
struct sst_runtime_stream *stream;
- stream = kzalloc_obj(*stream, GFP_KERNEL);
+ stream = kzalloc_obj(*stream);
if (!stream)
return -ENOMEM;
spin_lock_init(&stream->status_lock);
diff --git a/sound/soc/intel/atom/sst/sst.c b/sound/soc/intel/atom/sst/sst.c
index 5313c8ec605e..d9d695ed7cfb 100644
--- a/sound/soc/intel/atom/sst/sst.c
+++ b/sound/soc/intel/atom/sst/sst.c
@@ -463,7 +463,7 @@ static int intel_sst_suspend(struct device *dev)
return -EBUSY;
/* save the memories */
- fw_save = kzalloc_obj(*fw_save, GFP_KERNEL);
+ fw_save = kzalloc_obj(*fw_save);
if (!fw_save)
return -ENOMEM;
fw_save->iram = kvzalloc(ctx->iram_end - ctx->iram_base, GFP_KERNEL);
diff --git a/sound/soc/intel/atom/sst/sst_ipc.c b/sound/soc/intel/atom/sst/sst_ipc.c
index bdf68d69127f..0d5e71e8a5b5 100644
--- a/sound/soc/intel/atom/sst/sst_ipc.c
+++ b/sound/soc/intel/atom/sst/sst_ipc.c
@@ -31,7 +31,7 @@ struct sst_block *sst_create_block(struct intel_sst_drv *ctx,
struct sst_block *msg;
dev_dbg(ctx->dev, "Enter\n");
- msg = kzalloc_obj(*msg, GFP_KERNEL);
+ msg = kzalloc_obj(*msg);
if (!msg)
return NULL;
msg->condition = false;
diff --git a/sound/soc/intel/atom/sst/sst_loader.c b/sound/soc/intel/atom/sst/sst_loader.c
index 60b73c9c2306..a043443d2887 100644
--- a/sound/soc/intel/atom/sst/sst_loader.c
+++ b/sound/soc/intel/atom/sst/sst_loader.c
@@ -148,7 +148,7 @@ static int sst_fill_memcpy_list(struct list_head *memcpy_list,
{
struct sst_memcpy_list *listnode;
- listnode = kzalloc_obj(*listnode, GFP_KERNEL);
+ listnode = kzalloc_obj(*listnode);
if (listnode == NULL)
return -ENOMEM;
listnode->dstn = destn;
diff --git a/sound/soc/intel/avs/path.c b/sound/soc/intel/avs/path.c
index a080d85d30a6..2291f9728a54 100644
--- a/sound/soc/intel/avs/path.c
+++ b/sound/soc/intel/avs/path.c
@@ -880,7 +880,7 @@ avs_path_module_create(struct avs_dev *adev,
if (module_id < 0)
return ERR_PTR(module_id);
- mod = kzalloc_obj(*mod, GFP_KERNEL);
+ mod = kzalloc_obj(*mod);
if (!mod)
return ERR_PTR(-ENOMEM);
@@ -968,7 +968,7 @@ static struct avs_path_binding *avs_path_binding_create(struct avs_dev *adev,
{
struct avs_path_binding *binding;
- binding = kzalloc_obj(*binding, GFP_KERNEL);
+ binding = kzalloc_obj(*binding);
if (!binding)
return ERR_PTR(-ENOMEM);
@@ -1043,7 +1043,7 @@ avs_path_pipeline_create(struct avs_dev *adev, struct avs_path *owner,
struct avs_tplg_module *tmod;
int ret, i;
- ppl = kzalloc_obj(*ppl, GFP_KERNEL);
+ ppl = kzalloc_obj(*ppl);
if (!ppl)
return ERR_PTR(-ENOMEM);
@@ -1173,7 +1173,7 @@ static struct avs_path *avs_path_create_unlocked(struct avs_dev *adev, u32 dma_i
struct avs_path *path;
int ret;
- path = kzalloc_obj(*path, GFP_KERNEL);
+ path = kzalloc_obj(*path);
if (!path)
return ERR_PTR(-ENOMEM);
diff --git a/sound/soc/intel/avs/pcm.c b/sound/soc/intel/avs/pcm.c
index b8f5e1185a1a..d53c2f76fcd4 100644
--- a/sound/soc/intel/avs/pcm.c
+++ b/sound/soc/intel/avs/pcm.c
@@ -130,7 +130,7 @@ static int avs_dai_startup(struct snd_pcm_substream *substream, struct snd_soc_d
return -EINVAL;
}
- data = kzalloc_obj(*data, GFP_KERNEL);
+ data = kzalloc_obj(*data);
if (!data)
return -ENOMEM;
diff --git a/sound/soc/intel/avs/utils.c b/sound/soc/intel/avs/utils.c
index df4d4e2f6c4f..ee36725ac731 100644
--- a/sound/soc/intel/avs/utils.c
+++ b/sound/soc/intel/avs/utils.c
@@ -124,7 +124,7 @@ avs_module_ida_alloc(struct avs_dev *adev, struct avs_mods_info *newinfo, bool p
tocopy_count = oldinfo->count;
}
- ida_ptrs = kzalloc_objs(*ida_ptrs, newinfo->count, GFP_KERNEL);
+ ida_ptrs = kzalloc_objs(*ida_ptrs, newinfo->count);
if (!ida_ptrs)
return -ENOMEM;
@@ -132,7 +132,7 @@ avs_module_ida_alloc(struct avs_dev *adev, struct avs_mods_info *newinfo, bool p
memcpy(ida_ptrs, adev->mod_idas, tocopy_count * sizeof(*ida_ptrs));
for (i = tocopy_count; i < newinfo->count; i++) {
- ida_ptrs[i] = kzalloc_obj(**ida_ptrs, GFP_KERNEL);
+ ida_ptrs[i] = kzalloc_obj(**ida_ptrs);
if (!ida_ptrs[i]) {
while (i--)
kfree(ida_ptrs[i]);
@@ -246,7 +246,7 @@ int avs_request_firmware(struct avs_dev *adev, const struct firmware **fw_p, con
}
/* FW is not loaded, let's load it now and add to the list */
- entry = kzalloc_obj(*entry, GFP_KERNEL);
+ entry = kzalloc_obj(*entry);
if (!entry)
return -ENOMEM;
diff --git a/sound/soc/intel/boards/sof_sdw.c b/sound/soc/intel/boards/sof_sdw.c
index 65bc023ab01b..f230991f5f8e 100644
--- a/sound/soc/intel/boards/sof_sdw.c
+++ b/sound/soc/intel/boards/sof_sdw.c
@@ -1251,12 +1251,12 @@ static int sof_card_dai_links_create(struct snd_soc_card *card)
* add one additional to act as a terminator such that code can iterate
* until it hits an uninitialised DAI.
*/
- sof_dais = kzalloc_objs(*sof_dais, num_ends + 1, GFP_KERNEL);
+ sof_dais = kzalloc_objs(*sof_dais, num_ends + 1);
if (!sof_dais)
return -ENOMEM;
/* One per endpoint, ie. each DAI on each codec/amp */
- sof_ends = kzalloc_objs(*sof_ends, num_ends, GFP_KERNEL);
+ sof_ends = kzalloc_objs(*sof_ends, num_ends);
if (!sof_ends) {
ret = -ENOMEM;
goto err_dai;
diff --git a/sound/soc/intel/catpt/pcm.c b/sound/soc/intel/catpt/pcm.c
index b3e8ea4b92b4..2c5ea4e0ff3d 100644
--- a/sound/soc/intel/catpt/pcm.c
+++ b/sound/soc/intel/catpt/pcm.c
@@ -263,7 +263,7 @@ static int catpt_dai_startup(struct snd_pcm_substream *substream,
template = catpt_get_stream_template(substream);
- stream = kzalloc_obj(*stream, GFP_KERNEL);
+ stream = kzalloc_obj(*stream);
if (!stream)
return -ENOMEM;
diff --git a/sound/soc/loongson/loongson_dma.c b/sound/soc/loongson/loongson_dma.c
index 8cf0feb64ff9..f26b2951bc9c 100644
--- a/sound/soc/loongson/loongson_dma.c
+++ b/sound/soc/loongson/loongson_dma.c
@@ -243,7 +243,7 @@ static int loongson_pcm_open(struct snd_soc_component *component,
SNDRV_PCM_HW_PARAM_PERIODS);
snd_soc_set_runtime_hwparams(substream, &ls_pcm_hardware);
- prtd = kzalloc_obj(*prtd, GFP_KERNEL);
+ prtd = kzalloc_obj(*prtd);
if (!prtd)
return -ENOMEM;
diff --git a/sound/soc/mediatek/mt8186/mt8186-audsys-clk.c b/sound/soc/mediatek/mt8186/mt8186-audsys-clk.c
index 53f30d12195b..642f4fb55ca6 100644
--- a/sound/soc/mediatek/mt8186/mt8186-audsys-clk.c
+++ b/sound/soc/mediatek/mt8186/mt8186-audsys-clk.c
@@ -135,7 +135,7 @@ int mt8186_audsys_clk_register(struct mtk_base_afe *afe)
}
/* add clk_lookup for devm_clk_get(SND_SOC_DAPM_CLOCK_SUPPLY) */
- cl = kzalloc_obj(*cl, GFP_KERNEL);
+ cl = kzalloc_obj(*cl);
if (!cl)
return -ENOMEM;
diff --git a/sound/soc/mediatek/mt8188/mt8188-audsys-clk.c b/sound/soc/mediatek/mt8188/mt8188-audsys-clk.c
index 2ef5ed3ee200..972f097a13ca 100644
--- a/sound/soc/mediatek/mt8188/mt8188-audsys-clk.c
+++ b/sound/soc/mediatek/mt8188/mt8188-audsys-clk.c
@@ -193,7 +193,7 @@ int mt8188_audsys_clk_register(struct mtk_base_afe *afe)
}
/* add clk_lookup for devm_clk_get(SND_SOC_DAPM_CLOCK_SUPPLY) */
- cl = kzalloc_obj(*cl, GFP_KERNEL);
+ cl = kzalloc_obj(*cl);
if (!cl)
return -ENOMEM;
diff --git a/sound/soc/mediatek/mt8195/mt8195-audsys-clk.c b/sound/soc/mediatek/mt8195/mt8195-audsys-clk.c
index ec069729253e..e6fefc320443 100644
--- a/sound/soc/mediatek/mt8195/mt8195-audsys-clk.c
+++ b/sound/soc/mediatek/mt8195/mt8195-audsys-clk.c
@@ -199,7 +199,7 @@ int mt8195_audsys_clk_register(struct mtk_base_afe *afe)
}
/* add clk_lookup for devm_clk_get(SND_SOC_DAPM_CLOCK_SUPPLY) */
- cl = kzalloc_obj(*cl, GFP_KERNEL);
+ cl = kzalloc_obj(*cl);
if (!cl)
return -ENOMEM;
diff --git a/sound/soc/meson/aiu-fifo.c b/sound/soc/meson/aiu-fifo.c
index b17a62727fc7..8b54f9681d00 100644
--- a/sound/soc/meson/aiu-fifo.c
+++ b/sound/soc/meson/aiu-fifo.c
@@ -196,7 +196,7 @@ int aiu_fifo_dai_probe(struct snd_soc_dai *dai)
{
struct aiu_fifo *fifo;
- fifo = kzalloc_obj(*fifo, GFP_KERNEL);
+ fifo = kzalloc_obj(*fifo);
if (!fifo)
return -ENOMEM;
diff --git a/sound/soc/meson/axg-tdm-formatter.c b/sound/soc/meson/axg-tdm-formatter.c
index 1fd78790c967..f451e4dce442 100644
--- a/sound/soc/meson/axg-tdm-formatter.c
+++ b/sound/soc/meson/axg-tdm-formatter.c
@@ -368,7 +368,7 @@ struct axg_tdm_stream *axg_tdm_stream_alloc(struct axg_tdm_iface *iface)
{
struct axg_tdm_stream *ts;
- ts = kzalloc_obj(*ts, GFP_KERNEL);
+ ts = kzalloc_obj(*ts);
if (ts) {
INIT_LIST_HEAD(&ts->formatter_list);
mutex_init(&ts->lock);
diff --git a/sound/soc/meson/meson-codec-glue.c b/sound/soc/meson/meson-codec-glue.c
index bd9a91d8bc3a..2ff6066e1b6c 100644
--- a/sound/soc/meson/meson-codec-glue.c
+++ b/sound/soc/meson/meson-codec-glue.c
@@ -122,7 +122,7 @@ int meson_codec_glue_input_dai_probe(struct snd_soc_dai *dai)
{
struct meson_codec_glue_input *data;
- data = kzalloc_obj(*data, GFP_KERNEL);
+ data = kzalloc_obj(*data);
if (!data)
return -ENOMEM;
diff --git a/sound/soc/pxa/pxa-ssp.c b/sound/soc/pxa/pxa-ssp.c
index 790e4db9d91b..c34bfa27a446 100644
--- a/sound/soc/pxa/pxa-ssp.c
+++ b/sound/soc/pxa/pxa-ssp.c
@@ -85,7 +85,7 @@ static int pxa_ssp_startup(struct snd_pcm_substream *substream,
clk_prepare_enable(priv->extclk);
- dma = kzalloc_obj(struct snd_dmaengine_dai_dma_data, GFP_KERNEL);
+ dma = kzalloc_obj(struct snd_dmaengine_dai_dma_data);
if (!dma)
return -ENOMEM;
dma->chan_name = substream->stream == SNDRV_PCM_STREAM_PLAYBACK ?
@@ -749,7 +749,7 @@ static int pxa_ssp_probe(struct snd_soc_dai *dai)
struct ssp_priv *priv;
int ret;
- priv = kzalloc_obj(struct ssp_priv, GFP_KERNEL);
+ priv = kzalloc_obj(struct ssp_priv);
if (!priv)
return -ENOMEM;
diff --git a/sound/soc/qcom/lpass-platform.c b/sound/soc/qcom/lpass-platform.c
index 84909af310b4..ce6896cc015d 100644
--- a/sound/soc/qcom/lpass-platform.c
+++ b/sound/soc/qcom/lpass-platform.c
@@ -202,7 +202,7 @@ static int lpass_platform_pcmops_open(struct snd_soc_component *component,
struct regmap *map;
unsigned int dai_id = cpu_dai->driver->id;
- data = kzalloc_obj(*data, GFP_KERNEL);
+ data = kzalloc_obj(*data);
if (!data)
return -ENOMEM;
diff --git a/sound/soc/qcom/qdsp6/q6afe.c b/sound/soc/qcom/qdsp6/q6afe.c
index b1851dac61fa..43d877322bae 100644
--- a/sound/soc/qcom/qdsp6/q6afe.c
+++ b/sound/soc/qcom/qdsp6/q6afe.c
@@ -1359,7 +1359,7 @@ void q6afe_tdm_port_prepare(struct q6afe_port *port,
pcfg->tdm_cfg.slot_width = cfg->slot_width;
pcfg->tdm_cfg.slot_mask = cfg->slot_mask;
- port->scfg = kzalloc_obj(*port->scfg, GFP_KERNEL);
+ port->scfg = kzalloc_obj(*port->scfg);
if (!port->scfg)
return;
diff --git a/sound/soc/qcom/qdsp6/q6apm-dai.c b/sound/soc/qcom/qdsp6/q6apm-dai.c
index dcd960aeab2f..de3bdac3e791 100644
--- a/sound/soc/qcom/qdsp6/q6apm-dai.c
+++ b/sound/soc/qcom/qdsp6/q6apm-dai.c
@@ -348,7 +348,7 @@ static int q6apm_dai_open(struct snd_soc_component *component,
return -EINVAL;
}
- prtd = kzalloc_obj(*prtd, GFP_KERNEL);
+ prtd = kzalloc_obj(*prtd);
if (prtd == NULL)
return -ENOMEM;
@@ -490,7 +490,7 @@ static int q6apm_dai_compr_open(struct snd_soc_component *component,
if (!pdata)
return -EINVAL;
- prtd = kzalloc_obj(*prtd, GFP_KERNEL);
+ prtd = kzalloc_obj(*prtd);
if (prtd == NULL)
return -ENOMEM;
diff --git a/sound/soc/qcom/qdsp6/q6apm.c b/sound/soc/qcom/qdsp6/q6apm.c
index 99d2dcdfac25..44841fde3856 100644
--- a/sound/soc/qcom/qdsp6/q6apm.c
+++ b/sound/soc/qcom/qdsp6/q6apm.c
@@ -57,7 +57,7 @@ static struct audioreach_graph *q6apm_get_audioreach_graph(struct q6apm *apm, ui
if (!info)
return ERR_PTR(-ENODEV);
- graph = kzalloc_obj(*graph, GFP_KERNEL);
+ graph = kzalloc_obj(*graph);
if (!graph)
return ERR_PTR(-ENOMEM);
@@ -220,7 +220,7 @@ int q6apm_map_memory_regions(struct q6apm_graph *graph, unsigned int dir, phys_a
return 0;
}
- buf = kzalloc_objs(struct audio_buffer, periods, GFP_KERNEL);
+ buf = kzalloc_objs(struct audio_buffer, periods);
if (!buf) {
mutex_unlock(&graph->lock);
return -ENOMEM;
@@ -615,7 +615,7 @@ struct q6apm_graph *q6apm_graph_open(struct device *dev, q6apm_cb cb,
return ERR_CAST(ar_graph);
}
- graph = kzalloc_obj(*graph, GFP_KERNEL);
+ graph = kzalloc_obj(*graph);
if (!graph) {
ret = -ENOMEM;
goto put_ar_graph;
diff --git a/sound/soc/qcom/qdsp6/q6asm-dai.c b/sound/soc/qcom/qdsp6/q6asm-dai.c
index 99c1969d5cdc..9e3d176f50c2 100644
--- a/sound/soc/qcom/qdsp6/q6asm-dai.c
+++ b/sound/soc/qcom/qdsp6/q6asm-dai.c
@@ -378,7 +378,7 @@ static int q6asm_dai_open(struct snd_soc_component *component,
return -EINVAL;
}
- prtd = kzalloc_obj(struct q6asm_dai_rtd, GFP_KERNEL);
+ prtd = kzalloc_obj(struct q6asm_dai_rtd);
if (prtd == NULL)
return -ENOMEM;
@@ -621,7 +621,7 @@ static int q6asm_dai_compr_open(struct snd_soc_component *component,
return -EINVAL;
}
- prtd = kzalloc_obj(*prtd, GFP_KERNEL);
+ prtd = kzalloc_obj(*prtd);
if (!prtd)
return -ENOMEM;
diff --git a/sound/soc/qcom/qdsp6/q6asm.c b/sound/soc/qcom/qdsp6/q6asm.c
index 424306da4a25..de0bd8fd08ee 100644
--- a/sound/soc/qcom/qdsp6/q6asm.c
+++ b/sound/soc/qcom/qdsp6/q6asm.c
@@ -850,7 +850,7 @@ struct audio_client *q6asm_audio_client_alloc(struct device *dev, q6asm_cb cb,
return ac;
}
- ac = kzalloc_obj(*ac, GFP_KERNEL);
+ ac = kzalloc_obj(*ac);
if (!ac)
return ERR_PTR(-ENOMEM);
diff --git a/sound/soc/qcom/qdsp6/q6core.c b/sound/soc/qcom/qdsp6/q6core.c
index 393488c571cd..48825756a7ab 100644
--- a/sound/soc/qcom/qdsp6/q6core.c
+++ b/sound/soc/qcom/qdsp6/q6core.c
@@ -327,7 +327,7 @@ EXPORT_SYMBOL_GPL(q6core_is_adsp_ready);
static int q6core_probe(struct apr_device *adev)
{
- g_core = kzalloc_obj(*g_core, GFP_KERNEL);
+ g_core = kzalloc_obj(*g_core);
if (!g_core)
return -ENOMEM;
diff --git a/sound/soc/qcom/qdsp6/q6routing.c b/sound/soc/qcom/qdsp6/q6routing.c
index c3b26b318718..7386226046fa 100644
--- a/sound/soc/qcom/qdsp6/q6routing.c
+++ b/sound/soc/qcom/qdsp6/q6routing.c
@@ -1133,7 +1133,7 @@ static int q6pcm_routing_probe(struct platform_device *pdev)
{
struct device *dev = &pdev->dev;
- routing_data = kzalloc_obj(*routing_data, GFP_KERNEL);
+ routing_data = kzalloc_obj(*routing_data);
if (!routing_data)
return -ENOMEM;
diff --git a/sound/soc/qcom/qdsp6/topology.c b/sound/soc/qcom/qdsp6/topology.c
index 076b55c1f729..e87ad2f65e5d 100644
--- a/sound/soc/qcom/qdsp6/topology.c
+++ b/sound/soc/qcom/qdsp6/topology.c
@@ -42,7 +42,7 @@ static struct audioreach_graph_info *audioreach_tplg_alloc_graph_info(struct q6a
}
*found = false;
- info = kzalloc_obj(*info, GFP_KERNEL);
+ info = kzalloc_obj(*info);
if (!info)
return ERR_PTR(-ENOMEM);
@@ -92,7 +92,7 @@ static struct audioreach_sub_graph *audioreach_tplg_alloc_sub_graph(struct q6apm
}
*found = false;
- sg = kzalloc_obj(*sg, GFP_KERNEL);
+ sg = kzalloc_obj(*sg);
if (!sg)
return ERR_PTR(-ENOMEM);
@@ -134,7 +134,7 @@ static struct audioreach_container *audioreach_tplg_alloc_container(struct q6apm
}
*found = false;
- cont = kzalloc_obj(*cont, GFP_KERNEL);
+ cont = kzalloc_obj(*cont);
if (!cont)
return ERR_PTR(-ENOMEM);
@@ -176,7 +176,7 @@ static struct audioreach_module *audioreach_tplg_alloc_module(struct q6apm *apm,
return mod;
}
*found = false;
- mod = kzalloc_obj(*mod, GFP_KERNEL);
+ mod = kzalloc_obj(*mod);
if (!mod)
return ERR_PTR(-ENOMEM);
@@ -830,7 +830,7 @@ static int audioreach_widget_load_mixer(struct snd_soc_component *component,
w_array = &tplg_w->priv.array[0];
- scontrol = kzalloc_obj(*scontrol, GFP_KERNEL);
+ scontrol = kzalloc_obj(*scontrol);
if (!scontrol)
return -ENOMEM;
@@ -1247,7 +1247,7 @@ static int audioreach_control_load(struct snd_soc_component *scomp, int index,
struct snd_soc_dobj *dobj;
int ret = 0;
- scontrol = kzalloc_obj(*scontrol, GFP_KERNEL);
+ scontrol = kzalloc_obj(*scontrol);
if (!scontrol)
return -ENOMEM;
diff --git a/sound/soc/renesas/siu_dai.c b/sound/soc/renesas/siu_dai.c
index 5e7751c8b1e3..039b1264d90d 100644
--- a/sound/soc/renesas/siu_dai.c
+++ b/sound/soc/renesas/siu_dai.c
@@ -453,7 +453,7 @@ int siu_init_port(int port, struct siu_port **port_info, struct snd_card *card)
struct snd_kcontrol *kctrl;
int ret;
- *port_info = kzalloc_obj(**port_info, GFP_KERNEL);
+ *port_info = kzalloc_obj(**port_info);
if (!*port_info)
return -ENOMEM;
diff --git a/sound/soc/samsung/idma.c b/sound/soc/samsung/idma.c
index 58fade080976..beb7e09e9fac 100644
--- a/sound/soc/samsung/idma.c
+++ b/sound/soc/samsung/idma.c
@@ -290,7 +290,7 @@ static int idma_open(struct snd_soc_component *component,
snd_soc_set_runtime_hwparams(substream, &idma_hardware);
- prtd = kzalloc_obj(struct idma_ctrl, GFP_KERNEL);
+ prtd = kzalloc_obj(struct idma_ctrl);
if (prtd == NULL)
return -ENOMEM;
diff --git a/sound/soc/sdca/sdca_asoc.c b/sound/soc/sdca/sdca_asoc.c
index 51ccaa14b443..a0191e5a5a7d 100644
--- a/sound/soc/sdca/sdca_asoc.c
+++ b/sound/soc/sdca/sdca_asoc.c
@@ -1349,7 +1349,7 @@ int sdca_asoc_set_constraints(struct device *dev, struct regmap *regmap,
dev_dbg(dev, "%s: set channel constraint mask: %#x\n",
entity->label, channel_mask);
- constraint = kzalloc_obj(*constraint, GFP_KERNEL);
+ constraint = kzalloc_obj(*constraint);
if (!constraint)
return -ENOMEM;
diff --git a/sound/soc/sdca/sdca_function_device.c b/sound/soc/sdca/sdca_function_device.c
index dd419f426ba6..feacfbc6a518 100644
--- a/sound/soc/sdca/sdca_function_device.c
+++ b/sound/soc/sdca/sdca_function_device.c
@@ -39,7 +39,7 @@ static struct sdca_dev *sdca_dev_register(struct device *parent,
int ret;
int rc;
- sdev = kzalloc_obj(*sdev, GFP_KERNEL);
+ sdev = kzalloc_obj(*sdev);
if (!sdev)
return ERR_PTR(-ENOMEM);
diff --git a/sound/soc/sdca/sdca_jack.c b/sound/soc/sdca/sdca_jack.c
index 0ce9cf8f850c..49d317d3b8c8 100644
--- a/sound/soc/sdca/sdca_jack.c
+++ b/sound/soc/sdca/sdca_jack.c
@@ -99,7 +99,7 @@ int sdca_jack_process(struct sdca_interrupt *interrupt)
if (kctl) {
struct soc_enum *soc_enum = (struct soc_enum *)kctl->private_value;
- ucontrol = kzalloc_obj(*ucontrol, GFP_KERNEL);
+ ucontrol = kzalloc_obj(*ucontrol);
if (!ucontrol)
return -ENOMEM;
diff --git a/sound/soc/soc-ac97.c b/sound/soc/soc-ac97.c
index f71413a186b8..5f81e3606655 100644
--- a/sound/soc/soc-ac97.c
+++ b/sound/soc/soc-ac97.c
@@ -181,7 +181,7 @@ struct snd_ac97 *snd_soc_alloc_ac97_component(struct snd_soc_component *componen
{
struct snd_ac97 *ac97;
- ac97 = kzalloc_obj(struct snd_ac97, GFP_KERNEL);
+ ac97 = kzalloc_obj(struct snd_ac97);
if (ac97 == NULL)
return ERR_PTR(-ENOMEM);
diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c
index 7c1f2c93d5d3..d0fffef65daf 100644
--- a/sound/soc/soc-core.c
+++ b/sound/soc/soc-core.c
@@ -507,7 +507,7 @@ static struct snd_soc_pcm_runtime *soc_new_pcm_runtime(
/*
* for rtd->dev
*/
- dev = kzalloc_obj(struct device, GFP_KERNEL);
+ dev = kzalloc_obj(struct device);
if (!dev)
return NULL;
diff --git a/sound/soc/soc-dapm.c b/sound/soc/soc-dapm.c
index 54ee54dcba87..5abfb183c3b1 100644
--- a/sound/soc/soc-dapm.c
+++ b/sound/soc/soc-dapm.c
@@ -638,7 +638,7 @@ static int dapm_add_path(
if (ret)
return ret;
- path = kzalloc_obj(struct snd_soc_dapm_path, GFP_KERNEL);
+ path = kzalloc_obj(struct snd_soc_dapm_path);
if (!path)
return -ENOMEM;
@@ -713,7 +713,7 @@ static int dapm_kcontrol_data_alloc(struct snd_soc_dapm_widget *widget,
const char *name;
int ret;
- data = kzalloc_obj(*data, GFP_KERNEL);
+ data = kzalloc_obj(*data);
if (!data)
return -ENOMEM;
@@ -3977,7 +3977,7 @@ static int dapm_dai_link_event_pre_pmu(struct snd_soc_dapm_widget *w,
if (!params)
return -ENOMEM;
- runtime = kzalloc_obj(*runtime, GFP_KERNEL);
+ runtime = kzalloc_obj(*runtime);
if (!runtime)
return -ENOMEM;
diff --git a/sound/soc/soc-generic-dmaengine-pcm.c b/sound/soc/soc-generic-dmaengine-pcm.c
index 1a2b5a8fd198..dbec46703b35 100644
--- a/sound/soc/soc-generic-dmaengine-pcm.c
+++ b/sound/soc/soc-generic-dmaengine-pcm.c
@@ -437,7 +437,7 @@ int snd_dmaengine_pcm_register(struct device *dev,
struct dmaengine_pcm *pcm;
int ret;
- pcm = kzalloc_obj(*pcm, GFP_KERNEL);
+ pcm = kzalloc_obj(*pcm);
if (!pcm)
return -ENOMEM;
diff --git a/sound/soc/soc-ops-test.c b/sound/soc/soc-ops-test.c
index 0f924a6b0d15..dc83107930e4 100644
--- a/sound/soc/soc-ops-test.c
+++ b/sound/soc/soc-ops-test.c
@@ -486,7 +486,7 @@ static void soc_ops_test_access(struct kunit *test)
/* it is too large struct. use kzalloc() */
struct snd_ctl_elem_value *result;
- result = kzalloc_obj(*result, GFP_KERNEL);
+ result = kzalloc_obj(*result);
if (!result)
return;
diff --git a/sound/soc/soc-ops.c b/sound/soc/soc-ops.c
index 1d2ebb4f63e4..f966d4e13c7f 100644
--- a/sound/soc/soc-ops.c
+++ b/sound/soc/soc-ops.c
@@ -454,7 +454,7 @@ static int snd_soc_clip_to_platform_max(struct snd_kcontrol *kctl)
if (!mc->platform_max)
return 0;
- uctl = kzalloc_obj(*uctl, GFP_KERNEL);
+ uctl = kzalloc_obj(*uctl);
if (!uctl)
return -ENOMEM;
diff --git a/sound/soc/soc-pcm.c b/sound/soc/soc-pcm.c
index b3e3ffdcce6f..afa9fad4457f 100644
--- a/sound/soc/soc-pcm.c
+++ b/sound/soc/soc-pcm.c
@@ -1323,7 +1323,7 @@ static int dpcm_be_connect(struct snd_soc_pcm_runtime *fe,
be_substream->pcm->nonatomic = 1;
}
- dpcm = kzalloc_obj(struct snd_soc_dpcm, GFP_KERNEL);
+ dpcm = kzalloc_obj(struct snd_soc_dpcm);
if (!dpcm)
return -ENOMEM;
diff --git a/sound/soc/soc-usb.c b/sound/soc/soc-usb.c
index 57e537edb637..6386404a8db8 100644
--- a/sound/soc/soc-usb.c
+++ b/sound/soc/soc-usb.c
@@ -189,7 +189,7 @@ struct snd_soc_usb *snd_soc_usb_allocate_port(struct snd_soc_component *componen
{
struct snd_soc_usb *usb;
- usb = kzalloc_obj(*usb, GFP_KERNEL);
+ usb = kzalloc_obj(*usb);
if (!usb)
return ERR_PTR(-ENOMEM);
diff --git a/sound/soc/sof/compress.c b/sound/soc/sof/compress.c
index f68fa3551df8..96570121aae0 100644
--- a/sound/soc/sof/compress.c
+++ b/sound/soc/sof/compress.c
@@ -101,7 +101,7 @@ static int sof_compr_open(struct snd_soc_component *component,
struct snd_sof_pcm *spcm;
int dir;
- sstream = kzalloc_obj(*sstream, GFP_KERNEL);
+ sstream = kzalloc_obj(*sstream);
if (!sstream)
return -ENOMEM;
diff --git a/sound/soc/sof/intel/apl.c b/sound/soc/sof/intel/apl.c
index 31494c686c72..b0072601181e 100644
--- a/sound/soc/sof/intel/apl.c
+++ b/sound/soc/sof/intel/apl.c
@@ -54,7 +54,7 @@ int sof_apl_ops_init(struct snd_sof_dev *sdev)
if (sdev->pdata->ipc_type == SOF_IPC_TYPE_4) {
struct sof_ipc4_fw_data *ipc4_data;
- sdev->private = kzalloc_obj(*ipc4_data, GFP_KERNEL);
+ sdev->private = kzalloc_obj(*ipc4_data);
if (!sdev->private)
return -ENOMEM;
diff --git a/sound/soc/sof/intel/cnl.c b/sound/soc/sof/intel/cnl.c
index b55dd9ace41f..660c1475e5a4 100644
--- a/sound/soc/sof/intel/cnl.c
+++ b/sound/soc/sof/intel/cnl.c
@@ -401,7 +401,7 @@ int sof_cnl_ops_init(struct snd_sof_dev *sdev)
if (sdev->pdata->ipc_type == SOF_IPC_TYPE_4) {
struct sof_ipc4_fw_data *ipc4_data;
- sdev->private = kzalloc_obj(*ipc4_data, GFP_KERNEL);
+ sdev->private = kzalloc_obj(*ipc4_data);
if (!sdev->private)
return -ENOMEM;
diff --git a/sound/soc/sof/intel/hda-mlink.c b/sound/soc/sof/intel/hda-mlink.c
index c9790f37928f..ce603a2343de 100644
--- a/sound/soc/sof/intel/hda-mlink.c
+++ b/sound/soc/sof/intel/hda-mlink.c
@@ -392,7 +392,7 @@ static int hda_ml_alloc_h2link(struct hdac_bus *bus, int index)
struct hdac_ext_link *hlink;
int ret;
- h2link = kzalloc_obj(*h2link, GFP_KERNEL);
+ h2link = kzalloc_obj(*h2link);
if (!h2link)
return -ENOMEM;
diff --git a/sound/soc/sof/intel/icl.c b/sound/soc/sof/intel/icl.c
index 8079a1363b45..c1018893750c 100644
--- a/sound/soc/sof/intel/icl.c
+++ b/sound/soc/sof/intel/icl.c
@@ -122,7 +122,7 @@ int sof_icl_ops_init(struct snd_sof_dev *sdev)
if (sdev->pdata->ipc_type == SOF_IPC_TYPE_4) {
struct sof_ipc4_fw_data *ipc4_data;
- sdev->private = kzalloc_obj(*ipc4_data, GFP_KERNEL);
+ sdev->private = kzalloc_obj(*ipc4_data);
if (!sdev->private)
return -ENOMEM;
diff --git a/sound/soc/sof/intel/mtl.c b/sound/soc/sof/intel/mtl.c
index e46b0fd5746f..9503d00e6002 100644
--- a/sound/soc/sof/intel/mtl.c
+++ b/sound/soc/sof/intel/mtl.c
@@ -734,7 +734,7 @@ int sof_mtl_set_ops(struct snd_sof_dev *sdev, struct snd_sof_dsp_ops *dsp_ops)
dsp_ops->core_get = mtl_dsp_core_get;
dsp_ops->core_put = mtl_dsp_core_put;
- sdev->private = kzalloc_obj(struct sof_ipc4_fw_data, GFP_KERNEL);
+ sdev->private = kzalloc_obj(struct sof_ipc4_fw_data);
if (!sdev->private)
return -ENOMEM;
diff --git a/sound/soc/sof/intel/skl.c b/sound/soc/sof/intel/skl.c
index eb94027a5724..90519ebd3168 100644
--- a/sound/soc/sof/intel/skl.c
+++ b/sound/soc/sof/intel/skl.c
@@ -62,7 +62,7 @@ int sof_skl_ops_init(struct snd_sof_dev *sdev)
/* probe/remove/shutdown */
sof_skl_ops.shutdown = hda_dsp_shutdown;
- sdev->private = kzalloc_obj(*ipc4_data, GFP_KERNEL);
+ sdev->private = kzalloc_obj(*ipc4_data);
if (!sdev->private)
return -ENOMEM;
diff --git a/sound/soc/sof/intel/telemetry.c b/sound/soc/sof/intel/telemetry.c
index 2e2cc6e2ea3a..967b5b577f03 100644
--- a/sound/soc/sof/intel/telemetry.c
+++ b/sound/soc/sof/intel/telemetry.c
@@ -29,7 +29,7 @@ void sof_ipc4_intel_dump_telemetry_state(struct snd_sof_dev *sdev, u32 flags)
if (!slot_offset)
return;
- telemetry_data = kmalloc_obj(*telemetry_data, GFP_KERNEL);
+ telemetry_data = kmalloc_obj(*telemetry_data);
if (!telemetry_data)
return;
sof_mailbox_read(sdev, slot_offset, telemetry_data, sizeof(*telemetry_data));
@@ -39,7 +39,7 @@ void sof_ipc4_intel_dump_telemetry_state(struct snd_sof_dev *sdev, u32 flags)
goto free_telemetry_data;
}
- block = kmalloc_obj(*block, GFP_KERNEL);
+ block = kmalloc_obj(*block);
if (!block)
goto free_telemetry_data;
diff --git a/sound/soc/sof/intel/tgl.c b/sound/soc/sof/intel/tgl.c
index 1c07f5882e1c..7936361e2e39 100644
--- a/sound/soc/sof/intel/tgl.c
+++ b/sound/soc/sof/intel/tgl.c
@@ -90,7 +90,7 @@ int sof_tgl_ops_init(struct snd_sof_dev *sdev)
if (sdev->pdata->ipc_type == SOF_IPC_TYPE_4) {
struct sof_ipc4_fw_data *ipc4_data;
- sdev->private = kzalloc_obj(*ipc4_data, GFP_KERNEL);
+ sdev->private = kzalloc_obj(*ipc4_data);
if (!sdev->private)
return -ENOMEM;
diff --git a/sound/soc/sof/ipc3-dtrace.c b/sound/soc/sof/ipc3-dtrace.c
index d5cb86b2ad08..22053357731a 100644
--- a/sound/soc/sof/ipc3-dtrace.c
+++ b/sound/soc/sof/ipc3-dtrace.c
@@ -126,7 +126,7 @@ static int trace_filter_parse(struct snd_sof_dev *sdev, char *string,
capacity += TRACE_FILTER_ELEMENTS_PER_ENTRY;
entry = strchr(entry + 1, entry_delimiter[0]);
}
- *out = kmalloc_objs(**out, capacity, GFP_KERNEL);
+ *out = kmalloc_objs(**out, capacity);
if (!*out)
return -ENOMEM;
diff --git a/sound/soc/sof/ipc3-topology.c b/sound/soc/sof/ipc3-topology.c
index b4fc27727106..dac8e7ba5981 100644
--- a/sound/soc/sof/ipc3-topology.c
+++ b/sound/soc/sof/ipc3-topology.c
@@ -524,7 +524,7 @@ static int sof_ipc3_widget_setup_comp_pipeline(struct snd_sof_widget *swidget)
struct snd_sof_widget *comp_swidget;
int ret;
- pipeline = kzalloc_obj(*pipeline, GFP_KERNEL);
+ pipeline = kzalloc_obj(*pipeline);
if (!pipeline)
return -ENOMEM;
@@ -589,7 +589,7 @@ static int sof_ipc3_widget_setup_comp_buffer(struct snd_sof_widget *swidget)
struct sof_ipc_buffer *buffer;
int ret;
- buffer = kzalloc_obj(*buffer, GFP_KERNEL);
+ buffer = kzalloc_obj(*buffer);
if (!buffer)
return -ENOMEM;
@@ -893,7 +893,7 @@ static int sof_process_load(struct snd_soc_component *scomp,
/* allocate struct for widget control data sizes and types */
if (widget->num_kcontrols) {
- wdata = kzalloc_objs(*wdata, widget->num_kcontrols, GFP_KERNEL);
+ wdata = kzalloc_objs(*wdata, widget->num_kcontrols);
if (!wdata)
return -ENOMEM;
@@ -1567,7 +1567,7 @@ static int sof_ipc3_widget_setup_comp_dai(struct snd_sof_widget *swidget)
struct snd_sof_dai_link *slink;
int ret;
- private = kzalloc_obj(*private, GFP_KERNEL);
+ private = kzalloc_obj(*private);
if (!private)
return -ENOMEM;
diff --git a/sound/soc/sof/ipc4-pcm.c b/sound/soc/sof/ipc4-pcm.c
index a21dc53e1026..f82b080de4a9 100644
--- a/sound/soc/sof/ipc4-pcm.c
+++ b/sound/soc/sof/ipc4-pcm.c
@@ -939,7 +939,7 @@ static int sof_ipc4_pcm_setup(struct snd_sof_dev *sdev, struct snd_sof_pcm *spcm
return -ENOMEM;
}
- stream_priv = kzalloc_obj(*stream_priv, GFP_KERNEL);
+ stream_priv = kzalloc_obj(*stream_priv);
if (!stream_priv) {
sof_ipc4_pcm_free(sdev, spcm);
return -ENOMEM;
@@ -951,7 +951,7 @@ static int sof_ipc4_pcm_setup(struct snd_sof_dev *sdev, struct snd_sof_pcm *spcm
if (!support_info || stream == SNDRV_PCM_STREAM_CAPTURE)
continue;
- time_info = kzalloc_obj(*time_info, GFP_KERNEL);
+ time_info = kzalloc_obj(*time_info);
if (!time_info) {
sof_ipc4_pcm_free(sdev, spcm);
return -ENOMEM;
diff --git a/sound/soc/sof/ipc4-topology.c b/sound/soc/sof/ipc4-topology.c
index 051b02b222f9..a2e9fef2760c 100644
--- a/sound/soc/sof/ipc4-topology.c
+++ b/sound/soc/sof/ipc4-topology.c
@@ -629,7 +629,7 @@ static int sof_ipc4_widget_setup_pcm(struct snd_sof_widget *swidget)
int node_type = 0;
int ret, dir;
- ipc4_copier = kzalloc_obj(*ipc4_copier, GFP_KERNEL);
+ ipc4_copier = kzalloc_obj(*ipc4_copier);
if (!ipc4_copier)
return -ENOMEM;
@@ -690,7 +690,7 @@ static int sof_ipc4_widget_setup_pcm(struct snd_sof_widget *swidget)
}
skip_gtw_cfg:
- ipc4_copier->gtw_attr = kzalloc_obj(*ipc4_copier->gtw_attr, GFP_KERNEL);
+ ipc4_copier->gtw_attr = kzalloc_obj(*ipc4_copier->gtw_attr);
if (!ipc4_copier->gtw_attr) {
ret = -ENOMEM;
goto free_available_fmt;
@@ -759,7 +759,7 @@ static int sof_ipc4_widget_setup_comp_dai(struct snd_sof_widget *swidget)
int node_type = 0;
int ret;
- ipc4_copier = kzalloc_obj(*ipc4_copier, GFP_KERNEL);
+ ipc4_copier = kzalloc_obj(*ipc4_copier);
if (!ipc4_copier)
return -ENOMEM;
@@ -826,7 +826,7 @@ static int sof_ipc4_widget_setup_comp_dai(struct snd_sof_widget *swidget)
break;
}
- blob = kzalloc_obj(*blob, GFP_KERNEL);
+ blob = kzalloc_obj(*blob);
if (!blob) {
ret = -ENOMEM;
goto free_available_fmt;
@@ -933,7 +933,7 @@ static int sof_ipc4_widget_setup_comp_pipeline(struct snd_sof_widget *swidget)
struct snd_sof_pipeline *spipe = swidget->spipe;
int ret;
- pipeline = kzalloc_obj(*pipeline, GFP_KERNEL);
+ pipeline = kzalloc_obj(*pipeline);
if (!pipeline)
return -ENOMEM;
@@ -992,7 +992,7 @@ static int sof_ipc4_widget_setup_comp_pga(struct snd_sof_widget *swidget)
struct sof_ipc4_gain *gain;
int ret;
- gain = kzalloc_obj(*gain, GFP_KERNEL);
+ gain = kzalloc_obj(*gain);
if (!gain)
return -ENOMEM;
@@ -1051,7 +1051,7 @@ static int sof_ipc4_widget_setup_comp_mixer(struct snd_sof_widget *swidget)
dev_dbg(scomp->dev, "Updating IPC structure for %s\n", swidget->widget->name);
- mixer = kzalloc_obj(*mixer, GFP_KERNEL);
+ mixer = kzalloc_obj(*mixer);
if (!mixer)
return -ENOMEM;
@@ -1083,7 +1083,7 @@ static int sof_ipc4_widget_setup_comp_src(struct snd_sof_widget *swidget)
dev_dbg(scomp->dev, "Updating IPC structure for %s\n", swidget->widget->name);
- src = kzalloc_obj(*src, GFP_KERNEL);
+ src = kzalloc_obj(*src);
if (!src)
return -ENOMEM;
@@ -1126,7 +1126,7 @@ static int sof_ipc4_widget_setup_comp_asrc(struct snd_sof_widget *swidget)
dev_dbg(scomp->dev, "Updating IPC structure for %s\n", swidget->widget->name);
- asrc = kzalloc_obj(*asrc, GFP_KERNEL);
+ asrc = kzalloc_obj(*asrc);
if (!asrc)
return -ENOMEM;
@@ -1209,7 +1209,7 @@ static int sof_ipc4_widget_setup_comp_process(struct snd_sof_widget *swidget)
void *cfg;
int ret;
- process = kzalloc_obj(*process, GFP_KERNEL);
+ process = kzalloc_obj(*process);
if (!process)
return -ENOMEM;
diff --git a/sound/soc/sof/sof-client-probes-ipc4.c b/sound/soc/sof/sof-client-probes-ipc4.c
index 2ab282e98a61..88397c7dc4c3 100644
--- a/sound/soc/sof/sof-client-probes-ipc4.c
+++ b/sound/soc/sof/sof-client-probes-ipc4.c
@@ -327,7 +327,7 @@ static int ipc4_probes_points_add(struct sof_client_dev *cdev,
* performance issue I wrote the conversion explicitly open for
* future development.
*/
- points = kzalloc_objs(*points, num_desc, GFP_KERNEL);
+ points = kzalloc_objs(*points, num_desc);
if (!points)
return -ENOMEM;
diff --git a/sound/soc/sof/sof-client.c b/sound/soc/sof/sof-client.c
index 6cc9b7616100..c7bbf09e547f 100644
--- a/sound/soc/sof/sof-client.c
+++ b/sound/soc/sof/sof-client.c
@@ -554,7 +554,7 @@ int sof_client_register_ipc_rx_handler(struct sof_client_dev *cdev,
return -EINVAL;
}
- event = kmalloc_obj(*event, GFP_KERNEL);
+ event = kmalloc_obj(*event);
if (!event)
return -ENOMEM;
@@ -608,7 +608,7 @@ int sof_client_register_fw_state_handler(struct sof_client_dev *cdev,
if (!callback)
return -EINVAL;
- event = kmalloc_obj(*event, GFP_KERNEL);
+ event = kmalloc_obj(*event);
if (!event)
return -ENOMEM;
diff --git a/sound/soc/sof/stream-ipc.c b/sound/soc/sof/stream-ipc.c
index e7541e1976b8..78758cf58f01 100644
--- a/sound/soc/sof/stream-ipc.c
+++ b/sound/soc/sof/stream-ipc.c
@@ -99,7 +99,7 @@ EXPORT_SYMBOL(sof_set_stream_data_offset);
int sof_stream_pcm_open(struct snd_sof_dev *sdev,
struct snd_pcm_substream *substream)
{
- struct sof_stream *stream = kmalloc_obj(*stream, GFP_KERNEL);
+ struct sof_stream *stream = kmalloc_obj(*stream);
if (!stream)
return -ENOMEM;
diff --git a/sound/soc/sof/topology.c b/sound/soc/sof/topology.c
index 46d78de5d9da..18e2401152c8 100644
--- a/sound/soc/sof/topology.c
+++ b/sound/soc/sof/topology.c
@@ -973,7 +973,7 @@ static int sof_control_load(struct snd_soc_component *scomp, int index,
dev_dbg(scomp->dev, "tplg: load control type %d name : %s\n",
hdr->type, hdr->name);
- scontrol = kzalloc_obj(*scontrol, GFP_KERNEL);
+ scontrol = kzalloc_obj(*scontrol);
if (!scontrol)
return -ENOMEM;
@@ -1233,7 +1233,7 @@ static int sof_widget_parse_tokens(struct snd_soc_component *scomp, struct snd_s
num_tuples += token_list[object_token_list[i]].count;
/* allocate memory for tuples array */
- swidget->tuples = kzalloc_objs(*swidget->tuples, num_tuples, GFP_KERNEL);
+ swidget->tuples = kzalloc_objs(*swidget->tuples, num_tuples);
if (!swidget->tuples)
return -ENOMEM;
@@ -1420,7 +1420,7 @@ static int sof_widget_ready(struct snd_soc_component *scomp, int index,
int token_list_size = 0;
int ret = 0;
- swidget = kzalloc_obj(*swidget, GFP_KERNEL);
+ swidget = kzalloc_obj(*swidget);
if (!swidget)
return -ENOMEM;
@@ -1496,7 +1496,7 @@ static int sof_widget_ready(struct snd_soc_component *scomp, int index,
switch (w->id) {
case snd_soc_dapm_dai_in:
case snd_soc_dapm_dai_out:
- dai = kzalloc_obj(*dai, GFP_KERNEL);
+ dai = kzalloc_obj(*dai);
if (!dai) {
ret = -ENOMEM;
goto widget_free;
@@ -1586,7 +1586,7 @@ static int sof_widget_ready(struct snd_soc_component *scomp, int index,
if (w->id == snd_soc_dapm_scheduler) {
struct snd_sof_pipeline *spipe;
- spipe = kzalloc_obj(*spipe, GFP_KERNEL);
+ spipe = kzalloc_obj(*spipe);
if (!spipe) {
ret = -ENOMEM;
goto free;
@@ -1739,7 +1739,7 @@ static int sof_dai_load(struct snd_soc_component *scomp, int index,
if (!pcm)
return 0;
- spcm = kzalloc_obj(*spcm, GFP_KERNEL);
+ spcm = kzalloc_obj(*spcm);
if (!spcm)
return -ENOMEM;
@@ -1906,7 +1906,7 @@ static int sof_link_load(struct snd_soc_component *scomp, int index, struct snd_
return -EINVAL;
}
- slink = kzalloc_obj(*slink, GFP_KERNEL);
+ slink = kzalloc_obj(*slink);
if (!slink)
return -ENOMEM;
@@ -1999,7 +1999,7 @@ static int sof_link_load(struct snd_soc_component *scomp, int index, struct snd_
}
/* allocate memory for tuples array */
- slink->tuples = kzalloc_objs(*slink->tuples, num_tuples, GFP_KERNEL);
+ slink->tuples = kzalloc_objs(*slink->tuples, num_tuples);
if (!slink->tuples) {
kfree(slink->hw_configs);
kfree(slink);
@@ -2094,7 +2094,7 @@ static int sof_route_load(struct snd_soc_component *scomp, int index,
int ret = 0;
/* allocate memory for sroute and connect */
- sroute = kzalloc_obj(*sroute, GFP_KERNEL);
+ sroute = kzalloc_obj(*sroute);
if (!sroute)
return -ENOMEM;
@@ -2398,11 +2398,11 @@ static int sof_dspless_widget_ready(struct snd_soc_component *scomp, int index,
struct snd_sof_widget *swidget;
struct snd_sof_dai *sdai;
- swidget = kzalloc_obj(*swidget, GFP_KERNEL);
+ swidget = kzalloc_obj(*swidget);
if (!swidget)
return -ENOMEM;
- sdai = kzalloc_obj(*sdai, GFP_KERNEL);
+ sdai = kzalloc_obj(*sdai);
if (!sdai) {
kfree(swidget);
return -ENOMEM;
diff --git a/sound/soc/sprd/sprd-pcm-compress.c b/sound/soc/sprd/sprd-pcm-compress.c
index 0d544ff5a24f..a7d437b49fbf 100644
--- a/sound/soc/sprd/sprd-pcm-compress.c
+++ b/sound/soc/sprd/sprd-pcm-compress.c
@@ -160,7 +160,7 @@ static int sprd_platform_compr_dma_config(struct snd_soc_component *component,
return -ENODEV;
}
- sgt = sg = kzalloc_objs(*sg, sg_num, GFP_KERNEL);
+ sgt = sg = kzalloc_objs(*sg, sg_num);
if (!sg) {
ret = -ENOMEM;
goto sg_err;
diff --git a/sound/soc/xilinx/xlnx_formatter_pcm.c b/sound/soc/xilinx/xlnx_formatter_pcm.c
index 7cfe09fdd2a0..04a4eae1bc92 100644
--- a/sound/soc/xilinx/xlnx_formatter_pcm.c
+++ b/sound/soc/xilinx/xlnx_formatter_pcm.c
@@ -341,7 +341,7 @@ static int xlnx_formatter_pcm_open(struct snd_soc_component *component,
!adata->s2mm_presence)
return -ENODEV;
- stream_data = kzalloc_obj(*stream_data, GFP_KERNEL);
+ stream_data = kzalloc_obj(*stream_data);
if (!stream_data)
return -ENOMEM;
diff --git a/sound/sound_core.c b/sound/sound_core.c
index 741e62cffe6e..10db8c699630 100644
--- a/sound/sound_core.c
+++ b/sound/sound_core.c
@@ -238,7 +238,7 @@ static DEFINE_SPINLOCK(sound_loader_lock);
static int sound_insert_unit(struct sound_unit **list, const struct file_operations *fops, int index, int low, int top, const char *name, umode_t mode, struct device *dev)
{
- struct sound_unit *s = kmalloc_obj(*s, GFP_KERNEL);
+ struct sound_unit *s = kmalloc_obj(*s);
int r;
if (!s)
diff --git a/sound/synth/emux/emux.c b/sound/synth/emux/emux.c
index f690e8f812d9..c38903144c72 100644
--- a/sound/synth/emux/emux.c
+++ b/sound/synth/emux/emux.c
@@ -26,7 +26,7 @@ int snd_emux_new(struct snd_emux **remu)
struct snd_emux *emu;
*remu = NULL;
- emu = kzalloc_obj(*emu, GFP_KERNEL);
+ emu = kzalloc_obj(*emu);
if (emu == NULL)
return -ENOMEM;
diff --git a/sound/synth/emux/emux_seq.c b/sound/synth/emux/emux_seq.c
index 9a279d07364d..62d1ba66721c 100644
--- a/sound/synth/emux/emux_seq.c
+++ b/sound/synth/emux/emux_seq.c
@@ -132,7 +132,7 @@ snd_emux_create_port(struct snd_emux *emu, char *name,
int i, type, cap;
/* Allocate structures for this channel */
- p = kzalloc_obj(*p, GFP_KERNEL);
+ p = kzalloc_obj(*p);
if (!p)
return NULL;
@@ -351,7 +351,7 @@ int snd_emux_init_virmidi(struct snd_emux *emu, struct snd_card *card)
if (emu->midi_ports <= 0)
return 0;
- emu->vmidi = kzalloc_objs(*emu->vmidi, emu->midi_ports, GFP_KERNEL);
+ emu->vmidi = kzalloc_objs(*emu->vmidi, emu->midi_ports);
if (!emu->vmidi)
return -ENOMEM;
diff --git a/sound/synth/emux/soundfont.c b/sound/synth/emux/soundfont.c
index 01996637d257..c172b53b17a4 100644
--- a/sound/synth/emux/soundfont.c
+++ b/sound/synth/emux/soundfont.c
@@ -230,7 +230,7 @@ newsf(struct snd_sf_list *sflist, int type, char *name)
}
/* not found -- create a new one */
- sf = kzalloc_obj(*sf, GFP_KERNEL);
+ sf = kzalloc_obj(*sf);
if (sf == NULL)
return NULL;
sf->id = sflist->fonts_size;
@@ -309,7 +309,7 @@ sf_zone_new(struct snd_sf_list *sflist, struct snd_soundfont *sf)
{
struct snd_sf_zone *zp;
- zp = kzalloc_obj(*zp, GFP_KERNEL);
+ zp = kzalloc_obj(*zp);
if (!zp)
return NULL;
zp->next = sf->zones;
@@ -342,7 +342,7 @@ sf_sample_new(struct snd_sf_list *sflist, struct snd_soundfont *sf)
{
struct snd_sf_sample *sp;
- sp = kzalloc_obj(*sp, GFP_KERNEL);
+ sp = kzalloc_obj(*sp);
if (!sp)
return NULL;
@@ -1391,7 +1391,7 @@ snd_sf_new(struct snd_sf_callback *callback, struct snd_util_memhdr *hdr)
{
struct snd_sf_list *sflist;
- sflist = kzalloc_obj(*sflist, GFP_KERNEL);
+ sflist = kzalloc_obj(*sflist);
if (!sflist)
return NULL;
diff --git a/sound/synth/util_mem.c b/sound/synth/util_mem.c
index 36fa4fc9632c..21893e5612fb 100644
--- a/sound/synth/util_mem.c
+++ b/sound/synth/util_mem.c
@@ -26,7 +26,7 @@ snd_util_memhdr_new(int memsize)
{
struct snd_util_memhdr *hdr;
- hdr = kzalloc_obj(*hdr, GFP_KERNEL);
+ hdr = kzalloc_obj(*hdr);
if (hdr == NULL)
return NULL;
hdr->size = memsize;
diff --git a/sound/usb/6fire/comm.c b/sound/usb/6fire/comm.c
index b7378a514e21..9a0b85653c61 100644
--- a/sound/usb/6fire/comm.c
+++ b/sound/usb/6fire/comm.c
@@ -141,7 +141,7 @@ static int usb6fire_comm_write16(struct comm_runtime *rt, u8 request,
int usb6fire_comm_init(struct sfire_chip *chip)
{
- struct comm_runtime *rt = kzalloc_obj(struct comm_runtime, GFP_KERNEL);
+ struct comm_runtime *rt = kzalloc_obj(struct comm_runtime);
struct urb *urb;
int ret;
diff --git a/sound/usb/6fire/firmware.c b/sound/usb/6fire/firmware.c
index 6707fb8a2d1e..123c1c6539b8 100644
--- a/sound/usb/6fire/firmware.c
+++ b/sound/usb/6fire/firmware.c
@@ -195,7 +195,7 @@ static int usb6fire_fw_ezusb_upload(
u8 data;
struct usb_device *device = interface_to_usbdev(intf);
const struct firmware *fw = NULL;
- struct ihex_record *rec = kmalloc_obj(struct ihex_record, GFP_KERNEL);
+ struct ihex_record *rec = kmalloc_obj(struct ihex_record);
if (!rec)
return -ENOMEM;
diff --git a/sound/usb/6fire/midi.c b/sound/usb/6fire/midi.c
index 40c935fb7592..6b0bb096f27a 100644
--- a/sound/usb/6fire/midi.c
+++ b/sound/usb/6fire/midi.c
@@ -140,7 +140,7 @@ static const struct snd_rawmidi_ops in_ops = {
int usb6fire_midi_init(struct sfire_chip *chip)
{
int ret;
- struct midi_runtime *rt = kzalloc_obj(struct midi_runtime, GFP_KERNEL);
+ struct midi_runtime *rt = kzalloc_obj(struct midi_runtime);
struct comm_runtime *comm_rt = chip->comm;
if (!rt)
diff --git a/sound/usb/6fire/pcm.c b/sound/usb/6fire/pcm.c
index abd1338eb972..d2e274b731fe 100644
--- a/sound/usb/6fire/pcm.c
+++ b/sound/usb/6fire/pcm.c
@@ -587,7 +587,7 @@ int usb6fire_pcm_init(struct sfire_chip *chip)
int ret;
struct snd_pcm *pcm;
struct pcm_runtime *rt =
- kzalloc_obj(struct pcm_runtime, GFP_KERNEL);
+ kzalloc_obj(struct pcm_runtime);
if (!rt)
return -ENOMEM;
diff --git a/sound/usb/caiaq/audio.c b/sound/usb/caiaq/audio.c
index 06837b9f8bf8..ba3f73455ebe 100644
--- a/sound/usb/caiaq/audio.c
+++ b/sound/usb/caiaq/audio.c
@@ -681,7 +681,7 @@ static struct urb **alloc_urbs(struct snd_usb_caiaqdev *cdev, int dir, int *ret)
usb_sndisocpipe(usb_dev, ENDPOINT_PLAYBACK) :
usb_rcvisocpipe(usb_dev, ENDPOINT_CAPTURE);
- urbs = kmalloc_objs(*urbs, N_URBS, GFP_KERNEL);
+ urbs = kmalloc_objs(*urbs, N_URBS);
if (!urbs) {
*ret = -ENOMEM;
return NULL;
@@ -813,7 +813,7 @@ int snd_usb_caiaq_audio_init(struct snd_usb_caiaqdev *cdev)
NULL, 0, 0);
cdev->data_cb_info =
- kmalloc_objs(struct snd_usb_caiaq_cb_info, N_URBS, GFP_KERNEL);
+ kmalloc_objs(struct snd_usb_caiaq_cb_info, N_URBS);
if (!cdev->data_cb_info)
return -ENOMEM;
diff --git a/sound/usb/endpoint.c b/sound/usb/endpoint.c
index 8a2bb82c1a18..73bce9712dbd 100644
--- a/sound/usb/endpoint.c
+++ b/sound/usb/endpoint.c
@@ -621,7 +621,7 @@ iface_ref_find(struct snd_usb_audio *chip, int iface)
if (ip->iface == iface)
return ip;
- ip = kzalloc_obj(*ip, GFP_KERNEL);
+ ip = kzalloc_obj(*ip);
if (!ip)
return NULL;
ip->iface = iface;
@@ -639,7 +639,7 @@ clock_ref_find(struct snd_usb_audio *chip, int clock)
if (ref->clock == clock)
return ref;
- ref = kzalloc_obj(*ref, GFP_KERNEL);
+ ref = kzalloc_obj(*ref);
if (!ref)
return NULL;
ref->clock = clock;
@@ -698,7 +698,7 @@ int snd_usb_add_endpoint(struct snd_usb_audio *chip, int ep_num, int type)
usb_audio_dbg(chip, "Creating new %s endpoint #%x\n",
ep_type_name(type),
ep_num);
- ep = kzalloc_obj(*ep, GFP_KERNEL);
+ ep = kzalloc_obj(*ep);
if (!ep)
return -ENOMEM;
diff --git a/sound/usb/fcp.c b/sound/usb/fcp.c
index 2ca41460aa5b..0fc4d063c48a 100644
--- a/sound/usb/fcp.c
+++ b/sound/usb/fcp.c
@@ -329,7 +329,7 @@ static int fcp_add_new_ctl(struct usb_mixer_interface *mixer,
struct usb_mixer_elem_info *elem;
int err;
- elem = kzalloc_obj(*elem, GFP_KERNEL);
+ elem = kzalloc_obj(*elem);
if (!elem)
return -ENOMEM;
@@ -654,7 +654,7 @@ static int fcp_ioctl_set_meter_map(struct usb_mixer_interface *mixer,
if (!private->meter_ctl) {
/* Allocate buffer for the map */
s16 *new_map __free(kfree) =
- kmalloc_objs(s16, map.map_size, GFP_KERNEL);
+ kmalloc_objs(s16, map.map_size);
if (!new_map)
return -ENOMEM;
@@ -1045,7 +1045,7 @@ static int fcp_init(struct usb_mixer_interface *mixer,
static int fcp_init_private(struct usb_mixer_interface *mixer)
{
struct fcp_data *private =
- kzalloc_obj(struct fcp_data, GFP_KERNEL);
+ kzalloc_obj(struct fcp_data);
if (!private)
return -ENOMEM;
diff --git a/sound/usb/hiface/pcm.c b/sound/usb/hiface/pcm.c
index 2603a88a9d27..cd1a4c871c5d 100644
--- a/sound/usb/hiface/pcm.c
+++ b/sound/usb/hiface/pcm.c
@@ -547,7 +547,7 @@ int hiface_pcm_init(struct hiface_chip *chip, u8 extra_freq)
struct snd_pcm *pcm;
struct pcm_runtime *rt;
- rt = kzalloc_obj(*rt, GFP_KERNEL);
+ rt = kzalloc_obj(*rt);
if (!rt)
return -ENOMEM;
diff --git a/sound/usb/line6/midi.c b/sound/usb/line6/midi.c
index 0e5cb8a86922..af01b649393c 100644
--- a/sound/usb/line6/midi.c
+++ b/sound/usb/line6/midi.c
@@ -264,7 +264,7 @@ int line6_init_midi(struct usb_line6 *line6)
if (err < 0)
return err;
- line6midi = kzalloc_obj(struct snd_line6_midi, GFP_KERNEL);
+ line6midi = kzalloc_obj(struct snd_line6_midi);
if (!line6midi)
return -ENOMEM;
diff --git a/sound/usb/line6/pcm.c b/sound/usb/line6/pcm.c
index ea1cea5d1105..2932eaf157f4 100644
--- a/sound/usb/line6/pcm.c
+++ b/sound/usb/line6/pcm.c
@@ -528,7 +528,7 @@ int line6_init_pcm(struct usb_line6 *line6,
if (err < 0)
return err;
- line6pcm = kzalloc_obj(*line6pcm, GFP_KERNEL);
+ line6pcm = kzalloc_obj(*line6pcm);
if (!line6pcm)
return -ENOMEM;
diff --git a/sound/usb/line6/toneport.c b/sound/usb/line6/toneport.c
index abc1a750a921..1df5c0dcd216 100644
--- a/sound/usb/line6/toneport.c
+++ b/sound/usb/line6/toneport.c
@@ -363,7 +363,7 @@ static int toneport_setup(struct usb_line6_toneport *toneport)
struct usb_line6 *line6 = &toneport->line6;
struct usb_device *usbdev = line6->usbdev;
- ticks = kmalloc_obj(*ticks, GFP_KERNEL);
+ ticks = kmalloc_obj(*ticks);
if (!ticks)
return -ENOMEM;
diff --git a/sound/usb/media.c b/sound/usb/media.c
index 0aab1eb5c4e9..b7497d18ee3f 100644
--- a/sound/usb/media.c
+++ b/sound/usb/media.c
@@ -49,7 +49,7 @@ int snd_media_stream_init(struct snd_usb_substream *subs, struct snd_pcm *pcm,
return 0;
/* allocate media_ctl */
- mctl = kzalloc_obj(*mctl, GFP_KERNEL);
+ mctl = kzalloc_obj(*mctl);
if (!mctl)
return -ENOMEM;
@@ -188,7 +188,7 @@ static int snd_media_mixer_init(struct snd_usb_audio *chip)
continue;
/* allocate media_mixer_ctl */
- mctl = kzalloc_obj(*mctl, GFP_KERNEL);
+ mctl = kzalloc_obj(*mctl);
if (!mctl)
return -ENOMEM;
diff --git a/sound/usb/midi.c b/sound/usb/midi.c
index c72434ac581d..a8bddc90c0ed 100644
--- a/sound/usb/midi.c
+++ b/sound/usb/midi.c
@@ -1328,7 +1328,7 @@ static int snd_usbmidi_in_endpoint_create(struct snd_usb_midi *umidi,
int err;
rep->in = NULL;
- ep = kzalloc_obj(*ep, GFP_KERNEL);
+ ep = kzalloc_obj(*ep);
if (!ep)
return -ENOMEM;
ep->umidi = umidi;
@@ -1414,7 +1414,7 @@ static int snd_usbmidi_out_endpoint_create(struct snd_usb_midi *umidi,
int err;
rep->out = NULL;
- ep = kzalloc_obj(*ep, GFP_KERNEL);
+ ep = kzalloc_obj(*ep);
if (!ep)
return -ENOMEM;
ep->umidi = umidi;
@@ -2506,7 +2506,7 @@ int __snd_usbmidi_create(struct snd_card *card,
int out_ports, in_ports;
int i, err;
- umidi = kzalloc_obj(*umidi, GFP_KERNEL);
+ umidi = kzalloc_obj(*umidi);
if (!umidi)
return -ENOMEM;
umidi->dev = interface_to_usbdev(iface);
diff --git a/sound/usb/midi2.c b/sound/usb/midi2.c
index cf05e4cb97b1..ef602e81576d 100644
--- a/sound/usb/midi2.c
+++ b/sound/usb/midi2.c
@@ -432,7 +432,7 @@ static int create_midi2_endpoint(struct snd_usb_midi2_interface *umidi,
hostep->desc.bEndpointAddress,
ms_ep->bNumGrpTrmBlock);
- ep = kzalloc_obj(*ep, GFP_KERNEL);
+ ep = kzalloc_obj(*ep);
if (!ep)
return -ENOMEM;
@@ -693,7 +693,7 @@ static int create_midi2_ump(struct snd_usb_midi2_interface *umidi,
char idstr[16];
int err;
- rmidi = kzalloc_obj(*rmidi, GFP_KERNEL);
+ rmidi = kzalloc_obj(*rmidi);
if (!rmidi)
return -ENOMEM;
INIT_LIST_HEAD(&rmidi->list);
@@ -1101,7 +1101,7 @@ int snd_usb_midi_v2_create(struct snd_usb_audio *chip,
hostif->desc.bInterfaceNumber,
hostif->desc.bAlternateSetting);
- umidi = kzalloc_obj(*umidi, GFP_KERNEL);
+ umidi = kzalloc_obj(*umidi);
if (!umidi)
return -ENOMEM;
umidi->chip = chip;
diff --git a/sound/usb/misc/ua101.c b/sound/usb/misc/ua101.c
index 62be8a00a826..49b3dd8d827d 100644
--- a/sound/usb/misc/ua101.c
+++ b/sound/usb/misc/ua101.c
@@ -1062,7 +1062,7 @@ static int alloc_stream_urbs(struct ua101 *ua, struct ua101_stream *stream,
while (size >= max_packet_size) {
if (u >= stream->queue_length)
goto bufsize_error;
- urb = kmalloc_obj(*urb, GFP_KERNEL);
+ urb = kmalloc_obj(*urb);
if (!urb)
return -ENOMEM;
usb_init_urb(&urb->urb);
diff --git a/sound/usb/mixer.c b/sound/usb/mixer.c
index 1b66f9581b4a..3c3b197de39d 100644
--- a/sound/usb/mixer.c
+++ b/sound/usb/mixer.c
@@ -1684,7 +1684,7 @@ static void __build_feature_ctl(struct usb_mixer_interface *mixer,
if (check_ignored_ctl(map))
return;
- cval = kzalloc_obj(*cval, GFP_KERNEL);
+ cval = kzalloc_obj(*cval);
if (!cval)
return;
snd_usb_mixer_elem_init_std(&cval->head, mixer, unitid);
@@ -1894,7 +1894,7 @@ static void build_connector_control(struct usb_mixer_interface *mixer,
if (check_ignored_ctl(map))
return;
- cval = kzalloc_obj(*cval, GFP_KERNEL);
+ cval = kzalloc_obj(*cval);
if (!cval)
return;
snd_usb_mixer_elem_init_std(&cval->head, mixer, term->id);
@@ -1956,7 +1956,7 @@ static int parse_clock_source_unit(struct mixer_build *state, int unitid,
UAC2_CS_CONTROL_CLOCK_VALID))
return 0;
- cval = kzalloc_obj(*cval, GFP_KERNEL);
+ cval = kzalloc_obj(*cval);
if (!cval)
return -ENOMEM;
@@ -2177,7 +2177,7 @@ static void build_mixer_unit_ctl(struct mixer_build *state,
if (check_ignored_ctl(map))
return;
- cval = kzalloc_obj(*cval, GFP_KERNEL);
+ cval = kzalloc_obj(*cval);
if (!cval)
return;
@@ -2525,7 +2525,7 @@ static int build_audio_procunit(struct mixer_build *state, int unitid,
map = find_map(state->map, unitid, valinfo->control);
if (check_ignored_ctl(map))
continue;
- cval = kzalloc_obj(*cval, GFP_KERNEL);
+ cval = kzalloc_obj(*cval);
if (!cval)
return -ENOMEM;
snd_usb_mixer_elem_init_std(&cval->head, state->mixer, unitid);
@@ -2771,7 +2771,7 @@ static int parse_audio_selector_unit(struct mixer_build *state, int unitid,
if (check_ignored_ctl(map))
return 0;
- cval = kzalloc_obj(*cval, GFP_KERNEL);
+ cval = kzalloc_obj(*cval);
if (!cval)
return -ENOMEM;
snd_usb_mixer_elem_init_std(&cval->head, state->mixer, unitid);
@@ -3598,7 +3598,7 @@ int snd_usb_create_mixer(struct snd_usb_audio *chip, int ctrlif)
strscpy(chip->card->mixername, "USB Mixer");
- mixer = kzalloc_obj(*mixer, GFP_KERNEL);
+ mixer = kzalloc_obj(*mixer);
if (!mixer)
return -ENOMEM;
mixer->chip = chip;
diff --git a/sound/usb/mixer_quirks.c b/sound/usb/mixer_quirks.c
index dc538450f3b9..9bc449ea9327 100644
--- a/sound/usb/mixer_quirks.c
+++ b/sound/usb/mixer_quirks.c
@@ -67,7 +67,7 @@ static int snd_create_std_mono_ctl_offset(struct usb_mixer_interface *mixer,
struct usb_mixer_elem_info *cval;
struct snd_kcontrol *kctl;
- cval = kzalloc_obj(*cval, GFP_KERNEL);
+ cval = kzalloc_obj(*cval);
if (!cval)
return -ENOMEM;
@@ -151,7 +151,7 @@ static int add_single_ctl_with_resume(struct usb_mixer_interface *mixer,
struct usb_mixer_elem_list *list;
struct snd_kcontrol *kctl;
- list = kzalloc_obj(*list, GFP_KERNEL);
+ list = kzalloc_obj(*list);
if (!list)
return -ENOMEM;
if (listp)
@@ -617,7 +617,7 @@ static int snd_dualsense_ih_connect(struct input_handler *handler,
struct input_handle *handle;
int err;
- handle = kzalloc_obj(*handle, GFP_KERNEL);
+ handle = kzalloc_obj(*handle);
if (!handle)
return -ENOMEM;
@@ -714,7 +714,7 @@ static int snd_dualsense_jack_create(struct usb_mixer_interface *mixer,
struct snd_kcontrol *kctl;
int err;
- mei = kzalloc_obj(*mei, GFP_KERNEL);
+ mei = kzalloc_obj(*mei);
if (!mei)
return -ENOMEM;
@@ -2279,7 +2279,7 @@ static int realtek_add_jack(struct usb_mixer_interface *mixer,
struct usb_mixer_elem_info *cval;
struct snd_kcontrol *kctl;
- cval = kzalloc_obj(*cval, GFP_KERNEL);
+ cval = kzalloc_obj(*cval);
if (!cval)
return -ENOMEM;
snd_usb_mixer_elem_init_std(&cval->head, mixer, unitid);
diff --git a/sound/usb/mixer_s1810c.c b/sound/usb/mixer_s1810c.c
index f931643db1c5..473cb29efa7f 100644
--- a/sound/usb/mixer_s1810c.c
+++ b/sound/usb/mixer_s1810c.c
@@ -534,7 +534,7 @@ snd_s1810c_switch_init(struct usb_mixer_interface *mixer,
struct snd_kcontrol *kctl;
struct usb_mixer_elem_info *elem;
- elem = kzalloc_obj(struct usb_mixer_elem_info, GFP_KERNEL);
+ elem = kzalloc_obj(struct usb_mixer_elem_info);
if (!elem)
return -ENOMEM;
@@ -645,7 +645,7 @@ int snd_sc1810_init_mixer(struct usb_mixer_interface *mixer)
if (ret < 0)
return ret;
- private = kzalloc_obj(struct s1810_mixer_state, GFP_KERNEL);
+ private = kzalloc_obj(struct s1810_mixer_state);
if (!private)
return -ENOMEM;
diff --git a/sound/usb/mixer_scarlett.c b/sound/usb/mixer_scarlett.c
index 8582153cb4a7..1bb01e827654 100644
--- a/sound/usb/mixer_scarlett.c
+++ b/sound/usb/mixer_scarlett.c
@@ -819,7 +819,7 @@ static int add_new_ctl(struct usb_mixer_interface *mixer,
struct usb_mixer_elem_info *elem;
int err;
- elem = kzalloc_obj(*elem, GFP_KERNEL);
+ elem = kzalloc_obj(*elem);
if (!elem)
return -ENOMEM;
diff --git a/sound/usb/mixer_scarlett2.c b/sound/usb/mixer_scarlett2.c
index 41a496adcc09..85a0316889d4 100644
--- a/sound/usb/mixer_scarlett2.c
+++ b/sound/usb/mixer_scarlett2.c
@@ -3197,7 +3197,7 @@ static int scarlett2_add_new_ctl(struct usb_mixer_interface *mixer,
struct usb_mixer_elem_info *elem;
int err;
- elem = kzalloc_obj(*elem, GFP_KERNEL);
+ elem = kzalloc_obj(*elem);
if (!elem)
return -ENOMEM;
@@ -8272,7 +8272,7 @@ static int scarlett2_init_private(struct usb_mixer_interface *mixer,
const struct scarlett2_device_entry *entry)
{
struct scarlett2_data *private =
- kzalloc_obj(struct scarlett2_data, GFP_KERNEL);
+ kzalloc_obj(struct scarlett2_data);
if (!private)
return -ENOMEM;
diff --git a/sound/usb/mixer_us16x08.c b/sound/usb/mixer_us16x08.c
index c7b63c29cbf6..8a02964e5d7b 100644
--- a/sound/usb/mixer_us16x08.c
+++ b/sound/usb/mixer_us16x08.c
@@ -969,7 +969,7 @@ static struct snd_us16x08_comp_store *snd_us16x08_create_comp_store(void)
int i;
struct snd_us16x08_comp_store *tmp;
- tmp = kmalloc_obj(*tmp, GFP_KERNEL);
+ tmp = kmalloc_obj(*tmp);
if (!tmp)
return NULL;
@@ -991,7 +991,7 @@ static struct snd_us16x08_eq_store *snd_us16x08_create_eq_store(void)
int i, b_idx;
struct snd_us16x08_eq_store *tmp;
- tmp = kmalloc_obj(*tmp, GFP_KERNEL);
+ tmp = kmalloc_obj(*tmp);
if (!tmp)
return NULL;
@@ -1027,7 +1027,7 @@ static struct snd_us16x08_meter_store *snd_us16x08_create_meter_store(void)
{
struct snd_us16x08_meter_store *tmp;
- tmp = kzalloc_obj(*tmp, GFP_KERNEL);
+ tmp = kzalloc_obj(*tmp);
if (!tmp)
return NULL;
tmp->comp_index = 1;
@@ -1059,7 +1059,7 @@ static int add_new_ctl(struct usb_mixer_interface *mixer,
usb_audio_dbg(mixer->chip, "us16x08 add mixer %s\n", name);
- elem = kzalloc_obj(*elem, GFP_KERNEL);
+ elem = kzalloc_obj(*elem);
if (!elem)
return -ENOMEM;
diff --git a/sound/usb/power.c b/sound/usb/power.c
index 47863b688b4d..c2d708c87fc4 100644
--- a/sound/usb/power.c
+++ b/sound/usb/power.c
@@ -20,7 +20,7 @@ snd_usb_find_power_domain(struct usb_host_interface *ctrl_iface,
struct snd_usb_power_domain *pd;
void *p;
- pd = kzalloc_obj(*pd, GFP_KERNEL);
+ pd = kzalloc_obj(*pd);
if (!pd)
return NULL;
diff --git a/sound/usb/qcom/qc_audio_offload.c b/sound/usb/qcom/qc_audio_offload.c
index b709b6cb3051..57b803e0c986 100644
--- a/sound/usb/qcom/qc_audio_offload.c
+++ b/sound/usb/qcom/qc_audio_offload.c
@@ -438,7 +438,7 @@ static unsigned long uaudio_get_iova(unsigned long *curr_iova,
}
}
- info = kzalloc_obj(*info, GFP_KERNEL);
+ info = kzalloc_obj(*info);
if (!info) {
iova = 0;
goto done;
@@ -1687,7 +1687,7 @@ static struct qmi_msg_handler uaudio_stream_req_handlers = {
*/
static int qc_usb_audio_offload_init_qmi_dev(void)
{
- uaudio_qdev = kzalloc_obj(*uaudio_qdev, GFP_KERNEL);
+ uaudio_qdev = kzalloc_obj(*uaudio_qdev);
if (!uaudio_qdev)
return -ENOMEM;
@@ -1759,7 +1759,7 @@ static void qc_usb_audio_offload_probe(struct snd_usb_audio *chip)
guard(mutex)(&qdev_mutex);
guard(mutex)(&chip->mutex);
if (!uadev[chip->card->number].chip) {
- sdev = kzalloc_obj(*sdev, GFP_KERNEL);
+ sdev = kzalloc_obj(*sdev);
if (!sdev)
return;
@@ -1914,11 +1914,11 @@ static int qc_usb_audio_probe(struct auxiliary_device *auxdev,
struct uaudio_qmi_svc *svc;
int ret;
- svc = kzalloc_obj(*svc, GFP_KERNEL);
+ svc = kzalloc_obj(*svc);
if (!svc)
return -ENOMEM;
- svc->uaudio_svc_hdl = kzalloc_obj(*svc->uaudio_svc_hdl, GFP_KERNEL);
+ svc->uaudio_svc_hdl = kzalloc_obj(*svc->uaudio_svc_hdl);
if (!svc->uaudio_svc_hdl) {
ret = -ENOMEM;
goto free_svc;
diff --git a/sound/usb/quirks.c b/sound/usb/quirks.c
index 975b57adf2f4..4cac0dfb0094 100644
--- a/sound/usb/quirks.c
+++ b/sound/usb/quirks.c
@@ -566,7 +566,7 @@ static int snd_usb_extigy_boot_quirk(struct usb_device *dev, struct usb_interfac
if (err < 0)
dev_dbg(&dev->dev, "error sending boot message: %d\n", err);
struct usb_device_descriptor *new_device_descriptor __free(kfree) =
- kmalloc_obj(*new_device_descriptor, GFP_KERNEL);
+ kmalloc_obj(*new_device_descriptor);
if (!new_device_descriptor)
return -ENOMEM;
err = usb_get_descriptor(dev, USB_DT_DEVICE, 0,
@@ -944,7 +944,7 @@ static int snd_usb_mbox2_boot_quirk(struct usb_device *dev)
dev_dbg(&dev->dev, "device initialised!\n");
struct usb_device_descriptor *new_device_descriptor __free(kfree) =
- kmalloc_obj(*new_device_descriptor, GFP_KERNEL);
+ kmalloc_obj(*new_device_descriptor);
if (!new_device_descriptor)
return -ENOMEM;
@@ -1279,7 +1279,7 @@ static int snd_usb_mbox3_boot_quirk(struct usb_device *dev)
dev_dbg(&dev->dev, "MBOX3: device initialised!\n");
struct usb_device_descriptor *new_device_descriptor __free(kfree) =
- kmalloc_obj(*new_device_descriptor, GFP_KERNEL);
+ kmalloc_obj(*new_device_descriptor);
if (!new_device_descriptor)
return -ENOMEM;
diff --git a/sound/usb/stream.c b/sound/usb/stream.c
index adf1827807d4..ac4d92065dd9 100644
--- a/sound/usb/stream.c
+++ b/sound/usb/stream.c
@@ -291,7 +291,7 @@ static struct snd_pcm_chmap_elem *convert_chmap(int channels, unsigned int bits,
if (channels > ARRAY_SIZE(chmap->map))
return NULL;
- chmap = kzalloc_obj(*chmap, GFP_KERNEL);
+ chmap = kzalloc_obj(*chmap);
if (!chmap)
return NULL;
@@ -335,7 +335,7 @@ snd_pcm_chmap_elem *convert_chmap_v3(struct uac3_cluster_header_descriptor
if (channels > ARRAY_SIZE(chmap->map))
return NULL;
- chmap = kzalloc_obj(*chmap, GFP_KERNEL);
+ chmap = kzalloc_obj(*chmap);
if (!chmap)
return NULL;
@@ -526,7 +526,7 @@ static int __snd_usb_add_audio_stream(struct snd_usb_audio *chip,
}
/* create a new pcm */
- as = kzalloc_obj(*as, GFP_KERNEL);
+ as = kzalloc_obj(*as);
if (!as)
return -ENOMEM;
as->pcm_index = chip->pcm_devs;
@@ -693,7 +693,7 @@ audio_format_alloc_init(struct snd_usb_audio *chip,
struct usb_host_endpoint *ep = &alts->endpoint[0];
struct audioformat *fp;
- fp = kzalloc_obj(*fp, GFP_KERNEL);
+ fp = kzalloc_obj(*fp);
if (!fp)
return NULL;
@@ -927,7 +927,7 @@ snd_usb_get_audioformat_uac3(struct snd_usb_audio *chip,
break;
}
- chmap = kzalloc_obj(*chmap, GFP_KERNEL);
+ chmap = kzalloc_obj(*chmap);
if (!chmap)
return ERR_PTR(-ENOMEM);
@@ -1078,7 +1078,7 @@ snd_usb_get_audioformat_uac3(struct snd_usb_audio *chip,
fp->rate_max = UAC3_BADD_SAMPLING_RATE;
fp->rates = SNDRV_PCM_RATE_CONTINUOUS;
- pd = kzalloc_obj(*pd, GFP_KERNEL);
+ pd = kzalloc_obj(*pd);
if (!pd) {
audioformat_free(fp);
return NULL;
diff --git a/sound/usb/usx2y/usbusx2yaudio.c b/sound/usb/usx2y/usbusx2yaudio.c
index c8f2f07d7f8d..c913354247c7 100644
--- a/sound/usb/usx2y/usbusx2yaudio.c
+++ b/sound/usb/usx2y/usbusx2yaudio.c
@@ -663,7 +663,7 @@ static int usx2y_rate_set(struct usx2ydev *usx2y, int rate)
goto cleanup;
}
us->len = NOOF_SETRATE_URBS;
- usbdata = kmalloc_objs(int, NOOF_SETRATE_URBS, GFP_KERNEL);
+ usbdata = kmalloc_objs(int, NOOF_SETRATE_URBS);
if (!usbdata) {
err = -ENOMEM;
goto cleanup;
diff --git a/sound/virtio/virtio_card.c b/sound/virtio/virtio_card.c
index 65abd8510ff4..647190f4d5af 100644
--- a/sound/virtio/virtio_card.c
+++ b/sound/virtio/virtio_card.c
@@ -137,7 +137,7 @@ static int virtsnd_find_vqs(struct virtio_snd *snd)
n = virtqueue_get_vring_size(vqs[VIRTIO_SND_VQ_EVENT]);
- snd->event_msgs = kmalloc_objs(*snd->event_msgs, n, GFP_KERNEL);
+ snd->event_msgs = kmalloc_objs(*snd->event_msgs, n);
if (!snd->event_msgs)
return -ENOMEM;
diff --git a/sound/virtio/virtio_jack.c b/sound/virtio/virtio_jack.c
index 2f1ec3ac02f0..68e40c7f5039 100644
--- a/sound/virtio/virtio_jack.c
+++ b/sound/virtio/virtio_jack.c
@@ -144,7 +144,7 @@ int virtsnd_jack_parse_cfg(struct virtio_snd *snd)
if (!snd->jacks)
return -ENOMEM;
- info = kzalloc_objs(*info, snd->njacks, GFP_KERNEL);
+ info = kzalloc_objs(*info, snd->njacks);
if (!info)
return -ENOMEM;
diff --git a/sound/virtio/virtio_pcm.c b/sound/virtio/virtio_pcm.c
index ef5a8a507b24..eb9cc8131905 100644
--- a/sound/virtio/virtio_pcm.c
+++ b/sound/virtio/virtio_pcm.c
@@ -354,7 +354,7 @@ int virtsnd_pcm_parse_cfg(struct virtio_snd *snd)
spin_lock_init(&vss->lock);
}
- info = kzalloc_objs(*info, snd->nsubstreams, GFP_KERNEL);
+ info = kzalloc_objs(*info, snd->nsubstreams);
if (!info)
return -ENOMEM;
diff --git a/sound/virtio/virtio_pcm_msg.c b/sound/virtio/virtio_pcm_msg.c
index 79af520ef12e..7b27f242bf5f 100644
--- a/sound/virtio/virtio_pcm_msg.c
+++ b/sound/virtio/virtio_pcm_msg.c
@@ -135,7 +135,7 @@ int virtsnd_pcm_msg_alloc(struct virtio_pcm_substream *vss,
struct snd_pcm_runtime *runtime = vss->substream->runtime;
unsigned int i;
- vss->msgs = kzalloc_objs(*vss->msgs, periods, GFP_KERNEL);
+ vss->msgs = kzalloc_objs(*vss->msgs, periods);
if (!vss->msgs)
return -ENOMEM;
diff --git a/sound/x86/intel_hdmi_audio.c b/sound/x86/intel_hdmi_audio.c
index dc7501c95b99..91dfcf47e979 100644
--- a/sound/x86/intel_hdmi_audio.c
+++ b/sound/x86/intel_hdmi_audio.c
@@ -475,7 +475,7 @@ static void had_build_channel_allocation_map(struct snd_intelhad *intelhaddata)
kfree(intelhaddata->chmap->chmap);
intelhaddata->chmap->chmap = NULL;
- chmap = kzalloc_obj(*chmap, GFP_KERNEL);
+ chmap = kzalloc_obj(*chmap);
if (!chmap)
return;
diff --git a/virt/kvm/guest_memfd.c b/virt/kvm/guest_memfd.c
index e73339295a44..017d84a7adf3 100644
--- a/virt/kvm/guest_memfd.c
+++ b/virt/kvm/guest_memfd.c
@@ -568,7 +568,7 @@ static int __kvm_gmem_create(struct kvm *kvm, loff_t size, u64 flags)
if (fd < 0)
return fd;
- f = kzalloc_obj(*f, GFP_KERNEL);
+ f = kzalloc_obj(*f);
if (!f) {
err = -ENOMEM;
goto err_fd;
diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c
index b798903540b6..22f8a672e1fd 100644
--- a/virt/kvm/kvm_main.c
+++ b/virt/kvm/kvm_main.c
@@ -4505,7 +4505,7 @@ static long kvm_vcpu_ioctl(struct file *filp,
struct kvm_regs *kvm_regs;
r = -ENOMEM;
- kvm_regs = kzalloc_obj(struct kvm_regs, GFP_KERNEL);
+ kvm_regs = kzalloc_obj(struct kvm_regs);
if (!kvm_regs)
goto out;
r = kvm_arch_vcpu_ioctl_get_regs(vcpu, kvm_regs);
@@ -4532,7 +4532,7 @@ static long kvm_vcpu_ioctl(struct file *filp,
break;
}
case KVM_GET_SREGS: {
- kvm_sregs = kzalloc_obj(struct kvm_sregs, GFP_KERNEL);
+ kvm_sregs = kzalloc_obj(struct kvm_sregs);
r = -ENOMEM;
if (!kvm_sregs)
goto out;
@@ -4624,7 +4624,7 @@ static long kvm_vcpu_ioctl(struct file *filp,
break;
}
case KVM_GET_FPU: {
- fpu = kzalloc_obj(struct kvm_fpu, GFP_KERNEL);
+ fpu = kzalloc_obj(struct kvm_fpu);
r = -ENOMEM;
if (!fpu)
goto out;
@@ -6326,7 +6326,7 @@ static void kvm_uevent_notify_change(unsigned int type, struct kvm *kvm)
active = kvm_active_vms;
mutex_unlock(&kvm_lock);
- env = kzalloc_obj(*env, GFP_KERNEL);
+ env = kzalloc_obj(*env);
if (!env)
return;