diff options
| author | Madalin Bucur <madalin.bucur@freescale.com> | 2014-02-21 15:04:08 (GMT) |
|---|---|---|
| committer | Madalin-Cristian Bucur <madalin.bucur@freescale.com> | 2014-02-26 15:57:14 (GMT) |
| commit | 9a714298b9e27276663f6d75c479f10416142ed2 (patch) | |
| tree | 95e517fb0577cb8cc921ae244ce2c9653c582a86 /drivers | |
| parent | e14d2e2329c1fad762a50ab0af112ef531b32447 (diff) | |
| download | linux-fsl-qoriq-9a714298b9e27276663f6d75c479f10416142ed2.tar.xz | |
dpaa_eth: move declarations to the proper location
Move dpa_alloc_pcd_fqids and dpa_free_pcd_fqids to dpaa_eth_common.c.
Signed-off-by: Madalin Bucur <madalin.bucur@freescale.com>
Change-Id: I6322cdc377e2b8061680fc39129d567726ec4c29
Reviewed-on: http://git.am.freescale.net:8181/9026
Reviewed-by: Cristian-Constantin Sovaiala <Cristian.Sovaiala@freescale.com>
(cherry picked from commit fe1d9e3e097efe1c330f4209b7cca7f75049a6a8)
Reviewed-on: http://git.am.freescale.net:8181/9191
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/net/ethernet/freescale/dpa/dpaa_eth.c | 8 | ||||
| -rw-r--r-- | drivers/net/ethernet/freescale/dpa/dpaa_eth_common.c | 14 |
2 files changed, 14 insertions, 8 deletions
diff --git a/drivers/net/ethernet/freescale/dpa/dpaa_eth.c b/drivers/net/ethernet/freescale/dpa/dpaa_eth.c index b707989..f3cfc2b 100644 --- a/drivers/net/ethernet/freescale/dpa/dpaa_eth.c +++ b/drivers/net/ethernet/freescale/dpa/dpaa_eth.c @@ -102,14 +102,6 @@ static const char rtx[][3] = { [TX] = "TX" }; -#if defined(CONFIG_FSL_FMAN_TEST) -/* Defined as weak, to be implemented by fman pcd tester. */ -int dpa_alloc_pcd_fqids(struct device *, uint32_t, uint8_t, uint32_t *) -__attribute__((weak)); - -int dpa_free_pcd_fqids(struct device *, uint32_t) __attribute__((weak)); -#endif /* CONFIG_FSL_FMAN_TEST */ - /* BM */ #define DPAA_ETH_MAX_PAD (L1_CACHE_BYTES * 8) diff --git a/drivers/net/ethernet/freescale/dpa/dpaa_eth_common.c b/drivers/net/ethernet/freescale/dpa/dpaa_eth_common.c index 0726948..5ae98dd 100644 --- a/drivers/net/ethernet/freescale/dpa/dpaa_eth_common.c +++ b/drivers/net/ethernet/freescale/dpa/dpaa_eth_common.c @@ -1419,6 +1419,20 @@ dpaa_eth_init_rx_port(struct fm_port *port, struct dpa_bp *bp, size_t count, buf_layout, frag_enabled); } +#if defined(CONFIG_FSL_FMAN_TEST) +/* Defined as weak, to be implemented by fman pcd tester. */ +int dpa_alloc_pcd_fqids(struct device *, uint32_t, uint8_t, uint32_t *) +__attribute__((weak)); + +int dpa_free_pcd_fqids(struct device *, uint32_t) __attribute__((weak)); +#else +int dpa_alloc_pcd_fqids(struct device *, uint32_t, uint8_t, uint32_t *); + +int dpa_free_pcd_fqids(struct device *, uint32_t); + +#endif /* CONFIG_FSL_FMAN_TEST */ + + int dpa_alloc_pcd_fqids(struct device *dev, uint32_t num, uint8_t alignment, uint32_t *base_fqid) { |