mirror of
https://github.com/SCST-project/scst.git
synced 2026-05-19 11:41:26 +00:00
Fix 3.3 checkpatch warnings about min() and max() (merge r4172 from trunk)
git-svn-id: http://svn.code.sf.net/p/scst/svn/branches/2.2.x@5032 d57e44dd-8a1f-0410-8b47-8ef2f437770f
This commit is contained in:
@@ -3955,7 +3955,7 @@ int iscsi_threads_pool_get(const cpumask_t *cpu_mask,
|
||||
INIT_LIST_HEAD(&p->threads_list);
|
||||
|
||||
if (cpu_mask == NULL)
|
||||
count = max((int)num_online_cpus(), 2);
|
||||
count = max_t(int, num_online_cpus(), 2);
|
||||
else {
|
||||
count = 0;
|
||||
for_each_cpu(i, cpu_mask)
|
||||
|
||||
@@ -2583,8 +2583,8 @@ static void q2x_init_ctio_ret_entry(ctio_ret_entry_t *ctio_m1,
|
||||
{
|
||||
TRACE_ENTRY();
|
||||
|
||||
prm->sense_buffer_len = min((uint32_t)prm->sense_buffer_len,
|
||||
(uint32_t)sizeof(ctio_m1->sense_data));
|
||||
prm->sense_buffer_len = min_t(uint32_t, prm->sense_buffer_len,
|
||||
sizeof(ctio_m1->sense_data));
|
||||
|
||||
ctio_m1->flags = cpu_to_le16(OF_SSTS | OF_FAST_POST |
|
||||
OF_NO_DATA | OF_SS_MODE_1);
|
||||
@@ -2790,8 +2790,8 @@ static void q24_init_ctio_ret_entry(ctio7_status0_entry_t *ctio,
|
||||
|
||||
TRACE_ENTRY();
|
||||
|
||||
prm->sense_buffer_len = min((uint32_t)prm->sense_buffer_len,
|
||||
(uint32_t)sizeof(ctio1->sense_data));
|
||||
prm->sense_buffer_len = min_t(uint32_t, prm->sense_buffer_len,
|
||||
sizeof(ctio1->sense_data));
|
||||
ctio->flags |= cpu_to_le16(CTIO7_FLAGS_SEND_STATUS);
|
||||
if (q2t_need_explicit_conf(prm->tgt->ha, prm->cmd, 0)) {
|
||||
ctio->flags |= cpu_to_le16(
|
||||
|
||||
Reference in New Issue
Block a user