ia64/xen-unstable

changeset 10368:cede50ca1704

[LINUX] Fix code indentation in Linux drivers.
Signed-off-by: Keir Fraser <keir@xensource.com>
author kfraser@dhcp93.uk.xensource.com
date Mon Jun 12 18:32:47 2006 +0100 (2006-06-12)
parents bb89ec7765c7
children e913081f20f3
files linux-2.6-xen-sparse/drivers/xen/balloon/balloon.c linux-2.6-xen-sparse/drivers/xen/blkback/blkback.c linux-2.6-xen-sparse/drivers/xen/blkback/common.h linux-2.6-xen-sparse/drivers/xen/blkfront/blkfront.c linux-2.6-xen-sparse/drivers/xen/blkfront/block.h linux-2.6-xen-sparse/drivers/xen/char/mem.c linux-2.6-xen-sparse/drivers/xen/console/console.c linux-2.6-xen-sparse/drivers/xen/core/gnttab.c linux-2.6-xen-sparse/drivers/xen/core/reboot.c linux-2.6-xen-sparse/drivers/xen/evtchn/evtchn.c linux-2.6-xen-sparse/drivers/xen/netback/common.h linux-2.6-xen-sparse/drivers/xen/netback/interface.c linux-2.6-xen-sparse/drivers/xen/netback/netback.c linux-2.6-xen-sparse/drivers/xen/netfront/netfront.c linux-2.6-xen-sparse/drivers/xen/privcmd/privcmd.c linux-2.6-xen-sparse/drivers/xen/tpmback/common.h linux-2.6-xen-sparse/drivers/xen/tpmback/xenbus.c linux-2.6-xen-sparse/drivers/xen/xenbus/xenbus_probe.c
line diff
     1.1 --- a/linux-2.6-xen-sparse/drivers/xen/balloon/balloon.c	Mon Jun 12 18:23:42 2006 +0100
     1.2 +++ b/linux-2.6-xen-sparse/drivers/xen/balloon/balloon.c	Mon Jun 12 18:32:47 2006 +0100
     1.3 @@ -222,7 +222,7 @@ static int increase_reservation(unsigned
     1.4  		/* Update P->M and M->P tables. */
     1.5  		set_phys_to_machine(pfn, frame_list[i]);
     1.6  		xen_machphys_update(frame_list[i], pfn);
     1.7 -            
     1.8 +
     1.9  		/* Link back into the page tables if not highmem. */
    1.10  		if (pfn < max_low_pfn) {
    1.11  			int ret;
    1.12 @@ -382,18 +382,17 @@ static void watch_target(struct xenbus_w
    1.13  	if (err != 1) {
    1.14  		/* This is ok (for domain0 at least) - so just return */
    1.15  		return;
    1.16 -	} 
    1.17 -        
    1.18 +	}
    1.19 +
    1.20  	/* The given memory/target value is in KiB, so it needs converting to
    1.21 -	   pages.  PAGE_SHIFT converts bytes to pages, hence PAGE_SHIFT - 10.
    1.22 -	*/
    1.23 +	 * pages. PAGE_SHIFT converts bytes to pages, hence PAGE_SHIFT - 10.
    1.24 +	 */
    1.25  	set_new_target(new_target >> (PAGE_SHIFT - 10));
    1.26 -    
    1.27  }
    1.28  
    1.29  static int balloon_init_watcher(struct notifier_block *notifier,
    1.30 -                                unsigned long event,
    1.31 -                                void *data)
    1.32 +				unsigned long event,
    1.33 +				void *data)
    1.34  {
    1.35  	int err;
    1.36  
    1.37 @@ -402,11 +401,10 @@ static int balloon_init_watcher(struct n
    1.38  		printk(KERN_ERR "Failed to set balloon watcher\n");
    1.39  
    1.40  	return NOTIFY_DONE;
    1.41 -    
    1.42  }
    1.43  
    1.44  static int balloon_write(struct file *file, const char __user *buffer,
    1.45 -                         unsigned long count, void *data)
    1.46 +			 unsigned long count, void *data)
    1.47  {
    1.48  	char memstring[64], *endchar;
    1.49  	unsigned long long target_bytes;
    1.50 @@ -430,7 +428,7 @@ static int balloon_write(struct file *fi
    1.51  }
    1.52  
    1.53  static int balloon_read(char *page, char **start, off_t off,
    1.54 -                        int count, int *eof, void *data)
    1.55 +			int count, int *eof, void *data)
    1.56  {
    1.57  	int len;
    1.58  
     2.1 --- a/linux-2.6-xen-sparse/drivers/xen/blkback/blkback.c	Mon Jun 12 18:23:42 2006 +0100
     2.2 +++ b/linux-2.6-xen-sparse/drivers/xen/blkback/blkback.c	Mon Jun 12 18:32:47 2006 +0100
     2.3 @@ -110,7 +110,7 @@ static void dispatch_rw_block_io(blkif_t
     2.4  				 blkif_request_t *req,
     2.5  				 pending_req_t *pending_req);
     2.6  static void make_response(blkif_t *blkif, unsigned long id, 
     2.7 -                          unsigned short op, int st);
     2.8 +			  unsigned short op, int st);
     2.9  
    2.10  /******************************************************************
    2.11   * misc small helpers
    2.12 @@ -434,7 +434,7 @@ static void dispatch_rw_block_io(blkif_t
    2.13  			bio = biolist[nbio++] = bio_alloc(GFP_KERNEL, nseg-i);
    2.14  			if (unlikely(bio == NULL))
    2.15  				goto fail_put_bio;
    2.16 -                
    2.17 +
    2.18  			bio->bi_bdev    = preq.bdev;
    2.19  			bio->bi_private = pending_req;
    2.20  			bio->bi_end_io  = end_block_io_op;
    2.21 @@ -471,7 +471,7 @@ static void dispatch_rw_block_io(blkif_t
    2.22  
    2.23  
    2.24  static void make_response(blkif_t *blkif, unsigned long id, 
    2.25 -                          unsigned short op, int st)
    2.26 +			  unsigned short op, int st)
    2.27  {
    2.28  	blkif_response_t *resp;
    2.29  	unsigned long     flags;
     3.1 --- a/linux-2.6-xen-sparse/drivers/xen/blkback/common.h	Mon Jun 12 18:23:42 2006 +0100
     3.2 +++ b/linux-2.6-xen-sparse/drivers/xen/blkback/common.h	Mon Jun 12 18:32:47 2006 +0100
     3.3 @@ -45,8 +45,9 @@
     3.4  #include <xen/gnttab.h>
     3.5  #include <xen/driver_util.h>
     3.6  
     3.7 -#define DPRINTK(_f, _a...) pr_debug("(file=%s, line=%d) " _f, \
     3.8 -                                    __FILE__ , __LINE__ , ## _a )
     3.9 +#define DPRINTK(_f, _a...)			\
    3.10 +	pr_debug("(file=%s, line=%d) " _f,	\
    3.11 +		 __FILE__ , __LINE__ , ## _a )
    3.12  
    3.13  struct vbd {
    3.14  	blkif_vdev_t   handle;      /* what the domain refers to this vbd as */
     4.1 --- a/linux-2.6-xen-sparse/drivers/xen/blkfront/blkfront.c	Mon Jun 12 18:23:42 2006 +0100
     4.2 +++ b/linux-2.6-xen-sparse/drivers/xen/blkfront/blkfront.c	Mon Jun 12 18:32:47 2006 +0100
     4.3 @@ -318,7 +318,7 @@ static void connect(struct blkfront_info
     4.4  	err = xlvbd_add(sectors, info->vdevice, binfo, sector_size, info);
     4.5  	if (err) {
     4.6  		xenbus_dev_fatal(info->xbdev, err, "xlvbd_add at %s",
     4.7 -		                 info->xbdev->otherend);
     4.8 +				 info->xbdev->otherend);
     4.9  		return;
    4.10  	}
    4.11  
    4.12 @@ -444,7 +444,7 @@ int blkif_release(struct inode *inode, s
    4.13  
    4.14  
    4.15  int blkif_ioctl(struct inode *inode, struct file *filep,
    4.16 -                unsigned command, unsigned long argument)
    4.17 +		unsigned command, unsigned long argument)
    4.18  {
    4.19  	int i;
    4.20  
     5.1 --- a/linux-2.6-xen-sparse/drivers/xen/blkfront/block.h	Mon Jun 12 18:23:42 2006 +0100
     5.2 +++ b/linux-2.6-xen-sparse/drivers/xen/blkfront/block.h	Mon Jun 12 18:32:47 2006 +0100
     5.3 @@ -59,15 +59,15 @@
     5.4  #include <asm/uaccess.h>
     5.5  
     5.6  #if 1
     5.7 -#define IPRINTK(fmt, args...) \
     5.8 -    printk(KERN_INFO "xen_blk: " fmt, ##args)
     5.9 +#define IPRINTK(fmt, args...)				\
    5.10 +	printk(KERN_INFO "xen_blk: " fmt, ##args)
    5.11  #else
    5.12  #define IPRINTK(fmt, args...) ((void)0)
    5.13  #endif
    5.14  
    5.15  #if 1
    5.16 -#define WPRINTK(fmt, args...) \
    5.17 -    printk(KERN_WARNING "xen_blk: " fmt, ##args)
    5.18 +#define WPRINTK(fmt, args...)				\
    5.19 +	printk(KERN_WARNING "xen_blk: " fmt, ##args)
    5.20  #else
    5.21  #define WPRINTK(fmt, args...) ((void)0)
    5.22  #endif
    5.23 @@ -139,7 +139,7 @@ extern spinlock_t blkif_io_lock;
    5.24  extern int blkif_open(struct inode *inode, struct file *filep);
    5.25  extern int blkif_release(struct inode *inode, struct file *filep);
    5.26  extern int blkif_ioctl(struct inode *inode, struct file *filep,
    5.27 -                       unsigned command, unsigned long argument);
    5.28 +		       unsigned command, unsigned long argument);
    5.29  extern int blkif_getgeo(struct block_device *, struct hd_geometry *);
    5.30  extern int blkif_check(dev_t dev);
    5.31  extern int blkif_revalidate(dev_t dev);
     6.1 --- a/linux-2.6-xen-sparse/drivers/xen/char/mem.c	Mon Jun 12 18:23:42 2006 +0100
     6.2 +++ b/linux-2.6-xen-sparse/drivers/xen/char/mem.c	Mon Jun 12 18:32:47 2006 +0100
     6.3 @@ -30,10 +30,10 @@
     6.4  
     6.5  static inline int uncached_access(struct file *file)
     6.6  {
     6.7 -        if (file->f_flags & O_SYNC)
     6.8 -                return 1;
     6.9 -        /* Xen sets correct MTRR type on non-RAM for us. */
    6.10 -        return 0;
    6.11 +	if (file->f_flags & O_SYNC)
    6.12 +		return 1;
    6.13 +	/* Xen sets correct MTRR type on non-RAM for us. */
    6.14 +	return 0;
    6.15  }
    6.16  
    6.17  /*
     7.1 --- a/linux-2.6-xen-sparse/drivers/xen/console/console.c	Mon Jun 12 18:23:42 2006 +0100
     7.2 +++ b/linux-2.6-xen-sparse/drivers/xen/console/console.c	Mon Jun 12 18:32:47 2006 +0100
     7.3 @@ -364,7 +364,7 @@ void xencons_tx(void)
     7.4  
     7.5  /* Privileged receive callback and transmit kicker. */
     7.6  static irqreturn_t xencons_priv_interrupt(int irq, void *dev_id,
     7.7 -                                          struct pt_regs *regs)
     7.8 +					  struct pt_regs *regs)
     7.9  {
    7.10  	static char rbuf[16];
    7.11  	int         l;
     8.1 --- a/linux-2.6-xen-sparse/drivers/xen/core/gnttab.c	Mon Jun 12 18:23:42 2006 +0100
     8.2 +++ b/linux-2.6-xen-sparse/drivers/xen/core/gnttab.c	Mon Jun 12 18:32:47 2006 +0100
     8.3 @@ -220,9 +220,9 @@ unsigned long gnttab_end_foreign_transfe
     8.4  	u16           flags;
     8.5  
     8.6  	/*
     8.7 -         * If a transfer is not even yet started, try to reclaim the grant
     8.8 -         * reference and return failure (== 0).
     8.9 -         */
    8.10 +	 * If a transfer is not even yet started, try to reclaim the grant
    8.11 +	 * reference and return failure (== 0).
    8.12 +	 */
    8.13  	while (!((flags = shared[ref].flags) & GTF_transfer_committed)) {
    8.14  		if (synch_cmpxchg(&shared[ref].flags, flags, 0) == flags)
    8.15  			return 0;
     9.1 --- a/linux-2.6-xen-sparse/drivers/xen/core/reboot.c	Mon Jun 12 18:23:42 2006 +0100
     9.2 +++ b/linux-2.6-xen-sparse/drivers/xen/core/reboot.c	Mon Jun 12 18:32:47 2006 +0100
     9.3 @@ -336,8 +336,8 @@ static struct xenbus_watch sysrq_watch =
     9.4  };
     9.5  
     9.6  static int setup_shutdown_watcher(struct notifier_block *notifier,
     9.7 -                                  unsigned long event,
     9.8 -                                  void *data)
     9.9 +				  unsigned long event,
    9.10 +				  void *data)
    9.11  {
    9.12  	int err;
    9.13  
    10.1 --- a/linux-2.6-xen-sparse/drivers/xen/evtchn/evtchn.c	Mon Jun 12 18:23:42 2006 +0100
    10.2 +++ b/linux-2.6-xen-sparse/drivers/xen/evtchn/evtchn.c	Mon Jun 12 18:32:47 2006 +0100
    10.3 @@ -93,7 +93,7 @@ void evtchn_device_upcall(int port)
    10.4  }
    10.5  
    10.6  static ssize_t evtchn_read(struct file *file, char __user *buf,
    10.7 -                           size_t count, loff_t *ppos)
    10.8 +			   size_t count, loff_t *ppos)
    10.9  {
   10.10  	int rc;
   10.11  	unsigned int c, p, bytes1 = 0, bytes2 = 0;
   10.12 @@ -153,7 +153,7 @@ static ssize_t evtchn_read(struct file *
   10.13  }
   10.14  
   10.15  static ssize_t evtchn_write(struct file *file, const char __user *buf,
   10.16 -                            size_t count, loff_t *ppos)
   10.17 +			    size_t count, loff_t *ppos)
   10.18  {
   10.19  	int  rc, i;
   10.20  	evtchn_port_t *kbuf = (evtchn_port_t *)__get_free_page(GFP_KERNEL);
   10.21 @@ -201,7 +201,7 @@ static void evtchn_bind_to_user(struct p
   10.22  }
   10.23  
   10.24  static int evtchn_ioctl(struct inode *inode, struct file *file,
   10.25 -                        unsigned int cmd, unsigned long arg)
   10.26 +			unsigned int cmd, unsigned long arg)
   10.27  {
   10.28  	int rc;
   10.29  	struct per_user_data *u = file->private_data;
    11.1 --- a/linux-2.6-xen-sparse/drivers/xen/netback/common.h	Mon Jun 12 18:23:42 2006 +0100
    11.2 +++ b/linux-2.6-xen-sparse/drivers/xen/netback/common.h	Mon Jun 12 18:32:47 2006 +0100
    11.3 @@ -47,12 +47,13 @@
    11.4  #include <xen/gnttab.h>
    11.5  #include <xen/driver_util.h>
    11.6  
    11.7 -#define DPRINTK(_f, _a...) pr_debug("(file=%s, line=%d) " _f, \
    11.8 -                                    __FILE__ , __LINE__ , ## _a )
    11.9 -#define IPRINTK(fmt, args...) \
   11.10 -    printk(KERN_INFO "xen_net: " fmt, ##args)
   11.11 -#define WPRINTK(fmt, args...) \
   11.12 -    printk(KERN_WARNING "xen_net: " fmt, ##args)
   11.13 +#define DPRINTK(_f, _a...)			\
   11.14 +	pr_debug("(file=%s, line=%d) " _f,	\
   11.15 +		 __FILE__ , __LINE__ , ## _a )
   11.16 +#define IPRINTK(fmt, args...)				\
   11.17 +	printk(KERN_INFO "xen_net: " fmt, ##args)
   11.18 +#define WPRINTK(fmt, args...)				\
   11.19 +	printk(KERN_WARNING "xen_net: " fmt, ##args)
   11.20  
   11.21  typedef struct netif_st {
   11.22  	/* Unique identifier for this interface. */
    12.1 --- a/linux-2.6-xen-sparse/drivers/xen/netback/interface.c	Mon Jun 12 18:23:42 2006 +0100
    12.2 +++ b/linux-2.6-xen-sparse/drivers/xen/netback/interface.c	Mon Jun 12 18:32:47 2006 +0100
    12.3 @@ -124,7 +124,7 @@ netif_t *netif_alloc(domid_t domid, unsi
    12.4  		 * Initialise a dummy MAC address. We choose the numerically
    12.5  		 * largest non-broadcast address to prevent the address getting
    12.6  		 * stolen by an Ethernet bridge for STP purposes.
    12.7 -                 * (FE:FF:FF:FF:FF:FF) 
    12.8 +		 * (FE:FF:FF:FF:FF:FF)
    12.9  		 */ 
   12.10  		memset(dev->dev_addr, 0xFF, ETH_ALEN);
   12.11  		dev->dev_addr[0] &= ~0x01;
    13.1 --- a/linux-2.6-xen-sparse/drivers/xen/netback/netback.c	Mon Jun 12 18:23:42 2006 +0100
    13.2 +++ b/linux-2.6-xen-sparse/drivers/xen/netback/netback.c	Mon Jun 12 18:32:47 2006 +0100
    13.3 @@ -43,14 +43,14 @@
    13.4  static void netif_idx_release(u16 pending_idx);
    13.5  static void netif_page_release(struct page *page);
    13.6  static void make_tx_response(netif_t *netif, 
    13.7 -                             u16      id,
    13.8 -                             s8       st);
    13.9 +			     u16      id,
   13.10 +			     s8       st);
   13.11  static int  make_rx_response(netif_t *netif, 
   13.12 -                             u16      id, 
   13.13 -                             s8       st,
   13.14 -                             u16      offset,
   13.15 -                             u16      size,
   13.16 -                             u16      flags);
   13.17 +			     u16      id, 
   13.18 +			     s8       st,
   13.19 +			     u16      offset,
   13.20 +			     u16      size,
   13.21 +			     u16      flags);
   13.22  
   13.23  static void net_tx_action(unsigned long unused);
   13.24  static DECLARE_TASKLET(net_tx_tasklet, net_tx_action, 0);
   13.25 @@ -329,9 +329,9 @@ static void net_rx_action(unsigned long 
   13.26  			DPRINTK("Bad status %d from grant transfer to DOM%u\n",
   13.27  				gop->status, netif->domid);
   13.28  			/*
   13.29 -                         * Page no longer belongs to us unless GNTST_bad_page,
   13.30 -                         * but that should be a fatal error anyway.
   13.31 -                         */
   13.32 +			 * Page no longer belongs to us unless GNTST_bad_page,
   13.33 +			 * but that should be a fatal error anyway.
   13.34 +			 */
   13.35  			BUG_ON(gop->status == GNTST_bad_page);
   13.36  			status = NETIF_RSP_ERROR; 
   13.37  		}
   13.38 @@ -483,7 +483,7 @@ inline static void net_tx_action_dealloc
   13.39  
   13.40  		make_tx_response(netif, pending_tx_info[pending_idx].req.id, 
   13.41  				 NETIF_RSP_OKAY);
   13.42 -        
   13.43 +
   13.44  		pending_ring[MASK_PEND_IDX(pending_prod++)] = pending_idx;
   13.45  
   13.46  		netif_put(netif);
   13.47 @@ -898,8 +898,8 @@ irqreturn_t netif_be_int(int irq, void *
   13.48  }
   13.49  
   13.50  static void make_tx_response(netif_t *netif, 
   13.51 -                             u16      id,
   13.52 -                             s8       st)
   13.53 +			     u16      id,
   13.54 +			     s8       st)
   13.55  {
   13.56  	RING_IDX i = netif->tx.rsp_prod_pvt;
   13.57  	netif_tx_response_t *resp;
   13.58 @@ -925,11 +925,11 @@ static void make_tx_response(netif_t *ne
   13.59  }
   13.60  
   13.61  static int make_rx_response(netif_t *netif, 
   13.62 -                            u16      id, 
   13.63 -                            s8       st,
   13.64 -                            u16      offset,
   13.65 -                            u16      size,
   13.66 -                            u16      flags)
   13.67 +			    u16      id, 
   13.68 +			    s8       st,
   13.69 +			    u16      offset,
   13.70 +			    u16      size,
   13.71 +			    u16      flags)
   13.72  {
   13.73  	RING_IDX i = netif->rx.rsp_prod_pvt;
   13.74  	netif_rx_response_t *resp;
    14.1 --- a/linux-2.6-xen-sparse/drivers/xen/netfront/netfront.c	Mon Jun 12 18:23:42 2006 +0100
    14.2 +++ b/linux-2.6-xen-sparse/drivers/xen/netfront/netfront.c	Mon Jun 12 18:32:47 2006 +0100
    14.3 @@ -138,14 +138,14 @@ static inline unsigned short get_id_from
    14.4  	return id;
    14.5  }
    14.6  
    14.7 -#define DPRINTK(fmt, args...) pr_debug("netfront (%s:%d) " fmt, \
    14.8 -                                       __FUNCTION__, __LINE__, ##args)
    14.9 +#define DPRINTK(fmt, args...)				\
   14.10 +	pr_debug("netfront (%s:%d) " fmt,		\
   14.11 +		 __FUNCTION__, __LINE__, ##args)
   14.12  #define IPRINTK(fmt, args...)				\
   14.13  	printk(KERN_INFO "netfront: " fmt, ##args)
   14.14  #define WPRINTK(fmt, args...)				\
   14.15  	printk(KERN_WARNING "netfront: " fmt, ##args)
   14.16  
   14.17 -
   14.18  static int talk_to_backend(struct xenbus_device *, struct netfront_info *);
   14.19  static int setup_device(struct xenbus_device *, struct netfront_info *);
   14.20  static struct net_device *create_netdev(int, struct xenbus_device *);
   14.21 @@ -846,10 +846,10 @@ static int netif_poll(struct net_device 
   14.22  		rx = RING_GET_RESPONSE(&np->rx, i);
   14.23  
   14.24  		/*
   14.25 -                 * This definitely indicates a bug, either in this driver or
   14.26 -                 * in the backend driver. In future this should flag the bad
   14.27 -                 * situation to the system controller to reboot the backed.
   14.28 -                 */
   14.29 +		 * This definitely indicates a bug, either in this driver or in
   14.30 +		 * the backend driver. In future this should flag the bad
   14.31 +		 * situation to the system controller to reboot the backed.
   14.32 +		 */
   14.33  		if ((ref = np->grant_rx_ref[rx->id]) == GRANT_INVALID_REF) {
   14.34  			WPRINTK("Bad rx response id %d.\n", rx->id);
   14.35  			work_done--;
    15.1 --- a/linux-2.6-xen-sparse/drivers/xen/privcmd/privcmd.c	Mon Jun 12 18:23:42 2006 +0100
    15.2 +++ b/linux-2.6-xen-sparse/drivers/xen/privcmd/privcmd.c	Mon Jun 12 18:32:47 2006 +0100
    15.3 @@ -39,7 +39,7 @@ static struct proc_dir_entry *capabiliti
    15.4  static DECLARE_BITMAP(hypercall_permission_map, NR_HYPERCALLS);
    15.5  
    15.6  static int privcmd_ioctl(struct inode *inode, struct file *file,
    15.7 -                         unsigned int cmd, unsigned long data)
    15.8 +			 unsigned int cmd, unsigned long data)
    15.9  {
   15.10  	int ret = -ENOSYS;
   15.11  	void __user *udata = (void __user *) data;
   15.12 @@ -241,7 +241,7 @@ static struct file_operations privcmd_fi
   15.13  };
   15.14  
   15.15  static int capabilities_read(char *page, char **start, off_t off,
   15.16 -                        int count, int *eof, void *data)
   15.17 +			     int count, int *eof, void *data)
   15.18  {
   15.19  	int len = 0;
   15.20  	*page = 0;
    16.1 --- a/linux-2.6-xen-sparse/drivers/xen/tpmback/common.h	Mon Jun 12 18:23:42 2006 +0100
    16.2 +++ b/linux-2.6-xen-sparse/drivers/xen/tpmback/common.h	Mon Jun 12 18:32:47 2006 +0100
    16.3 @@ -17,8 +17,9 @@
    16.4  #include <asm/io.h>
    16.5  #include <asm/pgalloc.h>
    16.6  
    16.7 -#define DPRINTK(_f, _a...) pr_debug("(file=%s, line=%d) " _f, \
    16.8 -                                    __FILE__ , __LINE__ , ## _a )
    16.9 +#define DPRINTK(_f, _a...)			\
   16.10 +	pr_debug("(file=%s, line=%d) " _f,	\
   16.11 +		 __FILE__ , __LINE__ , ## _a )
   16.12  
   16.13  typedef struct tpmif_st {
   16.14  	struct list_head tpmif_list;
   16.15 @@ -68,12 +69,11 @@ int tpmif_vtpm_close(u32 instance);
   16.16  int vtpm_release_packets(tpmif_t * tpmif, int send_msgs);
   16.17  
   16.18  #define tpmif_get(_b) (atomic_inc(&(_b)->refcnt))
   16.19 -#define tpmif_put(_b)                             \
   16.20 -    do {                                          \
   16.21 -        if ( atomic_dec_and_test(&(_b)->refcnt) ) \
   16.22 -            tpmif_disconnect_complete(_b);        \
   16.23 -    } while (0)
   16.24 -
   16.25 +#define tpmif_put(_b)					\
   16.26 +	do {						\
   16.27 +		if (atomic_dec_and_test(&(_b)->refcnt))	\
   16.28 +			tpmif_disconnect_complete(_b);	\
   16.29 +	} while (0)
   16.30  
   16.31  extern int num_frontends;
   16.32  
    17.1 --- a/linux-2.6-xen-sparse/drivers/xen/tpmback/xenbus.c	Mon Jun 12 18:23:42 2006 +0100
    17.2 +++ b/linux-2.6-xen-sparse/drivers/xen/tpmback/xenbus.c	Mon Jun 12 18:32:47 2006 +0100
    17.3 @@ -41,9 +41,9 @@ static void maybe_connect(struct backend
    17.4  static void connect(struct backend_info *be);
    17.5  static int connect_ring(struct backend_info *be);
    17.6  static void backend_changed(struct xenbus_watch *watch,
    17.7 -                            const char **vec, unsigned int len);
    17.8 +			    const char **vec, unsigned int len);
    17.9  static void frontend_changed(struct xenbus_device *dev,
   17.10 -                             enum xenbus_state frontend_state);
   17.11 +			     enum xenbus_state frontend_state);
   17.12  
   17.13  static int tpmback_remove(struct xenbus_device *dev)
   17.14  {
   17.15 @@ -67,15 +67,15 @@ static int tpmback_remove(struct xenbus_
   17.16  }
   17.17  
   17.18  static int tpmback_probe(struct xenbus_device *dev,
   17.19 -                         const struct xenbus_device_id *id)
   17.20 +			 const struct xenbus_device_id *id)
   17.21  {
   17.22  	int err;
   17.23  	struct backend_info *be = kzalloc(sizeof(struct backend_info),
   17.24 -	                                  GFP_KERNEL);
   17.25 +					  GFP_KERNEL);
   17.26  
   17.27  	if (!be) {
   17.28  		xenbus_dev_fatal(dev, -ENOMEM,
   17.29 -		                 "allocating backend structure");
   17.30 +				 "allocating backend structure");
   17.31  		return -ENOMEM;
   17.32  	}
   17.33  
   17.34 @@ -84,8 +84,8 @@ static int tpmback_probe(struct xenbus_d
   17.35  	dev->dev.driver_data = be;
   17.36  
   17.37  	err = xenbus_watch_path2(dev, dev->nodename,
   17.38 -	                        "instance", &be->backend_watch,
   17.39 -	                        backend_changed);
   17.40 +				 "instance", &be->backend_watch,
   17.41 +				 backend_changed);
   17.42  	if (err) {
   17.43  		goto fail;
   17.44  	}
   17.45 @@ -102,7 +102,7 @@ fail:
   17.46  
   17.47  
   17.48  static void backend_changed(struct xenbus_watch *watch,
   17.49 -                            const char **vec, unsigned int len)
   17.50 +			    const char **vec, unsigned int len)
   17.51  {
   17.52  	int err;
   17.53  	long instance;
   17.54 @@ -111,7 +111,7 @@ static void backend_changed(struct xenbu
   17.55  	struct xenbus_device *dev = be->dev;
   17.56  
   17.57  	err = xenbus_scanf(XBT_NIL, dev->nodename,
   17.58 -	                   "instance","%li", &instance);
   17.59 +			   "instance","%li", &instance);
   17.60  	if (XENBUS_EXIST_ERR(err)) {
   17.61  		return;
   17.62  	}
   17.63 @@ -129,7 +129,7 @@ static void backend_changed(struct xenbu
   17.64  
   17.65  
   17.66  static void frontend_changed(struct xenbus_device *dev,
   17.67 -                             enum xenbus_state frontend_state)
   17.68 +			     enum xenbus_state frontend_state)
   17.69  {
   17.70  	struct backend_info *be = dev->dev.driver_data;
   17.71  	int err;
   17.72 @@ -167,8 +167,8 @@ static void frontend_changed(struct xenb
   17.73  	case XenbusStateInitWait:
   17.74  	default:
   17.75  		xenbus_dev_fatal(dev, -EINVAL,
   17.76 -		                 "saw state %d at frontend",
   17.77 -		                 frontend_state);
   17.78 +				 "saw state %d at frontend",
   17.79 +				 frontend_state);
   17.80  		break;
   17.81  	}
   17.82  }
   17.83 @@ -188,11 +188,11 @@ static void maybe_connect(struct backend
   17.84  	 * Notify the vTPM manager about a new front-end.
   17.85  	 */
   17.86  	err = tpmif_vtpm_open(be->tpmif,
   17.87 -	                      be->frontend_id,
   17.88 -	                      be->instance);
   17.89 +			      be->frontend_id,
   17.90 +			      be->instance);
   17.91  	if (err) {
   17.92  		xenbus_dev_error(be->dev, err,
   17.93 -		                 "queueing vtpm open packet");
   17.94 +				 "queueing vtpm open packet");
   17.95  		/*
   17.96  		 * Should close down this device and notify FE
   17.97  		 * about closure.
   17.98 @@ -217,7 +217,7 @@ again:
   17.99  	}
  17.100  
  17.101  	err = xenbus_printf(xbt, be->dev->nodename,
  17.102 -	                    "ready", "%lu", ready);
  17.103 +			    "ready", "%lu", ready);
  17.104  	if (err) {
  17.105  		xenbus_dev_fatal(be->dev, err, "writing 'ready'");
  17.106  		goto abort;
  17.107 @@ -246,7 +246,7 @@ static int connect_ring(struct backend_i
  17.108  	int err;
  17.109  
  17.110  	err = xenbus_gather(XBT_NIL, dev->otherend,
  17.111 -	                    "ring-ref", "%lu", &ring_ref,
  17.112 +			    "ring-ref", "%lu", &ring_ref,
  17.113  			    "event-channel", "%u", &evtchn, NULL);
  17.114  	if (err) {
  17.115  		xenbus_dev_error(dev, err,
  17.116 @@ -257,7 +257,7 @@ static int connect_ring(struct backend_i
  17.117  
  17.118  	if (!be->tpmif) {
  17.119  		be->tpmif = tpmif_find(dev->otherend_id,
  17.120 -		                       be->instance);
  17.121 +				       be->instance);
  17.122  		if (IS_ERR(be->tpmif)) {
  17.123  			err = PTR_ERR(be->tpmif);
  17.124  			be->tpmif = NULL;
  17.125 @@ -270,8 +270,8 @@ static int connect_ring(struct backend_i
  17.126  		err = tpmif_map(be->tpmif, ring_ref, evtchn);
  17.127  		if (err) {
  17.128  			xenbus_dev_error(dev, err,
  17.129 -			    	         "mapping shared-frame %lu port %u",
  17.130 -				         ring_ref, evtchn);
  17.131 +					 "mapping shared-frame %lu port %u",
  17.132 +					 ring_ref, evtchn);
  17.133  			return err;
  17.134  		}
  17.135  	}
    18.1 --- a/linux-2.6-xen-sparse/drivers/xen/xenbus/xenbus_probe.c	Mon Jun 12 18:23:42 2006 +0100
    18.2 +++ b/linux-2.6-xen-sparse/drivers/xen/xenbus/xenbus_probe.c	Mon Jun 12 18:32:47 2006 +0100
    18.3 @@ -30,8 +30,9 @@
    18.4   * IN THE SOFTWARE.
    18.5   */
    18.6  
    18.7 -#define DPRINTK(fmt, args...) \
    18.8 -    pr_debug("xenbus_probe (%s:%d) " fmt ".\n", __FUNCTION__, __LINE__, ##args)
    18.9 +#define DPRINTK(fmt, args...)				\
   18.10 +	pr_debug("xenbus_probe (%s:%d) " fmt ".\n",	\
   18.11 +		 __FUNCTION__, __LINE__, ##args)
   18.12  
   18.13  #include <linux/kernel.h>
   18.14  #include <linux/err.h>
   18.15 @@ -817,18 +818,18 @@ static int resume_dev(struct device *dev
   18.16  		       dev->bus_id, err);
   18.17  		return err;
   18.18  	}
   18.19 -        
   18.20 +
   18.21  	xdev->state = XenbusStateInitialising;
   18.22 -        
   18.23 +
   18.24  	if (drv->resume) {
   18.25  		err = drv->resume(xdev);
   18.26 -                if (err) { 
   18.27 -                        printk(KERN_WARNING
   18.28 -                               "xenbus: resume %s failed: %i\n", 
   18.29 -                               dev->bus_id, err);
   18.30 -                        return err; 
   18.31 -                }
   18.32 -        }
   18.33 +		if (err) { 
   18.34 +			printk(KERN_WARNING
   18.35 +			       "xenbus: resume %s failed: %i\n", 
   18.36 +			       dev->bus_id, err);
   18.37 +			return err; 
   18.38 +		}
   18.39 +	}
   18.40  
   18.41  	err = watch_otherend(xdev);
   18.42  	if (err) {
   18.43 @@ -945,7 +946,7 @@ static int xsd_kva_mmap(struct file *fil
   18.44  }
   18.45  
   18.46  static int xsd_kva_read(char *page, char **start, off_t off,
   18.47 -                        int count, int *eof, void *data)
   18.48 +			int count, int *eof, void *data)
   18.49  {
   18.50  	int len;
   18.51  
   18.52 @@ -1044,10 +1045,10 @@ static int __init xenbus_probe_init(void
   18.53  		free_page(page);
   18.54  
   18.55  	/*
   18.56 -         * Do not unregister the xenbus front/backend buses here. The
   18.57 -         * buses must exist because front/backend drivers will use
   18.58 -         * them when they are registered.
   18.59 -         */
   18.60 +	 * Do not unregister the xenbus front/backend buses here. The buses
   18.61 +	 * must exist because front/backend drivers will use them when they are
   18.62 +	 * registered.
   18.63 +	 */
   18.64  
   18.65  	return err;
   18.66  }