From: Eddie James <eajames@linux.ibm.com>
To: linux-fsi@lists.ozlabs.org
Cc: linux-kernel@vger.kernel.org, linux-i2c@vger.kernel.org,
devicetree@vger.kernel.org, andi.shyti@kernel.org,
eajames@linux.ibm.com, alistair@popple.id.au, joel@jms.id.au,
jk@ozlabs.org, robh@kernel.org,
krzysztof.kozlowski+dt@linaro.org, conor+dt@kernel.org,
lakshmiy@us.ibmcom
Subject: [PATCH v2 27/31] i2c: fsi: Change fsi_i2c_write_reg to accept data instead of a pointer
Date: Mon, 26 Feb 2024 10:53:17 -0600 [thread overview]
Message-ID: <20240226165321.91976-28-eajames@linux.ibm.com> (raw)
In-Reply-To: <20240226165321.91976-1-eajames@linux.ibm.com>
There's no use passing a pointer here.
Signed-off-by: Eddie James <eajames@linux.ibm.com>
---
drivers/i2c/busses/i2c-fsi.c | 47 +++++++++++++++---------------------
1 file changed, 20 insertions(+), 27 deletions(-)
diff --git a/drivers/i2c/busses/i2c-fsi.c b/drivers/i2c/busses/i2c-fsi.c
index bc44cad49ef2..f237e76d29e6 100644
--- a/drivers/i2c/busses/i2c-fsi.c
+++ b/drivers/i2c/busses/i2c-fsi.c
@@ -177,9 +177,9 @@ static int fsi_i2c_read_reg(struct fsi_device *fsi, unsigned int reg,
}
static int fsi_i2c_write_reg(struct fsi_device *fsi, unsigned int reg,
- u32 *data)
+ u32 data)
{
- __be32 data_be = cpu_to_be32p(data);
+ __be32 data_be = cpu_to_be32(data);
return fsi_device_write(fsi, reg, &data_be, sizeof(data_be));
}
@@ -188,17 +188,16 @@ static int fsi_i2c_dev_init(struct fsi_i2c_master *i2c)
{
u32 mode = I2C_MODE_ENHANCED;
u32 extended_status;
- u32 interrupt = 0;
u32 watermark;
int rc;
/* since we use polling, disable interrupts */
- rc = fsi_i2c_write_reg(i2c->fsi, I2C_FSI_INT_MASK, &interrupt);
+ rc = fsi_i2c_write_reg(i2c->fsi, I2C_FSI_INT_MASK, 0);
if (rc)
return rc;
mode |= FIELD_PREP(I2C_MODE_CLKDIV, i2c->clock_div);
- rc = fsi_i2c_write_reg(i2c->fsi, I2C_FSI_MODE, &mode);
+ rc = fsi_i2c_write_reg(i2c->fsi, I2C_FSI_MODE, mode);
if (rc)
return rc;
@@ -211,13 +210,12 @@ static int fsi_i2c_dev_init(struct fsi_i2c_master *i2c)
i2c->fifo_size - I2C_FIFO_HI_LVL);
watermark |= FIELD_PREP(I2C_WATERMARK_LO, I2C_FIFO_LO_LVL);
- return fsi_i2c_write_reg(i2c->fsi, I2C_FSI_WATER_MARK, &watermark);
+ return fsi_i2c_write_reg(i2c->fsi, I2C_FSI_WATER_MARK, watermark);
}
static int fsi_i2c_set_port(struct fsi_i2c_port *port)
{
struct fsi_device *fsi = port->master->fsi;
- u32 dummy = 0;
u32 mode;
int rc;
@@ -229,12 +227,12 @@ static int fsi_i2c_set_port(struct fsi_i2c_port *port)
return 0;
mode = (mode & ~I2C_MODE_PORT) | FIELD_PREP(I2C_MODE_PORT, port->port);
- rc = fsi_i2c_write_reg(fsi, I2C_FSI_MODE, &mode);
+ rc = fsi_i2c_write_reg(fsi, I2C_FSI_MODE, mode);
if (rc)
return rc;
/* reset engine when port is changed */
- return fsi_i2c_write_reg(fsi, I2C_FSI_RESET_ERR, &dummy);
+ return fsi_i2c_write_reg(fsi, I2C_FSI_RESET_ERR, 0);
}
static int fsi_i2c_start(struct fsi_i2c_port *port, struct i2c_msg *msg,
@@ -253,7 +251,7 @@ static int fsi_i2c_start(struct fsi_i2c_port *port, struct i2c_msg *msg,
cmd |= FIELD_PREP(I2C_CMD_ADDR, msg->addr);
cmd |= FIELD_PREP(I2C_CMD_LEN, msg->len);
- return fsi_i2c_write_reg(port->master->fsi, I2C_FSI_CMD, &cmd);
+ return fsi_i2c_write_reg(port->master->fsi, I2C_FSI_CMD, cmd);
}
static int fsi_i2c_get_op_bytes(int op_bytes)
@@ -340,12 +338,11 @@ static int fsi_i2c_get_scl(struct i2c_adapter *adap)
static void fsi_i2c_set_scl(struct i2c_adapter *adap, int val)
{
struct fsi_i2c_port *port = adap->algo_data;
- u32 dummy = 0;
if (val)
- fsi_i2c_write_reg(port->master->fsi, I2C_FSI_SET_SCL, &dummy);
+ fsi_i2c_write_reg(port->master->fsi, I2C_FSI_SET_SCL, 0);
else
- fsi_i2c_write_reg(port->master->fsi, I2C_FSI_RESET_SCL, &dummy);
+ fsi_i2c_write_reg(port->master->fsi, I2C_FSI_RESET_SCL, 0);
}
static int fsi_i2c_get_sda(struct i2c_adapter *adap)
@@ -361,12 +358,11 @@ static int fsi_i2c_get_sda(struct i2c_adapter *adap)
static void fsi_i2c_set_sda(struct i2c_adapter *adap, int val)
{
struct fsi_i2c_port *port = adap->algo_data;
- u32 dummy = 0;
if (val)
- fsi_i2c_write_reg(port->master->fsi, I2C_FSI_SET_SDA, &dummy);
+ fsi_i2c_write_reg(port->master->fsi, I2C_FSI_SET_SDA, 0);
else
- fsi_i2c_write_reg(port->master->fsi, I2C_FSI_RESET_SDA, &dummy);
+ fsi_i2c_write_reg(port->master->fsi, I2C_FSI_RESET_SDA, 0);
}
static void fsi_i2c_prepare_recovery(struct i2c_adapter *adap)
@@ -380,7 +376,7 @@ static void fsi_i2c_prepare_recovery(struct i2c_adapter *adap)
return;
mode |= I2C_MODE_DIAG;
- fsi_i2c_write_reg(port->master->fsi, I2C_FSI_MODE, &mode);
+ fsi_i2c_write_reg(port->master->fsi, I2C_FSI_MODE, mode);
}
static void fsi_i2c_unprepare_recovery(struct i2c_adapter *adap)
@@ -394,13 +390,12 @@ static void fsi_i2c_unprepare_recovery(struct i2c_adapter *adap)
return;
mode &= ~I2C_MODE_DIAG;
- fsi_i2c_write_reg(port->master->fsi, I2C_FSI_MODE, &mode);
+ fsi_i2c_write_reg(port->master->fsi, I2C_FSI_MODE, mode);
}
static int fsi_i2c_reset_bus(struct fsi_i2c_master *i2c,
struct fsi_i2c_port *port)
{
- u32 dummy = 0;
u32 stat;
int rc;
@@ -408,7 +403,7 @@ static int fsi_i2c_reset_bus(struct fsi_i2c_master *i2c,
i2c_recover_bus(&port->adapter);
/* reset errors */
- rc = fsi_i2c_write_reg(i2c->fsi, I2C_FSI_RESET_ERR, &dummy);
+ rc = fsi_i2c_write_reg(i2c->fsi, I2C_FSI_RESET_ERR, 0);
if (rc)
return rc;
@@ -423,7 +418,7 @@ static int fsi_i2c_reset_bus(struct fsi_i2c_master *i2c,
return 0;
/* failed to get command complete; reset engine again */
- rc = fsi_i2c_write_reg(i2c->fsi, I2C_FSI_RESET_I2C, &dummy);
+ rc = fsi_i2c_write_reg(i2c->fsi, I2C_FSI_RESET_I2C, 0);
if (rc)
return rc;
@@ -433,12 +428,11 @@ static int fsi_i2c_reset_bus(struct fsi_i2c_master *i2c,
static int fsi_i2c_reset_engine(struct fsi_i2c_master *i2c, u16 port)
{
- u32 dummy = 0;
u32 mode;
int rc;
/* reset engine */
- rc = fsi_i2c_write_reg(i2c->fsi, I2C_FSI_RESET_I2C, &dummy);
+ rc = fsi_i2c_write_reg(i2c->fsi, I2C_FSI_RESET_I2C, 0);
if (rc)
return rc;
@@ -455,14 +449,13 @@ static int fsi_i2c_reset_engine(struct fsi_i2c_master *i2c, u16 port)
if (port) {
mode &= ~I2C_MODE_PORT;
mode |= FIELD_PREP(I2C_MODE_PORT, port);
- rc = fsi_i2c_write_reg(i2c->fsi, I2C_FSI_MODE, &mode);
+ rc = fsi_i2c_write_reg(i2c->fsi, I2C_FSI_MODE, mode);
if (rc)
return rc;
}
/* reset busy register; hw workaround */
- dummy = I2C_PORT_BUSY_RESET;
- rc = fsi_i2c_write_reg(i2c->fsi, I2C_FSI_PORT_BUSY, &dummy);
+ rc = fsi_i2c_write_reg(i2c->fsi, I2C_FSI_PORT_BUSY, I2C_PORT_BUSY_RESET);
if (rc)
return rc;
@@ -497,7 +490,7 @@ static int fsi_i2c_abort(struct fsi_i2c_port *port, u32 status)
return 0;
/* write stop command */
- rc = fsi_i2c_write_reg(i2c->fsi, I2C_FSI_CMD, &cmd);
+ rc = fsi_i2c_write_reg(i2c->fsi, I2C_FSI_CMD, cmd);
if (rc)
return rc;
--
2.39.3
next prev parent reply other threads:[~2024-02-26 16:53 UTC|newest]
Thread overview: 40+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-02-26 16:52 [PATCH v2 00/31] fsi: Interrupt support Eddie James
2024-02-26 16:52 ` [PATCH v2 01/31] fsi: Move slave definitions to fsi-slave.h Eddie James
2024-02-26 16:52 ` [PATCH v2 02/31] fsi: Improve master indexing Eddie James
2024-02-26 16:52 ` [PATCH v2 03/31] fsi: Use a defined value for default echo delay Eddie James
2024-02-26 16:52 ` [PATCH v2 04/31] fsi: Expose master-specific local bus clock divider Eddie James
2024-02-26 16:52 ` [PATCH v2 05/31] ARM: dts: aspeed: p10 and tacoma: Set FSI clock frequency Eddie James
2024-02-26 16:52 ` [PATCH v2 06/31] fsi: core: Improve master read/write/error traces Eddie James
2024-02-26 16:52 ` [PATCH v2 07/31] fsi: core: Add slave error trace Eddie James
2024-02-26 16:52 ` [PATCH v2 08/31] dt-bindings: fsi: Add AST2700 compatible Eddie James
2024-02-27 7:14 ` Krzysztof Kozlowski
2024-02-28 15:47 ` Rob Herring
2024-02-26 16:52 ` [PATCH v2 09/31] fsi: aspeed: Add AST2700 support Eddie James
2024-02-26 16:53 ` [PATCH v2 10/31] fsi: core: Add slave spinlock Eddie James
2024-02-26 16:53 ` [PATCH v2 11/31] fsi: core: Allow cfam device type aliases Eddie James
2024-02-26 16:53 ` [PATCH v2 12/31] fsi: core: Add common regmap master functions Eddie James
2024-02-26 16:53 ` [PATCH v2 13/31] fsi: hub: Use common initialization and link enable Eddie James
2024-02-26 16:53 ` [PATCH v2 14/31] fsi: aspeed: " Eddie James
2024-02-26 16:53 ` [PATCH v2 15/31] fsi: aspeed: Remove cfam reset sysfs file in error path and remove Eddie James
2024-02-26 16:53 ` [PATCH v2 16/31] fsi: aspeed: Refactor trace functions Eddie James
2024-02-26 16:53 ` [PATCH v2 17/31] fsi: aspeed: Don't clear all IRQs during OPB transfers Eddie James
2024-02-26 16:53 ` [PATCH v2 18/31] fsi: aspeed: Only read result register for successful read Eddie James
2024-02-26 16:53 ` [PATCH v2 19/31] fsi: aspeed: Switch to spinlock Eddie James
2024-02-26 16:53 ` [PATCH v2 20/31] fsi: aspeed: Disable relative addressing and IPOLL for cfam reset Eddie James
2024-02-26 16:53 ` [PATCH v2 21/31] fsi: aspeed: Use common master error handler Eddie James
2024-02-26 16:53 ` [PATCH v2 22/31] fsi: core: Add interrupt support Eddie James
2024-02-26 16:53 ` [PATCH v2 23/31] fsi: aspeed: " Eddie James
2024-02-26 16:53 ` [PATCH v2 24/31] fsi: hub: " Eddie James
2024-02-26 16:53 ` [PATCH v2 25/31] i2c: fsi: Calculate clock divider from local bus frequency Eddie James
2024-04-15 22:11 ` Andi Shyti
2024-04-16 18:09 ` Eddie James
2024-04-16 21:20 ` Guenter Roeck
2024-04-17 13:50 ` Eddie James
2024-02-26 16:53 ` [PATCH v2 26/31] i2c: fsi: Improve formatting Eddie James
2024-04-15 22:13 ` Andi Shyti
2024-02-26 16:53 ` Eddie James [this message]
2024-02-26 16:53 ` [PATCH v2 28/31] i2c: fsi: Remove list structure of ports Eddie James
2024-02-26 16:53 ` [PATCH v2 29/31] i2c: fsi: Define a function to check status error bits Eddie James
2024-02-26 16:53 ` [PATCH v2 30/31] i2c: fsi: Add boolean for skip stop command on abort Eddie James
2024-02-26 16:53 ` [PATCH v2 31/31] i2c: fsi: Add interrupt support Eddie James
2024-02-27 13:44 ` [PATCH v2 00/31] fsi: Interrupt support Rob Herring
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=20240226165321.91976-28-eajames@linux.ibm.com \
--to=eajames@linux.ibm.com \
--cc=alistair@popple.id.au \
--cc=andi.shyti@kernel.org \
--cc=conor+dt@kernel.org \
--cc=devicetree@vger.kernel.org \
--cc=jk@ozlabs.org \
--cc=joel@jms.id.au \
--cc=krzysztof.kozlowski+dt@linaro.org \
--cc=lakshmiy@us.ibmcom \
--cc=linux-fsi@lists.ozlabs.org \
--cc=linux-i2c@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=robh@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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox