From 1fed9b4666f6907b56851d163e8b634100e77d2a Mon Sep 17 00:00:00 2001 From: Richard Weinberger Date: Tue, 26 Apr 2016 23:47:37 +0200 Subject: Remove UDEV_SETTLE_HACK UDEV_SETTLE_HACK addresses a problem which does no longer exist on Linux. These days we have devtmpfs. New devices will automatically created on the kernel side and user space has no longer to wait for udev. As udev has a hard dependency on devtmpfs we can depend on it too. People which don't use udev nor plain devtmpfs are anyways on their own. Android, I'm looking at you... Signed-off-by: Richard Weinberger Signed-off-by: David Oberhollenzer --- lib/libubi.c | 29 ----------------------------- 1 file changed, 29 deletions(-) (limited to 'lib/libubi.c') diff --git a/lib/libubi.c b/lib/libubi.c index 758d351..99022dd 100644 --- a/lib/libubi.c +++ b/lib/libubi.c @@ -700,11 +700,6 @@ static int do_attach(const char *node, const struct ubi_attach_req *r) if (ret == -1) return -1; -#ifdef UDEV_SETTLE_HACK -// if (system("udevsettle") == -1) -// return -1; - usleep(100000); -#endif return ret; } @@ -850,12 +845,6 @@ int ubi_remove_dev(libubi_t desc, const char *node, int ubi_dev) if (ret == -1) goto out_close; -#ifdef UDEV_SETTLE_HACK -// if (system("udevsettle") == -1) -// return -1; - usleep(100000); -#endif - out_close: close(fd); return ret; @@ -1034,12 +1023,6 @@ int ubi_mkvol(libubi_t desc, const char *node, struct ubi_mkvol_request *req) close(fd); req->vol_id = r.vol_id; -#ifdef UDEV_SETTLE_HACK -// if (system("udevsettle") == -1) -// return -1; - usleep(100000); -#endif - return 0; } @@ -1060,12 +1043,6 @@ int ubi_rmvol(libubi_t desc, const char *node, int vol_id) close(fd); -#ifdef UDEV_SETTLE_HACK -// if (system("udevsettle") == -1) -// return -1; - usleep(100000); -#endif - return 0; } @@ -1086,12 +1063,6 @@ int ubi_rnvols(libubi_t desc, const char *node, struct ubi_rnvol_req *rnvol) close(fd); -#ifdef UDEV_SETTLE_HACK -// if (system("udevsettle") == -1) -// return -1; - usleep(100000); -#endif - return 0; } -- cgit v1.2.3