summaryrefslogtreecommitdiff
path: root/drivers/nvmem
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/nvmem')
-rw-r--r--drivers/nvmem/core.c6
-rw-r--r--drivers/nvmem/layouts.c2
2 files changed, 4 insertions, 4 deletions
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;