From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-5.3 required=3.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_PASS, URIBL_BLOCKED,USER_AGENT_MUTT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 823B8C10F11 for ; Wed, 10 Apr 2019 18:21:51 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 551152077C for ; Wed, 10 Apr 2019 18:21:51 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="WYDa3FaV" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730684AbfDJSVv (ORCPT ); Wed, 10 Apr 2019 14:21:51 -0400 Received: from mail-pf1-f194.google.com ([209.85.210.194]:34607 "EHLO mail-pf1-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730245AbfDJSVv (ORCPT ); Wed, 10 Apr 2019 14:21:51 -0400 Received: by mail-pf1-f194.google.com with SMTP id b3so1985876pfd.1 for ; Wed, 10 Apr 2019 11:21:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:date:from:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to:user-agent; bh=lzMK89nIGuGrncXuTs1BCQ/CHAdbkNm+CkI5p6wgaGw=; b=WYDa3FaVBxrNo2yJXGyasZG85epCVH4Ei7kzLiT4d0YkLhFyFJKwiMFYJa27wzvUXA Fhlv3DDvOK0KrehM5GHhbsQFkLM+mt6Gd2paYufb4eT+UbIIMGurIveZrWjnSExvkPgr JqHPiKtWq7VBk2ENsRGGFu1HsaO8ZQTZnj+gMMpPyYDC/q/qmfMR3/3k8TciBXOtqE/J 3muUmVw5yEAmYpAF/LC9IuLU0QqYjCmpon4cmoxTuPBjhregAAuWQpm407vtSkru0aUR Hc9SoJPN494NxAB5NbDEVXaRxb4nq+3XFL+mBa3SEn0mABe0RqKTFuZuSEy0XgD7E2Zj fnpg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:date:from:to:cc:subject:message-id :references:mime-version:content-disposition:in-reply-to:user-agent; bh=lzMK89nIGuGrncXuTs1BCQ/CHAdbkNm+CkI5p6wgaGw=; b=WvSeOQNfZFv3XorNH2gEsx7GTV4d3OP6bo4lB9qoXccpzmu6LhsZ5mX8g8ydcYGojW l3DmOpxuTFOUlOrJOunwS2suFFMrrbHfHoYz1TpCoVsz60Yi+q5at22oKvtjhoB5QxgS VZmol5kcQBZKQvTYqdQdlyFBdc+MwfAnyI1YNJFz7o6jrwNv7mxaMb0WvJ7W2NR87NuJ 5WsXe9kZWQ2tvHyFmpIBJ9lxhdmU1BhY0lDDl0GPy+yEn/cQs5h+YRzXMSXT+NdZ8GUV wvst7Dd1b2NidsISJC/tfJeMM/ypmtzSzeleyc5lNGw/D84PTeslBFZWe5IHw5UQh3HY JiWg== X-Gm-Message-State: APjAAAWTfOGF9CJVSm6NnpSG71axGm3QoAMLW1gbOhppdcfVxltBVHCe NY8f1/nngFeLEm9JwTpsTPw= X-Google-Smtp-Source: APXvYqxAAXqVTXRUzyU7AM1xgAat0qPOrwmuYzkIwS38vzb+2d0oMaPmaX81seShniJUeXjQnJgNNA== X-Received: by 2002:a65:6284:: with SMTP id f4mr42756229pgv.11.1554920510338; Wed, 10 Apr 2019 11:21:50 -0700 (PDT) Received: from localhost ([2600:1700:e321:62f0:329c:23ff:fee3:9d7c]) by smtp.gmail.com with ESMTPSA id p2sm45238276pfb.80.2019.04.10.11.21.48 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 10 Apr 2019 11:21:49 -0700 (PDT) Date: Wed, 10 Apr 2019 11:21:47 -0700 From: Guenter Roeck To: Jean Delvare Cc: linux-hwmon@vger.kernel.org, Eddie James Subject: Re: [PATCH v2 1/2] hwmon: (occ) Move common code to a separate module Message-ID: <20190410182147.GA939@roeck-us.net> References: <20190410124726.2d7e9d38@endymion> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20190410124726.2d7e9d38@endymion> User-Agent: Mutt/1.5.24 (2015-08-30) Sender: linux-hwmon-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-hwmon@vger.kernel.org Jean, On Wed, Apr 10, 2019 at 12:47:26PM +0200, Jean Delvare wrote: > Instead of duplicating the common code into the 2 (binary) drivers, > move the common code to a separate module. This is cleaner. > > Signed-off-by: Jean Delvare > Cc: Eddie James > Cc: Guenter Roeck what is the parent release for this patch ? I tried to apply it to mainline and to hwmon-next using git am, but both failed. Thanks, Guenter > --- > Eddie, can you please give it a try and confirm it works? > > Note: I kept the module names as they were before, hence the extra > "*-objs :=" statements. They could be removed if we rename the source > files, but that's better done in git directly. I don't mind either way > personally. > > drivers/hwmon/occ/Kconfig | 3 +-- > drivers/hwmon/occ/Makefile | 6 ++++-- > drivers/hwmon/occ/common.c | 7 +++++++ > drivers/hwmon/occ/sysfs.c | 2 ++ > 4 files changed, 14 insertions(+), 4 deletions(-) > > --- linux-5.0.orig/drivers/hwmon/occ/Kconfig 2019-04-10 11:30:05.579537638 +0200 > +++ linux-5.0/drivers/hwmon/occ/Kconfig 2019-04-10 11:31:20.843383376 +0200 > @@ -27,5 +27,4 @@ config SENSORS_OCC_P9_SBE > called occ-p9-hwmon. > > config SENSORS_OCC > - bool "POWER On-Chip Controller" > - depends on SENSORS_OCC_P8_I2C || SENSORS_OCC_P9_SBE > + tristate > --- linux-5.0.orig/drivers/hwmon/occ/Makefile 2019-03-04 00:21:29.000000000 +0100 > +++ linux-5.0/drivers/hwmon/occ/Makefile 2019-04-10 11:33:23.631765535 +0200 > @@ -1,5 +1,7 @@ > -occ-p8-hwmon-objs := common.o sysfs.o p8_i2c.o > -occ-p9-hwmon-objs := common.o sysfs.o p9_sbe.o > +occ-hwmon-common-objs := common.o sysfs.o > +occ-p8-hwmon-objs := p8_i2c.o > +occ-p9-hwmon-objs := p9_sbe.o > > +obj-$(CONFIG_SENSORS_OCC) += occ-hwmon-common.o > obj-$(CONFIG_SENSORS_OCC_P8_I2C) += occ-p8-hwmon.o > obj-$(CONFIG_SENSORS_OCC_P9_SBE) += occ-p9-hwmon.o > --- linux-5.0.orig/drivers/hwmon/occ/common.c 2019-03-04 00:21:29.000000000 +0100 > +++ linux-5.0/drivers/hwmon/occ/common.c 2019-04-10 11:44:53.035573580 +0200 > @@ -1,11 +1,13 @@ > // SPDX-License-Identifier: GPL-2.0 > > #include > +#include > #include > #include > #include > #include > #include > +#include > #include > #include > #include > @@ -1096,3 +1098,8 @@ int occ_setup(struct occ *occ, const cha > > return rc; > } > +EXPORT_SYMBOL_GPL(occ_setup); > + > +MODULE_AUTHOR("Eddie James "); > +MODULE_DESCRIPTION("Common OCC hwmon code"); > +MODULE_LICENSE("GPL"); > --- linux-5.0.orig/drivers/hwmon/occ/sysfs.c 2019-03-04 00:21:29.000000000 +0100 > +++ linux-5.0/drivers/hwmon/occ/sysfs.c 2019-04-10 11:39:38.627003382 +0200 > @@ -12,6 +12,7 @@ > > #include > #include > +#include > #include > #include > #include > @@ -186,3 +187,4 @@ void occ_shutdown(struct occ *occ) > { > sysfs_remove_group(&occ->bus_dev->kobj, &occ_sysfs); > } > +EXPORT_SYMBOL_GPL(occ_shutdown); > > > -- > Jean Delvare > SUSE L3 Support