From: atull@opensource.altera.com (atull)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH fpga 5/9] fpga zynq: Remove priv->dev
Date: Mon, 14 Nov 2016 09:13:49 -0600 [thread overview]
Message-ID: <alpine.DEB.2.10.1611140913280.3739@atull-VirtualBox> (raw)
In-Reply-To: <1478732303-13718-6-git-send-email-jgunthorpe@obsidianresearch.com>
On Wed, 9 Nov 2016, Jason Gunthorpe wrote:
Hi Jason,
Acked-by: Alan Tull <atull@opensource.altera.com>
Alan
> socfpga uses mgr->dev for debug prints, there should be consistency
> here, so standardize on that. The only other use was for dma
> which can be replaced with mgr->dev.parent.
>
> Signed-off-by: Jason Gunthorpe <jgunthorpe@obsidianresearch.com>
> ---
> drivers/fpga/zynq-fpga.c | 22 ++++++++++------------
> 1 file changed, 10 insertions(+), 12 deletions(-)
>
> diff --git a/drivers/fpga/zynq-fpga.c b/drivers/fpga/zynq-fpga.c
> index 3ffc5fcc3072..ac2deae92dbd 100644
> --- a/drivers/fpga/zynq-fpga.c
> +++ b/drivers/fpga/zynq-fpga.c
> @@ -118,7 +118,6 @@
> #define FPGA_RST_NONE_MASK 0x0
>
> struct zynq_fpga_priv {
> - struct device *dev;
> int irq;
> struct clk *clk;
>
> @@ -188,7 +187,7 @@ static int zynq_fpga_ops_write_init(struct fpga_manager *mgr, u32 flags,
> * least the sync word and something else to do anything.
> */
> if (count <= 4 || (count % 4) != 0) {
> - dev_err(priv->dev,
> + dev_err(&mgr->dev,
> "Invalid bitstream size, must be multiples of 4 bytes\n");
> return -EINVAL;
> }
> @@ -200,7 +199,7 @@ static int zynq_fpga_ops_write_init(struct fpga_manager *mgr, u32 flags,
> /* don't globally reset PL if we're doing partial reconfig */
> if (!(flags & FPGA_MGR_PARTIAL_RECONFIG)) {
> if (!zynq_fpga_has_sync(buf, count)) {
> - dev_err(priv->dev,
> + dev_err(&mgr->dev,
> "Invalid bitstream, could not find a sync word. Bitstream must be a byte swaped .bin file\n");
> err = -EINVAL;
> goto out_err;
> @@ -233,7 +232,7 @@ static int zynq_fpga_ops_write_init(struct fpga_manager *mgr, u32 flags,
> INIT_POLL_DELAY,
> INIT_POLL_TIMEOUT);
> if (err) {
> - dev_err(priv->dev, "Timeout waiting for PCFG_INIT\n");
> + dev_err(&mgr->dev, "Timeout waiting for PCFG_INIT\n");
> goto out_err;
> }
>
> @@ -247,7 +246,7 @@ static int zynq_fpga_ops_write_init(struct fpga_manager *mgr, u32 flags,
> INIT_POLL_DELAY,
> INIT_POLL_TIMEOUT);
> if (err) {
> - dev_err(priv->dev, "Timeout waiting for !PCFG_INIT\n");
> + dev_err(&mgr->dev, "Timeout waiting for !PCFG_INIT\n");
> goto out_err;
> }
>
> @@ -261,7 +260,7 @@ static int zynq_fpga_ops_write_init(struct fpga_manager *mgr, u32 flags,
> INIT_POLL_DELAY,
> INIT_POLL_TIMEOUT);
> if (err) {
> - dev_err(priv->dev, "Timeout waiting for PCFG_INIT\n");
> + dev_err(&mgr->dev, "Timeout waiting for PCFG_INIT\n");
> goto out_err;
> }
> }
> @@ -278,7 +277,7 @@ static int zynq_fpga_ops_write_init(struct fpga_manager *mgr, u32 flags,
> /* check that we have room in the command queue */
> status = zynq_fpga_read(priv, STATUS_OFFSET);
> if (status & STATUS_DMA_Q_F) {
> - dev_err(priv->dev, "DMA command queue full\n");
> + dev_err(&mgr->dev, "DMA command queue full\n");
> err = -EBUSY;
> goto out_err;
> }
> @@ -309,7 +308,8 @@ static int zynq_fpga_ops_write(struct fpga_manager *mgr,
>
> priv = mgr->priv;
>
> - kbuf = dma_alloc_coherent(priv->dev, count, &dma_addr, GFP_KERNEL);
> + kbuf =
> + dma_alloc_coherent(mgr->dev.parent, count, &dma_addr, GFP_KERNEL);
> if (!kbuf)
> return -ENOMEM;
>
> @@ -356,7 +356,7 @@ static int zynq_fpga_ops_write(struct fpga_manager *mgr,
> goto out_clk;
>
> out_report:
> - dev_err(priv->dev,
> + dev_err(&mgr->dev,
> "%s: INT_STS:0x%x CTRL:0x%x LOCK:0x%x INT_MASK:0x%x STATUS:0x%x MCTRL:0x%x\n",
> why,
> intr_status,
> @@ -368,7 +368,7 @@ out_report:
> out_clk:
> clk_disable(priv->clk);
> out_free:
> - dma_free_coherent(priv->dev, count, kbuf, dma_addr);
> + dma_free_coherent(mgr->dev.parent, count, kbuf, dma_addr);
> return err;
> }
>
> @@ -445,8 +445,6 @@ static int zynq_fpga_probe(struct platform_device *pdev)
> if (!priv)
> return -ENOMEM;
>
> - priv->dev = dev;
> -
> res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
> priv->io_base = devm_ioremap_resource(dev, res);
> if (IS_ERR(priv->io_base))
> --
> 2.1.4
>
>
next prev parent reply other threads:[~2016-11-14 15:13 UTC|newest]
Thread overview: 43+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-11-09 22:58 [PATCH fpga 0/9] Zynq FPGA Manager Improvements Jason Gunthorpe
2016-11-09 22:58 ` [PATCH fpga 1/9] fpga zynq: Add missing \n to messages Jason Gunthorpe
2016-11-15 11:05 ` Matthias Brugger
2016-11-15 18:08 ` Jason Gunthorpe
2016-11-16 18:39 ` Moritz Fischer
2016-11-16 20:17 ` Jason Gunthorpe
2016-11-16 22:28 ` atull
2016-11-16 22:43 ` Moritz Fischer
2016-11-16 23:55 ` Jason Gunthorpe
2016-11-17 11:32 ` Matthias Brugger
2016-11-09 22:58 ` [PATCH fpga 2/9] fpga zynq: Check the bitstream for validity Jason Gunthorpe
2016-11-10 0:04 ` Joshua Clayton
2016-11-10 4:58 ` Jason Gunthorpe
2016-11-09 22:58 ` [PATCH fpga 3/9] fpga zynq: Fix incorrect ISR state on bootup Jason Gunthorpe
2016-11-11 0:44 ` Moritz Fischer
2016-11-11 0:53 ` Jason Gunthorpe
2016-11-09 22:58 ` [PATCH fpga 4/9] fpga zynq: Check for errors after completing DMA Jason Gunthorpe
2016-11-17 6:10 ` Moritz Fischer
2016-11-17 18:28 ` Jason Gunthorpe
2016-11-09 22:58 ` [PATCH fpga 5/9] fpga zynq: Remove priv->dev Jason Gunthorpe
2016-11-14 15:13 ` atull [this message]
2016-11-14 17:20 ` Moritz Fischer
2016-11-14 23:04 ` Jason Gunthorpe
2016-11-17 18:00 ` Moritz Fischer
2016-11-09 22:58 ` [PATCH fpga 6/9] fpga: Add scatterlist based write ops to the driver ops Jason Gunthorpe
2016-11-09 22:58 ` [PATCH fpga 7/9] fpga zynq: Use the scatterlist interface Jason Gunthorpe
2016-11-09 22:58 ` [PATCH fpga 8/9] fpga socfpga: " Jason Gunthorpe
2016-11-13 23:19 ` atull
2016-11-14 0:18 ` Jason Gunthorpe
2016-11-14 4:02 ` atull
2016-11-15 4:35 ` Jason Gunthorpe
2016-11-15 15:47 ` atull
2016-11-16 5:20 ` Jason Gunthorpe
2016-11-16 15:45 ` atull
2016-11-16 20:23 ` Jason Gunthorpe
2016-11-17 19:54 ` atull
2016-11-17 20:35 ` atull
2016-11-09 22:58 ` [PATCH fpga 9/9] fpga: Remove support for non-sg drivers Jason Gunthorpe
2016-11-10 15:22 ` Joshua Clayton
2016-11-10 16:33 ` Jason Gunthorpe
2016-11-10 22:07 ` Joshua Clayton
2016-11-13 20:44 ` atull
2016-11-13 22:13 ` Jason Gunthorpe
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=alpine.DEB.2.10.1611140913280.3739@atull-VirtualBox \
--to=atull@opensource.altera.com \
--cc=linux-arm-kernel@lists.infradead.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