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

Commit 75021d28 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull trivial updates from Jiri Kosina:
 "Trivial stuff from trivial tree that can be trivially summed up as:

   - treewide drop of spurious unlikely() before IS_ERR() from Viresh
     Kumar

   - cosmetic fixes (that don't really affect basic functionality of the
     driver) for pktcdvd and bcache, from Julia Lawall and Petr Mladek

   - various comment / printk fixes and updates all over the place"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial:
  bcache: Really show state of work pending bit
  hwmon: applesmc: fix comment typos
  Kconfig: remove comment about scsi_wait_scan module
  class_find_device: fix reference to argument "match"
  debugfs: document that debugfs_remove*() accepts NULL and error values
  net: Drop unlikely before IS_ERR(_OR_NULL)
  mm: Drop unlikely before IS_ERR(_OR_NULL)
  fs: Drop unlikely before IS_ERR(_OR_NULL)
  drivers: net: Drop unlikely before IS_ERR(_OR_NULL)
  drivers: misc: Drop unlikely before IS_ERR(_OR_NULL)
  UBI: Update comments to reflect UBI_METAONLY flag
  pktcdvd: drop null test before destroy functions
parents 6f1da317 8d090f47

drivers/base/class.c

+1 −1
Original line number Diff line number Diff line
@@ -406,7 +406,7 @@ EXPORT_SYMBOL_GPL(class_for_each_device); 
 *

 * Note, you will need to drop the reference with put_device() after use.

 *

 * @fn is allowed to do anything including calling back into class

 * @match is allowed to do anything including calling back into class

 * code.  There's no locking restriction.

 */

struct device *class_find_device(struct class *class, struct device *start,

drivers/block/pktcdvd.c

+1 −2
Original line number Diff line number Diff line
@@ -2803,7 +2803,6 @@ static int pkt_setup_dev(dev_t dev, dev_t* pkt_dev) 
out_mem2:

	put_disk(disk);

out_mem:

	if (pd->rb_pool)

	mempool_destroy(pd->rb_pool);

	kfree(pd);

out_mutex:

drivers/hwmon/applesmc.c

+2 −2
Original line number Diff line number Diff line
@@ -1138,7 +1138,7 @@ static int applesmc_create_nodes(struct applesmc_node_group *groups, int num) 
	return ret;

}



/* Create accelerometer ressources */

/* Create accelerometer resources */

static int applesmc_create_accelerometer(void)

{

	struct input_dev *idev;
@@ -1191,7 +1191,7 @@ static int applesmc_create_accelerometer(void) 
	return ret;

}



/* Release all ressources used by the accelerometer */

/* Release all resources used by the accelerometer */

static void applesmc_release_accelerometer(void)

{

	if (!smcreg.has_accelerometer)

drivers/md/bcache/closure.c

+1 −3
Original line number Diff line number Diff line
@@ -167,8 +167,6 @@ EXPORT_SYMBOL(closure_debug_destroy); 


static struct dentry *debug;



#define work_data_bits(work) ((unsigned long *)(&(work)->data))



static int debug_seq_show(struct seq_file *f, void *data)

{

	struct closure *cl;
@@ -182,7 +180,7 @@ static int debug_seq_show(struct seq_file *f, void *data) 
			   r & CLOSURE_REMAINING_MASK);



		seq_printf(f, "%s%s%s%s\n",

			   test_bit(WORK_STRUCT_PENDING,

			   test_bit(WORK_STRUCT_PENDING_BIT,

				    work_data_bits(&cl->work)) ? "Q" : "",

			   r & CLOSURE_RUNNING	? "R" : "",

			   r & CLOSURE_STACK	? "S" : "",

drivers/misc/c2port/core.c

+1 −1
Original line number Diff line number Diff line
@@ -926,7 +926,7 @@ struct c2port_device *c2port_device_register(char *name, 


	c2dev->dev = device_create(c2port_class, NULL, 0, c2dev,

				   "c2port%d", c2dev->id);

	if (unlikely(IS_ERR(c2dev->dev))) {

	if (IS_ERR(c2dev->dev)) {

		ret = PTR_ERR(c2dev->dev);

		goto error_device_create;

	}