| Message ID | e313b7f9a856fd8546aabb20d44d10e3af6676c6.1656341824.git.geert+renesas@glider.be (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | memory: renesas-rpc-if: Rebind and s2ram fixes | expand |
On 27/06/2022 17:31, Geert Uytterhoeven wrote: > Most rpcif_*() API functions do not need access to any other fields in > the rpcif structure than the device pointer. Simplify dependencies by > passing the device pointer instead. > > Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be> > --- > drivers/memory/renesas-rpc-if.c | 32 ++++++++++++++++---------------- > drivers/mtd/hyperbus/rpc-if.c | 18 +++++++++--------- > drivers/spi/spi-rpc-if.c | 14 +++++++------- > include/memory/renesas-rpc-if.h | 16 ++++++++-------- > 4 files changed, 40 insertions(+), 40 deletions(-) > I need some acks here. Best regards, Krzysztof
Hi Krzysztof, geert+renesas@glider.be wrote on Mon, 27 Jun 2022 17:31:13 +0200: > Most rpcif_*() API functions do not need access to any other fields in > the rpcif structure than the device pointer. Simplify dependencies by > passing the device pointer instead. > > Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be> > --- > drivers/memory/renesas-rpc-if.c | 32 ++++++++++++++++---------------- > drivers/mtd/hyperbus/rpc-if.c | 18 +++++++++--------- [...] > diff --git a/drivers/mtd/hyperbus/rpc-if.c b/drivers/mtd/hyperbus/rpc-if.c > index d00d302434030b20..41734e337ac00e40 100644 > --- a/drivers/mtd/hyperbus/rpc-if.c > +++ b/drivers/mtd/hyperbus/rpc-if.c > @@ -56,7 +56,7 @@ static void rpcif_hb_prepare_read(struct rpcif *rpc, void *to, > op.data.nbytes = len; > op.data.buf.in = to; > > - rpcif_prepare(rpc, &op, NULL, NULL); > + rpcif_prepare(rpc->dev, &op, NULL, NULL); > } > > static void rpcif_hb_prepare_write(struct rpcif *rpc, unsigned long to, > @@ -70,7 +70,7 @@ static void rpcif_hb_prepare_write(struct rpcif *rpc, unsigned long to, > op.data.nbytes = len; > op.data.buf.out = from; > > - rpcif_prepare(rpc, &op, NULL, NULL); > + rpcif_prepare(rpc->dev, &op, NULL, NULL); > } > > static u16 rpcif_hb_read16(struct hyperbus_device *hbdev, unsigned long addr) > @@ -81,7 +81,7 @@ static u16 rpcif_hb_read16(struct hyperbus_device *hbdev, unsigned long addr) > > rpcif_hb_prepare_read(&hyperbus->rpc, &data, addr, 2); > > - rpcif_manual_xfer(&hyperbus->rpc); > + rpcif_manual_xfer(hyperbus->rpc.dev); > > return data.x[0]; > } > @@ -94,7 +94,7 @@ static void rpcif_hb_write16(struct hyperbus_device *hbdev, unsigned long addr, > > rpcif_hb_prepare_write(&hyperbus->rpc, addr, &data, 2); > > - rpcif_manual_xfer(&hyperbus->rpc); > + rpcif_manual_xfer(hyperbus->rpc.dev); > } > > static void rpcif_hb_copy_from(struct hyperbus_device *hbdev, void *to, > @@ -105,7 +105,7 @@ static void rpcif_hb_copy_from(struct hyperbus_device *hbdev, void *to, > > rpcif_hb_prepare_read(&hyperbus->rpc, to, from, len); > > - rpcif_dirmap_read(&hyperbus->rpc, from, len, to); > + rpcif_dirmap_read(hyperbus->rpc.dev, from, len, to); > } > > static const struct hyperbus_ops rpcif_hb_ops = { > @@ -130,9 +130,9 @@ static int rpcif_hb_probe(struct platform_device *pdev) > > platform_set_drvdata(pdev, hyperbus); > > - rpcif_enable_rpm(&hyperbus->rpc); > + rpcif_enable_rpm(hyperbus->rpc.dev); > > - error = rpcif_hw_init(&hyperbus->rpc, true); > + error = rpcif_hw_init(hyperbus->rpc.dev, true); > if (error) > goto out_disable_rpm; > > @@ -150,7 +150,7 @@ static int rpcif_hb_probe(struct platform_device *pdev) > return 0; > > out_disable_rpm: > - rpcif_disable_rpm(&hyperbus->rpc); > + rpcif_disable_rpm(hyperbus->rpc.dev); > return error; > } This will only apply on top of mtd/next, because that rpcif_disable_rpm() balance call was very recently contributed by Geert: https://lore.kernel.org/linux-mtd/f3070e1af480cb252ae183d479a593dbbf947685.1655457790.git.geert+renesas@glider.be/ So we need to first share an immutable tag on the current mtd/next branch. Richard, that is my vacation gift for you :) Otherwise, Acked-by: Miquel Raynal <miquel.raynal@bootlin.com> Thanks, Miquèl
On 30/06/2022 09:25, Miquel Raynal wrote: > Hi Krzysztof, > > geert+renesas@glider.be wrote on Mon, 27 Jun 2022 17:31:13 +0200: > >> Most rpcif_*() API functions do not need access to any other fields in >> the rpcif structure than the device pointer. Simplify dependencies by >> passing the device pointer instead. >> >> Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be> >> --- >> drivers/memory/renesas-rpc-if.c | 32 ++++++++++++++++---------------- >> drivers/mtd/hyperbus/rpc-if.c | 18 +++++++++--------- > > [...] > >> diff --git a/drivers/mtd/hyperbus/rpc-if.c b/drivers/mtd/hyperbus/rpc-if.c >> index d00d302434030b20..41734e337ac00e40 100644 >> --- a/drivers/mtd/hyperbus/rpc-if.c >> +++ b/drivers/mtd/hyperbus/rpc-if.c >> @@ -56,7 +56,7 @@ static void rpcif_hb_prepare_read(struct rpcif *rpc, void *to, >> op.data.nbytes = len; >> op.data.buf.in = to; >> >> - rpcif_prepare(rpc, &op, NULL, NULL); >> + rpcif_prepare(rpc->dev, &op, NULL, NULL); >> } >> >> static void rpcif_hb_prepare_write(struct rpcif *rpc, unsigned long to, >> @@ -70,7 +70,7 @@ static void rpcif_hb_prepare_write(struct rpcif *rpc, unsigned long to, >> op.data.nbytes = len; >> op.data.buf.out = from; >> >> - rpcif_prepare(rpc, &op, NULL, NULL); >> + rpcif_prepare(rpc->dev, &op, NULL, NULL); >> } >> >> static u16 rpcif_hb_read16(struct hyperbus_device *hbdev, unsigned long addr) >> @@ -81,7 +81,7 @@ static u16 rpcif_hb_read16(struct hyperbus_device *hbdev, unsigned long addr) >> >> rpcif_hb_prepare_read(&hyperbus->rpc, &data, addr, 2); >> >> - rpcif_manual_xfer(&hyperbus->rpc); >> + rpcif_manual_xfer(hyperbus->rpc.dev); >> >> return data.x[0]; >> } >> @@ -94,7 +94,7 @@ static void rpcif_hb_write16(struct hyperbus_device *hbdev, unsigned long addr, >> >> rpcif_hb_prepare_write(&hyperbus->rpc, addr, &data, 2); >> >> - rpcif_manual_xfer(&hyperbus->rpc); >> + rpcif_manual_xfer(hyperbus->rpc.dev); >> } >> >> static void rpcif_hb_copy_from(struct hyperbus_device *hbdev, void *to, >> @@ -105,7 +105,7 @@ static void rpcif_hb_copy_from(struct hyperbus_device *hbdev, void *to, >> >> rpcif_hb_prepare_read(&hyperbus->rpc, to, from, len); >> >> - rpcif_dirmap_read(&hyperbus->rpc, from, len, to); >> + rpcif_dirmap_read(hyperbus->rpc.dev, from, len, to); >> } >> >> static const struct hyperbus_ops rpcif_hb_ops = { >> @@ -130,9 +130,9 @@ static int rpcif_hb_probe(struct platform_device *pdev) >> >> platform_set_drvdata(pdev, hyperbus); >> >> - rpcif_enable_rpm(&hyperbus->rpc); >> + rpcif_enable_rpm(hyperbus->rpc.dev); >> >> - error = rpcif_hw_init(&hyperbus->rpc, true); >> + error = rpcif_hw_init(hyperbus->rpc.dev, true); >> if (error) >> goto out_disable_rpm; >> >> @@ -150,7 +150,7 @@ static int rpcif_hb_probe(struct platform_device *pdev) >> return 0; >> >> out_disable_rpm: >> - rpcif_disable_rpm(&hyperbus->rpc); >> + rpcif_disable_rpm(hyperbus->rpc.dev); >> return error; >> } > > This will only apply on top of mtd/next, because that > rpcif_disable_rpm() balance call was very recently contributed by Geert: > https://lore.kernel.org/linux-mtd/f3070e1af480cb252ae183d479a593dbbf947685.1655457790.git.geert+renesas@glider.be/ > > So we need to first share an immutable tag on the current mtd/next > branch. Richard, that is my vacation gift for you :) I don't want entire mtd/next. I could take Renesas hyperbus specific commits. Another solution is me to rebase on some rcX, if that commit was sent as fix for current cycle. The third option is to simply resolve a conflict - which should looks pretty easy and compile-testable. In that case the commit should be rebased on my v5.19-rc1. Best regards, Krzysztof
Hi Krzysztof, krzysztof.kozlowski@linaro.org wrote on Thu, 30 Jun 2022 10:46:51 +0200: > On 30/06/2022 09:25, Miquel Raynal wrote: > > Hi Krzysztof, > > > > geert+renesas@glider.be wrote on Mon, 27 Jun 2022 17:31:13 +0200: > > > >> Most rpcif_*() API functions do not need access to any other fields in > >> the rpcif structure than the device pointer. Simplify dependencies by > >> passing the device pointer instead. > >> > >> Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be> > >> --- > >> drivers/memory/renesas-rpc-if.c | 32 ++++++++++++++++---------------- > >> drivers/mtd/hyperbus/rpc-if.c | 18 +++++++++--------- > > > > [...] > > > >> diff --git a/drivers/mtd/hyperbus/rpc-if.c b/drivers/mtd/hyperbus/rpc-if.c > >> index d00d302434030b20..41734e337ac00e40 100644 > >> --- a/drivers/mtd/hyperbus/rpc-if.c > >> +++ b/drivers/mtd/hyperbus/rpc-if.c > >> @@ -56,7 +56,7 @@ static void rpcif_hb_prepare_read(struct rpcif *rpc, void *to, > >> op.data.nbytes = len; > >> op.data.buf.in = to; > >> > >> - rpcif_prepare(rpc, &op, NULL, NULL); > >> + rpcif_prepare(rpc->dev, &op, NULL, NULL); > >> } > >> > >> static void rpcif_hb_prepare_write(struct rpcif *rpc, unsigned long to, > >> @@ -70,7 +70,7 @@ static void rpcif_hb_prepare_write(struct rpcif *rpc, unsigned long to, > >> op.data.nbytes = len; > >> op.data.buf.out = from; > >> > >> - rpcif_prepare(rpc, &op, NULL, NULL); > >> + rpcif_prepare(rpc->dev, &op, NULL, NULL); > >> } > >> > >> static u16 rpcif_hb_read16(struct hyperbus_device *hbdev, unsigned long addr) > >> @@ -81,7 +81,7 @@ static u16 rpcif_hb_read16(struct hyperbus_device *hbdev, unsigned long addr) > >> > >> rpcif_hb_prepare_read(&hyperbus->rpc, &data, addr, 2); > >> > >> - rpcif_manual_xfer(&hyperbus->rpc); > >> + rpcif_manual_xfer(hyperbus->rpc.dev); > >> > >> return data.x[0]; > >> } > >> @@ -94,7 +94,7 @@ static void rpcif_hb_write16(struct hyperbus_device *hbdev, unsigned long addr, > >> > >> rpcif_hb_prepare_write(&hyperbus->rpc, addr, &data, 2); > >> > >> - rpcif_manual_xfer(&hyperbus->rpc); > >> + rpcif_manual_xfer(hyperbus->rpc.dev); > >> } > >> > >> static void rpcif_hb_copy_from(struct hyperbus_device *hbdev, void *to, > >> @@ -105,7 +105,7 @@ static void rpcif_hb_copy_from(struct hyperbus_device *hbdev, void *to, > >> > >> rpcif_hb_prepare_read(&hyperbus->rpc, to, from, len); > >> > >> - rpcif_dirmap_read(&hyperbus->rpc, from, len, to); > >> + rpcif_dirmap_read(hyperbus->rpc.dev, from, len, to); > >> } > >> > >> static const struct hyperbus_ops rpcif_hb_ops = { > >> @@ -130,9 +130,9 @@ static int rpcif_hb_probe(struct platform_device *pdev) > >> > >> platform_set_drvdata(pdev, hyperbus); > >> > >> - rpcif_enable_rpm(&hyperbus->rpc); > >> + rpcif_enable_rpm(hyperbus->rpc.dev); > >> > >> - error = rpcif_hw_init(&hyperbus->rpc, true); > >> + error = rpcif_hw_init(hyperbus->rpc.dev, true); > >> if (error) > >> goto out_disable_rpm; > >> > >> @@ -150,7 +150,7 @@ static int rpcif_hb_probe(struct platform_device *pdev) > >> return 0; > >> > >> out_disable_rpm: > >> - rpcif_disable_rpm(&hyperbus->rpc); > >> + rpcif_disable_rpm(hyperbus->rpc.dev); > >> return error; > >> } > > > > This will only apply on top of mtd/next, because that > > rpcif_disable_rpm() balance call was very recently contributed by Geert: > > https://lore.kernel.org/linux-mtd/f3070e1af480cb252ae183d479a593dbbf947685.1655457790.git.geert+renesas@glider.be/ > > > > So we need to first share an immutable tag on the current mtd/next > > branch. Richard, that is my vacation gift for you :) > > I don't want entire mtd/next. I could take Renesas hyperbus specific > commits. I applied this patch a week ago and did not remembered there was a possibly conflicting series aside. > Another solution is me to rebase on some rcX, if that commit > was sent as fix for current cycle. Unfortunately, no. > The third option is to simply resolve a conflict - which should looks > pretty easy and compile-testable. In that case the commit should be > rebased on my v5.19-rc1. I believe it should work. As this is mostly a cleanup, you can also wait 5.20-rc1. Thanks, Miquèl
diff --git a/drivers/memory/renesas-rpc-if.c b/drivers/memory/renesas-rpc-if.c index ef0336cbb4c196fb..ec76e603ad24d214 100644 --- a/drivers/memory/renesas-rpc-if.c +++ b/drivers/memory/renesas-rpc-if.c @@ -299,13 +299,13 @@ static void rpcif_rzg2l_timing_adjust_sdr(struct rpcif_priv *rpc) regmap_write(rpc->regmap, RPCIF_PHYADD, 0x80000032); } -int rpcif_hw_init(struct rpcif *rpcif, bool hyperflash) +int rpcif_hw_init(struct device *dev, bool hyperflash) { - struct rpcif_priv *rpc = dev_get_drvdata(rpcif->dev); + struct rpcif_priv *rpc = dev_get_drvdata(dev); u32 dummy; int ret; - ret = pm_runtime_resume_and_get(rpc->dev); + ret = pm_runtime_resume_and_get(dev); if (ret) return ret; @@ -352,7 +352,7 @@ int rpcif_hw_init(struct rpcif *rpcif, bool hyperflash) regmap_write(rpc->regmap, RPCIF_SSLDR, RPCIF_SSLDR_SPNDL(7) | RPCIF_SSLDR_SLNDL(7) | RPCIF_SSLDR_SCKDL(7)); - pm_runtime_put(rpc->dev); + pm_runtime_put(dev); rpc->bus_size = hyperflash ? 2 : 1; @@ -382,10 +382,10 @@ static u8 rpcif_bit_size(u8 buswidth) return buswidth > 4 ? 2 : ilog2(buswidth); } -void rpcif_prepare(struct rpcif *rpcif, const struct rpcif_op *op, u64 *offs, +void rpcif_prepare(struct device *dev, const struct rpcif_op *op, u64 *offs, size_t *len) { - struct rpcif_priv *rpc = dev_get_drvdata(rpcif->dev); + struct rpcif_priv *rpc = dev_get_drvdata(dev); rpc->smcr = 0; rpc->smadr = 0; @@ -470,13 +470,13 @@ void rpcif_prepare(struct rpcif *rpcif, const struct rpcif_op *op, u64 *offs, } EXPORT_SYMBOL(rpcif_prepare); -int rpcif_manual_xfer(struct rpcif *rpcif) +int rpcif_manual_xfer(struct device *dev) { - struct rpcif_priv *rpc = dev_get_drvdata(rpcif->dev); + struct rpcif_priv *rpc = dev_get_drvdata(dev); u32 smenr, smcr, pos = 0, max = rpc->bus_size == 2 ? 8 : 4; int ret = 0; - ret = pm_runtime_resume_and_get(rpc->dev); + ret = pm_runtime_resume_and_get(dev); if (ret < 0) return ret; @@ -588,13 +588,13 @@ int rpcif_manual_xfer(struct rpcif *rpcif) } exit: - pm_runtime_put(rpc->dev); + pm_runtime_put(dev); return ret; err_out: if (reset_control_reset(rpc->rstc)) - dev_err(rpc->dev, "Failed to reset HW\n"); - rpcif_hw_init(rpcif, rpc->bus_size == 2); + dev_err(dev, "Failed to reset HW\n"); + rpcif_hw_init(dev, rpc->bus_size == 2); goto exit; } EXPORT_SYMBOL(rpcif_manual_xfer); @@ -641,9 +641,9 @@ static void memcpy_fromio_readw(void *to, } } -ssize_t rpcif_dirmap_read(struct rpcif *rpcif, u64 offs, size_t len, void *buf) +ssize_t rpcif_dirmap_read(struct device *dev, u64 offs, size_t len, void *buf) { - struct rpcif_priv *rpc = dev_get_drvdata(rpcif->dev); + struct rpcif_priv *rpc = dev_get_drvdata(dev); loff_t from = offs & (rpc->size - 1); size_t size = rpc->size - from; int ret; @@ -651,7 +651,7 @@ ssize_t rpcif_dirmap_read(struct rpcif *rpcif, u64 offs, size_t len, void *buf) if (len > size) len = size; - ret = pm_runtime_resume_and_get(rpc->dev); + ret = pm_runtime_resume_and_get(dev); if (ret < 0) return ret; @@ -671,7 +671,7 @@ ssize_t rpcif_dirmap_read(struct rpcif *rpcif, u64 offs, size_t len, void *buf) else memcpy_fromio(buf, rpc->dirmap + from, len); - pm_runtime_put(rpc->dev); + pm_runtime_put(dev); return len; } diff --git a/drivers/mtd/hyperbus/rpc-if.c b/drivers/mtd/hyperbus/rpc-if.c index d00d302434030b20..41734e337ac00e40 100644 --- a/drivers/mtd/hyperbus/rpc-if.c +++ b/drivers/mtd/hyperbus/rpc-if.c @@ -56,7 +56,7 @@ static void rpcif_hb_prepare_read(struct rpcif *rpc, void *to, op.data.nbytes = len; op.data.buf.in = to; - rpcif_prepare(rpc, &op, NULL, NULL); + rpcif_prepare(rpc->dev, &op, NULL, NULL); } static void rpcif_hb_prepare_write(struct rpcif *rpc, unsigned long to, @@ -70,7 +70,7 @@ static void rpcif_hb_prepare_write(struct rpcif *rpc, unsigned long to, op.data.nbytes = len; op.data.buf.out = from; - rpcif_prepare(rpc, &op, NULL, NULL); + rpcif_prepare(rpc->dev, &op, NULL, NULL); } static u16 rpcif_hb_read16(struct hyperbus_device *hbdev, unsigned long addr) @@ -81,7 +81,7 @@ static u16 rpcif_hb_read16(struct hyperbus_device *hbdev, unsigned long addr) rpcif_hb_prepare_read(&hyperbus->rpc, &data, addr, 2); - rpcif_manual_xfer(&hyperbus->rpc); + rpcif_manual_xfer(hyperbus->rpc.dev); return data.x[0]; } @@ -94,7 +94,7 @@ static void rpcif_hb_write16(struct hyperbus_device *hbdev, unsigned long addr, rpcif_hb_prepare_write(&hyperbus->rpc, addr, &data, 2); - rpcif_manual_xfer(&hyperbus->rpc); + rpcif_manual_xfer(hyperbus->rpc.dev); } static void rpcif_hb_copy_from(struct hyperbus_device *hbdev, void *to, @@ -105,7 +105,7 @@ static void rpcif_hb_copy_from(struct hyperbus_device *hbdev, void *to, rpcif_hb_prepare_read(&hyperbus->rpc, to, from, len); - rpcif_dirmap_read(&hyperbus->rpc, from, len, to); + rpcif_dirmap_read(hyperbus->rpc.dev, from, len, to); } static const struct hyperbus_ops rpcif_hb_ops = { @@ -130,9 +130,9 @@ static int rpcif_hb_probe(struct platform_device *pdev) platform_set_drvdata(pdev, hyperbus); - rpcif_enable_rpm(&hyperbus->rpc); + rpcif_enable_rpm(hyperbus->rpc.dev); - error = rpcif_hw_init(&hyperbus->rpc, true); + error = rpcif_hw_init(hyperbus->rpc.dev, true); if (error) goto out_disable_rpm; @@ -150,7 +150,7 @@ static int rpcif_hb_probe(struct platform_device *pdev) return 0; out_disable_rpm: - rpcif_disable_rpm(&hyperbus->rpc); + rpcif_disable_rpm(hyperbus->rpc.dev); return error; } @@ -160,7 +160,7 @@ static int rpcif_hb_remove(struct platform_device *pdev) hyperbus_unregister_device(&hyperbus->hbdev); - rpcif_disable_rpm(&hyperbus->rpc); + rpcif_disable_rpm(hyperbus->rpc.dev); return 0; } diff --git a/drivers/spi/spi-rpc-if.c b/drivers/spi/spi-rpc-if.c index 24ec1c83f379ceec..5063587d2c724c7c 100644 --- a/drivers/spi/spi-rpc-if.c +++ b/drivers/spi/spi-rpc-if.c @@ -58,7 +58,7 @@ static void rpcif_spi_mem_prepare(struct spi_device *spi_dev, rpc_op.data.dir = RPCIF_NO_DATA; } - rpcif_prepare(rpc, &rpc_op, offs, len); + rpcif_prepare(rpc->dev, &rpc_op, offs, len); } static bool rpcif_spi_mem_supports_op(struct spi_mem *mem, @@ -86,7 +86,7 @@ static ssize_t rpcif_spi_mem_dirmap_read(struct spi_mem_dirmap_desc *desc, rpcif_spi_mem_prepare(desc->mem->spi, &desc->info.op_tmpl, &offs, &len); - return rpcif_dirmap_read(rpc, offs, len, buf); + return rpcif_dirmap_read(rpc->dev, offs, len, buf); } static int rpcif_spi_mem_dirmap_create(struct spi_mem_dirmap_desc *desc) @@ -117,7 +117,7 @@ static int rpcif_spi_mem_exec_op(struct spi_mem *mem, rpcif_spi_mem_prepare(mem->spi, op, NULL, NULL); - return rpcif_manual_xfer(rpc); + return rpcif_manual_xfer(rpc->dev); } static const struct spi_controller_mem_ops rpcif_spi_mem_ops = { @@ -147,7 +147,7 @@ static int rpcif_spi_probe(struct platform_device *pdev) ctlr->dev.of_node = parent->of_node; - rpcif_enable_rpm(rpc); + rpcif_enable_rpm(rpc->dev); ctlr->num_chipselect = 1; ctlr->mem_ops = &rpcif_spi_mem_ops; @@ -156,7 +156,7 @@ static int rpcif_spi_probe(struct platform_device *pdev) ctlr->mode_bits = SPI_CPOL | SPI_CPHA | SPI_TX_QUAD | SPI_RX_QUAD; ctlr->flags = SPI_CONTROLLER_HALF_DUPLEX; - error = rpcif_hw_init(rpc, false); + error = rpcif_hw_init(rpc->dev, false); if (error) goto out_disable_rpm; @@ -169,7 +169,7 @@ static int rpcif_spi_probe(struct platform_device *pdev) return 0; out_disable_rpm: - rpcif_disable_rpm(rpc); + rpcif_disable_rpm(rpc->dev); return error; } @@ -179,7 +179,7 @@ static int rpcif_spi_remove(struct platform_device *pdev) struct rpcif *rpc = spi_controller_get_devdata(ctlr); spi_unregister_controller(ctlr); - rpcif_disable_rpm(rpc); + rpcif_disable_rpm(rpc->dev); return 0; } diff --git a/include/memory/renesas-rpc-if.h b/include/memory/renesas-rpc-if.h index ddf94356752d3315..d2130c2c8c82fbd5 100644 --- a/include/memory/renesas-rpc-if.h +++ b/include/memory/renesas-rpc-if.h @@ -69,20 +69,20 @@ struct rpcif { }; int rpcif_sw_init(struct rpcif *rpc, struct device *dev); -int rpcif_hw_init(struct rpcif *rpc, bool hyperflash); -void rpcif_prepare(struct rpcif *rpc, const struct rpcif_op *op, u64 *offs, +int rpcif_hw_init(struct device *dev, bool hyperflash); +void rpcif_prepare(struct device *dev, const struct rpcif_op *op, u64 *offs, size_t *len); -int rpcif_manual_xfer(struct rpcif *rpc); -ssize_t rpcif_dirmap_read(struct rpcif *rpc, u64 offs, size_t len, void *buf); +int rpcif_manual_xfer(struct device *dev); +ssize_t rpcif_dirmap_read(struct device *dev, u64 offs, size_t len, void *buf); -static inline void rpcif_enable_rpm(struct rpcif *rpc) +static inline void rpcif_enable_rpm(struct device *dev) { - pm_runtime_enable(rpc->dev); + pm_runtime_enable(dev); } -static inline void rpcif_disable_rpm(struct rpcif *rpc) +static inline void rpcif_disable_rpm(struct device *dev) { - pm_runtime_disable(rpc->dev); + pm_runtime_disable(dev); } #endif // __RENESAS_RPC_IF_H
Most rpcif_*() API functions do not need access to any other fields in the rpcif structure than the device pointer. Simplify dependencies by passing the device pointer instead. Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be> --- drivers/memory/renesas-rpc-if.c | 32 ++++++++++++++++---------------- drivers/mtd/hyperbus/rpc-if.c | 18 +++++++++--------- drivers/spi/spi-rpc-if.c | 14 +++++++------- include/memory/renesas-rpc-if.h | 16 ++++++++-------- 4 files changed, 40 insertions(+), 40 deletions(-)