Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 53ca4fea authored by Jon Mason's avatar Jon Mason
Browse files

NTB: Code Style Clean-up 



Some white space and 80 char overruns corrected.

Signed-off-by: default avatarJon Mason <jon.mason@intel.com>
parent 403c63cb

drivers/ntb/ntb_hw.c

+10 −9
Original line number Diff line number Diff line
@@ -91,7 +91,7 @@ static struct dentry *debugfs_dir; 
/* Translate memory window 0,1 to BAR 2,4 */

#define MW_TO_BAR(mw)	(mw * NTB_MAX_NUM_MW + 2)



static DEFINE_PCI_DEVICE_TABLE(ntb_pci_tbl) = {

static const struct pci_device_id ntb_pci_tbl[] = {

	{PCI_VDEVICE(INTEL, PCI_DEVICE_ID_INTEL_NTB_B2B_BWD)},

	{PCI_VDEVICE(INTEL, PCI_DEVICE_ID_INTEL_NTB_B2B_JSF)},

	{PCI_VDEVICE(INTEL, PCI_DEVICE_ID_INTEL_NTB_B2B_SNB)},
@@ -120,7 +120,8 @@ MODULE_DEVICE_TABLE(pci, ntb_pci_tbl); 
 * RETURNS: An appropriate -ERRNO error value on error, or zero for success.

 */

int ntb_register_event_callback(struct ntb_device *ndev,

			    void (*func)(void *handle, enum ntb_hw_event event))

				void (*func)(void *handle,

					     enum ntb_hw_event event))

{

	if (ndev->event_cb)

		return -EINVAL;
@@ -715,9 +716,9 @@ static int ntb_xeon_setup(struct ntb_device *ndev) 
			       SNB_PBAR4LMT_OFFSET);

			/* HW errata on the Limit registers.  They can only be

			 * written when the base register is 4GB aligned and

			 * < 32bit.  This should already be the case based on the

			 * driver defaults, but write the Limit registers first

			 * just in case.

			 * < 32bit.  This should already be the case based on

			 * the driver defaults, but write the Limit registers

			 * first just in case.

			 */

		} else {

			ndev->limits.max_mw = SNB_MAX_MW;
@@ -739,9 +740,9 @@ static int ntb_xeon_setup(struct ntb_device *ndev) 
			writeq(0, ndev->reg_base + SNB_PBAR4LMT_OFFSET);

			/* HW errata on the Limit registers.  They can only be

			 * written when the base register is 4GB aligned and

			 * < 32bit.  This should already be the case based on the

			 * driver defaults, but write the Limit registers first

			 * just in case.

			 * < 32bit.  This should already be the case based on

			 * the driver defaults, but write the Limit registers

			 * first just in case.

			 */

		}

drivers/ntb/ntb_transport.c

+9 −10
Original line number Diff line number Diff line
@@ -1189,8 +1189,7 @@ out: 
	return 0;



err:

	ntb_list_add(&qp->ntb_rx_pend_q_lock, &entry->entry,

		     &qp->rx_pend_q);

	ntb_list_add(&qp->ntb_rx_pend_q_lock, &entry->entry, &qp->rx_pend_q);

	/* Ensure that the data is fully copied out before clearing the flag */

	wmb();

	hdr->flags = 0;

drivers/ntb/ntb_hw.h

+1 −1

File changed.

Contains only whitespace changes.

include/linux/ntb.h

+7 −7

File changed.

Contains only whitespace changes.

drivers/net/ntb_netdev.c

+1 −1

File changed.

Contains only whitespace changes.