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