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

Commit 980b306a authored Apr 25, 2008 by Denys Vlasenko Committed by James Bottomley Apr 27, 2008

[SCSI] aic7xxx: add const



This patch adds more const keywords where appropriate.

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
Acked-by: Hannes Reinecke <hare@suse.de>
Signed-off-by: James Bottomley <James.Bottomley@HansenPartnership.com>

parent d1d7b19d

drivers/scsi/aic7xxx/aic79xx.h

+3 −3

Original line number	Diff line number	Diff line
		@@ -815,7 +815,7 @@ struct ahd_tmode_tstate {
		struct ahd_phase_table_entry {
		uint8_t phase;
		uint8_t mesg_out; /* Message response to parity errors */
		char *phasemsg;
		const char *phasemsg;
		};

		/************************ Serial EEPROM Format ****************************/
		@@ -1335,9 +1335,9 @@ extern const int ahd_num_aic7770_devs;
		/******************************************************************************/

		/*************************** PCI Front End *******************************/
		struct ahd_pci_identity *ahd_find_pci_device(ahd_dev_softc_t);
		const struct ahd_pci_identity *ahd_find_pci_device(ahd_dev_softc_t);
		int ahd_pci_config(struct ahd_softc *,
		struct ahd_pci_identity *);
		const struct ahd_pci_identity *);
		int ahd_pci_test_register_access(struct ahd_softc *);
		#ifdef CONFIG_PM
		void ahd_pci_suspend(struct ahd_softc *);

drivers/scsi/aic7xxx/aic79xx_core.c

+14 −14

