Merge branch 'master' of git://dev.medozas.de/linux

[firefly-linux-kernel-4.4.55.git] / drivers / isdn / gigaset / proc.c

diff --git a/drivers/isdn/gigaset/proc.c b/drivers/isdn/gigaset/proc.c
index e767afa55abfa5cf6b0ee8a3dd25d46893ee15b4..9715aad9c3f0c43b6d6617e15f43fae5242681c5 100644 (file)
--- a/drivers/isdn/gigaset/proc.c
+++ b/drivers/isdn/gigaset/proc.c
@@ -19,15 +19,9 @@
 static ssize_t show_cidmode(struct device *dev,
                            struct device_attribute *attr, char *buf)
 {
-       int ret;
-       unsigned long flags;
        struct cardstate *cs = dev_get_drvdata(dev);
 
-       spin_lock_irqsave(&cs->lock, flags);
-       ret = sprintf(buf, "%u\n", cs->cidmode);
-       spin_unlock_irqrestore(&cs->lock, flags);
-
-       return ret;
+       return sprintf(buf, "%u\n", cs->cidmode);
 }
 
 static ssize_t set_cidmode(struct device *dev, struct device_attribute *attr,
@@ -85,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");
 }