From patchwork Thu Feb 8 18:24:46 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Shevchenko X-Patchwork-Id: 13550277 Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.13]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 3C39D1CF91; Thu, 8 Feb 2024 18:32:34 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=192.198.163.13 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707417155; cv=none; b=sJnFi9o/Nhd5hF6Cs5ZdD3gB9QsfwTxy2IkSrz+UAOO7uI+8WNdi7+aobivbsNbyQ7SW0v+X/zvRPG5yYuvbou+vjq31xfYVyj85JkFyBMnAajvL5ztZkVm1OqjXFEoP2TKqiw9s3rWsdf2NTQ92X01sfaAFCAZsAeiRX6gtVHg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707417155; c=relaxed/simple; bh=8InsWry7BortGoJkrl/sU2aGiKY8qEehwzBkYvlwt+s=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=JJ2d6NlQZS0hNWj51o1K7soxxaqvftAabRJBZ66+xOSsPUtGqKWJZX82bXnc5S3KH676UBPDdZZxJ3qWnLkjSthoFiEGDX9ldT8SvuYKI/pNw/1V1H7dZvNs6EIPAsUmj47jHJ6dRFpJzmyYyqar0AwSmt2ISV8ZuZ978eEvMtI= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.intel.com; spf=none smtp.mailfrom=linux.intel.com; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b=ZBGom4Ld; arc=none smtp.client-ip=192.198.163.13 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.intel.com Authentication-Results: smtp.subspace.kernel.org; spf=none smtp.mailfrom=linux.intel.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b="ZBGom4Ld" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1707417154; x=1738953154; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=8InsWry7BortGoJkrl/sU2aGiKY8qEehwzBkYvlwt+s=; b=ZBGom4LdhxqIbGb0HnVq8tlWRlUfzMCoENLFy7IvXWNrQWkM5+roTa2i wZYRjIPM6NEhj7PdsuhgBtFL4+lxAGfjSxyxUQx7WK5g272q6NJnIjgFq C4yTeywywj5VuMm7NSrzZPXEkOXe0WP1cEQmp6r57/FWkRTyjKALfhVmu LU0BPG60VzWsUFhT4OPc7/9xDMsJ39x08hjRDhSPBDfbAZXESOyLZn9yF 12/8vST83XtKt5VLdniEjh+eoSy6sI8j/yhkYAnCHhcx8im7BEEvEteb9 NMtNZx+FfXh+/H7FPfATEss1hgcrDKJBJpVs822o4KsXRJUXG2Jaizyus Q==; X-IronPort-AV: E=McAfee;i="6600,9927,10978"; a="4268805" X-IronPort-AV: E=Sophos;i="6.05,254,1701158400"; d="scan'208";a="4268805" Received: from orsmga001.jf.intel.com ([10.7.209.18]) by fmvoesa107.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 08 Feb 2024 10:32:30 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10978"; a="824917166" X-IronPort-AV: E=Sophos;i="6.05,254,1701158400"; d="scan'208";a="824917166" Received: from black.fi.intel.com ([10.237.72.28]) by orsmga001.jf.intel.com with ESMTP; 08 Feb 2024 10:32:27 -0800 Received: by black.fi.intel.com (Postfix, from userid 1003) id C95C31458; Thu, 8 Feb 2024 20:26:09 +0200 (EET) From: Andy Shevchenko To: Daniel Thompson , Flavio Suligoi , Andy Shevchenko , dri-devel@lists.freedesktop.org, linux-fbdev@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Lee Jones , Jingoo Han , Helge Deller Subject: [PATCH v3 1/3] backlight: mp3309c: Make use of device properties Date: Thu, 8 Feb 2024 20:24:46 +0200 Message-ID: <20240208182608.2224191-2-andriy.shevchenko@linux.intel.com> X-Mailer: git-send-email 2.43.0.rc1.1.gbec44491f096 In-Reply-To: <20240208182608.2224191-1-andriy.shevchenko@linux.intel.com> References: <20240208182608.2224191-1-andriy.shevchenko@linux.intel.com> Precedence: bulk X-Mailing-List: linux-fbdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Convert the module to be property provider agnostic and allow it to be used on non-OF platforms. Add mod_devicetable.h include. Tested-by: Flavio Suligoi Reviewed-by: Daniel Thompson Signed-off-by: Andy Shevchenko --- drivers/video/backlight/mp3309c.c | 44 +++++++++++++------------------ 1 file changed, 18 insertions(+), 26 deletions(-) diff --git a/drivers/video/backlight/mp3309c.c b/drivers/video/backlight/mp3309c.c index b0d9aef6942b..397f35dafc5e 100644 --- a/drivers/video/backlight/mp3309c.c +++ b/drivers/video/backlight/mp3309c.c @@ -15,6 +15,8 @@ #include #include #include +#include +#include #include #include @@ -199,18 +201,15 @@ static const struct backlight_ops mp3309c_bl_ops = { .update_status = mp3309c_bl_update_status, }; -static int pm3309c_parse_dt_node(struct mp3309c_chip *chip, - struct mp3309c_platform_data *pdata) +static int mp3309c_parse_fwnode(struct mp3309c_chip *chip, + struct mp3309c_platform_data *pdata) { - struct device_node *node = chip->dev->of_node; - struct property *prop_pwms; - struct property *prop_levels = NULL; - int length = 0; int ret, i; unsigned int num_levels, tmp_value; + struct device *dev = chip->dev; - if (!node) { - dev_err(chip->dev, "failed to get DT node\n"); + if (!dev_fwnode(dev)) { + dev_err(dev, "failed to get firmware node\n"); return -ENODEV; } @@ -224,8 +223,7 @@ static int pm3309c_parse_dt_node(struct mp3309c_chip *chip, * found in the backlight node, the mode switches to PWM mode. */ pdata->dimming_mode = DIMMING_ANALOG_I2C; - prop_pwms = of_find_property(node, "pwms", &length); - if (prop_pwms) { + if (device_property_present(dev, "pwms")) { chip->pwmd = devm_pwm_get(chip->dev, NULL); if (IS_ERR(chip->pwmd)) return dev_err_probe(chip->dev, PTR_ERR(chip->pwmd), @@ -257,11 +255,9 @@ static int pm3309c_parse_dt_node(struct mp3309c_chip *chip, /* * PWM control mode: check for brightness level in DT */ - prop_levels = of_find_property(node, "brightness-levels", - &length); - if (prop_levels) { + if (device_property_present(dev, "brightness-levels")) { /* Read brightness levels from DT */ - num_levels = length / sizeof(u32); + num_levels = device_property_count_u32(dev, "brightness-levels"); if (num_levels < 2) return -EINVAL; } else { @@ -275,10 +271,9 @@ static int pm3309c_parse_dt_node(struct mp3309c_chip *chip, sizeof(*pdata->levels), GFP_KERNEL); if (!pdata->levels) return -ENOMEM; - if (prop_levels) { - ret = of_property_read_u32_array(node, "brightness-levels", - pdata->levels, - num_levels); + if (device_property_present(dev, "brightness-levels")) { + ret = device_property_read_u32_array(dev, "brightness-levels", + pdata->levels, num_levels); if (ret < 0) return ret; } else { @@ -288,8 +283,7 @@ static int pm3309c_parse_dt_node(struct mp3309c_chip *chip, pdata->max_brightness = num_levels - 1; - ret = of_property_read_u32(node, "default-brightness", - &pdata->default_brightness); + ret = device_property_read_u32(dev, "default-brightness", &pdata->default_brightness); if (ret) pdata->default_brightness = pdata->max_brightness; if (pdata->default_brightness > pdata->max_brightness) { @@ -310,8 +304,8 @@ static int pm3309c_parse_dt_node(struct mp3309c_chip *chip, * If missing, the default value for OVP is 35.5V */ pdata->over_voltage_protection = REG_I2C_1_OVP1; - if (!of_property_read_u32(node, "mps,overvoltage-protection-microvolt", - &tmp_value)) { + ret = device_property_read_u32(dev, "mps,overvoltage-protection-microvolt", &tmp_value); + if (!ret) { switch (tmp_value) { case 13500000: pdata->over_voltage_protection = 0x00; @@ -328,9 +322,7 @@ static int pm3309c_parse_dt_node(struct mp3309c_chip *chip, } /* Synchronous (default) and non-synchronous mode */ - pdata->sync_mode = true; - if (of_property_read_bool(node, "mps,no-sync-mode")) - pdata->sync_mode = false; + pdata->sync_mode = !device_property_read_bool(dev, "mps,no-sync-mode"); return 0; } @@ -366,7 +358,7 @@ static int mp3309c_probe(struct i2c_client *client) if (!pdata) return -ENOMEM; - ret = pm3309c_parse_dt_node(chip, pdata); + ret = mp3309c_parse_fwnode(chip, pdata); if (ret) return ret; } From patchwork Thu Feb 8 18:24:47 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Shevchenko X-Patchwork-Id: 13550280 Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.19]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id D56321C6A8; Thu, 8 Feb 2024 18:42:29 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=192.198.163.19 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707417751; cv=none; b=f+cUK1CFvmyijDDth7RAIm1iWNqa+zOhzZOnl40XIYcp/RLcQY/ODQtW0fUsaHbjYo5fraJqpx699Q+0sZpoYZIQjqeFmihdSczZ4nGe5RzwSygBUYD/zQ0ZLdFDD/AsJjoa5manWcGjNDXxTb1/eTPS1NALrlL4FxxO2nnr9TM= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707417751; c=relaxed/simple; bh=R8VW3vdNVBtgOG4uxMk33o384NOmy+Axf/iYx44RjkM=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=ppXCBF6+JeUsFvpfvXXYqVQowvCIaNUn5NqCs1T+xuy717D9bYmjtp24Dwa8qgkHo5gecP1gp10+8PQxo+nQjEM6gjxjzRVaaX00lehkSPCtnALaySWcQSitrkbKMXaIarJG+L2VTUj95dA8q6bo0d+BvbIDS88KHhBNHWRQrPA= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.intel.com; spf=none smtp.mailfrom=linux.intel.com; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b=X5VtM6Ch; arc=none smtp.client-ip=192.198.163.19 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.intel.com Authentication-Results: smtp.subspace.kernel.org; spf=none smtp.mailfrom=linux.intel.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b="X5VtM6Ch" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1707417750; x=1738953750; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=R8VW3vdNVBtgOG4uxMk33o384NOmy+Axf/iYx44RjkM=; b=X5VtM6ChXofAWnqeuLCM8wH5Yey5vC1v6V+AG/kKic8w2fbggxTdfZXJ R9q3RYF4CIiVtmnx00U2QN13D4qy5vkUdPud2PxSCjGWCdj6IfBXn45bj 9sKKgCxw0Ggq810hjUT/8sAJ6XOJn9pTidbN6obbDHI+aKo6ru+gkzB65 2JRLVY65i+zm95cjvTWpt7qGjBAvTeHxMXEvM7LWFbv8AIACukyP1513p 4IMYfjSVPPZBEhdJV2vXqG9Fpr81k7jzOirYPE56PT7+3duxu4M9iSXsw xklsYSVz2sDmr8+fSkj4daLZM+s55SSM3FMHZ4wX8BR9hxTl7NaR7yQn/ g==; X-IronPort-AV: E=McAfee;i="6600,9927,10978"; a="1184538" X-IronPort-AV: E=Sophos;i="6.05,254,1701158400"; d="scan'208";a="1184538" Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by fmvoesa113.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 08 Feb 2024 10:42:29 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10978"; a="934213664" X-IronPort-AV: E=Sophos;i="6.05,254,1701158400"; d="scan'208";a="934213664" Received: from black.fi.intel.com ([10.237.72.28]) by fmsmga001.fm.intel.com with ESMTP; 08 Feb 2024 10:42:26 -0800 Received: by black.fi.intel.com (Postfix, from userid 1003) id D63C91529; Thu, 8 Feb 2024 20:26:09 +0200 (EET) From: Andy Shevchenko To: Daniel Thompson , Flavio Suligoi , Andy Shevchenko , dri-devel@lists.freedesktop.org, linux-fbdev@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Lee Jones , Jingoo Han , Helge Deller Subject: [PATCH v3 2/3] backlight: mp3309c: use dev_err_probe() instead of dev_err() Date: Thu, 8 Feb 2024 20:24:47 +0200 Message-ID: <20240208182608.2224191-3-andriy.shevchenko@linux.intel.com> X-Mailer: git-send-email 2.43.0.rc1.1.gbec44491f096 In-Reply-To: <20240208182608.2224191-1-andriy.shevchenko@linux.intel.com> References: <20240208182608.2224191-1-andriy.shevchenko@linux.intel.com> Precedence: bulk X-Mailing-List: linux-fbdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Replace dev_err() with dev_err_probe(). This helps in simplifing code and standardizing the error output. Tested-by: Flavio Suligoi Reviewed-by: Daniel Thompson Signed-off-by: Andy Shevchenko --- drivers/video/backlight/mp3309c.c | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/drivers/video/backlight/mp3309c.c b/drivers/video/backlight/mp3309c.c index 397f35dafc5e..426e9f2356ad 100644 --- a/drivers/video/backlight/mp3309c.c +++ b/drivers/video/backlight/mp3309c.c @@ -208,10 +208,8 @@ static int mp3309c_parse_fwnode(struct mp3309c_chip *chip, unsigned int num_levels, tmp_value; struct device *dev = chip->dev; - if (!dev_fwnode(dev)) { - dev_err(dev, "failed to get firmware node\n"); - return -ENODEV; - } + if (!dev_fwnode(dev)) + return dev_err_probe(dev, -ENODEV, "failed to get firmware node\n"); /* * Dimming mode: the MP3309C provides two dimming control mode: @@ -287,8 +285,7 @@ static int mp3309c_parse_fwnode(struct mp3309c_chip *chip, if (ret) pdata->default_brightness = pdata->max_brightness; if (pdata->default_brightness > pdata->max_brightness) { - dev_err(chip->dev, - "default brightness exceeds max brightness\n"); + dev_err_probe(dev, -ERANGE, "default brightness exceeds max brightness\n"); pdata->default_brightness = pdata->max_brightness; } @@ -329,16 +326,15 @@ static int mp3309c_parse_fwnode(struct mp3309c_chip *chip, static int mp3309c_probe(struct i2c_client *client) { - struct mp3309c_platform_data *pdata = dev_get_platdata(&client->dev); + struct device *dev = &client->dev; + struct mp3309c_platform_data *pdata = dev_get_platdata(dev); struct mp3309c_chip *chip; struct backlight_properties props; struct pwm_state pwmstate; int ret; - if (!i2c_check_functionality(client->adapter, I2C_FUNC_I2C)) { - dev_err(&client->dev, "failed to check i2c functionality\n"); - return -EOPNOTSUPP; - } + if (!i2c_check_functionality(client->adapter, I2C_FUNC_I2C)) + return dev_err_probe(dev, -EOPNOTSUPP, "failed to check i2c functionality\n"); chip = devm_kzalloc(&client->dev, sizeof(*chip), GFP_KERNEL); if (!chip) From patchwork Thu Feb 8 18:24:48 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Shevchenko X-Patchwork-Id: 13550276 Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.13]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 0EC418C1A; Thu, 8 Feb 2024 18:32:30 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=192.198.163.13 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707417153; cv=none; b=cd7KTtWbEdtnIyJIP9rcd1kzKISbQqfAGuXWm6Sz9OPjyoxrmwy8I4UEjTGRtMmA55KyxqQzCbPeT+CGNeoiZ/HM1UJv5nblbw8wYUNuJAsmQ0bNQUTnRIsTOLTThG4SJRRSUq63Btq4uaYKt9qJvosZcZDaSBXnx2bt2vmv4qw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707417153; c=relaxed/simple; bh=ksPh+SGOZxTsk3yoazHWC1sh6u7Hvs7YFo8izy4mpuk=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=onOeST6KyPRGq/jYY5BhMSbe52NRzjm4yOThHcdljClgwNSG+Ovb4CnppNgAu1Mk4oekMJgBAn3aPabqu2AlHuadzvfC6Ac6Upyar1PJoppFSVHEU7dWC98CSptAVqCfP9PB85pP7tOU+Jgf/j/XuM1ALIZkIgP2Z+MjXOyjWfA= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.intel.com; spf=none smtp.mailfrom=linux.intel.com; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b=g+Y1w4Qj; arc=none smtp.client-ip=192.198.163.13 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.intel.com Authentication-Results: smtp.subspace.kernel.org; spf=none smtp.mailfrom=linux.intel.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b="g+Y1w4Qj" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1707417152; x=1738953152; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=ksPh+SGOZxTsk3yoazHWC1sh6u7Hvs7YFo8izy4mpuk=; b=g+Y1w4Qjm/E4O+fA2DRY27iS+Mqk2iZimtdejN45e+XLENJwGxxBZXEv xa4KUxnEbm3VRVg+oH+dD8TH+Ig2rtA7iepUGpt6VVNGgT2fjPYnkrt+6 S2JLnpAHLJYjeqxkTByseA4sJ5gm6vaA/t05nBRJsGYV8Zz/Wxc8bdOaW wcUgyTui0KbKjQ2z4TpTDKIlt9bivpHb1jFnwkfNKUslD840AySIuXDpN kA2XSe2LHGkLIjJ06Ggw0wGaMvPNoJfqliR+n9bDDJOmWJg6rrnCQmEqm le1zKoz0R45Aqr++dbYCLA5kNu7u/ZXubAtjG12zlY5IgZoxo3l+aqpmj g==; X-IronPort-AV: E=McAfee;i="6600,9927,10978"; a="4268798" X-IronPort-AV: E=Sophos;i="6.05,254,1701158400"; d="scan'208";a="4268798" Received: from orsmga001.jf.intel.com ([10.7.209.18]) by fmvoesa107.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 08 Feb 2024 10:32:30 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10978"; a="824917165" X-IronPort-AV: E=Sophos;i="6.05,254,1701158400"; d="scan'208";a="824917165" Received: from black.fi.intel.com ([10.237.72.28]) by orsmga001.jf.intel.com with ESMTP; 08 Feb 2024 10:32:27 -0800 Received: by black.fi.intel.com (Postfix, from userid 1003) id DE1991584; Thu, 8 Feb 2024 20:26:09 +0200 (EET) From: Andy Shevchenko To: Daniel Thompson , Flavio Suligoi , Andy Shevchenko , dri-devel@lists.freedesktop.org, linux-fbdev@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Lee Jones , Jingoo Han , Helge Deller Subject: [PATCH v3 3/3] backlight: mp3309c: Utilise temporary variable for struct device Date: Thu, 8 Feb 2024 20:24:48 +0200 Message-ID: <20240208182608.2224191-4-andriy.shevchenko@linux.intel.com> X-Mailer: git-send-email 2.43.0.rc1.1.gbec44491f096 In-Reply-To: <20240208182608.2224191-1-andriy.shevchenko@linux.intel.com> References: <20240208182608.2224191-1-andriy.shevchenko@linux.intel.com> Precedence: bulk X-Mailing-List: linux-fbdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 We have a temporary variable to keep pointer to struct device. Utilise it where it makes sense. Reviewed-by: Daniel Thompson Tested-by: Flavio Suligoi Signed-off-by: Andy Shevchenko --- drivers/video/backlight/mp3309c.c | 30 ++++++++++++------------------ 1 file changed, 12 insertions(+), 18 deletions(-) diff --git a/drivers/video/backlight/mp3309c.c b/drivers/video/backlight/mp3309c.c index 426e9f2356ad..708c053d492c 100644 --- a/drivers/video/backlight/mp3309c.c +++ b/drivers/video/backlight/mp3309c.c @@ -222,10 +222,9 @@ static int mp3309c_parse_fwnode(struct mp3309c_chip *chip, */ pdata->dimming_mode = DIMMING_ANALOG_I2C; if (device_property_present(dev, "pwms")) { - chip->pwmd = devm_pwm_get(chip->dev, NULL); + chip->pwmd = devm_pwm_get(dev, NULL); if (IS_ERR(chip->pwmd)) - return dev_err_probe(chip->dev, PTR_ERR(chip->pwmd), - "error getting pwm data\n"); + return dev_err_probe(dev, PTR_ERR(chip->pwmd), "error getting pwm data\n"); pdata->dimming_mode = DIMMING_PWM; pwm_apply_args(chip->pwmd); } @@ -243,11 +242,9 @@ static int mp3309c_parse_fwnode(struct mp3309c_chip *chip, num_levels = ANALOG_I2C_NUM_LEVELS; /* Enable GPIO used in I2C dimming mode only */ - chip->enable_gpio = devm_gpiod_get(chip->dev, "enable", - GPIOD_OUT_HIGH); + chip->enable_gpio = devm_gpiod_get(dev, "enable", GPIOD_OUT_HIGH); if (IS_ERR(chip->enable_gpio)) - return dev_err_probe(chip->dev, - PTR_ERR(chip->enable_gpio), + return dev_err_probe(dev, PTR_ERR(chip->enable_gpio), "error getting enable gpio\n"); } else { /* @@ -265,8 +262,7 @@ static int mp3309c_parse_fwnode(struct mp3309c_chip *chip, } /* Fill brightness levels array */ - pdata->levels = devm_kcalloc(chip->dev, num_levels, - sizeof(*pdata->levels), GFP_KERNEL); + pdata->levels = devm_kcalloc(dev, num_levels, sizeof(*pdata->levels), GFP_KERNEL); if (!pdata->levels) return -ENOMEM; if (device_property_present(dev, "brightness-levels")) { @@ -336,21 +332,21 @@ static int mp3309c_probe(struct i2c_client *client) if (!i2c_check_functionality(client->adapter, I2C_FUNC_I2C)) return dev_err_probe(dev, -EOPNOTSUPP, "failed to check i2c functionality\n"); - chip = devm_kzalloc(&client->dev, sizeof(*chip), GFP_KERNEL); + chip = devm_kzalloc(dev, sizeof(*chip), GFP_KERNEL); if (!chip) return -ENOMEM; - chip->dev = &client->dev; + chip->dev = dev; chip->regmap = devm_regmap_init_i2c(client, &mp3309c_regmap); if (IS_ERR(chip->regmap)) - return dev_err_probe(&client->dev, PTR_ERR(chip->regmap), + return dev_err_probe(dev, PTR_ERR(chip->regmap), "failed to allocate register map\n"); i2c_set_clientdata(client, chip); if (!pdata) { - pdata = devm_kzalloc(chip->dev, sizeof(*pdata), GFP_KERNEL); + pdata = devm_kzalloc(dev, sizeof(*pdata), GFP_KERNEL); if (!pdata) return -ENOMEM; @@ -367,11 +363,10 @@ static int mp3309c_probe(struct i2c_client *client) props.type = BACKLIGHT_RAW; props.power = FB_BLANK_UNBLANK; props.fb_blank = FB_BLANK_UNBLANK; - chip->bl = devm_backlight_device_register(chip->dev, "mp3309c", - chip->dev, chip, + chip->bl = devm_backlight_device_register(dev, "mp3309c", dev, chip, &mp3309c_bl_ops, &props); if (IS_ERR(chip->bl)) - return dev_err_probe(chip->dev, PTR_ERR(chip->bl), + return dev_err_probe(dev, PTR_ERR(chip->bl), "error registering backlight device\n"); /* In PWM dimming mode, enable pwm device */ @@ -383,8 +378,7 @@ static int mp3309c_probe(struct i2c_client *client) pwmstate.enabled = true; ret = pwm_apply_might_sleep(chip->pwmd, &pwmstate); if (ret) - return dev_err_probe(chip->dev, ret, - "error setting pwm device\n"); + return dev_err_probe(dev, ret, "error setting pwm device\n"); } chip->pdata->status = FIRST_POWER_ON;