Commit 0cb0e25e authored by Robin Murphy's avatar Robin Murphy Committed by Christoph Hellwig
Browse files

dma/debug: Remove dma_debug_resize_entries() 



With the only caller now gone, we can clean up this part of dma-debug's
exposed internals and make way to tweak the allocation behaviour.

Signed-off-by: default avatarRobin Murphy <robin.murphy@arm.com>
Tested-by: default avatarQian Cai <cai@lca.pw>
Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
parent a8a4c98f

include/linux/dma-debug.h

+0 −7
Original line number Diff line number Diff line
@@ -30,8 +30,6 @@ struct bus_type; 


extern void dma_debug_add_bus(struct bus_type *bus);



extern int dma_debug_resize_entries(u32 num_entries);



extern void debug_dma_map_single(struct device *dev, const void *addr,

				 unsigned long len);
@@ -101,11 +99,6 @@ static inline void dma_debug_add_bus(struct bus_type *bus) 
{

}



static inline int dma_debug_resize_entries(u32 num_entries)

{

	return 0;

}



static inline void debug_dma_map_single(struct device *dev, const void *addr,

					unsigned long len)

{

kernel/dma/debug.c

+0 −46
Original line number Diff line number Diff line
@@ -755,52 +755,6 @@ static void dma_entry_free(struct dma_debug_entry *entry) 
	spin_unlock_irqrestore(&free_entries_lock, flags);

}



int dma_debug_resize_entries(u32 num_entries)

{

	int i, delta, ret = 0;

	unsigned long flags;

	struct dma_debug_entry *entry;

	LIST_HEAD(tmp);



	spin_lock_irqsave(&free_entries_lock, flags);



	if (nr_total_entries < num_entries) {

		delta = num_entries - nr_total_entries;



		spin_unlock_irqrestore(&free_entries_lock, flags);



		for (i = 0; i < delta; i++) {

			entry = kzalloc(sizeof(*entry), GFP_KERNEL);

			if (!entry)

				break;



			list_add_tail(&entry->list, &tmp);

		}



		spin_lock_irqsave(&free_entries_lock, flags);



		list_splice(&tmp, &free_entries);

		nr_total_entries += i;

		num_free_entries += i;

	} else {

		delta = nr_total_entries - num_entries;



		for (i = 0; i < delta && !list_empty(&free_entries); i++) {

			entry = __dma_entry_alloc();

			kfree(entry);

		}



		nr_total_entries -= i;

	}



	if (nr_total_entries != num_entries)

		ret = 1;



	spin_unlock_irqrestore(&free_entries_lock, flags);



	return ret;

}



/*

 * DMA-API debugging init code

 *

CRA Git | Maintained and supported by SUSTech CRA and CCSE