Skip to content

Commit 3e65b7a

Browse files
author
David S. Miller
committed
Merge nuts.ninka.net:/disk1/davem/BK/network-2.5
into nuts.ninka.net:/disk1/davem/BK/net-2.5
2 parents db4cf64 + 8305583 commit 3e65b7a

File tree

14 files changed

+113
-146
lines changed

14 files changed

+113
-146
lines changed

‎drivers/net/irda/act200l.c

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -84,12 +84,12 @@ static int act200l_change_speed(struct irda_task *task);
8484
#define ACT200L_OSCL 0x04 /* oscillator in low power, medium accuracy mode */
8585

8686
static struct dongle_reg dongle = {
87-
Q_NULL,
88-
IRDA_ACT200L_DONGLE,
89-
act200l_open,
90-
act200l_close,
91-
act200l_reset,
92-
act200l_change_speed,
87+
.type = IRDA_ACT200L_DONGLE,
88+
.open = act200l_open,
89+
.close = act200l_close,
90+
.reset = act200l_reset,
91+
.change_speed = act200l_change_speed,
92+
.owner = THIS_MODULE,
9393
};
9494

9595
int __init act200l_init(void)
@@ -112,8 +112,6 @@ static void act200l_open(dongle_t *self, struct qos_info *qos)
112112
/* Set the speeds we can accept */
113113
qos->baud_rate.bits &= IR_9600|IR_19200|IR_38400|IR_57600|IR_115200;
114114
qos->min_turn_time.bits = 0x03;
115-
116-
MOD_INC_USE_COUNT;
117115
}
118116

119117
static void act200l_close(dongle_t *self)
@@ -122,8 +120,6 @@ static void act200l_close(dongle_t *self)
122120

123121
/* Power off the dongle */
124122
self->set_dtr_rts(self->dev, FALSE, FALSE);
125-
126-
MOD_DEC_USE_COUNT;
127123
}
128124

129125
/*

‎drivers/net/irda/actisys.c

Lines changed: 12 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -64,21 +64,21 @@ static __u32 baud_rates[] = { 9600, 19200, 57600, 115200, 38400 };
6464
#define MAX_SPEEDS 5
6565

6666
static struct dongle_reg dongle = {
67-
Q_NULL,
68-
IRDA_ACTISYS_DONGLE,
69-
actisys_open,
70-
actisys_close,
71-
actisys_reset,
72-
actisys_change_speed,
67+
.type = IRDA_ACTISYS_DONGLE,
68+
.open = actisys_open,
69+
.close = actisys_close,
70+
.reset = actisys_reset,
71+
.change_speed = actisys_change_speed,
72+
.owner = THIS_MODULE,
7373
};
7474

7575
static struct dongle_reg dongle_plus = {
76-
Q_NULL,
77-
IRDA_ACTISYS_PLUS_DONGLE,
78-
actisys_open,
79-
actisys_close,
80-
actisys_reset,
81-
actisys_change_speed,
76+
.type = IRDA_ACTISYS_PLUS_DONGLE,
77+
.open = actisys_open,
78+
.close = actisys_close,
79+
.reset = actisys_reset,
80+
.change_speed = actisys_change_speed,
81+
.owner = THIS_MODULE,
8282
};
8383

8484
/*
@@ -128,16 +128,12 @@ static void actisys_open(dongle_t *self, struct qos_info *qos)
128128
qos->baud_rate.bits &= ~IR_38400;
129129

130130
qos->min_turn_time.bits = 0x7f; /* Needs 0.01 ms */
131-
132-
MOD_INC_USE_COUNT;
133131
}
134132

135133
static void actisys_close(dongle_t *self)
136134
{
137135
/* Power off the dongle */
138136
self->set_dtr_rts(self->dev, FALSE, FALSE);
139-
140-
MOD_DEC_USE_COUNT;
141137
}
142138

