From: Alan Cox <alan@redhat.com>
To: linux-kernel@vger.kernel.org
Subject: [PATCH 08/19] qla2xxx: Switch to ROM API
Date: Sun, 05 Oct 2008 17:36:52 +0100 [thread overview]
Message-ID: <20081005163649.3799.96955.stgit@localhost.localdomain> (raw)
In-Reply-To: <20081005163302.3799.61899.stgit@localhost.localdomain>
Depends on the pci_enable/disable_rom being exported. Closes #9422
---
drivers/scsi/qla2xxx/qla_init.c | 20 ++++----------------
1 files changed, 4 insertions(+), 16 deletions(-)
diff --git a/drivers/scsi/qla2xxx/qla_init.c b/drivers/scsi/qla2xxx/qla_init.c
index ee89ddd..cabc84b 100644
--- a/drivers/scsi/qla2xxx/qla_init.c
+++ b/drivers/scsi/qla2xxx/qla_init.c
@@ -134,7 +134,6 @@ int
qla2100_pci_config(scsi_qla_host_t *ha)
{
uint16_t w;
- uint32_t d;
unsigned long flags;
struct device_reg_2xxx __iomem *reg = &ha->iobase->isp;
@@ -146,9 +145,7 @@ qla2100_pci_config(scsi_qla_host_t *ha)
pci_write_config_word(ha->pdev, PCI_COMMAND, w);
/* Reset expansion ROM address decode enable */
- pci_read_config_dword(ha->pdev, PCI_ROM_ADDRESS, &d);
- d &= ~PCI_ROM_ADDRESS_ENABLE;
- pci_write_config_dword(ha->pdev, PCI_ROM_ADDRESS, d);
+ pci_disable_rom(ha->pdev);
/* Get PCI bus information. */
spin_lock_irqsave(&ha->hardware_lock, flags);
@@ -168,7 +165,6 @@ int
qla2300_pci_config(scsi_qla_host_t *ha)
{
uint16_t w;
- uint32_t d;
unsigned long flags = 0;
uint32_t cnt;
struct device_reg_2xxx __iomem *reg = &ha->iobase->isp;
@@ -231,9 +227,7 @@ qla2300_pci_config(scsi_qla_host_t *ha)
pci_write_config_byte(ha->pdev, PCI_LATENCY_TIMER, 0x80);
/* Reset expansion ROM address decode enable */
- pci_read_config_dword(ha->pdev, PCI_ROM_ADDRESS, &d);
- d &= ~PCI_ROM_ADDRESS_ENABLE;
- pci_write_config_dword(ha->pdev, PCI_ROM_ADDRESS, d);
+ pci_disable_rom(ha->pdev);
/* Get PCI bus information. */
spin_lock_irqsave(&ha->hardware_lock, flags);
@@ -253,7 +247,6 @@ int
qla24xx_pci_config(scsi_qla_host_t *ha)
{
uint16_t w;
- uint32_t d;
unsigned long flags = 0;
struct device_reg_24xx __iomem *reg = &ha->iobase->isp24;
@@ -276,9 +269,7 @@ qla24xx_pci_config(scsi_qla_host_t *ha)
pcie_set_readrq(ha->pdev, 2048);
/* Reset expansion ROM address decode enable */
- pci_read_config_dword(ha->pdev, PCI_ROM_ADDRESS, &d);
- d &= ~PCI_ROM_ADDRESS_ENABLE;
- pci_write_config_dword(ha->pdev, PCI_ROM_ADDRESS, d);
+ pci_disable_rom(ha->pdev);
ha->chip_revision = ha->pdev->revision;
@@ -300,7 +291,6 @@ int
qla25xx_pci_config(scsi_qla_host_t *ha)
{
uint16_t w;
- uint32_t d;
pci_set_master(ha->pdev);
pci_try_set_mwi(ha->pdev);
@@ -315,9 +305,7 @@ qla25xx_pci_config(scsi_qla_host_t *ha)
pcie_set_readrq(ha->pdev, 2048);
/* Reset expansion ROM address decode enable */
- pci_read_config_dword(ha->pdev, PCI_ROM_ADDRESS, &d);
- d &= ~PCI_ROM_ADDRESS_ENABLE;
- pci_write_config_dword(ha->pdev, PCI_ROM_ADDRESS, d);
+ pci_disable_rom(ha->pdev);
ha->chip_revision = ha->pdev->revision;
next prev parent reply other threads:[~2008-10-05 16:39 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-10-05 16:34 [PATCH 00/19] Alan's Miscellaneous Tree Alan Cox
2008-10-05 16:35 ` [PATCH 01/19] pcmcia: Fix wireless drivers Alan Cox
2008-10-05 16:35 ` [PATCH 02/19] pcmcia: IRQ_TYPE_EXCLUSIVE is long obsoleted Alan Cox
2008-10-05 16:40 ` Marcel Holtmann
2008-10-17 21:17 ` Dominik Brodowski
2008-10-05 16:35 ` [PATCH 03/19] pcmcia: Whine harder about use of EXCLUSIVE Alan Cox
2008-10-17 21:17 ` Dominik Brodowski
2008-10-05 16:36 ` [PATCH 04/19] ib700wdt: Fix off by one Alan Cox
2008-10-05 16:36 ` [PATCH 05/19] aic7xxx: MHz not Mhz for SI unit pedants Alan Cox
2008-10-05 16:36 ` [PATCH 06/19] hfsplus: O_LARGEFILE checking is missing Alan Cox
2008-10-05 16:36 ` [PATCH 07/19] mtd: intel_dc21285 switch to ROM API Alan Cox
2008-10-05 16:36 ` Alan Cox [this message]
2008-10-05 16:37 ` [PATCH 09/19] mtd: map_rom has NULL erase pointer Alan Cox
2008-10-05 16:37 ` [PATCH 10/19] ibmtr: PCMCIA IBMTR is ok on 64bit Alan Cox
2008-10-05 16:37 ` [PATCH 11/19] mptlan: Kill unused NAA workaround code Alan Cox
2008-10-05 16:37 ` [PATCH 12/19] pxa27x_udc: leak fix Alan Cox
2008-10-05 16:37 ` [PATCH 13/19] serial_8250: pci_enable_device fail is not fully handled Alan Cox
2008-10-05 16:38 ` [PATCH 14/19] parport: quickfix the proc registration bug Alan Cox
2008-10-05 18:10 ` Frans Pop
2008-10-05 18:22 ` Alan Cox
2008-10-05 16:38 ` [PATCH 15/19] email: sort out a consistent email address for contributions and stuff Alan Cox
2008-10-05 16:38 ` [PATCH 16/19] mptsas: remove unneeded check Alan Cox
2008-10-05 16:38 ` [PATCH 17/19] cdc-acm: Add another conexant modem to the quirks Alan Cox
2008-10-05 16:39 ` [PATCH 18/19] modinfo: Remove duplicate modinfo from some drivers Alan Cox
2008-10-06 8:54 ` Adrian Bunk
2008-10-05 16:39 ` [PATCH 19/19] fdomain_cs: Sort out modules with duplicate description Alan Cox
2008-10-17 21:18 ` Dominik Brodowski
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=20081005163649.3799.96955.stgit@localhost.localdomain \
--to=alan@redhat.com \
--cc=linux-kernel@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.