Skip to content

L
linux-davinci-2.6.23
Commit 70440cf2 authored by Tilman Schmidt's avatar Tilman Schmidt Committed by Linus Torvalds
Browse files
Options

[PATCH] isdn4linux: Siemens Gigaset drivers: remove forward references 

With Hansjoerg Lipp <hjlipp@web.de>

Remove four unnecessary forward function declarations and an obsolete E-mail
address from the Siemens Gigaset drivers.
Signed-off-by: default avatarHansjoerg Lipp <hjlipp@web.de>
Signed-off-by: default avatarTilman Schmidt <tilman@imap.cc>
Cc: Karsten Keil <kkeil@suse.de>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 443e1f45
Show whitespace changes
Inline Side-by-side
Showing with 60 additions and 71 deletions
drivers/isdn/gigaset/asyncdata.c
View file @ 70440cf2
......@@ -3,7 +3,7 @@
*
* Copyright (c) 2005 by Tilman Schmidt <tilman@imap.cc>,
* Hansjoerg Lipp <hjlipp@web.de>,
* Stefan Eilers <Eilers.Stefan@epost.de>.
* Stefan Eilers.
*
* =====================================================================
* This program is free software; you can redistribute it and/or
......
drivers/isdn/gigaset/bas-gigaset.c
View file @ 70440cf2
......@@ -3,7 +3,7 @@
*
* Copyright (c) 2001 by Hansjoerg Lipp <hjlipp@web.de>,
* Tilman Schmidt <tilman@imap.cc>,
* Stefan Eilers <Eilers.Stefan@epost.de>.
* Stefan Eilers.
*
* Based on usb-gigaset.c.
*
......@@ -26,7 +26,7 @@
#include <linux/moduleparam.h>
/* Version Information */
#define DRIVER_AUTHOR "Tilman Schmidt <tilman@imap.cc>, Hansjoerg Lipp <hjlipp@web.de>, Stefan Eilers <Eilers.Stefan@epost.de>"
#define DRIVER_AUTHOR "Tilman Schmidt <tilman@imap.cc>, Hansjoerg Lipp <hjlipp@web.de>, Stefan Eilers"
#define DRIVER_DESC "USB Driver for Gigaset 307x"
......
drivers/isdn/gigaset/common.c
View file @ 70440cf2
/*
* Stuff used by all variants of the driver
*
* Copyright (c) 2001 by Stefan Eilers <Eilers.Stefan@epost.de>,
* Copyright (c) 2001 by Stefan Eilers,
* Hansjoerg Lipp <hjlipp@web.de>,
* Tilman Schmidt <tilman@imap.cc>.
*
......@@ -19,7 +19,7 @@
#include <linux/moduleparam.h>
/* Version Information */
#define DRIVER_AUTHOR "Hansjoerg Lipp <hjlipp@web.de>, Tilman Schmidt <tilman@imap.cc>, Stefan Eilers <Eilers.Stefan@epost.de>"
#define DRIVER_AUTHOR "Hansjoerg Lipp <hjlipp@web.de>, Tilman Schmidt <tilman@imap.cc>, Stefan Eilers"
#define DRIVER_DESC "Driver for Gigaset 307x"
/* Module parameters */
......@@ -28,15 +28,7 @@ EXPORT_SYMBOL_GPL(gigaset_debuglevel);
module_param_named(debug, gigaset_debuglevel, int, S_IRUGO|S_IWUSR);
MODULE_PARM_DESC(debug, "debug level");
/*======================================================================
Prototypes of internal functions
*/
static struct cardstate *alloc_cs(struct gigaset_driver *drv);
static void free_cs(struct cardstate *cs);
static void make_valid(struct cardstate *cs, unsigned mask);
static void make_invalid(struct cardstate *cs, unsigned mask);
/* driver state flags */
#define VALID_MINOR 0x01
#define VALID_ID 0x02
#define ASSIGNED 0x04
......@@ -400,6 +392,52 @@ static void gigaset_freebcs(struct bc_state *bcs)
}
}
static struct cardstate *alloc_cs(struct gigaset_driver *drv)
{
unsigned long flags;
unsigned i;
static struct cardstate *ret = NULL;
spin_lock_irqsave(&drv->lock, flags);
for (i = 0; i < drv->minors; ++i) {
if (!(drv->flags[i] & VALID_MINOR)) {
drv->flags[i] = VALID_MINOR;
ret = drv->cs + i;
}
if (ret)
break;
}
spin_unlock_irqrestore(&drv->lock, flags);
return ret;
}
static void free_cs(struct cardstate *cs)
{
unsigned long flags;
struct gigaset_driver *drv = cs->driver;
spin_lock_irqsave(&drv->lock, flags);
drv->flags[cs->minor_index] = 0;
spin_unlock_irqrestore(&drv->lock, flags);
}
static void make_valid(struct cardstate *cs, unsigned mask)
{
unsigned long flags;
struct gigaset_driver *drv = cs->driver;
spin_lock_irqsave(&drv->lock, flags);
drv->flags[cs->minor_index] |= mask;
spin_unlock_irqrestore(&drv->lock, flags);
}
static void make_invalid(struct cardstate *cs, unsigned mask)
{
unsigned long flags;
struct gigaset_driver *drv = cs->driver;
spin_lock_irqsave(&drv->lock, flags);
drv->flags[cs->minor_index] &= ~mask;
spin_unlock_irqrestore(&drv->lock, flags);
}
void gigaset_freecs(struct cardstate *cs)
{
int i;
......@@ -1117,52 +1155,6 @@ out1:
}
EXPORT_SYMBOL_GPL(gigaset_initdriver);
static struct cardstate *alloc_cs(struct gigaset_driver *drv)
{
unsigned long flags;
unsigned i;
static struct cardstate *ret = NULL;
spin_lock_irqsave(&drv->lock, flags);
for (i = 0; i < drv->minors; ++i) {
if (!(drv->flags[i] & VALID_MINOR)) {
drv->flags[i] = VALID_MINOR;
ret = drv->cs + i;
}
if (ret)
break;
}
spin_unlock_irqrestore(&drv->lock, flags);
return ret;
}
static void free_cs(struct cardstate *cs)
{
unsigned long flags;
struct gigaset_driver *drv = cs->driver;
spin_lock_irqsave(&drv->lock, flags);
drv->flags[cs->minor_index] = 0;
spin_unlock_irqrestore(&drv->lock, flags);
}
static void make_valid(struct cardstate *cs, unsigned mask)
{
unsigned long flags;
struct gigaset_driver *drv = cs->driver;
spin_lock_irqsave(&drv->lock, flags);
drv->flags[cs->minor_index] |= mask;
spin_unlock_irqrestore(&drv->lock, flags);
}
static void make_invalid(struct cardstate *cs, unsigned mask)
{
unsigned long flags;
struct gigaset_driver *drv = cs->driver;
spin_lock_irqsave(&drv->lock, flags);
drv->flags[cs->minor_index] &= ~mask;
spin_unlock_irqrestore(&drv->lock, flags);
}
/* For drivers without fixed assignment device<->cardstate (usb) */
struct cardstate *gigaset_getunassignedcs(struct gigaset_driver *drv)
{
......
drivers/isdn/gigaset/ev-layer.c
View file @ 70440cf2
/*
* Stuff used by all variants of the driver
*
* Copyright (c) 2001 by Stefan Eilers <Eilers.Stefan@epost.de>,
* Copyright (c) 2001 by Stefan Eilers,
* Hansjoerg Lipp <hjlipp@web.de>,
* Tilman Schmidt <tilman@imap.cc>.
*
......
drivers/isdn/gigaset/gigaset.h
View file @ 70440cf2
......@@ -2,7 +2,7 @@
* Siemens Gigaset 307x driver
* Common header file for all connection variants
*
* Written by Stefan Eilers <Eilers.Stefan@epost.de>
* Written by Stefan Eilers
* and Hansjoerg Lipp <hjlipp@web.de>
*
* =====================================================================
......
drivers/isdn/gigaset/i4l.c
View file @ 70440cf2
/*
* Stuff used by all variants of the driver
*
* Copyright (c) 2001 by Stefan Eilers (Eilers.Stefan@epost.de),
* Hansjoerg Lipp (hjlipp@web.de),
* Tilman Schmidt (tilman@imap.cc).
* 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
......
drivers/isdn/gigaset/proc.c
View file @ 70440cf2
/*
* Stuff used by all variants of the driver
*
* Copyright (c) 2001 by Stefan Eilers <Eilers.Stefan@epost.de>,
* Copyright (c) 2001 by Stefan Eilers,
* Hansjoerg Lipp <hjlipp@web.de>,
* Tilman Schmidt <tilman@imap.cc>.
*
......
drivers/isdn/gigaset/usb-gigaset.c
View file @ 70440cf2
/*
* USB driver for Gigaset 307x directly or using M105 Data.
*
* Copyright (c) 2001 by Stefan Eilers <Eilers.Stefan@epost.de>
* Copyright (c) 2001 by Stefan Eilers
* and Hansjoerg Lipp <hjlipp@web.de>.
*
* This driver was derived from the USB skeleton driver by
......@@ -25,7 +25,7 @@
#include <linux/moduleparam.h>
/* Version Information */
#define DRIVER_AUTHOR "Hansjoerg Lipp <hjlipp@web.de>, Stefan Eilers <Eilers.Stefan@epost.de>"
#define DRIVER_AUTHOR "Hansjoerg Lipp <hjlipp@web.de>, Stefan Eilers"
#define DRIVER_DESC "USB Driver for Gigaset 307x using M105"
/* Module parameters */
......@@ -816,9 +816,6 @@ error:
return retval;
}
/**
* skel_disconnect
*/
static void gigaset_disconnect(struct usb_interface *interface)
{
struct cardstate *cs;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment