Commit 5cb95fae authored by Nava kishore Manne's avatar Nava kishore Manne Committed by Greg Kroah-Hartman

char: xilinx_hwicap: Fix warnings in the driver

This patch fixes the below warning
        --> Use #include <linux/io.h> instead of <asm/io.h>
        --> Use #include <linux/uaccess.h> instead of <asm/uaccess.h>
        --> please, no space before tabs
        --> Block comments use a trailing */ on a separate line
        --> Possible unnecessary 'out of memory' message
        --> Block comments use * on subsequent lines
        --> Block comments use a trailing */ on a separate line
        --> braces {} are not necessary for any arm of this statement
        --> DT compatible string "xlnx,opb-hwicap-1.00.b"
	    appears un-documented
        --> DT compatible string "xlnx,xps-hwicap-1.00.a"
            appears un-documented
Signed-off-by: default avatarNava kishore Manne <navam@xilinx.com>
Signed-off-by: default avatarMichal Simek <michal.simek@xilinx.com>
Acked-by: default avatarRob Herring <robh@kernel.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent ef2b56df
...@@ -281,6 +281,8 @@ ...@@ -281,6 +281,8 @@
capabilities of the underlying ICAP hardware capabilities of the underlying ICAP hardware
differ between different families. May be differ between different families. May be
'virtex2p', 'virtex4', or 'virtex5'. 'virtex2p', 'virtex4', or 'virtex5'.
- compatible : should contain "xlnx,xps-hwicap-1.00.a" or
"xlnx,opb-hwicap-1.00.b".
vi) Xilinx Uart 16550 vi) Xilinx Uart 16550
......
...@@ -86,8 +86,7 @@ ...@@ -86,8 +86,7 @@
#include <linux/cdev.h> #include <linux/cdev.h>
#include <linux/platform_device.h> #include <linux/platform_device.h>
#include <linux/slab.h> #include <linux/slab.h>
#include <linux/io.h>
#include <asm/io.h>
#include <linux/uaccess.h> #include <linux/uaccess.h>
#ifdef CONFIG_OF #ifdef CONFIG_OF
...@@ -253,8 +252,8 @@ static int hwicap_command_desync(struct hwicap_drvdata *drvdata) ...@@ -253,8 +252,8 @@ static int hwicap_command_desync(struct hwicap_drvdata *drvdata)
* hwicap_get_configuration_register - Query a configuration register. * hwicap_get_configuration_register - Query a configuration register.
* @drvdata: a pointer to the drvdata. * @drvdata: a pointer to the drvdata.
* @reg: a constant which represents the configuration * @reg: a constant which represents the configuration
* register value to be returned. * register value to be returned.
* Examples: XHI_IDCODE, XHI_FLR. * Examples: XHI_IDCODE, XHI_FLR.
* @reg_data: returns the value of the register. * @reg_data: returns the value of the register.
* *
* Returns: '0' on success and failure value on error * Returns: '0' on success and failure value on error
...@@ -324,7 +323,8 @@ static int hwicap_initialize_hwicap(struct hwicap_drvdata *drvdata) ...@@ -324,7 +323,8 @@ static int hwicap_initialize_hwicap(struct hwicap_drvdata *drvdata)
dev_dbg(drvdata->dev, "initializing\n"); dev_dbg(drvdata->dev, "initializing\n");
/* Abort any current transaction, to make sure we have the /* Abort any current transaction, to make sure we have the
* ICAP in a good state. */ * ICAP in a good state.
*/
dev_dbg(drvdata->dev, "Reset...\n"); dev_dbg(drvdata->dev, "Reset...\n");
drvdata->config->reset(drvdata); drvdata->config->reset(drvdata);
...@@ -636,7 +636,6 @@ static int hwicap_setup(struct device *dev, int id, ...@@ -636,7 +636,6 @@ static int hwicap_setup(struct device *dev, int id,
drvdata = kzalloc(sizeof(struct hwicap_drvdata), GFP_KERNEL); drvdata = kzalloc(sizeof(struct hwicap_drvdata), GFP_KERNEL);
if (!drvdata) { if (!drvdata) {
dev_err(dev, "Couldn't allocate device private record\n");
retval = -ENOMEM; retval = -ENOMEM;
goto failed0; goto failed0;
} }
...@@ -763,20 +762,20 @@ static int hwicap_of_probe(struct platform_device *op, ...@@ -763,20 +762,20 @@ static int hwicap_of_probe(struct platform_device *op,
id = of_get_property(op->dev.of_node, "port-number", NULL); id = of_get_property(op->dev.of_node, "port-number", NULL);
/* It's most likely that we're using V4, if the family is not /* It's most likely that we're using V4, if the family is not
specified */ * specified
*/
regs = &v4_config_registers; regs = &v4_config_registers;
family = of_get_property(op->dev.of_node, "xlnx,family", NULL); family = of_get_property(op->dev.of_node, "xlnx,family", NULL);
if (family) { if (family) {
if (!strcmp(family, "virtex2p")) { if (!strcmp(family, "virtex2p"))
regs = &v2_config_registers; regs = &v2_config_registers;
} else if (!strcmp(family, "virtex4")) { else if (!strcmp(family, "virtex4"))
regs = &v4_config_registers; regs = &v4_config_registers;
} else if (!strcmp(family, "virtex5")) { else if (!strcmp(family, "virtex5"))
regs = &v5_config_registers; regs = &v5_config_registers;
} else if (!strcmp(family, "virtex6")) { else if (!strcmp(family, "virtex6"))
regs = &v6_config_registers; regs = &v6_config_registers;
}
} }
return hwicap_setup(&op->dev, id ? *id : -1, &res, config, return hwicap_setup(&op->dev, id ? *id : -1, &res, config,
regs); regs);
...@@ -806,20 +805,20 @@ static int hwicap_drv_probe(struct platform_device *pdev) ...@@ -806,20 +805,20 @@ static int hwicap_drv_probe(struct platform_device *pdev)
return -ENODEV; return -ENODEV;
/* It's most likely that we're using V4, if the family is not /* It's most likely that we're using V4, if the family is not
specified */ * specified
*/
regs = &v4_config_registers; regs = &v4_config_registers;
family = pdev->dev.platform_data; family = pdev->dev.platform_data;
if (family) { if (family) {
if (!strcmp(family, "virtex2p")) { if (!strcmp(family, "virtex2p"))
regs = &v2_config_registers; regs = &v2_config_registers;
} else if (!strcmp(family, "virtex4")) { else if (!strcmp(family, "virtex4"))
regs = &v4_config_registers; regs = &v4_config_registers;
} else if (!strcmp(family, "virtex5")) { else if (!strcmp(family, "virtex5"))
regs = &v5_config_registers; regs = &v5_config_registers;
} else if (!strcmp(family, "virtex6")) { else if (!strcmp(family, "virtex6"))
regs = &v6_config_registers; regs = &v6_config_registers;
}
} }
return hwicap_setup(&pdev->dev, pdev->id, res, return hwicap_setup(&pdev->dev, pdev->id, res,
......
...@@ -62,11 +62,13 @@ struct hwicap_drvdata { ...@@ -62,11 +62,13 @@ struct hwicap_drvdata {
struct hwicap_driver_config { struct hwicap_driver_config {
/* Read configuration data given by size into the data buffer. /* Read configuration data given by size into the data buffer.
Return 0 if successful. */ * Return 0 if successful.
*/
int (*get_configuration)(struct hwicap_drvdata *drvdata, u32 *data, int (*get_configuration)(struct hwicap_drvdata *drvdata, u32 *data,
u32 size); u32 size);
/* Write configuration data given by size from the data buffer. /* Write configuration data given by size from the data buffer.
Return 0 if successful. */ * Return 0 if successful.
*/
int (*set_configuration)(struct hwicap_drvdata *drvdata, u32 *data, int (*set_configuration)(struct hwicap_drvdata *drvdata, u32 *data,
u32 size); u32 size);
/* Get the status register, bit pattern given by: /* Get the status register, bit pattern given by:
......
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