diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2017-03-14 23:45:37 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2017-03-14 23:45:37 -0700 |
| commit | 6490c4e227fd8e354b752ff318feede70313a6d7 (patch) | |
| tree | f79bbe2d3dfd6dac15dee8b62a610f267c48249e | |
| parent | 3d973006bc4c684162b6e7d440d2bfbaefc79ead (diff) | |
| parent | bf04d45e7380525f53f4bd4dc57698d9290cfcd7 (diff) | |
Merge "drm/msm: Remove DRM_MSM_NUM_IOCTLS"
| -rw-r--r-- | drivers/gpu/drm/msm/msm_drv.c | 2 | ||||
| -rw-r--r-- | include/uapi/drm/msm_drm.h | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/drivers/gpu/drm/msm/msm_drv.c b/drivers/gpu/drm/msm/msm_drv.c index f821a81c53a6..532ff8677259 100644 --- a/drivers/gpu/drm/msm/msm_drv.c +++ b/drivers/gpu/drm/msm/msm_drv.c @@ -1683,7 +1683,7 @@ static struct drm_driver msm_driver = { .debugfs_cleanup = msm_debugfs_cleanup, #endif .ioctls = msm_ioctls, - .num_ioctls = DRM_MSM_NUM_IOCTLS, + .num_ioctls = ARRAY_SIZE(msm_ioctls), .fops = &fops, .name = "msm_drm", .desc = "MSM Snapdragon DRM", diff --git a/include/uapi/drm/msm_drm.h b/include/uapi/drm/msm_drm.h index 8ef93938155c..99fe34d25fc5 100644 --- a/include/uapi/drm/msm_drm.h +++ b/include/uapi/drm/msm_drm.h @@ -267,7 +267,6 @@ struct drm_msm_event_resp { #define DRM_SDE_WB_CONFIG 0x40 #define DRM_MSM_REGISTER_EVENT 0x41 #define DRM_MSM_DEREGISTER_EVENT 0x42 -#define DRM_MSM_NUM_IOCTLS 0x43 /** * Currently DRM framework supports only VSYNC event. |