[PATCH 7/9] [Xilinx] xilinx_hwicap: use linux/io.h instead of asm/io.h

Grant Likely grant.likely at secretlab.ca
Wed Aug 11 04:16:56 EST 2010


On Fri, Jul 23, 2010 at 2:57 PM, Stephen Neuendorffer
<stephen.neuendorffer at xilinx.com> wrote:
> Better style, and it gives access to the asm-generic/iomap.h
> accessors in all architectures.
>
> Signed-off-by: Stephen Neuendorffer <stephen.neuendorffer at xilinx.com>

Looks good, but isn't a device-tree specific thing.  Should at least
go to linux-kernel before I pick it up to avoid troding on toes.

Acked-by: Grant Likely <grant.likely at secretlab.ca>

g.

> ---
>  drivers/char/xilinx_hwicap/buffer_icap.h   |    3 +--
>  drivers/char/xilinx_hwicap/fifo_icap.h     |    3 +--
>  drivers/char/xilinx_hwicap/xilinx_hwicap.c |    3 +--
>  drivers/char/xilinx_hwicap/xilinx_hwicap.h |    3 +--
>  4 files changed, 4 insertions(+), 8 deletions(-)
>
> diff --git a/drivers/char/xilinx_hwicap/buffer_icap.h b/drivers/char/xilinx_hwicap/buffer_icap.h
> index d4f419e..aa859b0 100644
> --- a/drivers/char/xilinx_hwicap/buffer_icap.h
> +++ b/drivers/char/xilinx_hwicap/buffer_icap.h
> @@ -36,8 +36,7 @@
>  #include <linux/types.h>
>  #include <linux/cdev.h>
>  #include <linux/platform_device.h>
> -
> -#include <asm/io.h>
> +#include <linux/io.h>
>  #include "xilinx_hwicap.h"
>
>  /* Loads a partial bitstream from system memory. */
> diff --git a/drivers/char/xilinx_hwicap/fifo_icap.h b/drivers/char/xilinx_hwicap/fifo_icap.h
> index 4c9dd9a..b266c40 100644
> --- a/drivers/char/xilinx_hwicap/fifo_icap.h
> +++ b/drivers/char/xilinx_hwicap/fifo_icap.h
> @@ -36,8 +36,7 @@
>  #include <linux/types.h>
>  #include <linux/cdev.h>
>  #include <linux/platform_device.h>
> -
> -#include <asm/io.h>
> +#include <linux/io.h>
>  #include "xilinx_hwicap.h"
>
>  /* Reads integers from the device into the storage buffer. */
> diff --git a/drivers/char/xilinx_hwicap/xilinx_hwicap.c b/drivers/char/xilinx_hwicap/xilinx_hwicap.c
> index ed8a9ce..6172689 100644
> --- a/drivers/char/xilinx_hwicap/xilinx_hwicap.c
> +++ b/drivers/char/xilinx_hwicap/xilinx_hwicap.c
> @@ -87,8 +87,7 @@
>  #include <linux/cdev.h>
>  #include <linux/platform_device.h>
>  #include <linux/slab.h>
> -
> -#include <asm/io.h>
> +#include <linux/io.h>
>  #include <asm/uaccess.h>
>  #include <asm/system.h>
>
> diff --git a/drivers/char/xilinx_hwicap/xilinx_hwicap.h b/drivers/char/xilinx_hwicap/xilinx_hwicap.h
> index 8cca119..e0a6857 100644
> --- a/drivers/char/xilinx_hwicap/xilinx_hwicap.h
> +++ b/drivers/char/xilinx_hwicap/xilinx_hwicap.h
> @@ -36,8 +36,7 @@
>  #include <linux/types.h>
>  #include <linux/cdev.h>
>  #include <linux/platform_device.h>
> -
> -#include <asm/io.h>
> +#include <linux/io.h>
>
>  struct hwicap_drvdata {
>        u32 write_buffer_in_use;  /* Always in [0,3] */
> --
> 1.5.6.6
>
>
>
> This email and any attachments are intended for the sole use of the named recipient(s) and contain(s) confidential information that may be proprietary, privileged or copyrighted under applicable law. If you are not the intended recipient, do not read, copy, or forward this email message or any attachments. Delete this email message and any attachments immediately.
>
>
>



-- 
Grant Likely, B.Sc., P.Eng.
Secret Lab Technologies Ltd.


More information about the devicetree-discuss mailing list