Skip to content

Commit c8c0cda

Browse files
pcercueivinodkoul
authored andcommitted
dmaengine: jz4780: Replace uint32_t with u32
Replace the uint32_t type used all over dma-jz4780.c with the equivalent Linux type: u32. Signed-off-by: Paul Cercueil <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Vinod Koul <[email protected]>
1 parent 3d70fcc commit c8c0cda

File tree

1 file changed

+19
-19
lines changed

1 file changed

+19
-19
lines changed

drivers/dma/dma-jz4780.c

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -104,10 +104,10 @@
104104
* descriptor base address in the upper 8 bits.
105105
*/
106106
struct jz4780_dma_hwdesc {
107-
uint32_t dcm;
108-
uint32_t dsa;
109-
uint32_t dta;
110-
uint32_t dtc;
107+
u32 dcm;
108+
u32 dsa;
109+
u32 dta;
110+
u32 dtc;
111111
};
112112

113113
/* Size of allocations for hardware descriptor blocks. */
@@ -122,16 +122,16 @@ struct jz4780_dma_desc {
122122
dma_addr_t desc_phys;
123123
unsigned int count;
124124
enum dma_transaction_type type;
125-
uint32_t status;
125+
u32 status;
126126
};
127127

128128
struct jz4780_dma_chan {
129129
struct virt_dma_chan vchan;
130130
unsigned int id;
131131
struct dma_pool *desc_pool;
132132

133-
uint32_t transfer_type;
134-
uint32_t transfer_shift;
133+
u32 transfer_type;
134+
u32 transfer_shift;
135135
struct dma_slave_config config;
136136

137137
struct jz4780_dma_desc *desc;
@@ -152,12 +152,12 @@ struct jz4780_dma_dev {
152152
unsigned int irq;
153153
const struct jz4780_dma_soc_data *soc_data;
154154

155-
uint32_t chan_reserved;
155+
u32 chan_reserved;
156156
struct jz4780_dma_chan chan[];
157157
};
158158

159159
struct jz4780_dma_filter_data {
160-
uint32_t transfer_type;
160+
u32 transfer_type;
161161
int channel;
162162
};
163163

@@ -179,26 +179,26 @@ static inline struct jz4780_dma_dev *jz4780_dma_chan_parent(
179179
dma_device);
180180
}
181181

182-
static inline uint32_t jz4780_dma_chn_readl(struct jz4780_dma_dev *jzdma,
182+
static inline u32 jz4780_dma_chn_readl(struct jz4780_dma_dev *jzdma,
183183
unsigned int chn, unsigned int reg)
184184
{
185185
return readl(jzdma->chn_base + reg + JZ_DMA_REG_CHAN(chn));
186186
}
187187

188188
static inline void jz4780_dma_chn_writel(struct jz4780_dma_dev *jzdma,
189-
unsigned int chn, unsigned int reg, uint32_t val)
189+
unsigned int chn, unsigned int reg, u32 val)
190190
{
191191
writel(val, jzdma->chn_base + reg + JZ_DMA_REG_CHAN(chn));
192192
}
193193

194-
static inline uint32_t jz4780_dma_ctrl_readl(struct jz4780_dma_dev *jzdma,
194+
static inline u32 jz4780_dma_ctrl_readl(struct jz4780_dma_dev *jzdma,
195195
unsigned int reg)
196196
{
197197
return readl(jzdma->ctrl_base + reg);
198198
}
199199

200200
static inline void jz4780_dma_ctrl_writel(struct jz4780_dma_dev *jzdma,
201-
unsigned int reg, uint32_t val)
201+
unsigned int reg, u32 val)
202202
{
203203
writel(val, jzdma->ctrl_base + reg);
204204
}
@@ -260,8 +260,8 @@ static void jz4780_dma_desc_free(struct virt_dma_desc *vdesc)
260260
kfree(desc);
261261
}
262262

263-
static uint32_t jz4780_dma_transfer_size(struct jz4780_dma_chan *jzchan,
264-
unsigned long val, uint32_t *shift)
263+
static u32 jz4780_dma_transfer_size(struct jz4780_dma_chan *jzchan,
264+
unsigned long val, u32 *shift)
265265
{
266266
struct jz4780_dma_dev *jzdma = jz4780_dma_chan_parent(jzchan);
267267
int ord = ffs(val) - 1;
@@ -303,7 +303,7 @@ static int jz4780_dma_setup_hwdesc(struct jz4780_dma_chan *jzchan,
303303
enum dma_transfer_direction direction)
304304
{
305305
struct dma_slave_config *config = &jzchan->config;
306-
uint32_t width, maxburst, tsz;
306+
u32 width, maxburst, tsz;
307307

308308
if (direction == DMA_MEM_TO_DEV) {
309309
desc->dcm = JZ_DMA_DCM_SAI;
@@ -453,7 +453,7 @@ static struct dma_async_tx_descriptor *jz4780_dma_prep_dma_memcpy(
453453
{
454454
struct jz4780_dma_chan *jzchan = to_jz4780_dma_chan(chan);
455455
struct jz4780_dma_desc *desc;
456-
uint32_t tsz;
456+
u32 tsz;
457457

458458
desc = jz4780_dma_desc_alloc(jzchan, 1, DMA_MEMCPY);
459459
if (!desc)
@@ -670,7 +670,7 @@ static bool jz4780_dma_chan_irq(struct jz4780_dma_dev *jzdma,
670670
{
671671
const unsigned int soc_flags = jzdma->soc_data->flags;
672672
struct jz4780_dma_desc *desc = jzchan->desc;
673-
uint32_t dcs;
673+
u32 dcs;
674674
bool ack = true;
675675

676676
spin_lock(&jzchan->vchan.lock);
@@ -727,7 +727,7 @@ static irqreturn_t jz4780_dma_irq_handler(int irq, void *data)
727727
struct jz4780_dma_dev *jzdma = data;
728728
unsigned int nb_channels = jzdma->soc_data->nb_channels;
729729
unsigned long pending;
730-
uint32_t dmac;
730+
u32 dmac;
731731
int i;
732732

733733
pending = jz4780_dma_ctrl_readl(jzdma, JZ_DMA_REG_DIRQP);

0 commit comments

Comments
 (0)