From: Paul Gortmaker <p_gortmaker@yahoo.com>
To: James Bottomley <James.Bottomley@SteelEye.com>
Cc: linux-scsi@vger.kernel.org
Subject: [PATCH] 2.6.9 scsi/advansys.c and !CONFIG_PCI
Date: Mon, 20 Dec 2004 05:27:39 -0500 [thread overview]
Message-ID: <41C6A91B.1030403@yahoo.com> (raw)
[-- Attachment #1: Type: text/plain, Size: 241 bytes --]
advansys.c fails to build for old ISA cards when CONFIG_PCI is not
enabled. Patch is against
http://linux-scsi.bkbits.net:8080/scsi-for-linus-2.6
but should apply to straight 2.6.9
Signed-off-by: Paul Gortmaker <p_gortmaker@yahoo.com>
[-- Attachment #2: 2.6.9-advansys_diff0 --]
[-- Type: text/plain, Size: 1513 bytes --]
--- linux-386/drivers/scsi/advansys.c~ Mon Dec 20 04:59:12 2004
+++ linux-386/drivers/scsi/advansys.c Mon Dec 20 05:04:35 2004
@@ -4322,12 +4322,12 @@ advansys_detect(struct scsi_host_templat
int ioport = 0;
int share_irq = FALSE;
int iolen = 0;
+ struct device *dev = NULL;
#ifdef CONFIG_PCI
int pci_init_search = 0;
struct pci_dev *pci_devicep[ASC_NUM_BOARD_SUPPORTED];
int pci_card_cnt_max = 0;
int pci_card_cnt = 0;
- struct device *dev = NULL;
struct pci_dev *pci_devp = NULL;
int pci_device_id_cnt = 0;
unsigned int pci_device_id[ASC_PCI_DEVICE_ID_CNT] = {
@@ -8944,7 +8944,7 @@ DvcAdvWritePCIConfigByte(
#ifdef CONFIG_PCI
pci_write_config_byte(to_pci_dev(asc_dvc->cfg->dev), offset, byte_data);
#else /* CONFIG_PCI */
- return 0;
+ return;
#endif /* CONFIG_PCI */
}
@@ -12014,13 +12014,13 @@ AscInitFromAscDvcVar(
PortAddr iop_base;
ushort cfg_msw;
ushort warn_code;
- ushort pci_device_id;
+ ushort pci_device_id = 0;
iop_base = asc_dvc->iop_base;
+#ifdef CONFIG_PCI
if (asc_dvc->cfg->dev)
pci_device_id = to_pci_dev(asc_dvc->cfg->dev)->device;
- else
- pci_device_id = 0;
+#endif
warn_code = 0;
cfg_msw = AscGetChipCfgMsw(iop_base);
if ((cfg_msw & ASC_CFG_MSW_CLR_MASK) != 0) {
reply other threads:[~2004-12-20 10:26 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=41C6A91B.1030403@yahoo.com \
--to=p_gortmaker@yahoo.com \
--cc=James.Bottomley@SteelEye.com \
--cc=linux-scsi@vger.kernel.org \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.