Re: [PATCH] iio: adc: ad7124: Disable all channels at probe time

From: Uwe Kleine-König
Date: Fri Dec 06 2024 - 11:11:57 EST


On Fri, Dec 06, 2024 at 09:35:15AM -0600, David Lechner wrote:
> On 12/6/24 5:04 AM, Uwe Kleine-König wrote:
> > Hello Jonathan,
> >
> > On Sat, Nov 09, 2024 at 03:24:38PM +0000, Jonathan Cameron wrote:
> >> Sadly this has probably missed 6.12, but I have queued it up as a fix
> >> for early next cycle and marked it for stable.
> >
> > I interpreted "early next cycle" as "This will go into v6.13-rc1.". But
> > that didn't work and didn't hit the mainline yet (as of cdd30ebb1b9f).
> >
> > This patch was included in next as
> > 64612ec9b909b699293b7220c634f67a9fc12e06 between next-20241111 and
> > next-20241128 and then disappeared from there.
> >
> > What is wrong here?
> >
> > Best regards
> > Uwe
>
> FYI, the iio tree is currently missing from linux-next due to [1].
>
> [1]: https://lore.kernel.org/all/d707cb3b-1569-45d9-bdc3-dcc98eb88bc4@xxxxxxxxxxxxx/

I first thought that couldn't be the explanation because that conflict
happened to late, but indeed next-20241203 is the first next tag after
next-20241128 and

git://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio.git fixes-togreg

still contains my patch. Thanks for that hint.

Masahiro pointed out a merge fix in the linked thread, but I think it's
incomplete/wrong.

When merging the above branch (currently at
1694dea95b02eff1a64c893ffee4626df533b2ab) into ceb8bf2ceaa7 ("module:
Convert default symbol namespace to string literal") I'd do:

diff --git a/drivers/iio/imu/inv_icm42600/inv_icm42600_core.c b/drivers/iio/imu/inv_icm42600/inv_icm42600_core.c
index 215731bd3c7d..ef9875d3b79d 100644
--- a/drivers/iio/imu/inv_icm42600/inv_icm42600_core.c
+++ b/drivers/iio/imu/inv_icm42600/inv_icm42600_core.c
@@ -100,7 +100,7 @@ const struct regmap_config inv_icm42600_spi_regmap_config = {
.cache_type = REGCACHE_RBTREE,
.use_single_write = true,
};
-EXPORT_SYMBOL_NS_GPL(inv_icm42600_spi_regmap_config, IIO_ICM42600);
+EXPORT_SYMBOL_NS_GPL(inv_icm42600_spi_regmap_config, "IIO_ICM42600");

struct inv_icm42600_hw {
uint8_t whoami;

The MODULE_IMPORT_NS line for
drivers/iio/imu/inv_icm42600/inv_icm42600_core.c was already fixed in
commit cdd30ebb1b9f ("module: Convert symbol namespace to string
literal").

Best regards
Uwe

Attachment: signature.asc
Description: PGP signature