From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757235AbcIULIz (ORCPT ); Wed, 21 Sep 2016 07:08:55 -0400 Received: from comal.ext.ti.com ([198.47.26.152]:58953 "EHLO comal.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754689AbcIULIx (ORCPT ); Wed, 21 Sep 2016 07:08:53 -0400 Subject: Re: [PATCH v2 2/9] dmaengine: edma: Use enum for eDMA binding type (legacy vs TPCC) To: Arnd Bergmann References: <20160921102637.24845-1-peter.ujfalusi@ti.com> <20160921102637.24845-3-peter.ujfalusi@ti.com> <7753810.Z3F41qkFaI@wuerfel> CC: , , , , , , From: Peter Ujfalusi Message-ID: Date: Wed, 21 Sep 2016 14:07:22 +0300 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101 Thunderbird/45.3.0 MIME-Version: 1.0 In-Reply-To: <7753810.Z3F41qkFaI@wuerfel> Content-Type: text/plain; charset="windows-1252" Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 09/21/16 13:31, Arnd Bergmann wrote: > On Wednesday, September 21, 2016 1:26:30 PM CEST Peter Ujfalusi wrote: >> diff --git a/drivers/dma/edma.c b/drivers/dma/edma.c >> index c2098a4b4dcf..4c8818278fcc 100644 >> --- a/drivers/dma/edma.c >> +++ b/drivers/dma/edma.c >> @@ -261,8 +261,11 @@ static const struct edmacc_param dummy_paramset = { >> .ccnt = 1, >> }; >> >> -#define EDMA_BINDING_LEGACY 0 >> -#define EDMA_BINDING_TPCC 1 >> +enum edma_binding_type { >> + EDMA_BINDING_LEGACY = 0, >> + EDMA_BINDING_TPCC, >> +}; >> + >> static const struct of_device_id edma_of_ids[] = { >> { >> .compatible = "ti,edma3", >> @@ -2184,7 +2187,8 @@ static int edma_probe(struct platform_device *pdev) >> const struct of_device_id *match; >> >> match = of_match_node(edma_of_ids, node); >> - if (match && (u32)match->data == EDMA_BINDING_TPCC) >> + if (match && >> + (enum edma_binding_type)match->data == EDMA_BINDING_TPCC) >> legacy_mode = false; >> >> info = edma_setup_info_from_dt(dev, legacy_mode); >> -- >> 2.10.0 >> > > Are you sure this works on all architectures? IIRC the size of an enum > is implementation defined, so this could still fail sometimes. True, some arch have HW type for enum or something similar. > > I tend to use 'uintptr_t' for the cast instead. What about keeping the defines and: diff --git a/drivers/dma/edma.c b/drivers/dma/edma.c index 3e9606b08340..493fdf30e8b8 100644 --- a/drivers/dma/edma.c +++ b/drivers/dma/edma.c @@ -263,14 +263,19 @@ static const struct edmacc_param dummy_paramset = { #define EDMA_BINDING_LEGACY 0 #define EDMA_BINDING_TPCC 1 +static const u32 edma_binding_type[] = { + [EDMA_BINDING_LEGACY] = EDMA_BINDING_LEGACY, + [EDMA_BINDING_TPCC] = EDMA_BINDING_TPCC, +}; + static const struct of_device_id edma_of_ids[] = { { .compatible = "ti,edma3", - .data = (void *)EDMA_BINDING_LEGACY, + .data = (void *)&edma_binding_type[EDMA_BINDING_LEGACY], }, { .compatible = "ti,edma3-tpcc", - .data = (void *)EDMA_BINDING_TPCC, + .data = (void *)&edma_binding_type[EDMA_BINDING_TPCC], }, {} }; @@ -2183,7 +2188,7 @@ static int edma_probe(struct platform_device *pdev) const struct of_device_id *match; match = of_match_node(edma_of_ids, node); - if (match && (u32)match->data == EDMA_BINDING_TPCC) + if (match && (*(u32*)match->data) == EDMA_BINDING_TPCC) legacy_mode = false; info = edma_setup_info_from_dt(dev, legacy_mode); same for the ti-dma-crossbar. -- Péter