143139
/*

‎drivers/net/irda/ep7211_ir.c

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -24,12 +24,12 @@ static int ep7211_ir_change_speed(struct irda_task *task);
2424
static int ep7211_ir_reset(struct irda_task *task);
2525

2626
static struct dongle_reg dongle = {
27-
Q_NULL,
28-
IRDA_EP7211_IR,
29-
ep7211_ir_open,
30-
ep7211_ir_close,
31-
ep7211_ir_reset,
32-
ep7211_ir_change_speed,
27+
.type = IRDA_EP7211_IR,
28+
.open = ep7211_ir_open,
29+
.close = ep7211_ir_close,
30+
.reset = ep7211_ir_reset,
31+
.change_speed = ep7211_ir_change_speed,
32+
.owner = THIS_MODULE,
3333
};
3434

3535
static void ep7211_ir_open(dongle_t *self, struct qos_info *qos)
@@ -47,8 +47,6 @@ static void ep7211_ir_open(dongle_t *self, struct qos_info *qos)
4747
UART (interrupt #14). */
4848

4949
restore_flags(flags);
50-
51-
MOD_INC_USE_COUNT;
5250
}
5351

5452
static void ep7211_ir_close(dongle_t *self)
@@ -66,8 +64,6 @@ static void ep7211_ir_close(dongle_t *self)
6664
reset them back to their original state. */
6765

6866
restore_flags(flags);
69-
70-
MOD_DEC_USE_COUNT;
7167
}
7268

7369
/*

‎drivers/net/irda/esi.c

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -44,12 +44,12 @@ static int esi_change_speed(struct irda_task *task);
4444
static int esi_reset(struct irda_task *task);
4545

4646
static struct dongle_reg dongle = {
47-
Q_NULL,
48-
IRDA_ESI_DONGLE,
49-
esi_open,
50-
esi_close,
51-
esi_reset,
52-
esi_change_speed,
47+
.type = IRDA_ESI_DONGLE,
48+
.open = esi_open,
49+
.close = esi_close,
50+
.reset = esi_reset,
51+
.change_speed = esi_change_speed,
52+
.owner = THIS_MODULE,
5353
};
5454

5555
int __init esi_init(void)
@@ -66,16 +66,12 @@ static void esi_open(dongle_t *self, struct qos_info *qos)
6666
{
6767
qos->baud_rate.bits &= IR_9600|IR_19200|IR_115200;
6868
qos->min_turn_time.bits = 0x01; /* Needs at least 10 ms */
69-
70-
MOD_INC_USE_COUNT;
7169
}
7270

7371
static void esi_close(dongle_t *dongle)
7472
{
7573
/* Power off dongle */
7674
dongle->set_dtr_rts(dongle->dev, FALSE, FALSE);
77-
78-
MOD_DEC_USE_COUNT;
7975
}
8076

8177
/*

‎drivers/net/irda/girbil.c

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -63,12 +63,12 @@ static int girbil_change_speed(struct irda_task *task);
6363
#define GIRBIL_LOAD 0x51 /* Load the new baud rate value */
6464

6565
static struct dongle_reg dongle = {
66-
Q_NULL,
67-
IRDA_GIRBIL_DONGLE,
68-
girbil_open,
69-
girbil_close,
70-
girbil_reset,
71-
girbil_change_speed,
66+
.type = IRDA_GIRBIL_DONGLE,
67+
.open = girbil_open,
68+
.close = girbil_close,
69+
.reset = girbil_reset,
70+
.change_speed = girbil_change_speed,
71+
.owner = THIS_MODULE,
7272
};
7373

7474
int __init girbil_init(void)
@@ -85,16 +85,12 @@ static void girbil_open(dongle_t *self, struct qos_info *qos)
8585
{
8686
qos->baud_rate.bits &= IR_9600|IR_19200|IR_38400|IR_57600|IR_115200;
8787
qos->min_turn_time.bits = 0x03;
88-
89-
MOD_INC_USE_COUNT;
9088
}
9189

