From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from top.free-electrons.com ([176.31.233.9] helo=mail.free-electrons.com) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1VGoEd-0003iK-2l for linux-mtd@lists.infradead.org; Tue, 03 Sep 2013 10:53:24 +0000 Date: Tue, 3 Sep 2013 07:53:14 -0300 From: Ezequiel Garcia To: Brian Norris Subject: Re: [PATCH] of_mtd: Add no-op stubs to support CONFIG_OF=n Message-ID: <20130903105313.GA2355@localhost> References: <1378175873-2763-1-git-send-email-ezequiel.garcia@free-electrons.com> <20130903053642.GA364@norris.computersforpeace.net> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <20130903053642.GA364@norris.computersforpeace.net> Cc: devicetree@vger.kernel.org, Josh Wu , linux-mtd@lists.infradead.org, David Woodhouse , Artem Bityutskiy List-Id: Linux MTD discussion mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , On Mon, Sep 02, 2013 at 10:36:58PM -0700, Brian Norris wrote: > On Mon, Sep 02, 2013 at 11:37:53PM -0300, Ezequiel Garcia wrote: > > Just like the rest of the subsystems, let's add the required no-op > > functions to implement stubs when CONFIG_OF=n. > > > > This prevents MTD drivers from having ugly ifdefs in their code, > > and instead hide the ifdef monster in the header closet (far away > > from people's sight). > > > > Signed-off-by: Ezequiel Garcia > > --- > > include/linux/of_mtd.h | 15 +++++++++++++++ > > 1 file changed, 15 insertions(+) > > > > diff --git a/include/linux/of_mtd.h b/include/linux/of_mtd.h > > index ed7f267..66f173e 100644 > > --- a/include/linux/of_mtd.h > > +++ b/include/linux/of_mtd.h > > @@ -14,6 +14,21 @@ > > int of_get_nand_ecc_mode(struct device_node *np); > > int of_get_nand_bus_width(struct device_node *np); > > bool of_get_nand_on_flash_bbt(struct device_node *np); > > +#else > > I would include an extra line on either side of #else. > > > +static inline int of_get_nand_ecc_mode(struct device_node *np) > > +{ > > + return -ENOSYS; > > +} > > + > > +static inline int of_get_nand_bus_width(struct device_node *np) > > +{ > > + return -ENOSYS; > > +} > > + > > +static inline bool of_get_nand_on_flash_bbt(struct device_node *np) > > +{ > > + return false; > > +} > > #endif > > Although we are "hiding" the #ifdef's here in the header, we can still > help to make them extra clear; I think the typical style is to include > /* CONFIG_OF_MTD */ markers to show which #ifdef/#else/#endif block it > belongs to. > Right, forgot about those markers! > > > > #endif /* __LINUX_OF_MTD_H */ > > With this trivial changes, I amended your patch and pushed to > l2-mtd.git. Thanks! I look forward to the following patches to remove > some of the driver #ifdef's. > Great, thanks for fixing it! -- Ezequiel García, Free Electrons Embedded Linux, Kernel and Android Engineering http://free-electrons.com From mboxrd@z Thu Jan 1 00:00:00 1970 From: Ezequiel Garcia Subject: Re: [PATCH] of_mtd: Add no-op stubs to support CONFIG_OF=n Date: Tue, 3 Sep 2013 07:53:14 -0300 Message-ID: <20130903105313.GA2355@localhost> References: <1378175873-2763-1-git-send-email-ezequiel.garcia@free-electrons.com> <20130903053642.GA364@norris.computersforpeace.net> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Content-Disposition: inline In-Reply-To: <20130903053642.GA364@norris.computersforpeace.net> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-mtd" Errors-To: linux-mtd-bounces+gldm-linux-mtd-36=gmane.org@lists.infradead.org To: Brian Norris Cc: devicetree@vger.kernel.org, Josh Wu , linux-mtd@lists.infradead.org, David Woodhouse , Artem Bityutskiy List-Id: devicetree@vger.kernel.org T24gTW9uLCBTZXAgMDIsIDIwMTMgYXQgMTA6MzY6NThQTSAtMDcwMCwgQnJpYW4gTm9ycmlzIHdy b3RlOgo+IE9uIE1vbiwgU2VwIDAyLCAyMDEzIGF0IDExOjM3OjUzUE0gLTAzMDAsIEV6ZXF1aWVs IEdhcmNpYSB3cm90ZToKPiA+IEp1c3QgbGlrZSB0aGUgcmVzdCBvZiB0aGUgc3Vic3lzdGVtcywg bGV0J3MgYWRkIHRoZSByZXF1aXJlZCBuby1vcAo+ID4gZnVuY3Rpb25zIHRvIGltcGxlbWVudCBz dHVicyB3aGVuIENPTkZJR19PRj1uLgo+ID4gCj4gPiBUaGlzIHByZXZlbnRzIE1URCBkcml2ZXJz IGZyb20gaGF2aW5nIHVnbHkgaWZkZWZzIGluIHRoZWlyIGNvZGUsCj4gPiBhbmQgaW5zdGVhZCBo aWRlIHRoZSBpZmRlZiBtb25zdGVyIGluIHRoZSBoZWFkZXIgY2xvc2V0IChmYXIgYXdheQo+ID4g ZnJvbSBwZW9wbGUncyBzaWdodCkuCj4gPiAKPiA+IFNpZ25lZC1vZmYtYnk6IEV6ZXF1aWVsIEdh cmNpYSA8ZXplcXVpZWwuZ2FyY2lhQGZyZWUtZWxlY3Ryb25zLmNvbT4KPiA+IC0tLQo+ID4gIGlu Y2x1ZGUvbGludXgvb2ZfbXRkLmggfCAxNSArKysrKysrKysrKysrKysKPiA+ICAxIGZpbGUgY2hh bmdlZCwgMTUgaW5zZXJ0aW9ucygrKQo+ID4gCj4gPiBkaWZmIC0tZ2l0IGEvaW5jbHVkZS9saW51 eC9vZl9tdGQuaCBiL2luY2x1ZGUvbGludXgvb2ZfbXRkLmgKPiA+IGluZGV4IGVkN2YyNjcuLjY2 ZjE3M2UgMTAwNjQ0Cj4gPiAtLS0gYS9pbmNsdWRlL2xpbnV4L29mX210ZC5oCj4gPiArKysgYi9p bmNsdWRlL2xpbnV4L29mX210ZC5oCj4gPiBAQCAtMTQsNiArMTQsMjEgQEAKPiA+ICBpbnQgb2Zf Z2V0X25hbmRfZWNjX21vZGUoc3RydWN0IGRldmljZV9ub2RlICpucCk7Cj4gPiAgaW50IG9mX2dl dF9uYW5kX2J1c193aWR0aChzdHJ1Y3QgZGV2aWNlX25vZGUgKm5wKTsKPiA+ICBib29sIG9mX2dl dF9uYW5kX29uX2ZsYXNoX2JidChzdHJ1Y3QgZGV2aWNlX25vZGUgKm5wKTsKPiA+ICsjZWxzZQo+ IAo+IEkgd291bGQgaW5jbHVkZSBhbiBleHRyYSBsaW5lIG9uIGVpdGhlciBzaWRlIG9mICNlbHNl Lgo+IAo+ID4gK3N0YXRpYyBpbmxpbmUgaW50IG9mX2dldF9uYW5kX2VjY19tb2RlKHN0cnVjdCBk ZXZpY2Vfbm9kZSAqbnApCj4gPiArewo+ID4gKwlyZXR1cm4gLUVOT1NZUzsKPiA+ICt9Cj4gPiAr Cj4gPiArc3RhdGljIGlubGluZSBpbnQgb2ZfZ2V0X25hbmRfYnVzX3dpZHRoKHN0cnVjdCBkZXZp Y2Vfbm9kZSAqbnApCj4gPiArewo+ID4gKwlyZXR1cm4gLUVOT1NZUzsKPiA+ICt9Cj4gPiArCj4g PiArc3RhdGljIGlubGluZSBib29sIG9mX2dldF9uYW5kX29uX2ZsYXNoX2JidChzdHJ1Y3QgZGV2 aWNlX25vZGUgKm5wKQo+ID4gK3sKPiA+ICsJcmV0dXJuIGZhbHNlOwo+ID4gK30KPiA+ICAjZW5k aWYKPiAKPiBBbHRob3VnaCB3ZSBhcmUgImhpZGluZyIgdGhlICNpZmRlZidzIGhlcmUgaW4gdGhl IGhlYWRlciwgd2UgY2FuIHN0aWxsCj4gaGVscCB0byBtYWtlIHRoZW0gZXh0cmEgY2xlYXI7IEkg dGhpbmsgdGhlIHR5cGljYWwgc3R5bGUgaXMgdG8gaW5jbHVkZQo+IC8qIENPTkZJR19PRl9NVEQg Ki8gbWFya2VycyB0byBzaG93IHdoaWNoICNpZmRlZi8jZWxzZS8jZW5kaWYgYmxvY2sgaXQKPiBi ZWxvbmdzIHRvLgo+IAoKUmlnaHQsIGZvcmdvdCBhYm91dCB0aG9zZSBtYXJrZXJzIQoKPiA+ICAK PiA+ICAjZW5kaWYgLyogX19MSU5VWF9PRl9NVERfSCAqLwo+IAo+IFdpdGggdGhpcyB0cml2aWFs IGNoYW5nZXMsIEkgYW1lbmRlZCB5b3VyIHBhdGNoIGFuZCBwdXNoZWQgdG8KPiBsMi1tdGQuZ2l0 LiBUaGFua3MhIEkgbG9vayBmb3J3YXJkIHRvIHRoZSBmb2xsb3dpbmcgcGF0Y2hlcyB0byByZW1v dmUKPiBzb21lIG9mIHRoZSBkcml2ZXIgI2lmZGVmJ3MuCj4gCgpHcmVhdCwgdGhhbmtzIGZvciBm aXhpbmcgaXQhCi0tIApFemVxdWllbCBHYXJjw61hLCBGcmVlIEVsZWN0cm9ucwpFbWJlZGRlZCBM aW51eCwgS2VybmVsIGFuZCBBbmRyb2lkIEVuZ2luZWVyaW5nCmh0dHA6Ly9mcmVlLWVsZWN0cm9u cy5jb20KCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fXwpMaW51eCBNVEQgZGlzY3Vzc2lvbiBtYWlsaW5nIGxpc3QKaHR0cDovL2xpc3RzLmluZnJh ZGVhZC5vcmcvbWFpbG1hbi9saXN0aW5mby9saW51eC1tdGQvCg==