Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 341734
b: refs/heads/master
c: 96070ae
h: refs/heads/master
v: v3
  • Loading branch information
Alexander Shiyan authored and David S. Miller committed Dec 3, 2012
1 parent 617d2ef commit 309469c
Show file tree
Hide file tree
Showing 2 changed files with 28 additions and 47 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: 60e476d02129acb1f863a9b4932358678ee6a355
refs/heads/master: 96070ae4d08eefe62ac534904ce21a01e1a5c9c4
73 changes: 27 additions & 46 deletions trunk/drivers/net/irda/ep7211-sir.c
Original file line number Diff line number Diff line change
@@ -1,52 +1,18 @@
/*
* IR port driver for the Cirrus Logic EP7211 processor.
* IR port driver for the Cirrus Logic CLPS711X processors
*
* Copyright 2001, Blue Mug Inc. All rights reserved.
* Copyright 2007, Samuel Ortiz <samuel@sortiz.org>
*/
#include <linux/module.h>
#include <linux/delay.h>
#include <linux/tty.h>
#include <linux/init.h>
#include <linux/spinlock.h>

#include <net/irda/irda.h>
#include <net/irda/irda_device.h>
#include <linux/module.h>
#include <linux/platform_device.h>

#include <asm/io.h>
#include <mach/hardware.h>

#include "sir-dev.h"

#define MIN_DELAY 25 /* 15 us, but wait a little more to be sure */
#define MAX_DELAY 10000 /* 1 ms */

static int ep7211_open(struct sir_dev *dev);
static int ep7211_close(struct sir_dev *dev);
static int ep7211_change_speed(struct sir_dev *dev, unsigned speed);
static int ep7211_reset(struct sir_dev *dev);

static struct dongle_driver ep7211 = {
.owner = THIS_MODULE,
.driver_name = "EP7211 IR driver",
.type = IRDA_EP7211_DONGLE,
.open = ep7211_open,
.close = ep7211_close,
.reset = ep7211_reset,
.set_speed = ep7211_change_speed,
};

static int __init ep7211_sir_init(void)
{
return irda_register_dongle(&ep7211);
}

static void __exit ep7211_sir_cleanup(void)
{
irda_unregister_dongle(&ep7211);
}

static int ep7211_open(struct sir_dev *dev)
static int clps711x_dongle_open(struct sir_dev *dev)
{
unsigned int syscon;

Expand All @@ -58,7 +24,7 @@ static int ep7211_open(struct sir_dev *dev)
return 0;
}

static int ep7211_close(struct sir_dev *dev)
static int clps711x_dongle_close(struct sir_dev *dev)
{
unsigned int syscon;

Expand All @@ -70,20 +36,35 @@ static int ep7211_close(struct sir_dev *dev)
return 0;
}

static int ep7211_change_speed(struct sir_dev *dev, unsigned speed)
static struct dongle_driver clps711x_dongle = {
.owner = THIS_MODULE,
.driver_name = "EP7211 IR driver",
.type = IRDA_EP7211_DONGLE,
.open = clps711x_dongle_open,
.close = clps711x_dongle_close,
};

static int clps711x_sir_probe(struct platform_device *pdev)
{
return 0;
return irda_register_dongle(&clps711x_dongle);
}

static int ep7211_reset(struct sir_dev *dev)
static int clps711x_sir_remove(struct platform_device *pdev)
{
return 0;
return irda_unregister_dongle(&clps711x_dongle);
}

static struct platform_driver clps711x_sir_driver = {
.driver = {
.name = "sir-clps711x",
.owner = THIS_MODULE,
},
.probe = clps711x_sir_probe,
.remove = clps711x_sir_remove,
};
module_platform_driver(clps711x_sir_driver);

MODULE_AUTHOR("Samuel Ortiz <samuel@sortiz.org>");
MODULE_DESCRIPTION("EP7211 IR dongle driver");
MODULE_LICENSE("GPL");
MODULE_ALIAS("irda-dongle-13"); /* IRDA_EP7211_DONGLE */

module_init(ep7211_sir_init);
module_exit(ep7211_sir_cleanup);

0 comments on commit 309469c

Please sign in to comment.