[PATCH] cs89x0: use u16 for device register data

cs89x0 inconsistently used 'int' and 'u32' for device register data.
As the cs89x0 is a 16-bit chip, change the I/O accessors over to 'u16'.
(Spotted by Deepak Saxena.)

Signed-off-by: Lennert Buytenhek <buytenh@wantstofly.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

authored by Lennert Buytenhek and committed by Linus Torvalds a07f0dbe 580d7b8c

+19 -19
+19 -19
drivers/net/cs89x0.c
··· 342 #endif 343 344 #if defined(CONFIG_ARCH_IXDP2X01) 345 - static int 346 readword(unsigned long base_addr, int portno) 347 { 348 - return (u16)__raw_readl(base_addr + (portno << 1)); 349 } 350 351 static void 352 - writeword(unsigned long base_addr, int portno, int value) 353 { 354 - __raw_writel((u16)value, base_addr + (portno << 1)); 355 } 356 #elif defined(CONFIG_ARCH_PNX010X) 357 - static int 358 readword(unsigned long base_addr, int portno) 359 { 360 return inw(base_addr + (portno << 1)); 361 } 362 363 static void 364 - writeword(unsigned long base_addr, int portno, int value) 365 { 366 outw(value, base_addr + (portno << 1)); 367 } 368 #else 369 - static int 370 readword(unsigned long base_addr, int portno) 371 { 372 return inw(base_addr + portno); 373 } 374 375 static void 376 - writeword(unsigned long base_addr, int portno, int value) 377 { 378 outw(value, base_addr + portno); 379 } ··· 385 u8 *buf8 = (u8 *)buf; 386 387 do { 388 - u32 tmp32; 389 390 - tmp32 = readword(base_addr, portno); 391 - *buf8++ = (u8)tmp32; 392 - *buf8++ = (u8)(tmp32 >> 8); 393 } while (--length); 394 } 395 ··· 399 u8 *buf8 = (u8 *)buf; 400 401 do { 402 - u32 tmp32; 403 404 - tmp32 = *buf8++; 405 - tmp32 |= (*buf8++) << 8; 406 - writeword(base_addr, portno, tmp32); 407 } while (--length); 408 } 409 410 - static int 411 - readreg(struct net_device *dev, int regno) 412 { 413 writeword(dev->base_addr, ADD_PORT, regno); 414 return readword(dev->base_addr, DATA_PORT); 415 } 416 417 static void 418 - writereg(struct net_device *dev, int regno, int value) 419 { 420 writeword(dev->base_addr, ADD_PORT, regno); 421 writeword(dev->base_addr, DATA_PORT, value);
··· 342 #endif 343 344 #if defined(CONFIG_ARCH_IXDP2X01) 345 + static u16 346 readword(unsigned long base_addr, int portno) 347 { 348 + return __raw_readl(base_addr + (portno << 1)); 349 } 350 351 static void 352 + writeword(unsigned long base_addr, int portno, u16 value) 353 { 354 + __raw_writel(value, base_addr + (portno << 1)); 355 } 356 #elif defined(CONFIG_ARCH_PNX010X) 357 + static u16 358 readword(unsigned long base_addr, int portno) 359 { 360 return inw(base_addr + (portno << 1)); 361 } 362 363 static void 364 + writeword(unsigned long base_addr, int portno, u16 value) 365 { 366 outw(value, base_addr + (portno << 1)); 367 } 368 #else 369 + static u16 370 readword(unsigned long base_addr, int portno) 371 { 372 return inw(base_addr + portno); 373 } 374 375 static void 376 + writeword(unsigned long base_addr, int portno, u16 value) 377 { 378 outw(value, base_addr + portno); 379 } ··· 385 u8 *buf8 = (u8 *)buf; 386 387 do { 388 + u16 tmp16; 389 390 + tmp16 = readword(base_addr, portno); 391 + *buf8++ = (u8)tmp16; 392 + *buf8++ = (u8)(tmp16 >> 8); 393 } while (--length); 394 } 395 ··· 399 u8 *buf8 = (u8 *)buf; 400 401 do { 402 + u16 tmp16; 403 404 + tmp16 = *buf8++; 405 + tmp16 |= (*buf8++) << 8; 406 + writeword(base_addr, portno, tmp16); 407 } while (--length); 408 } 409 410 + static u16 411 + readreg(struct net_device *dev, u16 regno) 412 { 413 writeword(dev->base_addr, ADD_PORT, regno); 414 return readword(dev->base_addr, DATA_PORT); 415 } 416 417 static void 418 + writereg(struct net_device *dev, u16 regno, u16 value) 419 { 420 writeword(dev->base_addr, ADD_PORT, regno); 421 writeword(dev->base_addr, DATA_PORT, value);