From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Tue, 02 May 2023 11:25:09 +0200 Received: from metis.ext.pengutronix.de ([2001:67c:670:201:290:27ff:fe1d:cc33]) by lore.white.stw.pengutronix.de with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1ptmFy-002ArT-7P for lore@lore.pengutronix.de; Tue, 02 May 2023 11:25:09 +0200 Received: from bombadil.infradead.org ([2607:7c80:54:3::133]) by metis.ext.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1ptmFw-0003ps-4Q for lore@pengutronix.de; Tue, 02 May 2023 11:25:08 +0200 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:From:In-Reply-To: Content-Type:MIME-Version:References:Message-ID:Subject:Cc:To:Date:Reply-To: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=OYuF8dyW/wRA1apu8ZJk18gSvOx0mmB3SHHs4E9SraY=; b=sf02iOmmTr42wDaaA+whjHKDMF h1Bst89yPGUPkBAHa5LnEnP3XEY2+zhDfSX+YEweadFEQAdgkhMH/dwR4Oijg2SZEnNJZPPlRg6JB V5xkpPETYDqe4fJws+fy6i/OD9cfGBEuwnCeKVATAkIaN0VVcYIdFZ0S9JPaSfFs92Vvg34fMLFmp U82M+INMj+u8iEiJY8AbbnkFJY0G+2rKk4Jc/4IcQHB/gnX5351629y8ECDi582pmucXMeIMURwuu palwgwI2atw7NK9ExmspGWdgROW0Qtf6VBbSKtRzFMAC7DQIYV2WsUVLyUzAAvuS0DKEQhllGwg57 mJSvsKKw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1ptmF1-000lUK-2a; Tue, 02 May 2023 09:24:11 +0000 Received: from metis.ext.pengutronix.de ([2001:67c:670:201:290:27ff:fe1d:cc33]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1ptmEz-000lTP-0P for barebox@lists.infradead.org; Tue, 02 May 2023 09:24:10 +0000 Received: from ptx.hi.pengutronix.de ([2001:67c:670:100:1d::c0]) by metis.ext.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1ptmEx-0003iY-RW; Tue, 02 May 2023 11:24:07 +0200 Received: from sha by ptx.hi.pengutronix.de with local (Exim 4.92) (envelope-from ) id 1ptmEx-00072c-9f; Tue, 02 May 2023 11:24:07 +0200 Date: Tue, 2 May 2023 11:24:07 +0200 To: Ahmad Fatoum Cc: barebox@lists.infradead.org Message-ID: <20230502092407.GW13543@pengutronix.de> References: <20230424120211.115610-1-ahmad@a3f.at> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20230424120211.115610-1-ahmad@a3f.at> X-Sent-From: Pengutronix Hildesheim X-URL: http://www.pengutronix.de/ X-Accept-Language: de,en X-Accept-Content-Type: text/plain User-Agent: Mutt/1.10.1 (2018-07-13) From: Sascha Hauer X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20230502_022409_163669_A6A61592 X-CRM114-Status: GOOD ( 28.32 ) X-BeenThere: barebox@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "barebox" X-SA-Exim-Connect-IP: 2607:7c80:54:3::133 X-SA-Exim-Mail-From: barebox-bounces+lore=pengutronix.de@lists.infradead.org X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on metis.ext.pengutronix.de X-Spam-Level: X-Spam-Status: No, score=-4.8 required=4.0 tests=AWL,BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED,SPF_HELO_NONE,SPF_NONE, T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.2 Subject: Re: [PATCH] clk: implement clk_to_clk_hw using container_of_safe X-SA-Exim-Version: 4.2.1 (built Wed, 08 May 2019 21:11:16 +0000) X-SA-Exim-Scanned: Yes (on metis.ext.pengutronix.de) On Mon, Apr 24, 2023 at 02:02:11PM +0200, Ahmad Fatoum wrote: > We basically opencode container_of_safe. The kernel implementation of > container_of has also got a better diagnostic for mismatched arguments, > so let's import it and use it. > > Signed-off-by: Ahmad Fatoum > --- > include/linux/clk.h | 3 ++- > include/linux/container_of.h | 40 ++++++++++++++++++++++++++++++++++++ > include/linux/kernel.h | 12 +---------- > 3 files changed, 43 insertions(+), 12 deletions(-) > create mode 100644 include/linux/container_of.h > Applied, thanks Sascha > diff --git a/include/linux/clk.h b/include/linux/clk.h > index 29c697a00bd9..c78132d40582 100644 > --- a/include/linux/clk.h > +++ b/include/linux/clk.h > @@ -13,6 +13,7 @@ > #include > #include > #include > +#include > #include > > struct device; > @@ -296,7 +297,7 @@ static inline struct clk *clk_hw_to_clk(const struct clk_hw *hw) > > static inline struct clk_hw *clk_to_clk_hw(const struct clk *clk) > { > - return IS_ERR(clk) ? ERR_CAST(clk) : (struct clk_hw *)container_of(clk, struct clk_hw, clk); > + return container_of_safe(clk, struct clk_hw, clk); > } > > struct clk_div_table { > diff --git a/include/linux/container_of.h b/include/linux/container_of.h > new file mode 100644 > index 000000000000..2f4944b791b8 > --- /dev/null > +++ b/include/linux/container_of.h > @@ -0,0 +1,40 @@ > +/* SPDX-License-Identifier: GPL-2.0 */ > +#ifndef _LINUX_CONTAINER_OF_H > +#define _LINUX_CONTAINER_OF_H > + > +#include > +#include > + > +#define typeof_member(T, m) typeof(((T*)0)->m) > + > +/** > + * container_of - cast a member of a structure out to the containing structure > + * @ptr: the pointer to the member. > + * @type: the type of the container struct this is embedded in. > + * @member: the name of the member within the struct. > + * > + */ > +#define container_of(ptr, type, member) ({ \ > + void *__mptr = (void *)(ptr); \ > + static_assert(__same_type(*(ptr), ((type *)0)->member) || \ > + __same_type(*(ptr), void), \ > + "pointer type mismatch in container_of()"); \ > + ((type *)(__mptr - offsetof(type, member))); }) > + > +/** > + * container_of_safe - cast a member of a structure out to the containing structure > + * @ptr: the pointer to the member. > + * @type: the type of the container struct this is embedded in. > + * @member: the name of the member within the struct. > + * > + * If IS_ERR_OR_NULL(ptr), ptr is returned unchanged. > + */ > +#define container_of_safe(ptr, type, member) ({ \ > + void *__mptr = (void *)(ptr); \ > + static_assert(__same_type(*(ptr), ((type *)0)->member) || \ > + __same_type(*(ptr), void), \ > + "pointer type mismatch in container_of_safe()"); \ > + IS_ERR_OR_NULL(__mptr) ? ERR_CAST(__mptr) : \ > + ((type *)(__mptr - offsetof(type, member))); }) > + > +#endif /* _LINUX_CONTAINER_OF_H */ > diff --git a/include/linux/kernel.h b/include/linux/kernel.h > index 44fc02df0bf9..0eb7bd21fe93 100644 > --- a/include/linux/kernel.h > +++ b/include/linux/kernel.h > @@ -7,6 +7,7 @@ > #include > #include > #include > +#include > > #define ALIGN(x, a) __ALIGN_MASK(x, (typeof(x))(a) - 1) > #define ALIGN_DOWN(x, a) ALIGN((x) - ((a) - 1), (a)) > @@ -256,17 +257,6 @@ extern int hex_to_bin(char ch); > extern int __must_check hex2bin(u8 *dst, const char *src, size_t count); > extern char *bin2hex(char *dst, const void *src, size_t count); > > -/** > - * container_of - cast a member of a structure out to the containing structure > - * @ptr: the pointer to the member. > - * @type: the type of the container struct this is embedded in. > - * @member: the name of the member within the struct. > - * > - */ > -#define container_of(ptr, type, member) ({ \ > - const typeof( ((type *)0)->member ) *__mptr = (ptr); \ > - (type *)( (char *)__mptr - offsetof(type,member) );}) > - > /* > * swap - swap value of @a and @b > */ > -- > 2.38.4 > > > -- Pengutronix e.K. | | Steuerwalder Str. 21 | http://www.pengutronix.de/ | 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 | Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |