Skip to content

Commit 5af5fc8

Browse files
Sean AndersonChristoph Hellwig
authored andcommitted
dma-mapping: use macros to define events in a class
Use a macro to avoid repeating the parameters and arguments for each event in a class. Signed-off-by: Sean Anderson <sean.anderson@linux.dev> Reviewed-by: Steven Rostedt (Google) <rostedt@goodmis.org> Signed-off-by: Christoph Hellwig <hch@lst.de>
1 parent 5935b83 commit 5af5fc8

File tree

1 file changed

+28
-32
lines changed
  • include/trace/events

1 file changed

+28
-32
lines changed

include/trace/events/dma.h

Lines changed: 28 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -65,15 +65,14 @@ DECLARE_EVENT_CLASS(dma_map,
6565
decode_dma_attrs(__entry->attrs))
6666
);
6767

68-
DEFINE_EVENT(dma_map, dma_map_page,
69-
TP_PROTO(struct device *dev, phys_addr_t phys_addr, dma_addr_t dma_addr,
70-
size_t size, enum dma_data_direction dir, unsigned long attrs),
71-
TP_ARGS(dev, phys_addr, dma_addr, size, dir, attrs));
68+
#define DEFINE_MAP_EVENT(name) \
69+
DEFINE_EVENT(dma_map, name, \
70+
TP_PROTO(struct device *dev, phys_addr_t phys_addr, dma_addr_t dma_addr, \
71+
size_t size, enum dma_data_direction dir, unsigned long attrs), \
72+
TP_ARGS(dev, phys_addr, dma_addr, size, dir, attrs))
7273

73-
DEFINE_EVENT(dma_map, dma_map_resource,
74-
TP_PROTO(struct device *dev, phys_addr_t phys_addr, dma_addr_t dma_addr,
75-
size_t size, enum dma_data_direction dir, unsigned long attrs),
76-
TP_ARGS(dev, phys_addr, dma_addr, size, dir, attrs));
74+
DEFINE_MAP_EVENT(dma_map_page);
75+
DEFINE_MAP_EVENT(dma_map_resource);
7776

7877
DECLARE_EVENT_CLASS(dma_unmap,
7978
TP_PROTO(struct device *dev, dma_addr_t addr, size_t size,
@@ -104,15 +103,14 @@ DECLARE_EVENT_CLASS(dma_unmap,
104103
decode_dma_attrs(__entry->attrs))
105104
);
106105

107-
DEFINE_EVENT(dma_unmap, dma_unmap_page,
108-
TP_PROTO(struct device *dev, dma_addr_t addr, size_t size,
109-
enum dma_data_direction dir, unsigned long attrs),
110-
TP_ARGS(dev, addr, size, dir, attrs));
106+
#define DEFINE_UNMAP_EVENT(name) \
107+
DEFINE_EVENT(dma_unmap, name, \
108+
TP_PROTO(struct device *dev, dma_addr_t addr, size_t size, \
109+
enum dma_data_direction dir, unsigned long attrs), \
110+
TP_ARGS(dev, addr, size, dir, attrs))
111111

112-
DEFINE_EVENT(dma_unmap, dma_unmap_resource,
113-
TP_PROTO(struct device *dev, dma_addr_t addr, size_t size,
114-
enum dma_data_direction dir, unsigned long attrs),
115-
TP_ARGS(dev, addr, size, dir, attrs));
112+
DEFINE_UNMAP_EVENT(dma_unmap_page);
113+
DEFINE_UNMAP_EVENT(dma_unmap_resource);
116114

117115
TRACE_EVENT(dma_alloc,
118116
TP_PROTO(struct device *dev, void *virt_addr, dma_addr_t dma_addr,
@@ -279,15 +277,14 @@ DECLARE_EVENT_CLASS(dma_sync_single,
279277
__entry->size)
280278
);
281279

282-
DEFINE_EVENT(dma_sync_single, dma_sync_single_for_cpu,
283-
TP_PROTO(struct device *dev, dma_addr_t dma_addr, size_t size,
284-
enum dma_data_direction dir),
285-
TP_ARGS(dev, dma_addr, size, dir));
280+
#define DEFINE_SYNC_SINGLE_EVENT(name) \
281+
DEFINE_EVENT(dma_sync_single, name, \
282+
TP_PROTO(struct device *dev, dma_addr_t dma_addr, size_t size, \
283+
enum dma_data_direction dir), \
284+
TP_ARGS(dev, dma_addr, size, dir))
286285

287-
DEFINE_EVENT(dma_sync_single, dma_sync_single_for_device,
288-
TP_PROTO(struct device *dev, dma_addr_t dma_addr, size_t size,
289-
enum dma_data_direction dir),
290-
TP_ARGS(dev, dma_addr, size, dir));
286+
DEFINE_SYNC_SINGLE_EVENT(dma_sync_single_for_cpu);
287+
DEFINE_SYNC_SINGLE_EVENT(dma_sync_single_for_device);
291288

292289
DECLARE_EVENT_CLASS(dma_sync_sg,
293290
TP_PROTO(struct device *dev, struct scatterlist *sgl, int nents,
@@ -326,15 +323,14 @@ DECLARE_EVENT_CLASS(dma_sync_sg,
326323
sizeof(unsigned int), sizeof(unsigned int)))
327324
);
328325

329-
DEFINE_EVENT(dma_sync_sg, dma_sync_sg_for_cpu,
330-
TP_PROTO(struct device *dev, struct scatterlist *sg, int nents,
331-
enum dma_data_direction dir),
332-
TP_ARGS(dev, sg, nents, dir));
326+
#define DEFINE_SYNC_SG_EVENT(name) \
327+
DEFINE_EVENT(dma_sync_sg, name, \
328+
TP_PROTO(struct device *dev, struct scatterlist *sg, int nents, \
329+
enum dma_data_direction dir), \
330+
TP_ARGS(dev, sg, nents, dir))
333331

334-
DEFINE_EVENT(dma_sync_sg, dma_sync_sg_for_device,
335-
TP_PROTO(struct device *dev, struct scatterlist *sg, int nents,
336-
enum dma_data_direction dir),
337-
TP_ARGS(dev, sg, nents, dir));
332+
DEFINE_SYNC_SG_EVENT(dma_sync_sg_for_cpu);
333+
DEFINE_SYNC_SG_EVENT(dma_sync_sg_for_device);
338334

339335
#endif /* _TRACE_DMA_H */
340336

0 commit comments

Comments
 (0)