git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fedora core 6 1.2949 + vserver 2.2.0
[linux-2.6.git]
/
drivers
/
block
/
paride
/
paride.c
diff --git
a/drivers/block/paride/paride.c
b/drivers/block/paride/paride.c
index
9f9401c
..
48c50f1
100644
(file)
--- a/
drivers/block/paride/paride.c
+++ b/
drivers/block/paride/paride.c
@@
-21,7
+21,6
@@
#define PI_VERSION "1.06"
#include <linux/module.h>
#define PI_VERSION "1.06"
#include <linux/module.h>
-#include <linux/config.h>
#include <linux/kmod.h>
#include <linux/types.h>
#include <linux/kernel.h>
#include <linux/kmod.h>
#include <linux/types.h>
#include <linux/kernel.h>
@@
-29,14
+28,8
@@
#include <linux/string.h>
#include <linux/spinlock.h>
#include <linux/wait.h>
#include <linux/string.h>
#include <linux/spinlock.h>
#include <linux/wait.h>
-
-#ifdef CONFIG_PARPORT_MODULE
-#define CONFIG_PARPORT
-#endif
-
-#ifdef CONFIG_PARPORT
+#include <linux/sched.h> /* TASK_* */
#include <linux/parport.h>
#include <linux/parport.h>
-#endif
#include "paride.h"
#include "paride.h"
@@
-46,7
+39,7
@@
MODULE_LICENSE("GPL");
static struct pi_protocol *protocols[MAX_PROTOS];
static struct pi_protocol *protocols[MAX_PROTOS];
-static
spinlock_t pi_spinlock = SPIN_LOCK_UNLOCKED
;
+static
DEFINE_SPINLOCK(pi_spinlock)
;
void pi_write_regr(PIA * pi, int cont, int regr, int val)
{
void pi_write_regr(PIA * pi, int cont, int regr, int val)
{
@@
-76,8
+69,6
@@
void pi_read_block(PIA * pi, char *buf, int count)
EXPORT_SYMBOL(pi_read_block);
EXPORT_SYMBOL(pi_read_block);
-#ifdef CONFIG_PARPORT
-
static void pi_wake_up(void *p)
{
PIA *pi = (PIA *) p;
static void pi_wake_up(void *p)
{
PIA *pi = (PIA *) p;
@@
-100,11
+91,8
@@
static void pi_wake_up(void *p)
cont();
}
cont();
}
-#endif
-
int pi_schedule_claimed(PIA * pi, void (*cont) (void))
{
int pi_schedule_claimed(PIA * pi, void (*cont) (void))
{
-#ifdef CONFIG_PARPORT
unsigned long flags;
spin_lock_irqsave(&pi_spinlock, flags);
unsigned long flags;
spin_lock_irqsave(&pi_spinlock, flags);
@@
-115,7
+103,6
@@
int pi_schedule_claimed(PIA * pi, void (*cont) (void))
}
pi->claimed = 1;
spin_unlock_irqrestore(&pi_spinlock, flags);
}
pi->claimed = 1;
spin_unlock_irqrestore(&pi_spinlock, flags);
-#endif
return 1;
}
EXPORT_SYMBOL(pi_schedule_claimed);
return 1;
}
EXPORT_SYMBOL(pi_schedule_claimed);
@@
-133,24
+120,18
@@
static void pi_claim(PIA * pi)
if (pi->claimed)
return;
pi->claimed = 1;
if (pi->claimed)
return;
pi->claimed = 1;
-#ifdef CONFIG_PARPORT
if (pi->pardev)
wait_event(pi->parq,
!parport_claim((struct pardevice *) pi->pardev));
if (pi->pardev)
wait_event(pi->parq,
!parport_claim((struct pardevice *) pi->pardev));
-#endif
}
}
-void pi_unclaim(PIA * pi)
+
static
void pi_unclaim(PIA * pi)
{
pi->claimed = 0;
{
pi->claimed = 0;
-#ifdef CONFIG_PARPORT
if (pi->pardev)
parport_release((struct pardevice *) (pi->pardev));
if (pi->pardev)
parport_release((struct pardevice *) (pi->pardev));
-#endif
}
}
-EXPORT_SYMBOL(pi_unclaim);
-
void pi_connect(PIA * pi)
{
pi_claim(pi);
void pi_connect(PIA * pi)
{
pi_claim(pi);
@@
-169,21
+150,15
@@
EXPORT_SYMBOL(pi_disconnect);
static void pi_unregister_parport(PIA * pi)
{
static void pi_unregister_parport(PIA * pi)
{
-#ifdef CONFIG_PARPORT
if (pi->pardev) {
parport_unregister_device((struct pardevice *) (pi->pardev));
pi->pardev = NULL;
}
if (pi->pardev) {
parport_unregister_device((struct pardevice *) (pi->pardev));
pi->pardev = NULL;
}
-#endif
}
void pi_release(PIA * pi)
{
pi_unregister_parport(pi);
}
void pi_release(PIA * pi)
{
pi_unregister_parport(pi);
-#ifndef CONFIG_PARPORT
- if (pi->reserved)
- release_region(pi->port, pi->reserved);
-#endif /* !CONFIG_PARPORT */
if (pi->proto->release_proto)
pi->proto->release_proto(pi);
module_put(pi->proto->owner);
if (pi->proto->release_proto)
pi->proto->release_proto(pi);
module_put(pi->proto->owner);
@@
-231,7
+206,7
@@
static int pi_test_proto(PIA * pi, char *scratch, int verbose)
return res;
}
return res;
}
-int p
i
_register(PIP * pr)
+int p
aride
_register(PIP * pr)
{
int k;
{
int k;
@@
-239,24
+214,24
@@
int pi_register(PIP * pr)
if (protocols[k] && !strcmp(pr->name, protocols[k]->name)) {
printk("paride: %s protocol already registered\n",
pr->name);
if (protocols[k] && !strcmp(pr->name, protocols[k]->name)) {
printk("paride: %s protocol already registered\n",
pr->name);
- return
0
;
+ return
-1
;
}
k = 0;
while ((k < MAX_PROTOS) && (protocols[k]))
k++;
if (k == MAX_PROTOS) {
printk("paride: protocol table full\n");
}
k = 0;
while ((k < MAX_PROTOS) && (protocols[k]))
k++;
if (k == MAX_PROTOS) {
printk("paride: protocol table full\n");
- return
0
;
+ return
-1
;
}
protocols[k] = pr;
pr->index = k;
printk("paride: %s registered as protocol %d\n", pr->name, k);
}
protocols[k] = pr;
pr->index = k;
printk("paride: %s registered as protocol %d\n", pr->name, k);
- return
1
;
+ return
0
;
}
}
-EXPORT_SYMBOL(p
i
_register);
+EXPORT_SYMBOL(p
aride
_register);
-void p
i
_unregister(PIP * pr)
+void p
aride
_unregister(PIP * pr)
{
if (!pr)
return;
{
if (!pr)
return;
@@
-267,12
+242,10
@@
void pi_unregister(PIP * pr)
protocols[pr->index] = NULL;
}
protocols[pr->index] = NULL;
}
-EXPORT_SYMBOL(p
i
_unregister);
+EXPORT_SYMBOL(p
aride
_unregister);
static int pi_register_parport(PIA * pi, int verbose)
{
static int pi_register_parport(PIA * pi, int verbose)
{
-#ifdef CONFIG_PARPORT
-
struct parport *port;
port = parport_find_base(pi->port);
struct parport *port;
port = parport_find_base(pi->port);
@@
-292,7
+265,6
@@
static int pi_register_parport(PIA * pi, int verbose)
printk("%s: 0x%x is %s\n", pi->device, pi->port, port->name);
pi->parname = (char *) port->name;
printk("%s: 0x%x is %s\n", pi->device, pi->port, port->name);
pi->parname = (char *) port->name;
-#endif
return 1;
}
return 1;
}
@@
-449,13
+421,6
@@
int pi_init(PIA * pi, int autoprobe, int port, int mode,
printk("%s: Adapter not found\n", device);
return 0;
}
printk("%s: Adapter not found\n", device);
return 0;
}
-#ifndef CONFIG_PARPORT
- if (!request_region(pi->port, pi->reserved, pi->device)) {
- printk(KERN_WARNING "paride: Unable to request region 0x%x\n",
- pi->port);
- return 0;
- }
-#endif /* !CONFIG_PARPORT */
if (pi->parname)
printk("%s: Sharing %s at 0x%x\n", pi->device,
if (pi->parname)
printk("%s: Sharing %s at 0x%x\n", pi->device,