| Message ID | 53D28DAF.9090506@infradead.org (mailing list archive) |
|---|---|
| State | Rejected |
| Delegated to: | Vinod Koul |
| Headers | show |
On Fri, Jul 25, 2014 at 10:02:39AM -0700, Randy Dunlap wrote: > From: Randy Dunlap <rdunlap@infradead.org> > > Fix printk format warnings by using size_t modifiers ('z'): > > ../drivers/dma/sh/rcar-dmac.c:759:4: warning: format '%u' expects argument of type 'unsigned int', but argument 9 has type 'size_t' [-Wformat=] > ../drivers/dma/sh/rcar-dmac.c:759:4: warning: format '%u' expects argument of type 'unsigned int', but argument 10 has type 'size_t' [-Wformat=] > This is not present in dmaengine trees. Simon is this in your tree?
On Saturday 26 July 2014 21:19:30 Vinod Koul wrote: > On Fri, Jul 25, 2014 at 10:02:39AM -0700, Randy Dunlap wrote: > > From: Randy Dunlap <rdunlap@infradead.org> > > > > Fix printk format warnings by using size_t modifiers ('z'): > > > > ../drivers/dma/sh/rcar-dmac.c:759:4: warning: format '%u' expects argument > > of type 'unsigned int', but argument 9 has type 'size_t' [-Wformat=] > > ../drivers/dma/sh/rcar-dmac.c:759:4: warning: format '%u' expects > > argument of type 'unsigned int', but argument 10 has type 'size_t' > > [-Wformat=] > > This is not present in dmaengine trees. Simon is this in your tree? The patch applies to a new driver under development that Simon took in his tree. From what he told me he plans to send a pull request soon. > > Signed-off-by: Randy Dunlap <rdunlap@infradead.org> > > Cc: Laurent Pinchart <laurent.pinchart@ideasonboard.com> > > Cc: Dan Williams <dan.j.williams@intel.com> > > Cc: dmaengine@vger.kernel.org Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> Simon, should I submit a new version that incorporates this change, or do you want to include it in your pull request directly (possibly squashing it in the original commit) ? > > --- > > > > drivers/dma/sh/rcar-dmac.c | 2 +- > > 1 file changed, 1 insertion(+), 1 deletion(-) > > > > Index: linux-next-20140725/drivers/dma/sh/rcar-dmac.c > > =================================================================== > > --- linux-next-20140725.orig/drivers/dma/sh/rcar-dmac.c > > +++ linux-next-20140725/drivers/dma/sh/rcar-dmac.c > > @@ -757,7 +757,7 @@ rcar_dmac_chan_prep_sg(struct rcar_dmac_ > > hwdesc->size = size; > > > > dev_dbg(chan->chan.device->dev, > > - "chan%u: hwdesc %p/%p sgl %u@%p, %u/%u %pad -> %pad\n", > > + "chan%u: hwdesc %p/%p sgl %u@%p, %zu/%zu %pad -> %pad\n", > > chan->index, hwdesc, desc, i, sg, size, len, > > &hwdesc->src_addr, &hwdesc->dst_addr);
[Replying again using an HTML-free mail client] On Mon, Jul 28, 2014 at 01:20:59PM +0200, Laurent Pinchart wrote: > On Saturday 26 July 2014 21:19:30 Vinod Koul wrote: > > On Fri, Jul 25, 2014 at 10:02:39AM -0700, Randy Dunlap wrote: > > > From: Randy Dunlap <rdunlap@infradead.org> > > > > > > Fix printk format warnings by using size_t modifiers ('z'): > > > > > > ../drivers/dma/sh/rcar-dmac.c:759:4: warning: format '%u' expects argument > > > of type 'unsigned int', but argument 9 has type 'size_t' [-Wformat=] > > > ../drivers/dma/sh/rcar-dmac.c:759:4: warning: format '%u' expects > > > argument of type 'unsigned int', but argument 10 has type 'size_t' > > > [-Wformat=] > > > > This is not present in dmaengine trees. Simon is this in your tree? > > The patch applies to a new driver under development that Simon took in his > tree. From what he told me he plans to send a pull request soon. > > > > Signed-off-by: Randy Dunlap <rdunlap@infradead.org> > > > Cc: Laurent Pinchart <laurent.pinchart@ideasonboard.com> > > > Cc: Dan Williams <dan.j.williams@intel.com> > > > Cc: dmaengine@vger.kernel.org > > Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> > > Simon, should I submit a new version that incorporates this change, or do you > want to include it in your pull request directly (possibly squashing it in the > original commit) ? Hi Laurent, sorry for any confusion that I may have caused. I will see about squashing this change into the original commit. > > > --- > > > > > > drivers/dma/sh/rcar-dmac.c | 2 +- > > > 1 file changed, 1 insertion(+), 1 deletion(-) > > > > > > Index: linux-next-20140725/drivers/dma/sh/rcar-dmac.c > > > =================================================================== > > > --- linux-next-20140725.orig/drivers/dma/sh/rcar-dmac.c > > > +++ linux-next-20140725/drivers/dma/sh/rcar-dmac.c > > > @@ -757,7 +757,7 @@ rcar_dmac_chan_prep_sg(struct rcar_dmac_ > > > hwdesc->size = size; > > > > > > dev_dbg(chan->chan.device->dev, > > > - "chan%u: hwdesc %p/%p sgl %u@%p, %u/%u %pad -> %pad\n", > > > + "chan%u: hwdesc %p/%p sgl %u@%p, %zu/%zu %pad -> %pad\n", > > > chan->index, hwdesc, desc, i, sg, size, len, > > > &hwdesc->src_addr, &hwdesc->dst_addr); > > -- > Regards, > > Laurent Pinchart > -- To unsubscribe from this list: send the line "unsubscribe dmaengine" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Mon, Jul 28, 2014 at 08:31:07PM +0900, Simon Horman wrote: > [Replying again using an HTML-free mail client] > > On Mon, Jul 28, 2014 at 01:20:59PM +0200, Laurent Pinchart wrote: > > On Saturday 26 July 2014 21:19:30 Vinod Koul wrote: > > > On Fri, Jul 25, 2014 at 10:02:39AM -0700, Randy Dunlap wrote: > > > > From: Randy Dunlap <rdunlap@infradead.org> > > > > > > > > Fix printk format warnings by using size_t modifiers ('z'): > > > > > > > > ../drivers/dma/sh/rcar-dmac.c:759:4: warning: format '%u' expects argument > > > > of type 'unsigned int', but argument 9 has type 'size_t' [-Wformat=] > > > > ../drivers/dma/sh/rcar-dmac.c:759:4: warning: format '%u' expects > > > > argument of type 'unsigned int', but argument 10 has type 'size_t' > > > > [-Wformat=] > > > > > > This is not present in dmaengine trees. Simon is this in your tree? > > > > The patch applies to a new driver under development that Simon took in his > > tree. From what he told me he plans to send a pull request soon. > > > > > > Signed-off-by: Randy Dunlap <rdunlap@infradead.org> > > > > Cc: Laurent Pinchart <laurent.pinchart@ideasonboard.com> > > > > Cc: Dan Williams <dan.j.williams@intel.com> > > > > Cc: dmaengine@vger.kernel.org > > > > Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> > > > > Simon, should I submit a new version that incorporates this change, or do you > > want to include it in your pull request directly (possibly squashing it in the > > original commit) ? > > Hi Laurent, > > sorry for any confusion that I may have caused. > I will see about squashing this change into the original commit. On second thoughts I decided to commit this patch on top of my branch in order to correctly credit Randy. > > > > --- > > > > > > > > drivers/dma/sh/rcar-dmac.c | 2 +- > > > > 1 file changed, 1 insertion(+), 1 deletion(-) > > > > > > > > Index: linux-next-20140725/drivers/dma/sh/rcar-dmac.c > > > > =================================================================== > > > > --- linux-next-20140725.orig/drivers/dma/sh/rcar-dmac.c > > > > +++ linux-next-20140725/drivers/dma/sh/rcar-dmac.c > > > > @@ -757,7 +757,7 @@ rcar_dmac_chan_prep_sg(struct rcar_dmac_ > > > > hwdesc->size = size; > > > > > > > > dev_dbg(chan->chan.device->dev, > > > > - "chan%u: hwdesc %p/%p sgl %u@%p, %u/%u %pad -> %pad\n", > > > > + "chan%u: hwdesc %p/%p sgl %u@%p, %zu/%zu %pad -> %pad\n", > > > > chan->index, hwdesc, desc, i, sg, size, len, > > > > &hwdesc->src_addr, &hwdesc->dst_addr); > > > > -- > > Regards, > > > > Laurent Pinchart > > -- To unsubscribe from this list: send the line "unsubscribe dmaengine" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Index: linux-next-20140725/drivers/dma/sh/rcar-dmac.c =================================================================== --- linux-next-20140725.orig/drivers/dma/sh/rcar-dmac.c +++ linux-next-20140725/drivers/dma/sh/rcar-dmac.c @@ -757,7 +757,7 @@ rcar_dmac_chan_prep_sg(struct rcar_dmac_ hwdesc->size = size; dev_dbg(chan->chan.device->dev, - "chan%u: hwdesc %p/%p sgl %u@%p, %u/%u %pad -> %pad\n", + "chan%u: hwdesc %p/%p sgl %u@%p, %zu/%zu %pad -> %pad\n", chan->index, hwdesc, desc, i, sg, size, len, &hwdesc->src_addr, &hwdesc->dst_addr);