Commit 6078091c authored by Andy Shevchenko's avatar Andy Shevchenko Committed by Dmitry Torokhov

Input: evdev - switch to bitmap API

Switch to bitmap API, i.e. bitmap_alloc(), bitmap_zalloc(), to show
clearly what we are allocating. Besides that it returns pointer of
bitmap type instead of opaque void *.

While here, replace memcpy() with bitmap_copy() for sake of consistency.
Signed-off-by: default avatarAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: default avatarDmitry Torokhov <dmitry.torokhov@gmail.com>
parent 4e2ec39d
...@@ -481,7 +481,7 @@ static int evdev_release(struct inode *inode, struct file *file) ...@@ -481,7 +481,7 @@ static int evdev_release(struct inode *inode, struct file *file)
evdev_detach_client(evdev, client); evdev_detach_client(evdev, client);
for (i = 0; i < EV_CNT; ++i) for (i = 0; i < EV_CNT; ++i)
kfree(client->evmasks[i]); bitmap_free(client->evmasks[i]);
kvfree(client); kvfree(client);
...@@ -925,17 +925,15 @@ static int evdev_handle_get_val(struct evdev_client *client, ...@@ -925,17 +925,15 @@ static int evdev_handle_get_val(struct evdev_client *client,
{ {
int ret; int ret;
unsigned long *mem; unsigned long *mem;
size_t len;
len = BITS_TO_LONGS(maxbit) * sizeof(unsigned long); mem = bitmap_alloc(maxbit, GFP_KERNEL);
mem = kmalloc(len, GFP_KERNEL);
if (!mem) if (!mem)
return -ENOMEM; return -ENOMEM;
spin_lock_irq(&dev->event_lock); spin_lock_irq(&dev->event_lock);
spin_lock(&client->buffer_lock); spin_lock(&client->buffer_lock);
memcpy(mem, bits, len); bitmap_copy(mem, bits, maxbit);
spin_unlock(&dev->event_lock); spin_unlock(&dev->event_lock);
...@@ -947,7 +945,7 @@ static int evdev_handle_get_val(struct evdev_client *client, ...@@ -947,7 +945,7 @@ static int evdev_handle_get_val(struct evdev_client *client,
if (ret < 0) if (ret < 0)
evdev_queue_syn_dropped(client); evdev_queue_syn_dropped(client);
kfree(mem); bitmap_free(mem);
return ret; return ret;
} }
...@@ -1003,13 +1001,13 @@ static int evdev_set_mask(struct evdev_client *client, ...@@ -1003,13 +1001,13 @@ static int evdev_set_mask(struct evdev_client *client,
if (!cnt) if (!cnt)
return 0; return 0;
mask = kcalloc(sizeof(unsigned long), BITS_TO_LONGS(cnt), GFP_KERNEL); mask = bitmap_zalloc(cnt, GFP_KERNEL);
if (!mask) if (!mask)
return -ENOMEM; return -ENOMEM;
error = bits_from_user(mask, cnt - 1, codes_size, codes, compat); error = bits_from_user(mask, cnt - 1, codes_size, codes, compat);
if (error < 0) { if (error < 0) {
kfree(mask); bitmap_free(mask);
return error; return error;
} }
...@@ -1018,7 +1016,7 @@ static int evdev_set_mask(struct evdev_client *client, ...@@ -1018,7 +1016,7 @@ static int evdev_set_mask(struct evdev_client *client,
client->evmasks[type] = mask; client->evmasks[type] = mask;
spin_unlock_irqrestore(&client->buffer_lock, flags); spin_unlock_irqrestore(&client->buffer_lock, flags);
kfree(oldmask); bitmap_free(oldmask);
return 0; return 0;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment