Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 122909
b: refs/heads/master
c: 0e49e64
h: refs/heads/master
i:
  122907: e65a8e4
v: v3
  • Loading branch information
Hannes Eder authored and David S. Miller committed Dec 26, 2008
1 parent a1be467 commit dc8285f
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 12 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 678c610b5a069a0a76c3189dd9aa801e5d5cd7e0
refs/heads/master: 0e49e64526ccd8cb78d7c4b4a732024ff221d4d0
2 changes: 1 addition & 1 deletion trunk/drivers/net/irda/ma600-sir.c
Original file line number Diff line number Diff line change
Expand Up @@ -236,7 +236,7 @@ static int ma600_change_speed(struct sir_dev *dev, unsigned speed)
* avoid the state machine complexity before we get things working
*/

int ma600_reset(struct sir_dev *dev)
static int ma600_reset(struct sir_dev *dev)
{
IRDA_DEBUG(2, "%s()\n", __func__);

Expand Down
6 changes: 3 additions & 3 deletions trunk/drivers/net/irda/smsc-ircc2.c
Original file line number Diff line number Diff line change
Expand Up @@ -872,7 +872,7 @@ static void smsc_ircc_timeout(struct net_device *dev)
* waits until the next transmit interrupt, and continues until the
* frame is transmitted.
*/
int smsc_ircc_hard_xmit_sir(struct sk_buff *skb, struct net_device *dev)
static int smsc_ircc_hard_xmit_sir(struct sk_buff *skb, struct net_device *dev)
{
struct smsc_ircc_cb *self;
unsigned long flags;
Expand Down Expand Up @@ -1128,7 +1128,7 @@ static void smsc_ircc_change_speed(struct smsc_ircc_cb *self, u32 speed)
* Set speed of IrDA port to specified baudrate
*
*/
void smsc_ircc_set_sir_speed(struct smsc_ircc_cb *self, __u32 speed)
static void smsc_ircc_set_sir_speed(struct smsc_ircc_cb *self, __u32 speed)
{
int iobase;
int fcr; /* FIFO control reg */
Expand Down Expand Up @@ -1894,7 +1894,7 @@ static void __exit smsc_ircc_cleanup(void)
* This function *must* be called with spinlock held, because it may
* be called from the irq handler (via smsc_ircc_change_speed()). - Jean II
*/
void smsc_ircc_sir_start(struct smsc_ircc_cb *self)
static void smsc_ircc_sir_start(struct smsc_ircc_cb *self)
{
struct net_device *dev;
int fir_base, sir_base;
Expand Down
14 changes: 7 additions & 7 deletions trunk/drivers/net/irda/w83977af_ir.c
Original file line number Diff line number Diff line change
Expand Up @@ -147,8 +147,8 @@ static void __exit w83977af_cleanup(void)
* Open driver instance
*
*/
int w83977af_open(int i, unsigned int iobase, unsigned int irq,
unsigned int dma)
static int w83977af_open(int i, unsigned int iobase, unsigned int irq,
unsigned int dma)
{
struct net_device *dev;
struct w83977af_ir *self;
Expand Down Expand Up @@ -310,7 +310,7 @@ static int w83977af_close(struct w83977af_ir *self)
return 0;
}

int w83977af_probe( int iobase, int irq, int dma)
static int w83977af_probe(int iobase, int irq, int dma)
{
int version;
int i;
Expand Down Expand Up @@ -409,7 +409,7 @@ int w83977af_probe( int iobase, int irq, int dma)
return -1;
}

void w83977af_change_speed(struct w83977af_ir *self, __u32 speed)
static void w83977af_change_speed(struct w83977af_ir *self, __u32 speed)
{
int ir_mode = HCR_SIR;
int iobase;
Expand Down Expand Up @@ -489,7 +489,7 @@ void w83977af_change_speed(struct w83977af_ir *self, __u32 speed)
* Sets up a DMA transfer to send the current frame.
*
*/
int w83977af_hard_xmit(struct sk_buff *skb, struct net_device *dev)
static int w83977af_hard_xmit(struct sk_buff *skb, struct net_device *dev)
{
struct w83977af_ir *self;
__s32 speed;
Expand Down Expand Up @@ -731,7 +731,7 @@ static void w83977af_dma_xmit_complete(struct w83977af_ir *self)
* if it starts to receive a frame.
*
*/
int w83977af_dma_receive(struct w83977af_ir *self)
static int w83977af_dma_receive(struct w83977af_ir *self)
{
int iobase;
__u8 set;
Expand Down Expand Up @@ -803,7 +803,7 @@ int w83977af_dma_receive(struct w83977af_ir *self)
* Finished with receiving a frame
*
*/
int w83977af_dma_receive_complete(struct w83977af_ir *self)
static int w83977af_dma_receive_complete(struct w83977af_ir *self)
{
struct sk_buff *skb;
struct st_fifo *st_fifo;
Expand Down

0 comments on commit dc8285f

Please sign in to comment.