Code Review
/
kvmfornfv.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
These changes are the raw update to linux-4.4.6-rt14. Kernel sources
[kvmfornfv.git]
/
kernel
/
drivers
/
gpu
/
drm
/
nouveau
/
nvkm
/
subdev
/
bios
/
shadowacpi.c
diff --git
a/kernel/drivers/gpu/drm/nouveau/nvkm/subdev/bios/shadowacpi.c
b/kernel/drivers/gpu/drm/nouveau/nvkm/subdev/bios/shadowacpi.c
index
f9d0eb5
..
8fecb5f
100644
(file)
--- a/
kernel/drivers/gpu/drm/nouveau/nvkm/subdev/bios/shadowacpi.c
+++ b/
kernel/drivers/gpu/drm/nouveau/nvkm/subdev/bios/shadowacpi.c
@@
-22,14
+22,12
@@
*/
#include "priv.h"
*/
#include "priv.h"
-#include <core/device.h>
-
#if defined(CONFIG_ACPI) && defined(CONFIG_X86)
int nouveau_acpi_get_bios_chunk(uint8_t *bios, int offset, int len);
#if defined(CONFIG_ACPI) && defined(CONFIG_X86)
int nouveau_acpi_get_bios_chunk(uint8_t *bios, int offset, int len);
-bool nouveau_acpi_rom_supported(struct
pci_dev *pdev
);
+bool nouveau_acpi_rom_supported(struct
device *
);
#else
static inline bool
#else
static inline bool
-nouveau_acpi_rom_supported(struct
pci_dev *p
dev)
+nouveau_acpi_rom_supported(struct
device *
dev)
{
return false;
}
{
return false;
}
@@
-90,7
+88,7
@@
acpi_read_slow(void *data, u32 offset, u32 length, struct nvkm_bios *bios)
static void *
acpi_init(struct nvkm_bios *bios, const char *name)
{
static void *
acpi_init(struct nvkm_bios *bios, const char *name)
{
- if (!nouveau_acpi_rom_supported(
nv_device(bios)->p
dev))
+ if (!nouveau_acpi_rom_supported(
bios->subdev.device->
dev))
return ERR_PTR(-ENODEV);
return NULL;
}
return ERR_PTR(-ENODEV);
return NULL;
}