From: harry Subject: [PATCH] make otherend_changed entrypoint optional for xenbus devices Date: Thu, 17 Nov 2005 10:50:36 +0000 Message-ID: <1132224636.1888.4.camel@localhost.localdomain> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="=-8MHGUIpMSHrKjkmZqD2z" Return-path: List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xensource.com Errors-To: xen-devel-bounces@lists.xensource.com To: xen-devel@lists.xensource.com, ewan@xensource.com List-Id: xen-devel@lists.xenproject.org --=-8MHGUIpMSHrKjkmZqD2z Content-Type: text/plain Content-Transfer-Encoding: 7bit Ewan, Here's the patch for making the otherend_changed entrypoint optional. The USB driver doesn't need this entrypoint because the state machine driven by it is factored out of the driver code entirely into xenidc. This is a resend. I forgot to put [PATCH] in the subject line last time. Signed-off-by: Harry Butterworth butterwo@uk.ibm.com diff -r 595ef1ab007c -r 2089b7edcada linux-2.6-xen-sparse/drivers/xen/xenbus/xenbus_probe.c --- a/linux-2.6-xen-sparse/drivers/xen/xenbus/xenbus_probe.c Tue Nov 15 14:44:59 2005 +++ b/linux-2.6-xen-sparse/drivers/xen/xenbus/xenbus_probe.c Tue Nov 15 16:43:02 2005 @@ -299,8 +299,8 @@ DPRINTK("state is %d, %s, %s", state, dev->otherend_watch.node, vec[XS_WATCH_PATH]); - - drv->otherend_changed(dev, state); + if (drv->otherend_changed) + drv->otherend_changed(dev, state); } --=-8MHGUIpMSHrKjkmZqD2z Content-Disposition: attachment; filename=otherend-optional-patch Content-Type: text/x-patch; name=otherend-optional-patch; charset=us-ascii Content-Transfer-Encoding: 7bit diff -r 595ef1ab007c -r 2089b7edcada linux-2.6-xen-sparse/drivers/xen/xenbus/xenbus_probe.c --- a/linux-2.6-xen-sparse/drivers/xen/xenbus/xenbus_probe.c Tue Nov 15 14:44:59 2005 +++ b/linux-2.6-xen-sparse/drivers/xen/xenbus/xenbus_probe.c Tue Nov 15 16:43:02 2005 @@ -299,8 +299,8 @@ DPRINTK("state is %d, %s, %s", state, dev->otherend_watch.node, vec[XS_WATCH_PATH]); - - drv->otherend_changed(dev, state); + if (drv->otherend_changed) + drv->otherend_changed(dev, state); } --=-8MHGUIpMSHrKjkmZqD2z Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ Xen-devel mailing list Xen-devel@lists.xensource.com http://lists.xensource.com/xen-devel --=-8MHGUIpMSHrKjkmZqD2z--