diff for duplicates of <1267074476-28347-3-git-send-email-airlied@gmail.com> diff --git a/a/1.txt b/N1/1.txt index 3db965a..2e3fd03 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -103,7 +103,7 @@ index 2307f98..fb91532 100644 +{ + struct drm_device *dev = pci_get_drvdata(pdev); + pm_message_t pmm = { .event = PM_EVENT_SUSPEND }; -+ if (state = VGA_SWITCHEROO_ON) { ++ if (state == VGA_SWITCHEROO_ON) { + printk(KERN_ERR "VGA switched i915 on\n"); + i915_resume(dev); + } else { @@ -118,7 +118,7 @@ index 2307f98..fb91532 100644 + bool can_switch; + + spin_lock(&dev->count_lock); -+ can_switch = (dev->open_count = 0); ++ can_switch = (dev->open_count == 0); + spin_unlock(&dev->count_lock); + return can_switch; +} @@ -326,7 +326,7 @@ index a4851af..330c763 100644 + enum vga_switcheroo_state state) +{ + pm_message_t pmm = { .event = PM_EVENT_SUSPEND }; -+ if (state = VGA_SWITCHEROO_ON) { ++ if (state == VGA_SWITCHEROO_ON) { + printk(KERN_ERR "VGA switcheroo: switched nouveau on\n"); + nouveau_pci_resume(pdev); + } else { @@ -341,7 +341,7 @@ index a4851af..330c763 100644 + bool can_switch; + + spin_lock(&dev->count_lock); -+ can_switch = (dev->open_count = 0); ++ can_switch = (dev->open_count == 0); + spin_unlock(&dev->count_lock); + return can_switch; +} @@ -458,7 +458,7 @@ index 0000000..6cb8340 + return -ENOSYS; + } + obj = (union acpi_object *)buffer.pointer; -+ if (obj && (obj->type = ACPI_TYPE_BUFFER)) ++ if (obj && (obj->type == ACPI_TYPE_BUFFER)) + printk(KERN_INFO "atpx: VERN is %d\n", *((u8 *)(obj->buffer.pointer) + 2)); + kfree(buffer.pointer); + return 0; @@ -512,7 +512,7 @@ index 0000000..6cb8340 + +static int radeon_atpx_switchto(acpi_handle handle, enum vga_switcheroo_client_id id) +{ -+ if (id = VGA_SWITCHEROO_IGD) ++ if (id == VGA_SWITCHEROO_IGD) + radeon_atpx_switch_mux(handle, 0); + else + radeon_atpx_switch_mux(handle, 1); @@ -524,7 +524,7 @@ index 0000000..6cb8340 + enum vga_switcheroo_state state) +{ + /* on w500 ACPI can't change intel gpu state */ -+ if (id = VGA_SWITCHEROO_IGD) ++ if (id == VGA_SWITCHEROO_IGD) + return 0; + + radeon_atpx_set_discrete_state(handle, state); @@ -573,13 +573,13 @@ index 9069217..a6f1da3 100644 - if (rdev->flags & RADEON_IS_IGP) { - r = igp_read_bios_from_vram(rdev); -- if (r = false) +- if (r == false) - r = radeon_read_bios(rdev); - } else + r = igp_read_bios_from_vram(rdev); -+ if (r = false) ++ if (r == false) r = radeon_read_bios(rdev); - if (r = false) { + if (r == false) { r = radeon_read_disabled_bios(rdev); diff --git a/drivers/gpu/drm/radeon/radeon_device.c b/drivers/gpu/drm/radeon/radeon_device.c index 768b150..c58591a 100644 @@ -602,7 +602,7 @@ index 768b150..c58591a 100644 + struct drm_device *dev = pci_get_drvdata(pdev); + struct radeon_device *rdev = dev->dev_private; + pm_message_t pmm = { .event = PM_EVENT_SUSPEND }; -+ if (state = VGA_SWITCHEROO_ON) { ++ if (state == VGA_SWITCHEROO_ON) { + printk(KERN_ERR "VGA switched radeon on\n"); + /* don't suspend or resume card normally */ + rdev->powered_down = false; @@ -623,7 +623,7 @@ index 768b150..c58591a 100644 + bool can_switch; + + spin_lock(&dev->count_lock); -+ can_switch = (dev->open_count = 0); ++ can_switch = (dev->open_count == 0); + spin_unlock(&dev->count_lock); + return can_switch; +} @@ -881,7 +881,7 @@ index 0000000..3d36524 + acpi_status status; + + /* TODO client ID for DSM when both are nvidia */ -+ if (pdev->vendor = PCI_VENDOR_ID_INTEL) ++ if (pdev->vendor == PCI_VENDOR_ID_INTEL) + *client_id = VGA_SWITCHEROO_IGD; + else + *client_id = VGA_SWITCHEROO_DIS; @@ -907,11 +907,11 @@ index 0000000..3d36524 + struct acpi_buffer buffer = {sizeof(acpi_method_name), acpi_method_name}; + + ret = vga_switcheroo_detect_atpx(pdev, handle, client_id); -+ if (ret = true) ++ if (ret == true) + goto out_print; + + ret = vga_switcheroo_detect_dsm(pdev, handle, client_id); -+ if (ret = true) ++ if (ret == true) + goto out_print; + + return false; @@ -952,7 +952,7 @@ index 0000000..3d36524 + vga_switcheroo_detect_acpi_method(pdev, &vgasr_priv.handle, &client_id); + if (vgasr_priv.registered_clients & (1 << client_id)) { + WARN(1, "VGA switcheroo: Double registration for %s client\n", -+ client_id = VGA_SWITCHEROO_IGD ? "Integrated" : "Discrete"); ++ client_id == VGA_SWITCHEROO_IGD ? "Integrated" : "Discrete"); + return -EINVAL; + } + @@ -965,7 +965,7 @@ index 0000000..3d36524 + + vgasr_priv.registered_clients |= (1 << client_id); + -+ if (vgasr_priv.registered_clients = 0x3 && vgasr_priv.handle) { ++ if (vgasr_priv.registered_clients == 0x3 && vgasr_priv.handle) { + printk(KERN_INFO "VGA switcheroo enabled\n"); + vga_switcheroo_debugfs_init(&vgasr_priv); + vgasr_priv.active = true; @@ -979,7 +979,7 @@ index 0000000..3d36524 + int i; + + for (i = 0; i < VGA_SWITCHEROO_MAX_CLIENTS; i++) { -+ if (vgasr_priv.clients[i].pdev = pdev) { ++ if (vgasr_priv.clients[i].pdev == pdev) { + vgasr_priv.registered_clients &= ~(1 << i); + break; + } @@ -997,7 +997,7 @@ index 0000000..3d36524 + int i; + + for (i = 0; i < VGA_SWITCHEROO_MAX_CLIENTS; i++) { -+ if (vgasr_priv.clients[i].pdev = pdev) { ++ if (vgasr_priv.clients[i].pdev == pdev) { + vgasr_priv.clients[i].fb_info = info; + break; + } @@ -1010,7 +1010,7 @@ index 0000000..3d36524 + int i; + for (i = 0; i < VGA_SWITCHEROO_MAX_CLIENTS; i++) { + seq_printf(m, "%d:%c:%s:%s\n", i, -+ (i = vgasr_priv.active_client ? '+' : ' '), ++ (i == vgasr_priv.active_client ? '+' : ' '), + vgasr_priv.clients[i].pwr_state ? "Pwr" : "Off", + pci_name(vgasr_priv.clients[i].pdev)); + } @@ -1047,11 +1047,11 @@ index 0000000..3d36524 + int cur = vgasr_priv.active_client; + int ret; + -+ if (cur = index) ++ if (cur == index) + return 0; + + /* power up the first device */ -+ if (vgasr_priv.clients[index].pwr_state = VGA_SWITCHEROO_OFF) ++ if (vgasr_priv.clients[index].pwr_state == VGA_SWITCHEROO_OFF) + vga_switchon(index); + + ret = pci_enable_device(vgasr_priv.clients[index].pdev); @@ -1072,7 +1072,7 @@ index 0000000..3d36524 + if (ret) + return ret; + -+ if (vgasr_priv.clients[cur].pwr_state = VGA_SWITCHEROO_ON) ++ if (vgasr_priv.clients[cur].pwr_state == VGA_SWITCHEROO_ON) + vga_switchoff(cur); + + vgasr_priv.active_client = index; @@ -1097,44 +1097,44 @@ index 0000000..3d36524 + + + /* pwr off the device not in use */ -+ if (strncmp(usercmd, "OFF", 3) = 0) { ++ if (strncmp(usercmd, "OFF", 3) == 0) { + for (i = 0; i < VGA_SWITCHEROO_MAX_CLIENTS; i++) { -+ if (vgasr_priv.active_client = i) ++ if (vgasr_priv.active_client == i) + continue; -+ if (vgasr_priv.clients[i].pwr_state = VGA_SWITCHEROO_ON) ++ if (vgasr_priv.clients[i].pwr_state == VGA_SWITCHEROO_ON) + vga_switchoff(i); + } + goto out; + } + /* pwr on the device not in use */ -+ if (strncmp(usercmd, "ON", 2) = 0) { ++ if (strncmp(usercmd, "ON", 2) == 0) { + for (i = 0; i < VGA_SWITCHEROO_MAX_CLIENTS; i++) { -+ if (vgasr_priv.active_client = i) ++ if (vgasr_priv.active_client == i) + continue; -+ if (vgasr_priv.clients[i].pwr_state = VGA_SWITCHEROO_OFF) ++ if (vgasr_priv.clients[i].pwr_state == VGA_SWITCHEROO_OFF) + vga_switchon(i); + } + goto out; + } + + /* request a delayed switch - test can we switch now */ -+ if (strncmp(usercmd, "DIGD", 4) = 0) { ++ if (strncmp(usercmd, "DIGD", 4) == 0) { + client_id = VGA_SWITCHEROO_IGD; + delay = true; + } + -+ if (strncmp(usercmd, "DDIS", 4) = 0) { ++ if (strncmp(usercmd, "DDIS", 4) == 0) { + client_id = VGA_SWITCHEROO_DIS; + delay = true; + } + -+ if (strncmp(usercmd, "IGD", 3) = 0) ++ if (strncmp(usercmd, "IGD", 3) == 0) + client_id = VGA_SWITCHEROO_IGD; + -+ if (strncmp(usercmd, "DIS", 3) = 0) ++ if (strncmp(usercmd, "DIS", 3) == 0) + client_id = VGA_SWITCHEROO_DIS; + -+ if (client_id = -1) ++ if (client_id == -1) + goto out; + + vgasr_priv.delayed_switch_active = false; @@ -1142,16 +1142,16 @@ index 0000000..3d36524 + can_switch = true; + for (i = 0; i < VGA_SWITCHEROO_MAX_CLIENTS; i++) { + can_switch = vgasr_priv.clients[i].can_switch(vgasr_priv.clients[i].pdev); -+ if (can_switch = false) { ++ if (can_switch == false) { + printk(KERN_ERR "Client %d refused switch\n", i); + break; + } + } + -+ if (can_switch = false && delay = false) ++ if (can_switch == false && delay == false) + goto out; + -+ if (can_switch = true) { ++ if (can_switch == true) { + pdev_name = pci_name(vgasr_priv.clients[client_id].pdev); + printk("switching to %s\n", pdev_name); + ret = vga_switchto(client_id); @@ -1164,7 +1164,7 @@ index 0000000..3d36524 + + /* we should at least power up the card to + make the switch faster */ -+ if (vgasr_priv.clients[client_id].pwr_state = VGA_SWITCHEROO_OFF) ++ if (vgasr_priv.clients[client_id].pwr_state == VGA_SWITCHEROO_OFF) + vga_switchon(client_id); + } + @@ -1231,13 +1231,13 @@ index 0000000..3d36524 + + for (i = 0; i < VGA_SWITCHEROO_MAX_CLIENTS; i++) { + can_switch = vgasr_priv.clients[i].can_switch(vgasr_priv.clients[i].pdev); -+ if (can_switch = false) { ++ if (can_switch == false) { + printk(KERN_ERR "Client %d refused switch\n", i); + break; + } + } + -+ if (can_switch = false) ++ if (can_switch == false) + return -EINVAL; + + pdev_name = pci_name(vgasr_priv.clients[vgasr_priv.delayed_client_id].pdev); diff --git a/a/content_digest b/N1/content_digest index d2b6fe6..354baf0 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -2,7 +2,7 @@ "ref\01267074476-28347-2-git-send-email-airlied@gmail.com\0" "From\0Dave Airlie <airlied@gmail.com>\0" "Subject\0[PATCH 2/2] vga_switcheroo: initial implementation (v8)\0" - "Date\0Thu, 25 Feb 2010 05:07:56 +0000\0" + "Date\0Thu, 25 Feb 2010 15:07:56 +1000\0" "To\0linux-fbdev@vger.kernel.org\0" "Cc\0dri-devel@lists.sf.net" linux-kernel@vger.kernel.org @@ -114,7 +114,7 @@ "+{\n" "+\tstruct drm_device *dev = pci_get_drvdata(pdev);\n" "+\tpm_message_t pmm = { .event = PM_EVENT_SUSPEND };\n" - "+\tif (state = VGA_SWITCHEROO_ON) {\n" + "+\tif (state == VGA_SWITCHEROO_ON) {\n" "+\t\tprintk(KERN_ERR \"VGA switched i915 on\\n\");\n" "+\t\ti915_resume(dev);\n" "+\t} else {\n" @@ -129,7 +129,7 @@ "+\tbool can_switch;\n" "+\n" "+\tspin_lock(&dev->count_lock);\n" - "+\tcan_switch = (dev->open_count = 0);\n" + "+\tcan_switch = (dev->open_count == 0);\n" "+\tspin_unlock(&dev->count_lock);\n" "+\treturn can_switch;\n" "+}\n" @@ -337,7 +337,7 @@ "+\t\t\t\t\t enum vga_switcheroo_state state)\n" "+{\n" "+\tpm_message_t pmm = { .event = PM_EVENT_SUSPEND };\n" - "+\tif (state = VGA_SWITCHEROO_ON) {\n" + "+\tif (state == VGA_SWITCHEROO_ON) {\n" "+\t\tprintk(KERN_ERR \"VGA switcheroo: switched nouveau on\\n\");\n" "+\t\tnouveau_pci_resume(pdev);\n" "+\t} else {\n" @@ -352,7 +352,7 @@ "+\tbool can_switch;\n" "+\n" "+\tspin_lock(&dev->count_lock);\n" - "+\tcan_switch = (dev->open_count = 0);\n" + "+\tcan_switch = (dev->open_count == 0);\n" "+\tspin_unlock(&dev->count_lock);\n" "+\treturn can_switch;\n" "+}\n" @@ -469,7 +469,7 @@ "+\t\treturn -ENOSYS;\n" "+\t}\n" "+\tobj = (union acpi_object *)buffer.pointer;\n" - "+\tif (obj && (obj->type = ACPI_TYPE_BUFFER))\n" + "+\tif (obj && (obj->type == ACPI_TYPE_BUFFER))\n" "+\t\tprintk(KERN_INFO \"atpx: VERN is %d\\n\", *((u8 *)(obj->buffer.pointer) + 2));\n" "+\tkfree(buffer.pointer);\n" "+\treturn 0;\n" @@ -523,7 +523,7 @@ "+\n" "+static int radeon_atpx_switchto(acpi_handle handle, enum vga_switcheroo_client_id id)\n" "+{\n" - "+\tif (id = VGA_SWITCHEROO_IGD)\n" + "+\tif (id == VGA_SWITCHEROO_IGD)\n" "+\t\tradeon_atpx_switch_mux(handle, 0);\n" "+\telse\n" "+\t\tradeon_atpx_switch_mux(handle, 1);\n" @@ -535,7 +535,7 @@ "+\t\t\t\t enum vga_switcheroo_state state)\n" "+{\n" "+\t/* on w500 ACPI can't change intel gpu state */\n" - "+\tif (id = VGA_SWITCHEROO_IGD)\n" + "+\tif (id == VGA_SWITCHEROO_IGD)\n" "+\t\treturn 0;\n" "+\n" "+\tradeon_atpx_set_discrete_state(handle, state);\n" @@ -584,13 +584,13 @@ " \n" "-\tif (rdev->flags & RADEON_IS_IGP) {\n" "-\t\tr = igp_read_bios_from_vram(rdev);\n" - "-\t\tif (r = false)\n" + "-\t\tif (r == false)\n" "-\t\t\tr = radeon_read_bios(rdev);\n" "-\t} else\n" "+\tr = igp_read_bios_from_vram(rdev);\n" - "+\tif (r = false)\n" + "+\tif (r == false)\n" " \t\tr = radeon_read_bios(rdev);\n" - " \tif (r = false) {\n" + " \tif (r == false) {\n" " \t\tr = radeon_read_disabled_bios(rdev);\n" "diff --git a/drivers/gpu/drm/radeon/radeon_device.c b/drivers/gpu/drm/radeon/radeon_device.c\n" "index 768b150..c58591a 100644\n" @@ -613,7 +613,7 @@ "+\tstruct drm_device *dev = pci_get_drvdata(pdev);\n" "+\tstruct radeon_device *rdev = dev->dev_private;\n" "+\tpm_message_t pmm = { .event = PM_EVENT_SUSPEND };\n" - "+\tif (state = VGA_SWITCHEROO_ON) {\n" + "+\tif (state == VGA_SWITCHEROO_ON) {\n" "+\t\tprintk(KERN_ERR \"VGA switched radeon on\\n\");\n" "+\t\t/* don't suspend or resume card normally */\n" "+\t\trdev->powered_down = false;\n" @@ -634,7 +634,7 @@ "+\tbool can_switch;\n" "+\n" "+\tspin_lock(&dev->count_lock);\n" - "+\tcan_switch = (dev->open_count = 0);\n" + "+\tcan_switch = (dev->open_count == 0);\n" "+\tspin_unlock(&dev->count_lock);\n" "+\treturn can_switch;\n" "+}\n" @@ -892,7 +892,7 @@ "+\tacpi_status status;\n" "+\n" "+\t/* TODO client ID for DSM when both are nvidia */\n" - "+\tif (pdev->vendor = PCI_VENDOR_ID_INTEL)\n" + "+\tif (pdev->vendor == PCI_VENDOR_ID_INTEL)\n" "+\t\t*client_id = VGA_SWITCHEROO_IGD;\n" "+\telse\n" "+\t\t*client_id = VGA_SWITCHEROO_DIS;\n" @@ -918,11 +918,11 @@ "+\tstruct acpi_buffer buffer = {sizeof(acpi_method_name), acpi_method_name};\n" "+\n" "+\tret = vga_switcheroo_detect_atpx(pdev, handle, client_id);\n" - "+\tif (ret = true)\n" + "+\tif (ret == true)\n" "+\t\tgoto out_print;\n" "+\n" "+\tret = vga_switcheroo_detect_dsm(pdev, handle, client_id);\n" - "+\tif (ret = true)\n" + "+\tif (ret == true)\n" "+\t\tgoto out_print;\n" "+\n" "+\treturn false;\n" @@ -963,7 +963,7 @@ "+\tvga_switcheroo_detect_acpi_method(pdev, &vgasr_priv.handle, &client_id);\n" "+\tif (vgasr_priv.registered_clients & (1 << client_id)) {\n" "+\t\tWARN(1, \"VGA switcheroo: Double registration for %s client\\n\",\n" - "+\t\t client_id = VGA_SWITCHEROO_IGD ? \"Integrated\" : \"Discrete\");\n" + "+\t\t client_id == VGA_SWITCHEROO_IGD ? \"Integrated\" : \"Discrete\");\n" "+\t\treturn -EINVAL;\n" "+\t}\n" "+\n" @@ -976,7 +976,7 @@ "+\n" "+\tvgasr_priv.registered_clients |= (1 << client_id);\n" "+\n" - "+\tif (vgasr_priv.registered_clients = 0x3 && vgasr_priv.handle) {\n" + "+\tif (vgasr_priv.registered_clients == 0x3 && vgasr_priv.handle) {\n" "+\t\tprintk(KERN_INFO \"VGA switcheroo enabled\\n\");\n" "+\t\tvga_switcheroo_debugfs_init(&vgasr_priv);\n" "+\t\tvgasr_priv.active = true;\n" @@ -990,7 +990,7 @@ "+\tint i;\n" "+\n" "+\tfor (i = 0; i < VGA_SWITCHEROO_MAX_CLIENTS; i++) {\n" - "+\t\tif (vgasr_priv.clients[i].pdev = pdev) {\n" + "+\t\tif (vgasr_priv.clients[i].pdev == pdev) {\n" "+\t\t\tvgasr_priv.registered_clients &= ~(1 << i);\n" "+\t\t\tbreak;\n" "+\t\t}\n" @@ -1008,7 +1008,7 @@ "+\tint i;\n" "+\n" "+\tfor (i = 0; i < VGA_SWITCHEROO_MAX_CLIENTS; i++) {\n" - "+\t\tif (vgasr_priv.clients[i].pdev = pdev) {\n" + "+\t\tif (vgasr_priv.clients[i].pdev == pdev) {\n" "+\t\t\tvgasr_priv.clients[i].fb_info = info;\n" "+\t\t\tbreak;\n" "+\t\t}\n" @@ -1021,7 +1021,7 @@ "+\tint i;\n" "+\tfor (i = 0; i < VGA_SWITCHEROO_MAX_CLIENTS; i++) {\n" "+\t\tseq_printf(m, \"%d:%c:%s:%s\\n\", i,\n" - "+\t\t\t (i = vgasr_priv.active_client ? '+' : ' '),\n" + "+\t\t\t (i == vgasr_priv.active_client ? '+' : ' '),\n" "+\t\t\t vgasr_priv.clients[i].pwr_state ? \"Pwr\" : \"Off\",\n" "+\t\t\t pci_name(vgasr_priv.clients[i].pdev));\n" "+\t}\n" @@ -1058,11 +1058,11 @@ "+\tint cur = vgasr_priv.active_client;\n" "+\tint ret;\n" "+\n" - "+\tif (cur = index)\n" + "+\tif (cur == index)\n" "+\t\treturn 0;\n" "+\n" "+\t/* power up the first device */\n" - "+\tif (vgasr_priv.clients[index].pwr_state = VGA_SWITCHEROO_OFF)\n" + "+\tif (vgasr_priv.clients[index].pwr_state == VGA_SWITCHEROO_OFF)\n" "+\t\tvga_switchon(index);\n" "+\n" "+\tret = pci_enable_device(vgasr_priv.clients[index].pdev);\n" @@ -1083,7 +1083,7 @@ "+\tif (ret)\n" "+\t\treturn ret;\n" "+\n" - "+\tif (vgasr_priv.clients[cur].pwr_state = VGA_SWITCHEROO_ON)\n" + "+\tif (vgasr_priv.clients[cur].pwr_state == VGA_SWITCHEROO_ON)\n" "+\t\tvga_switchoff(cur);\n" "+\n" "+\tvgasr_priv.active_client = index;\n" @@ -1108,44 +1108,44 @@ "+\n" "+\n" "+\t/* pwr off the device not in use */\n" - "+\tif (strncmp(usercmd, \"OFF\", 3) = 0) {\n" + "+\tif (strncmp(usercmd, \"OFF\", 3) == 0) {\n" "+\t\tfor (i = 0; i < VGA_SWITCHEROO_MAX_CLIENTS; i++) {\n" - "+\t\t\tif (vgasr_priv.active_client = i)\n" + "+\t\t\tif (vgasr_priv.active_client == i)\n" "+\t\t\t\tcontinue;\n" - "+\t\t\tif (vgasr_priv.clients[i].pwr_state = VGA_SWITCHEROO_ON)\n" + "+\t\t\tif (vgasr_priv.clients[i].pwr_state == VGA_SWITCHEROO_ON)\n" "+\t\t\t\tvga_switchoff(i);\n" "+\t\t}\n" "+\t\tgoto out;\n" "+\t}\n" "+\t/* pwr on the device not in use */\n" - "+\tif (strncmp(usercmd, \"ON\", 2) = 0) {\n" + "+\tif (strncmp(usercmd, \"ON\", 2) == 0) {\n" "+\t\tfor (i = 0; i < VGA_SWITCHEROO_MAX_CLIENTS; i++) {\n" - "+\t\t\tif (vgasr_priv.active_client = i)\n" + "+\t\t\tif (vgasr_priv.active_client == i)\n" "+\t\t\t\tcontinue;\n" - "+\t\t\tif (vgasr_priv.clients[i].pwr_state = VGA_SWITCHEROO_OFF)\n" + "+\t\t\tif (vgasr_priv.clients[i].pwr_state == VGA_SWITCHEROO_OFF)\n" "+\t\t\t\tvga_switchon(i);\n" "+\t\t}\n" "+\t\tgoto out;\n" "+\t}\n" "+\n" "+\t/* request a delayed switch - test can we switch now */\n" - "+\tif (strncmp(usercmd, \"DIGD\", 4) = 0) {\n" + "+\tif (strncmp(usercmd, \"DIGD\", 4) == 0) {\n" "+\t\tclient_id = VGA_SWITCHEROO_IGD;\n" "+\t\tdelay = true;\n" "+\t}\n" "+\n" - "+\tif (strncmp(usercmd, \"DDIS\", 4) = 0) {\n" + "+\tif (strncmp(usercmd, \"DDIS\", 4) == 0) {\n" "+\t\tclient_id = VGA_SWITCHEROO_DIS;\n" "+\t\tdelay = true;\n" "+\t}\n" "+\n" - "+\tif (strncmp(usercmd, \"IGD\", 3) = 0)\n" + "+\tif (strncmp(usercmd, \"IGD\", 3) == 0)\n" "+\t\tclient_id = VGA_SWITCHEROO_IGD;\n" "+\n" - "+\tif (strncmp(usercmd, \"DIS\", 3) = 0)\n" + "+\tif (strncmp(usercmd, \"DIS\", 3) == 0)\n" "+\t\tclient_id = VGA_SWITCHEROO_DIS;\n" "+\n" - "+\tif (client_id = -1)\n" + "+\tif (client_id == -1)\n" "+\t\tgoto out;\n" "+\n" "+\tvgasr_priv.delayed_switch_active = false;\n" @@ -1153,16 +1153,16 @@ "+\tcan_switch = true;\n" "+\tfor (i = 0; i < VGA_SWITCHEROO_MAX_CLIENTS; i++) {\n" "+\t\tcan_switch = vgasr_priv.clients[i].can_switch(vgasr_priv.clients[i].pdev);\n" - "+\t\tif (can_switch = false) {\n" + "+\t\tif (can_switch == false) {\n" "+\t\t\tprintk(KERN_ERR \"Client %d refused switch\\n\", i);\n" "+\t\t\tbreak;\n" "+\t\t}\n" "+\t}\n" "+\n" - "+\tif (can_switch = false && delay = false)\n" + "+\tif (can_switch == false && delay == false)\n" "+\t\tgoto out;\n" "+\n" - "+\tif (can_switch = true) {\n" + "+\tif (can_switch == true) {\n" "+\t\tpdev_name = pci_name(vgasr_priv.clients[client_id].pdev);\n" "+\t\tprintk(\"switching to %s\\n\", pdev_name);\n" "+\t\tret = vga_switchto(client_id);\n" @@ -1175,7 +1175,7 @@ "+\n" "+\t\t/* we should at least power up the card to\n" "+\t\t make the switch faster */\n" - "+\t\tif (vgasr_priv.clients[client_id].pwr_state = VGA_SWITCHEROO_OFF)\n" + "+\t\tif (vgasr_priv.clients[client_id].pwr_state == VGA_SWITCHEROO_OFF)\n" "+\t\t\tvga_switchon(client_id);\n" "+\t}\n" "+\n" @@ -1242,13 +1242,13 @@ "+\n" "+\tfor (i = 0; i < VGA_SWITCHEROO_MAX_CLIENTS; i++) {\n" "+\t\tcan_switch = vgasr_priv.clients[i].can_switch(vgasr_priv.clients[i].pdev);\n" - "+\t\tif (can_switch = false) {\n" + "+\t\tif (can_switch == false) {\n" "+\t\t\tprintk(KERN_ERR \"Client %d refused switch\\n\", i);\n" "+\t\t\tbreak;\n" "+\t\t}\n" "+\t}\n" "+\n" - "+\tif (can_switch = false)\n" + "+\tif (can_switch == false)\n" "+\t\treturn -EINVAL;\n" "+\n" "+\tpdev_name = pci_name(vgasr_priv.clients[vgasr_priv.delayed_client_id].pdev);\n" @@ -1384,4 +1384,4 @@ "-- \n" 1.6.5.2 -2eef8d3a76c77c6df719fac72d6e1518d44e0c712f12adacee8da9f53100ee3c +89176be23be9681ad519e5fd242291990eb71dfc10e0c367fd03e767e39fe091
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.