Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1532dcb7 authored by Harvey Harrison's avatar Harvey Harrison Committed by David S. Miller
Browse files

mISDN: annotate iomem pointer and add statics 



Signed-off-by: default avatarHarvey Harrison <harvey.harrison@gmail.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent f11d32df

drivers/isdn/hardware/mISDN/hfcpci.c

+7 −7
Original line number Diff line number Diff line
@@ -43,7 +43,7 @@ MODULE_LICENSE("GPL"); 
module_param(debug, uint, 0);



static LIST_HEAD(HFClist);

DEFINE_RWLOCK(HFClock);

static DEFINE_RWLOCK(HFClock);



enum {

	HFC_CCD_2BD0,
@@ -88,7 +88,7 @@ struct hfcPCI_hw { 
	unsigned char		bswapped;

	unsigned char		protocol;

	int			nt_timer;

	unsigned char		*pci_io; /* start of PCI IO memory */

	unsigned char __iomem 	*pci_io; /* start of PCI IO memory */

	dma_addr_t		dmahandle;

	void			*fifos; /* FIFO memory */

	int			last_bfifo_cnt[2];
@@ -153,7 +153,7 @@ release_io_hfcpci(struct hfc_pci *hc) 
	pci_write_config_word(hc->pdev, PCI_COMMAND, 0);

	del_timer(&hc->hw.timer);

	pci_free_consistent(hc->pdev, 0x8000, hc->hw.fifos, hc->hw.dmahandle);

	iounmap((void *)hc->hw.pci_io);

	iounmap(hc->hw.pci_io);

}



/*
@@ -522,7 +522,7 @@ receive_dmsg(struct hfc_pci *hc) 
/*

 * check for transparent receive data and read max one threshold size if avail

 */

int

static int

hfcpci_empty_fifo_trans(struct bchannel *bch, struct bzfifo *bz, u_char *bdata)

{

	 __le16 *z1r, *z2r;
@@ -575,7 +575,7 @@ hfcpci_empty_fifo_trans(struct bchannel *bch, struct bzfifo *bz, u_char *bdata) 
/*

 * B-channel main receive routine

 */

void

static void

main_rec_hfcpci(struct bchannel *bch)

{

	struct hfc_pci	*hc = bch->hw;
@@ -1678,7 +1678,7 @@ hfcpci_l2l1B(struct mISDNchannel *ch, struct sk_buff *skb) 
 * called for card init message

 */



void

static void

inithfcpci(struct hfc_pci *hc)

{

	printk(KERN_DEBUG "inithfcpci: entered\n");
@@ -1965,7 +1965,7 @@ setup_hw(struct hfc_pci *hc) 
		printk(KERN_WARNING "HFC-PCI: No IRQ for PCI card found\n");

		return 1;

	}

	hc->hw.pci_io = (char *)(ulong)hc->pdev->resource[1].start;

	hc->hw.pci_io = (char __iomem *)(unsigned long)hc->pdev->resource[1].start;



	if (!hc->hw.pci_io) {

		printk(KERN_WARNING "HFC-PCI: No IO-Mem for PCI card found\n");