@@ -20,6 +20,8 @@ enum ps3_lpar_id {
PS3_LPAR_ID_PME = 1,
};
+static u64 make_field(const char *text, u64 index);
+
#define dump_field(_a, _b) _dump_field(_a, _b, __func__, __LINE__)
static void _dump_field(const char *hdr, u64 n, const char *func, int line)
{
@@ -63,33 +65,33 @@ static void _dump_node(unsigned int lpar_id, u64 n1, u64 n2, u64 n3, u64 n4,
}
/**
- * make_field - Make subsequent fields of a repository node name.
- * @text: Text portion of the field. Use "" for 'don't care'.
+ * make_first_field - Make the first field of a repository node name.
+ * @text: Text portion of the field.
* @index: Numeric index portion of the field. Use zero for 'don't care'.
*
+ * This routine sets the vendor id to zero (non-vendor specific).
* Returns field value.
*/
-static u64 make_field(const char *text, u64 index)
+static u64 make_first_field(const char *text, u64 index)
{
- u64 n = 0;
-
- memcpy((char *)&n, text, strnlen(text, sizeof(n)));
- return n + index;
+ return PS3_VENDOR_ID_NONE + ((make_field(text, index) - index) >> 32) + index;
}
/**
- * make_first_field - Make the first field of a repository node name.
- * @text: Text portion of the field.
+ * make_field - Make subsequent fields of a repository node name.
+ * @text: Text portion of the field. Use "" for 'don't care'.
* @index: Numeric index portion of the field. Use zero for 'don't care'.
*
- * This routine sets the vendor id to zero (non-vendor specific).
* Returns field value.
*/
-static u64 make_first_field(const char *text, u64 index)
+static u64 make_field(const char *text, u64 index)
{
- return PS3_VENDOR_ID_NONE + ((make_field(text, index) - index) >> 32) + index;
+ u64 n = 0;
+
+ memcpy((char *)&n, text, strnlen(text, sizeof(n)));
+ return n + index;
}
/**
Forward declare `make_field` for a cleaner diff Signed-off-by: Justin Stitt <justinstitt@google.com> --- arch/powerpc/platforms/ps3/repository.c | 26 ++++++++++++++------------ 1 file changed, 14 insertions(+), 12 deletions(-)