plugins: do not include "suffix.h" and "argconfig.h"

Not required for most plugins.

Signed-off-by: Hannes Reinecke <hare@suse.de>

diff --git a/Makefile b/Makefile
index d99aa06d62b0a9cb14cb2ecaadc7ec757b5bed2b..bc9a94e52b5cc44b68d741ccf4e59cd52bdea9d2 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
 CFLAGS ?= -O2 -g -Wall -Werror
 override CFLAGS += -std=gnu99
-override CPPFLAGS += -D_GNU_SOURCE -D__CHECK_ENDIAN__ -I. -Iutil/
+override CPPFLAGS += -D_GNU_SOURCE -D__CHECK_ENDIAN__ -I.
 LIBUUID = $(shell $(LD) -o /dev/null -luuid >/dev/null 2>&1; echo $$?)
 LIBHUGETLBFS = $(shell $(LD) -o /dev/null -lhugetlbfs >/dev/null 2>&1; echo $$?)
 HAVE_SYSTEMD = $(shell pkg-config --exists libsystemd  --atleast-version=242; echo $$?)

diff --git a/plugins/amzn/amzn-nvme.c b/plugins/amzn/amzn-nvme.c
index 6400bb28ad8e9a927c73089c7c675ed47f82efe5..cd7d5552557a2b80adc853096ae4bef90c4f8011 100644 (file)
--- a/plugins/amzn/amzn-nvme.c
+++ b/plugins/amzn/amzn-nvme.c
@@ -10,9 +10,6 @@
 #include "libnvme.h"
 #include "plugin.h"
 
-#include "argconfig.h"
-#include "suffix.h"
-
 #define CREATE_CMD
 #include "amzn-nvme.h"
 

diff --git a/plugins/dera/dera-nvme.c b/plugins/dera/dera-nvme.c
index 7f9e7760d2c2cc40e00821a8eb26ff4c0f566c06..f4163bae6bb078cb19532677f7210af8e45b455d 100644 (file)
--- a/plugins/dera/dera-nvme.c
+++ b/plugins/dera/dera-nvme.c
@@ -13,9 +13,6 @@
 #include "libnvme.h"
 #include "plugin.h"
 
-#include "argconfig.h"
-#include "suffix.h"
-
 #define CREATE_CMD
 #include "dera-nvme.h"
 

diff --git a/plugins/huawei/huawei-nvme.c b/plugins/huawei/huawei-nvme.c
index b7e65c50a2e5fb5cb55a566e9d055e36b5d6904e..679578f7d69f2b00d71e4925650d149f4b2cb0a3 100644 (file)
--- a/plugins/huawei/huawei-nvme.c
+++ b/plugins/huawei/huawei-nvme.c
@@ -30,8 +30,7 @@
 #include "libnvme.h"
 #include "plugin.h"
 
-#include "argconfig.h"
-#include "suffix.h"
+#include "util/suffix.h"
 
 #define CREATE_CMD
 #include "huawei-nvme.h"

diff --git a/plugins/intel/intel-nvme.c b/plugins/intel/intel-nvme.c
index d3cbca72832eee54349db7ef7b562762178a33e4..77abdc91f49fec45c3b1b47d94113757112ab5f7 100644 (file)
--- a/plugins/intel/intel-nvme.c
+++ b/plugins/intel/intel-nvme.c
@@ -11,9 +11,6 @@
 #include "plugin.h"
 #include "linux/types.h"
 
-#include "argconfig.h"
-#include "suffix.h"
-
 #define CREATE_CMD
 #include "intel-nvme.h"
 

diff --git a/plugins/memblaze/memblaze-nvme.c b/plugins/memblaze/memblaze-nvme.c
index 118a756fe317610ee4e703a4c0b54ef662635f0f..0ace7d512df9edd70dcb7685289a9342090ec4ce 100644 (file)
--- a/plugins/memblaze/memblaze-nvme.c
+++ b/plugins/memblaze/memblaze-nvme.c
@@ -9,9 +9,6 @@
 #include "libnvme.h"
 #include "plugin.h"
 
-#include "argconfig.h"
-#include "suffix.h"
-
 #define CREATE_CMD
 #include "memblaze-nvme.h"
 #include "memblaze-utils.h"

diff --git a/plugins/netapp/netapp-nvme.c b/plugins/netapp/netapp-nvme.c
index 07dfeff7a3af1e3e53838bca568846560a79e3c9..377b5410c13d2c24001ac3bea81320923676f6a1 100644 (file)
--- a/plugins/netapp/netapp-nvme.c
+++ b/plugins/netapp/netapp-nvme.c
@@ -26,7 +26,7 @@
 #include "nvme.h"
 #include "libnvme.h"
 
-#include "suffix.h"
+#include "util/suffix.h"
 
 #define CREATE_CMD
 #include "netapp-nvme.h"

diff --git a/plugins/nvidia/nvidia-nvme.c b/plugins/nvidia/nvidia-nvme.c
index cb1ab9076ec42f6bdb9b6950a64fc05c36a74b2e..8ddd16f76fafc154d9384b0888480669f95f007f 100644 (file)
--- a/plugins/nvidia/nvidia-nvme.c
+++ b/plugins/nvidia/nvidia-nvme.c
@@ -10,9 +10,6 @@
 #include "libnvme.h"
 #include "plugin.h"
 
