From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932123AbdJVTdI (ORCPT ); Sun, 22 Oct 2017 15:33:08 -0400 Received: from mout.web.de ([212.227.17.12]:64802 "EHLO mout.web.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751730AbdJVTdG (ORCPT ); Sun, 22 Oct 2017 15:33:06 -0400 To: dri-devel@lists.freedesktop.org, Andrzej Hajda , Archit Taneja , David Airlie , Laurent Pinchart , Maciej Purski , Rob Herring From: SF Markus Elfring Subject: [PATCH] gpu/drm/bridge/sii9234: Use common error handling code in sii9234_writebm() Cc: LKML , kernel-janitors@vger.kernel.org Message-ID: <8bb4a1d2-8876-731f-2938-8be075f4252c@users.sourceforge.net> Date: Sun, 22 Oct 2017 21:32:46 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.4.0 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Language: en-GB Content-Transfer-Encoding: 7bit X-Provags-ID: V03:K0:/KwrHVmwrpMOucwp1Clx6fStnJuoVrIBied8XNZFKaSbS3J+wTe QKxFa22MsyeXHr5DDy9PrswG+M7BLoP7SCKIMcl9H8vMmRVcDQltF/LgC90ZmZeWJdoaqJl NoBxCFSTi63B0JEvmoksCrNVpgWxJ9vrOMzVj4EZs3pdmYYymWaHWdcpCgFDHQ+1fWTkxGs X7sXMVBbdqezY5DSRjzTA== X-UI-Out-Filterresults: notjunk:1;V01:K0:FUyIiWDa+rM=:QsfG8LzmIceI+L6c5BRlj4 LhhxkxlPCrl0dzxVhpPqacnGDw6F8x8UukfyWi/u64fue9hDq1f0fa0KeZDjql3XsdrQd5uQd uLqkgZDbM5Um3ubHS/v7OD3YMzl+OgCcFzHbyvAPrA0XQ7ufKRW3ETg8bQ4lWBN0Np0K7Xms3 3cQBcluD2Bxt8f6UBmMnFvKLty48BNX5pPWVzoackW+8rbtfF3u8VIEdlU/mZi9vwR+d+DuUL vDTCQIAVaYMZJSNuOUyzL03azNNS00EfPv0CVG0Wv33YFo0pt+gWH4ZiWTywOQL0lGP+bP/Px nW6GYuyXt/vhIQpgzpT5Qctv5gH3j6h/tHESPYPTKKA8sJFyvf+sUScAs3ufdGrllEMFeQc4w f8Cof9pSVv3b/JPFtZ2vszLUF/2ocrtfqZqQli79RfUJr30nq5fL0Bcf8cdE6cPlbpYRWhYbP yLxUGoJWdWrriNeb4ojjMmkAxRPvKizlE7G2x6wmomsRuJRDROSNorslATgtkS9KXXifsW08r XVAZ67uFfltK1dJ61+4+aBABNNIUmLvtP2bMAEG+bhL+fLc/Uue2/g/zlZhHvzF57yCAUFmTu Oo/t3fmnp+6dz9wy8qfNBLd+rUH44N9eZRL0tp2HDxnwtBN3MJAUvU8Je8O7uthy61N9fe8/+ 3eE3ieez9eCJzKQYQvMO4SY3yVxwOLlLD8e/u1u0tJPnW4zlDjaGA0vWzP83DQWveP4HxKrzw NLUFSKFGJY/FWluR2wCWCoO/fVdSso6WzwZyEvS8+A3oj7osEaweAIc38N+U++0T2fNGQZhD/ aog23x1TgTnfi9D3fvcUW1XltzW1nTsRj/l7yQ3+kDeV8aP5TQ= Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Markus Elfring Date: Sun, 22 Oct 2017 21:21:44 +0200 * Add a jump target so that a bit of exception handling can be better reused at the end of this function. This issue was detected by using the Coccinelle software. * Adjust condition checks. Signed-off-by: Markus Elfring --- drivers/gpu/drm/bridge/sii9234.c | 28 ++++++++++------------------ 1 file changed, 10 insertions(+), 18 deletions(-) diff --git a/drivers/gpu/drm/bridge/sii9234.c b/drivers/gpu/drm/bridge/sii9234.c index c77000626c22..fbdacdaf485c 100644 --- a/drivers/gpu/drm/bridge/sii9234.c +++ b/drivers/gpu/drm/bridge/sii9234.c @@ -231,30 +231,22 @@ static int sii9234_writebm(struct sii9234 *ctx, int id, int offset, return ctx->i2c_error; ret = i2c_smbus_write_byte(client, offset); - if (ret < 0) { - dev_err(ctx->dev, "writebm: %4s[0x%02x] <- 0x%02x\n", - sii9234_client_name[id], offset, value); - ctx->i2c_error = ret; - return ret; - } + if (ret) + goto report_failure; ret = i2c_smbus_read_byte(client); - if (ret < 0) { - dev_err(ctx->dev, "writebm: %4s[0x%02x] <- 0x%02x\n", - sii9234_client_name[id], offset, value); - ctx->i2c_error = ret; - return ret; - } + if (ret) + goto report_failure; value = (value & mask) | (ret & ~mask); - ret = i2c_smbus_write_byte_data(client, offset, value); - if (ret < 0) { - dev_err(ctx->dev, "writebm: %4s[0x%02x] <- 0x%02x\n", - sii9234_client_name[id], offset, value); - ctx->i2c_error = ret; - } + if (!ret) + return 0; +report_failure: + dev_err(ctx->dev, "writebm: %4s[0x%02x] <- 0x%02x\n", + sii9234_client_name[id], offset, value); + ctx->i2c_error = ret; return ret; } -- 2.14.2