dma-contiguous: remove dev_set_cma_area

Christoph Hellwig · Christoph Hellwig · commit 5af638931eb3 · 2020-10-06T07:07:03.000+02:00
dev_set_cma_area contains a trivial assignment.  It has just three
callers that all have a non-NULL device and depend on CONFIG_DMA_CMA,
so remove the wrapper.

Signed-off-by: Christoph Hellwig &lt;hch@lst.de&gt;
diff --git a/arch/arm/mach-davinci/devices-da8xx.c b/arch/arm/mach-davinci/devices-da8xx.c
@@ -905,7 +905,7 @@ void __init da8xx_rproc_reserve_cma(void)
 			__func__, ret);
 		return;
 	}
-	dev_set_cma_area(&da8xx_dsp.dev, cma);
+	da8xx_dsp.dev.cma_area = cma;
 	rproc_mem_inited = true;
 }
 #else
diff --git a/include/linux/dma-contiguous.h b/include/linux/dma-contiguous.h
@@ -66,12 +66,6 @@ static inline struct cma *dev_get_cma_area(struct device *dev)
 	return dma_contiguous_default_area;
 }
 
-static inline void dev_set_cma_area(struct device *dev, struct cma *cma)
-{
-	if (dev)
-		dev->cma_area = cma;
-}
-
 static inline void dma_contiguous_set_default(struct cma *cma)
 {
 	dma_contiguous_default_area = cma;
@@ -97,8 +91,6 @@ static inline struct cma *dev_get_cma_area(struct device *dev)
 	return NULL;
 }
 
-static inline void dev_set_cma_area(struct device *dev, struct cma *cma) { }
-
 static inline void dma_contiguous_set_default(struct cma *cma) { }
 
 static inline void dma_contiguous_reserve(phys_addr_t limit) { }
diff --git a/kernel/dma/contiguous.c b/kernel/dma/contiguous.c
@@ -359,14 +359,14 @@ void dma_free_contiguous(struct device *dev, struct page *page, size_t size)
 
 static int rmem_cma_device_init(struct reserved_mem *rmem, struct device *dev)
 {
-	dev_set_cma_area(dev, rmem->priv);
+	dev->cma_area = rmem->priv;
 	return 0;
 }
 
 static void rmem_cma_device_release(struct reserved_mem *rmem,
 				    struct device *dev)
 {
-	dev_set_cma_area(dev, NULL);
+	dev->cma_area = NULL;
 }
 
 static const struct reserved_mem_ops rmem_cma_ops = {

Original file line number	Diff line number	Diff line change
`@@ -905,7 +905,7 @@ void __init da8xx_rproc_reserve_cma(void)`
`905`	`905`	`__func__, ret);`
`906`	`906`	`return;`
`907`	`907`	`}`
`908`		`- dev_set_cma_area(&da8xx_dsp.dev, cma);`
	`908`	`+ da8xx_dsp.dev.cma_area = cma;`
`909`	`909`	`rproc_mem_inited = true;`
`910`	`910`	`}`
`911`	`911`	`#else`
Original file line number	Diff line number	Diff line change
`@@ -66,12 +66,6 @@ static inline struct cma dev_get_cma_area(struct device dev)`
`66`	`66`	`return dma_contiguous_default_area;`
`67`	`67`	`}`
`68`	`68`
`69`		`-static inline void dev_set_cma_area(struct device dev, struct cma cma)`
`70`		`-{`
`71`		`- if (dev)`
`72`		`- dev->cma_area = cma;`
`73`		`-}`
`74`		`-`
`75`	`69`	`static inline void dma_contiguous_set_default(struct cma *cma)`
`76`	`70`	`{`
`77`	`71`	`dma_contiguous_default_area = cma;`
`@@ -97,8 +91,6 @@ static inline struct cma dev_get_cma_area(struct device dev)`
`97`	`91`	`return NULL;`
`98`	`92`	`}`
`99`	`93`
`100`		`-static inline void dev_set_cma_area(struct device dev, struct cma cma) { }`
`101`		`-`
`102`	`94`	`static inline void dma_contiguous_set_default(struct cma *cma) { }`
`103`	`95`
`104`	`96`	`static inline void dma_contiguous_reserve(phys_addr_t limit) { }`
Original file line number	Diff line number	Diff line change
`@@ -359,14 +359,14 @@ void dma_free_contiguous(struct device dev, struct page page, size_t size)`
`359`	`359`
`360`	`360`	`static int rmem_cma_device_init(struct reserved_mem rmem, struct device dev)`
`361`	`361`	`{`
`362`		`- dev_set_cma_area(dev, rmem->priv);`
	`362`	`+ dev->cma_area = rmem->priv;`
`363`	`363`	`return 0;`
`364`	`364`	`}`
`365`	`365`
`366`	`366`	`static void rmem_cma_device_release(struct reserved_mem *rmem,`
`367`	`367`	`struct device *dev)`
`368`	`368`	`{`
`369`		`- dev_set_cma_area(dev, NULL);`
	`369`	`+ dev->cma_area = NULL;`
`370`	`370`	`}`
`371`	`371`
`372`	`372`	`static const struct reserved_mem_ops rmem_cma_ops = {`