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

[PATCH] ISDN: Rename special macro CONFIG_HISAX_HFC4S8S_PCIMEM

Rename the macro CONFIG_HISAX_HFC4S8S_PCIMEM to simply HISAX_HFC4S8S_PCIMEM so
that it no longer resembles a user-settable kernel config macro.

Signed-off-by: Robert P. J. Day <rpjday@mindspring.com>
Acked-by: Karsten Keil <kkeil@suse.de>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

authored by

Robert P. J. Day and committed by
Linus Torvalds 2a8081f9 f0d8737b

+24 -24
+24 -24
drivers/isdn/hisax/hfc4s8s_l1.c
··· 199 199 /***************************/ 200 200 /* inline function defines */ 201 201 /***************************/ 202 - #ifdef CONFIG_HISAX_HFC4S8S_PCIMEM /* inline functions mempry mapped */ 202 + #ifdef HISAX_HFC4S8S_PCIMEM /* inline functions memory mapped */ 203 203 204 204 /* memory write and dummy IO read to avoid PCI byte merge problems */ 205 205 #define Write_hfc8(a,b,c) {(*((volatile u_char *)(a->membase+b)) = c); inb(a->iobase+4);} ··· 305 305 306 306 #define PCI_ENA_REGIO 0x01 307 307 308 - #endif /* CONFIG_HISAX_HFC4S8S_PCIMEM */ 308 + #endif /* HISAX_HFC4S8S_PCIMEM */ 309 309 310 310 /******************************************************/ 311 311 /* function to read critical counter registers that */ ··· 724 724 } else { 725 725 /* read errornous D frame */ 726 726 727 - #ifndef CONFIG_HISAX_HFC4S8S_PCIMEM 727 + #ifndef HISAX_HFC4S8S_PCIMEM 728 728 SetRegAddr(l1p->hw, A_FIFO_DATA0); 729 729 #endif 730 730 731 731 while (z1 >= 4) { 732 - #ifdef CONFIG_HISAX_HFC4S8S_PCIMEM 732 + #ifdef HISAX_HFC4S8S_PCIMEM 733 733 Read_hfc32(l1p->hw, A_FIFO_DATA0); 734 734 #else 735 735 fRead_hfc32(l1p->hw); ··· 738 738 } 739 739 740 740 while (z1--) 741 - #ifdef CONFIG_HISAX_HFC4S8S_PCIMEM 741 + #ifdef HISAX_HFC4S8S_PCIMEM 742 742 Read_hfc8(l1p->hw, A_FIFO_DATA0); 743 743 #else 744 744 fRead_hfc8(l1p->hw); ··· 752 752 753 753 cp = skb->data; 754 754 755 - #ifndef CONFIG_HISAX_HFC4S8S_PCIMEM 755 + #ifndef HISAX_HFC4S8S_PCIMEM 756 756 SetRegAddr(l1p->hw, A_FIFO_DATA0); 757 757 #endif 758 758 759 759 while (z1 >= 4) { 760 - #ifdef CONFIG_HISAX_HFC4S8S_PCIMEM 760 + #ifdef HISAX_HFC4S8S_PCIMEM 761 761 *((unsigned long *) cp) = 762 762 Read_hfc32(l1p->hw, A_FIFO_DATA0); 763 763 #else ··· 768 768 } 769 769 770 770 while (z1--) 771 - #ifdef CONFIG_HISAX_HFC4S8S_PCIMEM 771 + #ifdef HISAX_HFC4S8S_PCIMEM 772 772 *cp++ = Read_hfc8(l1p->hw, A_FIFO_DATA0); 773 773 #else 774 774 *cp++ = fRead_hfc8(l1p->hw); ··· 858 858 wait_busy(l1->hw); 859 859 return; 860 860 } 861 - #ifndef CONFIG_HISAX_HFC4S8S_PCIMEM 861 + #ifndef HISAX_HFC4S8S_PCIMEM 862 862 SetRegAddr(l1->hw, A_FIFO_DATA0); 863 863 #endif 864 864 865 865 while (z1 >= 4) { 866 - #ifdef CONFIG_HISAX_HFC4S8S_PCIMEM 866 + #ifdef HISAX_HFC4S8S_PCIMEM 867 867 *((unsigned long *) bch->rx_ptr) = 868 868 Read_hfc32(l1->hw, A_FIFO_DATA0); 869 869 #else ··· 875 875 } 876 876 877 877 while (z1--) 878 - #ifdef CONFIG_HISAX_HFC4S8S_PCIMEM 878 + #ifdef HISAX_HFC4S8S_PCIMEM 879 879 *(bch->rx_ptr++) = Read_hfc8(l1->hw, A_FIFO_DATA0); 880 880 #else 881 881 *(bch->rx_ptr++) = fRead_hfc8(l1->hw); ··· 939 939 if ((skb = skb_dequeue(&l1p->d_tx_queue))) { 940 940 cp = skb->data; 941 941 cnt = skb->len; 942 - #ifndef CONFIG_HISAX_HFC4S8S_PCIMEM 942 + #ifndef HISAX_HFC4S8S_PCIMEM 943 943 SetRegAddr(l1p->hw, A_FIFO_DATA0); 944 944 #endif 945 945 946 946 while (cnt >= 4) { 947 - #ifdef CONFIG_HISAX_HFC4S8S_PCIMEM 947 + #ifdef HISAX_HFC4S8S_PCIMEM 948 948 fWrite_hfc32(l1p->hw, A_FIFO_DATA0, 949 949 *(unsigned long *) cp); 950 950 #else ··· 955 955 cnt -= 4; 956 956 } 957 957 958 - #ifdef CONFIG_HISAX_HFC4S8S_PCIMEM 958 + #ifdef HISAX_HFC4S8S_PCIMEM 959 959 while (cnt--) 960 960 fWrite_hfc8(l1p->hw, A_FIFO_DATA0, *cp++); 961 961 #else ··· 1036 1036 cp = skb->data + bch->tx_cnt; 1037 1037 bch->tx_cnt += cnt; 1038 1038 1039 - #ifndef CONFIG_HISAX_HFC4S8S_PCIMEM 1039 + #ifndef HISAX_HFC4S8S_PCIMEM 1040 1040 SetRegAddr(l1->hw, A_FIFO_DATA0); 1041 1041 #endif 1042 1042 while (cnt >= 4) { 1043 - #ifdef CONFIG_HISAX_HFC4S8S_PCIMEM 1043 + #ifdef HISAX_HFC4S8S_PCIMEM 1044 1044 fWrite_hfc32(l1->hw, A_FIFO_DATA0, 1045 1045 *(unsigned long *) cp); 1046 1046 #else ··· 1051 1051 } 1052 1052 1053 1053 while (cnt--) 1054 - #ifdef CONFIG_HISAX_HFC4S8S_PCIMEM 1054 + #ifdef HISAX_HFC4S8S_PCIMEM 1055 1055 fWrite_hfc8(l1->hw, A_FIFO_DATA0, *cp++); 1056 1056 #else 1057 1057 fWrite_hfc8(l1->hw, *cp++); ··· 1280 1280 if (!hw || !(hw->mr.r_irq_ctrl & M_GLOB_IRQ_EN)) 1281 1281 return IRQ_NONE; 1282 1282 1283 - #ifndef CONFIG_HISAX_HFC4S8S_PCIMEM 1283 + #ifndef HISAX_HFC4S8S_PCIMEM 1284 1284 /* read current selected regsister */ 1285 1285 old_ioreg = GetRegAddr(hw); 1286 1286 #endif ··· 1291 1291 if (! 1292 1292 (b = (Read_hfc8(hw, R_STATUS) & (M_MISC_IRQSTA | M_FR_IRQSTA))) 1293 1293 && !hw->mr.r_irq_statech) { 1294 - #ifndef CONFIG_HISAX_HFC4S8S_PCIMEM 1294 + #ifndef HISAX_HFC4S8S_PCIMEM 1295 1295 SetRegAddr(hw, old_ioreg); 1296 1296 #endif 1297 1297 return IRQ_NONE; ··· 1321 1321 /* queue the request to allow other cards to interrupt */ 1322 1322 schedule_work(&hw->tqueue); 1323 1323 1324 - #ifndef CONFIG_HISAX_HFC4S8S_PCIMEM 1324 + #ifndef HISAX_HFC4S8S_PCIMEM 1325 1325 SetRegAddr(hw, old_ioreg); 1326 1326 #endif 1327 1327 return IRQ_HANDLED; ··· 1470 1470 release_pci_ports(hfc4s8s_hw * hw) 1471 1471 { 1472 1472 pci_write_config_word(hw->pdev, PCI_COMMAND, 0); 1473 - #ifdef CONFIG_HISAX_HFC4S8S_PCIMEM 1473 + #ifdef HISAX_HFC4S8S_PCIMEM 1474 1474 if (hw->membase) 1475 1475 iounmap((void *) hw->membase); 1476 1476 #else ··· 1485 1485 static void 1486 1486 enable_pci_ports(hfc4s8s_hw * hw) 1487 1487 { 1488 - #ifdef CONFIG_HISAX_HFC4S8S_PCIMEM 1488 + #ifdef HISAX_HFC4S8S_PCIMEM 1489 1489 pci_write_config_word(hw->pdev, PCI_COMMAND, PCI_ENA_MEMIO); 1490 1490 #else 1491 1491 pci_write_config_word(hw->pdev, PCI_COMMAND, PCI_ENA_REGIO); ··· 1560 1560 hw->irq); 1561 1561 goto out; 1562 1562 } 1563 - #ifdef CONFIG_HISAX_HFC4S8S_PCIMEM 1563 + #ifdef HISAX_HFC4S8S_PCIMEM 1564 1564 printk(KERN_INFO 1565 1565 "HFC-4S/8S: found PCI card at membase 0x%p, irq %d\n", 1566 1566 hw->hw_membase, hw->irq); ··· 1613 1613 hw->irq = pdev->irq; 1614 1614 hw->iobase = pci_resource_start(pdev, 0); 1615 1615 1616 - #ifdef CONFIG_HISAX_HFC4S8S_PCIMEM 1616 + #ifdef HISAX_HFC4S8S_PCIMEM 1617 1617 hw->hw_membase = (u_char *) pci_resource_start(pdev, 1); 1618 1618 hw->membase = ioremap((ulong) hw->hw_membase, 256); 1619 1619 #else