Skip to content

Commit d76d273

Browse files
committed
Merge branch 'remotes/lorenzo/pci/dwc'
- Fix dwc find_next_bit() usage (Niklas Cassel) * remotes/lorenzo/pci/dwc: PCI: dwc: Fix find_next_bit() usage
2 parents ba7e87c + 1137e61 commit d76d273

File tree

1 file changed

+6
-5
lines changed

1 file changed

+6
-5
lines changed

drivers/pci/controller/dwc/pcie-designware-host.c

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -79,22 +79,23 @@ static struct msi_domain_info dw_pcie_msi_domain_info = {
7979
irqreturn_t dw_handle_msi_irq(struct pcie_port *pp)
8080
{
8181
int i, pos, irq;
82-
u32 val, num_ctrls;
82+
unsigned long val;
83+
u32 status, num_ctrls;
8384
irqreturn_t ret = IRQ_NONE;
8485

8586
num_ctrls = pp->num_vectors / MAX_MSI_IRQS_PER_CTRL;
8687

8788
for (i = 0; i < num_ctrls; i++) {
8889
dw_pcie_rd_own_conf(pp, PCIE_MSI_INTR0_STATUS +
8990
(i * MSI_REG_CTRL_BLOCK_SIZE),
90-
4, &val);
91-
if (!val)
91+
4, &status);
92+
if (!status)
9293
continue;
9394

9495
ret = IRQ_HANDLED;
96+
val = status;
9597
pos = 0;
96-
while ((pos = find_next_bit((unsigned long *) &val,
97-
MAX_MSI_IRQS_PER_CTRL,
98+
while ((pos = find_next_bit(&val, MAX_MSI_IRQS_PER_CTRL,
9899
pos)) != MAX_MSI_IRQS_PER_CTRL) {
99100
irq = irq_find_mapping(pp->irq_domain,
100101
(i * MAX_MSI_IRQS_PER_CTRL) +

0 commit comments

Comments
 (0)