From 70ef5da45c7901e43917acac71b2f1e42f858982 Mon Sep 17 00:00:00 2001 From: Tilman Schmidt Date: Wed, 13 May 2009 12:44:17 +0000 Subject: [PATCH] --- yaml --- r: 150225 b: refs/heads/master c: 42e3d611158faa2d372ccfb1e17bfde13935de68 h: refs/heads/master i: 150223: fea9eedac3a6e4dd82dd39da333492670dcc3b59 v: v3 --- [refs] | 2 +- trunk/drivers/isdn/gigaset/interface.c | 3 +-- trunk/drivers/isdn/gigaset/proc.c | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 2fc3706b194f..deabf36b9349 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 528efc6a54a9e4c03488ee72988567991c9476ba +refs/heads/master: 42e3d611158faa2d372ccfb1e17bfde13935de68 diff --git a/trunk/drivers/isdn/gigaset/interface.c b/trunk/drivers/isdn/gigaset/interface.c index 820a30923fee..1ebfcab74662 100644 --- a/trunk/drivers/isdn/gigaset/interface.c +++ b/trunk/drivers/isdn/gigaset/interface.c @@ -599,8 +599,7 @@ void gigaset_if_init(struct cardstate *cs) if (!IS_ERR(cs->tty_dev)) dev_set_drvdata(cs->tty_dev, cs); else { - dev_warn(cs->dev, - "could not register device to the tty subsystem\n"); + pr_warning("could not register device to the tty subsystem\n"); cs->tty_dev = NULL; } mutex_unlock(&cs->mutex); diff --git a/trunk/drivers/isdn/gigaset/proc.c b/trunk/drivers/isdn/gigaset/proc.c index da6f3acf9fd0..9715aad9c3f0 100644 --- a/trunk/drivers/isdn/gigaset/proc.c +++ b/trunk/drivers/isdn/gigaset/proc.c @@ -79,5 +79,5 @@ void gigaset_init_dev_sysfs(struct cardstate *cs) gig_dbg(DEBUG_INIT, "setting up sysfs"); if (device_create_file(cs->tty_dev, &dev_attr_cidmode)) - dev_err(cs->dev, "could not create sysfs attribute\n"); + pr_err("could not create sysfs attribute\n"); }