Received: by 2002:a05:6a10:f3d0:0:0:0:0 with SMTP id a16csp463872pxv; Wed, 14 Jul 2021 08:00:05 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzBIo4V0fBJs9NlmASNlQ0qfN3C5zkHbP5BFrsxxJxjBRGUKL0LCZ/SamNUYA+FHTSM8DSi X-Received: by 2002:a02:a797:: with SMTP id e23mr9319485jaj.121.1626274805823; Wed, 14 Jul 2021 08:00:05 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1626274805; cv=none; d=google.com; s=arc-20160816; b=hLswqb4ulRUas/d8vWl//bblNEGl83c+scklQ7t38W5kLwuuVpG63vl9wKeHkby31l 8e9AF/2xTb44x658quc4M80X40UOwwFM8QQ7qEDDzP89XLAolDmk1NQlbbyKjvdmUdlc O3cvTM8kdrtLkFAI479ZQXj/AuikHKpX4jBIk49w6GXsWf1btmum4AM+TYt9ujhRRPaw CQVBygNeb+0t3CZcRdjVkbZP7qYNo8qzqoLcYjy+DXhs8HU1Dd5psbxJprk6UZeYnGNz sVWo8CaMUBrZJG33seQ5FLeqQvPb7X15JxgYkrU6GunTx6kTL/9A4k8GFOK7OapERGO4 vEbg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from; bh=72k0FkXRO0tD06uzRcFoeOk8CAhGCBFymKiTlCX086U=; b=T/WALR3PRijqqRMwoQUey8R9K1PTq4d2av08vgdZ15X9EvNtE+VC7lPxr5lUJUofmT RIZXlHryKZ06Hd6Eg6gn4PdyNbchHVIM5faHtsSMaVsy5VtIlz9xz38DOci2N6crmNGR FLOMDkBuTlMOlXph/9Ri1R6n+jQA8Scym8CTwYg9VlRlgldei6YUZm9kMgl8VMKR9vta dNAoTSwqJy2WXG7pvAOPwKKCQWXtptVrQQenCB+VmiCWXK4w34bMaHOX3xI5Nz7EW1hp RKgCgJXbkUcO5Opr24UldgW7igaHJ2wXIphqe6y7D/webqN6IAufTS7aEByI+md0qej7 8sMw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id w132si2754918jab.61.2021.07.14.07.59.52; Wed, 14 Jul 2021 08:00:05 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S239559AbhGNPBJ (ORCPT + 99 others); Wed, 14 Jul 2021 11:01:09 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39254 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232378AbhGNPBF (ORCPT ); Wed, 14 Jul 2021 11:01:05 -0400 Received: from andre.telenet-ops.be (andre.telenet-ops.be [IPv6:2a02:1800:120:4::f00:15]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D66ACC0613DC for ; Wed, 14 Jul 2021 07:58:12 -0700 (PDT) Received: from ramsan.of.borg ([IPv6:2a02:1810:ac12:ed10:bcf3:b2b1:dff6:480b]) by andre.telenet-ops.be with bizsmtp id V2yA2500S4sai0K012yA1C; Wed, 14 Jul 2021 16:58:11 +0200 Received: from rox.of.borg ([192.168.97.57]) by ramsan.of.borg with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.93) (envelope-from ) id 1m3gKw-001AEk-Ka; Wed, 14 Jul 2021 16:58:10 +0200 Received: from geert by rox.of.borg with local (Exim 4.93) (envelope-from ) id 1m3gKv-00AcNJ-UM; Wed, 14 Jul 2021 16:58:09 +0200 From: Geert Uytterhoeven To: David Airlie , Daniel Vetter , Maxime Ripard Cc: linux-fbdev@vger.kernel.org, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, Geert Uytterhoeven Subject: [PATCH resend 3/5] video: fbdev: ssd1307fb: Extract ssd1307fb_set_address_range() Date: Wed, 14 Jul 2021 16:58:02 +0200 Message-Id: <20210714145804.2530727-4-geert@linux-m68k.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210714145804.2530727-1-geert@linux-m68k.org> References: <20210714145804.2530727-1-geert@linux-m68k.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Extract the code to set the column and page ranges into a helper function. Signed-off-by: Geert Uytterhoeven --- drivers/video/fbdev/ssd1307fb.c | 61 +++++++++++++++++++-------------- 1 file changed, 36 insertions(+), 25 deletions(-) diff --git a/drivers/video/fbdev/ssd1307fb.c b/drivers/video/fbdev/ssd1307fb.c index 6d7bd025bca1a175..cfa27ea0feab4f01 100644 --- a/drivers/video/fbdev/ssd1307fb.c +++ b/drivers/video/fbdev/ssd1307fb.c @@ -152,6 +152,38 @@ static inline int ssd1307fb_write_cmd(struct i2c_client *client, u8 cmd) return ret; } +static int ssd1307fb_set_address_range(struct ssd1307fb_par *par, u8 col_start, + u8 cols, u8 page_start, u8 pages) +{ + u8 col_end = col_start + cols - 1; + u8 page_end = page_start + pages - 1; + int ret; + + /* Set column range */ + ret = ssd1307fb_write_cmd(par->client, SSD1307FB_SET_COL_RANGE); + if (ret < 0) + return ret; + + ret = ssd1307fb_write_cmd(par->client, col_start); + if (ret < 0) + return ret; + + ret = ssd1307fb_write_cmd(par->client, col_end); + if (ret < 0) + return ret; + + /* Set page range */ + ret = ssd1307fb_write_cmd(par->client, SSD1307FB_SET_PAGE_RANGE); + if (ret < 0) + return ret; + + ret = ssd1307fb_write_cmd(par->client, page_start); + if (ret < 0) + return ret; + + return ssd1307fb_write_cmd(par->client, page_end); +} + static int ssd1307fb_update_display(struct ssd1307fb_par *par) { struct ssd1307fb_array *array; @@ -461,31 +493,10 @@ static int ssd1307fb_init(struct ssd1307fb_par *par) if (ret < 0) return ret; - /* Set column range */ - ret = ssd1307fb_write_cmd(par->client, SSD1307FB_SET_COL_RANGE); - if (ret < 0) - return ret; - - ret = ssd1307fb_write_cmd(par->client, par->col_offset); - if (ret < 0) - return ret; - - ret = ssd1307fb_write_cmd(par->client, par->col_offset + par->width - 1); - if (ret < 0) - return ret; - - /* Set page range */ - ret = ssd1307fb_write_cmd(par->client, SSD1307FB_SET_PAGE_RANGE); - if (ret < 0) - return ret; - - ret = ssd1307fb_write_cmd(par->client, par->page_offset); - if (ret < 0) - return ret; - - ret = ssd1307fb_write_cmd(par->client, - par->page_offset + - DIV_ROUND_UP(par->height, 8) - 1); + /* Set column and page range */ + ret = ssd1307fb_set_address_range(par, par->col_offset, par->width, + par->page_offset, + DIV_ROUND_UP(par->height, 8)); if (ret < 0) return ret; -- 2.25.1