Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752611AbbHPUhJ (ORCPT ); Sun, 16 Aug 2015 16:37:09 -0400 Received: from mail-wi0-f178.google.com ([209.85.212.178]:33102 "EHLO mail-wi0-f178.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751307AbbHPUhG (ORCPT ); Sun, 16 Aug 2015 16:37:06 -0400 From: Mike Rapoport To: Greg Kroah-Hartman Cc: Mike Rapoport , Thomas Petazzoni , =?UTF-8?q?Noralf=20Tr=C3=B8nnes?= , LKML Subject: [PATCH 2/5] staging: fbtft: fbtft-core: define backlight_ops statically Date: Sun, 16 Aug 2015 23:36:34 +0300 Message-Id: <1439757397-2304-3-git-send-email-mike.rapoport@gmail.com> X-Mailer: git-send-email 2.1.0 In-Reply-To: <1439757397-2304-1-git-send-email-mike.rapoport@gmail.com> References: <1439757397-2304-1-git-send-email-mike.rapoport@gmail.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1990 Lines: 59 instead of devm_kzalloc'ing them Signed-off-by: Mike Rapoport --- drivers/staging/fbtft/fbtft-core.c | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/drivers/staging/fbtft/fbtft-core.c b/drivers/staging/fbtft/fbtft-core.c index bbc394a..81ba416 100644 --- a/drivers/staging/fbtft/fbtft-core.c +++ b/drivers/staging/fbtft/fbtft-core.c @@ -280,11 +280,15 @@ void fbtft_unregister_backlight(struct fbtft_par *par) } } +static const struct backlight_ops fbtft_bl_ops = { + .get_brightness = fbtft_backlight_get_brightness, + .update_status = fbtft_backlight_update_status, +}; + void fbtft_register_backlight(struct fbtft_par *par) { struct backlight_device *bd; struct backlight_properties bl_props = { 0, }; - struct backlight_ops *bl_ops; fbtft_par_dbg(DEBUG_BACKLIGHT, par, "%s()\n", __func__); @@ -294,13 +298,6 @@ void fbtft_register_backlight(struct fbtft_par *par) return; } - bl_ops = devm_kzalloc(par->info->device, sizeof(struct backlight_ops), - GFP_KERNEL); - if (!bl_ops) - return; - - bl_ops->get_brightness = fbtft_backlight_get_brightness; - bl_ops->update_status = fbtft_backlight_update_status; bl_props.type = BACKLIGHT_RAW; /* Assume backlight is off, get polarity from current state of pin */ bl_props.power = FB_BLANK_POWERDOWN; @@ -308,7 +305,7 @@ void fbtft_register_backlight(struct fbtft_par *par) bl_props.state |= BL_CORE_DRIVER1; bd = backlight_device_register(dev_driver_string(par->info->device), - par->info->device, par, bl_ops, &bl_props); + par->info->device, par, &fbtft_bl_ops, &bl_props); if (IS_ERR(bd)) { dev_err(par->info->device, "cannot register backlight device (%ld)\n", -- 1.8.3.1 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/