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

Commit 4969b3a4 authored by Jiri Slaby's avatar Jiri Slaby Committed by Linus Torvalds
Browse files

Char: isicom, proper variables types 



irq is int, base is unsigned long

Signed-off-by: default avatarJiri Slaby <jirislaby@gmail.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent e327325f

drivers/char/isicom.c

+7 −11
Original line number Diff line number Diff line
@@ -184,7 +184,7 @@ static signed char linuxb_to_isib[] = { 


struct	isi_board {

	unsigned long		base;

	unsigned char		irq;

	int			irq;

	unsigned char		port_count;

	unsigned short		status;

	unsigned short		port_status; /* each bit for each port */
@@ -224,7 +224,7 @@ static struct isi_port isi_ports[PORT_COUNT]; 
 *	it wants to talk.

 */



static inline int WaitTillCardIsFree(u16 base)

static inline int WaitTillCardIsFree(unsigned long base)

{

	unsigned int count = 0;

	unsigned int a = in_atomic(); /* do we run under spinlock? */
@@ -396,9 +396,9 @@ static inline int __isicom_paranoia_check(struct isi_port const *port, 


static void isicom_tx(unsigned long _data)

{

	unsigned long flags;

	unsigned long flags, base;

	unsigned int retries;

	short count = (BOARD_COUNT-1), card, base;

	short count = (BOARD_COUNT-1), card;

	short txcount, wrd, residue, word_count, cnt;

	struct isi_port *port;

	struct tty_struct *tty;
@@ -1730,17 +1730,13 @@ static unsigned int card_count; 
static int __devinit isicom_probe(struct pci_dev *pdev,

	const struct pci_device_id *ent)

{

	unsigned int ioaddr, signature, index;

	unsigned int signature, index;

	int retval = -EPERM;

	u8 pciirq;

	struct isi_board *board = NULL;



	if (card_count >= BOARD_COUNT)

		goto err;



	ioaddr = pci_resource_start(pdev, 3);

	/* i.e at offset 0x1c in the PCI configuration register space. */

	pciirq = pdev->irq;

	dev_info(&pdev->dev, "ISI PCI Card(Device ID 0x%x)\n", ent->device);



	/* allot the first empty slot in the array */
@@ -1751,8 +1747,8 @@ static int __devinit isicom_probe(struct pci_dev *pdev, 
		}



	board->index = index;

	board->base = ioaddr;

	board->irq = pciirq;

	board->base = pci_resource_start(pdev, 3);

	board->irq = pdev->irq;

	card_count++;



	pci_set_drvdata(pdev, board);