AcoSail/kernel_optimize_test
8
0
Fork 0
forked from luck/tmp_suning_uos_patched
Code Pull Requests Activity

Here is the first set of FPGA changes for 5.6

Browse Source 
The first two patches are minor cleanups to the DFL drivers,
 that remove unused warnings.
 
 The third patch removes a redundant error message to the ts73xx driver.
 
 The last patch removes a confusing print in case a call to devm_clk_get
 returns -EPROBE_DEFER.
 
 All patches have been reviewed on the mailing list and have been in the
 last couple of linux-next releases without issues.
 
 Signed-off-by: Moritz Fischer <mdf@kernel.org>
 -----BEGIN PGP SIGNATURE-----
 
 iIUEABYIAC0WIQS/ea/a56fFi9QbQeJ+E8eWOj6VqQUCXiZQcA8cbWRmQGtlcm5l
 bC5vcmcACgkQfhPHljo+lamqqQEAgcbI1iX8EtyqUbujE8CXU6hHpX526LWB6tAZ
 /CoqP3YBAJ0cYEG3JXGj+auczgLKFp2dAI/yGbL5rD+UJTKpE68P
 =osX0
 -----END PGP SIGNATURE-----

Merge tag 'fpga-for-5.6' of git://git.kernel.org/pub/scm/linux/kernel/git/mdf/linux-fpga into char-misc-next

Moritz writes:

Here is the first set of FPGA changes for 5.6

The first two patches are minor cleanups to the DFL drivers,
that remove unused warnings.

The third patch removes a redundant error message to the ts73xx driver.

The last patch removes a confusing print in case a call to devm_clk_get
returns -EPROBE_DEFER.

All patches have been reviewed on the mailing list and have been in the
last couple of linux-next releases without issues.

Signed-off-by: Moritz Fischer <mdf@kernel.org>

* tag 'fpga-for-5.6' of git://git.kernel.org/pub/scm/linux/kernel/git/mdf/linux-fpga:
  fpga: xilinx-pr-decoupler: Remove clk_get error message for probe defer
  fpga: remove redundant dev_err message
  fpga: dfl: afu: remove set but not used variable 'afu'
  fpga: dfl: fme: remove set but not used variable 'fme'
This commit is contained in:
Greg Kroah-Hartman 2020-01-22 10:02:45 +01:00
commit 3634a4a80f
4 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/fpga/dfl-afu-main.c
View File

@ -813,10 +813,8 @@ static int afu_dev_init(struct platform_device *pdev)
static int afu_dev_destroy(struct platform_device *pdev)
{
struct dfl_feature_platform_data *pdata = dev_get_platdata(&pdev->dev);
struct dfl_afu *afu;
mutex_lock(&pdata->lock);
afu = dfl_fpga_pdata_get_private(pdata);
afu_mmio_region_destroy(pdata);
afu_dma_region_destroy(pdata);
dfl_fpga_pdata_set_private(pdata, NULL);

2
drivers/fpga/dfl-fme-main.c
View File

@ -675,10 +675,8 @@ static int fme_dev_init(struct platform_device *pdev)
static void fme_dev_destroy(struct platform_device *pdev)
{
struct dfl_feature_platform_data *pdata = dev_get_platdata(&pdev->dev);
struct dfl_fme *fme;
mutex_lock(&pdata->lock);
fme = dfl_fpga_pdata_get_private(pdata);
dfl_fpga_pdata_set_private(pdata, NULL);
mutex_unlock(&pdata->lock);
}

4
drivers/fpga/ts73xx-fpga.c
View File

@ -119,10 +119,8 @@ static int ts73xx_fpga_probe(struct platform_device *pdev)
res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
priv->io_base = devm_ioremap_resource(kdev, res);
if (IS_ERR(priv->io_base)) {
dev_err(kdev, "unable to remap registers\n");
if (IS_ERR(priv->io_base))
return PTR_ERR(priv->io_base);
}
mgr = devm_fpga_mgr_create(kdev, "TS-73xx FPGA Manager",
&ts73xx_fpga_ops, priv);

3
drivers/fpga/xilinx-pr-decoupler.c
View File

@ -101,7 +101,8 @@ static int xlnx_pr_decoupler_probe(struct platform_device *pdev)
priv->clk = devm_clk_get(&pdev->dev, "aclk");
if (IS_ERR(priv->clk)) {
dev_err(&pdev->dev, "input clock not found\n");
if (PTR_ERR(priv->clk) != -EPROBE_DEFER)
dev_err(&pdev->dev, "input clock not found\n");
return PTR_ERR(priv->clk);
}