From 965d017f49f7094348d95d8034f1ef94ddce601c Mon Sep 17 00:00:00 2001 From: Malcolm Priestley Date: Sun, 10 Aug 2014 12:22:02 +0100 Subject: [PATCH] staging: vt6655: upc.h replace read and write memory functions Update to the newer memory functions readb -> ioread8 readw -> ioread16 readl -> ioread32 writeb -> iowrite8 writew -> iowrite16 writel -> iowrite32 Signed-off-by: Malcolm Priestley Signed-off-by: Greg Kroah-Hartman --- drivers/staging/vt6655/upc.h | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/drivers/staging/vt6655/upc.h b/drivers/staging/vt6655/upc.h index 00e5a00a72e0..c5c889cade25 100644 --- a/drivers/staging/vt6655/upc.h +++ b/drivers/staging/vt6655/upc.h @@ -40,32 +40,32 @@ #define VNSvInPortB(dwIOAddress, pbyData) \ do { \ - *(pbyData) = readb(dwIOAddress); \ + *(pbyData) = ioread8(dwIOAddress); \ } while (0) #define VNSvInPortW(dwIOAddress, pwData) \ do { \ - *(pwData) = readw(dwIOAddress); \ + *(pwData) = ioread16(dwIOAddress); \ } while (0) #define VNSvInPortD(dwIOAddress, pdwData) \ do { \ - *(pdwData) = readl(dwIOAddress); \ + *(pdwData) = ioread32(dwIOAddress); \ } while (0) #define VNSvOutPortB(dwIOAddress, byData) \ do { \ - writeb((unsigned char)byData, dwIOAddress); \ + iowrite8((u8)byData, dwIOAddress); \ } while (0) #define VNSvOutPortW(dwIOAddress, wData) \ do { \ - writew((unsigned short)wData, dwIOAddress); \ + iowrite16((u16)wData, dwIOAddress); \ } while (0) #define VNSvOutPortD(dwIOAddress, dwData) \ do { \ - writel((unsigned long)dwData, dwIOAddress); \ + iowrite32((u32)dwData, dwIOAddress); \ } while (0) #define PCAvDelayByIO(uDelayUnit) \ -- 2.34.1