summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMadalin Bucur <madalin.bucur@freescale.com>2013-08-07 14:57:54 (GMT)
committerRivera Jose-B46482 <German.Rivera@freescale.com>2013-09-10 23:09:21 (GMT)
commitebfa225ac4717e95502492407658886f66e6c344 (patch)
treeaa20a1d7d4f3a9f0c5fee04e89476305bc31c0fa
parentb89aab0a05727500022df3d926f2f6c2591e279b (diff)
downloadlinux-fsl-qoriq-ebfa225ac4717e95502492407658886f66e6c344.tar.xz
dpaa_eth: fix non-smp build
Cleanup includes and fix non-smp build, removed unnecessary info. Signed-off-by: Madalin Bucur <madalin.bucur@freescale.com> Change-Id: I32596b8eb0c4b674de1f3684993d1ba09f20947e Reviewed-on: http://git.am.freescale.net:8181/3856 Reviewed-by: Bucur Madalin-Cristian-B32716 <madalin.bucur@freescale.com> Reviewed-by: Rivera Jose-B46482 <Jose.G.Rivera@freescale.com> Tested-by: Rivera Jose-B46482 <Jose.G.Rivera@freescale.com> Reviewed-on: http://git.am.freescale.net:8181/4461 Tested-by: Review Code-CDREVIEW <CDREVIEW@freescale.com> Reviewed-by: Sovaiala Cristian-Constantin-B39531 <Cristian.Sovaiala@freescale.com> Reviewed-by: Rivera Jose-B46482 <German.Rivera@freescale.com>
-rw-r--r--drivers/net/ethernet/freescale/dpa/dpaa_debugfs.c13
-rw-r--r--drivers/net/ethernet/freescale/dpa/dpaa_eth.c1
2 files changed, 6 insertions, 8 deletions
diff --git a/drivers/net/ethernet/freescale/dpa/dpaa_debugfs.c b/drivers/net/ethernet/freescale/dpa/dpaa_debugfs.c
index 2a58724..f424f4a 100644
--- a/drivers/net/ethernet/freescale/dpa/dpaa_debugfs.c
+++ b/drivers/net/ethernet/freescale/dpa/dpaa_debugfs.c
@@ -34,7 +34,6 @@
#include <linux/fsl_qman.h> /* struct qm_mcr_querycgr */
#include <linux/debugfs.h>
#include <asm/debug.h>
-#include <linux/smp.h> /* get_hard_smp_processor_id() if !CONFIG_SMP */
#include "dpaa_debugfs.h"
#include "dpaa_eth.h" /* struct dpa_priv_s, dpa_percpu_priv_s, dpa_bp */
@@ -91,8 +90,8 @@ static int dpa_debugfs_show(struct seq_file *file, void *offset)
total.stats.rx_errors += percpu_priv->stats.rx_errors;
count_total += dpa_bp_count;
- seq_printf(file, " %hu/%hu %8llu %8llu %8llu %8llu ",
- get_hard_smp_processor_id(i), i,
+ seq_printf(file, " %hu %8llu %8llu %8llu %8llu ",
+ i,
percpu_priv->in_interrupt,
percpu_priv->stats.rx_packets,
percpu_priv->stats.tx_packets,
@@ -144,8 +143,8 @@ static int dpa_debugfs_show(struct seq_file *file, void *offset)
total.rx_errors.phe += percpu_priv->rx_errors.phe;
total.rx_errors.cse += percpu_priv->rx_errors.cse;
- seq_printf(file, " %hu/%hu %8llu %8llu ",
- get_hard_smp_processor_id(i), i,
+ seq_printf(file, " %hu %8llu %8llu ",
+ i,
percpu_priv->rx_errors.dme,
percpu_priv->rx_errors.fpe);
seq_printf(file, "%8llu %8llu %8llu\n",
@@ -176,8 +175,8 @@ static int dpa_debugfs_show(struct seq_file *file, void *offset)
total.ern_cnt.fq_retired += percpu_priv->ern_cnt.fq_retired;
total.ern_cnt.orp_zero += percpu_priv->ern_cnt.orp_zero;
- seq_printf(file, " %hu/%hu %8llu %8llu %8llu %8llu ",
- get_hard_smp_processor_id(i), i,
+ seq_printf(file, " %hu %8llu %8llu %8llu %8llu ",
+ i,
percpu_priv->ern_cnt.cg_tdrop,
percpu_priv->ern_cnt.wred,
percpu_priv->ern_cnt.err_cond,
diff --git a/drivers/net/ethernet/freescale/dpa/dpaa_eth.c b/drivers/net/ethernet/freescale/dpa/dpaa_eth.c
index 683347e..42737d1 100644
--- a/drivers/net/ethernet/freescale/dpa/dpaa_eth.c
+++ b/drivers/net/ethernet/freescale/dpa/dpaa_eth.c
@@ -52,7 +52,6 @@
#include <linux/highmem.h>
#include <linux/percpu.h>
#include <linux/dma-mapping.h>
-#include <linux/smp.h> /* get_hard_smp_processor_id() */
#include <linux/fsl_bman.h>
#include "fsl_fman.h"