From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-wm1-f42.google.com (mail-wm1-f42.google.com [209.85.128.42]) (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 A9A5623EA99 for ; Thu, 16 Oct 2025 16:15:07 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.42 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1760631309; cv=none; b=RLWYeVHpgrA8dRvAKbGfSGjQQhnSRyOlwUuzzBISr+g+U+qHHGZGkcfRyTE+EQID+PzDVw2/IN+WRvKFZqHXThiY0droA0abc/t4JuxR5MJ4YWGsWBpj02Kizt2TYaCjox+Ly70lSoKFYTPgYAbJu6updd7qaRZZfyIxfIkcf0I= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1760631309; c=relaxed/simple; bh=LHZjH2UMXa92SxXhNcHHvMGpkdxmO+gWMcsE10ROlWg=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=X5SFScDI+IGIm3OiZOAjQlX/YqYJIxUmrMovnXFkgcdgrld7bRpHriF1G+/s9k4DBx6D/LiyLpwvpMSSVLNPsyXsyxOOvi9eUT9MwzBYP70xqp+3EbWWLRNhFJZ3HTCgnTpyij08PPMDGGAXZn/WXtnZSstg8et7qS2Iupt/OBA= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=EICEMrVV; arc=none smtp.client-ip=209.85.128.42 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="EICEMrVV" Received: by mail-wm1-f42.google.com with SMTP id 5b1f17b1804b1-47100eae3e5so9335455e9.1 for ; Thu, 16 Oct 2025 09:15:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1760631306; x=1761236106; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=XH2k5qkD7Z3u1A48Y16IYSnGNDzLTVrlHvL80g4n3eU=; b=EICEMrVVqwZijQMAW2fbczanNC5lCvGCBwU1YjZqYr196Hrc3ejTd1dKfJ9xhev1hd ElmtGDTyhrL+y5LZnW4ld0tLEjDXVDNknyI69fLXDkUYpGeafUUsU5j5YF0PF77Spd/W SqwQOYYNYGF9VqpPvmqakUuXbGfg1iWfEr65bxFwwi572RkADTEhvjRdTINq8RR1ah5m +itsH0X1eMSqA6xCjFHWEuRwke2CNr7BHZTd7/qd0/7RStJnnjg0keTJ2eZMfFLiU0V0 dDw3ib05GgRhmUXQS9Y4tkFpugBV7GmMDugzj7di3zQ8J3/YD0qltc762bkt7nmi8sKF RfFQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1760631306; x=1761236106; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=XH2k5qkD7Z3u1A48Y16IYSnGNDzLTVrlHvL80g4n3eU=; b=w2Kn89tgis98gio7aDd7uJ/+DSxFERJlzX3nbpS2d/QDXP3TMhMS23Cw6IQjAJFeTY z7djoXjpCESpiPdesZsiqAKFGSvL+hCyRW01NkmSm6d1rmHc79s9r2TFYrhRyjtzlSVP Pr071LTfidLSYe9ovG/VDEP87saL1ipphipCpzAwKJWbqzZXisGB2IWCcWOIN6diWrnZ pk2D5NTQZRPnDCK4tk1wj0i+FWrZrDbR7sHd4ZxV04KxGJMqdW6o0O+2qL8wWPlcZmnY rSHD/QYm4uFoVcS0A3yxMvLfvQmOD1oZTsKl5X02R6m9i2xpiQwkfU0yRVPHnEC3aLYc S4aA== X-Gm-Message-State: AOJu0Yx6rnWmpGuy1W5T9l3BxxoPsQ6CKx8mcNtVXT20rv0vWeNkPUG1 zjfiwjIRQGJPwjsHSbdlfhW3TGHfUo79b+vb3ji9Mmbuj938YCijxOJA X-Gm-Gg: ASbGncsQkUc0bKHvCXIoz2OISk/Ct27F5cIHicvxTHeybErqGXSDnoBnQg8M0R7//fi JGbrk+sV/VWFxHn9Bv7fE8Yj65KwzwqHw2+hEKu83o1mgzfPwGpA3+lklZbSZ4RY/KtvrYjBSJT 1ra5wOkmg42vWUti68mMDeh6VQHrPsMjAldhhlXmUUs+WO6lkvsrP15c9VvFQwtZpDBPQNvlo6J 6gX2z0q1PphgUVPgGEXMGOf5yun1RMz7gBYJDZtDrcxppptuyhit7nAwedN8JEqd1yzebGMnH1M lG8JE3eazGxAk4xnTeDgN28WjSYK/xT+I00z4/pStb5uu3QDoa6wXX94nhzBIOSxl2q1FpGl7yF wHSgOndPokh06GDXicheZexL/TfbAX2XOmwnYzGJax8OTIW2tzYAPgqEJmhJCYXp1fdymrcsK0h LgoHLPPA== X-Google-Smtp-Source: AGHT+IG3rVGmDp5olNfg9dU57+0wldzU8oxoJTE26xYya7QDoKqMwVqjPrv0UHx0OszQgqPF83LVow== X-Received: by 2002:a05:600c:19d4:b0:45d:5c71:769a with SMTP id 5b1f17b1804b1-47117903e2amr4046915e9.26.1760631305709; Thu, 16 Oct 2025 09:15:05 -0700 (PDT) Received: from hangmanPC.. ([86.124.201.90]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-471143663afsm35654025e9.0.2025.10.16.09.15.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 16 Oct 2025 09:15:05 -0700 (PDT) From: Cezar Chiru To: wsa+renesas@sang-engineering.com, andi.shyti@kernel.org Cc: linux-i2c@vger.kernel.org, linux-kernel@vger.kernel.org, Cezar Chiru Subject: [PATCH v6 2/3] i2c: pcf8584: Fix do not use assignment inside if conditional Date: Thu, 16 Oct 2025 19:14:16 +0300 Message-ID: <20251016161417.15545-3-chiru.cezar.89@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20251016161417.15545-1-chiru.cezar.89@gmail.com> References: <20250926154520.40583-1-chiru.cezar.89@gmail.com> <20251016161417.15545-1-chiru.cezar.89@gmail.com> Precedence: bulk X-Mailing-List: linux-i2c@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Assign inside of 'if' conditional is not allowed. Move assignment from inside 'if' conditional, to one line before each 'if'conditional statement that caused errors. Enforce errors fixing based on checkpatch.pl output on file. Signed-off-by: Cezar Chiru --- drivers/i2c/algos/i2c-algo-pcf.c | 28 +++++++++++++++------------- 1 file changed, 15 insertions(+), 13 deletions(-) diff --git a/drivers/i2c/algos/i2c-algo-pcf.c b/drivers/i2c/algos/i2c-algo-pcf.c index 7e2d8ff33d75..41a81d37e880 100644 --- a/drivers/i2c/algos/i2c-algo-pcf.c +++ b/drivers/i2c/algos/i2c-algo-pcf.c @@ -129,7 +129,7 @@ static int wait_for_pin(struct i2c_algo_pcf_data *adap, int *status) * * vdovikin: added detect code for PCF8584 */ -static int pcf_init_8584 (struct i2c_algo_pcf_data *adap) +static int pcf_init_8584(struct i2c_algo_pcf_data *adap) { unsigned char temp; @@ -139,38 +139,38 @@ static int pcf_init_8584 (struct i2c_algo_pcf_data *adap) * check to see S1 now used as R/W ctrl - * PCF8584 does that when ESO is zero */ - if (((temp = get_pcf(adap, 1)) & 0x7f) != (0)) { + temp = get_pcf(adap, 1); + if ((temp & 0x7f) != 0) return -ENXIO; /* definitely not PCF8584 */ - } /* load own address in S0, effective address is (own << 1) */ i2c_outb(adap, get_own(adap)); /* check it's really written */ - if ((temp = i2c_inb(adap)) != get_own(adap)) { + temp = i2c_inb(adap); + if (temp != get_own(adap)) return -ENXIO; - } /* S1=0xA0, next byte in S2 */ set_pcf(adap, 1, I2C_PCF_PIN | I2C_PCF_ES1); /* check to see S2 now selected */ - if (((temp = get_pcf(adap, 1)) & 0x7f) != I2C_PCF_ES1) { + temp = get_pcf(adap, 1); + if ((temp & 0x7f) != I2C_PCF_ES1) return -ENXIO; - } /* load clock register S2 */ i2c_outb(adap, get_clock(adap)); /* check it's really written, the only 5 lowest bits does matter */ - if (((temp = i2c_inb(adap)) & 0x1f) != get_clock(adap)) { + temp = i2c_inb(adap); + if ((temp & 0x1f) != get_clock(adap)) return -ENXIO; - } /* Enable serial interface, idle, S0 selected */ set_pcf(adap, 1, I2C_PCF_IDLE); /* check to see PCF is really idled and we can access status register */ - if ((temp = get_pcf(adap, 1)) != (I2C_PCF_PIN | I2C_PCF_BB)) { + temp = get_pcf(adap, 1); + if (temp != (I2C_PCF_PIN | I2C_PCF_BB)) return -ENXIO; - } printk(KERN_DEBUG "i2c-algo-pcf.o: detected and initialized PCF8584.\n"); @@ -218,7 +218,8 @@ static int pcf_readbytes(struct i2c_adapter *i2c_adap, char *buf, /* increment number of bytes to read by one -- read dummy byte */ for (i = 0; i <= count; i++) { - if ((wfp = wait_for_pin(adap, &status))) { + wfp = wait_for_pin(adap, &status); + if (wfp) { if (wfp == -EINTR) return -EINTR; /* arbitration lost */ @@ -351,7 +352,8 @@ int i2c_pcf_add_bus(struct i2c_adapter *adap) /* register new adapter to i2c module... */ adap->algo = &pcf_algo; - if ((rval = pcf_init_8584(pcf_adap))) + rval = pcf_init_8584(pcf_adap); + if (rval) return rval; rval = i2c_add_adapter(adap); -- 2.43.0