Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cbc60ca0 authored by Daniel Vetter's avatar Daniel Vetter Committed by Dave Airlie
Browse files

drm: kill get_reg_ofs callback



Every driver used the default implementation. Fold that one into
the only callsite and drop the callback.

Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
parent df8fcb09
Loading
Loading
Loading
Loading
+2 −4
Original line number Original line Diff line number Diff line
@@ -515,7 +515,7 @@ static int drm_mmap_dma(struct file *filp, struct vm_area_struct *vma)
	return 0;
	return 0;
}
}


resource_size_t drm_core_get_reg_ofs(struct drm_device *dev)
static resource_size_t drm_core_get_reg_ofs(struct drm_device *dev)
{
{
#ifdef __alpha__
#ifdef __alpha__
	return dev->hose->dense_mem_base - dev->hose->mem_space->start;
	return dev->hose->dense_mem_base - dev->hose->mem_space->start;
@@ -524,8 +524,6 @@ resource_size_t drm_core_get_reg_ofs(struct drm_device *dev)
#endif
#endif
}
}


EXPORT_SYMBOL(drm_core_get_reg_ofs);

/**
/**
 * mmap DMA memory.
 * mmap DMA memory.
 *
 *
@@ -612,7 +610,7 @@ int drm_mmap_locked(struct file *filp, struct vm_area_struct *vma)
#endif
#endif
	case _DRM_FRAME_BUFFER:
	case _DRM_FRAME_BUFFER:
	case _DRM_REGISTERS:
	case _DRM_REGISTERS:
		offset = dev->driver->get_reg_ofs(dev);
		offset = drm_core_get_reg_ofs(dev);
		vma->vm_flags |= VM_IO;	/* not in core dump */
		vma->vm_flags |= VM_IO;	/* not in core dump */
		vma->vm_page_prot = drm_io_prot(map->type, vma);
		vma->vm_page_prot = drm_io_prot(map->type, vma);
#if !defined(__arm__)
#if !defined(__arm__)
+0 −1
Original line number Original line Diff line number Diff line
@@ -52,7 +52,6 @@ static struct drm_driver driver = {
	.device_is_agp = i810_driver_device_is_agp,
	.device_is_agp = i810_driver_device_is_agp,
	.reclaim_buffers_locked = i810_driver_reclaim_buffers_locked,
	.reclaim_buffers_locked = i810_driver_reclaim_buffers_locked,
	.dma_quiescent = i810_driver_dma_quiescent,
	.dma_quiescent = i810_driver_dma_quiescent,
	.get_reg_ofs = drm_core_get_reg_ofs,
	.ioctls = i810_ioctls,
	.ioctls = i810_ioctls,
	.fops = {
	.fops = {
		 .owner = THIS_MODULE,
		 .owner = THIS_MODULE,
+0 −1
Original line number Original line Diff line number Diff line
@@ -57,7 +57,6 @@ static struct drm_driver driver = {
	.device_is_agp = i830_driver_device_is_agp,
	.device_is_agp = i830_driver_device_is_agp,
	.reclaim_buffers_locked = i830_driver_reclaim_buffers_locked,
	.reclaim_buffers_locked = i830_driver_reclaim_buffers_locked,
	.dma_quiescent = i830_driver_dma_quiescent,
	.dma_quiescent = i830_driver_dma_quiescent,
	.get_reg_ofs = drm_core_get_reg_ofs,
#if USE_IRQS
#if USE_IRQS
	.irq_preinstall = i830_driver_irq_preinstall,
	.irq_preinstall = i830_driver_irq_preinstall,
	.irq_postinstall = i830_driver_irq_postinstall,
	.irq_postinstall = i830_driver_irq_postinstall,
+0 −1
Original line number Original line Diff line number Diff line
@@ -524,7 +524,6 @@ static struct drm_driver driver = {
	.irq_uninstall = i915_driver_irq_uninstall,
	.irq_uninstall = i915_driver_irq_uninstall,
	.irq_handler = i915_driver_irq_handler,
	.irq_handler = i915_driver_irq_handler,
	.reclaim_buffers = drm_core_reclaim_buffers,
	.reclaim_buffers = drm_core_reclaim_buffers,
	.get_reg_ofs = drm_core_get_reg_ofs,
	.master_create = i915_master_create,
	.master_create = i915_master_create,
	.master_destroy = i915_master_destroy,
	.master_destroy = i915_master_destroy,
#if defined(CONFIG_DEBUG_FS)
#if defined(CONFIG_DEBUG_FS)
+0 −1
Original line number Original line Diff line number Diff line
@@ -60,7 +60,6 @@ static struct drm_driver driver = {
	.irq_uninstall = mga_driver_irq_uninstall,
	.irq_uninstall = mga_driver_irq_uninstall,
	.irq_handler = mga_driver_irq_handler,
	.irq_handler = mga_driver_irq_handler,
	.reclaim_buffers = drm_core_reclaim_buffers,
	.reclaim_buffers = drm_core_reclaim_buffers,
	.get_reg_ofs = drm_core_get_reg_ofs,
	.ioctls = mga_ioctls,
	.ioctls = mga_ioctls,
	.dma_ioctl = mga_dma_buffers,
	.dma_ioctl = mga_dma_buffers,
	.fops = {
	.fops = {
Loading