From e02ea7bd8e81dee547e413a63342d2b6687cf5ae Mon Sep 17 00:00:00 2001 From: Haiying Wang Date: Tue, 15 Oct 2013 12:03:48 -0400 Subject: fsl_qman: fix two compilation warnings drivers/staging/fsl_qbman/qman_high.c: In function 'qman_shutdown_fq': drivers/staging/fsl_qbman/qman_high.c:4834:1: warning: control reaches end of non-void function [-Wreturn-type] drivers/staging/fsl_qbman/fsl_usdpaa.c: In function 'dump_frags': drivers/staging/fsl_qbman/fsl_usdpaa.c:230:3: warning: format '%llx' expects argument of type 'long long unsigned int', but argument 4 has type 'long unsigned int' [-Wformat] Signed-off-by: Haiying Wang Change-Id: Ia61d1b303f033b777658131e517f5f10b16bf6b0 Reviewed-on: http://git.am.freescale.net:8181/5632 Tested-by: Review Code-CDREVIEW Reviewed-by: Thorpe Geoff-R01361 Reviewed-by: Rivera Jose-B46482 diff --git a/drivers/staging/fsl_qbman/fsl_usdpaa.c b/drivers/staging/fsl_qbman/fsl_usdpaa.c index b9ae8f0..f493def 100644 --- a/drivers/staging/fsl_qbman/fsl_usdpaa.c +++ b/drivers/staging/fsl_qbman/fsl_usdpaa.c @@ -227,7 +227,7 @@ __maybe_unused static void dump_frags(void) struct mem_fragment *frag; int i = 0; list_for_each_entry(frag, &mem_list, list) { - pr_info("FRAG %d: base 0x%llx pfn_base 0x%llx len 0x%llx " + pr_info("FRAG %d: base 0x%llx pfn_base 0x%lx len 0x%llx " "root_len 0x%llx refs %d\n", i, frag->base, frag->pfn_base, frag->len, frag->root_len, frag->refs); diff --git a/drivers/staging/fsl_qbman/qman_high.c b/drivers/staging/fsl_qbman/qman_high.c index 37fbaaa..fb2330a 100644 --- a/drivers/staging/fsl_qbman/qman_high.c +++ b/drivers/staging/fsl_qbman/qman_high.c @@ -4831,6 +4831,7 @@ int qman_shutdown_fq(u32 fqid) ret = qm_shutdown_fq(&low_p, 1, fqid); PORTAL_IRQ_UNLOCK(p, irqflags); put_affine_portal(); + return ret; } static void qman_portal_update_sdest(const struct qm_portal_config *pcfg, -- cgit v0.10.2