On Tue, Dec 13, 2016 at 4:03 PM, Daniel Vetter <daniel@xxxxxxxx> wrote:
> On Tue, Dec 13, 2016 at 09:34:06PM +0200, Laurent Pinchart wrote:
>> Now that the last driver has been converted, the drm_platform midlayer
>> is unused. Remove it.
>>
>> Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@xxxxxxxxxxxxxxxx>
>> ---
>> drivers/gpu/drm/Makefile | 2 +-
>> drivers/gpu/drm/drm_platform.c | 91 ------------------------------------------
>> include/drm/drmP.h | 3 --
>
> Absolutely awesome! Well except you forgot to double-check the kerneldoc
> with make DOCBOOKS="" htmldocs and notice that you need to remove
> drm_platform.c there too ;-)
>
> With that fixed: Reviewed-by: Daniel Vetter <daniel.vetter@xxxxxxxx> Feel
> free to push to drm-misc.
I'll pile on with my \o/
and my
Reviewed-by: Sean Paul <seanpaul@xxxxxxxxxxxx>
> -Daniel
>
>> 3 files changed, 1 insertion(+), 95 deletions(-)
>> delete mode 100644 drivers/gpu/drm/drm_platform.c
>>
>> diff --git a/drivers/gpu/drm/Makefile b/drivers/gpu/drm/Makefile
>> index b9ae4280de9d..914b2d7b2c7d 100644
>> --- a/drivers/gpu/drm/Makefile
>> +++ b/drivers/gpu/drm/Makefile
>> @@ -7,7 +7,7 @@ drm-y := drm_auth.o drm_bufs.o drm_cache.o \
>> drm_fops.o drm_gem.o drm_ioctl.o drm_irq.o \
>> drm_lock.o drm_memory.o drm_drv.o drm_vm.o \
>> drm_scatter.o drm_pci.o \
>> - drm_platform.o drm_sysfs.o drm_hashtab.o drm_mm.o \
>> + drm_sysfs.o drm_hashtab.o drm_mm.o \
>> drm_crtc.o drm_fourcc.o drm_modes.o drm_edid.o \
>> drm_info.o drm_encoder_slave.o \
>> drm_trace_points.o drm_global.o drm_prime.o \
>> diff --git a/drivers/gpu/drm/drm_platform.c b/drivers/gpu/drm/drm_platform.c
>> deleted file mode 100644
>> index 026269851ce9..000000000000
>> --- a/drivers/gpu/drm/drm_platform.c
>> +++ /dev/null
>> @@ -1,91 +0,0 @@
>> -/*
>> - * Derived from drm_pci.c
>> - *
>> - * Copyright 2003 José Fonseca.
>> - * Copyright 2003 Leif Delgass.
>> - * Copyright (c) 2009, Code Aurora Forum.
>> - * All Rights Reserved.
>> - *
>> - * Permission is hereby granted, free of charge, to any person obtaining a
>> - * copy of this software and associated documentation files (the "Software"),
>> - * to deal in the Software without restriction, including without limitation
>> - * the rights to use, copy, modify, merge, publish, distribute, sublicense,
>> - * and/or sell copies of the Software, and to permit persons to whom the
>> - * Software is furnished to do so, subject to the following conditions:
>> - *
>> - * The above copyright notice and this permission notice (including the next
>> - * paragraph) shall be included in all copies or substantial portions of the
>> - * Software.
>> - *
>> - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
>> - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
>> - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
>> - * AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
>> - * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
>> - * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
>> - */
>> -
>> -#include <linux/export.h>
>> -#include <drm/drmP.h>
>> -
>> -/*
>> - * Register.
>> - *
>> - * \param platdev - Platform device struture
>> - * \return zero on success or a negative number on failure.
>> - *
>> - * Attempt to gets inter module "drm" information. If we are first
>> - * then register the character device and inter module information.
>> - * Try and register, if we fail to register, backout previous work.
>> - */
>> -
>> -static int drm_get_platform_dev(struct platform_device *platdev,
>> - struct drm_driver *driver)
>> -{
>> - struct drm_device *dev;
>> - int ret;
>> -
>> - DRM_DEBUG("\n");
>> -
>> - dev = drm_dev_alloc(driver, &platdev->dev);
>> - if (IS_ERR(dev))
>> - return PTR_ERR(dev);
>> -
>> - dev->platformdev = platdev;
>> -
>> - ret = drm_dev_register(dev, 0);
>> - if (ret)
>> - goto err_free;
>> -
>> - DRM_INFO("Initialized %s %d.%d.%d %s on minor %d\n",
>> - driver->name, driver->major, driver->minor, driver->patchlevel,
>> - driver->date, dev->primary->index);
>> -
>> - return 0;
>> -
>> -err_free:
>> - drm_dev_unref(dev);
>> - return ret;
>> -}
>> -
>> -/**
>> - * drm_platform_init - Register a platform device with the DRM subsystem
>> - * @driver: DRM device driver
>> - * @platform_device: platform device to register
>> - *
>> - * Registers the specified DRM device driver and platform device with the DRM
>> - * subsystem, initializing a drm_device structure and calling the driver's
>> - * .load() function.
>> - *
>> - * NOTE: This function is deprecated, please use drm_dev_alloc() and
>> - * drm_dev_register() instead and remove your ->load() callback.
>> - *
>> - * Return: 0 on success or a negative error code on failure.
>> - */
>> -int drm_platform_init(struct drm_driver *driver, struct platform_device *platform_device)
>> -{
>> - DRM_DEBUG("\n");
>> -
>> - return drm_get_platform_dev(platform_device, driver);
>> -}
>> -EXPORT_SYMBOL(drm_platform_init);
>> diff --git a/include/drm/drmP.h b/include/drm/drmP.h
>> index a9cfd33c7b1a..0d6c1a13f533 100644
>> --- a/include/drm/drmP.h
>> +++ b/include/drm/drmP.h
>> @@ -825,9 +825,6 @@ static inline int drm_pci_set_busid(struct drm_device *dev,
>> extern int drm_pcie_get_speed_cap_mask(struct drm_device *dev, u32 *speed_mask);
>> extern int drm_pcie_get_max_link_width(struct drm_device *dev, u32 *mlw);
>>
>> -/* platform section */
>> -extern int drm_platform_init(struct drm_driver *driver, struct platform_device *platform_device);
>> -
>> /* returns true if currently okay to sleep */
>> static __inline__ bool drm_can_sleep(void)
>> {
>> --
>> Regards,
>>
>> Laurent Pinchart
>>
>> _______________________________________________
>> dri-devel mailing list
>> dri-devel@xxxxxxxxxxxxxxxxxxxxx
>> https://lists.freedesktop.org/mailman/listinfo/dri-devel
>
> --
> Daniel Vetter
> Software Engineer, Intel Corporation
> http://blog.ffwll.ch
> _______________________________________________
> dri-devel mailing list
> dri-devel@xxxxxxxxxxxxxxxxxxxxx
> https://lists.freedesktop.org/mailman/listinfo/dri-devel
--
Sean Paul, Software Engineer, Google / Chromium OS
_______________________________________________
dri-devel mailing list
dri-devel@xxxxxxxxxxxxxxxxxxxxx
https://lists.freedesktop.org/mailman/listinfo/dri-devel
