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

Commit 84a3c97b authored by walter harms's avatar walter harms Committed by James Bottomley
Browse files

[SCSI] megaraid: fix warnings when CONFIG_PROC_FS=n 



drivers/scsi/megaraid.c: In function 'megaraid_probe_one':
drivers/scsi/megaraid.c:4893: warning: implicit declaration of function 'mega_create_proc_entry'
drivers/scsi/megaraid.c: In function 'megaraid_remove_one':
drivers/scsi/megaraid.c:4968: warning: unused variable 'buf'

Fix by adding #defines

Signed-off-by: default avatarwalter harms <wharms@bfs.de>
Signed-off-by: default avatarAlexey Dobriyan <adobriyan@gmail.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarJames Bottomley <James.Bottomley@SteelEye.com>
parent 39580f2c

drivers/scsi/megaraid.c

+11 −6
Original line number Diff line number Diff line
@@ -3177,7 +3177,10 @@ proc_rdrv(adapter_t *adapter, char *page, int start, int end ) 


	return len;

}



#else

static inline void mega_create_proc_entry(int index, struct proc_dir_entry *parent)

{

}

#endif
@@ -4342,7 +4345,7 @@ mega_support_cluster(adapter_t *adapter) 
	return 0;

}





#ifdef CONFIG_PROC_FS

/**

 * mega_adapinq()

 * @adapter - pointer to our soft state
@@ -4447,7 +4450,7 @@ mega_internal_dev_inquiry(adapter_t *adapter, u8 ch, u8 tgt, 


	return rval;

}



#endif



/**

 * mega_internal_command()
@@ -4965,7 +4968,6 @@ megaraid_remove_one(struct pci_dev *pdev) 
{

	struct Scsi_Host *host = pci_get_drvdata(pdev);

	adapter_t *adapter = (adapter_t *)host->hostdata;

	char	buf[12] = { 0 };



	scsi_remove_host(host);
@@ -5011,9 +5013,12 @@ megaraid_remove_one(struct pci_dev *pdev) 
		remove_proc_entry("raiddrives-30-39",

				adapter->controller_proc_dir_entry);

#endif

		{

			char	buf[12] = { 0 };

			sprintf(buf, "hba%d", adapter->host->host_no);

			remove_proc_entry(buf, mega_proc_dir_entry);

		}

	}

#endif



	pci_free_consistent(adapter->dev, MEGA_BUFFER_SIZE,

drivers/scsi/megaraid.h

+2 −2
Original line number Diff line number Diff line
@@ -1002,7 +1002,6 @@ static int megaraid_reset(Scsi_Cmnd *); 
static int megaraid_abort_and_reset(adapter_t *, Scsi_Cmnd *, int);

static int megaraid_biosparam(struct scsi_device *, struct block_device *,

		sector_t, int []);

static int mega_print_inquiry(char *, char *);



static int mega_build_sglist (adapter_t *adapter, scb_t *scb,

			      u32 *buffer, u32 *length);
@@ -1024,6 +1023,7 @@ static int mega_init_scb (adapter_t *); 
static int mega_is_bios_enabled (adapter_t *);



#ifdef CONFIG_PROC_FS

static int mega_print_inquiry(char *, char *);

static void mega_create_proc_entry(int, struct proc_dir_entry *);

static int proc_read_config(char *, char **, off_t, int, int *, void *);

static int proc_read_stat(char *, char **, off_t, int, int *, void *);
@@ -1040,10 +1040,10 @@ static int proc_rdrv_20(char *, char **, off_t, int, int *, void *); 
static int proc_rdrv_30(char *, char **, off_t, int, int *, void *);

static int proc_rdrv_40(char *, char **, off_t, int, int *, void *);

static int proc_rdrv(adapter_t *, char *, int, int);

#endif



static int mega_adapinq(adapter_t *, dma_addr_t);

static int mega_internal_dev_inquiry(adapter_t *, u8, u8, dma_addr_t);

#endif



static int mega_support_ext_cdb(adapter_t *);

static mega_passthru* mega_prepare_passthru(adapter_t *, scb_t *,