Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1488012 > unrolled thread
| Started by | Peter Ujfalusi <peter.ujfalusi@ti.com> |
|---|---|
| First post | 2016-09-21 12:30 +0200 |
| Last post | 2016-09-21 13:40 +0200 |
| Articles | 4 — 2 participants |
Back to article view | Back to linux.kernel
This discussion starts older than the indexed window; earlier articles aren't shown. The article labeled Started by
below is the oldest one visible, not the original post.
[PATCH v2 2/9] dmaengine: edma: Use enum for eDMA binding type (legacy vs TPCC) Peter Ujfalusi <peter.ujfalusi@ti.com> - 2016-09-21 12:30 +0200
Re: [PATCH v2 2/9] dmaengine: edma: Use enum for eDMA binding type (legacy vs TPCC) Arnd Bergmann <arnd@arndb.de> - 2016-09-21 12:40 +0200
Re: [PATCH v2 2/9] dmaengine: edma: Use enum for eDMA binding type (legacy vs TPCC) Peter Ujfalusi <peter.ujfalusi@ti.com> - 2016-09-21 13:10 +0200
Re: [PATCH v2 2/9] dmaengine: edma: Use enum for eDMA binding type (legacy vs TPCC) Arnd Bergmann <arnd@arndb.de> - 2016-09-21 13:40 +0200
| From | Peter Ujfalusi <peter.ujfalusi@ti.com> |
|---|---|
| Date | 2016-09-21 12:30 +0200 |
| Subject | [PATCH v2 2/9] dmaengine: edma: Use enum for eDMA binding type (legacy vs TPCC) |
| Message-ID | <sjMWR-7Q9-3@gated-at.bofh.it> |
Fixes the following warning when compiling the driver for 64bit
architectures (x86_64 for example):
drivers/dma/edma.c:2185:16: warning: cast from pointer to integer of different size [-Wpointer-to-int-cast]
if (match && (u32)match->data == EDMA_BINDING_TPCC)
^
Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com>
---
drivers/dma/edma.c | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)
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
[toc] | [next] | [standalone]
| From | Arnd Bergmann <arnd@arndb.de> |
|---|---|
| Date | 2016-09-21 12:40 +0200 |
| Message-ID | <sjN6y-7Tm-11@gated-at.bofh.it> |
| In reply to | #1488012 |
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.
I tend to use 'uintptr_t' for the cast instead.
Arnd
[toc] | [prev] | [next] | [standalone]
| From | Peter Ujfalusi <peter.ujfalusi@ti.com> |
|---|---|
| Date | 2016-09-21 13:10 +0200 |
| Subject | Re: [PATCH v2 2/9] dmaengine: edma: Use enum for eDMA binding type (legacy vs TPCC) |
| Message-ID | <sjNzA-8it-11@gated-at.bofh.it> |
| In reply to | #1488035 |
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
[toc] | [prev] | [next] | [standalone]
| From | Arnd Bergmann <arnd@arndb.de> |
|---|---|
| Date | 2016-09-21 13:40 +0200 |
| Message-ID | <sjO2C-8rI-17@gated-at.bofh.it> |
| In reply to | #1488047 |
On Wednesday, September 21, 2016 2:07:22 PM CEST Peter Ujfalusi wrote:
> >
> > 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],
> },
> {}
You can drop the cast to (void *) here, otherwise looks good.
Arnd
[toc] | [prev] | [standalone]
Back to top | Article view | linux.kernel
csiph-web