X-Git-Url: http://www.pilppa.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=drivers%2Fs390%2Fcio%2Fdevice.c;h=95b92dfec5a815435630b1e7692591aa2dedad0c;hb=2a0217d5c7d22d6dd28f8ae5d20b06d24dc426b8;hp=8575d263b13e18b54c2f6957d615db37a930cd97;hpb=e4a1afaeb1d9ebc09f46d8b229ac96116974b1b8;p=linux-2.6-omap-h63xx.git

diff --git a/drivers/s390/cio/device.c b/drivers/s390/cio/device.c
index 8575d263b13..95b92dfec5a 100644
--- a/drivers/s390/cio/device.c
+++ b/drivers/s390/cio/device.c
@@ -1101,7 +1101,7 @@ static void io_subchannel_irq(struct subchannel *sch)
 	cdev = sch_get_cdev(sch);
 
 	CIO_TRACE_EVENT(3, "IRQ");
-	CIO_TRACE_EVENT(3, sch->dev.bus_id);
+	CIO_TRACE_EVENT(3, dev_name(&sch->dev));
 	if (cdev)
 		dev_fsm_event(cdev, DEV_EVENT_INTERRUPT);
 }
@@ -1707,7 +1707,7 @@ __ccwdev_check_busid(struct device *dev, void *id)
 
 	bus_id = id;
 
-	return (strncmp(bus_id, dev->bus_id, BUS_ID_SIZE) == 0);
+	return (strncmp(bus_id, dev_name(dev), BUS_ID_SIZE) == 0);
 }