diff options
| author | Andy Shevchenko <andriy.shevchenko@linux.intel.com> | 2018-08-01 18:47:14 -0400 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2018-08-01 20:59:21 -0400 |
| commit | 4e2ec39ddbf3d78bc3b576a775fd5b4e4ff4af34 (patch) | |
| tree | 4135ebd4850e621c58e79bfdad0555acf7d71a24 /drivers/input | |
| parent | 5d81a787bd4d896238c0c8d73d514290abd1d0d2 (diff) | |
Input: gpio-keys - switch to bitmap_zalloc()
Switch to bitmap_zalloc() to show clearly what we are allocating.
Besides that it returns pointer of bitmap type instead of opaque void *.
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Diffstat (limited to 'drivers/input')
| -rw-r--r-- | drivers/input/keyboard/gpio_keys.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/input/keyboard/gpio_keys.c b/drivers/input/keyboard/gpio_keys.c index 052e37675086..492a971b95b5 100644 --- a/drivers/input/keyboard/gpio_keys.c +++ b/drivers/input/keyboard/gpio_keys.c | |||
| @@ -196,7 +196,7 @@ static ssize_t gpio_keys_attr_show_helper(struct gpio_keys_drvdata *ddata, | |||
| 196 | ssize_t ret; | 196 | ssize_t ret; |
| 197 | int i; | 197 | int i; |
| 198 | 198 | ||
| 199 | bits = kcalloc(BITS_TO_LONGS(n_events), sizeof(*bits), GFP_KERNEL); | 199 | bits = bitmap_zalloc(n_events, GFP_KERNEL); |
| 200 | if (!bits) | 200 | if (!bits) |
| 201 | return -ENOMEM; | 201 | return -ENOMEM; |
| 202 | 202 | ||
| @@ -216,7 +216,7 @@ static ssize_t gpio_keys_attr_show_helper(struct gpio_keys_drvdata *ddata, | |||
| 216 | buf[ret++] = '\n'; | 216 | buf[ret++] = '\n'; |
| 217 | buf[ret] = '\0'; | 217 | buf[ret] = '\0'; |
| 218 | 218 | ||
| 219 | kfree(bits); | 219 | bitmap_free(bits); |
| 220 | 220 | ||
| 221 | return ret; | 221 | return ret; |
| 222 | } | 222 | } |
| @@ -240,7 +240,7 @@ static ssize_t gpio_keys_attr_store_helper(struct gpio_keys_drvdata *ddata, | |||
| 240 | ssize_t error; | 240 | ssize_t error; |
| 241 | int i; | 241 | int i; |
| 242 | 242 | ||
| 243 | bits = kcalloc(BITS_TO_LONGS(n_events), sizeof(*bits), GFP_KERNEL); | 243 | bits = bitmap_zalloc(n_events, GFP_KERNEL); |
| 244 | if (!bits) | 244 | if (!bits) |
| 245 | return -ENOMEM; | 245 | return -ENOMEM; |
| 246 | 246 | ||
| @@ -284,7 +284,7 @@ static ssize_t gpio_keys_attr_store_helper(struct gpio_keys_drvdata *ddata, | |||
| 284 | mutex_unlock(&ddata->disable_lock); | 284 | mutex_unlock(&ddata->disable_lock); |
| 285 | 285 | ||
| 286 | out: | 286 | out: |
| 287 | kfree(bits); | 287 | bitmap_free(bits); |
| 288 | return error; | 288 | return error; |
| 289 | } | 289 | } |
| 290 | 290 | ||
