diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2016-11-30 15:37:22 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2016-11-30 15:37:22 +0100 |
| commit | 946cb48082b0bbff0bb96b3f816d0327bf409d79 (patch) | |
| tree | ddf24fb1cffad74877ccd6d4c3421cf8e6cc5bb8 /d16.patch | |
| parent | 3c37d678907cad7f656ff2d3f1d7d9781cf90b58 (diff) | |
| download | patches-946cb48082b0bbff0bb96b3f816d0327bf409d79.tar.gz | |
more patches updated
Diffstat (limited to 'd16.patch')
| -rw-r--r-- | d16.patch | 120 |
1 files changed, 120 insertions, 0 deletions
diff --git a/d16.patch b/d16.patch new file mode 100644 index 00000000000000..1fa50d6891fb20 --- /dev/null +++ b/d16.patch @@ -0,0 +1,120 @@ +--- + drivers/xen/xen-pciback/pci_stub.c | 44 ++++++++++++++++--------------------- + 1 file changed, 20 insertions(+), 24 deletions(-) + + +--- a/drivers/xen/xen-pciback/pci_stub.c ++++ b/drivers/xen/xen-pciback/pci_stub.c +@@ -1172,8 +1172,8 @@ out: + return err; + } + +-static ssize_t pcistub_slot_add(struct device_driver *drv, const char *buf, +- size_t count) ++static ssize_t new_slot_store(struct device_driver *drv, const char *buf, ++ size_t count) + { + int domain, bus, slot, func; + int err; +@@ -1189,10 +1189,10 @@ out: + err = count; + return err; + } +-static DRIVER_ATTR(new_slot, S_IWUSR, NULL, pcistub_slot_add); ++static DRIVER_ATTR_WO(new_slot); + +-static ssize_t pcistub_slot_remove(struct device_driver *drv, const char *buf, +- size_t count) ++static ssize_t remove_slot_store(struct device_driver *drv, const char *buf, ++ size_t count) + { + int domain, bus, slot, func; + int err; +@@ -1208,9 +1208,9 @@ out: + err = count; + return err; + } +-static DRIVER_ATTR(remove_slot, S_IWUSR, NULL, pcistub_slot_remove); ++static DRIVER_ATTR_WO(remove_slot); + +-static ssize_t pcistub_slot_show(struct device_driver *drv, char *buf) ++static ssize_t slots_show(struct device_driver *drv, char *buf) + { + struct pcistub_device_id *pci_dev_id; + size_t count = 0; +@@ -1231,9 +1231,9 @@ static ssize_t pcistub_slot_show(struct + + return count; + } +-static DRIVER_ATTR(slots, S_IRUSR, pcistub_slot_show, NULL); ++static DRIVER_ATTR_RO(slots); + +-static ssize_t pcistub_irq_handler_show(struct device_driver *drv, char *buf) ++static ssize_t irq_handlers_show(struct device_driver *drv, char *buf) + { + struct pcistub_device *psdev; + struct xen_pcibk_dev_data *dev_data; +@@ -1260,11 +1260,10 @@ static ssize_t pcistub_irq_handler_show( + spin_unlock_irqrestore(&pcistub_devices_lock, flags); + return count; + } +-static DRIVER_ATTR(irq_handlers, S_IRUSR, pcistub_irq_handler_show, NULL); ++static DRIVER_ATTR_RO(irq_handlers); + +-static ssize_t pcistub_irq_handler_switch(struct device_driver *drv, +- const char *buf, +- size_t count) ++static ssize_t irq_handler_state_store(struct device_driver *drv, ++ const char *buf, size_t count) + { + struct pcistub_device *psdev; + struct xen_pcibk_dev_data *dev_data; +@@ -1301,11 +1300,10 @@ out: + err = count; + return err; + } +-static DRIVER_ATTR(irq_handler_state, S_IWUSR, NULL, +- pcistub_irq_handler_switch); ++static DRIVER_ATTR_WO(irq_handler_state); + +-static ssize_t pcistub_quirk_add(struct device_driver *drv, const char *buf, +- size_t count) ++static ssize_t quirks_add(struct device_driver *drv, const char *buf, ++ size_t count) + { + int domain, bus, slot, func, reg, size, mask; + int err; +@@ -1323,7 +1321,7 @@ out: + return err; + } + +-static ssize_t pcistub_quirk_show(struct device_driver *drv, char *buf) ++static ssize_t quirks_show(struct device_driver *drv, char *buf) + { + int count = 0; + unsigned long flags; +@@ -1366,11 +1364,10 @@ out: + + return count; + } +-static DRIVER_ATTR(quirks, S_IRUSR | S_IWUSR, pcistub_quirk_show, +- pcistub_quirk_add); ++static DRIVER_ATTR_RW(quirks); + +-static ssize_t permissive_add(struct device_driver *drv, const char *buf, +- size_t count) ++static ssize_t permissive_store(struct device_driver *drv, const char *buf, ++ size_t count) + { + int domain, bus, slot, func; + int err; +@@ -1431,8 +1428,7 @@ static ssize_t permissive_show(struct de + spin_unlock_irqrestore(&pcistub_devices_lock, flags); + return count; + } +-static DRIVER_ATTR(permissive, S_IRUSR | S_IWUSR, permissive_show, +- permissive_add); ++static DRIVER_ATTR_RW(permissive); + + static void pcistub_exit(void) + { |