X-GM-THRID: 6748523404915113984 X-Received: by 2002:a5d:9e09:: with SMTP id h9mr49163730ioh.83.1571263048723; Wed, 16 Oct 2019 14:57:28 -0700 (PDT) X-BeenThere: outreachy-kernel@googlegroups.com Received: by 2002:a92:b104:: with SMTP id t4ls113369ilh.1.gmail; Wed, 16 Oct 2019 14:57:27 -0700 (PDT) X-Google-Smtp-Source: APXvYqzkEA4pMOKOa++CguOsTxZcZbU4w5WK3+jKFUh2Bvm4H+CP5tQqmuFVZdgdS3/atFjkPELm X-Received: by 2002:a92:9892:: with SMTP id a18mr59503ill.189.1571263047574; Wed, 16 Oct 2019 14:57:27 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1571263047; cv=none; d=google.com; s=arc-20160816; b=ArV15moAhBbyO2ovdhGVLcIJUxVC4t697qhShRTPkI1d1U50EoWXvh3/ZBNI1tixGX eL3kGLXZsoGHwUr8d/Sr1r5L4In6fyhwpVOTUSLHBKdZKx5Z8HcujQ7OXVSxwUyr7MXV s8KA6H7YACJi99PChyDA9U1aq2Q4GVZrf+yFjE2tLZYoXRqDB3iYUIU9TMAWBNAiRvVU SZtEpEbfRcvIQdcKNsilEebQChjYllpQp/iX9Zi9jaoCYKdGxGhcA0efXJ4slW4oEXDj u+JVD0st2gruNmyQ8Kz6kszkdUkVw8lVlVgaXBEjqHo8vDkj5K3JgFFF3c5tVfmskMYJ 8GPQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=message-id:date:subject:cc:to:from:dkim-signature; bh=pNkXcw4SnOO5dtl/tUTVZAJWfTbVpVA0cBgicXjhIZs=; b=PSCO0kLs7I4ZGODq7xidQH6/ibu7eWPP3iU5P8ka2pO30czt9nyN5CTKzUd56J0gSd CeDYvV0DZYmNhAG974Qwma2OFhoyib1RX6RUj/JVbZqJDmDe174xEFRXD/dhPUJOeC1I 0CX/tZovbm7nXzhmGKKuZ3QWdS6NjSBuyk7GRBPj9PtT+D3e/YZktoInnkDi30A/mHWi 4tPAIS4jJyjXiTpNeBP4Shl0dQHDivwXTQ2inlCzuflV5OzmGM90jx0v8isk+jYP+nt9 1v7GtJWO3H/UBHDgz9SLbW2Gygz/r/RLPaQMO5YAjaKuWxpT2kxWtUYy4HhtRnOmWwtO ydHw== ARC-Authentication-Results: i=1; gmr-mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=JcdJNdnb; spf=pass (google.com: domain of jamal.k.shareef@gmail.com designates 2607:f8b0:4864:20::542 as permitted sender) smtp.mailfrom=jamal.k.shareef@gmail.com; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from mail-pg1-x542.google.com (mail-pg1-x542.google.com. [2607:f8b0:4864:20::542]) by gmr-mx.google.com with ESMTPS id n201si6565iod.3.2019.10.16.14.57.27 for (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Wed, 16 Oct 2019 14:57:27 -0700 (PDT) Received-SPF: pass (google.com: domain of jamal.k.shareef@gmail.com designates 2607:f8b0:4864:20::542 as permitted sender) client-ip=2607:f8b0:4864:20::542; Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=JcdJNdnb; spf=pass (google.com: domain of jamal.k.shareef@gmail.com designates 2607:f8b0:4864:20::542 as permitted sender) smtp.mailfrom=jamal.k.shareef@gmail.com; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: by mail-pg1-x542.google.com with SMTP id r1so23225pgj.12 for ; Wed, 16 Oct 2019 14:57:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=pNkXcw4SnOO5dtl/tUTVZAJWfTbVpVA0cBgicXjhIZs=; b=JcdJNdnbU6gooioki/ybN1Qflwfm1dyzSILFqUJkxJ1MIIkE9/KytvIQ4nX/yNwRtF ri4pTx/sd8diRDlSl/SUi257GZhcXNoD2C6WplgmMO/cvM0uNCESf2mFtT9Aa8tMiS16 JYG6t+vUFVBX3k1kU7382Wir3V2NzgmnleDPo59aiAX9vGED0ZhBU84FeSp1Jk6x0/Q8 Er6Mmh1ZrUHGLlGhvBGHXEf6ojhgsahUaPc/fIMHobBz9iH6J9j3hwIeJAKKbJ1MJeoP ZXpwQ7C4TEerBsaRMX1+SFnPuw5T/ZFzXGbsHYnLMcNr7RCOD0/OZpwNk/xNwUEPs6SQ KYIA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=pNkXcw4SnOO5dtl/tUTVZAJWfTbVpVA0cBgicXjhIZs=; b=K4tet/pUgKsVRQOVbs+99wa7d7jXmf22MZK3W6xquv999LTJiy1ptEchDq3b84UC9Z oovNfIDMuLxG9C53TZLCzQ55f1Ez0YNE0K+tc5+dzGIb5RrgunJ7bInxOrRR5LccdDp8 5wI4QYKUvs4y9E21z4rwB9zn4yJxKehjdLhbQ7i6x+t1ERwkihSPTR0L6bSzrF1tTkGA q1xy4ZH0C5Fl6AfuX4eJlRjxqiwSamj3FBlCTs9/k5kSrWfC3UF3ntWrJuWArLJ8w3ue SwHVV/yI6vQqKnCjmXnL987d+mRn2YAyiQUDI6Ec6QN0M0vx3Q9R/7g/5RQRY3xQ18ja 6H8g== X-Gm-Message-State: APjAAAWLUAhgfdpH1qEDwi+aHISrNXedjvv5W6jHkNBg+srlfbJsDTT3 vBRJ1cUsOay9FNf0Q+h/OXXk1aD8qYM= X-Received: by 2002:a63:d50c:: with SMTP id c12mr329901pgg.199.1571263046329; Wed, 16 Oct 2019 14:57:26 -0700 (PDT) Return-Path: Received: from jamal-XPS-13-9343 (97-126-66-56.tukw.qwest.net. [97.126.66.56]) by smtp.gmail.com with ESMTPSA id ev20sm125144pjb.19.2019.10.16.14.57.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 16 Oct 2019 14:57:25 -0700 (PDT) From: Jamal Shareef To: boqun.feng@microsoft.com, andrea.parri@microsoft.com Cc: Jamal Shareef , sudipm.mukherjee@gmail.com, teddy.wang@siliconmotion.com, gregkh@linuxfoundation.org, outreachy-kernel@googlegroups.com Subject: [RESEND PATCH] staging: sm750sb: Edit CamelCase in dvi/sii164 files Date: Wed, 16 Oct 2019 14:57:00 -0700 Message-Id: <20191016215700.2507-1-jamal.k.shareef@gmail.com> X-Mailer: git-send-email 2.17.1 This patch edits CamelCase naming in a group of dependent sm750fb files. Issue found by checkpatch. Signed-off-by: Jamal Shareef --- drivers/staging/sm750fb/ddk750_dvi.c | 68 ++++----- drivers/staging/sm750fb/ddk750_dvi.h | 64 ++++---- drivers/staging/sm750fb/ddk750_sii164.c | 185 ++++++++++++------------ drivers/staging/sm750fb/ddk750_sii164.h | 40 ++--- 4 files changed, 179 insertions(+), 178 deletions(-) diff --git a/drivers/staging/sm750fb/ddk750_dvi.c b/drivers/staging/sm750fb/ddk750_dvi.c index cd564ea40779..6fa77d4effef 100644 --- a/drivers/staging/sm750fb/ddk750_dvi.c +++ b/drivers/staging/sm750fb/ddk750_dvi.c @@ -11,50 +11,50 @@ * function API. Please set the function pointer to NULL whenever the function * is not supported. */ -static struct dvi_ctrl_device g_dcftSupportedDviController[] = { +static struct dvi_ctrl_device g_dcft_supported_dvi_controller[] = { #ifdef DVI_CTRL_SII164 { - .pfnInit = sii164InitChip, - .pfnGetVendorId = sii164GetVendorID, - .pfnGetDeviceId = sii164GetDeviceID, + .pfn_init = sii164_init_chip, + .pfn_get_vendor_id = sii164_get_vendor_id, + .pfn_get_device_id = sii164_get_device_id, #ifdef SII164_FULL_FUNCTIONS - .pfnResetChip = sii164ResetChip, - .pfnGetChipString = sii164GetChipString, - .pfnSetPower = sii164SetPower, - .pfnEnableHotPlugDetection = sii164EnableHotPlugDetection, - .pfnIsConnected = sii164IsConnected, - .pfnCheckInterrupt = sii164CheckInterrupt, - .pfnClearInterrupt = sii164ClearInterrupt, + .pfn_reset_chip = sii164_reset_chip, + .pfn_get_chip_string = sii164_get_chip_string, + .pfn_set_power = sii164_set_power, + .pfn_enable_hot_plug_detection = sii164_enable_hot_plug_detection, + .pfn_is_connected = sii164_is_connected, + .pfn_check_interrupt = sii164_check_interrupt, + .pfn_clear_interrupt = sii164_clear_interrupt, #endif }, #endif }; -int dviInit(unsigned char edge_select, - unsigned char bus_select, - unsigned char dual_edge_clk_select, - unsigned char hsync_enable, - unsigned char vsync_enable, - unsigned char deskew_enable, - unsigned char deskew_setting, - unsigned char continuous_sync_enable, - unsigned char pll_filter_enable, - unsigned char pll_filter_value) +int dvi_init(unsigned char edge_select, + unsigned char bus_select, + unsigned char dual_edge_clk_select, + unsigned char hsync_enable, + unsigned char vsync_enable, + unsigned char deskew_enable, + unsigned char deskew_setting, + unsigned char continuous_sync_enable, + unsigned char pll_filter_enable, + unsigned char pll_filter_value) { - struct dvi_ctrl_device *pCurrentDviCtrl; + struct dvi_ctrl_device *p_current_dvi_ctrl; - pCurrentDviCtrl = g_dcftSupportedDviController; - if (pCurrentDviCtrl->pfnInit) { - return pCurrentDviCtrl->pfnInit(edge_select, - bus_select, - dual_edge_clk_select, - hsync_enable, - vsync_enable, - deskew_enable, - deskew_setting, - continuous_sync_enable, - pll_filter_enable, - pll_filter_value); + p_current_dvi_ctrl = g_dcft_supported_dvi_controller; + if (p_current_dvi_ctrl->pfn_init) { + return p_current_dvi_ctrl->pfn_init(edge_select, + bus_select, + dual_edge_clk_select, + hsync_enable, + vsync_enable, + deskew_enable, + deskew_setting, + continuous_sync_enable, + pll_filter_enable, + pll_filter_value); } return -1; /* error */ } diff --git a/drivers/staging/sm750fb/ddk750_dvi.h b/drivers/staging/sm750fb/ddk750_dvi.h index 1c7a565b617a..d3ea365d1509 100644 --- a/drivers/staging/sm750fb/ddk750_dvi.h +++ b/drivers/staging/sm750fb/ddk750_dvi.h @@ -4,54 +4,54 @@ /* dvi chip stuffs structros */ -typedef long (*PFN_DVICTRL_INIT)(unsigned char edgeSelect, - unsigned char busSelect, - unsigned char dualEdgeClkSelect, - unsigned char hsyncEnable, - unsigned char vsyncEnable, - unsigned char deskewEnable, - unsigned char deskewSetting, - unsigned char continuousSyncEnable, - unsigned char pllFilterEnable, - unsigned char pllFilterValue); +typedef long (*PFN_DVICTRL_INIT)(unsigned char edge_select, + unsigned char bus_select, + unsigned char dual_edge_clk_select, + unsigned char hsync_enable, + unsigned char vsync_enable, + unsigned char deskew_enable, + unsigned char deskew_setting, + unsigned char continuous_sync_enable, + unsigned char pll_filter_enable, + unsigned char pll_filter_value); typedef void (*PFN_DVICTRL_RESETCHIP)(void); typedef char* (*PFN_DVICTRL_GETCHIPSTRING)(void); typedef unsigned short (*PFN_DVICTRL_GETVENDORID)(void); typedef unsigned short (*PFN_DVICTRL_GETDEVICEID)(void); -typedef void (*PFN_DVICTRL_SETPOWER)(unsigned char powerUp); -typedef void (*PFN_DVICTRL_HOTPLUGDETECTION)(unsigned char enableHotPlug); +typedef void (*PFN_DVICTRL_SETPOWER)(unsigned char power_up); +typedef void (*PFN_DVICTRL_HOTPLUGDETECTION)(unsigned char enable_hot_plug); typedef unsigned char (*PFN_DVICTRL_ISCONNECTED)(void); typedef unsigned char (*PFN_DVICTRL_CHECKINTERRUPT)(void); typedef void (*PFN_DVICTRL_CLEARINTERRUPT)(void); /* Structure to hold all the function pointer to the DVI Controller. */ struct dvi_ctrl_device { - PFN_DVICTRL_INIT pfnInit; - PFN_DVICTRL_RESETCHIP pfnResetChip; - PFN_DVICTRL_GETCHIPSTRING pfnGetChipString; - PFN_DVICTRL_GETVENDORID pfnGetVendorId; - PFN_DVICTRL_GETDEVICEID pfnGetDeviceId; - PFN_DVICTRL_SETPOWER pfnSetPower; - PFN_DVICTRL_HOTPLUGDETECTION pfnEnableHotPlugDetection; - PFN_DVICTRL_ISCONNECTED pfnIsConnected; - PFN_DVICTRL_CHECKINTERRUPT pfnCheckInterrupt; - PFN_DVICTRL_CLEARINTERRUPT pfnClearInterrupt; + PFN_DVICTRL_INIT pfn_init; + PFN_DVICTRL_RESETCHIP pfn_reset_chip; + PFN_DVICTRL_GETCHIPSTRING pfn_get_chip_string; + PFN_DVICTRL_GETVENDORID pfn_get_vendor_id; + PFN_DVICTRL_GETDEVICEID pfn_get_device_id; + PFN_DVICTRL_SETPOWER pfn_set_power; + PFN_DVICTRL_HOTPLUGDETECTION pfn_enable_hot_plug_detection; + PFN_DVICTRL_ISCONNECTED pfn_is_connected; + PFN_DVICTRL_CHECKINTERRUPT pfn_check_interrupt; + PFN_DVICTRL_CLEARINTERRUPT pfn_clear_interrupt; }; #define DVI_CTRL_SII164 /* dvi functions prototype */ -int dviInit(unsigned char edgeSelect, - unsigned char busSelect, - unsigned char dualEdgeClkSelect, - unsigned char hsyncEnable, - unsigned char vsyncEnable, - unsigned char deskewEnable, - unsigned char deskewSetting, - unsigned char continuousSyncEnable, - unsigned char pllFilterEnable, - unsigned char pllFilterValue); +int dvi_init(unsigned char edge_select, + unsigned char bus_select, + unsigned char dual_edge_clk_select, + unsigned char hsync_enable, + unsigned char vsync_enable, + unsigned char deskew_enable, + unsigned char deskew_setting, + unsigned char continuous_sync_enable, + unsigned char pll_filter_enable, + unsigned char pll_filter_value); #endif diff --git a/drivers/staging/sm750fb/ddk750_sii164.c b/drivers/staging/sm750fb/ddk750_sii164.c index bee58edc84e7..b3898e84e688 100644 --- a/drivers/staging/sm750fb/ddk750_sii164.c +++ b/drivers/staging/sm750fb/ddk750_sii164.c @@ -12,11 +12,11 @@ #define USE_HW_I2C #ifdef USE_HW_I2C - #define i2cWriteReg sm750_hw_i2c_write_reg - #define i2cReadReg sm750_hw_i2c_read_reg + #define i2c_write_reg sm750_hw_i2c_write_reg + #define i2c_read_reg sm750_hw_i2c_read_reg #else - #define i2cWriteReg sm750_sw_i2c_write_reg - #define i2cReadReg sm750_sw_i2c_read_reg + #define i2c_write_reg sm750_sw_i2c_write_reg + #define i2c_read_reg sm750_sw_i2c_read_reg #endif /* SII164 Vendor and Device ID */ @@ -25,45 +25,45 @@ #ifdef SII164_FULL_FUNCTIONS /* Name of the DVI Controller chip */ -static char *gDviCtrlChipName = "Silicon Image SiI 164"; +static char *g_dvi_ctrl_chip_name = "Silicon Image SiI 164"; #endif /* - * sii164GetVendorID + * sii164_get_vendor_id * This function gets the vendor ID of the DVI controller chip. * * Output: * Vendor ID */ -unsigned short sii164GetVendorID(void) +unsigned short sii164_get_vendor_id(void) { - unsigned short vendorID; + unsigned short vendor_id; - vendorID = ((unsigned short)i2cReadReg(SII164_I2C_ADDRESS, - SII164_VENDOR_ID_HIGH) << 8) | - (unsigned short)i2cReadReg(SII164_I2C_ADDRESS, - SII164_VENDOR_ID_LOW); + vendor_id = ((unsigned short)i2c_read_reg(SII164_I2C_ADDRESS, + SII164_VENDOR_ID_HIGH) << 8) | + (unsigned short)i2c_read_reg(SII164_I2C_ADDRESS, + SII164_VENDOR_ID_LOW); - return vendorID; + return vendor_id; } /* - * sii164GetDeviceID + * sii164_get_device_id * This function gets the device ID of the DVI controller chip. * * Output: * Device ID */ -unsigned short sii164GetDeviceID(void) +unsigned short sii164_get_device_id(void) { - unsigned short deviceID; + unsigned short device_id; - deviceID = ((unsigned short)i2cReadReg(SII164_I2C_ADDRESS, - SII164_DEVICE_ID_HIGH) << 8) | - (unsigned short)i2cReadReg(SII164_I2C_ADDRESS, - SII164_DEVICE_ID_LOW); + device_id = ((unsigned short)i2c_read_reg(SII164_I2C_ADDRESS, + SII164_DEVICE_ID_HIGH) << 8) | + (unsigned short)i2c_read_reg(SII164_I2C_ADDRESS, + SII164_DEVICE_ID_LOW); - return deviceID; + return device_id; } /* @@ -72,7 +72,7 @@ unsigned short sii164GetDeviceID(void) */ /* - * sii164InitChip + * sii164_init_chip * This function initialize and detect the DVI controller chip. * * Input: @@ -118,16 +118,16 @@ unsigned short sii164GetDeviceID(void) * 0 - Success * -1 - Fail. */ -long sii164InitChip(unsigned char edge_select, - unsigned char bus_select, - unsigned char dual_edge_clk_select, - unsigned char hsync_enable, - unsigned char vsync_enable, - unsigned char deskew_enable, - unsigned char deskew_setting, - unsigned char continuous_sync_enable, - unsigned char pll_filter_enable, - unsigned char pll_filter_value) +long sii164_init_chip(unsigned char edge_select, + unsigned char bus_select, + unsigned char dual_edge_clk_select, + unsigned char hsync_enable, + unsigned char vsync_enable, + unsigned char deskew_enable, + unsigned char deskew_setting, + unsigned char continuous_sync_enable, + unsigned char pll_filter_enable, + unsigned char pll_filter_value) { unsigned char config; @@ -140,8 +140,8 @@ long sii164InitChip(unsigned char edge_select, #endif /* Check if SII164 Chip exists */ - if ((sii164GetVendorID() == SII164_VENDOR_ID) && - (sii164GetDeviceID() == SII164_DEVICE_ID)) { + if ((sii164_get_vendor_id() == SII164_VENDOR_ID) && + (sii164_get_device_id() == SII164_DEVICE_ID)) { /* * Initialize SII164 controller chip. */ @@ -176,7 +176,7 @@ long sii164InitChip(unsigned char edge_select, else config |= SII164_CONFIGURATION_VSYNC_AS_IS; - i2cWriteReg(SII164_I2C_ADDRESS, SII164_CONFIGURATION, config); + i2c_write_reg(SII164_I2C_ADDRESS, SII164_CONFIGURATION, config); /* * De-skew enabled with default 111b value. @@ -214,7 +214,7 @@ long sii164InitChip(unsigned char edge_select, config |= SII164_DESKEW_8_STEP; break; } - i2cWriteReg(SII164_I2C_ADDRESS, SII164_DESKEW, config); + i2c_write_reg(SII164_I2C_ADDRESS, SII164_DESKEW, config); /* Enable/Disable Continuous Sync. */ if (continuous_sync_enable == 0) @@ -231,12 +231,12 @@ long sii164InitChip(unsigned char edge_select, /* Set the PLL Filter value */ config |= ((pll_filter_value & 0x07) << 1); - i2cWriteReg(SII164_I2C_ADDRESS, SII164_PLL, config); + i2c_write_reg(SII164_I2C_ADDRESS, SII164_PLL, config); /* Recover from Power Down and enable output. */ - config = i2cReadReg(SII164_I2C_ADDRESS, SII164_CONFIGURATION); + config = i2c_read_reg(SII164_I2C_ADDRESS, SII164_CONFIGURATION); config |= SII164_CONFIGURATION_POWER_NORMAL; - i2cWriteReg(SII164_I2C_ADDRESS, SII164_CONFIGURATION, config); + i2c_write_reg(SII164_I2C_ADDRESS, SII164_CONFIGURATION, config); return 0; } @@ -250,157 +250,158 @@ long sii164InitChip(unsigned char edge_select, #ifdef SII164_FULL_FUNCTIONS /* - * sii164ResetChip + * sii164_reset_chip * This function resets the DVI Controller Chip. */ -void sii164ResetChip(void) +void sii164_reset_chip(void) { /* Power down */ - sii164SetPower(0); - sii164SetPower(1); + sii164_set_power(0); + sii164_set_power(1); } /* - * sii164GetChipString + * sii164_get_chip_string * This function returns a char string name of the current DVI Controller * chip. * * It's convenient for application need to display the chip name. */ -char *sii164GetChipString(void) +char *sii164_get_chip_string(void) { - return gDviCtrlChipName; + return g_dvi_ctrl_chip_name; } /* - * sii164SetPower + * sii164_set_power * This function sets the power configuration of the DVI Controller Chip. * * Input: - * powerUp - Flag to set the power down or up + * power_up - Flag to set the power down or up */ -void sii164SetPower(unsigned char powerUp) +void sii164_set_power(unsigned char power_up) { unsigned char config; - config = i2cReadReg(SII164_I2C_ADDRESS, SII164_CONFIGURATION); - if (powerUp == 1) { + config = i2c_read_reg(SII164_I2C_ADDRESS, SII164_CONFIGURATION); + if (power_up == 1) { /* Power up the chip */ config &= ~SII164_CONFIGURATION_POWER_MASK; config |= SII164_CONFIGURATION_POWER_NORMAL; - i2cWriteReg(SII164_I2C_ADDRESS, SII164_CONFIGURATION, config); + i2c_write_reg(SII164_I2C_ADDRESS, SII164_CONFIGURATION, config); } else { /* Power down the chip */ config &= ~SII164_CONFIGURATION_POWER_MASK; config |= SII164_CONFIGURATION_POWER_DOWN; - i2cWriteReg(SII164_I2C_ADDRESS, SII164_CONFIGURATION, config); + i2c_write_reg(SII164_I2C_ADDRESS, SII164_CONFIGURATION, config); } } /* - * sii164SelectHotPlugDetectionMode + * sii164_select_hot_plug_detection_mode * This function selects the mode of the hot plug detection. */ static -void sii164SelectHotPlugDetectionMode(enum sii164_hot_plug_mode hotPlugMode) +void sii164_select_hot_plug_detection_mode(enum sii164_hot_plug_mode + hot_plug_mode) { - unsigned char detectReg; + unsigned char detect_reg; - detectReg = i2cReadReg(SII164_I2C_ADDRESS, SII164_DETECT) & - ~SII164_DETECT_MONITOR_SENSE_OUTPUT_FLAG; - switch (hotPlugMode) { + detect_reg = i2c_read_reg(SII164_I2C_ADDRESS, SII164_DETECT) & + ~SII164_DETECT_MONITOR_SENSE_OUTPUT_FLAG; + switch (hot_plug_mode) { case SII164_HOTPLUG_DISABLE: - detectReg |= SII164_DETECT_MONITOR_SENSE_OUTPUT_HIGH; + detect_reg |= SII164_DETECT_MONITOR_SENSE_OUTPUT_HIGH; break; case SII164_HOTPLUG_USE_MDI: - detectReg &= ~SII164_DETECT_INTERRUPT_MASK; - detectReg |= SII164_DETECT_INTERRUPT_BY_HTPLG_PIN; - detectReg |= SII164_DETECT_MONITOR_SENSE_OUTPUT_MDI; + detect_reg &= ~SII164_DETECT_INTERRUPT_MASK; + detect_reg |= SII164_DETECT_INTERRUPT_BY_HTPLG_PIN; + detect_reg |= SII164_DETECT_MONITOR_SENSE_OUTPUT_MDI; break; case SII164_HOTPLUG_USE_RSEN: - detectReg |= SII164_DETECT_MONITOR_SENSE_OUTPUT_RSEN; + detect_reg |= SII164_DETECT_MONITOR_SENSE_OUTPUT_RSEN; break; case SII164_HOTPLUG_USE_HTPLG: - detectReg |= SII164_DETECT_MONITOR_SENSE_OUTPUT_HTPLG; + detect_reg |= SII164_DETECT_MONITOR_SENSE_OUTPUT_HTPLG; break; } - i2cWriteReg(SII164_I2C_ADDRESS, SII164_DETECT, detectReg); + i2c_write_reg(SII164_I2C_ADDRESS, SII164_DETECT, detect_reg); } /* - * sii164EnableHotPlugDetection + * sii164_enable_hot_plug_detection * This function enables the Hot Plug detection. * - * enableHotPlug - Enable (=1) / disable (=0) Hot Plug detection + * enable_hot_plug - Enable (=1) / disable (=0) Hot Plug detection */ -void sii164EnableHotPlugDetection(unsigned char enableHotPlug) +void sii164_enable_hot_plug_detection(unsigned char enable_hot_plug) { - unsigned char detectReg; + unsigned char detect_reg; - detectReg = i2cReadReg(SII164_I2C_ADDRESS, SII164_DETECT); + detect_reg = i2c_read_reg(SII164_I2C_ADDRESS, SII164_DETECT); /* Depending on each DVI controller, need to enable the hot plug based * on each individual chip design. */ - if (enableHotPlug != 0) - sii164SelectHotPlugDetectionMode(SII164_HOTPLUG_USE_MDI); + if (enable_hot_plug != 0) + sii164_select_hot_plug_detection_mode(SII164_HOTPLUG_USE_MDI); else - sii164SelectHotPlugDetectionMode(SII164_HOTPLUG_DISABLE); + sii164_select_hot_plug_detection_mode(SII164_HOTPLUG_DISABLE); } /* - * sii164IsConnected + * sii164_is_connected * Check if the DVI Monitor is connected. * * Output: * 0 - Not Connected * 1 - Connected */ -unsigned char sii164IsConnected(void) +unsigned char sii164_is_connected(void) { - unsigned char hotPlugValue; + unsigned char hot_plug_value; - hotPlugValue = i2cReadReg(SII164_I2C_ADDRESS, SII164_DETECT) & - SII164_DETECT_HOT_PLUG_STATUS_MASK; - if (hotPlugValue == SII164_DETECT_HOT_PLUG_STATUS_ON) + hot_plug_value = i2c_read_reg(SII164_I2C_ADDRESS, SII164_DETECT) & + SII164_DETECT_HOT_PLUG_STATUS_MASK; + if (hot_plug_value == SII164_DETECT_HOT_PLUG_STATUS_ON) return 1; else return 0; } /* - * sii164CheckInterrupt + * sii164_check_interrupt * Checks if interrupt has occurred. * * Output: * 0 - No interrupt * 1 - Interrupt occurs */ -unsigned char sii164CheckInterrupt(void) +unsigned char sii164_check_interrupt(void) { - unsigned char detectReg; + unsigned char detect_reg; - detectReg = i2cReadReg(SII164_I2C_ADDRESS, SII164_DETECT) & - SII164_DETECT_MONITOR_STATE_MASK; - if (detectReg == SII164_DETECT_MONITOR_STATE_CHANGE) + detect_reg = i2c_read_reg(SII164_I2C_ADDRESS, SII164_DETECT) & + SII164_DETECT_MONITOR_STATE_MASK; + if (detect_reg == SII164_DETECT_MONITOR_STATE_CHANGE) return 1; else return 0; } /* - * sii164ClearInterrupt + * sii164_clear_interrupt * Clear the hot plug interrupt. */ -void sii164ClearInterrupt(void) +void sii164_clear_interrupt(void) { - unsigned char detectReg; + unsigned char detect_reg; /* Clear the MDI interrupt */ - detectReg = i2cReadReg(SII164_I2C_ADDRESS, SII164_DETECT); - i2cWriteReg(SII164_I2C_ADDRESS, SII164_DETECT, - detectReg | SII164_DETECT_MONITOR_STATE_CLEAR); + detect_reg = i2c_read_reg(SII164_I2C_ADDRESS, SII164_DETECT); + i2c_write_reg(SII164_I2C_ADDRESS, SII164_DETECT, + detect_reg | SII164_DETECT_MONITOR_STATE_CLEAR); } #endif diff --git a/drivers/staging/sm750fb/ddk750_sii164.h b/drivers/staging/sm750fb/ddk750_sii164.h index d940cb729066..737b0e4869ff 100644 --- a/drivers/staging/sm750fb/ddk750_sii164.h +++ b/drivers/staging/sm750fb/ddk750_sii164.h @@ -16,28 +16,28 @@ enum sii164_hot_plug_mode { }; /* Silicon Image SiI164 chip prototype */ -long sii164InitChip(unsigned char edgeSelect, - unsigned char busSelect, - unsigned char dualEdgeClkSelect, - unsigned char hsyncEnable, - unsigned char vsyncEnable, - unsigned char deskewEnable, - unsigned char deskewSetting, - unsigned char continuousSyncEnable, - unsigned char pllFilterEnable, - unsigned char pllFilterValue); - -unsigned short sii164GetVendorID(void); -unsigned short sii164GetDeviceID(void); +long sii164_init_chip(unsigned char edge_select, + unsigned char bus_select, + unsigned char dual_edge_clk_select, + unsigned char hsync_enable, + unsigned char vsync_enable, + unsigned char deskew_enable, + unsigned char deskew_setting, + unsigned char continuous_sync_enable, + unsigned char pll_filter_enable, + unsigned char pll_filter_value); + +unsigned short sii164_get_vendor_id(void); +unsigned short sii164_get_device_id(void); #ifdef SII164_FULL_FUNCTIONS -void sii164ResetChip(void); -char *sii164GetChipString(void); -void sii164SetPower(unsigned char powerUp); -void sii164EnableHotPlugDetection(unsigned char enableHotPlug); -unsigned char sii164IsConnected(void); -unsigned char sii164CheckInterrupt(void); -void sii164ClearInterrupt(void); +void sii164_reset_chip(void); +char *sii164_get_chip_string(void); +void sii164_set_power(unsigned char power_up); +void sii164_enable_hot_plug_detection(unsigned char enable_hot_plug); +unsigned char sii164_is_connected(void); +unsigned char sii164_check_interrupt(void); +void sii164_clear_interrupt(void); #endif /* * below register definition is used for -- 2.17.1