linux-next: build failure after merge of the akpm tree

[Stephen Rothwell]

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 function 'PDE_DATA'; did you mean 'NODE_DATA'? [-Werror=implicit-function-declaration]
  454 |  struct dell_smm_data *data = PDE_DATA(file_inode(fp));
      |                               ^~~~~~~~
      |                               NODE_DATA
drivers/hwmon/dell-smm-hwmon.c:454:31: error: initialization of 'struct dell_smm_data *' from 'int' makes pointer from integer without a cast [-Werror=int-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@xxxxxxxxxxxxxxxx>
Date: Mon, 20 Dec 2021 22:04:57 +1100
Subject: [PATCH] fixup for "proc: remove PDE_DATA() completely"

Signed-off-by: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
---
 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)
 
 static long i8k_ioctl(struct file *fp, unsigned int cmd, unsigned long arg)
 {
-	struct dell_smm_data *data = PDE_DATA(file_inode(fp));
+	struct dell_smm_data *data = pde_data(file_inode(fp));
 	int __user *argp = (int __user *)arg;
 	int speed, err;
 	int val = 0;
-- 
2.33.0

-- 
Cheers,
Stephen Rothwell

Attachment: pgpBUxzAuFAs7.pgp
Description: OpenPGP digital signature