Skip to content

Commit f59ec04

Browse files
andy-shevhcahca
authored andcommitted
s390/zcrypt: utilize dev_set_name() ability to use a formatted string
With the dev_set_name() prototype it's not obvious that it takes a formatted string as a parameter. Use its facility instead of duplicating the same with strncpy()/snprintf() calls. With this, also prevent return error code to be shadowed. Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com> Link: https://lore.kernel.org/r/20230831110000.24279-2-andriy.shevchenko@linux.intel.com Signed-off-by: Harald Freudenberger <freude@linux.ibm.com> Signed-off-by: Heiko Carstens <hca@linux.ibm.com>
1 parent 6252f47 commit f59ec04

File tree

1 file changed

+3
-7
lines changed

1 file changed

+3
-7
lines changed

drivers/s390/crypto/zcrypt_api.c

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -366,7 +366,6 @@ static int zcdn_create(const char *name)
366366
{
367367
dev_t devt;
368368
int i, rc = 0;
369-
char nodename[ZCDN_MAX_NAME];
370369
struct zcdn_device *zcdndev;
371370

372371
if (mutex_lock_interruptible(&ap_perms_mutex))
@@ -407,14 +406,11 @@ static int zcdn_create(const char *name)
407406
zcdndev->device.devt = devt;
408407
zcdndev->device.groups = zcdn_dev_attr_groups;
409408
if (name[0])
410-
strncpy(nodename, name, sizeof(nodename));
409+
rc = dev_set_name(&zcdndev->device, "%s", name);
411410
else
412-
snprintf(nodename, sizeof(nodename),
413-
ZCRYPT_NAME "_%d", (int)MINOR(devt));
414-
nodename[sizeof(nodename) - 1] = '\0';
415-
if (dev_set_name(&zcdndev->device, nodename)) {
411+
rc = dev_set_name(&zcdndev->device, ZCRYPT_NAME "_%d", (int)MINOR(devt));
412+
if (rc) {
416413
kfree(zcdndev);
417-
rc = -EINVAL;
418414
goto unlockout;
419415
}
420416
rc = device_register(&zcdndev->device);

0 commit comments

Comments
 (0)