Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1214c525 authored by Akinobu Mita's avatar Akinobu Mita Committed by Geert Uytterhoeven
Browse files

m68k: Use for_each_sg() 



This replaces the plain loop over the sglist array with for_each_sg()
macro which consists of sg_next() function calls.  Since m68k doesn't
select ARCH_HAS_SG_CHAIN, it is not necessary to use for_each_sg() in
order to loop over each sg element.  But this can help find problems
with drivers that do not properly initialize their sg tables when
CONFIG_DEBUG_SG is enabled.

Signed-off-by: default avatarAkinobu Mita <akinobu.mita@gmail.com>
Cc: Geert Uytterhoeven <geert@linux-m68k.org>
Cc: linux-m68k@lists.linux-m68k.org
Cc: linux-arch@vger.kernel.org
Signed-off-by: default avatarGeert Uytterhoeven <geert@linux-m68k.org>
parent 4d686b02

arch/m68k/kernel/dma.c

+12 −7
Original line number Original line Diff line number Diff line
@@ -120,13 +120,16 @@ void dma_sync_single_for_device(struct device *dev, dma_addr_t handle, 
}

}

EXPORT_SYMBOL(dma_sync_single_for_device);

EXPORT_SYMBOL(dma_sync_single_for_device);





void dma_sync_sg_for_device(struct device *dev, struct scatterlist *sg, int nents,

void dma_sync_sg_for_device(struct device *dev, struct scatterlist *sglist,

			    enum dma_data_direction dir)

			    int nents, enum dma_data_direction dir)

{

{

	int i;

	int i;

	struct scatterlist *sg;





	for (i = 0; i < nents; sg++, i++)

	for_each_sg(sglist, sg, nents, i) {

		dma_sync_single_for_device(dev, sg->dma_address, sg->length, dir);

		dma_sync_single_for_device(dev, sg->dma_address, sg->length,

					   dir);

	}

}

}

EXPORT_SYMBOL(dma_sync_sg_for_device);

EXPORT_SYMBOL(dma_sync_sg_for_device);
@@ -151,14 +154,16 @@ dma_addr_t dma_map_page(struct device *dev, struct page *page, 
}

}

EXPORT_SYMBOL(dma_map_page);

EXPORT_SYMBOL(dma_map_page);





int dma_map_sg(struct device *dev, struct scatterlist *sg, int nents,

int dma_map_sg(struct device *dev, struct scatterlist *sglist, int nents,

	       enum dma_data_direction dir)

	       enum dma_data_direction dir)

{

{

	int i;

	int i;

	struct scatterlist *sg;





	for (i = 0; i < nents; sg++, i++) {

	for_each_sg(sglist, sg, nents, i) {

		sg->dma_address = sg_phys(sg);

		sg->dma_address = sg_phys(sg);

		dma_sync_single_for_device(dev, sg->dma_address, sg->length, dir);

		dma_sync_single_for_device(dev, sg->dma_address, sg->length,

					   dir);

	}

	}

	return nents;

	return nents;

}

}