* Ben Dooks <ben-linux@xxxxxxxxx> [080929 15:30]: > On Thu, Sep 25, 2008 at 10:53:52AM +0300, Tony Lindgren wrote: > > From: Paul Walmsley <paul@xxxxxxxxx> > > > > Mark functions called only at init time as __init. > > surely these should be __devinit in case of hotplugged-ness? Here's this one fixed. Tony > > > Signed-off-by: Paul Walmsley <paul@xxxxxxxxx> > > Signed-off-by: Tony Lindgren <tony@xxxxxxxxxxx> > > --- > > drivers/i2c/busses/i2c-omap.c | 4 ++-- > > 1 files changed, 2 insertions(+), 2 deletions(-) > > > > diff --git a/drivers/i2c/busses/i2c-omap.c b/drivers/i2c/busses/i2c-omap.c > > index b41431a..e71f1f2 100644 > > --- a/drivers/i2c/busses/i2c-omap.c > > +++ b/drivers/i2c/busses/i2c-omap.c > > @@ -154,7 +154,7 @@ static inline u16 omap_i2c_read_reg(struct omap_i2c_dev *i2c_dev, int reg) > > return __raw_readw(i2c_dev->base + reg); > > } > > > > -static int omap_i2c_get_clocks(struct omap_i2c_dev *dev) > > +static int __init omap_i2c_get_clocks(struct omap_i2c_dev *dev) > > { > > if (cpu_is_omap16xx() || cpu_class_is_omap2()) { > > dev->iclk = clk_get(dev->dev, "i2c_ick"); > > @@ -697,7 +697,7 @@ static const struct i2c_algorithm omap_i2c_algo = { > > .functionality = omap_i2c_func, > > }; > > > > -static int > > +static int __init > > omap_i2c_probe(struct platform_device *pdev) > > { > > struct omap_i2c_dev *dev; > > -- > > 1.5.6.rc3.21.g8c6b5 > > > > > > _______________________________________________ > > i2c mailing list > > i2c@xxxxxxxxxxxxxx > > http://lists.lm-sensors.org/mailman/listinfo/i2c > > -- > Ben (ben@xxxxxxxxx, http://www.fluff.org/) > > 'a smiley only costs 4 bytes'
>From 168065ac952d019a1a578c2cdc46df4ef01044c2 Mon Sep 17 00:00:00 2001 From: Paul Walmsley <paul@xxxxxxxxx> Date: Fri, 17 Oct 2008 07:44:58 -0700 Subject: [PATCH] i2c-omap: Mark init-only functions as __init Mark functions called only at init time as __init. Signed-off-by: Paul Walmsley <paul@xxxxxxxxx> Signed-off-by: Tony Lindgren <tony@xxxxxxxxxxx> --- drivers/i2c/busses/i2c-omap.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/i2c/busses/i2c-omap.c b/drivers/i2c/busses/i2c-omap.c index 5dd8a24..018d284 100644 --- a/drivers/i2c/busses/i2c-omap.c +++ b/drivers/i2c/busses/i2c-omap.c @@ -154,7 +154,7 @@ static inline u16 omap_i2c_read_reg(struct omap_i2c_dev *i2c_dev, int reg) return __raw_readw(i2c_dev->base + reg); } -static int omap_i2c_get_clocks(struct omap_i2c_dev *dev) +static int __devinit omap_i2c_get_clocks(struct omap_i2c_dev *dev) { if (cpu_is_omap16xx() || cpu_class_is_omap2()) { dev->iclk = clk_get(dev->dev, "i2c_ick"); @@ -692,7 +692,7 @@ static const struct i2c_algorithm omap_i2c_algo = { .functionality = omap_i2c_func, }; -static int +static int __devinit omap_i2c_probe(struct platform_device *pdev) { struct omap_i2c_dev *dev; -- 1.5.6.rc3.21.g8c6b5