From: Khoronzhuk, Ivan Date: Mon, 3 Nov 2014 23:39:27 +0000 (+0200) Subject: dma: keystone_nav: remove spurious qm_cfg verification X-Git-Tag: v2015.01-rc1~33^2~16 X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=75d7c0b04c552a96de0e09ce5b892fa2e5592c5a;p=oweals%2Fu-boot.git dma: keystone_nav: remove spurious qm_cfg verification The verification qm_cfg existence is done at ksnav_init(). So, there is no need to verify it after initialization. Signed-off-by: Ivan Khoronzhuk Reviewed-by: Tom Rini --- diff --git a/drivers/dma/keystone_nav.c b/drivers/dma/keystone_nav.c index 77707c2109..dfca75abdc 100644 --- a/drivers/dma/keystone_nav.c +++ b/drivers/dma/keystone_nav.c @@ -81,9 +81,6 @@ void qm_close(void) { u32 j; - if (qm_cfg == NULL) - return; - queue_close(qm_cfg->qpool_num); qm_cfg->mngr_cfg->link_ram_base0 = 0; @@ -105,9 +102,6 @@ void qm_push(struct qm_host_desc *hd, u32 qnum) { u32 regd; - if (!qm_cfg) - return; - cpu_to_bus((u32 *)hd, sizeof(struct qm_host_desc)/4); regd = (u32)hd | ((sizeof(struct qm_host_desc) >> 4) - 1); writel(regd, &qm_cfg->queue[qnum].ptr_size_thresh); @@ -127,9 +121,6 @@ struct qm_host_desc *qm_pop(u32 qnum) { u32 uhd; - if (!qm_cfg) - return NULL; - uhd = readl(&qm_cfg->queue[qnum].ptr_size_thresh) & ~0xf; if (uhd) cpu_to_bus((u32 *)uhd, sizeof(struct qm_host_desc)/4); @@ -139,9 +130,6 @@ struct qm_host_desc *qm_pop(u32 qnum) struct qm_host_desc *qm_pop_from_free_pool(void) { - if (!qm_cfg) - return NULL; - return qm_pop(qm_cfg->qpool_num); }