[char-misc-next 2/2] mei: bus: set the device name before running fixup

Path	csiph.com!eternal-september.org!feeder.eternal-september.org!aioe.org!bofh.it!news.nic.it!robomod
From	Tomas Winkler <tomas.winkler@intel.com>
Newsgroups	linux.kernel
Subject	[char-misc-next 2/2] mei: bus: set the device name before running fixup
Date	Wed, 28 Oct 2015 13:40:02 +0100
Message-ID	<qoybf-2Bd-9@gated-at.bofh.it> (permalink)
References	<qoybf-2Bd-11@gated-at.bofh.it>
X-Original-To	Greg Kroah-Hartman <gregkh@linuxfoundation.org>
X-Extloop1	1
X-Ironport-Av	E=Sophos;i="5.20,209,1444719600"; d="scan'208";a="837055923"
X-Mailer	git-send-email 2.4.3
Sender	robomod@news.nic.it
List-ID	<linux-kernel.vger.kernel.org>
X-Mailing-List	linux-kernel@vger.kernel.org
Approved	robomod@news.nic.it
Lines	63
Organization	linux.* mail to news gateway
X-Original-Cc	Alexander Usyskin <alexander.usyskin@intel.com>, linux-kernel@vger.kernel.org, Tomas Winkler <tomas.winkler@intel.com>
X-Original-Date	Wed, 28 Oct 2015 14:34:35 +0200
X-Original-Message-ID	<1446035675-23960-2-git-send-email-tomas.winkler@intel.com>
X-Original-References	<1446035675-23960-1-git-send-email-tomas.winkler@intel.com>
X-Original-Sender	linux-kernel-owner@vger.kernel.org
Xref	csiph.com linux.kernel:1257951

Show key headers only | View raw

The mei bus fixup use dev_xxx services for printing
to kernel log so we need to setup the device name
prior to running fixup hooks.

Signed-off-by: Tomas Winkler <tomas.winkler@intel.com>
---
 drivers/misc/mei/bus.c | 20 ++++++++++++++++----
 1 file changed, 16 insertions(+), 4 deletions(-)

diff --git a/drivers/misc/mei/bus.c b/drivers/misc/mei/bus.c
index 46403e48be4f..0b05aa938799 100644
--- a/drivers/misc/mei/bus.c
+++ b/drivers/misc/mei/bus.c
@@ -742,6 +742,19 @@ static struct device_type mei_cl_device_type = {
 };
 
 /**
+ * mei_cl_bus_set_name - set device name for me client device
+ *
+ * @cldev: me client device
+ */
+static inline void mei_cl_bus_set_name(struct mei_cl_device *cldev)
+{
+	dev_set_name(&cldev->dev, "mei:%s:%pUl:%02X",
+		     cldev->name,
+		     mei_me_cl_uuid(cldev->me_cl),
+		     mei_me_cl_ver(cldev->me_cl));
+}
+
+/**
  * mei_cl_bus_dev_alloc - initialize and allocate mei client device
  *
  * @bus: mei device
@@ -764,6 +777,7 @@ static struct mei_cl_device *mei_cl_bus_dev_alloc(struct mei_device *bus,
 	cldev->dev.type   = &mei_cl_device_type;
 	cldev->bus        = mei_dev_bus_get(bus);
 	cldev->me_cl      = mei_me_cl_get(me_cl);
+	mei_cl_bus_set_name(cldev);
 	cldev->is_added   = 0;
 	INIT_LIST_HEAD(&cldev->bus_list);
 
@@ -785,11 +799,9 @@ static bool mei_cl_bus_dev_setup(struct mei_device *bus,
 	cldev->do_match = 1;
 	mei_cl_bus_dev_fixup(cldev);
 
+	/* the device name can change during fix up */
 	if (cldev->do_match)
-		dev_set_name(&cldev->dev, "mei:%s:%pUl:%02X",
-			     cldev->name,
-			     mei_me_cl_uuid(cldev->me_cl),
-			     mei_me_cl_ver(cldev->me_cl));
+		mei_cl_bus_set_name(cldev);
 
 	return cldev->do_match == 1;
 }
-- 
2.4.3

--
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 | Find similar | Unroll thread

Thread

[char-misc-next 2/2] mei: bus: set the device name before running fixup Tomas Winkler <tomas.winkler@intel.com> - 2015-10-28 13:40 +0100

csiph-web