Commit b64d76b7 authored by Sergey Ryazanov's avatar Sergey Ryazanov Committed by David S. Miller
Browse files

net: wwan: make WWAN_PORT_MAX meaning less surprised 



It is quite unusual when some value can not be equal to a defined range
max value. Also most subsystems defines FOO_TYPE_MAX as a maximum valid
value. So turn the WAN_PORT_MAX meaning from the number of supported
port types to the maximum valid port type.

Signed-off-by: default avatarSergey Ryazanov <ryazanov.s.a@gmail.com>
Reviewed-by: default avatarLoic Poulain <loic.poulain@linaro.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 9ee23f48

drivers/net/wwan/wwan_core.c

+1 −1
Original line number Diff line number Diff line
@@ -250,7 +250,7 @@ struct wwan_port *wwan_create_port(struct device *parent, 
	struct wwan_port *port;

	int minor, err = -ENOMEM;



	if (type >= WWAN_PORT_MAX || !ops)

	if (type > WWAN_PORT_MAX || !ops)

		return ERR_PTR(-EINVAL);



	/* A port is always a child of a WWAN device, retrieve (allocate or

include/linux/wwan.h

+9 −3
Original line number Diff line number Diff line
@@ -15,8 +15,10 @@ 
 * @WWAN_PORT_QMI: Qcom modem/MSM interface for modem control

 * @WWAN_PORT_QCDM: Qcom Modem diagnostic interface

 * @WWAN_PORT_FIREHOSE: XML based command protocol

 * @WWAN_PORT_UNKNOWN: Unknown port type

 * @WWAN_PORT_MAX: Number of supported port types

 *

 * @WWAN_PORT_MAX: Highest supported port types

 * @WWAN_PORT_UNKNOWN: Special value to indicate an unknown port type

 * @__WWAN_PORT_MAX: Internal use

 */

enum wwan_port_type {

	WWAN_PORT_AT,
@@ -24,8 +26,12 @@ enum wwan_port_type { 
	WWAN_PORT_QMI,

	WWAN_PORT_QCDM,

	WWAN_PORT_FIREHOSE,



	/* Add new port types above this line */



	__WWAN_PORT_MAX,

	WWAN_PORT_MAX = __WWAN_PORT_MAX - 1,

	WWAN_PORT_UNKNOWN,

	WWAN_PORT_MAX = WWAN_PORT_UNKNOWN,

};



struct wwan_port;