redonkable/remarkable-linux
redonkable/remarkable-linux
1
0
Fork 0
Code Releases Activity

Char: isicom, proper variables types

Browse source 
irq is int, base is unsigned long

Signed-off-by: Jiri Slaby <jirislaby@gmail.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Jiri Slaby 2007-07-17 04:05:18 -07:00 committed by Linus Torvalds
parent e327325f42
commit 4969b3a43d
1 changed files with 7 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
drivers/char/isicom.c
View file

@ -184,7 +184,7 @@ static signed char linuxb_to_isib[] = {
struct isi_board { struct isi_board {
unsigned long base; unsigned long base;
unsigned char irq; int irq;
unsigned char port_count; unsigned char port_count;
unsigned short status; unsigned short status;
unsigned short port_status; /* each bit for each port */ 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. * it wants to talk.
*/ */
static inline int WaitTillCardIsFree(u16 base) static inline int WaitTillCardIsFree(unsigned long base)
{ {
unsigned int count = 0; unsigned int count = 0;
unsigned int a = in_atomic(); /* do we run under spinlock? */ 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) static void isicom_tx(unsigned long _data)
{ {
unsigned long flags; unsigned long flags, base;
unsigned int retries; unsigned int retries;
short count = (BOARD_COUNT-1), card, base; short count = (BOARD_COUNT-1), card;
short txcount, wrd, residue, word_count, cnt; short txcount, wrd, residue, word_count, cnt;
struct isi_port *port; struct isi_port *port;
struct tty_struct *tty; struct tty_struct *tty;
@ -1730,17 +1730,13 @@ static unsigned int card_count;
static int __devinit isicom_probe(struct pci_dev *pdev, static int __devinit isicom_probe(struct pci_dev *pdev,
const struct pci_device_id *ent) const struct pci_device_id *ent)
{ {
unsigned int ioaddr, signature, index; unsigned int signature, index;
int retval = -EPERM; int retval = -EPERM;
u8 pciirq;
struct isi_board *board = NULL; struct isi_board *board = NULL;
if (card_count >= BOARD_COUNT) if (card_count >= BOARD_COUNT)
goto err; 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); dev_info(&pdev->dev, "ISI PCI Card(Device ID 0x%x)\n", ent->device);
/* allot the first empty slot in the array */ /* 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->index = index;
board->base = ioaddr; board->base = pci_resource_start(pdev, 3);
board->irq = pciirq; board->irq = pdev->irq;
card_count++; card_count++;
pci_set_drvdata(pdev, board); pci_set_drvdata(pdev, board);