diff for duplicates of <5226CF51.9050207@gmail.com> diff --git a/a/1.txt b/N1/1.txt index ec69880..258142c 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -152,7 +152,7 @@ as this patch won't have any change in changelog >> 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) @@ -279,7 +279,7 @@ as this patch won't have any change in changelog >> wIndex--; >> - temp = xhci_readl(xhci, port_array[wIndex]); >> + temp = xhci_readl(port_array[wIndex]); ->> if (temp = 0xffffffff) { +>> if (temp == 0xffffffff) { >> retval = -ENODEV; >> break; >> @@ -749,7 +749,7 @@ int xhci_hub_control(struct usb_hcd *hcd, u16 typeReq, u16 wValue, @@ -288,7 +288,7 @@ as this patch won't have any change in changelog >> wIndex--; >> - temp = xhci_readl(xhci, port_array[wIndex]); >> + temp = xhci_readl(port_array[wIndex]); ->> if (temp = 0xffffffff) { +>> if (temp == 0xffffffff) { >> retval = -ENODEV; >> break; >> @@ -758,7 +758,7 @@ int xhci_hub_control(struct usb_hcd *hcd, u16 typeReq, u16 wValue, @@ -306,7 +306,7 @@ as this patch won't have any change in changelog >> */ >> - 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 " >> @@ -796,11 +796,11 @@ int xhci_hub_control(struct usb_hcd *hcd, u16 typeReq, u16 wValue, @@ -322,7 +322,7 @@ as this patch won't have any change in changelog >> + 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) { >> @@ -815,7 +815,7 @@ int xhci_hub_control(struct usb_hcd *hcd, u16 typeReq, u16 wValue, >> PORT_CEC; >> xhci_writel(xhci, temp | PORT_PE, @@ -347,7 +347,7 @@ as this patch won't have any change in changelog >> >> - 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; >> @@ -872,7 +872,7 @@ int xhci_hub_control(struct usb_hcd *hcd, u16 typeReq, u16 wValue, @@ -412,7 +412,7 @@ as this patch won't have any change in changelog >> wIndex--; >> - temp = xhci_readl(xhci, port_array[wIndex]); >> + temp = xhci_readl(port_array[wIndex]); ->> if (temp = 0xffffffff) { +>> if (temp == 0xffffffff) { >> retval = -ENODEV; >> break; >> @@ -939,7 +939,7 @@ int xhci_hub_control(struct usb_hcd *hcd, u16 typeReq, u16 wValue, @@ -430,7 +430,7 @@ as this patch won't have any change in changelog >> 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; >> @@ -1098,7 +1098,7 @@ int xhci_bus_suspend(struct usb_hcd *hcd) @@ -513,7 +513,7 @@ as this patch won't have any change in changelog >> 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"); >> @@ -2115,7 +2115,7 @@ static int xhci_setup_port_arrays(struct xhci_hcd *xhci, gfp_t flags) @@ -522,7 +522,7 @@ as this patch won't have any change in changelog >> 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); >> @@ -2129,7 +2129,7 @@ static int xhci_setup_port_arrays(struct xhci_hcd *xhci, gfp_t flags) @@ -531,7 +531,7 @@ as this patch won't have any change in changelog >> >> - 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), >> @@ -2234,7 +2234,7 @@ int xhci_mem_init(struct xhci_hcd *xhci, gfp_t flags) @@ -602,11 +602,11 @@ as this patch won't have any change in changelog >> >> - 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); >> @@ -1684,7 +1684,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); @@ -620,7 +620,7 @@ as this patch won't have any change in changelog >> /* 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; >> >> @@ -2783,7 +2783,7 @@ hw_died: @@ -651,7 +651,7 @@ as this patch won't have any change in changelog >> 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; >> @@ -82,11 +82,11 @@ void xhci_quiesce(struct xhci_hcd *xhci) @@ -683,7 +683,7 @@ as this patch won't have any change in changelog >> >> - 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; >> } @@ -700,7 +700,7 @@ as this patch won't have any change in changelog >> 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 >> @@ -611,19 +611,19 @@ int xhci_run(struct usb_hcd *hcd) @@ -848,7 +848,7 @@ as this patch won't have any change in changelog >> 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_trace(xhci, trace_xhci_dbg_cancel_urb, >> "HW died, freeing TD."); >> @@ -3593,7 +3593,7 @@ void xhci_free_dev(struct usb_hcd *hcd, struct usb_device *udev) @@ -857,7 +857,7 @@ as this patch won't have any change in changelog >> /* 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); >> @@ -4102,12 +4102,12 @@ static int xhci_usb2_software_lpm_test(struct usb_hcd *hcd, diff --git a/a/content_digest b/N1/content_digest index 906490a..801c122 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -2,7 +2,7 @@ "ref\020130903160412.GB2657@xanatos\0" "From\0Kumar Gaurav <kumargauravgupta3@gmail.com>\0" "Subject\0Re: [PATCH v4:No Change] xHCI:Fixing xhci_readl definition and function call\0" - "Date\0Wed, 04 Sep 2013 06:24:33 +0000\0" + "Date\0Wed, 04 Sep 2013 11:42:33 +0530\0" "To\0Sarah Sharp <sarah.a.sharp@linux.intel.com>\0" "Cc\0gregkh@linuxfoundation.org" linux-usb@vger.kernel.org @@ -165,7 +165,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" @@ -292,7 +292,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" ">> @@ -749,7 +749,7 @@ int xhci_hub_control(struct usb_hcd *hcd, u16 typeReq, u16 wValue,\n" @@ -301,7 +301,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" ">> @@ -758,7 +758,7 @@ int xhci_hub_control(struct usb_hcd *hcd, u16 typeReq, u16 wValue,\n" @@ -319,7 +319,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" ">> @@ -796,11 +796,11 @@ int xhci_hub_control(struct usb_hcd *hcd, u16 typeReq, u16 wValue,\n" @@ -335,7 +335,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" ">> @@ -815,7 +815,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" @@ -360,7 +360,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" ">> @@ -872,7 +872,7 @@ int xhci_hub_control(struct usb_hcd *hcd, u16 typeReq, u16 wValue,\n" @@ -425,7 +425,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" ">> @@ -939,7 +939,7 @@ int xhci_hub_control(struct usb_hcd *hcd, u16 typeReq, u16 wValue,\n" @@ -443,7 +443,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" ">> @@ -1098,7 +1098,7 @@ int xhci_bus_suspend(struct usb_hcd *hcd)\n" @@ -526,7 +526,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" ">> @@ -2115,7 +2115,7 @@ static int xhci_setup_port_arrays(struct xhci_hcd *xhci, gfp_t flags)\n" @@ -535,7 +535,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" ">> @@ -2129,7 +2129,7 @@ static int xhci_setup_port_arrays(struct xhci_hcd *xhci, gfp_t flags)\n" @@ -544,7 +544,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" ">> @@ -2234,7 +2234,7 @@ int xhci_mem_init(struct xhci_hcd *xhci, gfp_t flags)\n" @@ -615,11 +615,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" ">> @@ -1684,7 +1684,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" @@ -633,7 +633,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" ">> @@ -2783,7 +2783,7 @@ hw_died:\n" @@ -664,7 +664,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" ">> @@ -82,11 +82,11 @@ void xhci_quiesce(struct xhci_hcd *xhci)\n" @@ -696,7 +696,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" @@ -713,7 +713,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" ">> @@ -611,19 +611,19 @@ int xhci_run(struct usb_hcd *hcd)\n" @@ -861,7 +861,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_trace(xhci, trace_xhci_dbg_cancel_urb,\n" ">> \t\t\t\t\"HW died, freeing TD.\");\n" ">> @@ -3593,7 +3593,7 @@ void xhci_free_dev(struct usb_hcd *hcd, struct usb_device *udev)\n" @@ -870,7 +870,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" ">> @@ -4102,12 +4102,12 @@ static int xhci_usb2_software_lpm_test(struct usb_hcd *hcd,\n" @@ -986,4 +986,4 @@ ">> 1.7.9.5\n" >> -e35657ac0ffb0ac180138f56ed73d2768ad98cec11af90f130bd2a5d6b4449bb +6d12b7b4fada76cb8700a6157780141e3ac7e24e811853f886e00ffc6bf7312b
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.