hc
2024-02-20 102a0743326a03cd1a1202ceda21e175b7d3575c
kernel/drivers/misc/cxl/flash.c
....@@ -92,8 +92,8 @@
9292
9393 val = (u32 *)new_prop->value;
9494 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));
9797
9898 if (rc) {
9999 kfree(new_prop->name);
....@@ -175,7 +175,7 @@
175175 struct update_nodes_workarea *unwa;
176176 u32 action, node_count;
177177 int token, rc, i;
178
- __be32 *data, drc_index, phandle;
178
+ __be32 *data, phandle;
179179 char *buf;
180180
181181 token = rtas_token("ibm,update-nodes");
....@@ -213,7 +213,7 @@
213213 break;
214214 case OPCODE_ADD:
215215 /* nothing to do, just move pointer */
216
- drc_index = *data++;
216
+ data++;
217217 break;
218218 }
219219 }
....@@ -473,12 +473,6 @@
473473 return -EINVAL;
474474 }
475475
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
-
482476 static int device_close(struct inode *inode, struct file *file)
483477 {
484478 struct cxl *adapter = file->private_data;
....@@ -514,7 +508,7 @@
514508 .owner = THIS_MODULE,
515509 .open = device_open,
516510 .unlocked_ioctl = device_ioctl,
517
- .compat_ioctl = device_compat_ioctl,
511
+ .compat_ioctl = compat_ptr_ioctl,
518512 .release = device_close,
519513 };
520514