iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

PCI: Drop msi_lower_address_reg() and msi_upper_address_reg() macros

Browse Source 
msi_lower_address_reg() and msi_upper_address_reg() don't provide any
useful abstraction, so drop them.

Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
This commit is contained in:
Bjorn Helgaas 2013-04-17 17:39:57 -06:00
parent f84ecd285f
commit 9925ad0cf1
2 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
drivers/pci/msi.c
View File

@ -244,11 +244,11 @@ void __read_msi_msg(struct msi_desc *entry, struct msi_msg *msg)
int pos = dev->msi_cap; int pos = dev->msi_cap;
u16 data; u16 data;
pci_read_config_dword(dev, msi_lower_address_reg(pos), pci_read_config_dword(dev, pos + PCI_MSI_ADDRESS_LO,
&msg->address_lo); &msg->address_lo);
if (entry->msi_attrib.is_64) { if (entry->msi_attrib.is_64) {
pci_read_config_dword(dev, msi_upper_address_reg(pos), pci_read_config_dword(dev, pos + PCI_MSI_ADDRESS_HI,
&msg->address_hi); &msg->address_hi);
pci_read_config_word(dev, msi_data_reg(pos, 1), &data); pci_read_config_word(dev, msi_data_reg(pos, 1), &data);
} else { } else {
msg->address_hi = 0; msg->address_hi = 0;
@ -304,11 +304,11 @@ void __write_msi_msg(struct msi_desc *entry, struct msi_msg *msg)
msgctl |= entry->msi_attrib.multiple << 4; msgctl |= entry->msi_attrib.multiple << 4;
pci_write_config_word(dev, pos + PCI_MSI_FLAGS, msgctl); pci_write_config_word(dev, pos + PCI_MSI_FLAGS, msgctl);
pci_write_config_dword(dev, msi_lower_address_reg(pos), pci_write_config_dword(dev, pos + PCI_MSI_ADDRESS_LO,
msg->address_lo); msg->address_lo);
if (entry->msi_attrib.is_64) { if (entry->msi_attrib.is_64) {
pci_write_config_dword(dev, msi_upper_address_reg(pos), pci_write_config_dword(dev, pos + PCI_MSI_ADDRESS_HI,
msg->address_hi); msg->address_hi);
pci_write_config_word(dev, msi_data_reg(pos, 1), pci_write_config_word(dev, msi_data_reg(pos, 1),
msg->data); msg->data);
} else { } else {

2
drivers/pci/msi.h
View File

@ -6,8 +6,6 @@
#ifndef MSI_H #ifndef MSI_H
#define MSI_H #define MSI_H
#define msi_lower_address_reg(base) (base + PCI_MSI_ADDRESS_LO)
#define msi_upper_address_reg(base) (base + PCI_MSI_ADDRESS_HI)
#define msi_data_reg(base, is64bit) \ #define msi_data_reg(base, is64bit) \
(base + ((is64bit == 1) ? PCI_MSI_DATA_64 : PCI_MSI_DATA_32)) (base + ((is64bit == 1) ? PCI_MSI_DATA_64 : PCI_MSI_DATA_32))
#define msi_mask_reg(base, is64bit) \ #define msi_mask_reg(base, is64bit) \