lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

PCI: cleanup MSI code

Browse Source 
Cleanup MSI code as follows:

 - fix some types
 - fix strange local variable definition
 - delete unnecessary blank line
 - add comment to #endif which is far from corresponding #ifdef

Signed-off-by: Satoru Takeuchi <takeuchi_satoru@jp.fujitsu.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
Satoru Takeuchi
2007-01-18 13:50:05 +09:00
committed by Greg Kroah-Hartman
parent 8255cf35d5
commit c54c187907
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
drivers/pci/msi.c
View File

@@ -162,6 +162,7 @@ void unmask_msi_irq(unsigned int irq)
} }
static int msi_free_irq(struct pci_dev* dev, int irq); static int msi_free_irq(struct pci_dev* dev, int irq);
static int msi_init(void) static int msi_init(void)
{ {
static int status = -ENOMEM; static int status = -ENOMEM;
@@ -291,7 +292,7 @@ static int msi_lookup_irq(struct pci_dev *dev, int type)
continue; continue;
spin_unlock_irqrestore(&msi_lock, flags); spin_unlock_irqrestore(&msi_lock, flags);
/* This pre-assigned MSI irq for this device /* This pre-assigned MSI irq for this device
already exits. Override dev->irq with this irq */ already exists. Override dev->irq with this irq */
dev->irq = irq; dev->irq = irq;
return 0; return 0;
} }
@@ -458,7 +459,7 @@ void pci_restore_msix_state(struct pci_dev *dev)
pci_write_config_word(dev, msi_control_reg(pos), save); pci_write_config_word(dev, msi_control_reg(pos), save);
enable_msi_mode(dev, pos, PCI_CAP_ID_MSIX); enable_msi_mode(dev, pos, PCI_CAP_ID_MSIX);
} }
#endif #endif /* CONFIG_PM */
/** /**
* msi_capability_init - configure device's MSI capability structure * msi_capability_init - configure device's MSI capability structure

3
include/linux/msi.h
View File

@@ -7,11 +7,10 @@ struct msi_msg {
u32 data; /* 16 bits of msi message data */ u32 data; /* 16 bits of msi message data */
}; };
/* Heper functions */ /* Helper functions */
extern void mask_msi_irq(unsigned int irq); extern void mask_msi_irq(unsigned int irq);
extern void unmask_msi_irq(unsigned int irq); extern void unmask_msi_irq(unsigned int irq);
extern void read_msi_msg(unsigned int irq, struct msi_msg *msg); extern void read_msi_msg(unsigned int irq, struct msi_msg *msg);
extern void write_msi_msg(unsigned int irq, struct msi_msg *msg); extern void write_msi_msg(unsigned int irq, struct msi_msg *msg);
struct msi_desc { struct msi_desc {