From 8cb05f4b54535cb91d7a5f9f8eb230bd4fa86e4e Mon Sep 17 00:00:00 2001 From: Andy Shevchenko Date: Thu, 2 Aug 2012 19:05:41 +0300 Subject: [PATCH] staging: tidspbridge: eliminate uuid_uuid_to_string There is native specificator for snprintf to get UUID in human readable format. Signed-off-by: Andy Shevchenko Cc: Omar Ramirez Luna Signed-off-by: Greg Kroah-Hartman --- drivers/staging/tidspbridge/gen/uuidutil.c | 21 ------------------- .../tidspbridge/include/dspbridge/uuidutil.h | 20 ------------------ drivers/staging/tidspbridge/rmgr/dbdcd.c | 2 +- 3 files changed, 1 insertion(+), 42 deletions(-) diff --git a/drivers/staging/tidspbridge/gen/uuidutil.c b/drivers/staging/tidspbridge/gen/uuidutil.c index b44656cf7858..b7d8313d1acb 100644 --- a/drivers/staging/tidspbridge/gen/uuidutil.c +++ b/drivers/staging/tidspbridge/gen/uuidutil.c @@ -26,27 +26,6 @@ /* ----------------------------------- This */ #include -/* - * ======== 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) { s32 i; diff --git a/drivers/staging/tidspbridge/include/dspbridge/uuidutil.h b/drivers/staging/tidspbridge/include/dspbridge/uuidutil.h index 9a994753e9ba..414bf71d652d 100644 --- a/drivers/staging/tidspbridge/include/dspbridge/uuidutil.h +++ b/drivers/staging/tidspbridge/include/dspbridge/uuidutil.h @@ -21,26 +21,6 @@ #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 ======== * Purpose: diff --git a/drivers/staging/tidspbridge/rmgr/dbdcd.c b/drivers/staging/tidspbridge/rmgr/dbdcd.c index 12a1d34b3954..eba36f484979 100644 --- a/drivers/staging/tidspbridge/rmgr/dbdcd.c +++ b/drivers/staging/tidspbridge/rmgr/dbdcd.c @@ -395,7 +395,7 @@ int dcd_get_object_def(struct dcd_manager *hdcd_mgr, } /* 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) strncat(sz_reg_key, sz_uuid, MAXUUIDLEN); -- 2.20.1