summaryrefslogtreecommitdiff
path: root/drivers/net
diff options
context:
space:
mode:
authorPhilippe Langlais <philippe.langlais@linaro.org>2011-05-09 16:30:48 +0200
committerUlf Hansson <ulf.hansson@stericsson.com>2011-09-19 15:15:07 +0200
commit837d3f5c6a8d793756d1fe85f4e678e37aa498ae (patch)
tree13346332cc3f5e9bc755c6bd6a2f461091798211 /drivers/net
parentf80182de84b2fe4d54003f35bdae6e83fce9153c (diff)
caif: Align CAIF HSI Link Layer
Signed-off-by: Philippe Langlais <philippe.langlais@linaro.org>
Diffstat (limited to 'drivers/net')
-rw-r--r--drivers/net/caif/caif_hsi.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/net/caif/caif_hsi.c b/drivers/net/caif/caif_hsi.c
index 10cc5608737..73f78623cfe 100644
--- a/drivers/net/caif/caif_hsi.c
+++ b/drivers/net/caif/caif_hsi.c
@@ -498,7 +498,7 @@ int cfhsi_probe(struct platform_device *pdev)
*/
cfhsi->tx_buf = kzalloc(CFHSI_BUF_SZ_TX, GFP_KERNEL);
if (!cfhsi->tx_buf) {
- dev_err(&pdev->dev, "cfhsi: failed to allocate TX buffer.\n");
+ netdev_err(cfhsi->ndev, "cfhsi: failed to allocate TX buffer.\n");
res = -ENODEV;
goto err_alloc_tx;
}
@@ -509,7 +509,7 @@ int cfhsi_probe(struct platform_device *pdev)
*/
cfhsi->rx_buf = kzalloc(CFHSI_BUF_SZ_RX, GFP_KERNEL);
if (!cfhsi->rx_buf) {
- dev_err(&pdev->dev, "cfhsi: failed to allocate RX buffer.\n");
+ netdev_err(cfhsi->ndev, "cfhsi: failed to allocate RX buffer.\n");
res = -ENODEV;
goto err_alloc_rx;
}
@@ -529,7 +529,7 @@ int cfhsi_probe(struct platform_device *pdev)
/* Register network device. */
res = register_netdev(ndev);
if (res) {
- dev_err(&pdev->dev, "cfhsi: Reg. error: %d.\n", res);
+ netdev_err(cfhsi->ndev, "cfhsi: Reg. error: %d.\n", res);
goto err_net_reg;
}
@@ -609,7 +609,7 @@ static int __init cfhsi_init_module(void)
/* Register platform driver. */
result = platform_driver_register(&cfhsi_plat_drv);
if (result) {
- pr_err("Could not register platform HSI driver.\n");
+ pr_warning("Could not register platform HSI driver.\n");
goto err_dev_register;
}