From: Peter Colberg <peter.colberg@intel.com>
To: Wu Hao <hao.wu@intel.com>, Tom Rix <trix@redhat.com>,
Moritz Fischer <mdf@kernel.org>, Xu Yilun <yilun.xu@intel.com>,
linux-fpga@vger.kernel.org, linux-kernel@vger.kernel.org
Cc: Russ Weight <russ.weight@linux.dev>,
Marco Pagani <marpagan@redhat.com>,
Matthew Gerlach <matthew.gerlach@linux.intel.com>,
Basheer Ahmed Muddebihal
<basheer.ahmed.muddebihal@linux.intel.com>,
Peter Colberg <peter.colberg@intel.com>
Subject: [PATCH v5 04/18] fpga: dfl: afu: define local pointer to feature device
Date: Tue, 19 Nov 2024 20:10:20 -0500 [thread overview]
Message-ID: <20241120011035.230574-5-peter.colberg@intel.com> (raw)
In-Reply-To: <20241120011035.230574-1-peter.colberg@intel.com>
Define local pointer to pdata->dev->dev to avoid repetition.
Signed-off-by: Peter Colberg <peter.colberg@intel.com>
Reviewed-by: Matthew Gerlach <matthew.gerlach@linux.intel.com>
Reviewed-by: Basheer Ahmed Muddebihal <basheer.ahmed.muddebihal@linux.intel.com>
Acked-by: Xu Yilun <yilun.xu@intel.com>
---
Changes since v4:
- No changes.
Changes since v3:
- No changes.
Changes since v2:
- New patch extracted from monolithic v1 patch.
---
drivers/fpga/dfl-afu-dma-region.c | 9 +++++----
drivers/fpga/dfl-afu-region.c | 5 +++--
2 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/drivers/fpga/dfl-afu-dma-region.c b/drivers/fpga/dfl-afu-dma-region.c
index 02b60fde0430..814191e623e1 100644
--- a/drivers/fpga/dfl-afu-dma-region.c
+++ b/drivers/fpga/dfl-afu-dma-region.c
@@ -301,6 +301,7 @@ afu_dma_region_find_iova(struct dfl_feature_platform_data *pdata, u64 iova)
int afu_dma_map_region(struct dfl_feature_platform_data *pdata,
u64 user_addr, u64 length, u64 *iova)
{
+ struct device *dev = &pdata->dev->dev;
struct dfl_afu_dma_region *region;
int ret;
@@ -325,13 +326,13 @@ int afu_dma_map_region(struct dfl_feature_platform_data *pdata,
/* Pin the user memory region */
ret = afu_dma_pin_pages(pdata, region);
if (ret) {
- dev_err(&pdata->dev->dev, "failed to pin memory region\n");
+ dev_err(dev, "failed to pin memory region\n");
goto free_region;
}
/* Only accept continuous pages, return error else */
if (!afu_dma_check_continuous_pages(region)) {
- dev_err(&pdata->dev->dev, "pages are not continuous\n");
+ dev_err(dev, "pages are not continuous\n");
ret = -EINVAL;
goto unpin_pages;
}
@@ -342,7 +343,7 @@ int afu_dma_map_region(struct dfl_feature_platform_data *pdata,
region->length,
DMA_BIDIRECTIONAL);
if (dma_mapping_error(dfl_fpga_pdata_to_parent(pdata), region->iova)) {
- dev_err(&pdata->dev->dev, "failed to map for dma\n");
+ dev_err(dev, "failed to map for dma\n");
ret = -EFAULT;
goto unpin_pages;
}
@@ -353,7 +354,7 @@ int afu_dma_map_region(struct dfl_feature_platform_data *pdata,
ret = afu_dma_region_add(pdata, region);
mutex_unlock(&pdata->lock);
if (ret) {
- dev_err(&pdata->dev->dev, "failed to add dma region\n");
+ dev_err(dev, "failed to add dma region\n");
goto unmap_dma;
}
diff --git a/drivers/fpga/dfl-afu-region.c b/drivers/fpga/dfl-afu-region.c
index 2e7b41629406..8f0e9485214a 100644
--- a/drivers/fpga/dfl-afu-region.c
+++ b/drivers/fpga/dfl-afu-region.c
@@ -50,11 +50,12 @@ static struct dfl_afu_mmio_region *get_region_by_index(struct dfl_afu *afu,
int afu_mmio_region_add(struct dfl_feature_platform_data *pdata,
u32 region_index, u64 region_size, u64 phys, u32 flags)
{
+ struct device *dev = &pdata->dev->dev;
struct dfl_afu_mmio_region *region;
struct dfl_afu *afu;
int ret = 0;
- region = devm_kzalloc(&pdata->dev->dev, sizeof(*region), GFP_KERNEL);
+ region = devm_kzalloc(dev, sizeof(*region), GFP_KERNEL);
if (!region)
return -ENOMEM;
@@ -85,7 +86,7 @@ int afu_mmio_region_add(struct dfl_feature_platform_data *pdata,
return 0;
exit:
- devm_kfree(&pdata->dev->dev, region);
+ devm_kfree(dev, region);
return ret;
}
--
2.47.0
next prev parent reply other threads:[~2024-11-20 1:11 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-11-20 1:10 [PATCH v5 00/18] fpga: dfl: fix kernel warning on port release/assign for SRIOV Peter Colberg
2024-11-20 1:10 ` [PATCH v5 01/18] fpga: dfl: omit unneeded argument pdata from dfl_feature_instance_init() Peter Colberg
2024-11-20 1:10 ` [PATCH v5 02/18] fpga: dfl: return platform data from dfl_fpga_inode_to_feature_dev_data() Peter Colberg
2024-11-20 1:10 ` [PATCH v5 03/18] fpga: dfl: afu: use parent device to log errors on port enable/disable Peter Colberg
2024-11-20 1:10 ` Peter Colberg [this message]
2024-11-20 1:10 ` [PATCH v5 05/18] fpga: dfl: pass feature platform data instead of device as argument Peter Colberg
2024-11-20 1:10 ` [PATCH v5 06/18] fpga: dfl: factor out feature data creation from build_info_commit_dev() Peter Colberg
2024-11-20 1:10 ` [PATCH v5 07/18] fpga: dfl: store FIU type in feature platform data Peter Colberg
2024-11-20 1:10 ` [PATCH v5 08/18] fpga: dfl: refactor internal DFL APIs to take/return feature device data Peter Colberg
2024-11-20 1:10 ` [PATCH v5 09/18] fpga: dfl: factor out feature device registration Peter Colberg
2024-11-20 1:10 ` [PATCH v5 10/18] fpga: dfl: factor out feature device data from platform device data Peter Colberg
2024-11-20 1:10 ` [PATCH v5 11/18] fpga: dfl: convert features from flexible array member to separate array Peter Colberg
2024-11-20 1:10 ` [PATCH v5 12/18] fpga: dfl: store MMIO resources in feature device data Peter Colberg
2024-11-20 1:10 ` [PATCH v5 13/18] fpga: dfl: store platform device name " Peter Colberg
2024-11-20 1:10 ` [PATCH v5 14/18] fpga: dfl: store platform device id " Peter Colberg
2024-11-20 1:10 ` [PATCH v5 15/18] fpga: dfl: allocate platform device after " Peter Colberg
2024-11-20 1:10 ` [PATCH v5 16/18] fpga: dfl: remove unneeded function build_info_create_dev() Peter Colberg
2024-11-20 1:10 ` [PATCH v5 17/18] fpga: dfl: drop unneeded get_device() and put_device() of feature device Peter Colberg
2024-11-20 1:10 ` [PATCH v5 18/18] fpga: dfl: destroy/recreate feature platform device on port release/assign Peter Colberg
2024-12-10 9:07 ` [PATCH v5 00/18] fpga: dfl: fix kernel warning on port release/assign for SRIOV Xu Yilun
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=20241120011035.230574-5-peter.colberg@intel.com \
--to=peter.colberg@intel.com \
--cc=basheer.ahmed.muddebihal@linux.intel.com \
--cc=hao.wu@intel.com \
--cc=linux-fpga@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=marpagan@redhat.com \
--cc=matthew.gerlach@linux.intel.com \
--cc=mdf@kernel.org \
--cc=russ.weight@linux.dev \
--cc=trix@redhat.com \
--cc=yilun.xu@intel.com \
/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;
as well as URLs for NNTP newsgroup(s).