-#include "argconfig.h"
-#include "suffix.h"
-
 #define CREATE_CMD
 #include "nvidia-nvme.h"
 

diff --git a/plugins/scaleflux/sfx-nvme.c b/plugins/scaleflux/sfx-nvme.c
index 1f8b5b1023954c7d6ee7be1f1a8bd4ca2be87336..8938ae93807d16268fba364f669a02267ac316c5 100644 (file)
--- a/plugins/scaleflux/sfx-nvme.c
+++ b/plugins/scaleflux/sfx-nvme.c
@@ -14,9 +14,6 @@
 #include "libnvme.h"
 #include "plugin.h"
 
-#include "argconfig.h"
-#include "suffix.h"
-
 #define CREATE_CMD
 #include "sfx-nvme.h"
 

diff --git a/plugins/seagate/seagate-nvme.c b/plugins/seagate/seagate-nvme.c
index 73bb88ed844178937a37f92b257a7a582c1b2e7d..28f86a181bb56e5bc8c78bf0b568ae52280c4fa0 100644 (file)
--- a/plugins/seagate/seagate-nvme.c
+++ b/plugins/seagate/seagate-nvme.c
@@ -31,8 +31,6 @@
 #include "nvme.h"
 #include "libnvme.h"
 #include "plugin.h"
-#include "argconfig.h"
-#include "suffix.h"
 
 #define CREATE_CMD
 

diff --git a/plugins/shannon/shannon-nvme.c b/plugins/shannon/shannon-nvme.c
index f8eddf4fa9d0a87c549e954584fcd79da321f05d..09ce554990ae1eccab71fe5046e9c928a48245f3 100644 (file)
--- a/plugins/shannon/shannon-nvme.c
+++ b/plugins/shannon/shannon-nvme.c
@@ -10,9 +10,6 @@
 #include "libnvme.h"
 #include "plugin.h"
 
-#include "argconfig.h"
-#include "suffix.h"
-
 #define CREATE_CMD
 #include "shannon-nvme.h"
 

diff --git a/plugins/toshiba/toshiba-nvme.c b/plugins/toshiba/toshiba-nvme.c
index 540e9d62c8437a8f2aea585d5073b20c3c114c0a..1302ec97e26a7d1cdfe6bd1b142445931e11fa7d 100644 (file)
--- a/plugins/toshiba/toshiba-nvme.c
+++ b/plugins/toshiba/toshiba-nvme.c
@@ -10,8 +10,6 @@
 #include "nvme.h"
 #include "libnvme.h"
 #include "plugin.h"
-#include "argconfig.h"
-#include "suffix.h"
 
 #define CREATE_CMD
 #include "toshiba-nvme.h"

diff --git a/plugins/transcend/transcend-nvme.c b/plugins/transcend/transcend-nvme.c
index 55d066f7ff6f0bac344ad4271badcf8023a9ec3a..85d3cac9ad9ac4f170ef6061c45c17ba65ee9bdd 100644 (file)
--- a/plugins/transcend/transcend-nvme.c
+++ b/plugins/transcend/transcend-nvme.c
@@ -8,8 +8,6 @@
 #include "nvme.h"
 #include "libnvme.h"
 #include "plugin.h"
-#include "argconfig.h"
-#include "suffix.h"
 
 #define CREATE_CMD
 #include "transcend-nvme.h"

diff --git a/plugins/virtium/virtium-nvme.c b/plugins/virtium/virtium-nvme.c
index d4e255d7b4d2273fdeee424809f67bff197a43b3..50a4e2e021a8e9d8dbe7091fe1101af02ad67ce0 100644 (file)
--- a/plugins/virtium/virtium-nvme.c
+++ b/plugins/virtium/virtium-nvme.c
@@ -12,8 +12,6 @@
 #include "nvme.h"
 #include "libnvme.h"
 #include "plugin.h"
-#include "argconfig.h"
-#include "suffix.h"
 
 #define CREATE_CMD
 #include "virtium-nvme.h"

diff --git a/plugins/wdc/wdc-nvme.c b/plugins/wdc/wdc-nvme.c
index ce31eb0fd9301600497b269518c9caff4092d3f1..4d145ca01377dcdf4e14f167597503e2358099ef 100644 (file)
--- a/plugins/wdc/wdc-nvme.c
+++ b/plugins/wdc/wdc-nvme.c
@@ -35,8 +35,6 @@
 #include "libnvme.h"
 #include "plugin.h"
 
-#include "argconfig.h"
-#include "suffix.h"
 #define CREATE_CMD
 #include "wdc-nvme.h"
 #include "wdc-utils.h"

diff --git a/plugins/ymtc/ymtc-nvme.c b/plugins/ymtc/ymtc-nvme.c
index 2a6609b3aca70a65d7b0830041d5dccb81e66da0..2958ee0872f2dfa2c41b735b84b4f7debb520af5 100644 (file)
--- a/plugins/ymtc/ymtc-nvme.c
+++ b/plugins/ymtc/ymtc-nvme.c
@@ -8,9 +8,6 @@
 #include "libnvme.h"
 #include "plugin.h"
 
-#include "argconfig.h"
-#include "suffix.h"
-
 #define CREATE_CMD
 #include "ymtc-nvme.h"
 #include "ymtc-utils.h"