Commit 2d278f54 authored by Laurent Pinchart's avatar Laurent Pinchart

drm: omapdrm: Clean up #include's

Use the <...> include style instead of "..." for DRM headers and sort
the headers alphabetically to ease detection of duplicates.
Signed-off-by: default avatarLaurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: default avatarTomi Valkeinen <tomi.valkeinen@ti.com>
parent 0c19ac9d
...@@ -17,10 +17,10 @@ ...@@ -17,10 +17,10 @@
* this program. If not, see <http://www.gnu.org/licenses/>. * this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
#include "omap_drv.h" #include <drm/drm_crtc.h>
#include <drm/drm_crtc_helper.h>
#include "drm_crtc.h" #include "omap_drv.h"
#include "drm_crtc_helper.h"
/* /*
* connector funcs * connector funcs
......
...@@ -19,12 +19,12 @@ ...@@ -19,12 +19,12 @@
#include <linux/completion.h> #include <linux/completion.h>
#include "omap_drv.h" #include <drm/drm_crtc.h>
#include <drm/drm_crtc_helper.h>
#include <drm/drm_mode.h> #include <drm/drm_mode.h>
#include <drm/drm_plane_helper.h> #include <drm/drm_plane_helper.h>
#include "drm_crtc.h"
#include "drm_crtc_helper.h" #include "omap_drv.h"
#define to_omap_crtc(x) container_of(x, struct omap_crtc, base) #define to_omap_crtc(x) container_of(x, struct omap_crtc, base)
......
...@@ -17,12 +17,12 @@ ...@@ -17,12 +17,12 @@
* this program. If not, see <http://www.gnu.org/licenses/>. * this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
#include <drm/drm_crtc.h>
#include <drm/drm_fb_helper.h>
#include "omap_drv.h" #include "omap_drv.h"
#include "omap_dmm_tiler.h" #include "omap_dmm_tiler.h"
#include "drm_fb_helper.h"
#ifdef CONFIG_DEBUG_FS #ifdef CONFIG_DEBUG_FS
static int gem_show(struct seq_file *m, void *arg) static int gem_show(struct seq_file *m, void *arg)
......
...@@ -15,21 +15,22 @@ ...@@ -15,21 +15,22 @@
* of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details. * GNU General Public License for more details.
*/ */
#include <linux/completion.h>
#include <linux/delay.h>
#include <linux/dma-mapping.h>
#include <linux/errno.h>
#include <linux/init.h> #include <linux/init.h>
#include <linux/interrupt.h>
#include <linux/list.h>
#include <linux/mm.h>
#include <linux/module.h> #include <linux/module.h>
#include <linux/platform_device.h> /* platform_device() */ #include <linux/platform_device.h> /* platform_device() */
#include <linux/errno.h>
#include <linux/sched.h> #include <linux/sched.h>
#include <linux/wait.h>
#include <linux/interrupt.h>
#include <linux/dma-mapping.h>
#include <linux/slab.h> #include <linux/slab.h>
#include <linux/vmalloc.h>
#include <linux/delay.h>
#include <linux/mm.h>
#include <linux/time.h> #include <linux/time.h>
#include <linux/list.h> #include <linux/vmalloc.h>
#include <linux/completion.h> #include <linux/wait.h>
#include "omap_dmm_tiler.h" #include "omap_dmm_tiler.h"
#include "omap_dmm_priv.h" #include "omap_dmm_priv.h"
......
...@@ -17,11 +17,11 @@ ...@@ -17,11 +17,11 @@
* this program. If not, see <http://www.gnu.org/licenses/>. * this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
#include "omap_drv.h" #include <drm/drm_crtc_helper.h>
#include <drm/drm_fb_helper.h>
#include "drm_crtc_helper.h"
#include "drm_fb_helper.h"
#include "omap_dmm_tiler.h" #include "omap_dmm_tiler.h"
#include "omap_drv.h"
#define DRIVER_NAME MODULE_NAME #define DRIVER_NAME MODULE_NAME
#define DRIVER_DESC "OMAP DRM" #define DRIVER_DESC "OMAP DRM"
......
...@@ -20,15 +20,15 @@ ...@@ -20,15 +20,15 @@
#ifndef __OMAP_DRV_H__ #ifndef __OMAP_DRV_H__
#define __OMAP_DRV_H__ #define __OMAP_DRV_H__
#include <video/omapdss.h>
#include <linux/module.h> #include <linux/module.h>
#include <linux/platform_data/omap_drm.h>
#include <linux/types.h> #include <linux/types.h>
#include <video/omapdss.h>
#include <drm/drmP.h> #include <drm/drmP.h>
#include <drm/drm_crtc_helper.h> #include <drm/drm_crtc_helper.h>
#include <drm/omap_drm.h>
#include <drm/drm_gem.h> #include <drm/drm_gem.h>
#include <linux/platform_data/omap_drm.h> #include <drm/omap_drm.h>
#define DBG(fmt, ...) DRM_DEBUG(fmt"\n", ##__VA_ARGS__) #define DBG(fmt, ...) DRM_DEBUG(fmt"\n", ##__VA_ARGS__)
#define VERB(fmt, ...) if (0) DRM_DEBUG(fmt, ##__VA_ARGS__) /* verbose debug */ #define VERB(fmt, ...) if (0) DRM_DEBUG(fmt, ##__VA_ARGS__) /* verbose debug */
......
...@@ -17,16 +17,14 @@ ...@@ -17,16 +17,14 @@
* this program. If not, see <http://www.gnu.org/licenses/>. * this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
#include <linux/list.h>
#include <drm/drm_crtc.h>
#include <drm/drm_crtc_helper.h>
#include <drm/drm_edid.h> #include <drm/drm_edid.h>
#include "omap_drv.h" #include "omap_drv.h"
#include "drm_crtc.h"
#include "drm_crtc_helper.h"
#include <linux/list.h>
/* /*
* encoder funcs * encoder funcs
*/ */
......
...@@ -17,11 +17,11 @@ ...@@ -17,11 +17,11 @@
* this program. If not, see <http://www.gnu.org/licenses/>. * this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
#include "omap_drv.h" #include <drm/drm_crtc.h>
#include "omap_dmm_tiler.h" #include <drm/drm_crtc_helper.h>
#include "drm_crtc.h" #include "omap_dmm_tiler.h"
#include "drm_crtc_helper.h" #include "omap_drv.h"
/* /*
* framebuffer funcs * framebuffer funcs
......
...@@ -17,10 +17,10 @@ ...@@ -17,10 +17,10 @@
* this program. If not, see <http://www.gnu.org/licenses/>. * this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
#include "omap_drv.h" #include <drm/drm_crtc.h>
#include <drm/drm_fb_helper.h>
#include "drm_crtc.h" #include "omap_drv.h"
#include "drm_fb_helper.h"
MODULE_PARM_DESC(ywrap, "Enable ywrap scrolling (omap44xx and later, default 'y')"); MODULE_PARM_DESC(ywrap, "Enable ywrap scrolling (omap44xx and later, default 'y')");
static bool ywrap_enabled = true; static bool ywrap_enabled = true;
......
...@@ -17,9 +17,9 @@ ...@@ -17,9 +17,9 @@
* this program. If not, see <http://www.gnu.org/licenses/>. * this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
#include <linux/spinlock.h>
#include <linux/shmem_fs.h> #include <linux/shmem_fs.h>
#include <linux/spinlock.h>
#include <drm/drm_vma_manager.h> #include <drm/drm_vma_manager.h>
#include "omap_drv.h" #include "omap_drv.h"
......
...@@ -17,10 +17,10 @@ ...@@ -17,10 +17,10 @@
* this program. If not, see <http://www.gnu.org/licenses/>. * this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
#include "omap_drv.h"
#include <linux/dma-buf.h> #include <linux/dma-buf.h>
#include "omap_drv.h"
static struct sg_table *omap_gem_map_dma_buf( static struct sg_table *omap_gem_map_dma_buf(
struct dma_buf_attachment *attachment, struct dma_buf_attachment *attachment,
enum dma_data_direction dir) enum dma_data_direction dir)
......
...@@ -17,8 +17,8 @@ ...@@ -17,8 +17,8 @@
* this program. If not, see <http://www.gnu.org/licenses/>. * this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
#include "omap_drv.h"
#include "omap_dmm_tiler.h" #include "omap_dmm_tiler.h"
#include "omap_drv.h"
/* some hackery because omapdss has an 'enum omap_plane' (which would be /* some hackery because omapdss has an 'enum omap_plane' (which would be
* better named omap_plane_id).. and compiler seems unhappy about having * better named omap_plane_id).. and compiler seems unhappy about having
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment