Now that all devices can pass the same set of unit tests, elminate the
temporary idxd_rawdev_test function and move the prototype for
ioat_rawdev_test to the proper internal header file, to be used by all
device instances.
Signed-off-by: Bruce Richardson <bruce.richardson@intel.com>
---
drivers/raw/ioat/idxd_pci.c | 2 +-
drivers/raw/ioat/idxd_vdev.c | 2 +-
drivers/raw/ioat/ioat_private.h | 4 ++--
drivers/raw/ioat/ioat_rawdev.c | 2 --
drivers/raw/ioat/ioat_rawdev_test.c | 7 -------
5 files changed, 4 insertions(+), 13 deletions(-)
@@ -102,7 +102,7 @@ idxd_pci_dev_start(struct rte_rawdev *dev)
}
static const struct rte_rawdev_ops idxd_pci_ops = {
- .dev_selftest = idxd_rawdev_test,
+ .dev_selftest = ioat_rawdev_test,
.dump = idxd_dev_dump,
.dev_configure = idxd_dev_configure,
.dev_start = idxd_pci_dev_start,
@@ -81,7 +81,7 @@ idxd_vdev_start(struct rte_rawdev *dev)
}
static const struct rte_rawdev_ops idxd_vdev_ops = {
- .dev_selftest = idxd_rawdev_test,
+ .dev_selftest = ioat_rawdev_test,
.dump = idxd_dev_dump,
.dev_configure = idxd_dev_configure,
.dev_start = idxd_vdev_start,
@@ -65,6 +65,8 @@ int ioat_xstats_get_names(const struct rte_rawdev *dev,
int ioat_xstats_reset(struct rte_rawdev *dev, const uint32_t *ids,
uint32_t nb_ids);
+extern int ioat_rawdev_test(uint16_t dev_id);
+
extern int idxd_rawdev_create(const char *name, struct rte_device *dev,
const struct idxd_rawdev *idxd,
const struct rte_rawdev_ops *ops);
@@ -75,8 +77,6 @@ extern int idxd_dev_configure(const struct rte_rawdev *dev,
extern int idxd_dev_info_get(struct rte_rawdev *dev, rte_rawdev_obj_t dev_info,
size_t info_size);
-extern int idxd_rawdev_test(uint16_t dev_id);
-
extern int idxd_dev_dump(struct rte_rawdev *dev, FILE *f);
#endif /* _IOAT_PRIVATE_H_ */
@@ -121,8 +121,6 @@ ioat_dev_info_get(struct rte_rawdev *dev, rte_rawdev_obj_t dev_info,
return 0;
}
-extern int ioat_rawdev_test(uint16_t dev_id);
-
static int
ioat_rawdev_create(const char *name, struct rte_pci_device *dev)
{
@@ -253,10 +253,3 @@ ioat_rawdev_test(uint16_t dev_id)
free(ids);
return -1;
}
-
-int
-idxd_rawdev_test(uint16_t dev_id)
-{
- rte_rawdev_dump(dev_id, stdout);
- return ioat_rawdev_test(dev_id);
-}