Skip to content

Commit a9dc339

Browse files
jnikulajnikula
committed
drm/i915/sdvo: switch to kernel types
Mixed C99 and kernel types use is getting ugly. Prefer kernel types. sed -i 's/\buint\(8\|16\|32\|64\)_t\b/u\1/g' v2: rebase Acked-by: Chris Wilson <chris@chris-wilson.co.uk> Acked-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com> Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com> Reviewed-by: José Roberto de Souza <jose.souza@intel.com> Signed-off-by: Jani Nikula <jani.nikula@intel.com> Link: https://patchwork.freedesktop.org/patch/msgid/20190118120125.15484-1-jani.nikula@intel.com
1 parent a81f781 commit a9dc339

File tree

1 file changed

+39
-39
lines changed

1 file changed

+39
-39
lines changed

‎drivers/gpu/drm/i915/intel_sdvo.c

Lines changed: 39 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ struct intel_sdvo {
7676
i915_reg_t sdvo_reg;
7777

7878
/* Active outputs controlled by this SDVO output */
79-
uint16_t controlled_output;
79+
u16 controlled_output;
8080

8181
/*
8282
* Capabilities of the SDVO device returned by
@@ -91,32 +91,32 @@ struct intel_sdvo {
9191
* For multiple function SDVO device,
9292
* this is for current attached outputs.
9393
*/
94-
uint16_t attached_output;
94+
u16 attached_output;
9595

9696
/*
9797
* Hotplug activation bits for this device
9898
*/
99-
uint16_t hotplug_active;
99+
u16 hotplug_active;
100100

101101
enum port port;
102102

103103
bool has_hdmi_monitor;
104104
bool has_hdmi_audio;
105105

106106
/* DDC bus used by this SDVO encoder */
107-
uint8_t ddc_bus;
107+
u8 ddc_bus;
108108

109109
/*
110110
* the sdvo flag gets lost in round trip: dtd->adjusted_mode->dtd
111111
*/
112-
uint8_t dtd_sdvo_flags;
112+
u8 dtd_sdvo_flags;
113113
};
114114

