mirror of
https://github.com/torvalds/linux.git
synced 2024-11-16 17:12:06 +00:00
b91ecb0027
Commit 5a0e3ad causes slab.h to be included twice in many of the
Gigaset driver's source files, first via the common include file
gigaset.h and then a second time directly. Drop the spares, and
use the opportunity to clean up a few more similar cases.
Impact: cleanup, no functional change
Signed-off-by: Tilman Schmidt <tilman@imap.cc>
CC: Tejun Heo <tj@kernel.org>
Acked-by: Tejun Heo <tj@kernel.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
81 lines
2.0 KiB
C
81 lines
2.0 KiB
C
/*
|
|
* Stuff used by all variants of the driver
|
|
*
|
|
* Copyright (c) 2001 by Stefan Eilers,
|
|
* Hansjoerg Lipp <hjlipp@web.de>,
|
|
* Tilman Schmidt <tilman@imap.cc>.
|
|
*
|
|
* =====================================================================
|
|
* This program is free software; you can redistribute it and/or
|
|
* modify it under the terms of the GNU General Public License as
|
|
* published by the Free Software Foundation; either version 2 of
|
|
* the License, or (at your option) any later version.
|
|
* =====================================================================
|
|
*/
|
|
|
|
#include "gigaset.h"
|
|
|
|
static ssize_t show_cidmode(struct device *dev,
|
|
struct device_attribute *attr, char *buf)
|
|
{
|
|
struct cardstate *cs = dev_get_drvdata(dev);
|
|
|
|
return sprintf(buf, "%u\n", cs->cidmode);
|
|
}
|
|
|
|
static ssize_t set_cidmode(struct device *dev, struct device_attribute *attr,
|
|
const char *buf, size_t count)
|
|
{
|
|
struct cardstate *cs = dev_get_drvdata(dev);
|
|
long int value;
|
|
char *end;
|
|
|
|
value = simple_strtol(buf, &end, 0);
|
|
while (*end)
|
|
if (!isspace(*end++))
|
|
return -EINVAL;
|
|
if (value < 0 || value > 1)
|
|
return -EINVAL;
|
|
|
|
if (mutex_lock_interruptible(&cs->mutex))
|
|
return -ERESTARTSYS;
|
|
|
|
cs->waiting = 1;
|
|
if (!gigaset_add_event(cs, &cs->at_state, EV_PROC_CIDMODE,
|
|
NULL, value, NULL)) {
|
|
cs->waiting = 0;
|
|
mutex_unlock(&cs->mutex);
|
|
return -ENOMEM;
|
|
}
|
|
gigaset_schedule_event(cs);
|
|
|
|
wait_event(cs->waitqueue, !cs->waiting);
|
|
|
|
mutex_unlock(&cs->mutex);
|
|
|
|
return count;
|
|
}
|
|
|
|
static DEVICE_ATTR(cidmode, S_IRUGO|S_IWUSR, show_cidmode, set_cidmode);
|
|
|
|
/* free sysfs for device */
|
|
void gigaset_free_dev_sysfs(struct cardstate *cs)
|
|
{
|
|
if (!cs->tty_dev)
|
|
return;
|
|
|
|
gig_dbg(DEBUG_INIT, "removing sysfs entries");
|
|
device_remove_file(cs->tty_dev, &dev_attr_cidmode);
|
|
}
|
|
|
|
/* initialize sysfs for device */
|
|
void gigaset_init_dev_sysfs(struct cardstate *cs)
|
|
{
|
|
if (!cs->tty_dev)
|
|
return;
|
|
|
|
gig_dbg(DEBUG_INIT, "setting up sysfs");
|
|
if (device_create_file(cs->tty_dev, &dev_attr_cidmode))
|
|
pr_err("could not create sysfs attribute\n");
|
|
}
|