-/*
- * Copyright (C) 2001, 2002 Jeff Dike (jdike@karaya.com)
+/*
+ * Copyright (C) 2001 - 2007 Jeff Dike (jdike@{addtoit,linux.intel}.com)
* Licensed under the GPL
*/
-#include "linux/stddef.h"
-#include "linux/kernel.h"
-#include "asm/errno.h"
+#include <asm/errno.h>
#include "init.h"
-#include "os.h"
#include "kern.h"
+#include "os.h"
-/* Changed by set_umid_arg and umid_file_name */
-int umid_is_random = 0;
+/* Changed by set_umid_arg */
static int umid_inited = 0;
static int __init set_umid_arg(char *name, int *add)
{
int err;
- if(umid_inited)
+ if (umid_inited) {
+ printf("umid already set\n");
return 0;
+ }
*add = 0;
- err = set_umid(name, printf);
- if(err == -EEXIST){
+ err = set_umid(name);
+ if (err == -EEXIST)
printf("umid '%s' already in use\n", name);
- umid_is_random = 1;
- }
- else if(!err)
+ else if (!err)
umid_inited = 1;
return 0;