aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/isdn
diff options
context:
space:
mode:
authorHarvey Harrison <harvey.harrison@gmail.com>2008-09-22 22:16:51 -0400
committerDavid S. Miller <davem@davemloft.net>2008-09-22 22:16:51 -0400
commit1532dcb75c238d79c54a037da87c3f495cbf605b (patch)
treedf39d554ed57cdd75a7a4dedc7a6e014a678607e /drivers/isdn
parentf11d32dfaa0753cfab7b2e5052923e8784a3c141 (diff)
mISDN: annotate iomem pointer and add statics
Signed-off-by: Harvey Harrison <harvey.harrison@gmail.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/isdn')
-rw-r--r--drivers/isdn/hardware/mISDN/hfcpci.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/drivers/isdn/hardware/mISDN/hfcpci.c b/drivers/isdn/hardware/mISDN/hfcpci.c
index 9f808ecc6898..cd8302af40eb 100644
--- a/drivers/isdn/hardware/mISDN/hfcpci.c
+++ b/drivers/isdn/hardware/mISDN/hfcpci.c
@@ -43,7 +43,7 @@ MODULE_LICENSE("GPL");
43module_param(debug, uint, 0); 43module_param(debug, uint, 0);
44 44
45static LIST_HEAD(HFClist); 45static LIST_HEAD(HFClist);
46DEFINE_RWLOCK(HFClock); 46static DEFINE_RWLOCK(HFClock);
47 47
48enum { 48enum {
49 HFC_CCD_2BD0, 49 HFC_CCD_2BD0,
@@ -88,7 +88,7 @@ struct hfcPCI_hw {
88 unsigned char bswapped; 88 unsigned char bswapped;
89 unsigned char protocol; 89 unsigned char protocol;
90 int nt_timer; 90 int nt_timer;
91 unsigned char *pci_io; /* start of PCI IO memory */ 91 unsigned char __iomem *pci_io; /* start of PCI IO memory */
92 dma_addr_t dmahandle; 92 dma_addr_t dmahandle;
93 void *fifos; /* FIFO memory */ 93 void *fifos; /* FIFO memory */
94 int last_bfifo_cnt[2]; 94 int last_bfifo_cnt[2];
@@ -153,7 +153,7 @@ release_io_hfcpci(struct hfc_pci *hc)
153 pci_write_config_word(hc->pdev, PCI_COMMAND, 0); 153 pci_write_config_word(hc->pdev, PCI_COMMAND, 0);
154 del_timer(&hc->hw.timer); 154 del_timer(&hc->hw.timer);
155 pci_free_consistent(hc->pdev, 0x8000, hc->hw.fifos, hc->hw.dmahandle); 155 pci_free_consistent(hc->pdev, 0x8000, hc->hw.fifos, hc->hw.dmahandle);
156 iounmap((void *)hc->hw.pci_io); 156 iounmap(hc->hw.pci_io);
157} 157}
158 158
159/* 159/*
@@ -522,7 +522,7 @@ receive_dmsg(struct hfc_pci *hc)
522/* 522/*
523 * check for transparent receive data and read max one threshold size if avail 523 * check for transparent receive data and read max one threshold size if avail
524 */ 524 */
525int 525static int
526hfcpci_empty_fifo_trans(struct bchannel *bch, struct bzfifo *bz, u_char *bdata) 526hfcpci_empty_fifo_trans(struct bchannel *bch, struct bzfifo *bz, u_char *bdata)
527{ 527{
528 __le16 *z1r, *z2r; 528 __le16 *z1r, *z2r;
@@ -575,7 +575,7 @@ hfcpci_empty_fifo_trans(struct bchannel *bch, struct bzfifo *bz, u_char *bdata)
575/* 575/*
576 * B-channel main receive routine 576 * B-channel main receive routine
577 */ 577 */
578void 578static void
579main_rec_hfcpci(struct bchannel *bch) 579main_rec_hfcpci(struct bchannel *bch)
580{ 580{
581 struct hfc_pci *hc = bch->hw; 581 struct hfc_pci *hc = bch->hw;
@@ -1678,7 +1678,7 @@ hfcpci_l2l1B(struct mISDNchannel *ch, struct sk_buff *skb)
1678 * called for card init message 1678 * called for card init message
1679 */ 1679 */
1680 1680
1681void 1681static void
1682inithfcpci(struct hfc_pci *hc) 1682inithfcpci(struct hfc_pci *hc)
1683{ 1683{
1684 printk(KERN_DEBUG "inithfcpci: entered\n"); 1684 printk(KERN_DEBUG "inithfcpci: entered\n");
@@ -1965,7 +1965,7 @@ setup_hw(struct hfc_pci *hc)
1965 printk(KERN_WARNING "HFC-PCI: No IRQ for PCI card found\n"); 1965 printk(KERN_WARNING "HFC-PCI: No IRQ for PCI card found\n");
1966 return 1; 1966 return 1;
1967 } 1967 }
1968 hc->hw.pci_io = (char *)(ulong)hc->pdev->resource[1].start; 1968 hc->hw.pci_io = (char __iomem *)(unsigned long)hc->pdev->resource[1].start;
1969 1969
1970 if (!hc->hw.pci_io) { 1970 if (!hc->hw.pci_io) {
1971 printk(KERN_WARNING "HFC-PCI: No IO-Mem for PCI card found\n"); 1971 printk(KERN_WARNING "HFC-PCI: No IO-Mem for PCI card found\n");