From patchwork Tue Nov 1 15:09:46 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Shevchenko X-Patchwork-Id: 621170 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id C1193C4332F for ; Tue, 1 Nov 2022 15:14:17 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231330AbiKAPOP (ORCPT ); Tue, 1 Nov 2022 11:14:15 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36200 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231166AbiKAPN5 (ORCPT ); Tue, 1 Nov 2022 11:13:57 -0400 Received: from mga05.intel.com (mga05.intel.com [192.55.52.43]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8C2631EC5E; Tue, 1 Nov 2022 08:09:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1667315374; x=1698851374; h=from:to:cc:subject:date:message-id:mime-version: content-transfer-encoding; bh=s75q2MsgxsQuSoRbKCZULbXrGHbPl+xDbnix/pI6B6E=; b=MUkxF3f57Xvt82P/+U5quBLfEzT08ERs6YDzNbxKxNLWbRZK6Q8TrCzE 5MScQqT4NJj7/dYyXhisP4nIvCpWA+CgCq+8JaxIG99Z7vsrPgj+Wm7RK psQEcreM3fVXMaAd8RpVxn+pw0eJyP8uHyOaWxSHyF6xMVF9Dink7Qad0 kfHX96WOTUuJ1LGKl2UCGkbTw1UQqBAbF7KexGf31r8aksFCmbTDOZVtJ rYW8sg1xe1v6KFidp0dI9ujWAuTn8RLt8gG/sL0yuQsfe4jjbLhnNE6T2 qsQotO+NfRv0kY8oNofber+/bn055/ZFwp2yZDaZs2DnY8caOZaC+YTSc g==; X-IronPort-AV: E=McAfee;i="6500,9779,10518"; a="395468737" X-IronPort-AV: E=Sophos;i="5.95,231,1661842800"; d="scan'208";a="395468737" Received: from orsmga001.jf.intel.com ([10.7.209.18]) by fmsmga105.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 01 Nov 2022 08:09:31 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6500,9779,10518"; a="667221094" X-IronPort-AV: E=Sophos;i="5.95,231,1661842800"; d="scan'208";a="667221094" Received: from black.fi.intel.com ([10.237.72.28]) by orsmga001.jf.intel.com with ESMTP; 01 Nov 2022 08:09:29 -0700 Received: by black.fi.intel.com (Postfix, from userid 1003) id 5620DF7; Tue, 1 Nov 2022 17:09:52 +0200 (EET) From: Andy Shevchenko To: Javier Martinez Canillas , linux-fbdev@vger.kernel.org, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org Cc: Helge Deller , Andy Shevchenko Subject: [PATCH v1 1/2] fbdev: ssd1307fb: Drop optional dependency Date: Tue, 1 Nov 2022 17:09:46 +0200 Message-Id: <20221101150947.67377-1-andriy.shevchenko@linux.intel.com> X-Mailer: git-send-email 2.35.1 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-fbdev@vger.kernel.org Only a single out of three devices need a PWM, so from driver it's optional. Moreover it's a single driver in the entire kernel that currently selects PWM. Unfortunately this selection is a root cause of the circular dependencies when we want to enable optional PWM for some other drivers that select GPIOLIB. Fixes: a2ed00da5047 ("drivers/video: add support for the Solomon SSD1307 OLED Controller") Signed-off-by: Andy Shevchenko --- drivers/video/fbdev/Kconfig | 1 - 1 file changed, 1 deletion(-) diff --git a/drivers/video/fbdev/Kconfig b/drivers/video/fbdev/Kconfig index a98987aa2784..b88d8bfe992e 100644 --- a/drivers/video/fbdev/Kconfig +++ b/drivers/video/fbdev/Kconfig @@ -2218,7 +2218,6 @@ config FB_SSD1307 select FB_SYS_COPYAREA select FB_SYS_IMAGEBLIT select FB_DEFERRED_IO - select PWM select FB_BACKLIGHT help This driver implements support for the Solomon SSD1307 From patchwork Tue Nov 1 15:09:47 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Shevchenko X-Patchwork-Id: 620712 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id C2DC2C433FE for ; Tue, 1 Nov 2022 15:14:12 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230251AbiKAPOL (ORCPT ); Tue, 1 Nov 2022 11:14:11 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36728 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230442AbiKAPNz (ORCPT ); Tue, 1 Nov 2022 11:13:55 -0400 Received: from mga05.intel.com (mga05.intel.com [192.55.52.43]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9B35A1F9FB; Tue, 1 Nov 2022 08:09:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1667315371; x=1698851371; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=ak/4T+4EA30gwIfd/EobbLy7FhELRXx6beNhV222/eY=; b=MjqRdx90Blmf/E8VlqBSK5+63Ko/vsPuSuOK8b07rhYzK7j4Sldql67u q9lzSxTJz7TEEMwyyoCO1ytVe4t93djNiV17mB7EtIZLQaq/2s2JJ/n6j 9zXistURKbCoqyazR3vkat1bS5CCkBfD3AlbFRAjHsWzFVHqZz3yM5shL dyXMbvYzhesHdwD7cX8enBPsAXEauu+Sr/6k20p+P6NOU89lWRliXAtc8 hvc1tf8J4DSx8KCGgBMlVX1ZITdu74+9ZHDNcA8xBJibS8REGF+c9q2iE vDXPIaX4Xn6niBaEjaScAHVZLjnLI70gEjzUvpyXSd1tkbMl7IWzbKGaa g==; X-IronPort-AV: E=McAfee;i="6500,9779,10518"; a="395468736" X-IronPort-AV: E=Sophos;i="5.95,231,1661842800"; d="scan'208";a="395468736" Received: from orsmga001.jf.intel.com ([10.7.209.18]) by fmsmga105.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 01 Nov 2022 08:09:31 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6500,9779,10518"; a="667221091" X-IronPort-AV: E=Sophos;i="5.95,231,1661842800"; d="scan'208";a="667221091" Received: from black.fi.intel.com ([10.237.72.28]) by orsmga001.jf.intel.com with ESMTP; 01 Nov 2022 08:09:29 -0700 Received: by black.fi.intel.com (Postfix, from userid 1003) id 61770D0; Tue, 1 Nov 2022 17:09:52 +0200 (EET) From: Andy Shevchenko To: Javier Martinez Canillas , linux-fbdev@vger.kernel.org, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org Cc: Helge Deller , Andy Shevchenko Subject: [PATCH v1 2/2] fbdev: ssd1307fb: Drop duplicate NULL checks for PWM APIs Date: Tue, 1 Nov 2022 17:09:47 +0200 Message-Id: <20221101150947.67377-2-andriy.shevchenko@linux.intel.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20221101150947.67377-1-andriy.shevchenko@linux.intel.com> References: <20221101150947.67377-1-andriy.shevchenko@linux.intel.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-fbdev@vger.kernel.org pwm_disable() and pwm_put() are NULL-aware, no need to duplicate the check in the caller. Signed-off-by: Andy Shevchenko --- drivers/video/fbdev/ssd1307fb.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/drivers/video/fbdev/ssd1307fb.c b/drivers/video/fbdev/ssd1307fb.c index 5c891aa00d59..046b9990d27c 100644 --- a/drivers/video/fbdev/ssd1307fb.c +++ b/drivers/video/fbdev/ssd1307fb.c @@ -803,10 +803,8 @@ static int ssd1307fb_probe(struct i2c_client *client) bl_init_error: unregister_framebuffer(info); panel_init_error: - if (par->device_info->need_pwm) { - pwm_disable(par->pwm); - pwm_put(par->pwm); - } + pwm_disable(par->pwm); + pwm_put(par->pwm); regulator_enable_error: if (par->vbat_reg) regulator_disable(par->vbat_reg); @@ -827,10 +825,8 @@ static void ssd1307fb_remove(struct i2c_client *client) backlight_device_unregister(info->bl_dev); unregister_framebuffer(info); - if (par->device_info->need_pwm) { - pwm_disable(par->pwm); - pwm_put(par->pwm); - } + pwm_disable(par->pwm); + pwm_put(par->pwm); if (par->vbat_reg) regulator_disable(par->vbat_reg); fb_deferred_io_cleanup(info);