diff options
| -rw-r--r-- | drivers/pci/host/pci-keystone-dw.c | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/drivers/pci/host/pci-keystone-dw.c b/drivers/pci/host/pci-keystone-dw.c index ed34c9520a02..6153853ca9c3 100644 --- a/drivers/pci/host/pci-keystone-dw.c +++ b/drivers/pci/host/pci-keystone-dw.c | |||
| @@ -58,11 +58,6 @@ | |||
| 58 | 58 | ||
| 59 | #define to_keystone_pcie(x) container_of(x, struct keystone_pcie, pp) | 59 | #define to_keystone_pcie(x) container_of(x, struct keystone_pcie, pp) |
| 60 | 60 | ||
| 61 | static inline struct pcie_port *sys_to_pcie(struct pci_sys_data *sys) | ||
| 62 | { | ||
| 63 | return sys->private_data; | ||
| 64 | } | ||
| 65 | |||
| 66 | static inline void update_reg_offset_bit_pos(u32 offset, u32 *reg_offset, | 61 | static inline void update_reg_offset_bit_pos(u32 offset, u32 *reg_offset, |
| 67 | u32 *bit_pos) | 62 | u32 *bit_pos) |
| 68 | { | 63 | { |
| @@ -108,7 +103,7 @@ static void ks_dw_pcie_msi_irq_ack(struct irq_data *d) | |||
| 108 | struct pcie_port *pp; | 103 | struct pcie_port *pp; |
| 109 | 104 | ||
| 110 | msi = irq_data_get_msi_desc(d); | 105 | msi = irq_data_get_msi_desc(d); |
| 111 | pp = sys_to_pcie(msi_desc_to_pci_sysdata(msi)); | 106 | pp = (struct pcie_port *) msi_desc_to_pci_sysdata(msi); |
| 112 | ks_pcie = to_keystone_pcie(pp); | 107 | ks_pcie = to_keystone_pcie(pp); |
| 113 | offset = d->irq - irq_linear_revmap(pp->irq_domain, 0); | 108 | offset = d->irq - irq_linear_revmap(pp->irq_domain, 0); |
| 114 | update_reg_offset_bit_pos(offset, ®_offset, &bit_pos); | 109 | update_reg_offset_bit_pos(offset, ®_offset, &bit_pos); |
| @@ -146,7 +141,7 @@ static void ks_dw_pcie_msi_irq_mask(struct irq_data *d) | |||
| 146 | u32 offset; | 141 | u32 offset; |
| 147 | 142 | ||
| 148 | msi = irq_data_get_msi_desc(d); | 143 | msi = irq_data_get_msi_desc(d); |
| 149 | pp = sys_to_pcie(msi_desc_to_pci_sysdata(msi)); | 144 | pp = (struct pcie_port *) msi_desc_to_pci_sysdata(msi); |
| 150 | ks_pcie = to_keystone_pcie(pp); | 145 | ks_pcie = to_keystone_pcie(pp); |
| 151 | offset = d->irq - irq_linear_revmap(pp->irq_domain, 0); | 146 | offset = d->irq - irq_linear_revmap(pp->irq_domain, 0); |
| 152 | 147 | ||
| @@ -167,7 +162,7 @@ static void ks_dw_pcie_msi_irq_unmask(struct irq_data *d) | |||
| 167 | u32 offset; | 162 | u32 offset; |
| 168 | 163 | ||
| 169 | msi = irq_data_get_msi_desc(d); | 164 | msi = irq_data_get_msi_desc(d); |
| 170 | pp = sys_to_pcie(msi_desc_to_pci_sysdata(msi)); | 165 | pp = (struct pcie_port *) msi_desc_to_pci_sysdata(msi); |
| 171 | ks_pcie = to_keystone_pcie(pp); | 166 | ks_pcie = to_keystone_pcie(pp); |
| 172 | offset = d->irq - irq_linear_revmap(pp->irq_domain, 0); | 167 | offset = d->irq - irq_linear_revmap(pp->irq_domain, 0); |
| 173 | 168 | ||
