Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4be929be authored by Alexey Dobriyan's avatar Alexey Dobriyan Committed by Linus Torvalds
Browse files

kernel-wide: replace USHORT_MAX, SHORT_MAX and SHORT_MIN with USHRT_MAX, SHRT_MAX and SHRT_MIN 



- C99 knows about USHRT_MAX/SHRT_MAX/SHRT_MIN, not
  USHORT_MAX/SHORT_MAX/SHORT_MIN.

- Make SHRT_MIN of type s16, not int, for consistency.

[akpm@linux-foundation.org: fix drivers/dma/timb_dma.c]
[akpm@linux-foundation.org: fix security/keys/keyring.c]
Signed-off-by: default avatarAlexey Dobriyan <adobriyan@gmail.com>
Acked-by: default avatarWANG Cong <xiyou.wangcong@gmail.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 940370fc

drivers/dma/timb_dma.c

+1 −1
Original line number Diff line number Diff line
@@ -188,7 +188,7 @@ static void __td_unmap_descs(struct timb_dma_desc *td_desc, bool single) 
static int td_fill_desc(struct timb_dma_chan *td_chan, u8 *dma_desc,

	struct scatterlist *sg, bool last)

{

	if (sg_dma_len(sg) > USHORT_MAX) {

	if (sg_dma_len(sg) > USHRT_MAX) {

		dev_err(chan2dev(&td_chan->chan), "Too big sg element\n");

		return -EINVAL;

	}

drivers/scsi/fcoe/fcoe.c

+1 −1
Original line number Diff line number Diff line
@@ -688,7 +688,7 @@ static int fcoe_shost_config(struct fc_lport *lport, struct device *dev) 
	}



	if (!lport->vport)

		fc_host_max_npiv_vports(lport->host) = USHORT_MAX;

		fc_host_max_npiv_vports(lport->host) = USHRT_MAX;



	snprintf(fc_host_symbolic_name(lport->host), FC_SYMBOLIC_NAME_SIZE,

		 "%s v%s over %s", FCOE_NAME, FCOE_VERSION,

drivers/scsi/mpt2sas/mpt2sas_base.c

+1 −1
Original line number Diff line number Diff line
@@ -3757,7 +3757,7 @@ _base_reset_handler(struct MPT2SAS_ADAPTER *ioc, int reset_phase) 
		if (ioc->config_cmds.status & MPT2_CMD_PENDING) {

			ioc->config_cmds.status |= MPT2_CMD_RESET;

			mpt2sas_base_free_smid(ioc, ioc->config_cmds.smid);

			ioc->config_cmds.smid = USHORT_MAX;

			ioc->config_cmds.smid = USHRT_MAX;

			complete(&ioc->config_cmds.done);

		}

		break;

drivers/scsi/mpt2sas/mpt2sas_config.c

+1 −1
Original line number Diff line number Diff line
@@ -258,7 +258,7 @@ mpt2sas_config_done(struct MPT2SAS_ADAPTER *ioc, u16 smid, u8 msix_index, 
#ifdef CONFIG_SCSI_MPT2SAS_LOGGING

	_config_display_some_debug(ioc, smid, "config_done", mpi_reply);

#endif

	ioc->config_cmds.smid = USHORT_MAX;

	ioc->config_cmds.smid = USHRT_MAX;

	complete(&ioc->config_cmds.done);

	return 1;

}

drivers/vhost/vhost.c

+1 −1
Original line number Diff line number Diff line
@@ -806,7 +806,7 @@ static unsigned get_indirect(struct vhost_dev *dev, struct vhost_virtqueue *vq, 
	count = indirect->len / sizeof desc;

	/* Buffers are chained via a 16 bit next field, so

	 * we can have at most 2^16 of these. */

	if (count > USHORT_MAX + 1) {

	if (count > USHRT_MAX + 1) {

		vq_err(vq, "Indirect buffer length too big: %d\n",

		       indirect->len);

		return -E2BIG;