ASoC: samsung: Remove tests of member address

The driver was checking for non-NULL address of struct's members:
 - s3c_audio_pdata->type (union),
 - s3c_audio_pdata->type.i2s (embedded struct).

This is pointless as these will be always non-NULL.  The 's3c_audio_pdata'
is always initialized in static memory so it will be zeroed.
Additionally the 'type' member was an union with only one member.

It is safe to reorganize the structures to get rid of useless union and
checks for addresses to fix the coccinelle warning:
	>> sound/soc/samsung/i2s.c:1270:2-4: ERROR: test of a variable/field address

Reported-by: kbuild test robot <fengguang.wu@intel.com>
Signed-off-by: Krzysztof Kozlowski <krzk@kernel.org>
Reviewed-by: Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/arch/arm/mach-s3c64xx/dev-audio.c b/arch/arm/mach-s3c64xx/dev-audio.c
index b57783371d525976946f3f47a2b37933308756f9..247dcc0b691e53a5e94539a0d490a25fc7afb20f 100644 (file)
--- a/arch/arm/mach-s3c64xx/dev-audio.c
+++ b/arch/arm/mach-s3c64xx/dev-audio.c
@@ -106,9 +106,7 @@ static struct s3c_audio_pdata i2sv4_pdata = {
        .dma_playback = DMACH_HSI_I2SV40_TX,
        .dma_capture = DMACH_HSI_I2SV40_RX,
        .type = {
-               .i2s = {
-                       .quirks = QUIRK_PRI_6CHAN,
-               },
+               .quirks = QUIRK_PRI_6CHAN,
        },
 };
 

diff --git a/include/linux/platform_data/asoc-s3c.h b/include/linux/platform_data/asoc-s3c.h
index 15bf56ee8af7d21d307c924df06d0f443d835975..90641a5daaf0218e4ead2af9ae4fe4bd9488159d 100644 (file)
--- a/include/linux/platform_data/asoc-s3c.h
+++ b/include/linux/platform_data/asoc-s3c.h
@@ -18,7 +18,7 @@
 
 extern void s3c64xx_ac97_setup_gpio(int);
 
-struct samsung_i2s {
+struct samsung_i2s_type {
 /* If the Primary DAI has 5.1 Channels */
 #define QUIRK_PRI_6CHAN                (1 << 0)
 /* If the I2S block has a Stereo Overlay Channel */
@@ -47,7 +47,5 @@ struct s3c_audio_pdata {
        void *dma_capture;
        void *dma_play_sec;
        void *dma_capture_mic;
-       union {
-               struct samsung_i2s i2s;
-       } type;
+       struct samsung_i2s_type type;
 };

diff --git a/sound/soc/samsung/i2s.c b/sound/soc/samsung/i2s.c
index e00974bc561670ff30413a85e5fe2644148617e3..d55326289a4a15ea0a3ec781e66ffc6a287195cc 100644 (file)
--- a/sound/soc/samsung/i2s.c
+++ b/sound/soc/samsung/i2s.c
@@ -1218,7 +1218,6 @@ static int samsung_i2s_probe(struct platform_device *pdev)
 {
        struct i2s_dai *pri_dai, *sec_dai = NULL;
        struct s3c_audio_pdata *i2s_pdata = pdev->dev.platform_data;
-       struct samsung_i2s *i2s_cfg = NULL;
        struct resource *res;
        u32 regs_base, quirks = 0, idma_addr = 0;
        struct device_node *np = pdev->dev.of_node;
@@ -1267,13 +1266,8 @@ static int samsung_i2s_probe(struct platform_device *pdev)
                pri_dai->dma_capture.filter_data = i2s_pdata->dma_capture;
                pri_dai->filter = i2s_pdata->dma_filter;
 
-               if (&i2s_pdata->type)
-                       i2s_cfg = &i2s_pdata->type.i2s;
-
-               if (i2s_cfg) {
-                       quirks = i2s_cfg->quirks;
-                       idma_addr = i2s_cfg->idma_addr;
-               }
+               quirks = i2s_pdata->type.quirks;
+               idma_addr = i2s_pdata->type.idma_addr;
        } else {
                quirks = i2s_dai_data->quirks;
                if (of_property_read_u32(np, "samsung,idma-addr",