[PATCH 0/5] Do not use 0x in front of %pa[pd]

[PATCH 0/5] Do not use 0x in front of %pa[pd]

[Dmitry V. Krivenok]

Do not use "0x" in front of %pa, %pap and %pad to avoid
duplicate "0x" in the output.

The changes were split per driver as suggested by
Andy Shevchenko.

Dmitry V. Krivenok (5):
  dma: do not use 0x in front of %pad
  i2c: do not use 0x in front of %pa
  nd: do not use 0x in front of %pa
  of: do not use 0x in front of %pa
  pci: do not use 0x in front of %pap

 drivers/dma/at_hdmac_regs.h   | 2 +-
 drivers/i2c/busses/i2c-st.c   | 2 +-
 drivers/nvdimm/pmem.c         | 2 +-
 drivers/of/fdt.c              | 2 +-
 drivers/pci/host/pcie-iproc.c | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

-- 
2.6.2

[PATCH 1/5] dma: do not use 0x in front of %pad

[Dmitry V. Krivenok]

Signed-off-by: Dmitry V. Krivenok <krivenok.dmitry@gmail.com>
---
 drivers/dma/at_hdmac_regs.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/dma/at_hdmac_regs.h b/drivers/dma/at_hdmac_regs.h
index 7f58f06..0474e4a 100644
--- a/drivers/dma/at_hdmac_regs.h
+++ b/drivers/dma/at_hdmac_regs.h
@@ -385,7 +385,7 @@ static void vdbg_dump_regs(struct at_dma_chan *atchan) {}
 static void atc_dump_lli(struct at_dma_chan *atchan, struct at_lli *lli)
 {
 	dev_crit(chan2dev(&atchan->chan_common),
-		 "  desc: s%pad d%pad ctrl0x%x:0x%x l0x%pad\n",
+		 "  desc: s%pad d%pad ctrl0x%x:0x%x l%pad\n",
 		 &lli->saddr, &lli->daddr,
 		 lli->ctrla, lli->ctrlb, &lli->dscr);
 }
-- 
2.6.2

Re: [PATCH 1/5] dma: do not use 0x in front of %pad

[Nicolas Ferre]

Le 30/11/2015 21:45, Dmitry V. Krivenok a écrit :
> Signed-off-by: Dmitry V. Krivenok <krivenok.dmitry@gmail.com>

Acked-by: Nicolas Ferre <nicolas.ferre@atmel.com>

> ---
>  drivers/dma/at_hdmac_regs.h | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/drivers/dma/at_hdmac_regs.h b/drivers/dma/at_hdmac_regs.h
> index 7f58f06..0474e4a 100644
> --- a/drivers/dma/at_hdmac_regs.h
> +++ b/drivers/dma/at_hdmac_regs.h
> @@ -385,7 +385,7 @@ static void vdbg_dump_regs(struct at_dma_chan *atchan) {}
>  static void atc_dump_lli(struct at_dma_chan *atchan, struct at_lli *lli)
>  {
>  	dev_crit(chan2dev(&atchan->chan_common),
> -		 "  desc: s%pad d%pad ctrl0x%x:0x%x l0x%pad\n",
> +		 "  desc: s%pad d%pad ctrl0x%x:0x%x l%pad\n",
>  		 &lli->saddr, &lli->daddr,
>  		 lli->ctrla, lli->ctrlb, &lli->dscr);
>  }
> 


-- 
Nicolas Ferre

Re: [PATCH 1/5] dma: do not use 0x in front of %pad

[Thierry Reding]

