aboutsummaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorJoe Perches <joe@perches.com>2010-09-05 18:08:09 -0400
committerDavid S. Miller <davem@davemloft.net>2010-09-06 21:48:43 -0400
commitf6c9322c3a0cd50a6996094327347c87cd2f4bd8 (patch)
tree63685e0f5dd9eb6ac0c9f4c0017a21ef2e0f0c29 /net
parentb31fa5bad576cd8180a5ad70c648333b44320d44 (diff)
net/caifcaif_dev.c: Use netdev_<level>
Convert pr_<level>("%s" ..., (struct netdev *)->name ...) to netdev_<level>((struct netdev *), ...) Signed-off-by: Joe Perches <joe@perches.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
-rw-r--r--net/caif/caif_dev.c16
1 files changed, 8 insertions, 8 deletions
diff --git a/net/caif/caif_dev.c b/net/caif/caif_dev.c
index 1fdfe70392dc..0fd01dd17c48 100644
--- a/net/caif/caif_dev.c
+++ b/net/caif/caif_dev.c
@@ -216,7 +216,7 @@ static int caif_device_notify(struct notifier_block *me, unsigned long what,
216 216
217 switch (what) { 217 switch (what) {
218 case NETDEV_REGISTER: 218 case NETDEV_REGISTER:
219 pr_info("register %s\n", dev->name); 219 netdev_info(dev, "register\n");
220 caifd = caif_device_alloc(dev); 220 caifd = caif_device_alloc(dev);
221 if (caifd == NULL) 221 if (caifd == NULL)
222 break; 222 break;
@@ -227,13 +227,13 @@ static int caif_device_notify(struct notifier_block *me, unsigned long what,
227 break; 227 break;
228 228
229 case NETDEV_UP: 229 case NETDEV_UP:
230 pr_info("up %s\n", dev->name); 230 netdev_info(dev, "up\n");
231 caifd = caif_get(dev); 231 caifd = caif_get(dev);
232 if (caifd == NULL) 232 if (caifd == NULL)
233 break; 233 break;
234 caifdev = netdev_priv(dev); 234 caifdev = netdev_priv(dev);
235 if (atomic_read(&caifd->state) == NETDEV_UP) { 235 if (atomic_read(&caifd->state) == NETDEV_UP) {
236 pr_info("%s already up\n", dev->name); 236 netdev_info(dev, "already up\n");
237 break; 237 break;
238 } 238 }
239 atomic_set(&caifd->state, what); 239 atomic_set(&caifd->state, what);
@@ -274,7 +274,7 @@ static int caif_device_notify(struct notifier_block *me, unsigned long what,
274 caifd = caif_get(dev); 274 caifd = caif_get(dev);
275 if (caifd == NULL) 275 if (caifd == NULL)
276 break; 276 break;
277 pr_info("going down %s\n", dev->name); 277 netdev_info(dev, "going down\n");
278 278
279 if (atomic_read(&caifd->state) == NETDEV_GOING_DOWN || 279 if (atomic_read(&caifd->state) == NETDEV_GOING_DOWN ||
280 atomic_read(&caifd->state) == NETDEV_DOWN) 280 atomic_read(&caifd->state) == NETDEV_DOWN)
@@ -296,10 +296,10 @@ static int caif_device_notify(struct notifier_block *me, unsigned long what,
296 caifd = caif_get(dev); 296 caifd = caif_get(dev);
297 if (caifd == NULL) 297 if (caifd == NULL)
298 break; 298 break;
299 pr_info("down %s\n", dev->name); 299 netdev_info(dev, "down\n");
300 if (atomic_read(&caifd->in_use)) 300 if (atomic_read(&caifd->in_use))
301 pr_warn("Unregistering an active CAIF device: %s\n", 301 netdev_warn(dev,
302 dev->name); 302 "Unregistering an active CAIF device\n");
303 cfcnfg_del_phy_layer(get_caif_conf(), &caifd->layer); 303 cfcnfg_del_phy_layer(get_caif_conf(), &caifd->layer);
304 dev_put(dev); 304 dev_put(dev);
305 atomic_set(&caifd->state, what); 305 atomic_set(&caifd->state, what);
@@ -307,7 +307,7 @@ static int caif_device_notify(struct notifier_block *me, unsigned long what,
307 307
308 case NETDEV_UNREGISTER: 308 case NETDEV_UNREGISTER:
309 caifd = caif_get(dev); 309 caifd = caif_get(dev);
310 pr_info("unregister %s\n", dev->name); 310 netdev_info(dev, "unregister\n");
311 atomic_set(&caifd->state, what); 311 atomic_set(&caifd->state, what);
312 caif_device_destroy(dev); 312 caif_device_destroy(dev);
313 break; 313 break;