mk-rootfs.sh

hc

2023-12-11 072de836f53be56a70cecf70b43ae43b7ce17376

 kernel/drivers/misc/cxl/flash.c
..
..
@@ -92,8 +92,8 @@
92
92
 
93
93
 	val = (u32 *)new_prop->value;
94
94
 	rc = cxl_update_properties(dn, new_prop);
95
-	pr_devel("%s: update property (%s, length: %i, value: %#x)\n",
96
-		  dn->name, name, vd, be32_to_cpu(*val));
95
+	pr_devel("%pOFn: update property (%s, length: %i, value: %#x)\n",
96
+		  dn, name, vd, be32_to_cpu(*val));
97
97
 
98
98
 	if (rc) {
99
99
 		kfree(new_prop->name);
..
..
@@ -175,7 +175,7 @@
175
175
 	struct update_nodes_workarea *unwa;
176
176
 	u32 action, node_count;
177
177
 	int token, rc, i;
178
-	__be32 *data, drc_index, phandle;
178
+	__be32 *data, phandle;
179
179
 	char *buf;
180
180
 
181
181
 	token = rtas_token("ibm,update-nodes");
..
..
@@ -213,7 +213,7 @@
213
213
 					break;
214
214
 				case OPCODE_ADD:
215
215
 					/* nothing to do, just move pointer */
216
-					drc_index = *data++;
216
+					data++;
217
217
 					break;
218
218
 				}
219
219
 			}
..
..
@@ -473,12 +473,6 @@
473
473
 		return -EINVAL;
474
474
 }
475
475
 
476
-static long device_compat_ioctl(struct file *file, unsigned int cmd,
477
-				unsigned long arg)
478
-{
479
-	return device_ioctl(file, cmd, arg);
480
-}
481
-
482
476
 static int device_close(struct inode *inode, struct file *file)
483
477
 {
484
478
 	struct cxl *adapter = file->private_data;
..
..
@@ -514,7 +508,7 @@
514
508
 	.owner		= THIS_MODULE,
515
509
 	.open		= device_open,
516
510
 	.unlocked_ioctl	= device_ioctl,
517
-	.compat_ioctl	= device_compat_ioctl,
511
+	.compat_ioctl	= compat_ptr_ioctl,
518
512
 	.release	= device_close,
519
513
 };
520
514