2019-03-23 15:48:30

by Bharath Vedartham

[permalink] [raw]
Subject: [PATCH v4] staging: ralink-gdma: Use u32 over uint32_t

Fixes the checkpatch.pl warning: "Prefer u32 over uint32_t"

Signed-off-by: Bharath Vedartham <[email protected]>
---
Changes since v3
- Fixed allignment issues.
- Submitted a seperate patch to change unsigned
to unsigned int.
- One of the allignments crosses 80 characters in a line
but I feel that we may loose readability if we try to reduce
the characters in the line.
---
drivers/staging/ralink-gdma/ralink-gdma.c | 14 ++++++--------
1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/drivers/staging/ralink-gdma/ralink-gdma.c b/drivers/staging/ralink-gdma/ralink-gdma.c
index d78042e..0b831f8 100644
--- a/drivers/staging/ralink-gdma/ralink-gdma.c
+++ b/drivers/staging/ralink-gdma/ralink-gdma.c
@@ -157,14 +157,12 @@ static struct gdma_dma_desc *to_gdma_dma_desc(struct virt_dma_desc *vdesc)
return container_of(vdesc, struct gdma_dma_desc, vdesc);
}

-static inline uint32_t gdma_dma_read(struct gdma_dma_dev *dma_dev,
- unsigned int reg)
+static inline u32 gdma_dma_read(struct gdma_dma_dev *dma_dev, unsigned int reg)
{
return readl(dma_dev->base + reg);
}

-static inline void gdma_dma_write(struct gdma_dma_dev *dma_dev,
- unsigned reg, uint32_t val)
+static inline void gdma_dma_write(struct gdma_dma_dev *dma_dev, unsigned reg, u32 val)
{
writel(val, dma_dev->base + reg);
}
@@ -283,7 +281,7 @@ static int rt305x_gdma_start_transfer(struct gdma_dmaengine_chan *chan)
struct gdma_dma_dev *dma_dev = gdma_dma_chan_get_dev(chan);
dma_addr_t src_addr, dst_addr;
struct gdma_dma_sg *sg;
- uint32_t ctrl0, ctrl1;
+ u32 ctrl0, ctrl1;

/* verify chan is already stopped */
ctrl0 = gdma_dma_read(dma_dev, GDMA_REG_CTRL0(chan->id));
@@ -361,7 +359,7 @@ static int rt3883_gdma_start_transfer(struct gdma_dmaengine_chan *chan)
struct gdma_dma_dev *dma_dev = gdma_dma_chan_get_dev(chan);
dma_addr_t src_addr, dst_addr;
struct gdma_dma_sg *sg;
- uint32_t ctrl0, ctrl1;
+ u32 ctrl0, ctrl1;

/* verify chan is already stopped */
ctrl0 = gdma_dma_read(dma_dev, GDMA_REG_CTRL0(chan->id));
@@ -753,7 +751,7 @@ static void gdma_dma_tasklet(unsigned long arg)

static void rt305x_gdma_init(struct gdma_dma_dev *dma_dev)
{
- uint32_t gct;
+ u32 gct;

/* all chans round robin */
gdma_dma_write(dma_dev, GDMA_RT305X_GCT, GDMA_REG_GCT_ARBIT_RR);
@@ -767,7 +765,7 @@ static void rt305x_gdma_init(struct gdma_dma_dev *dma_dev)

static void rt3883_gdma_init(struct gdma_dma_dev *dma_dev)
{
- uint32_t gct;
+ u32 gct;

/* all chans round robin */
gdma_dma_write(dma_dev, GDMA_REG_GCT, GDMA_REG_GCT_ARBIT_RR);
--
2.7.4



2019-03-24 08:59:53

by Greg Kroah-Hartman

[permalink] [raw]
Subject: Re: [PATCH v4] staging: ralink-gdma: Use u32 over uint32_t

On Sat, Mar 23, 2019 at 09:16:48PM +0530, Bharath Vedartham wrote:
> Fixes the checkpatch.pl warning: "Prefer u32 over uint32_t"
>
> Signed-off-by: Bharath Vedartham <[email protected]>
> ---
> Changes since v3
> - Fixed allignment issues.
> - Submitted a seperate patch to change unsigned
> to unsigned int.
> - One of the allignments crosses 80 characters in a line
> but I feel that we may loose readability if we try to reduce
> the characters in the line.
> ---
> drivers/staging/ralink-gdma/ralink-gdma.c | 14 ++++++--------
> 1 file changed, 6 insertions(+), 8 deletions(-)

This patch does not apply to my staging-testing branch at all :(

2019-03-24 09:40:19

by Bharath Vedartham

[permalink] [raw]
Subject: Re: [PATCH v4] staging: ralink-gdma: Use u32 over uint32_t

On Sun, Mar 24, 2019 at 09:58:33AM +0100, Greg KH wrote:
> On Sat, Mar 23, 2019 at 09:16:48PM +0530, Bharath Vedartham wrote:
> > Fixes the checkpatch.pl warning: "Prefer u32 over uint32_t"
> >
> > Signed-off-by: Bharath Vedartham <[email protected]>
> > ---
> > Changes since v3
> > - Fixed allignment issues.
> > - Submitted a seperate patch to change unsigned
> > to unsigned int.
> > - One of the allignments crosses 80 characters in a line
> > but I feel that we may loose readability if we try to reduce
> > the characters in the line.
> > ---
> > drivers/staging/ralink-gdma/ralink-gdma.c | 14 ++++++--------
> > 1 file changed, 6 insertions(+), 8 deletions(-)
>
> This patch does not apply to my staging-testing branch at all :(
Same case here :(. I have used linus's branch rather than the staging
branch. I have also noticed that this patch does not apply to the
staging branch as this checkpatch warning has already been fixed in the
staging branch.