Skip to contentSkip to conversation

Cleanup: replace prefered with preferred

PATCH In review Mark Salyzyn 6 participants 9 messages Oct 22, 2019 – Oct 24, 2019

Subsystems (19)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 Cleanup: replace prefered with preferred

Replace all occurrences of prefered with preferred to make future checkpatch.pl's happy. A few places the incorrect spelling is matched with the correct spelling to preserve existing user space API.

---
 Documentation/networking/ip-sysctl.txt        |   2 +-
 .../firmware/efi/libstub/efi-stub-helper.c    |   2 +-
 .../gpu/drm/amd/display/dc/inc/compressor.h   |   4 +-
 drivers/gpu/drm/vmwgfx/vmwgfx_kms.c           |   2 +-
 drivers/gpu/drm/vmwgfx/vmwgfx_kms.h           |   2 +-
 drivers/media/usb/uvc/uvc_video.c             |   6 +-
 fs/nfs/nfs4xdr.c                              |   2 +-
 include/linux/ipv6.h                          |   2 +-
 include/net/addrconf.h                        |   4 +-
 include/net/if_inet6.h                        |   2 +-
 include/net/ndisc.h                           |   8 +-
 include/uapi/linux/if_addr.h                  |   5 +-
 include/uapi/linux/ipv6.h                     |   4 +-
 include/uapi/linux/sysctl.h                   |   4 +-
 include/uapi/linux/usb/video.h                |   5 +-
 kernel/sysctl_binary.c                        |   3 +-
 net/6lowpan/ndisc.c                           |   4 +-
 net/ipv4/devinet.c                            |  20 ++--
 net/ipv6/addrconf.c                           | 113 ++++++++++--------
 19 files changed, 112 insertions(+), 82 deletions(-)
Documentation/networking/ip-sysctl.txt +1 -1
index 49e95f438ed7..eab3d20fc016 100644
@@ -1792,7 +1792,7 @@ temp_valid_lft - INTEGER
 	valid lifetime (in seconds) for temporary addresses.
 	Default: 604800 (7 days)
 
-temp_prefered_lft - INTEGER
+temp_preferred_lft - INTEGER
 	Preferred lifetime (in seconds) for temporary addresses.
 	Default: 86400 (1 day)
 
