From mboxrd@z Thu Jan 1 00:00:00 1970 From: Daniel Vetter Subject: Re: [PATCH 18/20] drm: Goody bye, drm_bus! Date: Fri, 29 Aug 2014 15:02:45 +0200 Message-ID: <20140829130245.GL15520@phenom.ffwll.local> References: <1409307166-12396-1-git-send-email-dh.herrmann@gmail.com> <1409307166-12396-19-git-send-email-dh.herrmann@gmail.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: Received: from mail-we0-f178.google.com (mail-we0-f178.google.com [74.125.82.178]) by gabe.freedesktop.org (Postfix) with ESMTP id 6B8426E6EB for ; Fri, 29 Aug 2014 06:02:24 -0700 (PDT) Received: by mail-we0-f178.google.com with SMTP id u57so2174959wes.37 for ; Fri, 29 Aug 2014 06:02:23 -0700 (PDT) Content-Disposition: inline In-Reply-To: <1409307166-12396-19-git-send-email-dh.herrmann@gmail.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: David Herrmann Cc: Daniel Vetter , dri-devel@lists.freedesktop.org List-Id: dri-devel@lists.freedesktop.org On Fri, Aug 29, 2014 at 12:12:44PM +0200, David Herrmann wrote: > ..we will not miss you.. > > Signed-off-by: David Herrmann Since this is independant of how we'll get rid of bus->set_busid: Reviewed-by: Daniel Vetter > --- > drivers/gpu/drm/drm_ioctl.c | 8 +------- > drivers/gpu/drm/drm_pci.c | 6 ------ > drivers/gpu/drm/drm_platform.c | 5 ----- > drivers/gpu/drm/drm_usb.c | 12 ------------ > include/drm/drmP.h | 5 ----- > 5 files changed, 1 insertion(+), 35 deletions(-) > > diff --git a/drivers/gpu/drm/drm_ioctl.c b/drivers/gpu/drm/drm_ioctl.c > index 4770bd7..3a1349f 100644 > --- a/drivers/gpu/drm/drm_ioctl.c > +++ b/drivers/gpu/drm/drm_ioctl.c > @@ -250,15 +250,9 @@ static int drm_set_busid(struct drm_device *dev, struct drm_file *file_priv) > drm_unset_busid(dev, master); > 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 { > 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 " > "name explicitly.", dev->driver)) > return -EINVAL; > diff --git a/drivers/gpu/drm/drm_pci.c b/drivers/gpu/drm/drm_pci.c > index 0400c37..7563130 100644 > --- a/drivers/gpu/drm/drm_pci.c > +++ b/drivers/gpu/drm/drm_pci.c > @@ -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 > * @pdev: PCI device > @@ -338,8 +334,6 @@ int drm_pci_init(struct drm_driver *driver, struct pci_driver *pdriver) > > DRM_DEBUG("\n"); > > - driver->bus = &drm_pci_bus; > - > if (driver->driver_features & DRIVER_MODESET) > return pci_register_driver(pdriver); > > diff --git a/drivers/gpu/drm/drm_platform.c b/drivers/gpu/drm/drm_platform.c > index 939cd22..5314c9d 100644 > --- a/drivers/gpu/drm/drm_platform.c > +++ b/drivers/gpu/drm/drm_platform.c > @@ -86,10 +86,6 @@ int drm_platform_set_busid(struct drm_device *dev, struct drm_master *master) > } > 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 > * @driver: DRM device driver > @@ -105,7 +101,6 @@ int drm_platform_init(struct drm_driver *driver, struct platform_device *platfor > { > DRM_DEBUG("\n"); > > - driver->bus = &drm_platform_bus; > return drm_get_platform_dev(platform_device, driver); > } > EXPORT_SYMBOL(drm_platform_init); > diff --git a/drivers/gpu/drm/drm_usb.c b/drivers/gpu/drm/drm_usb.c > index f2fe94a..9c43490 100644 > --- a/drivers/gpu/drm/drm_usb.c > +++ b/drivers/gpu/drm/drm_usb.c > @@ -36,16 +36,6 @@ err_free: > } > 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 > * @driver: DRM device driver > @@ -61,8 +51,6 @@ int drm_usb_init(struct drm_driver *driver, struct usb_driver *udriver) > int res; > DRM_DEBUG("\n"); > > - driver->bus = &drm_usb_bus; > - > res = usb_register(udriver); > return res; > } > diff --git a/include/drm/drmP.h b/include/drm/drmP.h > index c82f292..5ae388a 100644 > --- a/include/drm/drmP.h > +++ b/include/drm/drmP.h > @@ -605,10 +605,6 @@ struct drm_master { > #define DRM_SCANOUTPOS_INVBL (1 << 1) > #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 > * 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; > int num_ioctls; > const struct file_operations *fops; > - struct drm_bus *bus; > > /* List of devices hanging off this driver with stealth attach. */ > struct list_head legacy_dev_list; > -- > 2.1.0 > -- Daniel Vetter Software Engineer, Intel Corporation +41 (0) 79 365 57 48 - http://blog.ffwll.ch