OMAP1: McBSP: fix build break for non-multi-OMAP1 configs
Commit 3cf32bba8c
("OMAP: McBSP: Convert
McBSP to platform device model") breaks compilation with non-multi-OMAP1
configs:
CC arch/arm/mach-omap1/mcbsp.o
arch/arm/mach-omap1/mcbsp.c: In function 'omap1_mcbsp_init':
arch/arm/mach-omap1/mcbsp.c:384: warning: dereferencing 'void *' pointer
arch/arm/mach-omap1/mcbsp.c:387: error: invalid use of void expression
arch/arm/mach-omap1/mcbsp.c:390: warning: dereferencing 'void *' pointer
arch/arm/mach-omap1/mcbsp.c:393: error: invalid use of void expression
Fix by avoiding NULL dereferences.
Signed-off-by: Paul Walmsley <paul@pwsan.com>
Cc: Kishon Vijay Abraham I <kishon@ti.com>
Cc: Tony Lindgren <tony@atomide.com>
Acked-by: Jarkko Nikula <jhnikula@gmail.com>
[tony@atomide.com: updated description not to remove unnecessary branch name]
Signed-off-by: Tony Lindgren <tony@atomide.com>
This commit is contained in:
parent
cd97bb0032
commit
e7916740bb
|
@ -136,6 +136,8 @@ struct resource omap7xx_mcbsp_res[][6] = {
|
||||||
},
|
},
|
||||||
};
|
};
|
||||||
|
|
||||||
|
#define omap7xx_mcbsp_res_0 omap7xx_mcbsp_res[0]
|
||||||
|
|
||||||
static struct omap_mcbsp_platform_data omap7xx_mcbsp_pdata[] = {
|
static struct omap_mcbsp_platform_data omap7xx_mcbsp_pdata[] = {
|
||||||
{
|
{
|
||||||
.ops = &omap1_mcbsp_ops,
|
.ops = &omap1_mcbsp_ops,
|
||||||
|
@ -147,7 +149,7 @@ static struct omap_mcbsp_platform_data omap7xx_mcbsp_pdata[] = {
|
||||||
#define OMAP7XX_MCBSP_RES_SZ ARRAY_SIZE(omap7xx_mcbsp_res[1])
|
#define OMAP7XX_MCBSP_RES_SZ ARRAY_SIZE(omap7xx_mcbsp_res[1])
|
||||||
#define OMAP7XX_MCBSP_COUNT ARRAY_SIZE(omap7xx_mcbsp_res)
|
#define OMAP7XX_MCBSP_COUNT ARRAY_SIZE(omap7xx_mcbsp_res)
|
||||||
#else
|
#else
|
||||||
#define omap7xx_mcbsp_res NULL
|
#define omap7xx_mcbsp_res_0 NULL
|
||||||
#define omap7xx_mcbsp_pdata NULL
|
#define omap7xx_mcbsp_pdata NULL
|
||||||
#define OMAP7XX_MCBSP_RES_SZ 0
|
#define OMAP7XX_MCBSP_RES_SZ 0
|
||||||
#define OMAP7XX_MCBSP_COUNT 0
|
#define OMAP7XX_MCBSP_COUNT 0
|
||||||
|
@ -238,6 +240,8 @@ struct resource omap15xx_mcbsp_res[][6] = {
|
||||||
},
|
},
|
||||||
};
|
};
|
||||||
|
|
||||||
|
#define omap15xx_mcbsp_res_0 omap15xx_mcbsp_res[0]
|
||||||
|
|
||||||
static struct omap_mcbsp_platform_data omap15xx_mcbsp_pdata[] = {
|
static struct omap_mcbsp_platform_data omap15xx_mcbsp_pdata[] = {
|
||||||
{
|
{
|
||||||
.ops = &omap1_mcbsp_ops,
|
.ops = &omap1_mcbsp_ops,
|
||||||
|
@ -252,7 +256,7 @@ static struct omap_mcbsp_platform_data omap15xx_mcbsp_pdata[] = {
|
||||||
#define OMAP15XX_MCBSP_RES_SZ ARRAY_SIZE(omap15xx_mcbsp_res[1])
|
#define OMAP15XX_MCBSP_RES_SZ ARRAY_SIZE(omap15xx_mcbsp_res[1])
|
||||||
#define OMAP15XX_MCBSP_COUNT ARRAY_SIZE(omap15xx_mcbsp_res)
|
#define OMAP15XX_MCBSP_COUNT ARRAY_SIZE(omap15xx_mcbsp_res)
|
||||||
#else
|
#else
|
||||||
#define omap15xx_mcbsp_res NULL
|
#define omap15xx_mcbsp_res_0 NULL
|
||||||
#define omap15xx_mcbsp_pdata NULL
|
#define omap15xx_mcbsp_pdata NULL
|
||||||
#define OMAP15XX_MCBSP_RES_SZ 0
|
#define OMAP15XX_MCBSP_RES_SZ 0
|
||||||
#define OMAP15XX_MCBSP_COUNT 0
|
#define OMAP15XX_MCBSP_COUNT 0
|
||||||
|
@ -343,6 +347,8 @@ struct resource omap16xx_mcbsp_res[][6] = {
|
||||||
},
|
},
|
||||||
};
|
};
|
||||||
|
|
||||||
|
#define omap16xx_mcbsp_res_0 omap16xx_mcbsp_res[0]
|
||||||
|
|
||||||
static struct omap_mcbsp_platform_data omap16xx_mcbsp_pdata[] = {
|
static struct omap_mcbsp_platform_data omap16xx_mcbsp_pdata[] = {
|
||||||
{
|
{
|
||||||
.ops = &omap1_mcbsp_ops,
|
.ops = &omap1_mcbsp_ops,
|
||||||
|
@ -357,7 +363,7 @@ static struct omap_mcbsp_platform_data omap16xx_mcbsp_pdata[] = {
|
||||||
#define OMAP16XX_MCBSP_RES_SZ ARRAY_SIZE(omap16xx_mcbsp_res[1])
|
#define OMAP16XX_MCBSP_RES_SZ ARRAY_SIZE(omap16xx_mcbsp_res[1])
|
||||||
#define OMAP16XX_MCBSP_COUNT ARRAY_SIZE(omap16xx_mcbsp_res)
|
#define OMAP16XX_MCBSP_COUNT ARRAY_SIZE(omap16xx_mcbsp_res)
|
||||||
#else
|
#else
|
||||||
#define omap16xx_mcbsp_res NULL
|
#define omap16xx_mcbsp_res_0 NULL
|
||||||
#define omap16xx_mcbsp_pdata NULL
|
#define omap16xx_mcbsp_pdata NULL
|
||||||
#define OMAP16XX_MCBSP_RES_SZ 0
|
#define OMAP16XX_MCBSP_RES_SZ 0
|
||||||
#define OMAP16XX_MCBSP_COUNT 0
|
#define OMAP16XX_MCBSP_COUNT 0
|
||||||
|
@ -381,19 +387,19 @@ static int __init omap1_mcbsp_init(void)
|
||||||
return -ENOMEM;
|
return -ENOMEM;
|
||||||
|
|
||||||
if (cpu_is_omap7xx())
|
if (cpu_is_omap7xx())
|
||||||
omap_mcbsp_register_board_cfg(omap7xx_mcbsp_res[0],
|
omap_mcbsp_register_board_cfg(omap7xx_mcbsp_res_0,
|
||||||
OMAP7XX_MCBSP_RES_SZ,
|
OMAP7XX_MCBSP_RES_SZ,
|
||||||
omap7xx_mcbsp_pdata,
|
omap7xx_mcbsp_pdata,
|
||||||
OMAP7XX_MCBSP_COUNT);
|
OMAP7XX_MCBSP_COUNT);
|
||||||
|
|
||||||
if (cpu_is_omap15xx())
|
if (cpu_is_omap15xx())
|
||||||
omap_mcbsp_register_board_cfg(omap15xx_mcbsp_res[0],
|
omap_mcbsp_register_board_cfg(omap15xx_mcbsp_res_0,
|
||||||
OMAP15XX_MCBSP_RES_SZ,
|
OMAP15XX_MCBSP_RES_SZ,
|
||||||
omap15xx_mcbsp_pdata,
|
omap15xx_mcbsp_pdata,
|
||||||
OMAP15XX_MCBSP_COUNT);
|
OMAP15XX_MCBSP_COUNT);
|
||||||
|
|
||||||
if (cpu_is_omap16xx())
|
if (cpu_is_omap16xx())
|
||||||
omap_mcbsp_register_board_cfg(omap16xx_mcbsp_res[0],
|
omap_mcbsp_register_board_cfg(omap16xx_mcbsp_res_0,
|
||||||
OMAP16XX_MCBSP_RES_SZ,
|
OMAP16XX_MCBSP_RES_SZ,
|
||||||
omap16xx_mcbsp_pdata,
|
omap16xx_mcbsp_pdata,
|
||||||
OMAP16XX_MCBSP_COUNT);
|
OMAP16XX_MCBSP_COUNT);
|
||||||
|
|
Loading…
Reference in New Issue