git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
nfsd: simplify fh_verify access checks
[safe/jmp/linux-2.6]
/
net
/
irda
/
irda_device.c
diff --git
a/net/irda/irda_device.c
b/net/irda/irda_device.c
index
8718591
..
bf92e14
100644
(file)
--- a/
net/irda/irda_device.c
+++ b/
net/irda/irda_device.c
@@
-90,7
+90,7
@@
static void leftover_dongle(void *arg)
void irda_device_cleanup(void)
{
void irda_device_cleanup(void)
{
- IRDA_DEBUG(4, "%s()\n", __
FUNCTION
__);
+ IRDA_DEBUG(4, "%s()\n", __
func
__);
hashbin_delete(tasks, (FREE_FUNC) __irda_task_delete);
hashbin_delete(tasks, (FREE_FUNC) __irda_task_delete);
@@
-107,7
+107,7
@@
void irda_device_set_media_busy(struct net_device *dev, int status)
{
struct irlap_cb *self;
{
struct irlap_cb *self;
- IRDA_DEBUG(4, "%s(%s)\n", __
FUNCTION
__, status ? "TRUE" : "FALSE");
+ IRDA_DEBUG(4, "%s(%s)\n", __
func
__, status ? "TRUE" : "FALSE");
self = (struct irlap_cb *) dev->atalk_ptr;
self = (struct irlap_cb *) dev->atalk_ptr;
@@
-147,15
+147,16
@@
int irda_device_is_receiving(struct net_device *dev)
struct if_irda_req req;
int ret;
struct if_irda_req req;
int ret;
- IRDA_DEBUG(2, "%s()\n", __
FUNCTION
__);
+ IRDA_DEBUG(2, "%s()\n", __
func
__);
- if (!dev->do_ioctl) {
+ if (!dev->
netdev_ops->ndo_
do_ioctl) {
IRDA_ERROR("%s: do_ioctl not impl. by device driver\n",
IRDA_ERROR("%s: do_ioctl not impl. by device driver\n",
- __
FUNCTION
__);
+ __
func
__);
return -1;
}
return -1;
}
- ret = dev->do_ioctl(dev, (struct ifreq *) &req, SIOCGRECEIVING);
+ ret = (dev->netdev_ops->ndo_do_ioctl)(dev, (struct ifreq *) &req,
+ SIOCGRECEIVING);
if (ret < 0)
return ret;
if (ret < 0)
return ret;
@@
-191,7
+192,7
@@
static int irda_task_kick(struct irda_task *task)
int count = 0;
int timeout;
int count = 0;
int timeout;
- IRDA_DEBUG(2, "%s()\n", __
FUNCTION
__);
+ IRDA_DEBUG(2, "%s()\n", __
func
__);
IRDA_ASSERT(task != NULL, return -1;);
IRDA_ASSERT(task->magic == IRDA_TASK_MAGIC, return -1;);
IRDA_ASSERT(task != NULL, return -1;);
IRDA_ASSERT(task->magic == IRDA_TASK_MAGIC, return -1;);
@@
-201,14
+202,14
@@
static int irda_task_kick(struct irda_task *task)
timeout = task->function(task);
if (count++ > 100) {
IRDA_ERROR("%s: error in task handler!\n",
timeout = task->function(task);
if (count++ > 100) {
IRDA_ERROR("%s: error in task handler!\n",
- __
FUNCTION
__);
+ __
func
__);
irda_task_delete(task);
return TRUE;
}
} while ((timeout == 0) && (task->state != IRDA_TASK_DONE));
if (timeout < 0) {
irda_task_delete(task);
return TRUE;
}
} while ((timeout == 0) && (task->state != IRDA_TASK_DONE));
if (timeout < 0) {
- IRDA_ERROR("%s: Error executing task!\n", __
FUNCTION
__);
+ IRDA_ERROR("%s: Error executing task!\n", __
func
__);
irda_task_delete(task);
return TRUE;
}
irda_task_delete(task);
return TRUE;
}
@@
-241,7
+242,7
@@
static int irda_task_kick(struct irda_task *task)
finished = FALSE;
} else {
IRDA_DEBUG(0, "%s(), not finished, and no timeout!\n",
finished = FALSE;
} else {
IRDA_DEBUG(0, "%s(), not finished, and no timeout!\n",
- __
FUNCTION
__);
+ __
func
__);
finished = FALSE;
}
finished = FALSE;
}
@@
-258,7
+259,7
@@
static void irda_task_timer_expired(void *data)
{
struct irda_task *task;
{
struct irda_task *task;
- IRDA_DEBUG(2, "%s()\n", __
FUNCTION
__);
+ IRDA_DEBUG(2, "%s()\n", __
func
__);
task = (struct irda_task *) data;
task = (struct irda_task *) data;