.. | .. |
---|
105 | 105 | } |
---|
106 | 106 | |
---|
107 | 107 | static int xen_pcibk_do_attach(struct xen_pcibk_device *pdev, int gnt_ref, |
---|
108 | | - int remote_evtchn) |
---|
| 108 | + evtchn_port_t remote_evtchn) |
---|
109 | 109 | { |
---|
110 | 110 | int err = 0; |
---|
111 | 111 | void *vaddr; |
---|
112 | 112 | |
---|
113 | 113 | 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", |
---|
115 | 115 | gnt_ref, remote_evtchn); |
---|
116 | 116 | |
---|
117 | 117 | err = xenbus_map_ring_valloc(pdev->xdev, &gnt_ref, 1, &vaddr); |
---|
.. | .. |
---|
142 | 142 | static int xen_pcibk_attach(struct xen_pcibk_device *pdev) |
---|
143 | 143 | { |
---|
144 | 144 | int err = 0; |
---|
145 | | - int gnt_ref, remote_evtchn; |
---|
| 145 | + int gnt_ref; |
---|
| 146 | + evtchn_port_t remote_evtchn; |
---|
146 | 147 | char *magic = NULL; |
---|
147 | 148 | |
---|
148 | 149 | |
---|
.. | .. |
---|
547 | 548 | xenbus_switch_state(xdev, XenbusStateClosed); |
---|
548 | 549 | if (xenbus_dev_is_online(xdev)) |
---|
549 | 550 | break; |
---|
550 | | - /* fall through if not online */ |
---|
| 551 | + fallthrough; /* if not online */ |
---|
551 | 552 | case XenbusStateUnknown: |
---|
552 | 553 | dev_dbg(&xdev->dev, "frontend is gone! unregister device\n"); |
---|
553 | 554 | device_unregister(&xdev->dev); |
---|
.. | .. |
---|
709 | 710 | /* We need to force a call to our callback here in case |
---|
710 | 711 | * xend already configured us! |
---|
711 | 712 | */ |
---|
712 | | - xen_pcibk_be_watch(&pdev->be_watch, NULL, 0); |
---|
| 713 | + xen_pcibk_be_watch(&pdev->be_watch, NULL, NULL); |
---|
713 | 714 | |
---|
714 | 715 | out: |
---|
715 | 716 | return err; |
---|