Skip to content

Commit

Permalink
[PATCH] PCI: clean up msi.c a bit
Browse files Browse the repository at this point in the history 
Clean up: move assignments outside of if() statements.
AFAICT, no functional change. Easier to read/understand.

Depends on "[PATCH 1/3] msi vector targeting abstractions"
by Mark Maule <maule@sgi.com>.
I expect one hunk to fail if applied against 2.6.15.

This is essentially Joe Perches' patch.
I've cleaned up the one instance added by Mark's patch.

Signed-off-by: Grant Grundler <grundler@parisc-linux.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  • Loading branch information
Grant Grundler authored and Greg Kroah-Hartman committed Mar 23, 2006
1 parent b0e6e96 commit b64c05e
Show file tree
Hide file tree
Showing 2 changed files with 37 additions and 23 deletions.
55 changes: 35 additions & 20 deletions drivers/pci/msi.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -103,9 +103,9 @@ static void set_msi_affinity(unsigned int vector, cpumask_t cpu_mask)
switch (entry->msi_attrib.type) {
case PCI_CAP_ID_MSI:
{
int pos;
int pos = pci_find_capability(entry->dev, PCI_CAP_ID_MSI);

if (!(pos = pci_find_capability(entry->dev, PCI_CAP_ID_MSI)))
if (!pos)
return;

pci_read_config_dword(entry->dev, msi_lower_address_reg(pos),
Expand Down Expand Up @@ -347,9 +347,9 @@ static int assign_msi_vector(void)

static int get_new_vector(void)
{
int vector;
int vector = assign_msi_vector();

if ((vector = assign_msi_vector()) > 0)
if (vector > 0)
set_intr_gate(vector, interrupt[vector]);

return vector;
Expand All @@ -369,7 +369,8 @@ static int msi_init(void)
return status;
}

if ((status = msi_cache_init()) < 0) {
status = msi_cache_init();
if (status < 0) {
pci_msi_enable = 0;
printk(KERN_WARNING "PCI: MSI cache init failed\n");
return status;
Expand Down Expand Up @@ -523,10 +524,12 @@ static int msi_capability_init(struct pci_dev *dev)
pos = pci_find_capability(dev, PCI_CAP_ID_MSI);
pci_read_config_word(dev, msi_control_reg(pos), &control);
/* MSI Entry Initialization */
if (!(entry = alloc_msi_entry()))
entry = alloc_msi_entry();
if (!entry)
return -ENOMEM;

if ((vector = get_msi_vector(dev)) < 0) {
vector = get_msi_vector(dev);
if (vector < 0) {
kmem_cache_free(msi_cachep, entry);
return -EBUSY;
}
Expand Down Expand Up @@ -620,7 +623,8 @@ static int msix_capability_init(struct pci_dev *dev,
entry = alloc_msi_entry();
if (!entry)
break;
if ((vector = get_msi_vector(dev)) < 0)
vector = get_msi_vector(dev);
if (vector < 0)
break;

j = entries[i].entry;
Expand Down Expand Up @@ -701,10 +705,12 @@ int pci_enable_msi(struct pci_dev* dev)

temp = dev->irq;

if ((status = msi_init()) < 0)
status = msi_init();
if (status < 0)
return status;

if (!(pos = pci_find_capability(dev, PCI_CAP_ID_MSI)))
pos = pci_find_capability(dev, PCI_CAP_ID_MSI);
if (!pos)
return -EINVAL;

pci_read_config_word(dev, msi_control_reg(pos), &control);
Expand All @@ -728,8 +734,8 @@ int pci_enable_msi(struct pci_dev* dev)
dev->irq = temp;
}
/* Check whether driver already requested for MSI-X vectors */
if ((pos = pci_find_capability(dev, PCI_CAP_ID_MSIX)) > 0 &&
!msi_lookup_vector(dev, PCI_CAP_ID_MSIX)) {
pos = pci_find_capability(dev, PCI_CAP_ID_MSIX);
if (pos > 0 && !msi_lookup_vector(dev, PCI_CAP_ID_MSIX)) {
printk(KERN_INFO "PCI: %s: Can't enable MSI. "
"Device already has MSI-X vectors assigned\n",
pci_name(dev));
Expand All @@ -755,7 +761,10 @@ void pci_disable_msi(struct pci_dev* dev)
u16 control;
unsigned long flags;

if (!dev || !(pos = pci_find_capability(dev, PCI_CAP_ID_MSI)))
if (!dev)
return;
pos = pci_find_capability(dev, PCI_CAP_ID_MSI);
if (!pos)
return;

pci_read_config_word(dev, msi_control_reg(pos), &control);
Expand Down Expand Up @@ -924,10 +933,12 @@ int pci_enable_msix(struct pci_dev* dev, struct msix_entry *entries, int nvec)
if (!pci_msi_enable || !dev || !entries)
return -EINVAL;

if ((status = msi_init()) < 0)
status = msi_init();
if (status < 0)
return status;

if (!(pos = pci_find_capability(dev, PCI_CAP_ID_MSIX)))
pos = pci_find_capability(dev, PCI_CAP_ID_MSIX);
if (!pos)
return -EINVAL;

pci_read_config_word(dev, msi_control_reg(pos), &control);
Expand Down Expand Up @@ -1006,7 +1017,11 @@ void pci_disable_msix(struct pci_dev* dev)
int pos, temp;
u16 control;

if (!dev || !(pos = pci_find_capability(dev, PCI_CAP_ID_MSIX)))
if (!dev)
return;

pos = pci_find_capability(dev, PCI_CAP_ID_MSIX);
if (!pos)
return;

pci_read_config_word(dev, msi_control_reg(pos), &control);
Expand Down Expand Up @@ -1066,8 +1081,8 @@ void msi_remove_pci_irq_vectors(struct pci_dev* dev)
return;

temp = dev->irq; /* Save IOAPIC IRQ */
if ((pos = pci_find_capability(dev, PCI_CAP_ID_MSI)) > 0 &&
!msi_lookup_vector(dev, PCI_CAP_ID_MSI)) {
pos = pci_find_capability(dev, PCI_CAP_ID_MSI);
if (pos > 0 && !msi_lookup_vector(dev, PCI_CAP_ID_MSI)) {
spin_lock_irqsave(&msi_lock, flags);
state = msi_desc[dev->irq]->msi_attrib.state;
spin_unlock_irqrestore(&msi_lock, flags);
Expand All @@ -1080,8 +1095,8 @@ void msi_remove_pci_irq_vectors(struct pci_dev* dev)
msi_free_vector(dev, dev->irq, 0);
dev->irq = temp; /* Restore IOAPIC IRQ */
}
if ((pos = pci_find_capability(dev, PCI_CAP_ID_MSIX)) > 0 &&
!msi_lookup_vector(dev, PCI_CAP_ID_MSIX)) {
pos = pci_find_capability(dev, PCI_CAP_ID_MSIX);
if (pos > 0 && !msi_lookup_vector(dev, PCI_CAP_ID_MSIX)) {
int vector, head, tail = 0, warning = 0;
void __iomem *base = NULL;

Expand Down
5 changes: 2 additions & 3 deletions drivers/pci/pci.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -495,9 +495,8 @@ pci_enable_device_bars(struct pci_dev *dev, int bars)
int
pci_enable_device(struct pci_dev *dev)
{
int err;

if ((err = pci_enable_device_bars(dev, (1 << PCI_NUM_RESOURCES) - 1)))
int err = pci_enable_device_bars(dev, (1 << PCI_NUM_RESOURCES) - 1);
if (err)
return err;
pci_fixup_device(pci_fixup_enable, dev);
dev->is_enabled = 1;
Expand Down

0 comments on commit b64c05e

Please sign in to comment.