From: Eddie James <eajames@linux.ibm.com>
To: linux-fsi@lists.ozlabs.org
Cc: rostedt@goodmis.org, linux-trace-kernel@vger.kernel.org,
devicetree@vger.kernel.org, linux-kernel@vger.kernel.org,
mhiramat@kernel.org, alistair@popple.id.au, joel@jms.id.au,
jk@ozlabs.org, andrew@aj.id.au, robh+dt@kernel.org,
krzysztof.kozlowski+dt@linaro.org, eajames@linux.ibm.com
Subject: [PATCH v8 2/8] fsi: Make master device indexing and naming optional
Date: Mon, 6 Mar 2023 10:10:50 -0600 [thread overview]
Message-ID: <20230306161057.44017-3-eajames@linux.ibm.com> (raw)
In-Reply-To: <20230306161057.44017-1-eajames@linux.ibm.com>
Some FSI masters need different device naming, so make the indexing and naming
an optional part of FSI master registration.
Signed-off-by: Eddie James <eajames@linux.ibm.com>
---
drivers/fsi/fsi-core.c | 13 +++++++++----
1 file changed, 9 insertions(+), 4 deletions(-)
diff --git a/drivers/fsi/fsi-core.c b/drivers/fsi/fsi-core.c
index d591e68afd11..3271e40702ec 100644
--- a/drivers/fsi/fsi-core.c
+++ b/drivers/fsi/fsi-core.c
@@ -1297,11 +1297,16 @@ int fsi_master_register(struct fsi_master *master)
struct device_node *np;
mutex_init(&master->scan_lock);
- master->idx = ida_simple_get(&master_ida, 0, INT_MAX, GFP_KERNEL);
- if (master->idx < 0)
- return master->idx;
- dev_set_name(&master->dev, "fsi%d", master->idx);
+ if (!master->idx) {
+ master->idx = ida_simple_get(&master_ida, 0, INT_MAX,
+ GFP_KERNEL);
+ if (master->idx < 0)
+ return master->idx;
+
+ dev_set_name(&master->dev, "fsi%d", master->idx);
+ }
+
master->dev.class = &fsi_master_class;
rc = device_register(&master->dev);
--
2.31.1
next prev parent reply other threads:[~2023-03-06 16:36 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-03-06 16:10 [PATCH v8 0/8] fsi: Add IBM I2C Responder virtual FSI master Eddie James
2023-03-06 16:10 ` [PATCH v8 1/8] fsi: Move fsi_slave structure definition to header Eddie James
2023-03-06 16:10 ` Eddie James [this message]
2023-03-06 16:10 ` [PATCH v8 3/8] dt-bindings: fsi: Document the IBM I2C Responder virtual FSI master Eddie James
2023-03-06 16:10 ` [PATCH v8 4/8] fsi: Add " Eddie James
2023-03-06 16:10 ` [PATCH v8 5/8] fsi: Add I2C Responder SCOM driver Eddie James
2023-03-06 16:10 ` [PATCH v8 6/8] fsi: Add aliased device numbering Eddie James
2023-03-06 16:10 ` [PATCH v8 7/8] fsi: Use of_match_table for bus matching if specified Eddie James
2023-03-06 16:10 ` [PATCH v8 8/8] fsi: sbefifo: Don't check status during probe Eddie James
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230306161057.44017-3-eajames@linux.ibm.com \
--to=eajames@linux.ibm.com \
--cc=alistair@popple.id.au \
--cc=andrew@aj.id.au \
--cc=devicetree@vger.kernel.org \
--cc=jk@ozlabs.org \
--cc=joel@jms.id.au \
--cc=krzysztof.kozlowski+dt@linaro.org \
--cc=linux-fsi@lists.ozlabs.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-trace-kernel@vger.kernel.org \
--cc=mhiramat@kernel.org \
--cc=robh+dt@kernel.org \
--cc=rostedt@goodmis.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).