drivers/firmware/efi/libstub/efi-stub-helper.c +1 -1
index 3caae7f2cf56..0b0ae3844a8f 100644
@@ -717,7 +717,7 @@ efi_status_t efi_relocate_kernel(efi_system_table_t *sys_table_arg,
 	 * The EFI firmware loader could have placed the kernel image
 	 * anywhere in memory, but the kernel has restrictions on the
 	 * max physical address it can run at.  Some architectures
-	 * also have a prefered address, so first try to relocate
+	 * also have a preferred address, so first try to relocate
 	 * to the preferred address.  If that fails, allocate as low
 	 * as possible while respecting the required alignment.
 	 */
drivers/gpu/drm/amd/display/dc/inc/compressor.h +2 -2
index 7a147a9762a0..a8448f8e85d6 100644
@@ -126,9 +126,9 @@ struct fbc_requested_compressed_size {
 	unsigned int   min_size_alignment;
 	union {
 		struct {
-			/* Above preferedSize must be allocated in FB pool */
+			/* Above preferred_size must be allocated in FB pool */
 			unsigned int preferred_must_be_framebuffer_pool : 1;
-			/* Above minSize must be allocated in FB pool */
+			/* Above min_size must be allocated in FB pool */
 			unsigned int min_must_be_framebuffer_pool : 1;
 		} bits;
 		unsigned int flags;
drivers/gpu/drm/vmwgfx/vmwgfx_kms.c +1 -1
index f47d5710cc95..c8ac6968221a 100644
@@ -2306,7 +2306,7 @@ int vmw_du_connector_fill_modes(struct drm_connector *connector,
 	}
 
 	drm_connector_list_update(connector);
-	/* Move the prefered mode first, help apps pick the right mode. */
+	/* Move the preferred mode first, help apps pick the right mode. */
 	drm_mode_sort(&connector->modes);
 
 	return 1;
drivers/gpu/drm/vmwgfx/vmwgfx_kms.h +1 -1
index 3ee03227607c..335d9484e28f 100644
@@ -355,7 +355,7 @@ struct vmw_display_unit {
 	unsigned unit;
 
 	/*
-	 * Prefered mode tracking.
+	 * Preferred mode tracking.
 	 */
 	unsigned pref_width;
 	unsigned pref_height;
drivers/media/usb/uvc/uvc_video.c +3 -3
index 8fa77a81dd7f..0096e6aacdb4 100644
@@ -276,13 +276,13 @@ static int uvc_get_video_ctrl(struct uvc_streaming *stream,
 	if (size >= 34) {
 		ctrl->dwClockFrequency = get_unaligned_le32(&data[26]);
 		ctrl->bmFramingInfo = data[30];
-		ctrl->bPreferedVersion = data[31];
+		ctrl->bPreferredVersion = data[31];
 		ctrl->bMinVersion = data[32];
 		ctrl->bMaxVersion = data[33];
 	} else {
 		ctrl->dwClockFrequency = stream->dev->clock_frequency;
 		ctrl->bmFramingInfo = 0;
-		ctrl->bPreferedVersion = 0;
+		ctrl->bPreferredVersion = 0;
 		ctrl->bMinVersion = 0;
 		ctrl->bMaxVersion = 0;
 	}
@@ -325,7 +325,7 @@ static int uvc_set_video_ctrl(struct uvc_streaming *stream,
 	if (size >= 34) {
 		put_unaligned_le32(ctrl->dwClockFrequency, &data[26]);
 		data[30] = ctrl->bmFramingInfo;
-		data[31] = ctrl->bPreferedVersion;
+		data[31] = ctrl->bPreferredVersion;
 		data[32] = ctrl->bMinVersion;
 		data[33] = ctrl->bMaxVersion;
 	}
fs/nfs/nfs4xdr.c +1 -1
index ab07db0f07cd..4befb5a40218 100644
@@ -4768,7 +4768,7 @@ static int decode_attr_pnfstype(struct xdr_stream *xdr, uint32_t *bitmap,
 }
 
 /*
- * The prefered block size for layout directed io
+ * The preferred block size for layout directed io
  */
 static int decode_attr_layout_blksize(struct xdr_stream *xdr, uint32_t *bitmap,
 				      uint32_t *res)
include/linux/ipv6.h +1 -1
index ea7c7906591e..5d0fc10e9842 100644
@@ -26,7 +26,7 @@ struct ipv6_devconf {
 	__s32		mldv2_unsolicited_report_interval;
 	__s32		use_tempaddr;
 	__s32		temp_valid_lft;
-	__s32		temp_prefered_lft;
+	__s32		temp_preferred_lft;
 	__s32		regen_max_retry;
 	__s32		max_desync_factor;
 	__s32		max_addresses;
include/net/addrconf.h +2 -2
index 3f62b347b04a..754b16f7fd03 100644
@@ -43,7 +43,7 @@ struct prefix_info {
 #error "Please fix <asm/byteorder.h>"
 #endif
 	__be32			valid;
-	__be32			prefered;
+	__be32			preferred;
 	__be32			reserved2;
 
 	struct in6_addr		prefix;
@@ -121,7 +121,7 @@ int addrconf_prefix_rcv_add_addr(struct net *net, struct net_device *dev,
 				 struct inet6_dev *in6_dev,
 				 const struct in6_addr *addr, int addr_type,
 				 u32 addr_flags, bool sllao, bool tokenized,
-				 __u32 valid_lft, u32 prefered_lft);
+				 __u32 valid_lft, u32 preferred_lft);
 
 static inline void addrconf_addr_eui48_base(u8 *eui, const char *const addr)
 {
include/net/if_inet6.h +1 -1
index a01981d7108f..9055b024d439 100644
@@ -41,7 +41,7 @@ struct inet6_ifaddr {
 
 	/* In seconds, relative to tstamp. Expiry is at tstamp + HZ * lft. */
 	__u32			valid_lft;
-	__u32			prefered_lft;
+	__u32			preferred_lft;
 	refcount_t		refcnt;
 	spinlock_t		lock;
 
include/net/ndisc.h +4 -4
index b2f715ca0567..9791347f30e4 100644
@@ -189,7 +189,7 @@ void __ndisc_fill_addr_option(struct sk_buff *skb, int type, void *data,
  *			       struct in6_addr *addr,
  *			       int addr_type, u32 addr_flags,
  *			       bool sllao, bool tokenized,
- *			       __u32 valid_lft, u32 prefered_lft,
+ *			       __u32 valid_lft, u32 preferred_lft,
  *			       bool dev_addr_generated):
  *     This function is called when a RA messages is received with valid
  *     PIO option fields and an IPv6 address will be added to the interface
@@ -218,7 +218,7 @@ struct ndisc_ops {
 				       struct in6_addr *addr,
 				       int addr_type, u32 addr_flags,
 				       bool sllao, bool tokenized,
-				       __u32 valid_lft, u32 prefered_lft,
+				       __u32 valid_lft, u32 preferred_lft,
 				       bool dev_addr_generated);
 };
 
@@ -298,7 +298,7 @@ static inline void ndisc_ops_prefix_rcv_add_addr(struct net *net,
 						 int addr_type, u32 addr_flags,
 						 bool sllao, bool tokenized,
 						 __u32 valid_lft,
-						 u32 prefered_lft,
+						 u32 preferred_lft,
 						 bool dev_addr_generated)
 {
 	if (dev->ndisc_ops && dev->ndisc_ops->prefix_rcv_add_addr)
@@ -306,7 +306,7 @@ static inline void ndisc_ops_prefix_rcv_add_addr(struct net *net,
 						    addr, addr_type,
 						    addr_flags, sllao,
 						    tokenized, valid_lft,
-						    prefered_lft,
+						    preferred_lft,
 						    dev_addr_generated);
 }
 #endif
include/uapi/linux/if_addr.h +4 -1
index dfcf3ce0097f..7ad3fbe110c0 100644
@@ -57,7 +57,10 @@ enum {
 #define IFA_F_STABLE_PRIVACY	0x800
 
 struct ifa_cacheinfo {
-	__u32	ifa_prefered;
+	union {
+		__u32	ifa_preferred;
+		__u32	ifa_prefered __attribute__((deprecated)); /* NOTYPO */
+	} __attribute__((packed));
 	__u32	ifa_valid;
 	__u32	cstamp; /* created timestamp, hundredths of seconds */
 	__u32	tstamp; /* updated timestamp, hundredths of seconds */
include/uapi/linux/ipv6.h +3 -1
index 9c0f4a92bcff..04d0ddefc32c 100644
@@ -148,7 +148,9 @@ enum {
 	DEVCONF_RTR_SOLICIT_DELAY,
 	DEVCONF_USE_TEMPADDR,
 	DEVCONF_TEMP_VALID_LFT,
-	DEVCONF_TEMP_PREFERED_LFT,
+	DEVCONF_TEMP_PREFERRED_LFT,
+	DEVCONF_TEMP_PREFERED_LFT __attribute__((deprecated)) = /* NOTYPO */
+		DEVCONF_TEMP_PREFERRED_LFT,
 	DEVCONF_REGEN_MAX_RETRY,
 	DEVCONF_MAX_DESYNC_FACTOR,
 	DEVCONF_MAX_ADDRESSES,
include/uapi/linux/sysctl.h +3 -1
index 87aa2a6d9125..f76993d874fe 100644
@@ -557,7 +557,9 @@ enum {
 	NET_IPV6_RTR_SOLICIT_DELAY=10,
 	NET_IPV6_USE_TEMPADDR=11,
 	NET_IPV6_TEMP_VALID_LFT=12,
-	NET_IPV6_TEMP_PREFERED_LFT=13,
+	NET_IPV6_TEMP_PREFERRED_LFT = 13,
+	NET_IPV6_TEMP_PREFERED_LFT __attribute__((deprecated)) = /* NOTYPO */
+		NET_IPV6_TEMP_PREFERRED_LFT,
 	NET_IPV6_REGEN_MAX_RETRY=14,
 	NET_IPV6_MAX_DESYNC_FACTOR=15,
 	NET_IPV6_MAX_ADDRESSES=16,
include/uapi/linux/usb/video.h +4 -1
index d854cb19c42c..59167f0ed5c1 100644
@@ -448,7 +448,10 @@ struct uvc_streaming_control {
 	__u32 dwMaxPayloadTransferSize;
 	__u32 dwClockFrequency;
 	__u8  bmFramingInfo;
-	__u8  bPreferedVersion;
+	union {
+		__u8 bPreferredVersion;
+		__u8 bPreferedVersion __attribute__((deprecated)); /* NOTYPO */
+	} __attribute__((__packed__));
 	__u8  bMinVersion;
 	__u8  bMaxVersion;
 } __attribute__((__packed__));
kernel/sysctl_binary.c +2 -1
index 73c132095a7b..78c4f363c84b 100644
@@ -513,7 +513,8 @@ static const struct bin_table bin_net_ipv6_conf_var_table[] = {
 	{ CTL_INT,	NET_IPV6_RTR_SOLICIT_DELAY,		"router_solicitation_delay" },
 	{ CTL_INT,	NET_IPV6_USE_TEMPADDR,			"use_tempaddr" },
 	{ CTL_INT,	NET_IPV6_TEMP_VALID_LFT,		"temp_valid_lft" },
-	{ CTL_INT,	NET_IPV6_TEMP_PREFERED_LFT,		"temp_prefered_lft" },
+	{ CTL_INT,	NET_IPV6_TEMP_PREFERRED_LFT,		"temp_preferred_lft" },
+	{ CTL_INT,	NET_IPV6_TEMP_PREFERRED_LFT,		"temp_prefered_lft" }, /* NOTYPO */
 	{ CTL_INT,	NET_IPV6_REGEN_MAX_RETRY,		"regen_max_retry" },
 	{ CTL_INT,	NET_IPV6_MAX_DESYNC_FACTOR,		"max_desync_factor" },
 	{ CTL_INT,	NET_IPV6_MAX_ADDRESSES,			"max_addresses" },
net/6lowpan/ndisc.c +2 -2
index 16be8f8b2f8c..467f2b492772 100644
@@ -201,7 +201,7 @@ static void lowpan_ndisc_prefix_rcv_add_addr(struct net *net,
 					     int addr_type, u32 addr_flags,
 					     bool sllao, bool tokenized,
 					     __u32 valid_lft,
-					     u32 prefered_lft,
+					     u32 preferred_lft,
 					     bool dev_addr_generated)
 {
 	int err;
@@ -212,7 +212,7 @@ static void lowpan_ndisc_prefix_rcv_add_addr(struct net *net,
 		err = addrconf_prefix_rcv_add_addr(net, dev, pinfo, in6_dev,
 						   addr, addr_type, addr_flags,
 						   sllao, tokenized, valid_lft,
-						   prefered_lft);
+						   preferred_lft);
 		if (err)
 			ND_PRINTK(2, warn,
 				  "RA: could not add a short address based address for prefix: %pI6c\n",
net/ipv4/devinet.c +10 -10
index a4b5bd4d2c89..d20ce5648e37 100644
@@ -790,7 +790,7 @@ static void check_lifetime(struct work_struct *work)
 }
 
 static void set_ifa_lifetime(struct in_ifaddr *ifa, __u32 valid_lft,
-			     __u32 prefered_lft)
+			     __u32 preferred_lft)
 {
 	unsigned long timeout;
 
@@ -802,7 +802,7 @@ static void set_ifa_lifetime(struct in_ifaddr *ifa, __u32 valid_lft,
 	else
 		ifa->ifa_flags |= IFA_F_PERMANENT;
 
-	timeout = addrconf_timeout_fixup(prefered_lft, HZ);
+	timeout = addrconf_timeout_fixup(preferred_lft, HZ);
 	if (addrconf_finite_timeout(timeout)) {
 		if (timeout == 0)
 			ifa->ifa_flags |= IFA_F_DEPRECATED;
@@ -814,7 +814,7 @@ static void set_ifa_lifetime(struct in_ifaddr *ifa, __u32 valid_lft,
 }
 
 static struct in_ifaddr *rtm_to_ifaddr(struct net *net, struct nlmsghdr *nlh,
-				       __u32 *pvalid_lft, __u32 *pprefered_lft,
+				       __u32 *pvalid_lft, __u32 *ppreferred_lft,
 				       struct netlink_ext_ack *extack)
 {
 	struct nlattr *tb[IFA_MAX+1];
@@ -885,12 +885,12 @@ static struct in_ifaddr *rtm_to_ifaddr(struct net *net, struct nlmsghdr *nlh,
 		struct ifa_cacheinfo *ci;
 
 		ci = nla_data(tb[IFA_CACHEINFO]);
-		if (!ci->ifa_valid || ci->ifa_prefered > ci->ifa_valid) {
+		if (!ci->ifa_valid || ci->ifa_preferred > ci->ifa_valid) {
 			err = -EINVAL;
 			goto errout_free;
 		}
 		*pvalid_lft = ci->ifa_valid;
-		*pprefered_lft = ci->ifa_prefered;
+		*ppreferred_lft = ci->ifa_preferred;
 	}
 
 	return ifa;
@@ -925,11 +925,11 @@ static int inet_rtm_newaddr(struct sk_buff *skb, struct nlmsghdr *nlh,
 	struct in_ifaddr *ifa;
 	struct in_ifaddr *ifa_existing;
 	__u32 valid_lft = INFINITY_LIFE_TIME;
-	__u32 prefered_lft = INFINITY_LIFE_TIME;
+	__u32 preferred_lft = INFINITY_LIFE_TIME;
 
 	ASSERT_RTNL();
 
-	ifa = rtm_to_ifaddr(net, nlh, &valid_lft, &prefered_lft, extack);
+	ifa = rtm_to_ifaddr(net, nlh, &valid_lft, &preferred_lft, extack);
 	if (IS_ERR(ifa))
 		return PTR_ERR(ifa);
 
@@ -938,7 +938,7 @@ static int inet_rtm_newaddr(struct sk_buff *skb, struct nlmsghdr *nlh,
 		/* It would be best to check for !NLM_F_CREATE here but
 		 * userspace already relies on not having to provide this.
 		 */
-		set_ifa_lifetime(ifa, valid_lft, prefered_lft);
+		set_ifa_lifetime(ifa, valid_lft, preferred_lft);
 		if (ifa->ifa_flags & IFA_F_MCAUTOJOIN) {
 			int ret = ip_mc_config(net->ipv4.mc_autojoin_sk,
 					       true, ifa);
@@ -965,7 +965,7 @@ static int inet_rtm_newaddr(struct sk_buff *skb, struct nlmsghdr *nlh,
 			ifa->ifa_rt_priority = new_metric;
 		}
 
-		set_ifa_lifetime(ifa, valid_lft, prefered_lft);
+		set_ifa_lifetime(ifa, valid_lft, preferred_lft);
 		cancel_delayed_work(&check_lifetime_work);
 		queue_delayed_work(system_power_efficient_wq,
 				&check_lifetime_work, 0);
@@ -1639,7 +1639,7 @@ static int put_cacheinfo(struct sk_buff *skb, unsigned long cstamp,
 
 	ci.cstamp = cstamp_delta(cstamp);
 	ci.tstamp = cstamp_delta(tstamp);
-	ci.ifa_prefered = preferred;
+	ci.ifa_preferred = preferred;
 	ci.ifa_valid = valid;
 
 	return nla_put(skb, IFA_CACHEINFO, sizeof(ci), &ci);
net/ipv6/addrconf.c +66 -47

309 lines not on this page · raw message

Signature · 6 lines
2.23.0.866.gb869b98d4c-goog

_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
maintainer
#1 lore raw

Hi Mark,

Thank you for the patch.

Quoted 26 lines · Mark Salyzyn

Replace all occurrences of prefered with preferred to make future checkpatch.pl's happy. A few places the incorrect spelling is matched with the correct spelling to preserve existing user space API.

---
 Documentation/networking/ip-sysctl.txt        |   2 +-
 .../firmware/efi/libstub/efi-stub-helper.c    |   2 +-
 .../gpu/drm/amd/display/dc/inc/compressor.h   |   4 +-
 drivers/gpu/drm/vmwgfx/vmwgfx_kms.c           |   2 +-
 drivers/gpu/drm/vmwgfx/vmwgfx_kms.h           |   2 +-
 drivers/media/usb/uvc/uvc_video.c             |   6 +-
 fs/nfs/nfs4xdr.c                              |   2 +-
 include/linux/ipv6.h                          |   2 +-
 include/net/addrconf.h                        |   4 +-
 include/net/if_inet6.h                        |   2 +-
 include/net/ndisc.h                           |   8 +-
 include/uapi/linux/if_addr.h                  |   5 +-
 include/uapi/linux/ipv6.h                     |   4 +-
 include/uapi/linux/sysctl.h                   |   4 +-
 include/uapi/linux/usb/video.h                |   5 +-
 kernel/sysctl_binary.c                        |   3 +-
 net/6lowpan/ndisc.c                           |   4 +-
 net/ipv4/devinet.c                            |  20 ++--
 net/ipv6/addrconf.c                           | 113 ++++++++++--------
 19 files changed, 112 insertions(+), 82 deletions(-)

[snip]

Quoted 29 lines
drivers/media/usb/uvc/uvc_video.c +3 -3
index 8fa77a81dd7f..0096e6aacdb4 100644
@@ -276,13 +276,13 @@ static int uvc_get_video_ctrl(struct uvc_streaming *stream,
 	if (size >= 34) {
 		ctrl->dwClockFrequency = get_unaligned_le32(&data[26]);
 		ctrl->bmFramingInfo = data[30];
-		ctrl->bPreferedVersion = data[31];
+		ctrl->bPreferredVersion = data[31];
 		ctrl->bMinVersion = data[32];
 		ctrl->bMaxVersion = data[33];
 	} else {
 		ctrl->dwClockFrequency = stream->dev->clock_frequency;
 		ctrl->bmFramingInfo = 0;
-		ctrl->bPreferedVersion = 0;
+		ctrl->bPreferredVersion = 0;
 		ctrl->bMinVersion = 0;
 		ctrl->bMaxVersion = 0;
 	}
@@ -325,7 +325,7 @@ static int uvc_set_video_ctrl(struct uvc_streaming *stream,
 	if (size >= 34) {
 		put_unaligned_le32(ctrl->dwClockFrequency, &data[26]);
 		data[30] = ctrl->bmFramingInfo;
-		data[31] = ctrl->bPreferedVersion;
+		data[31] = ctrl->bPreferredVersion;
 		data[32] = ctrl->bMinVersion;
 		data[33] = ctrl->bMaxVersion;
 	}

[snip]

include/uapi/linux/usb/video.h struct uvc_streaming_control { · line 454

Quoted 13 lines
include/uapi/linux/usb/video.h +4 -1
index d854cb19c42c..59167f0ed5c1 100644
@@ -448,7 +448,10 @@ struct uvc_streaming_control {
 	__u32 dwMaxPayloadTransferSize;
 	__u32 dwClockFrequency;
 	__u8  bmFramingInfo;
-	__u8  bPreferedVersion;
+	union {
+		__u8 bPreferredVersion;
+		__u8 bPreferedVersion __attribute__((deprecated)); /* NOTYPO */
+	} __attribute__((__packed__));

Quite interestingly this typo is part of the USB device class definition for video devices (UVC) specification. I thus think we should keep using the field name bPreferedVersion through the code, otherwise it wouldn't match the spec.

Quoted 3 lines
include/uapi/linux/usb/video.h +0 -0
 	__u8  bMinVersion;
 	__u8  bMaxVersion;
 } __attribute__((__packed__));

[snip]

Signature · 3 lines
Regards,

Laurent Pinchart
#2 lore raw
In reply to Mark Salyzyn
Quoted 5 lines · Mark Salyzyn

Replace all occurrences of prefered with preferred to make future checkpatch.pl's happy. A few places the incorrect spelling is matched with the correct spelling to preserve existing user space API.

I'd fix such things when the code is otherwise change and scope this patch only to Documentation/. There is no pragmatic benefit of doing this for the code.

/Jarkko
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel

#3 lore raw
Quoted 11 lines · Jarkko Sakkinen
Quoted 5 lines · Mark Salyzyn

Replace all occurrences of prefered with preferred to make future checkpatch.pl's happy. A few places the incorrect spelling is matched with the correct spelling to preserve existing user space API.

I'd fix such things when the code is otherwise change and scope this patch only to Documentation/. There is no pragmatic benefit of doing this for the code.

/Jarkko

The pragmatic benefit comes with the use of an ABI/API checker (which is a 'distro' thing, not a top of tree kernel thing) produces its map which is typically required to be co-located in the same tree as the kernel repository. Quite a few ABI/API update checkins result in a checkpatch.pl complaint about the misspelled elements being (re-)recorded due to proximity. We have a separate task to improve how it is tracked in Android to reduce milepost marker changes that result in sweeping changes to the database which would reduce the occurrences.

I will split this between pure and inert documentation/comments for now, with a followup later for the code portion which understandably is more controversial.

Cleanup is the least appreciated part of kernel maintenance ;-}.

Sincerely -- Mark Salyzyn

#4 lore raw
Quoted 3 lines · Mark Salyzyn

I will split this between pure and inert documentation/comments for now, with a followup later for the code portion which understandably is more controversial.

Please split by driver/subsystem too, and it'll be all around much easier for everyone.

BR,
Jani.

Signature · 1 line
Jani Nikula, Intel Open Source Graphics Center
#5 lore raw
Quoted 7 lines · Jani Nikula
Quoted 3 lines · Mark Salyzyn

I will split this between pure and inert documentation/comments for now, with a followup later for the code portion which understandably is more controversial.

Please split by driver/subsystem too, and it'll be all around much easier for everyone.

I agree, spelling fixes are trivial and should go in per-subsystem.

thanks,

greg k-h
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel

#6 lore raw
In reply to Mark Salyzyn
Quoted 22 lines · Mark Salyzyn
Quoted 11 lines · Jarkko Sakkinen
Quoted 5 lines · Mark Salyzyn

Replace all occurrences of prefered with preferred to make future checkpatch.pl's happy. A few places the incorrect spelling is matched with the correct spelling to preserve existing user space API.

I'd fix such things when the code is otherwise change and scope this patch only to Documentation/. There is no pragmatic benefit of doing this for the code.

/Jarkko

The pragmatic benefit comes with the use of an ABI/API checker (which is a 'distro' thing, not a top of tree kernel thing) produces its map which is typically required to be co-located in the same tree as the kernel repository. Quite a few ABI/API update checkins result in a checkpatch.pl complaint about the misspelled elements being (re-)recorded due to proximity. We have a separate task to improve how it is tracked in Android to reduce milepost marker changes that result in sweeping changes to the database which would reduce the occurrences.

Quoted 7 lines

I will split this between pure and inert documentation/comments for now, with a followup later for the code portion which understandably is more controversial.

Cleanup is the least appreciated part of kernel maintenance ;-}.

Sincerely -- Mark Salyzyn

I'm a strong believer of "evolutionary" approach. Patch sets for the most part (everything in the end has to be considered case by case, not a strict rule) should have some functional changes involved.

What I do require for the parts that I maintain is that any new change will result cleaner code base than the one that existed before that change was applied. Again, there are some exceptions to this e.g. circulating a firmware bug but this is my driving guideline as a maintainer.

Doing cleanups just for cleanups can sometimes add unnecessary merge conflicts when backporting patches to stable kernels. Thus, if you are doing just a cleanup you should have extremely good reasons to do so.

/Jarkko

#7 lore raw
In reply to Mark Salyzyn
Quoted 13 lines · Mark Salyzyn
Quoted 11 lines · Jarkko Sakkinen
Quoted 5 lines · Mark Salyzyn

Replace all occurrences of prefered with preferred to make future checkpatch.pl's happy. A few places the incorrect spelling is matched with the correct spelling to preserve existing user space API.

I'd fix such things when the code is otherwise change and scope this patch only to Documentation/. There is no pragmatic benefit of doing this for the code.

/Jarkko

Quoted 8 lines

The pragmatic benefit comes with the use of an ABI/API checker (which is a 'distro' thing, not a top of tree kernel thing) produces its map which is typically required to be co-located in the same tree as the kernel repository. Quite a few ABI/API update checkins result in a checkpatch.pl complaint about the misspelled elements being (re-)recorded due to proximity. We have a separate task to improve how it is tracked in Android to reduce milepost marker changes that result in sweeping changes to the database which would reduce the occurrences.

Requiring checkpatch spelling warnings to be correct based on function names is crazy, you should fix your tools if you are requiring something as looney as that :)

Quoted 3 lines

I will split this between pure and inert documentation/comments for now, with a followup later for the code portion which understandably is more controversial.

Please break up per subsystem, like all trivial patches, as this isn't anything special.

thanks,

greg k-h

#8 lore raw
In reply to Mark Salyzyn
Thank you for the patch! Yet something to improve:

Hi Mark,

Thank you for the patch! Yet something to improve:

[auto build test ERROR on linus/master]
[cannot apply to v5.4-rc4 next-20191024]
[if your patch is applied to the wrong git tree, please drop us a note to help improve the system. BTW, we also suggest to use '--base' option to specify the base tree in git format-patch, please see https://stackoverflow.com/a/37406982]

url:    https://github.com/0day-ci/linux/commits/Mark-Salyzyn/Cleanup-replace-prefered-with-preferred/20191024-084105
base:   https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git 13b86bc4cd648eae69fdcf3d04b2750c76350053
config: x86_64-randconfig-a004-201942 (attached as .config)
compiler: gcc-4.9 (Debian 4.9.2-10+deb8u1) 4.9.2
reproduce:
        # save the attached .config to linux build tree
        make ARCH=x86_64 

If you fix the issue, kindly add following tag

All errors (new ones prefixed by >>):

In file included from include/linux/sysctl.h:30:0,

                    from include/linux/key.h:17,
                    from include/linux/cred.h:13,
                    from include/linux/seq_file.h:12,
                    from include/linux/cgroup.h:18,
                    from include/linux/memcontrol.h:13,
                    from include/linux/swap.h:9,
                    from include/linux/suspend.h:5,
                    from arch/x86/kernel/asm-offsets.c:13:
>> include/uapi/linux/sysctl.h:561:29: error: expected ',' or '}' before '__attribute__'
     NET_IPV6_TEMP_PREFERED_LFT __attribute__((deprecated)) = /* NOTYPO */
                                ^

make[2]: *** [arch/x86/kernel/asm-offsets.s] Error 1 make[2]: Target '__build' not remade because of errors. make[1]: *** [prepare0] Error 2
make[1]: Target 'prepare' not remade because of errors.
make: *** [sub-make] Error 2
29 real 5 user 4 sys 35.37% cpu make prepare

vim +561 include/uapi/linux/sysctl.h

546
547 enum {
548 NET_IPV6_FORWARDING=1,
549 NET_IPV6_HOP_LIMIT=2,
550 NET_IPV6_MTU=3,
551 NET_IPV6_ACCEPT_RA=4,
552 NET_IPV6_ACCEPT_REDIRECTS=5,
553 NET_IPV6_AUTOCONF=6,
554 NET_IPV6_DAD_TRANSMITS=7,
555 NET_IPV6_RTR_SOLICITS=8,
556 NET_IPV6_RTR_SOLICIT_INTERVAL=9,
557 NET_IPV6_RTR_SOLICIT_DELAY=10,
558 NET_IPV6_USE_TEMPADDR=11,
559 NET_IPV6_TEMP_VALID_LFT=12,
560 NET_IPV6_TEMP_PREFERRED_LFT = 13,

 > 561		NET_IPV6_TEMP_PREFERED_LFT __attribute__((deprecated)) = /* NOTYPO */

562 NET_IPV6_TEMP_PREFERRED_LFT,
563 NET_IPV6_REGEN_MAX_RETRY=14,
564 NET_IPV6_MAX_DESYNC_FACTOR=15,
565 NET_IPV6_MAX_ADDRESSES=16,
566 NET_IPV6_FORCE_MLD_VERSION=17,
567 NET_IPV6_ACCEPT_RA_DEFRTR=18,
568 NET_IPV6_ACCEPT_RA_PINFO=19,
569 NET_IPV6_ACCEPT_RA_RTR_PREF=20,
570 NET_IPV6_RTR_PROBE_INTERVAL=21,
571 NET_IPV6_ACCEPT_RA_RT_INFO_MAX_PLEN=22,
572 NET_IPV6_PROXY_NDP=23,
573 NET_IPV6_ACCEPT_SOURCE_ROUTE=25,
574 NET_IPV6_ACCEPT_RA_FROM_LOCAL=26,
575 NET_IPV6_ACCEPT_RA_RT_INFO_MIN_PLEN=27,
576 __NET_IPV6_MAX
577 };
578

---
0-DAY kernel test infrastructure Open Source Technology Center
https://lists.01.org/pipermail/kbuild-all Intel Corporation

_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel