diff options
| author | Antonio Argenziano <antonio.argenziano@intel.com> | 2018-02-23 15:14:40 -0800 |
|---|---|---|
| committer | Arkadiusz Hiler <arkadiusz.hiler@intel.com> | 2018-02-27 13:58:56 +0200 |
| commit | d75e676ffdf5095a5f4361110a760bf0d902f80f (patch) | |
| tree | 269d35a7e0d6a0263c42927a6f464548de6cba52 /tools | |
| parent | 148737b8f9d22388ef2ae517c3512469f323f8e8 (diff) | |
igt: Make libudev mandatory
Since more essential components use libudev, make its dependency
mandatory.
Signed-off-by: Antonio Argenziano <antonio.argenziano@intel.com>
Cc: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Daniel Vetter <daniel.vetter@ffwll.ch>
Cc: Petri Latvala <petri.latvala@intel.com>
Cc: Arkadiusz Hiler <arkadiusz.hiler@intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Acked-by: Petri Latvala <petri.latvala@intel.com>
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/Makefile.am | 2 | ||||
| -rw-r--r-- | tools/intel_l3_parity.c | 7 | ||||
| -rw-r--r-- | tools/intel_l3_parity.h | 5 | ||||
| -rw-r--r-- | tools/intel_l3_udev_listener.c | 2 |
4 files changed, 0 insertions, 16 deletions
diff --git a/tools/Makefile.am b/tools/Makefile.am index dcf282ea..8de2a231 100644 --- a/tools/Makefile.am +++ b/tools/Makefile.am @@ -7,11 +7,9 @@ bin_PROGRAMS += $(LIBDRM_INTEL_BIN) intel_error_decode_LDFLAGS = -lz endif -if HAVE_UDEV bin_PROGRAMS += intel_dp_compliance intel_dp_compliance_CFLAGS = $(AM_CFLAGS) intel_dp_compliance_LDADD = $(top_builddir)/lib/libintel_tools.la -endif SUBDIRS = null_state_gen registers diff --git a/tools/intel_l3_parity.c b/tools/intel_l3_parity.c index 9df4fc24..d1a9bc44 100644 --- a/tools/intel_l3_parity.c +++ b/tools/intel_l3_parity.c @@ -39,10 +39,8 @@ #include "igt_sysfs.h" #include "drmtest.h" #include "config.h" -#ifdef HAVE_UDEV #include <libudev.h> #include <syslog.h> -#endif #include "intel_l3_parity.h" static unsigned int devid; @@ -318,10 +316,6 @@ int main(int argc, char *argv[]) /* Daemon doesn't work like the other commands */ if (action == 'L') { -#ifndef HAVE_UDEV - fprintf(stderr, "Daemon requires udev support. Please reconfigure.\n"); - exit(EXIT_FAILURE); -#else struct l3_parity par; struct l3_location loc; if (daemonize) { @@ -332,7 +326,6 @@ int main(int argc, char *argv[]) assert(l3_uevent_setup(&par) == 0); assert(l3_listen(&par, daemonize == 1, &loc) == 0); exit(EXIT_SUCCESS); -#endif } if (action == 'l') diff --git a/tools/intel_l3_parity.h b/tools/intel_l3_parity.h index 759c4f4b..275c9b4b 100644 --- a/tools/intel_l3_parity.h +++ b/tools/intel_l3_parity.h @@ -18,14 +18,9 @@ struct l3_location { uint8_t subbank; }; -#ifdef HAVE_UDEV int l3_uevent_setup(struct l3_parity *par); /* Listens (blocks) for an l3 parity event. Returns the location of the error. */ int l3_listen(struct l3_parity *par, bool daemon, struct l3_location *loc); #define l3_uevent_teardown(par) {} -#else -#define l3_uevent_setup(par, daemon, loc) -1 -#define l3_listen(par) -1 -#endif #endif diff --git a/tools/intel_l3_udev_listener.c b/tools/intel_l3_udev_listener.c index 94d931e5..ff62f407 100644 --- a/tools/intel_l3_udev_listener.c +++ b/tools/intel_l3_udev_listener.c @@ -23,7 +23,6 @@ #include "config.h" -#ifdef HAVE_UDEV #include <libudev.h> #include <stdio.h> #include <stdlib.h> @@ -123,4 +122,3 @@ again: return 0; } -#endif |