* [PATCH] dma-mapping: remove unused attrs parameter to dma_common_get_sgtable
@ 2019-01-03 8:29 Huaisheng Ye
2019-01-03 17:54 ` Stefano Stabellini
0 siblings, 1 reply; 5+ messages in thread
From: Huaisheng Ye @ 2019-01-03 8:29 UTC (permalink / raw)
To: hch
Cc: konrad.wilk, boris.ostrovsky, jgross, sstabellini, m.szyprowski,
robin.murphy, linux-kernel, chengnt, xen-devel, iommu,
Huaisheng Ye
From: Huaisheng Ye <yehs1@lenovo.com>
dma_common_get_sgtable has parameter attrs which is not used at all.
Remove it.
Signed-off-by: Huaisheng Ye <yehs1@lenovo.com>
---
drivers/xen/swiotlb-xen.c | 2 +-
include/linux/dma-mapping.h | 5 ++---
kernel/dma/mapping.c | 3 +--
3 files changed, 4 insertions(+), 6 deletions(-)
diff --git a/drivers/xen/swiotlb-xen.c b/drivers/xen/swiotlb-xen.c
index 2a7f545..2dc17a5 100644
--- a/drivers/xen/swiotlb-xen.c
+++ b/drivers/xen/swiotlb-xen.c
@@ -697,7 +697,7 @@ static void xen_swiotlb_unmap_page(struct device *hwdev, dma_addr_t dev_addr,
handle, size, attrs);
}
#endif
- return dma_common_get_sgtable(dev, sgt, cpu_addr, handle, size, attrs);
+ return dma_common_get_sgtable(dev, sgt, cpu_addr, handle, size);
}
static int xen_swiotlb_mapping_error(struct device *dev, dma_addr_t dma_addr)
diff --git a/include/linux/dma-mapping.h b/include/linux/dma-mapping.h
index d327bdd..bbfad44 100644
--- a/include/linux/dma-mapping.h
+++ b/include/linux/dma-mapping.h
@@ -483,7 +483,7 @@ void *dma_common_pages_remap(struct page **pages, size_t size,
int
dma_common_get_sgtable(struct device *dev, struct sg_table *sgt, void *cpu_addr,
- dma_addr_t dma_addr, size_t size, unsigned long attrs);
+ dma_addr_t dma_addr, size_t size);
static inline int
dma_get_sgtable_attrs(struct device *dev, struct sg_table *sgt, void *cpu_addr,
@@ -495,8 +495,7 @@ void *dma_common_pages_remap(struct page **pages, size_t size,
if (ops->get_sgtable)
return ops->get_sgtable(dev, sgt, cpu_addr, dma_addr, size,
attrs);
- return dma_common_get_sgtable(dev, sgt, cpu_addr, dma_addr, size,
- attrs);
+ return dma_common_get_sgtable(dev, sgt, cpu_addr, dma_addr, size);
}
#define dma_get_sgtable(d, t, v, h, s) dma_get_sgtable_attrs(d, t, v, h, s, 0)
diff --git a/kernel/dma/mapping.c b/kernel/dma/mapping.c
index 58dec7a..6b33f10 100644
--- a/kernel/dma/mapping.c
+++ b/kernel/dma/mapping.c
@@ -202,8 +202,7 @@ void dmam_release_declared_memory(struct device *dev)
* Create scatter-list for the already allocated DMA buffer.
*/
int dma_common_get_sgtable(struct device *dev, struct sg_table *sgt,
- void *cpu_addr, dma_addr_t dma_addr, size_t size,
- unsigned long attrs)
+ void *cpu_addr, dma_addr_t dma_addr, size_t size)
{
struct page *page;
int ret;
--
1.8.3.1
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH] dma-mapping: remove unused attrs parameter to dma_common_get_sgtable
2019-01-03 8:29 [PATCH] dma-mapping: remove unused attrs parameter to dma_common_get_sgtable Huaisheng Ye
@ 2019-01-03 17:54 ` Stefano Stabellini
0 siblings, 0 replies; 5+ messages in thread
From: Stefano Stabellini @ 2019-01-03 17:54 UTC (permalink / raw)
To: Huaisheng Ye
Cc: hch, konrad.wilk, boris.ostrovsky, jgross, sstabellini,
m.szyprowski, robin.murphy, linux-kernel, chengnt, xen-devel,
iommu, Huaisheng Ye
On Thu, 3 Jan 2019, Huaisheng Ye wrote:
> From: Huaisheng Ye <yehs1@lenovo.com>
>
> dma_common_get_sgtable has parameter attrs which is not used at all.
> Remove it.
>
> Signed-off-by: Huaisheng Ye <yehs1@lenovo.com>
Acked-by: Stefano Stabellini <sstabellini@kernel.org>
FYI the patch doesn't apply cleanly to master.
> ---
> drivers/xen/swiotlb-xen.c | 2 +-
> include/linux/dma-mapping.h | 5 ++---
> kernel/dma/mapping.c | 3 +--
> 3 files changed, 4 insertions(+), 6 deletions(-)
>
> diff --git a/drivers/xen/swiotlb-xen.c b/drivers/xen/swiotlb-xen.c
> index 2a7f545..2dc17a5 100644
> --- a/drivers/xen/swiotlb-xen.c
> +++ b/drivers/xen/swiotlb-xen.c
> @@ -697,7 +697,7 @@ static void xen_swiotlb_unmap_page(struct device *hwdev, dma_addr_t dev_addr,
> handle, size, attrs);
> }
> #endif
> - return dma_common_get_sgtable(dev, sgt, cpu_addr, handle, size, attrs);
> + return dma_common_get_sgtable(dev, sgt, cpu_addr, handle, size);
> }
>
> static int xen_swiotlb_mapping_error(struct device *dev, dma_addr_t dma_addr)
> diff --git a/include/linux/dma-mapping.h b/include/linux/dma-mapping.h
> index d327bdd..bbfad44 100644
> --- a/include/linux/dma-mapping.h
> +++ b/include/linux/dma-mapping.h
> @@ -483,7 +483,7 @@ void *dma_common_pages_remap(struct page **pages, size_t size,
>
> int
> dma_common_get_sgtable(struct device *dev, struct sg_table *sgt, void *cpu_addr,
> - dma_addr_t dma_addr, size_t size, unsigned long attrs);
> + dma_addr_t dma_addr, size_t size);
>
> static inline int
> dma_get_sgtable_attrs(struct device *dev, struct sg_table *sgt, void *cpu_addr,
> @@ -495,8 +495,7 @@ void *dma_common_pages_remap(struct page **pages, size_t size,
> if (ops->get_sgtable)
> return ops->get_sgtable(dev, sgt, cpu_addr, dma_addr, size,
> attrs);
> - return dma_common_get_sgtable(dev, sgt, cpu_addr, dma_addr, size,
> - attrs);
> + return dma_common_get_sgtable(dev, sgt, cpu_addr, dma_addr, size);
> }
>
> #define dma_get_sgtable(d, t, v, h, s) dma_get_sgtable_attrs(d, t, v, h, s, 0)
> diff --git a/kernel/dma/mapping.c b/kernel/dma/mapping.c
> index 58dec7a..6b33f10 100644
> --- a/kernel/dma/mapping.c
> +++ b/kernel/dma/mapping.c
> @@ -202,8 +202,7 @@ void dmam_release_declared_memory(struct device *dev)
> * Create scatter-list for the already allocated DMA buffer.
> */
> int dma_common_get_sgtable(struct device *dev, struct sg_table *sgt,
> - void *cpu_addr, dma_addr_t dma_addr, size_t size,
> - unsigned long attrs)
> + void *cpu_addr, dma_addr_t dma_addr, size_t size)
> {
> struct page *page;
> int ret;
> --
> 1.8.3.1
>
>
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] dma-mapping: remove unused attrs parameter to dma_common_get_sgtable
2019-01-04 1:45 Huaisheng HS1 Ye
@ 2019-01-04 7:26 ` hch
0 siblings, 0 replies; 5+ messages in thread
From: hch @ 2019-01-04 7:26 UTC (permalink / raw)
To: Huaisheng HS1 Ye
Cc: Stefano Stabellini, hch, konrad.wilk, boris.ostrovsky, jgross,
m.szyprowski, robin.murphy, linux-kernel, NingTing Cheng,
xen-devel, iommu, Huaisheng Ye
On Fri, Jan 04, 2019 at 01:45:26AM +0000, Huaisheng HS1 Ye wrote:
> From: Stefano Stabellini <sstabellini@kernel.org>
> Sent: Friday, January 04, 2019 1:55 AM
> > On Thu, 3 Jan 2019, Huaisheng Ye wrote:
> > > From: Huaisheng Ye <yehs1@lenovo.com>
> > >
> > > dma_common_get_sgtable has parameter attrs which is not used at all.
> > > Remove it.
> > >
> > > Signed-off-by: Huaisheng Ye <yehs1@lenovo.com>
> >
> > Acked-by: Stefano Stabellini <sstabellini@kernel.org>
> >
> > FYI the patch doesn't apply cleanly to master.
>
> Got it, I will rebase it to branch master and resend the patch later.
I think we can skip it. For the next merge window I plan to remove
the fallbacks for get_sgtable and mmap and instead wire everything up
explicitly. And to be a possible method instance it will have to match
the prototype and thus keep the unused argument.
^ permalink raw reply [flat|nested] 5+ messages in thread
* [PATCH] dma-mapping: remove unused attrs parameter to dma_common_get_sgtable
@ 2019-01-04 2:36 Huaisheng Ye
0 siblings, 0 replies; 5+ messages in thread
From: Huaisheng Ye @ 2019-01-04 2:36 UTC (permalink / raw)
To: hch, sstabellini
Cc: konrad.wilk, boris.ostrovsky, jgross, m.szyprowski, robin.murphy,
linux-kernel, chengnt, xen-devel, iommu, Huaisheng Ye
From: Huaisheng Ye <yehs1@lenovo.com>
dma_common_get_sgtable has parameter attrs which is not used at all.
Remove it.
Signed-off-by: Huaisheng Ye <yehs1@lenovo.com>
Acked-by: Stefano Stabellini <sstabellini@kernel.org>
---
drivers/xen/swiotlb-xen.c | 2 +-
include/linux/dma-mapping.h | 2 +-
kernel/dma/mapping.c | 6 ++----
3 files changed, 4 insertions(+), 6 deletions(-)
diff --git a/drivers/xen/swiotlb-xen.c b/drivers/xen/swiotlb-xen.c
index 989cf87..b8cb1da 100644
--- a/drivers/xen/swiotlb-xen.c
+++ b/drivers/xen/swiotlb-xen.c
@@ -677,7 +677,7 @@ static void xen_swiotlb_unmap_page(struct device *hwdev, dma_addr_t dev_addr,
handle, size, attrs);
}
#endif
- return dma_common_get_sgtable(dev, sgt, cpu_addr, handle, size, attrs);
+ return dma_common_get_sgtable(dev, sgt, cpu_addr, handle, size);
}
const struct dma_map_ops xen_swiotlb_dma_ops = {
diff --git a/include/linux/dma-mapping.h b/include/linux/dma-mapping.h
index ba521d5..f9e7c2a 100644
--- a/include/linux/dma-mapping.h
+++ b/include/linux/dma-mapping.h
@@ -523,7 +523,7 @@ int dma_mmap_attrs(struct device *dev, struct vm_area_struct *vma,
int
dma_common_get_sgtable(struct device *dev, struct sg_table *sgt, void *cpu_addr,
- dma_addr_t dma_addr, size_t size, unsigned long attrs);
+ dma_addr_t dma_addr, size_t size);
int dma_get_sgtable_attrs(struct device *dev, struct sg_table *sgt,
void *cpu_addr, dma_addr_t dma_addr, size_t size,
diff --git a/kernel/dma/mapping.c b/kernel/dma/mapping.c
index d7c34d2..0c28b71 100644
--- a/kernel/dma/mapping.c
+++ b/kernel/dma/mapping.c
@@ -203,8 +203,7 @@ void dmam_release_declared_memory(struct device *dev)
* Create scatter-list for the already allocated DMA buffer.
*/
int dma_common_get_sgtable(struct device *dev, struct sg_table *sgt,
- void *cpu_addr, dma_addr_t dma_addr, size_t size,
- unsigned long attrs)
+ void *cpu_addr, dma_addr_t dma_addr, size_t size)
{
struct page *page;
int ret;
@@ -234,8 +233,7 @@ int dma_get_sgtable_attrs(struct device *dev, struct sg_table *sgt,
if (!dma_is_direct(ops) && ops->get_sgtable)
return ops->get_sgtable(dev, sgt, cpu_addr, dma_addr, size,
attrs);
- return dma_common_get_sgtable(dev, sgt, cpu_addr, dma_addr, size,
- attrs);
+ return dma_common_get_sgtable(dev, sgt, cpu_addr, dma_addr, size);
}
EXPORT_SYMBOL(dma_get_sgtable_attrs);
--
1.8.3.1
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH] dma-mapping: remove unused attrs parameter to dma_common_get_sgtable
@ 2019-01-04 1:45 Huaisheng HS1 Ye
2019-01-04 7:26 ` hch
0 siblings, 1 reply; 5+ messages in thread
From: Huaisheng HS1 Ye @ 2019-01-04 1:45 UTC (permalink / raw)
To: Stefano Stabellini
Cc: hch, konrad.wilk, boris.ostrovsky, jgross, m.szyprowski,
robin.murphy, linux-kernel, NingTing Cheng, xen-devel, iommu,
Huaisheng Ye
From: Stefano Stabellini <sstabellini@kernel.org>
Sent: Friday, January 04, 2019 1:55 AM
> On Thu, 3 Jan 2019, Huaisheng Ye wrote:
> > From: Huaisheng Ye <yehs1@lenovo.com>
> >
> > dma_common_get_sgtable has parameter attrs which is not used at all.
> > Remove it.
> >
> > Signed-off-by: Huaisheng Ye <yehs1@lenovo.com>
>
> Acked-by: Stefano Stabellini <sstabellini@kernel.org>
>
> FYI the patch doesn't apply cleanly to master.
Got it, I will rebase it to branch master and resend the patch later.
Cheers,
Huaisheng Ye
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2019-01-04 7:26 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-01-03 8:29 [PATCH] dma-mapping: remove unused attrs parameter to dma_common_get_sgtable Huaisheng Ye
2019-01-03 17:54 ` Stefano Stabellini
2019-01-04 1:45 Huaisheng HS1 Ye
2019-01-04 7:26 ` hch
2019-01-04 2:36 Huaisheng Ye
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).