Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 01c6505d authored Apr 26, 2014 by Sam Ravnborg Committed by David S. Miller May 02, 2014

sparc32: replace flip_dword() with swab32()



The latter is a generic implmentation.
flip_{,d}word() is sparc32 specific and will be dropped.

Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
Cc: Daniel Hellstrom <daniel@gaisler.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

parent c46064b4

arch/sparc/kernel/leon_pci_grpci1.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -144,7 +144,7 @@ static int grpci1_cfg_r32(struct grpci1_priv *priv, unsigned int bus,
		grpci1_cfg_w32(priv, TGT, 0, PCI_COMMAND, tmp);
		} else {
		/* Bus always little endian (unaffected by byte-swapping) */
		*val = flip_dword(tmp);
		*val = swab32(tmp);
		}

		return 0;
		@@ -197,7 +197,7 @@ static int grpci1_cfg_w32(struct grpci1_priv *priv, unsigned int bus,

		pci_conf = (unsigned int *) (priv->pci_conf \|
		(devfn << 8) \| (where & 0xfc));
		LEON3_BYPASS_STORE_PA(pci_conf, flip_dword(val));
		LEON3_BYPASS_STORE_PA(pci_conf, swab32(val));

		return 0;
		}

arch/sparc/kernel/leon_pci_grpci2.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -270,7 +270,7 @@ static int grpci2_cfg_r32(struct grpci2_priv *priv, unsigned int bus,
		*val = 0xffffffff;
		} else {
		/* Bus always little endian (unaffected by byte-swapping) */
		*val = flip_dword(tmp);
		*val = swab32(tmp);
		}

		return 0;
		@@ -328,7 +328,7 @@ static int grpci2_cfg_w32(struct grpci2_priv *priv, unsigned int bus,

		pci_conf = (unsigned int *) (priv->pci_conf \|
		(devfn << 8) \| (where & 0xfc));
		LEON3_BYPASS_STORE_PA(pci_conf, flip_dword(val));
		LEON3_BYPASS_STORE_PA(pci_conf, swab32(val));

		/* Wait until GRPCI2 signals that CFG access is done, it should be
		* done instantaneously unless a DMA operation is ongoing...

arch/sparc/kernel/pcic.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -783,7 +783,7 @@ int pcibios_enable_device(struct pci_dev *pdev, int mask)
		void pcic_nmi(unsigned int pend, struct pt_regs *regs)
		{

		pend = flip_dword(pend);
		pend = swab32(pend);

		if (!pcic_speculative \|\| (pend & PCI_SYS_INT_PENDING_PIO) == 0) {
		/*