summaryrefslogtreecommitdiff
path: root/drivers/sh
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/sh')
-rw-r--r--drivers/sh/clk/cpg.c2
-rw-r--r--drivers/sh/maple/maple.c4
2 files changed, 3 insertions, 3 deletions
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;