Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

cs89x0: Removing dead SH_HICOSH4

SH_HICOSH4 doesn't exist in Kconfig, therefore removing all references
for it from the source code.

Signed-off-by: Christoph Egger <siccegge@cs.fau.de>
Signed-off-by: David S. Miller <davem@davemloft.net>

authored by

Christoph Egger and committed by
David S. Miller
ef3cf9f2 7e4ee4d9

+2 -53
+2 -49
drivers/net/cs89x0.c
··· 170 170 /* The cs8900 has 4 IRQ pins, software selectable. cs8900_irq_map maps 171 171 them to system IRQ numbers. This mapping is card specific and is set to 172 172 the configuration of the Cirrus Eval board for this chip. */ 173 - #if defined(CONFIG_SH_HICOSH4) 174 - static unsigned int netcard_portlist[] __used __initdata = 175 - { 0x0300, 0}; 176 - static unsigned int cs8900_irq_map[] = {1,0,0,0}; 177 - #elif defined(CONFIG_MACH_IXDP2351) 173 + #if defined(CONFIG_MACH_IXDP2351) 178 174 static unsigned int netcard_portlist[] __used __initdata = {IXDP2351_VIRT_CS8900_BASE, 0}; 179 175 static unsigned int cs8900_irq_map[] = {IRQ_IXDP2351_CS8900, 0, 0, 0}; 180 176 #elif defined(CONFIG_ARCH_IXDP2X01) ··· 574 578 goto out1; 575 579 } 576 580 577 - #ifdef CONFIG_SH_HICOSH4 578 - /* truly reset the chip */ 579 - writeword(ioaddr, ADD_PORT, 0x0114); 580 - writeword(ioaddr, DATA_PORT, 0x0040); 581 - #endif 582 - 583 581 /* if they give us an odd I/O address, then do ONE write to 584 582 the address port, to get it back to address zero, where we 585 583 expect to find the EISA signature word. An IO with a base of 0x3 ··· 639 649 the driver will always do *something* instead of complain that 640 650 adapter_cnf is 0. */ 641 651 642 - #ifdef CONFIG_SH_HICOSH4 643 - if (1) { 644 - /* For the HiCO.SH4 board, things are different: we don't 645 - have EEPROM, but there is some data in flash, so we go 646 - get it there directly (MAC). */ 647 - __u16 *confd; 648 - short cnt; 649 - if (((* (volatile __u32 *) 0xa0013ff0) & 0x00ffffff) 650 - == 0x006c3000) { 651 - confd = (__u16*) 0xa0013fc0; 652 - } else { 653 - confd = (__u16*) 0xa001ffc0; 654 - } 655 - cnt = (*confd++ & 0x00ff) >> 1; 656 - while (--cnt > 0) { 657 - __u16 j = *confd++; 658 - 659 - switch (j & 0x0fff) { 660 - case PP_IA: 661 - for (i = 0; i < ETH_ALEN/2; i++) { 662 - dev->dev_addr[i*2] = confd[i] & 0xFF; 663 - dev->dev_addr[i*2+1] = confd[i] >> 8; 664 - } 665 - break; 666 - } 667 - j = (j >> 12) + 1; 668 - confd += j; 669 - cnt -= j; 670 - } 671 - } else 672 - #endif 673 652 674 653 if ((readreg(dev, PP_SelfST) & (EEPROM_OK | EEPROM_PRESENT)) == 675 654 (EEPROM_OK|EEPROM_PRESENT)) { ··· 693 734 printk("\n"); 694 735 695 736 /* First check to see if an EEPROM is attached. */ 696 - #ifdef CONFIG_SH_HICOSH4 /* no EEPROM on HiCO, don't hazzle with it here */ 697 - if (1) { 698 - printk(KERN_NOTICE "cs89x0: No EEPROM on HiCO.SH4\n"); 699 - } else 700 - #endif 737 + 701 738 if ((readreg(dev, PP_SelfST) & EEPROM_PRESENT) == 0) 702 739 printk(KERN_WARNING "cs89x0: No EEPROM, relying on command line....\n"); 703 740 else if (get_eeprom_data(dev, START_EEPROM_DATA,CHKSUM_LEN,eeprom_buff) < 0) { ··· 1230 1275 int i; 1231 1276 int ret; 1232 1277 1233 - #if !defined(CONFIG_SH_HICOSH4) && !defined(CONFIG_ARCH_PNX010X) /* uses irq#1, so this won't work */ 1234 1278 if (dev->irq < 2) { 1235 1279 /* Allow interrupts to be generated by the chip */ 1236 1280 /* Cirrus' release had this: */ ··· 1258 1304 } 1259 1305 } 1260 1306 else 1261 - #endif 1262 1307 { 1263 1308 #ifndef CONFIG_CS89x0_NONISA_IRQ 1264 1309 if (((1 << dev->irq) & lp->irq_map) == 0) {
-4
drivers/net/cs89x0.h
··· 437 437 #define IRQ_MAP_EEPROM_DATA 0x0046 /* Offset into eeprom for the IRQ map */ 438 438 #define IRQ_MAP_LEN 0x0004 /* No of bytes to read for the IRQ map */ 439 439 #define PNP_IRQ_FRMT 0x0022 /* PNP small item IRQ format */ 440 - #ifdef CONFIG_SH_HICOSH4 441 - #define CS8900_IRQ_MAP 0x0002 /* HiCO-SH4 board has its IRQ on #1 */ 442 - #else 443 440 #define CS8900_IRQ_MAP 0x1c20 /* This IRQ map is fixed */ 444 - #endif 445 441 446 442 #define CS8920_NO_INTS 0x0F /* Max CS8920 interrupt select # */ 447 443