Commit 40e9892e authored by Gustavo Pimentel's avatar Gustavo Pimentel Committed by Lorenzo Pieralisi

PCI: dwc: Rename variable name from data to d on dw_pci_bottom_mask/unmask()

Rename variable from data to d to maintain consistency between driver
functions, such as dw_msi_mask_irq() and dw_msi_unmask_irq().

No functional change is intended.
Signed-off-by: default avatarGustavo Pimentel <gustavo.pimentel@synopsys.com>
Signed-off-by: default avatarLorenzo Pieralisi <lorenzo.pieralisi@arm.com>
Cc: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>
Cc: Joao Pinto <jpinto@synopsys.com>
Cc: Jingoo Han <jingoohan1@gmail.com>
parent 3630c4aa
...@@ -149,20 +149,20 @@ static int dw_pci_msi_set_affinity(struct irq_data *irq_data, ...@@ -149,20 +149,20 @@ static int dw_pci_msi_set_affinity(struct irq_data *irq_data,
return -EINVAL; return -EINVAL;
} }
static void dw_pci_bottom_mask(struct irq_data *data) static void dw_pci_bottom_mask(struct irq_data *d)
{ {
struct pcie_port *pp = irq_data_get_irq_chip_data(data); struct pcie_port *pp = irq_data_get_irq_chip_data(d);
unsigned int res, bit, ctrl; unsigned int res, bit, ctrl;
unsigned long flags; unsigned long flags;
raw_spin_lock_irqsave(&pp->lock, flags); raw_spin_lock_irqsave(&pp->lock, flags);
if (pp->ops->msi_clear_irq) { if (pp->ops->msi_clear_irq) {
pp->ops->msi_clear_irq(pp, data->hwirq); pp->ops->msi_clear_irq(pp, d->hwirq);
} else { } else {
ctrl = data->hwirq / MAX_MSI_IRQS_PER_CTRL; ctrl = d->hwirq / MAX_MSI_IRQS_PER_CTRL;
res = ctrl * MSI_REG_CTRL_BLOCK_SIZE; res = ctrl * MSI_REG_CTRL_BLOCK_SIZE;
bit = data->hwirq % MAX_MSI_IRQS_PER_CTRL; bit = d->hwirq % MAX_MSI_IRQS_PER_CTRL;
pp->irq_status[ctrl] &= ~(1 << bit); pp->irq_status[ctrl] &= ~(1 << bit);
dw_pcie_wr_own_conf(pp, PCIE_MSI_INTR0_MASK + res, 4, dw_pcie_wr_own_conf(pp, PCIE_MSI_INTR0_MASK + res, 4,
...@@ -172,20 +172,20 @@ static void dw_pci_bottom_mask(struct irq_data *data) ...@@ -172,20 +172,20 @@ static void dw_pci_bottom_mask(struct irq_data *data)
raw_spin_unlock_irqrestore(&pp->lock, flags); raw_spin_unlock_irqrestore(&pp->lock, flags);
} }
static void dw_pci_bottom_unmask(struct irq_data *data) static void dw_pci_bottom_unmask(struct irq_data *d)
{ {
struct pcie_port *pp = irq_data_get_irq_chip_data(data); struct pcie_port *pp = irq_data_get_irq_chip_data(d);
unsigned int res, bit, ctrl; unsigned int res, bit, ctrl;
unsigned long flags; unsigned long flags;
raw_spin_lock_irqsave(&pp->lock, flags); raw_spin_lock_irqsave(&pp->lock, flags);
if (pp->ops->msi_set_irq) { if (pp->ops->msi_set_irq) {
pp->ops->msi_set_irq(pp, data->hwirq); pp->ops->msi_set_irq(pp, d->hwirq);
} else { } else {
ctrl = data->hwirq / MAX_MSI_IRQS_PER_CTRL; ctrl = d->hwirq / MAX_MSI_IRQS_PER_CTRL;
res = ctrl * MSI_REG_CTRL_BLOCK_SIZE; res = ctrl * MSI_REG_CTRL_BLOCK_SIZE;
bit = data->hwirq % MAX_MSI_IRQS_PER_CTRL; bit = d->hwirq % MAX_MSI_IRQS_PER_CTRL;
pp->irq_status[ctrl] |= 1 << bit; pp->irq_status[ctrl] |= 1 << bit;
dw_pcie_wr_own_conf(pp, PCIE_MSI_INTR0_MASK + res, 4, dw_pcie_wr_own_conf(pp, PCIE_MSI_INTR0_MASK + res, 4,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment