diff mbox

pcie-rcar: kill duplicate checks

Message ID 201406271859.13626.sergei.shtylyov@cogentembedded.com (mailing list archive)
State New, archived
Delegated to: Bjorn Helgaas
Headers show

Commit Message

Sergei Shtylyov June 27, 2014, 2:59 p.m. UTC 
The PCI core will have already checked the configuration register address before
calling the {read|write}() methods, no need to check it again in these methods.

Signed-off-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>

---
The patch is against the 'next' branch of Bjorn Helgaas' 'pci.git' repo.

 drivers/pci/host/pcie-rcar.c |   10 ----------
 1 file changed, 10 deletions(-)

--
To unsubscribe from this list: send the line "unsubscribe linux-pci" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Comments

Phil Edworthy June 27, 2014, 4:31 p.m. UTC | #1 
Acked-by: Phil Edworthy <phil.edworthy@renesas.com>

Thanks
Phil

On 27 June 2014 15:59, Sergei wrote:
> The PCI core will have already checked the configuration register address
> before
> calling the {read|write}() methods, no need to check it again in these
> methods.
> 
> Signed-off-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
> 
> ---
> The patch is against the 'next' branch of Bjorn Helgaas' 'pci.git' repo.
> 
>  drivers/pci/host/pcie-rcar.c |   10 ----------
>  1 file changed, 10 deletions(-)
> 
> Index: pci/drivers/pci/host/pcie-rcar.c
> ==========================================================
> =========
> --- pci.orig/drivers/pci/host/pcie-rcar.c
> +++ pci/drivers/pci/host/pcie-rcar.c
> @@ -260,11 +260,6 @@ static int rcar_pcie_read_conf(struct pc
>  	struct rcar_pcie *pcie = sys_to_pcie(bus->sysdata);
>  	int ret;
> 
> -	if ((size == 2) && (where & 1))
> -		return PCIBIOS_BAD_REGISTER_NUMBER;
> -	else if ((size == 4) && (where & 3))
> -		return PCIBIOS_BAD_REGISTER_NUMBER;
> -
>  	ret = rcar_pcie_config_access(pcie, PCI_ACCESS_READ,
>  				      bus, devfn, where, val);
>  	if (ret != PCIBIOS_SUCCESSFUL) {
> @@ -291,11 +286,6 @@ static int rcar_pcie_write_conf(struct p
>  	int shift, ret;
>  	u32 data;
> 
> -	if ((size == 2) && (where & 1))
> -		return PCIBIOS_BAD_REGISTER_NUMBER;
> -	else if ((size == 4) && (where & 3))
> -		return PCIBIOS_BAD_REGISTER_NUMBER;
> -
>  	ret = rcar_pcie_config_access(pcie, PCI_ACCESS_READ,
>  				      bus, devfn, where, &data);
>  	if (ret != PCIBIOS_SUCCESSFUL)
--
To unsubscribe from this list: send the line "unsubscribe linux-pci" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Simon Horman June 28, 2014, 12:06 a.m. UTC | #2 
On Fri, Jun 27, 2014 at 04:31:49PM +0000, Phil Edworthy wrote:
> > The PCI core will have already checked the configuration register address
> > before
> > calling the {read|write}() methods, no need to check it again in these
> > methods.
> > 
> > Signed-off-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
>
> Acked-by: Phil Edworthy <phil.edworthy@renesas.com>


Acked-by: Simon Horman <horms+renesas@verge.net.au>

> 
> On 27 June 2014 15:59, Sergei wrote:
> > 
> > ---
> > The patch is against the 'next' branch of Bjorn Helgaas' 'pci.git' repo.
> > 
> >  drivers/pci/host/pcie-rcar.c |   10 ----------
> >  1 file changed, 10 deletions(-)
> > 
> > Index: pci/drivers/pci/host/pcie-rcar.c
> > ==========================================================
> > =========
> > --- pci.orig/drivers/pci/host/pcie-rcar.c
> > +++ pci/drivers/pci/host/pcie-rcar.c
> > @@ -260,11 +260,6 @@ static int rcar_pcie_read_conf(struct pc
> >  	struct rcar_pcie *pcie = sys_to_pcie(bus->sysdata);
> >  	int ret;
> > 
> > -	if ((size == 2) && (where & 1))
> > -		return PCIBIOS_BAD_REGISTER_NUMBER;
> > -	else if ((size == 4) && (where & 3))
> > -		return PCIBIOS_BAD_REGISTER_NUMBER;
> > -
> >  	ret = rcar_pcie_config_access(pcie, PCI_ACCESS_READ,
> >  				      bus, devfn, where, val);
> >  	if (ret != PCIBIOS_SUCCESSFUL) {
> > @@ -291,11 +286,6 @@ static int rcar_pcie_write_conf(struct p
> >  	int shift, ret;
> >  	u32 data;
> > 
> > -	if ((size == 2) && (where & 1))
> > -		return PCIBIOS_BAD_REGISTER_NUMBER;
> > -	else if ((size == 4) && (where & 3))
> > -		return PCIBIOS_BAD_REGISTER_NUMBER;
> > -
> >  	ret = rcar_pcie_config_access(pcie, PCI_ACCESS_READ,
> >  				      bus, devfn, where, &data);
> >  	if (ret != PCIBIOS_SUCCESSFUL)
> 
--
To unsubscribe from this list: send the line "unsubscribe linux-pci" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Bjorn Helgaas July 5, 2014, 5:47 p.m. UTC | #3 
On Fri, Jun 27, 2014 at 06:59:13PM +0400, Sergei Shtylyov wrote:
> The PCI core will have already checked the configuration register address before
> calling the {read|write}() methods, no need to check it again in these methods.
> 
> Signed-off-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>

Applied with Phil and Simon's acks to pci/host-rcar for v3.17, thanks!

> ---
> The patch is against the 'next' branch of Bjorn Helgaas' 'pci.git' repo.
> 
>  drivers/pci/host/pcie-rcar.c |   10 ----------
>  1 file changed, 10 deletions(-)
> 
> Index: pci/drivers/pci/host/pcie-rcar.c
> ===================================================================
> --- pci.orig/drivers/pci/host/pcie-rcar.c
> +++ pci/drivers/pci/host/pcie-rcar.c
> @@ -260,11 +260,6 @@ static int rcar_pcie_read_conf(struct pc
>  	struct rcar_pcie *pcie = sys_to_pcie(bus->sysdata);
>  	int ret;
>  
> -	if ((size == 2) && (where & 1))
> -		return PCIBIOS_BAD_REGISTER_NUMBER;
> -	else if ((size == 4) && (where & 3))
> -		return PCIBIOS_BAD_REGISTER_NUMBER;
> -
>  	ret = rcar_pcie_config_access(pcie, PCI_ACCESS_READ,
>  				      bus, devfn, where, val);
>  	if (ret != PCIBIOS_SUCCESSFUL) {
> @@ -291,11 +286,6 @@ static int rcar_pcie_write_conf(struct p
>  	int shift, ret;
>  	u32 data;
>  
> -	if ((size == 2) && (where & 1))
> -		return PCIBIOS_BAD_REGISTER_NUMBER;
> -	else if ((size == 4) && (where & 3))
> -		return PCIBIOS_BAD_REGISTER_NUMBER;
> -
>  	ret = rcar_pcie_config_access(pcie, PCI_ACCESS_READ,
>  				      bus, devfn, where, &data);
>  	if (ret != PCIBIOS_SUCCESSFUL)
--
To unsubscribe from this list: send the line "unsubscribe linux-pci" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
diff mbox

Patch

Index: pci/drivers/pci/host/pcie-rcar.c
===================================================================
--- pci.orig/drivers/pci/host/pcie-rcar.c
+++ pci/drivers/pci/host/pcie-rcar.c
@@ -260,11 +260,6 @@  static int rcar_pcie_read_conf(struct pc
 	struct rcar_pcie *pcie = sys_to_pcie(bus->sysdata);
 	int ret;
 
-	if ((size == 2) && (where & 1))
-		return PCIBIOS_BAD_REGISTER_NUMBER;
-	else if ((size == 4) && (where & 3))
-		return PCIBIOS_BAD_REGISTER_NUMBER;
-
 	ret = rcar_pcie_config_access(pcie, PCI_ACCESS_READ,
 				      bus, devfn, where, val);
 	if (ret != PCIBIOS_SUCCESSFUL) {
@@ -291,11 +286,6 @@  static int rcar_pcie_write_conf(struct p
 	int shift, ret;
 	u32 data;
 
-	if ((size == 2) && (where & 1))
-		return PCIBIOS_BAD_REGISTER_NUMBER;
-	else if ((size == 4) && (where & 3))
-		return PCIBIOS_BAD_REGISTER_NUMBER;
-
 	ret = rcar_pcie_config_access(pcie, PCI_ACCESS_READ,
 				      bus, devfn, where, &data);
 	if (ret != PCIBIOS_SUCCESSFUL)