summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKevin Brace <kevinbrace@gmx.com>2021-04-02 09:29:51 -0700
committerKevin Brace <kevinbrace@gmx.com>2021-04-02 09:29:51 -0700
commitbcb616948ba00a93360139beafa1976891b78da1 (patch)
tree82d3847c195d198a4ef9a8a84e03e4a6447ecf6c
parent4f680ce5c0d2ef0f3f66f22b3e5e431bd4152b46 (diff)
drm/openchrome: Change openchrome_driver{} member names
Signed-off-by: Kevin Brace <kevinbrace@gmx.com>
-rw-r--r--drivers/gpu/drm/openchrome/openchrome_drv.c25
-rw-r--r--drivers/gpu/drm/openchrome/openchrome_drv.h4
-rw-r--r--drivers/gpu/drm/openchrome/openchrome_ioctl.c4
3 files changed, 16 insertions, 17 deletions
diff --git a/drivers/gpu/drm/openchrome/openchrome_drv.c b/drivers/gpu/drm/openchrome/openchrome_drv.c
index 6a7eaa9855a5..7877ef1dee1f 100644
--- a/drivers/gpu/drm/openchrome/openchrome_drv.c
+++ b/drivers/gpu/drm/openchrome/openchrome_drv.c
@@ -42,7 +42,7 @@ MODULE_PARM_DESC(audio, "HDMI Audio enable (1 = enable)");
module_param_named(audio, openchrome_hdmi_audio, int, 0444);
-static int openchrome_drm_driver_open(struct drm_device *dev,
+static int openchrome_driver_open(struct drm_device *dev,
struct drm_file *file_priv)
{
int ret = 0;
@@ -53,7 +53,7 @@ static int openchrome_drm_driver_open(struct drm_device *dev,
return ret;
}
-static void openchrome_drm_driver_postclose(struct drm_device *dev,
+static void openchrome_driver_postclose(struct drm_device *dev,
struct drm_file *file_priv)
{
DRM_DEBUG_KMS("Entered %s.\n", __func__);
@@ -61,7 +61,7 @@ static void openchrome_drm_driver_postclose(struct drm_device *dev,
DRM_DEBUG_KMS("Exiting %s.\n", __func__);
}
-static void openchrome_drm_driver_lastclose(struct drm_device *dev)
+static void openchrome_driver_lastclose(struct drm_device *dev)
{
DRM_DEBUG_KMS("Entered %s.\n", __func__);
@@ -70,7 +70,7 @@ static void openchrome_drm_driver_lastclose(struct drm_device *dev)
DRM_DEBUG_KMS("Exiting %s.\n", __func__);
}
-static int openchrome_drm_driver_dumb_create(
+static int openchrome_driver_dumb_create(
struct drm_file *file_priv,
struct drm_device *dev,
struct drm_mode_create_dumb *args)
@@ -114,7 +114,7 @@ exit:
return ret;
}
-static int openchrome_drm_driver_dumb_map_offset(
+static int openchrome_driver_dumb_map_offset(
struct drm_file *file_priv,
struct drm_device *dev,
uint32_t handle,
@@ -156,13 +156,12 @@ static struct drm_driver openchrome_driver = {
DRIVER_GEM |
DRIVER_MODESET |
DRIVER_ATOMIC,
- .open = openchrome_drm_driver_open,
- .postclose = openchrome_drm_driver_postclose,
- .lastclose = openchrome_drm_driver_lastclose,
- .dumb_create = openchrome_drm_driver_dumb_create,
- .dumb_map_offset =
- openchrome_drm_driver_dumb_map_offset,
- .ioctls = openchrome_ioctls,
+ .open = openchrome_driver_open,
+ .postclose = openchrome_driver_postclose,
+ .lastclose = openchrome_driver_lastclose,
+ .dumb_create = openchrome_driver_dumb_create,
+ .dumb_map_offset = openchrome_driver_dumb_map_offset,
+ .ioctls = openchrome_driver_ioctls,
.fops = &openchrome_driver_fops,
.name = DRIVER_NAME,
.desc = DRIVER_DESC,
@@ -255,7 +254,7 @@ static int __init openchrome_init(void)
DRM_DEBUG_KMS("Entered %s.\n", __func__);
- openchrome_driver.num_ioctls = openchrome_max_ioctl;
+ openchrome_driver.num_ioctls = openchrome_driver_num_ioctls;
ret = pci_register_driver(&openchrome_pci_driver);
diff --git a/drivers/gpu/drm/openchrome/openchrome_drv.h b/drivers/gpu/drm/openchrome/openchrome_drv.h
index fe9b7bcdff79..1c0f08da78c6 100644
--- a/drivers/gpu/drm/openchrome/openchrome_drv.h
+++ b/drivers/gpu/drm/openchrome/openchrome_drv.h
@@ -365,8 +365,8 @@ disable_second_display_channel(void __iomem *regs)
}
-extern const struct drm_ioctl_desc openchrome_ioctls[];
-extern int openchrome_max_ioctl;
+extern const struct drm_ioctl_desc openchrome_driver_ioctls[];
+extern int openchrome_driver_num_ioctls;
extern int openchrome_hdmi_audio;
diff --git a/drivers/gpu/drm/openchrome/openchrome_ioctl.c b/drivers/gpu/drm/openchrome/openchrome_ioctl.c
index 147b8e92b174..36453b40e775 100644
--- a/drivers/gpu/drm/openchrome/openchrome_ioctl.c
+++ b/drivers/gpu/drm/openchrome/openchrome_ioctl.c
@@ -116,11 +116,11 @@ static int openchrome_gem_unmap_ioctl(struct drm_device *dev,
}
-const struct drm_ioctl_desc openchrome_ioctls[] = {
+const struct drm_ioctl_desc openchrome_driver_ioctls[] = {
DRM_IOCTL_DEF_DRV(OPENCHROME_GEM_CREATE, openchrome_gem_create_ioctl, DRM_AUTH | DRM_UNLOCKED),
DRM_IOCTL_DEF_DRV(OPENCHROME_GEM_MAP, openchrome_gem_map_ioctl, DRM_AUTH | DRM_UNLOCKED),
DRM_IOCTL_DEF_DRV(OPENCHROME_GEM_UNMAP, openchrome_gem_unmap_ioctl, DRM_AUTH | DRM_UNLOCKED),
};
-int openchrome_max_ioctl = ARRAY_SIZE(openchrome_ioctls);
+int openchrome_driver_num_ioctls = ARRAY_SIZE(openchrome_driver_ioctls);