Skip to content

Commit

Permalink
scsi/m68k: Kill NCR_700_detect() warnings
Browse files Browse the repository at this point in the history
The patch from Ming Lei <tom.leiming@gmail.com> entitled:
    platform driver: fix incorrect use of 'platform_bus_type' with 'struct devic
introduced the following warnings on m68k, as `dev' is now a `struct
platform_device *' instead of a `struct device *':

| drivers/scsi/a4000t.c:64: warning: passing argument 3 of 'NCR_700_detect' from incompatible pointer type
| drivers/scsi/mvme16x_scsi.c:67: warning: passing argument 3 of 'NCR_700_detect' from incompatible pointer type
| drivers/scsi/bvme6000_scsi.c:61: warning: passing argument 3 of 'NCR_700_detect' from incompatible pointer type

I think the below is missing (untested on real hardware).

Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
Cc: Ming Lei <tom.leiming@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  • Loading branch information
Geert Uytterhoeven authored and Greg Kroah-Hartman committed Mar 24, 2009
1 parent 7a192ec commit e5779a5
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 3 deletions.
3 changes: 2 additions & 1 deletion drivers/scsi/a4000t.c
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,8 @@ static int __devinit a4000t_probe(struct platform_device *dev)
hostdata->dcntl_extra = EA_710;

/* and register the chip */
host = NCR_700_detect(&a4000t_scsi_driver_template, hostdata, dev);
host = NCR_700_detect(&a4000t_scsi_driver_template, hostdata,
&dev->dev);
if (!host) {
printk(KERN_ERR "a4000t-scsi: No host detected; "
"board configuration problem?\n");
Expand Down
3 changes: 2 additions & 1 deletion drivers/scsi/bvme6000_scsi.c
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,8 @@ bvme6000_probe(struct platform_device *dev)
hostdata->ctest7_extra = CTEST7_TT1;

/* and register the chip */
host = NCR_700_detect(&bvme6000_scsi_driver_template, hostdata, dev);
host = NCR_700_detect(&bvme6000_scsi_driver_template, hostdata,
&dev->dev);
if (!host) {
printk(KERN_ERR "bvme6000-scsi: No host detected; "
"board configuration problem?\n");
Expand Down
3 changes: 2 additions & 1 deletion drivers/scsi/mvme16x_scsi.c
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,8 @@ mvme16x_probe(struct platform_device *dev)
hostdata->ctest7_extra = CTEST7_TT1;

/* and register the chip */
host = NCR_700_detect(&mvme16x_scsi_driver_template, hostdata, dev);
host = NCR_700_detect(&mvme16x_scsi_driver_template, hostdata,
&dev->dev);
if (!host) {
printk(KERN_ERR "mvme16x-scsi: No host detected; "
"board configuration problem?\n");
Expand Down

0 comments on commit e5779a5

Please sign in to comment.