Code Review
/
kvmfornfv.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
These changes are a raw update to a vanilla kernel 4.1.10, with the
[kvmfornfv.git]
/
kernel
/
drivers
/
usb
/
host
/
ehci-sysfs.c
diff --git
a/kernel/drivers/usb/host/ehci-sysfs.c
b/kernel/drivers/usb/host/ehci-sysfs.c
index
5e44407
..
5216f2b
100644
(file)
--- a/
kernel/drivers/usb/host/ehci-sysfs.c
+++ b/
kernel/drivers/usb/host/ehci-sysfs.c
@@
-29,7
+29,7
@@
static ssize_t show_companion(struct device *dev,
int count = PAGE_SIZE;
char *ptr = buf;
int count = PAGE_SIZE;
char *ptr = buf;
- ehci = hcd_to_ehci(
bus_to_hcd(dev_get_drvdata(dev)
));
+ ehci = hcd_to_ehci(
dev_get_drvdata(dev
));
nports = HCS_N_PORTS(ehci->hcs_params);
for (index = 0; index < nports; ++index) {
nports = HCS_N_PORTS(ehci->hcs_params);
for (index = 0; index < nports; ++index) {
@@
-54,7
+54,7
@@
static ssize_t store_companion(struct device *dev,
struct ehci_hcd *ehci;
int portnum, new_owner;
struct ehci_hcd *ehci;
int portnum, new_owner;
- ehci = hcd_to_ehci(
bus_to_hcd(dev_get_drvdata(dev)
));
+ ehci = hcd_to_ehci(
dev_get_drvdata(dev
));
new_owner = PORT_OWNER; /* Owned by companion */
if (sscanf(buf, "%d", &portnum) != 1)
return -EINVAL;
new_owner = PORT_OWNER; /* Owned by companion */
if (sscanf(buf, "%d", &portnum) != 1)
return -EINVAL;
@@
-85,7
+85,7
@@
static ssize_t show_uframe_periodic_max(struct device *dev,
struct ehci_hcd *ehci;
int n;
struct ehci_hcd *ehci;
int n;
- ehci = hcd_to_ehci(
bus_to_hcd(dev_get_drvdata(dev)
));
+ ehci = hcd_to_ehci(
dev_get_drvdata(dev
));
n = scnprintf(buf, PAGE_SIZE, "%d\n", ehci->uframe_periodic_max);
return n;
}
n = scnprintf(buf, PAGE_SIZE, "%d\n", ehci->uframe_periodic_max);
return n;
}
@@
-101,7
+101,7
@@
static ssize_t store_uframe_periodic_max(struct device *dev,
unsigned long flags;
ssize_t ret;
unsigned long flags;
ssize_t ret;
- ehci = hcd_to_ehci(
bus_to_hcd(dev_get_drvdata(dev)
));
+ ehci = hcd_to_ehci(
dev_get_drvdata(dev
));
if (kstrtouint(buf, 0, &uframe_periodic_max) < 0)
return -EINVAL;
if (kstrtouint(buf, 0, &uframe_periodic_max) < 0)
return -EINVAL;