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

Commit a5d361fc authored by Al Viro's avatar Al Viro Committed by Linus Torvalds
Browse files

[PATCH] m68k: NULL noise removal 



Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
Cc: Roman Zippel <zippel@linux-m68k.org>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 031eb4cd

arch/m68k/mac/iop.c

+2 −2
Original line number Diff line number Diff line
@@ -293,8 +293,8 @@ void __init iop_init(void) 
	}



	for (i = 0 ; i < NUM_IOP_CHAN ; i++) {

		iop_send_queue[IOP_NUM_SCC][i] = 0;

		iop_send_queue[IOP_NUM_ISM][i] = 0;

		iop_send_queue[IOP_NUM_SCC][i] = NULL;

		iop_send_queue[IOP_NUM_ISM][i] = NULL;

		iop_listeners[IOP_NUM_SCC][i].devname = NULL;

		iop_listeners[IOP_NUM_SCC][i].handler = NULL;

		iop_listeners[IOP_NUM_ISM][i].devname = NULL;

drivers/macintosh/adb-iop.c

+1 −1
Original line number Diff line number Diff line
@@ -239,7 +239,7 @@ static int adb_iop_write(struct adb_request *req) 


	local_irq_save(flags);



	req->next = 0;

	req->next = NULL;

	req->sent = 0;

	req->complete = 0;

	req->reply_len = 0;

drivers/macintosh/via-macii.c

+2 −2
Original line number Diff line number Diff line
@@ -260,7 +260,7 @@ static int macii_write(struct adb_request *req) 
		return -EINVAL;

	}

	

	req->next = 0;

	req->next = NULL;

	req->sent = 0;

	req->complete = 0;

	req->reply_len = 0;
@@ -295,7 +295,7 @@ static void macii_poll(void) 
	unsigned long flags;



	local_irq_save(flags);

	if (via[IFR] & SR_INT) macii_interrupt(0, 0, 0);

	if (via[IFR] & SR_INT) macii_interrupt(0, NULL, NULL);

	local_irq_restore(flags);

}

drivers/macintosh/via-maciisi.c

+2 −2
Original line number Diff line number Diff line
@@ -326,7 +326,7 @@ maciisi_write(struct adb_request* req) 
		req->complete = 1;

		return -EINVAL;

	}

	req->next = 0;

	req->next = NULL;

	req->sent = 0;

	req->complete = 0;

	req->reply_len = 0;
@@ -421,7 +421,7 @@ maciisi_poll(void) 


	local_irq_save(flags);

	if (via[IFR] & SR_INT) {

		maciisi_interrupt(0, 0, 0);

		maciisi_interrupt(0, NULL, NULL);

	}

	else /* avoid calling this function too quickly in a loop */

		udelay(ADB_DELAY);

drivers/macintosh/via-pmu68k.c

+2 −2
Original line number Diff line number Diff line
@@ -493,7 +493,7 @@ pmu_queue_request(struct adb_request *req) 
		return -EINVAL;

	}



	req->next = 0;

	req->next = NULL;

	req->sent = 0;

	req->complete = 0;

	local_irq_save(flags);
@@ -717,7 +717,7 @@ pmu_handle_data(unsigned char *data, int len, struct pt_regs *regs) 
				printk(KERN_ERR "PMU: extra ADB reply\n");

				return;

			}

			req_awaiting_reply = 0;

			req_awaiting_reply = NULL;

			if (len <= 2)

				req->reply_len = 0;

			else {