mirror of
https://github.com/torvalds/linux.git
synced 2026-06-04 04:23:35 +02:00
drm/msm/hdmi: Consistently use u32 instead of uint32_t
Linux coding style asks to use kernel types like u32 instead of uint32_t and code already has it in other places, so unify the remaining pieces. Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@oss.qualcomm.com> Reviewed-by: Dmitry Baryshkov <dmitry.baryshkov@oss.qualcomm.com> Patchwork: https://patchwork.freedesktop.org/patch/711172/ Link: https://lore.kernel.org/r/20260311-drm-msm-hdmi-cleanup-v1-4-c5535245f6de@oss.qualcomm.com Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@oss.qualcomm.com>
This commit is contained in:
parent
69c68ab38d
commit
bc11794cfe
|
|
@ -20,7 +20,7 @@
|
|||
|
||||
void msm_hdmi_set_mode(struct hdmi *hdmi, bool power_on)
|
||||
{
|
||||
uint32_t ctrl = 0;
|
||||
u32 ctrl = 0;
|
||||
unsigned long flags;
|
||||
|
||||
spin_lock_irqsave(&hdmi->reg_lock, flags);
|
||||
|
|
|
|||
|
|
@ -17,8 +17,7 @@ int msm_hdmi_audio_update(struct hdmi *hdmi)
|
|||
{
|
||||
struct hdmi_audio *audio = &hdmi->audio;
|
||||
bool enabled = audio->enabled;
|
||||
uint32_t acr_pkt_ctrl, vbi_pkt_ctrl, aud_pkt_ctrl;
|
||||
uint32_t audio_config;
|
||||
u32 acr_pkt_ctrl, vbi_pkt_ctrl, aud_pkt_ctrl, audio_config;
|
||||
|
||||
if (!hdmi->connector->display_info.is_hdmi)
|
||||
return -EINVAL;
|
||||
|
|
@ -43,7 +42,7 @@ int msm_hdmi_audio_update(struct hdmi *hdmi)
|
|||
acr_pkt_ctrl &= ~HDMI_ACR_PKT_CTRL_SELECT__MASK;
|
||||
|
||||
if (enabled) {
|
||||
uint32_t n, cts, multiplier;
|
||||
u32 n, cts, multiplier;
|
||||
enum hdmi_acr_cts select;
|
||||
|
||||
drm_hdmi_acr_get_n_cts(hdmi->pixclock, audio->rate, &n, &cts);
|
||||
|
|
|
|||
|
|
@ -355,7 +355,7 @@ static void msm_hdmi_set_timings(struct hdmi *hdmi,
|
|||
const struct drm_display_mode *mode)
|
||||
{
|
||||
int hstart, hend, vstart, vend;
|
||||
uint32_t frame_ctrl;
|
||||
u32 frame_ctrl;
|
||||
|
||||
hstart = mode->htotal - mode->hsync_start;
|
||||
hend = mode->htotal - mode->hsync_start + mode->hdisplay;
|
||||
|
|
@ -408,7 +408,7 @@ static const struct drm_edid *msm_hdmi_bridge_edid_read(struct drm_bridge *bridg
|
|||
struct hdmi_bridge *hdmi_bridge = to_hdmi_bridge(bridge);
|
||||
struct hdmi *hdmi = hdmi_bridge->hdmi;
|
||||
const struct drm_edid *drm_edid;
|
||||
uint32_t hdmi_ctrl;
|
||||
u32 hdmi_ctrl;
|
||||
|
||||
hdmi_ctrl = hdmi_read(hdmi, REG_HDMI_CTRL);
|
||||
hdmi_write(hdmi, REG_HDMI_CTRL, hdmi_ctrl | HDMI_CTRL_ENABLE);
|
||||
|
|
|
|||
|
|
@ -65,7 +65,7 @@ void msm_hdmi_hpd_enable(struct drm_bridge *bridge)
|
|||
struct hdmi_bridge *hdmi_bridge = to_hdmi_bridge(bridge);
|
||||
struct hdmi *hdmi = hdmi_bridge->hdmi;
|
||||
struct device *dev = &hdmi->pdev->dev;
|
||||
uint32_t hpd_ctrl;
|
||||
u32 hpd_ctrl;
|
||||
int ret;
|
||||
unsigned long flags;
|
||||
|
||||
|
|
@ -125,7 +125,7 @@ void msm_hdmi_hpd_irq(struct drm_bridge *bridge)
|
|||
{
|
||||
struct hdmi_bridge *hdmi_bridge = to_hdmi_bridge(bridge);
|
||||
struct hdmi *hdmi = hdmi_bridge->hdmi;
|
||||
uint32_t hpd_int_status, hpd_int_ctrl;
|
||||
u32 hpd_int_status, hpd_int_ctrl;
|
||||
|
||||
/* Process HPD: */
|
||||
hpd_int_status = hdmi_read(hdmi, REG_HDMI_HPD_INT_STATUS);
|
||||
|
|
|
|||
|
|
@ -40,8 +40,8 @@ static int ddc_clear_irq(struct hdmi_i2c_adapter *hdmi_i2c)
|
|||
{
|
||||
struct hdmi *hdmi = hdmi_i2c->hdmi;
|
||||
struct drm_device *dev = hdmi->dev;
|
||||
uint32_t retry = 0xffff;
|
||||
uint32_t ddc_int_ctrl;
|
||||
u32 retry = 0xffff;
|
||||
u32 ddc_int_ctrl;
|
||||
|
||||
do {
|
||||
--retry;
|
||||
|
|
@ -71,7 +71,7 @@ static bool sw_done(struct hdmi_i2c_adapter *hdmi_i2c)
|
|||
struct hdmi *hdmi = hdmi_i2c->hdmi;
|
||||
|
||||
if (!hdmi_i2c->sw_done) {
|
||||
uint32_t ddc_int_ctrl;
|
||||
u32 ddc_int_ctrl;
|
||||
|
||||
ddc_int_ctrl = hdmi_read(hdmi, REG_HDMI_DDC_INT_CTRL);
|
||||
|
||||
|
|
@ -92,13 +92,13 @@ static int msm_hdmi_i2c_xfer(struct i2c_adapter *i2c,
|
|||
struct hdmi_i2c_adapter *hdmi_i2c = to_hdmi_i2c_adapter(i2c);
|
||||
struct hdmi *hdmi = hdmi_i2c->hdmi;
|
||||
struct drm_device *dev = hdmi->dev;
|
||||
static const uint32_t nack[] = {
|
||||
static const u32 nack[] = {
|
||||
HDMI_DDC_SW_STATUS_NACK0, HDMI_DDC_SW_STATUS_NACK1,
|
||||
HDMI_DDC_SW_STATUS_NACK2, HDMI_DDC_SW_STATUS_NACK3,
|
||||
};
|
||||
int indices[MAX_TRANSACTIONS];
|
||||
int ret, i, j, index = 0;
|
||||
uint32_t ddc_status, ddc_data, i2c_trans;
|
||||
u32 ddc_status, ddc_data, i2c_trans;
|
||||
|
||||
num = min(num, MAX_TRANSACTIONS);
|
||||
|
||||
|
|
@ -119,7 +119,7 @@ static int msm_hdmi_i2c_xfer(struct i2c_adapter *i2c,
|
|||
|
||||
for (i = 0; i < num; i++) {
|
||||
struct i2c_msg *p = &msgs[i];
|
||||
uint32_t raw_addr = p->addr << 1;
|
||||
u32 raw_addr = p->addr << 1;
|
||||
|
||||
if (p->flags & I2C_M_RD)
|
||||
raw_addr |= 1;
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user