From patchwork Wed Jan 5 20:35:46 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gaston Gonzalez X-Patchwork-Id: 12704700 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 57020C433F5 for ; Wed, 5 Jan 2022 20:38:46 +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=XWBV1OrRDDzOXbWvmpjBA8cuF2MPUVVXzJlPpDIUI+4=; b=BxW9rL3XX5b4gG OaEUUm8Xf1/zoRaHvV7AP0etoABIO/rdr2OYDalPxP/VEpIox9JJ+4FedrhxjVzajIFVyRSjgpuLx KD9kWTI3WjlsyjNSEbxgd7+usLMzmQjak5g6KWP9t846laREOh7+D70tYgBNf8aq+tZNBYxkeZcDU gX6LB0WZwr3lH+gI5QSnnh+kZUNS/QFMNPnYTVamDS/Y6jTLLLHSbnHPlVpa5GhEYqnbiBl+tbihh +olUpuvCGmcuObBO4iQpLlrnwgUtgcryeL31E2adbf6worxFwpjiujKouKZcCLhvXxDLM7oMsOZGi T5TPhvaNmvhNdu1VMZJw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1n5D2F-00Fm3d-Ml; Wed, 05 Jan 2022 20:37:27 +0000 Received: from mail-vk1-xa30.google.com ([2607:f8b0:4864:20::a30]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1n5D1n-00Flr9-QJ; Wed, 05 Jan 2022 20:37:01 +0000 Received: by mail-vk1-xa30.google.com with SMTP id u198so366625vkb.13; Wed, 05 Jan 2022 12:36:57 -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=PFpxL8eNjWfN9L9+3lNFj3nd+2+vNaUo9b7OlF5oUWU=; b=MOzaZyxBX3Mcp7NycsdG6RBaO+0oKmPOdqDAe0sh0Ods0J5BVgNQd6WTsHq2z1dTNR 0Hcz5XTpa1HDn+ljXWi3Ene9RxrMrhMORzMtuo07KYswBrsYQoLvVp+VEhJ9G+8W3uTY 9Xog4dUYCz+RzTl5ZFiABiDCkHGiIo273jK8g73H+BXwGqg7uzbTyHbGBngCabCI8W1l v08A9+HNolepnYcvf1WKrgMKMDiCBNCWbVXeDBS7/axpTkNuep8e9tVZkSw5oM9qYCkP XTwlaov9v8uFIu1QBUYUc1Cyy5L5gV7G3tGqBci2Ms/IPXOeGkeiISEh7OzAVhDU3Dj5 Tg6A== 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=PFpxL8eNjWfN9L9+3lNFj3nd+2+vNaUo9b7OlF5oUWU=; b=KyhGB6YUcQ1SHeVXy4/htlr93Y67bU3FDRScuQlubhBJx9M2nnTivxUQbmZ00fJRFi Ude5K7KI7YlpBMZyTO63nq77mvCoMGP30MuIYpGKdLpqz318cVsHficGlJIdZURSWcka 1avMDzK0qhnRLD+x8VA1eMXpM9fvnjKly8hYYiAZ8Td5kHn2eyjyXLVH1kp4u2r1QF2K xR62MsrO91YfaozbXjgNsAsxm1MBwkqUp3b2pgT4s3C+S8RJhtRw9bvordaj19DF33VQ trvQy6G0PQVMnRpuoG1ZystQnMIMh5ZPdwMze+vU19vFdXyr5TqUeOn1tMFi3zmXrnS0 0nXw== X-Gm-Message-State: AOAM531GBxwwpUBPyJ83qa85FYiqgcCxpOxXje3AOWFG650dR6A0jNac mug/Hi+ljZ8fmyL82WRgoEE= X-Google-Smtp-Source: ABdhPJwDAuwT6naxOjUL5AyLq0SJlsEUSbEgq7WuMoQW8aEYk8+Vovkwf4Cg53hxRuabgFrryic7GA== X-Received: by 2002:a05:6122:d0f:: with SMTP id az15mr20333761vkb.28.1641415016836; Wed, 05 Jan 2022 12:36:56 -0800 (PST) Received: from localhost.localdomain ([181.22.170.52]) by smtp.gmail.com with ESMTPSA id t130sm7860vkc.32.2022.01.05.12.36.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 05 Jan 2022 12:36:56 -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 4/6] staging: vc04_services: rename string literal containing bm2835_* to bcm2835*_ Date: Wed, 5 Jan 2022 17:35:46 -0300 Message-Id: <91caae07fce0e4511f283388304e935526ba29ed.1641414449.git.gascoar@gmail.com> 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_123659_903451_C36979A0 X-CRM114-Status: UNSURE ( 9.76 ) X-CRM114-Notice: Please train this message. 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 string term bm2835_* to bcm2835_*. While at it, some realignments were made to improve readability. Suggested-by: Stefan Wahren Signed-off-by: Gaston Gonzalez --- .../staging/vc04_services/bcm2835-camera/bcm2835-camera.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/drivers/staging/vc04_services/bcm2835-camera/bcm2835-camera.c b/drivers/staging/vc04_services/bcm2835-camera/bcm2835-camera.c index cbc881e19f65..aaf529f2186c 100644 --- a/drivers/staging/vc04_services/bcm2835-camera/bcm2835-camera.c +++ b/drivers/staging/vc04_services/bcm2835-camera/bcm2835-camera.c @@ -884,12 +884,10 @@ static int vidioc_querycap(struct file *file, void *priv, vchiq_mmal_version(dev->instance, &major, &minor); - strscpy(cap->driver, "bm2835 mmal", sizeof(cap->driver)); - snprintf((char *)cap->card, sizeof(cap->card), "mmal service %d.%d", - major, minor); + strscpy(cap->driver, "bcm2835 mmal", sizeof(cap->driver)); + snprintf((char *)cap->card, sizeof(cap->card), "mmal service %d.%d", major, minor); - snprintf((char *)cap->bus_info, sizeof(cap->bus_info), - "platform:%s", dev->v4l2_dev.name); + snprintf((char *)cap->bus_info, sizeof(cap->bus_info), "platform:%s", dev->v4l2_dev.name); return 0; }