From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-ed1-f47.google.com (mail-ed1-f47.google.com [209.85.208.47]) (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 5FECD17D3 for ; Thu, 14 Apr 2022 10:43:52 +0000 (UTC) Received: by mail-ed1-f47.google.com with SMTP id 11so784089edw.0 for ; Thu, 14 Apr 2022 03:43:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=HMcu7zgQS9k0Bz6hvTLZm8qcxNG9rHsrt5l+a1uteew=; b=owKXAll23qDyqfo0QPXWSi6YM2YVa3BJCIc6zCarnqr1bxlbxBIHIcuTsDXNO7AXTY JMzA8cAcsb92yA9yn5mnNvwoAucOL94HWDzJBgfuJ6lyU9oSekQkwNSq1Dewe60BkKtD 1UJUSqy9rbGNvD1WaUU1Sjfqgt5Qthp4UAfLp9yWgk0GmAjedZ8kTC5vkYSWihKiUjsv P2iEA0tT9odaJQqe/6kMyY77vdJGPSc+fkYqkN0g7KkCrH22rgqU6Cffs3dEtAwrSHj/ H0z4Oclyz9sDlEz58wu/9+io5GvaqbCjNIM2si6pTMb//L6tuLUKdI/57PhUbP8IL1hE wcCw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=HMcu7zgQS9k0Bz6hvTLZm8qcxNG9rHsrt5l+a1uteew=; b=CtM0a2FGTkWGWhzF8S4c97NzIN2+gkV6UK1olsxWCTx2BGMFkx60DScZ1uWEMjcRxR gpZhQkbYT+c+o+p7cDO1yscRSSHUWlD5yaigdUYAzocV7LNFlYKnsqRJaaap7LdC5JSN tdwtU5hKrWgWETlIUZD2ewkuq7r3IZya9nYqOatZXwDrDX5UfSzEpxEj7vTON6MTXl5a WSdKwPdyikwdyFg1Vzbxe+/dproODlt4pR1jkmylWeBQXPRMFO6ZCiTq20hXX7xl+G+3 zhOhYjHDEI8vcUSjUTHIzMjWp3RYhy8RroL2zxHeAIEgIPhVDdW/Kl2jiYWayCMIiIi9 u6fw== X-Gm-Message-State: AOAM532MBS/zPKvDKtrIvtWlV0Oqo7X68gdaMmm5PiOW4PwAENZQKQ+9 OdmmY8+I5IAjhS1izur/XRkz4hIJmjc= X-Google-Smtp-Source: ABdhPJwH3JmT4QONevs0qREw8ct63mE8YvnUqehS0MI05unk99lQFWNO6+xk90GjMwWJvw0mGY30+w== X-Received: by 2002:aa7:dc49:0:b0:41d:72e2:d34e with SMTP id g9-20020aa7dc49000000b0041d72e2d34emr2211955edu.385.1649933030803; Thu, 14 Apr 2022 03:43:50 -0700 (PDT) Received: from localhost.localdomain (ip5f5abb6b.dynamic.kabel-deutschland.de. [95.90.187.107]) by smtp.gmail.com with ESMTPSA id h9-20020aa7c949000000b0041b4d8ae50csm821318edt.34.2022.04.14.03.43.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 14 Apr 2022 03:43:50 -0700 (PDT) From: Michael Straube To: gregkh@linuxfoundation.org Cc: Larry.Finger@lwfinger.net, phil@philpotter.co.uk, linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org, Michael Straube Subject: [PATCH v2 5/8] staging: r8188eu: remove variables from rtl8188e_firmware_download() Date: Thu, 14 Apr 2022 12:43:20 +0200 Message-Id: <20220414104323.6152-6-straube.linux@gmail.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220414104323.6152-1-straube.linux@gmail.com> References: <20220414104323.6152-1-straube.linux@gmail.com> Precedence: bulk X-Mailing-List: linux-staging@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit The local variables fw_version, fw_subversion, fw_signature in rtl8188e_firmware_download() are only used in one place. Use the assigned values directly and remove the variables to make the code shorter and cleaner. Signed-off-by: Michael Straube --- drivers/staging/r8188eu/core/rtw_fw.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/drivers/staging/r8188eu/core/rtw_fw.c b/drivers/staging/r8188eu/core/rtw_fw.c index 94526064f29b..cbc4980bd938 100644 --- a/drivers/staging/r8188eu/core/rtw_fw.c +++ b/drivers/staging/r8188eu/core/rtw_fw.c @@ -237,7 +237,6 @@ int rtl8188e_firmware_download(struct adapter *padapter) struct dvobj_priv *dvobj = adapter_to_dvobj(padapter); struct device *device = dvobj_to_dev(dvobj); struct rt_firmware_hdr *fwhdr = NULL; - u16 fw_version, fw_subversion, fw_signature; u8 *fw_data; u32 fw_size; static int log_version; @@ -254,13 +253,10 @@ int rtl8188e_firmware_download(struct adapter *padapter) /* To Check Fw header. Added by tynli. 2009.12.04. */ fwhdr = (struct rt_firmware_hdr *)dvobj->firmware.data; - fw_version = le16_to_cpu(fwhdr->version); - fw_subversion = fwhdr->subversion; - fw_signature = le16_to_cpu(fwhdr->signature); - if (!log_version++) pr_info("%sFirmware Version %d, SubVersion %d, Signature 0x%x\n", - DRIVER_PREFIX, fw_version, fw_subversion, fw_signature); + DRIVER_PREFIX, le16_to_cpu(fwhdr->version), fwhdr->subversion, + le16_to_cpu(fwhdr->signature)); if (IS_FW_HEADER_EXIST(fwhdr)) { fw_data = fw_data + sizeof(struct rt_firmware_hdr); -- 2.35.1