115115
struct intel_sdvo_connector {
116116
struct intel_connector base;
117117

118118
/* Mark the type of connector */
119-
uint16_t output_flag;
119+
u16 output_flag;
120120

121121
/* This contains all current supported TV format */
122122
u8 tv_format_supported[TV_FORMAT_NUM];
@@ -184,7 +184,7 @@ to_intel_sdvo_connector(struct drm_connector *connector)
184184
container_of((conn_state), struct intel_sdvo_connector_state, base.base)
185185

186186
static bool
187-
intel_sdvo_output_setup(struct intel_sdvo *intel_sdvo, uint16_t flags);
187+
intel_sdvo_output_setup(struct intel_sdvo *intel_sdvo, u16 flags);
188188
static bool
189189
intel_sdvo_tv_create_property(struct intel_sdvo *intel_sdvo,
190190
struct intel_sdvo_connector *intel_sdvo_connector,
@@ -746,9 +746,9 @@ static bool intel_sdvo_get_input_timing(struct intel_sdvo *intel_sdvo,
746746
static bool
747747
intel_sdvo_create_preferred_input_timing(struct intel_sdvo *intel_sdvo,
748748
struct intel_sdvo_connector *intel_sdvo_connector,
749-
uint16_t clock,
750-
uint16_t width,
751-
uint16_t height)
749+
u16 clock,
750+
u16 width,
751+
u16 height)
752752
{
753753
struct intel_sdvo_preferred_input_timing_args args;
754754

@@ -791,9 +791,9 @@ static bool intel_sdvo_set_clock_rate_mult(struct intel_sdvo *intel_sdvo, u8 val
791791
static void intel_sdvo_get_dtd_from_mode(struct intel_sdvo_dtd *dtd,
792792
const struct drm_display_mode *mode)
793793
{
794-
uint16_t width, height;
795-
uint16_t h_blank_len, h_sync_len, v_blank_len, v_sync_len;
796-
uint16_t h_sync_offset, v_sync_offset;
794+
u16 width, height;
795+
u16 h_blank_len, h_sync_len, v_blank_len, v_sync_len;
796+
u16 h_sync_offset, v_sync_offset;
797797
int mode_clock;
798798

799799
memset(dtd, 0, sizeof(*dtd));
@@ -898,13 +898,13 @@ static bool intel_sdvo_check_supp_encode(struct intel_sdvo *intel_sdvo)
898898
}
899899

900900
static bool intel_sdvo_set_encode(struct intel_sdvo *intel_sdvo,
901-
uint8_t mode)
901+
u8 mode)
902902
{
903903
return intel_sdvo_set_value(intel_sdvo, SDVO_CMD_SET_ENCODE, &mode, 1);
904904
}
905905

906906
static bool intel_sdvo_set_colorimetry(struct intel_sdvo *intel_sdvo,
907-
uint8_t mode)
907+
u8 mode)
908908
{
909909
return intel_sdvo_set_value(intel_sdvo, SDVO_CMD_SET_COLORIMETRY, &mode, 1);
910910
}
@@ -913,11 +913,11 @@ static bool intel_sdvo_set_colorimetry(struct intel_sdvo *intel_sdvo,
913913
static void intel_sdvo_dump_hdmi_buf(struct intel_sdvo *intel_sdvo)
914914
{
915915
int i, j;
916-
uint8_t set_buf_index[2];
917-
uint8_t av_split;
918-
uint8_t buf_size;
919-
uint8_t buf[48];
920-
uint8_t *pos;
916+
u8 set_buf_index[2];
917+
u8 av_split;
918+
u8 buf_size;
919+
u8 buf[48];
920+
u8 *pos;
921921

922922
intel_sdvo_get_value(encoder, SDVO_CMD_GET_HBUF_AV_SPLIT, &av_split, 1);
923923

@@ -940,11 +940,11 @@ static void intel_sdvo_dump_hdmi_buf(struct intel_sdvo *intel_sdvo)
940940
#endif
941941

942942
static bool intel_sdvo_write_infoframe(struct intel_sdvo *intel_sdvo,
943-
unsigned if_index, uint8_t tx_rate,
944-
const uint8_t *data, unsigned length)
943+
unsigned int if_index, u8 tx_rate,
944+
const u8 *data, unsigned int length)
945945
{
946-
uint8_t set_buf_index[2] = { if_index, 0 };
947-
uint8_t hbuf_size, tmp[8];
946+
u8 set_buf_index[2] = { if_index, 0 };
947+
u8 hbuf_size, tmp[8];
948948
int i;
949949

950950
if (!intel_sdvo_set_value(intel_sdvo,
@@ -984,7 +984,7 @@ static bool intel_sdvo_set_avi_infoframe(struct intel_sdvo *intel_sdvo,
984984
{
985985
const struct drm_display_mode *adjusted_mode =
986986
&pipe_config->base.adjusted_mode;
987-
uint8_t sdvo_data[HDMI_INFOFRAME_SIZE(AVI)];
987+
u8 sdvo_data[HDMI_INFOFRAME_SIZE(AVI)];
988988
union hdmi_infoframe frame;
989989
int ret;
990990
ssize_t len;
@@ -1017,7 +1017,7 @@ static bool intel_sdvo_set_tv_format(struct intel_sdvo *intel_sdvo,
10171017
const struct drm_connector_state *conn_state)
10181018
{
10191019
struct intel_sdvo_tv_format format;
1020-
uint32_t format_map;
1020+
u32 format_map;
10211021

10221022
format_map = 1 << conn_state->tv.mode;
10231023
memset(&format, 0, sizeof(format));
@@ -1208,7 +1208,7 @@ static void intel_sdvo_update_props(struct intel_sdvo *intel_sdvo,
12081208
const struct drm_connector_state *conn_state = &sdvo_state->base.base;
12091209
struct intel_sdvo_connector *intel_sdvo_conn =
12101210
to_intel_sdvo_connector(conn_state->connector);
1211-
uint16_t val;
1211+
u16 val;
12121212

12131213
if (intel_sdvo_conn->left)
12141214
UPDATE_PROPERTY(sdvo_state->tv.overscan_h, OVERSCAN_H);
@@ -1692,10 +1692,10 @@ static bool intel_sdvo_get_capabilities(struct intel_sdvo *intel_sdvo, struct in
16921692
return true;
16931693
}
16941694

1695-
static uint16_t intel_sdvo_get_hotplug_support(struct intel_sdvo *intel_sdvo)
1695+
static u16 intel_sdvo_get_hotplug_support(struct intel_sdvo *intel_sdvo)
16961696
{
16971697
struct drm_i915_private *dev_priv = to_i915(intel_sdvo->base.base.dev);
1698-
uint16_t hotplug;
1698+
u16 hotplug;
16991699

17001700
if (!I915_HAS_HOTPLUG(dev_priv))
17011701
return 0;
@@ -1826,7 +1826,7 @@ intel_sdvo_connector_matches_edid(struct intel_sdvo_connector *sdvo,
18261826
static enum drm_connector_status
18271827
intel_sdvo_detect(struct drm_connector *connector, bool force)
18281828
{
1829-
uint16_t response;
1829+
u16 response;
18301830
struct intel_sdvo *intel_sdvo = intel_attached_sdvo(connector);
18311831
struct intel_sdvo_connector *intel_sdvo_connector = to_intel_sdvo_connector(connector);
18321832
enum drm_connector_status ret;
@@ -1977,7 +1977,7 @@ static void intel_sdvo_get_tv_modes(struct drm_connector *connector)
19771977
struct intel_sdvo *intel_sdvo = intel_attached_sdvo(connector);
19781978
const struct drm_connector_state *conn_state = connector->state;
19791979
struct intel_sdvo_sdtv_resolution_request tv_res;
1980-
uint32_t reply = 0, format_map = 0;
1980+
u32 reply = 0, format_map = 0;
19811981
int i;
19821982

19831983
DRM_DEBUG_KMS("[CONNECTOR:%d:%s]\n",
@@ -2062,7 +2062,7 @@ static int
20622062
intel_sdvo_connector_atomic_get_property(struct drm_connector *connector,
20632063
const struct drm_connector_state *state,
20642064
struct drm_property *property,
2065-
uint64_t *val)
2065+
u64 *val)
20662066
{
20672067
struct intel_sdvo_connector *intel_sdvo_connector = to_intel_sdvo_connector(connector);
20682068
const struct intel_sdvo_connector_state *sdvo_state = to_intel_sdvo_connector_state((void *)state);
@@ -2121,7 +2121,7 @@ static int
21212121
intel_sdvo_connector_atomic_set_property(struct drm_connector *connector,
21222122
struct drm_connector_state *state,
21232123
struct drm_property *property,
2124-
uint64_t val)
2124+
u64 val)
21252125
{
21262126
struct intel_sdvo_connector *intel_sdvo_connector = to_intel_sdvo_connector(connector);
21272127
struct intel_sdvo_connector_state *sdvo_state = to_intel_sdvo_connector_state(state);
@@ -2270,7 +2270,7 @@ static const struct drm_encoder_funcs intel_sdvo_enc_funcs = {
22702270
static void
22712271
intel_sdvo_guess_ddc_bus(struct intel_sdvo *sdvo)
22722272
{
2273-
uint16_t mask = 0;
2273+
u16 mask = 0;
22742274
unsigned int num_bits;
22752275

22762276
/*
@@ -2671,7 +2671,7 @@ intel_sdvo_lvds_init(struct intel_sdvo *intel_sdvo, int device)
26712671
}
26722672

26732673
static bool
2674-
intel_sdvo_output_setup(struct intel_sdvo *intel_sdvo, uint16_t flags)
2674+
intel_sdvo_output_setup(struct intel_sdvo *intel_sdvo, u16 flags)
26752675
{
26762676
/* SDVO requires XXX1 function may not exist unless it has XXX0 function.*/
26772677

@@ -2747,7 +2747,7 @@ static bool intel_sdvo_tv_create_property(struct intel_sdvo *intel_sdvo,
27472747
{
27482748
struct drm_device *dev = intel_sdvo->base.base.dev;
27492749
struct intel_sdvo_tv_format format;
2750-
uint32_t format_map, i;
2750+
u32 format_map, i;
27512751

27522752
if (!intel_sdvo_set_target_output(intel_sdvo, type))
27532753
return false;
@@ -2814,7 +2814,7 @@ intel_sdvo_create_enhance_property_tv(struct intel_sdvo *intel_sdvo,
28142814
struct drm_connector_state *conn_state = connector->state;
28152815
struct intel_sdvo_connector_state *sdvo_state =
28162816
to_intel_sdvo_connector_state(conn_state);
2817-
uint16_t response, data_value[2];
2817+
u16 response, data_value[2];
28182818

28192819
/* when horizontal overscan is supported, Add the left/right property */
28202820
if (enhancements.overscan_h) {
@@ -2925,7 +2925,7 @@ intel_sdvo_create_enhance_property_lvds(struct intel_sdvo *intel_sdvo,
29252925
{
29262926
struct drm_device *dev = intel_sdvo->base.base.dev;
29272927
struct drm_connector *connector = &intel_sdvo_connector->base.base;
2928-
uint16_t response, data_value[2];
2928+
u16 response, data_value[2];
29292929

29302930
ENHANCEMENT(&connector->state->tv, brightness, BRIGHTNESS);
29312931

@@ -2939,7 +2939,7 @@ static bool intel_sdvo_create_enhance_property(struct intel_sdvo *intel_sdvo,
29392939
{
29402940
union {
29412941
struct intel_sdvo_enhancements_reply reply;
2942-
uint16_t response;
2942+
u16 response;
29432943
} enhancements;
29442944

29452945
BUILD_BUG_ON(sizeof(enhancements) != 2);

0 commit comments

Comments
 (0)