aboutsummaryrefslogtreecommitdiff
path: root/drivers/usb/mon
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/usb/mon')
-rw-r--r--drivers/usb/mon/mon_bin.c5
-rw-r--r--drivers/usb/mon/mon_main.c2
-rw-r--r--drivers/usb/mon/mon_stat.c2
-rw-r--r--drivers/usb/mon/mon_text.c2
4 files changed, 5 insertions, 6 deletions
diff --git a/drivers/usb/mon/mon_bin.c b/drivers/usb/mon/mon_bin.c
index e713fc5964b1..687f6a8981f3 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(sizeof(struct mon_reader_bin), GFP_KERNEL);
+ rp = kzalloc_obj(struct mon_reader_bin);
if (rp == NULL) {
rc = -ENOMEM;
goto err_alloc;
@@ -1029,8 +1029,7 @@ static long mon_bin_ioctl(struct file *file, unsigned int cmd, unsigned long arg
return -EINVAL;
size = CHUNK_ALIGN(arg);
- vec = kcalloc(size / CHUNK_SIZE, sizeof(struct mon_pgmap),
- GFP_KERNEL);
+ vec = kzalloc_objs(struct mon_pgmap, size / CHUNK_SIZE);
if (vec == NULL) {
ret = -ENOMEM;
break;
diff --git a/drivers/usb/mon/mon_main.c b/drivers/usb/mon/mon_main.c
index af852d53aac6..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(sizeof(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 398e02af6a2b..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(sizeof(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 68b9b2b41189..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(sizeof(struct mon_reader_text), GFP_KERNEL);
+ rp = kzalloc_obj(struct mon_reader_text);
if (rp == NULL) {
rc = -ENOMEM;
goto err_alloc;