diff options
author | Felix Fietkau <nbd@openwrt.org> | 2015-09-11 08:49:42 +0000 |
---|---|---|
committer | Felix Fietkau <nbd@openwrt.org> | 2015-09-11 08:49:42 +0000 |
commit | 0dc3d0e7c74bf8d50c3a2bfc335e5e717ab4051f (patch) | |
tree | 468ddb1694552b21dd48bff5ce8f4882517b1865 /target/linux/ipq806x/patches-3.18/702-stmmac-move-error-path-at-the-end-of-stmmac_probe_co.patch | |
parent | 4f27e9cc7185ca4894a211178ffc4cfc5026e54a (diff) | |
download | upstream-0dc3d0e7c74bf8d50c3a2bfc335e5e717ab4051f.tar.gz upstream-0dc3d0e7c74bf8d50c3a2bfc335e5e717ab4051f.tar.bz2 upstream-0dc3d0e7c74bf8d50c3a2bfc335e5e717ab4051f.zip |
ipq806x: delete from CC branch; it is broken and unsupported
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
git-svn-id: svn://svn.openwrt.org/openwrt/branches/chaos_calmer@46845 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/ipq806x/patches-3.18/702-stmmac-move-error-path-at-the-end-of-stmmac_probe_co.patch')
-rw-r--r-- | target/linux/ipq806x/patches-3.18/702-stmmac-move-error-path-at-the-end-of-stmmac_probe_co.patch | 65 |
1 files changed, 0 insertions, 65 deletions
diff --git a/target/linux/ipq806x/patches-3.18/702-stmmac-move-error-path-at-the-end-of-stmmac_probe_co.patch b/target/linux/ipq806x/patches-3.18/702-stmmac-move-error-path-at-the-end-of-stmmac_probe_co.patch deleted file mode 100644 index e8f9b5c29a..0000000000 --- a/target/linux/ipq806x/patches-3.18/702-stmmac-move-error-path-at-the-end-of-stmmac_probe_co.patch +++ /dev/null @@ -1,65 +0,0 @@ -From 0149d275415cd1b2382ce94e5eb32641590097d0 Mon Sep 17 00:00:00 2001 -From: Mathieu Olivari <mathieu@codeaurora.org> -Date: Fri, 8 May 2015 15:57:12 -0700 -Subject: [PATCH 2/8] stmmac: move error path at the end of - stmmac_probe_config_dt() - -We will want to do additional clean-up on certain errors. Therefore, -this change moves the error path at the end of the function for better -code readability. - -This patch doesn't change anything functionally. - -Signed-off-by: Mathieu Olivari <mathieu@codeaurora.org> ---- - .../net/ethernet/stmicro/stmmac/stmmac_platform.c | 22 ++++++++++++++++------ - 1 file changed, 16 insertions(+), 6 deletions(-) - ---- a/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c -+++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c -@@ -117,13 +117,18 @@ static int stmmac_probe_config_dt(struct - struct device_node *np = pdev->dev.of_node; - struct stmmac_dma_cfg *dma_cfg; - const struct of_device_id *device; -+ int ret; - -- if (!np) -- return -ENODEV; -+ if (!np) { -+ ret = -ENODEV; -+ goto err; -+ } - - device = of_match_device(stmmac_dt_ids, &pdev->dev); -- if (!device) -- return -ENODEV; -+ if (!device) { -+ ret = -ENODEV; -+ goto err; -+ } - - if (device->data) { - const struct stmmac_of_data *data = device->data; -@@ -219,8 +224,10 @@ static int stmmac_probe_config_dt(struct - if (of_find_property(np, "snps,pbl", NULL)) { - dma_cfg = devm_kzalloc(&pdev->dev, sizeof(*dma_cfg), - GFP_KERNEL); -- if (!dma_cfg) -- return -ENOMEM; -+ if (!dma_cfg) { -+ ret = -ENOMEM; -+ goto err; -+ } - plat->dma_cfg = dma_cfg; - of_property_read_u32(np, "snps,pbl", &dma_cfg->pbl); - dma_cfg->fixed_burst = -@@ -235,6 +242,9 @@ static int stmmac_probe_config_dt(struct - } - - return 0; -+ -+err: -+ return ret; - } - #else - static int stmmac_probe_config_dt(struct platform_device *pdev, |