From patchwork Wed Jan 5 20:35:47 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gaston Gonzalez X-Patchwork-Id: 12704701 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 188A5C433EF for ; Wed, 5 Jan 2022 20:39:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=LQzHouarYCcJX3/bAQDtafn/89wx+IyOnQcDaRM9YhM=; b=fEETcmE8XITS7p 4KhDr5BJX//I++Pyuap+wCunpjhbDc8yd/f5Kx46vZ6n3L3YPnAt5G0bHz839muvH+I5wwSxAQo3y vB4acldJXiyUHO6Sgm5hXi84qf7fPPbiBGQECE8w7J86iwOhGUq/KMJuUQN7by15MmX70/OqaXIi/ DAIPA6aOL5IiTBzuUc0rKeQci6a3m5tzJ17lWcv6zSlvHcOyFsR+BB5Ibr+WqhJ5KMZBV0u1uX+cX UJRZDPCFqRvI0r1JWJYvJP9e0Z2kKlPsRN0w8VHjLSb7crSRewNGokEKjUtwLW68L255sdwVBeHFb hZQ4BGUsIGftqYuGY64Q==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1n5D2R-00Fm9J-QJ; Wed, 05 Jan 2022 20:37:40 +0000 Received: from mail-vk1-xa36.google.com ([2607:f8b0:4864:20::a36]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1n5D1p-00Flt2-VK; Wed, 05 Jan 2022 20:37:03 +0000 Received: by mail-vk1-xa36.google.com with SMTP id h67so407849vkh.1; Wed, 05 Jan 2022 12:37:01 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=KryD1Tl4pz4bryw9HstBOCtF+w+P5fB9bwLkC/bWiN4=; b=EzFZZCOcqu47YWlPxyWloqUhnXhBHkzNud9oApmsxTR5gEwY+MdHJodVtinVV/tFKR B0K3yGExKPNVNmhnB+3MVzd4MTfS/JYT95XVBnxv0/By6zd4EZrxI88txVrS1MOUfzgZ 40MkCvMZDNZRBzXDqqBnP67PegVsz/eo06SWfsRBXCIf/5nObawnvUmAG732L8SMLBQf H34Cbkvqw2or1LKXgqPy79TLdPZyGQb7bXjkv/4jV+Tg+FYNzAdt8t5hjQAJvayFQwQB f2+Mz077GxH3ZEhovFoqjSobiW2BTRj/HrFiFIJ96BAaOMtjzSjtNV8g94PN1aDv139w dYJg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=KryD1Tl4pz4bryw9HstBOCtF+w+P5fB9bwLkC/bWiN4=; b=b7nMxVzaYuGiwG0YzDPxSP6srIQ9P7UM0ixdr0w0eri4HC815ojTZ/rmzzL6RhPKfx WK6yWRSyRWiEG8pFqf0O8r/qFfY01pGsNPa1QKmNnwAQLhLGyN5CW3ALIo4ILG7hTKCl JnGuhawiHfBpPBeRjM9dkzcDLF3FqJ77YQNQ7VlE9Ii2GHLGjbx+rsFeUieyiQ7pyvZ9 vbKVvVpSZhxUR5s2oySFmRsot7UvJJggqfpxCesK0hNQrMFRaFGzt0A7Zj2Rpovq9YSd vdLY7NKw6oVw3FuBjjqy0DQPJZpKcKPQINJ0OxKbDGSLproyOG+prQbo7pAIGvT9mhNN pPyQ== X-Gm-Message-State: AOAM531D7uOAobJXBmd6lg0CgZOMQo3T5noUzjCGbzRvfz3BPjoM2J0w cy8zKgAq4oYfQQuHgcu2NwQ= X-Google-Smtp-Source: ABdhPJzh6vlJ1UUpbhGlxH4d5ijjrmyFqAgWJh8jBQzLMTaS+R7qaF/7mZV+RahkDhpqG+nJ4I8eXw== X-Received: by 2002:a05:6122:d07:: with SMTP id az7mr19249968vkb.9.1641415020584; Wed, 05 Jan 2022 12:37:00 -0800 (PST) Received: from localhost.localdomain ([181.22.170.52]) by smtp.gmail.com with ESMTPSA id t130sm7860vkc.32.2022.01.05.12.36.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 05 Jan 2022 12:37:00 -0800 (PST) From: Gaston Gonzalez To: linux-staging@lists.linux.dev Cc: gregkh@linuxfoundation.org, nsaenz@kernel.org, f.fainelli@gmail.com, rjui@broadcom.com, sbranden@broadcom.com, juerg.haefliger@canonical.com, rdunlap@infradead.org, dave.stevenson@raspberrypi.com, stefan.wahren@i2se.com, unixbhaskar@gmail.com, mitaliborkar810@gmail.com, phil@raspberrypi.com, len.baker@gmx.com, linux-rpi-kernel@lists.infradead.org, linux-arm-kernel@lists.infradead.org, bcm-kernel-feedback-list@broadcom.com, linux-kernel@vger.kernel.org, gascoar@gmail.com Subject: [PATCH 5/6] staging: vc04_services: rename macros BM2835_MMAL_VERSION and BM2835_MMAL_MODULE_NAME Date: Wed, 5 Jan 2022 17:35:47 -0300 Message-Id: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220105_123702_062531_663EFB37 X-CRM114-Status: GOOD ( 10.84 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org In the kernel, all names related to the chip BCM2835 are always named bcm2835_*. To avoid confusion, and to make things more consistent, rename the macros BM2835_MMAL_VERSION and BM2835_MMAL_MODULE_NAME accordingly. While at it, some realignments were made to improve readability. Suggested-by: Stefan Wahren Signed-off-by: Gaston Gonzalez --- .../vc04_services/bcm2835-camera/bcm2835-camera.c | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/drivers/staging/vc04_services/bcm2835-camera/bcm2835-camera.c b/drivers/staging/vc04_services/bcm2835-camera/bcm2835-camera.c index aaf529f2186c..c729b1b7de71 100644 --- a/drivers/staging/vc04_services/bcm2835-camera/bcm2835-camera.c +++ b/drivers/staging/vc04_services/bcm2835-camera/bcm2835-camera.c @@ -33,8 +33,8 @@ #include "mmal-parameters.h" #include "bcm2835-camera.h" -#define BM2835_MMAL_VERSION "0.0.2" -#define BM2835_MMAL_MODULE_NAME "bcm2835-v4l2" +#define BCM2835_MMAL_VERSION "0.0.2" +#define BCM2835_MMAL_MODULE_NAME "bcm2835-v4l2" #define MIN_WIDTH 32 #define MIN_HEIGHT 32 #define MIN_BUFFER_SIZE (80 * 1024) @@ -1894,8 +1894,7 @@ static int bcm2835_mmal_probe(struct platform_device *pdev) dev->capture.fmt = &formats[3]; /* JPEG */ /* v4l device registration */ - dev->camera_num = v4l2_device_set_name(&dev->v4l2_dev, - BM2835_MMAL_MODULE_NAME, + dev->camera_num = v4l2_device_set_name(&dev->v4l2_dev, BCM2835_MMAL_MODULE_NAME, &camera_instance); ret = v4l2_device_register(NULL, &dev->v4l2_dev); if (ret) { @@ -1954,9 +1953,8 @@ static int bcm2835_mmal_probe(struct platform_device *pdev) goto unreg_dev; } - v4l2_info(&dev->v4l2_dev, - "Broadcom 2835 MMAL video capture ver %s loaded.\n", - BM2835_MMAL_VERSION); + v4l2_info(&dev->v4l2_dev, "Broadcom 2835 MMAL video capture ver %s loaded.\n", + BCM2835_MMAL_VERSION); gdev[camera] = dev; } @@ -2008,5 +2006,5 @@ module_platform_driver(bcm2835_camera_driver) MODULE_DESCRIPTION("Broadcom 2835 MMAL video capture"); MODULE_AUTHOR("Vincent Sanders"); MODULE_LICENSE("GPL"); -MODULE_VERSION(BM2835_MMAL_VERSION); +MODULE_VERSION(BCM2835_MMAL_VERSION); MODULE_ALIAS("platform:bcm2835-camera");