From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 7C11BC432C0 for ; Fri, 29 Nov 2019 10:35:54 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 5A04E215F1 for ; Fri, 29 Nov 2019 10:35:54 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726791AbfK2Kfx (ORCPT ); Fri, 29 Nov 2019 05:35:53 -0500 Received: from mga17.intel.com ([192.55.52.151]:17471 "EHLO mga17.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726215AbfK2Kfx (ORCPT ); Fri, 29 Nov 2019 05:35:53 -0500 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga006.jf.intel.com ([10.7.209.51]) by fmsmga107.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 29 Nov 2019 02:35:53 -0800 X-IronPort-AV: E=Sophos;i="5.69,257,1571727600"; d="scan'208";a="212284321" Received: from jnikula-mobl3.fi.intel.com (HELO localhost) ([10.237.66.161]) by orsmga006-auth.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 29 Nov 2019 02:35:48 -0800 From: Jani Nikula To: dri-devel@lists.freedesktop.org, linux-fbdev@vger.kernel.org Cc: Andy Walls , Daniel Vetter , intel-gfx@lists.freedesktop.org, ivtv-devel@ivtvdriver.org, Hans Verkuil , linux-media@vger.kernel.org Subject: Re: [Intel-gfx] [PATCH v2 12/14] media: constify fb ops across all drivers In-Reply-To: <9cfc1a171d12a52dfbd5508d737681f2d89d21df.1575022735.git.jani.nikula@intel.com> Organization: Intel Finland Oy - BIC 0357606-4 - Westendinkatu 7, 02160 Espoo References: <9cfc1a171d12a52dfbd5508d737681f2d89d21df.1575022735.git.jani.nikula@intel.com> Date: Fri, 29 Nov 2019 12:35:44 +0200 Message-ID: <87h82nkm0v.fsf@intel.com> MIME-Version: 1.0 Content-Type: text/plain Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org On Fri, 29 Nov 2019, Jani Nikula wrote: > Now that the fbops member of struct fb_info is const, we can start > making the ops const as well. > > Remove the redundant fbops assignments while at it. > > v2: > - actually add const in vivid > - fix typo (Christophe de Dinechin) > > Cc: Hans Verkuil > Cc: Andy Walls > Cc: linux-media@vger.kernel.org > Cc: ivtv-devel@ivtvdriver.org > Reviewed-by: Daniel Vetter > Signed-off-by: Jani Nikula > > fixup-to-media Rebase artefact, to be removed before applying... BR, Jani. > --- > drivers/media/pci/ivtv/ivtvfb.c | 3 +-- > drivers/media/platform/vivid/vivid-osd.c | 3 +-- > 2 files changed, 2 insertions(+), 4 deletions(-) > > diff --git a/drivers/media/pci/ivtv/ivtvfb.c b/drivers/media/pci/ivtv/ivtvfb.c > index 95a56cce9b65..f2922b554b09 100644 > --- a/drivers/media/pci/ivtv/ivtvfb.c > +++ b/drivers/media/pci/ivtv/ivtvfb.c > @@ -925,7 +925,7 @@ static int ivtvfb_blank(int blank_mode, struct fb_info *info) > return 0; > } > > -static struct fb_ops ivtvfb_ops = { > +static const struct fb_ops ivtvfb_ops = { > .owner = THIS_MODULE, > .fb_write = ivtvfb_write, > .fb_check_var = ivtvfb_check_var, > @@ -1049,7 +1049,6 @@ static int ivtvfb_init_vidmode(struct ivtv *itv) > > oi->ivtvfb_info.node = -1; > oi->ivtvfb_info.flags = FBINFO_FLAG_DEFAULT; > - oi->ivtvfb_info.fbops = &ivtvfb_ops; > oi->ivtvfb_info.par = itv; > oi->ivtvfb_info.var = oi->ivtvfb_defined; > oi->ivtvfb_info.fix = oi->ivtvfb_fix; > diff --git a/drivers/media/platform/vivid/vivid-osd.c b/drivers/media/platform/vivid/vivid-osd.c > index f2e789bdf4a6..fbaec8acc161 100644 > --- a/drivers/media/platform/vivid/vivid-osd.c > +++ b/drivers/media/platform/vivid/vivid-osd.c > @@ -244,7 +244,7 @@ static int vivid_fb_blank(int blank_mode, struct fb_info *info) > return 0; > } > > -static struct fb_ops vivid_fb_ops = { > +static const struct fb_ops vivid_fb_ops = { > .owner = THIS_MODULE, > .fb_check_var = vivid_fb_check_var, > .fb_set_par = vivid_fb_set_par, > @@ -311,7 +311,6 @@ static int vivid_fb_init_vidmode(struct vivid_dev *dev) > > dev->fb_info.node = -1; > dev->fb_info.flags = FBINFO_FLAG_DEFAULT; > - dev->fb_info.fbops = &vivid_fb_ops; > dev->fb_info.par = dev; > dev->fb_info.var = dev->fb_defined; > dev->fb_info.fix = dev->fb_fix; -- Jani Nikula, Intel Open Source Graphics Center