dma-mapping: don't return errors from dma_set_min_align_mask

Christoph Hellwig · Christoph Hellwig · commit c42a01264ba1 · 2024-08-29T07:22:36.000+03:00
A NULL dev-&gt;dma_parms indicates either a bus that is not DMA capable or
grave bug in the implementation of the bus code.

There isn't much the driver can do in terms of error handling for either
case, so just warn and continue as DMA operations will fail anyway.

Signed-off-by: Christoph Hellwig &lt;hch@lst.de&gt;
Reviewed-by: Robin Murphy &lt;robin.murphy@arm.com&gt;
Reviewed-by: Martin K. Petersen &lt;martin.petersen@oracle.com&gt;
diff --git a/include/linux/dma-mapping.h b/include/linux/dma-mapping.h
@@ -575,13 +575,12 @@ static inline unsigned int dma_get_min_align_mask(struct device *dev)
 	return 0;
 }
 
-static inline int dma_set_min_align_mask(struct device *dev,
+static inline void dma_set_min_align_mask(struct device *dev,
 		unsigned int min_align_mask)
 {
 	if (WARN_ON_ONCE(!dev->dma_parms))
-		return -EIO;
+		return;
 	dev->dma_parms->min_align_mask = min_align_mask;
-	return 0;
 }
 
 #ifndef dma_get_cache_alignment

Original file line number	Diff line number	Diff line change
`@@ -575,13 +575,12 @@ static inline unsigned int dma_get_min_align_mask(struct device *dev)`
`575`	`575`	`return 0;`
`576`	`576`	`}`
`577`	`577`
`578`		`-static inline int dma_set_min_align_mask(struct device *dev,`
	`578`	`+static inline void dma_set_min_align_mask(struct device *dev,`
`579`	`579`	`unsigned int min_align_mask)`
`580`	`580`	`{`
`581`	`581`	`if (WARN_ON_ONCE(!dev->dma_parms))`
`582`		`- return -EIO;`
	`582`	`+ return;`
`583`	`583`	`dev->dma_parms->min_align_mask = min_align_mask;`
`584`		`- return 0;`
`585`	`584`	`}`
`586`	`585`
`587`	`586`	`#ifndef dma_get_cache_alignment`