From patchwork Thu Jun 23 10:24:30 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Krzysztof Kozlowski X-Patchwork-Id: 12892065 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 9D038C43334 for ; Thu, 23 Jun 2022 10:24:53 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230421AbiFWKYv (ORCPT ); Thu, 23 Jun 2022 06:24:51 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54558 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230248AbiFWKYn (ORCPT ); Thu, 23 Jun 2022 06:24:43 -0400 Received: from mail-ej1-x630.google.com (mail-ej1-x630.google.com [IPv6:2a00:1450:4864:20::630]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id EF63E3E5F7 for ; Thu, 23 Jun 2022 03:24:40 -0700 (PDT) Received: by mail-ej1-x630.google.com with SMTP id g26so18659447ejb.5 for ; Thu, 23 Jun 2022 03:24:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=UMHcbNV6LUSIBgqPCd8l2C2cXREeSA5BqoEsfTECcso=; b=dirVe3A3Q6SuaQgZgCIa3gHPqzzyWr9SPGuDGoD1Y8w8AwRKlPL0B3bHAtE9dymWqK oempeMTv8sWoW2T/O2v15XFL2raCGVsE+QmLL6gC7ZWya8q+PnwdDRCgVNyPC9Woi07x PK5FsY8z7VvOZ7tvpJmGL6lUZzg5C/9PPkik4IshaXEAKg5tejDkazgmxJaHsCsjP8V4 FzKD4ibmqUU0/3tcob1YB5lD4uhgFw3bX5jv7HDRNpbcONCDHxwUlblqE01d5T8f/IcM b10sxQfX5SzraoirZxjq9C8LBaPLWFVclalzWstEakRRxqnPtHZ+dQp59ChCSWQx9oz5 d2Ww== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=UMHcbNV6LUSIBgqPCd8l2C2cXREeSA5BqoEsfTECcso=; b=5e/hBEXR1P9/+PGp5e3m0S9q3663OZOchDu0dGrZTFRV9xOy2RPhEsLCIKMsFgGCZ6 c2c/idFfDRNPUovT3Ye1nMmCiBrmVqw08Ood0tA8kZeaFpsYiDc0Pz03hPfMzR3jNuzl rB5OYbD95Mnr74uDLsAXQAoLMBkjMymoSZ3Hkq+kx0xQ1ZyO6A7R/zmQYE/vowQUdPma EEyVgMRlZuBg5saXZeOq2/srtOHL67yC/TbSa5P2D83FzFKSRw5AFSNNI3fyXIEQMyGk dH4k+4VcHYsdOdx3to/6VLyGGD9o9Be5P2hJNyJ/r+UogdLR1m21ioTUB81qtJhiWprK CNDg== X-Gm-Message-State: AJIora9dlG2QyyoxK0G9Q+/E7vT/rAD7+nG4dg3/fMeModl6NmEvsPJX d7jeTQ99UCmNgFZ5N5fiTQktUg== X-Google-Smtp-Source: AGRyM1tPk0ehpC4cidkKbYWC+gkd+OpQCKel+SFWzCULqS0VveOGsZ8egk9pOrUUGoQooWtMejbZfw== X-Received: by 2002:a17:907:1c8f:b0:6e8:f898:63bb with SMTP id nb15-20020a1709071c8f00b006e8f89863bbmr7793487ejc.721.1655979879291; Thu, 23 Jun 2022 03:24:39 -0700 (PDT) Received: from localhost.localdomain (xdsl-188-155-176-92.adslplus.ch. [188.155.176.92]) by smtp.gmail.com with ESMTPSA id 15-20020a170906300f00b006f3ef214dd9sm10692128ejz.63.2022.06.23.03.24.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 23 Jun 2022 03:24:38 -0700 (PDT) From: Krzysztof Kozlowski To: "James E.J. Bottomley" , "Martin K. Petersen" , Damien Le Moal , Doug Gilbert , linux-scsi@vger.kernel.org, linux-kernel@vger.kernel.org, linux-ide@vger.kernel.org Cc: Krzysztof Kozlowski Subject: [PATCH v4 1/3] scsi: core: fix white-spaces Date: Thu, 23 Jun 2022 12:24:30 +0200 Message-Id: <20220623102432.108059-2-krzysztof.kozlowski@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220623102432.108059-1-krzysztof.kozlowski@linaro.org> References: <20220623102432.108059-1-krzysztof.kozlowski@linaro.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-scsi@vger.kernel.org Remove trailing white-spaces and correct mixed-up indentation. Signed-off-by: Krzysztof Kozlowski --- drivers/scsi/scsi_debug.c | 2 +- drivers/scsi/scsi_priv.h | 4 +-- drivers/scsi/scsi_proc.c | 14 ++++----- drivers/scsi/scsi_scan.c | 10 +++---- drivers/scsi/scsi_sysfs.c | 4 +-- drivers/scsi/scsi_transport_spi.c | 49 +++++++++++++++---------------- drivers/scsi/scsicam.c | 6 ++-- drivers/scsi/sr.c | 8 ++--- include/linux/libata.h | 6 ++-- include/scsi/scsi_cmnd.h | 2 +- include/scsi/scsi_device.h | 10 +++---- include/scsi/scsi_host.h | 13 ++++---- include/scsi/scsi_ioctl.h | 2 +- include/scsi/scsi_transport.h | 2 +- include/scsi/scsi_transport_spi.h | 2 +- include/scsi/scsicam.h | 2 +- include/scsi/sg.h | 2 +- 17 files changed, 68 insertions(+), 70 deletions(-) diff --git a/drivers/scsi/scsi_debug.c b/drivers/scsi/scsi_debug.c index 1f423f723d06..5ef54b1f97f9 100644 --- a/drivers/scsi/scsi_debug.c +++ b/drivers/scsi/scsi_debug.c @@ -1610,7 +1610,7 @@ static int resp_inquiry(struct scsi_cmnd *scp, struct sdebug_dev_info *devip) u32 len; char lu_id_str[6]; int host_no = devip->sdbg_host->shost->host_no; - + port_group_id = (((host_no + 1) & 0x7f) << 8) + (devip->channel & 0x7f); if (sdebug_vpd_use_hostno == 0) diff --git a/drivers/scsi/scsi_priv.h b/drivers/scsi/scsi_priv.h index 5c4786310a31..8bc7353883ee 100644 --- a/drivers/scsi/scsi_priv.h +++ b/drivers/scsi/scsi_priv.h @@ -37,7 +37,7 @@ void scsi_init_command(struct scsi_device *dev, struct scsi_cmnd *cmd); void scsi_log_send(struct scsi_cmnd *cmd); void scsi_log_completion(struct scsi_cmnd *cmd, int disposition); #else -static inline void scsi_log_send(struct scsi_cmnd *cmd) +static inline void scsi_log_send(struct scsi_cmnd *cmd) { }; static inline void scsi_log_completion(struct scsi_cmnd *cmd, int disposition) { }; @@ -183,7 +183,7 @@ struct bsg_device *scsi_bsg_register_queue(struct scsi_device *sdev); extern int scsi_device_max_queue_depth(struct scsi_device *sdev); -/* +/* * internal scsi timeout functions: for use by mid-layer and transport * classes. */ diff --git a/drivers/scsi/scsi_proc.c b/drivers/scsi/scsi_proc.c index 95aee1ad1383..72548b9e685a 100644 --- a/drivers/scsi/scsi_proc.c +++ b/drivers/scsi/scsi_proc.c @@ -4,13 +4,13 @@ * * The functions in this file provide an interface between * the PROC file system and the SCSI device drivers - * It is mainly used for debugging, statistics and to pass + * It is mainly used for debugging, statistics and to pass * information directly to the lowlevel driver. * - * (c) 1995 Michael Neuffer neuffer@goofy.zdv.uni-mainz.de + * (c) 1995 Michael Neuffer neuffer@goofy.zdv.uni-mainz.de * Version: 0.99.8 last change: 95/09/13 - * - * generic command parser provided by: + * + * generic command parser provided by: * Andreas Heilwagen * * generic_proc_info() support of xxxx_info() by: @@ -52,7 +52,7 @@ static ssize_t proc_scsi_host_write(struct file *file, const char __user *buf, struct Scsi_Host *shost = pde_data(file_inode(file)); ssize_t ret = -ENOMEM; char *page; - + if (count > PROC_BLOCK_SIZE) return -EOVERFLOW; @@ -106,7 +106,7 @@ void scsi_proc_hostdir_add(struct scsi_host_template *sht) mutex_lock(&global_host_template_mutex); if (!sht->present++) { sht->proc_dir = proc_mkdir(sht->proc_name, proc_scsi); - if (!sht->proc_dir) + if (!sht->proc_dir) printk(KERN_ERR "%s: proc_mkdir failed for %s\n", __func__, sht->proc_name); } @@ -361,7 +361,7 @@ static ssize_t proc_scsi_write(struct file *file, const char __user *buf, } /* - * convert success returns so that we return the + * convert success returns so that we return the * number of bytes consumed. */ if (!err) diff --git a/drivers/scsi/scsi_scan.c b/drivers/scsi/scsi_scan.c index 91ac901a6682..1ffc5e137fdd 100644 --- a/drivers/scsi/scsi_scan.c +++ b/drivers/scsi/scsi_scan.c @@ -108,7 +108,7 @@ MODULE_PARM_DESC(scan, "sync, async, manual, or none. " static unsigned int scsi_inq_timeout = SCSI_TIMEOUT/HZ + 18; module_param_named(inq_timeout, scsi_inq_timeout, uint, S_IRUGO|S_IWUSR); -MODULE_PARM_DESC(inq_timeout, +MODULE_PARM_DESC(inq_timeout, "Timeout (in seconds) waiting for devices to answer INQUIRY." " Default is 20. Some devices may need more; most need less."); @@ -687,7 +687,7 @@ static int scsi_probe_lun(struct scsi_device *sdev, unsigned char *inq_result, * not-ready to ready transition [asc/ascq=0x28/0x0] * or power-on, reset [asc/ascq=0x29/0x0], continue. * INQUIRY should not yield UNIT_ATTENTION - * but many buggy devices do so anyway. + * but many buggy devices do so anyway. */ if (scsi_status_is_check_condition(result) && scsi_sense_valid(&sshdr)) { @@ -943,7 +943,7 @@ static int scsi_add_lun(struct scsi_device *sdev, unsigned char *inq_result, * Don't set the device offline here; rather let the upper * level drivers eval the PQ to decide whether they should * attach. So remove ((inq_result[0] >> 5) & 7) == 1 check. - */ + */ sdev->inq_periph_qual = (inq_result[0] >> 5) & 7; sdev->lockable = sdev->removable; @@ -1098,7 +1098,7 @@ static int scsi_add_lun(struct scsi_device *sdev, unsigned char *inq_result, } #ifdef CONFIG_SCSI_LOGGING -/** +/** * scsi_inq_str - print INQUIRY data from min to max index, strip trailing whitespace * @buf: Output buffer with at least end-first+1 bytes of space * @inq: Inquiry buffer (input) @@ -1598,7 +1598,7 @@ EXPORT_SYMBOL(__scsi_add_device); int scsi_add_device(struct Scsi_Host *host, uint channel, uint target, u64 lun) { - struct scsi_device *sdev = + struct scsi_device *sdev = __scsi_add_device(host, channel, target, lun, NULL); if (IS_ERR(sdev)) return PTR_ERR(sdev); diff --git a/drivers/scsi/scsi_sysfs.c b/drivers/scsi/scsi_sysfs.c index 43949798a2e4..00334e189f98 100644 --- a/drivers/scsi/scsi_sysfs.c +++ b/drivers/scsi/scsi_sysfs.c @@ -672,7 +672,7 @@ static int scsi_sdev_check_buf_bit(const char *buf) return 1; else if (buf[0] == '0') return 0; - else + else return -EINVAL; } else return -EINVAL; @@ -888,7 +888,7 @@ store_queue_type_field(struct device *dev, struct device_attribute *attr, if (!sdev->tagged_supported) return -EINVAL; - + sdev_printk(KERN_INFO, sdev, "ignoring write to deprecated queue_type attribute"); return count; diff --git a/drivers/scsi/scsi_transport_spi.c b/drivers/scsi/scsi_transport_spi.c index bd72c38d7bfc..51d163200f41 100644 --- a/drivers/scsi/scsi_transport_spi.c +++ b/drivers/scsi/scsi_transport_spi.c @@ -1,5 +1,5 @@ // SPDX-License-Identifier: GPL-2.0-or-later -/* +/* * Parallel SCSI (SPI) transport specific attributes exported to sysfs. * * Copyright (c) 2003 Silicon Graphics, Inc. All rights reserved. @@ -33,7 +33,7 @@ #define DV_LOOPS 3 #define DV_TIMEOUT (10*HZ) -#define DV_RETRIES 3 /* should only need at most +#define DV_RETRIES 3 /* should only need at most * two cc/ua clears */ /* Our blacklist flags */ @@ -651,7 +651,7 @@ spi_dv_device_echo_buffer(struct scsi_device *sdev, u8 *buffer, * 0xffff (test b) */ for ( ; j < min(len, k + 32); j += 2) { u16 *word = (u16 *)&buffer[j]; - + *word = (j & 0x02) ? 0x0000 : 0xffff; } k = j; @@ -667,7 +667,7 @@ spi_dv_device_echo_buffer(struct scsi_device *sdev, u8 *buffer, for ( ; j < min(len, k + 32); j += 4) { u32 *word = (unsigned int *)&buffer[j]; u32 roll = (pattern & 0x80000000) ? 1 : 0; - + *word = pattern; pattern = (pattern << 1) | roll; } @@ -724,7 +724,7 @@ spi_dv_device_compare_inquiry(struct scsi_device *sdev, u8 *buffer, result = spi_execute(sdev, spi_inquiry, DMA_FROM_DEVICE, ptr, len, NULL); - + if(result || !scsi_device_online(sdev)) { scsi_device_set_state(sdev, SDEV_QUIESCE); return SPI_COMPARE_FAILURE; @@ -747,12 +747,12 @@ spi_dv_device_compare_inquiry(struct scsi_device *sdev, u8 *buffer, static enum spi_compare_returns spi_dv_retrain(struct scsi_device *sdev, u8 *buffer, u8 *ptr, - enum spi_compare_returns + enum spi_compare_returns (*compare_fn)(struct scsi_device *, u8 *, u8 *, int)) { struct spi_internal *i = to_spi_internal(sdev->host->transportt); struct scsi_target *starget = sdev->sdev_target; - int period = 0, prevperiod = 0; + int period = 0, prevperiod = 0; enum spi_compare_returns retval; @@ -808,11 +808,11 @@ spi_dv_device_get_echo_buffer(struct scsi_device *sdev, u8 *buffer) { int l, result; - /* first off do a test unit ready. This can error out + /* first off do a test unit ready. This can error out * because of reservations or some other reason. If it * fails, the device won't let us write to the echo buffer * so just return failure */ - + static const char spi_test_unit_ready[] = { TEST_UNIT_READY, 0, 0, 0, 0, 0 }; @@ -821,14 +821,13 @@ spi_dv_device_get_echo_buffer(struct scsi_device *sdev, u8 *buffer) READ_BUFFER, 0x0b, 0, 0, 0, 0, 0, 0, 4, 0 }; - - /* We send a set of three TURs to clear any outstanding + /* We send a set of three TURs to clear any outstanding * unit attention conditions if they exist (Otherwise the * buffer tests won't be happy). If the TUR still fails * (reservation conflict, device not ready, etc) just * skip the write tests */ for (l = 0; ; l++) { - result = spi_execute(sdev, spi_test_unit_ready, DMA_NONE, + result = spi_execute(sdev, spi_test_unit_ready, DMA_NONE, NULL, 0, NULL); if(result) { @@ -840,7 +839,7 @@ spi_dv_device_get_echo_buffer(struct scsi_device *sdev, u8 *buffer) } } - result = spi_execute(sdev, spi_read_buffer_descriptor, + result = spi_execute(sdev, spi_read_buffer_descriptor, DMA_FROM_DEVICE, buffer, 4, NULL); if (result) @@ -1222,7 +1221,7 @@ EXPORT_SYMBOL_GPL(spi_populate_ppr_msg); * @cmd: pointer to the scsi command for the tag * * Notes: - * designed to create the correct type of tag message for the + * designed to create the correct type of tag message for the * particular request. Returns the size of the tag message. * May return 0 if TCQ is disabled for this device. **/ @@ -1231,7 +1230,7 @@ int spi_populate_tag_msg(unsigned char *msg, struct scsi_cmnd *cmd) if (cmd->flags & SCMD_TAGGED) { *msg++ = SIMPLE_QUEUE_TAG; *msg++ = scsi_cmd_to_rq(cmd)->tag; - return 2; + return 2; } return 0; @@ -1241,10 +1240,10 @@ EXPORT_SYMBOL_GPL(spi_populate_tag_msg); #ifdef CONFIG_SCSI_CONSTANTS static const char * const one_byte_msgs[] = { /* 0x00 */ "Task Complete", NULL /* Extended Message */, "Save Pointers", -/* 0x03 */ "Restore Pointers", "Disconnect", "Initiator Error", +/* 0x03 */ "Restore Pointers", "Disconnect", "Initiator Error", /* 0x06 */ "Abort Task Set", "Message Reject", "Nop", "Message Parity Error", /* 0x0a */ "Linked Command Complete", "Linked Command Complete w/flag", -/* 0x0c */ "Target Reset", "Abort Task", "Clear Task Set", +/* 0x0c */ "Target Reset", "Abort Task", "Clear Task Set", /* 0x0f */ "Initiate Recovery", "Release Recovery", /* 0x11 */ "Terminate Process", "Continue Task", "Target Transfer Disable", /* 0x14 */ NULL, NULL, "Clear ACA", "LUN Reset" @@ -1290,8 +1289,8 @@ int spi_print_msg(const unsigned char *msg) if (len == 2) len += 256; if (msg[2] < ARRAY_SIZE(extended_msgs)) - printk ("%s ", extended_msgs[msg[2]]); - else + printk ("%s ", extended_msgs[msg[2]]); + else printk ("Extended Message, reserved code (0x%02x) ", (int) msg[2]); switch (msg[2]) { @@ -1312,7 +1311,7 @@ int spi_print_msg(const unsigned char *msg) print_ptr(msg, 7, "in"); break; default: - for (i = 2; i < len; ++i) + for (i = 2; i < len; ++i) printk("%02x ", msg[i]); } /* Identify */ @@ -1332,13 +1331,13 @@ int spi_print_msg(const unsigned char *msg) /* Two byte */ } else if (msg[0] <= 0x2f) { if ((msg[0] - 0x20) < ARRAY_SIZE(two_byte_msgs)) - printk("%s %02x ", two_byte_msgs[msg[0] - 0x20], + printk("%s %02x ", two_byte_msgs[msg[0] - 0x20], msg[1]); - else - printk("reserved two byte (%02x %02x) ", + else + printk("reserved two byte (%02x %02x) ", msg[0], msg[1]); len = 2; - } else + } else printk("reserved "); return len; } @@ -1366,7 +1365,7 @@ int spi_print_msg(const unsigned char *msg) } else if (msg[0] <= 0x2f) { printk("%02x %02x", msg[0], msg[1]); len = 2; - } else + } else printk("%02x ", msg[0]); return len; } diff --git a/drivers/scsi/scsicam.c b/drivers/scsi/scsicam.c index e2c7d8ef205f..a30b0a3fe68f 100644 --- a/drivers/scsi/scsicam.c +++ b/drivers/scsi/scsicam.c @@ -3,7 +3,7 @@ * scsicam.c - SCSI CAM support functions, use for HDIO_GETGEO, etc. * * Copyright 1993, 1994 Drew Eckhardt - * Visionary Computing + * Visionary Computing * (Unix and Linux consulting and custom programming) * drew@Colorado.EDU * +1 (303) 786-7975 @@ -159,7 +159,7 @@ EXPORT_SYMBOL(scsi_partsize); * Information technology - * SCSI-2 Common access method * transport and SCSI interface module - * + * * ANNEX A : * * setsize() converts a read capacity value to int 13h @@ -169,7 +169,7 @@ EXPORT_SYMBOL(scsi_partsize); * will not fit in 4 bits (or 6 bits). This algorithm also * minimizes the number of sectors that will be unused at the end * of the disk while allowing for very large disks to be - * accommodated. This algorithm does not use physical geometry. + * accommodated. This algorithm does not use physical geometry. */ static int setsize(unsigned long capacity, unsigned int *cyls, unsigned int *hds, diff --git a/drivers/scsi/sr.c b/drivers/scsi/sr.c index 32d3b8274f14..2b6d08ab61fa 100644 --- a/drivers/scsi/sr.c +++ b/drivers/scsi/sr.c @@ -94,7 +94,7 @@ static const struct dev_pm_ops sr_pm_ops = { static struct scsi_driver sr_template = { .gendrv = { - .name = "sr", + .name = "sr", .owner = THIS_MODULE, .probe = sr_probe, .remove = sr_remove, @@ -123,8 +123,8 @@ static int sr_read_cdda_bpc(struct cdrom_device_info *cdi, void __user *ubuf, static const struct cdrom_device_ops sr_dops = { .open = sr_open, - .release = sr_release, - .drive_status = sr_drive_status, + .release = sr_release, + .drive_status = sr_drive_status, .check_events = sr_check_events, .tray_move = sr_tray_move, .lock_door = sr_lock_door, @@ -600,7 +600,7 @@ static int sr_open(struct cdrom_device_info *cdi, int purpose) return 0; error_out: - return retval; + return retval; } static void sr_release(struct cdrom_device_info *cdi) diff --git a/include/linux/libata.h b/include/linux/libata.h index 732de9014626..3d9317aedf85 100644 --- a/include/linux/libata.h +++ b/include/linux/libata.h @@ -564,7 +564,7 @@ struct ata_ioports { struct ata_host { spinlock_t lock; - struct device *dev; + struct device *dev; void __iomem * const *iomap; unsigned int n_ports; unsigned int n_tags; /* nr of NCQ tags */ @@ -833,7 +833,7 @@ struct ata_port { struct ata_port_stats stats; struct ata_host *host; - struct device *dev; + struct device *dev; struct device tdev; struct mutex scsi_scan_mutex; @@ -986,7 +986,7 @@ struct ata_port_info { unsigned long mwdma_mask; unsigned long udma_mask; struct ata_port_operations *port_ops; - void *private_data; + void *private_data; }; struct ata_timing { diff --git a/include/scsi/scsi_cmnd.h b/include/scsi/scsi_cmnd.h index 1e80e70dfa92..410a2ceefc52 100644 --- a/include/scsi/scsi_cmnd.h +++ b/include/scsi/scsi_cmnd.h @@ -105,7 +105,7 @@ struct scsi_cmnd { unsigned transfersize; /* How much we are guaranteed to transfer with each SCSI transfer - (ie, between disconnect / + (ie, between disconnect / reconnects. Probably == sector size */ unsigned resid_len; /* residual count */ diff --git a/include/scsi/scsi_device.h b/include/scsi/scsi_device.h index 7cf5f3b7589f..1fb790ef9b96 100644 --- a/include/scsi/scsi_device.h +++ b/include/scsi/scsi_device.h @@ -42,7 +42,7 @@ enum scsi_device_state { * All commands allowed */ SDEV_CANCEL, /* beginning to delete device * Only error handler commands allowed */ - SDEV_DEL, /* device deleted + SDEV_DEL, /* device deleted * no commands allowed */ SDEV_QUIESCE, /* Device quiescent. No block commands * will be accepted, only specials (which @@ -130,14 +130,14 @@ struct scsi_device { unsigned int id, channel; u64 lun; - unsigned int manufacturer; /* Manufacturer of device, for using + unsigned int manufacturer; /* Manufacturer of device, for using * vendor-specific cmd's */ unsigned sector_size; /* size in bytes */ void *hostdata; /* available to low-level driver */ unsigned char type; char scsi_level; - char inq_periph_qual; /* PQ from INQUIRY data */ + char inq_periph_qual; /* PQ from INQUIRY data */ struct mutex inquiry_mutex; unsigned char inquiry_len; /* valid bytes in 'inquiry' */ unsigned char * inquiry; /* INQUIRY response data */ @@ -165,7 +165,7 @@ struct scsi_device { unsigned busy:1; /* Used to prevent races */ unsigned lockable:1; /* Able to prevent media removal */ unsigned locked:1; /* Media removal disabled */ - unsigned borken:1; /* Tell the Seagate driver to be + unsigned borken:1; /* Tell the Seagate driver to be * painfully slow on this device */ unsigned disconnect:1; /* can disconnect */ unsigned soft_reset:1; /* Uses soft reset option */ @@ -174,7 +174,7 @@ struct scsi_device { unsigned ppr:1; /* Device supports PPR messages */ unsigned tagged_supported:1; /* Supports SCSI-II tagged queuing */ unsigned simple_tags:1; /* simple queue tag messages are enabled */ - unsigned was_reset:1; /* There was a bus reset on the bus for + unsigned was_reset:1; /* There was a bus reset on the bus for * this device */ unsigned expecting_cc_ua:1; /* Expecting a CHECK_CONDITION/UNIT_ATTN * because we did a bus reset. */ diff --git a/include/scsi/scsi_host.h b/include/scsi/scsi_host.h index 667d889b92b5..44ff28d8fd0d 100644 --- a/include/scsi/scsi_host.h +++ b/include/scsi/scsi_host.h @@ -178,7 +178,7 @@ struct scsi_host_template { * this function, it *must* perform the task of setting the queue * depth on the device. All other tasks are optional and depend * on what the driver supports and various implementation details. - * + * * Things currently recommended to be handled at this time include: * * 1. Setting the device queue depth. Proper setting of this is @@ -207,7 +207,7 @@ struct scsi_host_template { * has ceased the mid layer calls this point so that the low level * driver may completely detach itself from the scsi device and vice * versa. The low level driver is responsible for freeing any memory - * it allocated in the slave_alloc or slave_configure calls. + * it allocated in the slave_alloc or slave_configure calls. * * Status: OPTIONAL */ @@ -466,7 +466,7 @@ struct scsi_host_template { /* * Default value for the blocking. If the queue is empty, * host_blocked counts down in the request_fn until it restarts - * host operations as zero is reached. + * host operations as zero is reached. * * FIXME: This should probably be a value in the template */ @@ -540,7 +540,7 @@ struct Scsi_Host { */ struct list_head __devices; struct list_head __targets; - + struct list_head starved_list; spinlock_t default_lock; @@ -565,7 +565,7 @@ struct Scsi_Host { unsigned int host_failed; /* commands that failed. protected by host_lock */ unsigned int host_eh_scheduled; /* EH scheduled without command */ - + unsigned int host_no; /* Used for IOCTL_GET_IDLUN, /proc/scsi et al. */ /* next two fields are used to bound the time spent in error handling */ @@ -627,7 +627,7 @@ struct Scsi_Host { * time being. */ unsigned host_self_blocked:1; - + /* * Host uses correct SCSI ordering not PC ordering. The bit is * set for the minority of drivers whose authors actually read @@ -682,7 +682,6 @@ struct Scsi_Host { unsigned char n_io_port; unsigned char dma_channel; unsigned int irq; - enum scsi_host_state shost_state; diff --git a/include/scsi/scsi_ioctl.h b/include/scsi/scsi_ioctl.h index beac64e38b87..c3ab331c809b 100644 --- a/include/scsi/scsi_ioctl.h +++ b/include/scsi/scsi_ioctl.h @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: GPL-2.0 */ #ifndef _SCSI_IOCTL_H -#define _SCSI_IOCTL_H +#define _SCSI_IOCTL_H #define SCSI_IOCTL_SEND_COMMAND 1 #define SCSI_IOCTL_TEST_UNIT_READY 2 diff --git a/include/scsi/scsi_transport.h b/include/scsi/scsi_transport.h index a0458bda3148..1a7b92f8b423 100644 --- a/include/scsi/scsi_transport.h +++ b/include/scsi/scsi_transport.h @@ -1,5 +1,5 @@ /* SPDX-License-Identifier: GPL-2.0-only */ -/* +/* * Transport specific attributes. * * Copyright (c) 2003 Silicon Graphics, Inc. All rights reserved. diff --git a/include/scsi/scsi_transport_spi.h b/include/scsi/scsi_transport_spi.h index 78324502b1c9..d967bc6f1836 100644 --- a/include/scsi/scsi_transport_spi.h +++ b/include/scsi/scsi_transport_spi.h @@ -1,5 +1,5 @@ /* SPDX-License-Identifier: GPL-2.0-or-later */ -/* +/* * Parallel SCSI (SPI) transport specific attributes exported to sysfs. * * Copyright (c) 2003 Silicon Graphics, Inc. All rights reserved. diff --git a/include/scsi/scsicam.h b/include/scsi/scsicam.h index 08edd603e521..3a37512c06ec 100644 --- a/include/scsi/scsicam.h +++ b/include/scsi/scsicam.h @@ -3,7 +3,7 @@ * scsicam.h - SCSI CAM support functions, use for HDIO_GETGEO, etc. * * Copyright 1993, 1994 Drew Eckhardt - * Visionary Computing + * Visionary Computing * (Unix and Linux consulting and custom programming) * drew@Colorado.EDU * +1 (303) 786-7975 diff --git a/include/scsi/sg.h b/include/scsi/sg.h index 068e35d36557..e16160b5b407 100644 --- a/include/scsi/sg.h +++ b/include/scsi/sg.h @@ -244,7 +244,7 @@ typedef struct sg_req_info { /* used by SG_GET_REQUEST_TABLE ioctl() */ #define SG_GET_KEEP_ORPHAN 0x2288 /* yields scsi midlevel's access_count for this SCSI device */ -#define SG_GET_ACCESS_COUNT 0x2289 +#define SG_GET_ACCESS_COUNT 0x2289 #define SG_SCATTER_SZ (8 * 4096) From patchwork Thu Jun 23 10:24:31 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Krzysztof Kozlowski X-Patchwork-Id: 12892066 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 28912C433EF for ; Thu, 23 Jun 2022 10:24:54 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230357AbiFWKYx (ORCPT ); Thu, 23 Jun 2022 06:24:53 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54572 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230370AbiFWKYn (ORCPT ); Thu, 23 Jun 2022 06:24:43 -0400 Received: from mail-ej1-x634.google.com (mail-ej1-x634.google.com [IPv6:2a00:1450:4864:20::634]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B2B3B3D1D5 for ; Thu, 23 Jun 2022 03:24:41 -0700 (PDT) Received: by mail-ej1-x634.google.com with SMTP id lw20so17714258ejb.4 for ; Thu, 23 Jun 2022 03:24:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=OcOxzRrmout0J6KGnfy+0CFuX6gez+EVlPisuTa/Efo=; b=XXHC1h9NIZtSXCdxkZC4+2oX9kyJq0XfXoQRxh/3fYGxrkAM7yJJkZXGwKFVEPXVKM qeeqdGJuhE41gxChF0BRzJmR8ELmhG+QgmesJX9uThU4trQu4aMoVbP6dVx4ya6H6xhO 75wgzV14RihAQZgf20b/xXmyzAnreJYWHz7zCzTIz7mjRYM8tWwo/JSCveoP8Lnl4+w+ 6jOAC3CgH2u+K0d4wTYUhMqqKyHDWIsO10yNJPuqTwtMUqMEj/7yOrVi91SEbqTTJEUQ zieybDJZ1vziRz5yMLWK2Kx+EdEhJJ8H0x3uj4PWHhzYWz5F50IFmxoonty0WBgNHBew fRDw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=OcOxzRrmout0J6KGnfy+0CFuX6gez+EVlPisuTa/Efo=; b=rZpN+bSg4gaW84GEIhh8w2bFafSJY/QdaBq6Q+54IBHFcj58Ep/ILKA9rvUBi8wdtp oDRZiRvDCzalpvdlMRY5w+L3Dq5jPkz31pEHHNxkclNYHSKHSnWzltgpG58+X7hhmySx 9J7AvfQB2vK/jm75v7IEGfOHtD/3UcUkFjrlhcRKPKOxi93cyaPS2Ia4n/sYoYF7bdzL S+/Tm2YJw4LPmeb9Y6VxugZI4Ft4gVGrqJXHsTmsnuPt29YSpe+Q2rvtXK5gZv19lh8Y Bk3qGWdCKZDeDoY3FfTJ6DG218kTslmLDRrfgvcmShZF221cAf43hsphVYrNYW6g+uOs pSdg== X-Gm-Message-State: AJIora+uOQjbGIFEV1c7JM3T8K+fzZedEJ2Xr2ZyP9/470sCv4Ivnukr 1qB8wltx6naP39IcQN1AMEojng== X-Google-Smtp-Source: AGRyM1v+zfjYyrIJHG7DNkBmGM+zEYv9Y2gwhU7r8LrRr5hAnM0h81pD2+LM9BZAFfGUuis78PUwdA== X-Received: by 2002:a17:906:1c9:b0:712:1115:42a5 with SMTP id 9-20020a17090601c900b00712111542a5mr7234837ejj.662.1655979880272; Thu, 23 Jun 2022 03:24:40 -0700 (PDT) Received: from localhost.localdomain (xdsl-188-155-176-92.adslplus.ch. [188.155.176.92]) by smtp.gmail.com with ESMTPSA id 15-20020a170906300f00b006f3ef214dd9sm10692128ejz.63.2022.06.23.03.24.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 23 Jun 2022 03:24:39 -0700 (PDT) From: Krzysztof Kozlowski To: "James E.J. Bottomley" , "Martin K. Petersen" , Damien Le Moal , Doug Gilbert , linux-scsi@vger.kernel.org, linux-kernel@vger.kernel.org, linux-ide@vger.kernel.org Cc: Krzysztof Kozlowski , Bart Van Assche Subject: [PATCH v4 2/3] scsi: ufs: ufshcd-pltfrm: constify pointed data Date: Thu, 23 Jun 2022 12:24:31 +0200 Message-Id: <20220623102432.108059-3-krzysztof.kozlowski@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220623102432.108059-1-krzysztof.kozlowski@linaro.org> References: <20220623102432.108059-1-krzysztof.kozlowski@linaro.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-scsi@vger.kernel.org Constify pointers to data which is not modified for code safety. Signed-off-by: Krzysztof Kozlowski Reviewed-by: Bart Van Assche --- drivers/ufs/host/ufshcd-pltfrm.c | 10 +++++----- drivers/ufs/host/ufshcd-pltfrm.h | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/drivers/ufs/host/ufshcd-pltfrm.c b/drivers/ufs/host/ufshcd-pltfrm.c index e7332cc65b1f..e0b7c02092cc 100644 --- a/drivers/ufs/host/ufshcd-pltfrm.c +++ b/drivers/ufs/host/ufshcd-pltfrm.c @@ -26,7 +26,7 @@ static int ufshcd_parse_clock_info(struct ufs_hba *hba) int i; struct device *dev = hba->dev; struct device_node *np = dev->of_node; - char *name; + const char *name; u32 *clkfreq = NULL; struct ufs_clk_info *clki; int len = 0; @@ -79,8 +79,8 @@ static int ufshcd_parse_clock_info(struct ufs_hba *hba) } for (i = 0; i < sz; i += 2) { - ret = of_property_read_string_index(np, - "clock-names", i/2, (const char **)&name); + ret = of_property_read_string_index(np, "clock-names", i/2, + &name); if (ret) goto out; @@ -208,8 +208,8 @@ static void ufshcd_init_lanes_per_dir(struct ufs_hba *hba) * * Returns 0 on success, non-zero value on failure */ -int ufshcd_get_pwr_dev_param(struct ufs_dev_params *pltfrm_param, - struct ufs_pa_layer_attr *dev_max, +int ufshcd_get_pwr_dev_param(const struct ufs_dev_params *pltfrm_param, + const struct ufs_pa_layer_attr *dev_max, struct ufs_pa_layer_attr *agreed_pwr) { int min_pltfrm_gear; diff --git a/drivers/ufs/host/ufshcd-pltfrm.h b/drivers/ufs/host/ufshcd-pltfrm.h index 43c2e412bd99..fead72998dca 100644 --- a/drivers/ufs/host/ufshcd-pltfrm.h +++ b/drivers/ufs/host/ufshcd-pltfrm.h @@ -25,8 +25,8 @@ struct ufs_dev_params { u32 desired_working_mode; }; -int ufshcd_get_pwr_dev_param(struct ufs_dev_params *dev_param, - struct ufs_pa_layer_attr *dev_max, +int ufshcd_get_pwr_dev_param(const struct ufs_dev_params *dev_param, + const struct ufs_pa_layer_attr *dev_max, struct ufs_pa_layer_attr *agreed_pwr); void ufshcd_init_pwr_dev_param(struct ufs_dev_params *dev_param); int ufshcd_pltfrm_init(struct platform_device *pdev, From patchwork Thu Jun 23 10:24:32 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Krzysztof Kozlowski X-Patchwork-Id: 12892067 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id D2B54C43334 for ; Thu, 23 Jun 2022 10:25:09 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230511AbiFWKZI (ORCPT ); Thu, 23 Jun 2022 06:25:08 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54698 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230314AbiFWKYv (ORCPT ); Thu, 23 Jun 2022 06:24:51 -0400 Received: from mail-ej1-x62c.google.com (mail-ej1-x62c.google.com [IPv6:2a00:1450:4864:20::62c]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 48C5549F1A for ; Thu, 23 Jun 2022 03:24:43 -0700 (PDT) Received: by mail-ej1-x62c.google.com with SMTP id sb34so11004319ejc.11 for ; Thu, 23 Jun 2022 03:24:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=abFcN7yt45SAGecDxFSgv8asUDSKLZ0iooh6X0QnrtM=; b=kz3Wdh6KLPaVMA1S/IqIpp6DgZU4rRVcYPQ4sclUQn7bznussF6Dd/sSWuTnG9Fho1 40PT4gbksc5gMT7uj4O1GgSIUJ7v9bejewE1D9UfVacauFOBs9D57BYZsL5PxT7s4BTa i4WAjrE/Uf7CVlKnQuOTlrl5whclsslzecddKUXJDevmgidEJ0kRcKzg1UZLq3DCFXO7 Sidl6DZFUvuON4JekMxz+Mp/pjFHkPQQTud+Dv6LxueIxw+c94/g8Zr4rGsm/gpG0p9g quvfnjMVUhPHmUctCyD75tn6FOgkoI7iYeXh9ubB1etfFywIDKnBq9ZMjfilk9jh0adr gS2A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=abFcN7yt45SAGecDxFSgv8asUDSKLZ0iooh6X0QnrtM=; b=DVE5GiGJqw8zf4ho0QP3hTPX0tpXQfsPp2iroWh6d/4p6vuokU0OjaErRtJMhJgKyQ DC7uwF9oMnZG1Q9NmtTuxEeKy7STUk4t84kPXL1h4oxHd/Dau2r69PGS20FerkZ/s4oI yaewHyc8bAPAW8FJr7vhc1IAli7rX4nHvuhtTOob7yLBSXYekr/rtz83G/LFJn6Sh1dz qyzDjS61xjrfJbY/X8TZK1Gaj0lf2MUComPVR2+aD7pr/Km7V3LZ5nipanEifjTsYRdy RbsFvMMYZnNufJWaZADIsdcypC5zTQ4/NRVUfchhaP49nyt2VrNMQeGqVxvx/m5Q+14o bdcA== X-Gm-Message-State: AJIora9hE43T4VQvf74NbeTqgfxFd7jIH1i0rcdN5eUPcYiblMElpYlY vCteWEhkcnJLxH/klggy84WyhA== X-Google-Smtp-Source: AGRyM1vKi7gNH6A091rkjDn8tue2t5aKDS/UlumenTlpfwCwy53xNbqKWKG/nbEN5R62WeybpuqCpg== X-Received: by 2002:a17:907:2da9:b0:722:ce54:2cd1 with SMTP id gt41-20020a1709072da900b00722ce542cd1mr7638664ejc.517.1655979881672; Thu, 23 Jun 2022 03:24:41 -0700 (PDT) Received: from localhost.localdomain (xdsl-188-155-176-92.adslplus.ch. [188.155.176.92]) by smtp.gmail.com with ESMTPSA id 15-20020a170906300f00b006f3ef214dd9sm10692128ejz.63.2022.06.23.03.24.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 23 Jun 2022 03:24:40 -0700 (PDT) From: Krzysztof Kozlowski To: "James E.J. Bottomley" , "Martin K. Petersen" , Damien Le Moal , Doug Gilbert , linux-scsi@vger.kernel.org, linux-kernel@vger.kernel.org, linux-ide@vger.kernel.org Cc: Krzysztof Kozlowski , Bart Van Assche Subject: [PATCH v4 3/3] scsi: ufs: ufshcd: constify pointed data Date: Thu, 23 Jun 2022 12:24:32 +0200 Message-Id: <20220623102432.108059-4-krzysztof.kozlowski@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220623102432.108059-1-krzysztof.kozlowski@linaro.org> References: <20220623102432.108059-1-krzysztof.kozlowski@linaro.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-scsi@vger.kernel.org Constify arrays and pointers to data which are not modified for code safety. Signed-off-by: Krzysztof Kozlowski Reviewed-by: Bart Van Assche --- drivers/ufs/core/ufshcd-priv.h | 6 ++--- drivers/ufs/core/ufshcd.c | 42 ++++++++++++++++++---------------- include/ufs/ufshcd.h | 6 ++--- 3 files changed, 28 insertions(+), 26 deletions(-) diff --git a/drivers/ufs/core/ufshcd-priv.h b/drivers/ufs/core/ufshcd-priv.h index ffb01fc6de75..8f67db202d7b 100644 --- a/drivers/ufs/core/ufshcd-priv.h +++ b/drivers/ufs/core/ufshcd-priv.h @@ -215,7 +215,7 @@ static inline void ufshcd_vops_config_scaling_param(struct ufs_hba *hba, hba->vops->config_scaling_param(hba, p, data); } -extern struct ufs_pm_lvl_states ufs_pm_lvl_states[]; +extern const struct ufs_pm_lvl_states ufs_pm_lvl_states[]; /** * ufshcd_scsi_to_upiu_lun - maps scsi LUN to UPIU LUN @@ -234,8 +234,8 @@ static inline u8 ufshcd_scsi_to_upiu_lun(unsigned int scsi_lun) int __ufshcd_write_ee_control(struct ufs_hba *hba, u32 ee_ctrl_mask); int ufshcd_write_ee_control(struct ufs_hba *hba); -int ufshcd_update_ee_control(struct ufs_hba *hba, u16 *mask, u16 *other_mask, - u16 set, u16 clr); +int ufshcd_update_ee_control(struct ufs_hba *hba, u16 *mask, + const u16 *other_mask, u16 set, u16 clr); static inline int ufshcd_update_ee_drv_mask(struct ufs_hba *hba, u16 set, u16 clr) diff --git a/drivers/ufs/core/ufshcd.c b/drivers/ufs/core/ufshcd.c index 01fb4bad86be..94d059c7473d 100644 --- a/drivers/ufs/core/ufshcd.c +++ b/drivers/ufs/core/ufshcd.c @@ -175,7 +175,7 @@ enum { #define ufshcd_clear_eh_in_progress(h) \ ((h)->eh_flags &= ~UFSHCD_EH_IN_PROGRESS) -struct ufs_pm_lvl_states ufs_pm_lvl_states[] = { +const struct ufs_pm_lvl_states ufs_pm_lvl_states[] = { [UFS_PM_LVL_0] = {UFS_ACTIVE_PWR_MODE, UIC_LINK_ACTIVE_STATE}, [UFS_PM_LVL_1] = {UFS_ACTIVE_PWR_MODE, UIC_LINK_HIBERN8_STATE}, [UFS_PM_LVL_2] = {UFS_SLEEP_PWR_MODE, UIC_LINK_ACTIVE_STATE}, @@ -363,7 +363,7 @@ static void ufshcd_add_tm_upiu_trace(struct ufs_hba *hba, unsigned int tag, } static void ufshcd_add_uic_command_trace(struct ufs_hba *hba, - struct uic_command *ucmd, + const struct uic_command *ucmd, enum ufs_trace_str_t str_t) { u32 cmd; @@ -443,11 +443,11 @@ static void ufshcd_print_clk_freqs(struct ufs_hba *hba) } static void ufshcd_print_evt(struct ufs_hba *hba, u32 id, - char *err_name) + const char *err_name) { int i; bool found = false; - struct ufs_event_hist *e; + const struct ufs_event_hist *e; if (id >= UFS_EVT_CNT) return; @@ -497,7 +497,7 @@ static void ufshcd_print_evt_hist(struct ufs_hba *hba) static void ufshcd_print_trs(struct ufs_hba *hba, unsigned long bitmap, bool pr_prdt) { - struct ufshcd_lrb *lrbp; + const struct ufshcd_lrb *lrbp; int prdt_length; int tag; @@ -553,7 +553,7 @@ static void ufshcd_print_tmrs(struct ufs_hba *hba, unsigned long bitmap) static void ufshcd_print_host_state(struct ufs_hba *hba) { - struct scsi_device *sdev_ufs = hba->ufs_device_wlun; + const struct scsi_device *sdev_ufs = hba->ufs_device_wlun; dev_err(hba->dev, "UFS Host state=%d\n", hba->ufshcd_state); dev_err(hba->dev, "outstanding reqs=0x%lx tasks=0x%lx\n", @@ -1098,7 +1098,7 @@ static bool ufshcd_is_devfreq_scaling_required(struct ufs_hba *hba, */ static u32 ufshcd_pending_cmds(struct ufs_hba *hba) { - struct scsi_device *sdev; + const struct scsi_device *sdev; u32 pending = 0; lockdep_assert_held(hba->host->host_lock); @@ -2069,14 +2069,15 @@ static inline int ufshcd_monitor_opcode2dir(u8 opcode) static inline bool ufshcd_should_inform_monitor(struct ufs_hba *hba, struct ufshcd_lrb *lrbp) { - struct ufs_hba_monitor *m = &hba->monitor; + const struct ufs_hba_monitor *m = &hba->monitor; return (m->enabled && lrbp && lrbp->cmd && (!m->chunk_size || m->chunk_size == lrbp->cmd->sdb.length) && ktime_before(hba->monitor.enabled_ts, lrbp->issue_time_stamp)); } -static void ufshcd_start_monitor(struct ufs_hba *hba, struct ufshcd_lrb *lrbp) +static void ufshcd_start_monitor(struct ufs_hba *hba, + const struct ufshcd_lrb *lrbp) { int dir = ufshcd_monitor_opcode2dir(*lrbp->cmd->cmnd); unsigned long flags; @@ -2087,14 +2088,14 @@ static void ufshcd_start_monitor(struct ufs_hba *hba, struct ufshcd_lrb *lrbp) spin_unlock_irqrestore(hba->host->host_lock, flags); } -static void ufshcd_update_monitor(struct ufs_hba *hba, struct ufshcd_lrb *lrbp) +static void ufshcd_update_monitor(struct ufs_hba *hba, const struct ufshcd_lrb *lrbp) { int dir = ufshcd_monitor_opcode2dir(*lrbp->cmd->cmnd); unsigned long flags; spin_lock_irqsave(hba->host->host_lock, flags); if (dir >= 0 && hba->monitor.nr_queued[dir] > 0) { - struct request *req = scsi_cmd_to_rq(lrbp->cmd); + const struct request *req = scsi_cmd_to_rq(lrbp->cmd); struct ufs_hba_monitor *m = &hba->monitor; ktime_t now, inc, lat; @@ -4899,7 +4900,7 @@ static int ufshcd_get_lu_wp(struct ufs_hba *hba, * */ static inline void ufshcd_get_lu_power_on_wp_status(struct ufs_hba *hba, - struct scsi_device *sdev) + const struct scsi_device *sdev) { if (hba->dev_info.f_power_on_wp_en && !hba->dev_info.is_lu_power_on_wp) { @@ -5418,8 +5419,8 @@ int ufshcd_write_ee_control(struct ufs_hba *hba) return err; } -int ufshcd_update_ee_control(struct ufs_hba *hba, u16 *mask, u16 *other_mask, - u16 set, u16 clr) +int ufshcd_update_ee_control(struct ufs_hba *hba, u16 *mask, + const u16 *other_mask, u16 set, u16 clr) { u16 new_mask, ee_ctrl_mask; int err = 0; @@ -7346,7 +7347,8 @@ static int ufshcd_eh_host_reset_handler(struct scsi_cmnd *cmd) * * Returns calculated max ICC level for specific regulator */ -static u32 ufshcd_get_max_icc_level(int sup_curr_uA, u32 start_scan, char *buff) +static u32 ufshcd_get_max_icc_level(int sup_curr_uA, u32 start_scan, + const char *buff) { int i; int curr_uA; @@ -7393,7 +7395,7 @@ static u32 ufshcd_get_max_icc_level(int sup_curr_uA, u32 start_scan, char *buff) * Returns calculated ICC level */ static u32 ufshcd_find_max_sup_active_icc_level(struct ufs_hba *hba, - u8 *desc_buf, int len) + const u8 *desc_buf, int len) { u32 icc_level = 0; @@ -7543,7 +7545,7 @@ static int ufshcd_scsi_add_wlus(struct ufs_hba *hba) return ret; } -static void ufshcd_wb_probe(struct ufs_hba *hba, u8 *desc_buf) +static void ufshcd_wb_probe(struct ufs_hba *hba, const u8 *desc_buf) { struct ufs_dev_info *dev_info = &hba->dev_info; u8 lun; @@ -7614,7 +7616,7 @@ static void ufshcd_wb_probe(struct ufs_hba *hba, u8 *desc_buf) hba->caps &= ~UFSHCD_CAP_WB_EN; } -static void ufshcd_temp_notif_probe(struct ufs_hba *hba, u8 *desc_buf) +static void ufshcd_temp_notif_probe(struct ufs_hba *hba, const u8 *desc_buf) { struct ufs_dev_info *dev_info = &hba->dev_info; u32 ext_ufs_feature; @@ -7848,7 +7850,7 @@ static int ufshcd_quirk_tune_host_pa_tactivate(struct ufs_hba *hba) u32 granularity, peer_granularity; u32 pa_tactivate, peer_pa_tactivate; u32 pa_tactivate_us, peer_pa_tactivate_us; - u8 gran_to_us_table[] = {1, 4, 8, 16, 32, 100}; + static const u8 gran_to_us_table[] = {1, 4, 8, 16, 32, 100}; ret = ufshcd_dme_get(hba, UIC_ARG_MIB(PA_GRANULARITY), &granularity); @@ -7965,7 +7967,7 @@ struct ufs_ref_clk { enum ufs_ref_clk_freq val; }; -static struct ufs_ref_clk ufs_ref_clk_freqs[] = { +static const struct ufs_ref_clk ufs_ref_clk_freqs[] = { {19200000, REF_CLK_FREQ_19_2_MHZ}, {26000000, REF_CLK_FREQ_26_MHZ}, {38400000, REF_CLK_FREQ_38_4_MHZ}, diff --git a/include/ufs/ufshcd.h b/include/ufs/ufshcd.h index a92271421718..4f0531af9141 100644 --- a/include/ufs/ufshcd.h +++ b/include/ufs/ufshcd.h @@ -1217,14 +1217,14 @@ static inline int ufshcd_vops_phy_initialization(struct ufs_hba *hba) return 0; } -extern struct ufs_pm_lvl_states ufs_pm_lvl_states[]; +extern const struct ufs_pm_lvl_states ufs_pm_lvl_states[]; int ufshcd_dump_regs(struct ufs_hba *hba, size_t offset, size_t len, const char *prefix); int __ufshcd_write_ee_control(struct ufs_hba *hba, u32 ee_ctrl_mask); int ufshcd_write_ee_control(struct ufs_hba *hba); -int ufshcd_update_ee_control(struct ufs_hba *hba, u16 *mask, u16 *other_mask, - u16 set, u16 clr); +int ufshcd_update_ee_control(struct ufs_hba *hba, u16 *mask, + const u16 *other_mask, u16 set, u16 clr); #endif /* End of Header */