android/android_kernel_asus_sm8350
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

NTB: Code Style Clean-up

Browse Source 
Some white space and 80 char overruns corrected.

Signed-off-by: Jon Mason <jon.mason@intel.com>
This commit is contained in:
Jon Mason 2013-11-26 11:21:50 -07:00
parent 403c63cb6d
commit 53ca4fea0b
5 changed files with 28 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/net/ntb_netdev.c
View File

@ -377,7 +377,7 @@ static void ntb_netdev_remove(struct pci_dev *pdev)
{ {
struct net_device *ndev; struct net_device *ndev;
struct ntb_netdev *dev; struct ntb_netdev *dev;
bool found = false; bool found = false;
list_for_each_entry(dev, &dev_list, list) { list_for_each_entry(dev, &dev_list, list) {
if (dev->pdev == pdev) { if (dev->pdev == pdev) {

19
drivers/ntb/ntb_hw.c
View File

@ -91,7 +91,7 @@ static struct dentry *debugfs_dir;
/* Translate memory window 0,1 to BAR 2,4 */ /* Translate memory window 0,1 to BAR 2,4 */
#define MW_TO_BAR(mw) (mw * NTB_MAX_NUM_MW + 2) #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_BWD)},
{PCI_VDEVICE(INTEL, PCI_DEVICE_ID_INTEL_NTB_B2B_JSF)}, {PCI_VDEVICE(INTEL, PCI_DEVICE_ID_INTEL_NTB_B2B_JSF)},
{PCI_VDEVICE(INTEL, PCI_DEVICE_ID_INTEL_NTB_B2B_SNB)}, {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. * RETURNS: An appropriate -ERRNO error value on error, or zero for success.
*/ */
int ntb_register_event_callback(struct ntb_device *ndev, 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) if (ndev->event_cb)
return -EINVAL; return -EINVAL;
@ -715,9 +716,9 @@ static int ntb_xeon_setup(struct ntb_device *ndev)
SNB_PBAR4LMT_OFFSET); SNB_PBAR4LMT_OFFSET);
/* HW errata on the Limit registers. They can only be /* HW errata on the Limit registers. They can only be
* written when the base register is 4GB aligned and * written when the base register is 4GB aligned and
* < 32bit. This should already be the case based on the * < 32bit. This should already be the case based on
* driver defaults, but write the Limit registers first * the driver defaults, but write the Limit registers
* just in case. * first just in case.
*/ */
} else { } else {
ndev->limits.max_mw = SNB_MAX_MW; 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); writeq(0, ndev->reg_base + SNB_PBAR4LMT_OFFSET);
/* HW errata on the Limit registers. They can only be /* HW errata on the Limit registers. They can only be
* written when the base register is 4GB aligned and * written when the base register is 4GB aligned and
* < 32bit. This should already be the case based on the * < 32bit. This should already be the case based on
* driver defaults, but write the Limit registers first * the driver defaults, but write the Limit registers
* just in case. * first just in case.
*/ */
} }
@ -803,7 +804,7 @@ static int ntb_xeon_setup(struct ntb_device *ndev)
ndev->conn_type = NTB_CONN_RP; ndev->conn_type = NTB_CONN_RP;
if (xeon_errata_workaround) { if (xeon_errata_workaround) {
dev_err(&ndev->pdev->dev, dev_err(&ndev->pdev->dev,
"NTB-RP disabled due to hardware errata. To disregard this warning and potentially lock-up the system, add the parameter 'xeon_errata_workaround=0'.\n"); "NTB-RP disabled due to hardware errata. To disregard this warning and potentially lock-up the system, add the parameter 'xeon_errata_workaround=0'.\n");
return -EINVAL; return -EINVAL;
} }

2
drivers/ntb/ntb_hw.h
View File

@ -231,7 +231,7 @@ int ntb_register_db_callback(struct ntb_device *ndev, unsigned int idx,
int db_num)); int db_num));
void ntb_unregister_db_callback(struct ntb_device *ndev, unsigned int idx); void ntb_unregister_db_callback(struct ntb_device *ndev, unsigned int idx);
int ntb_register_event_callback(struct ntb_device *ndev, int ntb_register_event_callback(struct ntb_device *ndev,
void (*event_cb_func) (void *handle, void (*event_cb_func)(void *handle,
enum ntb_hw_event event)); enum ntb_hw_event event));
void ntb_unregister_event_callback(struct ntb_device *ndev); void ntb_unregister_event_callback(struct ntb_device *ndev);
int ntb_get_max_spads(struct ntb_device *ndev); int ntb_get_max_spads(struct ntb_device *ndev);

19
drivers/ntb/ntb_transport.c
View File

