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

Commit c5786fe5 authored by David Herrmann's avatar David Herrmann Committed by Dave Airlie
Browse files

drm: Goody bye, drm_bus! 



..we will not miss you..

Signed-off-by: default avatarDavid Herrmann <dh.herrmann@gmail.com>
Reviewed-by: default avatarThierry Reding <treding@nvidia.com>
Reviewed-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
parent 915b4d11

drivers/gpu/drm/drm_ioctl.c

+1 −7
Original line number Original line Diff line number Diff line
@@ -250,15 +250,9 @@ static int drm_set_busid(struct drm_device *dev, struct drm_file *file_priv) 
			drm_unset_busid(dev, master);

			drm_unset_busid(dev, master);

			return ret;

			return ret;

		}

		}

	} else if (dev->driver->bus && dev->driver->bus->set_busid) {

		ret = dev->driver->bus->set_busid(dev, master);

		if (ret) {

			drm_unset_busid(dev, master);

			return ret;

		}

	} else {

	} else {

		if (WARN(dev->unique == NULL,

		if (WARN(dev->unique == NULL,

			 "No drm_bus.set_busid() implementation provided by "

			 "No drm_driver.set_busid() implementation provided by "

			 "%ps. Use drm_dev_set_unique() to set the unique "

			 "%ps. Use drm_dev_set_unique() to set the unique "

			 "name explicitly.", dev->driver))

			 "name explicitly.", dev->driver))

			return -EINVAL;

			return -EINVAL;

drivers/gpu/drm/drm_pci.c

+0 −6
Original line number Original line Diff line number Diff line
@@ -254,10 +254,6 @@ void drm_pci_agp_destroy(struct drm_device *dev) 
	}

	}

}

}





static struct drm_bus drm_pci_bus = {

	.set_busid = drm_pci_set_busid,

};



/**

/**

 * drm_get_pci_dev - Register a PCI device with the DRM subsystem

 * drm_get_pci_dev - Register a PCI device with the DRM subsystem

 * @pdev: PCI device

 * @pdev: PCI device
@@ -338,8 +334,6 @@ int drm_pci_init(struct drm_driver *driver, struct pci_driver *pdriver) 




	DRM_DEBUG("\n");

	DRM_DEBUG("\n");





	driver->bus = &drm_pci_bus;



	if (driver->driver_features & DRIVER_MODESET)

	if (driver->driver_features & DRIVER_MODESET)

		return pci_register_driver(pdriver);

		return pci_register_driver(pdriver);

drivers/gpu/drm/drm_platform.c

+0 −5
Original line number Original line Diff line number Diff line
@@ -86,10 +86,6 @@ int drm_platform_set_busid(struct drm_device *dev, struct drm_master *master) 
}

}

EXPORT_SYMBOL(drm_platform_set_busid);

EXPORT_SYMBOL(drm_platform_set_busid);





static struct drm_bus drm_platform_bus = {

	.set_busid = drm_platform_set_busid,

};



/**

/**

 * drm_platform_init - Register a platform device with the DRM subsystem

 * drm_platform_init - Register a platform device with the DRM subsystem

 * @driver: DRM device driver

 * @driver: DRM device driver
@@ -105,7 +101,6 @@ int drm_platform_init(struct drm_driver *driver, struct platform_device *platfor 
{

{

	DRM_DEBUG("\n");

	DRM_DEBUG("\n");





	driver->bus = &drm_platform_bus;

	return drm_get_platform_dev(platform_device, driver);

	return drm_get_platform_dev(platform_device, driver);

}

}

EXPORT_SYMBOL(drm_platform_init);
 
EXPORT_SYMBOL(drm_platform_init);

drivers/gpu/drm/drm_usb.c

+0 −12
Original line number Original line Diff line number Diff line
@@ -36,16 +36,6 @@ int drm_get_usb_dev(struct usb_interface *interface, 
}

}

EXPORT_SYMBOL(drm_get_usb_dev);

EXPORT_SYMBOL(drm_get_usb_dev);





static int drm_usb_set_busid(struct drm_device *dev,

			       struct drm_master *master)

{

	return 0;

}



static struct drm_bus drm_usb_bus = {

	.set_busid = drm_usb_set_busid,

};



/**

/**

 * drm_usb_init - Register matching USB devices with the DRM subsystem

 * drm_usb_init - Register matching USB devices with the DRM subsystem

 * @driver: DRM device driver

 * @driver: DRM device driver
@@ -61,8 +51,6 @@ int drm_usb_init(struct drm_driver *driver, struct usb_driver *udriver) 
	int res;

	int res;

	DRM_DEBUG("\n");

	DRM_DEBUG("\n");





	driver->bus = &drm_usb_bus;



	res = usb_register(udriver);

	res = usb_register(udriver);

	return res;

	return res;

}

}

include/drm/drmP.h

+0 −5
Original line number Original line Diff line number Diff line
@@ -605,10 +605,6 @@ struct drm_master { 
#define DRM_SCANOUTPOS_INVBL        (1 << 1)

#define DRM_SCANOUTPOS_INVBL        (1 << 1)

#define DRM_SCANOUTPOS_ACCURATE     (1 << 2)

#define DRM_SCANOUTPOS_ACCURATE     (1 << 2)





struct drm_bus {

	int (*set_busid)(struct drm_device *dev, struct drm_master *master);

};



/**

/**

 * DRM driver structure. This structure represent the common code for

 * DRM driver structure. This structure represent the common code for

 * a family of cards. There will one drm_device for each card present

 * a family of cards. There will one drm_device for each card present
@@ -846,7 +842,6 @@ struct drm_driver { 
	const struct drm_ioctl_desc *ioctls;

	const struct drm_ioctl_desc *ioctls;

	int num_ioctls;

	int num_ioctls;

	const struct file_operations *fops;

	const struct file_operations *fops;

	struct drm_bus *bus;





	/* List of devices hanging off this driver with stealth attach. */

	/* List of devices hanging off this driver with stealth attach. */

	struct list_head legacy_dev_list;

	struct list_head legacy_dev_list;