lkml.org 
[lkml]   [2012]   [Feb]   [13]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    /
    Date
    From
    SubjectRe: [PATCH 3.3 v2] I2C: OMAP: fix build breakage when CONFIG_OF is not set
    On Wed, Feb 08, 2012 at 01:18:21PM +0200, Luciano Coelho wrote:
    > Since commit 6145197 (i2c: OMAP: Add DT support for i2c controller),
    > building i2c_omap.c breaks if CONFIG_OF is not set:
    >
    > drivers/i2c/busses/i2c-omap.c: In function 'omap_i2c_probe':
    > drivers/i2c/busses/i2c-omap.c:1021: error: 'omap_i2c_of_match' undeclared (first use in this function)
    > drivers/i2c/busses/i2c-omap.c:1021: error: (Each undeclared identifier is reported only once
    > drivers/i2c/busses/i2c-omap.c:1021: error: for each function it appears in.)
    >
    > This is because the definition of omap_i2c_of_match is #ifdef'd on
    > CONFIG_OF, but the usage of it is not.
    >
    > Since the places where omap_ic2_of_match are prepared to get NULL
    > pointers if CONFIG_OF is not defined, we can simply define it to NULL.
    >
    > Cc: Benoit Cousson <b-cousson@ti.com>
    > Signed-off-by: Luciano Coelho <coelho@ti.com>
    > Reviewed-by: Felipe Balbi <balbi@ti.com>
    > ---
    > v2: changed the commit log to use abbrev sha and include the commit subject
    >
    > drivers/i2c/busses/i2c-omap.c | 2 ++
    > 1 files changed, 2 insertions(+), 0 deletions(-)
    >
    > diff --git a/drivers/i2c/busses/i2c-omap.c b/drivers/i2c/busses/i2c-omap.c
    > index f713eac..fd200eb 100644
    > --- a/drivers/i2c/busses/i2c-omap.c
    > +++ b/drivers/i2c/busses/i2c-omap.c
    > @@ -979,6 +979,8 @@ static const struct of_device_id omap_i2c_of_match[] = {
    > { },
    > };
    > MODULE_DEVICE_TABLE(of, omap_i2c_of_match);
    > +#else
    > +static const struct of_device_id *omap_i2c_of_match = NULL;
    > #endif

    of_match_ptr(_ptr) will go to NULL if CONFIG_OF is not set, use that please.


    \
     
     \ /
      Last update: 2012-02-14 01:15    [W:0.023 / U:0.788 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site