| device.c (14e77332e74603efab8347c89d3cda447c3b97c9) | device.c (5c2e5a0cf5b12c156b0cb07af43b51627c086480) |
|---|---|
| 1// SPDX-License-Identifier: GPL-1.0+ 2/* 3 * bus driver for ccw devices 4 * 5 * Copyright IBM Corp. 2002, 2008 6 * Author(s): Arnd Bergmann (arndb@de.ibm.com) 7 * Cornelia Huck (cornelia.huck@de.ibm.com) 8 * Martin Schwidefsky (schwidefsky@de.ibm.com) --- 922 unchanged lines hidden (view full) --- 931 if (rc) { 932 CIO_MSG_EVENT(0, "device_move(0.%x.%04x,0.%x.%04x)=%d\n", 933 cdev->private->dev_id.ssid, 934 cdev->private->dev_id.devno, sch->schid.ssid, 935 sch->schib.pmcw.dev, rc); 936 if (old_enabled) { 937 /* Try to reenable the old subchannel. */ 938 spin_lock_irq(old_sch->lock); | 1// SPDX-License-Identifier: GPL-1.0+ 2/* 3 * bus driver for ccw devices 4 * 5 * Copyright IBM Corp. 2002, 2008 6 * Author(s): Arnd Bergmann (arndb@de.ibm.com) 7 * Cornelia Huck (cornelia.huck@de.ibm.com) 8 * Martin Schwidefsky (schwidefsky@de.ibm.com) --- 922 unchanged lines hidden (view full) --- 931 if (rc) { 932 CIO_MSG_EVENT(0, "device_move(0.%x.%04x,0.%x.%04x)=%d\n", 933 cdev->private->dev_id.ssid, 934 cdev->private->dev_id.devno, sch->schid.ssid, 935 sch->schib.pmcw.dev, rc); 936 if (old_enabled) { 937 /* Try to reenable the old subchannel. */ 938 spin_lock_irq(old_sch->lock); |
| 939 cio_enable_subchannel(old_sch, (u32)(addr_t)old_sch); | 939 cio_enable_subchannel(old_sch, (u32)virt_to_phys(old_sch)); |
| 940 spin_unlock_irq(old_sch->lock); 941 } 942 /* Release child reference for new parent. */ 943 put_device(&sch->dev); 944 return rc; 945 } 946 /* Clean up old subchannel. */ 947 if (!sch_is_pseudo_sch(old_sch)) { --- 945 unchanged lines hidden --- | 940 spin_unlock_irq(old_sch->lock); 941 } 942 /* Release child reference for new parent. */ 943 put_device(&sch->dev); 944 return rc; 945 } 946 /* Clean up old subchannel. */ 947 if (!sch_is_pseudo_sch(old_sch)) { --- 945 unchanged lines hidden --- |