Eric Lee / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit a24342b90c9c829fc5fea9ee01b127f81bca18ef

Authored by Henne
Committed by James Bottomley
1 parent 811c93666c
Exists in master and in 39 other branches 8mp-imx_5.4.70_2.3.0, 8qm-imx_5.4.70_2.3.0, emb_imx_lf-5.15.y, emb_lf-6.1.y, imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, imx_4.1.15_1.0.0_ga, pitx_8mp_lf-5.10.y, rt-smarc-imx_4.1.15_1.0.0_ga, rt_linux_5.15.71, smarc-8m-android-11.0.0_2.0.0, smarc-imx6_4.14.98_2.0.0_ga, smarc-imx6_4.9.88_2.0.0_ga, smarc-imx7_4.14.98_2.0.0_ga, smarc-imx7_4.9.11_1.0.0_ga, smarc-imx7_4.9.88_2.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-imx_4.1.15_1.0.0_ga, smarc-imx_4.9.11_1.0.0_ga, smarc-imx_4.9.51_imx8m_ga, smarc-imx_4.9.88_2.0.0_ga, smarc-m6.0.1_2.1.0-ga, smarc-n7.1.2_2.0.0-ga, smarc-rel_imx_4.1.15_1.2.0_ga, smarc_8m_00d0_imx_4.14.98_2.0.0_ga, smarc_8m_imx_4.14.78_1.0.0_ga, smarc_8m_imx_4.14.98_2.0.0_ga, smarc_8m_imx_4.19.35_1.1.0, smarc_8mm_imx_4.14.78_1.0.0_ga, smarc_8mm_imx_4.14.98_2.0.0_ga, smarc_8mm_imx_4.19.35_1.1.0, smarc_8mm_imx_5.4.24_2.1.0, smarc_8mp_lf-5.10.y, smarc_8mq_imx_5.4.24_2.1.0, smarc_8mq_lf-5.10.y, smarc_imx_lf-5.15.y

[SCSI] Scsi_Cmnd conversion in qlogicfas408 driver 

Change obsolete Scsi_Cmnd to struct scsi_cmnd in the Qlocic FAS408 driver.

Signed-off-by: Henrik Kretzschmar <henne@nachtwindheim.de>

rejections fixed and
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>

Showing 2 changed files with 24 additions and 23 deletions Side-by-side Diff

drivers/scsi/qlogicfas408.c
Diff comments   View file @ a24342b
... ... @@ -209,7 +209,7 @@
209 209 * caller must hold host lock
210 210 */
211 211  
212   -static void ql_icmd(Scsi_Cmnd * cmd)
  212 +static void ql_icmd(struct scsi_cmnd *cmd)
