Date:   Mon, 20 Dec 2021 22:08:43 +1100
From:   Stephen Rothwell <sfr@canb.auug.org.au>
To:     Andrew Morton <akpm@linux-foundation.org>,
        Guenter Roeck <linux@roeck-us.net>
Cc:     Armin Wolf <W_Armin@gmx.de>,
        Muchun Song <songmuchun@bytedance.com>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        Linux Next Mailing List <linux-next@vger.kernel.org>
Subject: linux-next: build failure after merge of the akpm tree
Message-ID: <20211220220843.735da08f@canb.auug.org.au>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/3o/FjkrRNfy.xCOU8MbTLzM";
 protocol="application/pgp-signature"; micalg=pgp-sha256
Precedence: bulk

--Sig_/3o/FjkrRNfy.xCOU8MbTLzM
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: quoted-printable

Hi all,

After merging the akpm tree, today's linux-next build (x86_64
allmodconfig) failed like this:

drivers/hwmon/dell-smm-hwmon.c: In function 'i8k_ioctl':
drivers/hwmon/dell-smm-hwmon.c:454:31: error: implicit declaration of funct=
ion 'PDE_DATA'; did you mean 'NODE_DATA'? [-Werror=3Dimplicit-function-decl=
aration]
  454 |  struct dell_smm_data *data =3D PDE_DATA(file_inode(fp));
      |                               ^~~~~~~~
      |                               NODE_DATA
drivers/hwmon/dell-smm-hwmon.c:454:31: error: initialization of 'struct del=
l_smm_data *' from 'int' makes pointer from integer without a cast [-Werror=
=3Dint-conversion]
cc1: all warnings being treated as errors

Caused by commit

  2dd082773083 ("proc: remove PDE_DATA() completely")

interacting with commit

  073bd07205af ("hwmon: (dell-smm) Unify i8k_ioctl() and i8k_ioctl_unlocked=
()")

from the hwmon-staging tree.

I applied the following fixup patch.

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Mon, 20 Dec 2021 22:04:57 +1100
Subject: [PATCH] fixup for "proc: remove PDE_DATA() completely"

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
 drivers/hwmon/dell-smm-hwmon.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/hwmon/dell-smm-hwmon.c b/drivers/hwmon/dell-smm-hwmon.c
index baec55c1d83d..145034a324c4 100644
--- a/drivers/hwmon/dell-smm-hwmon.c
+++ b/drivers/hwmon/dell-smm-hwmon.c
@@ -451,7 +451,7 @@ static int i8k_get_power_status(void)
=20
 static long i8k_ioctl(struct file *fp, unsigned int cmd, unsigned long arg)
 {
-	struct dell_smm_data *data =3D PDE_DATA(file_inode(fp));
+	struct dell_smm_data *data =3D pde_data(file_inode(fp));
 	int __user *argp =3D (int __user *)arg;
 	int speed, err;
 	int val =3D 0;
--=20
2.33.0

--=20
Cheers,
Stephen Rothwell

--Sig_/3o/FjkrRNfy.xCOU8MbTLzM
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

-----BEGIN PGP SIGNATURE-----

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmHAZDsACgkQAVBC80lX
0GxdOwf+Msc+uRWSp1bEelqjgOSLlWQ+6DtvdtvUkvm207r9TFArUb6EgzLT094T
Ojc5WtHXNYfYftHpmW4m1Iqu7e8sri/GxoVf0JaHlXJklUndyfunF12Sx5KVkrMN
zJEDw9QQckDaeuk5YXawqAZVDiaouXIcE8Sl7LDMiz0FljDYSKIoplHHzcnWdqro
fFAT2WsYzjefXLjpeWH1AzeV0fHplE3Rhx7MIHa6iPhgxHVMDHTRfLredehhAApp
eAjAWY2xTC8MjPRNDuxP8t65zman4ah2UnW9zCC0kmYfTLKDpirhJwMA2h4JDObx
afHQS5JysV+aFws8ZMnj+c6mhT8DDg==
=+yb4
-----END PGP SIGNATURE-----

--Sig_/3o/FjkrRNfy.xCOU8MbTLzM--