* [PATCH wpan-next v3 1/3] mrf24j40: fix Missing a blank line after declarations
2014-09-19 10:57 [PATCH wpan-next v3 0/3] cleanup for mrf24j40 Varka Bhadram
@ 2014-09-19 10:57 ` Varka Bhadram
2014-09-19 10:57 ` [PATCH wpan-next v3 2/3] mrf24j40: remove unnecessary return statement Varka Bhadram
` (2 subsequent siblings)
3 siblings, 0 replies; 6+ messages in thread
From: Varka Bhadram @ 2014-09-19 10:57 UTC (permalink / raw)
To: linux-wpan; +Cc: alan, Varka Bhadram
Signed-off-by: Varka Bhadram <varkab@cdac.in>
---
drivers/net/ieee802154/mrf24j40.c | 3 +++
1 file changed, 3 insertions(+)
diff --git a/drivers/net/ieee802154/mrf24j40.c b/drivers/net/ieee802154/mrf24j40.c
index 9e6a124..466da57 100644
--- a/drivers/net/ieee802154/mrf24j40.c
+++ b/drivers/net/ieee802154/mrf24j40.c
@@ -412,6 +412,7 @@ static void mrf24j40_stop(struct ieee802154_dev *dev)
struct mrf24j40 *devrec = dev->priv;
u8 val;
int ret;
+
dev_dbg(printdev(devrec), "stop\n");
ret = read_short_reg(devrec, REG_INTCON, &val);
@@ -465,6 +466,7 @@ static int mrf24j40_filter(struct ieee802154_dev *dev,
if (changed & IEEE802515_AFILT_SADDR_CHANGED) {
/* Short Addr */
u8 addrh, addrl;
+
addrh = le16_to_cpu(filt->short_addr) >> 8 & 0xff;
addrl = le16_to_cpu(filt->short_addr) & 0xff;
@@ -493,6 +495,7 @@ static int mrf24j40_filter(struct ieee802154_dev *dev,
if (changed & IEEE802515_AFILT_PANID_CHANGED) {
/* PAN ID */
u8 panidl, panidh;
+
panidh = le16_to_cpu(filt->pan_id) >> 8 & 0xff;
panidl = le16_to_cpu(filt->pan_id) & 0xff;
write_short_reg(devrec, REG_PANIDH, panidh);
--
1.7.9.5
^ permalink raw reply related [flat|nested] 6+ messages in thread* [PATCH wpan-next v3 2/3] mrf24j40: remove unnecessary return statement
2014-09-19 10:57 [PATCH wpan-next v3 0/3] cleanup for mrf24j40 Varka Bhadram
2014-09-19 10:57 ` [PATCH wpan-next v3 1/3] mrf24j40: fix Missing a blank line after declarations Varka Bhadram
@ 2014-09-19 10:57 ` Varka Bhadram
2014-09-19 10:57 ` [PATCH wpan-next v3 3/3] mrf24j40: use pr_* / dev_* instead of printk() Varka Bhadram
2014-09-23 2:46 ` [PATCH wpan-next v3 0/3] cleanup for mrf24j40 Alan Ott
3 siblings, 0 replies; 6+ messages in thread
From: Varka Bhadram @ 2014-09-19 10:57 UTC (permalink / raw)
To: linux-wpan; +Cc: alan, Varka Bhadram
Remove the return statement in the void function.
Signed-off-by: Varka Bhadram <varkab@cdac.in>
---
drivers/net/ieee802154/mrf24j40.c | 2 --
1 file changed, 2 deletions(-)
diff --git a/drivers/net/ieee802154/mrf24j40.c b/drivers/net/ieee802154/mrf24j40.c
index 466da57..2c617e3 100644
--- a/drivers/net/ieee802154/mrf24j40.c
+++ b/drivers/net/ieee802154/mrf24j40.c
@@ -420,8 +420,6 @@ static void mrf24j40_stop(struct ieee802154_dev *dev)
return;
val |= 0x1|0x8; /* Set TXNIE and RXIE. Disable Interrupts */
write_short_reg(devrec, REG_INTCON, val);
-
- return;
}
static int mrf24j40_set_channel(struct ieee802154_dev *dev,
--
1.7.9.5
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH wpan-next v3 3/3] mrf24j40: use pr_* / dev_* instead of printk()
2014-09-19 10:57 [PATCH wpan-next v3 0/3] cleanup for mrf24j40 Varka Bhadram
2014-09-19 10:57 ` [PATCH wpan-next v3 1/3] mrf24j40: fix Missing a blank line after declarations Varka Bhadram
2014-09-19 10:57 ` [PATCH wpan-next v3 2/3] mrf24j40: remove unnecessary return statement Varka Bhadram
@ 2014-09-19 10:57 ` Varka Bhadram
2014-09-23 2:46 ` [PATCH wpan-next v3 0/3] cleanup for mrf24j40 Alan Ott
3 siblings, 0 replies; 6+ messages in thread
From: Varka Bhadram @ 2014-09-19 10:57 UTC (permalink / raw)
To: linux-wpan; +Cc: alan, Varka Bhadram
Replace printk() with dev_*() pr_*().
Signed-off-by: Varka Bhadram <varkab@cdac.in>
---
drivers/net/ieee802154/mrf24j40.c | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/drivers/net/ieee802154/mrf24j40.c b/drivers/net/ieee802154/mrf24j40.c
index 2c617e3..07e0b88 100644
--- a/drivers/net/ieee802154/mrf24j40.c
+++ b/drivers/net/ieee802154/mrf24j40.c
@@ -323,8 +323,8 @@ static int mrf24j40_read_rx_buf(struct mrf24j40 *devrec,
#ifdef DEBUG
print_hex_dump(KERN_DEBUG, "mrf24j40 rx: ",
DUMP_PREFIX_OFFSET, 16, 1, data, *len, 0);
- printk(KERN_DEBUG "mrf24j40 rx: lqi: %02hhx rssi: %02hhx\n",
- lqi_rssi[0], lqi_rssi[1]);
+ pr_debug("mrf24j40 rx: lqi: %02hhx rssi: %02hhx\n",
+ lqi_rssi[0], lqi_rssi[1]);
#endif
out:
@@ -385,7 +385,7 @@ err:
static int mrf24j40_ed(struct ieee802154_dev *dev, u8 *level)
{
/* TODO: */
- printk(KERN_WARNING "mrf24j40: ed not implemented\n");
+ pr_warn("mrf24j40: ed not implemented\n");
*level = 0;
return 0;
}
@@ -483,10 +483,10 @@ static int mrf24j40_filter(struct ieee802154_dev *dev,
write_short_reg(devrec, REG_EADR0 + i, addr[i]);
#ifdef DEBUG
- printk(KERN_DEBUG "Set long addr to: ");
+ pr_debug("Set long addr to: ");
for (i = 0; i < 8; i++)
- printk("%02hhx ", addr[7 - i]);
- printk(KERN_DEBUG "\n");
+ pr_debug("%02hhx ", addr[7 - i]);
+ pr_debug("\n");
#endif
}
@@ -702,7 +702,7 @@ static int mrf24j40_probe(struct spi_device *spi)
int ret = -ENOMEM;
struct mrf24j40 *devrec;
- printk(KERN_INFO "mrf24j40: probe(). IRQ: %d\n", spi->irq);
+ dev_info(&spi->dev, "probe(). IRQ: %d\n", spi->irq);
devrec = devm_kzalloc(&spi->dev, sizeof(struct mrf24j40), GFP_KERNEL);
if (!devrec)
--
1.7.9.5
^ permalink raw reply related [flat|nested] 6+ messages in thread* Re: [PATCH wpan-next v3 0/3] cleanup for mrf24j40
2014-09-19 10:57 [PATCH wpan-next v3 0/3] cleanup for mrf24j40 Varka Bhadram
` (2 preceding siblings ...)
2014-09-19 10:57 ` [PATCH wpan-next v3 3/3] mrf24j40: use pr_* / dev_* instead of printk() Varka Bhadram
@ 2014-09-23 2:46 ` Alan Ott
2014-09-24 6:54 ` Alexander Aring
3 siblings, 1 reply; 6+ messages in thread
From: Alan Ott @ 2014-09-23 2:46 UTC (permalink / raw)
To: Varka Bhadram, linux-wpan; +Cc: Varka Bhadram
On 09/19/2014 06:57 AM, Varka Bhadram wrote:
> changes since v2:
> - generated patches based on wpan-next
>
> changes since v1:
> - changes in commit messages and descriptions suggested by Alan Ott
>
> Varka Bhadram (3):
> mrf24j40: fix Missing a blank line after declarations
> mrf24j40: remove unnecessary return statement
> mrf24j40: use pr_* / dev_* instead of printk()
>
> drivers/net/ieee802154/mrf24j40.c | 19 ++++++++++---------
> 1 file changed, 10 insertions(+), 9 deletions(-)
>
Acked-by: Alan Ott <alan@signal11.us>
Thanks.
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [PATCH wpan-next v3 0/3] cleanup for mrf24j40
2014-09-23 2:46 ` [PATCH wpan-next v3 0/3] cleanup for mrf24j40 Alan Ott
@ 2014-09-24 6:54 ` Alexander Aring
0 siblings, 0 replies; 6+ messages in thread
From: Alexander Aring @ 2014-09-24 6:54 UTC (permalink / raw)
To: Alan Ott; +Cc: Varka Bhadram, linux-wpan, Varka Bhadram
On Mon, Sep 22, 2014 at 10:46:51PM -0400, Alan Ott wrote:
> On 09/19/2014 06:57 AM, Varka Bhadram wrote:
> >changes since v2:
> >- generated patches based on wpan-next
> >
> >changes since v1:
> >- changes in commit messages and descriptions suggested by Alan Ott
> >
> >Varka Bhadram (3):
> > mrf24j40: fix Missing a blank line after declarations
> > mrf24j40: remove unnecessary return statement
> > mrf24j40: use pr_* / dev_* instead of printk()
> >
> > drivers/net/ieee802154/mrf24j40.c | 19 ++++++++++---------
> > 1 file changed, 10 insertions(+), 9 deletions(-)
> >
>
> Acked-by: Alan Ott <alan@signal11.us>
>
Patches applied to wpan-next/testing branch. Note I catch all patches to
the testing branch and when these are applied to bluetooth then I rebase
the master branch again to the bluetooth master branch.
After that you have these patches are inside of wpan-next master branch.
- Alex
^ permalink raw reply [flat|nested] 6+ messages in thread