Original line number	Diff line number	Diff line
		@@ -52,7 +52,7 @@


		/*************************** Lookup Tables ********************************/
		static char *ahd_chip_names[] =
		static const char *const ahd_chip_names[] =
		{
		"NONE",
		"aic7901",
		@@ -66,10 +66,10 @@ static const u_int num_chip_names = ARRAY_SIZE(ahd_chip_names);
		*/
		struct ahd_hard_error_entry {
		uint8_t errno;
		char *errmesg;
		const char *errmesg;
		};

		static struct ahd_hard_error_entry ahd_hard_errors[] = {
		static const struct ahd_hard_error_entry ahd_hard_errors[] = {
		{ DSCTMOUT, "Discard Timer has timed out" },
		{ ILLOPCODE, "Illegal Opcode in sequencer program" },
		{ SQPARERR, "Sequencer Parity Error" },
		@@ -79,7 +79,7 @@ static struct ahd_hard_error_entry ahd_hard_errors[] = {
		};
		static const u_int num_errors = ARRAY_SIZE(ahd_hard_errors);

		static struct ahd_phase_table_entry ahd_phase_table[] =
		static const struct ahd_phase_table_entry ahd_phase_table[] =
		{
		{ P_DATAOUT, MSG_NOOP, "in Data-out phase" },
		{ P_DATAIN, MSG_INITIATOR_DET_ERR, "in Data-in phase" },
		@@ -213,7 +213,7 @@ static void ahd_dumpseq(struct ahd_softc *ahd);
		#endif
		static void ahd_loadseq(struct ahd_softc *ahd);
		static int ahd_check_patch(struct ahd_softc *ahd,
		struct patch **start_patch,
		const struct patch **start_patch,
		u_int start_instr, u_int *skip_addr);
		static u_int ahd_resolve_seqaddr(struct ahd_softc *ahd,
		u_int address);
		@@ -254,7 +254,7 @@ static void ahd_freeze_devq(struct ahd_softc *ahd,
		struct scb *scb);
		static void ahd_handle_scb_status(struct ahd_softc *ahd,
		struct scb *scb);
		static struct ahd_phase_table_entry* ahd_lookup_phase_entry(int phase);
		static const struct ahd_phase_table_entry* ahd_lookup_phase_entry(int phase);
		static void ahd_shutdown(void *arg);
		static void ahd_update_coalescing_values(struct ahd_softc *ahd,
		u_int timer,
		@@ -4337,11 +4337,11 @@ ahd_print_devinfo(struct ahd_softc ahd, struct ahd_devinfo devinfo)
		devinfo->target, devinfo->lun);
		}

		static struct ahd_phase_table_entry*
		static const struct ahd_phase_table_entry*
		ahd_lookup_phase_entry(int phase)
		{
		struct ahd_phase_table_entry *entry;
		struct ahd_phase_table_entry *last_entry;
		const struct ahd_phase_table_entry *entry;
		const struct ahd_phase_table_entry *last_entry;

		/*
		* num_phases doesn't include the default entry which
		@@ -9354,7 +9354,7 @@ ahd_loadseq(struct ahd_softc *ahd)
		struct cs cs_table[num_critical_sections];
		u_int begin_set[num_critical_sections];
		u_int end_set[num_critical_sections];
		struct patch *cur_patch;
		const struct patch *cur_patch;
		u_int cs_count;
		u_int cur_cs;
		u_int i;
		@@ -9509,11 +9509,11 @@ ahd_loadseq(struct ahd_softc *ahd)
		}

		static int
		ahd_check_patch(struct ahd_softc ahd, struct patch *start_patch,
		ahd_check_patch(struct ahd_softc ahd, const struct patch *start_patch,
		u_int start_instr, u_int *skip_addr)
		{
		struct patch *cur_patch;
		struct patch *last_patch;
		const struct patch *cur_patch;
		const struct patch *last_patch;
		u_int num_patches;

		num_patches = ARRAY_SIZE(patches);
		@@ -9547,7 +9547,7 @@ ahd_check_patch(struct ahd_softc ahd, struct patch *start_patch,
		static u_int
		ahd_resolve_seqaddr(struct ahd_softc *ahd, u_int address)
		{
		struct patch *cur_patch;
		const struct patch *cur_patch;
		int address_offset;
		u_int skip_addr;
		u_int i;

drivers/scsi/aic7xxx/aic79xx_osm.c

+8 −10

Original line number	Diff line number	Diff line
		@@ -193,7 +193,7 @@ struct ahd_linux_iocell_opts
		#define AIC79XX_PRECOMP_INDEX 0
		#define AIC79XX_SLEWRATE_INDEX 1
		#define AIC79XX_AMPLITUDE_INDEX 2
		static struct ahd_linux_iocell_opts aic79xx_iocell_info[] =
		static const struct ahd_linux_iocell_opts aic79xx_iocell_info[] =
		{
		AIC79XX_DEFAULT_IOOPTS,
		AIC79XX_DEFAULT_IOOPTS,
		@@ -557,13 +557,11 @@ ahd_linux_info(struct Scsi_Host *host)
		bp = &buffer[0];
		ahd = (struct ahd_softc *)host->hostdata;
		memset(bp, 0, sizeof(buffer));
		strcpy(bp, "Adaptec AIC79XX PCI-X SCSI HBA DRIVER, Rev ");
		strcat(bp, AIC79XX_DRIVER_VERSION);
		strcat(bp, "\n");
		strcat(bp, " <");
		strcpy(bp, "Adaptec AIC79XX PCI-X SCSI HBA DRIVER, Rev " AIC79XX_DRIVER_VERSION "\n"
		" <");
		strcat(bp, ahd->description);
		strcat(bp, ">\n");
		strcat(bp, " ");
		strcat(bp, ">\n"
		" ");
		ahd_controller_info(ahd, ahd_info);
		strcat(bp, ahd_info);

		@@ -1148,7 +1146,7 @@ aic79xx_setup(char *s)
		char *p;
		char *end;

		static struct {
		static const struct {
		const char *name;
		uint32_t *flag;
		} options[] = {
		@@ -1380,7 +1378,7 @@ ahd_platform_init(struct ahd_softc *ahd)
		* Lookup and commit any modified IO Cell options.
		*/
		if (ahd->unit < ARRAY_SIZE(aic79xx_iocell_info)) {
		struct ahd_linux_iocell_opts *iocell_opts;
		const struct ahd_linux_iocell_opts *iocell_opts;

		iocell_opts = &aic79xx_iocell_info[ahd->unit];
		if (iocell_opts->precomp != AIC79XX_DEFAULT_PRECOMP)
		@@ -2770,7 +2768,7 @@ static void ahd_linux_set_pcomp_en(struct scsi_target *starget, int pcomp)
		uint8_t precomp;

		if (ahd->unit < ARRAY_SIZE(aic79xx_iocell_info)) {
		struct ahd_linux_iocell_opts *iocell_opts;
		const struct ahd_linux_iocell_opts *iocell_opts;

		iocell_opts = &aic79xx_iocell_info[ahd->unit];
		precomp = iocell_opts->precomp;

drivers/scsi/aic7xxx/aic79xx_osm_pci.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -49,7 +49,7 @@
		ID2C(x), \
		ID2C(IDIROC(x))

		static struct pci_device_id ahd_linux_pci_id_table[] = {
		static const struct pci_device_id ahd_linux_pci_id_table[] = {
		/* aic7901 based controllers */
		ID(ID_AHA_29320A),
		ID(ID_AHA_29320ALP),
		@@ -159,7 +159,7 @@ ahd_linux_pci_dev_probe(struct pci_dev pdev, const struct pci_device_id ent)
		char buf[80];
		struct ahd_softc *ahd;
		ahd_dev_softc_t pci;
		struct ahd_pci_identity *entry;
		const struct ahd_pci_identity *entry;
		char *name;
		int error;
		struct device *dev = &pdev->dev;

drivers/scsi/aic7xxx/aic79xx_pci.c

+4 −4

Original line number	Diff line number	Diff line
		@@ -97,7 +97,7 @@ static ahd_device_setup_t ahd_aic7901A_setup;
		static ahd_device_setup_t ahd_aic7902_setup;
		static ahd_device_setup_t ahd_aic790X_setup;

		static struct ahd_pci_identity ahd_pci_ident_table[] =
		static const struct ahd_pci_identity ahd_pci_ident_table[] =
		{
		/* aic7901 based controllers */
		{
		@@ -253,7 +253,7 @@ static void ahd_configure_termination(struct ahd_softc *ahd,
		static void ahd_pci_split_intr(struct ahd_softc *ahd, u_int intstat);
		static void ahd_pci_intr(struct ahd_softc *ahd);

		struct ahd_pci_identity *
		const struct ahd_pci_identity *
		ahd_find_pci_device(ahd_dev_softc_t pci)
		{
		uint64_t full_id;
		@@ -261,7 +261,7 @@ ahd_find_pci_device(ahd_dev_softc_t pci)
		uint16_t vendor;
		uint16_t subdevice;
		uint16_t subvendor;
		struct ahd_pci_identity *entry;
		const struct ahd_pci_identity *entry;
		u_int i;

		vendor = ahd_pci_read_config(pci, PCIR_DEVVENDOR, /bytes/2);
		@@ -292,7 +292,7 @@ ahd_find_pci_device(ahd_dev_softc_t pci)
		}

		int
		ahd_pci_config(struct ahd_softc ahd, struct ahd_pci_identity entry)
		ahd_pci_config(struct ahd_softc ahd, const struct ahd_pci_identity entry)
		{
		struct scb_data *shared_scb_data;
		u_int command;