From 94ecb0a6b2b42f5dbf847157caf15e8a66deb18a Mon Sep 17 00:00:00 2001 From: Saleem Abdulrasool Date: Thu, 20 Jan 2011 18:47:52 -0800 Subject: [PATCH] siihdmi: more uniform naming SIIHDMI_INFO_FRAME_ is more fitting with the rest of the code --- drivers/video/mxc/mxcfb_siihdmi.c | 4 ++-- include/linux/i2c/sii_hdmi.h | 14 +++++++------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/drivers/video/mxc/mxcfb_siihdmi.c b/drivers/video/mxc/mxcfb_siihdmi.c index c8aab4b7331..ea22061fff8 100644 --- a/drivers/video/mxc/mxcfb_siihdmi.c +++ b/drivers/video/mxc/mxcfb_siihdmi.c @@ -438,7 +438,7 @@ static int siihdmi_set_audio_info_frame(struct siihdmi_tx *tx) int ret; struct siihdmi_audio_info_frame packet = { .header = { - .info_frame = INFO_FRAME_BUFFER_AUDIO, + .info_frame = SIIHDMI_INFO_FRAME_AUDIO, .repeat = false, .enable = tx->enable_audio, }, @@ -481,7 +481,7 @@ static int siihdmi_set_spd_info_frame(struct siihdmi_tx *tx) int ret; struct siihdmi_spd_info_frame packet = { .header = { - .info_frame = INFO_FRAME_BUFFER_SPD_ACP, + .info_frame = SIIHDMI_INFO_FRAME_SPD_ACP, .repeat = false, .enable = true, }, diff --git a/include/linux/i2c/sii_hdmi.h b/include/linux/i2c/sii_hdmi.h index 06a0c10b7ab..0c341197622 100644 --- a/include/linux/i2c/sii_hdmi.h +++ b/include/linux/i2c/sii_hdmi.h @@ -275,13 +275,13 @@ #define SIIHDMI_AVI_INFO_FRAME_OFFSET (0x03) -enum sii_info_frame_type { - INFO_FRAME_BUFFER_NONE, - INFO_FRAME_BUFFER_SPD_ACP, - INFO_FRAME_BUFFER_AUDIO, - INFO_FRAME_BUFFER_MPEG_GBD, - INFO_FRAME_BUFFER_GENERIC1_ISRC1, - INFO_FRAME_BUFFER_GENERIC2_ISRC2, +enum siihdmi_info_frame_type { + SIIHDMI_INFO_FRAME_NONE, + SIIHDMI_INFO_FRAME_SPD_ACP, + SIIHDMI_INFO_FRAME_AUDIO, + SIIHDMI_INFO_FRAME_MPEG_GBD, + SIIHDMI_INFO_FRAME_GENERIC1_ISRC1, + SIIHDMI_INFO_FRAME_GENERIC2_ISRC2, }; struct __packed info_frame_buffer_header {