From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752054AbdBTICy (ORCPT ); Mon, 20 Feb 2017 03:02:54 -0500 Received: from mail-pg0-f66.google.com ([74.125.83.66]:36852 "EHLO mail-pg0-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751330AbdBTICu (ORCPT ); Mon, 20 Feb 2017 03:02:50 -0500 From: Chris Zhong To: john@metanate.com, dianders@chromium.org, tfiga@chromium.org, heiko@sntech.de, yzq@rock-chips.com, mark.rutland@arm.com, devicetree@vger.kernel.org, robh+dt@kernel.org, galak@codeaurora.org, pawel.moll@arm.com, seanpaul@chromium.org Cc: linux-rockchip@lists.infradead.org, Chris Zhong , Mark Yao , David Airlie , dri-devel@lists.freedesktop.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [RESEND PATCH v7 3/7] drm/rockchip/dsi: dw-mipi: correct the coding style Date: Mon, 20 Feb 2017 16:02:19 +0800 Message-Id: <1487577744-2855-4-git-send-email-zyw@rock-chips.com> X-Mailer: git-send-email 2.6.3 In-Reply-To: <1487577744-2855-1-git-send-email-zyw@rock-chips.com> References: <1487577744-2855-1-git-send-email-zyw@rock-chips.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org correct the coding style, according the checkpatch scripts Signed-off-by: Chris Zhong Reviewed-by: Sean Paul --- Changes in v6: None Changes in v5: None Changes in v4: None Changes in v3: None drivers/gpu/drm/rockchip/dw-mipi-dsi.c | 29 ++++++++++++++--------------- 1 file changed, 14 insertions(+), 15 deletions(-) diff --git a/drivers/gpu/drm/rockchip/dw-mipi-dsi.c b/drivers/gpu/drm/rockchip/dw-mipi-dsi.c index 4e74681..836cb83 100644 --- a/drivers/gpu/drm/rockchip/dw-mipi-dsi.c +++ b/drivers/gpu/drm/rockchip/dw-mipi-dsi.c @@ -157,7 +157,6 @@ #define LPRX_TO_CNT(p) ((p) & 0xffff) #define DSI_BTA_TO_CNT 0x8c - #define DSI_LPCLK_CTRL 0x94 #define AUTO_CLKLANE_CTRL BIT(1) #define PHY_TXREQUESTCLKHS BIT(0) @@ -223,11 +222,11 @@ #define HSFREQRANGE_SEL(val) (((val) & 0x3f) << 1) -#define INPUT_DIVIDER(val) ((val - 1) & 0x7f) +#define INPUT_DIVIDER(val) (((val) - 1) & 0x7f) #define LOW_PROGRAM_EN 0 #define HIGH_PROGRAM_EN BIT(7) -#define LOOP_DIV_LOW_SEL(val) ((val - 1) & 0x1f) -#define LOOP_DIV_HIGH_SEL(val) (((val - 1) >> 5) & 0x1f) +#define LOOP_DIV_LOW_SEL(val) (((val) - 1) & 0x1f) +#define LOOP_DIV_HIGH_SEL(val) ((((val) - 1) >> 5) & 0x1f) #define PLL_LOOP_DIV_EN BIT(5) #define PLL_INPUT_DIV_EN BIT(4) @@ -369,6 +368,7 @@ static inline struct dw_mipi_dsi *encoder_to_dsi(struct drm_encoder *encoder) { return container_of(encoder, struct dw_mipi_dsi, encoder); } + static inline void dsi_write(struct dw_mipi_dsi *dsi, u32 reg, u32 val) { writel(val, dsi->base + reg); @@ -380,7 +380,7 @@ static inline u32 dsi_read(struct dw_mipi_dsi *dsi, u32 reg) } static void dw_mipi_dsi_phy_write(struct dw_mipi_dsi *dsi, u8 test_code, - u8 test_data) + u8 test_data) { /* * With the falling edge on TESTCLK, the TESTDIN[7:0] signal content @@ -496,7 +496,6 @@ static int dw_mipi_dsi_phy_init(struct dw_mipi_dsi *dsi) dsi_write(dsi, DSI_PHY_RSTZ, PHY_ENFORCEPLL | PHY_ENABLECLK | PHY_UNRSTZ | PHY_UNSHUTDOWNZ); - ret = readl_poll_timeout(dsi->base + DSI_PHY_STATUS, val, val & LOCK, 1000, PHY_STATUS_TIMEOUT_US); if (ret < 0) { @@ -571,7 +570,7 @@ static int dw_mipi_dsi_host_attach(struct mipi_dsi_host *host, if (device->lanes > dsi->pdata->max_data_lanes) { dev_err(dsi->dev, "the number of data lanes(%u) is too many\n", - device->lanes); + device->lanes); return -EINVAL; } @@ -1060,14 +1059,14 @@ dw_mipi_dsi_encoder_atomic_check(struct drm_encoder *encoder, return 0; } -static struct drm_encoder_helper_funcs +static const struct drm_encoder_helper_funcs dw_mipi_dsi_encoder_helper_funcs = { .enable = dw_mipi_dsi_encoder_enable, .disable = dw_mipi_dsi_encoder_disable, .atomic_check = dw_mipi_dsi_encoder_atomic_check, }; -static struct drm_encoder_funcs dw_mipi_dsi_encoder_funcs = { +static const struct drm_encoder_funcs dw_mipi_dsi_encoder_funcs = { .destroy = drm_encoder_cleanup, }; @@ -1103,7 +1102,7 @@ static void dw_mipi_dsi_drm_connector_destroy(struct drm_connector *connector) drm_connector_cleanup(connector); } -static struct drm_connector_funcs dw_mipi_dsi_atomic_connector_funcs = { +static const struct drm_connector_funcs dw_mipi_dsi_atomic_connector_funcs = { .dpms = drm_atomic_helper_connector_dpms, .fill_modes = drm_helper_probe_single_connector_modes, .destroy = dw_mipi_dsi_drm_connector_destroy, @@ -1113,7 +1112,7 @@ static struct drm_connector_funcs dw_mipi_dsi_atomic_connector_funcs = { }; static int dw_mipi_dsi_register(struct drm_device *drm, - struct dw_mipi_dsi *dsi) + struct dw_mipi_dsi *dsi) { struct drm_encoder *encoder = &dsi->encoder; struct drm_connector *connector = &dsi->connector; @@ -1134,14 +1133,14 @@ static int dw_mipi_dsi_register(struct drm_device *drm, drm_encoder_helper_add(&dsi->encoder, &dw_mipi_dsi_encoder_helper_funcs); ret = drm_encoder_init(drm, &dsi->encoder, &dw_mipi_dsi_encoder_funcs, - DRM_MODE_ENCODER_DSI, NULL); + DRM_MODE_ENCODER_DSI, NULL); if (ret) { dev_err(dev, "Failed to initialize encoder with drm\n"); return ret; } drm_connector_helper_add(connector, - &dw_mipi_dsi_connector_helper_funcs); + &dw_mipi_dsi_connector_helper_funcs); drm_connector_init(drm, &dsi->connector, &dw_mipi_dsi_atomic_connector_funcs, @@ -1216,7 +1215,7 @@ static const struct of_device_id dw_mipi_dsi_dt_ids[] = { MODULE_DEVICE_TABLE(of, dw_mipi_dsi_dt_ids); static int dw_mipi_dsi_bind(struct device *dev, struct device *master, - void *data) + void *data) { const struct of_device_id *of_id = of_match_device(dw_mipi_dsi_dt_ids, dev); @@ -1331,7 +1330,7 @@ static int dw_mipi_dsi_bind(struct device *dev, struct device *master, } static void dw_mipi_dsi_unbind(struct device *dev, struct device *master, - void *data) + void *data) { struct dw_mipi_dsi *dsi = dev_get_drvdata(dev); -- 2.6.3 From mboxrd@z Thu Jan 1 00:00:00 1970 From: Chris Zhong Subject: [RESEND PATCH v7 3/7] drm/rockchip/dsi: dw-mipi: correct the coding style Date: Mon, 20 Feb 2017 16:02:19 +0800 Message-ID: <1487577744-2855-4-git-send-email-zyw@rock-chips.com> References: <1487577744-2855-1-git-send-email-zyw@rock-chips.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <1487577744-2855-1-git-send-email-zyw@rock-chips.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: john@metanate.com, dianders@chromium.org, tfiga@chromium.org, heiko@sntech.de, yzq@rock-chips.com, mark.rutland@arm.com, devicetree@vger.kernel.org, robh+dt@kernel.org, galak@codeaurora.org, pawel.moll@arm.com, seanpaul@chromium.org Cc: linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org, linux-rockchip@lists.infradead.org, Chris Zhong , linux-arm-kernel@lists.infradead.org List-Id: devicetree@vger.kernel.org Y29ycmVjdCB0aGUgY29kaW5nIHN0eWxlLCBhY2NvcmRpbmcgdGhlIGNoZWNrcGF0Y2ggc2NyaXB0 cwoKU2lnbmVkLW9mZi1ieTogQ2hyaXMgWmhvbmcgPHp5d0Byb2NrLWNoaXBzLmNvbT4KUmV2aWV3 ZWQtYnk6IFNlYW4gUGF1bCA8c2VhbnBhdWxAY2hyb21pdW0ub3JnPgotLS0KCkNoYW5nZXMgaW4g djY6IE5vbmUKQ2hhbmdlcyBpbiB2NTogTm9uZQpDaGFuZ2VzIGluIHY0OiBOb25lCkNoYW5nZXMg aW4gdjM6IE5vbmUKCiBkcml2ZXJzL2dwdS9kcm0vcm9ja2NoaXAvZHctbWlwaS1kc2kuYyB8IDI5 ICsrKysrKysrKysrKysrLS0tLS0tLS0tLS0tLS0tCiAxIGZpbGUgY2hhbmdlZCwgMTQgaW5zZXJ0 aW9ucygrKSwgMTUgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL3Jv Y2tjaGlwL2R3LW1pcGktZHNpLmMgYi9kcml2ZXJzL2dwdS9kcm0vcm9ja2NoaXAvZHctbWlwaS1k c2kuYwppbmRleCA0ZTc0NjgxLi44MzZjYjgzIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0v cm9ja2NoaXAvZHctbWlwaS1kc2kuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vcm9ja2NoaXAvZHct bWlwaS1kc2kuYwpAQCAtMTU3LDcgKzE1Nyw2IEBACiAjZGVmaW5lIExQUlhfVE9fQ05UKHApCQkJ KChwKSAmIDB4ZmZmZikKIAogI2RlZmluZSBEU0lfQlRBX1RPX0NOVAkJCTB4OGMKLQogI2RlZmlu ZSBEU0lfTFBDTEtfQ1RSTAkJCTB4OTQKICNkZWZpbmUgQVVUT19DTEtMQU5FX0NUUkwJCUJJVCgx KQogI2RlZmluZSBQSFlfVFhSRVFVRVNUQ0xLSFMJCUJJVCgwKQpAQCAtMjIzLDExICsyMjIsMTEg QEAKIAogI2RlZmluZSBIU0ZSRVFSQU5HRV9TRUwodmFsKQkoKCh2YWwpICYgMHgzZikgPDwgMSkK IAotI2RlZmluZSBJTlBVVF9ESVZJREVSKHZhbCkJKCh2YWwgLSAxKSAmIDB4N2YpCisjZGVmaW5l IElOUFVUX0RJVklERVIodmFsKQkoKCh2YWwpIC0gMSkgJiAweDdmKQogI2RlZmluZSBMT1dfUFJP R1JBTV9FTgkJMAogI2RlZmluZSBISUdIX1BST0dSQU1fRU4JCUJJVCg3KQotI2RlZmluZSBMT09Q X0RJVl9MT1dfU0VMKHZhbCkJKCh2YWwgLSAxKSAmIDB4MWYpCi0jZGVmaW5lIExPT1BfRElWX0hJ R0hfU0VMKHZhbCkJKCgodmFsIC0gMSkgPj4gNSkgJiAweDFmKQorI2RlZmluZSBMT09QX0RJVl9M T1dfU0VMKHZhbCkJKCgodmFsKSAtIDEpICYgMHgxZikKKyNkZWZpbmUgTE9PUF9ESVZfSElHSF9T RUwodmFsKQkoKCgodmFsKSAtIDEpID4+IDUpICYgMHgxZikKICNkZWZpbmUgUExMX0xPT1BfRElW X0VOCQlCSVQoNSkKICNkZWZpbmUgUExMX0lOUFVUX0RJVl9FTglCSVQoNCkKIApAQCAtMzY5LDYg KzM2OCw3IEBAIHN0YXRpYyBpbmxpbmUgc3RydWN0IGR3X21pcGlfZHNpICplbmNvZGVyX3RvX2Rz aShzdHJ1Y3QgZHJtX2VuY29kZXIgKmVuY29kZXIpCiB7CiAJcmV0dXJuIGNvbnRhaW5lcl9vZihl bmNvZGVyLCBzdHJ1Y3QgZHdfbWlwaV9kc2ksIGVuY29kZXIpOwogfQorCiBzdGF0aWMgaW5saW5l IHZvaWQgZHNpX3dyaXRlKHN0cnVjdCBkd19taXBpX2RzaSAqZHNpLCB1MzIgcmVnLCB1MzIgdmFs KQogewogCXdyaXRlbCh2YWwsIGRzaS0+YmFzZSArIHJlZyk7CkBAIC0zODAsNyArMzgwLDcgQEAg c3RhdGljIGlubGluZSB1MzIgZHNpX3JlYWQoc3RydWN0IGR3X21pcGlfZHNpICpkc2ksIHUzMiBy ZWcpCiB9CiAKIHN0YXRpYyB2b2lkIGR3X21pcGlfZHNpX3BoeV93cml0ZShzdHJ1Y3QgZHdfbWlw aV9kc2kgKmRzaSwgdTggdGVzdF9jb2RlLAotCQkJCSB1OCB0ZXN0X2RhdGEpCisJCQkJICB1OCB0 ZXN0X2RhdGEpCiB7CiAJLyoKIAkgKiBXaXRoIHRoZSBmYWxsaW5nIGVkZ2Ugb24gVEVTVENMSywg dGhlIFRFU1RESU5bNzowXSBzaWduYWwgY29udGVudApAQCAtNDk2LDcgKzQ5Niw2IEBAIHN0YXRp YyBpbnQgZHdfbWlwaV9kc2lfcGh5X2luaXQoc3RydWN0IGR3X21pcGlfZHNpICpkc2kpCiAJZHNp X3dyaXRlKGRzaSwgRFNJX1BIWV9SU1RaLCBQSFlfRU5GT1JDRVBMTCB8IFBIWV9FTkFCTEVDTEsg fAogCQkJCSAgICAgUEhZX1VOUlNUWiB8IFBIWV9VTlNIVVRET1dOWik7CiAKLQogCXJldCA9IHJl YWRsX3BvbGxfdGltZW91dChkc2ktPmJhc2UgKyBEU0lfUEhZX1NUQVRVUywKIAkJCQkgdmFsLCB2 YWwgJiBMT0NLLCAxMDAwLCBQSFlfU1RBVFVTX1RJTUVPVVRfVVMpOwogCWlmIChyZXQgPCAwKSB7 CkBAIC01NzEsNyArNTcwLDcgQEAgc3RhdGljIGludCBkd19taXBpX2RzaV9ob3N0X2F0dGFjaChz dHJ1Y3QgbWlwaV9kc2lfaG9zdCAqaG9zdCwKIAogCWlmIChkZXZpY2UtPmxhbmVzID4gZHNpLT5w ZGF0YS0+bWF4X2RhdGFfbGFuZXMpIHsKIAkJZGV2X2Vycihkc2ktPmRldiwgInRoZSBudW1iZXIg b2YgZGF0YSBsYW5lcygldSkgaXMgdG9vIG1hbnlcbiIsCi0JCQkJZGV2aWNlLT5sYW5lcyk7CisJ CQlkZXZpY2UtPmxhbmVzKTsKIAkJcmV0dXJuIC1FSU5WQUw7CiAJfQogCkBAIC0xMDYwLDE0ICsx MDU5LDE0IEBAIGR3X21pcGlfZHNpX2VuY29kZXJfYXRvbWljX2NoZWNrKHN0cnVjdCBkcm1fZW5j b2RlciAqZW5jb2RlciwKIAlyZXR1cm4gMDsKIH0KIAotc3RhdGljIHN0cnVjdCBkcm1fZW5jb2Rl cl9oZWxwZXJfZnVuY3MKK3N0YXRpYyBjb25zdCBzdHJ1Y3QgZHJtX2VuY29kZXJfaGVscGVyX2Z1 bmNzCiBkd19taXBpX2RzaV9lbmNvZGVyX2hlbHBlcl9mdW5jcyA9IHsKIAkuZW5hYmxlID0gZHdf bWlwaV9kc2lfZW5jb2Rlcl9lbmFibGUsCiAJLmRpc2FibGUgPSBkd19taXBpX2RzaV9lbmNvZGVy X2Rpc2FibGUsCiAJLmF0b21pY19jaGVjayA9IGR3X21pcGlfZHNpX2VuY29kZXJfYXRvbWljX2No ZWNrLAogfTsKIAotc3RhdGljIHN0cnVjdCBkcm1fZW5jb2Rlcl9mdW5jcyBkd19taXBpX2RzaV9l bmNvZGVyX2Z1bmNzID0geworc3RhdGljIGNvbnN0IHN0cnVjdCBkcm1fZW5jb2Rlcl9mdW5jcyBk d19taXBpX2RzaV9lbmNvZGVyX2Z1bmNzID0gewogCS5kZXN0cm95ID0gZHJtX2VuY29kZXJfY2xl YW51cCwKIH07CiAKQEAgLTExMDMsNyArMTEwMiw3IEBAIHN0YXRpYyB2b2lkIGR3X21pcGlfZHNp X2RybV9jb25uZWN0b3JfZGVzdHJveShzdHJ1Y3QgZHJtX2Nvbm5lY3RvciAqY29ubmVjdG9yKQog CWRybV9jb25uZWN0b3JfY2xlYW51cChjb25uZWN0b3IpOwogfQogCi1zdGF0aWMgc3RydWN0IGRy bV9jb25uZWN0b3JfZnVuY3MgZHdfbWlwaV9kc2lfYXRvbWljX2Nvbm5lY3Rvcl9mdW5jcyA9IHsK K3N0YXRpYyBjb25zdCBzdHJ1Y3QgZHJtX2Nvbm5lY3Rvcl9mdW5jcyBkd19taXBpX2RzaV9hdG9t aWNfY29ubmVjdG9yX2Z1bmNzID0gewogCS5kcG1zID0gZHJtX2F0b21pY19oZWxwZXJfY29ubmVj dG9yX2RwbXMsCiAJLmZpbGxfbW9kZXMgPSBkcm1faGVscGVyX3Byb2JlX3NpbmdsZV9jb25uZWN0 b3JfbW9kZXMsCiAJLmRlc3Ryb3kgPSBkd19taXBpX2RzaV9kcm1fY29ubmVjdG9yX2Rlc3Ryb3ks CkBAIC0xMTEzLDcgKzExMTIsNyBAQCBzdGF0aWMgc3RydWN0IGRybV9jb25uZWN0b3JfZnVuY3Mg ZHdfbWlwaV9kc2lfYXRvbWljX2Nvbm5lY3Rvcl9mdW5jcyA9IHsKIH07CiAKIHN0YXRpYyBpbnQg ZHdfbWlwaV9kc2lfcmVnaXN0ZXIoc3RydWN0IGRybV9kZXZpY2UgKmRybSwKLQkJCQkgICAgICBz dHJ1Y3QgZHdfbWlwaV9kc2kgKmRzaSkKKwkJCQlzdHJ1Y3QgZHdfbWlwaV9kc2kgKmRzaSkKIHsK IAlzdHJ1Y3QgZHJtX2VuY29kZXIgKmVuY29kZXIgPSAmZHNpLT5lbmNvZGVyOwogCXN0cnVjdCBk cm1fY29ubmVjdG9yICpjb25uZWN0b3IgPSAmZHNpLT5jb25uZWN0b3I7CkBAIC0xMTM0LDE0ICsx MTMzLDE0IEBAIHN0YXRpYyBpbnQgZHdfbWlwaV9kc2lfcmVnaXN0ZXIoc3RydWN0IGRybV9kZXZp Y2UgKmRybSwKIAlkcm1fZW5jb2Rlcl9oZWxwZXJfYWRkKCZkc2ktPmVuY29kZXIsCiAJCQkgICAg ICAgJmR3X21pcGlfZHNpX2VuY29kZXJfaGVscGVyX2Z1bmNzKTsKIAlyZXQgPSBkcm1fZW5jb2Rl cl9pbml0KGRybSwgJmRzaS0+ZW5jb2RlciwgJmR3X21pcGlfZHNpX2VuY29kZXJfZnVuY3MsCi0J CQkgRFJNX01PREVfRU5DT0RFUl9EU0ksIE5VTEwpOworCQkJICAgICAgIERSTV9NT0RFX0VOQ09E RVJfRFNJLCBOVUxMKTsKIAlpZiAocmV0KSB7CiAJCWRldl9lcnIoZGV2LCAiRmFpbGVkIHRvIGlu aXRpYWxpemUgZW5jb2RlciB3aXRoIGRybVxuIik7CiAJCXJldHVybiByZXQ7CiAJfQogCiAJZHJt X2Nvbm5lY3Rvcl9oZWxwZXJfYWRkKGNvbm5lY3RvciwKLQkJCSZkd19taXBpX2RzaV9jb25uZWN0 b3JfaGVscGVyX2Z1bmNzKTsKKwkJCQkgJmR3X21pcGlfZHNpX2Nvbm5lY3Rvcl9oZWxwZXJfZnVu Y3MpOwogCiAJZHJtX2Nvbm5lY3Rvcl9pbml0KGRybSwgJmRzaS0+Y29ubmVjdG9yLAogCQkJICAg JmR3X21pcGlfZHNpX2F0b21pY19jb25uZWN0b3JfZnVuY3MsCkBAIC0xMjE2LDcgKzEyMTUsNyBA QCBzdGF0aWMgY29uc3Qgc3RydWN0IG9mX2RldmljZV9pZCBkd19taXBpX2RzaV9kdF9pZHNbXSA9 IHsKIE1PRFVMRV9ERVZJQ0VfVEFCTEUob2YsIGR3X21pcGlfZHNpX2R0X2lkcyk7CiAKIHN0YXRp YyBpbnQgZHdfbWlwaV9kc2lfYmluZChzdHJ1Y3QgZGV2aWNlICpkZXYsIHN0cnVjdCBkZXZpY2Ug Km1hc3RlciwKLQkJCSAgICAgdm9pZCAqZGF0YSkKKwkJCSAgICB2b2lkICpkYXRhKQogewogCWNv bnN0IHN0cnVjdCBvZl9kZXZpY2VfaWQgKm9mX2lkID0KIAkJCW9mX21hdGNoX2RldmljZShkd19t aXBpX2RzaV9kdF9pZHMsIGRldik7CkBAIC0xMzMxLDcgKzEzMzAsNyBAQCBzdGF0aWMgaW50IGR3 X21pcGlfZHNpX2JpbmQoc3RydWN0IGRldmljZSAqZGV2LCBzdHJ1Y3QgZGV2aWNlICptYXN0ZXIs CiB9CiAKIHN0YXRpYyB2b2lkIGR3X21pcGlfZHNpX3VuYmluZChzdHJ1Y3QgZGV2aWNlICpkZXYs IHN0cnVjdCBkZXZpY2UgKm1hc3RlciwKLQl2b2lkICpkYXRhKQorCQkJICAgICAgIHZvaWQgKmRh dGEpCiB7CiAJc3RydWN0IGR3X21pcGlfZHNpICpkc2kgPSBkZXZfZ2V0X2RydmRhdGEoZGV2KTsK IAotLSAKMi42LjMKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fCmRyaS1kZXZlbCBtYWlsaW5nIGxpc3QKZHJpLWRldmVsQGxpc3RzLmZyZWVkZXNrdG9wLm9y ZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2RyaS1kZXZl bAo= From mboxrd@z Thu Jan 1 00:00:00 1970 From: zyw@rock-chips.com (Chris Zhong) Date: Mon, 20 Feb 2017 16:02:19 +0800 Subject: [RESEND PATCH v7 3/7] drm/rockchip/dsi: dw-mipi: correct the coding style In-Reply-To: <1487577744-2855-1-git-send-email-zyw@rock-chips.com> References: <1487577744-2855-1-git-send-email-zyw@rock-chips.com> Message-ID: <1487577744-2855-4-git-send-email-zyw@rock-chips.com> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org correct the coding style, according the checkpatch scripts Signed-off-by: Chris Zhong Reviewed-by: Sean Paul --- Changes in v6: None Changes in v5: None Changes in v4: None Changes in v3: None drivers/gpu/drm/rockchip/dw-mipi-dsi.c | 29 ++++++++++++++--------------- 1 file changed, 14 insertions(+), 15 deletions(-) diff --git a/drivers/gpu/drm/rockchip/dw-mipi-dsi.c b/drivers/gpu/drm/rockchip/dw-mipi-dsi.c index 4e74681..836cb83 100644 --- a/drivers/gpu/drm/rockchip/dw-mipi-dsi.c +++ b/drivers/gpu/drm/rockchip/dw-mipi-dsi.c @@ -157,7 +157,6 @@ #define LPRX_TO_CNT(p) ((p) & 0xffff) #define DSI_BTA_TO_CNT 0x8c - #define DSI_LPCLK_CTRL 0x94 #define AUTO_CLKLANE_CTRL BIT(1) #define PHY_TXREQUESTCLKHS BIT(0) @@ -223,11 +222,11 @@ #define HSFREQRANGE_SEL(val) (((val) & 0x3f) << 1) -#define INPUT_DIVIDER(val) ((val - 1) & 0x7f) +#define INPUT_DIVIDER(val) (((val) - 1) & 0x7f) #define LOW_PROGRAM_EN 0 #define HIGH_PROGRAM_EN BIT(7) -#define LOOP_DIV_LOW_SEL(val) ((val - 1) & 0x1f) -#define LOOP_DIV_HIGH_SEL(val) (((val - 1) >> 5) & 0x1f) +#define LOOP_DIV_LOW_SEL(val) (((val) - 1) & 0x1f) +#define LOOP_DIV_HIGH_SEL(val) ((((val) - 1) >> 5) & 0x1f) #define PLL_LOOP_DIV_EN BIT(5) #define PLL_INPUT_DIV_EN BIT(4) @@ -369,6 +368,7 @@ static inline struct dw_mipi_dsi *encoder_to_dsi(struct drm_encoder *encoder) { return container_of(encoder, struct dw_mipi_dsi, encoder); } + static inline void dsi_write(struct dw_mipi_dsi *dsi, u32 reg, u32 val) { writel(val, dsi->base + reg); @@ -380,7 +380,7 @@ static inline u32 dsi_read(struct dw_mipi_dsi *dsi, u32 reg) } static void dw_mipi_dsi_phy_write(struct dw_mipi_dsi *dsi, u8 test_code, - u8 test_data) + u8 test_data) { /* * With the falling edge on TESTCLK, the TESTDIN[7:0] signal content @@ -496,7 +496,6 @@ static int dw_mipi_dsi_phy_init(struct dw_mipi_dsi *dsi) dsi_write(dsi, DSI_PHY_RSTZ, PHY_ENFORCEPLL | PHY_ENABLECLK | PHY_UNRSTZ | PHY_UNSHUTDOWNZ); - ret = readl_poll_timeout(dsi->base + DSI_PHY_STATUS, val, val & LOCK, 1000, PHY_STATUS_TIMEOUT_US); if (ret < 0) { @@ -571,7 +570,7 @@ static int dw_mipi_dsi_host_attach(struct mipi_dsi_host *host, if (device->lanes > dsi->pdata->max_data_lanes) { dev_err(dsi->dev, "the number of data lanes(%u) is too many\n", - device->lanes); + device->lanes); return -EINVAL; } @@ -1060,14 +1059,14 @@ dw_mipi_dsi_encoder_atomic_check(struct drm_encoder *encoder, return 0; } -static struct drm_encoder_helper_funcs +static const struct drm_encoder_helper_funcs dw_mipi_dsi_encoder_helper_funcs = { .enable = dw_mipi_dsi_encoder_enable, .disable = dw_mipi_dsi_encoder_disable, .atomic_check = dw_mipi_dsi_encoder_atomic_check, }; -static struct drm_encoder_funcs dw_mipi_dsi_encoder_funcs = { +static const struct drm_encoder_funcs dw_mipi_dsi_encoder_funcs = { .destroy = drm_encoder_cleanup, }; @@ -1103,7 +1102,7 @@ static void dw_mipi_dsi_drm_connector_destroy(struct drm_connector *connector) drm_connector_cleanup(connector); } -static struct drm_connector_funcs dw_mipi_dsi_atomic_connector_funcs = { +static const struct drm_connector_funcs dw_mipi_dsi_atomic_connector_funcs = { .dpms = drm_atomic_helper_connector_dpms, .fill_modes = drm_helper_probe_single_connector_modes, .destroy = dw_mipi_dsi_drm_connector_destroy, @@ -1113,7 +1112,7 @@ static struct drm_connector_funcs dw_mipi_dsi_atomic_connector_funcs = { }; static int dw_mipi_dsi_register(struct drm_device *drm, - struct dw_mipi_dsi *dsi) + struct dw_mipi_dsi *dsi) { struct drm_encoder *encoder = &dsi->encoder; struct drm_connector *connector = &dsi->connector; @@ -1134,14 +1133,14 @@ static int dw_mipi_dsi_register(struct drm_device *drm, drm_encoder_helper_add(&dsi->encoder, &dw_mipi_dsi_encoder_helper_funcs); ret = drm_encoder_init(drm, &dsi->encoder, &dw_mipi_dsi_encoder_funcs, - DRM_MODE_ENCODER_DSI, NULL); + DRM_MODE_ENCODER_DSI, NULL); if (ret) { dev_err(dev, "Failed to initialize encoder with drm\n"); return ret; } drm_connector_helper_add(connector, - &dw_mipi_dsi_connector_helper_funcs); + &dw_mipi_dsi_connector_helper_funcs); drm_connector_init(drm, &dsi->connector, &dw_mipi_dsi_atomic_connector_funcs, @@ -1216,7 +1215,7 @@ static const struct of_device_id dw_mipi_dsi_dt_ids[] = { MODULE_DEVICE_TABLE(of, dw_mipi_dsi_dt_ids); static int dw_mipi_dsi_bind(struct device *dev, struct device *master, - void *data) + void *data) { const struct of_device_id *of_id = of_match_device(dw_mipi_dsi_dt_ids, dev); @@ -1331,7 +1330,7 @@ static int dw_mipi_dsi_bind(struct device *dev, struct device *master, } static void dw_mipi_dsi_unbind(struct device *dev, struct device *master, - void *data) + void *data) { struct dw_mipi_dsi *dsi = dev_get_drvdata(dev); -- 2.6.3