Message ID | CADTWAOL7aBi64yimwPubAJ22=4AQ1BRjzQCahUXUsbSa1oJ59A@mail.gmail.com |
---|---|
State | New, archived |
Headers | show |
On Thu, 2012-03-15 at 19:19 +0900, Ryosuke Saito wrote: > doc_probe_device() is only called from docg3_probe() which is in .init.text, > so it must be in the same section to avoid a section mismatch warning. > > Signed-off-by: Ryosuke Saito <raitosyo@gmail.com> > --- > drivers/mtd/devices/docg3.c | 4 ++-- > 1 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/drivers/mtd/devices/docg3.c b/drivers/mtd/devices/docg3.c > index 25f688c..db9a4b7 100644 > --- a/drivers/mtd/devices/docg3.c > +++ b/drivers/mtd/devices/docg3.c > @@ -1846,8 +1846,8 @@ static void __init doc_set_driver_info(int > chip_id, struct mtd_info *mtd) The patch is line-wrapped and not applicable with git am :-(
On Thu, 2012-03-15 at 19:19 +0900, Ryosuke Saito wrote: > doc_probe_device() is only called from docg3_probe() which is in .init.text, > so it must be in the same section to avoid a section mismatch warning. > > Signed-off-by: Ryosuke Saito <raitosyo@gmail.com> I've fixed up your patch and push to l2-mtd.git, thanks!
diff --git a/drivers/mtd/devices/docg3.c b/drivers/mtd/devices/docg3.c index 25f688c..db9a4b7 100644 --- a/drivers/mtd/devices/docg3.c +++ b/drivers/mtd/devices/docg3.c @@ -1846,8 +1846,8 @@ static void __init doc_set_driver_info(int chip_id, struct mtd_info *mtd) * if a memory allocation failed. If floor 0 is checked, a reset of the ASIC is * launched. */ -static struct mtd_info *doc_probe_device(void __iomem *base, int floor, - struct device *dev) +static struct mtd_info * __init +doc_probe_device(void __iomem *base, int floor, struct device *dev) { int ret, bbt_nbpages;
doc_probe_device() is only called from docg3_probe() which is in .init.text, so it must be in the same section to avoid a section mismatch warning. Signed-off-by: Ryosuke Saito <raitosyo@gmail.com> --- drivers/mtd/devices/docg3.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) u16 chip_id, chip_id_inv;