9290
static void girbil_close(dongle_t *self)
9391
{
9492
/* Power off dongle */
9593
self->set_dtr_rts(self->dev, FALSE, FALSE);
96-
97-
MOD_DEC_USE_COUNT;
9894
}
9995

10096
/*

‎drivers/net/irda/litelink.c

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -48,12 +48,12 @@ static int litelink_reset(struct irda_task *task);
4848
static __u32 baud_rates[] = { 115200, 57600, 38400, 19200, 9600 };
4949

5050
static struct dongle_reg dongle = {
51-
Q_NULL,
52-
IRDA_LITELINK_DONGLE,
53-
litelink_open,
54-
litelink_close,
55-
litelink_reset,
56-
litelink_change_speed,
51+
.type = IRDA_LITELINK_DONGLE,
52+
.open = litelink_open,
53+
.close = litelink_close,
54+
.reset = litelink_reset,
55+
.change_speed = litelink_change_speed,
56+
.owner = THIS_MODULE,
5757
};
5858

5959
int __init litelink_init(void)
@@ -70,16 +70,12 @@ static void litelink_open(dongle_t *self, struct qos_info *qos)
7070
{
7171
qos->baud_rate.bits &= IR_9600|IR_19200|IR_38400|IR_57600|IR_115200;
7272
qos->min_turn_time.bits = 0x7f; /* Needs 0.01 ms */
73-
74-
MOD_INC_USE_COUNT;
7573
}
7674

7775
static void litelink_close(dongle_t *self)
7876
{
7977
/* Power off dongle */
8078
self->set_dtr_rts(self->dev, FALSE, FALSE);
81-
82-
MOD_DEC_USE_COUNT;
8379
}
8480

8581
/*

‎drivers/net/irda/ma600.c

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -74,12 +74,12 @@ static int ma600_reset(struct irda_task *task);
7474
#define MA600_2400 0x08
7575

7676
static struct dongle_reg dongle = {
77-
Q_NULL,
78-
IRDA_MA600_DONGLE,
79-
ma600_open,
80-
ma600_close,
81-
ma600_reset,
82-
ma600_change_speed,
77+
.type = IRDA_MA600_DONGLE,
78+
.open = ma600_open,
79+
.close = ma600_close,
80+
.reset = ma600_reset,
81+
.change_speed = ma600_change_speed,
82+
.owner = THIS_MODULE,
8383
};
8484

8585
int __init ma600_init(void)
@@ -115,8 +115,6 @@ static void ma600_open(dongle_t *self, struct qos_info *qos)
115115

116116
self->set_dtr_rts(self->dev, TRUE, TRUE);
117117
// should wait 1 second
118-
119-
MOD_INC_USE_COUNT;
120118
}
121119

122120
static void ma600_close(dongle_t *self)
@@ -125,8 +123,6 @@ static void ma600_close(dongle_t *self)
125123

126124
/* Power off dongle */
127125
self->set_dtr_rts(self->dev, FALSE, FALSE);
128-
129-
MOD_DEC_USE_COUNT;
130126
}
131127

132128
static __u8 get_control_byte(__u32 speed)

‎drivers/net/irda/mcp2120.c

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -40,12 +40,12 @@ static int mcp2120_change_speed(struct irda_task *task);
4040
#define MCP2120_COMMIT 0x11
4141

4242
static struct dongle_reg dongle = {
43-
Q_NULL,
44-
IRDA_MCP2120_DONGLE,
45-
mcp2120_open,
46-
mcp2120_close,
47-
mcp2120_reset,
48-
mcp2120_change_speed,
43+
.type = IRDA_MCP2120_DONGLE,
44+
.open = mcp2120_open,
45+
.close = mcp2120_close,
46+
.reset = mcp2120_reset,
47+
.change_speed = mcp2120_change_speed,
48+
.owner = THIS_MODULE,
4949
};
5050

