* acpi-hotplug: ACPI / hotplug: Generate online uevents for ACPI containers * acpi-scan: ACPI / scan: Correct error return value of create_modalias() * acpi-lpss: ACPI / platform / LPSS: disable async suspend/resume of LPSS devices * acpi-gpio: gpio / ACPI: Use pin index and bit length ACPICA: Update to GPIO region handler interface. * acpi-video: ACPI / video: disable native backlight for ThinkPad X201s
Showing the changes to include (7 of 177 files). Show all
Unified · Split
| @@ -205,10 +205,9 @@ struct acpi_device_flags { · 204 unmodified lines | ||
| 205 | 205 | u32 match_driver:1; |
| 206 | 206 | u32 initialized:1; |
| 207 | 207 | u32 visited:1; |
| 208 | − u32 no_hotplug:1; | |
| 209 | 208 | u32 hotplug_notify:1; |
| 210 | 209 | u32 is_dock_station:1; |
| 211 | − u32 reserved:22; | |
| 210 | + u32 reserved:23; | |
| 212 | 211 | }; |
| 213 | 212 | |
| 214 | 213 | /* File System */ |
| @@ -412,7 +411,6 @@ void acpi_bus_private_data_handler(acpi_handle, void *); · 197 unmodified lines | ||
| 412 | 411 | int acpi_bus_get_private_data(acpi_handle, void **); |
| 413 | 412 | int acpi_bus_attach_private_data(acpi_handle, void *); |
| 414 | 413 | void acpi_bus_detach_private_data(acpi_handle); |
| 415 | −void acpi_bus_no_hotplug(acpi_handle handle); | |
| 416 | 414 | extern int acpi_notifier_call_chain(struct acpi_device *, u32, u32); |
| 417 | 415 | extern int register_acpi_notifier(struct notifier_block *); |
| 418 | 416 | extern int unregister_acpi_notifier(struct notifier_block *); |
| @@ -162,12 +162,25 @@ static inline size_t drbg_max_request_bytes(struct drbg_state *drbg) · 161 unmodified lines | ||
| 162 | 162 | |
| 163 | 163 | static inline size_t drbg_max_addtl(struct drbg_state *drbg) |
| 164 | 164 | { |
| 165 | +#if (__BITS_PER_LONG == 32) | |
| 166 | + /* | |
| 167 | + * SP800-90A allows smaller maximum numbers to be returned -- we | |
| 168 | + * return SIZE_MAX - 1 to allow the verification of the enforcement | |
| 169 | + * of this value in drbg_healthcheck_sanity. | |
| 170 | + */ | |
| 171 | + return (SIZE_MAX - 1); | |
| 172 | +#else | |
| 165 | 173 | return (1UL<<(drbg->core->max_addtllen)); |
| 174 | +#endif | |
| 166 | 175 | } |
| 167 | 176 | |
| 168 | 177 | static inline size_t drbg_max_requests(struct drbg_state *drbg) |
| 169 | 178 | { |
| 179 | +#if (__BITS_PER_LONG == 32) | |
| 180 | + return SIZE_MAX; | |
| 181 | +#else | |
| 170 | 182 | return (1UL<<(drbg->core->max_req)); |
| 183 | +#endif | |
| 171 | 184 | } |
| 172 | 185 | |
| 173 | 186 | /* |
| @@ -84,10 +84,12 @@ static inline void iio_trigger_put(struct iio_trigger *trig) · 83 unmodified lines | ||
| 84 | 84 | put_device(&trig->dev); |
| 85 | 85 | } |
| 86 | 86 | |
| 87 | −static inline void iio_trigger_get(struct iio_trigger *trig) | |
| 87 | +static inline struct iio_trigger *iio_trigger_get(struct iio_trigger *trig) | |
| 88 | 88 | { |
| 89 | 89 | get_device(&trig->dev); |
| 90 | 90 | __module_get(trig->ops->owner); |
| 91 | + | |
| 92 | + return trig; | |
| 91 | 93 | } |
| 92 | 94 | |
| 93 | 95 | /** |
| @@ -303,6 +303,7 @@ struct pci_dev { · 302 unmodified lines | ||
| 303 | 303 | D3cold, not set for devices |
| 304 | 304 | powered on/off by the |
| 305 | 305 | corresponding bridge */ |
| 306 | + unsigned int ignore_hotplug:1; /* Ignore hotplug events */ | |
| 306 | 307 | unsigned int d3_delay; /* D3->D0 transition time in ms */ |
| 307 | 308 | unsigned int d3cold_delay; /* D3cold->D0 transition time in ms */ |
| 308 | 309 | |
| @@ -1021,6 +1022,11 @@ bool pci_dev_run_wake(struct pci_dev *dev); · 712 unmodified lines | ||
| 1021 | 1022 | bool pci_check_pme_status(struct pci_dev *dev); |
| 1022 | 1023 | void pci_pme_wakeup_bus(struct pci_bus *bus); |
| 1023 | 1024 | |
| 1025 | +static inline void pci_ignore_hotplug(struct pci_dev *dev) | |
| 1026 | +{ | |
| 1027 | + dev->ignore_hotplug = 1; | |
| 1028 | +} | |
| 1029 | + | |
| 1024 | 1030 | static inline int pci_enable_wake(struct pci_dev *dev, pci_power_t state, |
| 1025 | 1031 | bool enable) |
| 1026 | 1032 | { |
| @@ -64,6 +64,7 @@ int vga_switcheroo_get_client_state(struct pci_dev *dev); · 63 unmodified lines | ||
| 64 | 64 | void vga_switcheroo_set_dynamic_switch(struct pci_dev *pdev, enum vga_switcheroo_state dynamic); |
| 65 | 65 | |
| 66 | 66 | int vga_switcheroo_init_domain_pm_ops(struct device *dev, struct dev_pm_domain *domain); |
| 67 | +void vga_switcheroo_fini_domain_pm_ops(struct device *dev); | |
| 67 | 68 | int vga_switcheroo_init_domain_pm_optimus_hdmi_audio(struct device *dev, struct dev_pm_domain *domain); |
| 68 | 69 | #else |
| 69 | 70 | |
| @@ -82,6 +83,7 @@ static inline int vga_switcheroo_get_client_state(struct pci_dev *dev) { return · 12 unmodified lines | ||
| 82 | 83 | static inline void vga_switcheroo_set_dynamic_switch(struct pci_dev *pdev, enum vga_switcheroo_state dynamic) {} |
| 83 | 84 | |
| 84 | 85 | static inline int vga_switcheroo_init_domain_pm_ops(struct device *dev, struct dev_pm_domain *domain) { return -EINVAL; } |
| 86 | +static inline void vga_switcheroo_fini_domain_pm_ops(struct device *dev) {} | |
| 85 | 87 | static inline int vga_switcheroo_init_domain_pm_optimus_hdmi_audio(struct device *dev, struct dev_pm_domain *domain) { return -EINVAL; } |
| 86 | 88 | |
| 87 | 89 | #endif |
| @@ -182,7 +182,6 @@ extern void vga_put(struct pci_dev *pdev, unsigned int rsrc); · 181 unmodified lines | ||
| 182 | 182 | * vga_get()... |
| 183 | 183 | */ |
| 184 | 184 | |
| 185 | −#ifndef __ARCH_HAS_VGA_DEFAULT_DEVICE | |
| 186 | 185 | #ifdef CONFIG_VGA_ARB |
| 187 | 186 | extern struct pci_dev *vga_default_device(void); |
| 188 | 187 | extern void vga_set_default_device(struct pci_dev *pdev); |
| @@ -190,7 +189,6 @@ extern void vga_set_default_device(struct pci_dev *pdev); · 1 unmodified line | ||
| 190 | 189 | static inline struct pci_dev *vga_default_device(void) { return NULL; }; |
| 191 | 190 | static inline void vga_set_default_device(struct pci_dev *pdev) { }; |
| 192 | 191 | #endif |
| 193 | −#endif | |
| 194 | 192 | |
| 195 | 193 | /** |
| 196 | 194 | * vga_conflicts |
| @@ -68,7 +68,7 @@ static inline void scsi_activate_tcq(struct scsi_device *sdev, int depth) · 67 unmodified lines | ||
| 68 | 68 | return; |
| 69 | 69 | |
| 70 | 70 | if (!shost_use_blk_mq(sdev->host) && |
| 71 | − blk_queue_tagged(sdev->request_queue)) | |
| 71 | + !blk_queue_tagged(sdev->request_queue)) | |
| 72 | 72 | blk_queue_init_tags(sdev->request_queue, depth, |
| 73 | 73 | sdev->host->bqt); |
| 74 | 74 | |