* [PATCH 1/2] rtlwifi: Use is_zero_ether_addr, remove line continuation @ 2012-03-17 19:13 Joe Perches 2012-03-17 19:14 ` [PATCH 2/2] drivers: net: Remove unnecessary line continuations Joe Perches 2012-03-17 21:14 ` [PATCH 1/2] rtlwifi: Use is_zero_ether_addr, remove line continuation Larry Finger 0 siblings, 2 replies; 8+ messages in thread From: Joe Perches @ 2012-03-17 19:13 UTC (permalink / raw) To: Larry Finger, Chaoming Li Cc: John W. Linville, linux-wireless, netdev, linux-kernel Use the normal kernel facilities and use %pM to print the all zero mac address. Remove unnecessary line continuation. Signed-off-by: Joe Perches <joe@perches.com> --- drivers/net/wireless/rtlwifi/cam.c | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) diff --git a/drivers/net/wireless/rtlwifi/cam.c b/drivers/net/wireless/rtlwifi/cam.c index 5c7d579..3d8cc4a 100644 --- a/drivers/net/wireless/rtlwifi/cam.c +++ b/drivers/net/wireless/rtlwifi/cam.c @@ -328,10 +328,9 @@ void rtl_cam_del_entry(struct ieee80211_hw *hw, u8 *sta_addr) RT_TRACE(rtlpriv, COMP_SEC, DBG_EMERG, "sta_addr is NULL\n"); } - if ((sta_addr[0]|sta_addr[1]|sta_addr[2]|sta_addr[3]|\ - sta_addr[4]|sta_addr[5]) == 0) { + if (is_zero_ether_addr(sta_addr)) { RT_TRACE(rtlpriv, COMP_SEC, DBG_EMERG, - "sta_addr is 00:00:00:00:00:00\n"); + "sta_addr is %pM\n", sta_addr); return; } /* Does STA already exist? */ -- 1.7.8.111.gad25c.dirty ^ permalink raw reply related [flat|nested] 8+ messages in thread
* [PATCH 2/2] drivers: net: Remove unnecessary line continuations 2012-03-17 19:13 [PATCH 1/2] rtlwifi: Use is_zero_ether_addr, remove line continuation Joe Perches @ 2012-03-17 19:14 ` Joe Perches 2012-03-17 19:21 ` Marc Kleine-Budde ` (2 more replies) 2012-03-17 21:14 ` [PATCH 1/2] rtlwifi: Use is_zero_ether_addr, remove line continuation Larry Finger 1 sibling, 3 replies; 8+ messages in thread From: Joe Perches @ 2012-03-17 19:14 UTC (permalink / raw) To: Geoff Levand, Ishizaki Kou, Jens Osterkamp, Samuel Ortiz Cc: Wolfgang Grandegger, Marc Kleine-Budde, linux-can, netdev, linux-kernel, cbe-oss-dev Line continuations are error prone so just remove them. Signed-off-by: Joe Perches <joe@perches.com> --- drivers/net/can/usb/peak_usb/pcan_usb_pro.c | 4 ++-- drivers/net/ethernet/micrel/ks8695net.c | 4 ++-- drivers/net/ethernet/toshiba/ps3_gelic_net.c | 3 +-- drivers/net/ethernet/toshiba/spider_net.c | 4 ++-- drivers/net/irda/bfin_sir.c | 4 ++-- drivers/net/phy/et1011c.c | 9 +++++---- 6 files changed, 14 insertions(+), 14 deletions(-) diff --git a/drivers/net/can/usb/peak_usb/pcan_usb_pro.c b/drivers/net/can/usb/peak_usb/pcan_usb_pro.c index 5234586..68f4e12 100644 --- a/drivers/net/can/usb/peak_usb/pcan_usb_pro.c +++ b/drivers/net/can/usb/peak_usb/pcan_usb_pro.c @@ -304,8 +304,8 @@ static int pcan_usb_pro_wait_rsp(struct peak_usb_device *dev, pr->data_type); /* check if channel in response corresponds too */ - else if ((req_channel != 0xff) && \ - (pr->bus_act.channel != req_channel)) + else if ((req_channel != 0xff) && + (pr->bus_act.channel != req_channel)) netdev_err(dev->netdev, "got rsp %xh but on chan%u: ignored\n", req_data_type, pr->bus_act.channel); diff --git a/drivers/net/ethernet/micrel/ks8695net.c b/drivers/net/ethernet/micrel/ks8695net.c index dccae1d..012e66d 100644 --- a/drivers/net/ethernet/micrel/ks8695net.c +++ b/drivers/net/ethernet/micrel/ks8695net.c @@ -1180,8 +1180,8 @@ ks8695_start_xmit(struct sk_buff *skb, struct net_device *ndev) if (unlikely(dma_mapping_error(ksp->dev, dmap))) { /* Failed to DMA map this SKB, give it back for now */ spin_unlock_irq(&ksp->txq_lock); - dev_dbg(ksp->dev, "%s: Could not map DMA memory for "\ - "transmission, trying later\n", ndev->name); + dev_dbg(ksp->dev, "%s: Could not map DMA memory for transmission, trying later\n", + ndev->name); return NETDEV_TX_BUSY; } diff --git a/drivers/net/ethernet/toshiba/ps3_gelic_net.c b/drivers/net/ethernet/toshiba/ps3_gelic_net.c index 5ee82a7..f707b0b 100644 --- a/drivers/net/ethernet/toshiba/ps3_gelic_net.c +++ b/drivers/net/ethernet/toshiba/ps3_gelic_net.c @@ -508,8 +508,7 @@ static void gelic_card_release_tx_chain(struct gelic_card *card, int stop) case GELIC_DESCR_DMA_FORCE_END: if (printk_ratelimit()) dev_info(ctodev(card), - "%s: forcing end of tx descriptor " \ - "with status %x\n", + "%s: forcing end of tx descriptor with status %x\n", __func__, status); netdev->stats.tx_dropped++; break; diff --git a/drivers/net/ethernet/toshiba/spider_net.c b/drivers/net/ethernet/toshiba/spider_net.c index 6199f6b..9039ddf 100644 --- a/drivers/net/ethernet/toshiba/spider_net.c +++ b/drivers/net/ethernet/toshiba/spider_net.c @@ -53,8 +53,8 @@ #include "spider_net.h" -MODULE_AUTHOR("Utz Bacher <utz.bacher@de.ibm.com> and Jens Osterkamp " \ - "<Jens.Osterkamp@de.ibm.com>"); +MODULE_AUTHOR("Utz Bacher <utz.bacher@de.ibm.com> and " + "Jens Osterkamp <Jens.Osterkamp@de.ibm.com>"); MODULE_DESCRIPTION("Spider Southbridge Gigabit Ethernet driver"); MODULE_LICENSE("GPL"); MODULE_VERSION(VERSION); diff --git a/drivers/net/irda/bfin_sir.c b/drivers/net/irda/bfin_sir.c index a561ae4..089b7e8 100644 --- a/drivers/net/irda/bfin_sir.c +++ b/drivers/net/irda/bfin_sir.c @@ -696,8 +696,8 @@ static int __devinit bfin_sir_probe(struct platform_device *pdev) struct bfin_sir_port *sir_port; int err; - if (pdev->id >= 0 && pdev->id < ARRAY_SIZE(per) && \ - per[pdev->id][3] == pdev->id) { + if (pdev->id >= 0 && pdev->id < ARRAY_SIZE(per) && + per[pdev->id][3] == pdev->id) { err = peripheral_request_list(per[pdev->id], DRIVER_NAME); if (err) return err; diff --git a/drivers/net/phy/et1011c.c b/drivers/net/phy/et1011c.c index a8eb19e..edbccf7 100644 --- a/drivers/net/phy/et1011c.c +++ b/drivers/net/phy/et1011c.c @@ -77,10 +77,11 @@ static int et1011c_read_status(struct phy_device *phydev) ET1011C_GIGABIT_SPEED) { val = phy_read(phydev, ET1011C_CONFIG_REG); val &= ~ET1011C_TX_FIFO_MASK; - phy_write(phydev, ET1011C_CONFIG_REG, val\ - | ET1011C_GMII_INTERFACE\ - | ET1011C_SYS_CLK_EN\ - | ET1011C_TX_FIFO_DEPTH_16); + phy_write(phydev, ET1011C_CONFIG_REG, + (val | + ET1011C_GMII_INTERFACE | + ET1011C_SYS_CLK_EN | + ET1011C_TX_FIFO_DEPTH_16)); } } -- 1.7.8.111.gad25c.dirty ^ permalink raw reply related [flat|nested] 8+ messages in thread
* Re: [PATCH 2/2] drivers: net: Remove unnecessary line continuations 2012-03-17 19:14 ` [PATCH 2/2] drivers: net: Remove unnecessary line continuations Joe Perches @ 2012-03-17 19:21 ` Marc Kleine-Budde 2012-03-17 22:41 ` David Miller 2012-03-18 1:57 ` Geoff Levand 2 siblings, 0 replies; 8+ messages in thread From: Marc Kleine-Budde @ 2012-03-17 19:21 UTC (permalink / raw) To: Joe Perches Cc: Geoff Levand, Ishizaki Kou, Jens Osterkamp, Samuel Ortiz, Wolfgang Grandegger, linux-can, netdev, linux-kernel, cbe-oss-dev [-- Attachment #1: Type: text/plain, Size: 941 bytes --] On 03/17/2012 08:14 PM, Joe Perches wrote: > Line continuations are error prone so just remove them. > > Signed-off-by: Joe Perches <joe@perches.com> > --- > drivers/net/can/usb/peak_usb/pcan_usb_pro.c | 4 ++-- > drivers/net/ethernet/micrel/ks8695net.c | 4 ++-- > drivers/net/ethernet/toshiba/ps3_gelic_net.c | 3 +-- > drivers/net/ethernet/toshiba/spider_net.c | 4 ++-- > drivers/net/irda/bfin_sir.c | 4 ++-- > drivers/net/phy/et1011c.c | 9 +++++---- > 6 files changed, 14 insertions(+), 14 deletions(-) For the peak_usb: Acked-by: Marc Kleine-Budde <mkl@pengutronix.de> Marc -- Pengutronix e.K. | Marc Kleine-Budde | Industrial Linux Solutions | Phone: +49-231-2826-924 | Vertretung West/Dortmund | Fax: +49-5121-206917-5555 | Amtsgericht Hildesheim, HRA 2686 | http://www.pengutronix.de | [-- Attachment #2: OpenPGP digital signature --] [-- Type: application/pgp-signature, Size: 262 bytes --] ^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH 2/2] drivers: net: Remove unnecessary line continuations 2012-03-17 19:14 ` [PATCH 2/2] drivers: net: Remove unnecessary line continuations Joe Perches 2012-03-17 19:21 ` Marc Kleine-Budde @ 2012-03-17 22:41 ` David Miller 2012-03-18 1:57 ` Geoff Levand 2 siblings, 0 replies; 8+ messages in thread From: David Miller @ 2012-03-17 22:41 UTC (permalink / raw) To: joe Cc: geoff, kou.ishizaki, jens, samuel, wg, mkl, linux-can, netdev, linux-kernel, cbe-oss-dev From: Joe Perches <joe@perches.com> Date: Sat, 17 Mar 2012 12:14:03 -0700 > Line continuations are error prone so just remove them. > > Signed-off-by: Joe Perches <joe@perches.com> Applied. ^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH 2/2] drivers: net: Remove unnecessary line continuations 2012-03-17 19:14 ` [PATCH 2/2] drivers: net: Remove unnecessary line continuations Joe Perches 2012-03-17 19:21 ` Marc Kleine-Budde 2012-03-17 22:41 ` David Miller @ 2012-03-18 1:57 ` Geoff Levand 2 siblings, 0 replies; 8+ messages in thread From: Geoff Levand @ 2012-03-18 1:57 UTC (permalink / raw) To: Joe Perches Cc: Ishizaki Kou, Jens Osterkamp, Samuel Ortiz, Wolfgang Grandegger, Marc Kleine-Budde, linux-can, netdev, linux-kernel, cbe-oss-dev On Sat, 2012-03-17 at 12:14 -0700, Joe Perches wrote: > Line continuations are error prone so just remove them. > > Signed-off-by: Joe Perches <joe@perches.com> > --- > drivers/net/ethernet/toshiba/ps3_gelic_net.c | 3 +-- Looks OK for ps3_gelic_net. Thanks. Acked-by: Geoff Levand <geoff@infradead.org> ^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH 1/2] rtlwifi: Use is_zero_ether_addr, remove line continuation 2012-03-17 19:13 [PATCH 1/2] rtlwifi: Use is_zero_ether_addr, remove line continuation Joe Perches 2012-03-17 19:14 ` [PATCH 2/2] drivers: net: Remove unnecessary line continuations Joe Perches @ 2012-03-17 21:14 ` Larry Finger [not found] ` <4F64FECD.9000802-tQ5ms3gMjBLk1uMJSBkQmQ@public.gmane.org> 1 sibling, 1 reply; 8+ messages in thread From: Larry Finger @ 2012-03-17 21:14 UTC (permalink / raw) To: Joe Perches Cc: Chaoming Li, John W. Linville, linux-wireless, netdev, linux-kernel On 03/17/2012 02:13 PM, Joe Perches wrote: > Use the normal kernel facilities and use %pM > to print the all zero mac address. > > Remove unnecessary line continuation. > > Signed-off-by: Joe Perches<joe@perches.com> > --- > drivers/net/wireless/rtlwifi/cam.c | 5 ++--- > 1 files changed, 2 insertions(+), 3 deletions(-) ACKed-by: Larry.Finger@lwfinger.net Is there a PATCH 2/2? I did not receive it. Larry > > diff --git a/drivers/net/wireless/rtlwifi/cam.c b/drivers/net/wireless/rtlwifi/cam.c > index 5c7d579..3d8cc4a 100644 > --- a/drivers/net/wireless/rtlwifi/cam.c > +++ b/drivers/net/wireless/rtlwifi/cam.c > @@ -328,10 +328,9 @@ void rtl_cam_del_entry(struct ieee80211_hw *hw, u8 *sta_addr) > RT_TRACE(rtlpriv, COMP_SEC, DBG_EMERG, "sta_addr is NULL\n"); > } > > - if ((sta_addr[0]|sta_addr[1]|sta_addr[2]|sta_addr[3]|\ > - sta_addr[4]|sta_addr[5]) == 0) { > + if (is_zero_ether_addr(sta_addr)) { > RT_TRACE(rtlpriv, COMP_SEC, DBG_EMERG, > - "sta_addr is 00:00:00:00:00:00\n"); > + "sta_addr is %pM\n", sta_addr); > return; > } > /* Does STA already exist? */ ^ permalink raw reply [flat|nested] 8+ messages in thread
[parent not found: <4F64FECD.9000802-tQ5ms3gMjBLk1uMJSBkQmQ@public.gmane.org>]
* Re: [PATCH 1/2] rtlwifi: Use is_zero_ether_addr, remove line continuation [not found] ` <4F64FECD.9000802-tQ5ms3gMjBLk1uMJSBkQmQ@public.gmane.org> @ 2012-03-17 21:18 ` Joe Perches 2012-03-17 21:18 ` David Miller 1 sibling, 0 replies; 8+ messages in thread From: Joe Perches @ 2012-03-17 21:18 UTC (permalink / raw) To: Larry Finger Cc: Chaoming Li, John W. Linville, linux-wireless-u79uwXL29TY76Z2rM5mHXA, netdev-u79uwXL29TY76Z2rM5mHXA, linux-kernel-u79uwXL29TY76Z2rM5mHXA On Sat, 2012-03-17 at 16:14 -0500, Larry Finger wrote: > Is there a PATCH 2/2? I did not receive it. Yes. It's a line continuation removal patch to other files. https://lkml.org/lkml/2012/3/17/72 -- To unsubscribe from this list: send the line "unsubscribe linux-wireless" in the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org More majordomo info at http://vger.kernel.org/majordomo-info.html ^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH 1/2] rtlwifi: Use is_zero_ether_addr, remove line continuation [not found] ` <4F64FECD.9000802-tQ5ms3gMjBLk1uMJSBkQmQ@public.gmane.org> 2012-03-17 21:18 ` Joe Perches @ 2012-03-17 21:18 ` David Miller 1 sibling, 0 replies; 8+ messages in thread From: David Miller @ 2012-03-17 21:18 UTC (permalink / raw) To: Larry.Finger-tQ5ms3gMjBLk1uMJSBkQmQ Cc: joe-6d6DIl74uiNBDgjK7y7TUQ, chaoming_li-kXabqFNEczNtrwSWzY7KCg, linville-2XuSBdqkA4R54TAoqtyWWQ, linux-wireless-u79uwXL29TY76Z2rM5mHXA, netdev-u79uwXL29TY76Z2rM5mHXA, linux-kernel-u79uwXL29TY76Z2rM5mHXA From: Larry Finger <Larry.Finger-tQ5ms3gMjBLk1uMJSBkQmQ@public.gmane.org> Date: Sat, 17 Mar 2012 16:14:53 -0500 > On 03/17/2012 02:13 PM, Joe Perches wrote: >> Use the normal kernel facilities and use %pM >> to print the all zero mac address. >> >> Remove unnecessary line continuation. >> >> Signed-off-by: Joe Perches<joe-6d6DIl74uiNBDgjK7y7TUQ@public.gmane.org> >> --- >> drivers/net/wireless/rtlwifi/cam.c | 5 ++--- >> 1 files changed, 2 insertions(+), 3 deletions(-) > > ACKed-by: Larry.Finger-tQ5ms3gMjBLk1uMJSBkQmQ@public.gmane.org > > Is there a PATCH 2/2? I did not receive it. It went to netdev only and was only for non-wireless networking drivers. -- To unsubscribe from this list: send the line "unsubscribe linux-wireless" in the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org More majordomo info at http://vger.kernel.org/majordomo-info.html ^ permalink raw reply [flat|nested] 8+ messages in thread
end of thread, other threads:[~2012-03-18 1:57 UTC | newest]
Thread overview: 8+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-03-17 19:13 [PATCH 1/2] rtlwifi: Use is_zero_ether_addr, remove line continuation Joe Perches
2012-03-17 19:14 ` [PATCH 2/2] drivers: net: Remove unnecessary line continuations Joe Perches
2012-03-17 19:21 ` Marc Kleine-Budde
2012-03-17 22:41 ` David Miller
2012-03-18 1:57 ` Geoff Levand
2012-03-17 21:14 ` [PATCH 1/2] rtlwifi: Use is_zero_ether_addr, remove line continuation Larry Finger
[not found] ` <4F64FECD.9000802-tQ5ms3gMjBLk1uMJSBkQmQ@public.gmane.org>
2012-03-17 21:18 ` Joe Perches
2012-03-17 21:18 ` David Miller
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).