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

Commit f7e8d9f8 authored by David S. Miller's avatar David S. Miller
Browse files

qlogicpti: Fix build warning. 



The build warns:

drivers/scsi/qlogicpti.c: In function 'qpti_sbus_probe':
drivers/scsi/qlogicpti.c:1316:45: warning: passing argument 1 of 'scsi_host_alloc' discards 'const' qualifier from pointer target type [enabled by default]
include/scsi/scsi_host.h:778:26: note: expected 'struct scsi_host_template *' but argument is of type 'const struct scsi_host_template *'

The problem is that of_device_id->data is a const void pointer.

This is pretty silly in this specific instance, because for all
matched device IDs we set match->data to the same value,
&qpti_template.

So just use that directly instead of the unnecessary and improperly
typed abstraction.

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 1df35f80

drivers/scsi/qlogicpti.c

+1 −12
Original line number Diff line number Diff line
@@ -1294,26 +1294,19 @@ static struct scsi_host_template qpti_template = { 
static const struct of_device_id qpti_match[];

static int __devinit qpti_sbus_probe(struct platform_device *op)

{

	const struct of_device_id *match;

	struct scsi_host_template *tpnt;

	struct device_node *dp = op->dev.of_node;

	struct Scsi_Host *host;

	struct qlogicpti *qpti;

	static int nqptis;

	const char *fcode;



	match = of_match_device(qpti_match, &op->dev);

	if (!match)

		return -EINVAL;

	tpnt = match->data;



	/* Sometimes Antares cards come up not completely

	 * setup, and we get a report of a zero IRQ.

	 */

	if (op->archdata.irqs[0] == 0)

		return -ENODEV;



	host = scsi_host_alloc(tpnt, sizeof(struct qlogicpti));

	host = scsi_host_alloc(&qpti_template, sizeof(struct qlogicpti));

	if (!host)

		return -ENOMEM;
@@ -1445,19 +1438,15 @@ static int __devexit qpti_sbus_remove(struct platform_device *op) 
static const struct of_device_id qpti_match[] = {

	{

		.name = "ptisp",

		.data = &qpti_template,

	},

	{

		.name = "PTI,ptisp",

		.data = &qpti_template,

	},

	{

		.name = "QLGC,isp",

		.data = &qpti_template,

	},

	{

		.name = "SUNW,isp",

		.data = &qpti_template,

	},

	{},

};