From mboxrd@z Thu Jan 1 00:00:00 1970 From: moinejf@free.fr (Jean-Francois Moine) Date: Thu, 9 Jan 2014 11:58:11 +0100 Subject: [PATCH v2 3/28] drm/i2c: tda998x: code cleanup Message-ID: <20140109115811.779554cb@armhf> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org Signed-off-by: Jean-Francois Moine --- drivers/gpu/drm/i2c/tda998x_drv.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/drivers/gpu/drm/i2c/tda998x_drv.c b/drivers/gpu/drm/i2c/tda998x_drv.c index 603f716..cd7ac58 100644 --- a/drivers/gpu/drm/i2c/tda998x_drv.c +++ b/drivers/gpu/drm/i2c/tda998x_drv.c @@ -335,7 +335,7 @@ cec_write(struct tda998x_priv *priv, uint16_t addr, uint8_t val) uint8_t buf[] = {addr, val}; int ret; - ret = i2c_master_send(client, buf, ARRAY_SIZE(buf)); + ret = i2c_master_send(client, buf, sizeof buf); if (ret < 0) dev_err(&client->dev, "Error %d writing to cec:0x%x\n", ret, addr); } @@ -372,7 +372,8 @@ set_page(struct tda998x_priv *priv, uint16_t reg) }; int ret = i2c_master_send(client, buf, sizeof(buf)); if (ret < 0) { - dev_err(&client->dev, "Error %d writing to REG_CURPAGE\n", ret); + dev_err(&client->dev, "setpage %04x err %d\n", + reg, ret); return ret; } @@ -449,7 +450,7 @@ reg_write(struct tda998x_priv *priv, uint16_t reg, uint8_t val) if (ret < 0) return; - ret = i2c_master_send(client, buf, ARRAY_SIZE(buf)); + ret = i2c_master_send(client, buf, sizeof buf); if (ret < 0) dev_err(&client->dev, "Error %d writing to 0x%x\n", ret, reg); } @@ -465,7 +466,7 @@ reg_write16(struct tda998x_priv *priv, uint16_t reg, uint16_t val) if (ret < 0) return; - ret = i2c_master_send(client, buf, ARRAY_SIZE(buf)); + ret = i2c_master_send(client, buf, sizeof buf); if (ret < 0) dev_err(&client->dev, "Error %d writing to 0x%x\n", ret, reg); } @@ -998,7 +999,7 @@ read_edid_block(struct drm_encoder *encoder, uint8_t *buf, int blk) ret = reg_read_range(priv, REG_EDID_DATA_0, buf, EDID_LENGTH); if (ret != EDID_LENGTH) { - dev_err(encoder->dev->dev, "failed to read edid block %d: %d", + dev_err(encoder->dev->dev, "failed to read edid block %d: %d\n", blk, ret); return ret; } @@ -1012,7 +1013,7 @@ static uint8_t * do_get_edid(struct drm_encoder *encoder) { struct tda998x_priv *priv = to_tda998x_priv(encoder); - int j = 0, valid_extensions = 0; + int j, valid_extensions = 0; uint8_t *block, *new; bool print_bad_edid = drm_debug & DRM_UT_KMS; -- Ken ar c'henta? | ** Breizh ha Linux atav! ** Jef | http://moinejf.free.fr/ From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jean-Francois Moine Subject: [PATCH v2 3/28] drm/i2c: tda998x: code cleanup Date: Thu, 9 Jan 2014 11:58:11 +0100 Message-ID: <20140109115811.779554cb@armhf> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from smtp1-g21.free.fr (smtp1-g21.free.fr [212.27.42.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 02601FBCC1 for ; Thu, 9 Jan 2014 03:09:26 -0800 (PST) List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: dri-devel-bounces@lists.freedesktop.org Errors-To: dri-devel-bounces@lists.freedesktop.org To: dri-devel@lists.freedesktop.org Cc: linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org List-Id: dri-devel@lists.freedesktop.org ClNpZ25lZC1vZmYtYnk6IEplYW4tRnJhbmNvaXMgTW9pbmUgPG1vaW5lamZAZnJlZS5mcj4KLS0t CiBkcml2ZXJzL2dwdS9kcm0vaTJjL3RkYTk5OHhfZHJ2LmMgIHwgMTMgKysrKysrKy0tLS0tLQog MSBmaWxlIGNoYW5nZWQsIDcgaW5zZXJ0aW9ucygrKSwgNiBkZWxldGlvbnMoLSkKCmRpZmYgLS1n aXQgYS9kcml2ZXJzL2dwdS9kcm0vaTJjL3RkYTk5OHhfZHJ2LmMgYi9kcml2ZXJzL2dwdS9kcm0v aTJjL3RkYTk5OHhfZHJ2LmMKaW5kZXggNjAzZjcxNi4uY2Q3YWM1OCAxMDA2NDQKLS0tIGEvZHJp dmVycy9ncHUvZHJtL2kyYy90ZGE5OTh4X2Rydi5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pMmMv dGRhOTk4eF9kcnYuYwpAQCAtMzM1LDcgKzMzNSw3IEBAIGNlY193cml0ZShzdHJ1Y3QgdGRhOTk4 eF9wcml2ICpwcml2LCB1aW50MTZfdCBhZGRyLCB1aW50OF90IHZhbCkKIAl1aW50OF90IGJ1Zltd ID0ge2FkZHIsIHZhbH07CiAJaW50IHJldDsKIAotCXJldCA9IGkyY19tYXN0ZXJfc2VuZChjbGll bnQsIGJ1ZiwgQVJSQVlfU0laRShidWYpKTsKKwlyZXQgPSBpMmNfbWFzdGVyX3NlbmQoY2xpZW50 LCBidWYsIHNpemVvZiBidWYpOwogCWlmIChyZXQgPCAwKQogCQlkZXZfZXJyKCZjbGllbnQtPmRl diwgIkVycm9yICVkIHdyaXRpbmcgdG8gY2VjOjB4JXhcbiIsIHJldCwgYWRkcik7CiB9CkBAIC0z NzIsNyArMzcyLDggQEAgc2V0X3BhZ2Uoc3RydWN0IHRkYTk5OHhfcHJpdiAqcHJpdiwgdWludDE2 X3QgcmVnKQogCQl9OwogCQlpbnQgcmV0ID0gaTJjX21hc3Rlcl9zZW5kKGNsaWVudCwgYnVmLCBz aXplb2YoYnVmKSk7CiAJCWlmIChyZXQgPCAwKSB7Ci0JCQlkZXZfZXJyKCZjbGllbnQtPmRldiwg IkVycm9yICVkIHdyaXRpbmcgdG8gUkVHX0NVUlBBR0VcbiIsIHJldCk7CisJCQlkZXZfZXJyKCZj bGllbnQtPmRldiwgInNldHBhZ2UgJTA0eCBlcnIgJWRcbiIsCisJCQkJCXJlZywgcmV0KTsKIAkJ CXJldHVybiByZXQ7CiAJCX0KIApAQCAtNDQ5LDcgKzQ1MCw3IEBAIHJlZ193cml0ZShzdHJ1Y3Qg dGRhOTk4eF9wcml2ICpwcml2LCB1aW50MTZfdCByZWcsIHVpbnQ4X3QgdmFsKQogCWlmIChyZXQg PCAwKQogCQlyZXR1cm47CiAKLQlyZXQgPSBpMmNfbWFzdGVyX3NlbmQoY2xpZW50LCBidWYsIEFS UkFZX1NJWkUoYnVmKSk7CisJcmV0ID0gaTJjX21hc3Rlcl9zZW5kKGNsaWVudCwgYnVmLCBzaXpl b2YgYnVmKTsKIAlpZiAocmV0IDwgMCkKIAkJZGV2X2VycigmY2xpZW50LT5kZXYsICJFcnJvciAl ZCB3cml0aW5nIHRvIDB4JXhcbiIsIHJldCwgcmVnKTsKIH0KQEAgLTQ2NSw3ICs0NjYsNyBAQCBy ZWdfd3JpdGUxNihzdHJ1Y3QgdGRhOTk4eF9wcml2ICpwcml2LCB1aW50MTZfdCByZWcsIHVpbnQx Nl90IHZhbCkKIAlpZiAocmV0IDwgMCkKIAkJcmV0dXJuOwogCi0JcmV0ID0gaTJjX21hc3Rlcl9z ZW5kKGNsaWVudCwgYnVmLCBBUlJBWV9TSVpFKGJ1ZikpOworCXJldCA9IGkyY19tYXN0ZXJfc2Vu ZChjbGllbnQsIGJ1Ziwgc2l6ZW9mIGJ1Zik7CiAJaWYgKHJldCA8IDApCiAJCWRldl9lcnIoJmNs aWVudC0+ZGV2LCAiRXJyb3IgJWQgd3JpdGluZyB0byAweCV4XG4iLCByZXQsIHJlZyk7CiB9CkBA IC05OTgsNyArOTk5LDcgQEAgcmVhZF9lZGlkX2Jsb2NrKHN0cnVjdCBkcm1fZW5jb2RlciAqZW5j b2RlciwgdWludDhfdCAqYnVmLCBpbnQgYmxrKQogCiAJcmV0ID0gcmVnX3JlYWRfcmFuZ2UocHJp diwgUkVHX0VESURfREFUQV8wLCBidWYsIEVESURfTEVOR1RIKTsKIAlpZiAocmV0ICE9IEVESURf TEVOR1RIKSB7Ci0JCWRldl9lcnIoZW5jb2Rlci0+ZGV2LT5kZXYsICJmYWlsZWQgdG8gcmVhZCBl ZGlkIGJsb2NrICVkOiAlZCIsCisJCWRldl9lcnIoZW5jb2Rlci0+ZGV2LT5kZXYsICJmYWlsZWQg dG8gcmVhZCBlZGlkIGJsb2NrICVkOiAlZFxuIiwKIAkJCQlibGssIHJldCk7CiAJCXJldHVybiBy ZXQ7CiAJfQpAQCAtMTAxMiw3ICsxMDEzLDcgQEAgc3RhdGljIHVpbnQ4X3QgKgogZG9fZ2V0X2Vk aWQoc3RydWN0IGRybV9lbmNvZGVyICplbmNvZGVyKQogewogCXN0cnVjdCB0ZGE5OTh4X3ByaXYg KnByaXYgPSB0b190ZGE5OTh4X3ByaXYoZW5jb2Rlcik7Ci0JaW50IGogPSAwLCB2YWxpZF9leHRl bnNpb25zID0gMDsKKwlpbnQgaiwgdmFsaWRfZXh0ZW5zaW9ucyA9IDA7CiAJdWludDhfdCAqYmxv Y2ssICpuZXc7CiAJYm9vbCBwcmludF9iYWRfZWRpZCA9IGRybV9kZWJ1ZyAmIERSTV9VVF9LTVM7 CiAKCi0tIApLZW4gYXIgYydoZW50YcOxCXwJICAgICAgKiogQnJlaXpoIGhhIExpbnV4IGF0YXYh ICoqCkplZgkJfAkJaHR0cDovL21vaW5lamYuZnJlZS5mci8KX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX18KZHJpLWRldmVsIG1haWxpbmcgbGlzdApkcmktZGV2 ZWxAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHA6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFp bG1hbi9saXN0aW5mby9kcmktZGV2ZWwK From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754630AbaAILJp (ORCPT ); Thu, 9 Jan 2014 06:09:45 -0500 Received: from smtp1-g21.free.fr ([212.27.42.1]:57487 "EHLO smtp1-g21.free.fr" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754191AbaAILJ2 convert rfc822-to-8bit (ORCPT ); Thu, 9 Jan 2014 06:09:28 -0500 Date: Thu, 9 Jan 2014 11:58:11 +0100 From: Jean-Francois Moine To: dri-devel@lists.freedesktop.org Cc: Dave Airlie , Rob Clark , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH v2 3/28] drm/i2c: tda998x: code cleanup Message-ID: <20140109115811.779554cb@armhf> X-Mailer: Claws Mail 3.9.3 (GTK+ 2.24.22; arm-unknown-linux-gnueabihf) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8BIT Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Signed-off-by: Jean-Francois Moine --- drivers/gpu/drm/i2c/tda998x_drv.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/drivers/gpu/drm/i2c/tda998x_drv.c b/drivers/gpu/drm/i2c/tda998x_drv.c index 603f716..cd7ac58 100644 --- a/drivers/gpu/drm/i2c/tda998x_drv.c +++ b/drivers/gpu/drm/i2c/tda998x_drv.c @@ -335,7 +335,7 @@ cec_write(struct tda998x_priv *priv, uint16_t addr, uint8_t val) uint8_t buf[] = {addr, val}; int ret; - ret = i2c_master_send(client, buf, ARRAY_SIZE(buf)); + ret = i2c_master_send(client, buf, sizeof buf); if (ret < 0) dev_err(&client->dev, "Error %d writing to cec:0x%x\n", ret, addr); } @@ -372,7 +372,8 @@ set_page(struct tda998x_priv *priv, uint16_t reg) }; int ret = i2c_master_send(client, buf, sizeof(buf)); if (ret < 0) { - dev_err(&client->dev, "Error %d writing to REG_CURPAGE\n", ret); + dev_err(&client->dev, "setpage %04x err %d\n", + reg, ret); return ret; } @@ -449,7 +450,7 @@ reg_write(struct tda998x_priv *priv, uint16_t reg, uint8_t val) if (ret < 0) return; - ret = i2c_master_send(client, buf, ARRAY_SIZE(buf)); + ret = i2c_master_send(client, buf, sizeof buf); if (ret < 0) dev_err(&client->dev, "Error %d writing to 0x%x\n", ret, reg); } @@ -465,7 +466,7 @@ reg_write16(struct tda998x_priv *priv, uint16_t reg, uint16_t val) if (ret < 0) return; - ret = i2c_master_send(client, buf, ARRAY_SIZE(buf)); + ret = i2c_master_send(client, buf, sizeof buf); if (ret < 0) dev_err(&client->dev, "Error %d writing to 0x%x\n", ret, reg); } @@ -998,7 +999,7 @@ read_edid_block(struct drm_encoder *encoder, uint8_t *buf, int blk) ret = reg_read_range(priv, REG_EDID_DATA_0, buf, EDID_LENGTH); if (ret != EDID_LENGTH) { - dev_err(encoder->dev->dev, "failed to read edid block %d: %d", + dev_err(encoder->dev->dev, "failed to read edid block %d: %d\n", blk, ret); return ret; } @@ -1012,7 +1013,7 @@ static uint8_t * do_get_edid(struct drm_encoder *encoder) { struct tda998x_priv *priv = to_tda998x_priv(encoder); - int j = 0, valid_extensions = 0; + int j, valid_extensions = 0; uint8_t *block, *new; bool print_bad_edid = drm_debug & DRM_UT_KMS; -- Ken ar c'hentañ | ** Breizh ha Linux atav! ** Jef | http://moinejf.free.fr/