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
/
usb
/
host
/
isp116x-hcd.c
diff --git
a/drivers/usb/host/isp116x-hcd.c
b/drivers/usb/host/isp116x-hcd.c
index
972ce04
..
2718b5d
100644
(file)
--- a/
drivers/usb/host/isp116x-hcd.c
+++ b/
drivers/usb/host/isp116x-hcd.c
@@
-63,7
+63,7
@@
#include <linux/init.h>
#include <linux/list.h>
#include <linux/usb.h>
#include <linux/init.h>
#include <linux/list.h>
#include <linux/usb.h>
-#include <linux/usb
_
isp116x.h>
+#include <linux/usb
/
isp116x.h>
#include <linux/platform_device.h>
#include <asm/io.h>
#include <linux/platform_device.h>
#include <asm/io.h>
@@
-418,7
+418,7
@@
static void postproc_atl_queue(struct isp116x *isp116x)
processed urbs.
*/
static void finish_request(struct isp116x *isp116x, struct isp116x_ep *ep,
processed urbs.
*/
static void finish_request(struct isp116x *isp116x, struct isp116x_ep *ep,
- struct urb *urb
, struct pt_regs *regs
)
+ struct urb *urb)
__releases(isp116x->lock) __acquires(isp116x->lock)
{
unsigned i;
__releases(isp116x->lock) __acquires(isp116x->lock)
{
unsigned i;
@@
-432,7
+432,7
@@
__releases(isp116x->lock) __acquires(isp116x->lock)
urb_dbg(urb, "Finish");
spin_unlock(&isp116x->lock);
urb_dbg(urb, "Finish");
spin_unlock(&isp116x->lock);
- usb_hcd_giveback_urb(isp116x_to_hcd(isp116x), urb
, regs
);
+ usb_hcd_giveback_urb(isp116x_to_hcd(isp116x), urb);
spin_lock(&isp116x->lock);
/* take idle endpoints out of the schedule */
spin_lock(&isp116x->lock);
/* take idle endpoints out of the schedule */
@@
-568,7
+568,7
@@
static void start_atl_transfers(struct isp116x *isp116x)
/*
Finish the processed transfers
*/
/*
Finish the processed transfers
*/
-static void finish_atl_transfers(struct isp116x *isp116x
, struct pt_regs *regs
)
+static void finish_atl_transfers(struct isp116x *isp116x)
{
struct isp116x_ep *ep;
struct urb *urb;
{
struct isp116x_ep *ep;
struct urb *urb;
@@
-590,12
+590,12
@@
static void finish_atl_transfers(struct isp116x *isp116x, struct pt_regs *regs)
occured, while URB_SHORT_NOT_OK was set */
if (urb && urb->status != -EINPROGRESS
&& ep->nextpid != USB_PID_ACK)
occured, while URB_SHORT_NOT_OK was set */
if (urb && urb->status != -EINPROGRESS
&& ep->nextpid != USB_PID_ACK)
- finish_request(isp116x, ep, urb
, regs
);
+ finish_request(isp116x, ep, urb);
}
atomic_dec(&isp116x->atl_finishing);
}
}
atomic_dec(&isp116x->atl_finishing);
}
-static irqreturn_t isp116x_irq(struct usb_hcd *hcd
, struct pt_regs *regs
)
+static irqreturn_t isp116x_irq(struct usb_hcd *hcd)
{
struct isp116x *isp116x = hcd_to_isp116x(hcd);
u16 irqstat;
{
struct isp116x *isp116x = hcd_to_isp116x(hcd);
u16 irqstat;
@@
-608,7
+608,7
@@
static irqreturn_t isp116x_irq(struct usb_hcd *hcd, struct pt_regs *regs)
if (irqstat & (HCuPINT_ATL | HCuPINT_SOF)) {
ret = IRQ_HANDLED;
if (irqstat & (HCuPINT_ATL | HCuPINT_SOF)) {
ret = IRQ_HANDLED;
- finish_atl_transfers(isp116x
, regs
);
+ finish_atl_transfers(isp116x);
}
if (irqstat & HCuPINT_OPR) {
}
if (irqstat & HCuPINT_OPR) {
@@
-724,7
+724,7
@@
static int isp116x_urb_enqueue(struct usb_hcd *hcd,
ep = hep->hcpriv;
else {
INIT_LIST_HEAD(&ep->schedule);
ep = hep->hcpriv;
else {
INIT_LIST_HEAD(&ep->schedule);
- ep->udev = u
sb_get_dev(udev)
;
+ ep->udev = u
dev
;
ep->epnum = epnum;
ep->maxpacket = usb_maxpacket(udev, urb->pipe, is_out);
usb_settoggle(udev, epnum, is_out, 0);
ep->epnum = epnum;
ep->maxpacket = usb_maxpacket(udev, urb->pipe, is_out);
usb_settoggle(udev, epnum, is_out, 0);
@@
-781,7
+781,7
@@
static int isp116x_urb_enqueue(struct usb_hcd *hcd,
if (ep->branch < PERIODIC_SIZE)
break;
if (ep->branch < PERIODIC_SIZE)
break;
-
ret = ep->branch
= balance(isp116x, ep->period, ep->load);
+
ep->branch = ret
= balance(isp116x, ep->period, ep->load);
if (ret < 0)
goto fail;
ret = 0;
if (ret < 0)
goto fail;
ret = 0;
@@
-824,7
+824,7
@@
static int isp116x_urb_enqueue(struct usb_hcd *hcd,
spin_lock(&urb->lock);
if (urb->status != -EINPROGRESS) {
spin_unlock(&urb->lock);
spin_lock(&urb->lock);
if (urb->status != -EINPROGRESS) {
spin_unlock(&urb->lock);
- finish_request(isp116x, ep, urb
, NULL
);
+ finish_request(isp116x, ep, urb);
ret = 0;
goto fail;
}
ret = 0;
goto fail;
}
@@
-870,7
+870,7
@@
static int isp116x_urb_dequeue(struct usb_hcd *hcd, struct urb *urb)
}
if (urb)
}
if (urb)
- finish_request(isp116x, ep, urb
, NULL
);
+ finish_request(isp116x, ep, urb);
spin_unlock_irqrestore(&isp116x->lock, flags);
return 0;
spin_unlock_irqrestore(&isp116x->lock, flags);
return 0;
@@
-891,7
+891,6
@@
static void isp116x_endpoint_disable(struct usb_hcd *hcd,
if (!list_empty(&hep->urb_list))
WARN("ep %p not empty?\n", ep);
if (!list_empty(&hep->urb_list))
WARN("ep %p not empty?\n", ep);
- usb_put_dev(ep->udev);
kfree(ep);
hep->hcpriv = NULL;
}
kfree(ep);
hep->hcpriv = NULL;
}
@@
-1205,10
+1204,10
@@
static int isp116x_show_dbg(struct seq_file *s, void *unused)
static int isp116x_open_seq(struct inode *inode, struct file *file)
{
static int isp116x_open_seq(struct inode *inode, struct file *file)
{
- return single_open(file, isp116x_show_dbg, inode->
u.generic_ip
);
+ return single_open(file, isp116x_show_dbg, inode->
i_private
);
}
}
-static struct file_operations isp116x_debug_fops = {
+static
const
struct file_operations isp116x_debug_fops = {
.open = isp116x_open_seq,
.read = seq_read,
.llseek = seq_lseek,
.open = isp116x_open_seq,
.read = seq_read,
.llseek = seq_lseek,
@@
-1553,7
+1552,7
@@
static struct hc_driver isp116x_hc_driver = {
/*----------------------------------------------------------------*/
/*----------------------------------------------------------------*/
-static int
__init_or_module
isp116x_remove(struct platform_device *pdev)
+static int isp116x_remove(struct platform_device *pdev)
{
struct usb_hcd *hcd = platform_get_drvdata(pdev);
struct isp116x *isp116x;
{
struct usb_hcd *hcd = platform_get_drvdata(pdev);
struct isp116x *isp116x;
@@
-1654,7
+1653,7
@@
static int __init isp116x_probe(struct platform_device *pdev)
goto err6;
}
goto err6;
}
- ret = usb_add_hcd(hcd, irq,
SA_INTERRUPT
);
+ ret = usb_add_hcd(hcd, irq,
IRQF_DISABLED
);
if (ret)
goto err6;
if (ret)
goto err6;