Commit 9d845447 authored by jan.koester's avatar jan.koester
Browse files

some fixes

parent 7b326962

drivers/base/regmap/regcache.c

+0 −24
Original line number Diff line number Diff line
@@ -449,7 +449,6 @@ int regcache_sync_region(struct regmap *map, unsigned int min, 
	int ret = 0;

	const char *name;

	bool bypass;

	struct rb_node *node;



	if (WARN_ON(map->cache_type == REGCACHE_NONE))

		return -EINVAL;
@@ -481,29 +480,6 @@ int regcache_sync_region(struct regmap *map, unsigned int min, 
	map->cache_bypass = bypass;

	map->async = false;

	map->no_sync_defaults = false;



	/*

	 * If we did any paging with cache bypassed and a cached

	 * paging register then the register and cache state might

	 * have gone out of sync, force writes of all the paging

	 * registers.

	 */

	rb_for_each(node, 0, &map->range_tree, rbtree_all) {

		struct regmap_range_node *this =

			rb_entry(node, struct regmap_range_node, node);



		/* If there's nothing in the cache there's nothing to sync */

		if (regcache_read(map, this->selector_reg, &i) != 0)

			continue;



		ret = _regmap_write(map, this->selector_reg, i);

		if (ret != 0) {

			dev_err(map->dev, "Failed to write %x = %x: %d\n",

				this->selector_reg, i, ret);

			break;

		}

	}



	map->unlock(map->lock_arg);



	regmap_async_complete(map);

fs/smb/client/ioctl.c

+0 −14
Original line number Diff line number Diff line
@@ -131,20 +131,6 @@ static long smb_mnt_get_tcon_info(struct cifs_tcon *tcon, void __user *arg) 
	return rc;

}



static long smb_mnt_get_tcon_info(struct cifs_tcon *tcon, void __user *arg)

{

	int rc = 0;

	struct smb_mnt_tcon_info tcon_inf;



	tcon_inf.tid = tcon->tid;

	tcon_inf.session_id = tcon->ses->Suid;



	if (copy_to_user(arg, &tcon_inf, sizeof(struct smb_mnt_tcon_info)))

		rc = -EFAULT;



	return rc;

}



static long smb_mnt_get_fsinfo(unsigned int xid, struct cifs_tcon *tcon,

				void __user *arg)

{