projects
/
linux-2.6-microblaze.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'io_uring-5.15-2021-09-11' of git://git.kernel.dk/linux-block
[linux-2.6-microblaze.git]
/
drivers
/
pci
/
controller
/
pci-tegra.c
diff --git
a/drivers/pci/controller/pci-tegra.c
b/drivers/pci/controller/pci-tegra.c
index
c979229
..
cb0aa65
100644
(file)
--- a/
drivers/pci/controller/pci-tegra.c
+++ b/
drivers/pci/controller/pci-tegra.c
@@
-372,11
+372,6
@@
struct tegra_pcie_port {
struct gpio_desc *reset_gpio;
};
struct gpio_desc *reset_gpio;
};
-struct tegra_pcie_bus {
- struct list_head list;
- unsigned int nr;
-};
-
static inline void afi_writel(struct tegra_pcie *pcie, u32 value,
unsigned long offset)
{
static inline void afi_writel(struct tegra_pcie *pcie, u32 value,
unsigned long offset)
{
@@
-764,7
+759,7
@@
static int tegra_pcie_map_irq(const struct pci_dev *pdev, u8 slot, u8 pin)
static irqreturn_t tegra_pcie_isr(int irq, void *arg)
{
static irqreturn_t tegra_pcie_isr(int irq, void *arg)
{
-
const char *
err_msg[] = {
+
static const char * const
err_msg[] = {
"Unknown",
"AXI slave error",
"AXI decode error",
"Unknown",
"AXI slave error",
"AXI decode error",
@@
-1553,12
+1548,10
@@
static void tegra_pcie_msi_irq(struct irq_desc *desc)
while (reg) {
unsigned int offset = find_first_bit(®, 32);
unsigned int index = i * 32 + offset;
while (reg) {
unsigned int offset = find_first_bit(®, 32);
unsigned int index = i * 32 + offset;
-
unsigned int irq
;
+
int ret
;
- irq = irq_find_mapping(msi->domain->parent, index);
- if (irq) {
- generic_handle_irq(irq);
- } else {
+ ret = generic_handle_domain_irq(msi->domain->parent, index);
+ if (ret) {
/*
* that's weird who triggered this?
* just clear it
/*
* that's weird who triggered this?
* just clear it
@@
-2193,13
+2186,15
@@
static int tegra_pcie_parse_dt(struct tegra_pcie *pcie)
rp->np = port;
rp->base = devm_pci_remap_cfg_resource(dev, &rp->regs);
rp->np = port;
rp->base = devm_pci_remap_cfg_resource(dev, &rp->regs);
- if (IS_ERR(rp->base))
- return PTR_ERR(rp->base);
+ if (IS_ERR(rp->base)) {
+ err = PTR_ERR(rp->base);
+ goto err_node_put;
+ }
label = devm_kasprintf(dev, GFP_KERNEL, "pex-reset-%u", index);
if (!label) {
label = devm_kasprintf(dev, GFP_KERNEL, "pex-reset-%u", index);
if (!label) {
-
dev_err(dev, "failed to create reset GPIO label\n")
;
-
return -ENOMEM
;
+
err = -ENOMEM
;
+
goto err_node_put
;
}
/*
}
/*
@@
-2217,7
+2212,8
@@
static int tegra_pcie_parse_dt(struct tegra_pcie *pcie)
} else {
dev_err(dev, "failed to get reset GPIO: %ld\n",
PTR_ERR(rp->reset_gpio));
} else {
dev_err(dev, "failed to get reset GPIO: %ld\n",
PTR_ERR(rp->reset_gpio));
- return PTR_ERR(rp->reset_gpio);
+ err = PTR_ERR(rp->reset_gpio);
+ goto err_node_put;
}
}
}
}
@@
-2548,7
+2544,7
@@
static void *tegra_pcie_ports_seq_start(struct seq_file *s, loff_t *pos)
if (list_empty(&pcie->ports))
return NULL;
if (list_empty(&pcie->ports))
return NULL;
- seq_p
rintf
(s, "Index Status\n");
+ seq_p
uts
(s, "Index Status\n");
return seq_list_start(&pcie->ports, *pos);
}
return seq_list_start(&pcie->ports, *pos);
}
@@
-2585,16
+2581,16
@@
static int tegra_pcie_ports_seq_show(struct seq_file *s, void *v)
seq_printf(s, "%2u ", port->index);
if (up)
seq_printf(s, "%2u ", port->index);
if (up)
- seq_p
rintf
(s, "up");
+ seq_p
uts
(s, "up");
if (active) {
if (up)
if (active) {
if (up)
- seq_p
rintf
(s, ", ");
+ seq_p
uts
(s, ", ");
- seq_p
rintf
(s, "active");
+ seq_p
uts
(s, "active");
}
}
- seq_p
rintf
(s, "\n");
+ seq_p
uts
(s, "\n");
return 0;
}
return 0;
}