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

Commit 439d77f7 authored by H Hartley Sweeten's avatar H Hartley Sweeten Committed by Linus Torvalds
Browse files

scsi/sd.c: quiet all sparse noise 



In sd_store_cache_type the symbol 'len' is declared twice.  Remove the
second declaration to quiet the following sparse warning.

warning: symbol 'len' shadows an earlier one

In sd_probe the variable 'index' is declared as a u32.  This variable is
used in a call to ida_get_new which is expecting an int *.  Make the
variable an int to quiet the following sparse warning.

warning: incorrect type in argument 2 (different signedness)

There are 4 symbols in the file that are not exported and produce
the following sparse warnings.

warning: symbol 'sd_cdb_cache' was not declared. Should it be static?
warning: symbol 'sd_cdb_pool' was not declared. Should it be static?
warning: symbol 'sd_read_protection_type' was not declared. Should it be static?
warning: symbol 'sd_read_app_tag_own' was not declared. Should it be static?

Make them static to quiet the warnings.

Signed-off-by: default avatarH Hartley Sweeten <hsweeten@visionengravers.com>
Cc: James E.J. Bottomley <James.Bottomley@suse.de>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent d6e9fb46

drivers/scsi/sd.c

+6 −6
Original line number Diff line number Diff line
@@ -119,8 +119,8 @@ static DEFINE_IDA(sd_index_ida); 
 * object after last put) */

static DEFINE_MUTEX(sd_ref_mutex);



struct kmem_cache *sd_cdb_cache;

mempool_t *sd_cdb_pool;

static struct kmem_cache *sd_cdb_cache;

static mempool_t *sd_cdb_pool;



static const char *sd_cache_types[] = {

	"write through", "none", "write back",
@@ -147,7 +147,7 @@ sd_store_cache_type(struct device *dev, struct device_attribute *attr, 
		return -EINVAL;



	for (i = 0; i < ARRAY_SIZE(sd_cache_types); i++) {

		const int len = strlen(sd_cache_types[i]);

		len = strlen(sd_cache_types[i]);

		if (strncmp(sd_cache_types[i], buf, len) == 0 &&

		    buf[len] == '\n') {

			ct = i;
@@ -1423,7 +1423,7 @@ sd_spinup_disk(struct scsi_disk *sdkp) 
/*

 * Determine whether disk supports Data Integrity Field.

 */

void sd_read_protection_type(struct scsi_disk *sdkp, unsigned char *buffer)

static void sd_read_protection_type(struct scsi_disk *sdkp, unsigned char *buffer)

{

	struct scsi_device *sdp = sdkp->device;

	u8 type;
@@ -1969,7 +1969,7 @@ sd_read_cache_type(struct scsi_disk *sdkp, unsigned char *buffer) 
 * The ATO bit indicates whether the DIF application tag is available

 * for use by the operating system.

 */

void sd_read_app_tag_own(struct scsi_disk *sdkp, unsigned char *buffer)

static void sd_read_app_tag_own(struct scsi_disk *sdkp, unsigned char *buffer)

{

	int res, offset;

	struct scsi_device *sdp = sdkp->device;
@@ -2315,7 +2315,7 @@ static int sd_probe(struct device *dev) 
	struct scsi_device *sdp = to_scsi_device(dev);

	struct scsi_disk *sdkp;

	struct gendisk *gd;

	u32 index;

	int index;

	int error;



	error = -ENODEV;