5151
int __init mcp2120_init(void)
@@ -62,8 +62,6 @@ static void mcp2120_open(dongle_t *self, struct qos_info *qos)
6262
{
6363
qos->baud_rate.bits &= IR_9600|IR_19200|IR_38400|IR_57600|IR_115200;
6464
qos->min_turn_time.bits = 0x01;
65-
66-
MOD_INC_USE_COUNT;
6765
}
6866

6967
static void mcp2120_close(dongle_t *self)
@@ -72,8 +70,6 @@ static void mcp2120_close(dongle_t *self)
7270
/* reset and inhibit mcp2120 */
7371
self->set_dtr_rts(self->dev, TRUE, TRUE);
7472
//self->set_dtr_rts(self->dev, FALSE, FALSE);
75-
76-
MOD_DEC_USE_COUNT;
7773
}
7874

7975
/*

‎drivers/net/irda/old_belkin.c

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -74,12 +74,12 @@ static int old_belkin_reset(struct irda_task *task);
7474
/* static __u32 baud_rates[] = { 9600 }; */
7575

7676
static struct dongle_reg dongle = {
77-
Q_NULL,
78-
IRDA_OLD_BELKIN_DONGLE,
79-
old_belkin_open,
80-
old_belkin_close,
81-
old_belkin_reset,
82-
old_belkin_change_speed,
77+
.type = IRDA_OLD_BELKIN_DONGLE,
78+
.open = old_belkin_open,
79+
.close = old_belkin_close,
80+
.reset = old_belkin_reset,
81+
.change_speed = old_belkin_change_speed,
82+
.owner = THIS_MODULE,
8383
};
8484

8585
int __init old_belkin_init(void)
@@ -98,16 +98,12 @@ static void old_belkin_open(dongle_t *self, struct qos_info *qos)
9898
qos->baud_rate.bits &= IR_9600;
9999
/* Needs at least 10 ms (totally wild guess, can do probably better) */
100100
qos->min_turn_time.bits = 0x01;
101-
102-
MOD_INC_USE_COUNT;
103101
}
104102

105103
static void old_belkin_close(dongle_t *self)
106104
{
107105
/* Power off dongle */
108106
self->set_dtr_rts(self->dev, FALSE, FALSE);
109-
110-
MOD_DEC_USE_COUNT;
111107
}
112108

113109
/*

‎drivers/net/irda/tekram.c

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -44,12 +44,12 @@ static int tekram_reset(struct irda_task *task);
4444
#define TEKRAM_PW 0x10 /* Pulse select bit */
4545

4646
static struct dongle_reg dongle = {
47-
Q_NULL,
48-
IRDA_TEKRAM_DONGLE,
49-
tekram_open,
50-
tekram_close,
51-
tekram_reset,
52-
tekram_change_speed,
47+
.type = IRDA_TEKRAM_DONGLE,
48+
.open = tekram_open,
49+
.close = tekram_close,
50+
.reset = tekram_reset,
51+
.change_speed = tekram_change_speed,
52+
.owner = THIS_MODULE,
5353
};
5454

5555
int __init tekram_init(void)
@@ -69,8 +69,6 @@ static void tekram_open(dongle_t *self, struct qos_info *qos)
6969
qos->baud_rate.bits &= IR_9600|IR_19200|IR_38400|IR_57600|IR_115200;
7070
qos->min_turn_time.bits = 0x01; /* Needs at least 10 ms */
7171
irda_qos_bits_to_value(qos);
72-
73-
MOD_INC_USE_COUNT;
7472
}
7573

7674
static void tekram_close(dongle_t *self)
@@ -84,8 +82,6 @@ static void tekram_close(dongle_t *self)
8482
irda_task_delete(self->reset_task);
8583
if (self->speed_task)
8684
irda_task_delete(self->speed_task);
87-
88-
MOD_DEC_USE_COUNT;
8985
}
9086

9187
/*

0 commit comments

Comments
 (0)