diff options
| author | Satoru Takeuchi <takeuchi_satoru@jp.fujitsu.com> | 2007-01-18 07:50:05 +0300 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2007-02-08 02:50:06 +0300 |
| commit | c54c18790700b8b2a503945d729aa425c25691fe (patch) | |
| tree | 90061bba5831aa5112afb08fc2fc89f32582078b | |
| parent | 8255cf35d503db7c1b26ae53b6b7f23ada82316f (diff) | |
| download | linux-c54c18790700b8b2a503945d729aa425c25691fe.tar.xz | |
PCI: cleanup MSI code
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>
| -rw-r--r-- | drivers/pci/msi.c | 9 | ||||
| -rw-r--r-- | include/linux/msi.h | 3 |
2 files changed, 6 insertions, 6 deletions
diff --git a/drivers/pci/msi.c b/drivers/pci/msi.c index ed3f7e1a563c..e87e8efb9bb4 100644 --- a/drivers/pci/msi.c +++ b/drivers/pci/msi.c @@ -49,8 +49,8 @@ static void msi_set_mask_bit(unsigned int irq, int flag) switch (entry->msi_attrib.type) { case PCI_CAP_ID_MSI: if (entry->msi_attrib.maskbit) { - int pos; - u32 mask_bits; + int pos; + u32 mask_bits; pos = (long)entry->mask_base; pci_read_config_dword(entry->dev, pos, &mask_bits); @@ -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_init(void) { static int status = -ENOMEM; @@ -291,7 +292,7 @@ static int msi_lookup_irq(struct pci_dev *dev, int type) continue; spin_unlock_irqrestore(&msi_lock, flags); /* 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; 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); enable_msi_mode(dev, pos, PCI_CAP_ID_MSIX); } -#endif +#endif /* CONFIG_PM */ /** * msi_capability_init - configure device's MSI capability structure diff --git a/include/linux/msi.h b/include/linux/msi.h index c7ef94343673..b99976b1536e 100644 --- a/include/linux/msi.h +++ b/include/linux/msi.h @@ -7,11 +7,10 @@ struct msi_msg { u32 data; /* 16 bits of msi message data */ }; -/* Heper functions */ +/* Helper functions */ extern void mask_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 write_msi_msg(unsigned int irq, struct msi_msg *msg); struct msi_desc { |