> +bool blk_queue_can_use_dma_map_merging(struct request_queue *q,
> + struct device *dev)
> +{
> + unsigned long boundary = dma_get_merge_boundary(dev);
> +
> + if (!boundary)
> + return false;
> +
> + /* No need to update max_segment_size. see blk_queue_virt_boundary() */
> + blk_queue_virt_boundary(q, boundary);
> +
> + return true;
I'd skip that empty line here, but that is way into nitpick territory.
Otherwise looks good:
Reviewed-by: Christoph Hellwig <hch@xxxxxx>
