Kernel/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2025-01-12 08:00:09 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

staging: tidspbridge: eliminate uuid_uuid_to_string

Browse Source 
There is native specificator for snprintf to get UUID in human readable format.

Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Cc: Omar Ramirez Luna <omar.ramirez@ti.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Andy Shevchenko 2012-08-02 19:05:41 +03:00 committed by Greg Kroah-Hartman
parent 0edc6c6d54
commit 8cb05f4b54
3 changed files with 1 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
drivers/staging/tidspbridge/gen/uuidutil.c
View File

@ -26,27 +26,6 @@
/* ----------------------------------- This */ /* ----------------------------------- This */
#include <dspbridge/uuidutil.h> #include <dspbridge/uuidutil.h>
/*
* ======== uuid_uuid_to_string ========
* Purpose:
* Converts a struct dsp_uuid to a string.
* Note: snprintf format specifier is:
* %[flags] [width] [.precision] [{h | l | I64 | L}]type
*/
void uuid_uuid_to_string(struct dsp_uuid *uuid_obj, char *sz_uuid,
s32 size)
{
s32 i; /* return result from snprintf. */
i = snprintf(sz_uuid, size,
"%.8X_%.4X_%.4X_%.2X%.2X_%.2X%.2X%.2X%.2X%.2X%.2X",
uuid_obj->data1, uuid_obj->data2, uuid_obj->data3,
uuid_obj->data4, uuid_obj->data5,
uuid_obj->data6[0], uuid_obj->data6[1],
uuid_obj->data6[2], uuid_obj->data6[3],
uuid_obj->data6[4], uuid_obj->data6[5]);
}
static s32 uuid_hex_to_bin(char *buf, s32 len) static s32 uuid_hex_to_bin(char *buf, s32 len)
{ {
s32 i; s32 i;

20
drivers/staging/tidspbridge/include/dspbridge/uuidutil.h
View File

@ -21,26 +21,6 @@
#define MAXUUIDLEN 37 #define MAXUUIDLEN 37
/*
* ======== uuid_uuid_to_string ========
* Purpose:
* Converts a dsp_uuid to an ANSI string.
* Parameters:
* uuid_obj: Pointer to a dsp_uuid object.
* sz_uuid: Pointer to a buffer to receive a NULL-terminated UUID
* string.
* size: Maximum size of the sz_uuid string.
* Returns:
* Requires:
* uuid_obj & sz_uuid are non-NULL values.
* Ensures:
* Lenghth of sz_uuid is less than MAXUUIDLEN.
* Details:
* UUID string limit currently set at MAXUUIDLEN.
*/
void uuid_uuid_to_string(struct dsp_uuid *uuid_obj, char *sz_uuid,
s32 size);
/* /*
* ======== uuid_uuid_from_string ======== * ======== uuid_uuid_from_string ========
* Purpose: * Purpose:

2
drivers/staging/tidspbridge/rmgr/dbdcd.c
View File

@ -395,7 +395,7 @@ int dcd_get_object_def(struct dcd_manager *hdcd_mgr,
} }
/* Create UUID value to set in registry. */ /* Create UUID value to set in registry. */
uuid_uuid_to_string(obj_uuid, sz_uuid, MAXUUIDLEN); snprintf(sz_uuid, MAXUUIDLEN, "%pU", obj_uuid);
if ((strlen(sz_reg_key) + MAXUUIDLEN) < DCD_MAXPATHLENGTH) if ((strlen(sz_reg_key) + MAXUUIDLEN) < DCD_MAXPATHLENGTH)
strncat(sz_reg_key, sz_uuid, MAXUUIDLEN); strncat(sz_reg_key, sz_uuid, MAXUUIDLEN);