From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752192AbdKHLZL (ORCPT ); Wed, 8 Nov 2017 06:25:11 -0500 Received: from mail-yw0-f193.google.com ([209.85.161.193]:43509 "EHLO mail-yw0-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752066AbdKHLZJ (ORCPT ); Wed, 8 Nov 2017 06:25:09 -0500 X-Google-Smtp-Source: ABhQp+S3v3MFEEkOnoLsnDerUTGvilNjNRTTNtlw6D3rubEuDyaCk9IUW/Wwa42dgfAGTEprWj/6CQ== Date: Wed, 8 Nov 2017 06:25:06 -0500 From: Joshua Abraham To: gregkh@linuxfoundation.org Cc: marcin.s.ciupak@gmail.com, linux@Wolf-Entwicklungen.de, colin.king@canonical.com, robsonde@gmail.com, dudebrobro179@gmail.com, devel@driverdev.osuosl.org, linux-kernel@vger.kernel.org, j.abraham1776@gmail.com Subject: [PATCH] staging: pi433: #define shift constants in rf69.c Message-ID: <20171108112506.GA1654@josharch> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline User-Agent: Mutt/1.9.1 (2017-09-22) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org This patch completes TODO improvements in rf69.c to change shift constants to a define. Signed-off-by: Joshua Abraham --- drivers/staging/pi433/rf69.c | 4 ++-- drivers/staging/pi433/rf69_registers.h | 4 ++++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/drivers/staging/pi433/rf69.c b/drivers/staging/pi433/rf69.c index e69a2153c999..cfcace195be9 100644 --- a/drivers/staging/pi433/rf69.c +++ b/drivers/staging/pi433/rf69.c @@ -102,7 +102,7 @@ enum modulation rf69_get_modulation(struct spi_device *spi) currentValue = READ_REG(REG_DATAMODUL); - switch (currentValue & MASK_DATAMODUL_MODULATION_TYPE >> 3) { // TODO improvement: change 3 to define + switch (currentValue & MASK_DATAMODUL_MODULATION_TYPE >> SHIFT_DATAMODUL_MODE) { case DATAMODUL_MODULATION_TYPE_OOK: return OOK; case DATAMODUL_MODULATION_TYPE_FSK: return FSK; default: return undefined; @@ -409,7 +409,7 @@ enum lnaGain rf69_get_lna_gain(struct spi_device *spi) currentValue = READ_REG(REG_LNA); - switch (currentValue & MASK_LNA_CURRENT_GAIN >> 3) { // improvement: change 3 to define + switch (currentValue & MASK_LNA_CURRENT_GAIN >> SHIFT_LNA_CURRENT_GAIN) { case LNA_GAIN_AUTO: return automatic; case LNA_GAIN_MAX: return max; case LNA_GAIN_MAX_MINUS_6: return maxMinus6; diff --git a/drivers/staging/pi433/rf69_registers.h b/drivers/staging/pi433/rf69_registers.h index 6335d42142fe..119df543e80e 100644 --- a/drivers/staging/pi433/rf69_registers.h +++ b/drivers/staging/pi433/rf69_registers.h @@ -121,6 +121,8 @@ #define OPMODE_MODE_RECEIVE 0x10 /* RegDataModul */ +#define SHIFT_DATAMODUL_MODE 0x03 + #define MASK_DATAMODUL_MODE 0x06 #define MASK_DATAMODUL_MODULATION_TYPE 0x18 #define MASK_DATAMODUL_MODULATION_SHAPE 0x03 @@ -234,6 +236,8 @@ */ /* RegLna (0x18) */ +#define SHIFT_LNA_CURRENT_GAIN 0x03 + #define MASK_LNA_ZIN 0x80 #define MASK_LNA_CURRENT_GAIN 0x38 #define MASK_LNA_GAIN 0x07 -- 2.15.0