Subject: Re: [PATCH net-next] ieee802154: use helper function to get rid of redundancy

From: Jean Sacren <[email-masked]>
Date: Sun, 1 Jun 2014 09:35:47 -0600

From: Alexander Aring <[email-masked]>
Date: Sun, 01 Jun 2014 16:35:53 +0200
>
> Hi,
> 
> On Sun, Jun 01, 2014 at 08:23:17AM -0600, Jean Sacren wrote:
> > From: Alexander Aring <[email-masked]>
> > Date: Sun, 01 Jun 2014 09:26:57 +0200
> > 
> > Hi Alex,
> > 
> > Thank you very much for the feedback.
> > 
> > > the at86rf230 driver supports several at86rf2xx chips. You split the
> > > at86rf212_set_channel which is at86rf212 specific in two function which
> > > are named at86rf230_foo.
> > 
> > I didn't "split" at86rf212_set_channel() in two functions. I spliced
> > those two sections of code and made at86rf212_set_channel() far
> > succinct and easy to read.
> > 
> 
> yes, but this driver supports more than one chip and it's easier to read
> if we have one channel_set function for each chip type. Note you also
> named the specific channel_set function to a another at86rf230_foo
> function which is at86rf212 specific only. Sorry that will confuse
> all the people who will ever read this code.
> 
> There is a at86rf230_ops and at86rf212_ops struct. The channel_set
> function it's much easier to have only one callback for each struct,
> otherwise you have 4 different channel_set functions and nobody knows
> for which at86rf2xx type that function is for.

You mean something like the following will be less confusing?

diff --git a/drivers/net/ieee802154/at86rf230.c b/drivers/net/ieee802154/at86rf230.c
index 4517b149ed07..06b494bacc44 100644
--- a/drivers/net/ieee802154/at86rf230.c
+++ b/drivers/net/ieee802154/at86rf230.c
@@ -602,20 +602,21 @@ at86rf212_set_channel(struct at86rf230_local *lp, int page, int channel)
 {
 	int rc;
 
-	if (channel == 0)
-		rc = at86rf230_write_subreg(lp, SR_SUB_MODE, 0);
-	else
-		rc = at86rf230_write_subreg(lp, SR_SUB_MODE, 1);
+	if (channel)
+		channel = 1;
+
+	rc = at86rf230_write_subreg(lp, SR_SUB_MODE, channel);
 	if (rc < 0)
 		return rc;
 
-	if (page == 0) {
-		rc = at86rf230_write_subreg(lp, SR_BPSK_QPSK, 0);
-		lp->rssi_base_val = -100;
-	} else {
-		rc = at86rf230_write_subreg(lp, SR_BPSK_QPSK, 1);
+	if (page) {
 		lp->rssi_base_val = -98;
+		page = 1;
+	} else {
+		lp->rssi_base_val = -100;
 	}
+
+	rc = at86rf230_write_subreg(lp, SR_BPSK_QPSK, page);
 	if (rc < 0)
 		return rc;