releases/4.4.152/ieee802154-at86rf230-use-__func__-macro-for-debug-messages.patch

   1 From foo@baz Wed Aug 22 10:28:26 CEST 2018
   2 From: Stefan Schmidt <stefan@datenfreihafen.org>
   3 Date: Fri, 22 Sep 2017 14:13:54 +0200
   4 Subject: ieee802154: at86rf230: use __func__ macro for debug messages
   5
   6 From: Stefan Schmidt <stefan@datenfreihafen.org>
   7
   8 [ Upstream commit 8a81388ec27c4c0adbdecd20e67bb5f411ab46b2 ]
   9
  10 Instead of having the function name hard-coded (it might change and we
  11 forgot to update them in the debug output) we can use __func__ instead
  12 and also shorter the line so we do not need to break it. Also fix an
  13 extra blank line while being here.
  14 Found by checkpatch.
  15
  16 Signed-off-by: Stefan Schmidt <stefan@datenfreihafen.org>
  17 Signed-off-by: Sasha Levin <alexander.levin@microsoft.com>
  18 Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  19 ---
  20  drivers/net/ieee802154/at86rf230.c |   13 ++++---------
  21  1 file changed, 4 insertions(+), 9 deletions(-)
  22
  23 --- a/drivers/net/ieee802154/at86rf230.c
  24 +++ b/drivers/net/ieee802154/at86rf230.c
  25 @@ -1108,8 +1108,7 @@ at86rf230_set_hw_addr_filt(struct ieee80
  26         if (changed & IEEE802154_AFILT_SADDR_CHANGED) {
  27                 u16 addr = le16_to_cpu(filt->short_addr);
  28
  29 -               dev_vdbg(&lp->spi->dev,
  30 -                        "at86rf230_set_hw_addr_filt called for saddr\n");
  31 +               dev_vdbg(&lp->spi->dev, "%s called for saddr\n", __func__);
  32                 __at86rf230_write(lp, RG_SHORT_ADDR_0, addr);
  33                 __at86rf230_write(lp, RG_SHORT_ADDR_1, addr >> 8);
  34         }
  35 @@ -1117,8 +1116,7 @@ at86rf230_set_hw_addr_filt(struct ieee80
  36         if (changed & IEEE802154_AFILT_PANID_CHANGED) {
  37                 u16 pan = le16_to_cpu(filt->pan_id);
  38
  39 -               dev_vdbg(&lp->spi->dev,
  40 -                        "at86rf230_set_hw_addr_filt called for pan id\n");
  41 +               dev_vdbg(&lp->spi->dev, "%s called for pan id\n", __func__);
  42                 __at86rf230_write(lp, RG_PAN_ID_0, pan);
  43                 __at86rf230_write(lp, RG_PAN_ID_1, pan >> 8);
  44         }
  45 @@ -1127,15 +1125,13 @@ at86rf230_set_hw_addr_filt(struct ieee80
  46                 u8 i, addr[8];
  47
  48                 memcpy(addr, &filt->ieee_addr, 8);
  49 -               dev_vdbg(&lp->spi->dev,
  50 -                        "at86rf230_set_hw_addr_filt called for IEEE addr\n");
  51 +               dev_vdbg(&lp->spi->dev, "%s called for IEEE addr\n", __func__);
  52                 for (i = 0; i < 8; i++)
  53                         __at86rf230_write(lp, RG_IEEE_ADDR_0 + i, addr[i]);
  54         }
  55
  56         if (changed & IEEE802154_AFILT_PANC_CHANGED) {
  57 -               dev_vdbg(&lp->spi->dev,
  58 -                        "at86rf230_set_hw_addr_filt called for panc change\n");
  59 +               dev_vdbg(&lp->spi->dev, "%s called for panc change\n", __func__);
  60                 if (filt->pan_coord)
  61                         at86rf230_write_subreg(lp, SR_AACK_I_AM_COORD, 1);
  62                 else
  63 @@ -1239,7 +1235,6 @@ at86rf230_set_cca_mode(struct ieee802154
  64         return at86rf230_write_subreg(lp, SR_CCA_MODE, val);
  65  }
  66
  67 -
  68  static int
  69  at86rf230_set_cca_ed_level(struct ieee802154_hw *hw, s32 mbm)
  70  {