sh: Mass ctrl_in/outX to __raw_read/writeX conversion.
The old ctrl in/out routines are non-portable and unsuitable for cross-platform use. While drivers/sh has already been sanitized, there is still quite a lot of code that is not. This converts the arch/sh/ bits over, which permits us to flag the routines as deprecated whilst still building with -Werror for the architecture code, and to ensure that future users are not added. Signed-off-by: Paul Mundt <lethal@linux-sh.org>
This commit is contained in:
@@ -43,7 +43,7 @@ int pci_fixup_pcic(struct pci_channel *chan)
|
||||
{
|
||||
unsigned long bcr1, mcr;
|
||||
|
||||
bcr1 = ctrl_inl(SH7751_BCR1);
|
||||
bcr1 = __raw_readl(SH7751_BCR1);
|
||||
bcr1 |= 0x40080000; /* Enable Bit 19 BREQEN, set PCIC to slave */
|
||||
pci_write_reg(chan, bcr1, SH4_PCIBCR1);
|
||||
|
||||
@@ -54,7 +54,7 @@ int pci_fixup_pcic(struct pci_channel *chan)
|
||||
pci_write_reg(chan, 0xfb900047, SH7751_PCICONF1);
|
||||
pci_write_reg(chan, 0xab000001, SH7751_PCICONF4);
|
||||
|
||||
mcr = ctrl_inl(SH7751_MCR);
|
||||
mcr = __raw_readl(SH7751_MCR);
|
||||
mcr = (mcr & PCIMCR_MRSET_OFF) & PCIMCR_RFSH_OFF;
|
||||
pci_write_reg(chan, mcr, SH4_PCIMCR);
|
||||
|
||||
|
Reference in New Issue
Block a user