提交 5df6f7fa 编写于 作者: M Madalin Bucur 提交者: Madalin Bucur

fsl/fman: small fixes

Make module params static, proper NULL checks, remove __iomem label
when misused.
Signed-off-by: NMadalin Bucur <madalin.bucur@freescale.com>
上级 29c4684e
...@@ -2462,7 +2462,7 @@ EXPORT_SYMBOL(fman_get_mem_region); ...@@ -2462,7 +2462,7 @@ EXPORT_SYMBOL(fman_get_mem_region);
* particular forwarding scenarios that add extra headers to the * particular forwarding scenarios that add extra headers to the
* forwarded frame. * forwarded frame.
*/ */
int fsl_fm_rx_extra_headroom = FSL_FM_RX_EXTRA_HEADROOM; static int fsl_fm_rx_extra_headroom = FSL_FM_RX_EXTRA_HEADROOM;
module_param(fsl_fm_rx_extra_headroom, int, 0); module_param(fsl_fm_rx_extra_headroom, int, 0);
MODULE_PARM_DESC(fsl_fm_rx_extra_headroom, "Extra headroom for Rx buffers"); MODULE_PARM_DESC(fsl_fm_rx_extra_headroom, "Extra headroom for Rx buffers");
...@@ -2475,7 +2475,7 @@ MODULE_PARM_DESC(fsl_fm_rx_extra_headroom, "Extra headroom for Rx buffers"); ...@@ -2475,7 +2475,7 @@ MODULE_PARM_DESC(fsl_fm_rx_extra_headroom, "Extra headroom for Rx buffers");
* Could be overridden once, at boot-time, via the * Could be overridden once, at boot-time, via the
* fm_set_max_frm() callback. * fm_set_max_frm() callback.
*/ */
int fsl_fm_max_frm = FSL_FM_MAX_FRAME_SIZE; static int fsl_fm_max_frm = FSL_FM_MAX_FRAME_SIZE;
module_param(fsl_fm_max_frm, int, 0); module_param(fsl_fm_max_frm, int, 0);
MODULE_PARM_DESC(fsl_fm_max_frm, "Maximum frame size, across all interfaces"); MODULE_PARM_DESC(fsl_fm_max_frm, "Maximum frame size, across all interfaces");
...@@ -2868,7 +2868,7 @@ static struct fman *read_dts_node(struct platform_device *of_dev) ...@@ -2868,7 +2868,7 @@ static struct fman *read_dts_node(struct platform_device *of_dev)
fman->dts_params.base_addr = fman->dts_params.base_addr =
devm_ioremap(&of_dev->dev, phys_base_addr, mem_size); devm_ioremap(&of_dev->dev, phys_base_addr, mem_size);
if (fman->dts_params.base_addr == 0) { if (!fman->dts_params.base_addr) {
dev_err(&of_dev->dev, "%s: devm_ioremap() failed\n", __func__); dev_err(&of_dev->dev, "%s: devm_ioremap() failed\n", __func__);
goto fman_free; goto fman_free;
} }
......
...@@ -1477,7 +1477,8 @@ EXPORT_SYMBOL(fman_port_cfg_buf_prefix_content); ...@@ -1477,7 +1477,8 @@ EXPORT_SYMBOL(fman_port_cfg_buf_prefix_content);
*/ */
int fman_port_disable(struct fman_port *port) int fman_port_disable(struct fman_port *port)
{ {
u32 __iomem *bmi_cfg_reg, *bmi_status_reg, tmp; u32 __iomem *bmi_cfg_reg, *bmi_status_reg;
u32 tmp;
bool rx_port, failure = false; bool rx_port, failure = false;
int count; int count;
...@@ -1553,7 +1554,8 @@ EXPORT_SYMBOL(fman_port_disable); ...@@ -1553,7 +1554,8 @@ EXPORT_SYMBOL(fman_port_disable);
*/ */
int fman_port_enable(struct fman_port *port) int fman_port_enable(struct fman_port *port)
{ {
u32 __iomem *bmi_cfg_reg, tmp; u32 __iomem *bmi_cfg_reg;
u32 tmp;
bool rx_port; bool rx_port;
if (!is_init_done(port->cfg)) if (!is_init_done(port->cfg))
...@@ -1743,7 +1745,7 @@ static int fman_port_probe(struct platform_device *of_dev) ...@@ -1743,7 +1745,7 @@ static int fman_port_probe(struct platform_device *of_dev)
port->dts_params.base_addr = devm_ioremap(port->dev, res.start, port->dts_params.base_addr = devm_ioremap(port->dev, res.start,
resource_size(&res)); resource_size(&res));
if (port->dts_params.base_addr == 0) if (!port->dts_params.base_addr)
dev_err(port->dev, "%s: devm_ioremap() failed\n", __func__); dev_err(port->dev, "%s: devm_ioremap() failed\n", __func__);
dev_set_drvdata(&of_dev->dev, port); dev_set_drvdata(&of_dev->dev, port);
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册