[-- Attachment #1: Type: text/plain, Size: 1784 bytes --]

On Tue, Dec 01, 2015 at 10:01:52AM +0100, Nicolas Ferre wrote:
> Le 30/11/2015 21:45, Dmitry V. Krivenok a écrit :
> > Signed-off-by: Dmitry V. Krivenok <krivenok.dmitry@gmail.com>
> 
> Acked-by: Nicolas Ferre <nicolas.ferre@atmel.com>
> 
> > ---
> >  drivers/dma/at_hdmac_regs.h | 2 +-
> >  1 file changed, 1 insertion(+), 1 deletion(-)
> > 
> > diff --git a/drivers/dma/at_hdmac_regs.h b/drivers/dma/at_hdmac_regs.h
> > index 7f58f06..0474e4a 100644
> > --- a/drivers/dma/at_hdmac_regs.h
> > +++ b/drivers/dma/at_hdmac_regs.h
> > @@ -385,7 +385,7 @@ static void vdbg_dump_regs(struct at_dma_chan *atchan) {}
> >  static void atc_dump_lli(struct at_dma_chan *atchan, struct at_lli *lli)
> >  {
> >  	dev_crit(chan2dev(&atchan->chan_common),
> > -		 "  desc: s%pad d%pad ctrl0x%x:0x%x l0x%pad\n",
> > +		 "  desc: s%pad d%pad ctrl0x%x:0x%x l%pad\n",
> >  		 &lli->saddr, &lli->daddr,
> >  		 lli->ctrla, lli->ctrlb, &lli->dscr);

Hi Vinod,

I think this ended up being misapplied, possibly because the patch
doesn't seem to have been based on something upstream. I got build
warnings during sanity builds of linux-next today and applied this
patch to fix them. Feel free to squash it into the original patch.

Thierry

--->8---
diff --git a/drivers/dma/at_hdmac_regs.h b/drivers/dma/at_hdmac_regs.h
index 610907dbc11a..0474e4a0f02a 100644
--- a/drivers/dma/at_hdmac_regs.h
+++ b/drivers/dma/at_hdmac_regs.h
@@ -386,8 +386,8 @@ static void atc_dump_lli(struct at_dma_chan *atchan, struct at_lli *lli)
 {
 	dev_crit(chan2dev(&atchan->chan_common),
 		 "  desc: s%pad d%pad ctrl0x%x:0x%x l%pad\n",
-		 lli->saddr, lli->daddr,
-		 lli->ctrla, lli->ctrlb, lli->dscr);
+		 &lli->saddr, &lli->daddr,
+		 lli->ctrla, lli->ctrlb, &lli->dscr);
 }

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 819 bytes --]

Re: [PATCH 1/5] dma: do not use 0x in front of %pad

[Vinod Koul]

