2015-11-20 10:30:35

by Rasmus Villemoes

[permalink] [raw]
Subject: [PATCH] efi/esrt: don't preformat name

kobject_init_and_add takes a format string+args, so there's no reason
to do this formatting in advance.

Signed-off-by: Rasmus Villemoes <[email protected]>
---
drivers/firmware/efi/esrt.c | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/drivers/firmware/efi/esrt.c b/drivers/firmware/efi/esrt.c
index 22c5285f7705..75feb3f5829b 100644
--- a/drivers/firmware/efi/esrt.c
+++ b/drivers/firmware/efi/esrt.c
@@ -167,14 +167,11 @@ static struct kset *esrt_kset;
static int esre_create_sysfs_entry(void *esre, int entry_num)
{
struct esre_entry *entry;
- char name[20];

entry = kzalloc(sizeof(*entry), GFP_KERNEL);
if (!entry)
return -ENOMEM;

- sprintf(name, "entry%d", entry_num);
-
entry->kobj.kset = esrt_kset;

if (esrt->fw_resource_version == 1) {
@@ -182,7 +179,7 @@ static int esre_create_sysfs_entry(void *esre, int entry_num)

entry->esre.esre1 = esre;
rc = kobject_init_and_add(&entry->kobj, &esre1_ktype, NULL,
- "%s", name);
+ "entry%d", entry_num);
if (rc) {
kfree(entry);
return rc;
--
2.6.1


2015-11-26 10:27:13

by Matt Fleming

[permalink] [raw]
Subject: Re: [PATCH] efi/esrt: don't preformat name

On Fri, 20 Nov, at 11:30:17AM, Rasmus Villemoes wrote:
> kobject_init_and_add takes a format string+args, so there's no reason
> to do this formatting in advance.
>
> Signed-off-by: Rasmus Villemoes <[email protected]>
> ---
> drivers/firmware/efi/esrt.c | 5 +----
> 1 file changed, 1 insertion(+), 4 deletions(-)

Looks good to me. Thanks applied!

> diff --git a/drivers/firmware/efi/esrt.c b/drivers/firmware/efi/esrt.c
> index 22c5285f7705..75feb3f5829b 100644
> --- a/drivers/firmware/efi/esrt.c
> +++ b/drivers/firmware/efi/esrt.c
> @@ -167,14 +167,11 @@ static struct kset *esrt_kset;
> static int esre_create_sysfs_entry(void *esre, int entry_num)
> {
> struct esre_entry *entry;
> - char name[20];
>
> entry = kzalloc(sizeof(*entry), GFP_KERNEL);
> if (!entry)
> return -ENOMEM;
>
> - sprintf(name, "entry%d", entry_num);
> -
> entry->kobj.kset = esrt_kset;
>
> if (esrt->fw_resource_version == 1) {
> @@ -182,7 +179,7 @@ static int esre_create_sysfs_entry(void *esre, int entry_num)
>
> entry->esre.esre1 = esre;
> rc = kobject_init_and_add(&entry->kobj, &esre1_ktype, NULL,
> - "%s", name);
> + "entry%d", entry_num);
> if (rc) {
> kfree(entry);
> return rc;
> --
> 2.6.1
>