aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/layerscape/patches-5.4/701-net-0338-net-dsa-felix-Fix-probing-allocation-and-cleanup-pat.patch
diff options
context:
space:
mode:
authorAdrian Schmutzler <freifunk@adrianschmutzler.de>2020-08-19 15:41:30 +0200
committerAdrian Schmutzler <freifunk@adrianschmutzler.de>2020-08-20 14:19:39 +0200
commitcf7c101135934710b1958092da9a0c9ad446de4b (patch)
tree8dee4a6f7c93e8bdd24fea0bb84d3c53044349db /target/linux/layerscape/patches-5.4/701-net-0338-net-dsa-felix-Fix-probing-allocation-and-cleanup-pat.patch
parenta14f5bb4bd263c21e103f13279d0c2ff03e48fe5 (diff)
downloadupstream-cf7c101135934710b1958092da9a0c9ad446de4b.tar.gz
upstream-cf7c101135934710b1958092da9a0c9ad446de4b.tar.bz2
upstream-cf7c101135934710b1958092da9a0c9ad446de4b.zip
layerscape: remove useless pairs of kernel patches
The layerscape kernel patches appears to be just some uncleaned local development tree, where patches are sometimes directly followed by their revert. While this does not seem a problem in the first place, it becomes incredibly unpleasant when the upstream kernel changes in the relevant areas and requires rebase. This removes all these patch-revert pairs and refreshs the rest. It removes about 44000 lines of entirely useless code. Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
Diffstat (limited to 'target/linux/layerscape/patches-5.4/701-net-0338-net-dsa-felix-Fix-probing-allocation-and-cleanup-pat.patch')
-rw-r--r--target/linux/layerscape/patches-5.4/701-net-0338-net-dsa-felix-Fix-probing-allocation-and-cleanup-pat.patch6
1 files changed, 3 insertions, 3 deletions
diff --git a/target/linux/layerscape/patches-5.4/701-net-0338-net-dsa-felix-Fix-probing-allocation-and-cleanup-pat.patch b/target/linux/layerscape/patches-5.4/701-net-0338-net-dsa-felix-Fix-probing-allocation-and-cleanup-pat.patch
index 3e99861d16..ec4c62a7a5 100644
--- a/target/linux/layerscape/patches-5.4/701-net-0338-net-dsa-felix-Fix-probing-allocation-and-cleanup-pat.patch
+++ b/target/linux/layerscape/patches-5.4/701-net-0338-net-dsa-felix-Fix-probing-allocation-and-cleanup-pat.patch
@@ -90,7 +90,7 @@ Signed-off-by: Claudiu Manoil <claudiu.manoil@nxp.com>
--- a/drivers/net/dsa/ocelot/felix.c
+++ b/drivers/net/dsa/ocelot/felix.c
-@@ -530,7 +530,7 @@ static int felix_pci_probe(struct pci_de
+@@ -485,7 +485,7 @@ static int felix_pci_probe(struct pci_de
}
}
@@ -99,7 +99,7 @@ Signed-off-by: Claudiu Manoil <claudiu.manoil@nxp.com>
if (!felix) {
err = -ENOMEM;
dev_err(&pdev->dev, "Failed to allocate driver memory\n");
-@@ -577,11 +577,9 @@ static int felix_pci_probe(struct pci_de
+@@ -532,11 +532,9 @@ static int felix_pci_probe(struct pci_de
return 0;
err_register_ds:
@@ -111,7 +111,7 @@ Signed-off-by: Claudiu Manoil <claudiu.manoil@nxp.com>
err_dma:
pci_disable_device(pdev);
err_pci_enable:
-@@ -596,9 +594,6 @@ static void felix_pci_remove(struct pci_
+@@ -551,9 +549,6 @@ static void felix_pci_remove(struct pci_
dsa_unregister_switch(felix->ds);