From: "Marek Behún" <kabel@kernel.org>
To: "Gregory CLEMENT" <gregory.clement@bootlin.com>,
"Andrew Lunn" <andrew@lunn.ch>, "Arnd Bergmann" <arnd@arndb.de>,
soc@kernel.org, arm@kernel.org,
"Andy Shevchenko" <andy@kernel.org>,
"Hans de Goede" <hdegoede@redhat.com>,
"Ilpo Järvinen" <ilpo.jarvinen@linux.intel.com>
Cc: "Marek Behún" <kabel@kernel.org>
Subject: [PATCH v3 13/17] firmware: turris-mox-rwtm: Drop redundant device pointer
Date: Mon, 17 Jun 2024 16:45:28 +0200 [thread overview]
Message-ID: <20240617144532.17385-14-kabel@kernel.org> (raw)
In-Reply-To: <20240617144532.17385-1-kabel@kernel.org>
Drop redundant device pointer from driver's private structure.
Signed-off-by: Marek Behún <kabel@kernel.org>
---
drivers/firmware/turris-mox-rwtm.c | 18 +++++++++++-------
1 file changed, 11 insertions(+), 7 deletions(-)
diff --git a/drivers/firmware/turris-mox-rwtm.c b/drivers/firmware/turris-mox-rwtm.c
index 2c43af69783c..0b93040167b6 100644
--- a/drivers/firmware/turris-mox-rwtm.c
+++ b/drivers/firmware/turris-mox-rwtm.c
@@ -62,7 +62,6 @@ enum mbox_cmd {
};
struct mox_rwtm {
- struct device *dev;
struct mbox_client mbox_client;
struct mbox_chan *mbox;
struct hwrng hwrng;
@@ -97,6 +96,11 @@ struct mox_rwtm {
#endif
};
+static inline struct device *rwtm_dev(struct mox_rwtm *rwtm)
+{
+ return rwtm->mbox_client.dev;
+}
+
#define MOX_ATTR_RO(name, format, cat) \
static ssize_t \
name##_show(struct device *dev, struct device_attribute *a, \
@@ -165,6 +169,7 @@ static void reply_to_mac_addr(u8 *mac, u32 t1, u32 t2)
static int mox_get_board_info(struct mox_rwtm *rwtm)
{
+ struct device *dev = rwtm_dev(rwtm);
struct armada_37xx_rwtm_tx_msg msg;
struct armada_37xx_rwtm_rx_msg *reply = &rwtm->reply;
int ret;
@@ -179,10 +184,10 @@ static int mox_get_board_info(struct mox_rwtm *rwtm)
ret = mox_get_status(MBOX_CMD_BOARD_INFO, reply->retval);
if (ret == -ENODATA) {
- dev_warn(rwtm->dev,
+ dev_warn(dev,
"Board does not have manufacturing information burned!\n");
} else if (ret == -ENOSYS) {
- dev_notice(rwtm->dev,
+ dev_notice(dev,
"Firmware does not support the BOARD_INFO command\n");
} else if (ret < 0) {
return ret;
@@ -214,9 +219,9 @@ static int mox_get_board_info(struct mox_rwtm *rwtm)
ret = mox_get_status(MBOX_CMD_ECDSA_PUB_KEY, reply->retval);
if (ret == -ENODATA) {
- dev_warn(rwtm->dev, "Board has no public key burned!\n");
+ dev_warn(dev, "Board has no public key burned!\n");
} else if (ret == -ENOSYS) {
- dev_notice(rwtm->dev,
+ dev_notice(dev,
"Firmware does not support the ECDSA_PUB_KEY command\n");
} else if (ret < 0) {
return ret;
@@ -418,7 +423,7 @@ static void rwtm_register_debugfs(struct mox_rwtm *rwtm)
debugfs_create_file_unsafe("do_sign", 0600, root, rwtm, &do_sign_fops);
- devm_add_action_or_reset(rwtm->dev, rwtm_debugfs_release, root);
+ devm_add_action_or_reset(rwtm_dev(rwtm), rwtm_debugfs_release, root);
}
#else
static inline void rwtm_register_debugfs(struct mox_rwtm *rwtm)
@@ -446,7 +451,6 @@ static int turris_mox_rwtm_probe(struct platform_device *pdev)
if (!rwtm)
return -ENOMEM;
- rwtm->dev = dev;
rwtm->buf = dmam_alloc_coherent(dev, RWTM_DMA_BUFFER_SIZE,
&rwtm->buf_phys, GFP_KERNEL);
if (!rwtm->buf)
--
2.44.2
next prev parent reply other threads:[~2024-06-17 14:46 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-06-17 14:45 [PATCH v3 00/17] Updates for turris-mox-rwtm driver Marek Behún
2024-06-17 14:45 ` [PATCH v3 01/17] firmware: turris-mox-rwtm: Do not complete if there are no waiters Marek Behún
2024-06-17 19:42 ` Andy Shevchenko
2024-06-17 14:45 ` [PATCH v3 02/17] firmware: turris-mox-rwtm: Fix checking return value of wait_for_completion_timeout() Marek Behún
2024-06-17 14:45 ` [PATCH v3 03/17] firmware: turris-mox-rwtm: Use macro constant instead of hardcoded 4096 Marek Behún
2024-06-17 14:45 ` [PATCH v3 04/17] firmware: turris-mox-rwtm: Use ETH_ALEN instead of hardcoded 6 Marek Behún
2024-06-17 14:45 ` [PATCH v3 05/17] firmware: turris-mox-rwtm: Use the boolean type where appropriate Marek Behún
2024-06-17 19:46 ` Andy Shevchenko
2024-06-17 14:45 ` [PATCH v3 06/17] firmware: turris-mox-rwtm: Hide signature related constants behind macros Marek Behún
2024-06-17 19:52 ` Andy Shevchenko
2024-06-17 14:45 ` [PATCH v3 07/17] firmware: turris-mox-rwtm: Fix driver includes Marek Behún
2024-06-17 14:45 ` [PATCH v3 08/17] firmware: turris-mox-rwtm: Don't create own kobject type Marek Behún
2024-06-17 19:57 ` Andy Shevchenko
2024-06-17 14:45 ` [PATCH v3 09/17] firmware: turris-mox-rwtm: Simplify debugfs code Marek Behún
2024-06-17 20:22 ` Andy Shevchenko
2024-07-12 13:16 ` Marek Behún
2024-06-17 14:45 ` [PATCH v3 10/17] firmware: turris-mox-rwtm: Convert rest to devm_* and get rid of driver .remove() Marek Behún
2024-06-17 14:45 ` [PATCH v3 11/17] firmware: turris-mox-rwtm: Use dev_err_probe() where possible Marek Behún
2024-06-17 14:45 ` [PATCH v3 12/17] firmware: turris-mox-rwtm: Initialize completion before mailbox Marek Behún
2024-06-17 14:45 ` Marek Behún [this message]
2024-06-17 14:45 ` [PATCH v3 14/17] firmware: turris-mox-rwtm: Use devm_mutex_init() instead of mutex_init() Marek Behún
2024-06-17 14:45 ` [PATCH v3 15/17] firmware: turris-mox-rwtm: Use container_of() instead of hwrng .priv member Marek Behún
2024-06-17 20:27 ` Andy Shevchenko
2024-06-17 14:45 ` [PATCH v3 16/17] firmware: turris-mox-rwtm: Use EOPNOTSUPP instead of ENOSYS Marek Behún
2024-06-17 14:45 ` [PATCH v3 17/17] firmware: turris-mox-rwtm: Deduplicate command execution code Marek Behún
2024-06-17 20:29 ` Andy Shevchenko
2024-06-17 20:31 ` [PATCH v3 00/17] Updates for turris-mox-rwtm driver Andy Shevchenko
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=20240617144532.17385-14-kabel@kernel.org \
--to=kabel@kernel.org \
--cc=andrew@lunn.ch \
--cc=andy@kernel.org \
--cc=arm@kernel.org \
--cc=arnd@arndb.de \
--cc=gregory.clement@bootlin.com \
--cc=hdegoede@redhat.com \
--cc=ilpo.jarvinen@linux.intel.com \
--cc=soc@kernel.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.