microsoft
/
WSL2-Linux-Kernel
зеркало из https://github.com/microsoft/WSL2-Linux-Kernel.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

fpga zynq: Remove priv->dev 

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>
Acked-by: Alan Tull <atull@opensource.altera.com>
Acked-by: Moritz Fischer <moritz.fischer@ettus.com>
This commit is contained in:
Jason Gunthorpe 2016-11-21 22:26:44 +00:00 коммит произвёл Alan Tull
Родитель 1930c28651
Коммит 80baf649c2
1 изменённых файлов: 8 добавлений и 11 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

19
drivers/fpga/zynq-fpga.c
Просмотреть файл

@ -118,7 +118,6 @@
#define FPGA_RST_NONE_MASK 0x0 #define FPGA_RST_NONE_MASK 0x0
struct zynq_fpga_priv { struct zynq_fpga_priv {
struct device *dev;
int irq; int irq;
struct clk *clk; struct clk *clk;
@ -218,7 +217,7 @@ static int zynq_fpga_ops_write_init(struct fpga_manager *mgr,
INIT_POLL_DELAY, INIT_POLL_DELAY,
INIT_POLL_TIMEOUT); INIT_POLL_TIMEOUT);
if (err) { 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; goto out_err;
} }
@ -232,7 +231,7 @@ static int zynq_fpga_ops_write_init(struct fpga_manager *mgr,
INIT_POLL_DELAY, INIT_POLL_DELAY,
INIT_POLL_TIMEOUT); INIT_POLL_TIMEOUT);
if (err) { 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; goto out_err;
} }
@ -246,7 +245,7 @@ static int zynq_fpga_ops_write_init(struct fpga_manager *mgr,
INIT_POLL_DELAY, INIT_POLL_DELAY,
INIT_POLL_TIMEOUT); INIT_POLL_TIMEOUT);
if (err) { 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; goto out_err;
} }
} }
@ -263,7 +262,7 @@ static int zynq_fpga_ops_write_init(struct fpga_manager *mgr,
/* check that we have room in the command queue */ /* check that we have room in the command queue */
status = zynq_fpga_read(priv, STATUS_OFFSET); status = zynq_fpga_read(priv, STATUS_OFFSET);
if (status & STATUS_DMA_Q_F) { 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; err = -EBUSY;
goto out_err; goto out_err;
} }
@ -296,7 +295,8 @@ static int zynq_fpga_ops_write(struct fpga_manager *mgr,
in_count = count; in_count = count;
priv = mgr->priv; 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) if (!kbuf)
return -ENOMEM; return -ENOMEM;
@ -332,15 +332,14 @@ static int zynq_fpga_ops_write(struct fpga_manager *mgr,
zynq_fpga_write(priv, INT_STS_OFFSET, intr_status); zynq_fpga_write(priv, INT_STS_OFFSET, intr_status);
if (!((intr_status & IXR_D_P_DONE_MASK) == IXR_D_P_DONE_MASK)) { if (!((intr_status & IXR_D_P_DONE_MASK) == IXR_D_P_DONE_MASK)) {
dev_err(priv->dev, "Error configuring FPGA\n"); dev_err(&mgr->dev, "Error configuring FPGA\n");
err = -EFAULT; err = -EFAULT;
} }
clk_disable(priv->clk); clk_disable(priv->clk);
out_free: out_free:
dma_free_coherent(priv->dev, in_count, kbuf, dma_addr); dma_free_coherent(mgr->dev.parent, count, kbuf, dma_addr);
return err; return err;
} }
@ -418,8 +417,6 @@ static int zynq_fpga_probe(struct platform_device *pdev)
if (!priv) if (!priv)
return -ENOMEM; return -ENOMEM;
priv->dev = dev;
res = platform_get_resource(pdev, IORESOURCE_MEM, 0); res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
priv->io_base = devm_ioremap_resource(dev, res); priv->io_base = devm_ioremap_resource(dev, res);
if (IS_ERR(priv->io_base)) if (IS_ERR(priv->io_base))