[-- Attachment #1: Type: text/plain, Size: 2029 bytes --]

On Tue, Dec 08, 2015 at 03:48:39PM +0100, Thierry Reding wrote:
> On Tue, Dec 01, 2015 at 10:01:52AM +0100, Nicolas Ferre wrote:
> > Le 30/11/2015 21:45, Dmitry V. Krivenok a écrit :
> > > Signed-off-by: Dmitry V. Krivenok <krivenok.dmitry@gmail.com>
> > 
> > Acked-by: Nicolas Ferre <nicolas.ferre@atmel.com>
> > 
> > > ---
> > >  drivers/dma/at_hdmac_regs.h | 2 +-
> > >  1 file changed, 1 insertion(+), 1 deletion(-)
> > > 
> > > diff --git a/drivers/dma/at_hdmac_regs.h b/drivers/dma/at_hdmac_regs.h
> > > index 7f58f06..0474e4a 100644
> > > --- a/drivers/dma/at_hdmac_regs.h
> > > +++ b/drivers/dma/at_hdmac_regs.h
> > > @@ -385,7 +385,7 @@ static void vdbg_dump_regs(struct at_dma_chan *atchan) {}
> > >  static void atc_dump_lli(struct at_dma_chan *atchan, struct at_lli *lli)
> > >  {
> > >  	dev_crit(chan2dev(&atchan->chan_common),
> > > -		 "  desc: s%pad d%pad ctrl0x%x:0x%x l0x%pad\n",
> > > +		 "  desc: s%pad d%pad ctrl0x%x:0x%x l%pad\n",
> > >  		 &lli->saddr, &lli->daddr,
> > >  		 lli->ctrla, lli->ctrlb, &lli->dscr);
> 
> Hi Vinod,
> 
> I think this ended up being misapplied, possibly because the patch
> doesn't seem to have been based on something upstream. I got build
> warnings during sanity builds of linux-next today and applied this
> patch to fix them. Feel free to squash it into the original patch.

I have dropped that one and pushed updated tree few moments back !

-- 
~Vinod

> 
> Thierry
> 
> --->8---
> diff --git a/drivers/dma/at_hdmac_regs.h b/drivers/dma/at_hdmac_regs.h
> index 610907dbc11a..0474e4a0f02a 100644
> --- a/drivers/dma/at_hdmac_regs.h
> +++ b/drivers/dma/at_hdmac_regs.h
> @@ -386,8 +386,8 @@ static void atc_dump_lli(struct at_dma_chan *atchan, struct at_lli *lli)
>  {
>  	dev_crit(chan2dev(&atchan->chan_common),
>  		 "  desc: s%pad d%pad ctrl0x%x:0x%x l%pad\n",
> -		 lli->saddr, lli->daddr,
> -		 lli->ctrla, lli->ctrlb, lli->dscr);
> +		 &lli->saddr, &lli->daddr,
> +		 lli->ctrla, lli->ctrlb, &lli->dscr);
>  }


[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]

Re: [PATCH 1/5] dma: do not use 0x in front of %pad

[Vinod Koul]

On Mon, Nov 30, 2015 at 11:45:45PM +0300, Dmitry V. Krivenok wrote:

Applied, after fixing susystem name

-- 
~Vinod

[PATCH 2/5] i2c: do not use 0x in front of %pa

[Dmitry V. Krivenok]

Signed-off-by: Dmitry V. Krivenok <krivenok.dmitry@gmail.com>
---
 drivers/i2c/busses/i2c-st.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/i2c/busses/i2c-st.c b/drivers/i2c/busses/i2c-st.c
index ea72dca..25020ec 100644
--- a/drivers/i2c/busses/i2c-st.c
+++ b/drivers/i2c/busses/i2c-st.c
@@ -822,7 +822,7 @@ static int st_i2c_probe(struct platform_device *pdev)
 
 	adap = &i2c_dev->adap;
 	i2c_set_adapdata(adap, i2c_dev);
-	snprintf(adap->name, sizeof(adap->name), "ST I2C(0x%pa)", &res->start);
+	snprintf(adap->name, sizeof(adap->name), "ST I2C(%pa)", &res->start);
 	adap->owner = THIS_MODULE;
 	adap->timeout = 2 * HZ;
 	adap->retries = 0;
-- 
2.6.2

Re: [PATCH 2/5] i2c: do not use 0x in front of %pa

[Wolfram Sang]

[-- Attachment #1: Type: text/plain, Size: 214 bytes --]

On Mon, Nov 30, 2015 at 11:45:46PM +0300, Dmitry V. Krivenok wrote:
> Signed-off-by: Dmitry V. Krivenok <krivenok.dmitry@gmail.com>

Applied to for-current, thanks! Please make sure to add the i2c-list
next time.


[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]

[PATCH 3/5] nd: do not use 0x in front of %pa

[Dmitry V. Krivenok]

Signed-off-by: Dmitry V. Krivenok <krivenok.dmitry@gmail.com>
---
 drivers/nvdimm/pmem.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/nvdimm/pmem.c b/drivers/nvdimm/pmem.c
index 8ee7989..93396f4 100644
--- a/drivers/nvdimm/pmem.c
+++ b/drivers/nvdimm/pmem.c
@@ -135,7 +135,7 @@ static struct pmem_device *pmem_alloc(struct device *dev,
 
 	if (!devm_request_mem_region(dev, pmem->phys_addr, pmem->size,
 			dev_name(dev))) {
-		dev_warn(dev, "could not reserve region [0x%pa:0x%zx]\n",
+		dev_warn(dev, "could not reserve region [%pa:0x%zx]\n",
 				&pmem->phys_addr, pmem->size);
 		return ERR_PTR(-EBUSY);
 	}
-- 
2.6.2

Re: [PATCH 3/5] nd: do not use 0x in front of %pa

[Dan Williams]

On Mon, Nov 30, 2015 at 12:45 PM, Dmitry V. Krivenok
<krivenok.dmitry@gmail.com> wrote:
> Signed-off-by: Dmitry V. Krivenok <krivenok.dmitry@gmail.com>
> ---
>  drivers/nvdimm/pmem.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/nvdimm/pmem.c b/drivers/nvdimm/pmem.c
> index 8ee7989..93396f4 100644
> --- a/drivers/nvdimm/pmem.c
> +++ b/drivers/nvdimm/pmem.c
> @@ -135,7 +135,7 @@ static struct pmem_device *pmem_alloc(struct device *dev,
>
>         if (!devm_request_mem_region(dev, pmem->phys_addr, pmem->size,
>                         dev_name(dev))) {
> -               dev_warn(dev, "could not reserve region [0x%pa:0x%zx]\n",
> +               dev_warn(dev, "could not reserve region [%pa:0x%zx]\n",
>                                 &pmem->phys_addr, pmem->size);
>                 return ERR_PTR(-EBUSY);

Acked-by: Dan Williams <dan.j.williams@intel.com>

[PATCH 4/5] of: do not use 0x in front of %pa

[Dmitry V. Krivenok]

Signed-off-by: Dmitry V. Krivenok <krivenok.dmitry@gmail.com>
---
 drivers/of/fdt.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/of/fdt.c b/drivers/of/fdt.c
index d243029..1bbe3a9 100644
--- a/drivers/of/fdt.c
+++ b/drivers/of/fdt.c
@@ -1041,7 +1041,7 @@ void __init __weak early_init_dt_add_memory_arch(u64 base, u64 size)
 int __init __weak early_init_dt_reserve_memory_arch(phys_addr_t base,
 					phys_addr_t size, bool nomap)
 {
-	pr_err("Reserved memory not supported, ignoring range 0x%pa - 0x%pa%s\n",
+	pr_err("Reserved memory not supported, ignoring range %pa - %pa%s\n",
 		  &base, &size, nomap ? " (nomap)" : "");
 	return -ENOSYS;
 }
-- 
2.6.2

Re: [PATCH 4/5] of: do not use 0x in front of %pa

[Rob Herring]

On Mon, Nov 30, 2015 at 2:45 PM, Dmitry V. Krivenok
<krivenok.dmitry@gmail.com> wrote:
> Signed-off-by: Dmitry V. Krivenok <krivenok.dmitry@gmail.com>

Applied, thanks.

> ---
>  drivers/of/fdt.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/of/fdt.c b/drivers/of/fdt.c
> index d243029..1bbe3a9 100644
> --- a/drivers/of/fdt.c
> +++ b/drivers/of/fdt.c
> @@ -1041,7 +1041,7 @@ void __init __weak early_init_dt_add_memory_arch(u64 base, u64 size)
>  int __init __weak early_init_dt_reserve_memory_arch(phys_addr_t base,
>                                         phys_addr_t size, bool nomap)
>  {
> -       pr_err("Reserved memory not supported, ignoring range 0x%pa - 0x%pa%s\n",
> +       pr_err("Reserved memory not supported, ignoring range %pa - %pa%s\n",
>                   &base, &size, nomap ? " (nomap)" : "");
>         return -ENOSYS;
>  }
> --
> 2.6.2
>

[PATCH 5/5] pci: do not use 0x in front of %pap

[Dmitry V. Krivenok]

Signed-off-by: Dmitry V. Krivenok <krivenok.dmitry@gmail.com>
---
 drivers/pci/host/pcie-iproc.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/pci/host/pcie-iproc.c b/drivers/pci/host/pcie-iproc.c
index eac719a..d1ad883 100644
--- a/drivers/pci/host/pcie-iproc.c
+++ b/drivers/pci/host/pcie-iproc.c
@@ -245,7 +245,7 @@ static int iproc_pcie_setup_ob(struct iproc_pcie *pcie, u64 axi_addr,
 
 	if (size > max_size) {
 		dev_err(pcie->dev,
-			"res size 0x%pap exceeds max supported size 0x%llx\n",
+			"res size %pap exceeds max supported size 0x%llx\n",
 			&size, max_size);
 		return -EINVAL;
 	}
-- 
2.6.2

Re: [PATCH 5/5] pci: do not use 0x in front of %pap

[Ray Jui]

On 11/30/2015 12:45 PM, Dmitry V. Krivenok wrote:
> Signed-off-by: Dmitry V. Krivenok <krivenok.dmitry@gmail.com>
> ---
>   drivers/pci/host/pcie-iproc.c | 2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/pci/host/pcie-iproc.c b/drivers/pci/host/pcie-iproc.c
> index eac719a..d1ad883 100644
> --- a/drivers/pci/host/pcie-iproc.c
> +++ b/drivers/pci/host/pcie-iproc.c
> @@ -245,7 +245,7 @@ static int iproc_pcie_setup_ob(struct iproc_pcie *pcie, u64 axi_addr,
>
>   	if (size > max_size) {
>   		dev_err(pcie->dev,
> -			"res size 0x%pap exceeds max supported size 0x%llx\n",
> +			"res size %pap exceeds max supported size 0x%llx\n",
>   			&size, max_size);
>   		return -EINVAL;
>   	}
>

This change looks good to me.

Acked-by: Ray Jui <rjui@broadcom.com>

Thanks,

Ray

Re: [PATCH 5/5] pci: do not use 0x in front of %pap

[Bjorn Helgaas]

On Mon, Nov 30, 2015 at 11:45:49PM +0300, Dmitry V. Krivenok wrote:
> Signed-off-by: Dmitry V. Krivenok <krivenok.dmitry@gmail.com>

Applied with Ray's ack to pci/host-iproc for v4.5, thanks, Dmitry!

> ---
>  drivers/pci/host/pcie-iproc.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/drivers/pci/host/pcie-iproc.c b/drivers/pci/host/pcie-iproc.c
> index eac719a..d1ad883 100644
> --- a/drivers/pci/host/pcie-iproc.c
> +++ b/drivers/pci/host/pcie-iproc.c
> @@ -245,7 +245,7 @@ static int iproc_pcie_setup_ob(struct iproc_pcie *pcie, u64 axi_addr,
>  
>  	if (size > max_size) {
>  		dev_err(pcie->dev,
> -			"res size 0x%pap exceeds max supported size 0x%llx\n",
> +			"res size %pap exceeds max supported size 0x%llx\n",
>  			&size, max_size);
>  		return -EINVAL;
>  	}
> -- 
> 2.6.2
> 
> --
> To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
> Please read the FAQ at  http://www.tux.org/lkml/