Commit 7941b570 authored by jan.koester's avatar jan.koester
Browse files

cleaups

parent c01df847

drivers/acpi/video_detect.c

+0 −26
Original line number Diff line number Diff line
@@ -140,16 +140,6 @@ static int video_detect_portege_r100(const struct dmi_system_id *d) 
	return 0;

}



static int video_detect_portege_r100(const struct dmi_system_id *d)

{

	struct pci_dev *dev;

	/* Search for Trident CyberBlade XP4m32 to confirm Portégé R100 */

	dev = pci_get_device(PCI_VENDOR_ID_TRIDENT, 0x2100, NULL);

	if (dev)

		acpi_backlight_dmi = acpi_backlight_vendor;

	return 0;

}



static const struct dmi_system_id video_detect_dmi_table[] = {

	/*

	 * Models which should use the vendor backlight interface,
@@ -306,22 +296,6 @@ static const struct dmi_system_id video_detect_dmi_table[] = { 
		},

	},



	/*

	 * Toshiba Portégé R100 has working both acpi_video and toshiba_acpi

	 * vendor driver. But none of them gets activated as it has a VGA with

	 * no kernel driver (Trident CyberBlade XP4m32).

	 * The DMI strings are generic so check for the VGA chip in callback.

	 */

	{

	 .callback = video_detect_portege_r100,

	 .matches = {

		DMI_MATCH(DMI_SYS_VENDOR, "TOSHIBA"),

		DMI_MATCH(DMI_PRODUCT_NAME, "Portable PC"),

		DMI_MATCH(DMI_PRODUCT_VERSION, "Version 1.0"),

		DMI_MATCH(DMI_BOARD_NAME, "Portable PC")

		},

	},



	/*

	 * Models which need acpi_video backlight control where the GPU drivers

	 * do not call acpi_video_register_backlight() because no internal panel

drivers/base/regmap/regcache.c

+0 −29
Original line number Diff line number Diff line
@@ -339,11 +339,6 @@ static int rbtree_all(const void *key, const struct rb_node *node) 
	return 0;

}



static int rbtree_all(const void *key, const struct rb_node *node)

{

	return 0;

}



/**

 * regcache_sync - Sync the register cache with the hardware.

 *
@@ -454,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;
@@ -486,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);

drivers/iommu/intel/svm.c

+0 −26
Original line number Diff line number Diff line
@@ -237,27 +237,6 @@ static void intel_flush_svm_all(struct intel_svm *svm) 
	rcu_read_unlock();

}



static void intel_flush_svm_all(struct intel_svm *svm)

{

	struct device_domain_info *info;

	struct intel_svm_dev *sdev;



	rcu_read_lock();

	list_for_each_entry_rcu(sdev, &svm->devs, list) {

		info = dev_iommu_priv_get(sdev->dev);



		qi_flush_piotlb(sdev->iommu, sdev->did, svm->pasid, 0, -1UL, 0);

		if (info->ats_enabled) {

			qi_flush_dev_iotlb_pasid(sdev->iommu, sdev->sid, info->pfsid,

						 svm->pasid, sdev->qdep,

						 0, 64 - VTD_PAGE_SHIFT);

			quirk_extra_dev_tlb_flush(info, 0, 64 - VTD_PAGE_SHIFT,

						  svm->pasid, sdev->qdep);

		}

	}

	rcu_read_unlock();

}



/* Pages have been freed at this point */

static void intel_arch_invalidate_secondary_tlbs(struct mmu_notifier *mn,

					struct mm_struct *mm,
@@ -270,11 +249,6 @@ static void intel_arch_invalidate_secondary_tlbs(struct mmu_notifier *mn, 
		return;

	}



	if (start == 0 && end == -1UL) {

		intel_flush_svm_all(svm);

		return;

	}



	intel_flush_svm_range(svm, start,

			      (end - start + PAGE_SIZE - 1) >> VTD_PAGE_SHIFT, 0);

}

fs/smb/client/ioctl.c

+0 −25
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)

{
@@ -453,17 +439,6 @@ long cifs_ioctl(struct file *filep, unsigned int command, unsigned long arg) 
			rc = smb_mnt_get_tcon_info(tcon, (void __user *)arg);

			cifs_put_tlink(tlink);

			break;

		case CIFS_IOC_GET_TCON_INFO:

			cifs_sb = CIFS_SB(inode->i_sb);

			tlink = cifs_sb_tlink(cifs_sb);

			if (IS_ERR(tlink)) {

				rc = PTR_ERR(tlink);

				break;

			}

			tcon = tlink_tcon(tlink);

			rc = smb_mnt_get_tcon_info(tcon, (void __user *)arg);

			cifs_put_tlink(tlink);

			break;

		case CIFS_ENUMERATE_SNAPSHOTS:

			if (pSMBFile == NULL)

				break;