hc
2023-12-11 d2ccde1c8e90d38cee87a1b0309ad2827f3fd30d
kernel/drivers/xen/xen-pciback/xenbus.c
....@@ -105,13 +105,13 @@
105105 }
106106
107107 static int xen_pcibk_do_attach(struct xen_pcibk_device *pdev, int gnt_ref,
108
- int remote_evtchn)
108
+ evtchn_port_t remote_evtchn)
109109 {
110110 int err = 0;
111111 void *vaddr;
112112
113113 dev_dbg(&pdev->xdev->dev,
114
- "Attaching to frontend resources - gnt_ref=%d evtchn=%d\n",
114
+ "Attaching to frontend resources - gnt_ref=%d evtchn=%u\n",
115115 gnt_ref, remote_evtchn);
116116
117117 err = xenbus_map_ring_valloc(pdev->xdev, &gnt_ref, 1, &vaddr);
....@@ -142,7 +142,8 @@
142142 static int xen_pcibk_attach(struct xen_pcibk_device *pdev)
143143 {
144144 int err = 0;
145
- int gnt_ref, remote_evtchn;
145
+ int gnt_ref;
146
+ evtchn_port_t remote_evtchn;
146147 char *magic = NULL;
147148
148149
....@@ -547,7 +548,7 @@
547548 xenbus_switch_state(xdev, XenbusStateClosed);
548549 if (xenbus_dev_is_online(xdev))
549550 break;
550
- /* fall through if not online */
551
+ fallthrough; /* if not online */
551552 case XenbusStateUnknown:
552553 dev_dbg(&xdev->dev, "frontend is gone! unregister device\n");
553554 device_unregister(&xdev->dev);
....@@ -709,7 +710,7 @@
709710 /* We need to force a call to our callback here in case
710711 * xend already configured us!
711712 */
712
- xen_pcibk_be_watch(&pdev->be_watch, NULL, 0);
713
+ xen_pcibk_be_watch(&pdev->be_watch, NULL, NULL);
713714
714715 out:
715716 return err;