Convert device_d name to be dynamically allocated in order to lift MAX_DRIVER_NAME length limit needed for commits that follow.
Signed-off-by: Andrey Smirnov <[email protected]> --- drivers/base/driver.c | 23 +++++++++++++++++------ include/driver.h | 5 ++--- 2 files changed, 19 insertions(+), 9 deletions(-) diff --git a/drivers/base/driver.c b/drivers/base/driver.c index b7720f31a..1941a972c 100644 --- a/drivers/base/driver.c +++ b/drivers/base/driver.c @@ -184,11 +184,9 @@ int register_device(struct device_d *new_device) } if (new_device->id != DEVICE_ID_SINGLE) - snprintf(new_device->unique_name, - sizeof(new_device->unique_name), - FORMAT_DRIVER_NAME_ID, - new_device->name, - new_device->id); + new_device->unique_name = basprintf(FORMAT_DRIVER_NAME_ID, + new_device->name, + new_device->id); debug ("register_device: %s\n", dev_name(new_device)); @@ -478,16 +476,29 @@ EXPORT_SYMBOL(dummy_probe); * @dev: device * @fmt: format string for the device's name * + * NOTE: This function expects dev->name to be free()-able, so extra + * precautions needs to be taken when mixing its usage with manual + * assignement of device_d.name. */ int dev_set_name(struct device_d *dev, const char *fmt, ...) { va_list vargs; int err; + /* + * Save old pointer in case we are overriding already set name + */ + char *oldname = dev->name; va_start(vargs, fmt); - err = vsnprintf(dev->name, sizeof(dev->name), fmt, vargs); + err = vasprintf(&dev->name, fmt, vargs); va_end(vargs); + /* + * Free old pointer, we do this after vasprintf call in case + * old device name was in one of vargs + */ + free(oldname); + WARN_ON(err < 0); return err; diff --git a/include/driver.h b/include/driver.h index 94fddc735..db844aed3 100644 --- a/include/driver.h +++ b/include/driver.h @@ -23,7 +23,6 @@ #include <linux/ioport.h> #include <of.h> -#define MAX_DRIVER_NAME 32 #define FORMAT_DRIVER_NAME_ID "%s%d" #include <param.h> @@ -44,13 +43,13 @@ struct device_d { * should not be modified directly and dev_set_name() should * be used instead. */ - char name[MAX_DRIVER_NAME]; + char *name; /*! This member is used to store device's unique name as * obtained by calling dev_id(). Internal field, do not * access it directly. */ - char unique_name[MAX_DRIVER_NAME + 16]; + char *unique_name; /*! The id is used to uniquely identify a device in the system. The id * will show up under /dev/ as the device's name. Usually this is * something like eth0 or nor0. */ -- 2.17.1 _______________________________________________ barebox mailing list [email protected] http://lists.infradead.org/mailman/listinfo/barebox
