From nobody Tue Jun 23 02:05:38 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 8E31DC433FE for ; Sat, 12 Mar 2022 15:48:58 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232102AbiCLPuC (ORCPT ); Sat, 12 Mar 2022 10:50:02 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47196 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229483AbiCLPt7 (ORCPT ); Sat, 12 Mar 2022 10:49:59 -0500 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id 758ADD5547 for ; Sat, 12 Mar 2022 07:48:54 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1647100133; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=kISRCGimiFN+j8PVmDcD9+AwgFqbdKXIjp3SAo8kWyw=; b=hqEllWudHRMq/5Im9T/9iUlhG1ooMWpS8QBEpePbPAmKzwVsaF6Rj8rg60cdD3YvI7L/qe pTbqMVCw6U0c7tyiaSlof2GHNAOxjbe6Gf0ZJ7HdsJgrYwXgUcOP324epFzKG4UX++yVnT vhOUQp56anxvCHTW8yNYFvzYNgu5rdA= Received: from mail-qt1-f197.google.com (mail-qt1-f197.google.com [209.85.160.197]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-83-_kYIIkYLMu6HhuGtE71XZw-1; Sat, 12 Mar 2022 10:48:52 -0500 X-MC-Unique: _kYIIkYLMu6HhuGtE71XZw-1 Received: by mail-qt1-f197.google.com with SMTP id x10-20020ac8700a000000b002c3ef8fc44cso8811411qtm.8 for ; Sat, 12 Mar 2022 07:48:52 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=kISRCGimiFN+j8PVmDcD9+AwgFqbdKXIjp3SAo8kWyw=; b=tEFJh0W42AChwAHg7ziibwgtI4ESSGhNq+ETA86luTJr9EpfLdPX39/K3d/pQpfsYW ayIMLKAik5ON4xeB5qyG54PA+nY9udzq0ngsrI/vMP0QZE9R1K+y4cmKUNKrm/CvpQXu ZkMCkfn/fz/l2PVNIKl+4A1PSLg6XLNSdc/nsm5v1Lks7RzgxzTFJaSdmvOpkXgzITEs SAmmn6jGAZdfE1/MyAD9DML/kdlqRSl3ap3dEUSAFD4h26wt9vnUnziFoWeH9vbcuM8N YwQf+lHLbjzmvV/kssoRpABMo78krk84fONz8ozbHZ/9qFex0YyekzFA6l9jTGRQVK42 jtzg== X-Gm-Message-State: AOAM530Gh85zXQmPHtAojbF/hohaKHr8xF1DAhbxW/LUr8w83Vrr44dx yLSylYAyG6aMi8hOwwBSIdOYUqAPctC5tsjGqO97IjPmKzEPhlWvlLplG/hYaITBkHX8E4YUe4q O55qBDpScEJGRpSRqAK6+YjgF X-Received: by 2002:ac8:7fcd:0:b0:2e1:cd49:4153 with SMTP id b13-20020ac87fcd000000b002e1cd494153mr655303qtk.38.1647100131913; Sat, 12 Mar 2022 07:48:51 -0800 (PST) X-Google-Smtp-Source: ABdhPJwrlwtkGuieGph5i7dQs0daAao7w3lGwSdZ8aE9uKzklCWyujh6pAd13Ps8ESaGlleBhM36og== X-Received: by 2002:ac8:7fcd:0:b0:2e1:cd49:4153 with SMTP id b13-20020ac87fcd000000b002e1cd494153mr655285qtk.38.1647100131675; Sat, 12 Mar 2022 07:48:51 -0800 (PST) Received: from localhost.localdomain.com (024-205-208-113.res.spectrum.com. [24.205.208.113]) by smtp.gmail.com with ESMTPSA id t19-20020ac85893000000b002e1afa26591sm6015249qta.52.2022.03.12.07.48.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 12 Mar 2022 07:48:51 -0800 (PST) From: trix@redhat.com To: ek5.chimenti@gmail.com, hverkuil-cisco@xs4all.nl, mchehab@kernel.org Cc: linux-media@vger.kernel.org, linux-kernel@vger.kernel.org, Tom Rix Subject: [PATCH] media: cec: seco: remove byte handling from smb_word_op Date: Sat, 12 Mar 2022 07:48:45 -0800 Message-Id: <20220312154845.1402960-1-trix@redhat.com> X-Mailer: git-send-email 2.26.3 MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" From: Tom Rix smb_word_op() has a parameter data_format that determines if the data is either a byte or word. From inspection, smb_word_op() is only used by the macros smb_wr16() and smb_rd16() both pass in CMD_WORD_DATA. There is no use of smb_word_op() that passes in CMD_BYTE_DATA. So remove the byte handling. Signed-off-by: Tom Rix --- drivers/media/cec/platform/seco/seco-cec.c | 22 +++++----------------- 1 file changed, 5 insertions(+), 17 deletions(-) diff --git a/drivers/media/cec/platform/seco/seco-cec.c b/drivers/media/cec= /platform/seco/seco-cec.c index 51a6fcfd077df..580905e3d0667 100644 --- a/drivers/media/cec/platform/seco/seco-cec.c +++ b/drivers/media/cec/platform/seco/seco-cec.c @@ -31,29 +31,17 @@ struct secocec_data { int irq; }; =20 -#define smb_wr16(cmd, data) smb_word_op(CMD_WORD_DATA, SECOCEC_MICRO_ADDRE= SS, \ - cmd, data, SMBUS_WRITE, NULL) -#define smb_rd16(cmd, res) smb_word_op(CMD_WORD_DATA, SECOCEC_MICRO_ADDRES= S, \ +#define smb_wr16(cmd, data) smb_word_op(SECOCEC_MICRO_ADDRESS, \ + cmd, data, SMBUS_WRITE, NULL) +#define smb_rd16(cmd, res) smb_word_op(SECOCEC_MICRO_ADDRESS, \ cmd, 0, SMBUS_READ, res) =20 -static int smb_word_op(short data_format, u16 slave_addr, u8 cmd, u16 data, +static int smb_word_op(u16 slave_addr, u8 cmd, u16 data, u8 operation, u16 *result) { unsigned int count; - short _data_format; int status =3D 0; =20 - switch (data_format) { - case CMD_BYTE_DATA: - _data_format =3D BRA_SMB_CMD_BYTE_DATA; - break; - case CMD_WORD_DATA: - _data_format =3D BRA_SMB_CMD_WORD_DATA; - break; - default: - return -EINVAL; - } - /* Active wait until ready */ for (count =3D 0; count <=3D SMBTIMEOUT; ++count) { if (!(inb(HSTS) & BRA_INUSE_STS)) @@ -75,7 +63,7 @@ static int smb_word_op(short data_format, u16 slave_addr,= u8 cmd, u16 data, outb((u8)(data >> 8), HDAT1); } =20 - outb(BRA_START + _data_format, HCNT); + outb(BRA_START + BRA_SMB_CMD_WORD_DATA, HCNT); =20 for (count =3D 0; count <=3D SMBTIMEOUT; count++) { if (!(inb(HSTS) & BRA_HOST_BUSY)) --=20 2.26.3