drm/nouveau: Remove references to struct drm_device.pdev

[sfrench/cifs-2.6.git] / drivers / gpu / drm / nouveau / dispnv04 / hw.c

diff --git a/drivers/gpu/drm/nouveau/dispnv04/hw.c b/drivers/gpu/drm/nouveau/dispnv04/hw.c
index b674d68ef28ab8bc1efb2538530a05773ed16359..f7d35657aa64c270d6fa6debc4492af36682803a 100644 (file)
--- a/drivers/gpu/drm/nouveau/dispnv04/hw.c
+++ b/drivers/gpu/drm/nouveau/dispnv04/hw.c
@@ -214,14 +214,15 @@ nouveau_hw_pllvals_to_clk(struct nvkm_pll_vals *pv)
 int
 nouveau_hw_get_clock(struct drm_device *dev, enum nvbios_pll_type plltype)
 {
+       struct pci_dev *pdev = to_pci_dev(dev->dev);
        struct nvkm_pll_vals pllvals;
        int ret;
        int domain;
 
-       domain = pci_domain_nr(dev->pdev->bus);
+       domain = pci_domain_nr(pdev->bus);
 
        if (plltype == PLL_MEMORY &&
-           (dev->pdev->device & 0x0ff0) == CHIPSET_NFORCE) {
+           (pdev->device & 0x0ff0) == CHIPSET_NFORCE) {
                uint32_t mpllP;
                pci_read_config_dword(pci_get_domain_bus_and_slot(domain, 0, 3),
                                      0x6c, &mpllP);
@@ -232,7 +233,7 @@ nouveau_hw_get_clock(struct drm_device *dev, enum nvbios_pll_type plltype)
                return 400000 / mpllP;
        } else
        if (plltype == PLL_MEMORY &&
-           (dev->pdev->device & 0xff0) == CHIPSET_NFORCE2) {
+           (pdev->device & 0xff0) == CHIPSET_NFORCE2) {
                uint32_t clock;
 
                pci_read_config_dword(pci_get_domain_bus_and_slot(domain, 0, 5),
@@ -309,6 +310,7 @@ void
 nouveau_hw_save_vga_fonts(struct drm_device *dev, bool save)
 {
        struct nouveau_drm *drm = nouveau_drm(dev);
+       struct pci_dev *pdev = to_pci_dev(dev->dev);
        uint8_t misc, gr4, gr5, gr6, seq2, seq4;
        bool graphicsmode;
        unsigned plane;
@@ -327,7 +329,7 @@ nouveau_hw_save_vga_fonts(struct drm_device *dev, bool save)
        NV_INFO(drm, "%sing VGA fonts\n", save ? "Sav" : "Restor");
 
        /* map first 64KiB of VRAM, holds VGA fonts etc */
-       iovram = ioremap(pci_resource_start(dev->pdev, 1), 65536);
+       iovram = ioremap(pci_resource_start(pdev, 1), 65536);
        if (!iovram) {
                NV_ERROR(drm, "Failed to map VRAM, "
                                        "cannot save/restore VGA fonts.\n");