diff for duplicates of <20130820183035.GD14337@xanatos> diff --git a/a/1.txt b/N1/1.txt index 86f3a6f..201c081 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -166,7 +166,7 @@ argument anymore, right? > addr = &ir_set->irq_pending; > - temp = xhci_readl(xhci, addr); > + temp = xhci_readl(addr); -> if (temp = XHCI_INIT_VALUE) +> if (temp == XHCI_INIT_VALUE) > return; > > @@ -187,17 +187,17 @@ void xhci_print_ir_set(struct xhci_hcd *xhci, int set_num) @@ -293,7 +293,7 @@ argument anymore, right? > status = 0; > - temp = xhci_readl(xhci, port_array[wIndex]); > + temp = xhci_readl(port_array[wIndex]); -> if (temp = 0xffffffff) { +> if (temp == 0xffffffff) { > retval = -ENODEV; > break; > @@ -709,7 +709,7 @@ int xhci_hub_control(struct usb_hcd *hcd, u16 typeReq, u16 wValue, @@ -302,7 +302,7 @@ argument anymore, right? > wIndex--; > - temp = xhci_readl(xhci, port_array[wIndex]); > + temp = xhci_readl(port_array[wIndex]); -> if (temp = 0xffffffff) { +> if (temp == 0xffffffff) { > retval = -ENODEV; > break; > @@ -718,7 +718,7 @@ int xhci_hub_control(struct usb_hcd *hcd, u16 typeReq, u16 wValue, @@ -320,7 +320,7 @@ argument anymore, right? > */ > - temp = xhci_readl(xhci, port_array[wIndex]); > + temp = xhci_readl(port_array[wIndex]); -> if ((temp & PORT_PE) = 0 || (temp & PORT_RESET) +> if ((temp & PORT_PE) == 0 || (temp & PORT_RESET) > || (temp & PORT_PLS_MASK) >= XDEV_U3) { > xhci_warn(xhci, "USB core suspending device " > @@ -756,11 +756,11 @@ int xhci_hub_control(struct usb_hcd *hcd, u16 typeReq, u16 wValue, @@ -336,7 +336,7 @@ argument anymore, right? > + temp = xhci_readl(port_array[wIndex]); > > /* Disable port */ -> if (link_state = USB_SS_PORT_LS_SS_DISABLED) { +> if (link_state == USB_SS_PORT_LS_SS_DISABLED) { > @@ -775,7 +775,7 @@ int xhci_hub_control(struct usb_hcd *hcd, u16 typeReq, u16 wValue, > PORT_CEC; > xhci_writel(xhci, temp | PORT_PE, @@ -361,7 +361,7 @@ argument anymore, right? > > - temp = xhci_readl(xhci, port_array[wIndex]); > + temp = xhci_readl(port_array[wIndex]); -> if (link_state = USB_SS_PORT_LS_U3) +> if (link_state == USB_SS_PORT_LS_U3) > bus_state->suspended_ports |= 1 << wIndex; > break; > @@ -832,7 +832,7 @@ int xhci_hub_control(struct usb_hcd *hcd, u16 typeReq, u16 wValue, @@ -426,7 +426,7 @@ argument anymore, right? > wIndex--; > - temp = xhci_readl(xhci, port_array[wIndex]); > + temp = xhci_readl(port_array[wIndex]); -> if (temp = 0xffffffff) { +> if (temp == 0xffffffff) { > retval = -ENODEV; > break; > @@ -899,7 +899,7 @@ int xhci_hub_control(struct usb_hcd *hcd, u16 typeReq, u16 wValue, @@ -444,7 +444,7 @@ argument anymore, right? > for (i = 0; i < max_ports; i++) { > - temp = xhci_readl(xhci, port_array[i]); > + temp = xhci_readl(port_array[i]); -> if (temp = 0xffffffff) { +> if (temp == 0xffffffff) { > retval = -ENODEV; > break; > @@ -1058,7 +1058,7 @@ int xhci_bus_suspend(struct usb_hcd *hcd) @@ -527,7 +527,7 @@ argument anymore, right? > addr = &xhci->cap_regs->hcc_params; > - offset = XHCI_HCC_EXT_CAPS(xhci_readl(xhci, addr)); > + offset = XHCI_HCC_EXT_CAPS(xhci_readl(addr)); -> if (offset = 0) { +> if (offset == 0) { > xhci_err(xhci, "No Extended Capability registers, " > "unable to set up roothub.\n"); > @@ -2173,7 +2173,7 @@ static int xhci_setup_port_arrays(struct xhci_hcd *xhci, gfp_t flags) @@ -536,7 +536,7 @@ argument anymore, right? > u32 cap_id; > - cap_id = xhci_readl(xhci, tmp_addr); > + cap_id = xhci_readl(tmp_addr); -> if (XHCI_EXT_CAPS_ID(cap_id) = XHCI_EXT_CAPS_PROTOCOL) +> if (XHCI_EXT_CAPS_ID(cap_id) == XHCI_EXT_CAPS_PROTOCOL) > cap_count++; > tmp_offset = XHCI_EXT_CAPS_NEXT(cap_id); > @@ -2187,7 +2187,7 @@ static int xhci_setup_port_arrays(struct xhci_hcd *xhci, gfp_t flags) @@ -545,7 +545,7 @@ argument anymore, right? > > - cap_id = xhci_readl(xhci, addr); > + cap_id = xhci_readl(addr); -> if (XHCI_EXT_CAPS_ID(cap_id) = XHCI_EXT_CAPS_PROTOCOL) +> if (XHCI_EXT_CAPS_ID(cap_id) == XHCI_EXT_CAPS_PROTOCOL) > xhci_add_in_port(xhci, num_ports, addr, > (u8) XHCI_EXT_PORT_MAJOR(cap_id), > @@ -2287,7 +2287,7 @@ int xhci_mem_init(struct xhci_hcd *xhci, gfp_t flags) @@ -616,11 +616,11 @@ argument anymore, right? > > - temp = xhci_readl(xhci, port_array[faked_port_index]); > + temp = xhci_readl(port_array[faked_port_index]); -> if (hcd->state = HC_STATE_SUSPENDED) { +> if (hcd->state == HC_STATE_SUSPENDED) { > xhci_dbg(xhci, "resume root hub\n"); > usb_hcd_resume_root_hub(hcd); > @@ -1657,7 +1657,7 @@ static void handle_port_status(struct xhci_hcd *xhci, -> if ((temp & PORT_PLC) && (temp & PORT_PLS_MASK) = XDEV_RESUME) { +> if ((temp & PORT_PLC) && (temp & PORT_PLS_MASK) == XDEV_RESUME) { > xhci_dbg(xhci, "port resume event for port %d\n", port_id); > > - temp1 = xhci_readl(xhci, &xhci->op_regs->command); @@ -634,7 +634,7 @@ argument anymore, right? > /* Check if the xHC generated the interrupt, or the irq is shared */ > - status = xhci_readl(xhci, &xhci->op_regs->status); > + status = xhci_readl(&xhci->op_regs->status); -> if (status = 0xffffffff) +> if (status == 0xffffffff) > goto hw_died; > > @@ -2756,7 +2756,7 @@ hw_died: @@ -665,7 +665,7 @@ argument anymore, right? > do { > - result = xhci_readl(xhci, ptr); > + result = xhci_readl(ptr); -> if (result = ~(u32)0) /* card removed */ +> if (result == ~(u32)0) /* card removed */ > return -ENODEV; > result &= mask; > @@ -80,11 +80,11 @@ void xhci_quiesce(struct xhci_hcd *xhci) @@ -697,7 +697,7 @@ argument anymore, right? > > - state = xhci_readl(xhci, &xhci->op_regs->status); > + state = xhci_readl(&xhci->op_regs->status); -> if ((state & STS_HALT) = 0) { +> if ((state & STS_HALT) == 0) { > xhci_warn(xhci, "Host controller not halted, aborting reset.\n"); > return 0; > } @@ -714,7 +714,7 @@ argument anymore, right? > for (i = 0; i < xhci->num_usb3_ports; i++) { > - temp = xhci_readl(xhci, xhci->usb3_ports[i]); > + temp = xhci_readl(xhci->usb3_ports[i]); -> if ((temp & PORT_PLS_MASK) = USB_SS_PORT_LS_COMP_MOD) { +> if ((temp & PORT_PLS_MASK) == USB_SS_PORT_LS_COMP_MOD) { > /* > * Compliance Mode Detected. Letting USB Core > @@ -540,7 +540,7 @@ static void xhci_event_ring_work(unsigned long arg) @@ -724,7 +724,7 @@ argument anymore, right? > - temp = xhci_readl(xhci, &xhci->op_regs->status); > + temp = xhci_readl(&xhci->op_regs->status); > xhci_dbg(xhci, "op reg status = 0x%x\n", temp); -> if (temp = 0xffffffff || (xhci->xhc_state & XHCI_STATE_DYING) || +> if (temp == 0xffffffff || (xhci->xhc_state & XHCI_STATE_DYING) || > (xhci->xhc_state & XHCI_STATE_HALTED)) { > @@ -549,7 +549,7 @@ static void xhci_event_ring_work(unsigned long arg) > return; @@ -880,7 +880,7 @@ argument anymore, right? > goto done; > - temp = xhci_readl(xhci, &xhci->op_regs->status); > + temp = xhci_readl(&xhci->op_regs->status); -> if (temp = 0xffffffff || (xhci->xhc_state & XHCI_STATE_HALTED)) { +> if (temp == 0xffffffff || (xhci->xhc_state & XHCI_STATE_HALTED)) { > xhci_dbg(xhci, "HW died, freeing TD.\n"); > urb_priv = urb->hcpriv; > @@ -3606,7 +3606,7 @@ void xhci_free_dev(struct usb_hcd *hcd, struct usb_device *udev) @@ -889,7 +889,7 @@ argument anymore, right? > /* Don't disable the slot if the host controller is dead. */ > - state = xhci_readl(xhci, &xhci->op_regs->status); > + state = xhci_readl(&xhci->op_regs->status); -> if (state = 0xffffffff || (xhci->xhc_state & XHCI_STATE_DYING) || +> if (state == 0xffffffff || (xhci->xhc_state & XHCI_STATE_DYING) || > (xhci->xhc_state & XHCI_STATE_HALTED)) { > xhci_free_virt_device(xhci, udev->slot_id); > @@ -4088,12 +4088,12 @@ static int xhci_usb2_software_lpm_test(struct usb_hcd *hcd, diff --git a/a/content_digest b/N1/content_digest index 2bceca7..cc86044 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,7 +1,7 @@ "ref\01376991736-8516-1-git-send-email-kumargauravgupta3@gmail.com\0" "From\0Sarah Sharp <sarah.a.sharp@linux.intel.com>\0" "Subject\0Re: [PATCH] xHCI:Fixing xhci_readl definition and function call\0" - "Date\0Tue, 20 Aug 2013 18:30:35 +0000\0" + "Date\0Tue, 20 Aug 2013 11:30:35 -0700\0" "To\0Kumar Gaurav <kumargauravgupta3@gmail.com>\0" "Cc\0gregkh@linuxfoundation.org" linux-usb@vger.kernel.org @@ -177,7 +177,7 @@ "> \taddr = &ir_set->irq_pending;\n" "> -\ttemp = xhci_readl(xhci, addr);\n" "> +\ttemp = xhci_readl(addr);\n" - "> \tif (temp = XHCI_INIT_VALUE)\n" + "> \tif (temp == XHCI_INIT_VALUE)\n" "> \t\treturn;\n" "> \n" "> @@ -187,17 +187,17 @@ void xhci_print_ir_set(struct xhci_hcd *xhci, int set_num)\n" @@ -304,7 +304,7 @@ "> \t\tstatus = 0;\n" "> -\t\ttemp = xhci_readl(xhci, port_array[wIndex]);\n" "> +\t\ttemp = xhci_readl(port_array[wIndex]);\n" - "> \t\tif (temp = 0xffffffff) {\n" + "> \t\tif (temp == 0xffffffff) {\n" "> \t\t\tretval = -ENODEV;\n" "> \t\t\tbreak;\n" "> @@ -709,7 +709,7 @@ int xhci_hub_control(struct usb_hcd *hcd, u16 typeReq, u16 wValue,\n" @@ -313,7 +313,7 @@ "> \t\twIndex--;\n" "> -\t\ttemp = xhci_readl(xhci, port_array[wIndex]);\n" "> +\t\ttemp = xhci_readl(port_array[wIndex]);\n" - "> \t\tif (temp = 0xffffffff) {\n" + "> \t\tif (temp == 0xffffffff) {\n" "> \t\t\tretval = -ENODEV;\n" "> \t\t\tbreak;\n" "> @@ -718,7 +718,7 @@ int xhci_hub_control(struct usb_hcd *hcd, u16 typeReq, u16 wValue,\n" @@ -331,7 +331,7 @@ "> \t\t\t */\n" "> -\t\t\ttemp = xhci_readl(xhci, port_array[wIndex]);\n" "> +\t\t\ttemp = xhci_readl(port_array[wIndex]);\n" - "> \t\t\tif ((temp & PORT_PE) = 0 || (temp & PORT_RESET)\n" + "> \t\t\tif ((temp & PORT_PE) == 0 || (temp & PORT_RESET)\n" "> \t\t\t\t|| (temp & PORT_PLS_MASK) >= XDEV_U3) {\n" "> \t\t\t\txhci_warn(xhci, \"USB core suspending device \"\n" "> @@ -756,11 +756,11 @@ int xhci_hub_control(struct usb_hcd *hcd, u16 typeReq, u16 wValue,\n" @@ -347,7 +347,7 @@ "> +\t\t\ttemp = xhci_readl(port_array[wIndex]);\n" "> \n" "> \t\t\t/* Disable port */\n" - "> \t\t\tif (link_state = USB_SS_PORT_LS_SS_DISABLED) {\n" + "> \t\t\tif (link_state == USB_SS_PORT_LS_SS_DISABLED) {\n" "> @@ -775,7 +775,7 @@ int xhci_hub_control(struct usb_hcd *hcd, u16 typeReq, u16 wValue,\n" "> \t\t\t\t\tPORT_CEC;\n" "> \t\t\t\txhci_writel(xhci, temp | PORT_PE,\n" @@ -372,7 +372,7 @@ "> \n" "> -\t\t\ttemp = xhci_readl(xhci, port_array[wIndex]);\n" "> +\t\t\ttemp = xhci_readl(port_array[wIndex]);\n" - "> \t\t\tif (link_state = USB_SS_PORT_LS_U3)\n" + "> \t\t\tif (link_state == USB_SS_PORT_LS_U3)\n" "> \t\t\t\tbus_state->suspended_ports |= 1 << wIndex;\n" "> \t\t\tbreak;\n" "> @@ -832,7 +832,7 @@ int xhci_hub_control(struct usb_hcd *hcd, u16 typeReq, u16 wValue,\n" @@ -437,7 +437,7 @@ "> \t\twIndex--;\n" "> -\t\ttemp = xhci_readl(xhci, port_array[wIndex]);\n" "> +\t\ttemp = xhci_readl(port_array[wIndex]);\n" - "> \t\tif (temp = 0xffffffff) {\n" + "> \t\tif (temp == 0xffffffff) {\n" "> \t\t\tretval = -ENODEV;\n" "> \t\t\tbreak;\n" "> @@ -899,7 +899,7 @@ int xhci_hub_control(struct usb_hcd *hcd, u16 typeReq, u16 wValue,\n" @@ -455,7 +455,7 @@ "> \tfor (i = 0; i < max_ports; i++) {\n" "> -\t\ttemp = xhci_readl(xhci, port_array[i]);\n" "> +\t\ttemp = xhci_readl(port_array[i]);\n" - "> \t\tif (temp = 0xffffffff) {\n" + "> \t\tif (temp == 0xffffffff) {\n" "> \t\t\tretval = -ENODEV;\n" "> \t\t\tbreak;\n" "> @@ -1058,7 +1058,7 @@ int xhci_bus_suspend(struct usb_hcd *hcd)\n" @@ -538,7 +538,7 @@ "> \taddr = &xhci->cap_regs->hcc_params;\n" "> -\toffset = XHCI_HCC_EXT_CAPS(xhci_readl(xhci, addr));\n" "> +\toffset = XHCI_HCC_EXT_CAPS(xhci_readl(addr));\n" - "> \tif (offset = 0) {\n" + "> \tif (offset == 0) {\n" "> \t\txhci_err(xhci, \"No Extended Capability registers, \"\n" "> \t\t\t\t\"unable to set up roothub.\\n\");\n" "> @@ -2173,7 +2173,7 @@ static int xhci_setup_port_arrays(struct xhci_hcd *xhci, gfp_t flags)\n" @@ -547,7 +547,7 @@ "> \t\tu32 cap_id;\n" "> -\t\tcap_id = xhci_readl(xhci, tmp_addr);\n" "> +\t\tcap_id = xhci_readl(tmp_addr);\n" - "> \t\tif (XHCI_EXT_CAPS_ID(cap_id) = XHCI_EXT_CAPS_PROTOCOL)\n" + "> \t\tif (XHCI_EXT_CAPS_ID(cap_id) == XHCI_EXT_CAPS_PROTOCOL)\n" "> \t\t\tcap_count++;\n" "> \t\ttmp_offset = XHCI_EXT_CAPS_NEXT(cap_id);\n" "> @@ -2187,7 +2187,7 @@ static int xhci_setup_port_arrays(struct xhci_hcd *xhci, gfp_t flags)\n" @@ -556,7 +556,7 @@ "> \n" "> -\t\tcap_id = xhci_readl(xhci, addr);\n" "> +\t\tcap_id = xhci_readl(addr);\n" - "> \t\tif (XHCI_EXT_CAPS_ID(cap_id) = XHCI_EXT_CAPS_PROTOCOL)\n" + "> \t\tif (XHCI_EXT_CAPS_ID(cap_id) == XHCI_EXT_CAPS_PROTOCOL)\n" "> \t\t\txhci_add_in_port(xhci, num_ports, addr,\n" "> \t\t\t\t\t(u8) XHCI_EXT_PORT_MAJOR(cap_id),\n" "> @@ -2287,7 +2287,7 @@ int xhci_mem_init(struct xhci_hcd *xhci, gfp_t flags)\n" @@ -627,11 +627,11 @@ "> \n" "> -\ttemp = xhci_readl(xhci, port_array[faked_port_index]);\n" "> +\ttemp = xhci_readl(port_array[faked_port_index]);\n" - "> \tif (hcd->state = HC_STATE_SUSPENDED) {\n" + "> \tif (hcd->state == HC_STATE_SUSPENDED) {\n" "> \t\txhci_dbg(xhci, \"resume root hub\\n\");\n" "> \t\tusb_hcd_resume_root_hub(hcd);\n" "> @@ -1657,7 +1657,7 @@ static void handle_port_status(struct xhci_hcd *xhci,\n" - "> \tif ((temp & PORT_PLC) && (temp & PORT_PLS_MASK) = XDEV_RESUME) {\n" + "> \tif ((temp & PORT_PLC) && (temp & PORT_PLS_MASK) == XDEV_RESUME) {\n" "> \t\txhci_dbg(xhci, \"port resume event for port %d\\n\", port_id);\n" "> \n" "> -\t\ttemp1 = xhci_readl(xhci, &xhci->op_regs->command);\n" @@ -645,7 +645,7 @@ "> \t/* Check if the xHC generated the interrupt, or the irq is shared */\n" "> -\tstatus = xhci_readl(xhci, &xhci->op_regs->status);\n" "> +\tstatus = xhci_readl(&xhci->op_regs->status);\n" - "> \tif (status = 0xffffffff)\n" + "> \tif (status == 0xffffffff)\n" "> \t\tgoto hw_died;\n" "> \n" "> @@ -2756,7 +2756,7 @@ hw_died:\n" @@ -676,7 +676,7 @@ "> \tdo {\n" "> -\t\tresult = xhci_readl(xhci, ptr);\n" "> +\t\tresult = xhci_readl(ptr);\n" - "> \t\tif (result = ~(u32)0)\t\t/* card removed */\n" + "> \t\tif (result == ~(u32)0)\t\t/* card removed */\n" "> \t\t\treturn -ENODEV;\n" "> \t\tresult &= mask;\n" "> @@ -80,11 +80,11 @@ void xhci_quiesce(struct xhci_hcd *xhci)\n" @@ -708,7 +708,7 @@ "> \n" "> -\tstate = xhci_readl(xhci, &xhci->op_regs->status);\n" "> +\tstate = xhci_readl(&xhci->op_regs->status);\n" - "> \tif ((state & STS_HALT) = 0) {\n" + "> \tif ((state & STS_HALT) == 0) {\n" "> \t\txhci_warn(xhci, \"Host controller not halted, aborting reset.\\n\");\n" "> \t\treturn 0;\n" "> \t}\n" @@ -725,7 +725,7 @@ "> \tfor (i = 0; i < xhci->num_usb3_ports; i++) {\n" "> -\t\ttemp = xhci_readl(xhci, xhci->usb3_ports[i]);\n" "> +\t\ttemp = xhci_readl(xhci->usb3_ports[i]);\n" - "> \t\tif ((temp & PORT_PLS_MASK) = USB_SS_PORT_LS_COMP_MOD) {\n" + "> \t\tif ((temp & PORT_PLS_MASK) == USB_SS_PORT_LS_COMP_MOD) {\n" "> \t\t\t/*\n" "> \t\t\t * Compliance Mode Detected. Letting USB Core\n" "> @@ -540,7 +540,7 @@ static void xhci_event_ring_work(unsigned long arg)\n" @@ -735,7 +735,7 @@ "> -\ttemp = xhci_readl(xhci, &xhci->op_regs->status);\n" "> +\ttemp = xhci_readl(&xhci->op_regs->status);\n" "> \txhci_dbg(xhci, \"op reg status = 0x%x\\n\", temp);\n" - "> \tif (temp = 0xffffffff || (xhci->xhc_state & XHCI_STATE_DYING) ||\n" + "> \tif (temp == 0xffffffff || (xhci->xhc_state & XHCI_STATE_DYING) ||\n" "> \t\t\t(xhci->xhc_state & XHCI_STATE_HALTED)) {\n" "> @@ -549,7 +549,7 @@ static void xhci_event_ring_work(unsigned long arg)\n" "> \t\treturn;\n" @@ -891,7 +891,7 @@ "> \t\tgoto done;\n" "> -\ttemp = xhci_readl(xhci, &xhci->op_regs->status);\n" "> +\ttemp = xhci_readl(&xhci->op_regs->status);\n" - "> \tif (temp = 0xffffffff || (xhci->xhc_state & XHCI_STATE_HALTED)) {\n" + "> \tif (temp == 0xffffffff || (xhci->xhc_state & XHCI_STATE_HALTED)) {\n" "> \t\txhci_dbg(xhci, \"HW died, freeing TD.\\n\");\n" "> \t\turb_priv = urb->hcpriv;\n" "> @@ -3606,7 +3606,7 @@ void xhci_free_dev(struct usb_hcd *hcd, struct usb_device *udev)\n" @@ -900,7 +900,7 @@ "> \t/* Don't disable the slot if the host controller is dead. */\n" "> -\tstate = xhci_readl(xhci, &xhci->op_regs->status);\n" "> +\tstate = xhci_readl(&xhci->op_regs->status);\n" - "> \tif (state = 0xffffffff || (xhci->xhc_state & XHCI_STATE_DYING) ||\n" + "> \tif (state == 0xffffffff || (xhci->xhc_state & XHCI_STATE_DYING) ||\n" "> \t\t\t(xhci->xhc_state & XHCI_STATE_HALTED)) {\n" "> \t\txhci_free_virt_device(xhci, udev->slot_id);\n" "> @@ -4088,12 +4088,12 @@ static int xhci_usb2_software_lpm_test(struct usb_hcd *hcd,\n" @@ -1034,4 +1034,4 @@ "> 1.7.9.5\n" > -a26be75dada3ac5fcf6df25a70a7b054dc4076bc1a74fbfc4745c16d5f21c4ef +a7ebfccb8f175bd70abade21709bc12b358c4f70b86c25c14f490943109b3f23
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.