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=-2.6 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SPF_PASS,USER_AGENT_GIT 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 9CAF5C5CFE7 for ; Mon, 9 Jul 2018 22:42:03 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 4DC672086B for ; Mon, 9 Jul 2018 22:42:03 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="YGm5xOoQ" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 4DC672086B Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933476AbeGIWmA (ORCPT ); Mon, 9 Jul 2018 18:42:00 -0400 Received: from mail-pf0-f195.google.com ([209.85.192.195]:46696 "EHLO mail-pf0-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933437AbeGIWj7 (ORCPT ); Mon, 9 Jul 2018 18:39:59 -0400 Received: by mail-pf0-f195.google.com with SMTP id l123-v6so14641950pfl.13; Mon, 09 Jul 2018 15:39:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=ejaR1+lAFWLym9QSkToU8C8dkkL4tLfRJBhmO/2ix3I=; b=YGm5xOoQZoyrClSmQKaFd0Yopn/p6w8LIcXgPDShFy6bQwv8IkSk/7idGOn0x+BrRI KH+RYCnXEJcrebCSe8WK5xlebZck35zUPtt6ASZnjNcch6FB+lTpcHk3LoUh9NWSjxFJ LBQfYp6xcJNr/rIbWFtdjlrFyTntxJ5PAKP0yI/DfO+hlZp59KCDuaAYbxAE0gNwtNz/ rIlJrej/JhSfx3KMsiZPRM1z/ODBm476puwZvmo0Pu+0BgpYzWEmBnEfDEywUz0NszmF O2eLfEwD5Ppo8kEGBI1YftW/EoVH914IwVQ6lXoVG7GG0Ilf3pxsV+FS9rg15RuiPlRm Ao1w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=ejaR1+lAFWLym9QSkToU8C8dkkL4tLfRJBhmO/2ix3I=; b=JU6NyInjN/1RimH540DCKQLJutwEQOKcPNq+6XVN9eRSWstNsot2EnKB+dn7axRHL8 GJVWwX4a5dpFg+R/kgVdisNUwGScZ8aWRQi2Utj4xyc4G7dXRHqLZHiVJdCjjs8Roeh7 6lzZ/KA8QijboeHzcGJe6tS8V7l18ozvHaXTwcaAGfWEqYjx33t6tQpyPdgn0+z1Vi+l JiHIPn/0WaLhXBkH6g4dejMsNbxxRI/hE06q6WIjpjn2WCcQjFP7BdBIq/Bb8YhFl+xi wMWZ24B9XdYuTDLI7DeoSf8FHmrBYUzM+3+wveEqRwH58qkDATz0o+a2vAxw0eRuhuie R3fg== X-Gm-Message-State: APt69E0Y2K3GRsmjSsB7n/8pkNqjLvXBA0VY1gYyKXUBa5rYK2bW1Ky2 2YJRVRHy5VKQ6bjWEXz+O1+cbA== X-Google-Smtp-Source: AAOMgpdEC5bp/uM6EjuW4Ef/F0qr0m7q4qfCpcLFGYsFahhSvi8w63cXU/ayNaO7tS4uW23eTWeQmA== X-Received: by 2002:a62:384:: with SMTP id 126-v6mr5694724pfd.11.1531175998382; Mon, 09 Jul 2018 15:39:58 -0700 (PDT) Received: from majic.sklembedded.com (c-98-210-181-167.hsd1.ca.comcast.net. [98.210.181.167]) by smtp.googlemail.com with ESMTPSA id r16-v6sm30143804pfe.173.2018.07.09.15.39.57 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 09 Jul 2018 15:39:57 -0700 (PDT) From: Steve Longerbeam X-Google-Original-From: Steve Longerbeam To: linux-media@vger.kernel.org Cc: Steve Longerbeam , Steve Longerbeam , Philipp Zabel , Mauro Carvalho Chehab , Greg Kroah-Hartman , devel@driverdev.osuosl.org (open list:STAGING SUBSYSTEM), linux-kernel@vger.kernel.org (open list) Subject: [PATCH v6 12/17] media: staging/imx: Rename root notifier Date: Mon, 9 Jul 2018 15:39:12 -0700 Message-Id: <1531175957-1973-13-git-send-email-steve_longerbeam@mentor.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1531175957-1973-1-git-send-email-steve_longerbeam@mentor.com> References: <1531175957-1973-1-git-send-email-steve_longerbeam@mentor.com> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Rename the imx-media root async notifier from "subdev_notifier" to simply "notifier", so as not to confuse it with true subdev notifiers. No functional changes. Signed-off-by: Steve Longerbeam --- drivers/staging/media/imx/imx-media-dev.c | 14 +++++++------- drivers/staging/media/imx/imx-media.h | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/drivers/staging/media/imx/imx-media-dev.c b/drivers/staging/media/imx/imx-media-dev.c index ae87c81..982e455 100644 --- a/drivers/staging/media/imx/imx-media-dev.c +++ b/drivers/staging/media/imx/imx-media-dev.c @@ -29,7 +29,7 @@ static inline struct imx_media_dev *notifier2dev(struct v4l2_async_notifier *n) { - return container_of(n, struct imx_media_dev, subdev_notifier); + return container_of(n, struct imx_media_dev, notifier); } /* @@ -113,7 +113,7 @@ int imx_media_add_async_subdev(struct imx_media_dev *imxmd, list_add_tail(&imxasd->list, &imxmd->asd_list); - imxmd->subdev_notifier.num_subdevs++; + imxmd->notifier.num_subdevs++; dev_dbg(imxmd->md.dev, "%s: added %s, match type %s\n", __func__, np ? np->name : devname, np ? "FWNODE" : "DEVNAME"); @@ -532,7 +532,7 @@ static int imx_media_probe(struct platform_device *pdev) goto unreg_dev; } - num_subdevs = imxmd->subdev_notifier.num_subdevs; + num_subdevs = imxmd->notifier.num_subdevs; /* no subdevs? just bail */ if (num_subdevs == 0) { @@ -552,10 +552,10 @@ static int imx_media_probe(struct platform_device *pdev) subdevs[i++] = &imxasd->asd; /* prepare the async subdev notifier and register it */ - imxmd->subdev_notifier.subdevs = subdevs; - imxmd->subdev_notifier.ops = &imx_media_subdev_ops; + imxmd->notifier.subdevs = subdevs; + imxmd->notifier.ops = &imx_media_subdev_ops; ret = v4l2_async_notifier_register(&imxmd->v4l2_dev, - &imxmd->subdev_notifier); + &imxmd->notifier); if (ret) { v4l2_err(&imxmd->v4l2_dev, "v4l2_async_notifier_register failed with %d\n", ret); @@ -580,7 +580,7 @@ static int imx_media_remove(struct platform_device *pdev) v4l2_info(&imxmd->v4l2_dev, "Removing imx-media\n"); - v4l2_async_notifier_unregister(&imxmd->subdev_notifier); + v4l2_async_notifier_unregister(&imxmd->notifier); imx_media_remove_internal_subdevs(imxmd); v4l2_device_unregister(&imxmd->v4l2_dev); media_device_unregister(&imxmd->md); diff --git a/drivers/staging/media/imx/imx-media.h b/drivers/staging/media/imx/imx-media.h index 57bd094..227b79c 100644 --- a/drivers/staging/media/imx/imx-media.h +++ b/drivers/staging/media/imx/imx-media.h @@ -150,7 +150,7 @@ struct imx_media_dev { /* for async subdev registration */ struct list_head asd_list; - struct v4l2_async_notifier subdev_notifier; + struct v4l2_async_notifier notifier; }; enum codespace_sel { -- 2.7.4