Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1250159

[PATCH 3/4] vfio: platform: add compat in vfio_platform_device

Show all headers | View raw

Let's retrieve the compatibility string on probe and store it
in the vfio_platform_device struct

Signed-off-by: Eric Auger <eric.auger@linaro.org>
---
 drivers/vfio/platform/vfio_platform_common.c  | 15 ++++++++-------
 drivers/vfio/platform/vfio_platform_private.h |  1 +
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/drivers/vfio/platform/vfio_platform_common.c b/drivers/vfio/platform/vfio_platform_common.c
index d36afc9..31a6a8c 100644
--- a/drivers/vfio/platform/vfio_platform_common.c
+++ b/drivers/vfio/platform/vfio_platform_common.c
@@ -38,16 +38,11 @@ static const struct vfio_platform_reset_combo reset_lookup_table[] = {
 static void vfio_platform_get_reset(struct vfio_platform_device *vdev,
 				    struct device *dev)
 {
-	const char *compat;
 	int (*reset)(struct vfio_platform_device *);
-	int ret, i;
-
-	ret = device_property_read_string(dev, "compatible", &compat);
-	if (ret)
-		return;
+	int i;
 
 	for (i = 0 ; i < ARRAY_SIZE(reset_lookup_table); i++) {
-		if (!strcmp(reset_lookup_table[i].compat, compat)) {
+		if (!strcmp(reset_lookup_table[i].compat, vdev->compat)) {
 			request_module(reset_lookup_table[i].module_name);
 			reset = __symbol_get(
 				reset_lookup_table[i].reset_function_name);
@@ -538,6 +533,12 @@ int vfio_platform_probe_common(struct vfio_platform_device *vdev,
 	struct iommu_group *group;
 	int ret;
 
+	ret = device_property_read_string(dev, "compatible", &vdev->compat);
+	if (ret) {
+		pr_err("VFIO: cannot retrieve compat for %s\n", vdev->name);
+		return -EINVAL;
+	}
+
 	if (!vdev)
 		return -EINVAL;
 
diff --git a/drivers/vfio/platform/vfio_platform_private.h b/drivers/vfio/platform/vfio_platform_private.h
index 17323f0..b274646 100644
--- a/drivers/vfio/platform/vfio_platform_private.h
+++ b/drivers/vfio/platform/vfio_platform_private.h
@@ -56,6 +56,7 @@ struct vfio_platform_device {
 	u32				num_irqs;
 	int				refcnt;
 	struct mutex			igate;
+	const char			*compat;
 
 	/*
 	 * These fields should be filled by the bus specific binder
-- 
1.9.1

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

[PATCH 0/4] VFIO platform reset module rework Eric Auger <eric.auger@linaro.org> - 2015-10-18 18:10 +0200
  [PATCH 4/4] vfio: platform: use list of registered reset function Eric Auger <eric.auger@linaro.org> - 2015-10-18 18:10 +0200
  [PATCH 3/4] vfio: platform: add compat in vfio_platform_device Eric Auger <eric.auger@linaro.org> - 2015-10-18 18:10 +0200
  [PATCH 1/4] vfio: platform: add capability to register a reset function Eric Auger <eric.auger@linaro.org> - 2015-10-18 18:10 +0200
    Re: [PATCH 1/4] vfio: platform: add capability to register a reset function Arnd Bergmann <arnd@arndb.de> - 2015-10-19 15:10 +0200
    Re: [PATCH 1/4] vfio: platform: add capability to register a reset  function Alex Williamson <alex.williamson@redhat.com> - 2015-10-19 21:50 +0200
      Re: [PATCH 1/4] vfio: platform: add capability to register a reset  function Eric Auger <eric.auger@linaro.org> - 2015-10-20 19:50 +0200
  [PATCH 2/4] vfio: platform: reset: calxedaxgmac: add reset function registration Eric Auger <eric.auger@linaro.org> - 2015-10-18 18:10 +0200
    Re: [PATCH 2/4] vfio: platform: reset: calxedaxgmac: add reset function registration Arnd Bergmann <arnd@arndb.de> - 2015-10-19 15:10 +0200
      Re: [PATCH 2/4] vfio: platform: reset: calxedaxgmac: add reset  function registration Eric Auger <eric.auger@linaro.org> - 2015-10-19 15:20 +0200
        Re: [PATCH 2/4] vfio: platform: reset: calxedaxgmac: add reset function registration Arnd Bergmann <arnd@arndb.de> - 2015-10-19 15:30 +0200
          Re: [PATCH 2/4] vfio: platform: reset: calxedaxgmac: add reset  function registration Eric Auger <eric.auger@linaro.org> - 2015-10-19 15:40 +0200
  Re: [PATCH 0/4] VFIO platform reset module rework Arnd Bergmann <arnd@arndb.de> - 2015-10-19 15:10 +0200

csiph-web