From nobody Tue Apr 7 17:52:09 2026 Received: from sonic307-53.consmr.mail.ir2.yahoo.com (sonic307-53.consmr.mail.ir2.yahoo.com [87.248.110.30]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id CE1B038B14F for ; Thu, 12 Mar 2026 08:58:31 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=87.248.110.30 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773305915; cv=none; b=lRcWprJZoZuSwNkO/+Ngry+J3lgezdzaaxDxB0JNAVmTg4vgb1HYfJF3OoFp+Adq7/1iOM6XAgzQ5kljfzuvJPi2gfSgN/HjVOHoXaFJnZ6bbi0PogNzUo8bSjRMT9ZJJ4TG1hhxug1o88U6JahzLbv05O0P1MdVqU0JzD//w2A= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773305915; c=relaxed/simple; bh=pGgNlBOKRJtu3tbLurrM7un+iGD4yiY31DB+IuUiiQA=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:To:Cc: References; b=RJdksgVXmciRyKcV6Irsyj+pjOClg5fsuj7/InCCKxDH41ASbQvF90h/LCQkw/08sm2S7ciKOY8s3SkcAg3evUa/D8xOygJw1okvfROvmKrxj3V2N0Ff1OKOwEFKmPm0Yr7fpCG4ZvPgF4Z5LUuo/XvtCL2ePIiembGk+RD8l4k= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=yahoo.pl; spf=pass smtp.mailfrom=yahoo.pl; dkim=pass (2048-bit key) header.d=yahoo.pl header.i=@yahoo.pl header.b=Upi/kVdF; arc=none smtp.client-ip=87.248.110.30 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=yahoo.pl Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=yahoo.pl Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=yahoo.pl header.i=@yahoo.pl header.b="Upi/kVdF" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yahoo.pl; s=s2048; t=1773305904; bh=46IprEABwCaeiuNOWmEjvVAOe5sMbxotEuz6oF3GBUg=; h=From:Date:Subject:To:Cc:References:From:Subject:Reply-To; b=Upi/kVdF/cEjDxMMxPaJO1v9m3j7xiLrtQFQK7FmqN1RRtryv4Amf8mHFh3Dd17hbJUqOwYtTKZGER4kwvxey7Be6bwEFJAhLfNFcccorX0hDUmw0d3XDZ3p6G0CoqbM/06eKHd1n0yCckMUI//7IqP5W5XAhsSxCCp+C/i7TBJzGtqkE9H14koaXLDQt/CZHZW1h5yWME4cg07Q0qaq1EEZGLS0qSarVqRsBWwztnp1b4PQ+bs7tFI4Yl/TQUTPLl+qsLH/jidUiJ8u/lK4a7u23xXj3pcHbM3D8QVEPoXt5INjMLrdGc2wxc5YNM1pwn7wA4dhiqTcz60Ymsom5A== X-SONIC-DKIM-SIGN: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yahoo.com; s=s2048; t=1773305904; bh=zkLXopHwc2gtEak3LrHAskTCiHhuxXsHGRM1uh9fwHK=; h=X-Sonic-MF:From:Date:Subject:To:From:Subject; b=YpPzM5CwhaJNP6iOIkS35GrtZhwRlKDoXZrp4OdC8jsL/VgKFdeXRG1fplQ0+SWSMdmA0xvv0euv6JZR3Z359+k/2Dkp977x5AhSDj22oXQZbZLvQI1KvNrJjJJ0WMOUhuA+yLsDYgq2x2q2NrZxlcLGc28wvTbQ/CU0gje6iZPJmUfsgLvaEdkYHfZbNgsZMbs2Abbmoiv1MtKNAE8qDTKhr7Wid6L9SC1ej2zrQhjiFemdxFaMVxHjC6VzqsInlQhn8I50JhfJnBsWUdpYg60mMN+JA+Qv3fynbJdNfDP1GX4QEi9na0Lh7iaZ9ZV1OGAAmdbM7ocKvMmP0d0e7A== X-YMail-OSG: zXoMFg8VM1lyL3O2g0AIree2d.Erj5iqXq8EWyRggu1Yh2M7UxGHvxm9lQ2IOvM QRrP81ds7MJ5cgYs6WZH5oP0ZX70OBczTF.x6l5S2da6XDYUJwHyQr.gMyqfqtPaLTOYsu0lm1qj pmGaCJ9R65c6Gj2XC.gmc25lD.7PGCibDbo3lq3EDyZel.bs8dvYuUZr8FWk8IiMQuHras51HtHV GPyPUH5XZwWj.Mfi2y_pD7F9mUhosz_2btrnob1LB_MzQcKCoL1ex8PAT10p1NZMEjRqL.tGB7Un V7AA2dNbfyxWZ7anGEQ5uPxvM6zhOs3rHa0ZMgBjHZa4DEIT2BCReoKFdihoV_TbsQ4lsX4tmG7b tNFlhWvjyeAOwJuZopjnOitG9BYeNJq7GWaJxs7Anwx1I1QsN7O8QrJu2fDqGKrEIXEkFyqnhw4B 1SAN67_5gOk7K8S0sVj16kel0jfvK3SxnVzsbBBattrU7JhCH5ThWq_NqBWXnm50j.9p32qjwZL0 REbuZ5ib742nUCEvrFDAdYhZt7DYuHebvhcTN_Uv4KzlU0J1bje7ngfwTWt39ReQat008yiVGwqI MlP5acjKaegpU_HQVBG2CcRE8uRTrvYQiE14PtYghWHabEfWksKBTjrSH42Zg.3ParPgF_wKPJIY gMXFg4sJB5p9wrXmiOPsnaHRjjWJzfFPXVushczHi8D2nPk7wajmWeCgOKzXow0RO_vDhWL5UGmS F.hnnnsCtSx_PW9sZZOPiel6dQEObhGaZ1oTZW8_SErKHMKkdY1G8vQM63Js6GGsTRi01MAtHsgp YbbanvvJIzqmkcRc8KVxZA3GGABvhj7uxZGOvKjTEM2W1lJ2qP_cpCPAyCgWR8qf47h4..WyRqAE fucqXLvzVq9XCGlFYqB2Rag3J212AMFJCTulfEOVi9WUVZAcL9p0i4g6i4_qGT9OGU58t0D.HCLG Re19JOHnd8RhKNL9gO4YElHki1zw3kMRvQiNKve9hP7SryLlb2mV7Ci2fly0L.ScihhaCRuJ6FlD 8sGCov9O18hLfNIGX8Ul.JolMmXKWGXpRQi2FwzO0S0vZ4KLWsZSqkqrqejlvl5c6mJTorSjm8Lc 6x2UQc4sFDcP_47GbmZs_GrjoHdHWWKdgu7VezoydAQpK.JxyDBCY4vMIjUXvq4ieDqVHQUKC3Fg UE3hz4PnRPwNGA37x_5dA5n3ANEaeGei46e4ud2P1qT.tyfZloSGnhzGciTKVi.9H4BSj9rku9RH G6mJVoChqchiKmFwy8H.MUlWsBoSS_olHc.Qpep_Th1KnYp1dFpe9dz8mZFErDakQfsb12GiDJEd 4rLb59BFi6MFdYrRs0cg4SAcNHpHurC4XvSONNmp8VGYi6NQFdvZTRdrVleshy1ZPR6ojaSZchW_ EMLVKK2yQEad8LXv_tATPXnSZEroBodwyC46IKRIElYKQ4_A6n1FcIMoh45ovE0FvwzmgbhsGunR 9qykX8YFVqy8aekBx1IuD2SQS1dL5gZrABZzxS1O_ng0ZdCUoMQgOIXWzhD86F_rYs1D34_Do2VO GwKSCd8rMQjiQUHpj5vuwuqA2eiW23B8AxdqYbLZWHoUjsTL5KE6ewoF1FfTlSxVwXNCEBgBIRw1 45M9QNdccuKQrg3nDUf5uyt9agxqWWsMEyUMA9hbh6.w5ts.ruqez.BbR405rO5qiDT752SwEdSk yq4NUFztDkpJoOcd_XpnRTW92PBeXlFmNfAkQKtfW6L7nkplkvRTIjPxa03z6RQxeqFRoNmE7vjD 5PvigzHUTgvAa0BrT7OQg.wUMHRZd6SThonAVloKrdannOiZ0PNtF499PXafe7N4edGhBG.WcvL0 BQ9OEw4o6t33y6RiZS5I7otFW7jAC62gq8Z_D20tz5dczTQpQOD792AJxugf74N6ilfPjEkVaWDU Cv5nfBdGwC1U4gzQbNnZZWLb0MM852AAT6yMo3Vr7BHID8fUVff3cTvOq8TMq03xwlPmFmwmvjir HE2hQ9_bikMbXczCZm8TYmauwS29Lyoo81_aDPkKC8pEZPg7D_jywVqr.Mqgerh_9g_MqZX4HQmu YYNsyuSHlfuqYQ0PMfZtNxIy9L6PESYiGaWn_W6IIByuAfadIZK6C2Dhem2SXlTsmFNT9MdECFcL xOEi3XX9LJaXVOZl1wfbyaAHGJ_h8H5uLiXDDwlXUFuFZT0dLkPVFBJ0Huvd_BFPPedKE_IVvhYe hwPa6FWv9rR96RKlcRgmWUp6ANvmNtnXZ37YH0Y3cYJfztsrKof4mANUUykajDy.sZdMbTMGwa63 ._Ij_mScNyKk.oCtW6UgQxg9oAxi8wgtASOXAPLAz_4ms X-Sonic-MF: X-Sonic-ID: eec3c655-a3d0-4fdc-b424-b803fa6e33b2 Received: from sonic.gate.mail.ne1.yahoo.com by sonic307.consmr.mail.ir2.yahoo.com with HTTP; Thu, 12 Mar 2026 08:58:24 +0000 Received: by hermes--production-ir2-bbcfb4457-796l5 (Yahoo Inc. Hermes SMTP Server) with ESMTPA ID 935b37a686d702ebf8e5deb2ad5c0795; Thu, 12 Mar 2026 08:58:23 +0000 (UTC) From: Tomasz Unger Date: Thu, 12 Mar 2026 09:56:18 +0100 Subject: [PATCH v5] media: staging: atomisp: Remove unnecessary return statements from void functions Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260312-atomisp-remove-void-return-v2b-v5-1-4f68de466c3c@yahoo.pl> X-B4-Tracking: v=1; b=H4sIAAAAAAAC/43NTQ6CMBCG4auYrq1ppy0/rryHcQFlkEmEkhYbj eHuFlbEDe7mncXzfVhATxjY+fBhHiMFckMKczww21XDHTk1qRkIyIQShleT6ymM3GPvIvLoqEn 39PQDj1BzbbGU0CBIsCwho8eWXuvA9Za6ozA5/173oly+f9NRcslLAWiURlvr4vKuOudO44Mtc oSNJsWuBkmrBeaq1WWBYH40vdXkrqaTlgHkxhqDyqiNNs/zF6Y52zFnAQAA X-Change-ID: 20260305-atomisp-remove-void-return-v2b-4ce912de212c To: Andy Shevchenko , Hans de Goede , Mauro Carvalho Chehab , Sakari Ailus , Greg Kroah-Hartman Cc: linux-media@vger.kernel.org, linux-kernel@vger.kernel.org, linux-staging@lists.linux.dev, Tomasz Unger X-Mailer: b4 0.14.3 X-Developer-Signature: v=1; a=ed25519-sha256; t=1773305902; l=37681; i=tomasz.unger@yahoo.pl; s=20260311; h=from:subject:message-id; bh=pGgNlBOKRJtu3tbLurrM7un+iGD4yiY31DB+IuUiiQA=; b=3t1X5fgOqaoQ2Hk1uJCUeyviG8aOwhzcsjOBftO7/8nqlsyr87mNonOOgwePiJtGcvmxPqh3i rqNe8P1j1d5DP5Krh4P17D1oNizkITKoAwdJQTZOwh7w2/MtE6In5ll X-Developer-Key: i=tomasz.unger@yahoo.pl; a=ed25519; pk=EPPsO91uz/0J2cTQ6ol+dgxYaieEc9dKSXWUb51n46c= References: <20260312-atomisp-remove-void-return-v2b-v5-1-4f68de466c3c.ref@yahoo.pl> Remove redundant 'return;' statements at the end of void functions across the driver. Also remove blank lines left before closing braces after the return statements were removed. Found with checkpatch.pl --strict. Signed-off-by: Tomasz Unger --- Changes in v5: - Restored 'return;' statements before error labels in hmm_bo.c that were incorrectly removed (reported by Dan Carpenter) - Restored unrelated blank line in input_formatter.c that was accidentally removed (reported by Dan Carpenter) - Link to v4: https://lore.kernel.org/r/20260311-atomisp-remove-void-return= -v2b-v4-1-62275c55e353@yahoo.pl Changes in v4: - Squashed all patches into one (as suggested by Andy Shevchenko) - Also removed blank lines left before closing braces after return statements were removed (as suggested by Dan Carpenter) - Link to v3: https://lore.kernel.org/r/20260310-atomisp-remove-void-return= -v2b-v3-0-aae6a2764033@yahoo.pl Changes in v3: - Extended cleanup to all 27 files in the driver containing redundant 'return;' statements at the end of void functions (as suggested by Andy Shevchenko): inputfifo.c, bufq.c, ifmtr.c, frame.c, rx.c, binary.c, ia_css_debug.c, mmu_public.h, isp2400_input_system_private.h, hmm_bo.c, sh_css.c, sp_private.h, fifo_monitor_private.h, isp.c, input_formatter_private.h, irq.c, mmu.c, fifo_monitor.c, gp_device.c, gdc.c, event_fifo_private.h, isp_private.h, input_formatter.c, irq_private.h, gpio_private.h, gp_device_private.h, atomisp_cmd.c - Each removed 'return;' was verified to be at the end of a void function - Compiled successfully: make M=3Ddrivers/staging/media/atomisp/ - Module loaded successfully in QEMU with Linux 7.0-rc3 - Link to v2: https://lore.kernel.org/r/20260310-atomisp-remove-void-return= -v2b-v2-1-b0e73f498e25@yahoo.pl Changes in v2: - Fixed subject prefix to 'media: staging: atomisp:' (reported by media CI = robot) - Rebased on media-committers/next - Verified with checkpatch.pl --strict: 0 errors, 0 warnings - Compiled successfully: make M=3Ddrivers/staging/media/atomisp/ - Module loaded successfully in QEMU with Linux 7.0-rc2 - Link to v1: https://lore.kernel.org/r/20260305-atomisp-remove-void-return= -v2b-v1-1-902e534ecb48@yahoo.pl --- drivers/staging/media/atomisp/pci/atomisp_cmd.c | 1 - .../pci/hive_isp_css_common/host/event_fifo_private.h | 1 - .../atomisp/pci/hive_isp_css_common/host/fifo_monitor.c | 5 ----- .../pci/hive_isp_css_common/host/fifo_monitor_private.h | 3 --- .../media/atomisp/pci/hive_isp_css_common/host/gdc.c | 2 -- .../atomisp/pci/hive_isp_css_common/host/gp_device.c | 1 - .../pci/hive_isp_css_common/host/gp_device_private.h | 1 - .../atomisp/pci/hive_isp_css_common/host/gpio_private.h | 1 - .../pci/hive_isp_css_common/host/input_formatter.c | 9 --------- .../hive_isp_css_common/host/input_formatter_private.h | 1 - .../media/atomisp/pci/hive_isp_css_common/host/irq.c | 10 ---------- .../atomisp/pci/hive_isp_css_common/host/irq_private.h | 1 - .../media/atomisp/pci/hive_isp_css_common/host/isp.c | 1 - .../atomisp/pci/hive_isp_css_common/host/isp_private.h | 6 ------ .../media/atomisp/pci/hive_isp_css_common/host/mmu.c | 2 -- .../atomisp/pci/hive_isp_css_common/host/sp_private.h | 8 -------- .../atomisp/pci/hive_isp_css_include/host/mmu_public.h | 1 - drivers/staging/media/atomisp/pci/hmm/hmm_bo.c | 5 ----- .../media/atomisp/pci/isp2400_input_system_private.h | 4 ---- .../media/atomisp/pci/runtime/binary/src/binary.c | 2 -- .../staging/media/atomisp/pci/runtime/bufq/src/bufq.c | 1 - .../media/atomisp/pci/runtime/debug/src/ia_css_debug.c | 10 ---------- .../staging/media/atomisp/pci/runtime/frame/src/frame.c | 4 ---- .../staging/media/atomisp/pci/runtime/ifmtr/src/ifmtr.c | 2 -- .../media/atomisp/pci/runtime/inputfifo/src/inputfifo.c | 16 ------------= ---- drivers/staging/media/atomisp/pci/runtime/isys/src/rx.c | 8 -------- drivers/staging/media/atomisp/pci/sh_css.c | 11 ----------- drivers/staging/media/atomisp/pci/sh_css_param_dvs.c | 1 - 28 files changed, 118 deletions(-) diff --git a/drivers/staging/media/atomisp/pci/atomisp_cmd.c b/drivers/stag= ing/media/atomisp/pci/atomisp_cmd.c index fec369575d88..683e9d39a831 100644 --- a/drivers/staging/media/atomisp/pci/atomisp_cmd.c +++ b/drivers/staging/media/atomisp/pci/atomisp_cmd.c @@ -1415,7 +1415,6 @@ static void atomisp_update_grid_info(struct atomisp_s= ub_device *asd, =20 err: atomisp_css_free_stat_buffers(asd); - return; } =20 static void atomisp_curr_user_grid_info(struct atomisp_sub_device *asd, diff --git a/drivers/staging/media/atomisp/pci/hive_isp_css_common/host/eve= nt_fifo_private.h b/drivers/staging/media/atomisp/pci/hive_isp_css_common/h= ost/event_fifo_private.h index 439c69444942..b467cd7a63db 100644 --- a/drivers/staging/media/atomisp/pci/hive_isp_css_common/host/event_fifo= _private.h +++ b/drivers/staging/media/atomisp/pci/hive_isp_css_common/host/event_fifo= _private.h @@ -20,7 +20,6 @@ STORAGE_CLASS_EVENT_C void event_wait_for(const event_ID_= t ID) assert(ID < N_EVENT_ID); assert(event_source_addr[ID] !=3D ((hrt_address) - 1)); (void)ia_css_device_load_uint32(event_source_addr[ID]); - return; } =20 STORAGE_CLASS_EVENT_C void cnd_event_wait_for(const event_ID_t ID, diff --git a/drivers/staging/media/atomisp/pci/hive_isp_css_common/host/fif= o_monitor.c b/drivers/staging/media/atomisp/pci/hive_isp_css_common/host/fi= fo_monitor.c index f0de78815456..9aee5ebb2004 100644 --- a/drivers/staging/media/atomisp/pci/hive_isp_css_common/host/fifo_monit= or.c +++ b/drivers/staging/media/atomisp/pci/hive_isp_css_common/host/fifo_monit= or.c @@ -492,8 +492,6 @@ void fifo_channel_get_state( assert(0); break; } - - return; } =20 void fifo_switch_get_state( @@ -514,8 +512,6 @@ void fifo_switch_get_state( state->is_none =3D (data =3D=3D HIVE_ISP_CSS_STREAM_SWITCH_NONE); state->is_sp =3D (data =3D=3D HIVE_ISP_CSS_STREAM_SWITCH_SP); state->is_isp =3D (data =3D=3D HIVE_ISP_CSS_STREAM_SWITCH_ISP); - - return; } =20 void fifo_monitor_get_state( @@ -537,7 +533,6 @@ void fifo_monitor_get_state( fifo_switch_get_state(ID, sw_id, &state->fifo_switches[sw_id]); } - return; } =20 static inline bool fifo_monitor_status_valid( diff --git a/drivers/staging/media/atomisp/pci/hive_isp_css_common/host/fif= o_monitor_private.h b/drivers/staging/media/atomisp/pci/hive_isp_css_common= /host/fifo_monitor_private.h index 53a3fb796aab..123cb89cf3ee 100644 --- a/drivers/staging/media/atomisp/pci/hive_isp_css_common/host/fifo_monit= or_private.h +++ b/drivers/staging/media/atomisp/pci/hive_isp_css_common/host/fifo_monit= or_private.h @@ -31,8 +31,6 @@ STORAGE_CLASS_FIFO_MONITOR_C void fifo_switch_set( (void)ID; =20 gp_device_reg_store(GP_DEVICE0_ID, FIFO_SWITCH_ADDR[switch_id], sel); - - return; } =20 STORAGE_CLASS_FIFO_MONITOR_C hrt_data fifo_switch_get( @@ -56,7 +54,6 @@ STORAGE_CLASS_FIFO_MONITOR_C void fifo_monitor_reg_store( assert(FIFO_MONITOR_BASE[ID] !=3D (hrt_address) - 1); ia_css_device_store_uint32(FIFO_MONITOR_BASE[ID] + reg * sizeof(hrt_data), value); - return; } =20 STORAGE_CLASS_FIFO_MONITOR_C hrt_data fifo_monitor_reg_load( diff --git a/drivers/staging/media/atomisp/pci/hive_isp_css_common/host/gdc= .c b/drivers/staging/media/atomisp/pci/hive_isp_css_common/host/gdc.c index 8bb78b4d7c67..81870a6d9751 100644 --- a/drivers/staging/media/atomisp/pci/hive_isp_css_common/host/gdc.c +++ b/drivers/staging/media/atomisp/pci/hive_isp_css_common/host/gdc.c @@ -49,7 +49,6 @@ void gdc_lut_store( gdc_reg_store(ID, lut_offset++, word_0); gdc_reg_store(ID, lut_offset++, word_1); } - return; } =20 /* @@ -102,5 +101,4 @@ static inline void gdc_reg_store( const hrt_data value) { ia_css_device_store_uint32(GDC_BASE[ID] + reg * sizeof(hrt_data), value); - return; } diff --git a/drivers/staging/media/atomisp/pci/hive_isp_css_common/host/gp_= device.c b/drivers/staging/media/atomisp/pci/hive_isp_css_common/host/gp_de= vice.c index b934d20c88ea..35366da05390 100644 --- a/drivers/staging/media/atomisp/pci/hive_isp_css_common/host/gp_device.c +++ b/drivers/staging/media/atomisp/pci/hive_isp_css_common/host/gp_device.c @@ -96,5 +96,4 @@ void gp_device_get_state( _REG_GP_SYNCGEN_FRAME_CNT_ADDR); state->soft_reset =3D gp_device_reg_load(ID, _REG_GP_SOFT_RESET_ADDR); - return; } diff --git a/drivers/staging/media/atomisp/pci/hive_isp_css_common/host/gp_= device_private.h b/drivers/staging/media/atomisp/pci/hive_isp_css_common/ho= st/gp_device_private.h index 71f20992ee98..f43e79a39f4d 100644 --- a/drivers/staging/media/atomisp/pci/hive_isp_css_common/host/gp_device_= private.h +++ b/drivers/staging/media/atomisp/pci/hive_isp_css_common/host/gp_device_= private.h @@ -22,7 +22,6 @@ STORAGE_CLASS_GP_DEVICE_C void gp_device_reg_store( assert(GP_DEVICE_BASE[ID] !=3D (hrt_address) - 1); assert((reg_addr % sizeof(hrt_data)) =3D=3D 0); ia_css_device_store_uint32(GP_DEVICE_BASE[ID] + reg_addr, value); - return; } =20 STORAGE_CLASS_GP_DEVICE_C hrt_data gp_device_reg_load( diff --git a/drivers/staging/media/atomisp/pci/hive_isp_css_common/host/gpi= o_private.h b/drivers/staging/media/atomisp/pci/hive_isp_css_common/host/gp= io_private.h index bcf6538ac0dc..27809117dde6 100644 --- a/drivers/staging/media/atomisp/pci/hive_isp_css_common/host/gpio_priva= te.h +++ b/drivers/staging/media/atomisp/pci/hive_isp_css_common/host/gpio_priva= te.h @@ -18,7 +18,6 @@ static inline void gpio_reg_store( OP___assert(ID < N_GPIO_ID); OP___assert(GPIO_BASE[ID] !=3D (hrt_address) - 1); ia_css_device_store_uint32(GPIO_BASE[ID] + reg * sizeof(hrt_data), value); - return; } =20 static inline hrt_data gpio_reg_load( diff --git a/drivers/staging/media/atomisp/pci/hive_isp_css_common/host/inp= ut_formatter.c b/drivers/staging/media/atomisp/pci/hive_isp_css_common/host= /input_formatter.c index 40b3f1e48c56..db4052ab3665 100644 --- a/drivers/staging/media/atomisp/pci/hive_isp_css_common/host/input_form= atter.c +++ b/drivers/staging/media/atomisp/pci/hive_isp_css_common/host/input_form= atter.c @@ -6,7 +6,6 @@ =20 #include "system_global.h" =20 - #include "input_formatter.h" #include #include "gp_device.h" @@ -65,8 +64,6 @@ void input_formatter_rst( if (!HIVE_IF_BIN_COPY[ID]) { input_formatter_reg_store(ID, addr, rst); } - - return; } =20 unsigned int input_formatter_get_alignment( @@ -88,7 +85,6 @@ void input_formatter_set_fifo_blocking_mode( input_formatter_reg_store(ID, HIVE_IF_BLOCK_FIFO_NO_REQ_ADDRESS, enable); } - return; } =20 void input_formatter_get_switch_state( @@ -121,8 +117,6 @@ void input_formatter_get_switch_state( _REG_GP_IFMT_input_switch_fsync_lut); state->if_input_switch_ch_id_fmt_type =3D gp_device_reg_load(GP_DEVICE0_I= D, _REG_GP_IFMT_input_switch_ch_id_fmt_type); - - return; } =20 void input_formatter_get_state( @@ -202,8 +196,6 @@ void input_formatter_get_state( HIVE_IF_FSM_VECTOR_SUPPORT); state->sensor_data_lost =3D input_formatter_reg_load(ID, HIVE_IF_FIFO_SENSOR_STATUS); - - return; } =20 void input_formatter_bin_get_state( @@ -231,5 +223,4 @@ void input_formatter_bin_get_state( HIVE_STR2MEM_DUAL_BYTE_INPUTS_ENABLED_REG_ADDRESS); state->en_status_update =3D input_formatter_reg_load(ID, HIVE_STR2MEM_EN_STAT_UPDATE_ADDRESS); - return; } diff --git a/drivers/staging/media/atomisp/pci/hive_isp_css_common/host/inp= ut_formatter_private.h b/drivers/staging/media/atomisp/pci/hive_isp_css_com= mon/host/input_formatter_private.h index 6b6ba49656e5..823861f2abe3 100644 --- a/drivers/staging/media/atomisp/pci/hive_isp_css_common/host/input_form= atter_private.h +++ b/drivers/staging/media/atomisp/pci/hive_isp_css_common/host/input_form= atter_private.h @@ -22,7 +22,6 @@ STORAGE_CLASS_INPUT_FORMATTER_C void input_formatter_reg_= store( assert(INPUT_FORMATTER_BASE[ID] !=3D (hrt_address)-1); assert((reg_addr % sizeof(hrt_data)) =3D=3D 0); ia_css_device_store_uint32(INPUT_FORMATTER_BASE[ID] + reg_addr, value); - return; } =20 STORAGE_CLASS_INPUT_FORMATTER_C hrt_data input_formatter_reg_load( diff --git a/drivers/staging/media/atomisp/pci/hive_isp_css_common/host/irq= .c b/drivers/staging/media/atomisp/pci/hive_isp_css_common/host/irq.c index b66560bca625..a8fac8aebede 100644 --- a/drivers/staging/media/atomisp/pci/hive_isp_css_common/host/irq.c +++ b/drivers/staging/media/atomisp/pci/hive_isp_css_common/host/irq.c @@ -61,7 +61,6 @@ void irq_clear_all( =20 irq_reg_store(ID, _HRT_IRQ_CONTROLLER_CLEAR_REG_IDX, mask); - return; } =20 /* @@ -105,8 +104,6 @@ void irq_enable_channel( _HRT_IRQ_CONTROLLER_MASK_REG_IDX, mask); =20 irq_wait_for_write_complete(ID); - - return; } =20 void irq_enable_pulse( @@ -121,7 +118,6 @@ void irq_enable_pulse( /* output is given as edge, not pulse */ irq_reg_store(ID, _HRT_IRQ_CONTROLLER_EDGE_NOT_PULSE_REG_IDX, edge_out); - return; } =20 void irq_disable_channel( @@ -151,8 +147,6 @@ void irq_disable_channel( _HRT_IRQ_CONTROLLER_CLEAR_REG_IDX, me); =20 irq_wait_for_write_complete(ID); - - return; } =20 enum hrt_isp_css_irq_status irq_get_channel_id( @@ -213,7 +207,6 @@ void irq_raise( (unsigned int)addr, 1); gp_device_reg_store(GP_DEVICE0_ID, (unsigned int)addr, 0); - return; } =20 bool any_virq_signal(void) @@ -252,7 +245,6 @@ void cnd_virq_enable_channel( irq_disable_channel(IRQ0_ID, IRQ_NESTING_ID[ID]); } } - return; } =20 void virq_clear_all(void) @@ -262,7 +254,6 @@ void virq_clear_all(void) for (irq_id =3D (irq_ID_t)0; irq_id < N_IRQ_ID; irq_id++) { irq_clear_all(irq_id); } - return; } =20 enum hrt_isp_css_irq_status @@ -304,7 +295,6 @@ void virq_clear_info(struct virq_info *irq_info) for (ID =3D (irq_ID_t)0 ; ID < N_IRQ_ID; ID++) { irq_info->irq_status_reg[ID] =3D 0; } - return; } =20 enum hrt_isp_css_irq_status virq_get_channel_id( diff --git a/drivers/staging/media/atomisp/pci/hive_isp_css_common/host/irq= _private.h b/drivers/staging/media/atomisp/pci/hive_isp_css_common/host/irq= _private.h index ae0a8466a70a..5e27f053f00c 100644 --- a/drivers/staging/media/atomisp/pci/hive_isp_css_common/host/irq_privat= e.h +++ b/drivers/staging/media/atomisp/pci/hive_isp_css_common/host/irq_privat= e.h @@ -21,7 +21,6 @@ STORAGE_CLASS_IRQ_C void irq_reg_store( assert(ID < N_IRQ_ID); assert(IRQ_BASE[ID] !=3D (hrt_address) - 1); ia_css_device_store_uint32(IRQ_BASE[ID] + reg * sizeof(hrt_data), value); - return; } =20 STORAGE_CLASS_IRQ_C hrt_data irq_reg_load( diff --git a/drivers/staging/media/atomisp/pci/hive_isp_css_common/host/isp= .c b/drivers/staging/media/atomisp/pci/hive_isp_css_common/host/isp.c index 39cccbfa3fca..17a04ac623ff 100644 --- a/drivers/staging/media/atomisp/pci/hive_isp_css_common/host/isp.c +++ b/drivers/staging/media/atomisp/pci/hive_isp_css_common/host/isp.c @@ -27,7 +27,6 @@ void cnd_isp_irq_enable( isp_ctrl_clearbit(ID, ISP_IRQ_READY_REG, ISP_IRQ_READY_BIT); } - return; } =20 /* ISP functions to control the ISP state from the host, even in crun. */ diff --git a/drivers/staging/media/atomisp/pci/hive_isp_css_common/host/isp= _private.h b/drivers/staging/media/atomisp/pci/hive_isp_css_common/host/isp= _private.h index 177770a9bc1d..b699a1c3af0b 100644 --- a/drivers/staging/media/atomisp/pci/hive_isp_css_common/host/isp_privat= e.h +++ b/drivers/staging/media/atomisp/pci/hive_isp_css_common/host/isp_privat= e.h @@ -30,7 +30,6 @@ STORAGE_CLASS_ISP_C void isp_ctrl_store( #else hrt_master_port_store_32(ISP_CTRL_BASE[ID] + reg * sizeof(hrt_data), valu= e); #endif - return; } =20 STORAGE_CLASS_ISP_C hrt_data isp_ctrl_load( @@ -64,7 +63,6 @@ STORAGE_CLASS_ISP_C void isp_ctrl_setbit( hrt_data data =3D isp_ctrl_load(ID, reg); =20 isp_ctrl_store(ID, reg, (data | (1UL << bit))); - return; } =20 STORAGE_CLASS_ISP_C void isp_ctrl_clearbit( @@ -75,7 +73,6 @@ STORAGE_CLASS_ISP_C void isp_ctrl_clearbit( hrt_data data =3D isp_ctrl_load(ID, reg); =20 isp_ctrl_store(ID, reg, (data & ~(1UL << bit))); - return; } =20 STORAGE_CLASS_ISP_C void isp_dmem_store( @@ -91,7 +88,6 @@ STORAGE_CLASS_ISP_C void isp_dmem_store( #else hrt_master_port_store(ISP_DMEM_BASE[ID] + addr, data, size); #endif - return; } =20 STORAGE_CLASS_ISP_C void isp_dmem_load( @@ -107,7 +103,6 @@ STORAGE_CLASS_ISP_C void isp_dmem_load( #else hrt_master_port_load(ISP_DMEM_BASE[ID] + addr, data, size); #endif - return; } =20 STORAGE_CLASS_ISP_C void isp_dmem_store_uint32( @@ -123,7 +118,6 @@ STORAGE_CLASS_ISP_C void isp_dmem_store_uint32( #else hrt_master_port_store_32(ISP_DMEM_BASE[ID] + addr, data); #endif - return; } =20 STORAGE_CLASS_ISP_C uint32_t isp_dmem_load_uint32( diff --git a/drivers/staging/media/atomisp/pci/hive_isp_css_common/host/mmu= .c b/drivers/staging/media/atomisp/pci/hive_isp_css_common/host/mmu.c index 064e88a5e064..6d5434a27a7c 100644 --- a/drivers/staging/media/atomisp/pci/hive_isp_css_common/host/mmu.c +++ b/drivers/staging/media/atomisp/pci/hive_isp_css_common/host/mmu.c @@ -12,7 +12,6 @@ void mmu_set_page_table_base_index( const hrt_data base_index) { mmu_reg_store(ID, _HRT_MMU_PAGE_TABLE_BASE_ADDRESS_REG_IDX, base_index); - return; } =20 hrt_data mmu_get_page_table_base_index( @@ -25,7 +24,6 @@ void mmu_invalidate_cache( const mmu_ID_t ID) { mmu_reg_store(ID, _HRT_MMU_INVALIDATE_TLB_REG_IDX, 1); - return; } =20 void mmu_invalidate_cache_all(void) diff --git a/drivers/staging/media/atomisp/pci/hive_isp_css_common/host/sp_= private.h b/drivers/staging/media/atomisp/pci/hive_isp_css_common/host/sp_p= rivate.h index c69778411f2f..b03ae6658df3 100644 --- a/drivers/staging/media/atomisp/pci/hive_isp_css_common/host/sp_private= .h +++ b/drivers/staging/media/atomisp/pci/hive_isp_css_common/host/sp_private= .h @@ -21,7 +21,6 @@ STORAGE_CLASS_SP_C void sp_ctrl_store( assert(ID < N_SP_ID); assert(SP_CTRL_BASE[ID] !=3D (hrt_address)-1); ia_css_device_store_uint32(SP_CTRL_BASE[ID] + reg * sizeof(hrt_data), val= ue); - return; } =20 STORAGE_CLASS_SP_C hrt_data sp_ctrl_load( @@ -51,7 +50,6 @@ STORAGE_CLASS_SP_C void sp_ctrl_setbit( hrt_data data =3D sp_ctrl_load(ID, reg); =20 sp_ctrl_store(ID, reg, (data | (1UL << bit))); - return; } =20 STORAGE_CLASS_SP_C void sp_ctrl_clearbit( @@ -62,7 +60,6 @@ STORAGE_CLASS_SP_C void sp_ctrl_clearbit( hrt_data data =3D sp_ctrl_load(ID, reg); =20 sp_ctrl_store(ID, reg, (data & ~(1UL << bit))); - return; } =20 STORAGE_CLASS_SP_C void sp_dmem_store( @@ -74,7 +71,6 @@ STORAGE_CLASS_SP_C void sp_dmem_store( assert(ID < N_SP_ID); assert(SP_DMEM_BASE[ID] !=3D (hrt_address)-1); ia_css_device_store(SP_DMEM_BASE[ID] + addr, data, size); - return; } =20 STORAGE_CLASS_SP_C void sp_dmem_load( @@ -86,7 +82,6 @@ STORAGE_CLASS_SP_C void sp_dmem_load( assert(ID < N_SP_ID); assert(SP_DMEM_BASE[ID] !=3D (hrt_address)-1); ia_css_device_load(SP_DMEM_BASE[ID] + addr, data, size); - return; } =20 STORAGE_CLASS_SP_C void sp_dmem_store_uint8( @@ -98,7 +93,6 @@ STORAGE_CLASS_SP_C void sp_dmem_store_uint8( assert(SP_DMEM_BASE[ID] !=3D (hrt_address)-1); (void)ID; ia_css_device_store_uint8(SP_DMEM_BASE[SP0_ID] + addr, data); - return; } =20 STORAGE_CLASS_SP_C void sp_dmem_store_uint16( @@ -110,7 +104,6 @@ STORAGE_CLASS_SP_C void sp_dmem_store_uint16( assert(SP_DMEM_BASE[ID] !=3D (hrt_address)-1); (void)ID; ia_css_device_store_uint16(SP_DMEM_BASE[SP0_ID] + addr, data); - return; } =20 STORAGE_CLASS_SP_C void sp_dmem_store_uint32( @@ -122,7 +115,6 @@ STORAGE_CLASS_SP_C void sp_dmem_store_uint32( assert(SP_DMEM_BASE[ID] !=3D (hrt_address)-1); (void)ID; ia_css_device_store_uint32(SP_DMEM_BASE[SP0_ID] + addr, data); - return; } =20 STORAGE_CLASS_SP_C uint8_t sp_dmem_load_uint8( diff --git a/drivers/staging/media/atomisp/pci/hive_isp_css_include/host/mm= u_public.h b/drivers/staging/media/atomisp/pci/hive_isp_css_include/host/mm= u_public.h index 1a435a348318..2fc137ef46da 100644 --- a/drivers/staging/media/atomisp/pci/hive_isp_css_include/host/mmu_publi= c.h +++ b/drivers/staging/media/atomisp/pci/hive_isp_css_include/host/mmu_publi= c.h @@ -63,7 +63,6 @@ static inline void mmu_reg_store( assert(ID < N_MMU_ID); assert(MMU_BASE[ID] !=3D (hrt_address) - 1); ia_css_device_store_uint32(MMU_BASE[ID] + reg * sizeof(hrt_data), value); - return; } =20 /*! Read from a control register of MMU[ID] diff --git a/drivers/staging/media/atomisp/pci/hmm/hmm_bo.c b/drivers/stagi= ng/media/atomisp/pci/hmm/hmm_bo.c index 856561e951a5..0fe5ff64ba00 100644 --- a/drivers/staging/media/atomisp/pci/hmm/hmm_bo.c +++ b/drivers/staging/media/atomisp/pci/hmm/hmm_bo.c @@ -339,7 +339,6 @@ int hmm_bo_device_init(struct hmm_bo_device *bdev, spin_lock_init(&bdev->list_lock); mutex_init(&bdev->rbtree_mutex); =20 - INIT_LIST_HEAD(&bdev->entire_bo_list); bdev->allocated_rbtree =3D RB_ROOT; bdev->free_rbtree =3D RB_ROOT; @@ -483,7 +482,6 @@ void hmm_bo_release(struct hmm_buffer_object *bo) __bo_insert_to_free_rbtree(&bdev->free_rbtree, bo); =20 mutex_unlock(&bdev->rbtree_mutex); - return; } =20 void hmm_bo_device_exit(struct hmm_bo_device *bdev) @@ -736,7 +734,6 @@ void hmm_bo_free_pages(struct hmm_buffer_object *bo) =20 kfree(bo->pages); mutex_unlock(&bo->mutex); - return; =20 status_err2: @@ -869,7 +866,6 @@ void hmm_bo_unbind(struct hmm_buffer_object *bo) mutex_unlock(&bo->mutex); =20 return; - status_err: mutex_unlock(&bo->mutex); dev_err(atomisp_dev, @@ -948,7 +944,6 @@ void hmm_bo_vunmap(struct hmm_buffer_object *bo) } =20 mutex_unlock(&bo->mutex); - return; } =20 void hmm_bo_ref(struct hmm_buffer_object *bo) diff --git a/drivers/staging/media/atomisp/pci/isp2400_input_system_private= .h b/drivers/staging/media/atomisp/pci/isp2400_input_system_private.h index a6762683a0ac..00e6574f186a 100644 --- a/drivers/staging/media/atomisp/pci/isp2400_input_system_private.h +++ b/drivers/staging/media/atomisp/pci/isp2400_input_system_private.h @@ -22,7 +22,6 @@ STORAGE_CLASS_INPUT_SYSTEM_C void input_system_reg_store( assert(INPUT_SYSTEM_BASE[ID] !=3D (hrt_address)-1); ia_css_device_store_uint32(INPUT_SYSTEM_BASE[ID] + reg * sizeof(hrt_data), value); - return; } =20 STORAGE_CLASS_INPUT_SYSTEM_C hrt_data input_system_reg_load( @@ -43,7 +42,6 @@ STORAGE_CLASS_INPUT_SYSTEM_C void receiver_reg_store( assert(ID < N_RX_ID); assert(RX_BASE[ID] !=3D (hrt_address)-1); ia_css_device_store_uint32(RX_BASE[ID] + reg * sizeof(hrt_data), value); - return; } =20 STORAGE_CLASS_INPUT_SYSTEM_C hrt_data receiver_reg_load( @@ -67,7 +65,6 @@ STORAGE_CLASS_INPUT_SYSTEM_C void receiver_port_reg_store( assert(MIPI_PORT_OFFSET[port_ID] !=3D (hrt_address)-1); ia_css_device_store_uint32(RX_BASE[ID] + MIPI_PORT_OFFSET[port_ID] + reg * sizeof(hrt_data), value); - return; } =20 STORAGE_CLASS_INPUT_SYSTEM_C hrt_data receiver_port_reg_load( @@ -95,7 +92,6 @@ STORAGE_CLASS_INPUT_SYSTEM_C void input_system_sub_system= _reg_store( assert(SUB_SYSTEM_OFFSET[sub_ID] !=3D (hrt_address)-1); ia_css_device_store_uint32(INPUT_SYSTEM_BASE[ID] + SUB_SYSTEM_OFFSET[sub_= ID] + reg * sizeof(hrt_data), value); - return; } =20 STORAGE_CLASS_INPUT_SYSTEM_C hrt_data input_system_sub_system_reg_load( diff --git a/drivers/staging/media/atomisp/pci/runtime/binary/src/binary.c = b/drivers/staging/media/atomisp/pci/runtime/binary/src/binary.c index af93ca96747c..756602cb43c2 100644 --- a/drivers/staging/media/atomisp/pci/runtime/binary/src/binary.c +++ b/drivers/staging/media/atomisp/pci/runtime/binary/src/binary.c @@ -265,7 +265,6 @@ binary_get_shading_info_type_1(const struct ia_css_bina= ry *binary, /* [in] */ return err; } =20 - int ia_css_binary_get_shading_info(const struct ia_css_binary *binary, /* [i= n] */ enum ia_css_shading_correction_type type, /* [in] */ @@ -344,7 +343,6 @@ ia_css_binary_dvs_stat_grid_info( { (void)pipe; sh_css_binary_common_grid_info(binary, info); - return; } =20 int diff --git a/drivers/staging/media/atomisp/pci/runtime/bufq/src/bufq.c b/dr= ivers/staging/media/atomisp/pci/runtime/bufq/src/bufq.c index 0f0d16f4ce7c..51f7c9d6f378 100644 --- a/drivers/staging/media/atomisp/pci/runtime/bufq/src/bufq.c +++ b/drivers/staging/media/atomisp/pci/runtime/bufq/src/bufq.c @@ -176,7 +176,6 @@ static void map_buffer_type_to_queue_id( } =20 assert(i !=3D SH_CSS_MAX_NUM_QUEUES); - return; } =20 static void unmap_buffer_type_to_queue_id( diff --git a/drivers/staging/media/atomisp/pci/runtime/debug/src/ia_css_deb= ug.c b/drivers/staging/media/atomisp/pci/runtime/debug/src/ia_css_debug.c index b411ca2f415e..789d074a4542 100644 --- a/drivers/staging/media/atomisp/pci/runtime/debug/src/ia_css_debug.c +++ b/drivers/staging/media/atomisp/pci/runtime/debug/src/ia_css_debug.c @@ -136,7 +136,6 @@ void ia_css_debug_dtrace(unsigned int level, const char= *fmt, ...) void ia_css_debug_set_dtrace_level(const unsigned int trace_level) { dbg_level =3D trace_level; - return; } =20 unsigned int ia_css_debug_get_dtrace_level(void) @@ -315,7 +314,6 @@ static void debug_print_fifo_channel_state(const fifo_c= hannel_state_t *state, state->fifo_valid); ia_css_debug_dtrace(2, "\t%-32s: %d\n", "sink accept", state->sink_accept); - return; } =20 void ia_css_debug_dump_pif_a_isp_fifo_state(void) @@ -364,7 +362,6 @@ void ia_css_debug_dump_all_fifo_state(void) for (i =3D 0; i < N_FIFO_CHANNEL; i++) debug_print_fifo_channel_state(&state.fifo_channels[i], "squepfstqkt"); - return; } =20 static void debug_binary_info_print(const struct ia_css_binary_xinfo *info) @@ -386,7 +383,6 @@ static void debug_binary_info_print(const struct ia_css= _binary_xinfo *info) ia_css_debug_dtrace(2, "enable_uds =3D %d\n", info->sp.enable.uds); ia_css_debug_dtrace(2, "enable ds =3D %d\n", info->sp.enable.ds); ia_css_debug_dtrace(2, "s3atbl_use_dmem =3D %d\n", info->sp.s3a.s3atbl_us= e_dmem); - return; } =20 void ia_css_debug_binary_print(const struct ia_css_binary *bi) @@ -441,7 +437,6 @@ void ia_css_debug_binary_print(const struct ia_css_bina= ry *bi) bi->sctbl_width_per_color); ia_css_debug_dtrace(2, "s3atbl_width =3D %d\n", bi->s3atbl_width); ia_css_debug_dtrace(2, "s3atbl_height =3D %d\n", bi->s3atbl_height); - return; } =20 void ia_css_debug_frame_print(const struct ia_css_frame *frame, @@ -526,7 +521,6 @@ void ia_css_debug_frame_print(const struct ia_css_frame= *frame, ia_css_debug_dtrace(2, " unknown frame type\n"); break; } - return; } =20 #if SP_DEBUG !=3D SP_DEBUG_NONE @@ -808,8 +802,6 @@ void ia_css_debug_print_sp_debug_state(const struct sh_= css_sp_debug_state #endif =20 #if SP_DEBUG !=3D SP_DEBUG_NONE - - return; } #endif =20 @@ -823,7 +815,6 @@ void ia_css_debug_dump_sp_sw_debug_info(void) #endif ia_css_bufq_dump_queue_info(); ia_css_pipeline_dump_thread_map_info(); - return; } =20 /* this function is for debug use, it can make SP go to sleep @@ -1273,7 +1264,6 @@ ia_css_debug_pipe_graph_dump_stage( =20 snprintf(enable_info, sizeof(enable_info), "%s\\n%s", enable_info1, enable_info2); - } else { /* 2nd line is still too long */ p =3D ENABLE_LINE_MAX_LENGTH; diff --git a/drivers/staging/media/atomisp/pci/runtime/frame/src/frame.c b/= drivers/staging/media/atomisp/pci/runtime/frame/src/frame.c index 8614efc28b19..ae952df03cc6 100644 --- a/drivers/staging/media/atomisp/pci/runtime/frame/src/frame.c +++ b/drivers/staging/media/atomisp/pci/runtime/frame/src/frame.c @@ -525,7 +525,6 @@ static void frame_init_nv_planes(struct ia_css_frame *f= rame, frame_init_plane(&frame->planes.nv.y, y_width, y_stride, y_height, 0); frame_init_plane(&frame->planes.nv.uv, uv_width, uv_stride, uv_height, y_bytes); - return; } =20 static void frame_init_yuv_planes(struct ia_css_frame *frame, @@ -558,7 +557,6 @@ static void frame_init_yuv_planes(struct ia_css_frame *= frame, frame_init_plane(&frame->planes.yuv.v, uv_width, uv_stride, uv_height, y_bytes + uv_bytes); } - return; } =20 static void frame_init_rgb_planes(struct ia_css_frame *frame, @@ -575,7 +573,6 @@ static void frame_init_rgb_planes(struct ia_css_frame *= frame, width, stride, height, 1 * bytes); frame_init_plane(&frame->planes.planar_rgb.b, width, stride, height, 2 * bytes); - return; } =20 static void frame_init_qplane6_planes(struct ia_css_frame *frame) @@ -599,7 +596,6 @@ static void frame_init_qplane6_planes(struct ia_css_fra= me *frame) width, stride, height, 4 * bytes); frame_init_plane(&frame->planes.plane6.b_at_r, width, stride, height, 5 * bytes); - return; } =20 static int frame_allocate_buffer_data(struct ia_css_frame *frame) diff --git a/drivers/staging/media/atomisp/pci/runtime/ifmtr/src/ifmtr.c b/= drivers/staging/media/atomisp/pci/runtime/ifmtr/src/ifmtr.c index 50b0b31d734a..9739ab25000c 100644 --- a/drivers/staging/media/atomisp/pci/runtime/ifmtr/src/ifmtr.c +++ b/drivers/staging/media/atomisp/pci/runtime/ifmtr/src/ifmtr.c @@ -471,8 +471,6 @@ static void ifmtr_set_if_blocking_mode( input_formatter_set_fifo_blocking_mode(id, block[id]); } } - - return; } =20 static int ifmtr_start_column( diff --git a/drivers/staging/media/atomisp/pci/runtime/inputfifo/src/inputf= ifo.c b/drivers/staging/media/atomisp/pci/runtime/inputfifo/src/inputfifo.c index 8e1efeb6372c..f0dcd839e33b 100644 --- a/drivers/staging/media/atomisp/pci/runtime/inputfifo/src/inputfifo.c +++ b/drivers/staging/media/atomisp/pci/runtime/inputfifo/src/inputfifo.c @@ -88,7 +88,6 @@ _sh_css_fifo_snd(unsigned int token) while (!can_event_send_token(STR2MIPI_EVENT_ID)) udelay(1); event_send_token(STR2MIPI_EVENT_ID, token); - return; } =20 static void inputfifo_send_data_a( @@ -98,7 +97,6 @@ static void inputfifo_send_data_a( unsigned int token =3D (1 << HIVE_STR_TO_MIPI_VALID_A_BIT) | (data << HIVE_STR_TO_MIPI_DATA_A_LSB); _sh_css_fifo_snd(token); - return; } =20 static void inputfifo_send_data_b( @@ -108,7 +106,6 @@ static void inputfifo_send_data_b( unsigned int token =3D (1 << HIVE_STR_TO_MIPI_VALID_B_BIT) | (data << _HIVE_STR_TO_MIPI_DATA_B_LSB); _sh_css_fifo_snd(token); - return; } =20 static void inputfifo_send_data( @@ -121,7 +118,6 @@ static void inputfifo_send_data( (a << HIVE_STR_TO_MIPI_DATA_A_LSB) | (b << _HIVE_STR_TO_MIPI_DATA_B_LSB)); _sh_css_fifo_snd(token); - return; } =20 static void inputfifo_send_sol(void) @@ -131,7 +127,6 @@ static void inputfifo_send_sol(void) 1 << HIVE_STR_TO_MIPI_SOL_BIT); =20 _sh_css_fifo_snd(token); - return; } =20 static void inputfifo_send_eol(void) @@ -140,7 +135,6 @@ static void inputfifo_send_eol(void) hrt_data token =3D inputfifo_wrap_marker( 1 << HIVE_STR_TO_MIPI_EOL_BIT); _sh_css_fifo_snd(token); - return; } =20 static void inputfifo_send_sof(void) @@ -150,7 +144,6 @@ static void inputfifo_send_sof(void) 1 << HIVE_STR_TO_MIPI_SOF_BIT); =20 _sh_css_fifo_snd(token); - return; } =20 static void inputfifo_send_eof(void) @@ -159,7 +152,6 @@ static void inputfifo_send_eof(void) hrt_data token =3D inputfifo_wrap_marker( 1 << HIVE_STR_TO_MIPI_EOF_BIT); _sh_css_fifo_snd(token); - return; } =20 static void inputfifo_send_ch_id_and_fmt_type( @@ -177,7 +169,6 @@ static void inputfifo_send_ch_id_and_fmt_type( */ token =3D inputfifo_wrap_marker(0); _sh_css_fifo_snd(token); - return; } =20 static void inputfifo_send_empty_token(void) @@ -186,7 +177,6 @@ static void inputfifo_send_empty_token(void) hrt_data token =3D inputfifo_wrap_marker(0); =20 _sh_css_fifo_snd(token); - return; } =20 static void inputfifo_start_frame( @@ -196,7 +186,6 @@ static void inputfifo_start_frame( { inputfifo_send_ch_id_and_fmt_type(ch_id, fmt_type); inputfifo_send_sof(); - return; } =20 static void inputfifo_end_frame( @@ -207,7 +196,6 @@ static void inputfifo_end_frame( for (i =3D 0; i < marker_cycles; i++) inputfifo_send_empty_token(); inputfifo_send_eof(); - return; } =20 static void inputfifo_send_line2( @@ -297,7 +285,6 @@ static void inputfifo_send_line2( for (i =3D 0; i < hblank_cycles; i++) inputfifo_send_empty_token(); inputfifo_send_eol(); - return; } =20 static void @@ -377,7 +364,6 @@ static void inputfifo_send_frame( } } inputfifo_end_frame(marker_cycles); - return; } =20 static enum inputfifo_mipi_data_type inputfifo_determine_type( @@ -453,7 +439,6 @@ void ia_css_inputfifo_start_frame( s2mi->streaming =3D true; =20 inputfifo_start_frame(ch_id, s2mi->fmt_type); - return; } =20 void ia_css_inputfifo_send_line( @@ -516,5 +501,4 @@ void ia_css_inputfifo_end_frame( inputfifo_end_frame(s2mi->marker_cycles); =20 s2mi->streaming =3D false; - return; } diff --git a/drivers/staging/media/atomisp/pci/runtime/isys/src/rx.c b/driv= ers/staging/media/atomisp/pci/runtime/isys/src/rx.c index 9cfb8bc97e24..acc7e5f76f58 100644 --- a/drivers/staging/media/atomisp/pci/runtime/isys/src/rx.c +++ b/drivers/staging/media/atomisp/pci/runtime/isys/src/rx.c @@ -43,8 +43,6 @@ void ia_css_isys_rx_enable_all_interrupts(enum mipi_port_= id port) * The CSI is nested into the Iunit IRQ's */ ia_css_irq_enable(IA_CSS_IRQ_INFO_CSS_RECEIVER_ERROR, true); - - return; } =20 /* This function converts between the enum used on the CSS API and the @@ -196,8 +194,6 @@ void ia_css_isys_rx_clear_irq_info(enum mipi_port_id po= rt, receiver_port_reg_store(RX0_ID, port, _HRT_CSS_RECEIVER_IRQ_ENABLE_REG_IDX, bits); - - return; } =20 static int ia_css_isys_2400_set_fmt_type(enum atomisp_input_format input_f= ormat, @@ -530,7 +526,6 @@ unsigned int ia_css_csi2_calculate_input_system_alignme= nt( return memory_alignment_in_bytes; } =20 - static const mipi_lane_cfg_t MIPI_PORT_LANES[N_RX_MODE][N_MIPI_PORT_ID] = =3D { {MIPI_4LANE_CFG, MIPI_1LANE_CFG, MIPI_0LANE_CFG}, {MIPI_3LANE_CFG, MIPI_1LANE_CFG, MIPI_0LANE_CFG}, @@ -637,8 +632,6 @@ void ia_css_isys_rx_configure(const rx_cfg_t *config, * INPUT_SYSTEM_CSI_RECEIVER_SELECT_BACKENG, 1); */ input_system_reg_store(INPUT_SYSTEM0_ID, 0x207, 1); - - return; } =20 void ia_css_isys_rx_disable(void) @@ -650,5 +643,4 @@ void ia_css_isys_rx_disable(void) _HRT_CSS_RECEIVER_DEVICE_READY_REG_IDX, false); } - return; } diff --git a/drivers/staging/media/atomisp/pci/sh_css.c b/drivers/staging/m= edia/atomisp/pci/sh_css.c index 6cda5925fa45..50b55ec979ea 100644 --- a/drivers/staging/media/atomisp/pci/sh_css.c +++ b/drivers/staging/media/atomisp/pci/sh_css.c @@ -65,7 +65,6 @@ =20 #define SH_CSS_VIDEO_BUFFER_ALIGNMENT 0 =20 - #include "ia_css_spctrl.h" #include "ia_css_version_data.h" #include "sh_css_struct.h" @@ -1095,7 +1094,6 @@ static inline int stream_unregister_with_csi_rx( return stream_csi_rx_helper(stream, ia_css_isys_csi_rx_unregister_stream); } =20 - static void start_binary(struct ia_css_pipe *pipe, struct ia_css_binary *binary) @@ -2042,7 +2040,6 @@ int ia_css_irq_translate( if (status =3D=3D hrt_isp_css_irq_status_error) return -EINVAL; =20 - switch (irq) { case virq_sp: /* @@ -2148,7 +2145,6 @@ int ia_css_irq_enable( return 0; } =20 - static unsigned int sh_css_get_sw_interrupt_value(unsigned int irq) { @@ -2928,8 +2924,6 @@ ia_css_get_crop_offsets( in_frame->crop_info.start_line =3D row; =20 IA_CSS_LEAVE_PRIVATE("void start_col: %u start_row: %u", column, row); - - return; } =20 static int @@ -3326,8 +3320,6 @@ static void send_raw_frames(struct ia_css_pipe *pipe) pipe->continuous_frames[i], pipe->cont_md_buffers[i]); } } - - return; } =20 static int @@ -3521,7 +3513,6 @@ ia_css_pipe_enqueue_buffer(struct ia_css_pipe *pipe, ia_css_debug_dtrace(IA_CSS_DEBUG_TRACE, "ia_css_pipe_enqueue_buffer() buf_type=3D%d, data(DDR address)=3D0= x%x\n", buf_type, buffer->data.frame->data); - } =20 /* start of test for using rmgr for acq/rel memory */ @@ -5140,7 +5131,6 @@ static int load_primary_binaries( } } ia_css_pipe_destroy_cas_scaler_desc(&cas_scaler_descr); - } else { capt_pp_out_info =3D pipe->output_info[0]; } @@ -8930,7 +8920,6 @@ void ia_css_pipe_map_queue(struct ia_css_pipe *pipe, = bool map) IA_CSS_LEAVE(""); } =20 - int ia_css_unlock_raw_frame(struct ia_css_stream *stream, uint32_t exp_id) { diff --git a/drivers/staging/media/atomisp/pci/sh_css_param_dvs.c b/drivers= /staging/media/atomisp/pci/sh_css_param_dvs.c index 9ccdb66de2df..3d2cb2d25fdb 100644 --- a/drivers/staging/media/atomisp/pci/sh_css_param_dvs.c +++ b/drivers/staging/media/atomisp/pci/sh_css_param_dvs.c @@ -269,5 +269,4 @@ ia_css_dvs_statistics_get(enum dvs_statistics_type type, ia_css_get_dvs2_statistics(host_stats->p_dvs2_statistics_host, isp_stats->p_dvs_statistics_isp); } - return; } --- base-commit: c24bad1b9ac3ee3a63dcdeaa082cf671a4be1345 change-id: 20260305-atomisp-remove-void-return-v2b-4ce912de212c Best regards, --=20 Tomasz Unger