projects
/
linux.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
31ddf74
)
LF-3709 PCI: imx: fix the build warning
author
Richard Zhu
<hongxing.zhu@nxp.com>
Wed, 14 Apr 2021 02:01:37 +0000
(10:01 +0800)
committer
Richard Zhu
<hongxing.zhu@nxp.com>
Thu, 15 Apr 2021 07:28:46 +0000
(15:28 +0800)
Fix the build warning introduced by the previouse commit merge
conflictions.
Fixes: commit
1713c6ce909c
("MLK-25283-4 PCI: imx: adjust the l1ss support to proper place")
Signed-off-by: Richard Zhu <hongxing.zhu@nxp.com>
Reviewed-by: Jun Li <jun.li@nxp.com>
drivers/pci/controller/dwc/pci-imx6.c
patch
|
blob
|
history
diff --git
a/drivers/pci/controller/dwc/pci-imx6.c
b/drivers/pci/controller/dwc/pci-imx6.c
index
34e163e
..
37d9880
100644
(file)
--- a/
drivers/pci/controller/dwc/pci-imx6.c
+++ b/
drivers/pci/controller/dwc/pci-imx6.c
@@
-2380,7
+2380,6
@@
static int imx6_pcie_probe(struct platform_device *pdev)
void __iomem *iomem;
struct regmap_config regconfig = imx6_pcie_regconfig;
int ret;
- u32 reg;
imx6_pcie = devm_kzalloc(dev, sizeof(*imx6_pcie), GFP_KERNEL);
if (!imx6_pcie)