From: mikem <mikem@beardog.cca.cpqcorp.net>
To: marcelo.tosatti@cyclades.com, axboe@suse.de
Cc: linux-kernel@vger.kernel.org
Subject: cciss update [3/5] pci_dev->irq fix
Date: Fri, 13 Aug 2004 17:06:09 -0500 [thread overview]
Message-ID: <20040813220609.GC1016@beardog.cca.cpqcorp.net> (raw)
Patch 3 of 5.
This patch changes our pdev->intr to an unsigned int to match the
declaration in pci.h. Also cleans up the usage.
Applies to 2.4.27. Please consider this for inclusion.
Thanks,
mikem
-----------------------------------------------------------------------------
diff -burNp lx2427-p002/drivers/block/cciss.c lx2427/drivers/block/cciss.c
--- lx2427-p002/drivers/block/cciss.c 2004-08-13 15:51:28.498087560 -0500
+++ lx2427/drivers/block/cciss.c 2004-08-13 15:49:37.062028416 -0500
@@ -2671,7 +2671,7 @@ static int find_PCI_BAR_index(struct pci
static int cciss_pci_init(ctlr_info_t *c, struct pci_dev *pdev)
{
ushort subsystem_vendor_id, subsystem_device_id, command;
- unchar irq = pdev->irq, ready = 0;
+ int ready = 0;
__u32 board_id, scratchpad;
__u64 cfg_offset;
__u32 cfg_base_addr;
@@ -2727,11 +2727,11 @@ static int cciss_pci_init(ctlr_info_t *c
#ifdef CCISS_DEBUG
printk("command = %x\n", command);
- printk("irq = %x\n", irq);
+ printk("irq = %x\n", pdev->irq);
printk("board_id = %x\n", board_id);
#endif /* CCISS_DEBUG */
- c->intr = irq;
+ c->intr = pdev->irq;
/*
* Memory base addr is first addr , the second points to the config
diff -burNp lx2427-p002/drivers/block/cciss.h lx2427/drivers/block/cciss.h
--- lx2427-p002/drivers/block/cciss.h 2004-02-18 07:36:31.000000000 -0600
+++ lx2427/drivers/block/cciss.h 2004-08-13 15:49:52.185729264 -0500
@@ -51,7 +51,7 @@ struct ctlr_info
unsigned long io_mem_addr;
unsigned long io_mem_length;
CfgTable_struct *cfgtable;
- int intr;
+ unsigned int intr;
int interrupts_enabled;
int max_commands;
int commands_outstanding;
reply other threads:[~2004-08-13 22:07 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20040813220609.GC1016@beardog.cca.cpqcorp.net \
--to=mikem@beardog.cca.cpqcorp.net \
--cc=axboe@suse.de \
--cc=linux-kernel@vger.kernel.org \
--cc=marcelo.tosatti@cyclades.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®