213 213 {
214 214 struct qlogicfas408_priv *priv = get_priv_by_cmd(cmd);
215 215 int qbase = priv->qbase;
... ... @@ -256,7 +256,7 @@
256 256 * Process scsi command - usually after interrupt
257 257 */
258 258  
259   -static unsigned int ql_pcmd(Scsi_Cmnd * cmd)
  259 +static unsigned int ql_pcmd(struct scsi_cmnd *cmd)
260 260 {
261 261 unsigned int i, j;
262 262 unsigned long k;
... ... @@ -407,7 +407,7 @@
407 407  
408 408 static void ql_ihandl(void *dev_id)
409 409 {
410   - Scsi_Cmnd *icmd;
  410 + struct scsi_cmnd *icmd;
411 411 struct Scsi_Host *host = dev_id;
412 412 struct qlogicfas408_priv *priv = get_priv_by_host(host);
413 413 int qbase = priv->qbase;
... ... @@ -447,7 +447,8 @@
447 447 * Queued command
448 448 */
449 449  
450   -int qlogicfas408_queuecommand(Scsi_Cmnd * cmd, void (*done) (Scsi_Cmnd *))
  450 +int qlogicfas408_queuecommand(struct scsi_cmnd *cmd,
  451 + void (*done) (struct scsi_cmnd *))
451 452 {
452 453 struct qlogicfas408_priv *priv = get_priv_by_cmd(cmd);
453 454 if (scmd_id(cmd) == priv->qinitid) {
... ... @@ -470,9 +471,8 @@
470 471 * Return bios parameters
471 472 */
472 473  
473   -int qlogicfas408_biosparam(struct scsi_device * disk,
474   - struct block_device *dev,
475   - sector_t capacity, int ip[])
  474 +int qlogicfas408_biosparam(struct scsi_device *disk, struct block_device *dev,
  475 + sector_t capacity, int ip[])
476 476 {
477 477 /* This should mimic the DOS Qlogic driver's behavior exactly */
478 478 ip[0] = 0x40;
... ... @@ -494,7 +494,7 @@
494 494 * Abort a command in progress
495 495 */
496 496  
497   -int qlogicfas408_abort(Scsi_Cmnd * cmd)
  497 +int qlogicfas408_abort(struct scsi_cmnd *cmd)
498 498 {
499 499 struct qlogicfas408_priv *priv = get_priv_by_cmd(cmd);
500 500 priv->qabort = 1;
... ... @@ -508,7 +508,7 @@
508 508 * the PCMCIA qlogic_stub code. This wants fixing
509 509 */
510 510  
511   -int qlogicfas408_bus_reset(Scsi_Cmnd * cmd)
  511 +int qlogicfas408_bus_reset(struct scsi_cmnd *cmd)
512 512 {
513 513 struct qlogicfas408_priv *priv = get_priv_by_cmd(cmd);
514 514 unsigned long flags;
drivers/scsi/qlogicfas408.h
Diff comments   View file @ a24342b
... ... @@ -75,15 +75,15 @@
75 75 /*----------------------------------------------------------------*/
76 76  
77 77 struct qlogicfas408_priv {
78   - int qbase; /* Port */
79   - int qinitid; /* initiator ID */
80   - int qabort; /* Flag to cause an abort */
81   - int qlirq; /* IRQ being used */
82   - int int_type; /* type of irq, 2 for ISA board, 0 for PCMCIA */
83   - char qinfo[80]; /* description */
84   - Scsi_Cmnd *qlcmd; /* current command being processed */
85   - struct Scsi_Host *shost; /* pointer back to host */
86   - struct qlogicfas408_priv *next; /* next private struct */
  78 + int qbase; /* Port */
  79 + int qinitid; /* initiator ID */
  80 + int qabort; /* Flag to cause an abort */
  81 + int qlirq; /* IRQ being used */
  82 + int int_type; /* type of irq, 2 for ISA board, 0 for PCMCIA */
  83 + char qinfo[80]; /* description */
  84 + struct scsi_cmnd *qlcmd; /* current command being processed */
  85 + struct Scsi_Host *shost; /* pointer back to host */
  86 + struct qlogicfas408_priv *next; /* next private struct */
87 87 };
88 88  
89 89 /* The qlogic card uses two register maps - These macros select which one */
90 90  
... ... @@ -103,12 +103,13 @@
103 103 #define get_priv_by_host(x) (struct qlogicfas408_priv *)&((x)->hostdata[0])
104 104  
105 105 irqreturn_t qlogicfas408_ihandl(int irq, void *dev_id);
106   -int qlogicfas408_queuecommand(Scsi_Cmnd * cmd, void (*done) (Scsi_Cmnd *));
  106 +int qlogicfas408_queuecommand(struct scsi_cmnd * cmd,
  107 + void (*done) (struct scsi_cmnd *));
107 108 int qlogicfas408_biosparam(struct scsi_device * disk,
108   - struct block_device *dev,
109   - sector_t capacity, int ip[]);
110   -int qlogicfas408_abort(Scsi_Cmnd * cmd);
111   -int qlogicfas408_bus_reset(Scsi_Cmnd * cmd);
  109 + struct block_device *dev,
  110 + sector_t capacity, int ip[]);
  111 +int qlogicfas408_abort(struct scsi_cmnd * cmd);
  112 +int qlogicfas408_bus_reset(struct scsi_cmnd * cmd);
112 113 const char *qlogicfas408_info(struct Scsi_Host *host);
113 114 int qlogicfas408_get_chip_type(int qbase, int int_type);
114 115 void qlogicfas408_setup(int qbase, int id, int int_type);