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

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

[PATCH] sparc: vfc __iomem annotations and fixes 



Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent f8ad23a4

drivers/sbus/char/vfc.h

+1 −1
Original line number Diff line number Diff line
@@ -125,7 +125,7 @@ struct vfc_regs { 




struct vfc_dev {

	volatile struct vfc_regs *regs;

	volatile struct vfc_regs __iomem *regs;

	struct vfc_regs *phys_regs;

	unsigned int control_reg;

	struct semaphore device_lock_sem;

drivers/sbus/char/vfc_dev.c

+3 −3
Original line number Diff line number Diff line
@@ -149,7 +149,7 @@ int init_vfc_device(struct sbus_dev *sdev,struct vfc_dev *dev, int instance) 
	}

	printk("Initializing vfc%d\n",instance);

	dev->regs = NULL;

	dev->regs = (volatile struct vfc_regs *)

	dev->regs = (volatile struct vfc_regs __iomem *)

		sbus_ioremap(&sdev->resource[0], 0,

			     sizeof(struct vfc_regs), vfcstr);

	dev->which_io = sdev->reg_addrs[0].which_io;
@@ -319,7 +319,7 @@ int vfc_capture_poll(struct vfc_dev *dev) 
	int timeout = 1000;



	while (!timeout--) {

		if (dev->regs->control & VFC_STATUS_CAPTURE)

		if (sbus_readl(&dev->regs->control) & VFC_STATUS_CAPTURE)

			break;

		vfc_i2c_delay_no_busy(dev, 100);

	}
@@ -718,7 +718,7 @@ static void deinit_vfc_device(struct vfc_dev *dev) 
	if(dev == NULL)

		return;

	devfs_remove("vfc/%d", dev->instance);

	sbus_iounmap((unsigned long)dev->regs, sizeof(struct vfc_regs));

	sbus_iounmap(dev->regs, sizeof(struct vfc_regs));

	kfree(dev);

}