From d608210468a7a5c081f52d9a8ab529e48b459af5 Mon Sep 17 00:00:00 2001 From: Johannes Berg Date: Tue, 7 Feb 2017 22:32:29 +0100 Subject: backports: remove some stray whitespace Signed-off-by: Johannes Berg --- backport/backport-include/linux/device.h | 2 +- backport/backport-include/linux/etherdevice.h | 4 ++-- backport/backport-include/linux/idr.h | 2 +- backport/backport-include/linux/if_ether.h | 2 +- backport/backport-include/linux/if_vlan.h | 4 ++-- backport/backport-include/linux/init.h | 2 +- backport/backport-include/linux/leds.h | 8 ++++---- backport/backport-include/linux/rcupdate.h | 2 +- backport/backport-include/linux/rtnetlink.h | 1 - 9 files changed, 13 insertions(+), 14 deletions(-) diff --git a/backport/backport-include/linux/device.h b/backport/backport-include/linux/device.h index 592d7b10..3e16a150 100644 --- a/backport/backport-include/linux/device.h +++ b/backport/backport-include/linux/device.h @@ -174,7 +174,7 @@ static inline void init_##_name##_attrs(void) {} \ __ATTRIBUTE_GROUPS(_name) #if LINUX_VERSION_CODE < KERNEL_VERSION(3,13,0) -#define devm_kmalloc(dev, size, flags) devm_kzalloc(dev, size, flags) +#define devm_kmalloc(dev, size, flags) devm_kzalloc(dev, size, flags) #endif #if LINUX_VERSION_CODE < KERNEL_VERSION(3,15,0) diff --git a/backport/backport-include/linux/etherdevice.h b/backport/backport-include/linux/etherdevice.h index 34dbf651..b12a578b 100644 --- a/backport/backport-include/linux/etherdevice.h +++ b/backport/backport-include/linux/etherdevice.h @@ -54,8 +54,8 @@ static inline void eth_random_addr(u8 *addr) * commit 6d57e9078e880a3dd232d579f42ac437a8f1ef7b * Author: Duan Jiong * Date: Sat Sep 8 16:32:28 2012 +0000 - * - * etherdevice: introduce help function eth_zero_addr() + * + * etherdevice: introduce help function eth_zero_addr() */ #define eth_zero_addr LINUX_BACKPORT(eth_zero_addr) static inline void eth_zero_addr(u8 *addr) diff --git a/backport/backport-include/linux/idr.h b/backport/backport-include/linux/idr.h index d4ad9522..0d4792ee 100644 --- a/backport/backport-include/linux/idr.h +++ b/backport/backport-include/linux/idr.h @@ -18,7 +18,7 @@ void ida_simple_remove(struct ida *ida, unsigned int id); #include /** * backport of idr idr_alloc() usage - * + * * This backports a patch series send by Tejun Heo: * https://lkml.org/lkml/2013/2/2/159 */ diff --git a/backport/backport-include/linux/if_ether.h b/backport/backport-include/linux/if_ether.h index de5e28ac..55862cea 100644 --- a/backport/backport-include/linux/if_ether.h +++ b/backport/backport-include/linux/if_ether.h @@ -12,7 +12,7 @@ * commit e5c5d22e8dcf7c2d430336cbf8e180bd38e8daf1 * Author: Simon Horman * Date: Thu Mar 28 13:38:25 2013 +0900 - * + * * net: add ETH_P_802_3_MIN */ #ifndef ETH_P_802_3_MIN diff --git a/backport/backport-include/linux/if_vlan.h b/backport/backport-include/linux/if_vlan.h index be2e259a..f9ddc806 100644 --- a/backport/backport-include/linux/if_vlan.h +++ b/backport/backport-include/linux/if_vlan.h @@ -8,9 +8,9 @@ #define vlan_put_tag(__skb, __vlan_proto, __vlan_tci) vlan_put_tag(__skb, __vlan_tci) #define __vlan_hwaccel_put_tag(__skb, __vlan_proto, __vlan_tag) __vlan_hwaccel_put_tag(__skb, __vlan_tag) -#define __vlan_find_dev_deep(__real_dev, __vlan_proto, __vlan_id) __vlan_find_dev_deep(__real_dev, __vlan_id) +#define __vlan_find_dev_deep(__real_dev, __vlan_proto, __vlan_id) __vlan_find_dev_deep(__real_dev, __vlan_id) -#endif +#endif #ifndef VLAN_PRIO_MASK #define VLAN_PRIO_MASK 0xe000 /* Priority Code Point */ diff --git a/backport/backport-include/linux/init.h b/backport/backport-include/linux/init.h index a835e33b..3a122829 100644 --- a/backport/backport-include/linux/init.h +++ b/backport/backport-include/linux/init.h @@ -6,7 +6,7 @@ * Backports 312b1485fb509c9bc32eda28ad29537896658cb8 * Author: Sam Ravnborg * Date: Mon Jan 28 20:21:15 2008 +0100 - * + * * Introduce new section reference annotations tags: __ref, __refdata, __refconst */ #ifndef __ref diff --git a/backport/backport-include/linux/leds.h b/backport/backport-include/linux/leds.h index 9f45aba2..6cc9e194 100644 --- a/backport/backport-include/linux/leds.h +++ b/backport/backport-include/linux/leds.h @@ -8,21 +8,21 @@ #ifndef CPTCFG_BPAUTO_BUILD_LEDS #if LINUX_VERSION_CODE < KERNEL_VERSION(3,6,0) /* - * Backports - * + * Backports + * * commit 959d62fa865d2e616b61a509e1cc5b88741f065e * Author: Shuah Khan * Date: Thu Jun 14 04:34:30 2012 +0800 * * leds: Rename led_brightness_set() to led_set_brightness() - * + * * Rename leds external interface led_brightness_set() to led_set_brightness(). * This is the second phase of the change to reduce confusion between the * leds internal and external interfaces that set brightness. With this change, * now the external interface is led_set_brightness(). The first phase renamed * the internal interface led_set_brightness() to __led_set_brightness(). * There are no changes to the interface implementations. - * + * * Signed-off-by: Shuah Khan * Signed-off-by: Bryan Wu */ diff --git a/backport/backport-include/linux/rcupdate.h b/backport/backport-include/linux/rcupdate.h index 230d12f8..b96ef496 100644 --- a/backport/backport-include/linux/rcupdate.h +++ b/backport/backport-include/linux/rcupdate.h @@ -2,7 +2,7 @@ #define __BACKPORT_LINUX_RCUPDATE_H #include_next -/* +/* * This adds a nested function everywhere kfree_rcu() was called. This * function frees the memory and is given as a function to call_rcu(). * The rcu callback could happen every time also after the module was diff --git a/backport/backport-include/linux/rtnetlink.h b/backport/backport-include/linux/rtnetlink.h index 806f212f..69ac1228 100644 --- a/backport/backport-include/linux/rtnetlink.h +++ b/backport/backport-include/linux/rtnetlink.h @@ -18,5 +18,4 @@ ndo_dflt_fdb_add(ndm, tb, dev, addr, flags) #endif - #endif /* __BACKPORT_LINUX_RTNETLINK_H */ -- cgit v1.2.3