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

Commit acbb67d5 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband 

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband:
  IB/mthca: Use mmiowb after doorbell ring
  IB/ipath: Initialize diagpkt file on device init only
  RDMA/amso1100: Fix a NULL dereference in error path
  RDMA/amso1100: pci_module_init() conversion
parents 22a60f19 1f5c23e2

drivers/infiniband/hw/amso1100/c2.c

+1 −1
Original line number Diff line number Diff line
@@ -1243,7 +1243,7 @@ static struct pci_driver c2_pci_driver = { 


static int __init c2_init_module(void)

{

	return pci_module_init(&c2_pci_driver);

	return pci_register_driver(&c2_pci_driver);

}



static void __exit c2_exit_module(void)

drivers/infiniband/hw/amso1100/c2_rnic.c

+2 −2
Original line number Diff line number Diff line
@@ -150,7 +150,7 @@ static int c2_rnic_query(struct c2_dev *c2dev, struct ib_device_attr *props) 
	    (struct c2wr_rnic_query_rep *) (unsigned long) (vq_req->reply_msg);

	if (!reply)

		err = -ENOMEM;



	else

		err = c2_errno(reply);

	if (err)

		goto bail2;

drivers/infiniband/hw/ipath/ipath_diag.c

+38 −27
Original line number Diff line number Diff line
@@ -67,19 +67,54 @@ static struct file_operations diag_file_ops = { 
	.release = ipath_diag_release

};



static ssize_t ipath_diagpkt_write(struct file *fp,

				   const char __user *data,

				   size_t count, loff_t *off);



static struct file_operations diagpkt_file_ops = {

	.owner = THIS_MODULE,

	.write = ipath_diagpkt_write,

};



static atomic_t diagpkt_count = ATOMIC_INIT(0);

static struct cdev *diagpkt_cdev;

static struct class_device *diagpkt_class_dev;



int ipath_diag_add(struct ipath_devdata *dd)

{

	char name[16];

	int ret = 0;



	if (atomic_inc_return(&diagpkt_count) == 1) {

		ret = ipath_cdev_init(IPATH_DIAGPKT_MINOR,

				      "ipath_diagpkt", &diagpkt_file_ops,

				      &diagpkt_cdev, &diagpkt_class_dev);



		if (ret) {

			ipath_dev_err(dd, "Couldn't create ipath_diagpkt "

				      "device: %d", ret);

			goto done;

		}

	}



	snprintf(name, sizeof(name), "ipath_diag%d", dd->ipath_unit);



	return ipath_cdev_init(IPATH_DIAG_MINOR_BASE + dd->ipath_unit, name,

	ret = ipath_cdev_init(IPATH_DIAG_MINOR_BASE + dd->ipath_unit, name,

			      &diag_file_ops, &dd->diag_cdev,

			      &dd->diag_class_dev);

	if (ret)

		ipath_dev_err(dd, "Couldn't create %s device: %d",

			      name, ret);



done:

	return ret;

}



void ipath_diag_remove(struct ipath_devdata *dd)

{

	if (atomic_dec_and_test(&diagpkt_count))

		ipath_cdev_cleanup(&diagpkt_cdev, &diagpkt_class_dev);



	ipath_cdev_cleanup(&dd->diag_cdev, &dd->diag_class_dev);

}
@@ -275,30 +310,6 @@ bail: 
	return ret;

}



static ssize_t ipath_diagpkt_write(struct file *fp,

				   const char __user *data,

				   size_t count, loff_t *off);



static struct file_operations diagpkt_file_ops = {

	.owner = THIS_MODULE,

	.write = ipath_diagpkt_write,

};



static struct cdev *diagpkt_cdev;

static struct class_device *diagpkt_class_dev;



int __init ipath_diagpkt_add(void)

{

	return ipath_cdev_init(IPATH_DIAGPKT_MINOR,

			       "ipath_diagpkt", &diagpkt_file_ops,

			       &diagpkt_cdev, &diagpkt_class_dev);

}



void __exit ipath_diagpkt_remove(void)

{

	ipath_cdev_cleanup(&diagpkt_cdev, &diagpkt_class_dev);

}



/**

 * ipath_diagpkt_write - write an IB packet

 * @fp: the diag data device file pointer

drivers/infiniband/hw/ipath/ipath_driver.c

+0 −10
Original line number Diff line number Diff line
@@ -2005,18 +2005,8 @@ static int __init infinipath_init(void) 
		goto bail_group;

	}



	ret = ipath_diagpkt_add();

	if (ret < 0) {

		printk(KERN_ERR IPATH_DRV_NAME ": Unable to create "

		       "diag data device: error %d\n", -ret);

		goto bail_ipathfs;

	}



	goto bail;



bail_ipathfs:

	ipath_exit_ipathfs();



bail_group:

	ipath_driver_remove_group(&ipath_driver.driver);

drivers/infiniband/hw/ipath/ipath_kernel.h

+0 −3
Original line number Diff line number Diff line
@@ -869,9 +869,6 @@ int ipath_device_create_group(struct device *, struct ipath_devdata *); 
void ipath_device_remove_group(struct device *, struct ipath_devdata *);

int ipath_expose_reset(struct device *);



int ipath_diagpkt_add(void);

void ipath_diagpkt_remove(void);



int ipath_init_ipathfs(void);

void ipath_exit_ipathfs(void);

int ipathfs_add_device(struct ipath_devdata *);