From: Simon Horman <horms@verge.net.au>
To: marek.vasut@gmail.com
Cc: linux-pci@vger.kernel.org,
Marek Vasut <marek.vasut+renesas@gmail.com>,
Geert Uytterhoeven <geert+renesas@glider.be>,
Phil Edworthy <phil.edworthy@renesas.com>,
Wolfram Sang <wsa@the-dreams.de>,
linux-renesas-soc@vger.kernel.org,
Wolfram Sang <wsa+renesas@sang-engineering.com>
Subject: Re: [PATCH V4 4/6] PCI: rcar: Replace (8 * n) with (BITS_PER_BYTE * n)
Date: Wed, 27 Mar 2019 12:26:32 +0100 [thread overview]
Message-ID: <20190327112632.k37jp5brnox3esui@verge.net.au> (raw)
In-Reply-To: <20190325114101.10198-4-marek.vasut@gmail.com>
On Mon, Mar 25, 2019 at 12:40:59PM +0100, marek.vasut@gmail.com wrote:
> From: Marek Vasut <marek.vasut+renesas@gmail.com>
>
> Replace (8 * n) with (BITS_PER_BYTE * n) to make bit shift operations
> consistent. No functional change.
>
> Signed-off-by: Marek Vasut <marek.vasut+renesas@gmail.com>
> Cc: Geert Uytterhoeven <geert+renesas@glider.be>
> Cc: Phil Edworthy <phil.edworthy@renesas.com>
> Cc: Simon Horman <horms+renesas@verge.net.au>
> Cc: Wolfram Sang <wsa@the-dreams.de>
> Cc: linux-renesas-soc@vger.kernel.org
> To: linux-pci@vger.kernel.org
> Reviewed-by: Wolfram Sang <wsa+renesas@sang-engineering.com>
Reviewed-by: Simon Horman <horms+renesas@verge.net.au>
> ---
> V2: Bundle this patch with other cleanups before resending
> V3: Add Wolfram's R-B
> V4: Change the patch from n << 3 to BITS_PER_BYTE * n
> ---
> drivers/pci/controller/pcie-rcar.c | 12 ++++++------
> 1 file changed, 6 insertions(+), 6 deletions(-)
>
> diff --git a/drivers/pci/controller/pcie-rcar.c b/drivers/pci/controller/pcie-rcar.c
> index 6699211fdc9a..96210768e774 100644
> --- a/drivers/pci/controller/pcie-rcar.c
> +++ b/drivers/pci/controller/pcie-rcar.c
> @@ -170,7 +170,7 @@ enum {
>
> static void rcar_rmw32(struct rcar_pcie *pcie, int where, u32 mask, u32 data)
> {
> - unsigned int shift = 8 * (where & 3);
> + unsigned int shift = BITS_PER_BYTE * (where & 3);
> u32 val = rcar_pci_read_reg(pcie, where & ~3);
>
> val &= ~(mask << shift);
> @@ -180,7 +180,7 @@ static void rcar_rmw32(struct rcar_pcie *pcie, int where, u32 mask, u32 data)
>
> static u32 rcar_read_conf(struct rcar_pcie *pcie, int where)
> {
> - unsigned int shift = 8 * (where & 3);
> + unsigned int shift = BITS_PER_BYTE * (where & 3);
> u32 val = rcar_pci_read_reg(pcie, where & ~3);
>
> return val >> shift;
> @@ -280,9 +280,9 @@ static int rcar_pcie_read_conf(struct pci_bus *bus, unsigned int devfn,
> }
>
> if (size == 1)
> - *val = (*val >> (8 * (where & 3))) & 0xff;
> + *val = (*val >> (BITS_PER_BYTE * (where & 3))) & 0xff;
> else if (size == 2)
> - *val = (*val >> (8 * (where & 2))) & 0xffff;
> + *val = (*val >> (BITS_PER_BYTE * (where & 2))) & 0xffff;
>
> dev_dbg(&bus->dev, "pcie-config-read: bus=%3d devfn=0x%04x where=0x%04x size=%d val=0x%08lx\n",
> bus->number, devfn, where, size, (unsigned long)*val);
> @@ -308,11 +308,11 @@ static int rcar_pcie_write_conf(struct pci_bus *bus, unsigned int devfn,
> bus->number, devfn, where, size, (unsigned long)val);
>
> if (size == 1) {
> - shift = 8 * (where & 3);
> + shift = BITS_PER_BYTE * (where & 3);
> data &= ~(0xff << shift);
> data |= ((val & 0xff) << shift);
> } else if (size == 2) {
> - shift = 8 * (where & 2);
> + shift = BITS_PER_BYTE * (where & 2);
> data &= ~(0xffff << shift);
> data |= ((val & 0xffff) << shift);
> } else
> --
> 2.20.1
>
next prev parent reply other threads:[~2019-03-27 11:26 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-03-25 11:40 [PATCH V4 1/6] PCI: rcar: Clean up remaining macros defining bits marek.vasut
2019-03-25 11:40 ` [PATCH V4 2/6] PCI: rcar: Replace unsigned long with u32/unsigned int in register accessors marek.vasut
2019-03-27 11:24 ` Simon Horman
2019-03-25 11:40 ` [PATCH V4 3/6] PCI: rcar: Replace various variable types with unsigned ones for register values marek.vasut
2019-03-27 11:25 ` Simon Horman
2019-03-25 11:40 ` [PATCH V4 4/6] PCI: rcar: Replace (8 * n) with (BITS_PER_BYTE * n) marek.vasut
2019-03-25 11:45 ` Geert Uytterhoeven
2019-03-27 11:26 ` Simon Horman [this message]
2019-03-25 11:41 ` [PATCH V4 5/6] PCI: rcar: Clean up debug messages marek.vasut
2019-03-27 11:27 ` Simon Horman
2019-03-25 11:41 ` [PATCH V4 6/6] PCI: rcar: Fix 64bit MSI message address handling marek.vasut
2019-03-27 11:30 ` Simon Horman
2019-03-27 12:22 ` Geert Uytterhoeven
2019-03-28 3:03 ` Marek Vasut
2019-03-28 8:02 ` Geert Uytterhoeven
2019-03-28 16:28 ` Lorenzo Pieralisi
2019-03-28 16:31 ` Geert Uytterhoeven
2019-03-29 9:53 ` Marek Vasut
2019-03-29 19:32 ` Geert Uytterhoeven
2019-03-30 7:45 ` Marek Vasut
2019-03-26 13:04 ` [PATCH V4 1/6] PCI: rcar: Clean up remaining macros defining bits Lorenzo Pieralisi
2019-03-26 16:48 ` Marek Vasut
2019-03-27 11:24 ` Simon Horman
2019-03-29 14:09 ` Lorenzo Pieralisi
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190327112632.k37jp5brnox3esui@verge.net.au \
--to=horms@verge.net.au \
--cc=geert+renesas@glider.be \
--cc=linux-pci@vger.kernel.org \
--cc=linux-renesas-soc@vger.kernel.org \
--cc=marek.vasut+renesas@gmail.com \
--cc=marek.vasut@gmail.com \
--cc=phil.edworthy@renesas.com \
--cc=wsa+renesas@sang-engineering.com \
--cc=wsa@the-dreams.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).