diff options
| author | Kees Cook | 2018-07-04 19:31:25 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2018-07-06 17:35:42 +0200 |
| commit | 9f2378d94d0f026389fff351848f2adc484650fe (patch) | |
| tree | 1d0c76be0715961c6aa054a41a6f491b8eb7faea /drivers/staging/gasket/gasket_sysfs.c | |
| parent | staging: mt7621-pinctrl: replace core_initcall_sync with builtin_platform_driver (diff) | |
| download | kernel-qcow2-linux-9f2378d94d0f026389fff351848f2adc484650fe.tar.gz kernel-qcow2-linux-9f2378d94d0f026389fff351848f2adc484650fe.tar.xz kernel-qcow2-linux-9f2378d94d0f026389fff351848f2adc484650fe.zip | |
drivers/staging/gasket: Use 2-factor allocator calls
As already done treewide, switch from open-coded multiplication to using
2-factor allocator helpers.
Signed-off-by: Kees Cook <keescook@chromium.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/gasket/gasket_sysfs.c')
| -rw-r--r-- | drivers/staging/gasket/gasket_sysfs.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/staging/gasket/gasket_sysfs.c b/drivers/staging/gasket/gasket_sysfs.c index d45098c90b4b..40268fb50fc3 100644 --- a/drivers/staging/gasket/gasket_sysfs.c +++ b/drivers/staging/gasket/gasket_sysfs.c @@ -137,9 +137,9 @@ static void put_mapping(struct gasket_sysfs_mapping *mapping) device = mapping->device; legacy_device = mapping->legacy_device; num_files_to_remove = mapping->attribute_count; - files_to_remove = kzalloc( - num_files_to_remove * sizeof(*files_to_remove), - GFP_KERNEL); + files_to_remove = kcalloc(num_files_to_remove, + sizeof(*files_to_remove), + GFP_KERNEL); for (i = 0; i < num_files_to_remove; i++) files_to_remove[i] = mapping->attributes[i].attr; @@ -238,9 +238,9 @@ int gasket_sysfs_create_mapping( kref_init(&mapping->refcount); mapping->device = device; mapping->gasket_dev = gasket_dev; - mapping->attributes = kzalloc( - GASKET_SYSFS_MAX_NODES * sizeof(*mapping->attributes), - GFP_KERNEL); + mapping->attributes = kcalloc(GASKET_SYSFS_MAX_NODES, + sizeof(*mapping->attributes), + GFP_KERNEL); mapping->attribute_count = 0; if (!mapping->attributes) { gasket_nodev_error("Unable to allocate sysfs attribute array."); |