Skip to content

L
linux
Commit 2a8081f9 authored by Robert P. J. Day's avatar Robert P. J. Day Committed by Linus Torvalds
Browse files
Options

[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: default avatarRobert P. J. Day <rpjday@mindspring.com>
Acked-by: default avatarKarsten Keil <kkeil@suse.de>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent f0d8737b
Hide whitespace changes
Inline Side-by-side
Showing with 24 additions and 24 deletions
drivers/isdn/hisax/hfc4s8s_l1.c
View file @ 2a8081f9
...@@ -199,7 +199,7 @@ typedef struct _hfc4s8s_hw { ...@@ -199,7 +199,7 @@ typedef struct _hfc4s8s_hw {
/***************************/ /***************************/
/* inline function defines */ /* inline function defines */
/***************************/ /***************************/
#ifdef CONFIG_HISAX_HFC4S8S_PCIMEM /* inline functions mempry mapped */ #ifdef HISAX_HFC4S8S_PCIMEM /* inline functions memory mapped */
/* memory write and dummy IO read to avoid PCI byte merge problems */ /* memory write and dummy IO read to avoid PCI byte merge problems */
#define Write_hfc8(a,b,c) {(*((volatile u_char *)(a->membase+b)) = c); inb(a->iobase+4);} #define Write_hfc8(a,b,c) {(*((volatile u_char *)(a->membase+b)) = c); inb(a->iobase+4);}
...@@ -305,7 +305,7 @@ wait_busy(hfc4s8s_hw * a) ...@@ -305,7 +305,7 @@ wait_busy(hfc4s8s_hw * a)
#define PCI_ENA_REGIO 0x01 #define PCI_ENA_REGIO 0x01
#endif /* CONFIG_HISAX_HFC4S8S_PCIMEM */ #endif /* HISAX_HFC4S8S_PCIMEM */
/******************************************************/ /******************************************************/
/* function to read critical counter registers that */ /* function to read critical counter registers that */
...@@ -724,12 +724,12 @@ rx_d_frame(struct hfc4s8s_l1 *l1p, int ech) ...@@ -724,12 +724,12 @@ rx_d_frame(struct hfc4s8s_l1 *l1p, int ech)
} else { } else {
/* read errornous D frame */ /* read errornous D frame */
#ifndef CONFIG_HISAX_HFC4S8S_PCIMEM #ifndef HISAX_HFC4S8S_PCIMEM
SetRegAddr(l1p->hw, A_FIFO_DATA0); SetRegAddr(l1p->hw, A_FIFO_DATA0);
#endif #endif
while (z1 >= 4) { while (z1 >= 4) {
#ifdef CONFIG_HISAX_HFC4S8S_PCIMEM #ifdef HISAX_HFC4S8S_PCIMEM
Read_hfc32(l1p->hw, A_FIFO_DATA0); Read_hfc32(l1p->hw, A_FIFO_DATA0);
#else #else
fRead_hfc32(l1p->hw); fRead_hfc32(l1p->hw);
...@@ -738,7 +738,7 @@ rx_d_frame(struct hfc4s8s_l1 *l1p, int ech) ...@@ -738,7 +738,7 @@ rx_d_frame(struct hfc4s8s_l1 *l1p, int ech)
} }
while (z1--) while (z1--)
#ifdef CONFIG_HISAX_HFC4S8S_PCIMEM #ifdef HISAX_HFC4S8S_PCIMEM
Read_hfc8(l1p->hw, A_FIFO_DATA0); Read_hfc8(l1p->hw, A_FIFO_DATA0);
#else #else
fRead_hfc8(l1p->hw); fRead_hfc8(l1p->hw);
...@@ -752,12 +752,12 @@ rx_d_frame(struct hfc4s8s_l1 *l1p, int ech) ...@@ -752,12 +752,12 @@ rx_d_frame(struct hfc4s8s_l1 *l1p, int ech)
cp = skb->data; cp = skb->data;
#ifndef CONFIG_HISAX_HFC4S8S_PCIMEM #ifndef HISAX_HFC4S8S_PCIMEM
SetRegAddr(l1p->hw, A_FIFO_DATA0); SetRegAddr(l1p->hw, A_FIFO_DATA0);
#endif #endif
while (z1 >= 4) { while (z1 >= 4) {
#ifdef CONFIG_HISAX_HFC4S8S_PCIMEM #ifdef HISAX_HFC4S8S_PCIMEM
*((unsigned long *) cp) = *((unsigned long *) cp) =
Read_hfc32(l1p->hw, A_FIFO_DATA0); Read_hfc32(l1p->hw, A_FIFO_DATA0);
#else #else
...@@ -768,7 +768,7 @@ rx_d_frame(struct hfc4s8s_l1 *l1p, int ech) ...@@ -768,7 +768,7 @@ rx_d_frame(struct hfc4s8s_l1 *l1p, int ech)
} }
while (z1--) while (z1--)
#ifdef CONFIG_HISAX_HFC4S8S_PCIMEM #ifdef HISAX_HFC4S8S_PCIMEM
*cp++ = Read_hfc8(l1p->hw, A_FIFO_DATA0); *cp++ = Read_hfc8(l1p->hw, A_FIFO_DATA0);
#else #else
*cp++ = fRead_hfc8(l1p->hw); *cp++ = fRead_hfc8(l1p->hw);
...@@ -858,12 +858,12 @@ rx_b_frame(struct hfc4s8s_btype *bch) ...@@ -858,12 +858,12 @@ rx_b_frame(struct hfc4s8s_btype *bch)
wait_busy(l1->hw); wait_busy(l1->hw);
return; return;
} }
#ifndef CONFIG_HISAX_HFC4S8S_PCIMEM #ifndef HISAX_HFC4S8S_PCIMEM
SetRegAddr(l1->hw, A_FIFO_DATA0); SetRegAddr(l1->hw, A_FIFO_DATA0);
#endif #endif
while (z1 >= 4) { while (z1 >= 4) {
#ifdef CONFIG_HISAX_HFC4S8S_PCIMEM #ifdef HISAX_HFC4S8S_PCIMEM
*((unsigned long *) bch->rx_ptr) = *((unsigned long *) bch->rx_ptr) =
Read_hfc32(l1->hw, A_FIFO_DATA0); Read_hfc32(l1->hw, A_FIFO_DATA0);
#else #else
...@@ -875,7 +875,7 @@ rx_b_frame(struct hfc4s8s_btype *bch) ...@@ -875,7 +875,7 @@ rx_b_frame(struct hfc4s8s_btype *bch)
} }
while (z1--) while (z1--)
#ifdef CONFIG_HISAX_HFC4S8S_PCIMEM #ifdef HISAX_HFC4S8S_PCIMEM
*(bch->rx_ptr++) = Read_hfc8(l1->hw, A_FIFO_DATA0); *(bch->rx_ptr++) = Read_hfc8(l1->hw, A_FIFO_DATA0);
#else #else
*(bch->rx_ptr++) = fRead_hfc8(l1->hw); *(bch->rx_ptr++) = fRead_hfc8(l1->hw);
...@@ -939,12 +939,12 @@ tx_d_frame(struct hfc4s8s_l1 *l1p) ...@@ -939,12 +939,12 @@ tx_d_frame(struct hfc4s8s_l1 *l1p)
if ((skb = skb_dequeue(&l1p->d_tx_queue))) { if ((skb = skb_dequeue(&l1p->d_tx_queue))) {
cp = skb->data; cp = skb->data;
cnt = skb->len; cnt = skb->len;
#ifndef CONFIG_HISAX_HFC4S8S_PCIMEM #ifndef HISAX_HFC4S8S_PCIMEM
SetRegAddr(l1p->hw, A_FIFO_DATA0); SetRegAddr(l1p->hw, A_FIFO_DATA0);
#endif #endif
while (cnt >= 4) { while (cnt >= 4) {
#ifdef CONFIG_HISAX_HFC4S8S_PCIMEM #ifdef HISAX_HFC4S8S_PCIMEM
fWrite_hfc32(l1p->hw, A_FIFO_DATA0, fWrite_hfc32(l1p->hw, A_FIFO_DATA0,
*(unsigned long *) cp); *(unsigned long *) cp);
#else #else
...@@ -955,7 +955,7 @@ tx_d_frame(struct hfc4s8s_l1 *l1p) ...@@ -955,7 +955,7 @@ tx_d_frame(struct hfc4s8s_l1 *l1p)
cnt -= 4; cnt -= 4;
} }
#ifdef CONFIG_HISAX_HFC4S8S_PCIMEM #ifdef HISAX_HFC4S8S_PCIMEM
while (cnt--) while (cnt--)
fWrite_hfc8(l1p->hw, A_FIFO_DATA0, *cp++); fWrite_hfc8(l1p->hw, A_FIFO_DATA0, *cp++);
#else #else
...@@ -1036,11 +1036,11 @@ tx_b_frame(struct hfc4s8s_btype *bch) ...@@ -1036,11 +1036,11 @@ tx_b_frame(struct hfc4s8s_btype *bch)
cp = skb->data + bch->tx_cnt; cp = skb->data + bch->tx_cnt;
bch->tx_cnt += cnt; bch->tx_cnt += cnt;
#ifndef CONFIG_HISAX_HFC4S8S_PCIMEM #ifndef HISAX_HFC4S8S_PCIMEM
SetRegAddr(l1->hw, A_FIFO_DATA0); SetRegAddr(l1->hw, A_FIFO_DATA0);
#endif #endif
while (cnt >= 4) { while (cnt >= 4) {
#ifdef CONFIG_HISAX_HFC4S8S_PCIMEM #ifdef HISAX_HFC4S8S_PCIMEM
fWrite_hfc32(l1->hw, A_FIFO_DATA0, fWrite_hfc32(l1->hw, A_FIFO_DATA0,
*(unsigned long *) cp); *(unsigned long *) cp);
#else #else
...@@ -1051,7 +1051,7 @@ tx_b_frame(struct hfc4s8s_btype *bch) ...@@ -1051,7 +1051,7 @@ tx_b_frame(struct hfc4s8s_btype *bch)
} }
while (cnt--) while (cnt--)
#ifdef CONFIG_HISAX_HFC4S8S_PCIMEM #ifdef HISAX_HFC4S8S_PCIMEM
fWrite_hfc8(l1->hw, A_FIFO_DATA0, *cp++); fWrite_hfc8(l1->hw, A_FIFO_DATA0, *cp++);
#else #else
fWrite_hfc8(l1->hw, *cp++); fWrite_hfc8(l1->hw, *cp++);
...@@ -1280,7 +1280,7 @@ hfc4s8s_interrupt(int intno, void *dev_id) ...@@ -1280,7 +1280,7 @@ hfc4s8s_interrupt(int intno, void *dev_id)
if (!hw || !(hw->mr.r_irq_ctrl & M_GLOB_IRQ_EN)) if (!hw || !(hw->mr.r_irq_ctrl & M_GLOB_IRQ_EN))
return IRQ_NONE; return IRQ_NONE;
#ifndef CONFIG_HISAX_HFC4S8S_PCIMEM #ifndef HISAX_HFC4S8S_PCIMEM
/* read current selected regsister */ /* read current selected regsister */
old_ioreg = GetRegAddr(hw); old_ioreg = GetRegAddr(hw);
#endif #endif
...@@ -1291,7 +1291,7 @@ hfc4s8s_interrupt(int intno, void *dev_id) ...@@ -1291,7 +1291,7 @@ hfc4s8s_interrupt(int intno, void *dev_id)
if (! if (!
(b = (Read_hfc8(hw, R_STATUS) & (M_MISC_IRQSTA | M_FR_IRQSTA))) (b = (Read_hfc8(hw, R_STATUS) & (M_MISC_IRQSTA | M_FR_IRQSTA)))
&& !hw->mr.r_irq_statech) { && !hw->mr.r_irq_statech) {
#ifndef CONFIG_HISAX_HFC4S8S_PCIMEM #ifndef HISAX_HFC4S8S_PCIMEM
SetRegAddr(hw, old_ioreg); SetRegAddr(hw, old_ioreg);
#endif #endif
return IRQ_NONE; return IRQ_NONE;
...@@ -1321,7 +1321,7 @@ hfc4s8s_interrupt(int intno, void *dev_id) ...@@ -1321,7 +1321,7 @@ hfc4s8s_interrupt(int intno, void *dev_id)
/* queue the request to allow other cards to interrupt */ /* queue the request to allow other cards to interrupt */
schedule_work(&hw->tqueue); schedule_work(&hw->tqueue);
#ifndef CONFIG_HISAX_HFC4S8S_PCIMEM #ifndef HISAX_HFC4S8S_PCIMEM
SetRegAddr(hw, old_ioreg); SetRegAddr(hw, old_ioreg);
#endif #endif
return IRQ_HANDLED; return IRQ_HANDLED;
...@@ -1470,7 +1470,7 @@ static void ...@@ -1470,7 +1470,7 @@ static void
release_pci_ports(hfc4s8s_hw * hw) release_pci_ports(hfc4s8s_hw * hw)
{ {
pci_write_config_word(hw->pdev, PCI_COMMAND, 0); pci_write_config_word(hw->pdev, PCI_COMMAND, 0);
#ifdef CONFIG_HISAX_HFC4S8S_PCIMEM #ifdef HISAX_HFC4S8S_PCIMEM
if (hw->membase) if (hw->membase)
iounmap((void *) hw->membase); iounmap((void *) hw->membase);
#else #else
...@@ -1485,7 +1485,7 @@ release_pci_ports(hfc4s8s_hw * hw) ...@@ -1485,7 +1485,7 @@ release_pci_ports(hfc4s8s_hw * hw)
static void static void
enable_pci_ports(hfc4s8s_hw * hw) enable_pci_ports(hfc4s8s_hw * hw)
{ {
#ifdef CONFIG_HISAX_HFC4S8S_PCIMEM #ifdef HISAX_HFC4S8S_PCIMEM
pci_write_config_word(hw->pdev, PCI_COMMAND, PCI_ENA_MEMIO); pci_write_config_word(hw->pdev, PCI_COMMAND, PCI_ENA_MEMIO);
#else #else
pci_write_config_word(hw->pdev, PCI_COMMAND, PCI_ENA_REGIO); pci_write_config_word(hw->pdev, PCI_COMMAND, PCI_ENA_REGIO);
...@@ -1560,7 +1560,7 @@ setup_instance(hfc4s8s_hw * hw) ...@@ -1560,7 +1560,7 @@ setup_instance(hfc4s8s_hw * hw)
hw->irq); hw->irq);
goto out; goto out;
} }
#ifdef CONFIG_HISAX_HFC4S8S_PCIMEM #ifdef HISAX_HFC4S8S_PCIMEM
printk(KERN_INFO printk(KERN_INFO
"HFC-4S/8S: found PCI card at membase 0x%p, irq %d\n", "HFC-4S/8S: found PCI card at membase 0x%p, irq %d\n",
hw->hw_membase, hw->irq); hw->hw_membase, hw->irq);
...@@ -1613,7 +1613,7 @@ hfc4s8s_probe(struct pci_dev *pdev, const struct pci_device_id *ent) ...@@ -1613,7 +1613,7 @@ hfc4s8s_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
hw->irq = pdev->irq; hw->irq = pdev->irq;
hw->iobase = pci_resource_start(pdev, 0); hw->iobase = pci_resource_start(pdev, 0);
#ifdef CONFIG_HISAX_HFC4S8S_PCIMEM #ifdef HISAX_HFC4S8S_PCIMEM
hw->hw_membase = (u_char *) pci_resource_start(pdev, 1); hw->hw_membase = (u_char *) pci_resource_start(pdev, 1);
hw->membase = ioremap((ulong) hw->hw_membase, 256); hw->membase = ioremap((ulong) hw->hw_membase, 256);
#else #else
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7