chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
5f72c47
)
[PATCH] remove unused timestamp field
author
kay.sievers@vrfy.org
<kay.sievers@vrfy.org>
Mon, 29 Nov 2004 12:51:20 +0000
(13:51 +0100)
committer
Greg KH
<gregkh@suse.de>
Wed, 27 Apr 2005 06:00:29 +0000
(23:00 -0700)
namedev.c
patch
|
blob
|
history
udev.h
patch
|
blob
|
history
diff --git
a/namedev.c
b/namedev.c
index 0bc28bd028cc4eee3822b6540946986004364b2f..7045637e79e5f3423d6a4bd005dfd0b23ee513b9 100644
(file)
--- a/
namedev.c
+++ b/
namedev.c
@@
-31,7
+31,6
@@
#include <errno.h>
#include <sys/wait.h>
#include <sys/stat.h>
#include <errno.h>
#include <sys/wait.h>
#include <sys/stat.h>
-#include <sys/sysinfo.h>
#include "libsysfs/sysfs/libsysfs.h"
#include "list.h"
#include "libsysfs/sysfs/libsysfs.h"
#include "list.h"
@@
-697,7
+696,6
@@
int namedev_name_device(struct udevice *udev, struct sysfs_class_device *class_d
struct sysfs_device *sysfs_device = NULL;
struct config_device *dev;
struct perm_device *perm;
struct sysfs_device *sysfs_device = NULL;
struct config_device *dev;
struct perm_device *perm;
- struct sysinfo info;
char *pos;
udev->mode = 0;
char *pos;
udev->mode = 0;
@@
-774,7
+772,7
@@
int namedev_name_device(struct udevice *udev, struct sysfs_class_device *class_d
udev->ignore_remove = dev->ignore_remove;
if (udev->type == 'n')
udev->ignore_remove = dev->ignore_remove;
if (udev->type == 'n')
- goto
done
;
+ goto
exit
;
udev->partitions = dev->partitions;
udev->mode = dev->mode;
udev->partitions = dev->partitions;
udev->mode = dev->mode;
@@
-790,7
+788,7
@@
int namedev_name_device(struct udevice *udev, struct sysfs_class_device *class_d
strfieldcpy(udev->name, udev->kernel_name);
if (udev->type == 'n')
strfieldcpy(udev->name, udev->kernel_name);
if (udev->type == 'n')
- goto
done
;
+ goto
exit
;
perms:
/* apply permissions from permissions file to empty fields */
perms:
/* apply permissions from permissions file to empty fields */
@@
-815,11
+813,7
@@
perms:
dbg("name, '%s' is going to have owner='%s', group='%s', mode = %#o",
udev->name, udev->owner, udev->group, udev->mode);
dbg("name, '%s' is going to have owner='%s', group='%s', mode = %#o",
udev->name, udev->owner, udev->group, udev->mode);
-done:
- /* store time of action */
- sysinfo(&info);
- udev->config_uptime = info.uptime;
-
+exit:
return 0;
}
return 0;
}
diff --git
a/udev.h
b/udev.h
index cff991e57a040b34206833a83d88d8b3e6d30db3..7038376b3c23ab44ea4b83e69e705e5010fa428e 100644
(file)
--- a/
udev.h
+++ b/
udev.h
@@
-63,7
+63,6
@@
struct udevice {
int ignore_remove;
int config_line;
char config_file[NAME_SIZE];
int ignore_remove;
int config_line;
char config_file[NAME_SIZE];
- long config_uptime;
char bus_id[SYSFS_NAME_LEN];
char program_result[NAME_SIZE];
char kernel_number[NAME_SIZE];
char bus_id[SYSFS_NAME_LEN];
char program_result[NAME_SIZE];
char kernel_number[NAME_SIZE];