From patchwork Tue May 7 00:24:40 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Herdler X-Patchwork-Id: 13656138 Received: from mout.gmx.net (mout.gmx.net [212.227.17.20]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 37A498464 for ; Tue, 7 May 2024 00:25:29 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=212.227.17.20 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1715041536; cv=none; b=WIw6FlEfzFXDlTJAv5ke/3gU0klIQWqFuD5y7pJasWV+z5qk49gej6WuBtGAXgWtmUmMkf88EcGHSG8TFcD5BTFqrYDDsfnZQHiC8bz/AnEmPKWu6t4Npwm3WhwOvQXMyaA90ZVDMdGeO74BdcJ5Yaw3at3KzeG+EknzVKd87GE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1715041536; c=relaxed/simple; bh=fThSWgc8tyPlNmgg199MmzAxcYc36jcgEXMeOK+ZiFo=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=epKT18uv+W7RzbU1OIxesX3+H69E7thmzYTkyhPne34N/XFwwefaiB0iiB6Cz6RXAK4BHa6NhCiwZ1pZpW6vHaaSKSiPUVCZWz+njDM1kZLrdcENzHggIt+vLeNEq+Ep0mDXL4iuW74reJunYTUzPrvlOdZil+J19IE5Ay1ebhM= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=nurfuerspam.de; spf=pass smtp.mailfrom=nurfuerspam.de; dkim=pass (2048-bit key) header.d=nurfuerspam.de header.i=herdler@nurfuerspam.de header.b=diVmmJly; arc=none smtp.client-ip=212.227.17.20 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=nurfuerspam.de Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=nurfuerspam.de Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=nurfuerspam.de header.i=herdler@nurfuerspam.de header.b="diVmmJly" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nurfuerspam.de; s=s31663417; t=1715041525; x=1715646325; i=herdler@nurfuerspam.de; bh=lg1nqTZxH3b16Q/XhziY3fRKTjJw531jHqheM6/v1V4=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date:Message-Id:In-Reply-To: References:MIME-Version:Content-Transfer-Encoding:cc: content-transfer-encoding:content-type:date:from:message-id: mime-version:reply-to:subject:to; b=diVmmJlyJ5BC058janaFt+3ru/J5t3EUTN1p6+j41hIPJMKFYJogtMnQcT0i+Kaf EtHr7A8IWhEzRcWLtt9juU+4dJi71l0n4uF/OhNaYUjY9KYlboOQ7BZ26FYEGduh0 uXvL2xdHreW8ajrZ8BvKYJBZW8jsjQ9oArMpt7wu53vAoDz4HeL1+NrkPQEtLNUrA QIS15/jdBzo9LXgVBA+mI0NjvgHcNAh5LB5r4JYDPlFcSYcTHmth6OvxEQ8dfxrEf Odlck+33aeZUa7n3rA1NOfcrBTdBPgXvwIffKTq+c5DDuzYzk8Ft0Xh4Xd7kkAK13 Qj5K8I3WF33l0g3JHg== X-UI-Sender-Class: 724b4f7f-cbec-4199-ad4e-598c01a50d3a Received: from astro.haus ([185.101.174.109]) by mail.gmx.net (mrgmx105 [212.227.17.168]) with ESMTPSA (Nemesis) id 1MhU5b-1sZKnG17Z5-00eZOe; Tue, 07 May 2024 02:25:25 +0200 From: Stefan Herdler To: hverkuil-cisco@xs4all.nl Cc: linux-media@vger.kernel.org, smoch@web.de, tmn505@gmail.com, vinschen@redhat.com Subject: [PATCH 01/21] media: av7110: remove old documentation files Date: Tue, 7 May 2024 02:24:40 +0200 Message-Id: <20240507002500.81867-2-herdler@nurfuerspam.de> X-Mailer: git-send-email 2.34.0 In-Reply-To: <20240507002500.81867-1-herdler@nurfuerspam.de> References: <20240507002500.81867-1-herdler@nurfuerspam.de> Precedence: bulk X-Mailing-List: linux-media@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Provags-ID: V03:K1:QBiY7r7A9g+ygBIU5uWtxTYcIkNTV94mLMzmkJ0bzTRYyudlnWl mp63HOE+XLzjUsWjSuZUSQWrLhgyt+IaqGzx3CnxAeUv/bbz7xuANnEW9cYNhReE5f4yiWP wv6PLsaO3UTQ8J9pnV/6/Rv3yGlNyBX1p3NEgv8t8L7V0zFdi2ryiQ4DzIrb8N0n7bW3+M5 IANU9qDwreuzhK4emaFGQ== X-Spam-Flag: NO UI-OutboundReport: notjunk:1;M01:P0:MyrncktpJDc=;VimwN7lnI1yLey118/nzOEPe/7E OYlHRBMu9dPzhyuWOEOkEvJq4MARbt6RhqrRMfkxr9ONvCQbDEWuTdk1TDlcBBZ8Auz5sXrt3 OpDzYw3OPDckmhy3/eEwa1vmdH4QXCGyJqHt5hKz7mIiGb7fY3PL3UuirkYRmuMA4yfEvf1oW K12nK5ht2Vhcsta4PaGC5vm7vQJj0ZuBYLwlDV2EXEGrD70n+SZzoM7spXVrqtKT1B9kO/UlK iolp/7oqh1Qg2XsCmvPH2wN7fKQf1j0+KBOg4qruZkQbwtx4nhAOm40GyRj+oY+Mh2OXA3C5E IWl+vI/y7TwSPgMF7r0ZE3jcMdXS8aASVeqhOeCJsbYcztgXyl+Xl1qXeTPhIaL04qSDuaqhQ S3eVU1cNxtuMDxWk47VUEVTwQ58uFpZXi0d04eOK9tu4JPpN4J+odVzN6ffl1UaIhn1FUm6dT 6LOFV4zi+l6DEGhdpBLibgssNzODb8OKQ5rJUy2gO7REzolUMvKrMrf50bY+wQi9+P4FZitGT oVyIRdbYwNU1Y2qQGQujAXdTPFtvXt+wfKqzFcMQv5kqX9JbaAhfi1L8qoip+nXg3rZEqteQt TFzH/unrzGcFgzFEAAVrsVV0G4aCFbJ783yM4JhKUWOe3rEH5uB3UIy+LQOVeWTQGVUrnjMtU UoYbYJ8XRnGgOy1iWV//yNaN+o7KM00ktCnoQKmmGkhpYrxtxQKTXZh/MGdHoQSeGK+DokoSV FUCWhrK+sfr8tLEDRaDwXWn1XkNFDmVKksnCbvlySdMEXJmbEQXTQzWy+W1Wopm3kTtiZKdZI sGpvoP71QqOdH2KO4SR4fselj57LcykdtRJeHB9Cg1AOw= The documentation has been update and is now at: linux/Documentation/userspace-api/media/dvb/legacy_dvb_osd.rst linux/Documentation/userspace-api/media/dvb/legacy_dvb_audio.rst linux/Documentation/userspace-api/media/dvb/legacy_dvb_video.rst The .rst files of the old documentation aren't necessary any more, remove them. Signed-off-by: Stefan Herdler --- drivers/staging/media/av7110/TODO | 3 - .../av7110/audio-bilingual-channel-select.rst | 58 ---- .../media/av7110/audio-channel-select.rst | 57 ---- .../media/av7110/audio-clear-buffer.rst | 48 ---- .../staging/media/av7110/audio-continue.rst | 48 ---- drivers/staging/media/av7110/audio-fclose.rst | 51 ---- drivers/staging/media/av7110/audio-fopen.rst | 103 -------- drivers/staging/media/av7110/audio-fwrite.rst | 79 ------ .../media/av7110/audio-get-capabilities.rst | 54 ---- .../staging/media/av7110/audio-get-status.rst | 54 ---- drivers/staging/media/av7110/audio-pause.rst | 49 ---- drivers/staging/media/av7110/audio-play.rst | 48 ---- .../media/av7110/audio-select-source.rst | 56 ---- .../media/av7110/audio-set-av-sync.rst | 58 ---- .../media/av7110/audio-set-bypass-mode.rst | 62 ----- drivers/staging/media/av7110/audio-set-id.rst | 59 ----- .../staging/media/av7110/audio-set-mixer.rst | 53 ---- .../staging/media/av7110/audio-set-mute.rst | 62 ----- .../media/av7110/audio-set-streamtype.rst | 66 ----- drivers/staging/media/av7110/audio-stop.rst | 48 ---- drivers/staging/media/av7110/audio.rst | 27 -- .../staging/media/av7110/audio_data_types.rst | 116 -------- .../media/av7110/audio_function_calls.rst | 30 --- .../media/av7110/video-clear-buffer.rst | 54 ---- .../staging/media/av7110/video-command.rst | 96 ------- .../staging/media/av7110/video-continue.rst | 57 ---- .../media/av7110/video-fast-forward.rst | 72 ----- drivers/staging/media/av7110/video-fclose.rst | 51 ---- drivers/staging/media/av7110/video-fopen.rst | 111 -------- drivers/staging/media/av7110/video-freeze.rst | 61 ----- drivers/staging/media/av7110/video-fwrite.rst | 79 ------ .../media/av7110/video-get-capabilities.rst | 61 ----- .../staging/media/av7110/video-get-event.rst | 105 -------- .../media/av7110/video-get-frame-count.rst | 65 ----- .../staging/media/av7110/video-get-pts.rst | 69 ----- .../staging/media/av7110/video-get-size.rst | 69 ----- .../staging/media/av7110/video-get-status.rst | 72 ----- drivers/staging/media/av7110/video-play.rst | 57 ---- .../media/av7110/video-select-source.rst | 76 ------ .../staging/media/av7110/video-set-blank.rst | 64 ----- .../media/av7110/video-set-display-format.rst | 60 ----- .../staging/media/av7110/video-set-format.rst | 82 ------ .../media/av7110/video-set-streamtype.rst | 61 ----- .../staging/media/av7110/video-slowmotion.rst | 72 ----- .../media/av7110/video-stillpicture.rst | 61 ----- drivers/staging/media/av7110/video-stop.rst | 74 ------ .../media/av7110/video-try-command.rst | 66 ----- drivers/staging/media/av7110/video.rst | 36 --- .../media/av7110/video_function_calls.rst | 35 --- drivers/staging/media/av7110/video_types.rst | 248 ------------------ 50 files changed, 3303 deletions(-) delete mode 100644 drivers/staging/media/av7110/TODO delete mode 100644 drivers/staging/media/av7110/audio-bilingual-channel-select.rst delete mode 100644 drivers/staging/media/av7110/audio-channel-select.rst delete mode 100644 drivers/staging/media/av7110/audio-clear-buffer.rst delete mode 100644 drivers/staging/media/av7110/audio-continue.rst delete mode 100644 drivers/staging/media/av7110/audio-fclose.rst delete mode 100644 drivers/staging/media/av7110/audio-fopen.rst delete mode 100644 drivers/staging/media/av7110/audio-fwrite.rst delete mode 100644 drivers/staging/media/av7110/audio-get-capabilities.rst delete mode 100644 drivers/staging/media/av7110/audio-get-status.rst delete mode 100644 drivers/staging/media/av7110/audio-pause.rst delete mode 100644 drivers/staging/media/av7110/audio-play.rst delete mode 100644 drivers/staging/media/av7110/audio-select-source.rst delete mode 100644 drivers/staging/media/av7110/audio-set-av-sync.rst delete mode 100644 drivers/staging/media/av7110/audio-set-bypass-mode.rst delete mode 100644 drivers/staging/media/av7110/audio-set-id.rst delete mode 100644 drivers/staging/media/av7110/audio-set-mixer.rst delete mode 100644 drivers/staging/media/av7110/audio-set-mute.rst delete mode 100644 drivers/staging/media/av7110/audio-set-streamtype.rst delete mode 100644 drivers/staging/media/av7110/audio-stop.rst delete mode 100644 drivers/staging/media/av7110/audio.rst delete mode 100644 drivers/staging/media/av7110/audio_data_types.rst delete mode 100644 drivers/staging/media/av7110/audio_function_calls.rst delete mode 100644 drivers/staging/media/av7110/video-clear-buffer.rst delete mode 100644 drivers/staging/media/av7110/video-command.rst delete mode 100644 drivers/staging/media/av7110/video-continue.rst delete mode 100644 drivers/staging/media/av7110/video-fast-forward.rst delete mode 100644 drivers/staging/media/av7110/video-fclose.rst delete mode 100644 drivers/staging/media/av7110/video-fopen.rst delete mode 100644 drivers/staging/media/av7110/video-freeze.rst delete mode 100644 drivers/staging/media/av7110/video-fwrite.rst delete mode 100644 drivers/staging/media/av7110/video-get-capabilities.rst delete mode 100644 drivers/staging/media/av7110/video-get-event.rst delete mode 100644 drivers/staging/media/av7110/video-get-frame-count.rst delete mode 100644 drivers/staging/media/av7110/video-get-pts.rst delete mode 100644 drivers/staging/media/av7110/video-get-size.rst delete mode 100644 drivers/staging/media/av7110/video-get-status.rst delete mode 100644 drivers/staging/media/av7110/video-play.rst delete mode 100644 drivers/staging/media/av7110/video-select-source.rst delete mode 100644 drivers/staging/media/av7110/video-set-blank.rst delete mode 100644 drivers/staging/media/av7110/video-set-display-format.rst delete mode 100644 drivers/staging/media/av7110/video-set-format.rst delete mode 100644 drivers/staging/media/av7110/video-set-streamtype.rst delete mode 100644 drivers/staging/media/av7110/video-slowmotion.rst delete mode 100644 drivers/staging/media/av7110/video-stillpicture.rst delete mode 100644 drivers/staging/media/av7110/video-stop.rst delete mode 100644 drivers/staging/media/av7110/video-try-command.rst delete mode 100644 drivers/staging/media/av7110/video.rst delete mode 100644 drivers/staging/media/av7110/video_function_calls.rst delete mode 100644 drivers/staging/media/av7110/video_types.rst -- 2.34.0 diff --git a/drivers/staging/media/av7110/TODO b/drivers/staging/media/av7110/TODO deleted file mode 100644 index 60062d844..000000000 --- a/drivers/staging/media/av7110/TODO +++ /dev/null @@ -1,3 +0,0 @@ -- This driver is too old and relies on a different API. - Drop it from Kernel on a couple of versions. -- Cleanup patches for the drivers here won't be accepted. diff --git a/drivers/staging/media/av7110/audio-bilingual-channel-select.rst b/drivers/staging/media/av7110/audio-bilingual-channel-select.rst deleted file mode 100644 index 33b536331..000000000 --- a/drivers/staging/media/av7110/audio-bilingual-channel-select.rst +++ /dev/null @@ -1,58 +0,0 @@ -.. SPDX-License-Identifier: GFDL-1.1-no-invariants-or-later -.. c:namespace:: DTV.audio - -.. _AUDIO_BILINGUAL_CHANNEL_SELECT: - -============================== -AUDIO_BILINGUAL_CHANNEL_SELECT -============================== - -Name ----- - -AUDIO_BILINGUAL_CHANNEL_SELECT - -.. attention:: This ioctl is deprecated - -Synopsis --------- - -.. c:macro:: AUDIO_BILINGUAL_CHANNEL_SELECT - -``int ioctl(int fd, AUDIO_BILINGUAL_CHANNEL_SELECT, struct audio_channel_select *select)`` - -Arguments ---------- - -.. flat-table:: - :header-rows: 0 - :stub-columns: 0 - - - - - - int fd - - - File descriptor returned by a previous call to open(). - - - - - - audio_channel_select_t ch - - - Select the output format of the audio (mono left/right, stereo). - -Description ------------ - -This ioctl is obsolete. Do not use in new drivers. It has been replaced -by the V4L2 ``V4L2_CID_MPEG_AUDIO_DEC_MULTILINGUAL_PLAYBACK`` control -for MPEG decoders controlled through V4L2. - -This ioctl call asks the Audio Device to select the requested channel -for bilingual streams if possible. - -Return Value ------------- - -On success 0 is returned, on error -1 and the ``errno`` variable is set -appropriately. The generic error codes are described at the -:ref:`Generic Error Codes ` chapter. diff --git a/drivers/staging/media/av7110/audio-channel-select.rst b/drivers/staging/media/av7110/audio-channel-select.rst deleted file mode 100644 index 74093df92..000000000 --- a/drivers/staging/media/av7110/audio-channel-select.rst +++ /dev/null @@ -1,57 +0,0 @@ -.. SPDX-License-Identifier: GFDL-1.1-no-invariants-or-later -.. c:namespace:: DTV.audio - -.. _AUDIO_CHANNEL_SELECT: - -==================== -AUDIO_CHANNEL_SELECT -==================== - -Name ----- - -AUDIO_CHANNEL_SELECT - -.. attention:: This ioctl is deprecated - -Synopsis --------- - -.. c:macro:: AUDIO_CHANNEL_SELECT - -``int ioctl(int fd, AUDIO_CHANNEL_SELECT, struct audio_channel_select *select)`` - -Arguments ---------- - -.. flat-table:: - :header-rows: 0 - :stub-columns: 0 - - - - - - int fd - - - File descriptor returned by a previous call to open(). - - - - - - audio_channel_select_t ch - - - Select the output format of the audio (mono left/right, stereo). - -Description ------------ - -This ioctl is for Digital TV devices only. To control a V4L2 decoder use the -V4L2 ``V4L2_CID_MPEG_AUDIO_DEC_PLAYBACK`` control instead. - -This ioctl call asks the Audio Device to select the requested channel if -possible. - -Return Value ------------- - -On success 0 is returned, on error -1 and the ``errno`` variable is set -appropriately. The generic error codes are described at the -:ref:`Generic Error Codes ` chapter. diff --git a/drivers/staging/media/av7110/audio-clear-buffer.rst b/drivers/staging/media/av7110/audio-clear-buffer.rst deleted file mode 100644 index a0ebb0278..000000000 --- a/drivers/staging/media/av7110/audio-clear-buffer.rst +++ /dev/null @@ -1,48 +0,0 @@ -.. SPDX-License-Identifier: GFDL-1.1-no-invariants-or-later -.. c:namespace:: DTV.audio - -.. _AUDIO_CLEAR_BUFFER: - -================== -AUDIO_CLEAR_BUFFER -================== - -Name ----- - -AUDIO_CLEAR_BUFFER - -.. attention:: This ioctl is deprecated - -Synopsis --------- - -.. c:macro:: AUDIO_CLEAR_BUFFER - -``int ioctl(int fd, AUDIO_CLEAR_BUFFER)`` - -Arguments ---------- - -.. flat-table:: - :header-rows: 0 - :stub-columns: 0 - - - .. row 1 - - - int fd - - - File descriptor returned by a previous call to open(). - -Description ------------ - -This ioctl call asks the Audio Device to clear all software and hardware -buffers of the audio decoder device. - -Return Value ------------- - -On success 0 is returned, on error -1 and the ``errno`` variable is set -appropriately. The generic error codes are described at the -:ref:`Generic Error Codes ` chapter. diff --git a/drivers/staging/media/av7110/audio-continue.rst b/drivers/staging/media/av7110/audio-continue.rst deleted file mode 100644 index a2e9850f3..000000000 --- a/drivers/staging/media/av7110/audio-continue.rst +++ /dev/null @@ -1,48 +0,0 @@ -.. SPDX-License-Identifier: GFDL-1.1-no-invariants-or-later -.. c:namespace:: DTV.audio - -.. _AUDIO_CONTINUE: - -============== -AUDIO_CONTINUE -============== - -Name ----- - -AUDIO_CONTINUE - -.. attention:: This ioctl is deprecated - -Synopsis --------- - -.. c:macro:: AUDIO_CONTINUE - -``int ioctl(int fd, AUDIO_CONTINUE)`` - -Arguments ---------- - -.. flat-table:: - :header-rows: 0 - :stub-columns: 0 - - - .. row 1 - - - int fd - - - File descriptor returned by a previous call to open(). - -Description ------------ - -This ioctl restarts the decoding and playing process previously paused -with AUDIO_PAUSE command. - -Return Value ------------- - -On success 0 is returned, on error -1 and the ``errno`` variable is set -appropriately. The generic error codes are described at the -:ref:`Generic Error Codes ` chapter. diff --git a/drivers/staging/media/av7110/audio-fclose.rst b/drivers/staging/media/av7110/audio-fclose.rst deleted file mode 100644 index 77857d578..000000000 --- a/drivers/staging/media/av7110/audio-fclose.rst +++ /dev/null @@ -1,51 +0,0 @@ -.. SPDX-License-Identifier: GFDL-1.1-no-invariants-or-later -.. c:namespace:: DTV.audio - -.. _audio_fclose: - -======================== -Digital TV audio close() -======================== - -Name ----- - -Digital TV audio close() - -.. attention:: This ioctl is deprecated - -Synopsis --------- - -.. c:function:: int close(int fd) - -Arguments ---------- - -.. flat-table:: - :header-rows: 0 - :stub-columns: 0 - - - .. row 1 - - - int fd - - - File descriptor returned by a previous call to open(). - -Description ------------ - -This system call closes a previously opened audio device. - -Return Value ------------- - -.. flat-table:: - :header-rows: 0 - :stub-columns: 0 - - - .. row 1 - - - ``EBADF`` - - - fd is not a valid open file descriptor. diff --git a/drivers/staging/media/av7110/audio-fopen.rst b/drivers/staging/media/av7110/audio-fopen.rst deleted file mode 100644 index 774daaab3..000000000 --- a/drivers/staging/media/av7110/audio-fopen.rst +++ /dev/null @@ -1,103 +0,0 @@ -.. SPDX-License-Identifier: GFDL-1.1-no-invariants-or-later -.. c:namespace:: DTV.audio - -.. _audio_fopen: - -======================= -Digital TV audio open() -======================= - -Name ----- - -Digital TV audio open() - -.. attention:: This ioctl is deprecated - -Synopsis --------- - -.. c:function:: int open(const char *deviceName, int flags) - -Arguments ---------- - -.. flat-table:: - :header-rows: 0 - :stub-columns: 0 - - - .. row 1 - - - const char \*deviceName - - - Name of specific audio device. - - - .. row 2 - - - int flags - - - A bit-wise OR of the following flags: - - - .. row 3 - - - - - O_RDONLY read-only access - - - .. row 4 - - - - - O_RDWR read/write access - - - .. row 5 - - - - - O_NONBLOCK open in non-blocking mode - - - .. row 6 - - - - - (blocking mode is the default) - -Description ------------ - -This system call opens a named audio device (e.g. -/dev/dvb/adapter0/audio0) for subsequent use. When an open() call has -succeeded, the device will be ready for use. The significance of -blocking or non-blocking mode is described in the documentation for -functions where there is a difference. It does not affect the semantics -of the open() call itself. A device opened in blocking mode can later be -put into non-blocking mode (and vice versa) using the F_SETFL command -of the fcntl system call. This is a standard system call, documented in -the Linux manual page for fcntl. Only one user can open the Audio Device -in O_RDWR mode. All other attempts to open the device in this mode will -fail, and an error code will be returned. If the Audio Device is opened -in O_RDONLY mode, the only ioctl call that can be used is -AUDIO_GET_STATUS. All other call will return with an error code. - -Return Value ------------- - -.. tabularcolumns:: |p{2.5cm}|p{15.0cm}| - -.. flat-table:: - :header-rows: 0 - :stub-columns: 0 - - - .. row 1 - - - ``ENODEV`` - - - Device driver not loaded/available. - - - .. row 2 - - - ``EBUSY`` - - - Device or resource busy. - - - .. row 3 - - - ``EINVAL`` - - - Invalid argument. diff --git a/drivers/staging/media/av7110/audio-fwrite.rst b/drivers/staging/media/av7110/audio-fwrite.rst deleted file mode 100644 index 7b096ac2b..000000000 --- a/drivers/staging/media/av7110/audio-fwrite.rst +++ /dev/null @@ -1,79 +0,0 @@ -.. SPDX-License-Identifier: GFDL-1.1-no-invariants-or-later -.. c:namespace:: DTV.audio - -.. _audio_fwrite: - -========================= -Digital TV audio write() -========================= - -Name ----- - -Digital TV audio write() - -.. attention:: This ioctl is deprecated - -Synopsis --------- - -.. c:function:: size_t write(int fd, const void *buf, size_t count) - -Arguments ---------- - -.. flat-table:: - :header-rows: 0 - :stub-columns: 0 - - - .. row 1 - - - int fd - - - File descriptor returned by a previous call to open(). - - - .. row 2 - - - void \*buf - - - Pointer to the buffer containing the PES data. - - - .. row 3 - - - size_t count - - - Size of buf. - -Description ------------ - -This system call can only be used if AUDIO_SOURCE_MEMORY is selected -in the ioctl call AUDIO_SELECT_SOURCE. The data provided shall be in -PES format. If O_NONBLOCK is not specified the function will block -until buffer space is available. The amount of data to be transferred is -implied by count. - -Return Value ------------- - -.. flat-table:: - :header-rows: 0 - :stub-columns: 0 - - - .. row 1 - - - ``EPERM`` - - - Mode AUDIO_SOURCE_MEMORY not selected. - - - .. row 2 - - - ``ENOMEM`` - - - Attempted to write more data than the internal buffer can hold. - - - .. row 3 - - - ``EBADF`` - - - fd is not a valid open file descriptor. diff --git a/drivers/staging/media/av7110/audio-get-capabilities.rst b/drivers/staging/media/av7110/audio-get-capabilities.rst deleted file mode 100644 index 6d9eb71da..000000000 --- a/drivers/staging/media/av7110/audio-get-capabilities.rst +++ /dev/null @@ -1,54 +0,0 @@ -.. SPDX-License-Identifier: GFDL-1.1-no-invariants-or-later -.. c:namespace:: DTV.audio - -.. _AUDIO_GET_CAPABILITIES: - -====================== -AUDIO_GET_CAPABILITIES -====================== - -Name ----- - -AUDIO_GET_CAPABILITIES - -.. attention:: This ioctl is deprecated - -Synopsis --------- - -.. c:macro:: AUDIO_GET_CAPABILITIES - -``int ioctl(int fd, AUDIO_GET_CAPABILITIES, unsigned int *cap)`` - -Arguments ---------- - -.. flat-table:: - :header-rows: 0 - :stub-columns: 0 - - - - - - int fd - - - File descriptor returned by a previous call to open(). - - - - - - unsigned int \*cap - - - Returns a bit array of supported sound formats. - -Description ------------ - -This ioctl call asks the Audio Device to tell us about the decoding -capabilities of the audio hardware. - -Return Value ------------- - -On success 0 is returned, on error -1 and the ``errno`` variable is set -appropriately. The generic error codes are described at the -:ref:`Generic Error Codes ` chapter. diff --git a/drivers/staging/media/av7110/audio-get-status.rst b/drivers/staging/media/av7110/audio-get-status.rst deleted file mode 100644 index 7ae8db2e6..000000000 --- a/drivers/staging/media/av7110/audio-get-status.rst +++ /dev/null @@ -1,54 +0,0 @@ -.. SPDX-License-Identifier: GFDL-1.1-no-invariants-or-later -.. c:namespace:: DTV.audio - -.. _AUDIO_GET_STATUS: - -================ -AUDIO_GET_STATUS -================ - -Name ----- - -AUDIO_GET_STATUS - -.. attention:: This ioctl is deprecated - -Synopsis --------- - -.. c:macro:: AUDIO_GET_STATUS - -``int ioctl(int fd, AUDIO_GET_STATUS, struct audio_status *status)`` - -Arguments ---------- - -.. flat-table:: - :header-rows: 0 - :stub-columns: 0 - - - - - - int fd - - - File descriptor returned by a previous call to open(). - - - - - - struct audio_status \*status - - - Returns the current state of Audio Device. - -Description ------------ - -This ioctl call asks the Audio Device to return the current state of the -Audio Device. - -Return Value ------------- - -On success 0 is returned, on error -1 and the ``errno`` variable is set -appropriately. The generic error codes are described at the -:ref:`Generic Error Codes ` chapter. diff --git a/drivers/staging/media/av7110/audio-pause.rst b/drivers/staging/media/av7110/audio-pause.rst deleted file mode 100644 index d37d1ddce..000000000 --- a/drivers/staging/media/av7110/audio-pause.rst +++ /dev/null @@ -1,49 +0,0 @@ -.. SPDX-License-Identifier: GFDL-1.1-no-invariants-or-later -.. c:namespace:: DTV.audio - -.. _AUDIO_PAUSE: - -=========== -AUDIO_PAUSE -=========== - -Name ----- - -AUDIO_PAUSE - -.. attention:: This ioctl is deprecated - -Synopsis --------- - -.. c:macro:: AUDIO_PAUSE - -``int ioctl(int fd, AUDIO_PAUSE)`` - -Arguments ---------- - -.. flat-table:: - :header-rows: 0 - :stub-columns: 0 - - - .. row 1 - - - int fd - - - File descriptor returned by a previous call to open(). - -Description ------------ - -This ioctl call suspends the audio stream being played. Decoding and -playing are paused. It is then possible to restart again decoding and -playing process of the audio stream using AUDIO_CONTINUE command. - -Return Value ------------- - -On success 0 is returned, on error -1 and the ``errno`` variable is set -appropriately. The generic error codes are described at the -:ref:`Generic Error Codes ` chapter. diff --git a/drivers/staging/media/av7110/audio-play.rst b/drivers/staging/media/av7110/audio-play.rst deleted file mode 100644 index e591930b6..000000000 --- a/drivers/staging/media/av7110/audio-play.rst +++ /dev/null @@ -1,48 +0,0 @@ -.. SPDX-License-Identifier: GFDL-1.1-no-invariants-or-later -.. c:namespace:: DTV.audio - -.. _AUDIO_PLAY: - -========== -AUDIO_PLAY -========== - -Name ----- - -AUDIO_PLAY - -.. attention:: This ioctl is deprecated - -Synopsis --------- - -.. c:macro:: AUDIO_PLAY - -``int ioctl(int fd, AUDIO_PLAY)`` - -Arguments ---------- - -.. flat-table:: - :header-rows: 0 - :stub-columns: 0 - - - .. row 1 - - - int fd - - - File descriptor returned by a previous call to open(). - -Description ------------ - -This ioctl call asks the Audio Device to start playing an audio stream -from the selected source. - -Return Value ------------- - -On success 0 is returned, on error -1 and the ``errno`` variable is set -appropriately. The generic error codes are described at the -:ref:`Generic Error Codes ` chapter. diff --git a/drivers/staging/media/av7110/audio-select-source.rst b/drivers/staging/media/av7110/audio-select-source.rst deleted file mode 100644 index 6a0c0f365..000000000 --- a/drivers/staging/media/av7110/audio-select-source.rst +++ /dev/null @@ -1,56 +0,0 @@ -.. SPDX-License-Identifier: GFDL-1.1-no-invariants-or-later -.. c:namespace:: DTV.audio - -.. _AUDIO_SELECT_SOURCE: - -=================== -AUDIO_SELECT_SOURCE -=================== - -Name ----- - -AUDIO_SELECT_SOURCE - -.. attention:: This ioctl is deprecated - -Synopsis --------- - -.. c:macro:: AUDIO_SELECT_SOURCE - -``int ioctl(int fd, AUDIO_SELECT_SOURCE, struct audio_stream_source *source)`` - -Arguments ---------- - -.. flat-table:: - :header-rows: 0 - :stub-columns: 0 - - - - - - int fd - - - File descriptor returned by a previous call to open(). - - - - - - audio_stream_source_t source - - - Indicates the source that shall be used for the Audio stream. - -Description ------------ - -This ioctl call informs the audio device which source shall be used for -the input data. The possible sources are demux or memory. If -AUDIO_SOURCE_MEMORY is selected, the data is fed to the Audio Device -through the write command. - -Return Value ------------- - -On success 0 is returned, on error -1 and the ``errno`` variable is set -appropriately. The generic error codes are described at the -:ref:`Generic Error Codes ` chapter. diff --git a/drivers/staging/media/av7110/audio-set-av-sync.rst b/drivers/staging/media/av7110/audio-set-av-sync.rst deleted file mode 100644 index 85a8016bf..000000000 --- a/drivers/staging/media/av7110/audio-set-av-sync.rst +++ /dev/null @@ -1,58 +0,0 @@ -.. SPDX-License-Identifier: GFDL-1.1-no-invariants-or-later -.. c:namespace:: DTV.audio - -.. _AUDIO_SET_AV_SYNC: - -================= -AUDIO_SET_AV_SYNC -================= - -Name ----- - -AUDIO_SET_AV_SYNC - -.. attention:: This ioctl is deprecated - -Synopsis --------- - -.. c:macro:: AUDIO_SET_AV_SYNC - -``int ioctl(int fd, AUDIO_SET_AV_SYNC, boolean state)`` - -Arguments ---------- - -.. flat-table:: - :header-rows: 0 - :stub-columns: 0 - - - - - - int fd - - - File descriptor returned by a previous call to open(). - - - - - - boolean state - - - Tells the Digital TV subsystem if A/V synchronization shall be ON or OFF. - - TRUE: AV-sync ON - - FALSE: AV-sync OFF - -Description ------------ - -This ioctl call asks the Audio Device to turn ON or OFF A/V -synchronization. - -Return Value ------------- - -On success 0 is returned, on error -1 and the ``errno`` variable is set -appropriately. The generic error codes are described at the -:ref:`Generic Error Codes ` chapter. diff --git a/drivers/staging/media/av7110/audio-set-bypass-mode.rst b/drivers/staging/media/av7110/audio-set-bypass-mode.rst deleted file mode 100644 index 80d551a20..000000000 --- a/drivers/staging/media/av7110/audio-set-bypass-mode.rst +++ /dev/null @@ -1,62 +0,0 @@ -.. SPDX-License-Identifier: GFDL-1.1-no-invariants-or-later -.. c:namespace:: DTV.audio - -.. _AUDIO_SET_BYPASS_MODE: - -===================== -AUDIO_SET_BYPASS_MODE -===================== - -Name ----- - -AUDIO_SET_BYPASS_MODE - -.. attention:: This ioctl is deprecated - -Synopsis --------- - -.. c:macro:: AUDIO_SET_BYPASS_MODE - -``int ioctl(int fd, AUDIO_SET_BYPASS_MODE, boolean mode)`` - -Arguments ---------- - -.. flat-table:: - :header-rows: 0 - :stub-columns: 0 - - - - - - int fd - - - File descriptor returned by a previous call to open(). - - - - - - boolean mode - - - Enables or disables the decoding of the current Audio stream in - the Digital TV subsystem. - - TRUE: Bypass is disabled - - FALSE: Bypass is enabled - -Description ------------ - -This ioctl call asks the Audio Device to bypass the Audio decoder and -forward the stream without decoding. This mode shall be used if streams -that can't be handled by the Digital TV system shall be decoded. Dolby -DigitalTM streams are automatically forwarded by the Digital TV subsystem if -the hardware can handle it. - -Return Value ------------- - -On success 0 is returned, on error -1 and the ``errno`` variable is set -appropriately. The generic error codes are described at the -:ref:`Generic Error Codes ` chapter. diff --git a/drivers/staging/media/av7110/audio-set-id.rst b/drivers/staging/media/av7110/audio-set-id.rst deleted file mode 100644 index 39ad846d4..000000000 --- a/drivers/staging/media/av7110/audio-set-id.rst +++ /dev/null @@ -1,59 +0,0 @@ -.. SPDX-License-Identifier: GFDL-1.1-no-invariants-or-later -.. c:namespace:: DTV.audio - -.. _AUDIO_SET_ID: - -============ -AUDIO_SET_ID -============ - -Name ----- - -AUDIO_SET_ID - -.. attention:: This ioctl is deprecated - -Synopsis --------- - -.. c:macro:: AUDIO_SET_ID - -``int ioctl(int fd, AUDIO_SET_ID, int id)`` - -Arguments ---------- - -.. flat-table:: - :header-rows: 0 - :stub-columns: 0 - - - - - - int fd - - - File descriptor returned by a previous call to open(). - - - - - - int id - - - audio sub-stream id - -Description ------------ - -This ioctl selects which sub-stream is to be decoded if a program or -system stream is sent to the video device. If no audio stream type is -set the id has to be in [0xC0,0xDF] for MPEG sound, in [0x80,0x87] for -AC3 and in [0xA0,0xA7] for LPCM. More specifications may follow for -other stream types. If the stream type is set the id just specifies the -substream id of the audio stream and only the first 5 bits are -recognized. - -Return Value ------------- - -On success 0 is returned, on error -1 and the ``errno`` variable is set -appropriately. The generic error codes are described at the -:ref:`Generic Error Codes ` chapter. diff --git a/drivers/staging/media/av7110/audio-set-mixer.rst b/drivers/staging/media/av7110/audio-set-mixer.rst deleted file mode 100644 index 45dbdf480..000000000 --- a/drivers/staging/media/av7110/audio-set-mixer.rst +++ /dev/null @@ -1,53 +0,0 @@ -.. SPDX-License-Identifier: GFDL-1.1-no-invariants-or-later -.. c:namespace:: DTV.audio - -.. _AUDIO_SET_MIXER: - -=============== -AUDIO_SET_MIXER -=============== - -Name ----- - -AUDIO_SET_MIXER - -.. attention:: This ioctl is deprecated - -Synopsis --------- - -.. c:macro:: AUDIO_SET_MIXER - -``int ioctl(int fd, AUDIO_SET_MIXER, struct audio_mixer *mix)`` - -Arguments ---------- - -.. flat-table:: - :header-rows: 0 - :stub-columns: 0 - - - - - - int fd - - - File descriptor returned by a previous call to open(). - - - - - - audio_mixer_t \*mix - - - mixer settings. - -Description ------------ - -This ioctl lets you adjust the mixer settings of the audio decoder. - -Return Value ------------- - -On success 0 is returned, on error -1 and the ``errno`` variable is set -appropriately. The generic error codes are described at the -:ref:`Generic Error Codes ` chapter. diff --git a/drivers/staging/media/av7110/audio-set-mute.rst b/drivers/staging/media/av7110/audio-set-mute.rst deleted file mode 100644 index 987751f92..000000000 --- a/drivers/staging/media/av7110/audio-set-mute.rst +++ /dev/null @@ -1,62 +0,0 @@ -.. SPDX-License-Identifier: GFDL-1.1-no-invariants-or-later -.. c:namespace:: DTV.audio - -.. _AUDIO_SET_MUTE: - -============== -AUDIO_SET_MUTE -============== - -Name ----- - -AUDIO_SET_MUTE - -.. attention:: This ioctl is deprecated - -Synopsis --------- - -.. c:macro:: AUDIO_SET_MUTE - -``int ioctl(int fd, AUDIO_SET_MUTE, boolean state)`` - -Arguments ---------- - -.. flat-table:: - :header-rows: 0 - :stub-columns: 0 - - - - - - int fd - - - File descriptor returned by a previous call to open(). - - - - - - boolean state - - - Indicates if audio device shall mute or not. - - TRUE: Audio Mute - - FALSE: Audio Un-mute - -Description ------------ - -This ioctl is for Digital TV devices only. To control a V4L2 decoder use the -V4L2 :ref:`VIDIOC_DECODER_CMD` with the -``V4L2_DEC_CMD_START_MUTE_AUDIO`` flag instead. - -This ioctl call asks the audio device to mute the stream that is -currently being played. - -Return Value ------------- - -On success 0 is returned, on error -1 and the ``errno`` variable is set -appropriately. The generic error codes are described at the -:ref:`Generic Error Codes ` chapter. diff --git a/drivers/staging/media/av7110/audio-set-streamtype.rst b/drivers/staging/media/av7110/audio-set-streamtype.rst deleted file mode 100644 index 77d73c748..000000000 --- a/drivers/staging/media/av7110/audio-set-streamtype.rst +++ /dev/null @@ -1,66 +0,0 @@ -.. SPDX-License-Identifier: GFDL-1.1-no-invariants-or-later -.. c:namespace:: DTV.audio - -.. _AUDIO_SET_STREAMTYPE: - -==================== -AUDIO_SET_STREAMTYPE -==================== - -Name ----- - -AUDIO_SET_STREAMTYPE - -.. attention:: This ioctl is deprecated - -Synopsis --------- - -.. c:macro:: AUDIO_SET_STREAMTYPE - -``int ioctl(fd, AUDIO_SET_STREAMTYPE, int type)`` - -Arguments ---------- - -.. flat-table:: - :header-rows: 0 - :stub-columns: 0 - - - - - - int fd - - - File descriptor returned by a previous call to open(). - - - - - - int type - - - stream type - -Description ------------ - -This ioctl tells the driver which kind of audio stream to expect. This -is useful if the stream offers several audio sub-streams like LPCM and -AC3. - -Return Value ------------- - -On success 0 is returned, on error -1 and the ``errno`` variable is set -appropriately. The generic error codes are described at the -:ref:`Generic Error Codes ` chapter. - - -.. flat-table:: - :header-rows: 0 - :stub-columns: 0 - - - .. row 1 - - - ``EINVAL`` - - - type is not a valid or supported stream type. diff --git a/drivers/staging/media/av7110/audio-stop.rst b/drivers/staging/media/av7110/audio-stop.rst deleted file mode 100644 index d77f786fd..000000000 --- a/drivers/staging/media/av7110/audio-stop.rst +++ /dev/null @@ -1,48 +0,0 @@ -.. SPDX-License-Identifier: GFDL-1.1-no-invariants-or-later -.. c:namespace:: DTV.audio - -.. _AUDIO_STOP: - -========== -AUDIO_STOP -========== - -Name ----- - -AUDIO_STOP - -.. attention:: This ioctl is deprecated - -Synopsis --------- - -.. c:macro:: AUDIO_STOP - -``int ioctl(int fd, AUDIO_STOP)`` - -Arguments ---------- - -.. flat-table:: - :header-rows: 0 - :stub-columns: 0 - - - .. row 1 - - - int fd - - - File descriptor returned by a previous call to open(). - -Description ------------ - -This ioctl call asks the Audio Device to stop playing the current -stream. - -Return Value ------------- - -On success 0 is returned, on error -1 and the ``errno`` variable is set -appropriately. The generic error codes are described at the -:ref:`Generic Error Codes ` chapter. diff --git a/drivers/staging/media/av7110/audio.rst b/drivers/staging/media/av7110/audio.rst deleted file mode 100644 index aa753336b..000000000 --- a/drivers/staging/media/av7110/audio.rst +++ /dev/null @@ -1,27 +0,0 @@ -.. SPDX-License-Identifier: GFDL-1.1-no-invariants-or-later - -.. _dvb_audio: - -####################### -Digital TV Audio Device -####################### - -The Digital TV audio device controls the MPEG2 audio decoder of the Digital -TV hardware. It can be accessed through ``/dev/dvb/adapter?/audio?``. Data -types and ioctl definitions can be accessed by including -``linux/dvb/audio.h`` in your application. - -Please note that some Digital TV cards don't have their own MPEG decoder, which -results in the omission of the audio and video device. - -These ioctls were also used by V4L2 to control MPEG decoders implemented -in V4L2. The use of these ioctls for that purpose has been made obsolete -and proper V4L2 ioctls or controls have been created to replace that -functionality. - - -.. toctree:: - :maxdepth: 1 - - audio_data_types - audio_function_calls diff --git a/drivers/staging/media/av7110/audio_data_types.rst b/drivers/staging/media/av7110/audio_data_types.rst deleted file mode 100644 index 474452913..000000000 --- a/drivers/staging/media/av7110/audio_data_types.rst +++ /dev/null @@ -1,116 +0,0 @@ -.. SPDX-License-Identifier: GFDL-1.1-no-invariants-or-later - -.. _audio_data_types: - -**************** -Audio Data Types -**************** - -This section describes the structures, data types and defines used when -talking to the audio device. - -.. c:type:: audio_stream_source - -The audio stream source is set through the AUDIO_SELECT_SOURCE call -and can take the following values, depending on whether we are replaying -from an internal (demux) or external (user write) source. - - -.. code-block:: c - - typedef enum { - AUDIO_SOURCE_DEMUX, - AUDIO_SOURCE_MEMORY - } audio_stream_source_t; - -AUDIO_SOURCE_DEMUX selects the demultiplexer (fed either by the -frontend or the DVR device) as the source of the video stream. If -AUDIO_SOURCE_MEMORY is selected the stream comes from the application -through the ``write()`` system call. - - -.. c:type:: audio_play_state - -The following values can be returned by the AUDIO_GET_STATUS call -representing the state of audio playback. - - -.. code-block:: c - - typedef enum { - AUDIO_STOPPED, - AUDIO_PLAYING, - AUDIO_PAUSED - } audio_play_state_t; - - -.. c:type:: audio_channel_select - -The audio channel selected via AUDIO_CHANNEL_SELECT is determined by -the following values. - - -.. code-block:: c - - typedef enum { - AUDIO_STEREO, - AUDIO_MONO_LEFT, - AUDIO_MONO_RIGHT, - AUDIO_MONO, - AUDIO_STEREO_SWAPPED - } audio_channel_select_t; - - -.. c:type:: audio_status - -The AUDIO_GET_STATUS call returns the following structure informing -about various states of the playback operation. - - -.. code-block:: c - - typedef struct audio_status { - boolean AV_sync_state; - boolean mute_state; - audio_play_state_t play_state; - audio_stream_source_t stream_source; - audio_channel_select_t channel_select; - boolean bypass_mode; - audio_mixer_t mixer_state; - } audio_status_t; - - -.. c:type:: audio_mixer - -The following structure is used by the AUDIO_SET_MIXER call to set the -audio volume. - - -.. code-block:: c - - typedef struct audio_mixer { - unsigned int volume_left; - unsigned int volume_right; - } audio_mixer_t; - - -.. _audio_encodings: - -audio encodings -=============== - -A call to AUDIO_GET_CAPABILITIES returns an unsigned integer with the -following bits set according to the hardwares capabilities. - - -.. code-block:: c - - #define AUDIO_CAP_DTS 1 - #define AUDIO_CAP_LPCM 2 - #define AUDIO_CAP_MP1 4 - #define AUDIO_CAP_MP2 8 - #define AUDIO_CAP_MP3 16 - #define AUDIO_CAP_AAC 32 - #define AUDIO_CAP_OGG 64 - #define AUDIO_CAP_SDDS 128 - #define AUDIO_CAP_AC3 256 diff --git a/drivers/staging/media/av7110/audio_function_calls.rst b/drivers/staging/media/av7110/audio_function_calls.rst deleted file mode 100644 index fa5ba9539..000000000 --- a/drivers/staging/media/av7110/audio_function_calls.rst +++ /dev/null @@ -1,30 +0,0 @@ -.. SPDX-License-Identifier: GFDL-1.1-no-invariants-or-later - -.. _audio_function_calls: - -******************** -Audio Function Calls -******************** - -.. toctree:: - :maxdepth: 1 - - audio-fopen - audio-fclose - audio-fwrite - audio-stop - audio-play - audio-pause - audio-continue - audio-select-source - audio-set-mute - audio-set-av-sync - audio-set-bypass-mode - audio-channel-select - audio-bilingual-channel-select - audio-get-status - audio-get-capabilities - audio-clear-buffer - audio-set-id - audio-set-mixer - audio-set-streamtype diff --git a/drivers/staging/media/av7110/video-clear-buffer.rst b/drivers/staging/media/av7110/video-clear-buffer.rst deleted file mode 100644 index a7730559b..000000000 --- a/drivers/staging/media/av7110/video-clear-buffer.rst +++ /dev/null @@ -1,54 +0,0 @@ -.. SPDX-License-Identifier: GFDL-1.1-no-invariants-or-later -.. c:namespace:: DTV.video - -.. _VIDEO_CLEAR_BUFFER: - -================== -VIDEO_CLEAR_BUFFER -================== - -Name ----- - -VIDEO_CLEAR_BUFFER - -.. attention:: This ioctl is deprecated. - -Synopsis --------- - -.. c:macro:: VIDEO_CLEAR_BUFFER - -``int ioctl(fd, VIDEO_CLEAR_BUFFER)`` - -Arguments ---------- - -.. flat-table:: - :header-rows: 0 - :stub-columns: 0 - - - .. row 1 - - - int fd - - - File descriptor returned by a previous call to open(). - - - .. row 2 - - - int request - - - Equals VIDEO_CLEAR_BUFFER for this command. - -Description ------------ - -This ioctl call clears all video buffers in the driver and in the -decoder hardware. - -Return Value ------------- - -On success 0 is returned, on error -1 and the ``errno`` variable is set -appropriately. The generic error codes are described at the -:ref:`Generic Error Codes ` chapter. diff --git a/drivers/staging/media/av7110/video-command.rst b/drivers/staging/media/av7110/video-command.rst deleted file mode 100644 index cae9445eb..000000000 --- a/drivers/staging/media/av7110/video-command.rst +++ /dev/null @@ -1,96 +0,0 @@ -.. SPDX-License-Identifier: GFDL-1.1-no-invariants-or-later -.. c:namespace:: DTV.video - -.. _VIDEO_COMMAND: - -============= -VIDEO_COMMAND -============= - -Name ----- - -VIDEO_COMMAND - -.. attention:: This ioctl is deprecated. - -Synopsis --------- - -.. c:macro:: VIDEO_COMMAND - -``int ioctl(int fd, VIDEO_COMMAND, struct video_command *cmd)`` - -Arguments ---------- - -.. flat-table:: - :header-rows: 0 - :stub-columns: 0 - - - .. row 1 - - - int fd - - - File descriptor returned by a previous call to open(). - - - .. row 2 - - - int request - - - Equals VIDEO_COMMAND for this command. - - - .. row 3 - - - struct video_command \*cmd - - - Commands the decoder. - -Description ------------ - -This ioctl is obsolete. Do not use in new drivers. For V4L2 decoders -this ioctl has been replaced by the -:ref:`VIDIOC_DECODER_CMD` ioctl. - -This ioctl commands the decoder. The ``video_command`` struct is a -subset of the ``v4l2_decoder_cmd`` struct, so refer to the -:ref:`VIDIOC_DECODER_CMD` documentation for -more information. - -.. c:type:: video_command - -.. code-block:: c - - /* The structure must be zeroed before use by the application - This ensures it can be extended safely in the future. */ - struct video_command { - __u32 cmd; - __u32 flags; - union { - struct { - __u64 pts; - } stop; - - struct { - /* 0 or 1000 specifies normal speed, - 1 specifies forward single stepping, - -1 specifies backward single stepping, - >1: playback at speed/1000 of the normal speed, - <-1: reverse playback at (-speed/1000) of the normal speed. */ - __s32 speed; - __u32 format; - } play; - - struct { - __u32 data[16]; - } raw; - }; - }; - -Return Value ------------- - -On success 0 is returned, on error -1 and the ``errno`` variable is set -appropriately. The generic error codes are described at the -:ref:`Generic Error Codes ` chapter. diff --git a/drivers/staging/media/av7110/video-continue.rst b/drivers/staging/media/av7110/video-continue.rst deleted file mode 100644 index bc34bf398..000000000 --- a/drivers/staging/media/av7110/video-continue.rst +++ /dev/null @@ -1,57 +0,0 @@ -.. SPDX-License-Identifier: GFDL-1.1-no-invariants-or-later -.. c:namespace:: DTV.video - -.. _VIDEO_CONTINUE: - -============== -VIDEO_CONTINUE -============== - -Name ----- - -VIDEO_CONTINUE - -.. attention:: This ioctl is deprecated. - -Synopsis --------- - -.. c:macro:: VIDEO_CONTINUE - -``int ioctl(fd, VIDEO_CONTINUE)`` - -Arguments ---------- - -.. flat-table:: - :header-rows: 0 - :stub-columns: 0 - - - .. row 1 - - - int fd - - - File descriptor returned by a previous call to open(). - - - .. row 2 - - - int request - - - Equals VIDEO_CONTINUE for this command. - -Description ------------ - -This ioctl is for Digital TV devices only. To control a V4L2 decoder use the -V4L2 :ref:`VIDIOC_DECODER_CMD` instead. - -This ioctl call restarts decoding and playing processes of the video -stream which was played before a call to VIDEO_FREEZE was made. - -Return Value ------------- - -On success 0 is returned, on error -1 and the ``errno`` variable is set -appropriately. The generic error codes are described at the -:ref:`Generic Error Codes ` chapter. diff --git a/drivers/staging/media/av7110/video-fast-forward.rst b/drivers/staging/media/av7110/video-fast-forward.rst deleted file mode 100644 index e71fa8d69..000000000 --- a/drivers/staging/media/av7110/video-fast-forward.rst +++ /dev/null @@ -1,72 +0,0 @@ -.. SPDX-License-Identifier: GFDL-1.1-no-invariants-or-later -.. c:namespace:: DTV.video - -.. _VIDEO_FAST_FORWARD: - -================== -VIDEO_FAST_FORWARD -================== - -Name ----- - -VIDEO_FAST_FORWARD - -.. attention:: This ioctl is deprecated. - -Synopsis --------- - -.. c:macro:: VIDEO_FAST_FORWARD - -``int ioctl(fd, VIDEO_FAST_FORWARD, int nFrames)`` - -Arguments ---------- - -.. flat-table:: - :header-rows: 0 - :stub-columns: 0 - - - .. row 1 - - - int fd - - - File descriptor returned by a previous call to open(). - - - .. row 2 - - - int request - - - Equals VIDEO_FAST_FORWARD for this command. - - - .. row 3 - - - int nFrames - - - The number of frames to skip. - -Description ------------ - -This ioctl call asks the Video Device to skip decoding of N number of -I-frames. This call can only be used if VIDEO_SOURCE_MEMORY is -selected. - -Return Value ------------- - -On success 0 is returned, on error -1 and the ``errno`` variable is set -appropriately. The generic error codes are described at the -:ref:`Generic Error Codes ` chapter. - - -.. flat-table:: - :header-rows: 0 - :stub-columns: 0 - - - .. row 1 - - - ``EPERM`` - - - Mode VIDEO_SOURCE_MEMORY not selected. diff --git a/drivers/staging/media/av7110/video-fclose.rst b/drivers/staging/media/av7110/video-fclose.rst deleted file mode 100644 index 01d24d548..000000000 --- a/drivers/staging/media/av7110/video-fclose.rst +++ /dev/null @@ -1,51 +0,0 @@ -.. SPDX-License-Identifier: GFDL-1.1-no-invariants-or-later -.. c:namespace:: DTV.video - -.. _video_fclose: - -================= -dvb video close() -================= - -Name ----- - -dvb video close() - -.. attention:: This ioctl is deprecated. - -Synopsis --------- - -.. c:function:: int close(int fd) - -Arguments ---------- - -.. flat-table:: - :header-rows: 0 - :stub-columns: 0 - - - .. row 1 - - - int fd - - - File descriptor returned by a previous call to open(). - -Description ------------ - -This system call closes a previously opened video device. - -Return Value ------------- - -.. flat-table:: - :header-rows: 0 - :stub-columns: 0 - - - .. row 1 - - - ``EBADF`` - - - fd is not a valid open file descriptor. diff --git a/drivers/staging/media/av7110/video-fopen.rst b/drivers/staging/media/av7110/video-fopen.rst deleted file mode 100644 index 1371b083e..000000000 --- a/drivers/staging/media/av7110/video-fopen.rst +++ /dev/null @@ -1,111 +0,0 @@ -.. SPDX-License-Identifier: GFDL-1.1-no-invariants-or-later -.. c:namespace:: DTV.video - -.. _video_fopen: - -================ -dvb video open() -================ - -Name ----- - -dvb video open() - -.. attention:: This ioctl is deprecated. - -Synopsis --------- - -.. c:function:: int open(const char *deviceName, int flags) - -Arguments ---------- - -.. flat-table:: - :header-rows: 0 - :stub-columns: 0 - - - .. row 1 - - - const char \*deviceName - - - Name of specific video device. - - - .. row 2 - - - int flags - - - A bit-wise OR of the following flags: - - - .. row 3 - - - - - O_RDONLY read-only access - - - .. row 4 - - - - - O_RDWR read/write access - - - .. row 5 - - - - - O_NONBLOCK open in non-blocking mode - - - .. row 6 - - - - - (blocking mode is the default) - -Description ------------ - -This system call opens a named video device (e.g. -/dev/dvb/adapter0/video0) for subsequent use. - -When an open() call has succeeded, the device will be ready for use. The -significance of blocking or non-blocking mode is described in the -documentation for functions where there is a difference. It does not -affect the semantics of the open() call itself. A device opened in -blocking mode can later be put into non-blocking mode (and vice versa) -using the F_SETFL command of the fcntl system call. This is a standard -system call, documented in the Linux manual page for fcntl. Only one -user can open the Video Device in O_RDWR mode. All other attempts to -open the device in this mode will fail, and an error-code will be -returned. If the Video Device is opened in O_RDONLY mode, the only -ioctl call that can be used is VIDEO_GET_STATUS. All other call will -return an error code. - -Return Value ------------- - -.. tabularcolumns:: |p{2.5cm}|p{15.0cm}| - -.. flat-table:: - :header-rows: 0 - :stub-columns: 0 - - - .. row 1 - - - ``ENODEV`` - - - Device driver not loaded/available. - - - .. row 2 - - - ``EINTERNAL`` - - - Internal error. - - - .. row 3 - - - ``EBUSY`` - - - Device or resource busy. - - - .. row 4 - - - ``EINVAL`` - - - Invalid argument. diff --git a/drivers/staging/media/av7110/video-freeze.rst b/drivers/staging/media/av7110/video-freeze.rst deleted file mode 100644 index 4321f257c..000000000 --- a/drivers/staging/media/av7110/video-freeze.rst +++ /dev/null @@ -1,61 +0,0 @@ -.. SPDX-License-Identifier: GFDL-1.1-no-invariants-or-later -.. c:namespace:: DTV.video - -.. _VIDEO_FREEZE: - -============ -VIDEO_FREEZE -============ - -Name ----- - -VIDEO_FREEZE - -.. attention:: This ioctl is deprecated. - -Synopsis --------- - -.. c:macro:: VIDEO_FREEZE - -``int ioctl(fd, VIDEO_FREEZE)`` - -Arguments ---------- - -.. flat-table:: - :header-rows: 0 - :stub-columns: 0 - - - .. row 1 - - - int fd - - - File descriptor returned by a previous call to open(). - - - .. row 2 - - - int request - - - Equals VIDEO_FREEZE for this command. - -Description ------------ - -This ioctl is for Digital TV devices only. To control a V4L2 decoder use the -V4L2 :ref:`VIDIOC_DECODER_CMD` instead. - -This ioctl call suspends the live video stream being played. Decoding -and playing are frozen. It is then possible to restart the decoding and -playing process of the video stream using the VIDEO_CONTINUE command. -If VIDEO_SOURCE_MEMORY is selected in the ioctl call -VIDEO_SELECT_SOURCE, the Digital TV subsystem will not decode any more data -until the ioctl call VIDEO_CONTINUE or VIDEO_PLAY is performed. - -Return Value ------------- - -On success 0 is returned, on error -1 and the ``errno`` variable is set -appropriately. The generic error codes are described at the -:ref:`Generic Error Codes ` chapter. diff --git a/drivers/staging/media/av7110/video-fwrite.rst b/drivers/staging/media/av7110/video-fwrite.rst deleted file mode 100644 index a07fd7d7a..000000000 --- a/drivers/staging/media/av7110/video-fwrite.rst +++ /dev/null @@ -1,79 +0,0 @@ -.. SPDX-License-Identifier: GFDL-1.1-no-invariants-or-later -.. c:namespace:: DTV.video - -.. _video_fwrite: - -================= -dvb video write() -================= - -Name ----- - -dvb video write() - -.. attention:: This ioctl is deprecated. - -Synopsis --------- - -.. c:function:: size_t write(int fd, const void *buf, size_t count) - -Arguments ---------- - -.. flat-table:: - :header-rows: 0 - :stub-columns: 0 - - - .. row 1 - - - int fd - - - File descriptor returned by a previous call to open(). - - - .. row 2 - - - void \*buf - - - Pointer to the buffer containing the PES data. - - - .. row 3 - - - size_t count - - - Size of buf. - -Description ------------ - -This system call can only be used if VIDEO_SOURCE_MEMORY is selected -in the ioctl call VIDEO_SELECT_SOURCE. The data provided shall be in -PES format, unless the capability allows other formats. If O_NONBLOCK -is not specified the function will block until buffer space is -available. The amount of data to be transferred is implied by count. - -Return Value ------------- - -.. flat-table:: - :header-rows: 0 - :stub-columns: 0 - - - .. row 1 - - - ``EPERM`` - - - Mode VIDEO_SOURCE_MEMORY not selected. - - - .. row 2 - - - ``ENOMEM`` - - - Attempted to write more data than the internal buffer can hold. - - - .. row 3 - - - ``EBADF`` - - - fd is not a valid open file descriptor. diff --git a/drivers/staging/media/av7110/video-get-capabilities.rst b/drivers/staging/media/av7110/video-get-capabilities.rst deleted file mode 100644 index 01e09f566..000000000 --- a/drivers/staging/media/av7110/video-get-capabilities.rst +++ /dev/null @@ -1,61 +0,0 @@ -.. SPDX-License-Identifier: GFDL-1.1-no-invariants-or-later -.. c:namespace:: DTV.video - -.. _VIDEO_GET_CAPABILITIES: - -====================== -VIDEO_GET_CAPABILITIES -====================== - -Name ----- - -VIDEO_GET_CAPABILITIES - -.. attention:: This ioctl is deprecated. - -Synopsis --------- - -.. c:macro:: VIDEO_GET_CAPABILITIES - -``int ioctl(fd, VIDEO_GET_CAPABILITIES, unsigned int *cap)`` - -Arguments ---------- - -.. flat-table:: - :header-rows: 0 - :stub-columns: 0 - - - .. row 1 - - - int fd - - - File descriptor returned by a previous call to open(). - - - .. row 2 - - - int request - - - Equals VIDEO_GET_CAPABILITIES for this command. - - - .. row 3 - - - unsigned int \*cap - - - Pointer to a location where to store the capability information. - -Description ------------ - -This ioctl call asks the video device about its decoding capabilities. -On success it returns and integer which has bits set according to the -defines in section ??. - -Return Value ------------- - -On success 0 is returned, on error -1 and the ``errno`` variable is set -appropriately. The generic error codes are described at the -:ref:`Generic Error Codes ` chapter. diff --git a/drivers/staging/media/av7110/video-get-event.rst b/drivers/staging/media/av7110/video-get-event.rst deleted file mode 100644 index 90382bc36..000000000 --- a/drivers/staging/media/av7110/video-get-event.rst +++ /dev/null @@ -1,105 +0,0 @@ -.. SPDX-License-Identifier: GFDL-1.1-no-invariants-or-later -.. c:namespace:: DTV.video - -.. _VIDEO_GET_EVENT: - -=============== -VIDEO_GET_EVENT -=============== - -Name ----- - -VIDEO_GET_EVENT - -.. attention:: This ioctl is deprecated. - -Synopsis --------- - -.. c:macro:: VIDEO_GET_EVENT - -``int ioctl(fd, VIDEO_GET_EVENT, struct video_event *ev)`` - -Arguments ---------- - -.. flat-table:: - :header-rows: 0 - :stub-columns: 0 - - - .. row 1 - - - int fd - - - File descriptor returned by a previous call to open(). - - - .. row 2 - - - int request - - - Equals VIDEO_GET_EVENT for this command. - - - .. row 3 - - - struct video_event \*ev - - - Points to the location where the event, if any, is to be stored. - -Description ------------ - -This ioctl is for Digital TV devices only. To get events from a V4L2 decoder -use the V4L2 :ref:`VIDIOC_DQEVENT` ioctl instead. - -This ioctl call returns an event of type video_event if available. If -an event is not available, the behavior depends on whether the device is -in blocking or non-blocking mode. In the latter case, the call fails -immediately with errno set to ``EWOULDBLOCK``. In the former case, the call -blocks until an event becomes available. The standard Linux poll() -and/or select() system calls can be used with the device file descriptor -to watch for new events. For select(), the file descriptor should be -included in the exceptfds argument, and for poll(), POLLPRI should be -specified as the wake-up condition. Read-only permissions are sufficient -for this ioctl call. - -.. c:type:: video_event - -.. code-block:: c - - struct video_event { - __s32 type; - #define VIDEO_EVENT_SIZE_CHANGED 1 - #define VIDEO_EVENT_FRAME_RATE_CHANGED 2 - #define VIDEO_EVENT_DECODER_STOPPED 3 - #define VIDEO_EVENT_VSYNC 4 - long timestamp; - union { - video_size_t size; - unsigned int frame_rate; /* in frames per 1000sec */ - unsigned char vsync_field; /* unknown/odd/even/progressive */ - } u; - }; - -Return Value ------------- - -On success 0 is returned, on error -1 and the ``errno`` variable is set -appropriately. The generic error codes are described at the -:ref:`Generic Error Codes ` chapter. - -.. flat-table:: - :header-rows: 0 - :stub-columns: 0 - - - .. row 1 - - - ``EWOULDBLOCK`` - - - There is no event pending, and the device is in non-blocking mode. - - - .. row 2 - - - ``EOVERFLOW`` - - - Overflow in event queue - one or more events were lost. diff --git a/drivers/staging/media/av7110/video-get-frame-count.rst b/drivers/staging/media/av7110/video-get-frame-count.rst deleted file mode 100644 index b48ac8c58..000000000 --- a/drivers/staging/media/av7110/video-get-frame-count.rst +++ /dev/null @@ -1,65 +0,0 @@ -.. SPDX-License-Identifier: GFDL-1.1-no-invariants-or-later -.. c:namespace:: DTV.video - -.. _VIDEO_GET_FRAME_COUNT: - -===================== -VIDEO_GET_FRAME_COUNT -===================== - -Name ----- - -VIDEO_GET_FRAME_COUNT - -.. attention:: This ioctl is deprecated. - -Synopsis --------- - -.. c:macro:: VIDEO_GET_FRAME_COUNT - -``int ioctl(int fd, VIDEO_GET_FRAME_COUNT, __u64 *pts)`` - -Arguments ---------- - -.. flat-table:: - :header-rows: 0 - :stub-columns: 0 - - - .. row 1 - - - int fd - - - File descriptor returned by a previous call to open(). - - - .. row 2 - - - int request - - - Equals VIDEO_GET_FRAME_COUNT for this command. - - - .. row 3 - - - __u64 \*pts - - - Returns the number of frames displayed since the decoder was - started. - -Description ------------ - -This ioctl is obsolete. Do not use in new drivers. For V4L2 decoders -this ioctl has been replaced by the ``V4L2_CID_MPEG_VIDEO_DEC_FRAME`` -control. - -This ioctl call asks the Video Device to return the number of displayed -frames since the decoder was started. - -Return Value ------------- - -On success 0 is returned, on error -1 and the ``errno`` variable is set -appropriately. The generic error codes are described at the -:ref:`Generic Error Codes ` chapter. diff --git a/drivers/staging/media/av7110/video-get-pts.rst b/drivers/staging/media/av7110/video-get-pts.rst deleted file mode 100644 index fedaff41b..000000000 --- a/drivers/staging/media/av7110/video-get-pts.rst +++ /dev/null @@ -1,69 +0,0 @@ -.. SPDX-License-Identifier: GFDL-1.1-no-invariants-or-later -.. c:namespace:: DTV.video - -.. _VIDEO_GET_PTS: - -============= -VIDEO_GET_PTS -============= - -Name ----- - -VIDEO_GET_PTS - -.. attention:: This ioctl is deprecated. - -Synopsis --------- - -.. c:macro:: VIDEO_GET_PTS - -``int ioctl(int fd, VIDEO_GET_PTS, __u64 *pts)`` - -Arguments ---------- - -.. flat-table:: - :header-rows: 0 - :stub-columns: 0 - - - .. row 1 - - - int fd - - - File descriptor returned by a previous call to open(). - - - .. row 2 - - - int request - - - Equals VIDEO_GET_PTS for this command. - - - .. row 3 - - - __u64 \*pts - - - Returns the 33-bit timestamp as defined in ITU T-REC-H.222.0 / - ISO/IEC 13818-1. - - The PTS should belong to the currently played frame if possible, - but may also be a value close to it like the PTS of the last - decoded frame or the last PTS extracted by the PES parser. - -Description ------------ - -This ioctl is obsolete. Do not use in new drivers. For V4L2 decoders -this ioctl has been replaced by the ``V4L2_CID_MPEG_VIDEO_DEC_PTS`` -control. - -This ioctl call asks the Video Device to return the current PTS -timestamp. - -Return Value ------------- - -On success 0 is returned, on error -1 and the ``errno`` variable is set -appropriately. The generic error codes are described at the -:ref:`Generic Error Codes ` chapter. diff --git a/drivers/staging/media/av7110/video-get-size.rst b/drivers/staging/media/av7110/video-get-size.rst deleted file mode 100644 index de34331c5..000000000 --- a/drivers/staging/media/av7110/video-get-size.rst +++ /dev/null @@ -1,69 +0,0 @@ -.. SPDX-License-Identifier: GFDL-1.1-no-invariants-or-later -.. c:namespace:: DTV.video - -.. _VIDEO_GET_SIZE: - -============== -VIDEO_GET_SIZE -============== - -Name ----- - -VIDEO_GET_SIZE - -.. attention:: This ioctl is deprecated. - -Synopsis --------- - -.. c:macro:: VIDEO_GET_SIZE - -``int ioctl(int fd, VIDEO_GET_SIZE, video_size_t *size)`` - -Arguments ---------- - -.. flat-table:: - :header-rows: 0 - :stub-columns: 0 - - - .. row 1 - - - int fd - - - File descriptor returned by a previous call to open(). - - - .. row 2 - - - int request - - - Equals VIDEO_GET_SIZE for this command. - - - .. row 3 - - - video_size_t \*size - - - Returns the size and aspect ratio. - -Description ------------ - -This ioctl returns the size and aspect ratio. - -.. c:type:: video_size_t - -.. code-block::c - - typedef struct { - int w; - int h; - video_format_t aspect_ratio; - } video_size_t; - -Return Value ------------- - -On success 0 is returned, on error -1 and the ``errno`` variable is set -appropriately. The generic error codes are described at the -:ref:`Generic Error Codes ` chapter. diff --git a/drivers/staging/media/av7110/video-get-status.rst b/drivers/staging/media/av7110/video-get-status.rst deleted file mode 100644 index 9b86fbf41..000000000 --- a/drivers/staging/media/av7110/video-get-status.rst +++ /dev/null @@ -1,72 +0,0 @@ -.. SPDX-License-Identifier: GFDL-1.1-no-invariants-or-later -.. c:namespace:: DTV.video - -.. _VIDEO_GET_STATUS: - -================ -VIDEO_GET_STATUS -================ - -Name ----- - -VIDEO_GET_STATUS - -.. attention:: This ioctl is deprecated. - -Synopsis --------- - -.. c:macro:: VIDEO_GET_STATUS - -``int ioctl(fd, VIDEO_GET_STATUS, struct video_status *status)`` - -Arguments ---------- - -.. flat-table:: - :header-rows: 0 - :stub-columns: 0 - - - .. row 1 - - - int fd - - - File descriptor returned by a previous call to open(). - - - .. row 2 - - - int request - - - Equals VIDEO_GET_STATUS for this command. - - - .. row 3 - - - struct video_status \*status - - - Returns the current status of the Video Device. - -Description ------------ - -This ioctl call asks the Video Device to return the current status of -the device. - -.. c:type:: video_status - -.. code-block:: c - - struct video_status { - int video_blank; /* blank video on freeze? */ - video_play_state_t play_state; /* current state of playback */ - video_stream_source_t stream_source; /* current source (demux/memory) */ - video_format_t video_format; /* current aspect ratio of stream*/ - video_displayformat_t display_format;/* selected cropping mode */ - }; - -Return Value ------------- - -On success 0 is returned, on error -1 and the ``errno`` variable is set -appropriately. The generic error codes are described at the -:ref:`Generic Error Codes ` chapter. diff --git a/drivers/staging/media/av7110/video-play.rst b/drivers/staging/media/av7110/video-play.rst deleted file mode 100644 index 35ac8b98f..000000000 --- a/drivers/staging/media/av7110/video-play.rst +++ /dev/null @@ -1,57 +0,0 @@ -.. SPDX-License-Identifier: GFDL-1.1-no-invariants-or-later -.. c:namespace:: DTV.video - -.. _VIDEO_PLAY: - -========== -VIDEO_PLAY -========== - -Name ----- - -VIDEO_PLAY - -.. attention:: This ioctl is deprecated. - -Synopsis --------- - -.. c:macro:: VIDEO_PLAY - -``int ioctl(fd, VIDEO_PLAY)`` - -Arguments ---------- - -.. flat-table:: - :header-rows: 0 - :stub-columns: 0 - - - .. row 1 - - - int fd - - - File descriptor returned by a previous call to open(). - - - .. row 2 - - - int request - - - Equals VIDEO_PLAY for this command. - -Description ------------ - -This ioctl is for Digital TV devices only. To control a V4L2 decoder use the -V4L2 :ref:`VIDIOC_DECODER_CMD` instead. - -This ioctl call asks the Video Device to start playing a video stream -from the selected source. - -Return Value ------------- - -On success 0 is returned, on error -1 and the ``errno`` variable is set -appropriately. The generic error codes are described at the -:ref:`Generic Error Codes ` chapter. diff --git a/drivers/staging/media/av7110/video-select-source.rst b/drivers/staging/media/av7110/video-select-source.rst deleted file mode 100644 index 929a20985..000000000 --- a/drivers/staging/media/av7110/video-select-source.rst +++ /dev/null @@ -1,76 +0,0 @@ -.. SPDX-License-Identifier: GFDL-1.1-no-invariants-or-later -.. c:namespace:: DTV.video - -.. _VIDEO_SELECT_SOURCE: - -=================== -VIDEO_SELECT_SOURCE -=================== - -Name ----- - -VIDEO_SELECT_SOURCE - -.. attention:: This ioctl is deprecated. - -Synopsis --------- - -.. c:macro:: VIDEO_SELECT_SOURCE - -``int ioctl(fd, VIDEO_SELECT_SOURCE, video_stream_source_t source)`` - -Arguments ---------- - -.. flat-table:: - :header-rows: 0 - :stub-columns: 0 - - - .. row 1 - - - int fd - - - File descriptor returned by a previous call to open(). - - - .. row 2 - - - int request - - - Equals VIDEO_SELECT_SOURCE for this command. - - - .. row 3 - - - video_stream_source_t source - - - Indicates which source shall be used for the Video stream. - -Description ------------ - -This ioctl is for Digital TV devices only. This ioctl was also supported by the -V4L2 ivtv driver, but that has been replaced by the ivtv-specific -``IVTV_IOC_PASSTHROUGH_MODE`` ioctl. - -This ioctl call informs the video device which source shall be used for -the input data. The possible sources are demux or memory. If memory is -selected, the data is fed to the video device through the write command. - -.. c:type:: video_stream_source_t - -.. code-block:: c - - typedef enum { - VIDEO_SOURCE_DEMUX, /* Select the demux as the main source */ - VIDEO_SOURCE_MEMORY /* If this source is selected, the stream - comes from the user through the write - system call */ - } video_stream_source_t; - -Return Value ------------- - -On success 0 is returned, on error -1 and the ``errno`` variable is set -appropriately. The generic error codes are described at the -:ref:`Generic Error Codes ` chapter. diff --git a/drivers/staging/media/av7110/video-set-blank.rst b/drivers/staging/media/av7110/video-set-blank.rst deleted file mode 100644 index 70249a6ba..000000000 --- a/drivers/staging/media/av7110/video-set-blank.rst +++ /dev/null @@ -1,64 +0,0 @@ -.. SPDX-License-Identifier: GFDL-1.1-no-invariants-or-later -.. c:namespace:: DTV.video - -.. _VIDEO_SET_BLANK: - -=============== -VIDEO_SET_BLANK -=============== - -Name ----- - -VIDEO_SET_BLANK - -.. attention:: This ioctl is deprecated. - -Synopsis --------- - -.. c:macro:: VIDEO_SET_BLANK - -``int ioctl(fd, VIDEO_SET_BLANK, boolean mode)`` - -Arguments ---------- - -.. flat-table:: - :header-rows: 0 - :stub-columns: 0 - - - .. row 1 - - - int fd - - - File descriptor returned by a previous call to open(). - - - .. row 2 - - - int request - - - Equals VIDEO_SET_BLANK for this command. - - - .. row 3 - - - boolean mode - - - TRUE: Blank screen when stop. - - - .. row 4 - - - - - FALSE: Show last decoded frame. - -Description ------------ - -This ioctl call asks the Video Device to blank out the picture. - -Return Value ------------- - -On success 0 is returned, on error -1 and the ``errno`` variable is set -appropriately. The generic error codes are described at the -:ref:`Generic Error Codes ` chapter. diff --git a/drivers/staging/media/av7110/video-set-display-format.rst b/drivers/staging/media/av7110/video-set-display-format.rst deleted file mode 100644 index 1de4f40ae..000000000 --- a/drivers/staging/media/av7110/video-set-display-format.rst +++ /dev/null @@ -1,60 +0,0 @@ -.. SPDX-License-Identifier: GFDL-1.1-no-invariants-or-later -.. c:namespace:: DTV.video - -.. _VIDEO_SET_DISPLAY_FORMAT: - -======================== -VIDEO_SET_DISPLAY_FORMAT -======================== - -Name ----- - -VIDEO_SET_DISPLAY_FORMAT - -.. attention:: This ioctl is deprecated. - -Synopsis --------- - -.. c:macro:: VIDEO_SET_DISPLAY_FORMAT - -``int ioctl(fd, VIDEO_SET_DISPLAY_FORMAT)`` - -Arguments ---------- - -.. flat-table:: - :header-rows: 0 - :stub-columns: 0 - - - .. row 1 - - - int fd - - - File descriptor returned by a previous call to open(). - - - .. row 2 - - - int request - - - Equals VIDEO_SET_DISPLAY_FORMAT for this command. - - - .. row 3 - - - video_display_format_t format - - - Selects the video format to be used. - -Description ------------ - -This ioctl call asks the Video Device to select the video format to be -applied by the MPEG chip on the video. - -Return Value ------------- - -On success 0 is returned, on error -1 and the ``errno`` variable is set -appropriately. The generic error codes are described at the -:ref:`Generic Error Codes ` chapter. diff --git a/drivers/staging/media/av7110/video-set-format.rst b/drivers/staging/media/av7110/video-set-format.rst deleted file mode 100644 index bb64e37ae..000000000 --- a/drivers/staging/media/av7110/video-set-format.rst +++ /dev/null @@ -1,82 +0,0 @@ -.. SPDX-License-Identifier: GFDL-1.1-no-invariants-or-later -.. c:namespace:: DTV.video - -.. _VIDEO_SET_FORMAT: - -================ -VIDEO_SET_FORMAT -================ - -Name ----- - -VIDEO_SET_FORMAT - -.. attention:: This ioctl is deprecated. - -Synopsis --------- - -.. c:macro:: VIDEO_SET_FORMAT - -``int ioctl(fd, VIDEO_SET_FORMAT, video_format_t format)`` - -Arguments ---------- - -.. flat-table:: - :header-rows: 0 - :stub-columns: 0 - - - .. row 1 - - - int fd - - - File descriptor returned by a previous call to open(). - - - .. row 2 - - - int request - - - Equals VIDEO_SET_FORMAT for this command. - - - .. row 3 - - - video_format_t format - - - video format of TV as defined in section ??. - -Description ------------ - -This ioctl sets the screen format (aspect ratio) of the connected output -device (TV) so that the output of the decoder can be adjusted -accordingly. - -.. c:type:: video_format_t - -.. code-block:: c - - typedef enum { - VIDEO_FORMAT_4_3, /* Select 4:3 format */ - VIDEO_FORMAT_16_9, /* Select 16:9 format. */ - VIDEO_FORMAT_221_1 /* 2.21:1 */ - } video_format_t; - -Return Value ------------- - -On success 0 is returned, on error -1 and the ``errno`` variable is set -appropriately. The generic error codes are described at the -:ref:`Generic Error Codes ` chapter. - - -.. flat-table:: - :header-rows: 0 - :stub-columns: 0 - - - .. row 1 - - - ``EINVAL`` - - - format is not a valid video format. diff --git a/drivers/staging/media/av7110/video-set-streamtype.rst b/drivers/staging/media/av7110/video-set-streamtype.rst deleted file mode 100644 index 1f31c048b..000000000 --- a/drivers/staging/media/av7110/video-set-streamtype.rst +++ /dev/null @@ -1,61 +0,0 @@ -.. SPDX-License-Identifier: GFDL-1.1-no-invariants-or-later -.. c:namespace:: DTV.video - -.. _VIDEO_SET_STREAMTYPE: - -==================== -VIDEO_SET_STREAMTYPE -==================== - -Name ----- - -VIDEO_SET_STREAMTYPE - -.. attention:: This ioctl is deprecated. - -Synopsis --------- - -.. c:macro:: VIDEO_SET_STREAMTYPE - -``int ioctl(fd, VIDEO_SET_STREAMTYPE, int type)`` - -Arguments ---------- - -.. flat-table:: - :header-rows: 0 - :stub-columns: 0 - - - .. row 1 - - - int fd - - - File descriptor returned by a previous call to open(). - - - .. row 2 - - - int request - - - Equals VIDEO_SET_STREAMTYPE for this command. - - - .. row 3 - - - int type - - - stream type - -Description ------------ - -This ioctl tells the driver which kind of stream to expect being written -to it. If this call is not used the default of video PES is used. Some -drivers might not support this call and always expect PES. - -Return Value ------------- - -On success 0 is returned, on error -1 and the ``errno`` variable is set -appropriately. The generic error codes are described at the -:ref:`Generic Error Codes ` chapter. diff --git a/drivers/staging/media/av7110/video-slowmotion.rst b/drivers/staging/media/av7110/video-slowmotion.rst deleted file mode 100644 index 1478fcc30..000000000 --- a/drivers/staging/media/av7110/video-slowmotion.rst +++ /dev/null @@ -1,72 +0,0 @@ -.. SPDX-License-Identifier: GFDL-1.1-no-invariants-or-later -.. c:namespace:: DTV.video - -.. _VIDEO_SLOWMOTION: - -================ -VIDEO_SLOWMOTION -================ - -Name ----- - -VIDEO_SLOWMOTION - -.. attention:: This ioctl is deprecated. - -Synopsis --------- - -.. c:macro:: VIDEO_SLOWMOTION - -``int ioctl(fd, VIDEO_SLOWMOTION, int nFrames)`` - -Arguments ---------- - -.. flat-table:: - :header-rows: 0 - :stub-columns: 0 - - - .. row 1 - - - int fd - - - File descriptor returned by a previous call to open(). - - - .. row 2 - - - int request - - - Equals VIDEO_SLOWMOTION for this command. - - - .. row 3 - - - int nFrames - - - The number of times to repeat each frame. - -Description ------------ - -This ioctl call asks the video device to repeat decoding frames N number -of times. This call can only be used if VIDEO_SOURCE_MEMORY is -selected. - -Return Value ------------- - -On success 0 is returned, on error -1 and the ``errno`` variable is set -appropriately. The generic error codes are described at the -:ref:`Generic Error Codes ` chapter. - - -.. flat-table:: - :header-rows: 0 - :stub-columns: 0 - - - .. row 1 - - - ``EPERM`` - - - Mode VIDEO_SOURCE_MEMORY not selected. diff --git a/drivers/staging/media/av7110/video-stillpicture.rst b/drivers/staging/media/av7110/video-stillpicture.rst deleted file mode 100644 index d25384222..000000000 --- a/drivers/staging/media/av7110/video-stillpicture.rst +++ /dev/null @@ -1,61 +0,0 @@ -.. SPDX-License-Identifier: GFDL-1.1-no-invariants-or-later -.. c:namespace:: DTV.video - -.. _VIDEO_STILLPICTURE: - -================== -VIDEO_STILLPICTURE -================== - -Name ----- - -VIDEO_STILLPICTURE - -.. attention:: This ioctl is deprecated. - -Synopsis --------- - -.. c:macro:: VIDEO_STILLPICTURE - -``int ioctl(fd, VIDEO_STILLPICTURE, struct video_still_picture *sp)`` - -Arguments ---------- - -.. flat-table:: - :header-rows: 0 - :stub-columns: 0 - - - .. row 1 - - - int fd - - - File descriptor returned by a previous call to open(). - - - .. row 2 - - - int request - - - Equals VIDEO_STILLPICTURE for this command. - - - .. row 3 - - - struct video_still_picture \*sp - - - Pointer to a location where an I-frame and size is stored. - -Description ------------ - -This ioctl call asks the Video Device to display a still picture -(I-frame). The input data shall contain an I-frame. If the pointer is -NULL, then the current displayed still picture is blanked. - -Return Value ------------- - -On success 0 is returned, on error -1 and the ``errno`` variable is set -appropriately. The generic error codes are described at the -:ref:`Generic Error Codes ` chapter. diff --git a/drivers/staging/media/av7110/video-stop.rst b/drivers/staging/media/av7110/video-stop.rst deleted file mode 100644 index 96f61c5b4..000000000 --- a/drivers/staging/media/av7110/video-stop.rst +++ /dev/null @@ -1,74 +0,0 @@ -.. SPDX-License-Identifier: GFDL-1.1-no-invariants-or-later -.. c:namespace:: DTV.video - -.. _VIDEO_STOP: - -========== -VIDEO_STOP -========== - -Name ----- - -VIDEO_STOP - -.. attention:: This ioctl is deprecated. - -Synopsis --------- - -.. c:macro:: VIDEO_STOP - -``int ioctl(fd, VIDEO_STOP, boolean mode)`` - -Arguments ---------- - -.. flat-table:: - :header-rows: 0 - :stub-columns: 0 - - - .. row 1 - - - int fd - - - File descriptor returned by a previous call to open(). - - - .. row 2 - - - int request - - - Equals VIDEO_STOP for this command. - - - .. row 3 - - - Boolean mode - - - Indicates how the screen shall be handled. - - - .. row 4 - - - - - TRUE: Blank screen when stop. - - - .. row 5 - - - - - FALSE: Show last decoded frame. - -Description ------------ - -This ioctl is for Digital TV devices only. To control a V4L2 decoder use the -V4L2 :ref:`VIDIOC_DECODER_CMD` instead. - -This ioctl call asks the Video Device to stop playing the current -stream. Depending on the input parameter, the screen can be blanked out -or displaying the last decoded frame. - -Return Value ------------- - -On success 0 is returned, on error -1 and the ``errno`` variable is set -appropriately. The generic error codes are described at the -:ref:`Generic Error Codes ` chapter. diff --git a/drivers/staging/media/av7110/video-try-command.rst b/drivers/staging/media/av7110/video-try-command.rst deleted file mode 100644 index 79bf3dfb8..000000000 --- a/drivers/staging/media/av7110/video-try-command.rst +++ /dev/null @@ -1,66 +0,0 @@ -.. SPDX-License-Identifier: GFDL-1.1-no-invariants-or-later -.. c:namespace:: DTV.video - -.. _VIDEO_TRY_COMMAND: - -================= -VIDEO_TRY_COMMAND -================= - -Name ----- - -VIDEO_TRY_COMMAND - -.. attention:: This ioctl is deprecated. - -Synopsis --------- - -.. c:macro:: VIDEO_TRY_COMMAND - -``int ioctl(int fd, VIDEO_TRY_COMMAND, struct video_command *cmd)`` - -Arguments ---------- - -.. flat-table:: - :header-rows: 0 - :stub-columns: 0 - - - .. row 1 - - - int fd - - - File descriptor returned by a previous call to open(). - - - .. row 2 - - - int request - - - Equals VIDEO_TRY_COMMAND for this command. - - - .. row 3 - - - struct video_command \*cmd - - - Try a decoder command. - -Description ------------ - -This ioctl is obsolete. Do not use in new drivers. For V4L2 decoders -this ioctl has been replaced by the -:ref:`VIDIOC_TRY_DECODER_CMD ` ioctl. - -This ioctl tries a decoder command. The ``video_command`` struct is a -subset of the ``v4l2_decoder_cmd`` struct, so refer to the -:ref:`VIDIOC_TRY_DECODER_CMD ` documentation -for more information. - -Return Value ------------- - -On success 0 is returned, on error -1 and the ``errno`` variable is set -appropriately. The generic error codes are described at the -:ref:`Generic Error Codes ` chapter. diff --git a/drivers/staging/media/av7110/video.rst b/drivers/staging/media/av7110/video.rst deleted file mode 100644 index 808705b76..000000000 --- a/drivers/staging/media/av7110/video.rst +++ /dev/null @@ -1,36 +0,0 @@ -.. SPDX-License-Identifier: GFDL-1.1-no-invariants-or-later - -.. _dvb_video: - -####################### -Digital TV Video Device -####################### - -The Digital TV video device controls the MPEG2 video decoder of the Digital -TV hardware. It can be accessed through **/dev/dvb/adapter0/video0**. Data -types and ioctl definitions can be accessed by including -**linux/dvb/video.h** in your application. - -Note that the Digital TV video device only controls decoding of the MPEG video -stream, not its presentation on the TV or computer screen. On PCs this -is typically handled by an associated video4linux device, e.g. -**/dev/video**, which allows scaling and defining output windows. - -Some Digital TV cards don't have their own MPEG decoder, which results in the -omission of the audio and video device as well as the video4linux -device. - -The ioctls that deal with SPUs (sub picture units) and navigation -packets are only supported on some MPEG decoders made for DVD playback. - -These ioctls were also used by V4L2 to control MPEG decoders implemented -in V4L2. The use of these ioctls for that purpose has been made obsolete -and proper V4L2 ioctls or controls have been created to replace that -functionality. - - -.. toctree:: - :maxdepth: 1 - - video_types - video_function_calls diff --git a/drivers/staging/media/av7110/video_function_calls.rst b/drivers/staging/media/av7110/video_function_calls.rst deleted file mode 100644 index 20a897be5..000000000 --- a/drivers/staging/media/av7110/video_function_calls.rst +++ /dev/null @@ -1,35 +0,0 @@ -.. SPDX-License-Identifier: GFDL-1.1-no-invariants-or-later - -.. _video_function_calls: - -******************** -Video Function Calls -******************** - -.. toctree:: - :maxdepth: 1 - - video-fopen - video-fclose - video-fwrite - video-stop - video-play - video-freeze - video-continue - video-select-source - video-set-blank - video-get-status - video-get-frame-count - video-get-pts - video-get-event - video-command - video-try-command - video-get-size - video-set-display-format - video-stillpicture - video-fast-forward - video-slowmotion - video-get-capabilities - video-clear-buffer - video-set-streamtype - video-set-format diff --git a/drivers/staging/media/av7110/video_types.rst b/drivers/staging/media/av7110/video_types.rst deleted file mode 100644 index c4557d328..000000000 --- a/drivers/staging/media/av7110/video_types.rst +++ /dev/null @@ -1,248 +0,0 @@ -.. SPDX-License-Identifier: GFDL-1.1-no-invariants-or-later - -.. _video_types: - -**************** -Video Data Types -**************** - - -.. _video-format-t: - -video_format_t -============== - -The ``video_format_t`` data type defined by - - -.. code-block:: c - - typedef enum { - VIDEO_FORMAT_4_3, /* Select 4:3 format */ - VIDEO_FORMAT_16_9, /* Select 16:9 format. */ - VIDEO_FORMAT_221_1 /* 2.21:1 */ - } video_format_t; - -is used in the VIDEO_SET_FORMAT function (??) to tell the driver which -aspect ratio the output hardware (e.g. TV) has. It is also used in the -data structures video_status (??) returned by VIDEO_GET_STATUS (??) -and video_event (??) returned by VIDEO_GET_EVENT (??) which report -about the display format of the current video stream. - - -.. _video-displayformat-t: - -video_displayformat_t -===================== - -In case the display format of the video stream and of the display -hardware differ the application has to specify how to handle the -cropping of the picture. This can be done using the -VIDEO_SET_DISPLAY_FORMAT call (??) which accepts - - -.. code-block:: c - - typedef enum { - VIDEO_PAN_SCAN, /* use pan and scan format */ - VIDEO_LETTER_BOX, /* use letterbox format */ - VIDEO_CENTER_CUT_OUT /* use center cut out format */ - } video_displayformat_t; - -as argument. - - -.. _video-stream-source-t: - -video_stream_source_t -===================== - -The video stream source is set through the VIDEO_SELECT_SOURCE call -and can take the following values, depending on whether we are replaying -from an internal (demuxer) or external (user write) source. - - -.. code-block:: c - - typedef enum { - VIDEO_SOURCE_DEMUX, /* Select the demux as the main source */ - VIDEO_SOURCE_MEMORY /* If this source is selected, the stream - comes from the user through the write - system call */ - } video_stream_source_t; - -VIDEO_SOURCE_DEMUX selects the demultiplexer (fed either by the -frontend or the DVR device) as the source of the video stream. If -VIDEO_SOURCE_MEMORY is selected the stream comes from the application -through the **write()** system call. - - -.. _video-play-state-t: - -video_play_state_t -================== - -The following values can be returned by the VIDEO_GET_STATUS call -representing the state of video playback. - - -.. code-block:: c - - typedef enum { - VIDEO_STOPPED, /* Video is stopped */ - VIDEO_PLAYING, /* Video is currently playing */ - VIDEO_FREEZED /* Video is freezed */ - } video_play_state_t; - - -.. c:type:: video_command - -struct video_command -==================== - -The structure must be zeroed before use by the application This ensures -it can be extended safely in the future. - - -.. code-block:: c - - struct video_command { - __u32 cmd; - __u32 flags; - union { - struct { - __u64 pts; - } stop; - - struct { - /* 0 or 1000 specifies normal speed, - 1 specifies forward single stepping, - -1 specifies backward single stepping, - >>1: playback at speed/1000 of the normal speed, - <-1: reverse playback at (-speed/1000) of the normal speed. */ - __s32 speed; - __u32 format; - } play; - - struct { - __u32 data[16]; - } raw; - }; - }; - - -.. _video-size-t: - -video_size_t -============ - - -.. code-block:: c - - typedef struct { - int w; - int h; - video_format_t aspect_ratio; - } video_size_t; - - -.. c:type:: video_event - -struct video_event -================== - -The following is the structure of a video event as it is returned by the -VIDEO_GET_EVENT call. - - -.. code-block:: c - - struct video_event { - __s32 type; - #define VIDEO_EVENT_SIZE_CHANGED 1 - #define VIDEO_EVENT_FRAME_RATE_CHANGED 2 - #define VIDEO_EVENT_DECODER_STOPPED 3 - #define VIDEO_EVENT_VSYNC 4 - long timestamp; - union { - video_size_t size; - unsigned int frame_rate; /* in frames per 1000sec */ - unsigned char vsync_field; /* unknown/odd/even/progressive */ - } u; - }; - - -.. c:type:: video_status - -struct video_status -=================== - -The VIDEO_GET_STATUS call returns the following structure informing -about various states of the playback operation. - - -.. code-block:: c - - struct video_status { - int video_blank; /* blank video on freeze? */ - video_play_state_t play_state; /* current state of playback */ - video_stream_source_t stream_source; /* current source (demux/memory) */ - video_format_t video_format; /* current aspect ratio of stream */ - video_displayformat_t display_format;/* selected cropping mode */ - }; - -If video_blank is set video will be blanked out if the channel is -changed or if playback is stopped. Otherwise, the last picture will be -displayed. play_state indicates if the video is currently frozen, -stopped, or being played back. The stream_source corresponds to the -selected source for the video stream. It can come either from the -demultiplexer or from memory. The video_format indicates the aspect -ratio (one of 4:3 or 16:9) of the currently played video stream. -Finally, display_format corresponds to the selected cropping mode in -case the source video format is not the same as the format of the output -device. - - -.. c:type:: video_still_picture - -struct video_still_picture -========================== - -An I-frame displayed via the VIDEO_STILLPICTURE call is passed on -within the following structure. - - -.. code-block:: c - - /* pointer to and size of a single iframe in memory */ - struct video_still_picture { - char *iFrame; /* pointer to a single iframe in memory */ - int32_t size; - }; - - -.. _video_caps: - -video capabilities -================== - -A call to VIDEO_GET_CAPABILITIES returns an unsigned integer with the -following bits set according to the hardwares capabilities. - - -.. code-block:: c - - /* bit definitions for capabilities: */ - /* can the hardware decode MPEG1 and/or MPEG2? */ - #define VIDEO_CAP_MPEG1 1 - #define VIDEO_CAP_MPEG2 2 - /* can you send a system and/or program stream to video device? - (you still have to open the video and the audio device but only - send the stream to the video device) */ - #define VIDEO_CAP_SYS 4 - #define VIDEO_CAP_PROG 8 - /* can the driver also handle SPU, NAVI and CSS encoded data? - (CSS API is not present yet) */ - #define VIDEO_CAP_SPU 16 - #define VIDEO_CAP_NAVI 32 - #define VIDEO_CAP_CSS 64 From patchwork Tue May 7 00:24:41 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Herdler X-Patchwork-Id: 13656128 Received: from mout.gmx.net (mout.gmx.net [212.227.17.20]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 081D979DF for ; Tue, 7 May 2024 00:25:29 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=212.227.17.20 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1715041534; cv=none; b=gFrGvNpk2brQcap+Nd3i0K/iqDR4hsUTU240SR29w0l6jN7cdGO6Y+J8iLlzAdGfcl/edio/ReawHalESfjSp22UXtsAtsBJ7zg+1y5pkv5plzsbWGf2H3nVZqaS7ARy3rWJX0EBfFG9PqQ1Yk3Hpgqjff8FBH3weRBCX4rZkAM= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1715041534; c=relaxed/simple; bh=VcE+TB+vj8duY2lR1XCiRdcdCyimRhWKkpkQdAc77iE=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=F2yrro709Crdz1EPAxCcHURnvtSkG+sgaBl4gklO2TWMiiiGkRDuuNYi1ChCg/H6nfF1adUKS1GY+IOQSo74rmPioVLrCYZIwY6p2Duq0Kt2jTLMm97f7D8pO7VQ+X0Rt4kXmQ3norb411f/hSSwcNjIb/Aqi1QCN79ae/3kpcg= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=nurfuerspam.de; spf=pass smtp.mailfrom=nurfuerspam.de; dkim=pass (2048-bit key) header.d=nurfuerspam.de header.i=herdler@nurfuerspam.de header.b=a65N7A9t; arc=none smtp.client-ip=212.227.17.20 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=nurfuerspam.de Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=nurfuerspam.de Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=nurfuerspam.de header.i=herdler@nurfuerspam.de header.b="a65N7A9t" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nurfuerspam.de; s=s31663417; t=1715041525; x=1715646325; i=herdler@nurfuerspam.de; bh=PddmM42O0qh42eP+/qq4BlJaAaSWB/Bg7ftK1TqfYpE=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date:Message-Id:In-Reply-To: References:MIME-Version:Content-Transfer-Encoding:cc: content-transfer-encoding:content-type:date:from:message-id: mime-version:reply-to:subject:to; b=a65N7A9tNvH/+irlZ+TVmo0yidCL8a3bnyn0X4uqintLYcNspqPsDN/9pK4ZJtvw m0bGeZ4qTuZFuMm9nx7kRtIOfm/0AjI/rZvGJ3ZBwqfoulHOjOU1opDs8wbs9flOj TRy0jQMUK2HIYaECAMNY0nWcQOxqMjNji89/BhUAxxNjA5Eu98KA9S2ROnIpdTSTz 1Hk/TiRV3/wSDtbNNo1tdZP8hVhbdJvIO6oXmmctbGau0voHDMixwt+ktp0c9DiKG 32Brrmsow3JrPpR/LPOa92a29mmbJHGStOIKBJCojZNvJdfqNU1FMwb7iJeUAo2mM fUZwCBB9xrBbUVbrow== X-UI-Sender-Class: 724b4f7f-cbec-4199-ad4e-598c01a50d3a Received: from astro.haus ([185.101.174.109]) by mail.gmx.net (mrgmx105 [212.227.17.168]) with ESMTPSA (Nemesis) id 1MJmGP-1sJCeq2hyb-00K9wE; Tue, 07 May 2024 02:25:25 +0200 From: Stefan Herdler To: hverkuil-cisco@xs4all.nl Cc: linux-media@vger.kernel.org, smoch@web.de, tmn505@gmail.com, vinschen@redhat.com Subject: [PATCH 02/21] media: av7110: remove budget-patch driver Date: Tue, 7 May 2024 02:24:41 +0200 Message-Id: <20240507002500.81867-3-herdler@nurfuerspam.de> X-Mailer: git-send-email 2.34.0 In-Reply-To: <20240507002500.81867-1-herdler@nurfuerspam.de> References: <20240507002500.81867-1-herdler@nurfuerspam.de> Precedence: bulk X-Mailing-List: linux-media@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Provags-ID: V03:K1:ZGS7wzc6C5EabtPssTl7IeMy20wVpa5hsW89mvwJN7viDC6iRDa Ahi9dy1cKMMyd26Oe5lO/QamD9SR7Gq0I6YzJxFuGcdIZkINm7nWPf/n2TBG9Laf8ii/vJU eMPq0Huky9GO+5yxRHnaePfIrRqauv79xfMCNUCs3z/yPCIRHvqRyERyXjuFBrakrRYkxt2 jr6dZ7DDkHr8XBqcEspoQ== X-Spam-Flag: NO UI-OutboundReport: notjunk:1;M01:P0:VkvVsal2p6M=;VyLr/uqVvM8iOe5ycCVkKlvTgv6 obynLYi41r5dmtE1otU5B83x2j+/MerbqUiQh7rbXiOuwRKenwZaK4/rcfio3BeCg0Qpb6Qlz 5PhLAz22HYxpnf+w+7AJ/n0RBpwJN8LdpTXxpyisIHTZXYh+WxbY3rnTSNNCpoAXrfUtTE82H uMir8XJNo+AltwvlLrqEGAfOsjXkOGlIzmJQOIj6E2leqJdk7y6PewoytrFJLA7VU6SsLSeZs Jf/VwKyKf6kFABkOsGTDSqR+xIHr1bVQrXx1602vCuSQ+GbSGGnKVEtEi0NBqV/cVMtDTmtFq 7It0m/vSZY5AcgeX4NnrPM1HDNS0WQhclsCBS74jQ/009YCcQiy2Nv1Z0goniAnRNKorpzmRu RmurdDuSmmpbd9Dc537WK2XxEJNvQg+EXbNclOKwPHZVjEy2jhlCFQYbUijVfWBMDkz+PuxhA dMFxCqygmcJjHvhioRNFLb7ztuZ6IidMGZC/mT+mgibfAy+UGWtR13+qvUhdOBmbLDepdDHBY oKe93zItcSgKYu4x0OrzSIsp8C05G6EdEP77qoPj3gFCuDZcSCbNQyNQn2W1EegnPlp+f/lWh ttySyJACUkj2FraXZ3ehNG4608N2U/gMzPHv5WJ2KByUL5Rzch+Xa9zsb1yfWFIDA13qlzPlj JLQfjVHuQCF0+Wvv3YYlUZyw+L115ouV8e+yc1jgqYtvtw05y/aLYgQvdjrqKwJuFnrkqWJ7u 74vA0/LRc+fSu8+J5UipXBmzf8zzrOtadUKP34wkcpCba6D2ZYQpIXFsFuwxFQkBXjHfvoqez vcav7LR5VK8JVP/WuVvQCWXHAcr3bhYEr3mISBRBgRK+E= This patch removes the budget-patch stand alone driver only. This patch does *not* remove the budget-patch support from the av7110 (= dvb-ttpci) driver. This patch does also *not* remove the support for the full-ts mod. The budget-patch is an obsolete, experimental hardware modification, which aimed to receive the whole transport stream of a transponder by bypassing the av7110. This modification never worked reliably enough to be used in a productive environment. "almost no packet loss" [budget-patch.c #522] is still a packet loss. The successor of the budget-patch is the full-ts mod, which is reliable. The full-ts mod circuit is found on the never rev. 2.2 and 2.3 DVB-S cards ex factory. The full-ts mod support is (only) in the av7110 (= dvb-ttpci) driver. The budget-patch driver is a stand alone driver, which turns the card into a budget card. It doesn't appear to be ever intended for the average user. "Card is required to have loaded firmware to tune properly. Firmware can be loaded by insertion and removal of standard av7110 driver prior to loading this driver." [Kconfig] There is support for the budget-patch in the av7110 (= dvb-ttpci) driver too, which isn't affected by this patch. The budget-patch is obsolete and replaced by the full-ts mod quiet a while now. Remove the budget-patch driver left over from development. Signed-off-by: Stefan Herdler --- ========================================================================== I use this cards since almost 20 years now and I have never ever used this driver, not even once. Back then Oliver Endriss strongly discouraged me to make any experiments with the budget-patch. It will corrupt the data, he said. (Some time later he introduced the full-ts mod support.) My productive System is running flawless without the whole kernel module. (Tested by deleting budget-patch.ko.) Therefore I'm as sure as I could be, this driver can be safely removed. ========================================================================== drivers/staging/media/av7110/Kconfig | 22 - drivers/staging/media/av7110/Makefile | 2 - drivers/staging/media/av7110/budget-patch.c | 665 -------------------- 3 files changed, 689 deletions(-) delete mode 100644 drivers/staging/media/av7110/budget-patch.c -- 2.34.0 diff --git a/drivers/staging/media/av7110/Kconfig b/drivers/staging/media/av7110/Kconfig index 9faf9d2d4..0722df9e6 100644 --- a/drivers/staging/media/av7110/Kconfig +++ b/drivers/staging/media/av7110/Kconfig @@ -51,28 +51,6 @@ config DVB_AV7110_OSD All other people say N. -config DVB_BUDGET_PATCH - tristate "AV7110 cards with Budget Patch" - depends on DVB_BUDGET_CORE && I2C - depends on DVB_AV7110 - select DVB_STV0299 if MEDIA_SUBDRV_AUTOSELECT - select DVB_VES1X93 if MEDIA_SUBDRV_AUTOSELECT - select DVB_TDA8083 if MEDIA_SUBDRV_AUTOSELECT - help - Support for Budget Patch (full TS) modification on - SAA7146+AV7110 based cards (DVB-S cards). This - driver doesn't use onboard MPEG2 decoder. The - card is driven in Budget-only mode. Card is - required to have loaded firmware to tune properly. - Firmware can be loaded by insertion and removal of - standard AV7110 driver prior to loading this - driver. - - Say Y if you own such a card and want to use it. - - To compile this driver as a module, choose M here: the - module will be called budget-patch. - if DVB_AV7110 # Frontend driver that it is used only by AV7110 driver diff --git a/drivers/staging/media/av7110/Makefile b/drivers/staging/media/av7110/Makefile index 307b26759..f4bbb535d 100644 --- a/drivers/staging/media/av7110/Makefile +++ b/drivers/staging/media/av7110/Makefile @@ -10,8 +10,6 @@ ifdef CONFIG_DVB_AV7110_IR dvb-ttpci-objs += av7110_ir.o endif -obj-$(CONFIG_DVB_BUDGET_PATCH) += budget-patch.o - obj-$(CONFIG_DVB_AV7110) += dvb-ttpci.o obj-$(CONFIG_DVB_SP8870) += sp8870.o diff --git a/drivers/staging/media/av7110/budget-patch.c b/drivers/staging/media/av7110/budget-patch.c deleted file mode 100644 index d173c8ade..000000000 --- a/drivers/staging/media/av7110/budget-patch.c +++ /dev/null @@ -1,665 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0-or-later -/* - * budget-patch.c: driver for Budget Patch, - * hardware modification of DVB-S cards enabling full TS - * - * Written by Emard - * - * Original idea by Roberto Deza - * - * Special thanks to Holger Waechtler, Michael Hunold, Marian Durkovic - * and Metzlerbros - * - * the project's page is at https://linuxtv.org - */ - -#include "av7110.h" -#include "av7110_hw.h" -#include "budget.h" -#include "stv0299.h" -#include "ves1x93.h" -#include "tda8083.h" - -#include "bsru6.h" - -DVB_DEFINE_MOD_OPT_ADAPTER_NR(adapter_nr); - -#define budget_patch budget - -static struct saa7146_extension budget_extension; - -MAKE_BUDGET_INFO(ttbp, "TT-Budget/Patch DVB-S 1.x PCI", BUDGET_PATCH); -//MAKE_BUDGET_INFO(satel,"TT-Budget/Patch SATELCO PCI", BUDGET_TT_HW_DISEQC); - -static const struct pci_device_id pci_tbl[] = { - MAKE_EXTENSION_PCI(ttbp,0x13c2, 0x0000), -// MAKE_EXTENSION_PCI(satel, 0x13c2, 0x1013), - { - .vendor = 0, - } -}; - -/* those lines are for budget-patch to be tried -** on a true budget card and observe the -** behaviour of VSYNC generated by rps1. -** this code was shamelessly copy/pasted from budget.c -*/ -static void gpio_Set22K (struct budget *budget, int state) -{ - struct saa7146_dev *dev=budget->dev; - dprintk(2, "budget: %p\n", budget); - saa7146_setgpio(dev, 3, (state ? SAA7146_GPIO_OUTHI : SAA7146_GPIO_OUTLO)); -} - -/* Diseqc functions only for TT Budget card */ -/* taken from the Skyvision DVB driver by - Ralph Metzler */ - -static void DiseqcSendBit (struct budget *budget, int data) -{ - struct saa7146_dev *dev=budget->dev; - dprintk(2, "budget: %p\n", budget); - - saa7146_setgpio(dev, 3, SAA7146_GPIO_OUTHI); - udelay(data ? 500 : 1000); - saa7146_setgpio(dev, 3, SAA7146_GPIO_OUTLO); - udelay(data ? 1000 : 500); -} - -static void DiseqcSendByte (struct budget *budget, int data) -{ - int i, par=1, d; - - dprintk(2, "budget: %p\n", budget); - - for (i=7; i>=0; i--) { - d = (data>>i)&1; - par ^= d; - DiseqcSendBit(budget, d); - } - - DiseqcSendBit(budget, par); -} - -static int SendDiSEqCMsg (struct budget *budget, int len, u8 *msg, unsigned long burst) -{ - struct saa7146_dev *dev=budget->dev; - int i; - - dprintk(2, "budget: %p\n", budget); - - saa7146_setgpio(dev, 3, SAA7146_GPIO_OUTLO); - mdelay(16); - - for (i=0; idvb->priv; - - switch (tone) { - case SEC_TONE_ON: - gpio_Set22K (budget, 1); - break; - - case SEC_TONE_OFF: - gpio_Set22K (budget, 0); - break; - - default: - return -EINVAL; - } - - return 0; -} - -static int budget_diseqc_send_master_cmd(struct dvb_frontend* fe, struct dvb_diseqc_master_cmd* cmd) -{ - struct budget* budget = (struct budget*) fe->dvb->priv; - - SendDiSEqCMsg (budget, cmd->msg_len, cmd->msg, 0); - - return 0; -} - -static int budget_diseqc_send_burst(struct dvb_frontend *fe, - enum fe_sec_mini_cmd minicmd) -{ - struct budget* budget = (struct budget*) fe->dvb->priv; - - SendDiSEqCMsg (budget, 0, NULL, minicmd); - - return 0; -} - -static int budget_av7110_send_fw_cmd(struct budget_patch *budget, u16* buf, int length) -{ - int i; - - dprintk(2, "budget: %p\n", budget); - - for (i = 2; i < length; i++) - { - ttpci_budget_debiwrite(budget, DEBINOSWAP, COMMAND + 2*i, 2, (u32) buf[i], 0,0); - msleep(5); - } - if (length) - ttpci_budget_debiwrite(budget, DEBINOSWAP, COMMAND + 2, 2, (u32) buf[1], 0,0); - else - ttpci_budget_debiwrite(budget, DEBINOSWAP, COMMAND + 2, 2, 0, 0,0); - msleep(5); - ttpci_budget_debiwrite(budget, DEBINOSWAP, COMMAND, 2, (u32) buf[0], 0,0); - msleep(5); - return 0; -} - -static void av7110_set22k(struct budget_patch *budget, int state) -{ - u16 buf[2] = {( COMTYPE_AUDIODAC << 8) | (state ? ON22K : OFF22K), 0}; - - dprintk(2, "budget: %p\n", budget); - budget_av7110_send_fw_cmd(budget, buf, 2); -} - -static int av7110_send_diseqc_msg(struct budget_patch *budget, int len, u8 *msg, int burst) -{ - int i; - u16 buf[18] = { ((COMTYPE_AUDIODAC << 8) | SendDiSEqC), - 16, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }; - - dprintk(2, "budget: %p\n", budget); - - if (len>10) - len=10; - - buf[1] = len+2; - buf[2] = len; - - if (burst != -1) - buf[3]=burst ? 0x01 : 0x00; - else - buf[3]=0xffff; - - for (i=0; idvb->priv; - - switch (tone) { - case SEC_TONE_ON: - av7110_set22k (budget, 1); - break; - - case SEC_TONE_OFF: - av7110_set22k (budget, 0); - break; - - default: - return -EINVAL; - } - - return 0; -} - -static int budget_patch_diseqc_send_master_cmd(struct dvb_frontend* fe, struct dvb_diseqc_master_cmd* cmd) -{ - struct budget_patch* budget = (struct budget_patch*) fe->dvb->priv; - - av7110_send_diseqc_msg (budget, cmd->msg_len, cmd->msg, 0); - - return 0; -} - -static int budget_patch_diseqc_send_burst(struct dvb_frontend *fe, - enum fe_sec_mini_cmd minicmd) -{ - struct budget_patch* budget = (struct budget_patch*) fe->dvb->priv; - - av7110_send_diseqc_msg (budget, 0, NULL, minicmd); - - return 0; -} - -static int alps_bsrv2_tuner_set_params(struct dvb_frontend *fe) -{ - struct dtv_frontend_properties *p = &fe->dtv_property_cache; - struct budget_patch* budget = (struct budget_patch*) fe->dvb->priv; - u8 pwr = 0; - u8 buf[4]; - struct i2c_msg msg = { .addr = 0x61, .flags = 0, .buf = buf, .len = sizeof(buf) }; - u32 div = (p->frequency + 479500) / 125; - - if (p->frequency > 2000000) - pwr = 3; - else if (p->frequency > 1800000) - pwr = 2; - else if (p->frequency > 1600000) - pwr = 1; - else if (p->frequency > 1200000) - pwr = 0; - else if (p->frequency >= 1100000) - pwr = 1; - else pwr = 2; - - buf[0] = (div >> 8) & 0x7f; - buf[1] = div & 0xff; - buf[2] = ((div & 0x18000) >> 10) | 0x95; - buf[3] = (pwr << 6) | 0x30; - - // NOTE: since we're using a prescaler of 2, we set the - // divisor frequency to 62.5kHz and divide by 125 above - - if (fe->ops.i2c_gate_ctrl) - fe->ops.i2c_gate_ctrl(fe, 1); - if (i2c_transfer (&budget->i2c_adap, &msg, 1) != 1) - return -EIO; - return 0; -} - -static struct ves1x93_config alps_bsrv2_config = { - .demod_address = 0x08, - .xin = 90100000UL, - .invert_pwm = 0, -}; - -static int grundig_29504_451_tuner_set_params(struct dvb_frontend *fe) -{ - struct dtv_frontend_properties *p = &fe->dtv_property_cache; - struct budget_patch* budget = (struct budget_patch*) fe->dvb->priv; - u32 div; - u8 data[4]; - struct i2c_msg msg = { .addr = 0x61, .flags = 0, .buf = data, .len = sizeof(data) }; - - div = p->frequency / 125; - data[0] = (div >> 8) & 0x7f; - data[1] = div & 0xff; - data[2] = 0x8e; - data[3] = 0x00; - - if (fe->ops.i2c_gate_ctrl) - fe->ops.i2c_gate_ctrl(fe, 1); - if (i2c_transfer (&budget->i2c_adap, &msg, 1) != 1) - return -EIO; - return 0; -} - -static struct tda8083_config grundig_29504_451_config = { - .demod_address = 0x68, -}; - -static void frontend_init(struct budget_patch* budget) -{ - switch(budget->dev->pci->subsystem_device) { - case 0x0000: // Hauppauge/TT WinTV DVB-S rev1.X - case 0x1013: // SATELCO Multimedia PCI - - // try the ALPS BSRV2 first of all - budget->dvb_frontend = dvb_attach(ves1x93_attach, &alps_bsrv2_config, &budget->i2c_adap); - if (budget->dvb_frontend) { - budget->dvb_frontend->ops.tuner_ops.set_params = alps_bsrv2_tuner_set_params; - budget->dvb_frontend->ops.diseqc_send_master_cmd = budget_patch_diseqc_send_master_cmd; - budget->dvb_frontend->ops.diseqc_send_burst = budget_patch_diseqc_send_burst; - budget->dvb_frontend->ops.set_tone = budget_patch_set_tone; - break; - } - - // try the ALPS BSRU6 now - budget->dvb_frontend = dvb_attach(stv0299_attach, &alps_bsru6_config, &budget->i2c_adap); - if (budget->dvb_frontend) { - budget->dvb_frontend->ops.tuner_ops.set_params = alps_bsru6_tuner_set_params; - budget->dvb_frontend->tuner_priv = &budget->i2c_adap; - - budget->dvb_frontend->ops.diseqc_send_master_cmd = budget_diseqc_send_master_cmd; - budget->dvb_frontend->ops.diseqc_send_burst = budget_diseqc_send_burst; - budget->dvb_frontend->ops.set_tone = budget_set_tone; - break; - } - - // Try the grundig 29504-451 - budget->dvb_frontend = dvb_attach(tda8083_attach, &grundig_29504_451_config, &budget->i2c_adap); - if (budget->dvb_frontend) { - budget->dvb_frontend->ops.tuner_ops.set_params = grundig_29504_451_tuner_set_params; - budget->dvb_frontend->ops.diseqc_send_master_cmd = budget_diseqc_send_master_cmd; - budget->dvb_frontend->ops.diseqc_send_burst = budget_diseqc_send_burst; - budget->dvb_frontend->ops.set_tone = budget_set_tone; - break; - } - break; - } - - if (budget->dvb_frontend == NULL) { - printk("dvb-ttpci: A frontend driver was not found for device [%04x:%04x] subsystem [%04x:%04x]\n", - budget->dev->pci->vendor, - budget->dev->pci->device, - budget->dev->pci->subsystem_vendor, - budget->dev->pci->subsystem_device); - } else { - if (dvb_register_frontend(&budget->dvb_adapter, budget->dvb_frontend)) { - printk("budget-av: Frontend registration failed!\n"); - dvb_frontend_detach(budget->dvb_frontend); - budget->dvb_frontend = NULL; - } - } -} - -/* written by Emard */ -static int budget_patch_attach (struct saa7146_dev* dev, struct saa7146_pci_extension_data *info) -{ - struct budget_patch *budget; - int err; - int count = 0; - int detected = 0; - -#define PATCH_RESET 0 -#define RPS_IRQ 0 -#define HPS_SETUP 0 -#if PATCH_RESET - saa7146_write(dev, MC1, MASK_31); - msleep(40); -#endif -#if HPS_SETUP - // initialize registers. Better to have it like this - // than leaving something unconfigured - saa7146_write(dev, DD1_STREAM_B, 0); - // port B VSYNC at rising edge - saa7146_write(dev, DD1_INIT, 0x00000200); // have this in budget-core too! - saa7146_write(dev, BRS_CTRL, 0x00000000); // VBI - - // debi config - // saa7146_write(dev, DEBI_CONFIG, MASK_30|MASK_28|MASK_18); - - // zero all HPS registers - saa7146_write(dev, HPS_H_PRESCALE, 0); // r68 - saa7146_write(dev, HPS_H_SCALE, 0); // r6c - saa7146_write(dev, BCS_CTRL, 0); // r70 - saa7146_write(dev, HPS_V_SCALE, 0); // r60 - saa7146_write(dev, HPS_V_GAIN, 0); // r64 - saa7146_write(dev, CHROMA_KEY_RANGE, 0); // r74 - saa7146_write(dev, CLIP_FORMAT_CTRL, 0); // r78 - // Set HPS prescaler for port B input - saa7146_write(dev, HPS_CTRL, (1<<30) | (0<<29) | (1<<28) | (0<<12) ); - saa7146_write(dev, MC2, - 0 * (MASK_08 | MASK_24) | // BRS control - 0 * (MASK_09 | MASK_25) | // a - 0 * (MASK_10 | MASK_26) | // b - 1 * (MASK_06 | MASK_22) | // HPS_CTRL1 - 1 * (MASK_05 | MASK_21) | // HPS_CTRL2 - 0 * (MASK_01 | MASK_15) // DEBI - ); -#endif - // Disable RPS1 and RPS0 - saa7146_write(dev, MC1, ( MASK_29 | MASK_28)); - // RPS1 timeout disable - saa7146_write(dev, RPS_TOV1, 0); - - // code for autodetection - // will wait for VBI_B event (vertical blank at port B) - // and will reset GPIO3 after VBI_B is detected. - // (GPIO3 should be raised high by CPU to - // test if GPIO3 will generate vertical blank signal - // in budget patch GPIO3 is connected to VSYNC_B - count = 0; -#if 0 - WRITE_RPS1(CMD_UPLOAD | - MASK_10 | MASK_09 | MASK_08 | MASK_06 | MASK_05 | MASK_04 | MASK_03 | MASK_02 ); -#endif - WRITE_RPS1(CMD_PAUSE | EVT_VBI_B); - WRITE_RPS1(CMD_WR_REG_MASK | (GPIO_CTRL>>2)); - WRITE_RPS1(GPIO3_MSK); - WRITE_RPS1(SAA7146_GPIO_OUTLO<<24); -#if RPS_IRQ - // issue RPS1 interrupt to increment counter - WRITE_RPS1(CMD_INTERRUPT); - // at least a NOP is neede between two interrupts - WRITE_RPS1(CMD_NOP); - // interrupt again - WRITE_RPS1(CMD_INTERRUPT); -#endif - WRITE_RPS1(CMD_STOP); - -#if RPS_IRQ - // set event counter 1 source as RPS1 interrupt (0x03) (rE4 p53) - // use 0x03 to track RPS1 interrupts - increase by 1 every gpio3 is toggled - // use 0x15 to track VPE interrupts - increase by 1 every vpeirq() is called - saa7146_write(dev, EC1SSR, (0x03<<2) | 3 ); - // set event counter 1 threshold to maximum allowed value (rEC p55) - saa7146_write(dev, ECT1R, 0x3fff ); -#endif - // Fix VSYNC level - saa7146_setgpio(dev, 3, SAA7146_GPIO_OUTLO); - // Set RPS1 Address register to point to RPS code (r108 p42) - saa7146_write(dev, RPS_ADDR1, dev->d_rps1.dma_handle); - // Enable RPS1, (rFC p33) - saa7146_write(dev, MC1, (MASK_13 | MASK_29 )); - - - mdelay(50); - saa7146_setgpio(dev, 3, SAA7146_GPIO_OUTHI); - mdelay(150); - - - if( (saa7146_read(dev, GPIO_CTRL) & 0x10000000) == 0) - detected = 1; - -#if RPS_IRQ - printk("Event Counter 1 0x%04x\n", saa7146_read(dev, EC1R) & 0x3fff ); -#endif - // Disable RPS1 - saa7146_write(dev, MC1, ( MASK_29 )); - - if(detected == 0) - printk("budget-patch not detected or saa7146 in non-default state.\n" - "try enabling resetting of 7146 with MASK_31 in MC1 register\n"); - - else - printk("BUDGET-PATCH DETECTED.\n"); - - -/* OLD (Original design by Roberto Deza): -** This code will setup the SAA7146_RPS1 to generate a square -** wave on GPIO3, changing when a field (TS_HEIGHT/2 "lines" of -** TS_WIDTH packets) has been acquired on SAA7146_D1B video port; -** then, this GPIO3 output which is connected to the D1B_VSYNC -** input, will trigger the acquisition of the alternate field -** and so on. -** Currently, the TT_budget / WinTV_Nova cards have two ICs -** (74HCT4040, LVC74) for the generation of this VSYNC signal, -** which seems that can be done perfectly without this :-)). -*/ - -/* New design (By Emard) -** this rps1 code will copy internal HS event to GPIO3 pin. -** GPIO3 is in budget-patch hardware connected to port B VSYNC - -** HS is an internal event of 7146, accessible with RPS -** and temporarily raised high every n lines -** (n in defined in the RPS_THRESH1 counter threshold) -** I think HS is raised high on the beginning of the n-th line -** and remains high until this n-th line that triggered -** it is completely received. When the reception of n-th line -** ends, HS is lowered. - -** To transmit data over DMA, 7146 needs changing state at -** port B VSYNC pin. Any changing of port B VSYNC will -** cause some DMA data transfer, with more or less packets loss. -** It depends on the phase and frequency of VSYNC and -** the way of 7146 is instructed to trigger on port B (defined -** in DD1_INIT register, 3rd nibble from the right valid -** numbers are 0-7, see datasheet) -** -** The correct triggering can minimize packet loss, -** dvbtraffic should give this stable bandwidths: -** 22k transponder = 33814 kbit/s -** 27.5k transponder = 38045 kbit/s -** by experiment it is found that the best results -** (stable bandwidths and almost no packet loss) -** are obtained using DD1_INIT triggering number 2 -** (Va at rising edge of VS Fa = HS x VS-failing forced toggle) -** and a VSYNC phase that occurs in the middle of DMA transfer -** (about byte 188*512=96256 in the DMA window). -** -** Phase of HS is still not clear to me how to control, -** It just happens to be so. It can be seen if one enables -** RPS_IRQ and print Event Counter 1 in vpeirq(). Every -** time RPS_INTERRUPT is called, the Event Counter 1 will -** increment. That's how the 7146 is programmed to do event -** counting in this budget-patch.c -** I *think* HPS setting has something to do with the phase -** of HS but I can't be 100% sure in that. - -** hardware debug note: a working budget card (including budget patch) -** with vpeirq() interrupt setup in mode "0x90" (every 64K) will -** generate 3 interrupts per 25-Hz DMA frame of 2*188*512 bytes -** and that means 3*25=75 Hz of interrupt frequency, as seen by -** watch cat /proc/interrupts -** -** If this frequency is 3x lower (and data received in the DMA -** buffer don't start with 0x47, but in the middle of packets, -** whose lengths appear to be like 188 292 188 104 etc. -** this means VSYNC line is not connected in the hardware. -** (check soldering pcb and pins) -** The same behaviour of missing VSYNC can be duplicated on budget -** cards, by setting DD1_INIT trigger mode 7 in 3rd nibble. -*/ - - // Setup RPS1 "program" (p35) - count = 0; - - - // Wait Source Line Counter Threshold (p36) - WRITE_RPS1(CMD_PAUSE | EVT_HS); - // Set GPIO3=1 (p42) - WRITE_RPS1(CMD_WR_REG_MASK | (GPIO_CTRL>>2)); - WRITE_RPS1(GPIO3_MSK); - WRITE_RPS1(SAA7146_GPIO_OUTHI<<24); -#if RPS_IRQ - // issue RPS1 interrupt - WRITE_RPS1(CMD_INTERRUPT); -#endif - // Wait reset Source Line Counter Threshold (p36) - WRITE_RPS1(CMD_PAUSE | RPS_INV | EVT_HS); - // Set GPIO3=0 (p42) - WRITE_RPS1(CMD_WR_REG_MASK | (GPIO_CTRL>>2)); - WRITE_RPS1(GPIO3_MSK); - WRITE_RPS1(SAA7146_GPIO_OUTLO<<24); -#if RPS_IRQ - // issue RPS1 interrupt - WRITE_RPS1(CMD_INTERRUPT); -#endif - // Jump to begin of RPS program (p37) - WRITE_RPS1(CMD_JUMP); - WRITE_RPS1(dev->d_rps1.dma_handle); - - // Fix VSYNC level - saa7146_setgpio(dev, 3, SAA7146_GPIO_OUTLO); - // Set RPS1 Address register to point to RPS code (r108 p42) - saa7146_write(dev, RPS_ADDR1, dev->d_rps1.dma_handle); - - if (!(budget = kmalloc (sizeof(struct budget_patch), GFP_KERNEL))) - return -ENOMEM; - - dprintk(2, "budget: %p\n", budget); - - err = ttpci_budget_init(budget, dev, info, THIS_MODULE, adapter_nr); - if (err) { - kfree(budget); - return err; - } - - // Set Source Line Counter Threshold, using BRS (rCC p43) - // It generates HS event every TS_HEIGHT lines - // this is related to TS_WIDTH set in register - // NUM_LINE_BYTE3 in budget-core.c. If NUM_LINE_BYTE - // low 16 bits are set to TS_WIDTH bytes (TS_WIDTH=2*188 - //,then RPS_THRESH1 - // should be set to trigger every TS_HEIGHT (512) lines. - // - saa7146_write(dev, RPS_THRESH1, budget->buffer_height | MASK_12 ); - - // saa7146_write(dev, RPS_THRESH0, ((TS_HEIGHT/2)<<16) |MASK_28| (TS_HEIGHT/2) |MASK_12 ); - // Enable RPS1 (rFC p33) - saa7146_write(dev, MC1, (MASK_13 | MASK_29)); - - - dev->ext_priv = budget; - - budget->dvb_adapter.priv = budget; - frontend_init(budget); - - ttpci_budget_init_hooks(budget); - - return 0; -} - -static int budget_patch_detach (struct saa7146_dev* dev) -{ - struct budget_patch *budget = (struct budget_patch*) dev->ext_priv; - int err; - - if (budget->dvb_frontend) { - dvb_unregister_frontend(budget->dvb_frontend); - dvb_frontend_detach(budget->dvb_frontend); - } - err = ttpci_budget_deinit (budget); - - kfree (budget); - - return err; -} - -static int __init budget_patch_init(void) -{ - return saa7146_register_extension(&budget_extension); -} - -static void __exit budget_patch_exit(void) -{ - saa7146_unregister_extension(&budget_extension); -} - -static struct saa7146_extension budget_extension = { - .name = "budget_patch dvb", - .flags = 0, - - .module = THIS_MODULE, - .pci_tbl = pci_tbl, - .attach = budget_patch_attach, - .detach = budget_patch_detach, - - .irq_mask = MASK_10, - .irq_func = ttpci_budget_irq10_handler, -}; - -module_init(budget_patch_init); -module_exit(budget_patch_exit); - -MODULE_LICENSE("GPL"); -MODULE_AUTHOR("Emard, Roberto Deza, Holger Waechtler, Michael Hunold, others"); -MODULE_DESCRIPTION("Driver for full TS modified DVB-S SAA7146+AV7110 based so-called Budget Patch cards"); From patchwork Tue May 7 00:24:42 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Herdler X-Patchwork-Id: 13656122 Received: from mout.gmx.net (mout.gmx.net [212.227.17.22]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 3713679F0 for ; Tue, 7 May 2024 00:25:29 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=212.227.17.22 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1715041532; cv=none; b=UIYo72BZPzPcTEJy051XwWtqT4mcL0QKI+aMZe2PH4a9bR8WqymODI8JOO6WC2D26G3dbVKWEmAf9Hiu0QKKBH5Bc3ec0tmDH7jGN0DEcAYKlOK+s7duoDu3PNTtRRUuWvJONyStrBmNMp6zZDoYfPwsCRvKX+aie/j0SIzfGzI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1715041532; c=relaxed/simple; bh=QlfYLJaDSZOnHpRaTpqJOJDYvkDTxKGxdXulZd1DAKM=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=EriYVZl1HzfpuWPIwG/GHocobOElMtQ6nhDpm2PBlIobT5ZouL+67ndhW+4yZBomAnSaE+r5olZh+uJ8QvRe2bfhD38X2ax2OWp3MXv7IcUGNphGvlsWcU7xR2CDHPGlOTM+f7w1D+/IcrRGwXEhsuNDmeKBmcxoPey8+r4ylvM= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=nurfuerspam.de; spf=pass smtp.mailfrom=nurfuerspam.de; dkim=pass (2048-bit key) header.d=nurfuerspam.de header.i=herdler@nurfuerspam.de header.b=dFb5ZDuG; arc=none smtp.client-ip=212.227.17.22 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=nurfuerspam.de Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=nurfuerspam.de Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=nurfuerspam.de header.i=herdler@nurfuerspam.de header.b="dFb5ZDuG" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nurfuerspam.de; s=s31663417; t=1715041526; x=1715646326; i=herdler@nurfuerspam.de; bh=/o9tSanuJCe6yecdSJ1RmC3+RUcLKPA6pazNEyxhe2Y=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date:Message-Id:In-Reply-To: References:MIME-Version:Content-Transfer-Encoding:cc: content-transfer-encoding:content-type:date:from:message-id: mime-version:reply-to:subject:to; b=dFb5ZDuGBoNHZy5tpw8QU1QkUNrE+phLw68EcFN5JKB646R75QOKcwKjJZHXp5CU YYl3z9SEvM9jfB8eCUh2Mwc8aP30uGxKIRk+7O2lkoXslHnHEJXjSj+IHEGud/r/P 4L2SBFe++BFpLwM8ts6BnyTIa5PJ9F6Wnfak1DSgmJlY+9KrIWVbotY8aKUWcY2H8 vqCSDKKMDwPZIySB+9wkxDqOs9rtzkK1eT3a73ypiJcIXXex8WwBINeYu4oF3bRu8 s+3Xi+KI0BwhZJqTRsc5IDVoiimX4PwSVQdA685EIDZwJTBIl760kSnFTjLggRilh n7R4Xjh7H+smMx/08g== X-UI-Sender-Class: 724b4f7f-cbec-4199-ad4e-598c01a50d3a Received: from astro.haus ([185.101.174.109]) by mail.gmx.net (mrgmx105 [212.227.17.168]) with ESMTPSA (Nemesis) id 1Ma24y-1s9Vrt3pJc-00W0yR; Tue, 07 May 2024 02:25:26 +0200 From: Stefan Herdler To: hverkuil-cisco@xs4all.nl Cc: linux-media@vger.kernel.org, smoch@web.de, tmn505@gmail.com, vinschen@redhat.com Subject: [PATCH 03/21] media: sp8870: coding style fixes: whitespace Date: Tue, 7 May 2024 02:24:42 +0200 Message-Id: <20240507002500.81867-4-herdler@nurfuerspam.de> X-Mailer: git-send-email 2.34.0 In-Reply-To: <20240507002500.81867-1-herdler@nurfuerspam.de> References: <20240507002500.81867-1-herdler@nurfuerspam.de> Precedence: bulk X-Mailing-List: linux-media@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Provags-ID: V03:K1:Se3LleURTj4+N7ayZxW1JN6GY761OhqJPZtoiGfwUDawN7ft2MT BZH3eqnmQrGW/YHXO6nJ9CS4/RkZEdaMUyPYgWwBa9xlDWX3+k2h0FVEj4q/AMeBMq7mxsN WvU+7V85XSvPznN3Ypm67BRy3vdA11SKQ0DHrJk+2JRaJg5Ace1inUdVim+pSNc9NTbI4hO ttIb2lCBTF88CUvOVRU1w== X-Spam-Flag: NO UI-OutboundReport: notjunk:1;M01:P0:Dza5eeaEC5U=;JeotGqZfrj9p/gjFq1EnsjOrCnR 9jPhUde2z+2zPJQ5pFRC1+K4g8dTXNURH5FSWI1fKMVbdALwxS6RzFlSj8u/XdYrOhaABTC5g yM+0ePJxiHXKbQFFE38aQlNwMfZGiazU37jbO2aoOj4rMkFaqQOXpH9756KU9S+16ZVQ/MHcT /BUAuqw0Chwgpf4RS8w4tybT7eweL0kSxL81TTx1I4bwqm8UP5/6oL1bAqa7sMqfekH00iCco rAb+Vg5JUt5po3G8dt4adI5nyKPut2rBl/8myLeqFpfkaZ5EfqnElrLPh3jisPlJbdiDD9/nP V+ST1RtWooHh2UqNNd5tzTM2RPs4wFrSdj2kLNPZBu8iCu9xsrrYCuJqjUyDgytsvKoFD2vq0 1fHJYeo5i3ZGLxGuCVlYKQMkmYAftmpsegtlFriqCwdCQ+whzLMD4fYTHRPxmGzpWBGahFAZ5 ShWlZiPLuI74KH9oXfn+xPAiCxGQUvZmDfQmoJsFv6nIw2IRtq8I2AJy3emZZQ7AVdfw40eXA ZUFujc6lJSi78pksqSU1Be/Vo52IDTNfMNZh3qXoVhGOfUFGAOQcykc6Wgwo4xX+KK/TMmC61 3noWjJzLsnmxNmHSmCVk0ofMDh+c5awDoNem5rPviKNVDFNY2pNA1gcUeXkb4G3ViFXMz9mKj 6Gm4V8TVhTDWhR0bfLclW+rSffsyk7w2/LndMkaRoFgRjGiAWUyalI3W1kkUqyOtRTlPHkKhk fgq6M/t+9D4cn26FcgEDAqwb+HRTAfHO6jF1Ov8g5aNscHkbV/0oTHwZ3WO/8gzdFV8gmxpCE AAhZ63UleQV4L5vcxdedTNBjhtwU9d3A1cQrsg3f/nurs= This patch fixes the following checkpatch warnings: ERROR:BRACKET_SPACE: space prohibited before open square bracket '[' ERROR:POINTER_LOCATION: "foo * bar" should be "foo *bar" ERROR:POINTER_LOCATION: "foo* bar" should be "foo *bar" ERROR:SPACING: space prohibited before that ',' (ctx:WxW) ERROR:SPACING: space required before the open brace '{' WARNING:SPACING: space prohibited between function name and open parenthesis '(' CHECK:PARENTHESIS_ALIGNMENT: Alignment should match open parenthesis Whitespace changes only. "git diff -w" shows no changes. Signed-off-by: Stefan Herdler --- drivers/staging/media/av7110/sp8870.c | 80 +++++++++++++-------------- drivers/staging/media/av7110/sp8870.h | 6 +- 2 files changed, 43 insertions(+), 43 deletions(-) -- 2.34.0 diff --git a/drivers/staging/media/av7110/sp8870.c b/drivers/staging/media/av7110/sp8870.c index abf5c7260..4fb8518d2 100644 --- a/drivers/staging/media/av7110/sp8870.c +++ b/drivers/staging/media/av7110/sp8870.c @@ -28,9 +28,9 @@ struct sp8870_state { - struct i2c_adapter* i2c; + struct i2c_adapter *i2c; - const struct sp8870_config* config; + const struct sp8870_config *config; struct dvb_frontend frontend; @@ -50,9 +50,9 @@ static int debug; /* starting point for firmware in file 'Sc_main.mc' */ #define SP8870_FIRMWARE_OFFSET 0x0A -static int sp8870_writereg (struct sp8870_state* state, u16 reg, u16 data) +static int sp8870_writereg(struct sp8870_state *state, u16 reg, u16 data) { - u8 buf [] = { reg >> 8, reg & 0xff, data >> 8, data & 0xff }; + u8 buf[] = { reg >> 8, reg & 0xff, data >> 8, data & 0xff }; struct i2c_msg msg = { .addr = state->config->demod_address, .flags = 0, .buf = buf, .len = 4 }; int err; @@ -64,15 +64,15 @@ static int sp8870_writereg (struct sp8870_state* state, u16 reg, u16 data) return 0; } -static int sp8870_readreg (struct sp8870_state* state, u16 reg) +static int sp8870_readreg(struct sp8870_state *state, u16 reg) { int ret; - u8 b0 [] = { reg >> 8 , reg & 0xff }; - u8 b1 [] = { 0, 0 }; + u8 b0[] = { reg >> 8, reg & 0xff }; + u8 b1[] = { 0, 0 }; struct i2c_msg msg [] = { { .addr = state->config->demod_address, .flags = 0, .buf = b0, .len = 2 }, { .addr = state->config->demod_address, .flags = I2C_M_RD, .buf = b1, .len = 2 } }; - ret = i2c_transfer (state->i2c, msg, 2); + ret = i2c_transfer(state->i2c, msg, 2); if (ret != 2) { dprintk("%s: readreg error (ret == %i)\n", __func__, ret); @@ -82,7 +82,7 @@ static int sp8870_readreg (struct sp8870_state* state, u16 reg) return (b1[0] << 8 | b1[1]); } -static int sp8870_firmware_upload (struct sp8870_state* state, const struct firmware *fw) +static int sp8870_firmware_upload(struct sp8870_state *state, const struct firmware *fw) { struct i2c_msg msg; const char *fw_buf = fw->data; @@ -107,7 +107,7 @@ static int sp8870_firmware_upload (struct sp8870_state* state, const struct firm // do firmware upload fw_pos = SP8870_FIRMWARE_OFFSET; - while (fw_pos < SP8870_FIRMWARE_SIZE + SP8870_FIRMWARE_OFFSET){ + while (fw_pos < SP8870_FIRMWARE_SIZE + SP8870_FIRMWARE_OFFSET) { tx_len = (fw_pos <= SP8870_FIRMWARE_SIZE + SP8870_FIRMWARE_OFFSET - 252) ? 252 : SP8870_FIRMWARE_SIZE + SP8870_FIRMWARE_OFFSET - fw_pos; // write register 0xCF0A tx_buf[0] = 0xCF; @@ -129,7 +129,7 @@ static int sp8870_firmware_upload (struct sp8870_state* state, const struct firm return 0; }; -static void sp8870_microcontroller_stop (struct sp8870_state* state) +static void sp8870_microcontroller_stop(struct sp8870_state *state) { sp8870_writereg(state, 0x0F08, 0x000); sp8870_writereg(state, 0x0F09, 0x000); @@ -138,7 +138,7 @@ static void sp8870_microcontroller_stop (struct sp8870_state* state) sp8870_writereg(state, 0x0F00, 0x000); } -static void sp8870_microcontroller_start (struct sp8870_state* state) +static void sp8870_microcontroller_start(struct sp8870_state *state) { sp8870_writereg(state, 0x0F08, 0x000); sp8870_writereg(state, 0x0F09, 0x000); @@ -150,12 +150,12 @@ static void sp8870_microcontroller_start (struct sp8870_state* state) sp8870_readreg(state, 0x0D01); } -static int sp8870_read_data_valid_signal(struct sp8870_state* state) +static int sp8870_read_data_valid_signal(struct sp8870_state *state) { return (sp8870_readreg(state, 0x0D02) > 0); } -static int configure_reg0xc05 (struct dtv_frontend_properties *p, u16 *reg0xc05) +static int configure_reg0xc05(struct dtv_frontend_properties *p, u16 *reg0xc05) { int known_parameters = 1; @@ -226,7 +226,7 @@ static int configure_reg0xc05 (struct dtv_frontend_properties *p, u16 *reg0xc05) return 0; } -static int sp8870_wake_up(struct sp8870_state* state) +static int sp8870_wake_up(struct sp8870_state *state) { // enable TS output and interface pins return sp8870_writereg(state, 0xC18, 0x00D); @@ -235,7 +235,7 @@ static int sp8870_wake_up(struct sp8870_state* state) static int sp8870_set_frontend_parameters(struct dvb_frontend *fe) { struct dtv_frontend_properties *p = &fe->dtv_property_cache; - struct sp8870_state* state = fe->demodulator_priv; + struct sp8870_state *state = fe->demodulator_priv; int err; u16 reg0xc05; @@ -290,9 +290,9 @@ static int sp8870_set_frontend_parameters(struct dvb_frontend *fe) return 0; } -static int sp8870_init (struct dvb_frontend* fe) +static int sp8870_init(struct dvb_frontend *fe) { - struct sp8870_state* state = fe->demodulator_priv; + struct sp8870_state *state = fe->demodulator_priv; const struct firmware *fw = NULL; sp8870_wake_up(state); @@ -342,17 +342,17 @@ static int sp8870_init (struct dvb_frontend* fe) static int sp8870_read_status(struct dvb_frontend *fe, enum fe_status *fe_status) { - struct sp8870_state* state = fe->demodulator_priv; + struct sp8870_state *state = fe->demodulator_priv; int status; int signal; *fe_status = 0; - status = sp8870_readreg (state, 0x0200); + status = sp8870_readreg(state, 0x0200); if (status < 0) return -EIO; - signal = sp8870_readreg (state, 0x0303); + signal = sp8870_readreg(state, 0x0303); if (signal < 0) return -EIO; @@ -366,9 +366,9 @@ static int sp8870_read_status(struct dvb_frontend *fe, return 0; } -static int sp8870_read_ber (struct dvb_frontend* fe, u32 * ber) +static int sp8870_read_ber(struct dvb_frontend *fe, u32 *ber) { - struct sp8870_state* state = fe->demodulator_priv; + struct sp8870_state *state = fe->demodulator_priv; int ret; u32 tmp; @@ -393,21 +393,21 @@ static int sp8870_read_ber (struct dvb_frontend* fe, u32 * ber) return 0; } -static int sp8870_read_signal_strength(struct dvb_frontend* fe, u16 * signal) +static int sp8870_read_signal_strength(struct dvb_frontend *fe, u16 *signal) { - struct sp8870_state* state = fe->demodulator_priv; + struct sp8870_state *state = fe->demodulator_priv; int ret; u16 tmp; *signal = 0; - ret = sp8870_readreg (state, 0x306); + ret = sp8870_readreg(state, 0x306); if (ret < 0) return -EIO; tmp = ret << 8; - ret = sp8870_readreg (state, 0x303); + ret = sp8870_readreg(state, 0x303); if (ret < 0) return -EIO; @@ -419,9 +419,9 @@ static int sp8870_read_signal_strength(struct dvb_frontend* fe, u16 * signal) return 0; } -static int sp8870_read_uncorrected_blocks (struct dvb_frontend* fe, u32* ublocks) +static int sp8870_read_uncorrected_blocks(struct dvb_frontend *fe, u32 *ublocks) { - struct sp8870_state* state = fe->demodulator_priv; + struct sp8870_state *state = fe->demodulator_priv; int ret; *ublocks = 0; @@ -451,7 +451,7 @@ static int switches; static int sp8870_set_frontend(struct dvb_frontend *fe) { struct dtv_frontend_properties *p = &fe->dtv_property_cache; - struct sp8870_state* state = fe->demodulator_priv; + struct sp8870_state *state = fe->demodulator_priv; /* The firmware of the sp8870 sometimes locks up after setting frontend parameters. @@ -507,15 +507,15 @@ static int sp8870_set_frontend(struct dvb_frontend *fe) return 0; } -static int sp8870_sleep(struct dvb_frontend* fe) +static int sp8870_sleep(struct dvb_frontend *fe) { - struct sp8870_state* state = fe->demodulator_priv; + struct sp8870_state *state = fe->demodulator_priv; // tristate TS output and disable interface pins return sp8870_writereg(state, 0xC18, 0x000); } -static int sp8870_get_tune_settings(struct dvb_frontend* fe, struct dvb_frontend_tune_settings* fesettings) +static int sp8870_get_tune_settings(struct dvb_frontend *fe, struct dvb_frontend_tune_settings *fesettings) { fesettings->min_delay_ms = 350; fesettings->step_size = 0; @@ -523,9 +523,9 @@ static int sp8870_get_tune_settings(struct dvb_frontend* fe, struct dvb_frontend return 0; } -static int sp8870_i2c_gate_ctrl(struct dvb_frontend* fe, int enable) +static int sp8870_i2c_gate_ctrl(struct dvb_frontend *fe, int enable) { - struct sp8870_state* state = fe->demodulator_priv; + struct sp8870_state *state = fe->demodulator_priv; if (enable) { return sp8870_writereg(state, 0x206, 0x001); @@ -534,18 +534,18 @@ static int sp8870_i2c_gate_ctrl(struct dvb_frontend* fe, int enable) } } -static void sp8870_release(struct dvb_frontend* fe) +static void sp8870_release(struct dvb_frontend *fe) { - struct sp8870_state* state = fe->demodulator_priv; + struct sp8870_state *state = fe->demodulator_priv; kfree(state); } static const struct dvb_frontend_ops sp8870_ops; -struct dvb_frontend* sp8870_attach(const struct sp8870_config* config, - struct i2c_adapter* i2c) +struct dvb_frontend *sp8870_attach(const struct sp8870_config *config, + struct i2c_adapter *i2c) { - struct sp8870_state* state = NULL; + struct sp8870_state *state = NULL; /* allocate memory for the internal state */ state = kzalloc(sizeof(struct sp8870_state), GFP_KERNEL); diff --git a/drivers/staging/media/av7110/sp8870.h b/drivers/staging/media/av7110/sp8870.h index 5eacf39f4..2d125c8f2 100644 --- a/drivers/staging/media/av7110/sp8870.h +++ b/drivers/staging/media/av7110/sp8870.h @@ -19,15 +19,15 @@ struct sp8870_config u8 demod_address; /* request firmware for device */ - int (*request_firmware)(struct dvb_frontend* fe, const struct firmware **fw, char* name); + int (*request_firmware)(struct dvb_frontend *fe, const struct firmware **fw, char *name); }; #if IS_REACHABLE(CONFIG_DVB_SP8870) extern struct dvb_frontend* sp8870_attach(const struct sp8870_config* config, struct i2c_adapter* i2c); #else -static inline struct dvb_frontend* sp8870_attach(const struct sp8870_config* config, - struct i2c_adapter* i2c) +static inline struct dvb_frontend *sp8870_attach(const struct sp8870_config *config, + struct i2c_adapter *i2c) { printk(KERN_WARNING "%s: driver disabled by Kconfig\n", __func__); return NULL; From patchwork Tue May 7 00:24:43 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Herdler X-Patchwork-Id: 13656123 Received: from mout.gmx.net (mout.gmx.net [212.227.17.21]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 0866679EA for ; Tue, 7 May 2024 00:25:29 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=212.227.17.21 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1715041532; cv=none; b=l0OL1AQ1Af7GODGJK0sR8bUixswgAScoeBwvmBBf1gcVcPefOhTC8hvJgxH+NJFaVVzkcA4SlMckSCbqwIiyaG7K6lXhlIjKDMYv9N41BlZkhcvnTcZdYSdjWMl4MCkeDL/f04DSrv5vgm9IEhuPqh+1nHqgBV/7GdGqx/+RleU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1715041532; c=relaxed/simple; bh=wE0PMf90UbS05DBxYx67N2rPFc4cLzgAaH+e/csKs1k=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=JFu1Qg0nwyOPUcqxMl4VUYduqd703ultz/TOcL263M/luo7PfC1kv8MM9ePdc5ynNcDVHwqZ/+ZnfxHgId+/FIJTekz/TwyhutVg1ZshUaX2qdqdfMfM9cxxESNYInaj0l9/wtnO/hDZlEEP2dJlbTA4g6ElssjPJmPhuuGaXZM= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=nurfuerspam.de; spf=pass smtp.mailfrom=nurfuerspam.de; dkim=pass (2048-bit key) header.d=nurfuerspam.de header.i=herdler@nurfuerspam.de header.b=A6iyJANz; arc=none smtp.client-ip=212.227.17.21 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=nurfuerspam.de Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=nurfuerspam.de Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=nurfuerspam.de header.i=herdler@nurfuerspam.de header.b="A6iyJANz" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nurfuerspam.de; s=s31663417; t=1715041526; x=1715646326; i=herdler@nurfuerspam.de; bh=aThl7X8mE/f2OZ2PVg5AgPTumQ/wRz3cNR4HqrZdySA=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date:Message-Id:In-Reply-To: References:MIME-Version:Content-Transfer-Encoding:cc: content-transfer-encoding:content-type:date:from:message-id: mime-version:reply-to:subject:to; b=A6iyJANzE02cQKqJ8vc/dJGTiEd0gt1pyjypyOpXVsGFtyu/wrdb2Cg0tn7bCucR BilNIVJFo4tvObXYuOjF5o1NEEqfW1+UZAy5R68h6pF8hdgsIJ5oSl5D/jghxNnUl yqWGu7uWKjR9aopvW3CRbl/SmwHYSdcyemGFA2H3hwjfrd8rRc0wOZhXap2nTGVLD TvAHaerSIb6fkhBDgSaM6jPI3ISAFnYdLK1zo2D78RtryiXIo4mh3potdsFFbHdK7 GI2/W7pA/YmIAaul3eNpfLoWY/Hhtoq3aNrjrrWGdkDqT4ft7YN/VCDeoRxx+3qhp Qb3i9xOR/wNEmw8AZQ== X-UI-Sender-Class: 724b4f7f-cbec-4199-ad4e-598c01a50d3a Received: from astro.haus ([185.101.174.109]) by mail.gmx.net (mrgmx105 [212.227.17.168]) with ESMTPSA (Nemesis) id 1MTzfG-1sDO1U0bv0-00R51x; Tue, 07 May 2024 02:25:26 +0200 From: Stefan Herdler To: hverkuil-cisco@xs4all.nl Cc: linux-media@vger.kernel.org, smoch@web.de, tmn505@gmail.com, vinschen@redhat.com Subject: [PATCH 04/21] media: sp8870: coding style fixes: newline, comments and braces Date: Tue, 7 May 2024 02:24:43 +0200 Message-Id: <20240507002500.81867-5-herdler@nurfuerspam.de> X-Mailer: git-send-email 2.34.0 In-Reply-To: <20240507002500.81867-1-herdler@nurfuerspam.de> References: <20240507002500.81867-1-herdler@nurfuerspam.de> Precedence: bulk X-Mailing-List: linux-media@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Provags-ID: V03:K1:T3mPTbm0FS+nAzJ9ogFb5tEHajSLoHZMIguY4PAESwxi1tccPNC nAUDHVbpyXZ/SUAOU7gv2vkqPOh80B59+0i8PgHo9WiTDlsRL10vBbSas1212Hddzocfslc v5t2wUMaQuzk4RUmBtnN+hXhasq0ybsIMwzzRRW2h3wheKZP+BpOk0SCCVwDAk2A6cB1Yrg hv/lv/o6EBeVAi+Wx/XBg== X-Spam-Flag: NO UI-OutboundReport: notjunk:1;M01:P0:pupaWg+FfbM=;LvQYhxevC3yj+Ez2EvYNPNeF0v+ AVxiVQ6I2or9rCjqPvBxzdZJO/ePM39CmHhAoIeKW/9Yuvf1BJt3oZt6BDjz0tAQckHjLzgyl ZBhp7sAxq9elBLSrBLXEa0LnEQeD+jOxp2BmPoT+rnOXlsdiyu4PZ82Gij7Xrh3/40moZTkCt /M4nJmCLPcooQrkjRfhodo/To9xrOZiX+NI9earWDdFiwnfOYC3iYCAPE47gPM+brmgz/verG PEDarpMempe4d215ZdZi3yUsSn9+xinmEwlcjqQP5bF1zb/rtiE8GNwIallra+nArWUtUApH9 J/xRC3IKqX5Z25G7+WtKxk9n3kTjeVJ8+N+qHukoei4RRiredP1wD4BjnaZGM/oSYhxW2hpXk gmzkk6dIse4xQtQWuzOnrh9leiAJcW+9qb7xqqpx4W0gZKV7z55JkyBg9UbiZx5n/a9tF+5nl yfAMxqCzGbls85a8SzdoCWPCvJpilk+SqKHq+oycYUuuEVo6cmv0pg9mxmKroLHrYxH9kzwVr Vz52CkGE3cMosfcqP2Q9q6uiFIrhb/NWIi4oSGLtUX8NOFDORf7De2xS6/jULLmQU87JTQCCV NRbcZIrjsuSNxhZICRKstuOlrLxv0eI53BpV+Pz1Y80bhows3NJyyGUPmtc4SOP8IKcFhfwUp 1NUG4hdk0fto0DSbf6jMQH9GSSiyXtX1Iery8vJSokDfph7I8ZhdCjivDv0zd8PEw418rxQSq VW/Qd9VNiFWAz++alhdYBHKDJf9zrCd4bzPu6E9vQZe6+2NuFVQKX6oRkpEeHf0Eq+dIB7LIL Baqz5j2sGBxGSA8Hy4HBZmBa+IRkMbcHGs6uvMWhSTs/Y= This patch fixes the following checkpatch warnings: ERROR:OPEN_BRACE: open brace '{' following struct go on the same line ERROR:TRAILING_STATEMENTS: trailing statements should be on next line [*] WARNING:LINE_SPACING: Missing a blank line after declarations WARNING:BLOCK_COMMENT_STYLE: Block comments use a trailing */ on a separate line WARNING:BLOCK_COMMENT_STYLE: Block comments use * on subsequent lines CHECK:BRACES: Blank lines aren't necessary after an open brace '{' CHECK:LINE_SPACING: Please don't use multiple blank lines CHECK:LINE_SPACING: Please use a blank line after function/struct/union/enum declarations Except the 2 comment-blocks, newline changes only. [* The remaining trailing statement will be fixed in the logging patch.] Signed-off-by: Stefan Herdler --- drivers/staging/media/av7110/sp8870.c | 50 ++++++++++++++++----------- drivers/staging/media/av7110/sp8870.h | 13 +++---- 2 files changed, 34 insertions(+), 29 deletions(-) -- 2.34.0 diff --git a/drivers/staging/media/av7110/sp8870.c b/drivers/staging/media/av7110/sp8870.c index 4fb8518d2..4e2a1cbd4 100644 --- a/drivers/staging/media/av7110/sp8870.c +++ b/drivers/staging/media/av7110/sp8870.c @@ -1,11 +1,10 @@ // SPDX-License-Identifier: GPL-2.0-or-later /* - Driver for Spase SP8870 demodulator - - Copyright (C) 1999 Juergen Peitz - + * Driver for Spase SP8870 demodulator +.* + * Copyright (C) 1999 Juergen Peitz + */ -*/ /* * This driver needs external firmware. Please use the command * "/scripts/get_dvb_firmware alps_tdlb7" to @@ -25,9 +24,7 @@ #include #include "sp8870.h" - struct sp8870_state { - struct i2c_adapter *i2c; const struct sp8870_config *config; @@ -53,7 +50,13 @@ static int debug; static int sp8870_writereg(struct sp8870_state *state, u16 reg, u16 data) { u8 buf[] = { reg >> 8, reg & 0xff, data >> 8, data & 0xff }; - struct i2c_msg msg = { .addr = state->config->demod_address, .flags = 0, .buf = buf, .len = 4 }; + struct i2c_msg msg = { + .addr = state->config->demod_address, + .flags = 0, + .buf = buf, + .len = 4 + }; + int err; if ((err = i2c_transfer (state->i2c, &msg, 1)) != 1) { @@ -69,8 +72,10 @@ static int sp8870_readreg(struct sp8870_state *state, u16 reg) int ret; u8 b0[] = { reg >> 8, reg & 0xff }; u8 b1[] = { 0, 0 }; - struct i2c_msg msg [] = { { .addr = state->config->demod_address, .flags = 0, .buf = b0, .len = 2 }, - { .addr = state->config->demod_address, .flags = I2C_M_RD, .buf = b1, .len = 2 } }; + struct i2c_msg msg[] = { + { .addr = state->config->demod_address, .flags = 0, .buf = b0, .len = 2 }, + { .addr = state->config->demod_address, .flags = I2C_M_RD, .buf = b1, .len = 2 } + }; ret = i2c_transfer(state->i2c, msg, 2); @@ -108,7 +113,8 @@ static int sp8870_firmware_upload(struct sp8870_state *state, const struct firmw // do firmware upload fw_pos = SP8870_FIRMWARE_OFFSET; while (fw_pos < SP8870_FIRMWARE_SIZE + SP8870_FIRMWARE_OFFSET) { - tx_len = (fw_pos <= SP8870_FIRMWARE_SIZE + SP8870_FIRMWARE_OFFSET - 252) ? 252 : SP8870_FIRMWARE_SIZE + SP8870_FIRMWARE_OFFSET - fw_pos; + tx_len = (fw_pos <= SP8870_FIRMWARE_SIZE + SP8870_FIRMWARE_OFFSET - 252) ? 252 : + SP8870_FIRMWARE_SIZE + SP8870_FIRMWARE_OFFSET - fw_pos; // write register 0xCF0A tx_buf[0] = 0xCF; tx_buf[1] = 0x0A; @@ -248,7 +254,8 @@ static int sp8870_set_frontend_parameters(struct dvb_frontend *fe) // set tuner parameters if (fe->ops.tuner_ops.set_params) { fe->ops.tuner_ops.set_params(fe); - if (fe->ops.i2c_gate_ctrl) fe->ops.i2c_gate_ctrl(fe, 0); + if (fe->ops.i2c_gate_ctrl) + fe->ops.i2c_gate_ctrl(fe, 0); } // sample rate correction bit [23..17] @@ -296,12 +303,12 @@ static int sp8870_init(struct dvb_frontend *fe) const struct firmware *fw = NULL; sp8870_wake_up(state); - if (state->initialised) return 0; + if (state->initialised) + return 0; state->initialised = 1; dprintk ("%s\n", __func__); - /* request the firmware, this will block until someone uploads it */ printk("sp8870: waiting for firmware upload (%s)...\n", SP8870_DEFAULT_FIRMWARE); if (state->config->request_firmware(fe, &fw, SP8870_DEFAULT_FIRMWARE)) { @@ -454,11 +461,11 @@ static int sp8870_set_frontend(struct dvb_frontend *fe) struct sp8870_state *state = fe->demodulator_priv; /* - The firmware of the sp8870 sometimes locks up after setting frontend parameters. - We try to detect this by checking the data valid signal. - If it is not set after MAXCHECKS we try to recover the lockup by setting - the frontend parameters again. - */ + * The firmware of the sp8870 sometimes locks up after setting frontend parameters. + * We try to detect this by checking the data valid signal. + * If it is not set after MAXCHECKS we try to recover the lockup by setting + * the frontend parameters again. + */ int err = 0; int valid = 0; @@ -468,7 +475,6 @@ static int sp8870_set_frontend(struct dvb_frontend *fe) dprintk("%s: frequency = %i\n", __func__, p->frequency); for (trials = 1; trials <= MAXTRIALS; trials++) { - err = sp8870_set_frontend_parameters(fe); if (err) return err; @@ -537,6 +543,7 @@ static int sp8870_i2c_gate_ctrl(struct dvb_frontend *fe, int enable) static void sp8870_release(struct dvb_frontend *fe) { struct sp8870_state *state = fe->demodulator_priv; + kfree(state); } @@ -557,7 +564,8 @@ struct dvb_frontend *sp8870_attach(const struct sp8870_config *config, state->initialised = 0; /* check if the demod is there */ - if (sp8870_readreg(state, 0x0200) < 0) goto error; + if (sp8870_readreg(state, 0x0200) < 0) + goto error; /* create dvb_frontend */ memcpy(&state->frontend.ops, &sp8870_ops, sizeof(struct dvb_frontend_ops)); diff --git a/drivers/staging/media/av7110/sp8870.h b/drivers/staging/media/av7110/sp8870.h index 2d125c8f2..2cfee1bb6 100644 --- a/drivers/staging/media/av7110/sp8870.h +++ b/drivers/staging/media/av7110/sp8870.h @@ -1,11 +1,9 @@ /* SPDX-License-Identifier: GPL-2.0-or-later */ /* - Driver for Spase SP8870 demodulator - - Copyright (C) 1999 Juergen Peitz - - -*/ + * Driver for Spase SP8870 demodulator + * + * Copyright (C) 1999 Juergen Peitz + */ #ifndef SP8870_H #define SP8870_H @@ -13,8 +11,7 @@ #include #include -struct sp8870_config -{ +struct sp8870_config { /* the demodulator's i2c address */ u8 demod_address; From patchwork Tue May 7 00:24:44 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Herdler X-Patchwork-Id: 13656124 Received: from mout.gmx.net (mout.gmx.net [212.227.17.20]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 9DA208489 for ; Tue, 7 May 2024 00:25:30 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=212.227.17.20 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1715041532; cv=none; b=d3L7yWkLdWdyJabuiMOPGFmlgiO7ylK+pPT7ibOlAhEKsc0hFJZ1YAvvkZRg22PV1GvvjcqTjUw+GNP/CHFOb47jK50ULB9OOtoyIhRMuFFSIm/0PF94PoZD5wdNXH4PevG5aKr2e5r/Ygtssd37NxOPkDb6smNWEof5AAaaHrw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1715041532; c=relaxed/simple; bh=uJtkiNw4jVo4q3TVO6USpBvkUU5+QopsS/sTv17NpLY=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=SbyKKCuvwDn/Z5qzojF3Q/oHfTzVa+cYYl9tuZKf3JngIAAnNmR8y/2m7EW49CUUpwaJW/KY5sMgdhetrgW6PI7Zol6ZQxHqqDcjXOMmC4lHW8J9m3CSHiWwH7sRURvTXREOkdlIgZEaBKAqjW+lSZXOot6n8HcrIEBSyiupHoA= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=nurfuerspam.de; spf=pass smtp.mailfrom=nurfuerspam.de; dkim=pass (2048-bit key) header.d=nurfuerspam.de header.i=herdler@nurfuerspam.de header.b=SNO4lIgl; arc=none smtp.client-ip=212.227.17.20 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=nurfuerspam.de Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=nurfuerspam.de Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=nurfuerspam.de header.i=herdler@nurfuerspam.de header.b="SNO4lIgl" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nurfuerspam.de; s=s31663417; t=1715041526; x=1715646326; i=herdler@nurfuerspam.de; bh=e42ZZbhTDJrc4js2SE11f5o/CXHCWYa4FVg1NvzWaq0=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date:Message-Id:In-Reply-To: References:MIME-Version:Content-Transfer-Encoding:cc: content-transfer-encoding:content-type:date:from:message-id: mime-version:reply-to:subject:to; b=SNO4lIglotsLrDp1LXsX7mZ9orAUqHtnDI0+d5VfsmxpYxedCyESfz+uXoC+fnAZ RDDYlJWMAxGyIhMnQtikPLsDrHvKxqWWL6lPWYsRukM2KEJSYntCvcfzFyFSYhpo8 XMYU7dcw6FRm3awAZBxgZmBdERUT/I06bVAIwFB3XRBw/dV2UcaCeMsPMsbnyzBOg 2k4rD9N1TL19TSVT7WAQQIyNZIOREEZAbLPUiuvFDKHtqeBI5UcLhx2g5vY1l2XmD Vsu/A5qbymOQXztGDS/dIxjlusqJK7v4uK6qUcQDD3LwPuUuxhwlhrjhQmJsaDb4e dyUZ/BGzWq00bigksg== X-UI-Sender-Class: 724b4f7f-cbec-4199-ad4e-598c01a50d3a Received: from astro.haus ([185.101.174.109]) by mail.gmx.net (mrgmx105 [212.227.17.168]) with ESMTPSA (Nemesis) id 1MWASY-1s6mJY1d3i-00XebV; Tue, 07 May 2024 02:25:26 +0200 From: Stefan Herdler To: hverkuil-cisco@xs4all.nl Cc: linux-media@vger.kernel.org, smoch@web.de, tmn505@gmail.com, vinschen@redhat.com Subject: [PATCH 05/21] media: sp8870: coding style fixes: miscellaneous Date: Tue, 7 May 2024 02:24:44 +0200 Message-Id: <20240507002500.81867-6-herdler@nurfuerspam.de> X-Mailer: git-send-email 2.34.0 In-Reply-To: <20240507002500.81867-1-herdler@nurfuerspam.de> References: <20240507002500.81867-1-herdler@nurfuerspam.de> Precedence: bulk X-Mailing-List: linux-media@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Provags-ID: V03:K1:CxpjegexGPWqsvtWg2YgVEodrsXjQeRx/aqqIIm4TfK4fh/zI1/ GZeJGspZHko3UirtKhAL/idLPzJkg5WgAxpy6k/VIIqM2nGmLY0ytoLZguUIHFCUsV8a6fP s/CWy7GlBzSxSGtETV+n0En+lT8KoGMqWTax6Mf10IjJ0U1cJ4l52qyfhBNAYyc5qyb21QG HeGm6qe1gD/VZls0U1leg== X-Spam-Flag: NO UI-OutboundReport: notjunk:1;M01:P0:cy7ja2MNk9M=;dgvrFIRPn/fZZXcRkh2ni/lwjjJ ZAsN6uzKwysXpZauOIJ8ZyBUuy4OTzXaCYv00wr9UCMa3XVlrnDfERDx9frfsZbxim3cRH9n4 CweQ9tYB5PBU89as+ShzOIcO4zidWJt9i2YprHY+W5lAIMVPWcBdE1kfH64yubwnv+5a2/1hc ObK08PgqXgbmCYpWe3FLODaAL39u4W9OFWGhWWdvt4GHG+peRl+lhZ7FvYA3EVy1jgrYFwvix VFaK+jwT0dHmlGSSn9dZzqiqg4RfCWqO8FzugPgEnZ6NoftaUzkqLNve2vvXEb2E+6AbCVD48 5Gf6X9AzDgUqg9aMdm9gG+NMdFC9uRVhhUXF0J9eP9beSPtEYE8TUhiLNo6sM833F03Ri53RS UgKCp4qLO+NI/5GVPwaWyvbGjMBaedOsD3NSZUNlWK+9wQ/ytr39VfMd7jn0dQzaYfmCw6zWQ LkGsvNALoy5d3FR+5IuQK2xGhi6VsvNx41/bBwZo7wCi+sZ/sadK9ht+ZRtWowwo+8cntmHKW NAxA7hilHyGnJcGY5qKkmk6U80k0RvlLsQEDRYZXuihjxQPdtdRn2AO3iMx8KQwThGMVvGNa/ GsNMQBFv6cerhW/GSRikzigNiFgjRAAiyrA+43p3WkQdxtDAoevz2OTNkjbPoFHYGq8Ewgsau liTayfZ/zUDoV28bvL10RkR3Rb8Wv6z2xJ1VklpsXqvjRW4PDztdbGuGgSuTedarD9jMHdCf5 X/0EtrT0FroK5K/d1YwCrn9ArFiaAaubpD+xn9rDU3hUz0mpg30FH0vMfUoVWUmw8LamZm5jo eJXVvLAXegeiFMeIVLRZfNa7cZE6wRmg1z2RdkB2cAt2U= This patch fixes the following checkpatch: ERROR:ASSIGN_IN_IF: do not use assignment in if condition WARNING:BRACES: braces {} are not necessary for any arm of this statement WARNING:CONST_STRUCT: struct dvb_frontend_ops should normally be const WARNING:EXPORT_SYMBOL: EXPORT_SYMBOL(foo); should immediately follow its function/variable CHECK:ALLOC_SIZEOF_STRUCT: Prefer kzalloc(sizeof(*state)...) over kzalloc(sizeof(struct sp8870_state)...) CHECK:AVOID_EXTERNS: extern prototypes should be avoided in .h files CHECK:COMPARISON_TO_NULL: Comparison to NULL could be written ... CHECK:MULTIPLE_ASSIGNMENTS: multiple assignments should be avoided Signed-off-by: Stefan Herdler --- drivers/staging/media/av7110/sp8870.c | 24 +++++++++++++----------- drivers/staging/media/av7110/sp8870.h | 3 +-- 2 files changed, 14 insertions(+), 13 deletions(-) -- 2.34.0 diff --git a/drivers/staging/media/av7110/sp8870.c b/drivers/staging/media/av7110/sp8870.c index 4e2a1cbd4..282beb157 100644 --- a/drivers/staging/media/av7110/sp8870.c +++ b/drivers/staging/media/av7110/sp8870.c @@ -59,7 +59,8 @@ static int sp8870_writereg(struct sp8870_state *state, u16 reg, u16 data) int err; - if ((err = i2c_transfer (state->i2c, &msg, 1)) != 1) { + err = i2c_transfer(state->i2c, &msg, 1); + if (err != 1) { dprintk ("%s: writereg error (err == %i, reg == 0x%02x, data == 0x%02x)\n", __func__, err, reg, data); return -EREMOTEIO; } @@ -123,7 +124,8 @@ static int sp8870_firmware_upload(struct sp8870_state *state, const struct firmw msg.flags = 0; msg.buf = tx_buf; msg.len = tx_len + 2; - if ((err = i2c_transfer (state->i2c, &msg, 1)) != 1) { + err = i2c_transfer(state->i2c, &msg, 1); + if (err != 1) { printk("%s: firmware upload failed!\n", __func__); printk ("%s: i2c error (err == %i)\n", __func__, err); return err; @@ -245,7 +247,8 @@ static int sp8870_set_frontend_parameters(struct dvb_frontend *fe) int err; u16 reg0xc05; - if ((err = configure_reg0xc05(p, ®0xc05))) + err = configure_reg0xc05(p, ®0xc05); + if (err) return err; // system controller stop @@ -533,11 +536,10 @@ static int sp8870_i2c_gate_ctrl(struct dvb_frontend *fe, int enable) { struct sp8870_state *state = fe->demodulator_priv; - if (enable) { + if (enable) return sp8870_writereg(state, 0x206, 0x001); - } else { + else return sp8870_writereg(state, 0x206, 0x000); - } } static void sp8870_release(struct dvb_frontend *fe) @@ -555,8 +557,9 @@ struct dvb_frontend *sp8870_attach(const struct sp8870_config *config, struct sp8870_state *state = NULL; /* allocate memory for the internal state */ - state = kzalloc(sizeof(struct sp8870_state), GFP_KERNEL); - if (state == NULL) goto error; + state = kzalloc(sizeof(*state), GFP_KERNEL); + if (!state) + goto error; /* setup the state */ state->config = config; @@ -568,7 +571,7 @@ struct dvb_frontend *sp8870_attach(const struct sp8870_config *config, goto error; /* create dvb_frontend */ - memcpy(&state->frontend.ops, &sp8870_ops, sizeof(struct dvb_frontend_ops)); + memcpy(&state->frontend.ops, &sp8870_ops, sizeof(sp8870_ops)); state->frontend.demodulator_priv = state; return &state->frontend; @@ -576,6 +579,7 @@ struct dvb_frontend *sp8870_attach(const struct sp8870_config *config, kfree(state); return NULL; } +EXPORT_SYMBOL_GPL(sp8870_attach); static const struct dvb_frontend_ops sp8870_ops = { .delsys = { SYS_DVBT }, @@ -613,5 +617,3 @@ MODULE_PARM_DESC(debug, "Turn on/off frontend debugging (default:off)."); MODULE_DESCRIPTION("Spase SP8870 DVB-T Demodulator driver"); MODULE_AUTHOR("Juergen Peitz"); MODULE_LICENSE("GPL"); - -EXPORT_SYMBOL_GPL(sp8870_attach); diff --git a/drivers/staging/media/av7110/sp8870.h b/drivers/staging/media/av7110/sp8870.h index 2cfee1bb6..3f566671c 100644 --- a/drivers/staging/media/av7110/sp8870.h +++ b/drivers/staging/media/av7110/sp8870.h @@ -20,8 +20,7 @@ struct sp8870_config { }; #if IS_REACHABLE(CONFIG_DVB_SP8870) -extern struct dvb_frontend* sp8870_attach(const struct sp8870_config* config, - struct i2c_adapter* i2c); +struct dvb_frontend *sp8870_attach(const struct sp8870_config *config, struct i2c_adapter *i2c); #else static inline struct dvb_frontend *sp8870_attach(const struct sp8870_config *config, struct i2c_adapter *i2c) From patchwork Tue May 7 00:24:45 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Herdler X-Patchwork-Id: 13656125 Received: from mout.gmx.net (mout.gmx.net [212.227.17.20]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id CD1738821 for ; Tue, 7 May 2024 00:25:30 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=212.227.17.20 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1715041533; cv=none; b=gY71RHeC1kk/Nq9Yg+RyTFq1MaUK0oAJRIegXN8qXT2bp2bRLO2H1HgB2s73JmzGYkzB+2XlCEOrqPuYfqUn7covL5rIXryHth+xN8KH4GKr9V5uhJ4ud6KsZAMpmeU82t0rTAjNIPRKr1x821rM08zpAx5/t3R/8oQ5ndHCe/w= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1715041533; c=relaxed/simple; bh=1VgQ5/c0GyioLTIkmmvradVzu0JrLchrEFe4tvP5GwI=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=ItbltFXqbLaFrOp8/IoXFWsF+MnkbiYzJ+Xk3YIEJyPxQouv4BObsCv4b1/zRDVjzS/vsWbHIwrpGLHz84+7w5PvrFsEIMVkhJKcbsLlzpYb+t+GU2Ukyx6/NOx/5SUL57aUdUoZgH4dDRlgOHLsr0xdh8AZ7LOJWaNv9aOPLqY= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=nurfuerspam.de; spf=pass smtp.mailfrom=nurfuerspam.de; dkim=pass (2048-bit key) header.d=nurfuerspam.de header.i=herdler@nurfuerspam.de header.b=IkkBsrzW; arc=none smtp.client-ip=212.227.17.20 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=nurfuerspam.de Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=nurfuerspam.de Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=nurfuerspam.de header.i=herdler@nurfuerspam.de header.b="IkkBsrzW" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nurfuerspam.de; s=s31663417; t=1715041526; x=1715646326; i=herdler@nurfuerspam.de; bh=vNhcPL96xktsfWccEwGOIYlZcf27bGWM1fvPq5jb2tg=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date:Message-Id:In-Reply-To: References:MIME-Version:Content-Transfer-Encoding:cc: content-transfer-encoding:content-type:date:from:message-id: mime-version:reply-to:subject:to; b=IkkBsrzW0ObbxMMEE+Qsy2g5ueCzp4oVq+fArAFQ+EZl8uHcTNoAdUK0lcURX3Jx aKvVdxAu++CpDdw3TNX9b+G13lmHlS0wrLX1XQ3V0eSgsUoPo6loGJbg1lS9RVE94 4lIgS6tsJh9lgeaEpgm/6t8+5pc0KuoWAc6VaVlYjH2RSm3qYvG0z1WcIa2Ov9ooq WfLqerNKQOXCjrhKyyFdssrAMhAmSFTiMGfkcPZboH93iOROIREalZJ9vhRb0/rwe FmqLscnRNgdYf0ibVlUKPgZLwni4DdBTB9HAhZtpBPrDF/t2qrvCdSwlLjkHy6EaM g0aTEeCmgsGXKIoZog== X-UI-Sender-Class: 724b4f7f-cbec-4199-ad4e-598c01a50d3a Received: from astro.haus ([185.101.174.109]) by mail.gmx.net (mrgmx105 [212.227.17.168]) with ESMTPSA (Nemesis) id 1Md6Mt-1sdke52d3z-00aBgS; Tue, 07 May 2024 02:25:26 +0200 From: Stefan Herdler To: hverkuil-cisco@xs4all.nl Cc: linux-media@vger.kernel.org, smoch@web.de, tmn505@gmail.com, vinschen@redhat.com Subject: [PATCH 06/21] media: sp8870: coding style fixes: logging Date: Tue, 7 May 2024 02:24:45 +0200 Message-Id: <20240507002500.81867-7-herdler@nurfuerspam.de> X-Mailer: git-send-email 2.34.0 In-Reply-To: <20240507002500.81867-1-herdler@nurfuerspam.de> References: <20240507002500.81867-1-herdler@nurfuerspam.de> Precedence: bulk X-Mailing-List: linux-media@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Provags-ID: V03:K1:KhfzQF8ambVLRhiZ9CGPtg40t2ekIUiSyE8BeLQEITXMD6kJVh1 hmE64e+stop8SBwuk9OjmrlSVDlh3R+A38p7bKpxsSVDYKCuX+rXmm38sANv8tw6b2hRkds ot0YGfiCAt+y/nXiJdqa7R1RHvsl31aw1t9GnUnVq6cxJqzr5WQMTyFgbqGU+BM19TkRTCg qsGqxAX6Grb24UI4PWfrg== X-Spam-Flag: NO UI-OutboundReport: notjunk:1;M01:P0:VOh9T0mKnDg=;GrgO9HLumjXH+LitODRP02Jzis3 RIgZTZgOtXdQt0L0bCvvuguOJMu2GKJ+ti6m7FboGoN26oJ/4PHoGmnByJUQq+LyIQaQ92scx obISjcOOsITqV3AjEZ7AgdFbCgC/iQq5i7szh8Msy31cElaJ84AjeYYCE02yY2qCETBEA58A/ GK8v6QX9DGEBsMx6T+L7fGcS59DcjJXN8efuurD4O5PxKXVmDqXvQEMR9mSpi0fEnwlADFgDG 8UwGcY1Mjtfuf6ne5ZIEIW+oR50oIRehn9fVeaTKN7zg3zaP+GLeyNFOhaKVaD2QvM5ydzxPc CKw9jXfj1yn96Nf6XnQbk38G+QewzY0Hk6/8YhD7QunJNBOCnghUzl1iLcxM0ER2DfR9ww3hB oqbccTBwDqiu6Lmf5dM9NbKclof/4ToxycYePfToh1R/ZetFEXpq61rL5TqPmQ1mHUGZHbN3j 4b5USz1jWOgBTk94689f9A5ZSEKCshF7pUWr1/5dvwEQZxWNtxndT6QtV2K9Ceu4VWA8S/Xgi s3j8yEh/USFtTHVHKon7nF8+z6Xg4k0+YeT9Ejy+6CZY0dW3hQC5QxuHrew2i5c9nlgyh1Qss v1FkczCKI99gYszgh2vsTvdiLkB37ZVe5iqqFDurAYqAxhN8xl01hcydj+WTx9+uT+mCwLgES kmSKv1IgbS6THh4QU6RbK4iP4izjtU1pOZcvynMTIHwDVQxR7BmAtUjJ70o6K6mfcHtvf9WZT OjS9SDMxyfJRHBHQRl5IMITh1Kh30GB9yiQriG0X7eiaZ2czFGEQUGEint1FWngHMP/+SLGIW PT+1m1HdlS2Y3dMH8oAg2CV27DRdOBD9lU7OwESHH3LfA= This patch fixes the following checkpatch warnings: WARNING:PREFER_PR_LEVEL: Prefer [subsystem eg: netdev]_dbg([subsystem]dev, ... then dev_dbg(dev, ... then pr_debug(... to printk(KERN_DEBUG ... WARNING:PRINTK_WITHOUT_KERN_LEVEL: printk() should include KERN_ facility level WARNING:TRACING_LOGGING: Unnecessary ftrace-like logging - prefer using ftrace ERROR:TRAILING_STATEMENTS: trailing statements should be on next line Convert logging to the recommend pr_* macros. Signed-off-by: Stefan Herdler --- drivers/staging/media/av7110/sp8870.c | 46 +++++++++++++++------------ drivers/staging/media/av7110/sp8870.h | 2 +- 2 files changed, 27 insertions(+), 21 deletions(-) -- 2.34.0 diff --git a/drivers/staging/media/av7110/sp8870.c b/drivers/staging/media/av7110/sp8870.c index 282beb157..0c813860f 100644 --- a/drivers/staging/media/av7110/sp8870.c +++ b/drivers/staging/media/av7110/sp8870.c @@ -11,6 +11,12 @@ * download/extract it, and then copy it to /usr/lib/hotplug/firmware * or /lib/firmware (depending on configuration of firmware hotplug). */ + +#ifdef pr_fmt +#undef pr_fmt +#endif +#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt + #define SP8870_DEFAULT_FIRMWARE "dvb-fe-sp8870.fw" #include @@ -36,9 +42,10 @@ struct sp8870_state { }; static int debug; -#define dprintk(args...) \ +#define dprintk(fmt, arg...) \ do { \ - if (debug) printk(KERN_DEBUG "sp8870: " args); \ + if (debug) \ + pr_info("%s(): " fmt, __func__, ##arg); \ } while (0) /* firmware size for sp8870 */ @@ -61,7 +68,7 @@ static int sp8870_writereg(struct sp8870_state *state, u16 reg, u16 data) err = i2c_transfer(state->i2c, &msg, 1); if (err != 1) { - dprintk ("%s: writereg error (err == %i, reg == 0x%02x, data == 0x%02x)\n", __func__, err, reg, data); + dprintk("writereg error (err == %i, reg == 0x%02x, data == 0x%02x)\n", err, reg, data); return -EREMOTEIO; } @@ -81,7 +88,7 @@ static int sp8870_readreg(struct sp8870_state *state, u16 reg) ret = i2c_transfer(state->i2c, msg, 2); if (ret != 2) { - dprintk("%s: readreg error (ret == %i)\n", __func__, ret); + dprintk("readreg error (ret == %i)\n", ret); return -1; } @@ -97,7 +104,7 @@ static int sp8870_firmware_upload(struct sp8870_state *state, const struct firmw int tx_len; int err = 0; - dprintk ("%s: ...\n", __func__); + dprintk("start firmware upload...\n"); if (fw->size < SP8870_FIRMWARE_SIZE + SP8870_FIRMWARE_OFFSET) return -EINVAL; @@ -126,14 +133,14 @@ static int sp8870_firmware_upload(struct sp8870_state *state, const struct firmw msg.len = tx_len + 2; err = i2c_transfer(state->i2c, &msg, 1); if (err != 1) { - printk("%s: firmware upload failed!\n", __func__); - printk ("%s: i2c error (err == %i)\n", __func__, err); + pr_err("%s(): firmware upload failed!\n", __func__); + pr_err("%s(): i2c error (err == %i)\n", __func__, err); return err; } fw_pos += tx_len; } - dprintk ("%s: done!\n", __func__); + dprintk("firmware upload successful!\n"); return 0; }; @@ -310,22 +317,22 @@ static int sp8870_init(struct dvb_frontend *fe) return 0; state->initialised = 1; - dprintk ("%s\n", __func__); + dprintk("initialising frontend...\n"); /* request the firmware, this will block until someone uploads it */ - printk("sp8870: waiting for firmware upload (%s)...\n", SP8870_DEFAULT_FIRMWARE); + pr_info("waiting for firmware upload (%s)...\n", SP8870_DEFAULT_FIRMWARE); if (state->config->request_firmware(fe, &fw, SP8870_DEFAULT_FIRMWARE)) { - printk("sp8870: no firmware upload (timeout or file not found?)\n"); + pr_err("no firmware upload (timeout or file not found?)\n"); return -EIO; } if (sp8870_firmware_upload(state, fw)) { - printk("sp8870: writing firmware to device failed\n"); + pr_err("writing firmware to device failed\n"); release_firmware(fw); return -EIO; } release_firmware(fw); - printk("sp8870: firmware upload complete\n"); + pr_info("firmware upload complete\n"); /* enable TS output and interface pins */ sp8870_writereg(state, 0xc18, 0x00d); @@ -475,7 +482,7 @@ static int sp8870_set_frontend(struct dvb_frontend *fe) int trials = 0; int check_count = 0; - dprintk("%s: frequency = %i\n", __func__, p->frequency); + dprintk("frequency = %i\n", p->frequency); for (trials = 1; trials <= MAXTRIALS; trials++) { err = sp8870_set_frontend_parameters(fe); @@ -486,8 +493,7 @@ static int sp8870_set_frontend(struct dvb_frontend *fe) // valid = ((sp8870_readreg(i2c, 0x0200) & 4) == 0); valid = sp8870_read_data_valid_signal(state); if (valid) { - dprintk("%s: delay = %i usec\n", - __func__, check_count * 10); + dprintk("delay = %i usec\n", check_count * 10); break; } udelay(10); @@ -497,20 +503,20 @@ static int sp8870_set_frontend(struct dvb_frontend *fe) } if (!valid) { - printk("%s: firmware crash!!!!!!\n", __func__); + pr_err("%s(): firmware crash!!!!!!\n", __func__); return -EIO; } if (debug) { if (valid) { if (trials > 1) { - printk("%s: firmware lockup!!!\n", __func__); - printk("%s: recovered after %i trial(s))\n", __func__, trials - 1); + pr_info("%s(): firmware lockup!!!\n", __func__); + pr_info("%s(): recovered after %i trial(s))\n", __func__, trials - 1); lockups++; } } switches++; - printk("%s: switches = %i lockups = %i\n", __func__, switches, lockups); + pr_info("%s(): switches = %i lockups = %i\n", __func__, switches, lockups); } return 0; diff --git a/drivers/staging/media/av7110/sp8870.h b/drivers/staging/media/av7110/sp8870.h index 3f566671c..3323d1dfa 100644 --- a/drivers/staging/media/av7110/sp8870.h +++ b/drivers/staging/media/av7110/sp8870.h @@ -25,7 +25,7 @@ struct dvb_frontend *sp8870_attach(const struct sp8870_config *config, struct i2 static inline struct dvb_frontend *sp8870_attach(const struct sp8870_config *config, struct i2c_adapter *i2c) { - printk(KERN_WARNING "%s: driver disabled by Kconfig\n", __func__); + pr_warn(KBUILD_MODNAME ": %s(): driver disabled by Kconfig\n", __func__); return NULL; } #endif // CONFIG_DVB_SP8870 From patchwork Tue May 7 00:24:46 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Herdler X-Patchwork-Id: 13656132 Received: from mout.gmx.net (mout.gmx.net [212.227.17.20]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 3EC9B8830 for ; Tue, 7 May 2024 00:25:30 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=212.227.17.20 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1715041534; cv=none; b=Yhjz5e+rvqWknY2Use8WTTMENpftcKkzz8ei6TE6cfunbRmjfaB+fIL+TVmI9G/5fQs3Ipgv6Ltoisi1YsbvtxJaZ5w98m6cmvHfOOUT08ajIwmewPdZsb+NXzxT7hXyThJQc6qtOMUHJlkYyCnqeSvPwPrTdvkjmxIzdz8BAvA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1715041534; c=relaxed/simple; bh=jxRZWzoRHzhZKxQ7TkMaZtl4uNBwCyNlMvu8bZ7ydUQ=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=HE0P5PrEGwZux/4J7XCy6n1nGFpfzdryi1Ns9Bt8KTy2teOqJqMzyE9xtqBxVyKAJ4Qg6bOEd7vLVzss2CrXETxwbNBirxs/X6sr3aFs9NvskWHH73sCKs11evh3cl3+XCGCUHua4RHFusbBHdU/XZaZro5ckeTE3fvxssprBJ8= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=nurfuerspam.de; spf=pass smtp.mailfrom=nurfuerspam.de; dkim=pass (2048-bit key) header.d=nurfuerspam.de header.i=herdler@nurfuerspam.de header.b=L0fjY5YF; arc=none smtp.client-ip=212.227.17.20 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=nurfuerspam.de Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=nurfuerspam.de Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=nurfuerspam.de header.i=herdler@nurfuerspam.de header.b="L0fjY5YF" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nurfuerspam.de; s=s31663417; t=1715041527; x=1715646327; i=herdler@nurfuerspam.de; bh=mE/rSrWRng8CAXkTgHJJT8nyxFf3VT4MNRDLPXr4la4=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date:Message-Id:In-Reply-To: References:MIME-Version:Content-Transfer-Encoding:cc: content-transfer-encoding:content-type:date:from:message-id: mime-version:reply-to:subject:to; b=L0fjY5YFWlUuAjNhyIfos8bXAfKsmNRBGDM3cdbgU5YyVi3y5YGcZmL7W2elJm60 rYm45RvUj2akjEjXqjj6jHNAkdabwS9O+RA4BAvLMB9FMtAvDdQsl1FhhXjPPhY+c fw2fRKWnEuydPmzrcECp+Rk4E5haZtzBzpgGgNwAueDxbyi1t6PK6MFIr+fnBYt9u 7qoQFe/p19EhV+BOpsduWewbgkOlwszsc2D6QojVtqqLQYP6Iei5xPzWkPghFw/AJ Gux5f6XphdrFeuPrKFYMQC8nIayK3ljLwiQXkPVal5LaSKHNomvCby0/ddvcjKwfx pigxYxs9TX73Btredg== X-UI-Sender-Class: 724b4f7f-cbec-4199-ad4e-598c01a50d3a Received: from astro.haus ([185.101.174.109]) by mail.gmx.net (mrgmx105 [212.227.17.168]) with ESMTPSA (Nemesis) id 1M7b2T-1ryLsp3eIv-007yji; Tue, 07 May 2024 02:25:26 +0200 From: Stefan Herdler To: hverkuil-cisco@xs4all.nl Cc: linux-media@vger.kernel.org, smoch@web.de, tmn505@gmail.com, vinschen@redhat.com Subject: [PATCH 07/21] media: av7110: coding style fixes: pointer_location Date: Tue, 7 May 2024 02:24:46 +0200 Message-Id: <20240507002500.81867-8-herdler@nurfuerspam.de> X-Mailer: git-send-email 2.34.0 In-Reply-To: <20240507002500.81867-1-herdler@nurfuerspam.de> References: <20240507002500.81867-1-herdler@nurfuerspam.de> Precedence: bulk X-Mailing-List: linux-media@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Provags-ID: V03:K1:CvP/ll2xmEDJMmTUBypgZpRPH2b+BwVQ7iMGOk2x+oLI8GTSpBQ mCm2H+8lENuwxs4ltoI6/DO62jmcYaV9bdHf76EG7ODRyEqdkF5pCq1OG7SjLGU57aMYq5i DDZOaAkbxXV0i5lxyR+AycBs3aI06FYz+lJ+j7ULxbva9YDcaOczlb3bi1Aq4vsJis0S18K XN7Z65v7mFvGT+HO7hDLg== X-Spam-Flag: NO UI-OutboundReport: notjunk:1;M01:P0:82E7FQFv/zU=;LRw6tanlbnqlCbVDUTb0RDww/L5 vQqOhX928yu/KnwjEYqq2uVnF9rtsiH1c7FzzT9SoAxfTpbACexiNdc29bYvZOdi8dRHuAaDE 5RQZw5sZLnkj7/HLWJ7/kpyikDSl7lZRSF9qLO6NM8BAgCOIIaQVq06DuUqJND0dlQNfEWMIf 8vG7fMhRhWd+0FbS8yguPpwiRfQzZhEmTcvPtj5HpnCoVD4gBjT2bczeNxpUnnbPkx6F1KpSl AfNcKm6vOeMMv7WhA5TE6hZqCCSbIUxM3y97BhO5swkSIWAOOugA+V85erLuhJBTbm5bcs+dW duEgl8avm95bP5IBpKgbjGHQX/LKoqeD4OGvaJMNx4JXCew/Ie1hmQFNmUlHAxfYysAgnH5lF jq6odnQhBHvZJFPNmPcSizI6SZx/Hb7aMMjgVVpTzPAkK3EJCg+Yrn8j1wAdpOwVcnsmciPiM jzj5sLSiKZ1vt8huQKdTcOidMrbrJnzgVGKESqL6ibMUvJxcV13PzRVS6W8FAbUp5/57/WRzb MNmKuY6RiMUidvbTgN86Sx69/qtGxYrRB2inSu3urrKdsJTt9PXdd2KKYHQoaw7Fx4+IhcIPo WNn81xkDNtUfKcKNOIPuggqWLWawQKn3FRmniWtSxzcAUmGQPpYt4ephY7VyHeC31zlzIEUUD slVTLaaDcn2jgvtjxGiRphbCw3UiKUvsJlPs1K3x63RMoXwEaV1o5sNtozz7JTwD8kViZOUfL 2U0bFMhEiyYxvtUHaSWDNQkracI2QQNWRv/lFDPvZ1L/ELk/nJYfWSmDMfffyVf3qEX4d8e7F fsewE3hQopXoHKUS+gAZdlVyzEQuada2zHVDFJqnzyYzA= This patch fixes the following checkpatch warnings: ERROR:POINTER_LOCATION: "foo * bar" should be "foo *bar" ERROR:POINTER_LOCATION: "foo* bar" should be "foo *bar" ERROR:POINTER_LOCATION: "(foo*)" should be "(foo *)" Whitespace changes only. "git diff -w" shows no changes. Signed-off-by: Stefan Herdler --- drivers/staging/media/av7110/av7110.c | 78 +++++++++++------------ drivers/staging/media/av7110/av7110.h | 6 +- drivers/staging/media/av7110/av7110_ca.c | 6 +- drivers/staging/media/av7110/av7110_hw.c | 12 ++-- drivers/staging/media/av7110/av7110_v4l.c | 14 ++-- 5 files changed, 58 insertions(+), 58 deletions(-) -- 2.34.0 diff --git a/drivers/staging/media/av7110/av7110.c b/drivers/staging/media/av7110/av7110.c index a5a431c14..eb1dc64bc 100644 --- a/drivers/staging/media/av7110/av7110.c +++ b/drivers/staging/media/av7110/av7110.c @@ -429,7 +429,7 @@ static void debiirq(struct tasklet_struct *t) break; case DATA_DEBUG_MESSAGE: - ((s8*)av7110->debi_virt)[Reserved_SIZE - 1] = 0; + ((s8 *)av7110->debi_virt)[Reserved_SIZE - 1] = 0; printk("%s\n", (s8 *) av7110->debi_virt); xfer = RX_BUFF; break; @@ -1143,7 +1143,7 @@ static int dvb_get_stc(struct dmx_demux *demux, unsigned int num, static int av7110_set_tone(struct dvb_frontend *fe, enum fe_sec_tone_mode tone) { - struct av7110* av7110 = fe->dvb->priv; + struct av7110 *av7110 = fe->dvb->priv; switch (tone) { case SEC_TONE_ON: @@ -1157,18 +1157,18 @@ static int av7110_set_tone(struct dvb_frontend *fe, enum fe_sec_tone_mode tone) } } -static int av7110_diseqc_send_master_cmd(struct dvb_frontend* fe, - struct dvb_diseqc_master_cmd* cmd) +static int av7110_diseqc_send_master_cmd(struct dvb_frontend *fe, + struct dvb_diseqc_master_cmd *cmd) { - struct av7110* av7110 = fe->dvb->priv; + struct av7110 *av7110 = fe->dvb->priv; return av7110_diseqc_send(av7110, cmd->msg_len, cmd->msg, -1); } -static int av7110_diseqc_send_burst(struct dvb_frontend* fe, +static int av7110_diseqc_send_burst(struct dvb_frontend *fe, enum fe_sec_mini_cmd minicmd) { - struct av7110* av7110 = fe->dvb->priv; + struct av7110 *av7110 = fe->dvb->priv; return av7110_diseqc_send(av7110, 0, NULL, minicmd); } @@ -1440,7 +1440,7 @@ u8 i2c_readreg(struct av7110 *av7110, u8 id, u8 reg) ****************************************************************************/ -static int check_firmware(struct av7110* av7110) +static int check_firmware(struct av7110 *av7110) { u32 crc = 0, len = 0; unsigned char *ptr; @@ -1491,12 +1491,12 @@ static int check_firmware(struct av7110* av7110) return 0; } -static void put_firmware(struct av7110* av7110) +static void put_firmware(struct av7110 *av7110) { vfree(av7110->bin_fw); } -static int get_firmware(struct av7110* av7110) +static int get_firmware(struct av7110 *av7110) { int ret; const struct firmware *fw; @@ -1540,7 +1540,7 @@ static int get_firmware(struct av7110* av7110) static int alps_bsrv2_tuner_set_params(struct dvb_frontend *fe) { struct dtv_frontend_properties *p = &fe->dtv_property_cache; - struct av7110* av7110 = fe->dvb->priv; + struct av7110 *av7110 = fe->dvb->priv; u8 pwr = 0; u8 buf[4]; struct i2c_msg msg = { .addr = 0x61, .flags = 0, .buf = buf, .len = sizeof(buf) }; @@ -1583,7 +1583,7 @@ static struct ves1x93_config alps_bsrv2_config = { static int alps_tdbe2_tuner_set_params(struct dvb_frontend *fe) { struct dtv_frontend_properties *p = &fe->dtv_property_cache; - struct av7110* av7110 = fe->dvb->priv; + struct av7110 *av7110 = fe->dvb->priv; u32 div; u8 data[4]; struct i2c_msg msg = { .addr = 0x62, .flags = 0, .buf = data, .len = sizeof(data) }; @@ -1615,7 +1615,7 @@ static struct ves1820_config alps_tdbe2_config = { static int grundig_29504_451_tuner_set_params(struct dvb_frontend *fe) { struct dtv_frontend_properties *p = &fe->dtv_property_cache; - struct av7110* av7110 = fe->dvb->priv; + struct av7110 *av7110 = fe->dvb->priv; u32 div; u8 data[4]; struct i2c_msg msg = { .addr = 0x61, .flags = 0, .buf = data, .len = sizeof(data) }; @@ -1642,7 +1642,7 @@ static struct tda8083_config grundig_29504_451_config = { static int philips_cd1516_tuner_set_params(struct dvb_frontend *fe) { struct dtv_frontend_properties *p = &fe->dtv_property_cache; - struct av7110* av7110 = fe->dvb->priv; + struct av7110 *av7110 = fe->dvb->priv; u32 div; u32 f = p->frequency; u8 data[4]; @@ -1674,7 +1674,7 @@ static struct ves1820_config philips_cd1516_config = { static int alps_tdlb7_tuner_set_params(struct dvb_frontend *fe) { struct dtv_frontend_properties *p = &fe->dtv_property_cache; - struct av7110* av7110 = fe->dvb->priv; + struct av7110 *av7110 = fe->dvb->priv; u32 div, pwr; u8 data[4]; struct i2c_msg msg = { .addr = 0x60, .flags = 0, .buf = data, .len = sizeof(data) }; @@ -1698,10 +1698,10 @@ static int alps_tdlb7_tuner_set_params(struct dvb_frontend *fe) return 0; } -static int alps_tdlb7_request_firmware(struct dvb_frontend* fe, const struct firmware **fw, char* name) +static int alps_tdlb7_request_firmware(struct dvb_frontend *fe, const struct firmware **fw, char *name) { #if IS_ENABLED(CONFIG_DVB_SP8870) - struct av7110* av7110 = fe->dvb->priv; + struct av7110 *av7110 = fe->dvb->priv; return request_firmware(fw, name, &av7110->dev->pci->dev); #else @@ -1812,7 +1812,7 @@ static u8 nexusca_stv0297_inittab[] = { static int nexusca_stv0297_tuner_set_params(struct dvb_frontend *fe) { struct dtv_frontend_properties *p = &fe->dtv_property_cache; - struct av7110* av7110 = fe->dvb->priv; + struct av7110 *av7110 = fe->dvb->priv; u32 div; u8 data[4]; struct i2c_msg msg = { .addr = 0x63, .flags = 0, .buf = data, .len = sizeof(data) }; @@ -1868,7 +1868,7 @@ static struct stv0297_config nexusca_stv0297_config = { static int grundig_29504_401_tuner_set_params(struct dvb_frontend *fe) { struct dtv_frontend_properties *p = &fe->dtv_property_cache; - struct av7110* av7110 = fe->dvb->priv; + struct av7110 *av7110 = fe->dvb->priv; u32 div; u8 cfg, cpump, band_select; u8 data[4]; @@ -1956,7 +1956,7 @@ static int av7110_fe_lock_fix(struct av7110 *av7110, enum fe_status status) static int av7110_fe_set_frontend(struct dvb_frontend *fe) { - struct av7110* av7110 = fe->dvb->priv; + struct av7110 *av7110 = fe->dvb->priv; int ret = av7110_fe_lock_fix(av7110, 0); if (!ret) @@ -1965,9 +1965,9 @@ static int av7110_fe_set_frontend(struct dvb_frontend *fe) return ret; } -static int av7110_fe_init(struct dvb_frontend* fe) +static int av7110_fe_init(struct dvb_frontend *fe) { - struct av7110* av7110 = fe->dvb->priv; + struct av7110 *av7110 = fe->dvb->priv; int ret = av7110_fe_lock_fix(av7110, 0); if (!ret) @@ -1978,7 +1978,7 @@ static int av7110_fe_init(struct dvb_frontend* fe) static int av7110_fe_read_status(struct dvb_frontend *fe, enum fe_status *status) { - struct av7110* av7110 = fe->dvb->priv; + struct av7110 *av7110 = fe->dvb->priv; /* call the real implementation */ int ret = av7110->fe_read_status(fe, status); @@ -1988,9 +1988,9 @@ static int av7110_fe_read_status(struct dvb_frontend *fe, return ret; } -static int av7110_fe_diseqc_reset_overload(struct dvb_frontend* fe) +static int av7110_fe_diseqc_reset_overload(struct dvb_frontend *fe) { - struct av7110* av7110 = fe->dvb->priv; + struct av7110 *av7110 = fe->dvb->priv; int ret = av7110_fe_lock_fix(av7110, 0); if (!ret) @@ -1998,10 +1998,10 @@ static int av7110_fe_diseqc_reset_overload(struct dvb_frontend* fe) return ret; } -static int av7110_fe_diseqc_send_master_cmd(struct dvb_frontend* fe, - struct dvb_diseqc_master_cmd* cmd) +static int av7110_fe_diseqc_send_master_cmd(struct dvb_frontend *fe, + struct dvb_diseqc_master_cmd *cmd) { - struct av7110* av7110 = fe->dvb->priv; + struct av7110 *av7110 = fe->dvb->priv; int ret = av7110_fe_lock_fix(av7110, 0); if (!ret) { @@ -2014,7 +2014,7 @@ static int av7110_fe_diseqc_send_master_cmd(struct dvb_frontend* fe, static int av7110_fe_diseqc_send_burst(struct dvb_frontend *fe, enum fe_sec_mini_cmd minicmd) { - struct av7110* av7110 = fe->dvb->priv; + struct av7110 *av7110 = fe->dvb->priv; int ret = av7110_fe_lock_fix(av7110, 0); if (!ret) { @@ -2027,7 +2027,7 @@ static int av7110_fe_diseqc_send_burst(struct dvb_frontend *fe, static int av7110_fe_set_tone(struct dvb_frontend *fe, enum fe_sec_tone_mode tone) { - struct av7110* av7110 = fe->dvb->priv; + struct av7110 *av7110 = fe->dvb->priv; int ret = av7110_fe_lock_fix(av7110, 0); if (!ret) { @@ -2040,7 +2040,7 @@ static int av7110_fe_set_tone(struct dvb_frontend *fe, static int av7110_fe_set_voltage(struct dvb_frontend *fe, enum fe_sec_voltage voltage) { - struct av7110* av7110 = fe->dvb->priv; + struct av7110 *av7110 = fe->dvb->priv; int ret = av7110_fe_lock_fix(av7110, 0); if (!ret) { @@ -2050,9 +2050,9 @@ static int av7110_fe_set_voltage(struct dvb_frontend *fe, return ret; } -static int av7110_fe_dishnetwork_send_legacy_command(struct dvb_frontend* fe, unsigned long cmd) +static int av7110_fe_dishnetwork_send_legacy_command(struct dvb_frontend *fe, unsigned long cmd) { - struct av7110* av7110 = fe->dvb->priv; + struct av7110 *av7110 = fe->dvb->priv; int ret = av7110_fe_lock_fix(av7110, 0); if (!ret) @@ -2060,7 +2060,7 @@ static int av7110_fe_dishnetwork_send_legacy_command(struct dvb_frontend* fe, un return ret; } -static void dvb_s_recover(struct av7110* av7110) +static void dvb_s_recover(struct av7110 *av7110) { av7110_fe_init(av7110->fe); @@ -2077,7 +2077,7 @@ static void dvb_s_recover(struct av7110* av7110) av7110_fe_set_frontend(av7110->fe); } -static u8 read_pwm(struct av7110* av7110) +static u8 read_pwm(struct av7110 *av7110) { u8 b = 0xff; u8 pwm; @@ -2346,7 +2346,7 @@ static int frontend_init(struct av7110 *av7110) * The same behaviour of missing VSYNC can be duplicated on budget * cards, by setting DD1_INIT trigger mode 7 in 3rd nibble. */ -static int av7110_attach(struct saa7146_dev* dev, +static int av7110_attach(struct saa7146_dev *dev, struct saa7146_pci_extension_data *pci_ext) { const int length = TS_WIDTH * TS_HEIGHT; @@ -2453,7 +2453,7 @@ static int av7110_attach(struct saa7146_dev* dev, return -ENOMEM; } - av7110->card_name = (char*) pci_ext->ext_priv; + av7110->card_name = (char *)pci_ext->ext_priv; av7110->dev = dev; dev->ext_priv = av7110; @@ -2746,7 +2746,7 @@ static int av7110_attach(struct saa7146_dev* dev, goto out; } -static int av7110_detach(struct saa7146_dev* saa) +static int av7110_detach(struct saa7146_dev *saa) { struct av7110 *av7110 = saa->ext_priv; dprintk(4, "%p\n", av7110); @@ -2803,7 +2803,7 @@ static int av7110_detach(struct saa7146_dev* saa) } -static void av7110_irq(struct saa7146_dev* dev, u32 *isr) +static void av7110_irq(struct saa7146_dev *dev, u32 *isr) { struct av7110 *av7110 = dev->ext_priv; diff --git a/drivers/staging/media/av7110/av7110.h b/drivers/staging/media/av7110/av7110.h index 809d938ae..e251f989e 100644 --- a/drivers/staging/media/av7110/av7110.h +++ b/drivers/staging/media/av7110/av7110.h @@ -260,19 +260,19 @@ struct av7110 { unsigned char *bin_root; unsigned long size_root; - struct dvb_frontend* fe; + struct dvb_frontend *fe; enum fe_status fe_status; struct mutex ioctl_mutex; /* crash recovery */ - void (*recover)(struct av7110* av7110); + void (*recover)(struct av7110 *av7110); enum fe_sec_voltage saved_voltage; enum fe_sec_tone_mode saved_tone; struct dvb_diseqc_master_cmd saved_master_cmd; enum fe_sec_mini_cmd saved_minicmd; - int (*fe_init)(struct dvb_frontend* fe); + int (*fe_init)(struct dvb_frontend *fe); int (*fe_read_status)(struct dvb_frontend *fe, enum fe_status *status); int (*fe_diseqc_reset_overload)(struct dvb_frontend *fe); int (*fe_diseqc_send_master_cmd)(struct dvb_frontend *fe, diff --git a/drivers/staging/media/av7110/av7110_ca.c b/drivers/staging/media/av7110/av7110_ca.c index c1338e074..9ff5bd6f5 100644 --- a/drivers/staging/media/av7110/av7110_ca.c +++ b/drivers/staging/media/av7110/av7110_ca.c @@ -294,7 +294,7 @@ static int dvb_ca_ioctl(struct file *file, unsigned int cmd, void *parg) case CA_SET_DESCR: { - struct ca_descr *descr = (struct ca_descr*) parg; + struct ca_descr *descr = (struct ca_descr *)parg; if (descr->index >= 16 || descr->parity > 1) { mutex_unlock(&av7110->ioctl_mutex); @@ -369,12 +369,12 @@ void av7110_ca_unregister(struct av7110 *av7110) dvb_unregister_device(av7110->ca_dev); } -int av7110_ca_init(struct av7110* av7110) +int av7110_ca_init(struct av7110 *av7110) { return ci_ll_init(&av7110->ci_rbuffer, &av7110->ci_wbuffer, 8192); } -void av7110_ca_exit(struct av7110* av7110) +void av7110_ca_exit(struct av7110 *av7110) { ci_ll_release(&av7110->ci_rbuffer, &av7110->ci_wbuffer); } diff --git a/drivers/staging/media/av7110/av7110_hw.c b/drivers/staging/media/av7110/av7110_hw.c index a0be37717..714a4438b 100644 --- a/drivers/staging/media/av7110/av7110_hw.c +++ b/drivers/staging/media/av7110/av7110_hw.c @@ -318,7 +318,7 @@ int av7110_wait_msgstate(struct av7110 *av7110, u16 flags) return 0; } -static int __av7110_send_fw_cmd(struct av7110 *av7110, u16* buf, int length) +static int __av7110_send_fw_cmd(struct av7110 *av7110, u16 *buf, int length) { int i; unsigned long start; @@ -453,7 +453,7 @@ static int __av7110_send_fw_cmd(struct av7110 *av7110, u16* buf, int length) return 0; } -static int av7110_send_fw_cmd(struct av7110 *av7110, u16* buf, int length) +static int av7110_send_fw_cmd(struct av7110 *av7110, u16 *buf, int length) { int ret; @@ -606,7 +606,7 @@ int av7110_fw_request(struct av7110 *av7110, u16 *request_buf, return 0; } -static int av7110_fw_query(struct av7110 *av7110, u16 tag, u16* buf, s16 length) +static int av7110_fw_query(struct av7110 *av7110, u16 tag, u16 *buf, s16 length) { int ret; ret = av7110_fw_request(av7110, &tag, 0, buf, length); @@ -851,7 +851,7 @@ static inline int WaitUntilBmpLoaded(struct av7110 *av7110) } static inline int LoadBitmap(struct av7110 *av7110, - u16 dx, u16 dy, int inc, u8 __user * data) + u16 dx, u16 dy, int inc, u8 __user *data) { u16 format; int bpp; @@ -960,7 +960,7 @@ static int OSDSetColor(struct av7110 *av7110, u8 color, u8 r, u8 g, u8 b, u8 ble return ret; } -static int OSDSetPalette(struct av7110 *av7110, u32 __user * colors, u8 first, u8 last) +static int OSDSetPalette(struct av7110 *av7110, u32 __user *colors, u8 first, u8 last) { int i; int length = last - first + 1; @@ -986,7 +986,7 @@ static int OSDSetPalette(struct av7110 *av7110, u32 __user * colors, u8 first, u } static int OSDSetBlock(struct av7110 *av7110, int x0, int y0, - int x1, int y1, int inc, u8 __user * data) + int x1, int y1, int inc, u8 __user *data) { uint w, h, bpp, bpl, size, lpb, bnum, brest; int i; diff --git a/drivers/staging/media/av7110/av7110_v4l.c b/drivers/staging/media/av7110/av7110_v4l.c index ed2c60580..2c4707a60 100644 --- a/drivers/staging/media/av7110/av7110_v4l.c +++ b/drivers/staging/media/av7110/av7110_v4l.c @@ -175,7 +175,7 @@ static int ves1820_set_tv_freq(struct saa7146_dev *dev, u32 freq) static int stv0297_set_tv_freq(struct saa7146_dev *dev, u32 freq) { - struct av7110 *av7110 = (struct av7110*)dev->ext_priv; + struct av7110 *av7110 = (struct av7110 *)dev->ext_priv; u32 div; u8 data[4]; @@ -215,7 +215,7 @@ static const struct v4l2_audio msp3400_v4l2_audio = { static int av7110_dvb_c_switch(struct saa7146_dev *dev) { - struct av7110 *av7110 = (struct av7110*)dev->ext_priv; + struct av7110 *av7110 = (struct av7110 *)dev->ext_priv; u16 adswitch; int source, sync; @@ -610,7 +610,7 @@ static int vidioc_s_fmt_sliced_vbi_out(struct file *file, void *fh, static ssize_t av7110_vbi_write(struct file *file, const char __user *data, size_t count, loff_t *ppos) { struct saa7146_dev *dev = video_drvdata(file); - struct av7110 *av7110 = (struct av7110*) dev->ext_priv; + struct av7110 *av7110 = (struct av7110 *)dev->ext_priv; struct v4l2_sliced_vbi_data d; int rc; @@ -795,7 +795,7 @@ int av7110_init_analog_module(struct av7110 *av7110) int av7110_init_v4l(struct av7110 *av7110) { - struct saa7146_dev* dev = av7110->dev; + struct saa7146_dev *dev = av7110->dev; struct saa7146_ext_vv *vv_data; int ret; @@ -853,7 +853,7 @@ int av7110_init_v4l(struct av7110 *av7110) int av7110_exit_v4l(struct av7110 *av7110) { - struct saa7146_dev* dev = av7110->dev; + struct saa7146_dev *dev = av7110->dev; saa7146_unregister_device(&av7110->v4l_dev, av7110->dev); saa7146_unregister_device(&av7110->vbi_dev, av7110->dev); @@ -909,9 +909,9 @@ static struct saa7146_standard dvb_standard[] = { } }; -static int std_callback(struct saa7146_dev* dev, struct saa7146_standard *std) +static int std_callback(struct saa7146_dev *dev, struct saa7146_standard *std) { - struct av7110 *av7110 = (struct av7110*) dev->ext_priv; + struct av7110 *av7110 = (struct av7110 *)dev->ext_priv; if (std->id & V4L2_STD_PAL) { av7110->vidmode = AV7110_VIDEO_MODE_PAL; From patchwork Tue May 7 00:24:47 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Herdler X-Patchwork-Id: 13656136 Received: from mout.gmx.net (mout.gmx.net [212.227.17.22]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id AAF158BFC for ; Tue, 7 May 2024 00:25:31 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=212.227.17.22 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1715041535; cv=none; b=dQMtbUYDPAT4tfoqi5gwzET67UADS5V+DEGJcvoquFNzbx5trnnLHpLBqw7f4hsM8fshQevs8FXh/5pVOm/dSAzdJTJ2Bm2SURJko9Z6UBoocZzQAW4spzjOzSd7zXh+z8thRRF5Bo0uKdwi4kqo+1WLBmvjSMXYKe0EYN7r6PQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1715041535; c=relaxed/simple; bh=I8TxJjNCETSsBVpJ65jtjuybTu7nERT4l7UdDvUrI8c=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=uihXH624DCcuAgORd2Goua0zu2SuB7BVDvdirmfNWN93aqepmmrHzM1KQYR/w9Y+FEz+kWL8/IgsMUPx/3H4WpWIEtdXNUlLW7mlbVkqzwSS5IUN0R6+ruMc/Bk7bF+xA+vhp9OWd0egAQZC/E0qpA+wRsmu6LcIWo+nF1R+9Yw= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=nurfuerspam.de; spf=pass smtp.mailfrom=nurfuerspam.de; dkim=pass (2048-bit key) header.d=nurfuerspam.de header.i=herdler@nurfuerspam.de header.b=mjuyOFqA; arc=none smtp.client-ip=212.227.17.22 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=nurfuerspam.de Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=nurfuerspam.de Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=nurfuerspam.de header.i=herdler@nurfuerspam.de header.b="mjuyOFqA" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nurfuerspam.de; s=s31663417; t=1715041527; x=1715646327; i=herdler@nurfuerspam.de; bh=zV/qmPdsP2DbUbiQYAHvl2u+HAw/MXdAfBkPdoZElN0=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date:Message-Id:In-Reply-To: References:MIME-Version:Content-Transfer-Encoding:cc: content-transfer-encoding:content-type:date:from:message-id: mime-version:reply-to:subject:to; b=mjuyOFqAcoP3jH+PzF+rV9OM8wr8lktja6nNPs5Gvy0HPcERwvWqqywauYcrptPy hbfHkrvFl5/CG4M0GPz/5ic4j3lCq+UCu4ZWoF3BWIPdv8AKxwozfJo15lq5DHw0V UfG/aj/MIM8oyYQWsKlj7iMfJSrE3mGpewU/09UdRmcBQHQRMiVRX2qz6tdAUNBmB sciaZz0GeqzczMTvOGEnSWYVTGA14gb1oNP0BDkdWwr3VdVWke8Wq31KQV4SXttKr X8nyd0+EwMyj2ioV0uUiKMhGR9Dp56yCz+oA2cSSKv1cj/sgULe7q9Ya5q50BYdME 3ciGtQeVDMgeEHaMrg== X-UI-Sender-Class: 724b4f7f-cbec-4199-ad4e-598c01a50d3a Received: from astro.haus ([185.101.174.109]) by mail.gmx.net (mrgmx105 [212.227.17.168]) with ESMTPSA (Nemesis) id 1MN5eX-1sMURW0TBd-00J4XS; Tue, 07 May 2024 02:25:27 +0200 From: Stefan Herdler To: hverkuil-cisco@xs4all.nl Cc: linux-media@vger.kernel.org, smoch@web.de, tmn505@gmail.com, vinschen@redhat.com Subject: [PATCH 08/21] media: av7110: coding style fixes: blank lines Date: Tue, 7 May 2024 02:24:47 +0200 Message-Id: <20240507002500.81867-9-herdler@nurfuerspam.de> X-Mailer: git-send-email 2.34.0 In-Reply-To: <20240507002500.81867-1-herdler@nurfuerspam.de> References: <20240507002500.81867-1-herdler@nurfuerspam.de> Precedence: bulk X-Mailing-List: linux-media@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Provags-ID: V03:K1:gSDx61GeCF+1Z5rI693OH3T82aZPNwR504882wb1/HH+//YOX4M ENQ0O6meB/l89hNWz6I01U+59kLon5kaIuL1Ea0+jtvZSsJgrhyP8rXq1iWNm2Lm3KO3VUE 262KEz07Gpk00JB33g2N7N9EhrBMlg8TRjaOD7l9AjJFDCgKt5su39Ok5cHu+flEO3I7f4F RbjZGEJuUhIRBx27SzWnw== X-Spam-Flag: NO UI-OutboundReport: notjunk:1;M01:P0:cv+vcQ0sNpQ=;0SHcXsUFUKoOqisyGel2w+t5dxS CXGlAfc6Xkus5dQv/D6ZytO7f7WJ4pNh1sOSUllvSgiWFxUp23BvNhsFT/VztCiDcfD0h05BH cDYF17HWBdCgC3DcznBL+v5YZzIVkF/GGvDXEPihrjdMRifiChWpAgP3ug8dZ9H1RrGRXA9yI LLkK8bB3n5FgRLed/4UrqY/q48n/0jrPEihXr4g2F0ulgTeshGNflqbuanJbzKDMTCwTaFVpY fCXJf8eiCZdF/JBfEqjfuMXtuk0n+7MGbiWvCJENZNvLOuSF9CIv2nWt9EgzGPqpJBAV9pPkM M+AM9omVvvGBbhvXdFsNTMUjH/54YJ8PjppKWJa5I/WnLMflrFNS1EN/wf9seazworgSbLmwX t9F0h8+1iNlhS+owQHUl2ny87+ACyFOhpRjezinlQi9HjXIlfazFwFKmPSWaRhAJQU3nu8oRe dIdAlcde9hxXr3Z7VezUGfqcKNtSO11yhp1ON6qPXECjG2SOlcMpi3QncNx5sZPPhGFs1tonb CzxNVaK/xqi2ikcPwhuUcbGV7nHcz/njvohWELLZAi4KinZvIuJ+o2FyjSnWFojIhFE2QSbuV HpAaZxDKwTTue20mwYR/s1Zu3qloRJmfvaqan68O1MhCqd4vGoPweV7CFkgf79dnF+A2m0Dx/ YCHOsmj6ZuZiolswN/ryn8i+Wg112pvP6hi3JuNTo1S+3w4Ee4V1pApN8G7Uyq2t2T/NmNKcd KZDI6q9XcTwtICHUOZX26lAcEJjnk2rq8/8pyCrjDl9tUsMQtCmIuWQPwNdxRIqB+D8g2Zb7x kiC8o4f8w4UY/6oi7D9FmOWali7ZQAdwwRn7HI8BvLbRM= This patch fixes the following checkpatch warnings: CHECK:LINE_SPACING: Please don't use multiple blank lines CHECK:LINE_SPACING: Please use a blank line after function/struct/union/enum declarations CHECK:BRACES: Blank lines aren't necessary after an open brace '{' CHECK:BRACES: Blank lines aren't necessary before a close brace '}' WARNING:LINE_SPACING: Missing a blank line after declarations Added or removed blank lines only. "git diff --ignore-blank-lines" shows no changes. Signed-off-by: Stefan Herdler --- drivers/staging/media/av7110/av7110.c | 55 ++++++--------------- drivers/staging/media/av7110/av7110.h | 10 ---- drivers/staging/media/av7110/av7110_av.c | 33 +++++-------- drivers/staging/media/av7110/av7110_av.h | 1 - drivers/staging/media/av7110/av7110_ca.c | 4 -- drivers/staging/media/av7110/av7110_hw.c | 10 ++-- drivers/staging/media/av7110/av7110_hw.h | 12 ----- drivers/staging/media/av7110/av7110_ipack.c | 11 +---- drivers/staging/media/av7110/av7110_v4l.c | 7 +-- drivers/staging/media/av7110/dvb_filter.h | 4 -- 10 files changed, 33 insertions(+), 114 deletions(-) -- 2.34.0 diff --git a/drivers/staging/media/av7110/av7110.c b/drivers/staging/media/av7110/av7110.c index eb1dc64bc..b19c27f6e 100644 --- a/drivers/staging/media/av7110/av7110.c +++ b/drivers/staging/media/av7110/av7110.c @@ -12,7 +12,6 @@ * the project's page is at https://linuxtv.org */ - #include #include #include @@ -36,7 +35,6 @@ #include #include - #include #include @@ -57,7 +55,6 @@ #define TS_BUFLEN (TS_WIDTH*TS_HEIGHT) #define TS_MAX_PACKETS (TS_BUFLEN/TS_SIZE) - int av7110_debug; static int vidmode = CVBS_RGB_OUT; @@ -113,7 +110,6 @@ static int av7110_num; } \ } - static void init_av7110_av(struct av7110 *av7110) { int ret; @@ -273,7 +269,6 @@ static int arm_thread(void *data) return 0; } - /**************************************************************************** * IRQ handling ****************************************************************************/ @@ -325,12 +320,12 @@ static int DvbDmxFilterCallback(u8 *buffer1, size_t buffer1_len, } } - //#define DEBUG_TIMING static inline void print_time(char *s) { #ifdef DEBUG_TIMING struct timespec64 ts; + ktime_get_real_ts64(&ts); printk("%s: %lld.%09ld\n", s, (s64)ts.tv_sec, ts.tv_nsec); #endif @@ -376,7 +371,6 @@ static void debiirq(struct tasklet_struct *t) av7110->debitype = -1; switch (type & 0xff) { - case DATA_TS_RECORD: dvb_dmx_swfilter_packets(&av7110->demux, (const u8 *) av7110->debi_virt, @@ -410,6 +404,7 @@ static void debiirq(struct tasklet_struct *t) if (data_0 < 2 && data[2] == 0xff) { int flags = 0; + if (data[5] > 0) flags |= CA_CI_MODULE_PRESENT; if (data[5] > 5) @@ -489,7 +484,6 @@ static void gpioirq(struct tasklet_struct *t) dprintk(8, "GPIO0 irq 0x%04x %d\n", av7110->debitype, av7110->debilen); switch (av7110->debitype & 0xff) { - case DATA_TS_PLAY: case DATA_PES_PLAY: break; @@ -674,7 +668,6 @@ static void gpioirq(struct tasklet_struct *t) spin_unlock(&av7110->debilock); } - #ifdef CONFIG_DVB_AV7110_OSD static int dvb_osd_ioctl(struct file *file, unsigned int cmd, void *parg) @@ -692,7 +685,6 @@ static int dvb_osd_ioctl(struct file *file, return -EINVAL; } - static const struct file_operations dvb_osd_fops = { .owner = THIS_MODULE, .unlocked_ioctl = dvb_generic_ioctl, @@ -710,7 +702,6 @@ static struct dvb_device dvbdev_osd = { }; #endif /* CONFIG_DVB_AV7110_OSD */ - static inline int SetPIDs(struct av7110 *av7110, u16 vpid, u16 apid, u16 ttpid, u16 subpid, u16 pcrpid) { @@ -738,6 +729,7 @@ int ChangePIDs(struct av7110 *av7110, u16 vpid, u16 apid, u16 ttpid, u16 subpid, u16 pcrpid) { int ret = 0; + dprintk(4, "%p\n", av7110); if (mutex_lock_interruptible(&av7110->pid_mutex)) @@ -763,7 +755,6 @@ int ChangePIDs(struct av7110 *av7110, u16 vpid, u16 apid, u16 ttpid, return ret; } - /****************************************************************************** * hardware filter functions ******************************************************************************/ @@ -856,7 +847,6 @@ static int StopHWFilter(struct dvb_demux_filter *dvbdmxfilter) return ret; } - static int dvb_feed_start_pid(struct dvb_demux_feed *dvbdmxfeed) { struct dvb_demux *dvbdmx = dvbdmxfeed->demux; @@ -1008,12 +998,12 @@ static int av7110_start_feed(struct dvb_demux_feed *feed) return ret; } - static int av7110_stop_feed(struct dvb_demux_feed *feed) { struct dvb_demux *demux = feed->demux; struct av7110 *av7110 = demux->priv; int i, rc, ret = 0; + dprintk(4, "%p\n", av7110); if (feed->type == DMX_TYPE_TS) { @@ -1056,7 +1046,6 @@ static int av7110_stop_feed(struct dvb_demux_feed *feed) return ret; } - static void restart_feeds(struct av7110 *av7110) { struct dvb_demux *dvbdmx = &av7110->demux; @@ -1135,12 +1124,10 @@ static int dvb_get_stc(struct dmx_demux *demux, unsigned int num, return 0; } - /****************************************************************************** * SEC device file operations ******************************************************************************/ - static int av7110_set_tone(struct dvb_frontend *fe, enum fe_sec_tone_mode tone) { struct av7110 *av7110 = fe->dvb->priv; @@ -1365,7 +1352,6 @@ static int av7110_register(struct av7110 *av7110) return 0; } - static void dvb_unregister(struct av7110 *av7110) { struct dvb_demux *dvbdemux = &av7110->demux; @@ -1401,7 +1387,6 @@ static void dvb_unregister(struct av7110 *av7110) av7110_ca_unregister(av7110); } - /**************************************************************************** * I2C client commands ****************************************************************************/ @@ -1439,7 +1424,6 @@ u8 i2c_readreg(struct av7110 *av7110, u8 id, u8 reg) * INITIALIZATION ****************************************************************************/ - static int check_firmware(struct av7110 *av7110) { u32 crc = 0, len = 0; @@ -1609,9 +1593,6 @@ static struct ves1820_config alps_tdbe2_config = { .selagc = VES1820_SELAGC_SIGNAMPERR, }; - - - static int grundig_29504_451_tuner_set_params(struct dvb_frontend *fe) { struct dtv_frontend_properties *p = &fe->dtv_property_cache; @@ -1637,8 +1618,6 @@ static struct tda8083_config grundig_29504_451_config = { .demod_address = 0x68, }; - - static int philips_cd1516_tuner_set_params(struct dvb_frontend *fe) { struct dtv_frontend_properties *p = &fe->dtv_property_cache; @@ -1669,8 +1648,6 @@ static struct ves1820_config philips_cd1516_config = { .selagc = VES1820_SELAGC_SIGNAMPERR, }; - - static int alps_tdlb7_tuner_set_params(struct dvb_frontend *fe) { struct dtv_frontend_properties *p = &fe->dtv_property_cache; @@ -1710,12 +1687,10 @@ static int alps_tdlb7_request_firmware(struct dvb_frontend *fe, const struct fir } static const struct sp8870_config alps_tdlb7_config = { - .demod_address = 0x71, .request_firmware = alps_tdlb7_request_firmware, }; - static u8 nexusca_stv0297_inittab[] = { 0x80, 0x01, 0x80, 0x00, @@ -1856,15 +1831,12 @@ static int nexusca_stv0297_tuner_set_params(struct dvb_frontend *fe) } static struct stv0297_config nexusca_stv0297_config = { - .demod_address = 0x1C, .inittab = nexusca_stv0297_inittab, .invert = 1, .stop_during_read = 1, }; - - static int grundig_29504_401_tuner_set_params(struct dvb_frontend *fe) { struct dtv_frontend_properties *p = &fe->dtv_property_cache; @@ -1911,8 +1883,6 @@ static struct l64781_config grundig_29504_401_config = { .demod_address = 0x55, }; - - static int av7110_fe_lock_fix(struct av7110 *av7110, enum fe_status status) { int ret = 0; @@ -1959,6 +1929,7 @@ static int av7110_fe_set_frontend(struct dvb_frontend *fe) struct av7110 *av7110 = fe->dvb->priv; int ret = av7110_fe_lock_fix(av7110, 0); + if (!ret) ret = av7110->fe_set_frontend(fe); @@ -1970,6 +1941,7 @@ static int av7110_fe_init(struct dvb_frontend *fe) struct av7110 *av7110 = fe->dvb->priv; int ret = av7110_fe_lock_fix(av7110, 0); + if (!ret) ret = av7110->fe_init(fe); return ret; @@ -1982,6 +1954,7 @@ static int av7110_fe_read_status(struct dvb_frontend *fe, /* call the real implementation */ int ret = av7110->fe_read_status(fe, status); + if (!ret) if (((*status ^ av7110->fe_status) & FE_HAS_LOCK) && (*status & FE_HAS_LOCK)) ret = av7110_fe_lock_fix(av7110, *status); @@ -1993,6 +1966,7 @@ static int av7110_fe_diseqc_reset_overload(struct dvb_frontend *fe) struct av7110 *av7110 = fe->dvb->priv; int ret = av7110_fe_lock_fix(av7110, 0); + if (!ret) ret = av7110->fe_diseqc_reset_overload(fe); return ret; @@ -2004,6 +1978,7 @@ static int av7110_fe_diseqc_send_master_cmd(struct dvb_frontend *fe, struct av7110 *av7110 = fe->dvb->priv; int ret = av7110_fe_lock_fix(av7110, 0); + if (!ret) { av7110->saved_master_cmd = *cmd; ret = av7110->fe_diseqc_send_master_cmd(fe, cmd); @@ -2017,6 +1992,7 @@ static int av7110_fe_diseqc_send_burst(struct dvb_frontend *fe, struct av7110 *av7110 = fe->dvb->priv; int ret = av7110_fe_lock_fix(av7110, 0); + if (!ret) { av7110->saved_minicmd = minicmd; ret = av7110->fe_diseqc_send_burst(fe, minicmd); @@ -2030,6 +2006,7 @@ static int av7110_fe_set_tone(struct dvb_frontend *fe, struct av7110 *av7110 = fe->dvb->priv; int ret = av7110_fe_lock_fix(av7110, 0); + if (!ret) { av7110->saved_tone = tone; ret = av7110->fe_set_tone(fe, tone); @@ -2043,6 +2020,7 @@ static int av7110_fe_set_voltage(struct dvb_frontend *fe, struct av7110 *av7110 = fe->dvb->priv; int ret = av7110_fe_lock_fix(av7110, 0); + if (!ret) { av7110->saved_voltage = voltage; ret = av7110->fe_set_voltage(fe, voltage); @@ -2055,6 +2033,7 @@ static int av7110_fe_dishnetwork_send_legacy_command(struct dvb_frontend *fe, un struct av7110 *av7110 = fe->dvb->priv; int ret = av7110_fe_lock_fix(av7110, 0); + if (!ret) ret = av7110->fe_dishnetwork_send_legacy_command(fe, cmd); return ret; @@ -2490,6 +2469,7 @@ static int av7110_attach(struct saa7146_dev *dev, /* check for full-ts flag in eeprom */ if (i2c_readreg(av7110, 0xaa, 0) == 0x4f && i2c_readreg(av7110, 0xaa, 1) == 0x45) { u8 flags = i2c_readreg(av7110, 0xaa, 2); + if (flags != 0xff && (flags & 0x01)) av7110->full_ts = true; } @@ -2645,7 +2625,6 @@ static int av7110_attach(struct saa7146_dev *dev, if (!av7110->debi_virt) goto err_saa71466_vfree_4; - av7110->iobuf = vmalloc(AVOUTLEN+AOUTLEN+BMPLEN+4*IPACKS); if (!av7110->iobuf) goto err_pci_free_5; @@ -2749,6 +2728,7 @@ static int av7110_attach(struct saa7146_dev *dev, static int av7110_detach(struct saa7146_dev *saa) { struct av7110 *av7110 = saa->ext_priv; + dprintk(4, "%p\n", av7110); #if IS_ENABLED(CONFIG_DVB_AV7110_IR) @@ -2802,7 +2782,6 @@ static int av7110_detach(struct saa7146_dev *saa) return 0; } - static void av7110_irq(struct saa7146_dev *dev, u32 *isr) { struct av7110 *av7110 = dev->ext_priv; @@ -2844,7 +2823,6 @@ static void av7110_irq(struct saa7146_dev *dev, u32 *isr) tasklet_schedule(&av7110->vpe_tasklet); } - static struct saa7146_extension av7110_extension_driver; #define MAKE_AV7110_INFO(x_var,x_name) \ @@ -2887,7 +2865,6 @@ static const struct pci_device_id pci_tbl[] = { MODULE_DEVICE_TABLE(pci, pci_tbl); - static struct saa7146_extension av7110_extension_driver = { .name = "av7110", .flags = SAA7146_USE_I2C_IRQ, @@ -2901,13 +2878,11 @@ static struct saa7146_extension av7110_extension_driver = { .irq_func = av7110_irq, }; - static int __init av7110_init(void) { return saa7146_register_extension(&av7110_extension_driver); } - static void __exit av7110_exit(void) { saa7146_unregister_extension(&av7110_extension_driver); diff --git a/drivers/staging/media/av7110/av7110.h b/drivers/staging/media/av7110/av7110.h index e251f989e..2290300ae 100644 --- a/drivers/staging/media/av7110/av7110.h +++ b/drivers/staging/media/av7110/av7110.h @@ -35,7 +35,6 @@ #include - #define ANALOG_TUNER_VES1820 1 #define ANALOG_TUNER_STV0297 2 @@ -76,7 +75,6 @@ struct dvb_video_events { spinlock_t lock; }; - struct av7110; /* infrared remote control */ @@ -88,7 +86,6 @@ struct infrared { /* place to store all the necessary device information */ struct av7110 { - /* devices */ struct dvb_device dvb_dev; @@ -118,7 +115,6 @@ struct av7110 { #define DVB_ADAC_MSP34x5 3 #define DVB_ADAC_NONE -1 - /* buffers */ void *iobuf; /* memory for all buffers */ @@ -139,7 +135,6 @@ struct av7110 { #define BMP_LOADED 2 wait_queue_head_t bmpq; - /* DEBI and polled command interface */ spinlock_t debilock; @@ -147,7 +142,6 @@ struct av7110 { volatile int debitype; volatile int debilen; - /* Recording and playback flags */ int rec_mode; @@ -157,7 +151,6 @@ struct av7110 { #define RP_AUDIO 2 #define RP_AV 3 - /* OSD */ int osdwin; /* currently active window */ @@ -213,7 +206,6 @@ struct av7110 { int arm_errors; int registered; - /* AV711X */ u32 arm_fw; @@ -288,7 +280,6 @@ struct av7110 { int (*fe_set_frontend)(struct dvb_frontend *fe); }; - extern int ChangePIDs(struct av7110 *av7110, u16 vpid, u16 apid, u16 ttpid, u16 subpid, u16 pcrpid); @@ -307,7 +298,6 @@ extern int i2c_writereg(struct av7110 *av7110, u8 id, u8 reg, u8 val); extern u8 i2c_readreg(struct av7110 *av7110, u8 id, u8 reg); extern int msp_writereg(struct av7110 *av7110, u8 dev, u16 reg, u16 val); - extern int av7110_init_analog_module(struct av7110 *av7110); extern int av7110_init_v4l(struct av7110 *av7110); extern int av7110_exit_v4l(struct av7110 *av7110); diff --git a/drivers/staging/media/av7110/av7110_av.c b/drivers/staging/media/av7110/av7110_av.c index 00dd6a7fe..96309a896 100644 --- a/drivers/staging/media/av7110/av7110_av.c +++ b/drivers/staging/media/av7110/av7110_av.c @@ -70,12 +70,10 @@ #define PIECE_RATE 0x40 #define SEAM_SPLICE 0x20 - static void p_to_t(u8 const *buf, long int length, u16 pid, u8 *counter, struct dvb_demux_feed *feed); static int write_ts_to_decoder(struct av7110 *av7110, int type, const u8 *buf, size_t len); - int av7110_record_cb(struct dvb_filter_pes2ts *p2t, u8 *buf, size_t len) { struct dvb_demux_feed *dvbdmxfeed = p2t->priv; @@ -149,6 +147,7 @@ int av7110_av_start_record(struct av7110 *av7110, int av, int av7110_av_start_play(struct av7110 *av7110, int av) { int ret = 0; + dprintk(2, "av7110:%p, \n", av7110); if (av7110->rec_mode) @@ -183,6 +182,7 @@ int av7110_av_start_play(struct av7110 *av7110, int av) int av7110_av_stop(struct av7110 *av7110, int av) { int ret = 0; + dprintk(2, "av7110:%p, \n", av7110); if (!(av7110->playing & av) && !(av7110->rec_mode & av)) @@ -217,7 +217,6 @@ int av7110_av_stop(struct av7110 *av7110, int av) return ret; } - int av7110_pes_play(void *dest, struct dvb_ringbuffer *buf, int dlen) { int len; @@ -263,7 +262,6 @@ int av7110_pes_play(void *dest, struct dvb_ringbuffer *buf, int dlen) return blen; } - int av7110_set_volume(struct av7110 *av7110, unsigned int volleft, unsigned int volright) { @@ -320,6 +318,7 @@ int av7110_set_volume(struct av7110 *av7110, unsigned int volleft, int av7110_set_vidmode(struct av7110 *av7110, enum av7110_video_mode mode) { int ret; + dprintk(2, "av7110:%p, \n", av7110); ret = av7110_fw_cmd(av7110, COMTYPE_ENCODER, LoadVidCode, 1, mode); @@ -335,7 +334,6 @@ int av7110_set_vidmode(struct av7110 *av7110, enum av7110_video_mode mode) return ret; } - static enum av7110_video_mode sw2mode[16] = { AV7110_VIDEO_MODE_PAL, AV7110_VIDEO_MODE_NTSC, AV7110_VIDEO_MODE_NTSC, AV7110_VIDEO_MODE_PAL, @@ -377,7 +375,6 @@ static int get_video_format(struct av7110 *av7110, u8 *buf, int count) return ret; } - /**************************************************************************** * I/O buffer management and control ****************************************************************************/ @@ -408,6 +405,7 @@ static inline long aux_ring_buffer_write(struct dvb_ringbuffer *rbuf, static void play_video_cb(u8 *buf, int count, void *priv) { struct av7110 *av7110 = (struct av7110 *) priv; + dprintk(2, "av7110:%p, \n", av7110); if ((buf[3] & 0xe0) == 0xe0) { @@ -420,12 +418,12 @@ static void play_video_cb(u8 *buf, int count, void *priv) static void play_audio_cb(u8 *buf, int count, void *priv) { struct av7110 *av7110 = (struct av7110 *) priv; + dprintk(2, "av7110:%p, \n", av7110); aux_ring_buffer_write(&av7110->aout, buf, count); } - #define FREE_COND_TS (dvb_ringbuffer_free(rb) >= 4096) static ssize_t ts_play(struct av7110 *av7110, const char __user *buf, @@ -463,7 +461,6 @@ static ssize_t ts_play(struct av7110 *av7110, const char __user *buf, return count - todo; } - #define FREE_COND (dvb_ringbuffer_free(&av7110->avout) >= 20 * 1024 && \ dvb_ringbuffer_free(&av7110->aout) >= 20 * 1024) @@ -471,6 +468,7 @@ static ssize_t dvb_play(struct av7110 *av7110, const char __user *buf, unsigned long count, int nonblock, int type) { unsigned long todo = count, n; + dprintk(2, "av7110:%p, \n", av7110); if (!av7110->kbuf[type]) @@ -504,6 +502,7 @@ static ssize_t dvb_play_kernel(struct av7110 *av7110, const u8 *buf, unsigned long count, int nonblock, int type) { unsigned long todo = count, n; + dprintk(2, "av7110:%p, \n", av7110); if (!av7110->kbuf[type]) @@ -534,6 +533,7 @@ static ssize_t dvb_aplay(struct av7110 *av7110, const char __user *buf, unsigned long count, int nonblock, int type) { unsigned long todo = count, n; + dprintk(2, "av7110:%p, \n", av7110); if (!av7110->kbuf[type]) @@ -580,7 +580,6 @@ static void clear_p2t(struct av7110_p2t *p) p->frags = 0; } - static int find_pes_header(u8 const *buf, long int length, int *frags) { int c = 0; @@ -723,7 +722,6 @@ void av7110_p2t_write(u8 const *buf, long int length, u16 pid, struct av7110_p2t } } - static int write_ts_header2(u16 pid, u8 *counter, int pes_start, u8 *buf, u8 length) { int i; @@ -758,7 +756,6 @@ static int write_ts_header2(u16 pid, u8 *counter, int pes_start, u8 *buf, u8 len return c; } - static void p_to_t(u8 const *buf, long int length, u16 pid, u8 *counter, struct dvb_demux_feed *feed) { @@ -806,7 +803,6 @@ static void p_to_t(u8 const *buf, long int length, u16 pid, u8 *counter, } } - static int write_ts_to_decoder(struct av7110 *av7110, int type, const u8 *buf, size_t len) { struct ipack *ipack = &av7110->ipack[type]; @@ -833,7 +829,6 @@ static int write_ts_to_decoder(struct av7110 *av7110, int type, const u8 *buf, s return 0; } - int av7110_write_to_decoder(struct dvb_demux_feed *feed, const u8 *buf, size_t len) { struct dvb_demux *demux = feed->demux; @@ -860,8 +855,6 @@ int av7110_write_to_decoder(struct dvb_demux_feed *feed, const u8 *buf, size_t l return write_ts_to_decoder(av7110, feed->pes_type, buf, len); } - - /****************************************************************************** * Video MPEG decoder events ******************************************************************************/ @@ -887,7 +880,6 @@ void dvb_video_add_event(struct av7110 *av7110, struct video_event *event) wake_up_interruptible(&events->wait_queue); } - static int dvb_video_get_event (struct av7110 *av7110, struct video_event *event, int flags) { struct dvb_video_events *events = &av7110->video_events; @@ -1039,6 +1031,7 @@ static int play_iframe(struct av7110 *av7110, char __user *buf, unsigned int len /* search in buf for instances of 00 00 01 b5 1? */ for (i = 0; i < len; i++) { unsigned char c; + if (get_user(c, buf + i)) return -EFAULT; if (match == 5) { @@ -1086,6 +1079,7 @@ struct compat_video_still_picture { compat_uptr_t iFrame; int32_t size; }; + #define VIDEO_STILLPICTURE32 _IOW('o', 30, struct compat_video_still_picture) struct compat_video_event { @@ -1098,6 +1092,7 @@ struct compat_video_event { unsigned char vsync_field; /* unknown/odd/even/progressive */ } u; }; + #define VIDEO_GET_EVENT32 _IOR('o', 28, struct compat_video_event) static int dvb_compat_video_get_event(struct av7110 *av7110, @@ -1223,6 +1218,7 @@ static int dvb_video_ioctl(struct file *file, case VIDEO_SET_DISPLAY_FORMAT: { video_displayformat_t format = (video_displayformat_t) arg; + switch (format) { case VIDEO_PAN_SCAN: av7110->display_panscan = VID_PAN_SCAN_PREF; @@ -1483,6 +1479,7 @@ static int dvb_audio_ioctl(struct file *file, case AUDIO_SET_MIXER: { struct audio_mixer *amix = (struct audio_mixer *)parg; + ret = av7110_set_volume(av7110, amix->volume_left, amix->volume_right); break; } @@ -1498,7 +1495,6 @@ static int dvb_audio_ioctl(struct file *file, return ret; } - static int dvb_video_open(struct inode *inode, struct file *file) { struct dvb_device *dvbdev = file->private_data; @@ -1564,8 +1560,6 @@ static int dvb_audio_release(struct inode *inode, struct file *file) return dvb_generic_release(inode, file); } - - /****************************************************************************** * driver registration ******************************************************************************/ @@ -1609,7 +1603,6 @@ static struct dvb_device dvbdev_audio = { .kernel_ioctl = dvb_audio_ioctl, }; - int av7110_av_register(struct av7110 *av7110) { av7110->audiostate.AV_sync_state = 0; diff --git a/drivers/staging/media/av7110/av7110_av.h b/drivers/staging/media/av7110/av7110_av.h index 71bbd4391..56b0e14bb 100644 --- a/drivers/staging/media/av7110/av7110_av.h +++ b/drivers/staging/media/av7110/av7110_av.h @@ -28,5 +28,4 @@ extern void av7110_av_unregister(struct av7110 *av7110); extern int av7110_av_init(struct av7110 *av7110); extern void av7110_av_exit(struct av7110 *av7110); - #endif /* _AV7110_AV_H_ */ diff --git a/drivers/staging/media/av7110/av7110_ca.c b/drivers/staging/media/av7110/av7110_ca.c index 9ff5bd6f5..38a8f3f49 100644 --- a/drivers/staging/media/av7110/av7110_ca.c +++ b/drivers/staging/media/av7110/av7110_ca.c @@ -23,7 +23,6 @@ #include "av7110_hw.h" #include "av7110_ca.h" - void CI_handle(struct av7110 *av7110, u8 *data, u16 len) { dprintk(8, "av7110:%p\n",av7110); @@ -54,7 +53,6 @@ void CI_handle(struct av7110 *av7110, u8 *data, u16 len) } } - void ci_get_data(struct dvb_ringbuffer *cibuf, u8 *data, int len) { if (dvb_ringbuffer_free(cibuf) < len + 2) @@ -66,7 +64,6 @@ void ci_get_data(struct dvb_ringbuffer *cibuf, u8 *data, int len) wake_up_interruptible(&cibuf->queue); } - /****************************************************************************** * CI link layer file ops ******************************************************************************/ @@ -357,7 +354,6 @@ static struct dvb_device dvbdev_ca = { .kernel_ioctl = dvb_ca_ioctl, }; - int av7110_ca_register(struct av7110 *av7110) { return dvb_register_device(&av7110->dvb_adapter, &av7110->ca_dev, diff --git a/drivers/staging/media/av7110/av7110_hw.c b/drivers/staging/media/av7110/av7110_hw.c index 714a4438b..d75c8947d 100644 --- a/drivers/staging/media/av7110/av7110_hw.c +++ b/drivers/staging/media/av7110/av7110_hw.c @@ -93,8 +93,6 @@ u32 av7110_debiread(struct av7110 *av7110, u32 config, int addr, unsigned int co return result; } - - /* av7110 ARM core boot stuff */ #if 0 void av7110_reset_arm(struct av7110 *av7110) @@ -188,7 +186,6 @@ static int load_dram(struct av7110 *av7110, u32 *data, int len) return 0; } - /* we cannot write av7110 DRAM directly, so load a bootloader into * the DPRAM which implements a simple boot protocol */ int av7110_bootarm(struct av7110 *av7110) @@ -609,13 +606,13 @@ int av7110_fw_request(struct av7110 *av7110, u16 *request_buf, static int av7110_fw_query(struct av7110 *av7110, u16 tag, u16 *buf, s16 length) { int ret; + ret = av7110_fw_request(av7110, &tag, 0, buf, length); if (ret) printk(KERN_ERR "dvb-ttpci: av7110_fw_query error %d\n", ret); return ret; } - /**************************************************************************** * Firmware commands ****************************************************************************/ @@ -655,7 +652,6 @@ int av7110_firmversion(struct av7110 *av7110) return 0; } - int av7110_diseqc_send(struct av7110 *av7110, int len, u8 *msg, unsigned long burst) { int i, ret; @@ -684,7 +680,6 @@ int av7110_diseqc_send(struct av7110 *av7110, int len, u8 *msg, unsigned long bu return ret; } - #ifdef CONFIG_DVB_AV7110_OSD static inline int SetColorBlend(struct av7110 *av7110, u8 windownr) @@ -829,10 +824,10 @@ static inline int CreateOSDWindow(struct av7110 *av7110, u8 windownr, windownr, disptype, width, height); } - static enum av7110_osd_palette_type bpp2pal[8] = { Pal1Bit, Pal2Bit, 0, Pal4Bit, 0, 0, 0, Pal8Bit }; + static osd_raw_window_t bpp2bit[8] = { OSD_BITMAP1, OSD_BITMAP2, 0, OSD_BITMAP4, 0, 0, 0, OSD_BITMAP8 }; @@ -1087,6 +1082,7 @@ int av7110_osd_cmd(struct av7110 *av7110, osd_cmd_t *dc) int i, len = dc->x0-dc->color+1; u8 __user *colors = (u8 __user *)dc->data; u8 r, g = 0, b = 0, blend = 0; + ret = 0; for (i = 0; i /* for memcpy() */ #include - void av7110_ipack_reset(struct ipack *p) { p->found = 0; @@ -20,7 +19,6 @@ void av7110_ipack_reset(struct ipack *p) p->count = 0; } - int av7110_ipack_init(struct ipack *p, int size, void (*func)(u8 *buf, int size, void *priv)) { @@ -35,13 +33,11 @@ int av7110_ipack_init(struct ipack *p, int size, return 0; } - void av7110_ipack_free(struct ipack *p) { vfree(p->buf); } - static void send_ipack(struct ipack *p) { int off; @@ -108,7 +104,6 @@ static void send_ipack(struct ipack *p) } } - void av7110_ipack_flush(struct ipack *p) { if (p->plength != MMAX_PLENGTH - 6 || p->found <= 6) @@ -119,7 +114,6 @@ void av7110_ipack_flush(struct ipack *p) av7110_ipack_reset(p); } - static void write_ipack(struct ipack *p, const u8 *data, int count) { u8 headr[3] = { 0x00, 0x00, 0x01 }; @@ -134,6 +128,7 @@ static void write_ipack(struct ipack *p, const u8 *data, int count) p->count += count; } else { int rest = p->size - p->count; + memcpy(p->buf+p->count, data, rest); p->count += rest; send_ipack(p); @@ -142,7 +137,6 @@ static void write_ipack(struct ipack *p, const u8 *data, int count) } } - int av7110_ipack_instant_repack (const u8 *buf, int count, struct ipack *p) { int l; @@ -284,7 +278,6 @@ int av7110_ipack_instant_repack (const u8 *buf, int count, struct ipack *p) } if (p->mpeg == 1 && p->which < 2000) { - if (p->found == 7) { p->check = p->flag1; p->hlength = 1; @@ -368,7 +361,6 @@ int av7110_ipack_instant_repack (const u8 *buf, int count, struct ipack *p) } p->which = 2000; } - } while (c < count && p->found < p->plength + 6) { @@ -382,7 +374,6 @@ int av7110_ipack_instant_repack (const u8 *buf, int count, struct ipack *p) break; } - if (p->done) { if (p->found + count - c < p->plength + 6) { p->found += count - c; diff --git a/drivers/staging/media/av7110/av7110_v4l.c b/drivers/staging/media/av7110/av7110_v4l.c index 2c4707a60..3bf08cbcf 100644 --- a/drivers/staging/media/av7110/av7110_v4l.c +++ b/drivers/staging/media/av7110/av7110_v4l.c @@ -201,8 +201,6 @@ static int stv0297_set_tv_freq(struct saa7146_dev *dev, u32 freq) return tuner_write(dev, 0x63, data); } - - static struct saa7146_standard analog_standard[]; static struct saa7146_standard dvb_standard[]; static struct saa7146_standard standard[]; @@ -341,6 +339,7 @@ static int vidioc_s_tuner(struct file *file, void *fh, const struct v4l2_tuner * struct saa7146_dev *dev = video_drvdata(file); struct av7110 *av7110 = (struct av7110 *)dev->ext_priv; u16 fm_matrix, src; + dprintk(2, "VIDIOC_S_TUNER: %d\n", t->index); if (!av7110->analog_tuner_flags || av7110->current_input != 1) @@ -691,7 +690,6 @@ static u8 saa7113_init_regs[] = { 0xff }; - static struct saa7146_ext_vv av7110_vv_data_st; static struct saa7146_ext_vv av7110_vv_data_c; @@ -863,8 +861,6 @@ int av7110_exit_v4l(struct av7110 *av7110) return 0; } - - /* FIXME: these values are experimental values that look better than the values from the latest "official" driver -- at least for me... (MiHu) */ static struct saa7146_standard standard[] = { @@ -927,7 +923,6 @@ static int std_callback(struct saa7146_dev *dev, struct saa7146_standard *std) return 0; } - static struct saa7146_ext_vv av7110_vv_data_st = { .inputs = 1, .audios = 1, diff --git a/drivers/staging/media/av7110/dvb_filter.h b/drivers/staging/media/av7110/dvb_filter.h index 67a3c6333..928b33436 100644 --- a/drivers/staging/media/av7110/dvb_filter.h +++ b/drivers/staging/media/av7110/dvb_filter.h @@ -36,7 +36,6 @@ void dvb_filter_pes2ts_init(struct dvb_filter_pes2ts *p2ts, unsigned short pid, int dvb_filter_pes2ts(struct dvb_filter_pes2ts *p2ts, unsigned char *pes, int len, int payload_start); - #define PROG_STREAM_MAP 0xBC #define PRIVATE_STREAM1 0xBD #define PADDING_STREAM 0xBE @@ -78,7 +77,6 @@ int dvb_filter_pes2ts(struct dvb_filter_pes2ts *p2ts, unsigned char *pes, #define INIT_DISP_HORIZONTAL_SIZE 540 #define INIT_DISP_VERTICAL_SIZE 576 - //flags2 #define PTS_DTS_FLAGS 0xC0 #define ESCR_FLAG 0x20 @@ -119,7 +117,6 @@ int dvb_filter_pes2ts(struct dvb_filter_pes2ts *p2ts, unsigned char *pes, #define PIECE_RATE 0x40 #define SEAM_SPLICE 0x20 - #define MAX_PLENGTH 0xFFFF #define MMAX_PLENGTH (256*MAX_PLENGTH) @@ -238,5 +235,4 @@ struct dvb_audio_info { int dvb_filter_get_ac3info(u8 *mbuf, int count, struct dvb_audio_info *ai, int pr); - #endif From patchwork Tue May 7 00:24:48 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Herdler X-Patchwork-Id: 13656130 Received: from mout.gmx.net (mout.gmx.net [212.227.17.20]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id EAD70882B for ; Tue, 7 May 2024 00:25:30 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=212.227.17.20 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1715041534; cv=none; b=lsWTJe9CWLoHaxnOn1twNH+2C9jGs/SqhhbtHk1hIOWYK/jy7Gr8kEHpojW/F67W4Gg0cVU7v7qLpVK3tzF5owCcOEutg/BD6uVjvcf317+Ro0jc0jI6E7Liog0rv7dKmpVXCnBPBQwTIVSD8Tr8oV+inF2qUSClUjL97rUwH/s= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1715041534; c=relaxed/simple; bh=CtrdS2evZrfzsVMSGcskXsot5uSRUDlKoUg6Oqum/tI=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=qIGpyZ22cTQRfeJ8NZOZFnLa9/SavTcOYhReiWVpIltb6RxfJ1tTxrIzdS/lUi/UJnUA/iC/boXurNMnM/qxkskweJ2XCYcAFnFhrxBUtkF5LaDvP/48/o44cyLwievGL6HRLqyeCSLFAbK8xYpwlcIdmKoalzdjPpH3ZcpfIjc= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=nurfuerspam.de; spf=pass smtp.mailfrom=nurfuerspam.de; dkim=pass (2048-bit key) header.d=nurfuerspam.de header.i=herdler@nurfuerspam.de header.b=e5dphBVy; arc=none smtp.client-ip=212.227.17.20 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=nurfuerspam.de Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=nurfuerspam.de Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=nurfuerspam.de header.i=herdler@nurfuerspam.de header.b="e5dphBVy" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nurfuerspam.de; s=s31663417; t=1715041527; x=1715646327; i=herdler@nurfuerspam.de; bh=w80fT1iOlD6ZYiFxbPcMZFWau4NZWVi3MGQ87dN4SIQ=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date:Message-Id:In-Reply-To: References:MIME-Version:Content-Transfer-Encoding:cc: content-transfer-encoding:content-type:date:from:message-id: mime-version:reply-to:subject:to; b=e5dphBVyTNVluGAiTzjMaeUKlbaZCsIK8A9po4lLS8S/LvkmT9sMLyRwn1Em+TMN L9hMAMp5XsPOrPDZpnmx+grQ6SOeGigSaDxHmvPTbIGqrJXlSI1pnHojzxb2vdDus NZitMam/NWb4icxiAd/4V/uBEkgsYCbEpwT9vuaX0fNKz1liAE2x3RGKUHAQ37JLk MSwPyd8mCj3oQdlp/5tPzQkHJ03DJduSLtUSYkHvLUiUBQuiR5yUWnQkWlea6yeuv 6FcA+geaySxkJpDCvj+D7O6lErU0PWOeqQFCczjUjLFFDnVd9+WgyaVcSyFzZ2UT3 I4YXflWuP/XuAf0ILw== X-UI-Sender-Class: 724b4f7f-cbec-4199-ad4e-598c01a50d3a Received: from astro.haus ([185.101.174.109]) by mail.gmx.net (mrgmx105 [212.227.17.168]) with ESMTPSA (Nemesis) id 1MTiPl-1sBSsk1c3Z-00U66U; Tue, 07 May 2024 02:25:27 +0200 From: Stefan Herdler To: hverkuil-cisco@xs4all.nl Cc: linux-media@vger.kernel.org, smoch@web.de, tmn505@gmail.com, vinschen@redhat.com Subject: [PATCH 09/21] media: av7110: coding style fixes: whitespace Date: Tue, 7 May 2024 02:24:48 +0200 Message-Id: <20240507002500.81867-10-herdler@nurfuerspam.de> X-Mailer: git-send-email 2.34.0 In-Reply-To: <20240507002500.81867-1-herdler@nurfuerspam.de> References: <20240507002500.81867-1-herdler@nurfuerspam.de> Precedence: bulk X-Mailing-List: linux-media@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Provags-ID: V03:K1:paoao+mKRbZAXc3J1gqxpWFU+gbPMenbFgFmOpI9JNCR0jyEAL8 sreox8UGjL9zdWcB0Bp2AurZ9LI6e5bwKC47jzxOvs1w7PgJeNDvsFAJbKkFkQstbZDMFWq H4RgAxCVLlpAwUi0FObaq/sR2l1prZ3PSxtt/mJgD6FUO1xadCC/DffraG/+tG1k8w3L91K gWqpCbwuWSdgl7mk1tZ5w== X-Spam-Flag: NO UI-OutboundReport: notjunk:1;M01:P0:yPlSTh5iTIQ=;wf2TvEYULl/23RGfr77WIZ42b5+ +IJdRYkwFFcu3qb90SDBrkiue6rWOh0tjW4R9/PhHUeuZ3f/wdYgvfQTm8coFRlOni8h9wbJV zRLP8894EDAOLDJkLR89l1vSOpuDOHAgfrsqH4Rc94o7PrtGmKUVrr9reMGK/4t4AMWbuwts/ rtNVQTBQ2utwnM0z7lO4Sul0qsgb8/RdurhN8qNvPWNmQRwE0gKVjuFbn6TNgLk3ly/cjSg8i jxvBdJETcBCvQRn/vLbzF0ULzSRb0abiZ9UjYaNgC72EOmgZSJzk/eFWspaMICp8TpsYHFbYu e9WUji6baJOV0Y9KEHeU0aMfZCo373OB14GFWMik6et1o22ItOqm323GJH4/b78xc0cQFIeYy r+JVbKxDdq6iS30WSOXiwf7bj83ytu9GXMw4Cyz9BGfmSrWCV197otKFVBK+gu+KarqQ4ChwG BIZPEwsGJ5u7HUum3JPic4w3Q4HqYiabvY29KxPWvUFIFyYB9ZAW123lRZChRH5IMPA7aaGzV +odQCKEYtFYsl2DxiQg9QVs+gLVLU6TMsCEzKZ/9xL/+I4Ws7xuzH/EqLBe07hFN4/AD7m1ra +SL49n5Q1bA8vwMwYtiZVJn7SXw1m27H/Q0cEBj4iOZ3Cq3ehL3OEGU0BjxkOl/gUHQpzvEwp F561nEQYEVxKFNwKdCSuD9iUVGi1vYcBtvaY9Ki7BJvUoA2FEtqIlrrWVKnCioaANTRSC9kUR ylPW4SMutdxdwlW7P4UA8/rh7Rml1H4enVD/F1gP9wpBuXEBOoegVGgi/WH3suMIkDULypB1r g814zDlJ88CQQE1zfy+xmimoFUQClILNdWMG86TVsVrN8= This patch fixes the following checkpatch warnings: ERROR:SPACING: need consistent spacing around '&' (ctx:WxO) ERROR:SPACING: need consistent spacing around '&' (ctx:WxV) ERROR:SPACING: need consistent spacing around '-' (ctx:WxV) ERROR:SPACING: space prohibited after that '~' (ctx:OxW) ERROR:SPACING: space prohibited after that open parenthesis '(' ERROR:SPACING: space prohibited before that close parenthesis ')' ERROR:SPACING: space prohibited before that ':' (ctx:WxE) ERROR:SPACING: space prohibited before that ',' (ctx:WxW) ERROR:SPACING: space required after that ',' (ctx:VxV) ERROR:SPACING: space required before that '-' (ctx:OxV) ERROR:SPACING: space required before that '~' (ctx:OxV) ERROR:SPACING: space required before the open brace '{' ERROR:SPACING: space required before the open parenthesis '(' ERROR:SPACING: spaces required around that '&&' (ctx:ExV) ERROR:SPACING: spaces required around that '!=' (ctx:VxO) ERROR:SPACING: spaces required around that '&=' (ctx:VxO) ERROR:SPACING: spaces required around that '==' (ctx:VxO) ERROR:SPACING: spaces required around that '!=' (ctx:VxV) ERROR:SPACING: spaces required around that '+=' (ctx:VxV) ERROR:SPACING: spaces required around that '-=' (ctx:VxV) ERROR:SPACING: spaces required around that '<' (ctx:VxV) ERROR:SPACING: spaces required around that '<=' (ctx:VxV) ERROR:SPACING: spaces required around that '=' (ctx:VxV) ERROR:SPACING: spaces required around that '>' (ctx:VxV) ERROR:SPACING: spaces required around that '>=' (ctx:VxV) ERROR:SPACING: spaces required around that '|=' (ctx:VxV) WARNING:LEADING_SPACE: please, no spaces at the start of a line WARNING:QUOTED_WHITESPACE_BEFORE_NEWLINE: unnecessary whitespace before a quoted newline WARNING:SPACING: space prohibited before semicolon WARNING:SPACING: space prohibited between function name and open parenthesis '(' WARNING:SUSPECT_CODE_INDENT: suspect code indent for conditional statements (16, 23) WARNING:SUSPECT_CODE_INDENT: suspect code indent for conditional statements (16, 32) WARNING:SUSPECT_CODE_INDENT: suspect code indent for conditional statements (32, 39) WARNING:SUSPECT_CODE_INDENT: suspect code indent for conditional statements (39, 47) WARNING:SUSPECT_CODE_INDENT: suspect code indent for conditional statements (47, 55) WARNING:SUSPECT_CODE_INDENT: suspect code indent for conditional statements (8, 18) WARNING:TABSTOP: Statements should start on a tabstop CHECK:SPACING: No space is necessary after a cast CHECK:SPACING: space preferred before that '|' (ctx:VxE) CHECK:SPACING: spaces preferred around that '&' (ctx:VxV) CHECK:SPACING: spaces preferred around that '*' (ctx:VxV) CHECK:SPACING: spaces preferred around that '+' (ctx:VxV) CHECK:SPACING: spaces preferred around that '-' (ctx:VxV) CHECK:SPACING: spaces preferred around that '/' (ctx:VxV) CHECK:SPACING: spaces preferred around that '<<' (ctx:VxV) CHECK:SPACING: spaces preferred around that '>>' (ctx:VxV) CHECK:SPACING: spaces preferred around that '|' (ctx:VxV) Whitespace changes only. "git diff -w" shows no changes. Signed-off-by: Stefan Herdler --- drivers/staging/media/av7110/av7110.c | 62 ++++++++++----------- drivers/staging/media/av7110/av7110_av.c | 30 +++++----- drivers/staging/media/av7110/av7110_ca.c | 6 +- drivers/staging/media/av7110/av7110_hw.c | 32 +++++------ drivers/staging/media/av7110/av7110_hw.h | 6 +- drivers/staging/media/av7110/av7110_ipack.c | 14 ++--- drivers/staging/media/av7110/av7110_v4l.c | 8 +-- drivers/staging/media/av7110/dvb_filter.c | 48 ++++++++-------- drivers/staging/media/av7110/dvb_filter.h | 2 +- 9 files changed, 104 insertions(+), 104 deletions(-) -- 2.34.0 diff --git a/drivers/staging/media/av7110/av7110.c b/drivers/staging/media/av7110/av7110.c index b19c27f6e..557f42352 100644 --- a/drivers/staging/media/av7110/av7110.c +++ b/drivers/staging/media/av7110/av7110.c @@ -72,11 +72,11 @@ static int full_ts; module_param_named(debug, av7110_debug, int, 0644); MODULE_PARM_DESC(debug, "debug level (bitmask, default 0)"); module_param(vidmode, int, 0444); -MODULE_PARM_DESC(vidmode,"analog video out: 0 off, 1 CVBS+RGB (default), 2 CVBS+YC, 3 YC"); +MODULE_PARM_DESC(vidmode, "analog video out: 0 off, 1 CVBS+RGB (default), 2 CVBS+YC, 3 YC"); module_param(pids_off, int, 0444); -MODULE_PARM_DESC(pids_off,"clear video/audio/PCR PID filters when demux is closed"); +MODULE_PARM_DESC(pids_off, "clear video/audio/PCR PID filters when demux is closed"); module_param(adac, int, 0444); -MODULE_PARM_DESC(adac,"audio DAC type: 0 TI, 1 CRYSTAL, 2 MSP (use if autodetection fails)"); +MODULE_PARM_DESC(adac, "audio DAC type: 0 TI, 1 CRYSTAL, 2 MSP (use if autodetection fails)"); module_param(hw_sections, int, 0444); MODULE_PARM_DESC(hw_sections, "0 use software section filter, 1 use hardware"); module_param(rgb_on, int, 0444); @@ -951,14 +951,14 @@ static int av7110_start_feed(struct dvb_demux_feed *feed) switch (demux->dmx.frontend->source) { case DMX_MEMORY_FE: if (feed->ts_type & TS_DECODER) - if (feed->pes_type < 2 && - !(demux->pids[0] & 0x8000) && - !(demux->pids[1] & 0x8000)) { - dvb_ringbuffer_flush_spinlock_wakeup(&av7110->avout); - dvb_ringbuffer_flush_spinlock_wakeup(&av7110->aout); - ret = av7110_av_start_play(av7110,RP_AV); - if (!ret) - demux->playing = 1; + if (feed->pes_type < 2 && + !(demux->pids[0] & 0x8000) && + !(demux->pids[1] & 0x8000)) { + dvb_ringbuffer_flush_spinlock_wakeup(&av7110->avout); + dvb_ringbuffer_flush_spinlock_wakeup(&av7110->aout); + ret = av7110_av_start_play(av7110, RP_AV); + if (!ret) + demux->playing = 1; } break; default: @@ -1029,7 +1029,7 @@ static int av7110_stop_feed(struct dvb_demux_feed *feed) } if (feed->type == DMX_TYPE_SEC) { - for (i = 0; ifilternum; i++) { + for (i = 0; i < demux->filternum; i++) { if (demux->filter[i].state == DMX_STATE_GO && demux->filter[i].filter.parent == &feed->feed.sec) { demux->filter[i].state = DMX_STATE_READY; @@ -1466,7 +1466,7 @@ static int check_firmware(struct av7110 *av7110) printk("dvb-ttpci: root file has strange size (%d). aborting.\n", len); return -EINVAL; } - if( crc != crc32_le(0, ptr, len)) { + if (crc != crc32_le(0, ptr, len)) { printk("dvb-ttpci: crc32 of root file does not match.\n"); return -EINVAL; } @@ -1553,7 +1553,7 @@ static int alps_bsrv2_tuner_set_params(struct dvb_frontend *fe) if (fe->ops.i2c_gate_ctrl) fe->ops.i2c_gate_ctrl(fe, 1); - if (i2c_transfer (&av7110->i2c_adap, &msg, 1) != 1) + if (i2c_transfer(&av7110->i2c_adap, &msg, 1) != 1) return -EIO; return 0; } @@ -1819,7 +1819,7 @@ static int nexusca_stv0297_tuner_set_params(struct dvb_frontend *fe) } // wait for PLL lock - for(i = 0; i < 20; i++) { + for (i = 0; i < 20; i++) { if (fe->ops.i2c_gate_ctrl) fe->ops.i2c_gate_ctrl(fe, 1); if (i2c_transfer(&av7110->i2c_adap, &readmsg, 1) == 1) @@ -2060,8 +2060,8 @@ static u8 read_pwm(struct av7110 *av7110) { u8 b = 0xff; u8 pwm; - struct i2c_msg msg[] = { { .addr = 0x50,.flags = 0,.buf = &b,.len = 1 }, - { .addr = 0x50,.flags = I2C_M_RD,.buf = &pwm,.len = 1} }; + struct i2c_msg msg[] = { { .addr = 0x50, .flags = 0, .buf = &b, .len = 1 }, + { .addr = 0x50, .flags = I2C_M_RD, .buf = &pwm, .len = 1} }; if ((i2c_transfer(&av7110->i2c_adap, msg, 2) != 2) || (pwm == 0xff)) pwm = 0x48; @@ -2074,7 +2074,7 @@ static int frontend_init(struct av7110 *av7110) int ret; if (av7110->dev->pci->subsystem_vendor == 0x110a) { - switch(av7110->dev->pci->subsystem_device) { + switch (av7110->dev->pci->subsystem_device) { case 0x0000: // Fujitsu/Siemens DVB-Cable (ves1820/Philips CD1516(??)) av7110->fe = dvb_attach(ves1820_attach, &philips_cd1516_config, &av7110->i2c_adap, read_pwm(av7110)); @@ -2085,7 +2085,7 @@ static int frontend_init(struct av7110 *av7110) } } else if (av7110->dev->pci->subsystem_vendor == 0x13c2) { - switch(av7110->dev->pci->subsystem_device) { + switch (av7110->dev->pci->subsystem_device) { case 0x0000: // Hauppauge/TT WinTV DVB-S rev1.X case 0x0003: // Hauppauge/TT WinTV Nexus-S Rev 2.X case 0x1002: // Hauppauge/TT WinTV DVB-S rev1.3SE @@ -2126,7 +2126,7 @@ static int frontend_init(struct av7110 *av7110) } /* Try DVB-C cards */ - switch(av7110->dev->pci->subsystem_device) { + switch (av7110->dev->pci->subsystem_device) { case 0x0000: /* Siemens DVB-C (full-length card) VES1820/Philips CD1516 */ av7110->fe = dvb_attach(ves1820_attach, &philips_cd1516_config, &av7110->i2c_adap, @@ -2398,14 +2398,14 @@ static int av7110_attach(struct saa7146_dev *dev, * use 0x03 to track RPS1 interrupts - increase by 1 every gpio3 is toggled * use 0x15 to track VPE interrupts - increase by 1 every vpeirq() is called */ - saa7146_write(dev, EC1SSR, (0x03<<2) | 3 ); + saa7146_write(dev, EC1SSR, (0x03 << 2) | 3); /* set event counter 1 threshold to maximum allowed value (rEC p55) */ - saa7146_write(dev, ECT1R, 0x3fff ); + saa7146_write(dev, ECT1R, 0x3fff); #endif /* Set RPS1 Address register to point to RPS code (r108 p42) */ saa7146_write(dev, RPS_ADDR1, dev->d_rps1.dma_handle); /* Enable RPS1, (rFC p33) */ - saa7146_write(dev, MC1, (MASK_13 | MASK_29 )); + saa7146_write(dev, MC1, (MASK_13 | MASK_29)); mdelay(10); /* now send VSYNC_B to rps1 by rising GPIO3 */ @@ -2419,7 +2419,7 @@ static int av7110_attach(struct saa7146_dev *dev, printk("dvb-ttpci: BUDGET-PATCH DETECTED.\n"); } /* Disable RPS1 */ - saa7146_write(dev, MC1, ( MASK_29 )); + saa7146_write(dev, MC1, (MASK_29)); #if RPS_IRQ printk("dvb-ttpci: Event Counter 1 0x%04x\n", saa7146_read(dev, EC1R) & 0x3fff ); #endif @@ -2533,9 +2533,9 @@ static int av7110_attach(struct saa7146_dev *dev, * use 0x03 to track RPS1 interrupts - increase by 1 every gpio3 is toggled * use 0x15 to track VPE interrupts - increase by 1 every vpeirq() is called */ - saa7146_write(dev, EC1SSR, (0x03<<2) | 3 ); + saa7146_write(dev, EC1SSR, (0x03 << 2) | 3); /* set event counter 1 threshold to maximum allowed value (rEC p55) */ - saa7146_write(dev, ECT1R, 0x3fff ); + saa7146_write(dev, ECT1R, 0x3fff); #endif /* Setup BUDGETPATCH MAIN RPS1 "program" (p35) */ count = 0; @@ -2576,7 +2576,7 @@ static int av7110_attach(struct saa7146_dev *dev, * then RPS_THRESH1 should be set to trigger * every TS_HEIGHT (512) lines. */ - saa7146_write(dev, RPS_THRESH1, (TS_HEIGHT*1) | MASK_12 ); + saa7146_write(dev, RPS_THRESH1, (TS_HEIGHT * 1) | MASK_12); /* Enable RPS1 (rFC p33) */ saa7146_write(dev, MC1, (MASK_13 | MASK_29)); @@ -2650,7 +2650,7 @@ static int av7110_attach(struct saa7146_dev *dev, if (ret < 0) goto err_stop_arm_9; - if (FW_VERSION(av7110->arm_app)<0x2501) + if (FW_VERSION(av7110->arm_app) < 0x2501) printk(KERN_WARNING "dvb-ttpci: Warning, firmware version 0x%04x is too old. System might be unstable!\n", FW_VERSION(av7110->arm_app)); @@ -2769,7 +2769,7 @@ static int av7110_detach(struct saa7146_dev *saa) i2c_del_adapter(&av7110->i2c_adap); - dvb_unregister_adapter (&av7110->dvb_adapter); + dvb_unregister_adapter(&av7110->dvb_adapter); av7110_num--; @@ -2825,12 +2825,12 @@ static void av7110_irq(struct saa7146_dev *dev, u32 *isr) static struct saa7146_extension av7110_extension_driver; -#define MAKE_AV7110_INFO(x_var,x_name) \ +#define MAKE_AV7110_INFO(x_var, x_name) \ static struct saa7146_pci_extension_data x_var = { \ .ext_priv = x_name, \ .ext = &av7110_extension_driver } -MAKE_AV7110_INFO(tts_1_X_fsc,"Technotrend/Hauppauge WinTV DVB-S rev1.X or Fujitsu Siemens DVB-C"); +MAKE_AV7110_INFO(tts_1_X_fsc, "Technotrend/Hauppauge WinTV DVB-S rev1.X or Fujitsu Siemens DVB-C"); MAKE_AV7110_INFO(ttt_1_X, "Technotrend/Hauppauge WinTV DVB-T rev1.X"); MAKE_AV7110_INFO(ttc_1_X, "Technotrend/Hauppauge WinTV Nexus-CA rev1.X"); MAKE_AV7110_INFO(ttc_2_X, "Technotrend/Hauppauge WinTV DVB-C rev2.X"); diff --git a/drivers/staging/media/av7110/av7110_av.c b/drivers/staging/media/av7110/av7110_av.c index 96309a896..0b384e832 100644 --- a/drivers/staging/media/av7110/av7110_av.c +++ b/drivers/staging/media/av7110/av7110_av.c @@ -238,8 +238,8 @@ int av7110_pes_play(void *dest, struct dvb_ringbuffer *buf, int dlen) sync |= DVB_RINGBUFFER_PEEK(buf, 2) << 8; sync |= DVB_RINGBUFFER_PEEK(buf, 3); - if (((sync &~ 0x0f) == 0x000001e0) || - ((sync &~ 0x1f) == 0x000001c0) || + if (((sync & ~0x0f) == 0x000001e0) || + ((sync & ~0x1f) == 0x000001c0) || (sync == 0x000001bd)) break; printk("resync\n"); @@ -296,7 +296,7 @@ int av7110_set_volume(struct av7110 *av7110, unsigned int volleft, vol = (volleft > volright) ? volleft : volright; val = (vol * 0x73 / 255) << 8; if (vol > 0) - balance = ((volright - volleft) * 127) / vol; + balance = ((volright - volleft) * 127) / vol; msp_writereg(av7110, MSP_WR_DSP, 0x0001, balance << 8); msp_writereg(av7110, MSP_WR_DSP, 0x0000, val); /* loudspeaker */ msp_writereg(av7110, MSP_WR_DSP, 0x0006, val); /* headphonesr */ @@ -362,8 +362,8 @@ static int get_video_format(struct av7110 *av7110, u8 *buf, int count) if (p[0] || p[1] || p[2] != 0x01 || p[3] != 0xb3) continue; p += 4; - hsize = ((p[1] &0xF0) >> 4) | (p[0] << 4); - vsize = ((p[1] &0x0F) << 8) | (p[2]); + hsize = ((p[1] & 0xF0) >> 4) | (p[0] << 4); + vsize = ((p[1] & 0x0F) << 8) | (p[2]); sw = (p[3] & 0x0F); ret = av7110_set_vidmode(av7110, sw2mode[sw]); if (!ret) { @@ -590,7 +590,7 @@ static int find_pes_header(u8 const *buf, long int length, int *frags) while (c < length - 3 && !found) { if (buf[c] == 0x00 && buf[c + 1] == 0x00 && buf[c + 2] == 0x01) { - switch ( buf[c + 3] ) { + switch (buf[c + 3]) { case PROG_STREAM_MAP: case PRIVATE_STREAM2: case PROG_STREAM_DIR: @@ -635,9 +635,9 @@ void av7110_p2t_write(u8 const *buf, long int length, u16 pid, struct av7110_p2t c = 0; c2 = 0; - if (p->frags){ + if (p->frags) { check = 0; - switch(p->frags) { + switch (p->frags) { case 1: if (buf[c] == 0x00 && buf[c + 1] == 0x01) { check = 1; @@ -703,7 +703,7 @@ void av7110_p2t_write(u8 const *buf, long int length, u16 pid, struct av7110_p2t c2 = find_pes_header(buf + c + add, length - c - add, &p->frags); if (c2 >= 0) { c2 += c + add; - if (c2 > c){ + if (c2 > c) { p_to_t(buf + c, c2 - c, pid, &p->counter, p->feed); c = c2; clear_p2t(p); @@ -787,7 +787,7 @@ static void p_to_t(u8 const *buf, long int length, u16 pid, u8 *counter, while (c < length) { memset(obuf, 0, TS_SIZE); - if (length - c >= (TS_SIZE - 4)){ + if (length - c >= (TS_SIZE - 4)) { l = write_ts_header2(pid, counter, pes_start, obuf, (TS_SIZE - 4)); memcpy(obuf + l, buf + c, TS_SIZE - l); @@ -880,7 +880,7 @@ void dvb_video_add_event(struct av7110 *av7110, struct video_event *event) wake_up_interruptible(&events->wait_queue); } -static int dvb_video_get_event (struct av7110 *av7110, struct video_event *event, int flags) +static int dvb_video_get_event(struct av7110 *av7110, struct video_event *event, int flags) { struct dvb_video_events *events = &av7110->video_events; @@ -1124,8 +1124,8 @@ static int dvb_video_ioctl(struct file *file, dprintk(1, "av7110:%p, cmd=%04x\n", av7110,cmd); if ((file->f_flags & O_ACCMODE) == O_RDONLY) { - if ( cmd != VIDEO_GET_STATUS && cmd != VIDEO_GET_EVENT && - cmd != VIDEO_GET_SIZE ) { + if (cmd != VIDEO_GET_STATUS && cmd != VIDEO_GET_EVENT && + cmd != VIDEO_GET_SIZE) { return -EPERM; } } @@ -1419,7 +1419,7 @@ static int dvb_audio_ioctl(struct file *file, case AUDIO_CHANNEL_SELECT: av7110->audiostate.channel_select = (audio_channel_select_t) arg; - switch(av7110->audiostate.channel_select) { + switch (av7110->audiostate.channel_select) { case AUDIO_STEREO: ret = audcom(av7110, AUDIO_CMD_STEREO); if (!ret) { @@ -1624,7 +1624,7 @@ int av7110_av_register(struct av7110 *av7110) spin_lock_init(&av7110->video_events.lock); av7110->video_events.eventw = av7110->video_events.eventr = 0; av7110->video_events.overflow = 0; - memset(&av7110->video_size, 0, sizeof (video_size_t)); + memset(&av7110->video_size, 0, sizeof(video_size_t)); dvb_register_device(&av7110->dvb_adapter, &av7110->video_dev, &dvbdev_video, av7110, DVB_DEVICE_VIDEO, 0); diff --git a/drivers/staging/media/av7110/av7110_ca.c b/drivers/staging/media/av7110/av7110_ca.c index 38a8f3f49..93b888c70 100644 --- a/drivers/staging/media/av7110/av7110_ca.c +++ b/drivers/staging/media/av7110/av7110_ca.c @@ -206,7 +206,7 @@ static int dvb_ca_open(struct inode *inode, struct file *file) return 0; } -static __poll_t dvb_ca_poll (struct file *file, poll_table *wait) +static __poll_t dvb_ca_poll(struct file *file, poll_table *wait) { struct dvb_device *dvbdev = file->private_data; struct av7110 *av7110 = dvbdev->priv; @@ -260,7 +260,7 @@ static int dvb_ca_ioctl(struct file *file, unsigned int cmd, void *parg) case CA_GET_SLOT_INFO: { - struct ca_slot_info *info=(struct ca_slot_info *)parg; + struct ca_slot_info *info = (struct ca_slot_info *)parg; if (info->num < 0 || info->num > 1) { mutex_unlock(&av7110->ioctl_mutex); @@ -285,7 +285,7 @@ static int dvb_ca_ioctl(struct file *file, unsigned int cmd, void *parg) info.num = 16; info.type = CA_ECD; - memcpy(parg, &info, sizeof (info)); + memcpy(parg, &info, sizeof(info)); break; } diff --git a/drivers/staging/media/av7110/av7110_hw.c b/drivers/staging/media/av7110/av7110_hw.c index d75c8947d..d7439c522 100644 --- a/drivers/staging/media/av7110/av7110_hw.c +++ b/drivers/staging/media/av7110/av7110_hw.c @@ -465,7 +465,7 @@ static int av7110_send_fw_cmd(struct av7110 *av7110, u16 *buf, int length) ret = __av7110_send_fw_cmd(av7110, buf, length); mutex_unlock(&av7110->dcomlock); - if (ret && ret!=-ERESTARTSYS) + if (ret && ret != -ERESTARTSYS) printk(KERN_ERR "dvb-ttpci: %s(): av7110_send_fw_cmd error %d\n", __func__, ret); return ret; @@ -511,9 +511,9 @@ int av7110_send_ci_cmd(struct av7110 *av7110, u8 subcom, u8 *buf, u8 len) dprintk(4, "%p\n", av7110); - for(i = 0; i < len && i < 32; i++) + for (i = 0; i < len && i < 32; i++) { - if(i % 2 == 0) + if (i % 2 == 0) cmd[(i / 2) + 2] = (u16)(buf[i]) << 8; else cmd[(i / 2) + 2] |= buf[i]; @@ -675,7 +675,7 @@ int av7110_diseqc_send(struct av7110 *av7110, int len, u8 *msg, unsigned long bu buf[i + 4] = msg[i]; ret = av7110_send_fw_cmd(av7110, buf, 18); - if (ret && ret!=-ERESTARTSYS) + if (ret && ret != -ERESTARTSYS) printk(KERN_ERR "dvb-ttpci: av7110_diseqc_send error %d\n", ret); return ret; } @@ -777,7 +777,7 @@ static int WriteText(struct av7110 *av7110, u8 win, u16 x, u16 y, char *buf) wdebi(av7110, DEBINOSWAP, BUFF1_BASE + i * 2, 0, 2); ret = __av7110_send_fw_cmd(av7110, cbuf, 5); mutex_unlock(&av7110->dcomlock); - if (ret && ret!=-ERESTARTSYS) + if (ret && ret != -ERESTARTSYS) printk(KERN_ERR "dvb-ttpci: WriteText error %d\n", ret); return ret; } @@ -861,13 +861,13 @@ static inline int LoadBitmap(struct av7110 *av7110, av7110->bmp_state = BMP_LOADING; if (format == OSD_BITMAP8) { - bpp=8; delta = 1; + bpp = 8; delta = 1; } else if (format == OSD_BITMAP4) { - bpp=4; delta = 2; + bpp = 4; delta = 2; } else if (format == OSD_BITMAP2) { - bpp=2; delta = 4; + bpp = 2; delta = 4; } else if (format == OSD_BITMAP1) { - bpp=1; delta = 8; + bpp = 1; delta = 8; } else { av7110->bmp_state = BMP_NONE; return -EINVAL; @@ -927,8 +927,8 @@ static u32 RGB2YUV(u16 R, u16 G, u16 B) u16 Y, Cr, Cb; y = R * 77 + G * 150 + B * 29; /* Luma=0.299R+0.587G+0.114B 0..65535 */ - u = 2048 + B * 8 -(y >> 5); /* Cr 0..4095 */ - v = 2048 + R * 8 -(y >> 5); /* Cb 0..4095 */ + u = 2048 + B * 8 - (y >> 5); /* Cr 0..4095 */ + v = 2048 + R * 8 - (y >> 5); /* Cb 0..4095 */ Y = y / 256; Cb = u / 16; @@ -944,7 +944,7 @@ static int OSDSetColor(struct av7110 *av7110, u8 color, u8 r, u8 g, u8 b, u8 ble u16 ch, cl; u32 yuv; - yuv = blend ? RGB2YUV(r,g,b) : 0; + yuv = blend ? RGB2YUV(r, g, b) : 0; cl = (yuv & 0xffff); ch = ((yuv >> 16) & 0xffff); ret = SetColor_(av7110, av7110->osdwin, bpp2pal[av7110->osdbpp[av7110->osdwin]], @@ -985,7 +985,7 @@ static int OSDSetBlock(struct av7110 *av7110, int x0, int y0, { uint w, h, bpp, bpl, size, lpb, bnum, brest; int i; - int rc,release_rc; + int rc, release_rc; w = x1 - x0 + 1; h = y1 - y0 + 1; @@ -1084,14 +1084,14 @@ int av7110_osd_cmd(struct av7110 *av7110, osd_cmd_t *dc) u8 r, g = 0, b = 0, blend = 0; ret = 0; - for (i = 0; icolor + i, r, g, b, blend); if (ret) break; @@ -1177,7 +1177,7 @@ int av7110_osd_cmd(struct av7110 *av7110, osd_cmd_t *dc) } mutex_unlock(&av7110->osd_mutex); - if (ret==-ERESTARTSYS) + if (ret == -ERESTARTSYS) dprintk(1, "av7110_osd_cmd(%d) returns with -ERESTARTSYS\n",dc->cmd); else if (ret) dprintk(1, "av7110_osd_cmd(%d) returns with %d\n",dc->cmd,ret); diff --git a/drivers/staging/media/av7110/av7110_hw.h b/drivers/staging/media/av7110/av7110_hw.h index df13d55f7..3aff5db56 100644 --- a/drivers/staging/media/av7110/av7110_hw.h +++ b/drivers/staging/media/av7110/av7110_hw.h @@ -394,8 +394,8 @@ static inline u32 irdebi(struct av7110 *av7110, u32 config, int addr, u32 val, u { u32 res; - res=av7110_debiread(av7110, config, addr, count); - if (count<=4) + res = av7110_debiread(av7110, config, addr, count); + if (count <= 4) memcpy(av7110->debi_virt, (char *) &res, count); return res; } @@ -416,7 +416,7 @@ static inline u32 rdebi(struct av7110 *av7110, u32 config, int addr, u32 val, un u32 res; spin_lock_irqsave(&av7110->debilock, flags); - res=av7110_debiread(av7110, config, addr, count); + res = av7110_debiread(av7110, config, addr, count); spin_unlock_irqrestore(&av7110->debilock, flags); return res; } diff --git a/drivers/staging/media/av7110/av7110_ipack.c b/drivers/staging/media/av7110/av7110_ipack.c index 9a2b51d54..fc953db36 100644 --- a/drivers/staging/media/av7110/av7110_ipack.c +++ b/drivers/staging/media/av7110/av7110_ipack.c @@ -123,7 +123,7 @@ static void write_ipack(struct ipack *p, const u8 *data, int count) p->count = 6; } - if (p->count + count < p->size){ + if (p->count + count < p->size) { memcpy(p->buf+p->count, data, count); p->count += count; } else { @@ -137,7 +137,7 @@ static void write_ipack(struct ipack *p, const u8 *data, int count) } } -int av7110_ipack_instant_repack (const u8 *buf, int count, struct ipack *p) +int av7110_ipack_instant_repack(const u8 *buf, int count, struct ipack *p) { int l; int c = 0; @@ -170,10 +170,10 @@ int av7110_ipack_instant_repack (const u8 *buf, int count, struct ipack *p) case PROG_STREAM_MAP: case PRIVATE_STREAM2: case PROG_STREAM_DIR: - case ECM_STREAM : - case EMM_STREAM : - case PADDING_STREAM : - case DSM_CC_STREAM : + case ECM_STREAM: + case EMM_STREAM: + case PADDING_STREAM: + case DSM_CC_STREAM: case ISO13522_STREAM: p->done = 1; fallthrough; @@ -334,7 +334,7 @@ int av7110_ipack_instant_repack (const u8 *buf, int count, struct ipack *p) if (c == count) return count; - if (p->which > 2){ + if (p->which > 2) { if ((p->flag2 & PTS_DTS_FLAGS) == PTS_ONLY) { while (c < count && p->which < 7) { p->pts[p->which - 2] = buf[c]; diff --git a/drivers/staging/media/av7110/av7110_v4l.c b/drivers/staging/media/av7110/av7110_v4l.c index 3bf08cbcf..c494e940d 100644 --- a/drivers/staging/media/av7110/av7110_v4l.c +++ b/drivers/staging/media/av7110/av7110_v4l.c @@ -26,7 +26,7 @@ int msp_writereg(struct av7110 *av7110, u8 dev, u16 reg, u16 val) { - u8 msg[5] = { dev, reg >> 8, reg & 0xff, val >> 8 , val & 0xff }; + u8 msg[5] = { dev, reg >> 8, reg & 0xff, val >> 8, val & 0xff }; struct i2c_msg msgs = { .flags = 0, .len = 5, .buf = msg }; switch (av7110->adac_type) { @@ -53,7 +53,7 @@ static int msp_readreg(struct av7110 *av7110, u8 dev, u16 reg, u16 *val) u8 msg1[3] = { dev, reg >> 8, reg & 0xff }; u8 msg2[2]; struct i2c_msg msgs[2] = { - { .flags = 0 , .len = 3, .buf = msg1 }, + { .flags = 0, .len = 3, .buf = msg1 }, { .flags = I2C_M_RD, .len = 2, .buf = msg2 } }; @@ -132,7 +132,7 @@ static int ves1820_writereg(struct saa7146_dev *dev, u8 addr, u8 reg, u8 data) return 0; } -static int tuner_write(struct saa7146_dev *dev, u8 addr, u8 data [4]) +static int tuner_write(struct saa7146_dev *dev, u8 addr, u8 data[4]) { struct av7110 *av7110 = dev->ext_priv; struct i2c_msg msg = { .addr = addr, .flags = 0, .buf = data, .len = 4 }; @@ -724,7 +724,7 @@ int av7110_init_analog_module(struct av7110 *av7110) msp_writereg(av7110, MSP_WR_DSP, 0x0007, 0x7f00); // SCART 1 volume msp_writereg(av7110, MSP_WR_DSP, 0x000d, 0x1900); // prescale SCART - if (i2c_writereg(av7110, 0x48, 0x01, 0x00)!=1) { + if (i2c_writereg(av7110, 0x48, 0x01, 0x00) != 1) { pr_info("saa7113 not accessible\n"); } else { u8 *i = saa7113_init_regs; diff --git a/drivers/staging/media/av7110/dvb_filter.c b/drivers/staging/media/av7110/dvb_filter.c index 8c2eca5dc..4f1f92290 100644 --- a/drivers/staging/media/av7110/dvb_filter.c +++ b/drivers/staging/media/av7110/dvb_filter.c @@ -26,10 +26,10 @@ int dvb_filter_get_ac3info(u8 *mbuf, int count, struct dvb_audio_info *ai, int p u8 frame = 0; int fr = 0; - while ( !found && c < count){ + while (!found && c < count) { u8 *b = mbuf+c; - if ( b[0] == 0x0b && b[1] == 0x77 ) + if (b[0] == 0x0b && b[1] == 0x77) found = 1; else { c++; @@ -52,8 +52,8 @@ int dvb_filter_get_ac3info(u8 *mbuf, int count, struct dvb_audio_info *ai, int p if (pr) printk(KERN_CONT " BRate: %d kb/s", (int) ai->bit_rate/1000); - ai->frequency = (headr[2] & 0xc0 ) >> 6; - fr = (headr[2] & 0xc0 ) >> 6; + ai->frequency = (headr[2] & 0xc0) >> 6; + fr = (headr[2] & 0xc0) >> 6; ai->frequency = freq[fr]*100; if (pr) printk(KERN_CONT " Freq: %d Hz\n", (int) ai->frequency); @@ -70,46 +70,46 @@ int dvb_filter_get_ac3info(u8 *mbuf, int count, struct dvb_audio_info *ai, int p void dvb_filter_pes2ts_init(struct dvb_filter_pes2ts *p2ts, unsigned short pid, dvb_filter_pes2ts_cb_t *cb, void *priv) { - unsigned char *buf=p2ts->buf; - - buf[0]=0x47; - buf[1]=(pid>>8); - buf[2]=pid&0xff; - p2ts->cc=0; - p2ts->cb=cb; - p2ts->priv=priv; + unsigned char *buf = p2ts->buf; + + buf[0] = 0x47; + buf[1] = (pid >> 8); + buf[2] = pid & 0xff; + p2ts->cc = 0; + p2ts->cb = cb; + p2ts->priv = priv; } int dvb_filter_pes2ts(struct dvb_filter_pes2ts *p2ts, unsigned char *pes, int len, int payload_start) { - unsigned char *buf=p2ts->buf; - int ret=0, rest; + unsigned char *buf = p2ts->buf; + int ret = 0, rest; //len=6+((pes[4]<<8)|pes[5]); if (payload_start) - buf[1]|=0x40; + buf[1] |= 0x40; else - buf[1]&=~0x40; - while (len>=184) { - buf[3]=0x10|((p2ts->cc++)&0x0f); + buf[1] &= ~0x40; + while (len >= 184) { + buf[3] = 0x10 | ((p2ts->cc++) & 0x0f); memcpy(buf+4, pes, 184); if ((ret=p2ts->cb(p2ts->priv, buf))) return ret; - len-=184; pes+=184; - buf[1]&=~0x40; + len -= 184; pes += 184; + buf[1] &= ~0x40; } if (!len) return 0; - buf[3]=0x30|((p2ts->cc++)&0x0f); - rest=183-len; + buf[3] = 0x30 | ((p2ts->cc++) & 0x0f); + rest = 183 - len; if (rest) { - buf[5]=0x00; + buf[5] = 0x00; if (rest-1) memset(buf+6, 0xff, rest-1); } - buf[4]=rest; + buf[4] = rest; memcpy(buf+5+rest, pes, len); return p2ts->cb(p2ts->priv, buf); } diff --git a/drivers/staging/media/av7110/dvb_filter.h b/drivers/staging/media/av7110/dvb_filter.h index 928b33436..43a36d653 100644 --- a/drivers/staging/media/av7110/dvb_filter.h +++ b/drivers/staging/media/av7110/dvb_filter.h @@ -227,7 +227,7 @@ struct dvb_audio_info { u32 bit_rate; u32 frequency; u32 mode; - u32 mode_extension ; + u32 mode_extension; u32 emphasis; u32 framesize; u32 off; From patchwork Tue May 7 00:24:49 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Herdler X-Patchwork-Id: 13656126 Received: from mout.gmx.net (mout.gmx.net [212.227.17.21]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id D0BBB8828 for ; Tue, 7 May 2024 00:25:30 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=212.227.17.21 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1715041533; cv=none; b=K4AG6nDzRNfg/4T3KmwzmppUoJL85CXU8lx3oN0E+FRMR+EO6FM6cXAC/1L02k/0HspbUungg6FAOxheIc6F/S3rNE1/FZNYYNf2OUTYKuHNgx0diyaK5ZBV25ZHtHyZf32zK80Yd0pIcEkfp/axiMDk3G81tqSkDlpNd90R9YA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1715041533; c=relaxed/simple; bh=mAcaCbDBSwSqqFm9IRIPQohaUd6EpcA+uJ86WmyVmgk=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=GYtPPp2kEGCMiWPKd6ndbwY2e0OizKLMgMhOx2k1qkAJCgbSalHovoMRxVZTP7ZoGbRdN0ca68CVj+ybJqujjzhjzodWmuYvIQ09Z2EBIlgDe9P4RwZ9kDYxDU/kgiwj8w70NMfGw6Rn6otXFcQAXCIcVnxf0i77NyXJcov6hd8= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=nurfuerspam.de; spf=pass smtp.mailfrom=nurfuerspam.de; dkim=pass (2048-bit key) header.d=nurfuerspam.de header.i=herdler@nurfuerspam.de header.b=HbSTOkUb; arc=none smtp.client-ip=212.227.17.21 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=nurfuerspam.de Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=nurfuerspam.de Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=nurfuerspam.de header.i=herdler@nurfuerspam.de header.b="HbSTOkUb" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nurfuerspam.de; s=s31663417; t=1715041527; x=1715646327; i=herdler@nurfuerspam.de; bh=n4P60J14blsG6NGd+zwl2z2Wj1wWSU9jfikHqVg/5xc=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date:Message-Id:In-Reply-To: References:MIME-Version:Content-Transfer-Encoding:cc: content-transfer-encoding:content-type:date:from:message-id: mime-version:reply-to:subject:to; b=HbSTOkUbaQl1pzQkIo2eB+fvZd+Oj4/wD08GxZmWCaXl7uchz82ClrCKK5EGLGm+ 8mn85PJryrDC6svUF4YdfNl/dgaUb33lvbaftS5RPMA+OfHiw+fj318Bez0mtXBDp ccfc87L6GUrQdePyKHhyFDgYWDvHwq8YiW9oYp3RNzjP7DrovjspITVLnVazpm1+d EYLtXHh9EVfcnARXrtdB95hpxH6jV9ZkjajU7Ll4EGMdqVKYmmy0xrfBNxqoOOFaa xpz5cXRkHuQAT/D1VGisy4lOpGiQA1dPrZmyT+oqrSWborAu0D84Ei7KQ1ONIElla k0MJFbhH2f1cd3E/DQ== X-UI-Sender-Class: 724b4f7f-cbec-4199-ad4e-598c01a50d3a Received: from astro.haus ([185.101.174.109]) by mail.gmx.net (mrgmx105 [212.227.17.168]) with ESMTPSA (Nemesis) id 1MUXtY-1sCpnD2nJI-00QWnf; Tue, 07 May 2024 02:25:27 +0200 From: Stefan Herdler To: hverkuil-cisco@xs4all.nl Cc: linux-media@vger.kernel.org, smoch@web.de, tmn505@gmail.com, vinschen@redhat.com Subject: [PATCH 10/21] media: av7110: coding style fixes: newline Date: Tue, 7 May 2024 02:24:49 +0200 Message-Id: <20240507002500.81867-11-herdler@nurfuerspam.de> X-Mailer: git-send-email 2.34.0 In-Reply-To: <20240507002500.81867-1-herdler@nurfuerspam.de> References: <20240507002500.81867-1-herdler@nurfuerspam.de> Precedence: bulk X-Mailing-List: linux-media@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Provags-ID: V03:K1:5kg04sIOdi3zO42ul+epWkqJV7FN0AwfiC1UAAZv/MAkWgsQ2uL a4LnuUbDYU/fJ7y/XQ0qBjRgpK0DD05d8AOzzfq4JrW/dMkQebXy0PvJEawmhFFh0ss/Eb3 Jrt49WkXXU6z0fxvgl0zCBcqh5bbprA/xGc2JaACgqGk0tj0hlC+xYhm/2eS04EQLgxdvR2 Nwn3ySubcvl/He4UF342g== X-Spam-Flag: NO UI-OutboundReport: notjunk:1;M01:P0:Fzycp3VQgqA=;FwsUGRS+tGqf3vXmOkz1LTQLCdg Ol1oY55SLqqTzISuC/m5rfnXEAUDLPYLYRlL5tEMp7cdjjKrEsQhQPBOnSBFG9qlyRs26H3Km vqoamZKcLjlT2m8X1tFF71+Lp/JvCe32EDzOEE5nsZhyt4u4LdzINze/ep+5+NvfD/C2fjMgr YoonhjiEY8j0pTzZvukq4J2UdW+mXLmsx6Rup/J3s93Zvz+NpytmlyinWP0XTZgH5SmHwgOvB THjU9r7sN4M+DvJAypsw6E+9Kt0revb8Xkj+AR9u/1q1K7zeY+h7Bv8J4cR8GKRMQeSIIf2Gp tR7X3C5rzTkKZRqpv+RjAFK6+WhNl1Qwr2pXXV3f+IUMQWrTxNXeGtys7FLWpyFUiCL92Xx/a a9IO3/ADSTYXdEOn+U/mjGZkGgxpN7malBhZfaLhJ+iG85EROJipxndB21Y45aRiEcLxAenET L04CdOLifs2rfQl3MkXMFQqL3VTItUTQRRLim48Ibs0Nmmn9fBi7DfxCQGIFvLDJdKULnml5R 6mMI/PjTBSWl4Vs6rUPJW4LeXMo0qbmvTgUgD4NQbinvY5Gha8oW4DvTN9IIbSS8PMv+EYgcY 3uliyvcs9z80qaPS4x03es8iziq06ee/HB27DdlLDRrExdqg20FQEJEIVxxlBKwzhDy46/dgg cuZHyPsdGaAqlqeEf9gji2FQONf6HoAlQSAuP1ImWd7VJH9X0Q8joRahJb1G/RVbgE7mMHuq/ 5olQGgEMs4+nj0NvjhgRwF/NbWQ0NibGNOaRJeMBF6kSMwFil0SbWNmPtjiHisyNOp5U+gXce I+NlDdPnh49wjqhPo0z+Sy825pJ1eDUVwJ9ZO7tmdzKSE= This patch fixes the following checkpatch warnings: ERROR:ELSE_AFTER_BRACE: else should follow close brace '}' ERROR:OPEN_BRACE: open brace '{' following enum go on the same line ERROR:OPEN_BRACE: open brace '{' following struct go on the same line ERROR:OPEN_BRACE: that open brace { should be on the previous line ERROR:TRAILING_STATEMENTS: trailing statements should be on next line CHECK:LOGICAL_CONTINUATIONS: Logical continuations should be on the previous line Newline and whitespace changes only. Signed-off-by: Stefan Herdler --- drivers/staging/media/av7110/av7110.c | 22 +++++++------- drivers/staging/media/av7110/av7110_av.c | 9 ++++-- drivers/staging/media/av7110/av7110_hw.c | 9 ++---- drivers/staging/media/av7110/av7110_hw.h | 13 ++++---- drivers/staging/media/av7110/av7110_ipack.c | 8 ++--- drivers/staging/media/av7110/av7110_v4l.c | 12 ++++---- drivers/staging/media/av7110/dvb_filter.c | 33 ++++++++++++--------- 7 files changed, 54 insertions(+), 52 deletions(-) -- 2.34.0 diff --git a/drivers/staging/media/av7110/av7110.c b/drivers/staging/media/av7110/av7110.c index 557f42352..8a4e7bd82 100644 --- a/drivers/staging/media/av7110/av7110.c +++ b/drivers/staging/media/av7110/av7110.c @@ -161,13 +161,11 @@ static void init_av7110_av(struct av7110 *av7110) */ } else if (0 == av7110_init_analog_module(av7110)) { /* done. */ - } - else if (dev->pci->subsystem_vendor == 0x110a) { + } else if (dev->pci->subsystem_vendor == 0x110a) { printk("dvb-ttpci: DVB-C w/o analog module @ card %d detected\n", av7110->dvb_adapter.num); av7110->adac_type = DVB_ADAC_NONE; - } - else { + } else { av7110->adac_type = adac; printk("dvb-ttpci: adac type set to %d @ card %d\n", av7110->adac_type, av7110->dvb_adapter.num); @@ -504,8 +502,7 @@ static void gpioirq(struct tasklet_struct *t) event.type = VIDEO_EVENT_SIZE_CHANGED; event.u.size.w = av7110->video_size.w; event.u.size.h = av7110->video_size.h; - switch ((h_ar >> 12) & 0xf) - { + switch ((h_ar >> 12) & 0xf) { case 3: av7110->video_size.aspect_ratio = VIDEO_FORMAT_16_9; event.u.size.aspect_ratio = VIDEO_FORMAT_16_9; @@ -576,8 +573,8 @@ static void gpioirq(struct tasklet_struct *t) len = av7110_pes_play(av7110->debi_virt, &av7110->aout, 2048); spin_unlock(&av7110->aout.lock); } - if (len <= 0 && (av7110->debitype & 0x200) - &&av7110->videostate.play_state != VIDEO_FREEZED) { + if (len <= 0 && (av7110->debitype & 0x200) && + av7110->videostate.play_state != VIDEO_FREEZED) { spin_lock(&av7110->avout.lock); len = av7110_pes_play(av7110->debi_virt, &av7110->avout, 2048); spin_unlock(&av7110->avout.lock); @@ -874,8 +871,7 @@ static int dvb_feed_start_pid(struct dvb_demux_feed *dvbdmxfeed) } if (dvbdmxfeed->pes_type < 2 && npids[0]) - if (av7110->fe_synced) - { + if (av7110->fe_synced) { ret = av7110_fw_cmd(av7110, COMTYPE_PIDFILTER, Scan, 0); if (ret) return ret; @@ -1823,7 +1819,8 @@ static int nexusca_stv0297_tuner_set_params(struct dvb_frontend *fe) if (fe->ops.i2c_gate_ctrl) fe->ops.i2c_gate_ctrl(fe, 1); if (i2c_transfer(&av7110->i2c_adap, &readmsg, 1) == 1) - if (data[0] & 0x40) break; + if (data[0] & 0x40) + break; msleep(10); } @@ -1875,7 +1872,8 @@ static int grundig_29504_401_tuner_set_params(struct dvb_frontend *fe) if (fe->ops.i2c_gate_ctrl) fe->ops.i2c_gate_ctrl(fe, 1); - if (i2c_transfer (&av7110->i2c_adap, &msg, 1) != 1) return -EIO; + if (i2c_transfer(&av7110->i2c_adap, &msg, 1) != 1) + return -EIO; return 0; } diff --git a/drivers/staging/media/av7110/av7110_av.c b/drivers/staging/media/av7110/av7110_av.c index 0b384e832..56fa1f180 100644 --- a/drivers/staging/media/av7110/av7110_av.c +++ b/drivers/staging/media/av7110/av7110_av.c @@ -1043,13 +1043,16 @@ static int play_iframe(struct av7110 *av7110, char __user *buf, unsigned int len continue; } switch (match++) { - case 2: if (c == 0x01) + case 2: + if (c == 0x01) continue; break; - case 3: if (c == 0xb5) + case 3: + if (c == 0xb5) continue; break; - case 4: if ((c & 0xf0) == 0x10) + case 4: + if ((c & 0xf0) == 0x10) continue; break; } diff --git a/drivers/staging/media/av7110/av7110_hw.c b/drivers/staging/media/av7110/av7110_hw.c index d7439c522..d3aa524f6 100644 --- a/drivers/staging/media/av7110/av7110_hw.c +++ b/drivers/staging/media/av7110/av7110_hw.c @@ -440,8 +440,7 @@ static int __av7110_send_fw_cmd(struct av7110 *av7110, u16 *buf, int length) if (stat & GPMQOver) { printk(KERN_ERR "dvb-ttpci: %s(): GPMQOver\n", __func__); return -ENOSPC; - } - else if (stat & OSDQOver) { + } else if (stat & OSDQOver) { printk(KERN_ERR "dvb-ttpci: %s(): OSDQOver\n", __func__); return -ENOSPC; } @@ -511,8 +510,7 @@ int av7110_send_ci_cmd(struct av7110 *av7110, u8 subcom, u8 *buf, u8 len) dprintk(4, "%p\n", av7110); - for (i = 0; i < len && i < 32; i++) - { + for (i = 0; i < len && i < 32; i++) { if (i % 2 == 0) cmd[(i / 2) + 2] = (u16)(buf[i]) << 8; else @@ -588,8 +586,7 @@ int av7110_fw_request(struct av7110 *av7110, u16 *request_buf, printk(KERN_ERR "%s: GPMQOver\n", __func__); mutex_unlock(&av7110->dcomlock); return -1; - } - else if (stat & OSDQOver) { + } else if (stat & OSDQOver) { printk(KERN_ERR "%s: OSDQOver\n", __func__); mutex_unlock(&av7110->dcomlock); return -1; diff --git a/drivers/staging/media/av7110/av7110_hw.h b/drivers/staging/media/av7110/av7110_hw.h index 3aff5db56..39488c2fc 100644 --- a/drivers/staging/media/av7110/av7110_hw.h +++ b/drivers/staging/media/av7110/av7110_hw.h @@ -14,15 +14,14 @@ #define ARM_WAIT_SHAKE (HZ/5) #define ARM_WAIT_OSD (HZ) -enum av7110_bootstate -{ +enum av7110_bootstate { BOOTSTATE_BUFFER_EMPTY = 0, BOOTSTATE_BUFFER_FULL = 1, BOOTSTATE_AV7110_BOOT_COMPLETE = 2 }; -enum av7110_type_rec_play_format -{ RP_None, +enum av7110_type_rec_play_format { + RP_None, AudioPES, AudioMp2, AudioPCM, @@ -30,8 +29,7 @@ enum av7110_type_rec_play_format AV_PES }; -enum av7110_osd_palette_type -{ +enum av7110_osd_palette_type { NoPalet = 0, /* No palette */ Pal1Bit = 2, /* 2 colors for 1 Bit Palette */ Pal2Bit = 4, /* 4 colors for 2 bit palette */ @@ -50,8 +48,7 @@ enum av7110_osd_palette_type #define FB_ON SAA7146_GPIO_OUTHI /* FastBlank on (RGB-Mode) */ #define FB_LOOP SAA7146_GPIO_INPUT /* FastBlank loop-through (PC graphics ???) */ -enum av7110_video_output_mode -{ +enum av7110_video_output_mode { NO_OUT = 0, /* disable analog output */ CVBS_RGB_OUT = 1, CVBS_YC_OUT = 2, diff --git a/drivers/staging/media/av7110/av7110_ipack.c b/drivers/staging/media/av7110/av7110_ipack.c index fc953db36..ac00bff44 100644 --- a/drivers/staging/media/av7110/av7110_ipack.c +++ b/drivers/staging/media/av7110/av7110_ipack.c @@ -80,8 +80,8 @@ static void send_ipack(struct ipack *p) p->buf[7] = 0x00; p->buf[8] = 0x00; p->count = 9; - if (p->repack_subids && p->cid == PRIVATE_STREAM1 - && (streamid & 0xf8) == 0x80) { + if (p->repack_subids && p->cid == PRIVATE_STREAM1 && + (streamid & 0xf8) == 0x80) { p->count += 4; p->buf[9] = streamid; p->buf[10] = (ac3_off >> 8) & 0xff; @@ -144,8 +144,8 @@ int av7110_ipack_instant_repack(const u8 *buf, int count, struct ipack *p) while (c < count && (p->mpeg == 0 || (p->mpeg == 1 && p->found < 7) || - (p->mpeg == 2 && p->found < 9)) - && (p->found < 5 || !p->done)) { + (p->mpeg == 2 && p->found < 9)) && + (p->found < 5 || !p->done)) { switch (p->found) { case 0: case 1: diff --git a/drivers/staging/media/av7110/av7110_v4l.c b/drivers/staging/media/av7110/av7110_v4l.c index c494e940d..202a05561 100644 --- a/drivers/staging/media/av7110/av7110_v4l.c +++ b/drivers/staging/media/av7110/av7110_v4l.c @@ -729,13 +729,16 @@ int av7110_init_analog_module(struct av7110 *av7110) } else { u8 *i = saa7113_init_regs; - if ((av7110->dev->pci->subsystem_vendor == 0x110a) && (av7110->dev->pci->subsystem_device == 0x0000)) { + if ((av7110->dev->pci->subsystem_vendor == 0x110a) && + (av7110->dev->pci->subsystem_device == 0x0000)) { /* Fujitsu/Siemens DVB-Cable */ av7110->analog_tuner_flags |= ANALOG_TUNER_VES1820; - } else if ((av7110->dev->pci->subsystem_vendor == 0x13c2) && (av7110->dev->pci->subsystem_device == 0x0002)) { + } else if ((av7110->dev->pci->subsystem_vendor == 0x13c2) && + (av7110->dev->pci->subsystem_device == 0x0002)) { /* Hauppauge/TT DVB-C premium */ av7110->analog_tuner_flags |= ANALOG_TUNER_VES1820; - } else if ((av7110->dev->pci->subsystem_vendor == 0x13c2) && (av7110->dev->pci->subsystem_device == 0x000A)) { + } else if ((av7110->dev->pci->subsystem_vendor == 0x13c2) && + (av7110->dev->pci->subsystem_device == 0x000A)) { /* Hauppauge/TT DVB-C premium */ av7110->analog_tuner_flags |= ANALOG_TUNER_STV0297; } @@ -912,8 +915,7 @@ static int std_callback(struct saa7146_dev *dev, struct saa7146_standard *std) if (std->id & V4L2_STD_PAL) { av7110->vidmode = AV7110_VIDEO_MODE_PAL; av7110_set_vidmode(av7110, av7110->vidmode); - } - else if (std->id & V4L2_STD_NTSC) { + } else if (std->id & V4L2_STD_NTSC) { av7110->vidmode = AV7110_VIDEO_MODE_NTSC; av7110_set_vidmode(av7110, av7110->vidmode); } diff --git a/drivers/staging/media/av7110/dvb_filter.c b/drivers/staging/media/av7110/dvb_filter.c index 4f1f92290..4c41682ff 100644 --- a/drivers/staging/media/av7110/dvb_filter.c +++ b/drivers/staging/media/av7110/dvb_filter.c @@ -6,17 +6,19 @@ static u32 freq[4] = {480, 441, 320, 0}; -static unsigned int ac3_bitrates[32] = - {32,40,48,56,64,80,96,112,128,160,192,224,256,320,384,448,512,576,640, - 0,0,0,0,0,0,0,0,0,0,0,0,0}; - -static u32 ac3_frames[3][32] = - {{64,80,96,112,128,160,192,224,256,320,384,448,512,640,768,896,1024, - 1152,1280,0,0,0,0,0,0,0,0,0,0,0,0,0}, - {69,87,104,121,139,174,208,243,278,348,417,487,557,696,835,975,1114, - 1253,1393,0,0,0,0,0,0,0,0,0,0,0,0,0}, - {96,120,144,168,192,240,288,336,384,480,576,672,768,960,1152,1344, - 1536,1728,1920,0,0,0,0,0,0,0,0,0,0,0,0,0}}; +static unsigned int ac3_bitrates[32] = { + 32, 40, 48, 56, 64, 80, 96, 112, 128, 160, 192, 224, 256, 320, 384, 448, 512, 576, 640, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 +}; + +static u32 ac3_frames[3][32] = { + {64, 80, 96, 112, 128, 160, 192, 224, 256, 320, 384, 448, 512, 640, 768, 896, 1024, + 1152, 1280, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}, + {69, 87, 104, 121, 139, 174, 208, 243, 278, 348, 417, 487, 557, 696, 835, 975, 1114, + 1253, 1393, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}, + {96, 120, 144, 168, 192, 240, 288, 336, 384, 480, 576, 672, 768, 960, 1152, 1344, + 1536, 1728, 1920, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0} +}; int dvb_filter_get_ac3info(u8 *mbuf, int count, struct dvb_audio_info *ai, int pr) { @@ -36,12 +38,14 @@ int dvb_filter_get_ac3info(u8 *mbuf, int count, struct dvb_audio_info *ai, int p } } - if (!found) return -1; + if (!found) + return -1; if (pr) printk(KERN_DEBUG "Audiostream: AC3"); ai->off = c; - if (c+5 >= count) return -1; + if (c + 5 >= count) + return -1; ai->layer = 0; // 0 for AC3 headr = mbuf+c+2; @@ -59,7 +63,8 @@ int dvb_filter_get_ac3info(u8 *mbuf, int count, struct dvb_audio_info *ai, int p printk(KERN_CONT " Freq: %d Hz\n", (int) ai->frequency); ai->framesize = ac3_frames[fr][frame >> 1]; - if ((frame & 1) && (fr == 1)) ai->framesize++; + if ((frame & 1) && (fr == 1)) + ai->framesize++; ai->framesize = ai->framesize << 1; if (pr) printk(KERN_DEBUG " Framesize %d\n", (int) ai->framesize); From patchwork Tue May 7 00:24:50 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Herdler X-Patchwork-Id: 13656135 Received: from mout.gmx.net (mout.gmx.net [212.227.17.21]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 81BD58BF7 for ; Tue, 7 May 2024 00:25:31 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=212.227.17.21 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1715041535; cv=none; b=Yg/QmAJuBkdMF5prX2zd775wGIP+HYihJ7uEwd69/RAAE6N7v55TOMP4GPzV65EIyUGJLXW0dbCXY7RVbAssmLrNZN9NUT8A2jjc9UKrFwckVrKJ1V4f4ll3CL02r0DdGKhRhwb29vHmKL7B5vfdG4H+Oteyop58o6GYOCeuwIE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1715041535; c=relaxed/simple; bh=v45OWqV5yEDxQgmJE2f/DflJHeGFli7iJug9oFKB9W8=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=vB3r+vusrGyJB8NMyao/LOpBP+LA42ooC/RZKSIL4JpBatIOzH9vp63F3Cu143OyzhNCQKUTPVHNyVuuMh81YJeKEfaJF/U4eTF7MlyuQMSC+j9lV3+P11aDdZk40+LAN70hU6RTXq2YrdaxWFmyu5IWkMMRYVGq35VaC4IJvQg= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=nurfuerspam.de; spf=pass smtp.mailfrom=nurfuerspam.de; dkim=pass (2048-bit key) header.d=nurfuerspam.de header.i=herdler@nurfuerspam.de header.b=ED0bNFHU; arc=none smtp.client-ip=212.227.17.21 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=nurfuerspam.de Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=nurfuerspam.de Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=nurfuerspam.de header.i=herdler@nurfuerspam.de header.b="ED0bNFHU" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nurfuerspam.de; s=s31663417; t=1715041528; x=1715646328; i=herdler@nurfuerspam.de; bh=nhCF+aTc5d8JnBIHILH2twTN8PYiYO22ypw5UcWRh8c=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date:Message-Id:In-Reply-To: References:MIME-Version:Content-Transfer-Encoding:cc: content-transfer-encoding:content-type:date:from:message-id: mime-version:reply-to:subject:to; b=ED0bNFHU7VEz+7993iuDcECzsgtlSA4iXk1cxQ6JJFz8BiTkOexHT7wu6XqGu0hB T0uOVpkN677jqt2R2w83R1euCkRT50bmwhAikFdDtvg4K3WQMZuEWo/ek4kPQivh+ duwLnqx46qhA6IVsz6EBxGl391WdiBj2Ntdsocbbw1HxoR2wZtpI4IgLyM+cJiEMz cQJB5ishcABOqxlatNiixTZ49jWnzPcpaPVJ0aiKzcxp0cnPhhS9K6Hbj0iR4VuhY EemF37cDmFLan8nfjgPBwBBDPy8+bz4hXkDRgNKlYGN0J6VuQwCVYiLlDtM9cD9WX eVO8snkzizRDlHH2xg== X-UI-Sender-Class: 724b4f7f-cbec-4199-ad4e-598c01a50d3a Received: from astro.haus ([185.101.174.109]) by mail.gmx.net (mrgmx105 [212.227.17.168]) with ESMTPSA (Nemesis) id 1MpUYu-1sP7ud3obM-00psD5; Tue, 07 May 2024 02:25:28 +0200 From: Stefan Herdler To: hverkuil-cisco@xs4all.nl Cc: linux-media@vger.kernel.org, smoch@web.de, tmn505@gmail.com, vinschen@redhat.com Subject: [PATCH 11/21] media: av7110: coding style fixes: whitespace (strict) Date: Tue, 7 May 2024 02:24:50 +0200 Message-Id: <20240507002500.81867-12-herdler@nurfuerspam.de> X-Mailer: git-send-email 2.34.0 In-Reply-To: <20240507002500.81867-1-herdler@nurfuerspam.de> References: <20240507002500.81867-1-herdler@nurfuerspam.de> Precedence: bulk X-Mailing-List: linux-media@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Provags-ID: V03:K1:/gqTgg29Nhazna0ZGVep/nDfbxBqIY5SgHc/lRlEt8Dm3lsoOJp SG03PkOOJJybgExqOFRn34TYkdehmAAJ29ssZlNm++84RLxDIZwf1Oz31j3D0vIGLsDgQ9y SY231wa6fxKIexAClw90wgscyxaEls0x4lRVAdCrDdLbuAkWiQEYrJl1rasg/zHFlidtP9J SEFt4yNWvDlitDvZ3BQKQ== X-Spam-Flag: NO UI-OutboundReport: notjunk:1;M01:P0:CFde2i2n1R8=;rmxWbrLCQIhfxSo0DbIK+286zaz FB6m0Y4fTWKY8PNwVHCT0C/ntKgJ8gfx2AEfy4sMUuDzbE9H9lkmK9Ov9bS5lj0zNFis3fX6U mT2MTqHAhCAgNPASGKhBxUO/L89T1+aUKzO+Rlop1HbtXvnDYV0KcwM+FsLzzlQv/dYrfbOgd yF/Y1zR/v8wmkqEltUNd5wpFhxeyFBl924bhXceARQLZyV5VJyo9rapRB7SbUIAwxqafsO6Ru duA3y0zUPMhMHvY9l1d+FxoVYioAMoFhP+y+PYfFM2SlW1qa9hh5h9HhX/FyzHRxvyxKRsWaF ahliqihrdPgRg1CDotkwBu5bxSx1FyrAUKw2juXpcWFBY98nDVG6SzW28YxcVWYeQTmIttMM+ +yrNnzlM/7J6aFTxmCvoBSaZchb9MtOvhQqNq7prny56U3/1KI0r9R7BSAqMxHrAlfm1Kpb3I BRpPzfIoTDpMJ25N7KuTRKfRvIh/1/UwtnhLYg6dSAK+izxQa5uFZFhC3mnpNcw/3DlvTl8T9 EBU9QzlhCX9gwj25dV6o+L+PVi4VPPt8kcteXVqHGynoHLx6OAAvwxWopk3Mioioi+j+DkOJw Hd2cMJ8W5O5hhfAN3n/Te324Wt0mm5JzgInVoI18MgSZwy9OSH60qKK5qtfuT6UayxZrlhv8d 9VMNdsEM2s8uvt7rzGdNdhW6kBRUjnGJ26bEPOzn60DnwOz/FPe995c8NyI+igzfK/MeqWDqR we6sBG/l0+622gjn34BxTUa952PRvuqiGJdrmrlD125QfAd7JRz5tZNm3UGx5j6Apbe1b+277 lb47tgp6j4ctgLhIZIS6/PGbJtMECRh9l161N+T3jSEZc= This patch fixes the following checkpatch warnings: CHECK:PARENTHESIS_ALIGNMENT: Alignment should match open parenthesis CHECK:SPACING: No space is necessary after a cast CHECK:SPACING: space preferred before that '|' (ctx:VxE) CHECK:SPACING: spaces preferred around that '&' (ctx:VxV) CHECK:SPACING: spaces preferred around that '*' (ctx:VxV) CHECK:SPACING: spaces preferred around that '+' (ctx:VxV) CHECK:SPACING: spaces preferred around that '-' (ctx:VxV) CHECK:SPACING: spaces preferred around that '/' (ctx:VxV) CHECK:SPACING: spaces preferred around that '<<' (ctx:VxV) CHECK:SPACING: spaces preferred around that '>>' (ctx:VxV) CHECK:SPACING: spaces preferred around that '|' (ctx:VxV) Additional whitespace fixes found by "checkpatch.pl --strict". Whitespace changes only. "git diff -w" shows no changes. Signed-off-by: Stefan Herdler --- drivers/staging/media/av7110/av7110.c | 60 ++++++++++----------- drivers/staging/media/av7110/av7110.h | 8 +-- drivers/staging/media/av7110/av7110_av.c | 58 ++++++++++---------- drivers/staging/media/av7110/av7110_av.h | 2 +- drivers/staging/media/av7110/av7110_ca.c | 12 ++--- drivers/staging/media/av7110/av7110_hw.c | 28 +++++----- drivers/staging/media/av7110/av7110_hw.h | 16 +++--- drivers/staging/media/av7110/av7110_ipack.c | 8 +-- drivers/staging/media/av7110/av7110_v4l.c | 14 ++--- drivers/staging/media/av7110/dvb_filter.c | 18 +++---- drivers/staging/media/av7110/dvb_filter.h | 4 +- 11 files changed, 114 insertions(+), 114 deletions(-) -- 2.34.0 diff --git a/drivers/staging/media/av7110/av7110.c b/drivers/staging/media/av7110/av7110.c index 8a4e7bd82..27019e3f3 100644 --- a/drivers/staging/media/av7110/av7110.c +++ b/drivers/staging/media/av7110/av7110.c @@ -52,8 +52,8 @@ #define TS_WIDTH 376 #define TS_HEIGHT 512 -#define TS_BUFLEN (TS_WIDTH*TS_HEIGHT) -#define TS_MAX_PACKETS (TS_BUFLEN/TS_SIZE) +#define TS_BUFLEN (TS_WIDTH * TS_HEIGHT) +#define TS_MAX_PACKETS (TS_BUFLEN / TS_SIZE) int av7110_debug; @@ -122,7 +122,7 @@ static void init_av7110_av(struct av7110 *av7110) printk("dvb-ttpci:cannot set internal volume to maximum:%d\n",ret); ret = av7110_fw_cmd(av7110, COMTYPE_ENCODER, SetMonitorType, - 1, (u16) av7110->display_ar); + 1, (u16)av7110->display_ar); if (ret < 0) printk("dvb-ttpci: unable to set aspect ratio\n"); ret = av7110_fw_cmd(av7110, COMTYPE_ENCODER, SetPanScanType, @@ -234,7 +234,7 @@ static int arm_thread(void *data) for (;;) { timeout = wait_event_interruptible_timeout(av7110->arm_wait, - kthread_should_stop(), 5 * HZ); + kthread_should_stop(), 5 * HZ); if (-ERESTARTSYS == timeout || kthread_should_stop()) { /* got signal or told to quit*/ @@ -371,7 +371,7 @@ static void debiirq(struct tasklet_struct *t) switch (type & 0xff) { case DATA_TS_RECORD: dvb_dmx_swfilter_packets(&av7110->demux, - (const u8 *) av7110->debi_virt, + (const u8 *)av7110->debi_virt, av7110->debilen / 188); xfer = RX_BUFF; break; @@ -379,7 +379,7 @@ static void debiirq(struct tasklet_struct *t) case DATA_PES_RECORD: if (av7110->demux.recording) av7110_record_cb(&av7110->p2t[handle], - (u8 *) av7110->debi_virt, + (u8 *)av7110->debi_virt, av7110->debilen); xfer = RX_BUFF; break; @@ -611,11 +611,11 @@ static void gpioirq(struct tasklet_struct *t) len = 2 * 1024; iwdebi(av7110, DEBINOSWAP, TX_LEN, len, 2); iwdebi(av7110, DEBINOSWAP, IRQ_STATE_EXT, len, 2); - memcpy(av7110->debi_virt, av7110->bmpbuf+av7110->bmpp, len); + memcpy(av7110->debi_virt, av7110->bmpbuf + av7110->bmpp, len); av7110->bmpp += len; av7110->bmplen -= len; dprintk(8, "gpio DATA_BMP_LOAD DMA len %d\n", len); - start_debi_dma(av7110, DEBI_WRITE, DPRAM_BASE+txbuf, len); + start_debi_dma(av7110, DEBI_WRITE, DPRAM_BASE + txbuf, len); spin_unlock(&av7110->debilock); return; @@ -633,7 +633,7 @@ static void gpioirq(struct tasklet_struct *t) case DATA_TS_RECORD: case DATA_PES_RECORD: dprintk(8, "DMA: TS_REC etc.\n"); - start_debi_dma(av7110, DEBI_READ, DPRAM_BASE+rxbuf, len); + start_debi_dma(av7110, DEBI_READ, DPRAM_BASE + rxbuf, len); spin_unlock(&av7110->debilock); return; @@ -675,9 +675,9 @@ static int dvb_osd_ioctl(struct file *file, dprintk(4, "%p\n", av7110); if (cmd == OSD_SEND_CMD) - return av7110_osd_cmd(av7110, (osd_cmd_t *) parg); + return av7110_osd_cmd(av7110, (osd_cmd_t *)parg); if (cmd == OSD_GET_CAPABILITY) - return av7110_osd_capability(av7110, (osd_cap_t *) parg); + return av7110_osd_capability(av7110, (osd_cap_t *)parg); return -EINVAL; } @@ -723,7 +723,7 @@ static inline int SetPIDs(struct av7110 *av7110, u16 vpid, u16 apid, u16 ttpid, } int ChangePIDs(struct av7110 *av7110, u16 vpid, u16 apid, u16 ttpid, - u16 subpid, u16 pcrpid) + u16 subpid, u16 pcrpid) { int ret = 0; @@ -856,7 +856,7 @@ static int dvb_feed_start_pid(struct dvb_demux_feed *dvbdmxfeed) npids[0] = npids[1] = npids[2] = npids[3] = npids[4] = 0xffff; i = dvbdmxfeed->pes_type; - npids[i] = (pid[i]&0x8000) ? 0 : pid[i]; + npids[i] = (pid[i] & 0x8000) ? 0 : pid[i]; if ((i == 2) && npids[i] && (dvbdmxfeed->ts_type & TS_PACKET)) { npids[i] = 0; ret = ChangePIDs(av7110, npids[1], npids[0], npids[2], npids[3], npids[4]); @@ -919,7 +919,7 @@ static int dvb_feed_stop_pid(struct dvb_demux_feed *dvbdmxfeed) case 4: if (!pids_off) return 0; - npids[i] = (pid[i]&0x8000) ? 0 : pid[i]; + npids[i] = (pid[i] & 0x8000) ? 0 : pid[i]; break; } if (!ret) @@ -1111,8 +1111,8 @@ static int dvb_get_stc(struct dmx_demux *demux, unsigned int num, dprintk(2, "fwstc = %04hx %04hx %04hx %04hx\n", fwstc[0], fwstc[1], fwstc[2], fwstc[3]); - *stc = (((uint64_t) ((fwstc[3] & 0x8000) >> 15)) << 32) | - (((uint64_t) fwstc[1]) << 16) | ((uint64_t) fwstc[0]); + *stc = (((uint64_t)((fwstc[3] & 0x8000) >> 15)) << 32) | + (((uint64_t)fwstc[1]) << 16) | ((uint64_t)fwstc[0]); *base = 1; dprintk(4, "stc = %lu\n", (unsigned long)*stc); @@ -1218,7 +1218,7 @@ static int budget_stop_feed(struct dvb_demux_feed *feed) static void vpeirq(struct tasklet_struct *t) { struct av7110 *budget = from_tasklet(budget, t, vpe_tasklet); - u8 *mem = (u8 *) (budget->grabbing); + u8 *mem = (u8 *)(budget->grabbing); u32 olddma = budget->ttbp; u32 newdma = saa7146_read(budget->dev, PCI_VDP3); struct dvb_demux *demux = budget->full_ts ? &budget->demux : &budget->demux1; @@ -1268,7 +1268,7 @@ static int av7110_register(struct av7110 *av7110) av7110->registered = 1; - dvbdemux->priv = (void *) av7110; + dvbdemux->priv = (void *)av7110; for (i = 0; i < 32; i++) av7110->handle2filter[i] = NULL; @@ -1323,7 +1323,7 @@ static int av7110_register(struct av7110 *av7110) /* initialize software demux1 without its own frontend * demux1 hardware is connected to frontend0 of demux0 */ - dvbdemux1->priv = (void *) av7110; + dvbdemux1->priv = (void *)av7110; dvbdemux1->filternum = 256; dvbdemux1->feednum = 256; @@ -1901,7 +1901,7 @@ static int av7110_fe_lock_fix(struct av7110 *av7110, enum fe_status status) if (synced) { ret = SetPIDs(av7110, av7110->pids[DMX_PES_VIDEO], - av7110->pids[DMX_PES_AUDIO], + av7110->pids[DMX_PES_AUDIO], av7110->pids[DMX_PES_TELETEXT], 0, av7110->pids[DMX_PES_PCR]); if (!ret) @@ -2075,7 +2075,7 @@ static int frontend_init(struct av7110 *av7110) switch (av7110->dev->pci->subsystem_device) { case 0x0000: // Fujitsu/Siemens DVB-Cable (ves1820/Philips CD1516(??)) av7110->fe = dvb_attach(ves1820_attach, &philips_cd1516_config, - &av7110->i2c_adap, read_pwm(av7110)); + &av7110->i2c_adap, read_pwm(av7110)); if (av7110->fe) { av7110->fe->ops.tuner_ops.set_params = philips_cd1516_tuner_set_params; } @@ -2379,9 +2379,9 @@ static int av7110_attach(struct saa7146_dev *dev, /* RPS1 timeout disable */ saa7146_write(dev, RPS_TOV1, 0); WRITE_RPS1(CMD_PAUSE | EVT_VBI_B); - WRITE_RPS1(CMD_WR_REG_MASK | (GPIO_CTRL>>2)); + WRITE_RPS1(CMD_WR_REG_MASK | (GPIO_CTRL >> 2)); WRITE_RPS1(GPIO3_MSK); - WRITE_RPS1(SAA7146_GPIO_OUTLO<<24); + WRITE_RPS1(SAA7146_GPIO_OUTLO << 24); #if RPS_IRQ /* issue RPS1 interrupt to increment counter */ WRITE_RPS1(CMD_INTERRUPT); @@ -2541,9 +2541,9 @@ static int av7110_attach(struct saa7146_dev *dev, /* Wait Source Line Counter Threshold (p36) */ WRITE_RPS1(CMD_PAUSE | EVT_HS); /* Set GPIO3=1 (p42) */ - WRITE_RPS1(CMD_WR_REG_MASK | (GPIO_CTRL>>2)); + WRITE_RPS1(CMD_WR_REG_MASK | (GPIO_CTRL >> 2)); WRITE_RPS1(GPIO3_MSK); - WRITE_RPS1(SAA7146_GPIO_OUTHI<<24); + WRITE_RPS1(SAA7146_GPIO_OUTHI << 24); #if RPS_IRQ /* issue RPS1 interrupt */ WRITE_RPS1(CMD_INTERRUPT); @@ -2551,9 +2551,9 @@ static int av7110_attach(struct saa7146_dev *dev, /* Wait reset Source Line Counter Threshold (p36) */ WRITE_RPS1(CMD_PAUSE | RPS_INV | EVT_HS); /* Set GPIO3=0 (p42) */ - WRITE_RPS1(CMD_WR_REG_MASK | (GPIO_CTRL>>2)); + WRITE_RPS1(CMD_WR_REG_MASK | (GPIO_CTRL >> 2)); WRITE_RPS1(GPIO3_MSK); - WRITE_RPS1(SAA7146_GPIO_OUTLO<<24); + WRITE_RPS1(SAA7146_GPIO_OUTLO << 24); #if RPS_IRQ /* issue RPS1 interrupt */ WRITE_RPS1(CMD_INTERRUPT); @@ -2623,7 +2623,7 @@ static int av7110_attach(struct saa7146_dev *dev, if (!av7110->debi_virt) goto err_saa71466_vfree_4; - av7110->iobuf = vmalloc(AVOUTLEN+AOUTLEN+BMPLEN+4*IPACKS); + av7110->iobuf = vmalloc(AVOUTLEN + AOUTLEN + BMPLEN + 4 * IPACKS); if (!av7110->iobuf) goto err_pci_free_5; @@ -2632,7 +2632,7 @@ static int av7110_attach(struct saa7146_dev *dev, goto err_iobuf_vfree_6; /* init BMP buffer */ - av7110->bmpbuf = av7110->iobuf+AVOUTLEN+AOUTLEN; + av7110->bmpbuf = av7110->iobuf + AVOUTLEN + AOUTLEN; init_waitqueue_head(&av7110->bmpq); ret = av7110_ca_init(av7110); @@ -2653,7 +2653,7 @@ static int av7110_attach(struct saa7146_dev *dev, "dvb-ttpci: Warning, firmware version 0x%04x is too old. System might be unstable!\n", FW_VERSION(av7110->arm_app)); - thread = kthread_run(arm_thread, (void *) av7110, "arm_mon"); + thread = kthread_run(arm_thread, (void *)av7110, "arm_mon"); if (IS_ERR(thread)) { ret = PTR_ERR(thread); goto err_stop_arm_9; diff --git a/drivers/staging/media/av7110/av7110.h b/drivers/staging/media/av7110/av7110.h index 2290300ae..1cfe13df6 100644 --- a/drivers/staging/media/av7110/av7110.h +++ b/drivers/staging/media/av7110/av7110.h @@ -119,11 +119,11 @@ struct av7110 { void *iobuf; /* memory for all buffers */ struct dvb_ringbuffer avout; /* buffer for video or A/V mux */ -#define AVOUTLEN (128*1024) +#define AVOUTLEN (128 * 1024) struct dvb_ringbuffer aout; /* buffer for audio */ -#define AOUTLEN (64*1024) +#define AOUTLEN (64 * 1024) void *bmpbuf; -#define BMPLEN (8*32768+1024) +#define BMPLEN (8 * 32768 + 1024) /* bitmap buffers and states */ @@ -281,7 +281,7 @@ struct av7110 { }; extern int ChangePIDs(struct av7110 *av7110, u16 vpid, u16 apid, u16 ttpid, - u16 subpid, u16 pcrpid); + u16 subpid, u16 pcrpid); void av7110_ir_handler(struct av7110 *av7110, u32 ircom); int av7110_set_ir_config(struct av7110 *av7110); diff --git a/drivers/staging/media/av7110/av7110_av.c b/drivers/staging/media/av7110/av7110_av.c index 56fa1f180..e031d6028 100644 --- a/drivers/staging/media/av7110/av7110_av.c +++ b/drivers/staging/media/av7110/av7110_av.c @@ -91,7 +91,7 @@ int av7110_record_cb(struct dvb_filter_pes2ts *p2t, u8 *buf, size_t len) static int dvb_filter_pes2ts_cb(void *priv, unsigned char *data) { - struct dvb_demux_feed *dvbdmxfeed = (struct dvb_demux_feed *) priv; + struct dvb_demux_feed *dvbdmxfeed = (struct dvb_demux_feed *)priv; dvbdmxfeed->cb.ts(data, 188, NULL, 0, &dvbdmxfeed->feed.ts, NULL); @@ -117,7 +117,7 @@ int av7110_av_start_record(struct av7110 *av7110, int av, dvb_filter_pes2ts_init(&av7110->p2t[0], dvbdmx->pesfilter[0]->pid, dvb_filter_pes2ts_cb, - (void *) dvbdmx->pesfilter[0]); + (void *)dvbdmx->pesfilter[0]); ret = av7110_fw_cmd(av7110, COMTYPE_REC_PLAY, __Record, 2, AudioPES, 0); break; @@ -125,7 +125,7 @@ int av7110_av_start_record(struct av7110 *av7110, int av, dvb_filter_pes2ts_init(&av7110->p2t[1], dvbdmx->pesfilter[1]->pid, dvb_filter_pes2ts_cb, - (void *) dvbdmx->pesfilter[1]); + (void *)dvbdmx->pesfilter[1]); ret = av7110_fw_cmd(av7110, COMTYPE_REC_PLAY, __Record, 2, VideoPES, 0); break; @@ -133,11 +133,11 @@ int av7110_av_start_record(struct av7110 *av7110, int av, dvb_filter_pes2ts_init(&av7110->p2t[0], dvbdmx->pesfilter[0]->pid, dvb_filter_pes2ts_cb, - (void *) dvbdmx->pesfilter[0]); + (void *)dvbdmx->pesfilter[0]); dvb_filter_pes2ts_init(&av7110->p2t[1], dvbdmx->pesfilter[1]->pid, dvb_filter_pes2ts_cb, - (void *) dvbdmx->pesfilter[1]); + (void *)dvbdmx->pesfilter[1]); ret = av7110_fw_cmd(av7110, COMTYPE_REC_PLAY, __Record, 2, AV_PES, 0); break; } @@ -254,10 +254,10 @@ int av7110_pes_play(void *dest, struct dvb_ringbuffer *buf, int dlen) return -1; } - dvb_ringbuffer_read(buf, dest, (size_t) blen); + dvb_ringbuffer_read(buf, dest, (size_t)blen); dprintk(2, "pread=0x%08lx, pwrite=0x%08lx\n", - (unsigned long) buf->pread, (unsigned long) buf->pwrite); + (unsigned long)buf->pread, (unsigned long)buf->pwrite); wake_up(&buf->queue); return blen; } @@ -325,7 +325,7 @@ int av7110_set_vidmode(struct av7110 *av7110, enum av7110_video_mode mode) if (!ret && !av7110->playing) { ret = ChangePIDs(av7110, av7110->pids[DMX_PES_VIDEO], - av7110->pids[DMX_PES_AUDIO], + av7110->pids[DMX_PES_AUDIO], av7110->pids[DMX_PES_TELETEXT], 0, av7110->pids[DMX_PES_PCR]); if (!ret) @@ -404,7 +404,7 @@ static inline long aux_ring_buffer_write(struct dvb_ringbuffer *rbuf, static void play_video_cb(u8 *buf, int count, void *priv) { - struct av7110 *av7110 = (struct av7110 *) priv; + struct av7110 *av7110 = (struct av7110 *)priv; dprintk(2, "av7110:%p, \n", av7110); @@ -417,7 +417,7 @@ static void play_video_cb(u8 *buf, int count, void *priv) static void play_audio_cb(u8 *buf, int count, void *priv) { - struct av7110 *av7110 = (struct av7110 *) priv; + struct av7110 *av7110 = (struct av7110 *)priv; dprintk(2, "av7110:%p, \n", av7110); @@ -499,7 +499,7 @@ static ssize_t dvb_play(struct av7110 *av7110, const char __user *buf, } static ssize_t dvb_play_kernel(struct av7110 *av7110, const u8 *buf, - unsigned long count, int nonblock, int type) + unsigned long count, int nonblock, int type) { unsigned long todo = count, n; @@ -546,8 +546,8 @@ static ssize_t dvb_aplay(struct av7110 *av7110, const char __user *buf, if (nonblock) return count - todo; if (wait_event_interruptible(av7110->aout.queue, - (dvb_ringbuffer_free(&av7110->aout) >= 20 * 1024))) - return count-todo; + (dvb_ringbuffer_free(&av7110->aout) >= 20 * 1024))) + return count - todo; } n = todo; if (n > IPACKS * 2) @@ -688,7 +688,7 @@ void av7110_p2t_write(u8 const *buf, long int length, u16 pid, struct av7110_p2t if (p->pos) { c2 = find_pes_header(buf + c, length - c, &p->frags); if (c2 >= 0 && c2 < (TS_SIZE - 4) - p->pos) - l = c2+c; + l = c2 + c; else l = (TS_SIZE - 4) - p->pos; memcpy(p->pes + p->pos, buf, l); @@ -765,7 +765,7 @@ static void p_to_t(u8 const *buf, long int length, u16 pid, u8 *counter, pes_start = 0; if (length > 3 && - buf[0] == 0x00 && buf[1] == 0x00 && buf[2] == 0x01) + buf[0] == 0x00 && buf[1] == 0x00 && buf[2] == 0x01) switch (buf[3]) { case PROG_STREAM_MAP: case PRIVATE_STREAM2: @@ -1121,7 +1121,7 @@ static int dvb_video_ioctl(struct file *file, { struct dvb_device *dvbdev = file->private_data; struct av7110 *av7110 = dvbdev->priv; - unsigned long arg = (unsigned long) parg; + unsigned long arg = (unsigned long)parg; int ret = 0; dprintk(1, "av7110:%p, cmd=%04x\n", av7110,cmd); @@ -1143,7 +1143,7 @@ static int dvb_video_ioctl(struct file *file, ret = av7110_av_stop(av7110, RP_VIDEO); else ret = vidcom(av7110, AV_VIDEO_CMD_STOP, - av7110->videostate.video_blank ? 0 : 1); + av7110->videostate.video_blank ? 0 : 1); if (!ret) av7110->trickmode = TRICK_NONE; break; @@ -1193,11 +1193,11 @@ static int dvb_video_ioctl(struct file *file, break; case VIDEO_SELECT_SOURCE: - av7110->videostate.stream_source = (video_stream_source_t) arg; + av7110->videostate.stream_source = (video_stream_source_t)arg; break; case VIDEO_SET_BLANK: - av7110->videostate.video_blank = (int) arg; + av7110->videostate.video_blank = (int)arg; break; case VIDEO_GET_STATUS: @@ -1220,7 +1220,7 @@ static int dvb_video_ioctl(struct file *file, case VIDEO_SET_DISPLAY_FORMAT: { - video_displayformat_t format = (video_displayformat_t) arg; + video_displayformat_t format = (video_displayformat_t)arg; switch (format) { case VIDEO_PAN_SCAN: @@ -1250,14 +1250,14 @@ static int dvb_video_ioctl(struct file *file, } av7110->display_ar = arg; ret = av7110_fw_cmd(av7110, COMTYPE_ENCODER, SetMonitorType, - 1, (u16) arg); + 1, (u16)arg); break; #ifdef CONFIG_COMPAT case VIDEO_STILLPICTURE32: { struct compat_video_still_picture *pic = - (struct compat_video_still_picture *) parg; + (struct compat_video_still_picture *)parg; av7110->videostate.stream_source = VIDEO_SOURCE_MEMORY; dvb_ringbuffer_flush_spinlock_wakeup(&av7110->avout); ret = play_iframe(av7110, compat_ptr(pic->iFrame), @@ -1269,7 +1269,7 @@ static int dvb_video_ioctl(struct file *file, case VIDEO_STILLPICTURE: { struct video_still_picture *pic = - (struct video_still_picture *) parg; + (struct video_still_picture *)parg; av7110->videostate.stream_source = VIDEO_SOURCE_MEMORY; dvb_ringbuffer_flush_spinlock_wakeup(&av7110->avout); ret = play_iframe(av7110, pic->iFrame, pic->size, @@ -1291,7 +1291,7 @@ static int dvb_video_ioctl(struct file *file, break; case VIDEO_SLOWMOTION: - if (av7110->playing&RP_VIDEO) { + if (av7110->playing & RP_VIDEO) { if (av7110->trickmode != TRICK_SLOW) ret = av7110_fw_cmd(av7110, COMTYPE_REC_PLAY, __Slow, 2, 0, 0); if (!ret) @@ -1353,7 +1353,7 @@ static int dvb_audio_ioctl(struct file *file, { struct dvb_device *dvbdev = file->private_data; struct av7110 *av7110 = dvbdev->priv; - unsigned long arg = (unsigned long) parg; + unsigned long arg = (unsigned long)parg; int ret = 0; dprintk(1, "av7110:%p, cmd=%04x\n", av7110,cmd); @@ -1398,19 +1398,19 @@ static int dvb_audio_ioctl(struct file *file, break; case AUDIO_SELECT_SOURCE: - av7110->audiostate.stream_source = (audio_stream_source_t) arg; + av7110->audiostate.stream_source = (audio_stream_source_t)arg; break; case AUDIO_SET_MUTE: { ret = audcom(av7110, arg ? AUDIO_CMD_MUTE : AUDIO_CMD_UNMUTE); if (!ret) - av7110->audiostate.mute_state = (int) arg; + av7110->audiostate.mute_state = (int)arg; break; } case AUDIO_SET_AV_SYNC: - av7110->audiostate.AV_sync_state = (int) arg; + av7110->audiostate.AV_sync_state = (int)arg; ret = audcom(av7110, arg ? AUDIO_CMD_SYNC_ON : AUDIO_CMD_SYNC_OFF); break; @@ -1421,7 +1421,7 @@ static int dvb_audio_ioctl(struct file *file, break; case AUDIO_CHANNEL_SELECT: - av7110->audiostate.channel_select = (audio_channel_select_t) arg; + av7110->audiostate.channel_select = (audio_channel_select_t)arg; switch (av7110->audiostate.channel_select) { case AUDIO_STEREO: ret = audcom(av7110, AUDIO_CMD_STEREO); diff --git a/drivers/staging/media/av7110/av7110_av.h b/drivers/staging/media/av7110/av7110_av.h index 56b0e14bb..ce0f9945d 100644 --- a/drivers/staging/media/av7110/av7110_av.h +++ b/drivers/staging/media/av7110/av7110_av.h @@ -15,7 +15,7 @@ extern int av7110_set_volume(struct av7110 *av7110, unsigned int volleft, unsigned int volright); extern int av7110_av_stop(struct av7110 *av7110, int av); extern int av7110_av_start_record(struct av7110 *av7110, int av, - struct dvb_demux_feed *dvbdmxfeed); + struct dvb_demux_feed *dvbdmxfeed); extern int av7110_av_start_play(struct av7110 *av7110, int av); extern void dvb_video_add_event(struct av7110 *av7110, struct video_event *event); diff --git a/drivers/staging/media/av7110/av7110_ca.c b/drivers/staging/media/av7110/av7110_ca.c index 93b888c70..682204a6f 100644 --- a/drivers/staging/media/av7110/av7110_ca.c +++ b/drivers/staging/media/av7110/av7110_ca.c @@ -232,7 +232,7 @@ static int dvb_ca_ioctl(struct file *file, unsigned int cmd, void *parg) { struct dvb_device *dvbdev = file->private_data; struct av7110 *av7110 = dvbdev->priv; - unsigned long arg = (unsigned long) parg; + unsigned long arg = (unsigned long)parg; int ret = 0; dprintk(8, "av7110:%p\n",av7110); @@ -298,11 +298,11 @@ static int dvb_ca_ioctl(struct file *file, unsigned int cmd, void *parg) return -EINVAL; } av7110_fw_cmd(av7110, COMTYPE_PIDFILTER, SetDescr, 5, - (descr->index<<8)|descr->parity, - (descr->cw[0]<<8)|descr->cw[1], - (descr->cw[2]<<8)|descr->cw[3], - (descr->cw[4]<<8)|descr->cw[5], - (descr->cw[6]<<8)|descr->cw[7]); + (descr->index << 8) | descr->parity, + (descr->cw[0] << 8) | descr->cw[1], + (descr->cw[2] << 8) | descr->cw[3], + (descr->cw[4] << 8) | descr->cw[5], + (descr->cw[6] << 8) | descr->cw[7]); break; } diff --git a/drivers/staging/media/av7110/av7110_hw.c b/drivers/staging/media/av7110/av7110_hw.c index d3aa524f6..ef4090fb1 100644 --- a/drivers/staging/media/av7110/av7110_hw.c +++ b/drivers/staging/media/av7110/av7110_hw.c @@ -410,14 +410,14 @@ static int __av7110_send_fw_cmd(struct av7110 *av7110, u16 *buf, int length) } for (i = 2; i < length; i++) - wdebi(av7110, DEBINOSWAP, COMMAND + 2 * i, (u32) buf[i], 2); + wdebi(av7110, DEBINOSWAP, COMMAND + 2 * i, (u32)buf[i], 2); if (length) - wdebi(av7110, DEBINOSWAP, COMMAND + 2, (u32) buf[1], 2); + wdebi(av7110, DEBINOSWAP, COMMAND + 2, (u32)buf[1], 2); else wdebi(av7110, DEBINOSWAP, COMMAND + 2, 0, 2); - wdebi(av7110, DEBINOSWAP, COMMAND, (u32) buf[0], 2); + wdebi(av7110, DEBINOSWAP, COMMAND, (u32)buf[0], 2); if (FW_VERSION(av7110->arm_app) <= 0x261f) wdebi(av7110, DEBINOSWAP, COM_IF_LOCK, 0x0000, 2); @@ -685,14 +685,14 @@ static inline int SetColorBlend(struct av7110 *av7110, u8 windownr) } static inline int SetBlend_(struct av7110 *av7110, u8 windownr, - enum av7110_osd_palette_type colordepth, u16 index, u8 blending) + enum av7110_osd_palette_type colordepth, u16 index, u8 blending) { return av7110_fw_cmd(av7110, COMTYPE_OSD, SetBlend, 4, windownr, colordepth, index, blending); } static inline int SetColor_(struct av7110 *av7110, u8 windownr, - enum av7110_osd_palette_type colordepth, u16 index, u16 colorhi, u16 colorlo) + enum av7110_osd_palette_type colordepth, u16 index, u16 colorhi, u16 colorlo) { return av7110_fw_cmd(av7110, COMTYPE_OSD, SetColor, 5, windownr, colordepth, index, colorhi, colorlo); @@ -832,7 +832,7 @@ static osd_raw_window_t bpp2bit[8] = { static inline int WaitUntilBmpLoaded(struct av7110 *av7110) { int ret = wait_event_timeout(av7110->bmpq, - av7110->bmp_state != BMP_LOADING, 10*HZ); + av7110->bmp_state != BMP_LOADING, 10 * HZ); if (ret == 0) { printk("dvb-ttpci: warning: timeout waiting in LoadBitmap: %d, %d\n", ret, av7110->bmp_state); @@ -1046,7 +1046,7 @@ int av7110_osd_cmd(struct av7110 *av7110, osd_cmd_t *dc) case OSD_Open: av7110->osdbpp[av7110->osdwin] = (dc->color - 1) & 7; ret = CreateOSDWindow(av7110, av7110->osdwin, - bpp2bit[av7110->osdbpp[av7110->osdwin]], + bpp2bit[av7110->osdbpp[av7110->osdwin]], dc->x1 - dc->x0 + 1, dc->y1 - dc->y0 + 1); if (ret) break; @@ -1076,7 +1076,7 @@ int av7110_osd_cmd(struct av7110 *av7110, osd_cmd_t *dc) if (FW_VERSION(av7110->arm_app) >= 0x2618) ret = OSDSetPalette(av7110, dc->data, dc->color, dc->x0); else { - int i, len = dc->x0-dc->color+1; + int i, len = dc->x0 - dc->color + 1; u8 __user *colors = (u8 __user *)dc->data; u8 r, g = 0, b = 0, blend = 0; @@ -1097,7 +1097,7 @@ int av7110_osd_cmd(struct av7110 *av7110, osd_cmd_t *dc) break; case OSD_SetPixel: ret = DrawLine(av7110, av7110->osdwin, - dc->x0, dc->y0, 0, 0, dc->color); + dc->x0, dc->y0, 0, 0, dc->color); break; case OSD_SetRow: dc->y1 = dc->y0; @@ -1107,15 +1107,15 @@ int av7110_osd_cmd(struct av7110 *av7110, osd_cmd_t *dc) break; case OSD_FillRow: ret = DrawBlock(av7110, av7110->osdwin, dc->x0, dc->y0, - dc->x1-dc->x0+1, dc->y1, dc->color); + dc->x1 - dc->x0 + 1, dc->y1, dc->color); break; case OSD_FillBlock: ret = DrawBlock(av7110, av7110->osdwin, dc->x0, dc->y0, - dc->x1 - dc->x0 + 1, dc->y1 - dc->y0 + 1, dc->color); + dc->x1 - dc->x0 + 1, dc->y1 - dc->y0 + 1, dc->color); break; case OSD_Line: ret = DrawLine(av7110, av7110->osdwin, - dc->x0, dc->y0, dc->x1 - dc->x0, dc->y1 - dc->y0, dc->color); + dc->x0, dc->y0, dc->x1 - dc->x0, dc->y1 - dc->y0, dc->color); break; case OSD_Text: { @@ -1129,7 +1129,7 @@ int av7110_osd_cmd(struct av7110 *av7110, osd_cmd_t *dc) if (dc->x1 > 3) dc->x1 = 3; ret = SetFont(av7110, av7110->osdwin, dc->x1, - (u16) (dc->color & 0xffff), (u16) (dc->color >> 16)); + (u16)(dc->color & 0xffff), (u16)(dc->color >> 16)); if (!ret) ret = FlushText(av7110); if (!ret) @@ -1159,7 +1159,7 @@ int av7110_osd_cmd(struct av7110 *av7110, osd_cmd_t *dc) else av7110->osdbpp[av7110->osdwin] = 0; ret = CreateOSDWindow(av7110, av7110->osdwin, (osd_raw_window_t)dc->color, - dc->x1 - dc->x0 + 1, dc->y1 - dc->y0 + 1); + dc->x1 - dc->x0 + 1, dc->y1 - dc->y0 + 1); if (ret) break; if (!dc->data) { diff --git a/drivers/staging/media/av7110/av7110_hw.h b/drivers/staging/media/av7110/av7110_hw.h index 39488c2fc..3d0afae7f 100644 --- a/drivers/staging/media/av7110/av7110_hw.h +++ b/drivers/staging/media/av7110/av7110_hw.h @@ -11,7 +11,7 @@ #define DEBISWAP 0x002e0000 #define ARM_WAIT_FREE (HZ) -#define ARM_WAIT_SHAKE (HZ/5) +#define ARM_WAIT_SHAKE (HZ / 5) #define ARM_WAIT_OSD (HZ) enum av7110_bootstate { @@ -311,13 +311,13 @@ enum av7110_command_type { #define DATA_BUFF0_BASE (DPRAM_BASE + 0x200) #define DATA_BUFF0_SIZE 0x0800 -#define DATA_BUFF1_BASE (DATA_BUFF0_BASE+DATA_BUFF0_SIZE) +#define DATA_BUFF1_BASE (DATA_BUFF0_BASE + DATA_BUFF0_SIZE) #define DATA_BUFF1_SIZE 0x0800 -#define DATA_BUFF2_BASE (DATA_BUFF1_BASE+DATA_BUFF1_SIZE) +#define DATA_BUFF2_BASE (DATA_BUFF1_BASE + DATA_BUFF1_SIZE) #define DATA_BUFF2_SIZE 0x0800 -#define DATA_BUFF3_BASE (DATA_BUFF2_BASE+DATA_BUFF2_SIZE) +#define DATA_BUFF3_BASE (DATA_BUFF2_BASE + DATA_BUFF2_SIZE) #define DATA_BUFF3_SIZE 0x0400 #define Reserved (DPRAM_BASE + 0x1E00) @@ -393,7 +393,7 @@ static inline u32 irdebi(struct av7110 *av7110, u32 config, int addr, u32 val, u res = av7110_debiread(av7110, config, addr, count); if (count <= 4) - memcpy(av7110->debi_virt, (char *) &res, count); + memcpy(av7110->debi_virt, (char *)&res, count); return res; } @@ -456,14 +456,14 @@ static inline int av7710_set_video_mode(struct av7110 *av7110, int mode) static inline int vidcom(struct av7110 *av7110, u32 com, u32 arg) { return av7110_fw_cmd(av7110, COMTYPE_MISC, AV7110_FW_VIDEO_COMMAND, 4, - (com>>16), (com&0xffff), - (arg>>16), (arg&0xffff)); + (com >> 16), (com & 0xffff), + (arg >> 16), (arg & 0xffff)); } static inline int audcom(struct av7110 *av7110, u32 com) { return av7110_fw_cmd(av7110, COMTYPE_MISC, AV7110_FW_AUDIO_COMMAND, 2, - (com>>16), (com&0xffff)); + (com >> 16), (com & 0xffff)); } static inline int Set22K(struct av7110 *av7110, int state) diff --git a/drivers/staging/media/av7110/av7110_ipack.c b/drivers/staging/media/av7110/av7110_ipack.c index ac00bff44..9fe18f470 100644 --- a/drivers/staging/media/av7110/av7110_ipack.c +++ b/drivers/staging/media/av7110/av7110_ipack.c @@ -59,7 +59,7 @@ static void send_ipack(struct ipack *p) streamid = p->buf[off]; if ((streamid & 0xf8) == 0x80) { ai.off = 0; - ac3_off = ((p->buf[off + 2] << 8)| + ac3_off = ((p->buf[off + 2] << 8) | p->buf[off + 3]); if (ac3_off < p->count) f = dvb_filter_get_ac3info(p->buf + off + 3 + ac3_off, @@ -124,12 +124,12 @@ static void write_ipack(struct ipack *p, const u8 *data, int count) } if (p->count + count < p->size) { - memcpy(p->buf+p->count, data, count); + memcpy(p->buf + p->count, data, count); p->count += count; } else { int rest = p->size - p->count; - memcpy(p->buf+p->count, data, rest); + memcpy(p->buf + p->count, data, rest); p->count += rest; send_ipack(p); if (count - rest > 0) @@ -191,7 +191,7 @@ int av7110_ipack_instant_repack(const u8 *buf, int count, struct ipack *p) break; case 4: - if (count-c > 1) { + if (count - c > 1) { p->plen[0] = buf[c]; c++; p->plen[1] = buf[c]; diff --git a/drivers/staging/media/av7110/av7110_v4l.c b/drivers/staging/media/av7110/av7110_v4l.c index 202a05561..3090efb00 100644 --- a/drivers/staging/media/av7110/av7110_v4l.c +++ b/drivers/staging/media/av7110/av7110_v4l.c @@ -86,7 +86,7 @@ static struct v4l2_input inputs[4] = { .type = V4L2_INPUT_TYPE_CAMERA, .audioset = 1, .tuner = 0, /* ignored */ - .std = V4L2_STD_PAL_BG|V4L2_STD_NTSC_M, + .std = V4L2_STD_PAL_BG | V4L2_STD_NTSC_M, .status = 0, .capabilities = V4L2_IN_CAP_STD, }, { @@ -95,7 +95,7 @@ static struct v4l2_input inputs[4] = { .type = V4L2_INPUT_TYPE_TUNER, .audioset = 1, .tuner = 0, - .std = V4L2_STD_PAL_BG|V4L2_STD_NTSC_M, + .std = V4L2_STD_PAL_BG | V4L2_STD_NTSC_M, .status = 0, .capabilities = V4L2_IN_CAP_STD, }, { @@ -104,7 +104,7 @@ static struct v4l2_input inputs[4] = { .type = V4L2_INPUT_TYPE_CAMERA, .audioset = 0, .tuner = 0, - .std = V4L2_STD_PAL_BG|V4L2_STD_NTSC_M, + .std = V4L2_STD_PAL_BG | V4L2_STD_NTSC_M, .status = 0, .capabilities = V4L2_IN_CAP_STD, }, { @@ -113,7 +113,7 @@ static struct v4l2_input inputs[4] = { .type = V4L2_INPUT_TYPE_CAMERA, .audioset = 0, .tuner = 0, - .std = V4L2_STD_PAL_BG|V4L2_STD_NTSC_M, + .std = V4L2_STD_PAL_BG | V4L2_STD_NTSC_M, .status = 0, .capabilities = V4L2_IN_CAP_STD, } @@ -529,7 +529,7 @@ static int vidioc_s_audio(struct file *file, void *fh, const struct v4l2_audio * } static int vidioc_g_sliced_vbi_cap(struct file *file, void *fh, - struct v4l2_sliced_vbi_cap *cap) + struct v4l2_sliced_vbi_cap *cap) { struct saa7146_dev *dev = video_drvdata(file); struct av7110 *av7110 = (struct av7110 *)dev->ext_priv; @@ -545,7 +545,7 @@ static int vidioc_g_sliced_vbi_cap(struct file *file, void *fh, } static int vidioc_g_fmt_sliced_vbi_out(struct file *file, void *fh, - struct v4l2_format *f) + struct v4l2_format *f) { struct saa7146_dev *dev = video_drvdata(file); struct av7110 *av7110 = (struct av7110 *)dev->ext_priv; @@ -584,7 +584,7 @@ static int vidioc_try_fmt_sliced_vbi_out(struct file *file, void *fh, } static int vidioc_s_fmt_sliced_vbi_out(struct file *file, void *fh, - struct v4l2_format *f) + struct v4l2_format *f) { struct saa7146_dev *dev = video_drvdata(file); struct av7110 *av7110 = (struct av7110 *)dev->ext_priv; diff --git a/drivers/staging/media/av7110/dvb_filter.c b/drivers/staging/media/av7110/dvb_filter.c index 4c41682ff..515b4288b 100644 --- a/drivers/staging/media/av7110/dvb_filter.c +++ b/drivers/staging/media/av7110/dvb_filter.c @@ -29,7 +29,7 @@ int dvb_filter_get_ac3info(u8 *mbuf, int count, struct dvb_audio_info *ai, int p int fr = 0; while (!found && c < count) { - u8 *b = mbuf+c; + u8 *b = mbuf + c; if (b[0] == 0x0b && b[1] == 0x77) found = 1; @@ -48,17 +48,17 @@ int dvb_filter_get_ac3info(u8 *mbuf, int count, struct dvb_audio_info *ai, int p return -1; ai->layer = 0; // 0 for AC3 - headr = mbuf+c+2; + headr = mbuf + c + 2; - frame = (headr[2]&0x3f); - ai->bit_rate = ac3_bitrates[frame >> 1]*1000; + frame = (headr[2] & 0x3f); + ai->bit_rate = ac3_bitrates[frame >> 1] * 1000; if (pr) printk(KERN_CONT " BRate: %d kb/s", (int) ai->bit_rate/1000); ai->frequency = (headr[2] & 0xc0) >> 6; fr = (headr[2] & 0xc0) >> 6; - ai->frequency = freq[fr]*100; + ai->frequency = freq[fr] * 100; if (pr) printk(KERN_CONT " Freq: %d Hz\n", (int) ai->frequency); @@ -99,7 +99,7 @@ int dvb_filter_pes2ts(struct dvb_filter_pes2ts *p2ts, unsigned char *pes, buf[1] &= ~0x40; while (len >= 184) { buf[3] = 0x10 | ((p2ts->cc++) & 0x0f); - memcpy(buf+4, pes, 184); + memcpy(buf + 4, pes, 184); if ((ret=p2ts->cb(p2ts->priv, buf))) return ret; len -= 184; pes += 184; @@ -111,10 +111,10 @@ int dvb_filter_pes2ts(struct dvb_filter_pes2ts *p2ts, unsigned char *pes, rest = 183 - len; if (rest) { buf[5] = 0x00; - if (rest-1) - memset(buf+6, 0xff, rest-1); + if (rest - 1) + memset(buf + 6, 0xff, rest - 1); } buf[4] = rest; - memcpy(buf+5+rest, pes, len); + memcpy(buf + 5 + rest, pes, len); return p2ts->cb(p2ts->priv, buf); } diff --git a/drivers/staging/media/av7110/dvb_filter.h b/drivers/staging/media/av7110/dvb_filter.h index 43a36d653..471b53058 100644 --- a/drivers/staging/media/av7110/dvb_filter.h +++ b/drivers/staging/media/av7110/dvb_filter.h @@ -21,7 +21,7 @@ #include -typedef int (dvb_filter_pes2ts_cb_t) (void *, unsigned char *); +typedef int (dvb_filter_pes2ts_cb_t)(void *, unsigned char *); struct dvb_filter_pes2ts { unsigned char buf[188]; @@ -118,7 +118,7 @@ int dvb_filter_pes2ts(struct dvb_filter_pes2ts *p2ts, unsigned char *pes, #define SEAM_SPLICE 0x20 #define MAX_PLENGTH 0xFFFF -#define MMAX_PLENGTH (256*MAX_PLENGTH) +#define MMAX_PLENGTH (256 * MAX_PLENGTH) #ifndef IPACKS #define IPACKS 2048 From patchwork Tue May 7 00:24:51 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Herdler X-Patchwork-Id: 13656139 Received: from mout.gmx.net (mout.gmx.net [212.227.17.20]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 645328BE8 for ; Tue, 7 May 2024 00:25:31 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=212.227.17.20 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1715041536; cv=none; b=oZbjvRfT1pHXGNL7qwQMoemkruwn08JPOANkN2i716NiY8oP2B0n8T3AXlBXNNpQ4+dP8GWfxR8vVvLdBf/Emnyldxg3WaMpgshaa7YINIwCIpOx/Zglg6Fg3Q/wXxksGuGdvainbRLuhMnE+6rBbxSypr2K91f8RqENjZ7SMQc= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1715041536; c=relaxed/simple; bh=ZOOCalL79QkapZgj9hh17mZ9cLA7D/mYc1DBzl/qel4=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=On8r8FEE4jZH+KAH8N/yNEKQixCP74hA0UYLp5KxxGwUUmreYS2Ugi/c5o6UCJYieWDfvMTwoGyiQu/UQTramXAoG9nzHhjMbPMDlcXmXFl0Na3sdnMUHD+4EXacqygcH+xbqFUtJqMrgwU4aqqQgs6tq8hpC9R1tOwEFcgKyk4= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=nurfuerspam.de; spf=pass smtp.mailfrom=nurfuerspam.de; dkim=pass (2048-bit key) header.d=nurfuerspam.de header.i=herdler@nurfuerspam.de header.b=WYKbPOnF; arc=none smtp.client-ip=212.227.17.20 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=nurfuerspam.de Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=nurfuerspam.de Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=nurfuerspam.de header.i=herdler@nurfuerspam.de header.b="WYKbPOnF" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nurfuerspam.de; s=s31663417; t=1715041528; x=1715646328; i=herdler@nurfuerspam.de; bh=v+/E3QZqnpGZAXwWhZ3bSwkLV+GSI8f/B/7CmB6coPw=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date:Message-Id:In-Reply-To: References:MIME-Version:Content-Transfer-Encoding:cc: content-transfer-encoding:content-type:date:from:message-id: mime-version:reply-to:subject:to; b=WYKbPOnF68rmdNkvbgdQZb010tDqkcGSTAIUbXYutbZRItVsgKDXIOvYm3u1977z 1Bahz4KvLjJwYItFdDEgXrmxIvCwLfRiACbEjf6TaYok2FOgipzXOyfKksHxApzNb Aw4W2XVmkXTLny6loEopcb9zI05LrFlOEnM+J1pZVvUUHP5ckhnuiZEYW77qLM5s2 DRj++SMZQAjhPxkQT02l4yx0BG+4BU2WfkakHkvG83rmF6+fbdQfl9q9KfsumFQhd iI2e9FKIMFDNO34kjxkzR+6/uxtyk6f+WRHU0Ue+4w2TdsmeuQgWyfqtL1PSZPAfK xNo0BJWNlm6bI1ebeg== X-UI-Sender-Class: 724b4f7f-cbec-4199-ad4e-598c01a50d3a Received: from astro.haus ([185.101.174.109]) by mail.gmx.net (mrgmx105 [212.227.17.168]) with ESMTPSA (Nemesis) id 1MDhhX-1rwg7b0jA7-00An68; Tue, 07 May 2024 02:25:28 +0200 From: Stefan Herdler To: hverkuil-cisco@xs4all.nl Cc: linux-media@vger.kernel.org, smoch@web.de, tmn505@gmail.com, vinschen@redhat.com Subject: [PATCH 12/21] media: av7110: coding style fixes: comments Date: Tue, 7 May 2024 02:24:51 +0200 Message-Id: <20240507002500.81867-13-herdler@nurfuerspam.de> X-Mailer: git-send-email 2.34.0 In-Reply-To: <20240507002500.81867-1-herdler@nurfuerspam.de> References: <20240507002500.81867-1-herdler@nurfuerspam.de> Precedence: bulk X-Mailing-List: linux-media@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Provags-ID: V03:K1:RfJsmYupeloi4rTJHzg/tiL7WUPnk2UB9ObRLSFDX/EyXA72t+a DkwthUHmF2h1SFbSbFZiXIsahYmIuFkkF3GIs6X20/8sJw/1Sehqz32BZ4KvDYov/+akgqx N/4PfFRL9w/v10kpIJPH2fIF6OUaFkr6ywt6bNZpCEAuWczYzjU4j+0AcR/LSNoHJXDgA1/ bDtDahqwDfyMOSzWixt8g== X-Spam-Flag: NO UI-OutboundReport: notjunk:1;M01:P0:fvJQ2IcNV8Y=;xYfzVyFMc5yZ6J/RW8cadw+W30T TMVMEOiWxOASIUsq1gCeeUgNbE++Av1o7/zH5UDF3Kz0kUSdL6EFDU4cZgx6+kLoDdTNRVOpt G8fUVml10JVWIiGKJRLJtxeRAA23cvwkATTlwYwLajCLREMV4LunF8e6ftObcs0VeS2yRGwfi EupAHA6QLFDe+wURu2tP7RhllLVMxpQ71K5Y2NppnWFq3j5Q0JRH6l5Ha/GCUEVelx09lCTvi VSPulVs4SH9X1mts7ewQQ1Or8Q/4NhnPP+ANk+x6qqcG09sg+L2XIW9WiicdJWn+hTKH2mnQS /Et25N72Fl4cfKPKdBi60LhpSFsOjqPlbKbo0rip98uG/d3s9QgG0myWSb4jq7nCIyqcqNjmS hkU62PL09/qAeJML2gQ891QxP/wCJCQ79RHVvM64ayMsT0khFk/BnLwjdomsNbD/QgTuZbBVh V00krgUveDX1F5MSg6P6Ijm9/4/xf0FsA/NvRLwfpF3ra65vB7C1H2RKfySmD2wNGdVhvstGV 77KRdrEWkvv99nxreRKU9Annt5hvbuFSBJdBn4jAJqHIOEnDSTE94gXg2U6eOboL7rU1mYFjq ohJ04SGOLer8WUsxjsoCVpV+zz4yaPgw/FlyB+fAiFT3U1KCADM+Da0AjcKPiJFtVPq85YaJS bCEdfH7SjmFqZ2hfwtTNbOHmb3QpBVQJo9gZgYLwfWfM0NNHhtQLb4GKcmSoTru1fFUZUALXT Stq11XCwqycT3oDs1KjumHaSIRsietJBqavQoLlUUhYImjkWVqeEXpS+Ei2Y5FOch4HWA3h1e 53xXJ40VWzXzEDOxkBbb96uFzGlgq6u3LJAVrY3NpsQ0I= This patch fixes the following checkpatch warnings: WARNING:BLOCK_COMMENT_STYLE: Block comments use a trailing */ on a separate line WARNING:BLOCK_COMMENT_STYLE: Block comments use * on subsequent lines WARNING:SPDX_LICENSE_TAG: Missing or malformed SPDX-License-Identifier tag in line 1 WARNING:EMBEDDED_FILENAME: It's generally not useful to have the filename in the file Signed-off-by: Stefan Herdler --- drivers/staging/media/av7110/av7110.c | 14 ++++++++------ drivers/staging/media/av7110/av7110_av.c | 6 ++++-- drivers/staging/media/av7110/av7110_ca.c | 3 ++- drivers/staging/media/av7110/av7110_hw.c | 9 ++++++--- drivers/staging/media/av7110/av7110_hw.h | 6 ++++-- drivers/staging/media/av7110/av7110_v4l.c | 14 +++++++++----- drivers/staging/media/av7110/dvb_filter.h | 12 ++++++------ 7 files changed, 39 insertions(+), 25 deletions(-) -- 2.34.0 diff --git a/drivers/staging/media/av7110/av7110.c b/drivers/staging/media/av7110/av7110.c index 27019e3f3..49735cbb2 100644 --- a/drivers/staging/media/av7110/av7110.c +++ b/drivers/staging/media/av7110/av7110.c @@ -1,7 +1,7 @@ // SPDX-License-Identifier: GPL-2.0-or-later /* * driver for the SAA7146 based AV110 cards (like the Fujitsu-Siemens DVB) - * av7110.c: initialization and demux stuff + * - initialization and demux stuff * * Copyright (C) 1999-2002 Ralph Metzler * & Marcus Metzler for convergence integrated media GmbH @@ -2444,7 +2444,8 @@ static int av7110_attach(struct saa7146_dev *dev, goto err_put_firmware_1; /* the Siemens DVB needs this if you want to have the i2c chips - get recognized before the main driver is fully loaded */ + * get recognized before the main driver is fully loaded + */ saa7146_write(dev, GPIO_CTRL, 0x500000); strscpy(av7110->i2c_adap.name, pci_ext->ext_priv, @@ -2671,8 +2672,9 @@ static int av7110_attach(struct saa7146_dev *dev, init_av7110_av(av7110); /* special case DVB-C: these cards have an analog tuner - plus need some special handling, so we have separate - saa7146_ext_vv data for these... */ + * plus need some special handling, so we have separate + * saa7146_ext_vv data for these... + */ ret = av7110_init_v4l(av7110); if (ret < 0) goto err_av7110_unregister_11; @@ -2853,8 +2855,8 @@ static const struct pci_device_id pci_tbl[] = { MAKE_EXTENSION_PCI(tts_2_3, 0x13c2, 0x000e), MAKE_EXTENSION_PCI(tts_1_3se, 0x13c2, 0x1002), -/* MAKE_EXTENSION_PCI(???, 0x13c2, 0x0005), UNDEFINED CARD */ // Technisat SkyStar1 -/* MAKE_EXTENSION_PCI(???, 0x13c2, 0x0009), UNDEFINED CARD */ // TT/Hauppauge WinTV Nexus-CA v???? +// MAKE_EXTENSION_PCI(???, 0x13c2, 0x0005), UNDEFINED CARD // Technisat SkyStar1 +// MAKE_EXTENSION_PCI(???, 0x13c2, 0x0009), UNDEFINED CARD // TT/Hauppauge WinTV Nexus-CA v??? { .vendor = 0, diff --git a/drivers/staging/media/av7110/av7110_av.c b/drivers/staging/media/av7110/av7110_av.c index e031d6028..f5200aa3d 100644 --- a/drivers/staging/media/av7110/av7110_av.c +++ b/drivers/staging/media/av7110/av7110_av.c @@ -1,6 +1,7 @@ // SPDX-License-Identifier: GPL-2.0-or-later /* - * av7110_av.c: audio and video MPEG decoder stuff + * driver for the SAA7146 based AV110 cards + * - audio and video MPEG decoder stuff * * Copyright (C) 1999-2002 Ralph Metzler * & Marcus Metzler for convergence integrated media GmbH @@ -1060,7 +1061,8 @@ static int play_iframe(struct av7110 *av7110, char __user *buf, unsigned int len } /* setting n always > 1, fixes problems when playing stillframes - consisting of I- and P-Frames */ + * consisting of I- and P-Frames + */ n = MIN_IFRAME / len + 1; /* FIXME: nonblock? */ diff --git a/drivers/staging/media/av7110/av7110_ca.c b/drivers/staging/media/av7110/av7110_ca.c index 682204a6f..c28e41d42 100644 --- a/drivers/staging/media/av7110/av7110_ca.c +++ b/drivers/staging/media/av7110/av7110_ca.c @@ -1,6 +1,7 @@ // SPDX-License-Identifier: GPL-2.0-or-later /* - * av7110_ca.c: CA and CI stuff + * driver for the SAA7146 based AV110 cards + * - CA and CI stuff * * Copyright (C) 1999-2002 Ralph Metzler * & Marcus Metzler for convergence integrated media GmbH diff --git a/drivers/staging/media/av7110/av7110_hw.c b/drivers/staging/media/av7110/av7110_hw.c index ef4090fb1..c7ea72128 100644 --- a/drivers/staging/media/av7110/av7110_hw.c +++ b/drivers/staging/media/av7110/av7110_hw.c @@ -1,6 +1,7 @@ // SPDX-License-Identifier: GPL-2.0-or-later /* - * av7110_hw.c: av7110 low level hardware access and firmware interface + * driver for the SAA7146 based AV110 cards + * - av7110 low level hardware access and firmware interface * * Copyright (C) 1999-2002 Ralph Metzler * & Marcus Metzler for convergence integrated media GmbH @@ -38,7 +39,8 @@ ****************************************************************************/ /* This DEBI code is based on the Stradis driver - by Nathan Laredo */ + * by Nathan Laredo + */ int av7110_debiwrite(struct av7110 *av7110, u32 config, int addr, u32 val, unsigned int count) @@ -187,7 +189,8 @@ static int load_dram(struct av7110 *av7110, u32 *data, int len) } /* we cannot write av7110 DRAM directly, so load a bootloader into - * the DPRAM which implements a simple boot protocol */ + * the DPRAM which implements a simple boot protocol + */ int av7110_bootarm(struct av7110 *av7110) { const struct firmware *fw; diff --git a/drivers/staging/media/av7110/av7110_hw.h b/drivers/staging/media/av7110/av7110_hw.h index 3d0afae7f..c13b8c479 100644 --- a/drivers/staging/media/av7110/av7110_hw.h +++ b/drivers/staging/media/av7110/av7110_hw.h @@ -250,7 +250,8 @@ enum av7110_command_type { #define DATA_TS_PLAY 0x13 /* ancient CI command codes, only two are actually still used - * by the link level CI firmware */ + * by the link level CI firmware + */ #define CI_CMD_ERROR 0x00 #define CI_CMD_ACK 0x01 #define CI_CMD_SYSTEM_READY 0x02 @@ -286,7 +287,8 @@ enum av7110_command_type { /* base address of the dual ported RAM which serves as communication * area between PCI bus and av7110, - * as seen by the DEBI bus of the saa7146 */ + * as seen by the DEBI bus of the saa7146 + */ #define DPRAM_BASE 0x4000 /* boot protocol area */ diff --git a/drivers/staging/media/av7110/av7110_v4l.c b/drivers/staging/media/av7110/av7110_v4l.c index 3090efb00..633dbb697 100644 --- a/drivers/staging/media/av7110/av7110_v4l.c +++ b/drivers/staging/media/av7110/av7110_v4l.c @@ -1,6 +1,7 @@ // SPDX-License-Identifier: GPL-2.0-or-later /* - * av7110_v4l.c: av7110 video4linux interface for DVB and Siemens DVB-C analog module + * driver for the SAA7146 based AV110 cards + * - video4linux interface for DVB and Siemens DVB-C analog module * * Copyright (C) 1999-2002 Ralph Metzler * & Marcus Metzler for convergence integrated media GmbH @@ -153,7 +154,8 @@ static int ves1820_set_tv_freq(struct saa7146_dev *dev, u32 freq) dprintk(4, "freq: 0x%08x\n", freq); /* magic number: 614. tuning with the frequency given by v4l2 - is always off by 614*62.5 = 38375 kHz...*/ + * is always off by 614*62.5 = 38375 kHz... + */ div = freq + 614; buf[0] = (div >> 8) & 0x7f; @@ -801,8 +803,9 @@ int av7110_init_v4l(struct av7110 *av7110) int ret; /* special case DVB-C: these cards have an analog tuner - plus need some special handling, so we have separate - saa7146_ext_vv data for these... */ + * plus need some special handling, so we have separate + * saa7146_ext_vv data for these... + */ if (av7110->analog_tuner_flags) vv_data = &av7110_vv_data_c; else @@ -865,7 +868,8 @@ int av7110_exit_v4l(struct av7110 *av7110) } /* FIXME: these values are experimental values that look better than the - values from the latest "official" driver -- at least for me... (MiHu) */ + * values from the latest "official" driver -- at least for me... (MiHu) + */ static struct saa7146_standard standard[] = { { .name = "PAL", .id = V4L2_STD_PAL_BG, diff --git a/drivers/staging/media/av7110/dvb_filter.h b/drivers/staging/media/av7110/dvb_filter.h index 471b53058..38b483508 100644 --- a/drivers/staging/media/av7110/dvb_filter.h +++ b/drivers/staging/media/av7110/dvb_filter.h @@ -1,6 +1,5 @@ +/* SPDX-License-Identifier: GPL-2.0 */ /* - * dvb_filter.h - * * Copyright (C) 2003 Convergence GmbH * * This program is free software; you can redistribute it and/or @@ -184,10 +183,11 @@ struct mpg_picture { s8 matrix_change_flag; u8 picture_header_parameter; - /* bit 0 - 2: bwd f code - bit 3 : fpb vector - bit 4 - 6: fwd f code - bit 7 : fpf vector */ + /* bit 0 - 2: bwd f code + * bit 3 : fpb vector + * bit 4 - 6: fwd f code + * bit 7 : fpf vector + */ int mpeg1_flag; int progressive_sequence; From patchwork Tue May 7 00:24:52 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Herdler X-Patchwork-Id: 13656140 Received: from mout.gmx.net (mout.gmx.net [212.227.17.21]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id D4DE019E for ; Tue, 7 May 2024 00:25:31 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=212.227.17.21 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1715041536; cv=none; b=qIeH3jD3g9kKlSykcDcLsqo3u47pDAiPHN1LI+hozWJerNe8x8H2bFmG8vkJwC+UQmZb1yM+WOk3+8ICGKmy9DpDvP2mmffOdFg/bwGWFh/fcrHwVFSokI4MJQzsJgOjIU59SqL9c3BZKf6XpF56brwxJG6+C4pN30NzFmyCfNM= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1715041536; c=relaxed/simple; bh=+/q3KgKBBjd7eys1EDa9bYyst1ufISVg+xsZP17DeBQ=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=eCcoWYgjeF0SZMNXK1Wb4nPz6ewcCYStKl9CB4jIbWCEZ3Ej69JjCAC+jXY9z5UuBQVHKCkDK1haG5+teoQd5KXJkyXX37/uBryeAeGCI2PxCp9HM1t1wEy2SYCSCVFn0sRt3P2lrCFK3dHewGA/9FaRDiw55QP/Ekw0k1/Ljzo= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=nurfuerspam.de; spf=pass smtp.mailfrom=nurfuerspam.de; dkim=pass (2048-bit key) header.d=nurfuerspam.de header.i=herdler@nurfuerspam.de header.b=K5zBx8F0; arc=none smtp.client-ip=212.227.17.21 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=nurfuerspam.de Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=nurfuerspam.de Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=nurfuerspam.de header.i=herdler@nurfuerspam.de header.b="K5zBx8F0" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nurfuerspam.de; s=s31663417; t=1715041528; x=1715646328; i=herdler@nurfuerspam.de; bh=r4ZKA1+HNdu+SCUBAwAQEc+WZKmJGc/13/fw2hK8Fqs=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date:Message-Id:In-Reply-To: References:MIME-Version:Content-Transfer-Encoding:cc: content-transfer-encoding:content-type:date:from:message-id: mime-version:reply-to:subject:to; b=K5zBx8F087r+1jV6EsTQl1+AbXJl+VhKP1YYVk9Coig4UrfjGly36X63Bst1aWAV D95cooR9sNK7jaWweb3IDPueWO1KtbDZG30osgBJj/OJi/p9SrJqMRaxQGPe0GnDR byagWYADl7ytfaPgyY82GoX9YJM6o47LdxH/kAv610QB5g6BS2qUzQsOg/aLQUxor z8PShQPPCOxQyciojZ7ufLnTWmu5dml9GCOorEMo7s5cgMrbmvTNqBjxiMswYOfRQ kVbuX3e4+0/pGwwfS4iUxPD5AQcJWr5Y1kaJKFgtP//AD2JqBi/ojoFIPoLDLJ9Q8 7ZjYLYuFrSw4WS9uNg== X-UI-Sender-Class: 724b4f7f-cbec-4199-ad4e-598c01a50d3a Received: from astro.haus ([185.101.174.109]) by mail.gmx.net (mrgmx105 [212.227.17.168]) with ESMTPSA (Nemesis) id 1MD9T7-1rv1xZ1kUj-0098PG; Tue, 07 May 2024 02:25:28 +0200 From: Stefan Herdler To: hverkuil-cisco@xs4all.nl Cc: linux-media@vger.kernel.org, smoch@web.de, tmn505@gmail.com, vinschen@redhat.com Subject: [PATCH 13/21] media: av7110: coding style fixes: braces Date: Tue, 7 May 2024 02:24:52 +0200 Message-Id: <20240507002500.81867-14-herdler@nurfuerspam.de> X-Mailer: git-send-email 2.34.0 In-Reply-To: <20240507002500.81867-1-herdler@nurfuerspam.de> References: <20240507002500.81867-1-herdler@nurfuerspam.de> Precedence: bulk X-Mailing-List: linux-media@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Provags-ID: V03:K1:q3/SMbHsx/5sIkz/SQNOjR2YlCDetyX5r+guKJ+qXdTMytLb+gC eg/mhLuEaLUathm2TgQibtylLuwxfh7XYD0l3jIgU6Xt3gFsE3TXFWcAjpvlfmGT7m7UYvD wvv4ibC+/tT5nsm6NEAs3G00xR/WBKWDPdUueUMLK9m5b5kdf+T/flmFhpk1NUYMHnDSMQ9 CDCqnhYtskesn0VJb87Jw== X-Spam-Flag: NO UI-OutboundReport: notjunk:1;M01:P0:uZ1GKotKF70=;sMUP3WEvNwysQA0IdEDsPVdsmnv ARz1auRYYqlVDHxPkrr2hRjaO92m++gta7l5BnqqV+nktfT08Fd7j20NVUxeZtKlYf2bA3smV P1re+svN1M9z1DDYRRDlgmNlKP7B+xfluSoBPZga1myZDnAY0G7+cwgXzUk2eE34XWx48h53T 2HQI8dJ690t2WXAzrmazrDUe/PgqkdR1V+6E90B/7DS6D5tJyy6T20SaF1BC5yk/ckjvzW/Oy TYSvTFrek71xUpJs6do5p16/BjZLuIru1aCo/ZABlcwxKx3PsKgeni/024PfYEUc9K2qcsipi gsQY8rRnY69ubXD2TlGMUG/0ggUVncgUsVfisN7Ks0xWN2AlvzmRHS5m3dU4F27WR9AVf9XnF ND/LUJ77jw1qIzna0wIsitdWCysIRUmizVi8PPwqe/ua3dWyg+6xXnxLpXhtqgVaxlxASmCYO yeDZ+QjtzZRE+94lnSa9wK8F4Ae0rZiY5KrW2Cr2WQIKlnbiFb+GplRyY3rymHrnne8i0L3/d 4c8ckk2TZ5is3wCZU/2g6yWwE1qli6Qw9aQyeMldQoRxX71Zzyyjb8lVEYMYR/bDFzTFJn7gL wrMw/FZGSSjpTVkFAmxhEOpghZivQ7MXYPbuwExx7mvuSQOv27Wp2neNxbpy+6JukzbYxQxnI H45zdOcoiQFpV6OA7OKo44jd37sDpQCiVQ2DUV4oB7kvwIqLR3JYBoHvkIuKCEqcfMcoQIheq vXclvjXs6KpzU2iizdpc+1WIXzlKweEGuuKyQFhQU+9uanhvqsfxY8C9Hgd0a7v8GPMRYNymJ KuF407hIx+X/MT6AydlOJQG7mnaY7+8GI9qLGd1phLjPk= This patch fixes the following checkpatch warnings and errors: WARNING:BRACES: braces {} are not necessary for any arm of this statement WARNING:BRACES: braces {} are not necessary for single statement blocks CHECK:BRACES: braces {} should be used on all arms of this statement CHECK:BRACES: Unbalanced braces around else statement Signed-off-by: Stefan Herdler --- drivers/staging/media/av7110/av7110.c | 27 +++++++++------------ drivers/staging/media/av7110/av7110_av.c | 16 +++++++----- drivers/staging/media/av7110/av7110_hw.c | 8 +++--- drivers/staging/media/av7110/av7110_ipack.c | 4 +-- drivers/staging/media/av7110/av7110_v4l.c | 11 ++++++--- drivers/staging/media/av7110/dvb_filter.c | 3 +-- 6 files changed, 36 insertions(+), 33 deletions(-) -- 2.34.0 diff --git a/drivers/staging/media/av7110/av7110.c b/drivers/staging/media/av7110/av7110.c index 49735cbb2..78d708ffc 100644 --- a/drivers/staging/media/av7110/av7110.c +++ b/drivers/staging/media/av7110/av7110.c @@ -408,10 +408,11 @@ static void debiirq(struct tasklet_struct *t) if (data[5] > 5) flags |= CA_CI_MODULE_READY; av7110->ci_slot[data_0].flags = flags; - } else + } else { ci_get_data(&av7110->ci_rbuffer, av7110->debi_virt, av7110->debilen); + } xfer = RX_BUFF; break; } @@ -1010,10 +1011,9 @@ static int av7110_stop_feed(struct dvb_demux_feed *feed) demux->pids[feed->pes_type] |= 0x8000; demux->pesfilter[feed->pes_type] = NULL; } - if (feed->ts_type & TS_DECODER && - feed->pes_type < DMX_PES_OTHER) { + if (feed->ts_type & TS_DECODER && feed->pes_type < DMX_PES_OTHER) ret = dvb_feed_stop_pid(feed); - } else + else if ((feed->ts_type & TS_PACKET) && (demux->dmx.frontend->source != DMX_MEMORY_FE)) ret = StopHWFilter(feed->filter); @@ -1245,10 +1245,10 @@ static void vpeirq(struct tasklet_struct *t) saa7146_read(budget->dev, EC1R) & 0x3fff); #endif - if (newdma > olddma) + if (newdma > olddma) { /* no wraparound, dump olddma..newdma */ dvb_dmx_swfilter_packets(demux, mem + olddma, (newdma - olddma) / 188); - else { + } else { /* wraparound, dump olddma..buflen and 0..newdma */ dvb_dmx_swfilter_packets(demux, mem + olddma, (TS_BUFLEN - olddma) / 188); dvb_dmx_swfilter_packets(demux, mem, newdma / 188); @@ -1488,9 +1488,10 @@ static int get_firmware(struct av7110 *av7110) printk(KERN_ERR "dvb-ttpci: could not load firmware, file not found: dvb-ttpci-01.fw\n"); printk(KERN_ERR "dvb-ttpci: usually this should be in /usr/lib/hotplug/firmware or /lib/firmware\n"); printk(KERN_ERR "dvb-ttpci: and can be downloaded from https://linuxtv.org/download/dvb/firmware/\n"); - } else + } else { printk(KERN_ERR "dvb-ttpci: cannot request firmware (error %i)\n", ret); + } return -EINVAL; } @@ -2076,9 +2077,8 @@ static int frontend_init(struct av7110 *av7110) case 0x0000: // Fujitsu/Siemens DVB-Cable (ves1820/Philips CD1516(??)) av7110->fe = dvb_attach(ves1820_attach, &philips_cd1516_config, &av7110->i2c_adap, read_pwm(av7110)); - if (av7110->fe) { + if (av7110->fe) av7110->fe->ops.tuner_ops.set_params = philips_cd1516_tuner_set_params; - } break; } @@ -2129,17 +2129,15 @@ static int frontend_init(struct av7110 *av7110) /* Siemens DVB-C (full-length card) VES1820/Philips CD1516 */ av7110->fe = dvb_attach(ves1820_attach, &philips_cd1516_config, &av7110->i2c_adap, read_pwm(av7110)); - if (av7110->fe) { + if (av7110->fe) av7110->fe->ops.tuner_ops.set_params = philips_cd1516_tuner_set_params; - } break; case 0x0003: /* Hauppauge DVB-C 2.1 VES1820/ALPS TDBE2 */ av7110->fe = dvb_attach(ves1820_attach, &alps_tdbe2_config, &av7110->i2c_adap, read_pwm(av7110)); - if (av7110->fe) { + if (av7110->fe) av7110->fe->ops.tuner_ops.set_params = alps_tdbe2_tuner_set_params; - } break; } break; @@ -2168,9 +2166,8 @@ static int frontend_init(struct av7110 *av7110) case 0x0002: // Hauppauge/TT DVB-C premium rev2.X av7110->fe = dvb_attach(ves1820_attach, &alps_tdbe2_config, &av7110->i2c_adap, read_pwm(av7110)); - if (av7110->fe) { + if (av7110->fe) av7110->fe->ops.tuner_ops.set_params = alps_tdbe2_tuner_set_params; - } break; case 0x0004: // Galaxis DVB-S rev1.3 diff --git a/drivers/staging/media/av7110/av7110_av.c b/drivers/staging/media/av7110/av7110_av.c index f5200aa3d..35af0cd6d 100644 --- a/drivers/staging/media/av7110/av7110_av.c +++ b/drivers/staging/media/av7110/av7110_av.c @@ -412,8 +412,9 @@ static void play_video_cb(u8 *buf, int count, void *priv) if ((buf[3] & 0xe0) == 0xe0) { get_video_format(av7110, buf, count); aux_ring_buffer_write(&av7110->avout, buf, count); - } else + } else { aux_ring_buffer_write(&av7110->aout, buf, count); + } } static void play_audio_cb(u8 *buf, int count, void *priv) @@ -610,8 +611,9 @@ static int find_pes_header(u8 const *buf, long int length, int *frags) c++; break; } - } else + } else { c++; + } } if (c == length - 3 && !found) { if (buf[length - 1] == 0x00) @@ -709,8 +711,9 @@ void av7110_p2t_write(u8 const *buf, long int length, u16 pid, struct av7110_p2t c = c2; clear_p2t(p); add = 0; - } else + } else { add = 1; + } } else { l = length - c; rest = l % (TS_SIZE - 4); @@ -981,8 +984,10 @@ static __poll_t dvb_audio_poll(struct file *file, poll_table *wait) if (av7110->playing) { if (dvb_ringbuffer_free(&av7110->aout) >= 20 * 1024) mask |= (EPOLLOUT | EPOLLWRNORM); - } else /* if not playing: may play if asked for */ + } else { + /* if not playing: may play if asked for */ mask = (EPOLLOUT | EPOLLWRNORM); + } return mask; } @@ -1532,9 +1537,8 @@ static int dvb_video_release(struct inode *inode, struct file *file) dprintk(2, "av7110:%p, \n", av7110); - if ((file->f_flags & O_ACCMODE) != O_RDONLY) { + if ((file->f_flags & O_ACCMODE) != O_RDONLY) av7110_av_stop(av7110, RP_VIDEO); - } return dvb_generic_release(inode, file); } diff --git a/drivers/staging/media/av7110/av7110_hw.c b/drivers/staging/media/av7110/av7110_hw.c index c7ea72128..d775dd632 100644 --- a/drivers/staging/media/av7110/av7110_hw.c +++ b/drivers/staging/media/av7110/av7110_hw.c @@ -1076,9 +1076,9 @@ int av7110_osd_cmd(struct av7110 *av7110, osd_cmd_t *dc) ret = OSDSetColor(av7110, dc->color, dc->x0, dc->y0, dc->x1, dc->y1); break; case OSD_SetPalette: - if (FW_VERSION(av7110->arm_app) >= 0x2618) + if (FW_VERSION(av7110->arm_app) >= 0x2618) { ret = OSDSetPalette(av7110, dc->data, dc->color, dc->x0); - else { + } else { int i, len = dc->x0 - dc->color + 1; u8 __user *colors = (u8 __user *)dc->data; u8 r, g = 0, b = 0, blend = 0; @@ -1140,9 +1140,9 @@ int av7110_osd_cmd(struct av7110 *av7110, osd_cmd_t *dc) break; } case OSD_SetWindow: - if (dc->x0 < 1 || dc->x0 > 7) + if (dc->x0 < 1 || dc->x0 > 7) { ret = -EINVAL; - else { + } else { av7110->osdwin = dc->x0; ret = 0; } diff --git a/drivers/staging/media/av7110/av7110_ipack.c b/drivers/staging/media/av7110/av7110_ipack.c index 9fe18f470..c18a9f586 100644 --- a/drivers/staging/media/av7110/av7110_ipack.c +++ b/drivers/staging/media/av7110/av7110_ipack.c @@ -215,9 +215,9 @@ int av7110_ipack_instant_repack(const u8 *buf, int count, struct ipack *p) p->flag1 = buf[c]; c++; p->found++; - if ((p->flag1 & 0xc0) == 0x80) + if ((p->flag1 & 0xc0) == 0x80) { p->mpeg = 2; - else { + } else { p->hlength = 0; p->which = 0; p->mpeg = 1; diff --git a/drivers/staging/media/av7110/av7110_v4l.c b/drivers/staging/media/av7110/av7110_v4l.c index 633dbb697..f19e50537 100644 --- a/drivers/staging/media/av7110/av7110_v4l.c +++ b/drivers/staging/media/av7110/av7110_v4l.c @@ -330,8 +330,10 @@ static int vidioc_g_tuner(struct file *file, void *fh, struct v4l2_tuner *t) /* bilingual */ t->rxsubchans = V4L2_TUNER_SUB_LANG1 | V4L2_TUNER_SUB_LANG2; t->audmode = V4L2_TUNER_MODE_LANG1; - } else /* mono */ + } else { + /* mono */ t->rxsubchans = V4L2_TUNER_SUB_MONO; + } return 0; } @@ -709,8 +711,9 @@ int av7110_init_analog_module(struct av7110 *av7110) pr_info("DVB-C analog module @ card %d detected, initializing MSP3415\n", av7110->dvb_adapter.num); av7110->adac_type = DVB_ADAC_MSP34x5; - } else + } else { return -ENODEV; + } msleep(100); // the probing above resets the msp... msp_readreg(av7110, MSP_RD_DSP, 0x001e, &version1); @@ -922,9 +925,9 @@ static int std_callback(struct saa7146_dev *dev, struct saa7146_standard *std) } else if (std->id & V4L2_STD_NTSC) { av7110->vidmode = AV7110_VIDEO_MODE_NTSC; av7110_set_vidmode(av7110, av7110->vidmode); - } - else + } else { return -1; + } return 0; } diff --git a/drivers/staging/media/av7110/dvb_filter.c b/drivers/staging/media/av7110/dvb_filter.c index 515b4288b..f92faae44 100644 --- a/drivers/staging/media/av7110/dvb_filter.c +++ b/drivers/staging/media/av7110/dvb_filter.c @@ -33,9 +33,8 @@ int dvb_filter_get_ac3info(u8 *mbuf, int count, struct dvb_audio_info *ai, int p if (b[0] == 0x0b && b[1] == 0x77) found = 1; - else { + else c++; - } } if (!found) From patchwork Tue May 7 00:24:53 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Herdler X-Patchwork-Id: 13656129 Received: from mout.gmx.net (mout.gmx.net [212.227.17.20]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id A92FD8BF9 for ; Tue, 7 May 2024 00:25:31 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=212.227.17.20 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1715041534; cv=none; b=rlFEh7G6xcw7+NR+LwywksHBDdWM3yGKa3muZGX58weWitZiZ8rSd1jKgB3xAkMy1AxwMmQXyTzVuUH1XNljHK3rwE3kqGaSpbJ0fG/txZXf1iGS2DWjgYZXqJ07rfA37cf/X3S3GC5bsY3SPSGF9hIY8JlSiaBT5+SxBOSAvfA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1715041534; c=relaxed/simple; bh=oYd7/xKkj5/NJBGe5dv4q6raW9hKtWNAfH1kYEl3HDY=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=rbimAPE/i1s7pg7OiMdkLvHMKgWvMGkY/CzLyP1ldTkyP4uYw4sdr3GkfTHDBqONR25HK1YwLynkDBfMMk7CRA83EYtCF7K+fYJb7iDQK+QQUPHlA51d5vTckpFpmBZPHAyRZm+HeoQ9zK8Dg3DNlt/sr09xEAxfK2A2FIU/hWg= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=nurfuerspam.de; spf=pass smtp.mailfrom=nurfuerspam.de; dkim=pass (2048-bit key) header.d=nurfuerspam.de header.i=herdler@nurfuerspam.de header.b=WqD9Rdzi; arc=none smtp.client-ip=212.227.17.20 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=nurfuerspam.de Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=nurfuerspam.de Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=nurfuerspam.de header.i=herdler@nurfuerspam.de header.b="WqD9Rdzi" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nurfuerspam.de; s=s31663417; t=1715041528; x=1715646328; i=herdler@nurfuerspam.de; bh=ibJsf4/JZYC6N5lngSg4ZienRaShK6MMgvw7S3wSqWU=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date:Message-Id:In-Reply-To: References:MIME-Version:Content-Transfer-Encoding:cc: content-transfer-encoding:content-type:date:from:message-id: mime-version:reply-to:subject:to; b=WqD9RdzipKdQbRiCSW8zmIc+hr8bs6wsQHPZ2dH7Td1MzDmpFUnpn02Lt8o4w2yw TkEGKG7r07BcZze8Txex5R7fmn0h51dT65wZ/lSBWX78C5rEso0iKYdnZnIilwjWR MT/eon+MfCmw1lfti8d5LZBOSLwYA75TYyGPIvOlXHDin6qICiZWXEgZCMdFAt7uK +67E1j98pFDz3X+fN8sYHyze4nBDRwBlI5rpo/1S99nEMZQ7ZZYjCLuTFws/dSos9 hsr8V78e9PL4P5ICtKsvzVxcM8hMnVRizKxXH9KEnH7JRjdd9HmiW5Yaa42MUGgc0 v0RAMeRfGCqsoxKLdg== X-UI-Sender-Class: 724b4f7f-cbec-4199-ad4e-598c01a50d3a Received: from astro.haus ([185.101.174.109]) by mail.gmx.net (mrgmx105 [212.227.17.168]) with ESMTPSA (Nemesis) id 1MIMfc-1rrz1I2yge-00ELb9; Tue, 07 May 2024 02:25:28 +0200 From: Stefan Herdler To: hverkuil-cisco@xs4all.nl Cc: linux-media@vger.kernel.org, smoch@web.de, tmn505@gmail.com, vinschen@redhat.com Subject: [PATCH 14/21] media: av7110: coding style fixes: assignments Date: Tue, 7 May 2024 02:24:53 +0200 Message-Id: <20240507002500.81867-15-herdler@nurfuerspam.de> X-Mailer: git-send-email 2.34.0 In-Reply-To: <20240507002500.81867-1-herdler@nurfuerspam.de> References: <20240507002500.81867-1-herdler@nurfuerspam.de> Precedence: bulk X-Mailing-List: linux-media@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Provags-ID: V03:K1:8jg9ASVQc6wiVdUiIhC5esytv3nlJtAMoIeE+mlc/9m2VS46YaA awrPLsYYCZOjOqhuJttF9pGT5DqTHLVu3u7a/Z1+PnAQjdZBFtrVabeEWYvazlDtEXM2YVq UWK88v8YsT9uvx4pe6+8c7DDguV69JWb5kWhQlapoqL5Wkhk7THPv0IG00iWxpwYQJAW+2/ 9QkwdXp3XD4iFF8N80ZXw== X-Spam-Flag: NO UI-OutboundReport: notjunk:1;M01:P0:hjRQJsiLzOU=;hIq7eG1aujNwlhwtdBNIjI7rbOb 7KlDHMuuPSTaqBsW7KThToT1UCQr/1jInoe7GDpo09h7Es9OvlbY7QqsyxXhpOtwsGDLJfIbb dcxz4yx/1hIYcrqasQtB5EvV9JJLk8PW8Wi6I9YnL+S+lKQFTLpj/4rXRWwT55vFDU6p0LImz S85ln9W4Ia4Xo/2Up6tyyjoImi9KlDBsWMsdoDNsx5r8GmdZB1axJDcatYblPcm6rEwbQl8sE SCy/Ich6jviZXkrdQS4ajabboqMxBPITt/zwE8P1kXCmrCdk6o8YANGrxebT1yQC57GcYRb3B 4qwYEDh/Twct3R6nWHlYgt2oPDZD6pa61ESmNcKCKR1uJigTFzn0NN4P3VCZWun4kaMS9SrxC KCu1LbgfjwrJXnMLd2gj7sDFyXKmHaBs2dAfd+mn/5NUvegyJ8FjKKu6IF9hZjXYoGcvU1gIg bp+3i9G803xHy1+u4S/zwRtw8GYgdT+5ARsXyhqUz7QCb5n0Oo/Q42sbTLeXbUz6LnkYZ4cI3 aTRCF0R4sNpndV7D76ZjnMcyx1bykbu9Vn+ByVIT26232zcXbyybzVqUIQj6LMSruPMXLz0Dg KPmwBSRE9TUTRjc3fJicbxoKXvPDYfQ8zkxUvfbBydiT+AdHWMo+oY8B5QK+sp32a3Te6uKHp ozSKMR8Mxz7HIIrmBgW4EmQL88t/sVoCmLE/c/HXeaelEYvHVcObx0fCGdOL9TXbpGAlBBih3 I8nB/8aGn29w4DxygXfpN+f88Zeh0O6q4eU6GOT5pViLGtKCZnY6qARzpLFWRK14/7luIL0Ls px0VP4/AUC0peBHu7LPdXhxS7gpKLfpKIZGIU1QkCgqC4= This patch fixes the following checkpatch errors: ERROR:ASSIGN_IN_IF: do not use assignment in if condition CHECK:MULTIPLE_ASSIGNMENTS: multiple assignments should be avoided Signed-off-by: Stefan Herdler --- drivers/staging/media/av7110/av7110.c | 30 ++++++++++++++++----- drivers/staging/media/av7110/av7110_av.c | 18 ++++++++----- drivers/staging/media/av7110/av7110_hw.c | 6 +++-- drivers/staging/media/av7110/av7110_ipack.c | 3 ++- drivers/staging/media/av7110/dvb_filter.c | 3 ++- 5 files changed, 43 insertions(+), 17 deletions(-) -- 2.34.0 diff --git a/drivers/staging/media/av7110/av7110.c b/drivers/staging/media/av7110/av7110.c index 78d708ffc..fac774dc6 100644 --- a/drivers/staging/media/av7110/av7110.c +++ b/drivers/staging/media/av7110/av7110.c @@ -709,7 +709,11 @@ static inline int SetPIDs(struct av7110 *av7110, u16 vpid, u16 apid, u16 ttpid, if (vpid == 0x1fff || apid == 0x1fff || ttpid == 0x1fff || subpid == 0x1fff || pcrpid == 0x1fff) { - vpid = apid = ttpid = subpid = pcrpid = 0; + vpid = 0; + apid = 0; + ttpid = 0; + subpid = 0; + pcrpid = 0; av7110->pids[DMX_PES_VIDEO] = 0; av7110->pids[DMX_PES_AUDIO] = 0; av7110->pids[DMX_PES_TELETEXT] = 0; @@ -855,7 +859,11 @@ static int dvb_feed_start_pid(struct dvb_demux_feed *dvbdmxfeed) dprintk(4, "%p\n", av7110); - npids[0] = npids[1] = npids[2] = npids[3] = npids[4] = 0xffff; + npids[0] = 0xffff; + npids[1] = 0xffff; + npids[2] = 0xffff; + npids[3] = 0xffff; + npids[4] = 0xffff; i = dvbdmxfeed->pes_type; npids[i] = (pid[i] & 0x8000) ? 0 : pid[i]; if ((i == 2) && npids[i] && (dvbdmxfeed->ts_type & TS_PACKET)) { @@ -907,7 +915,11 @@ static int dvb_feed_stop_pid(struct dvb_demux_feed *dvbdmxfeed) if (!av7110->playing) dvbdmx->playing = 0; } - npids[0] = npids[1] = npids[2] = npids[3] = npids[4] = 0xffff; + npids[0] = 0xffff; + npids[1] = 0xffff; + npids[2] = 0xffff; + npids[3] = 0xffff; + npids[4] = 0xffff; i = dvbdmxfeed->pes_type; switch (i) { case 2: //teletext @@ -1407,10 +1419,13 @@ u8 i2c_readreg(struct av7110 *av7110, u8 id, u8 reg) msgs[0].flags = 0; msgs[1].flags = I2C_M_RD; - msgs[0].addr = msgs[1].addr = id / 2; + msgs[0].addr = id / 2; + msgs[1].addr = id / 2; mm1[0] = reg; - msgs[0].len = 1; msgs[1].len = 1; - msgs[0].buf = mm1; msgs[1].buf = mm2; + msgs[0].len = 1; + msgs[1].len = 1; + msgs[0].buf = mm1; + msgs[1].buf = mm2; i2c_transfer(&av7110->i2c_adap, msgs, 2); return mm2[0]; @@ -1511,7 +1526,8 @@ static int get_firmware(struct av7110 *av7110) memcpy(av7110->bin_fw, fw->data, fw->size); av7110->size_fw = fw->size; - if ((ret = check_firmware(av7110))) + ret = check_firmware(av7110); + if (ret) vfree(av7110->bin_fw); release_firmware(fw); diff --git a/drivers/staging/media/av7110/av7110_av.c b/drivers/staging/media/av7110/av7110_av.c index 35af0cd6d..3e0db8e9a 100644 --- a/drivers/staging/media/av7110/av7110_av.c +++ b/drivers/staging/media/av7110/av7110_av.c @@ -81,8 +81,10 @@ int av7110_record_cb(struct dvb_filter_pes2ts *p2t, u8 *buf, size_t len) if (!(dvbdmxfeed->ts_type & TS_PACKET)) return 0; - if (buf[3] == 0xe0) // video PES do not have a length in TS - buf[4] = buf[5] = 0; + if (buf[3] == 0xe0) { // video PES do not have a length in TS + buf[4] = 0; + buf[5] = 0; + } if (dvbdmxfeed->ts_type & TS_PAYLOAD_ONLY) return dvbdmxfeed->cb.ts(buf, len, NULL, 0, &dvbdmxfeed->feed.ts, NULL); @@ -282,7 +284,8 @@ int av7110_set_volume(struct av7110 *av7110, unsigned int volleft, volleft = 0x3f; if (volright > 0x3f) volright = 0x3f; - if ((err = SendDAC(av7110, 3, 0x80 + volleft))) + err = SendDAC(av7110, 3, 0x80 + volleft); + if (err) return err; return SendDAC(av7110, 4, volright); @@ -1513,7 +1516,8 @@ static int dvb_video_open(struct inode *inode, struct file *file) dprintk(2, "av7110:%p, \n", av7110); - if ((err = dvb_generic_open(inode, file)) < 0) + err = dvb_generic_open(inode, file); + if (err < 0) return err; if ((file->f_flags & O_ACCMODE) != O_RDONLY) { @@ -1524,7 +1528,8 @@ static int dvb_video_open(struct inode *inode, struct file *file) av7110->videostate.stream_source = VIDEO_SOURCE_DEMUX; /* empty event queue */ - av7110->video_events.eventr = av7110->video_events.eventw = 0; + av7110->video_events.eventr = 0; + av7110->video_events.eventw = 0; } return 0; @@ -1631,7 +1636,8 @@ int av7110_av_register(struct av7110 *av7110) init_waitqueue_head(&av7110->video_events.wait_queue); spin_lock_init(&av7110->video_events.lock); - av7110->video_events.eventw = av7110->video_events.eventr = 0; + av7110->video_events.eventw = 0; + av7110->video_events.eventr = 0; av7110->video_events.overflow = 0; memset(&av7110->video_size, 0, sizeof(video_size_t)); diff --git a/drivers/staging/media/av7110/av7110_hw.c b/drivers/staging/media/av7110/av7110_hw.c index d775dd632..52290a500 100644 --- a/drivers/staging/media/av7110/av7110_hw.c +++ b/drivers/staging/media/av7110/av7110_hw.c @@ -219,7 +219,8 @@ int av7110_bootarm(struct av7110 *av7110) /* FIXME: Why does Nexus CA require 2x iwdebi for first init? */ iwdebi(av7110, DEBISWAP, DPRAM_BASE, 0x76543210, 4); - if ((ret=irdebi(av7110, DEBINOSWAP, DPRAM_BASE, 0, 4)) != 0x10325476) { + ret = irdebi(av7110, DEBINOSWAP, DPRAM_BASE, 0, 4); + if (ret != 0x10325476) { printk(KERN_ERR "dvb-ttpci: debi test in av7110_bootarm() failed: %08x != %08x (check your BIOS 'Plug&Play OS' settings)\n", ret, 0x10325476); return -1; @@ -547,7 +548,8 @@ int av7110_fw_request(struct av7110 *av7110, u16 *request_buf, if (mutex_lock_interruptible(&av7110->dcomlock)) return -ERESTARTSYS; - if ((err = __av7110_send_fw_cmd(av7110, request_buf, request_buf_len)) < 0) { + err = __av7110_send_fw_cmd(av7110, request_buf, request_buf_len); + if (err < 0) { mutex_unlock(&av7110->dcomlock); printk(KERN_ERR "dvb-ttpci: av7110_fw_request error %d\n", err); return err; diff --git a/drivers/staging/media/av7110/av7110_ipack.c b/drivers/staging/media/av7110/av7110_ipack.c index c18a9f586..c41a233e1 100644 --- a/drivers/staging/media/av7110/av7110_ipack.c +++ b/drivers/staging/media/av7110/av7110_ipack.c @@ -22,7 +22,8 @@ void av7110_ipack_reset(struct ipack *p) int av7110_ipack_init(struct ipack *p, int size, void (*func)(u8 *buf, int size, void *priv)) { - if (!(p->buf = vmalloc(size))) { + p->buf = vmalloc(size); + if (!p->buf) { printk(KERN_WARNING "Couldn't allocate memory for ipack\n"); return -ENOMEM; } diff --git a/drivers/staging/media/av7110/dvb_filter.c b/drivers/staging/media/av7110/dvb_filter.c index f92faae44..71c1d9629 100644 --- a/drivers/staging/media/av7110/dvb_filter.c +++ b/drivers/staging/media/av7110/dvb_filter.c @@ -99,7 +99,8 @@ int dvb_filter_pes2ts(struct dvb_filter_pes2ts *p2ts, unsigned char *pes, while (len >= 184) { buf[3] = 0x10 | ((p2ts->cc++) & 0x0f); memcpy(buf + 4, pes, 184); - if ((ret=p2ts->cb(p2ts->priv, buf))) + ret = p2ts->cb(p2ts->priv, buf); + if (ret) return ret; len -= 184; pes += 184; buf[1] &= ~0x40; From patchwork Tue May 7 00:24:54 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Herdler X-Patchwork-Id: 13656133 Received: from mout.gmx.net (mout.gmx.net [212.227.17.21]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id DD8A537C for ; Tue, 7 May 2024 00:25:31 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=212.227.17.21 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1715041535; cv=none; b=VoyvXq1XWctMFY58+GOBfZzP54ta+8Qf+WjM0FowBre9QHlhULtEicKLenYEl5aB/imC3s5XooZgem95WJQ3PcMFw3IjZxRYc88vV2A7SxMmuGprDgi9fHT2SyPFRJZyzTBai8Alc5IBOwUmuGET8vN5NYDw0svUlxhxxyA1dZQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1715041535; c=relaxed/simple; bh=EjU7si92ubn2nOI/nwiunaQe5jl0YB4Wm2cRPHVSMP8=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=kn9F6JQb9rIbO6yZgU4DeZrMQXkM5ZOhVQ6q5jZ+H1gDiXK5ONQwHmVkjyfQckkZga5VJMRXWdMB+ZX2fpsWD4oziB3vOsx6tq2sNYX026W+/iJZct44hoEi0vzXUIDJCBo3G0VCduVBZO9c0tZ/wp4cdEK898ciVGvH84S/x0s= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=nurfuerspam.de; spf=pass smtp.mailfrom=nurfuerspam.de; dkim=pass (2048-bit key) header.d=nurfuerspam.de header.i=herdler@nurfuerspam.de header.b=nptKWk1x; arc=none smtp.client-ip=212.227.17.21 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=nurfuerspam.de Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=nurfuerspam.de Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=nurfuerspam.de header.i=herdler@nurfuerspam.de header.b="nptKWk1x" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nurfuerspam.de; s=s31663417; t=1715041529; x=1715646329; i=herdler@nurfuerspam.de; bh=a3gxFHemFYUxxJgVHcPHp5ApB6BblJkedmmGhhsf534=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date:Message-Id:In-Reply-To: References:MIME-Version:Content-Transfer-Encoding:cc: content-transfer-encoding:content-type:date:from:message-id: mime-version:reply-to:subject:to; b=nptKWk1xKNMfHHagiWNSnohxNWZXeHI/jFf0yJ1pazHSlATnXV2b5uKyuqKK6sVp 5jiCEfHiatFIeQqSpnL6Pi0fDa0o5YaN6vXcQW+j50pkuZBkI9IHus17zzNMLReDy vUrmYA0CEVfThcJ/lBnDQQx1wo3eLA9JtDAA7GaISxcoB31zKkYAU8Erp/wDPvLE7 wuVztesiU9ukXPVXCioGpLKxaJfMusg059WDD+oyayxYZXI2nBQBhfHynaWwcLR8+ +2SxXta/bK/gq1qj95HFP6j7Tj8AkWZrgr2mYBCueuPGJ9NwxorLis8SfYWujpt3I sl/mTEO+364sPXmXWw== X-UI-Sender-Class: 724b4f7f-cbec-4199-ad4e-598c01a50d3a Received: from astro.haus ([185.101.174.109]) by mail.gmx.net (mrgmx105 [212.227.17.168]) with ESMTPSA (Nemesis) id 1MOiDX-1sGQxr3zAN-00QCLI; Tue, 07 May 2024 02:25:29 +0200 From: Stefan Herdler To: hverkuil-cisco@xs4all.nl Cc: linux-media@vger.kernel.org, smoch@web.de, tmn505@gmail.com, vinschen@redhat.com Subject: [PATCH 15/21] media: av7110: coding style fixes: comparsations Date: Tue, 7 May 2024 02:24:54 +0200 Message-Id: <20240507002500.81867-16-herdler@nurfuerspam.de> X-Mailer: git-send-email 2.34.0 In-Reply-To: <20240507002500.81867-1-herdler@nurfuerspam.de> References: <20240507002500.81867-1-herdler@nurfuerspam.de> Precedence: bulk X-Mailing-List: linux-media@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Provags-ID: V03:K1:LD3Q1mer/EWhYp82YC6Z98ufMDTVuKYCn++p6aIRWqhtYBTt47o NYcCCvtyhS8hR8fkl+x+EhIJKbusnuIFKirDEMNsrkPIUUz8pWHGksHDMOu4JwZydzkY15y SNr8qukzLocJ2J9AKh4mF8gZ4eEzl7Khosc46yWTS3Sq0xZXLSfYZ7XC2MY+jbfRz0nU9Hf Kbj8xfyV2x53nudSgbFaw== X-Spam-Flag: NO UI-OutboundReport: notjunk:1;M01:P0:7cJ2Uhhl1aw=;1krqXmFzpqShp92UxuHfx7szEtq oucuwmM0UiKITfcJSNJPxMrci1K4sKTkBIZk6JvrgGtqIaT7UDrp8chYEpoMQuseD1amtvZ9D t4cD2mZ6a6uEmQDjq59FEb108xlSHJHhPY0GG2XD8jA1wCNBNcsBzrFVoocrDA3kWkfXsNpss djyeSVCsjySUpXpZ6+SWdujnzXRaj29uv3q20VhLj5UnvRmOg/xiVTKEcX5FdZrr0drLA0UmU n01KLprZpGbxXNb9BMB6OrnROnxH6JpTZR2cDiOUM/6APQu0jfch2Nrc7rgATtHelFwt/pE88 JVETVYIAUE721SXgcfvV77Pc2Q7mSK5gBWSoSlzUJxbUXYGt6+tUAeeMRRJBPSOHQMzejk2Cc WEoPwHN2hTgx1NPrSpHqm3NumlA6Fayv/B+bb7Bv7EmcinS2DyH6enoAmFQ9iN8q9j8wNne83 YEWat5oh+7d4vHpU1mhvXMtPHIH4sRfZlKc05DmpjEG3K2gYHNAaX/Xts7C7NGMiRKnzrvnto 4HMYU9+4OgzUnpqL+Zapc65Nl7TOxgAaxsc9DA/E6BZJdWLUazIl7g7Lo1tl7tntC6awAC7u9 Kifj4UKK0lBtTirvpId6iQ3JQqF6ym/NLqNiVh+lVaC6Oo1cFjiqr6wOzOhd1HsgbW/X5acBt qTzvwKD2gKDua1UhcmTS1ncbJ1L1jCc0x1IPDbIyg1nBH/DiMIxLRASgGnVcBa31R9UCxuSnL VddG2kAypZf0ScmFcMDlJmy/9KMV/1jKIhbuAGck5q/+JhCcuUMYWA/teBMkjUs9RUarIr3LX FPT9DhK6vjITzplkjhOVIWmlhguXx7KiKKlmXB4cHdpTM= This patch fixes the following checkpatch warnings: WARNING:CONSTANT_COMPARISON: Comparisons should place the constant on the right side of the test CHECK:COMPARISON_TO_NULL: Comparison to NULL could be written ... Signed-off-by: Stefan Herdler --- drivers/staging/media/av7110/av7110.c | 10 +++++----- drivers/staging/media/av7110/av7110_hw.c | 2 +- drivers/staging/media/av7110/av7110_v4l.c | 8 ++++---- 3 files changed, 10 insertions(+), 10 deletions(-) -- 2.34.0 diff --git a/drivers/staging/media/av7110/av7110.c b/drivers/staging/media/av7110/av7110.c index fac774dc6..de9476154 100644 --- a/drivers/staging/media/av7110/av7110.c +++ b/drivers/staging/media/av7110/av7110.c @@ -104,7 +104,7 @@ static int av7110_num; #define FE_FUNC_OVERRIDE(fe_func, av7110_copy, av7110_func) \ {\ - if (fe_func != NULL) { \ + if (fe_func) { \ av7110_copy = fe_func; \ fe_func = av7110_func; \ } \ @@ -159,7 +159,7 @@ static void init_av7110_av(struct av7110 *av7110) /** * some special handling for the Siemens DVB-C cards... */ - } else if (0 == av7110_init_analog_module(av7110)) { + } else if (av7110_init_analog_module(av7110) == 0) { /* done. */ } else if (dev->pci->subsystem_vendor == 0x110a) { printk("dvb-ttpci: DVB-C w/o analog module @ card %d detected\n", @@ -1386,7 +1386,7 @@ static void dvb_unregister(struct av7110 *av7110) dvb_dmxdev_release(&av7110->dmxdev); dvb_dmx_release(&av7110->demux); - if (av7110->fe != NULL) { + if (av7110->fe) { dvb_unregister_frontend(av7110->fe); dvb_frontend_detach(av7110->fe); } @@ -1518,7 +1518,7 @@ static int get_firmware(struct av7110 *av7110) /* check if the firmware is available */ av7110->bin_fw = vmalloc(fw->size); - if (NULL == av7110->bin_fw) { + if (!av7110->bin_fw) { dprintk(1, "out of memory\n"); release_firmware(fw); return -ENOMEM; @@ -2233,7 +2233,7 @@ static int frontend_init(struct av7110 *av7110) av7110->fe->ops.tuner_ops.set_params = alps_bsbe1_tuner_set_params; av7110->fe->tuner_priv = &av7110->i2c_adap; - if (dvb_attach(lnbp21_attach, av7110->fe, &av7110->i2c_adap, 0, 0) == NULL) { + if (!dvb_attach(lnbp21_attach, av7110->fe, &av7110->i2c_adap, 0, 0)) { printk("dvb-ttpci: LNBP21 not found!\n"); if (av7110->fe->ops.release) av7110->fe->ops.release(av7110->fe); diff --git a/drivers/staging/media/av7110/av7110_hw.c b/drivers/staging/media/av7110/av7110_hw.c index 52290a500..5a4de3e3e 100644 --- a/drivers/staging/media/av7110/av7110_hw.c +++ b/drivers/staging/media/av7110/av7110_hw.c @@ -390,7 +390,7 @@ static int __av7110_send_fw_cmd(struct av7110 *av7110, u16 *buf, int length) break; } - if (type != NULL) { + if (type) { /* non-immediate COMMAND type */ start = jiffies; for (;;) { diff --git a/drivers/staging/media/av7110/av7110_v4l.c b/drivers/staging/media/av7110/av7110_v4l.c index f19e50537..0ccc34f3d 100644 --- a/drivers/staging/media/av7110/av7110_v4l.c +++ b/drivers/staging/media/av7110/av7110_v4l.c @@ -128,7 +128,7 @@ static int ves1820_writereg(struct saa7146_dev *dev, u8 addr, u8 reg, u8 data) dprintk(4, "dev: %p\n", dev); - if (1 != i2c_transfer(&av7110->i2c_adap, &msg, 1)) + if (i2c_transfer(&av7110->i2c_adap, &msg, 1) != 1) return -1; return 0; } @@ -140,7 +140,7 @@ static int tuner_write(struct saa7146_dev *dev, u8 addr, u8 data[4]) dprintk(4, "dev: %p\n", dev); - if (1 != i2c_transfer(&av7110->i2c_adap, &msg, 1)) + if (i2c_transfer(&av7110->i2c_adap, &msg, 1) != 1) return -1; return 0; } @@ -221,7 +221,7 @@ static int av7110_dvb_c_switch(struct saa7146_dev *dev) dprintk(4, "%p\n", av7110); - if (0 != av7110->current_input) { + if (av7110->current_input != 0) { dprintk(1, "switching to analog TV:\n"); adswitch = 1; source = SAA7146_HPS_SOURCE_PORT_B; @@ -409,7 +409,7 @@ static int vidioc_s_frequency(struct file *file, void *fh, const struct v4l2_fre if (!av7110->analog_tuner_flags || av7110->current_input != 1) return -EINVAL; - if (V4L2_TUNER_ANALOG_TV != f->type) + if (f->type != V4L2_TUNER_ANALOG_TV) return -EINVAL; msp_writereg(av7110, MSP_WR_DSP, 0x0000, 0xffe0); /* fast mute */ From patchwork Tue May 7 00:24:55 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Herdler X-Patchwork-Id: 13656141 Received: from mout.gmx.net (mout.gmx.net [212.227.17.20]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 6107C622 for ; Tue, 7 May 2024 00:25:31 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=212.227.17.20 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1715041537; cv=none; b=repvcWseLtkx3gPe9ZQ7UzMu/WyuaNp0Ri18mMHfNlbxc7LUEieIQOfED2ELsTf2YHG7BYIuYHsTzLwZAHKTmPUQ/dcahPaX0Hn9xdtCdYUjoVqiQ+imMxHlezAFjOZQaI18eUB2VZ2IJpFLD/7uUJxO2JTi850tBBa93TaJOj8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1715041537; c=relaxed/simple; bh=JCFB7HhMvIMMGhanxN3QHo+K6mqN4gDyt1raEyy7Sd4=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=Pp9/LZNi5v63wpP8USXhE9ZGpZu3Rq7lFTB1i4BpFA46iV4m5wy46sVjdwO/qIcgm4VBK3J1DMJyx31qgV2gxKrY9HsewzIXDFuCY4YZ0f1pyxBMDkWepiqLydSRd84w4LCLX+w6qiZbUPcVshzV0Xpdpd5zX0cj/vr0h9/InEA= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=nurfuerspam.de; spf=pass smtp.mailfrom=nurfuerspam.de; dkim=pass (2048-bit key) header.d=nurfuerspam.de header.i=herdler@nurfuerspam.de header.b=iCd+y/FQ; arc=none smtp.client-ip=212.227.17.20 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=nurfuerspam.de Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=nurfuerspam.de Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=nurfuerspam.de header.i=herdler@nurfuerspam.de header.b="iCd+y/FQ" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nurfuerspam.de; s=s31663417; t=1715041529; x=1715646329; i=herdler@nurfuerspam.de; bh=hfopkUk4HidOYuCRwnz1Psnu1f4L/QvG4k5cBa+NZhU=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date:Message-Id:In-Reply-To: References:MIME-Version:Content-Transfer-Encoding:cc: content-transfer-encoding:content-type:date:from:message-id: mime-version:reply-to:subject:to; b=iCd+y/FQV6e/itWBFf3JIwb9HDPCjBwcmRKk71MQ0Dn6W9O4rFD2noSXguFuy2gN GtIW0cSmL7cC6VTWlFTPqa3+N68ZrPmSFs8ZqlWKjplJLgoGU93yP+TroFBZDQ11S ToOEtVS3+GhaFoDD8MAbNAkajOuknARkiiWgOjWfAez7VF5kHHVI2Ee8G28bBKYji 3keAvAiB3Q/ME5DfBdp3Ifzsp3Kg79Rt0qwVuQPYErca4bPZwUCWAHV019Tk/AIgF zGmJRUazrMy/Xw/FGwj4JfUCuVxLUVnY+6wXXcJIRGdvriZadY/qKVh7r0pA52Xoi Y5eKreRUqdO8nUszHQ== X-UI-Sender-Class: 724b4f7f-cbec-4199-ad4e-598c01a50d3a Received: from astro.haus ([185.101.174.109]) by mail.gmx.net (mrgmx105 [212.227.17.168]) with ESMTPSA (Nemesis) id 1N5VHG-1sg73z0pXm-016zM5; Tue, 07 May 2024 02:25:29 +0200 From: Stefan Herdler To: hverkuil-cisco@xs4all.nl Cc: linux-media@vger.kernel.org, smoch@web.de, tmn505@gmail.com, vinschen@redhat.com Subject: [PATCH 16/21] media: av7110: coding style fixes: sizeof Date: Tue, 7 May 2024 02:24:55 +0200 Message-Id: <20240507002500.81867-17-herdler@nurfuerspam.de> X-Mailer: git-send-email 2.34.0 In-Reply-To: <20240507002500.81867-1-herdler@nurfuerspam.de> References: <20240507002500.81867-1-herdler@nurfuerspam.de> Precedence: bulk X-Mailing-List: linux-media@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Provags-ID: V03:K1:10aGrKK9do7cuFA/RaNNRhYG+GRuwIZzQ9VMKl8TBaEpcA7CUrv EzIhzAtlC3/AX04bM1ZV2ZCziqT7LND0kLXCiwQAARBdJfj7n8e5eY6u7w876slCB5NtYxJ ZFsO0DgADfYIeSoy2KZ6IhxiPsmjQKjuQGwzjNjv+FbXFVOcwQSdaHd9ihg05SAWJ6iFlGB Fadsd28biS/qTbF++F6pQ== X-Spam-Flag: NO UI-OutboundReport: notjunk:1;M01:P0:mo3gkYAHw1g=;1s7VaveNkYVzNjo1VsZOqmEMqP8 PWE66+e6e1t01fFhctbYmjygXc64491Gh8FUFUz84fGqgAo04b9bOEQhTnhlFLYklycDnxAEd +oIQDvXfLoNTWbGJDCZY74IYxVwP23XGYwX9BE6dO6vyqJ7aaGeo07rQth63gct3GTkL9JKC4 UG8vCWRh1P1noAyPmgtDqhtSaf8AbsQ6JZLZ0XEzDxI0s4oMVgUmPqbxSetD10Io6W4WbAVEr Kch5VV/2M6MhoWZSQoFI4oeb1HBvpdFb7QD1PwMPjIN0TCgMu2w0FKkplEilmIMSYY2yR+JN6 JVF3egX/OQUOpUgfvgmY+pnyYo6ECyDtJbynenJ/cKnfprKWkb0ozB/4PCOSOqKnJj3o/i6j5 qnDvzEs0uLXAMolRM1tvon2/K8EeTlLZdt1PviKqVqcysHkB+toFrOOxnXPlEZm6lKgokg40H q62572XSqGV9uT2ST3QCmnxVbsE1DBETD+GVfqQLvWg+rSWsaHQGB1pSsqbhLXuIcmYlOaPe8 3jC1BR+eBxIl9IARX0VLHyO5AYrIzuKGa/WFrDGV2jaF3aucSGjIv5Twe0oc4iFHvJSM6Ujpd wUsg+CnvXH14uIKWOGtlD4qDYKkfJVjR489BjEeB9g6FLFwr2DvRGmrLNZWuavOQZ1ECs9TZh fDICWI65Mdcn0aRtCt46nP9GLf06LOxpxRsZpeLevOt6BSqCllvQm1F6ItHQcKI3WHYgoSPry PnC5ncCdFuIE1TIxwyRtYTVaCI6KF5xLX9XG1HZtugsJtxcAdgZLsIBYt/fR/KIVvUnkSmQ+5 uqTSyC46O/xMfhFp0qQ5G8DrFkwugj02wQ5JUZl7pVWWM= This patch fixes the following checkpatch warnings: WARNING:SIZEOF_PARENTHESIS: sizeof d should be sizeof(d) WARNING:SIZEOF_PARENTHESIS: sizeof f->fmt.sliced should be sizeof(f->fmt.sliced) WARNING:CONST_STRUCT: struct dvb_frontend_ops should normally be const CHECK:ALLOC_SIZEOF_STRUCT: Prefer kzalloc(sizeof(*av7110)...) over kzalloc(sizeof(struct av7110)...) Signed-off-by: Stefan Herdler --- drivers/staging/media/av7110/av7110.c | 2 +- drivers/staging/media/av7110/av7110_v4l.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) -- 2.34.0 diff --git a/drivers/staging/media/av7110/av7110.c b/drivers/staging/media/av7110/av7110.c index de9476154..42b5d049e 100644 --- a/drivers/staging/media/av7110/av7110.c +++ b/drivers/staging/media/av7110/av7110.c @@ -2437,7 +2437,7 @@ static int av7110_attach(struct saa7146_dev *dev, } /* prepare the av7110 device struct */ - av7110 = kzalloc(sizeof(struct av7110), GFP_KERNEL); + av7110 = kzalloc(sizeof(*av7110), GFP_KERNEL); if (!av7110) { dprintk(1, "out of memory\n"); return -ENOMEM; diff --git a/drivers/staging/media/av7110/av7110_v4l.c b/drivers/staging/media/av7110/av7110_v4l.c index 0ccc34f3d..d13f1afec 100644 --- a/drivers/staging/media/av7110/av7110_v4l.c +++ b/drivers/staging/media/av7110/av7110_v4l.c @@ -557,7 +557,7 @@ static int vidioc_g_fmt_sliced_vbi_out(struct file *file, void *fh, dprintk(2, "VIDIOC_G_FMT:\n"); if (FW_VERSION(av7110->arm_app) < 0x2623) return -EINVAL; - memset(&f->fmt.sliced, 0, sizeof f->fmt.sliced); + memset(&f->fmt.sliced, 0, sizeof(f->fmt.sliced)); if (av7110->wssMode) { f->fmt.sliced.service_set = V4L2_SLICED_WSS_625; f->fmt.sliced.service_lines[0][23] = V4L2_SLICED_WSS_625; @@ -618,7 +618,7 @@ static ssize_t av7110_vbi_write(struct file *file, const char __user *data, size int rc; dprintk(2, "%s\n", __func__); - if (FW_VERSION(av7110->arm_app) < 0x2623 || !av7110->wssMode || count != sizeof d) + if (FW_VERSION(av7110->arm_app) < 0x2623 || !av7110->wssMode || count != sizeof(d)) return -EINVAL; if (copy_from_user(&d, data, count)) return -EFAULT; From patchwork Tue May 7 00:24:56 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Herdler X-Patchwork-Id: 13656131 Received: from mout.gmx.net (mout.gmx.net [212.227.17.20]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 7F55E389 for ; Tue, 7 May 2024 00:25:32 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=212.227.17.20 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1715041534; cv=none; b=B+JTTxApN6ZLuamlR6Ez75WLTBp93YkiyaSgFvGqJHOlu5S3Oi9JPmquHBeZRyKmxdVs7VsXr2XFd0VH+pJEASZs2dzJ4KI7DqJflBtw4jL97r40HLpjhoBzi73Ilr0Jv8bn17qFr4w9IcxGco9W61CyHwvV6XzuDX9i09JN0LI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1715041534; c=relaxed/simple; bh=TYjgjKXafUWqDcFg/VAUrExwUY7VyLxVCeUPBAiTVio=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=QMUxQ5KHme2Zr+E3VCLSPIfYnww9mGWPLdo35XPY14Wu8x29D4dbb+HSaTr3w49/1MTj7aFi7GMUyq44HLQnt/i6nc/nz6zFzmbVjNQOi2SBy9lO4boIYe31rJGWZ7XU3r6p9smpiL6rGLDp+A/t/ltIz8M+TBb9edp4+qbjYGY= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=nurfuerspam.de; spf=pass smtp.mailfrom=nurfuerspam.de; dkim=pass (2048-bit key) header.d=nurfuerspam.de header.i=herdler@nurfuerspam.de header.b=gm67OccF; arc=none smtp.client-ip=212.227.17.20 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=nurfuerspam.de Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=nurfuerspam.de Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=nurfuerspam.de header.i=herdler@nurfuerspam.de header.b="gm67OccF" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nurfuerspam.de; s=s31663417; t=1715041529; x=1715646329; i=herdler@nurfuerspam.de; bh=sHiG/LHz5ilh6w4se0jNWjm0J+ARPrwvJ3UBMjE/ADQ=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date:Message-Id:In-Reply-To: References:MIME-Version:Content-Transfer-Encoding:cc: content-transfer-encoding:content-type:date:from:message-id: mime-version:reply-to:subject:to; b=gm67OccFUoideISqhCR6XFINqK2/OHg1G8a0vPSzvDCI0OqtgwZMuR9kUslDF411 zCatnGyWiAMOKP1yxO5cRWRbVZUHHPLt+pXhhB1N6Wt1C+Z2zyV+bkLfF0yBOmZvw QWLe36mtkI3f7D+AGRiUETwmHZE1Bt2F8ZllmcoQPlgHDarwecqrvcR5MvsNzP9Nj WLDsW7mkIVfqRN9zZUrDnK4wXHJslSdNkgRFD6RtEk3nZlbtkJNA2nrb38vzGq3Ee gAws34/lMDyMzKLaXBhrOJR0pI1eiJYjoSv3L0wkh2W3NAzxjL8eWdF2XQpcvLgof 5DY8rgRTJcXwbHLzuw== X-UI-Sender-Class: 724b4f7f-cbec-4199-ad4e-598c01a50d3a Received: from astro.haus ([185.101.174.109]) by mail.gmx.net (mrgmx105 [212.227.17.168]) with ESMTPSA (Nemesis) id 1N1OXT-1skFvu1qLD-012scm; Tue, 07 May 2024 02:25:29 +0200 From: Stefan Herdler To: hverkuil-cisco@xs4all.nl Cc: linux-media@vger.kernel.org, smoch@web.de, tmn505@gmail.com, vinschen@redhat.com Subject: [PATCH 17/21] media: av7110: coding style fixes: variable types Date: Tue, 7 May 2024 02:24:56 +0200 Message-Id: <20240507002500.81867-18-herdler@nurfuerspam.de> X-Mailer: git-send-email 2.34.0 In-Reply-To: <20240507002500.81867-1-herdler@nurfuerspam.de> References: <20240507002500.81867-1-herdler@nurfuerspam.de> Precedence: bulk X-Mailing-List: linux-media@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Provags-ID: V03:K1:MKi3i80oHKPsLayfvauw1qyeWnwBsH0ByR/Q+QIJVG2aCBzYCUY SStwjOdSB2/z8/qLHPCIds8n3eoUb97m9+4wVKmXQiC0h5ziUkcsvCPf2YcsZL+ZdKTZ+2r aSqSj0xZ/SGmYcR48MTrr57u3BoFAPv5X+C3xb1Q3FpSuma8P9pqa4UVfQ5/m2GBeKIx0bu fc6G4CTxqvupI4Ilp9cpQ== X-Spam-Flag: NO UI-OutboundReport: notjunk:1;M01:P0:6AHejE+96yk=;G57c6MKth9UPEk8BI79y2hJcnG6 bm/Hdh2VpPSU0zLAldgoY5HYlpJ+Oh2R7oJQZh69aGWx+Jit7cA+4DxPFIptWCcWEn/mqazGt 5rONNNZt6U/gQV/LMkUFAogSYOajCj3sAnHbi9rjl0IRCCXb8n/rauW7waHpxIRuqWPKWaxFc ShN/6cObz2CFOc0x0zSoGpX4VtLgtYkdQTgKYgX2N1qjBMm49Wcu6jNv0iMj/y7Wcc+yUk0bA asN48oFZ2WmD6Wp8Vwrw/F+oTboEhEgTcepMukmDpG/K2xmX+/HL4CcMWoAEWiGB7OSeOLlW9 wKsCaxWS/pJAfBnQXXBnCGXCF2DkFmVIkCDSxn/MSqr/scA2LPfzUPBJktcJ5WKZMKA02TS0D Rqo+6PEr6GYvy5Q5FwpV+xP5PUeXDp4fFqVuaRElc78c9o102L8CBW3WJvl52I0okKovKbREo Mcp39jve8tgHTcdSR9W/Hw8oc+bHZtHf5Q4Z4joTrOzIGH+wc+renoq7ja5azD7TjcgUPdM8l qT3SH9gQ+U7Vi4pCUqGEfkLxnuRuExvwKzBkLxlBELdZZaOIkp59Z880DpxSwSCCznN7D3/vH cVri4sKUOiXb0TTRdWAGRn2bgQybaomKRESbzLKAgRBlVM93dR2dM8vW2GK6fo0hFxF+JxlOq LJ6LrVyKHep5d4wiZC+ImoHyhdhYYvL2pTEwS/W+lgFmJuf+x1IJfQOZNJlzQhVBtqhaXN3LX WosPzFxJ1ru+o/FC+Epinn+Os7fRCJNVsuEbkYyqu4kIHnTL04J0ENSPXS0JS9DCeYsOEFy7u 46TT9W08J/eIcpI4Jw7W6ae095fxFzeyVZW5SIVvGA7qA= This patch fixes the following checkpatch warnings: CHECK:PREFER_KERNEL_TYPES: Prefer kernel type 's32' over 'int32_t' CHECK:PREFER_KERNEL_TYPES: Prefer kernel type 'u64' over 'uint64_t' WARNING:UNNECESSARY_INT: Prefer 'long' over 'long int' as the int is unnecessary WARNING:UNSPECIFIED_INT: Prefer 'unsigned int' to bare use of 'unsigned' Signed-off-by: Stefan Herdler --- ========================================================================== CHECK:AVOID_EXTERNS: extern prototypes should be avoided in .h files Will be fixes in: [PATCH 21/21] media: av7110: coding style fixes: avoid_externs ========================================================================== drivers/staging/media/av7110/av7110.c | 4 ++-- drivers/staging/media/av7110/av7110.h | 2 +- drivers/staging/media/av7110/av7110_av.c | 12 ++++++------ drivers/staging/media/av7110/av7110_av.h | 2 +- 4 files changed, 10 insertions(+), 10 deletions(-) -- 2.34.0 diff --git a/drivers/staging/media/av7110/av7110.c b/drivers/staging/media/av7110/av7110.c index 42b5d049e..14c512fdf 100644 --- a/drivers/staging/media/av7110/av7110.c +++ b/drivers/staging/media/av7110/av7110.c @@ -1094,7 +1094,7 @@ static void restart_feeds(struct av7110 *av7110) } static int dvb_get_stc(struct dmx_demux *demux, unsigned int num, - uint64_t *stc, unsigned int *base) + u64 *stc, unsigned int *base) { int ret; u16 fwstc[4]; @@ -1183,7 +1183,7 @@ static int stop_ts_capture(struct av7110 *budget) static int start_ts_capture(struct av7110 *budget) { - unsigned y; + unsigned int y; dprintk(2, "budget: %p\n", budget); diff --git a/drivers/staging/media/av7110/av7110.h b/drivers/staging/media/av7110/av7110.h index 1cfe13df6..3f6b88f0f 100644 --- a/drivers/staging/media/av7110/av7110.h +++ b/drivers/staging/media/av7110/av7110.h @@ -58,7 +58,7 @@ enum av7110_video_mode { struct av7110_p2t { u8 pes[TS_SIZE]; u8 counter; - long int pos; + long pos; int frags; struct dvb_demux_feed *feed; }; diff --git a/drivers/staging/media/av7110/av7110_av.c b/drivers/staging/media/av7110/av7110_av.c index 3e0db8e9a..a408e10fb 100644 --- a/drivers/staging/media/av7110/av7110_av.c +++ b/drivers/staging/media/av7110/av7110_av.c @@ -71,7 +71,7 @@ #define PIECE_RATE 0x40 #define SEAM_SPLICE 0x20 -static void p_to_t(u8 const *buf, long int length, u16 pid, +static void p_to_t(u8 const *buf, long length, u16 pid, u8 *counter, struct dvb_demux_feed *feed); static int write_ts_to_decoder(struct av7110 *av7110, int type, const u8 *buf, size_t len); @@ -585,7 +585,7 @@ static void clear_p2t(struct av7110_p2t *p) p->frags = 0; } -static int find_pes_header(u8 const *buf, long int length, int *frags) +static int find_pes_header(u8 const *buf, long length, int *frags) { int c = 0; int found = 0; @@ -634,7 +634,7 @@ static int find_pes_header(u8 const *buf, long int length, int *frags) return c; } -void av7110_p2t_write(u8 const *buf, long int length, u16 pid, struct av7110_p2t *p) +void av7110_p2t_write(u8 const *buf, long length, u16 pid, struct av7110_p2t *p) { int c, c2, l, add; int check, rest; @@ -763,7 +763,7 @@ static int write_ts_header2(u16 pid, u8 *counter, int pes_start, u8 *buf, u8 len return c; } -static void p_to_t(u8 const *buf, long int length, u16 pid, u8 *counter, +static void p_to_t(u8 const *buf, long length, u16 pid, u8 *counter, struct dvb_demux_feed *feed) { int l, pes_start; @@ -1023,7 +1023,7 @@ static u8 iframe_header[] = { 0x00, 0x00, 0x01, 0xe0, 0x00, 0x00, 0x80, 0x00, 0x static int play_iframe(struct av7110 *av7110, char __user *buf, unsigned int len, int nonblock) { - unsigned i, n; + unsigned int i, n; int progressive = 0; int match = 0; @@ -1090,7 +1090,7 @@ static int play_iframe(struct av7110 *av7110, char __user *buf, unsigned int len #ifdef CONFIG_COMPAT struct compat_video_still_picture { compat_uptr_t iFrame; - int32_t size; + s32 size; }; #define VIDEO_STILLPICTURE32 _IOW('o', 30, struct compat_video_still_picture) diff --git a/drivers/staging/media/av7110/av7110_av.h b/drivers/staging/media/av7110/av7110_av.h index ce0f9945d..f1c5c26c6 100644 --- a/drivers/staging/media/av7110/av7110_av.h +++ b/drivers/staging/media/av7110/av7110_av.h @@ -21,7 +21,7 @@ extern int av7110_av_start_play(struct av7110 *av7110, int av); extern void dvb_video_add_event(struct av7110 *av7110, struct video_event *event); extern void av7110_p2t_init(struct av7110_p2t *p, struct dvb_demux_feed *feed); -extern void av7110_p2t_write(u8 const *buf, long int length, u16 pid, struct av7110_p2t *p); +extern void av7110_p2t_write(u8 const *buf, long length, u16 pid, struct av7110_p2t *p); extern int av7110_av_register(struct av7110 *av7110); extern void av7110_av_unregister(struct av7110 *av7110); From patchwork Tue May 7 00:24:57 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Herdler X-Patchwork-Id: 13656137 Received: from mout.gmx.net (mout.gmx.net [212.227.17.22]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id BBA1964F for ; Tue, 7 May 2024 00:25:32 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=212.227.17.22 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1715041535; cv=none; b=et1+HztmDGb9HFPp9lqDl63bsm1p/BdsC7l6HiDUi/vgSEtrUynXKi7d91h9qi8crg2FjwD77nxalhQPkNN0dHfWuTFZeL3C77lntSHVsut2OFw0WIRivIrtqnq8ikKCyDodnKb2OYEswYukR2MPM3qV1YEjQZgXbK5fppRcjqU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1715041535; c=relaxed/simple; bh=LaNN/PknjqydjKNNPsTzYiJPGt4QOhMA66QdgMdurls=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=TrCE9nWEoGgEAEW0WNaSVsl0sU0q2knh4ztVG8p94+BMTYzyVDI3DmsqVztI72TL8g3zqWylHNwB+LDSHMPrP9dMs4VKrFWZ/aADTe4cz9oBzCcokyOLp7dYg58UNmvKtsPoWxV4IiBhrMs4JgyGw34F1jTVEL8Fc9G39IEhigQ= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=nurfuerspam.de; spf=pass smtp.mailfrom=nurfuerspam.de; dkim=pass (2048-bit key) header.d=nurfuerspam.de header.i=herdler@nurfuerspam.de header.b=ZKbJBGTU; arc=none smtp.client-ip=212.227.17.22 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=nurfuerspam.de Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=nurfuerspam.de Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=nurfuerspam.de header.i=herdler@nurfuerspam.de header.b="ZKbJBGTU" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nurfuerspam.de; s=s31663417; t=1715041529; x=1715646329; i=herdler@nurfuerspam.de; bh=W+nkUDSEvEFnaJ3eDxJ+5qJ/Vs37FG016keg0LXj9SM=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date:Message-Id:In-Reply-To: References:MIME-Version:Content-Transfer-Encoding:cc: content-transfer-encoding:content-type:date:from:message-id: mime-version:reply-to:subject:to; b=ZKbJBGTURpP4vbk7k5yEzTwQLNVacb7REDIA1ksUI3s3kx9uqbO9wq1oXDYO+g3P IVOu3m+iMtWfhYhYx4cXgDA/2pqInak7wRKbofgFx1QAB/TvUB1K5FTdwHto215Dk Rh2Oil1sNmvqflxJrIVzzCl8CE/2LnYiYYdkU6tmY6NeOXCsR/JeFdxmEL447JXZ+ SnjblLP0lxQXyTRbXMSdo3sPudi5CEnk0RFhjruzbClenU3A++EGOgWbVf7iGIPP1 pONIyU34RXlym/sc6+716iuRlTfsuiQTjXGJRLcR41xxXEyHLvwlyRseBk+x1Zh76 3HfQRPUfLMMtOH5wZQ== X-UI-Sender-Class: 724b4f7f-cbec-4199-ad4e-598c01a50d3a Received: from astro.haus ([185.101.174.109]) by mail.gmx.net (mrgmx105 [212.227.17.168]) with ESMTPSA (Nemesis) id 1Mkpap-1sTp0o2ur9-00mJi4; Tue, 07 May 2024 02:25:29 +0200 From: Stefan Herdler To: hverkuil-cisco@xs4all.nl Cc: linux-media@vger.kernel.org, smoch@web.de, tmn505@gmail.com, vinschen@redhat.com Subject: [PATCH 18/21] media: av7110: coding style fixes: miscellaneous Date: Tue, 7 May 2024 02:24:57 +0200 Message-Id: <20240507002500.81867-19-herdler@nurfuerspam.de> X-Mailer: git-send-email 2.34.0 In-Reply-To: <20240507002500.81867-1-herdler@nurfuerspam.de> References: <20240507002500.81867-1-herdler@nurfuerspam.de> Precedence: bulk X-Mailing-List: linux-media@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Provags-ID: V03:K1:4a0/PcX9wBE32Kcp5OdYyKFN+RFGyk7bw7HKjIY+pZR9Hz19kR9 a1fMGq22Wg+823lrD5InkEkNl8tEMv/ouKX+P3iMBpNVNEAXA3GGO0ryQVKKh8DA/a8VzWG 014LuV8GuQ/Y/4+58loHFG/8zuIhT+5xfqaF8foXFruqroBzMmamLkmW3LZQZGLFjzuu7UO QExBZ/FcdRCry4Asv9ObQ== X-Spam-Flag: NO UI-OutboundReport: notjunk:1;M01:P0:9qpuTHPv5L8=;QZlIEIfhciWCc+NNXHdlOJ2nNg8 nsBD4OzP54v0nT9D4b2b1PbIxca78ngXZbzpcgkVko3qjJB9Wbc293XvVdcDmQeHMBGCsf3XM sqVX6gOl/Tl4iMUmPzyQINlduTKKeWfYYmmWYB3sEsDtNzxJpnp4Zo2FlxX5/VudeNJkdaCG9 9EzxEVmAtK0NReMX+0tdpwbh9QRxKTU40VUWLYOOHjJKrmQg2qtwlPSvNxDfL+8S0AB9TeCnP vqQMijS5HM5Sj3IIlheZsYf1xRtFLbeUq2948+RLPxbOauF7lbhmplL58FEXgCPLRLed9qBHR zBGOF7tyzMpn0j7SF9PDLEkrJ4PQZNs1RXfSjx4vwadtKGmTYfTtyyC9G/DerJwKKcfogTN5Z FZXV57iDzHIhi/BRonkF3/wSghRjeoiFMRwIaDnW21vzM1hfFJ3agQQgB8HW1QLHdSwGpBFtJ mwN/dgrXaQvIyd0vFssTvdeF/E6rTubNM8piUW44wR9UswfbCr9tKYfnx5E2zK5LybFx8X3/Q LLhHR56Uj8uYGhsfZUxr8GSfITWChnJGm3rjLhmuL1O7CE0nFCSGcR2Pf8TQzB+5tMpgjm38y JOkytSe+bsQ6kzy4hHNkW9pChOGzpDAz9dlLmVjzFwLrSVgQiBFsost7geyMxNZbK+xXPo3JL u+Okvvgc9H1ZiimVv3RN7zm9Ytx2RYtlAF+o3ye4i82XKwP4fTNsm2tTnShsVz2N35rr+RB/j uzJMxHmhYnnv1Zpa3xSDF1hGUOd/ki7Db/dGhSzhDmvNXp9fdtOPY+7l/Uig3+mukIL0oi2ZY IKLbNX7fgxAroWaXmykdj6vioUuZygjs57KkLZWkxmmIw= This patch fixes the following checkpatch warnings: WARNING:OOM_MESSAGE: Possible unnecessary 'out of memory' message CHECK:MACRO_ARG_REUSE: Macro argument reuse 'fe_func' - possible side-effects? The MACRO_ARG_REUSE isn't really fixed but marked as intentional. The comment is visible in the checkpatch warning. Signed-off-by: Stefan Herdler --- drivers/staging/media/av7110/av7110.c | 2 +- drivers/staging/media/av7110/av7110_ipack.c | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) -- 2.34.0 diff --git a/drivers/staging/media/av7110/av7110.c b/drivers/staging/media/av7110/av7110.c index 14c512fdf..30e2e6e65 100644 --- a/drivers/staging/media/av7110/av7110.c +++ b/drivers/staging/media/av7110/av7110.c @@ -108,7 +108,7 @@ static int av7110_num; av7110_copy = fe_func; \ fe_func = av7110_func; \ } \ -} +} /* Macro argument reuse of 'fe_func' is intentional! */ static void init_av7110_av(struct av7110 *av7110) { diff --git a/drivers/staging/media/av7110/av7110_ipack.c b/drivers/staging/media/av7110/av7110_ipack.c index c41a233e1..9631aae71 100644 --- a/drivers/staging/media/av7110/av7110_ipack.c +++ b/drivers/staging/media/av7110/av7110_ipack.c @@ -23,10 +23,8 @@ int av7110_ipack_init(struct ipack *p, int size, void (*func)(u8 *buf, int size, void *priv)) { p->buf = vmalloc(size); - if (!p->buf) { - printk(KERN_WARNING "Couldn't allocate memory for ipack\n"); + if (!p->buf) return -ENOMEM; - } p->size = size; p->func = func; p->repack_subids = 0; From patchwork Tue May 7 00:24:58 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Herdler X-Patchwork-Id: 13656134 Received: from mout.gmx.net (mout.gmx.net [212.227.17.21]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 3A29EA23 for ; Tue, 7 May 2024 00:25:32 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=212.227.17.21 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1715041535; cv=none; b=R8Td7MdigyKA8/XlAHkLkbiEN3LfRpb9yvXrwNg2017PsdJvQ1breiajp0VMlRy/n7gydJDVpP+DANnkSd6ASTgICRd+7qufe4QNOmEDgCfDBV/elScToSGwYutRfHCOouiQlCZ2YcsPUm0KQU6WRDEA3cZo426SRYDc5ruI0Bo= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1715041535; c=relaxed/simple; bh=ceXJ+hHasLwkjwmMQviQbGxn8Y6E93LTfUEGou+Rm7Y=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=G1lk1CzQtYJ3NmPp60t8gilGCwcdWLobxMEkSG+h5Matxrcg3gGLBVXYQE3gJT7WadqIJEphX2yJEurUvshYfd7E3TOnVBXjQEzlulpH5zKviNVCemzzhXpnla3URDHk/jIBZ5xpzRFoS/wmMNBg/O+MLSxawfCDyxBHpClsHok= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=nurfuerspam.de; spf=pass smtp.mailfrom=nurfuerspam.de; dkim=pass (2048-bit key) header.d=nurfuerspam.de header.i=herdler@nurfuerspam.de header.b=IxLrg0G/; arc=none smtp.client-ip=212.227.17.21 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=nurfuerspam.de Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=nurfuerspam.de Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=nurfuerspam.de header.i=herdler@nurfuerspam.de header.b="IxLrg0G/" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nurfuerspam.de; s=s31663417; t=1715041530; x=1715646330; i=herdler@nurfuerspam.de; bh=UrD7/HzS21qEJde6ivImb9os6Ry5t2qmBcUKm4FOVEA=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date:Message-Id:In-Reply-To: References:MIME-Version:Content-Transfer-Encoding:cc: content-transfer-encoding:content-type:date:from:message-id: mime-version:reply-to:subject:to; b=IxLrg0G/jQLHLWv8xzRndO506xZi5lbWnunSrYAzv2jbmD1no/15T1fvz4Fbola1 3AzCMvj9MtrM1LVPfIesJS6dC0dw+bpVMLUEhNDC/Qw7YXjPnWeRLWuVScMhlzcC1 Axe+dziN0IfPIeXd37mvlgNA5MBEkNuyyu02Qstgar6RF6D8SrLamtha7UDq2iTuy YABWTF3Uv/XxLmv0isjqA0JjUTDNaJrgjWotBxp0lqjUVwzzSqrX5/kf1reoxZu4A nYBMo6PKv9t+rM+u+VUa5/bI4mljS8gdaGRj5dPXPjwjGNVFQkzP5/1i7GoU+WTdR yqD4UYN1Px1HWh5KcQ== X-UI-Sender-Class: 724b4f7f-cbec-4199-ad4e-598c01a50d3a Received: from astro.haus ([185.101.174.109]) by mail.gmx.net (mrgmx105 [212.227.17.168]) with ESMTPSA (Nemesis) id 1MS3il-1sAvBK3vVT-00TXsC; Tue, 07 May 2024 02:25:30 +0200 From: Stefan Herdler To: hverkuil-cisco@xs4all.nl Cc: linux-media@vger.kernel.org, smoch@web.de, tmn505@gmail.com, vinschen@redhat.com Subject: [PATCH 19/21] media: av7110: coding style fixes: deep_indentation Date: Tue, 7 May 2024 02:24:58 +0200 Message-Id: <20240507002500.81867-20-herdler@nurfuerspam.de> X-Mailer: git-send-email 2.34.0 In-Reply-To: <20240507002500.81867-1-herdler@nurfuerspam.de> References: <20240507002500.81867-1-herdler@nurfuerspam.de> Precedence: bulk X-Mailing-List: linux-media@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Provags-ID: V03:K1:xLq78zlf2k6yk6NKlG0VMjM0XVQ9QoCD6p3W2YCHlZ8oZqp5EUl sziavTBSTwfixjRvpzMg14lHYaIuK6TNw8tRA9OoTVURj6IluhRtXV//nK8/Ar8BefHTNHK f5Bc0yAhDgap6HKFqFYh4F39Tw/kqBAac+Qv4WjtqFCtLObjw6kRhP0oj7L0O4gCNF2wa3J 0KqDPQpCrM7uEDrM10J2A== X-Spam-Flag: NO UI-OutboundReport: notjunk:1;M01:P0:V3x/cXGdtMw=;ZLckh4G28OkdmNT0xNzWD1Ne5M6 CAf8t7DisEsNFvyD9T94N3DmYEgox5e9+AgPUp5WSqDpvFCVzzuzgKMkXuIQHYojTbX3Ikvi0 aH8T36Jz/6641yoi1uqFeZuoNSemhLGyX2SNtK9zVA8JEzzgC9q6w1WciYDe1Ymu2xA4dMGAF frqXiQGxZl4jZSA7yl0Qi9NYWN6ijZGOp8+ugRAN+HTJM2XzMO6TkqxxFFryqkn49zuy5xEWB PPqqmncHH+HDanrcFmQqqBYulHoilS96AZLk3W2Lm30pMRM3XvqkRgJxdvprWdN1PML+bpamp akYX4EKuHKqHkuh7ngL+p1GQ6By6bbpY086c1tv9wK9MB93umEOhoNhxM96Sim+frcPEkhf72 bmGA12OrMy0S1bsZbUhP95dQRgrh36KI66IhVVhYRd1xZNZ2IXaYNEaIDx21I2zbKRUu9b13H FmsyBKC2EJ0ZwlQrTJXo704AJocUpijvgq9w6Z4elLBqRXWtKmKf5RJ09t7EuKzd2PDDUBc94 6854aRcLMwgOmHdPub3aW3OS+Zy/R0t1Hadlb1Vfd5u8Z+YcHVR1XOxKUA0OIAa+5Tw5DkooO sQyzNBEH52sq6PaIFrCxuWwqCcwKbM9/1vRDaJxWk+c80FyHimERJscsmTQaf64scs6cIg4AB LUreNy+9uDKFAhRUtMDxl7LK20mnGU2UJIKp18hN+OL4OFsx3jl/IQPtFAnLD9l/4RQvVYk9o qm9aB+d7cbT4/oudOdJPKXuz6s7pSRziS7NePFrSHQyTNM950uQwUXrf+xtp8cB5lsKoXi67Z MqxtuJOVCkbNQx4lRPUkgXTwVQM2Wc6ZgAm2mnK6Ch1rs= This patch fixes most the following checkpatch warnings: WARNING:DEEP_INDENTATION: Too many leading tabs - consider code refactoring Invert "if" statement to reduce indention level by 1. Signed-off-by: Stefan Herdler --- ========================================================================== The patch is surprisingly confusing, compared to the little changes. "git diff -b HEAD~2 HEAD~3" shows the 3 really modifies lines. ========================================================================== drivers/staging/media/av7110/av7110_ipack.c | 234 ++++++++++---------- 1 file changed, 117 insertions(+), 117 deletions(-) -- 2.34.0 diff --git a/drivers/staging/media/av7110/av7110_ipack.c b/drivers/staging/media/av7110/av7110_ipack.c index 9631aae71..4be6e225f 100644 --- a/drivers/staging/media/av7110/av7110_ipack.c +++ b/drivers/staging/media/av7110/av7110_ipack.c @@ -249,146 +249,146 @@ int av7110_ipack_instant_repack(const u8 *buf, int count, struct ipack *p) if (!p->plength) p->plength = MMAX_PLENGTH - 6; - if (p->done || ((p->mpeg == 2 && p->found >= 9) || - (p->mpeg == 1 && p->found >= 7))) { - switch (p->cid) { - case AUDIO_STREAM_S ... AUDIO_STREAM_E: - case VIDEO_STREAM_S ... VIDEO_STREAM_E: - case PRIVATE_STREAM1: - if (p->mpeg == 2 && p->found == 9) { - write_ipack(p, &p->flag1, 1); - write_ipack(p, &p->flag2, 1); - write_ipack(p, &p->hlength, 1); + if (!(p->done || ((p->mpeg == 2 && p->found >= 9) || + (p->mpeg == 1 && p->found >= 7)))) + return count; + + switch (p->cid) { + case AUDIO_STREAM_S ... AUDIO_STREAM_E: + case VIDEO_STREAM_S ... VIDEO_STREAM_E: + case PRIVATE_STREAM1: + if (p->mpeg == 2 && p->found == 9) { + write_ipack(p, &p->flag1, 1); + write_ipack(p, &p->flag2, 1); + write_ipack(p, &p->hlength, 1); + } + + if (p->mpeg == 1 && p->found == 7) + write_ipack(p, &p->flag1, 1); + + if (p->mpeg == 2 && (p->flag2 & PTS_ONLY) && p->found < 14) { + while (c < count && p->found < 14) { + p->pts[p->found - 9] = buf[c]; + write_ipack(p, buf + c, 1); + c++; + p->found++; } + if (c == count) + return count; + } - if (p->mpeg == 1 && p->found == 7) - write_ipack(p, &p->flag1, 1); + if (p->mpeg == 1 && p->which < 2000) { + if (p->found == 7) { + p->check = p->flag1; + p->hlength = 1; + } - if (p->mpeg == 2 && (p->flag2 & PTS_ONLY) && - p->found < 14) { - while (c < count && p->found < 14) { - p->pts[p->found - 9] = buf[c]; - write_ipack(p, buf + c, 1); - c++; - p->found++; - } - if (c == count) - return count; + while (!p->which && c < count && p->check == 0xff) { + p->check = buf[c]; + write_ipack(p, buf + c, 1); + c++; + p->found++; + p->hlength++; } - if (p->mpeg == 1 && p->which < 2000) { - if (p->found == 7) { - p->check = p->flag1; - p->hlength = 1; - } + if (c == count) + return count; - while (!p->which && c < count && - p->check == 0xff){ - p->check = buf[c]; - write_ipack(p, buf + c, 1); - c++; - p->found++; - p->hlength++; - } + if ((p->check & 0xc0) == 0x40 && !p->which) { + p->check = buf[c]; + write_ipack(p, buf + c, 1); + c++; + p->found++; + p->hlength++; + p->which = 1; + if (c == count) + return count; + p->check = buf[c]; + write_ipack(p, buf + c, 1); + c++; + p->found++; + p->hlength++; + p->which = 2; if (c == count) return count; + } - if ((p->check & 0xc0) == 0x40 && !p->which) { - p->check = buf[c]; - write_ipack(p, buf + c, 1); - c++; - p->found++; - p->hlength++; + if (p->which == 1) { + p->check = buf[c]; + write_ipack(p, buf + c, 1); + c++; + p->found++; + p->hlength++; + p->which = 2; + if (c == count) + return count; + } - p->which = 1; - if (c == count) - return count; - p->check = buf[c]; - write_ipack(p, buf + c, 1); - c++; - p->found++; - p->hlength++; - p->which = 2; - if (c == count) - return count; - } + if ((p->check & 0x30) && p->check != 0xff) { + p->flag2 = (p->check & 0xf0) << 2; + p->pts[0] = p->check; + p->which = 3; + } - if (p->which == 1) { - p->check = buf[c]; - write_ipack(p, buf + c, 1); - c++; - p->found++; - p->hlength++; - p->which = 2; + if (c == count) + return count; + if (p->which > 2) { + if ((p->flag2 & PTS_DTS_FLAGS) == PTS_ONLY) { + while (c < count && p->which < 7) { + p->pts[p->which - 2] = buf[c]; + write_ipack(p, buf + c, 1); + c++; + p->found++; + p->which++; + p->hlength++; + } if (c == count) return count; - } - - if ((p->check & 0x30) && p->check != 0xff) { - p->flag2 = (p->check & 0xf0) << 2; - p->pts[0] = p->check; - p->which = 3; - } - - if (c == count) - return count; - if (p->which > 2) { - if ((p->flag2 & PTS_DTS_FLAGS) == PTS_ONLY) { - while (c < count && p->which < 7) { + } else if ((p->flag2 & PTS_DTS_FLAGS) == PTS_DTS) { + while (c < count && p->which < 12) { + if (p->which < 7) p->pts[p->which - 2] = buf[c]; - write_ipack(p, buf + c, 1); - c++; - p->found++; - p->which++; - p->hlength++; - } - if (c == count) - return count; - } else if ((p->flag2 & PTS_DTS_FLAGS) == PTS_DTS) { - while (c < count && p->which < 12) { - if (p->which < 7) - p->pts[p->which - 2] = buf[c]; - write_ipack(p, buf + c, 1); - c++; - p->found++; - p->which++; - p->hlength++; - } - if (c == count) - return count; + write_ipack(p, buf + c, 1); + c++; + p->found++; + p->which++; + p->hlength++; } - p->which = 2000; + if (c == count) + return count; } + p->which = 2000; } - - while (c < count && p->found < p->plength + 6) { - l = count - c; - if (l + p->found > p->plength + 6) - l = p->plength + 6 - p->found; - write_ipack(p, buf + c, l); - p->found += l; - c += l; - } - break; } - if (p->done) { - if (p->found + count - c < p->plength + 6) { - p->found += count - c; - c = count; - } else { - c += p->plength + 6 - p->found; - p->found = p->plength + 6; - } + while (c < count && p->found < p->plength + 6) { + l = count - c; + if (l + p->found > p->plength + 6) + l = p->plength + 6 - p->found; + write_ipack(p, buf + c, l); + p->found += l; + c += l; } + break; + } - if (p->plength && p->found == p->plength + 6) { - send_ipack(p); - av7110_ipack_reset(p); - if (c < count) - av7110_ipack_instant_repack(buf + c, count - c, p); + if (p->done) { + if (p->found + count - c < p->plength + 6) { + p->found += count - c; + c = count; + } else { + c += p->plength + 6 - p->found; + p->found = p->plength + 6; } } + + if (p->plength && p->found == p->plength + 6) { + send_ipack(p); + av7110_ipack_reset(p); + if (c < count) + av7110_ipack_instant_repack(buf + c, count - c, p); + } + return count; } From patchwork Tue May 7 00:24:59 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Herdler X-Patchwork-Id: 13656152 Received: from mout.gmx.net (mout.gmx.net [212.227.17.22]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 0F404637 for ; Tue, 7 May 2024 00:27:28 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=212.227.17.22 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1715041652; cv=none; b=sUEyZhgP5wuU4uU6Oj94NiIKan6zAY/zPo2nuY2oTLTqTxbUBusHYPS1ore8rN5LZq66fmRF0avakOqTSzoiiEPa2Oa2Qcf8TRDXrs4R+Dq6sDD83L2PxZjRKXR1LpVn3AOl+S+7hMKQ2xcvzQc1IosBsABC+GvZG1fnsaCzHx0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1715041652; c=relaxed/simple; bh=SyqoDwNGNrIGEQWoG0OIj1Cac28KK3yDWZ1A5DYEv5A=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=NEwac/2VFQeY+bvtSIe8xp5iyfgBRLDaCqrFxbNVRB45KEAG9qvGGf5nwE2wg5ZtgeH8Zlt5frQeTgkX9Kylpx4N8qOIJsHdcJ1N9YhTiBM8IgE/8I/dv2P8bfHnOVO6O+aEP8xJAEWKMVI4GV0+er1xcnjicsnG/GtJTT2a6i0= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=nurfuerspam.de; spf=pass smtp.mailfrom=nurfuerspam.de; dkim=pass (2048-bit key) header.d=nurfuerspam.de header.i=herdler@nurfuerspam.de header.b=jH0NtW//; arc=none smtp.client-ip=212.227.17.22 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=nurfuerspam.de Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=nurfuerspam.de Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=nurfuerspam.de header.i=herdler@nurfuerspam.de header.b="jH0NtW//" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nurfuerspam.de; s=s31663417; t=1715041646; x=1715646446; i=herdler@nurfuerspam.de; bh=/QkeTg2W/HIoi/Ho2pxuRzt18vx+lypVYLn56WdQsSw=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date:Message-Id:In-Reply-To: References:MIME-Version:Content-Transfer-Encoding:cc: content-transfer-encoding:content-type:date:from:message-id: mime-version:reply-to:subject:to; b=jH0NtW//FIB21fP501ZdAVt8RatgEvO08P4V3Wa0S2VLTu4eGnvbIH4chYSQLvWA mbPFiueh25/Do8fhP3UjsLuF+hFfiAYdUU+Dv3ZyEBF8mtokxj4EjzS3cQMoMXtkh W2Z6lSRdQwl6upnFte5bsgB0wRmnoXmFq0O0/uMBKeIzNBoLaCQj2EjD97o3iwKC2 h8PQDz+7ByZ4ej+bZZonYpee5FW37VdeNc1f8OX0/Y32AOtXkG7ewumXO2KvoCbiF QBLj66mXkfK4ytDlcxD11QwjoF7B3Q1g5nTrCPrpbuYBkT1huCCcPUr6uT/7H/hV0 8uAakVR+8KZMAtFnww== X-UI-Sender-Class: 724b4f7f-cbec-4199-ad4e-598c01a50d3a Received: from astro.haus ([185.101.174.109]) by mail.gmx.net (mrgmx104 [212.227.17.168]) with ESMTPSA (Nemesis) id 1MDQeU-1rwx8F36oA-008t1L; Tue, 07 May 2024 02:27:25 +0200 From: Stefan Herdler To: hverkuil-cisco@xs4all.nl Cc: linux-media@vger.kernel.org, smoch@web.de, tmn505@gmail.com, vinschen@redhat.com Subject: [PATCH 20/21] media: av7110: coding style fixes: logging Date: Tue, 7 May 2024 02:24:59 +0200 Message-Id: <20240507002500.81867-21-herdler@nurfuerspam.de> X-Mailer: git-send-email 2.34.0 In-Reply-To: <20240507002500.81867-1-herdler@nurfuerspam.de> References: <20240507002500.81867-1-herdler@nurfuerspam.de> Precedence: bulk X-Mailing-List: linux-media@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Provags-ID: V03:K1:HFPoBtw6UIvWabBQinJaTPL2wXd5BLrVtyjZhurE89u6NLwFKXo RbynpyXxKqgIShBEyVqYhgKZ8TXQs9dbnmr7sPCaKakrpD7x0Oa/wBqQb1JqPbLmbIH+XTB 26OLX9MBD3nzSXV7REv79UlyLMwYpUHBNcg/vLcjypiS2u1Ru0mhL4G64rvuMPDoC2Em6Fc 951H3FqEay+E2bbKK4i8A== X-Spam-Flag: NO UI-OutboundReport: notjunk:1;M01:P0:Yiwc8VDee+E=;HdoxaEjuQjz13YZWvgOc5Nziw0s 2yxCPLqEffrwkSuKwXazKTLal1qo/WrTTIpYeCK6zDDk/BMpVW7fB6ge1BAuvPxfSSTimOoKS cGcH2NFug+cv5FgunE+IvkKnefE1UL+eBDfiEcjJ28lwq/eOcHKLol90E2UnlQ6AZWO/E2auH AkoPkOqHC+vcOsvwgtE5ThnwxjslBsMCoQZssHSfIWXU3Lci4bJNW54yV9tWcVbp7oVhBVYSX V1wAC8C8cl/jXlYKDyEay0KSjV38ToJCNir46RjjO0T3ffZzlOJC1P3eTtwcZ+NZhZ41P5/xq LQE/0wGDNl/hnjT6eKSlEW+s8QiwLDKtpJpSNPpMaydyy2nKj0S9XUexUrXAIb8DZki5wqTHb DZjrPBF0yjVXv9gpaVjG+KHRQhU1+6w5tjuk7rYj416f3atzrUM4/hYF8LnRrKw0FtHQipMZI Wv8J/oDhrxMaXACpFaooPbnMczHa4neEwTDWYGjNs1ZLrN5Uw6co4mgq6jcGC00hiHJ6jx9TT /En9WGx68lK3sqD9w6X/6iD8YYpvhP6aKL86WXiNMsxiUuL9rMDXvcjcwu41RKdFufThKWpX1 FYhFzLNJnING1npY7VMjkSY95SRZ28W8vdUOa5YtuiUs3YOlTDq7bn3l64SrllsljNfKyqwu1 Zwiu6RzB+Z4ou/axb2Wfnb2o5raQqeevqWIxHVohxJPJKK9eA52ixuoYSeXBEqnY6vCT+aO6f QbOgFd5KHEbn8s0HI5qRYT6ldSyzjmAXhKU7gQCXfimA4dxwnp48An2m2BUp6RWdTkkECC3xn W9LUu8UsLJNi1mHynLwQGHEQZo/W2Jttql0ohA79lOz0w= This patch fixes the following checkpatch warnings: CHECK:MACRO_ARG_PRECEDENCE: Macro argument 'level' may be better as '(level)' to avoid precedence issues WARNING:EMBEDDED_FUNCTION_NAME: Prefer using '"%s...", __func__' to using 'av7110_bootarm', this function's name, in a string WARNING:EMBEDDED_FUNCTION_NAME: Prefer using '"%s...", __func__' to using 'av7110_diseqc_send', this function's name, in a string WARNING:EMBEDDED_FUNCTION_NAME: Prefer using '"%s...", __func__' to using 'av7110_fw_cmd', this function's name, in a string WARNING:EMBEDDED_FUNCTION_NAME: Prefer using '"%s...", __func__' to using 'av7110_fw_query', this function's name, in a string WARNING:EMBEDDED_FUNCTION_NAME: Prefer using '"%s...", __func__' to using 'av7110_fw_request', this function's name, in a string WARNING:EMBEDDED_FUNCTION_NAME: Prefer using '"%s...", __func__' to using 'av7110_osd_cmd', this function's name, in a string WARNING:EMBEDDED_FUNCTION_NAME: Prefer using '"%s...", __func__' to using 'av7110_send_ci_cmd', this function's name, in a string WARNING:EMBEDDED_FUNCTION_NAME: Prefer using '"%s...", __func__' to using 'av7110_send_fw_cmd', this function's name, in a string WARNING:EMBEDDED_FUNCTION_NAME: Prefer using '"%s...", __func__' to using 'gpioirq', this function's name, in a string WARNING:EMBEDDED_FUNCTION_NAME: Prefer using '"%s...", __func__' to using 'load_dram', this function's name, in a string WARNING:EMBEDDED_FUNCTION_NAME: Prefer using '"%s...", __func__' to using 'ReleaseBitmap', this function's name, in a string WARNING:EMBEDDED_FUNCTION_NAME: Prefer using '"%s...", __func__' to using 'vpeirq', this function's name, in a string WARNING:EMBEDDED_FUNCTION_NAME: Prefer using '"%s...", __func__' to using 'WriteText', this function's name, in a string WARNING:LOGGING_CONTINUATION: Avoid logging continuation uses where feasible WARNING:PREFER_PR_LEVEL: Prefer [subsystem eg: netdev]_cont([subsystem]dev, ... then dev_cont(dev, ... then pr_cont(... to printk(KERN_CONT ... WARNING:PREFER_PR_LEVEL: Prefer [subsystem eg: netdev]_dbg([subsystem]dev, ... then dev_dbg(dev, ... then pr_debug(... to printk(KERN_DEBUG ... WARNING:PREFER_PR_LEVEL: Prefer [subsystem eg: netdev]_err([subsystem]dev, ... then dev_err(dev, ... then pr_err(... to printk(KERN_ERR ... WARNING:PREFER_PR_LEVEL: Prefer [subsystem eg: netdev]_info([subsystem]dev, ... then dev_info(dev, ... then pr_info(... to printk(KERN_INFO ... WARNING:PREFER_PR_LEVEL: Prefer [subsystem eg: netdev]_warn([subsystem]dev, ... then dev_warn(dev, ... then pr_warn(... to printk(KERN_WARNING ... WARNING:PRINTK_WITHOUT_KERN_LEVEL: printk() should include KERN_ facility level WARNING:TRACING_LOGGING: Unnecessary ftrace-like logging - prefer using ftrace There where different logging styles in this drivers. Convert everything to the recommend pr_* macros. Log messages should mostly be unchanged by this patch. Signed-off-by: Stefan Herdler --- drivers/staging/media/av7110/av7110.c | 130 ++++++++++------------ drivers/staging/media/av7110/av7110.h | 10 +- drivers/staging/media/av7110/av7110_av.c | 52 ++++----- drivers/staging/media/av7110/av7110_ca.c | 12 +- drivers/staging/media/av7110/av7110_hw.c | 116 +++++++++---------- drivers/staging/media/av7110/av7110_ir.c | 3 +- drivers/staging/media/av7110/av7110_v4l.c | 10 +- drivers/staging/media/av7110/dvb_filter.c | 11 +- 8 files changed, 157 insertions(+), 187 deletions(-) -- 2.34.0 diff --git a/drivers/staging/media/av7110/av7110.c b/drivers/staging/media/av7110/av7110.c index 30e2e6e65..728b3892a 100644 --- a/drivers/staging/media/av7110/av7110.c +++ b/drivers/staging/media/av7110/av7110.c @@ -119,27 +119,27 @@ static void init_av7110_av(struct av7110 *av7110) av7110->adac_type = DVB_ADAC_TI; ret = av7110_set_volume(av7110, av7110->mixer.volume_left, av7110->mixer.volume_right); if (ret < 0) - printk("dvb-ttpci:cannot set internal volume to maximum:%d\n",ret); + pr_err("cannot set internal volume to maximum:%d\n", ret); ret = av7110_fw_cmd(av7110, COMTYPE_ENCODER, SetMonitorType, 1, (u16)av7110->display_ar); if (ret < 0) - printk("dvb-ttpci: unable to set aspect ratio\n"); + pr_err("unable to set aspect ratio\n"); ret = av7110_fw_cmd(av7110, COMTYPE_ENCODER, SetPanScanType, 1, av7110->display_panscan); if (ret < 0) - printk("dvb-ttpci: unable to set pan scan\n"); + pr_err("unable to set pan scan\n"); ret = av7110_fw_cmd(av7110, COMTYPE_ENCODER, SetWSSConfig, 2, 2, wss_cfg_4_3); if (ret < 0) - printk("dvb-ttpci: unable to configure 4:3 wss\n"); + pr_err("unable to configure 4:3 wss\n"); ret = av7110_fw_cmd(av7110, COMTYPE_ENCODER, SetWSSConfig, 2, 3, wss_cfg_16_9); if (ret < 0) - printk("dvb-ttpci: unable to configure 16:9 wss\n"); + pr_err("unable to configure 16:9 wss\n"); ret = av7710_set_video_mode(av7110, vidmode); if (ret < 0) - printk("dvb-ttpci:cannot set video mode:%d\n",ret); + pr_err("cannot set video mode:%d\n", ret); /* handle different card types */ /* remaining inits according to card and frontend type */ @@ -148,8 +148,7 @@ static void init_av7110_av(struct av7110 *av7110) if (dev->pci->subsystem_vendor == 0x13c2 && dev->pci->subsystem_device == 0x000a) av7110_fw_cmd(av7110, COMTYPE_AUDIODAC, ADSwitch, 1, 0); // SPDIF on if (i2c_writereg(av7110, 0x20, 0x00, 0x00) == 1) { - printk ("dvb-ttpci: Crystal audio DAC @ card %d detected\n", - av7110->dvb_adapter.num); + pr_info("Crystal audio DAC @ card %d detected\n", av7110->dvb_adapter.num); av7110->adac_type = DVB_ADAC_CRYSTAL; i2c_writereg(av7110, 0x20, 0x01, 0xd2); i2c_writereg(av7110, 0x20, 0x02, 0x49); @@ -162,23 +161,21 @@ static void init_av7110_av(struct av7110 *av7110) } else if (av7110_init_analog_module(av7110) == 0) { /* done. */ } else if (dev->pci->subsystem_vendor == 0x110a) { - printk("dvb-ttpci: DVB-C w/o analog module @ card %d detected\n", - av7110->dvb_adapter.num); + pr_info("DVB-C w/o analog module @ card %d detected\n", av7110->dvb_adapter.num); av7110->adac_type = DVB_ADAC_NONE; } else { av7110->adac_type = adac; - printk("dvb-ttpci: adac type set to %d @ card %d\n", - av7110->adac_type, av7110->dvb_adapter.num); + pr_info("adac type set to %d @ card %d\n", av7110->adac_type, av7110->dvb_adapter.num); } if (av7110->adac_type == DVB_ADAC_NONE || av7110->adac_type == DVB_ADAC_MSP34x0) { // switch DVB SCART on ret = av7110_fw_cmd(av7110, COMTYPE_AUDIODAC, MainSwitch, 1, 0); if (ret < 0) - printk("dvb-ttpci:cannot switch on SCART(Main):%d\n",ret); + pr_err("cannot switch on SCART(Main):%d\n", ret); ret = av7110_fw_cmd(av7110, COMTYPE_AUDIODAC, ADSwitch, 1, 1); if (ret < 0) - printk("dvb-ttpci:cannot switch on SCART(AD):%d\n",ret); + pr_err("cannot switch on SCART(AD):%d\n", ret); if (rgb_on && ((av7110->dev->pci->subsystem_vendor == 0x110a) || (av7110->dev->pci->subsystem_vendor == 0x13c2)) && @@ -193,12 +190,12 @@ static void init_av7110_av(struct av7110 *av7110) ret = av7110_set_volume(av7110, av7110->mixer.volume_left, av7110->mixer.volume_right); if (ret < 0) - printk("dvb-ttpci:cannot set volume :%d\n",ret); + pr_err("cannot set volume :%d\n", ret); } static void recover_arm(struct av7110 *av7110) { - dprintk(4, "%p\n",av7110); + dprintk(4, "%p\n", av7110); av7110_bootarm(av7110); msleep(100); @@ -230,7 +227,7 @@ static int arm_thread(void *data) u16 newloops = 0; int timeout; - dprintk(4, "%p\n",av7110); + dprintk(4, "%p\n", av7110); for (;;) { timeout = wait_event_interruptible_timeout(av7110->arm_wait, @@ -250,8 +247,7 @@ static int arm_thread(void *data) mutex_unlock(&av7110->dcomlock); if (newloops == av7110->arm_loops || av7110->arm_errors > 3) { - printk(KERN_ERR "dvb-ttpci: ARM crashed @ card %d\n", - av7110->dvb_adapter.num); + pr_err("ARM crashed @ card %d\n", av7110->dvb_adapter.num); recover_arm(av7110); @@ -325,7 +321,7 @@ static inline void print_time(char *s) struct timespec64 ts; ktime_get_real_ts64(&ts); - printk("%s: %lld.%09ld\n", s, (s64)ts.tv_sec, ts.tv_nsec); + pr_info("%s(): %lld.%09ld\n", s, (s64)ts.tv_sec, ts.tv_nsec); #endif } @@ -336,7 +332,7 @@ static inline void start_debi_dma(struct av7110 *av7110, int dir, { dprintk(8, "%c %08lx %u\n", dir == DEBI_READ ? 'R' : 'W', addr, len); if (saa7146_wait_for_debi_done(av7110->dev, 0)) { - printk(KERN_ERR "%s: saa7146_wait_for_debi_done timed out\n", __func__); + pr_err("%s(): saa7146_wait_for_debi_done timed out\n", __func__); return; } @@ -361,9 +357,8 @@ static void debiirq(struct tasklet_struct *t) dprintk(4, "type 0x%04x\n", type); if (type == -1) { - printk("DEBI irq oops @ %ld, psr:0x%08x, ssr:0x%08x\n", - jiffies, saa7146_read(av7110->dev, PSR), - saa7146_read(av7110->dev, SSR)); + pr_err("DEBI irq oops @ %ld, psr:0x%08x, ssr:0x%08x\n", jiffies, + saa7146_read(av7110->dev, PSR), saa7146_read(av7110->dev, SSR)); goto debi_done; } av7110->debitype = -1; @@ -424,7 +419,7 @@ static void debiirq(struct tasklet_struct *t) case DATA_DEBUG_MESSAGE: ((s8 *)av7110->debi_virt)[Reserved_SIZE - 1] = 0; - printk("%s\n", (s8 *) av7110->debi_virt); + pr_info("%s\n", (s8 *)av7110->debi_virt); xfer = RX_BUFF; break; @@ -460,12 +455,11 @@ static void gpioirq(struct tasklet_struct *t) if (av7110->debitype != -1) /* we shouldn't get any irq while a debi xfer is running */ - printk("dvb-ttpci: GPIO0 irq oops @ %ld, psr:0x%08x, ssr:0x%08x\n", - jiffies, saa7146_read(av7110->dev, PSR), - saa7146_read(av7110->dev, SSR)); + pr_err("GPIO0 irq oops @ %ld, psr:0x%08x, ssr:0x%08x\n", jiffies, + saa7146_read(av7110->dev, PSR), saa7146_read(av7110->dev, SSR)); if (saa7146_wait_for_debi_done(av7110->dev, 0)) { - printk(KERN_ERR "%s: saa7146_wait_for_debi_done timed out\n", __func__); + pr_err("%s(): saa7146_wait_for_debi_done timed out\n", __func__); BUG(); /* maybe we should try resetting the debi? */ } @@ -657,7 +651,7 @@ static void gpioirq(struct tasklet_struct *t) break; default: - printk("dvb-ttpci: gpioirq unknown type=%d len=%d\n", + pr_err("%s(): unknown irq: type=%d len=%d\n", __func__, av7110->debitype, av7110->debilen); break; } @@ -798,9 +792,8 @@ static int StartHWFilter(struct dvb_demux_filter *dvbdmxfilter) ret = av7110_fw_request(av7110, buf, 20, &handle, 1); if (ret != 0 || handle >= 32) { - printk(KERN_ERR "dvb-ttpci: %s error buf %04x %04x %04x %04x ret %d handle %04x\n", - __func__, buf[0], buf[1], buf[2], buf[3], - ret, handle); + pr_err("%s(): error buf %04x %04x %04x %04x ret %d handle %04x\n", + __func__, buf[0], buf[1], buf[2], buf[3], ret, handle); dvbdmxfilter->hw_handle = 0xffff; if (!ret) ret = -1; @@ -828,8 +821,8 @@ static int StopHWFilter(struct dvb_demux_filter *dvbdmxfilter) handle = dvbdmxfilter->hw_handle; if (handle >= 32) { - printk("%s tried to stop invalid filter %04x, filter type = %x\n", - __func__, handle, dvbdmxfilter->type); + pr_err("%s(): tried to stop invalid filter %04x, filter type = %x\n", + __func__, handle, dvbdmxfilter->type); return -EINVAL; } @@ -840,9 +833,8 @@ static int StopHWFilter(struct dvb_demux_filter *dvbdmxfilter) buf[2] = handle; ret = av7110_fw_request(av7110, buf, 3, answ, 2); if (ret != 0 || answ[1] != handle) { - printk(KERN_ERR "dvb-ttpci: %s error cmd %04x %04x %04x ret %x resp %04x %04x pid %d\n", - __func__, buf[0], buf[1], buf[2], ret, - answ[0], answ[1], dvbdmxfilter->feed->pid); + pr_err("%s(): error cmd %04x %04x %04x ret %x resp %04x %04x pid %d\n", __func__, + buf[0], buf[1], buf[2], ret, answ[0], answ[1], dvbdmxfilter->feed->pid); if (!ret) ret = -1; } @@ -1117,11 +1109,10 @@ static int dvb_get_stc(struct dmx_demux *demux, unsigned int num, ret = av7110_fw_request(av7110, &tag, 0, fwstc, 4); if (ret) { - printk(KERN_ERR "%s: av7110_fw_request error\n", __func__); + pr_err("%s(): av7110_fw_request error\n", __func__); return ret; } - dprintk(2, "fwstc = %04hx %04hx %04hx %04hx\n", - fwstc[0], fwstc[1], fwstc[2], fwstc[3]); + dprintk(2, "fwstc = %04hx %04hx %04hx %04hx\n", fwstc[0], fwstc[1], fwstc[2], fwstc[3]); *stc = (((uint64_t)((fwstc[3] & 0x8000) >> 15)) << 32) | (((uint64_t)fwstc[1]) << 16) | ((uint64_t)fwstc[0]); @@ -1250,11 +1241,10 @@ static void vpeirq(struct tasklet_struct *t) dma_sync_sg_for_cpu(&budget->dev->pci->dev, budget->pt.slist, budget->pt.nents, DMA_FROM_DEVICE); -#if 0 +#ifdef RPS_DEBUG /* track rps1 activity */ - printk("vpeirq: %02x Event Counter 1 0x%04x\n", - mem[olddma], - saa7146_read(budget->dev, EC1R) & 0x3fff); + pr_info("%s(): %02x Event Counter 1 0x%04x\n", __func__, mem[olddma], + saa7146_read(budget->dev, EC1R) & 0x3fff); #endif if (newdma > olddma) { @@ -1355,7 +1345,7 @@ static int av7110_register(struct av7110 *av7110) dvb_dmxdev_init(&av7110->dmxdev1, &av7110->dvb_adapter); dvb_net_init(&av7110->dvb_adapter, &av7110->dvb_net1, &dvbdemux1->dmx); - printk("dvb-ttpci: additional demux1 for budget-patch registered\n"); + pr_info("additional demux1 for budget-patch registered\n"); } return 0; } @@ -1444,7 +1434,7 @@ static int check_firmware(struct av7110 *av7110) ptr = av7110->bin_fw; if (ptr[0] != 'A' || ptr[1] != 'V' || ptr[2] != 'F' || ptr[3] != 'W') { - printk("dvb-ttpci: this is not an av7110 firmware\n"); + pr_err("this is not an av7110 firmware\n"); return -EINVAL; } ptr += 4; @@ -1455,11 +1445,11 @@ static int check_firmware(struct av7110 *av7110) len = get_unaligned_be32(ptr); ptr += 4; if (len >= 512) { - printk("dvb-ttpci: dpram file is way too big.\n"); + pr_err("dpram file is way too big.\n"); return -EINVAL; } if (crc != crc32_le(0, ptr, len)) { - printk("dvb-ttpci: crc32 of dpram file does not match.\n"); + pr_err("crc32 of dpram file does not match.\n"); return -EINVAL; } av7110->bin_dpram = ptr; @@ -1474,11 +1464,11 @@ static int check_firmware(struct av7110 *av7110) if (len <= 200000 || len >= 300000 || len > ((av7110->bin_fw + av7110->size_fw) - ptr)) { - printk("dvb-ttpci: root file has strange size (%d). aborting.\n", len); + pr_err("root file has strange size (%d). aborting.\n", len); return -EINVAL; } if (crc != crc32_le(0, ptr, len)) { - printk("dvb-ttpci: crc32 of root file does not match.\n"); + pr_err("crc32 of root file does not match.\n"); return -EINVAL; } av7110->bin_root = ptr; @@ -1500,18 +1490,17 @@ static int get_firmware(struct av7110 *av7110) ret = request_firmware(&fw, "dvb-ttpci-01.fw", &av7110->dev->pci->dev); if (ret) { if (ret == -ENOENT) { - printk(KERN_ERR "dvb-ttpci: could not load firmware, file not found: dvb-ttpci-01.fw\n"); - printk(KERN_ERR "dvb-ttpci: usually this should be in /usr/lib/hotplug/firmware or /lib/firmware\n"); - printk(KERN_ERR "dvb-ttpci: and can be downloaded from https://linuxtv.org/download/dvb/firmware/\n"); + pr_err("could not load firmware, file not found: dvb-ttpci-01.fw\n"); + pr_err("usually this should be in /usr/lib/hotplug/firmware or /lib/firmware\n"); + pr_err("and can be downloaded from https://linuxtv.org/download/dvb/firmware/\n"); } else { - printk(KERN_ERR "dvb-ttpci: cannot request firmware (error %i)\n", - ret); + pr_err("cannot request firmware (error %i)\n", ret); } return -EINVAL; } if (fw->size <= 200000) { - printk("dvb-ttpci: this firmware is way too small.\n"); + pr_err("this firmware is way too small.\n"); release_firmware(fw); return -EINVAL; } @@ -1827,7 +1816,7 @@ static int nexusca_stv0297_tuner_set_params(struct dvb_frontend *fe) if (fe->ops.i2c_gate_ctrl) fe->ops.i2c_gate_ctrl(fe, 1); if (i2c_transfer(&av7110->i2c_adap, &msg, 1) != 1) { - printk("nexusca: pll transfer failed!\n"); + pr_err("nexusca: pll transfer failed!\n"); return -EIO; } @@ -2234,7 +2223,7 @@ static int frontend_init(struct av7110 *av7110) av7110->fe->tuner_priv = &av7110->i2c_adap; if (!dvb_attach(lnbp21_attach, av7110->fe, &av7110->i2c_adap, 0, 0)) { - printk("dvb-ttpci: LNBP21 not found!\n"); + pr_err("LNBP21 not found!\n"); if (av7110->fe->ops.release) av7110->fe->ops.release(av7110->fe); av7110->fe = NULL; @@ -2250,11 +2239,9 @@ static int frontend_init(struct av7110 *av7110) if (!av7110->fe) { /* FIXME: propagate the failure code from the lower layers */ ret = -ENOMEM; - printk("dvb-ttpci: A frontend driver was not found for device [%04x:%04x] subsystem [%04x:%04x]\n", - av7110->dev->pci->vendor, - av7110->dev->pci->device, - av7110->dev->pci->subsystem_vendor, - av7110->dev->pci->subsystem_device); + pr_err("A frontend driver was not found for device [%04x:%04x] subsystem [%04x:%04x]\n", + av7110->dev->pci->vendor, av7110->dev->pci->device, + av7110->dev->pci->subsystem_vendor, av7110->dev->pci->subsystem_device); } else { FE_FUNC_OVERRIDE(av7110->fe->ops.init, av7110->fe_init, av7110_fe_init); FE_FUNC_OVERRIDE(av7110->fe->ops.read_status, av7110->fe_read_status, av7110_fe_read_status); @@ -2268,7 +2255,7 @@ static int frontend_init(struct av7110 *av7110) ret = dvb_register_frontend(&av7110->dvb_adapter, av7110->fe); if (ret < 0) { - printk("av7110: Frontend registration failed!\n"); + pr_err("av7110: Frontend registration failed!\n"); dvb_frontend_detach(av7110->fe); av7110->fe = NULL; } @@ -2427,12 +2414,12 @@ static int av7110_attach(struct saa7146_dev *dev, */ if ((saa7146_read(dev, GPIO_CTRL) & 0x10000000) == 0) { budgetpatch = 1; - printk("dvb-ttpci: BUDGET-PATCH DETECTED.\n"); + pr_info("BUDGET-PATCH DETECTED.\n"); } /* Disable RPS1 */ saa7146_write(dev, MC1, (MASK_29)); #if RPS_IRQ - printk("dvb-ttpci: Event Counter 1 0x%04x\n", saa7146_read(dev, EC1R) & 0x3fff ); + pr_info("Event Counter 1 0x%04x\n", saa7146_read(dev, EC1R) & 0x3fff); #endif } @@ -2487,7 +2474,7 @@ static int av7110_attach(struct saa7146_dev *dev, } if (av7110->full_ts) { - printk(KERN_INFO "dvb-ttpci: full-ts mode enabled for saa7146 port B\n"); + pr_info("full-ts mode enabled for saa7146 port B\n"); spin_lock_init(&av7110->feedlock1); av7110->grabbing = saa7146_vmalloc_build_pgtable(pdev, length, &av7110->pt); @@ -2663,9 +2650,8 @@ static int av7110_attach(struct saa7146_dev *dev, goto err_stop_arm_9; if (FW_VERSION(av7110->arm_app) < 0x2501) - printk(KERN_WARNING - "dvb-ttpci: Warning, firmware version 0x%04x is too old. System might be unstable!\n", - FW_VERSION(av7110->arm_app)); + pr_warn("Warning, firmware version 0x%04x is too old. System might be unstable!\n", + FW_VERSION(av7110->arm_app)); thread = kthread_run(arm_thread, (void *)av7110, "arm_mon"); if (IS_ERR(thread)) { @@ -2702,7 +2688,7 @@ static int av7110_attach(struct saa7146_dev *dev, #if IS_ENABLED(CONFIG_DVB_AV7110_IR) av7110_ir_init(av7110); #endif - printk(KERN_INFO "dvb-ttpci: found av7110-%d.\n", av7110_num); + pr_info("found av7110-%d.\n", av7110_num); av7110_num++; out: return ret; diff --git a/drivers/staging/media/av7110/av7110.h b/drivers/staging/media/av7110/av7110.h index 3f6b88f0f..403dbbba5 100644 --- a/drivers/staging/media/av7110/av7110.h +++ b/drivers/staging/media/av7110/av7110.h @@ -40,10 +40,14 @@ extern int av7110_debug; +#ifdef pr_fmt +#undef pr_fmt +#endif +#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt + #define dprintk(level, fmt, arg...) do { \ - if (level & av7110_debug) \ - printk(KERN_DEBUG KBUILD_MODNAME ": %s(): " fmt, \ - __func__, ##arg); \ + if ((level) & av7110_debug) \ + pr_info("%s(): " fmt, __func__, ##arg); \ } while (0) #define MAXFILT 32 diff --git a/drivers/staging/media/av7110/av7110_av.c b/drivers/staging/media/av7110/av7110_av.c index a408e10fb..2993ac43c 100644 --- a/drivers/staging/media/av7110/av7110_av.c +++ b/drivers/staging/media/av7110/av7110_av.c @@ -151,7 +151,7 @@ int av7110_av_start_play(struct av7110 *av7110, int av) { int ret = 0; - dprintk(2, "av7110:%p, \n", av7110); + dprintk(2, "av7110:%p\n", av7110); if (av7110->rec_mode) return -EBUSY; @@ -186,7 +186,7 @@ int av7110_av_stop(struct av7110 *av7110, int av) { int ret = 0; - dprintk(2, "av7110:%p, \n", av7110); + dprintk(2, "av7110:%p\n", av7110); if (!(av7110->playing & av) && !(av7110->rec_mode & av)) return 0; @@ -245,14 +245,14 @@ int av7110_pes_play(void *dest, struct dvb_ringbuffer *buf, int dlen) ((sync & ~0x1f) == 0x000001c0) || (sync == 0x000001bd)) break; - printk("resync\n"); + pr_info("resync\n"); DVB_RINGBUFFER_SKIP(buf, 1); } blen = DVB_RINGBUFFER_PEEK(buf, 4) << 8; blen |= DVB_RINGBUFFER_PEEK(buf, 5); blen += 6; if (len < blen || blen > dlen) { - //printk("buffer empty - avail %d blen %u dlen %d\n", len, blen, dlen); + //pr_info("buffer empty - avail %d blen %u dlen %d\n", len, blen, dlen); wake_up(&buf->queue); return -1; } @@ -271,7 +271,7 @@ int av7110_set_volume(struct av7110 *av7110, unsigned int volleft, unsigned int vol, val, balance = 0; int err; - dprintk(2, "av7110:%p, \n", av7110); + dprintk(2, "av7110:%p\n", av7110); av7110->mixer.volume_left = volleft; av7110->mixer.volume_right = volright; @@ -323,7 +323,7 @@ int av7110_set_vidmode(struct av7110 *av7110, enum av7110_video_mode mode) { int ret; - dprintk(2, "av7110:%p, \n", av7110); + dprintk(2, "av7110:%p\n", av7110); ret = av7110_fw_cmd(av7110, COMTYPE_ENCODER, LoadVidCode, 1, mode); @@ -357,7 +357,7 @@ static int get_video_format(struct av7110 *av7110, u8 *buf, int count) u8 *p; int ret = 0; - dprintk(2, "av7110:%p, \n", av7110); + dprintk(2, "av7110:%p\n", av7110); if (av7110->sinfo) return 0; @@ -410,7 +410,7 @@ static void play_video_cb(u8 *buf, int count, void *priv) { struct av7110 *av7110 = (struct av7110 *)priv; - dprintk(2, "av7110:%p, \n", av7110); + dprintk(2, "av7110:%p\n", av7110); if ((buf[3] & 0xe0) == 0xe0) { get_video_format(av7110, buf, count); @@ -424,7 +424,7 @@ static void play_audio_cb(u8 *buf, int count, void *priv) { struct av7110 *av7110 = (struct av7110 *)priv; - dprintk(2, "av7110:%p, \n", av7110); + dprintk(2, "av7110:%p\n", av7110); aux_ring_buffer_write(&av7110->aout, buf, count); } @@ -438,7 +438,7 @@ static ssize_t ts_play(struct av7110 *av7110, const char __user *buf, u8 *kb; unsigned long todo = count; - dprintk(2, "%s: type %d cnt %lu\n", __func__, type, count); + dprintk(2, "type %d cnt %lu\n", type, count); rb = (type) ? &av7110->avout : &av7110->aout; kb = av7110->kbuf[type]; @@ -474,7 +474,7 @@ static ssize_t dvb_play(struct av7110 *av7110, const char __user *buf, { unsigned long todo = count, n; - dprintk(2, "av7110:%p, \n", av7110); + dprintk(2, "av7110:%p\n", av7110); if (!av7110->kbuf[type]) return -ENOBUFS; @@ -508,7 +508,7 @@ static ssize_t dvb_play_kernel(struct av7110 *av7110, const u8 *buf, { unsigned long todo = count, n; - dprintk(2, "av7110:%p, \n", av7110); + dprintk(2, "av7110:%p\n", av7110); if (!av7110->kbuf[type]) return -ENOBUFS; @@ -539,7 +539,7 @@ static ssize_t dvb_aplay(struct av7110 *av7110, const char __user *buf, { unsigned long todo = count, n; - dprintk(2, "av7110:%p, \n", av7110); + dprintk(2, "av7110:%p\n", av7110); if (!av7110->kbuf[type]) return -ENOBUFS; @@ -841,7 +841,7 @@ int av7110_write_to_decoder(struct dvb_demux_feed *feed, const u8 *buf, size_t l struct dvb_demux *demux = feed->demux; struct av7110 *av7110 = demux->priv; - dprintk(2, "av7110:%p, \n", av7110); + dprintk(2, "av7110:%p\n", av7110); if (av7110->full_ts && demux->dmx.frontend->source != DMX_MEMORY_FE) return 0; @@ -928,7 +928,7 @@ static __poll_t dvb_video_poll(struct file *file, poll_table *wait) struct av7110 *av7110 = dvbdev->priv; __poll_t mask = 0; - dprintk(2, "av7110:%p, \n", av7110); + dprintk(2, "av7110:%p\n", av7110); if ((file->f_flags & O_ACCMODE) != O_RDONLY) poll_wait(file, &av7110->avout.queue, wait); @@ -958,7 +958,7 @@ static ssize_t dvb_video_write(struct file *file, const char __user *buf, struct av7110 *av7110 = dvbdev->priv; unsigned char c; - dprintk(2, "av7110:%p, \n", av7110); + dprintk(2, "av7110:%p\n", av7110); if ((file->f_flags & O_ACCMODE) == O_RDONLY) return -EPERM; @@ -980,7 +980,7 @@ static __poll_t dvb_audio_poll(struct file *file, poll_table *wait) struct av7110 *av7110 = dvbdev->priv; __poll_t mask = 0; - dprintk(2, "av7110:%p, \n", av7110); + dprintk(2, "av7110:%p\n", av7110); poll_wait(file, &av7110->aout.queue, wait); @@ -1002,10 +1002,10 @@ static ssize_t dvb_audio_write(struct file *file, const char __user *buf, struct av7110 *av7110 = dvbdev->priv; unsigned char c; - dprintk(2, "av7110:%p, \n", av7110); + dprintk(2, "av7110:%p\n", av7110); if (av7110->audiostate.stream_source != AUDIO_SOURCE_MEMORY) { - printk(KERN_ERR "not audio source memory\n"); + pr_err("not audio source memory\n"); return -EPERM; } @@ -1027,7 +1027,7 @@ static int play_iframe(struct av7110 *av7110, char __user *buf, unsigned int len int progressive = 0; int match = 0; - dprintk(2, "av7110:%p, \n", av7110); + dprintk(2, "av7110:%p\n", av7110); if (len == 0) return 0; @@ -1134,7 +1134,7 @@ static int dvb_video_ioctl(struct file *file, unsigned long arg = (unsigned long)parg; int ret = 0; - dprintk(1, "av7110:%p, cmd=%04x\n", av7110,cmd); + dprintk(1, "av7110:%p, cmd=%04x\n", av7110, cmd); if ((file->f_flags & O_ACCMODE) == O_RDONLY) { if (cmd != VIDEO_GET_STATUS && cmd != VIDEO_GET_EVENT && @@ -1366,7 +1366,7 @@ static int dvb_audio_ioctl(struct file *file, unsigned long arg = (unsigned long)parg; int ret = 0; - dprintk(1, "av7110:%p, cmd=%04x\n", av7110,cmd); + dprintk(1, "av7110:%p, cmd=%04x\n", av7110, cmd); if (((file->f_flags & O_ACCMODE) == O_RDONLY) && (cmd != AUDIO_GET_STATUS)) @@ -1514,7 +1514,7 @@ static int dvb_video_open(struct inode *inode, struct file *file) struct av7110 *av7110 = dvbdev->priv; int err; - dprintk(2, "av7110:%p, \n", av7110); + dprintk(2, "av7110:%p\n", av7110); err = dvb_generic_open(inode, file); if (err < 0) @@ -1540,7 +1540,7 @@ static int dvb_video_release(struct inode *inode, struct file *file) struct dvb_device *dvbdev = file->private_data; struct av7110 *av7110 = dvbdev->priv; - dprintk(2, "av7110:%p, \n", av7110); + dprintk(2, "av7110:%p\n", av7110); if ((file->f_flags & O_ACCMODE) != O_RDONLY) av7110_av_stop(av7110, RP_VIDEO); @@ -1554,7 +1554,7 @@ static int dvb_audio_open(struct inode *inode, struct file *file) struct av7110 *av7110 = dvbdev->priv; int err = dvb_generic_open(inode, file); - dprintk(2, "av7110:%p, \n", av7110); + dprintk(2, "av7110:%p\n", av7110); if (err < 0) return err; @@ -1568,7 +1568,7 @@ static int dvb_audio_release(struct inode *inode, struct file *file) struct dvb_device *dvbdev = file->private_data; struct av7110 *av7110 = dvbdev->priv; - dprintk(2, "av7110:%p, \n", av7110); + dprintk(2, "av7110:%p\n", av7110); av7110_av_stop(av7110, RP_AUDIO); return dvb_generic_release(inode, file); diff --git a/drivers/staging/media/av7110/av7110_ca.c b/drivers/staging/media/av7110/av7110_ca.c index c28e41d42..6ce212c64 100644 --- a/drivers/staging/media/av7110/av7110_ca.c +++ b/drivers/staging/media/av7110/av7110_ca.c @@ -26,7 +26,7 @@ void CI_handle(struct av7110 *av7110, u8 *data, u16 len) { - dprintk(8, "av7110:%p\n",av7110); + dprintk(8, "av7110:%p\n", av7110); if (len < 3) return; @@ -199,7 +199,7 @@ static int dvb_ca_open(struct inode *inode, struct file *file) struct av7110 *av7110 = dvbdev->priv; int err = dvb_generic_open(inode, file); - dprintk(8, "av7110:%p\n",av7110); + dprintk(8, "av7110:%p\n", av7110); if (err < 0) return err; @@ -215,7 +215,7 @@ static __poll_t dvb_ca_poll(struct file *file, poll_table *wait) struct dvb_ringbuffer *wbuf = &av7110->ci_wbuffer; __poll_t mask = 0; - dprintk(8, "av7110:%p\n",av7110); + dprintk(8, "av7110:%p\n", av7110); poll_wait(file, &rbuf->queue, wait); poll_wait(file, &wbuf->queue, wait); @@ -236,7 +236,7 @@ static int dvb_ca_ioctl(struct file *file, unsigned int cmd, void *parg) unsigned long arg = (unsigned long)parg; int ret = 0; - dprintk(8, "av7110:%p\n",av7110); + dprintk(8, "av7110:%p\n", av7110); if (mutex_lock_interruptible(&av7110->ioctl_mutex)) return -ERESTARTSYS; @@ -322,7 +322,7 @@ static ssize_t dvb_ca_write(struct file *file, const char __user *buf, struct dvb_device *dvbdev = file->private_data; struct av7110 *av7110 = dvbdev->priv; - dprintk(8, "av7110:%p\n",av7110); + dprintk(8, "av7110:%p\n", av7110); return ci_ll_write(&av7110->ci_wbuffer, file, buf, count, ppos); } @@ -332,7 +332,7 @@ static ssize_t dvb_ca_read(struct file *file, char __user *buf, struct dvb_device *dvbdev = file->private_data; struct av7110 *av7110 = dvbdev->priv; - dprintk(8, "av7110:%p\n",av7110); + dprintk(8, "av7110:%p\n", av7110); return ci_ll_read(&av7110->ci_rbuffer, file, buf, count, ppos); } diff --git a/drivers/staging/media/av7110/av7110_hw.c b/drivers/staging/media/av7110/av7110_hw.c index 5a4de3e3e..bf8e6dca4 100644 --- a/drivers/staging/media/av7110/av7110_hw.c +++ b/drivers/staging/media/av7110/av7110_hw.c @@ -48,11 +48,11 @@ int av7110_debiwrite(struct av7110 *av7110, u32 config, struct saa7146_dev *dev = av7110->dev; if (count > 32764) { - printk("%s: invalid count %d\n", __func__, count); + pr_err("%s(): invalid count %d\n", __func__, count); return -1; } if (saa7146_wait_for_debi_done(av7110->dev, 0) < 0) { - printk("%s: wait_for_debi_done failed\n", __func__); + pr_err("%s(): wait_for_debi_done failed\n", __func__); return -1; } saa7146_write(dev, DEBI_CONFIG, config); @@ -71,11 +71,11 @@ u32 av7110_debiread(struct av7110 *av7110, u32 config, int addr, unsigned int co u32 result = 0; if (count > 32764) { - printk("%s: invalid count %d\n", __func__, count); + pr_err("%s(): invalid count %d\n", __func__, count); return 0; } if (saa7146_wait_for_debi_done(av7110->dev, 0) < 0) { - printk("%s: wait_for_debi_done #1 failed\n", __func__); + pr_err("%s(): wait_for_debi_done #1 failed\n", __func__); return 0; } saa7146_write(dev, DEBI_AD, av7110->debi_bus); @@ -86,7 +86,7 @@ u32 av7110_debiread(struct av7110 *av7110, u32 config, int addr, unsigned int co if (count > 4) return count; if (saa7146_wait_for_debi_done(av7110->dev, 0) < 0) { - printk("%s: wait_for_debi_done #2 failed\n", __func__); + pr_err("%s(): wait_for_debi_done #2 failed\n", __func__); return 0; } @@ -146,7 +146,7 @@ static int load_dram(struct av7110 *av7110, u32 *data, int len) for (i = 0; i < blocks; i++) { if (waitdebi(av7110, AV7110_BOOT_STATE, BOOTSTATE_BUFFER_EMPTY) < 0) { - printk(KERN_ERR "dvb-ttpci: load_dram(): timeout at block %d\n", i); + pr_err("%s(): timeout at block %d\n", __func__, i); return -ETIMEDOUT; } dprintk(4, "writing DRAM block %d\n", i); @@ -161,7 +161,7 @@ static int load_dram(struct av7110 *av7110, u32 *data, int len) if (rest > 0) { if (waitdebi(av7110, AV7110_BOOT_STATE, BOOTSTATE_BUFFER_EMPTY) < 0) { - printk(KERN_ERR "dvb-ttpci: load_dram(): timeout at last block\n"); + pr_err("%s(): timeout at last block\n", __func__); return -ETIMEDOUT; } if (rest > 4) @@ -176,13 +176,13 @@ static int load_dram(struct av7110 *av7110, u32 *data, int len) iwdebi(av7110, DEBINOSWAP, AV7110_BOOT_STATE, BOOTSTATE_BUFFER_FULL, 2); } if (waitdebi(av7110, AV7110_BOOT_STATE, BOOTSTATE_BUFFER_EMPTY) < 0) { - printk(KERN_ERR "dvb-ttpci: load_dram(): timeout after last block\n"); + pr_err("%s(): timeout after last block\n", __func__); return -ETIMEDOUT; } iwdebi(av7110, DEBINOSWAP, AV7110_BOOT_SIZE, 0, 2); iwdebi(av7110, DEBINOSWAP, AV7110_BOOT_STATE, BOOTSTATE_BUFFER_FULL, 2); if (waitdebi(av7110, AV7110_BOOT_STATE, BOOTSTATE_AV7110_BOOT_COMPLETE) < 0) { - printk(KERN_ERR "dvb-ttpci: load_dram(): final handshake timeout\n"); + pr_err("%s(): final handshake timeout\n", __func__); return -ETIMEDOUT; } return 0; @@ -221,8 +221,8 @@ int av7110_bootarm(struct av7110 *av7110) ret = irdebi(av7110, DEBINOSWAP, DPRAM_BASE, 0, 4); if (ret != 0x10325476) { - printk(KERN_ERR "dvb-ttpci: debi test in av7110_bootarm() failed: %08x != %08x (check your BIOS 'Plug&Play OS' settings)\n", - ret, 0x10325476); + pr_err("debi test in %s() failed: %08x != %08x (check your BIOS 'Plug&Play OS' settings)\n", + __func__, ret, 0x10325476); return -1; } for (i = 0; i < 8192; i += 4) @@ -237,8 +237,7 @@ int av7110_bootarm(struct av7110 *av7110) ret = request_firmware(&fw, fw_name, &dev->pci->dev); if (ret) { - printk(KERN_ERR "dvb-ttpci: Failed to load firmware \"%s\"\n", - fw_name); + pr_err("Failed to load firmware \"%s\"\n", fw_name); return ret; } @@ -247,7 +246,7 @@ int av7110_bootarm(struct av7110 *av7110) iwdebi(av7110, DEBINOSWAP, AV7110_BOOT_STATE, BOOTSTATE_BUFFER_FULL, 2); if (saa7146_wait_for_debi_done(av7110->dev, 1)) { - printk(KERN_ERR "dvb-ttpci: av7110_bootarm(): saa7146_wait_for_debi_done() timed out\n"); + pr_err("%s(): saa7146_wait_for_debi_done() timed out\n", __func__); return -ETIMEDOUT; } saa7146_setgpio(dev, RESET_LINE, SAA7146_GPIO_OUTHI); @@ -255,7 +254,7 @@ int av7110_bootarm(struct av7110 *av7110) dprintk(1, "load dram code\n"); if (load_dram(av7110, (u32 *)av7110->bin_root, av7110->size_root) < 0) { - printk(KERN_ERR "dvb-ttpci: av7110_bootarm(): load_dram() failed\n"); + pr_err("%s(): load_dram() failed\n", __func__); return -1; } @@ -266,7 +265,7 @@ int av7110_bootarm(struct av7110 *av7110) mwdebi(av7110, DEBISWAB, DPRAM_BASE, av7110->bin_dpram, av7110->size_dpram); if (saa7146_wait_for_debi_done(av7110->dev, 1)) { - printk(KERN_ERR "dvb-ttpci: av7110_bootarm(): saa7146_wait_for_debi_done() timed out after loading DRAM\n"); + pr_err("%s(): saa7146_wait_for_debi_done() timed out after loading DRAM\n", __func__); return -ETIMEDOUT; } saa7146_setgpio(dev, RESET_LINE, SAA7146_GPIO_OUTHI); @@ -310,8 +309,7 @@ int av7110_wait_msgstate(struct av7110 *av7110, u16 flags) if ((stat & flags) == 0) break; if (err) { - printk(KERN_ERR "%s: timeout waiting for MSGSTATE %04x\n", - __func__, stat & flags); + pr_err("%s(): timeout waiting for MSGSTATE %04x\n", __func__, stat & flags); return -ETIMEDOUT; } msleep(1); @@ -341,7 +339,7 @@ static int __av7110_send_fw_cmd(struct av7110 *av7110, u16 *buf, int length) if (rdebi(av7110, DEBINOSWAP, COMMAND, 0, 2) == 0) break; if (err) { - printk(KERN_ERR "dvb-ttpci: %s(): timeout waiting for COMMAND idle\n", __func__); + pr_err("%s(): timeout waiting for COMMAND idle\n", __func__); av7110->arm_errors++; return -ETIMEDOUT; } @@ -358,7 +356,7 @@ static int __av7110_send_fw_cmd(struct av7110 *av7110, u16 *buf, int length) if (rdebi(av7110, DEBINOSWAP, HANDSHAKE_REG, 0, 2) == 0) break; if (err) { - printk(KERN_ERR "dvb-ttpci: %s(): timeout waiting for HANDSHAKE_REG\n", __func__); + pr_err("%s(): timeout waiting for HANDSHAKE_REG\n", __func__); return -ETIMEDOUT; } msleep(1); @@ -397,15 +395,13 @@ static int __av7110_send_fw_cmd(struct av7110 *av7110, u16 *buf, int length) err = time_after(jiffies, start + ARM_WAIT_FREE); stat = rdebi(av7110, DEBINOSWAP, MSGSTATE, 0, 2); if (stat & flags[0]) { - printk(KERN_ERR "%s: %s QUEUE overflow\n", - __func__, type); + pr_err("%s(): %s QUEUE overflow\n", __func__, type); return -1; } if ((stat & flags[1]) == 0) break; if (err) { - printk(KERN_ERR "%s: timeout waiting on busy %s QUEUE\n", - __func__, type); + pr_err("%s(): timeout waiting on busy %s QUEUE\n", __func__, type); av7110->arm_errors++; return -ETIMEDOUT; } @@ -433,7 +429,7 @@ static int __av7110_send_fw_cmd(struct av7110 *av7110, u16 *buf, int length) if (rdebi(av7110, DEBINOSWAP, COMMAND, 0, 2) == 0) break; if (err) { - printk(KERN_ERR "dvb-ttpci: %s(): timeout waiting for COMMAND %d to complete\n", + pr_err("%s(): timeout waiting for COMMAND %d to complete\n", __func__, (buf[0] >> 8) & 0xff); return -ETIMEDOUT; } @@ -442,10 +438,10 @@ static int __av7110_send_fw_cmd(struct av7110 *av7110, u16 *buf, int length) stat = rdebi(av7110, DEBINOSWAP, MSGSTATE, 0, 2); if (stat & GPMQOver) { - printk(KERN_ERR "dvb-ttpci: %s(): GPMQOver\n", __func__); + pr_err("%s(): GPMQOver\n", __func__); return -ENOSPC; } else if (stat & OSDQOver) { - printk(KERN_ERR "dvb-ttpci: %s(): OSDQOver\n", __func__); + pr_err("%s(): OSDQOver\n", __func__); return -ENOSPC; } #endif @@ -469,8 +465,7 @@ static int av7110_send_fw_cmd(struct av7110 *av7110, u16 *buf, int length) ret = __av7110_send_fw_cmd(av7110, buf, length); mutex_unlock(&av7110->dcomlock); if (ret && ret != -ERESTARTSYS) - printk(KERN_ERR "dvb-ttpci: %s(): av7110_send_fw_cmd error %d\n", - __func__, ret); + pr_err("%s(): error %d\n", __func__, ret); return ret; } @@ -483,9 +478,7 @@ int av7110_fw_cmd(struct av7110 *av7110, int type, int com, int num, ...) // dprintk(4, "%p\n", av7110); if (2 + num > ARRAY_SIZE(buf)) { - printk(KERN_WARNING - "%s: %s len=%d is too big!\n", - KBUILD_MODNAME, __func__, num); + pr_warn("%s(): len=%d is too big!\n", __func__, num); return -EINVAL; } @@ -501,7 +494,7 @@ int av7110_fw_cmd(struct av7110 *av7110, int type, int com, int num, ...) ret = av7110_send_fw_cmd(av7110, buf, num + 2); if (ret && ret != -ERESTARTSYS) - printk(KERN_ERR "dvb-ttpci: av7110_fw_cmd error %d\n", ret); + pr_err("%s(): error %d\n", __func__, ret); return ret; } @@ -523,7 +516,7 @@ int av7110_send_ci_cmd(struct av7110 *av7110, u8 subcom, u8 *buf, u8 len) ret = av7110_send_fw_cmd(av7110, cmd, 18); if (ret && ret != -ERESTARTSYS) - printk(KERN_ERR "dvb-ttpci: av7110_send_ci_cmd error %d\n", ret); + pr_err("%s(): error %d\n", __func__, ret); return ret; } #endif /* 0 */ @@ -551,7 +544,7 @@ int av7110_fw_request(struct av7110 *av7110, u16 *request_buf, err = __av7110_send_fw_cmd(av7110, request_buf, request_buf_len); if (err < 0) { mutex_unlock(&av7110->dcomlock); - printk(KERN_ERR "dvb-ttpci: av7110_fw_request error %d\n", err); + pr_err("%s(): error %d\n", __func__, err); return err; } @@ -561,7 +554,7 @@ int av7110_fw_request(struct av7110 *av7110, u16 *request_buf, if (rdebi(av7110, DEBINOSWAP, COMMAND, 0, 2) == 0) break; if (err) { - printk(KERN_ERR "%s: timeout waiting for COMMAND to complete\n", __func__); + pr_err("%s(): timeout waiting for COMMAND to complete\n", __func__); mutex_unlock(&av7110->dcomlock); return -ETIMEDOUT; } @@ -577,7 +570,7 @@ int av7110_fw_request(struct av7110 *av7110, u16 *request_buf, if (rdebi(av7110, DEBINOSWAP, HANDSHAKE_REG, 0, 2) == 0) break; if (err) { - printk(KERN_ERR "%s: timeout waiting for HANDSHAKE_REG\n", __func__); + pr_err("%s(): timeout waiting for HANDSHAKE_REG\n", __func__); mutex_unlock(&av7110->dcomlock); return -ETIMEDOUT; } @@ -588,11 +581,11 @@ int av7110_fw_request(struct av7110 *av7110, u16 *request_buf, #ifdef COM_DEBUG stat = rdebi(av7110, DEBINOSWAP, MSGSTATE, 0, 2); if (stat & GPMQOver) { - printk(KERN_ERR "%s: GPMQOver\n", __func__); + pr_err("%s(): GPMQOver\n", __func__); mutex_unlock(&av7110->dcomlock); return -1; } else if (stat & OSDQOver) { - printk(KERN_ERR "%s: OSDQOver\n", __func__); + pr_err("%s(): OSDQOver\n", __func__); mutex_unlock(&av7110->dcomlock); return -1; } @@ -611,7 +604,7 @@ static int av7110_fw_query(struct av7110 *av7110, u16 tag, u16 *buf, s16 length) ret = av7110_fw_request(av7110, &tag, 0, buf, length); if (ret) - printk(KERN_ERR "dvb-ttpci: av7110_fw_query error %d\n", ret); + pr_err("%s(): error %d\n", __func__, ret); return ret; } @@ -628,8 +621,7 @@ int av7110_firmversion(struct av7110 *av7110) dprintk(4, "%p\n", av7110); if (av7110_fw_query(av7110, tag, buf, 16)) { - printk("dvb-ttpci: failed to boot firmware @ card %d\n", - av7110->dvb_adapter.num); + pr_err("failed to boot firmware @ card %d\n", av7110->dvb_adapter.num); return -EIO; } @@ -639,17 +631,17 @@ int av7110_firmversion(struct av7110 *av7110) av7110->arm_app = (buf[6] << 16) + buf[7]; av7110->avtype = (buf[8] << 16) + buf[9]; - printk("dvb-ttpci: info @ card %d: firm %08x, rtsl %08x, vid %08x, app %08x\n", - av7110->dvb_adapter.num, av7110->arm_fw, - av7110->arm_rtsl, av7110->arm_vid, av7110->arm_app); + pr_info("info @ card %d: firm %08x, rtsl %08x, vid %08x, app %08x\n", + av7110->dvb_adapter.num, av7110->arm_fw, + av7110->arm_rtsl, av7110->arm_vid, av7110->arm_app); /* print firmware capabilities */ if (FW_CI_LL_SUPPORT(av7110->arm_app)) - printk("dvb-ttpci: firmware @ card %d supports CI link layer interface\n", - av7110->dvb_adapter.num); + pr_info("firmware @ card %d supports CI link layer interface\n", + av7110->dvb_adapter.num); else - printk("dvb-ttpci: no firmware support for CI link layer interface @ card %d\n", - av7110->dvb_adapter.num); + pr_info("no firmware support for CI link layer interface @ card %d\n", + av7110->dvb_adapter.num); return 0; } @@ -678,7 +670,7 @@ int av7110_diseqc_send(struct av7110 *av7110, int len, u8 *msg, unsigned long bu ret = av7110_send_fw_cmd(av7110, buf, 18); if (ret && ret != -ERESTARTSYS) - printk(KERN_ERR "dvb-ttpci: av7110_diseqc_send error %d\n", ret); + pr_err("%s(): error %d\n", __func__, ret); return ret; } @@ -723,8 +715,7 @@ static int FlushText(struct av7110 *av7110) if (rdebi(av7110, DEBINOSWAP, BUFF1_BASE, 0, 2) == 0) break; if (err) { - printk(KERN_ERR "dvb-ttpci: %s(): timeout waiting for BUFF1_BASE == 0\n", - __func__); + pr_err("%s(): timeout waiting for BUFF1_BASE == 0\n", __func__); mutex_unlock(&av7110->dcomlock); return -ETIMEDOUT; } @@ -750,8 +741,7 @@ static int WriteText(struct av7110 *av7110, u8 win, u16 x, u16 y, char *buf) if (rdebi(av7110, DEBINOSWAP, BUFF1_BASE, 0, 2) == 0) break; if (ret) { - printk(KERN_ERR "dvb-ttpci: %s: timeout waiting for BUFF1_BASE == 0\n", - __func__); + pr_err("%s(): timeout waiting for BUFF1_BASE == 0\n", __func__); mutex_unlock(&av7110->dcomlock); return -ETIMEDOUT; } @@ -764,8 +754,7 @@ static int WriteText(struct av7110 *av7110, u8 win, u16 x, u16 y, char *buf) if (rdebi(av7110, DEBINOSWAP, HANDSHAKE_REG, 0, 2) == 0) break; if (ret) { - printk(KERN_ERR "dvb-ttpci: %s: timeout waiting for HANDSHAKE_REG\n", - __func__); + pr_err("%s(): timeout waiting for HANDSHAKE_REG\n", __func__); mutex_unlock(&av7110->dcomlock); return -ETIMEDOUT; } @@ -780,7 +769,7 @@ static int WriteText(struct av7110 *av7110, u8 win, u16 x, u16 y, char *buf) ret = __av7110_send_fw_cmd(av7110, cbuf, 5); mutex_unlock(&av7110->dcomlock); if (ret && ret != -ERESTARTSYS) - printk(KERN_ERR "dvb-ttpci: WriteText error %d\n", ret); + pr_err("%s(): error %d\n", __func__, ret); return ret; } @@ -839,8 +828,7 @@ static inline int WaitUntilBmpLoaded(struct av7110 *av7110) int ret = wait_event_timeout(av7110->bmpq, av7110->bmp_state != BMP_LOADING, 10 * HZ); if (ret == 0) { - printk("dvb-ttpci: warning: timeout waiting in LoadBitmap: %d, %d\n", - ret, av7110->bmp_state); + pr_warn("warning: timeout waiting in LoadBitmap: %d, %d\n", ret, av7110->bmp_state); av7110->bmp_state = BMP_NONE; return -ETIMEDOUT; } @@ -897,7 +885,7 @@ static inline int LoadBitmap(struct av7110 *av7110, } } av7110->bmplen += 1024; - dprintk(4, "av7110_fw_cmd: LoadBmp size %d\n", av7110->bmplen); + dprintk(4, "av7110_fw_cmd(): LoadBmp size %d\n", av7110->bmplen); ret = av7110_fw_cmd(av7110, COMTYPE_OSD, LoadBmp, 3, format, dx, dy); if (!ret) ret = WaitUntilBmpLoaded(av7110); @@ -918,7 +906,7 @@ static inline int ReleaseBitmap(struct av7110 *av7110) if (av7110->bmp_state != BMP_LOADED && FW_VERSION(av7110->arm_app) < 0x261e) return -1; if (av7110->bmp_state == BMP_LOADING) - dprintk(1,"ReleaseBitmap called while BMP_LOADING\n"); + dprintk(1, "%s called while BMP_LOADING\n", __func__); av7110->bmp_state = BMP_NONE; return av7110_fw_cmd(av7110, COMTYPE_OSD, ReleaseBmp, 0); } @@ -1033,7 +1021,7 @@ static int OSDSetBlock(struct av7110 *av7110, int x0, int y0, if (!rc) rc = release_rc; if (rc) - dprintk(1,"returns %d\n",rc); + dprintk(1, "returns %d\n", rc); return rc; } @@ -1180,9 +1168,9 @@ int av7110_osd_cmd(struct av7110 *av7110, osd_cmd_t *dc) mutex_unlock(&av7110->osd_mutex); if (ret == -ERESTARTSYS) - dprintk(1, "av7110_osd_cmd(%d) returns with -ERESTARTSYS\n",dc->cmd); + dprintk(1, "%s(%d) returns with -ERESTARTSYS\n", __func__, dc->cmd); else if (ret) - dprintk(1, "av7110_osd_cmd(%d) returns with %d\n",dc->cmd,ret); + dprintk(1, "%s(%d) returns with %d\n", __func__, dc->cmd, ret); return ret; } diff --git a/drivers/staging/media/av7110/av7110_ir.c b/drivers/staging/media/av7110/av7110_ir.c index a851ba328..68b3979ba 100644 --- a/drivers/staging/media/av7110/av7110_ir.c +++ b/drivers/staging/media/av7110/av7110_ir.c @@ -59,8 +59,7 @@ void av7110_ir_handler(struct av7110 *av7110, u32 ircom) proto = RC_PROTO_RC5; break; default: - dprintk(2, "unknown ir config %d\n", - av7110->ir.ir_config); + dprintk(2, "unknown ir config %d\n", av7110->ir.ir_config); return; } diff --git a/drivers/staging/media/av7110/av7110_v4l.c b/drivers/staging/media/av7110/av7110_v4l.c index d13f1afec..04e659243 100644 --- a/drivers/staging/media/av7110/av7110_v4l.c +++ b/drivers/staging/media/av7110/av7110_v4l.c @@ -42,8 +42,7 @@ int msp_writereg(struct av7110 *av7110, u8 dev, u16 reg, u16 val) } if (i2c_transfer(&av7110->i2c_adap, &msgs, 1) != 1) { - dprintk(1, "dvb-ttpci: failed @ card %d, %u = %u\n", - av7110->dvb_adapter.num, reg, val); + dprintk(1, "failed @ card %d, %u = %u\n", av7110->dvb_adapter.num, reg, val); return -EIO; } return 0; @@ -72,8 +71,7 @@ static int msp_readreg(struct av7110 *av7110, u8 dev, u16 reg, u16 *val) } if (i2c_transfer(&av7110->i2c_adap, &msgs[0], 2) != 2) { - dprintk(1, "dvb-ttpci: failed @ card %d, %u\n", - av7110->dvb_adapter.num, reg); + dprintk(1, "failed @ card %d, %u\n", av7110->dvb_adapter.num, reg); return -EIO; } *val = (msg2[0] << 8) | msg2[1]; @@ -617,7 +615,7 @@ static ssize_t av7110_vbi_write(struct file *file, const char __user *data, size struct v4l2_sliced_vbi_data d; int rc; - dprintk(2, "%s\n", __func__); + dprintk(2, "\n"); if (FW_VERSION(av7110->arm_app) < 0x2623 || !av7110->wssMode || count != sizeof(d)) return -EINVAL; if (copy_from_user(&d, data, count)) @@ -718,7 +716,7 @@ int av7110_init_analog_module(struct av7110 *av7110) msleep(100); // the probing above resets the msp... msp_readreg(av7110, MSP_RD_DSP, 0x001e, &version1); msp_readreg(av7110, MSP_RD_DSP, 0x001f, &version2); - dprintk(1, "dvb-ttpci: @ card %d MSP34xx version 0x%04x 0x%04x\n", + dprintk(1, "@ card %d MSP34xx version 0x%04x 0x%04x\n", av7110->dvb_adapter.num, version1, version2); msp_writereg(av7110, MSP_WR_DSP, 0x0013, 0x0c00); msp_writereg(av7110, MSP_WR_DSP, 0x0000, 0x7f00); // loudspeaker + headphone diff --git a/drivers/staging/media/av7110/dvb_filter.c b/drivers/staging/media/av7110/dvb_filter.c index 71c1d9629..9eafbb82b 100644 --- a/drivers/staging/media/av7110/dvb_filter.c +++ b/drivers/staging/media/av7110/dvb_filter.c @@ -39,8 +39,6 @@ int dvb_filter_get_ac3info(u8 *mbuf, int count, struct dvb_audio_info *ai, int p if (!found) return -1; - if (pr) - printk(KERN_DEBUG "Audiostream: AC3"); ai->off = c; if (c + 5 >= count) @@ -52,21 +50,18 @@ int dvb_filter_get_ac3info(u8 *mbuf, int count, struct dvb_audio_info *ai, int p frame = (headr[2] & 0x3f); ai->bit_rate = ac3_bitrates[frame >> 1] * 1000; - if (pr) - printk(KERN_CONT " BRate: %d kb/s", (int) ai->bit_rate/1000); - ai->frequency = (headr[2] & 0xc0) >> 6; fr = (headr[2] & 0xc0) >> 6; ai->frequency = freq[fr] * 100; - if (pr) - printk(KERN_CONT " Freq: %d Hz\n", (int) ai->frequency); ai->framesize = ac3_frames[fr][frame >> 1]; if ((frame & 1) && (fr == 1)) ai->framesize++; ai->framesize = ai->framesize << 1; + if (pr) - printk(KERN_DEBUG " Framesize %d\n", (int) ai->framesize); + pr_info("Audiostream: AC3, BRate: %d kb/s, Freq: %d Hz, Framesize %d\n", + (int)ai->bit_rate / 1000, (int)ai->frequency, (int)ai->framesize); return 0; } From patchwork Tue May 7 00:25:00 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Herdler X-Patchwork-Id: 13656151 Received: from mout.gmx.net (mout.gmx.net [212.227.17.20]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 12D1364A for ; Tue, 7 May 2024 00:27:28 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=212.227.17.20 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1715041651; cv=none; b=GV/HNpfXwXm/0T+jc5tDpCYG45z3Hf9koyWwmHfNMrWsLZVh+QucoE9D64fACd52mc4ihgvi9ACeyJu9cWgRVF6jzL51Qw/snoePgikiDoG5V9HkQ7KVA185RiWRAVYSIAd0rXKGQPS3SkL1o4+qU7sKh+shTwGs7A4bm5+hq3Y= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1715041651; c=relaxed/simple; bh=CNxeGKCBepWjlCX4R7etSmDFomjRZLo8CZXL6/oHvrQ=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=r1b+fnyMTovUbesfFk0SZWhS5DnspzubI/RMH1cWG6CjEtsAubGq6NJGvXSqHTwYr7+oaDjvnR+mivsVZ+230i+NHF690Hu3PcHcHxgiG8Tcuq9opZgGdxYXvNgrYRz/KjR0KX/dDnvyFVwg9Whpck7tKVSTvd2ELeWES+B9lHw= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=nurfuerspam.de; spf=pass smtp.mailfrom=nurfuerspam.de; dkim=pass (2048-bit key) header.d=nurfuerspam.de header.i=herdler@nurfuerspam.de header.b=GtW3KVry; arc=none smtp.client-ip=212.227.17.20 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=nurfuerspam.de Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=nurfuerspam.de Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=nurfuerspam.de header.i=herdler@nurfuerspam.de header.b="GtW3KVry" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nurfuerspam.de; s=s31663417; t=1715041646; x=1715646446; i=herdler@nurfuerspam.de; bh=pl8t2uXfzkD5OxCLTeB/3ddO2oeRRbPyuBlZFITseFQ=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date:Message-Id:In-Reply-To: References:MIME-Version:Content-Transfer-Encoding:cc: content-transfer-encoding:content-type:date:from:message-id: mime-version:reply-to:subject:to; b=GtW3KVry5oM+Og4uh5bzLNFJkwLtlHO55mtfaMPWisSTg546wFv/sUuGKQ2MLElB jDxWUaBY5CpRyXbb9WMVG4fvB3nHhXN66VSeBXxn6W9yTGVnpOUf3w/GTpEmZLXS2 pnRYLMpL+6mes2kQ9DBHfQt5UhLZNi20DxRI1YK7JoC1nE9BTL5igvTDHyPZYiOWe L2ZpIlqB9Ny5Hd1JdmJUPdfmebjUoq6exzcCOcxQhQEYZamSDdH7Hkj7B49W6rTDQ PfdkZLKeR3J2tC4DdoJlglAsj8ppJ7NCm5KQBKA8J6JDwE+uQlOiWhMtKH1h6Icym yZETpIuHhGayXkBH8g== X-UI-Sender-Class: 724b4f7f-cbec-4199-ad4e-598c01a50d3a Received: from astro.haus ([185.101.174.109]) by mail.gmx.net (mrgmx104 [212.227.17.168]) with ESMTPSA (Nemesis) id 1MmDEm-1sUdn407lY-00jsSn; Tue, 07 May 2024 02:27:26 +0200 From: Stefan Herdler To: hverkuil-cisco@xs4all.nl Cc: linux-media@vger.kernel.org, smoch@web.de, tmn505@gmail.com, vinschen@redhat.com Subject: [PATCH 21/21] media: av7110: coding style fixes: avoid_externs Date: Tue, 7 May 2024 02:25:00 +0200 Message-Id: <20240507002500.81867-22-herdler@nurfuerspam.de> X-Mailer: git-send-email 2.34.0 In-Reply-To: <20240507002500.81867-1-herdler@nurfuerspam.de> References: <20240507002500.81867-1-herdler@nurfuerspam.de> Precedence: bulk X-Mailing-List: linux-media@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Provags-ID: V03:K1:R0Box3A9inhoZc7B7Vf2lGBL4gYTjYmJf+P5Cdd+0g+n20ooc+n tUqewFZPC4HX5RZmqpuNv9Lnn8xTzNPjE1Qrw2qkKZZapNUN30lqhAPRMdOcf+jjXvNvtUB Mb9cTzyh8idCfJmsrA8dDxve8E8cy9eyMd1uipgkW7yCoAcD4av4LQxA1ISNA6mIBZdGcY8 FCBjnOmPyY1/wcMjAhs3A== X-Spam-Flag: NO UI-OutboundReport: notjunk:1;M01:P0:uhsvJmqP1qQ=;jGYwYAj/+OtSQMG7ZEdacLuaFoR QvOQMlp94Oz3Rv5YNynEGz5UzmJwgCkuuI+/CDyVdc/uZVDLHkly2/6MIFAfxp1Xq6ZGSjNg0 UMXD9744QgKWZ17TEtuJNR+A1gOPB5UiKsgI4IRQ2tWIJLBFcb93nAx5yb/mHeKwZNOGeVhvZ kYu1vPAz6pJlqmnV2WhSWFQakrhj7BqDvtMik1uEmS8ViwqJ1NmGuG1EtRssO2JZzDP2QOXAE DAcpSpc8y1u/kVofIEne9hiOEPBQ8jFh5xdhooyFujx1K3SwE9DMoMQolnqWkIxfTjLQec2XU adqvC7ZmpnSFAtO8DFOxfII6H+bZiPpcAAjA2uUz6XTkCKdpAdgAcFX9MrW+98MAtu+DOd9Vo 9Kw5NcLIRBcXdBEi5fKPmqiM3DiIl7wNOEsEDE3UG+XI7Ps8qhFkVW+uTdIJIdaFwKA2+uAyA lrCwXGrf5HP0bDFkzHusDH7Uig/SWd0brv9tWT1V6u0m0JRb4hBNKW9J42oRqqtdifjS+Ewp+ 85D9bT7yJMedLd39VXZ6PiVphsl1svCy+JEkxxcieA9j91Op4Dp/jAJc4wyX/b2zSiV1tc/eq gZ3jggFFr0zBxXqQcUJ3C8fotH4p5z/i0cXkVIjAj5pxYq5F4+ambI21Uf94u/iVy1fqQA+Wx aHlL/NKJIEM/8fh096dKr3DlGMWKEk6CSkZcZV6oDQ/h2LIVs1PNOiy5xClHtZ2btOCz4Tl6O 7+AId7fTLlfVYwNwYqloeyyquhArzwOgr8fKNn8P5JkNgGC4eT+z1iXXTo/MglJmBRNzJB0+P DayPqGIm9eXeqP0tQuxPMsRMEhIdhAFCXhv51kvtgPwgQ= This patch fixes the following checkpatch warnings: CHECK:AVOID_EXTERNS: extern prototypes should be avoided in .h files Removing unnecessary 'extern' declaration of function prototypes in header files. Signed-off-by: Stefan Herdler --- drivers/staging/media/av7110/av7110.h | 16 ++++----- drivers/staging/media/av7110/av7110_av.h | 36 ++++++++++----------- drivers/staging/media/av7110/av7110_ca.h | 12 +++---- drivers/staging/media/av7110/av7110_hw.h | 26 +++++++-------- drivers/staging/media/av7110/av7110_ipack.h | 12 +++---- 5 files changed, 51 insertions(+), 51 deletions(-) -- 2.34.0 diff --git a/drivers/staging/media/av7110/av7110.h b/drivers/staging/media/av7110/av7110.h index 403dbbba5..ec461fd18 100644 --- a/drivers/staging/media/av7110/av7110.h +++ b/drivers/staging/media/av7110/av7110.h @@ -284,8 +284,8 @@ struct av7110 { int (*fe_set_frontend)(struct dvb_frontend *fe); }; -extern int ChangePIDs(struct av7110 *av7110, u16 vpid, u16 apid, u16 ttpid, - u16 subpid, u16 pcrpid); +int ChangePIDs(struct av7110 *av7110, u16 vpid, u16 apid, u16 ttpid, + u16 subpid, u16 pcrpid); void av7110_ir_handler(struct av7110 *av7110, u32 ircom); int av7110_set_ir_config(struct av7110 *av7110); @@ -298,12 +298,12 @@ void av7110_ir_exit(struct av7110 *av7110); #define MSP_WR_DSP 0x12 #define MSP_RD_DSP 0x13 -extern int i2c_writereg(struct av7110 *av7110, u8 id, u8 reg, u8 val); -extern u8 i2c_readreg(struct av7110 *av7110, u8 id, u8 reg); -extern int msp_writereg(struct av7110 *av7110, u8 dev, u16 reg, u16 val); +int i2c_writereg(struct av7110 *av7110, u8 id, u8 reg, u8 val); +u8 i2c_readreg(struct av7110 *av7110, u8 id, u8 reg); +int msp_writereg(struct av7110 *av7110, u8 dev, u16 reg, u16 val); -extern int av7110_init_analog_module(struct av7110 *av7110); -extern int av7110_init_v4l(struct av7110 *av7110); -extern int av7110_exit_v4l(struct av7110 *av7110); +int av7110_init_analog_module(struct av7110 *av7110); +int av7110_init_v4l(struct av7110 *av7110); +int av7110_exit_v4l(struct av7110 *av7110); #endif /* _AV7110_H_ */ diff --git a/drivers/staging/media/av7110/av7110_av.h b/drivers/staging/media/av7110/av7110_av.h index f1c5c26c6..eebaf59c7 100644 --- a/drivers/staging/media/av7110/av7110_av.h +++ b/drivers/staging/media/av7110/av7110_av.h @@ -4,28 +4,28 @@ struct av7110; -extern int av7110_set_vidmode(struct av7110 *av7110, - enum av7110_video_mode mode); +int av7110_set_vidmode(struct av7110 *av7110, + enum av7110_video_mode mode); -extern int av7110_record_cb(struct dvb_filter_pes2ts *p2t, u8 *buf, size_t len); -extern int av7110_pes_play(void *dest, struct dvb_ringbuffer *buf, int dlen); -extern int av7110_write_to_decoder(struct dvb_demux_feed *feed, const u8 *buf, size_t len); +int av7110_record_cb(struct dvb_filter_pes2ts *p2t, u8 *buf, size_t len); +int av7110_pes_play(void *dest, struct dvb_ringbuffer *buf, int dlen); +int av7110_write_to_decoder(struct dvb_demux_feed *feed, const u8 *buf, size_t len); -extern int av7110_set_volume(struct av7110 *av7110, unsigned int volleft, - unsigned int volright); -extern int av7110_av_stop(struct av7110 *av7110, int av); -extern int av7110_av_start_record(struct av7110 *av7110, int av, - struct dvb_demux_feed *dvbdmxfeed); -extern int av7110_av_start_play(struct av7110 *av7110, int av); +int av7110_set_volume(struct av7110 *av7110, unsigned int volleft, + unsigned int volright); +int av7110_av_stop(struct av7110 *av7110, int av); +int av7110_av_start_record(struct av7110 *av7110, int av, + struct dvb_demux_feed *dvbdmxfeed); +int av7110_av_start_play(struct av7110 *av7110, int av); -extern void dvb_video_add_event(struct av7110 *av7110, struct video_event *event); +void dvb_video_add_event(struct av7110 *av7110, struct video_event *event); -extern void av7110_p2t_init(struct av7110_p2t *p, struct dvb_demux_feed *feed); -extern void av7110_p2t_write(u8 const *buf, long length, u16 pid, struct av7110_p2t *p); +void av7110_p2t_init(struct av7110_p2t *p, struct dvb_demux_feed *feed); +void av7110_p2t_write(u8 const *buf, long length, u16 pid, struct av7110_p2t *p); -extern int av7110_av_register(struct av7110 *av7110); -extern void av7110_av_unregister(struct av7110 *av7110); -extern int av7110_av_init(struct av7110 *av7110); -extern void av7110_av_exit(struct av7110 *av7110); +int av7110_av_register(struct av7110 *av7110); +void av7110_av_unregister(struct av7110 *av7110); +int av7110_av_init(struct av7110 *av7110); +void av7110_av_exit(struct av7110 *av7110); #endif /* _AV7110_AV_H_ */ diff --git a/drivers/staging/media/av7110/av7110_ca.h b/drivers/staging/media/av7110/av7110_ca.h index a6e3f2955..d3521944b 100644 --- a/drivers/staging/media/av7110/av7110_ca.h +++ b/drivers/staging/media/av7110/av7110_ca.h @@ -4,12 +4,12 @@ struct av7110; -extern void CI_handle(struct av7110 *av7110, u8 *data, u16 len); -extern void ci_get_data(struct dvb_ringbuffer *cibuf, u8 *data, int len); +void CI_handle(struct av7110 *av7110, u8 *data, u16 len); +void ci_get_data(struct dvb_ringbuffer *cibuf, u8 *data, int len); -extern int av7110_ca_register(struct av7110 *av7110); -extern void av7110_ca_unregister(struct av7110 *av7110); -extern int av7110_ca_init(struct av7110* av7110); -extern void av7110_ca_exit(struct av7110* av7110); +int av7110_ca_register(struct av7110 *av7110); +void av7110_ca_unregister(struct av7110 *av7110); +int av7110_ca_init(struct av7110 *av7110); +void av7110_ca_exit(struct av7110 *av7110); #endif /* _AV7110_CA_H_ */ diff --git a/drivers/staging/media/av7110/av7110_hw.h b/drivers/staging/media/av7110/av7110_hw.h index c13b8c479..d4579f411 100644 --- a/drivers/staging/media/av7110/av7110_hw.h +++ b/drivers/staging/media/av7110/av7110_hw.h @@ -357,22 +357,22 @@ enum av7110_command_type { #define DEBI_DONE_LINE 1 #define ARM_IRQ_LINE 0 -extern int av7110_bootarm(struct av7110 *av7110); -extern int av7110_firmversion(struct av7110 *av7110); +int av7110_bootarm(struct av7110 *av7110); +int av7110_firmversion(struct av7110 *av7110); #define FW_CI_LL_SUPPORT(arm_app) ((arm_app) & 0x80000000) #define FW_4M_SDRAM(arm_app) ((arm_app) & 0x40000000) #define FW_VERSION(arm_app) ((arm_app) & 0x0000FFFF) -extern int av7110_wait_msgstate(struct av7110 *av7110, u16 flags); -extern int av7110_fw_cmd(struct av7110 *av7110, int type, int com, int num, ...); -extern int av7110_fw_request(struct av7110 *av7110, u16 *request_buf, - int request_buf_len, u16 *reply_buf, int reply_buf_len); +int av7110_wait_msgstate(struct av7110 *av7110, u16 flags); +int av7110_fw_cmd(struct av7110 *av7110, int type, int com, int num, ...); +int av7110_fw_request(struct av7110 *av7110, u16 *request_buf, + int request_buf_len, u16 *reply_buf, int reply_buf_len); /* DEBI (saa7146 data extension bus interface) access */ -extern int av7110_debiwrite(struct av7110 *av7110, u32 config, - int addr, u32 val, unsigned int count); -extern u32 av7110_debiread(struct av7110 *av7110, u32 config, - int addr, unsigned int count); +int av7110_debiwrite(struct av7110 *av7110, u32 config, + int addr, u32 val, unsigned int count); +u32 av7110_debiread(struct av7110 *av7110, u32 config, + int addr, unsigned int count); /* DEBI during interrupt */ /* single word writes */ @@ -473,11 +473,11 @@ static inline int Set22K(struct av7110 *av7110, int state) return av7110_fw_cmd(av7110, COMTYPE_AUDIODAC, (state ? ON22K : OFF22K), 0); } -extern int av7110_diseqc_send(struct av7110 *av7110, int len, u8 *msg, unsigned long burst); +int av7110_diseqc_send(struct av7110 *av7110, int len, u8 *msg, unsigned long burst); #ifdef CONFIG_DVB_AV7110_OSD -extern int av7110_osd_cmd(struct av7110 *av7110, osd_cmd_t *dc); -extern int av7110_osd_capability(struct av7110 *av7110, osd_cap_t *cap); +int av7110_osd_cmd(struct av7110 *av7110, osd_cmd_t *dc); +int av7110_osd_capability(struct av7110 *av7110, osd_cap_t *cap); #endif /* CONFIG_DVB_AV7110_OSD */ #endif /* _AV7110_HW_H_ */ diff --git a/drivers/staging/media/av7110/av7110_ipack.h b/drivers/staging/media/av7110/av7110_ipack.h index 943ec899b..55296421d 100644 --- a/drivers/staging/media/av7110/av7110_ipack.h +++ b/drivers/staging/media/av7110/av7110_ipack.h @@ -2,12 +2,12 @@ #ifndef _AV7110_IPACK_H_ #define _AV7110_IPACK_H_ -extern int av7110_ipack_init(struct ipack *p, int size, - void (*func)(u8 *buf, int size, void *priv)); +int av7110_ipack_init(struct ipack *p, int size, + void (*func)(u8 *buf, int size, void *priv)); -extern void av7110_ipack_reset(struct ipack *p); -extern int av7110_ipack_instant_repack(const u8 *buf, int count, struct ipack *p); -extern void av7110_ipack_free(struct ipack * p); -extern void av7110_ipack_flush(struct ipack *p); +void av7110_ipack_reset(struct ipack *p); +int av7110_ipack_instant_repack(const u8 *buf, int count, struct ipack *p); +void av7110_ipack_free(struct ipack *p); +void av7110_ipack_flush(struct ipack *p); #endif