Commit 2bb71b5a authored by Al Viro's avatar Al Viro Committed by Linus Torvalds

[PATCH] m68k trivial build fixes

amikbd: missing declaration
sun3_NCR5380: more work_struct mess
sun3_NCR5380: cast is not an lvalue
Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
parent 4fb23e43
...@@ -187,7 +187,7 @@ static irqreturn_t amikbd_interrupt(int irq, void *dummy) ...@@ -187,7 +187,7 @@ static irqreturn_t amikbd_interrupt(int irq, void *dummy)
static int __init amikbd_init(void) static int __init amikbd_init(void)
{ {
int i, j; int i, j, err;
if (!AMIGAHW_PRESENT(AMI_KEYBOARD)) if (!AMIGAHW_PRESENT(AMI_KEYBOARD))
return -ENODEV; return -ENODEV;
......
...@@ -266,7 +266,7 @@ static struct scsi_host_template *the_template = NULL; ...@@ -266,7 +266,7 @@ static struct scsi_host_template *the_template = NULL;
(struct NCR5380_hostdata *)(in)->hostdata (struct NCR5380_hostdata *)(in)->hostdata
#define HOSTDATA(in) ((struct NCR5380_hostdata *)(in)->hostdata) #define HOSTDATA(in) ((struct NCR5380_hostdata *)(in)->hostdata)
#define NEXT(cmd) ((struct scsi_cmnd *)((cmd)->host_scribble)) #define NEXT(cmd) (*(struct scsi_cmnd **)&((cmd)->host_scribble))
#define NEXTADDR(cmd) ((struct scsi_cmnd **)&((cmd)->host_scribble)) #define NEXTADDR(cmd) ((struct scsi_cmnd **)&((cmd)->host_scribble))
#define HOSTNO instance->host_no #define HOSTNO instance->host_no
...@@ -650,7 +650,7 @@ __inline__ void NCR5380_print_phase(struct Scsi_Host *instance) { }; ...@@ -650,7 +650,7 @@ __inline__ void NCR5380_print_phase(struct Scsi_Host *instance) { };
#include <linux/interrupt.h> #include <linux/interrupt.h>
static volatile int main_running = 0; static volatile int main_running = 0;
static DECLARE_WORK(NCR5380_tqueue, (void (*)(void*))NCR5380_main, NULL); static DECLARE_WORK(NCR5380_tqueue, NCR5380_main);
static __inline__ void queue_main(void) static __inline__ void queue_main(void)
{ {
...@@ -1031,7 +1031,7 @@ static int NCR5380_queue_command(struct scsi_cmnd *cmd, ...@@ -1031,7 +1031,7 @@ static int NCR5380_queue_command(struct scsi_cmnd *cmd,
* reenable them. This prevents reentrancy and kernel stack overflow. * reenable them. This prevents reentrancy and kernel stack overflow.
*/ */
static void NCR5380_main (void *bl) static void NCR5380_main (struct work_struct *bl)
{ {
struct scsi_cmnd *tmp, *prev; struct scsi_cmnd *tmp, *prev;
struct Scsi_Host *instance = first_instance; struct Scsi_Host *instance = first_instance;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment