From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933808AbbI1NHq (ORCPT ); Mon, 28 Sep 2015 09:07:46 -0400 Received: from mailout1.samsung.com ([203.254.224.24]:52703 "EHLO mailout1.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933762AbbI1NHn (ORCPT ); Mon, 28 Sep 2015 09:07:43 -0400 X-AuditID: cbfee61a-f79a06d000005c6f-c6-56093b9d0e10 From: Jacek Anaszewski To: linux-leds@vger.kernel.org Cc: linux-kernel@vger.kernel.org, sakari.ailus@linux.intel.com, andrew@lunn.ch, rpurdie@rpsys.net, Jacek Anaszewski Subject: [PATCH v2 04/12] leds: Rename brightness_set_sync op to brightness_set_blocking Date: Mon, 28 Sep 2015 15:07:13 +0200 Message-id: <1443445641-9529-5-git-send-email-j.anaszewski@samsung.com> X-Mailer: git-send-email 1.7.9.5 In-reply-to: <1443445641-9529-1-git-send-email-j.anaszewski@samsung.com> References: <1443445641-9529-1-git-send-email-j.anaszewski@samsung.com> X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFuplluLIzCtJLcpLzFFi42I5/e+xoO48a84wg4Z5LBbn7x5itui9+pzR 4vKuOWwWW9+sY7TYvespq8WnLd+YHNg85p0M9Ni54zOTx575P1g9+rasYvT4vEkugDWKyyYl NSezLLVI3y6BK+P0hJ+MBd+UKtbt3sjUwHhNtouRk0NCwETiz5bvrBC2mMSFe+vZuhi5OIQE ZjFKvDwxjx3C+ckocezAHXaQKjYBQ4mfL14zdTFycIgIyEnsPFMJEmYWmMAoMfWiOEhYWCBK 4t5UsAoWAVWJF3+NQSp4Bdwlel+8ZQYJSwgoSMyZZAMS5hTwkFj/vZsJxBYCKnm4+zzbBEbe BYwMqxglUguSC4qT0nMN81LL9YoTc4tL89L1kvNzNzGCA+mZ1A7Gg7vcDzEKcDAq8fB+1OQI E2JNLCuuzD3EKMHBrCTC6yTKGSbEm5JYWZValB9fVJqTWnyIUZqDRUmc98YhhjAhgfTEktTs 1NSC1CKYLBMHp1QDY+ipwCVm5fKPpp5cv+GJEscn/kyGvZYWems7X0lVL8q56qG823pmVeTu rA33EvkSP/5692nzw4nr0vh1t03df+NFY2X2jltpW4607jUPf3Xs/coDNc0qj3VZWW2cgqpj 5wj/XR5kYzBHY+33eVEiHBM/nP0b1MTD8f/PngM3it6rc6cZfTRi7VFiKc5INNRiLipOBADM tGrhIAIAAA== Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The initial purpose of brightness_set_sync op, introduced along with the LED flash class extension, was to add a means for setting torch LED brightness as soon as possible, which couldn't have been guaranteed by brightness_set op. This patch renames the op to brightness_set_blocking, which describes its purpose in a more generic way. It is beneficial in view of the prospective changes in the LED core, aiming at removing the need for using work queues in LED class drivers that can sleep or use delays while setting brightness. Signed-off-by: Jacek Anaszewski --- drivers/leds/led-class-flash.c | 2 +- drivers/leds/leds-aat1290.c | 2 +- drivers/leds/leds-ktd2692.c | 2 +- drivers/leds/leds-max77693.c | 2 +- drivers/leds/leds.h | 2 +- include/linux/leds.h | 4 ++-- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/drivers/leds/led-class-flash.c b/drivers/leds/led-class-flash.c index 3b25734..300a2c9 100644 --- a/drivers/leds/led-class-flash.c +++ b/drivers/leds/led-class-flash.c @@ -298,7 +298,7 @@ int led_classdev_flash_register(struct device *parent, led_cdev = &fled_cdev->led_cdev; if (led_cdev->flags & LED_DEV_CAP_FLASH) { - if (!led_cdev->brightness_set_sync) + if (!led_cdev->brightness_set_blocking) return -EINVAL; ops = fled_cdev->ops; diff --git a/drivers/leds/leds-aat1290.c b/drivers/leds/leds-aat1290.c index ac77d36..c56f9a9 100644 --- a/drivers/leds/leds-aat1290.c +++ b/drivers/leds/leds-aat1290.c @@ -510,7 +510,7 @@ static int aat1290_led_probe(struct platform_device *pdev) /* Initialize LED Flash class device */ led_cdev->brightness_set = aat1290_led_brightness_set; - led_cdev->brightness_set_sync = aat1290_led_brightness_set_sync; + led_cdev->brightness_set_blocking = aat1290_led_brightness_set_sync; led_cdev->max_brightness = led_cfg.max_brightness; led_cdev->flags |= LED_DEV_CAP_FLASH; INIT_WORK(&led->work_brightness_set, aat1290_brightness_set_work); diff --git a/drivers/leds/leds-ktd2692.c b/drivers/leds/leds-ktd2692.c index feca07b..e37de14 100644 --- a/drivers/leds/leds-ktd2692.c +++ b/drivers/leds/leds-ktd2692.c @@ -382,7 +382,7 @@ static int ktd2692_probe(struct platform_device *pdev) led_cdev->max_brightness = led_cfg.max_brightness; led_cdev->brightness_set = ktd2692_led_brightness_set; - led_cdev->brightness_set_sync = ktd2692_led_brightness_set_sync; + led_cdev->brightness_set_blocking = ktd2692_led_brightness_set_sync; led_cdev->flags |= LED_CORE_SUSPENDRESUME | LED_DEV_CAP_FLASH; mutex_init(&led->lock); diff --git a/drivers/leds/leds-max77693.c b/drivers/leds/leds-max77693.c index afbb140..9f7240b 100644 --- a/drivers/leds/leds-max77693.c +++ b/drivers/leds/leds-max77693.c @@ -932,7 +932,7 @@ static void max77693_init_fled_cdev(struct max77693_sub_led *sub_led, led_cdev->name = led_cfg->label[fled_id]; led_cdev->brightness_set = max77693_led_brightness_set; - led_cdev->brightness_set_sync = max77693_led_brightness_set_sync; + led_cdev->brightness_set_blocking = max77693_led_brightness_set_sync; led_cdev->max_brightness = (led->iout_joint ? led_cfg->iout_torch_max[FLED1] + led_cfg->iout_torch_max[FLED2] : diff --git a/drivers/leds/leds.h b/drivers/leds/leds.h index 4238fbc..cf6d448 100644 --- a/drivers/leds/leds.h +++ b/drivers/leds/leds.h @@ -34,7 +34,7 @@ static inline int led_set_brightness_sync(struct led_classdev *led_cdev, led_cdev->brightness = min(value, led_cdev->max_brightness); if (!(led_cdev->flags & LED_SUSPENDED)) - ret = led_cdev->brightness_set_sync(led_cdev, + ret = led_cdev->brightness_set_blocking(led_cdev, led_cdev->brightness); return ret; } diff --git a/include/linux/leds.h b/include/linux/leds.h index 84521e5..b47eff5 100644 --- a/include/linux/leds.h +++ b/include/linux/leds.h @@ -59,8 +59,8 @@ struct led_classdev { * Set LED brightness level immediately - it can block the caller for * the time required for accessing a LED device register. */ - int (*brightness_set_sync)(struct led_classdev *led_cdev, - enum led_brightness brightness); + int (*brightness_set_blocking)(struct led_classdev *led_cdev, + enum led_brightness brightness); /* Get LED brightness level */ enum led_brightness (*brightness_get)(struct led_classdev *led_cdev); -- 1.7.9.5