From: Peter Ujfalusi Date: Fri, 16 May 2014 12:17:13 +0000 (+0300) Subject: ARM: edma: Remove num_cc member from struct edma X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=6710ea7a0287be4380ac81c37aa6e2683a04b153;p=linux-beck.git ARM: edma: Remove num_cc member from struct edma The struct edma is allocated per CC bases so the member num_cc does not make any sense. One CC is one CC, it does not have sub CCs. Signed-off-by: Peter Ujfalusi Signed-off-by: Sekhar Nori --- diff --git a/arch/arm/common/edma.c b/arch/arm/common/edma.c index 4df5d443b0b3..90dd7b6013bb 100644 --- a/arch/arm/common/edma.c +++ b/arch/arm/common/edma.c @@ -233,7 +233,6 @@ struct edma { unsigned num_region; unsigned num_slots; unsigned num_tc; - unsigned num_cc; enum dma_event_q default_queue; /* list of channels with no even trigger; terminated by "-1" */ @@ -1499,7 +1498,6 @@ static int edma_of_parse_dt(struct device *dev, return ret; pdata->n_slot = value; - pdata->n_cc = 1; pdata->n_tc = 3; rsv_info = devm_kzalloc(dev, sizeof(struct edma_rsv_info), GFP_KERNEL); @@ -1645,8 +1643,6 @@ static int edma_probe(struct platform_device *pdev) EDMA_MAX_DMACH); edma_cc[j]->num_slots = min_t(unsigned, info[j]->n_slot, EDMA_MAX_PARAMENTRY); - edma_cc[j]->num_cc = min_t(unsigned, info[j]->n_cc, - EDMA_MAX_CC); edma_cc[j]->num_tc = info[j]->n_tc; edma_cc[j]->default_queue = info[j]->default_queue;