@ -106,8 +106,8 @@ struct ntb_transport_qp {
struct ntb_rx_info __iomem *rx_info; struct ntb_rx_info __iomem *rx_info;
struct ntb_rx_info *remote_rx_info; struct ntb_rx_info *remote_rx_info;
void (*tx_handler) (struct ntb_transport_qp *qp, void *qp_data, void (*tx_handler)(struct ntb_transport_qp *qp, void *qp_data,
void *data, int len); void *data, int len);
struct list_head tx_free_q; struct list_head tx_free_q;
spinlock_t ntb_tx_free_q_lock; spinlock_t ntb_tx_free_q_lock;
void __iomem *tx_mw; void __iomem *tx_mw;
@ -116,8 +116,8 @@ struct ntb_transport_qp {
unsigned int tx_max_entry; unsigned int tx_max_entry;
unsigned int tx_max_frame; unsigned int tx_max_frame;
void (*rx_handler) (struct ntb_transport_qp *qp, void *qp_data, void (*rx_handler)(struct ntb_transport_qp *qp, void *qp_data,
void *data, int len); void *data, int len);
struct list_head rx_pend_q; struct list_head rx_pend_q;
struct list_head rx_free_q; struct list_head rx_free_q;
spinlock_t ntb_rx_pend_q_lock; spinlock_t ntb_rx_pend_q_lock;
@ -128,7 +128,7 @@ struct ntb_transport_qp {
unsigned int rx_max_frame; unsigned int rx_max_frame;
dma_cookie_t last_cookie; dma_cookie_t last_cookie;
void (*event_handler) (void *data, int status); void (*event_handler)(void *data, int status);
struct delayed_work link_work; struct delayed_work link_work;
struct work_struct link_cleanup; struct work_struct link_cleanup;
@ -479,7 +479,7 @@ static void ntb_list_add(spinlock_t *lock, struct list_head *entry,
} }
static struct ntb_queue_entry *ntb_list_rm(spinlock_t *lock, static struct ntb_queue_entry *ntb_list_rm(spinlock_t *lock,
struct list_head *list) struct list_head *list)
{ {
struct ntb_queue_entry *entry; struct ntb_queue_entry *entry;
unsigned long flags; unsigned long flags;
@ -838,7 +838,7 @@ static void ntb_qp_link_work(struct work_struct *work)
} }
static int ntb_transport_init_queue(struct ntb_transport *nt, static int ntb_transport_init_queue(struct ntb_transport *nt,
unsigned int qp_num) unsigned int qp_num)
{ {
struct ntb_transport_qp *qp; struct ntb_transport_qp *qp;
unsigned int num_qps_mw, tx_size; unsigned int num_qps_mw, tx_size;
@ -1054,7 +1054,7 @@ static void ntb_async_rx(struct ntb_queue_entry *entry, void *offset,
if (!chan) if (!chan)
goto err; goto err;
if (len < copy_bytes) if (len < copy_bytes)
goto err_wait; goto err_wait;
device = chan->device; device = chan->device;
@ -1189,8 +1189,7 @@ static int ntb_process_rxc(struct ntb_transport_qp *qp)
return 0; return 0;
err: err:
ntb_list_add(&qp->ntb_rx_pend_q_lock, &entry->entry, ntb_list_add(&qp->ntb_rx_pend_q_lock, &entry->entry, &qp->rx_pend_q);
&qp->rx_pend_q);
/* Ensure that the data is fully copied out before clearing the flag */ /* Ensure that the data is fully copied out before clearing the flag */
wmb(); wmb();
hdr->flags = 0; hdr->flags = 0;

14
include/linux/ntb.h
View File

@ -50,8 +50,8 @@ struct ntb_transport_qp;
struct ntb_client { struct ntb_client {
struct device_driver driver; struct device_driver driver;
int (*probe) (struct pci_dev *pdev); int (*probe)(struct pci_dev *pdev);
void (*remove) (struct pci_dev *pdev); void (*remove)(struct pci_dev *pdev);
}; };
enum { enum {
@ -65,11 +65,11 @@ int ntb_register_client_dev(char *device_name);
void ntb_unregister_client_dev(char *device_name); void ntb_unregister_client_dev(char *device_name);
struct ntb_queue_handlers { struct ntb_queue_handlers {
void (*rx_handler) (struct ntb_transport_qp *qp, void *qp_data, void (*rx_handler)(struct ntb_transport_qp *qp, void *qp_data,
void *data, int len); void *data, int len);
void (*tx_handler) (struct ntb_transport_qp *qp, void *qp_data, void (*tx_handler)(struct ntb_transport_qp *qp, void *qp_data,
void *data, int len); void *data, int len);
void (*event_handler) (void *data, int status); void (*event_handler)(void *data, int status);
}; };
unsigned char ntb_transport_qp_num(struct ntb_transport_qp *qp); unsigned char ntb_transport_qp_num(struct ntb_transport_qp *qp);