projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus
[firefly-linux-kernel-4.4.55.git]
/
drivers
/
pci
/
pci-label.c
diff --git
a/drivers/pci/pci-label.c
b/drivers/pci/pci-label.c
index 2ab1b47c7651c2d86db3a56ea9bf842e44569f07..024b5c179348e26f062a2becab6896c260e26a06 100644
(file)
--- a/
drivers/pci/pci-label.c
+++ b/
drivers/pci/pci-label.c
@@
-31,8
+31,6
@@
#include <linux/pci-acpi.h>
#include "pci.h"
#include <linux/pci-acpi.h>
#include "pci.h"
-#define DEVICE_LABEL_DSM 0x07
-
#ifdef CONFIG_DMI
enum smbios_attr_enum {
SMBIOS_ATTR_NONE = 0,
#ifdef CONFIG_DMI
enum smbios_attr_enum {
SMBIOS_ATTR_NONE = 0,
@@
-148,11
+146,6
@@
static inline void pci_remove_smbiosname_file(struct pci_dev *pdev)
#endif
#ifdef CONFIG_ACPI
#endif
#ifdef CONFIG_ACPI
-static const char device_label_dsm_uuid[] = {
- 0xD0, 0x37, 0xC9, 0xE5, 0x53, 0x35, 0x7A, 0x4D,
- 0x91, 0x17, 0xEA, 0x4D, 0x19, 0xC3, 0x43, 0x4D
-};
-
enum acpi_attr_enum {
ACPI_ATTR_LABEL_SHOW,
ACPI_ATTR_INDEX_SHOW,
enum acpi_attr_enum {
ACPI_ATTR_LABEL_SHOW,
ACPI_ATTR_INDEX_SHOW,
@@
-179,7
+172,7
@@
static int dsm_get_label(struct device *dev, char *buf,
if (!handle)
return -1;
if (!handle)
return -1;
- obj = acpi_evaluate_dsm(handle,
device_label
_dsm_uuid, 0x2,
+ obj = acpi_evaluate_dsm(handle,
pci_acpi
_dsm_uuid, 0x2,
DEVICE_LABEL_DSM, NULL);
if (!obj)
return -1;
DEVICE_LABEL_DSM, NULL);
if (!obj)
return -1;
@@
-219,7
+212,7
@@
static bool device_has_dsm(struct device *dev)
if (!handle)
return false;
if (!handle)
return false;
- return !!acpi_check_dsm(handle,
device_label
_dsm_uuid, 0x2,
+ return !!acpi_check_dsm(handle,
pci_acpi
_dsm_uuid, 0x2,
1 << DEVICE_LABEL_DSM);
}
1 << DEVICE_LABEL_DSM);
}