History

Merge branches 'acpi-hotplug', 'acpi-scan', 'acpi-lpss', 'acpi-gpio' and 'acpi-video'

* 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

Rafael J. Wysocki committed 12 years ago

Commit 9ef5a305 parents 8ab17fc 98d28d0 4579208 c15d821 789eeea177 files · +1195 −631Browse files

Showing the changes to include (7 of 177 files). Show all

Unified · Split

7 files
  1. include/acpi/acpi_bus.h +1 −3
  2. include/crypto/drbg.h +13 −0
  3. include/linux/iio/trigger.h +3 −1
  4. include/linux/pci.h +6 −0
  5. include/linux/vga_switcheroo.h +2 −0
  6. include/linux/vgaarb.h +0 −2
  7. include/scsi/scsi_tcq.h +1 −1
include/acpi/acpi_bus.h+1−3
@@ -205,10 +205,9 @@ struct acpi_device_flags { · 204 unmodified lines
205 u32 match_driver:1;205 u32 match_driver:1;
206 u32 initialized:1;206 u32 initialized:1;
207 u32 visited:1;207 u32 visited:1;
208 u32 no_hotplug:1;
209 u32 hotplug_notify:1;208 u32 hotplug_notify:1;
210 u32 is_dock_station:1;209 u32 is_dock_station:1;
211 u32 reserved:22;210 u32 reserved:23;
212};211};
213 212
214/* File System */213/* File System */
@@ -412,7 +411,6 @@ void acpi_bus_private_data_handler(acpi_handle, void *); · 197 unmodified lines
412int acpi_bus_get_private_data(acpi_handle, void **);411int acpi_bus_get_private_data(acpi_handle, void **);
413int acpi_bus_attach_private_data(acpi_handle, void *);412int acpi_bus_attach_private_data(acpi_handle, void *);
414void acpi_bus_detach_private_data(acpi_handle);413void acpi_bus_detach_private_data(acpi_handle);
415void acpi_bus_no_hotplug(acpi_handle handle);
416extern int acpi_notifier_call_chain(struct acpi_device *, u32, u32);414extern int acpi_notifier_call_chain(struct acpi_device *, u32, u32);
417extern int register_acpi_notifier(struct notifier_block *);415extern int register_acpi_notifier(struct notifier_block *);
418extern int unregister_acpi_notifier(struct notifier_block *);416extern int unregister_acpi_notifier(struct notifier_block *);
include/crypto/drbg.h+13−0
@@ -162,12 +162,25 @@ static inline size_t drbg_max_request_bytes(struct drbg_state *drbg) · 161 unmodified lines
162 162
163static inline size_t drbg_max_addtl(struct drbg_state *drbg)163static 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 return (1UL<<(drbg->core->max_addtllen));173 return (1UL<<(drbg->core->max_addtllen));
174#endif
166}175}
167 176
168static inline size_t drbg_max_requests(struct drbg_state *drbg)177static 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 return (1UL<<(drbg->core->max_req));182 return (1UL<<(drbg->core->max_req));
183#endif
171}184}
172 185
173/*186/*
include/linux/iio/trigger.h+3−1
@@ -84,10 +84,12 @@ static inline void iio_trigger_put(struct iio_trigger *trig) · 83 unmodified lines
84 put_device(&trig->dev);84 put_device(&trig->dev);
85}85}
86 86
87static inline void iio_trigger_get(struct iio_trigger *trig)87static inline struct iio_trigger *iio_trigger_get(struct iio_trigger *trig)
88{88{
89 get_device(&trig->dev);89 get_device(&trig->dev);
90 __module_get(trig->ops->owner);90 __module_get(trig->ops->owner);
91
92 return trig;
91}93}
92 94
93/**95/**
include/linux/pci.h+6−0
@@ -303,6 +303,7 @@ struct pci_dev { · 302 unmodified lines
303 D3cold, not set for devices303 D3cold, not set for devices
304 powered on/off by the304 powered on/off by the
305 corresponding bridge */305 corresponding bridge */
306 unsigned int ignore_hotplug:1; /* Ignore hotplug events */
306 unsigned int d3_delay; /* D3->D0 transition time in ms */307 unsigned int d3_delay; /* D3->D0 transition time in ms */
307 unsigned int d3cold_delay; /* D3cold->D0 transition time in ms */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
1021bool pci_check_pme_status(struct pci_dev *dev);1022bool pci_check_pme_status(struct pci_dev *dev);
1022void pci_pme_wakeup_bus(struct pci_bus *bus);1023void pci_pme_wakeup_bus(struct pci_bus *bus);
1023 1024
1025static inline void pci_ignore_hotplug(struct pci_dev *dev)
1026{
1027 dev->ignore_hotplug = 1;
1028}
1029
1024static inline int pci_enable_wake(struct pci_dev *dev, pci_power_t state,1030static inline int pci_enable_wake(struct pci_dev *dev, pci_power_t state,
1025 bool enable)1031 bool enable)
1026{1032{
include/linux/vga_switcheroo.h+2−0
@@ -64,6 +64,7 @@ int vga_switcheroo_get_client_state(struct pci_dev *dev); · 63 unmodified lines
64void vga_switcheroo_set_dynamic_switch(struct pci_dev *pdev, enum vga_switcheroo_state dynamic);64void vga_switcheroo_set_dynamic_switch(struct pci_dev *pdev, enum vga_switcheroo_state dynamic);
65 65
66int vga_switcheroo_init_domain_pm_ops(struct device *dev, struct dev_pm_domain *domain);66int vga_switcheroo_init_domain_pm_ops(struct device *dev, struct dev_pm_domain *domain);
67void vga_switcheroo_fini_domain_pm_ops(struct device *dev);
67int vga_switcheroo_init_domain_pm_optimus_hdmi_audio(struct device *dev, struct dev_pm_domain *domain);68int vga_switcheroo_init_domain_pm_optimus_hdmi_audio(struct device *dev, struct dev_pm_domain *domain);
68#else69#else
69 70
@@ -82,6 +83,7 @@ static inline int vga_switcheroo_get_client_state(struct pci_dev *dev) { return · 12 unmodified lines
82static inline void vga_switcheroo_set_dynamic_switch(struct pci_dev *pdev, enum vga_switcheroo_state dynamic) {}83static inline void vga_switcheroo_set_dynamic_switch(struct pci_dev *pdev, enum vga_switcheroo_state dynamic) {}
83 84
84static inline int vga_switcheroo_init_domain_pm_ops(struct device *dev, struct dev_pm_domain *domain) { return -EINVAL; }85static inline int vga_switcheroo_init_domain_pm_ops(struct device *dev, struct dev_pm_domain *domain) { return -EINVAL; }
86static inline void vga_switcheroo_fini_domain_pm_ops(struct device *dev) {}
85static inline int vga_switcheroo_init_domain_pm_optimus_hdmi_audio(struct device *dev, struct dev_pm_domain *domain) { return -EINVAL; }87static inline int vga_switcheroo_init_domain_pm_optimus_hdmi_audio(struct device *dev, struct dev_pm_domain *domain) { return -EINVAL; }
86 88
87#endif89#endif
include/linux/vgaarb.h+0−2
@@ -182,7 +182,6 @@ extern void vga_put(struct pci_dev *pdev, unsigned int rsrc); · 181 unmodified lines
182 * vga_get()...182 * vga_get()...
183 */183 */
184 184
185#ifndef __ARCH_HAS_VGA_DEFAULT_DEVICE
186#ifdef CONFIG_VGA_ARB185#ifdef CONFIG_VGA_ARB
187extern struct pci_dev *vga_default_device(void);186extern struct pci_dev *vga_default_device(void);
188extern void vga_set_default_device(struct pci_dev *pdev);187extern 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
190static inline struct pci_dev *vga_default_device(void) { return NULL; };189static inline struct pci_dev *vga_default_device(void) { return NULL; };
191static inline void vga_set_default_device(struct pci_dev *pdev) { };190static inline void vga_set_default_device(struct pci_dev *pdev) { };
192#endif191#endif
193#endif
194 192
195/**193/**
196 * vga_conflicts194 * vga_conflicts
include/scsi/scsi_tcq.h+1−1
@@ -68,7 +68,7 @@ static inline void scsi_activate_tcq(struct scsi_device *sdev, int depth) · 67 unmodified lines
68 return;68 return;
69 69
70 if (!shost_use_blk_mq(sdev->host) &&70 if (!shost_use_blk_mq(sdev->host) &&
71 blk_queue_tagged(sdev->request_queue))71 !blk_queue_tagged(sdev->request_queue))
72 blk_queue_init_tags(sdev->request_queue, depth,72 blk_queue_init_tags(sdev->request_queue, depth,
73 sdev->host->bqt);73 sdev->host->bqt);
74 74

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t