mirror of
https://github.com/torvalds/linux.git
synced 2024-11-23 04:31:50 +00:00
char: remove use of __devexit
CONFIG_HOTPLUG is going away as an option so __devexit is no longer needed. Signed-off-by: Bill Pemberton <wfp5p@virginia.edu> Cc: David Airlie <airlied@linux.ie> Cc: Olof Johansson <olof@lixom.net> Cc: Mattia Dongili <malattia@linux.it> Cc: Kent Yoder <key@linux.vnet.ibm.com> Cc: Rajiv Andrade <mail@srajiv.net> Cc: Marcel Selhorst <tpmdd@selhorst.net> Cc: Sirrix AG <tpmdd@sirrix.com> Cc: linuxppc-dev@lists.ozlabs.org Cc: linux-arm-kernel@lists.infradead.org Cc: openipmi-developer@lists.sourceforge.net Cc: platform-driver-x86@vger.kernel.org Cc: tpmdd-devel@lists.sourceforge.net Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
parent
aa89ed9e36
commit
39af33fc45
@ -374,7 +374,7 @@ found:
|
||||
return agp_add_bridge(bridge);
|
||||
}
|
||||
|
||||
static void __devexit agp_ali_remove(struct pci_dev *pdev)
|
||||
static void agp_ali_remove(struct pci_dev *pdev)
|
||||
{
|
||||
struct agp_bridge_data *bridge = pci_get_drvdata(pdev);
|
||||
|
||||
|
@ -480,7 +480,7 @@ static int __devinit agp_amdk7_probe(struct pci_dev *pdev,
|
||||
return agp_add_bridge(bridge);
|
||||
}
|
||||
|
||||
static void __devexit agp_amdk7_remove(struct pci_dev *pdev)
|
||||
static void agp_amdk7_remove(struct pci_dev *pdev)
|
||||
{
|
||||
struct agp_bridge_data *bridge = pci_get_drvdata(pdev);
|
||||
|
||||
|
@ -579,7 +579,7 @@ static int __devinit agp_amd64_probe(struct pci_dev *pdev,
|
||||
return 0;
|
||||
}
|
||||
|
||||
static void __devexit agp_amd64_remove(struct pci_dev *pdev)
|
||||
static void agp_amd64_remove(struct pci_dev *pdev)
|
||||
{
|
||||
struct agp_bridge_data *bridge = pci_get_drvdata(pdev);
|
||||
|
||||
|
@ -533,7 +533,7 @@ found:
|
||||
return agp_add_bridge(bridge);
|
||||
}
|
||||
|
||||
static void __devexit agp_ati_remove(struct pci_dev *pdev)
|
||||
static void agp_ati_remove(struct pci_dev *pdev)
|
||||
{
|
||||
struct agp_bridge_data *bridge = pci_get_drvdata(pdev);
|
||||
|
||||
|
@ -407,7 +407,7 @@ static int __devinit agp_efficeon_probe(struct pci_dev *pdev,
|
||||
return agp_add_bridge(bridge);
|
||||
}
|
||||
|
||||
static void __devexit agp_efficeon_remove(struct pci_dev *pdev)
|
||||
static void agp_efficeon_remove(struct pci_dev *pdev)
|
||||
{
|
||||
struct agp_bridge_data *bridge = pci_get_drvdata(pdev);
|
||||
|
||||
|
@ -611,7 +611,7 @@ static int __devinit agp_intel_i460_probe(struct pci_dev *pdev,
|
||||
return agp_add_bridge(bridge);
|
||||
}
|
||||
|
||||
static void __devexit agp_intel_i460_remove(struct pci_dev *pdev)
|
||||
static void agp_intel_i460_remove(struct pci_dev *pdev)
|
||||
{
|
||||
struct agp_bridge_data *bridge = pci_get_drvdata(pdev);
|
||||
|
||||
|
@ -819,7 +819,7 @@ found_gmch:
|
||||
return err;
|
||||
}
|
||||
|
||||
static void __devexit agp_intel_remove(struct pci_dev *pdev)
|
||||
static void agp_intel_remove(struct pci_dev *pdev)
|
||||
{
|
||||
struct agp_bridge_data *bridge = pci_get_drvdata(pdev);
|
||||
|
||||
|
@ -388,7 +388,7 @@ static int __devinit agp_nvidia_probe(struct pci_dev *pdev,
|
||||
return agp_add_bridge(bridge);
|
||||
}
|
||||
|
||||
static void __devexit agp_nvidia_remove(struct pci_dev *pdev)
|
||||
static void agp_nvidia_remove(struct pci_dev *pdev)
|
||||
{
|
||||
struct agp_bridge_data *bridge = pci_get_drvdata(pdev);
|
||||
|
||||
|
@ -327,7 +327,7 @@ static int __devinit agp_sgi_init(void)
|
||||
return 0;
|
||||
}
|
||||
|
||||
static void __devexit agp_sgi_cleanup(void)
|
||||
static void agp_sgi_cleanup(void)
|
||||
{
|
||||
kfree(sgi_tioca_agp_bridges);
|
||||
sgi_tioca_agp_bridges = NULL;
|
||||
|
@ -211,7 +211,7 @@ static int __devinit agp_sis_probe(struct pci_dev *pdev,
|
||||
return agp_add_bridge(bridge);
|
||||
}
|
||||
|
||||
static void __devexit agp_sis_remove(struct pci_dev *pdev)
|
||||
static void agp_sis_remove(struct pci_dev *pdev)
|
||||
{
|
||||
struct agp_bridge_data *bridge = pci_get_drvdata(pdev);
|
||||
|
||||
|
@ -518,7 +518,7 @@ static int __devinit agp_serverworks_probe(struct pci_dev *pdev,
|
||||
return agp_add_bridge(bridge);
|
||||
}
|
||||
|
||||
static void __devexit agp_serverworks_remove(struct pci_dev *pdev)
|
||||
static void agp_serverworks_remove(struct pci_dev *pdev)
|
||||
{
|
||||
struct agp_bridge_data *bridge = pci_get_drvdata(pdev);
|
||||
|
||||
|
@ -663,7 +663,7 @@ static int __devinit agp_uninorth_probe(struct pci_dev *pdev,
|
||||
return agp_add_bridge(bridge);
|
||||
}
|
||||
|
||||
static void __devexit agp_uninorth_remove(struct pci_dev *pdev)
|
||||
static void agp_uninorth_remove(struct pci_dev *pdev)
|
||||
{
|
||||
struct agp_bridge_data *bridge = pci_get_drvdata(pdev);
|
||||
|
||||
|
@ -485,7 +485,7 @@ static int __devinit agp_via_probe(struct pci_dev *pdev,
|
||||
return agp_add_bridge(bridge);
|
||||
}
|
||||
|
||||
static void __devexit agp_via_remove(struct pci_dev *pdev)
|
||||
static void agp_via_remove(struct pci_dev *pdev)
|
||||
{
|
||||
struct agp_bridge_data *bridge = pci_get_drvdata(pdev);
|
||||
|
||||
|
@ -98,7 +98,7 @@ err_enable:
|
||||
return ret;
|
||||
}
|
||||
|
||||
static int __devexit atmel_trng_remove(struct platform_device *pdev)
|
||||
static int atmel_trng_remove(struct platform_device *pdev)
|
||||
{
|
||||
struct atmel_trng *trng = platform_get_drvdata(pdev);
|
||||
|
||||
|
@ -145,7 +145,7 @@ out:
|
||||
return ret;
|
||||
}
|
||||
|
||||
static int __devexit bcm63xx_rng_remove(struct platform_device *pdev)
|
||||
static int bcm63xx_rng_remove(struct platform_device *pdev)
|
||||
{
|
||||
struct hwrng *rng = platform_get_drvdata(pdev);
|
||||
struct bcm63xx_rng_priv *priv = to_rng_priv(rng);
|
||||
|
@ -134,7 +134,7 @@ static int __devinit exynos_rng_probe(struct platform_device *pdev)
|
||||
return hwrng_register(&exynos_rng->rng);
|
||||
}
|
||||
|
||||
static int __devexit exynos_rng_remove(struct platform_device *pdev)
|
||||
static int exynos_rng_remove(struct platform_device *pdev)
|
||||
{
|
||||
struct exynos_rng *exynos_rng = platform_get_drvdata(pdev);
|
||||
|
||||
|
@ -719,7 +719,7 @@ out:
|
||||
return err;
|
||||
}
|
||||
|
||||
static int __devexit n2rng_remove(struct platform_device *op)
|
||||
static int n2rng_remove(struct platform_device *op)
|
||||
{
|
||||
struct n2rng *np = dev_get_drvdata(&op->dev);
|
||||
|
||||
|
@ -122,7 +122,7 @@ static int __devinit rng_probe(struct platform_device *ofdev)
|
||||
return err;
|
||||
}
|
||||
|
||||
static int __devexit rng_remove(struct platform_device *dev)
|
||||
static int rng_remove(struct platform_device *dev)
|
||||
{
|
||||
void __iomem *rng_regs = (void __iomem *)pasemi_rng.priv;
|
||||
|
||||
|
@ -151,7 +151,7 @@ err_enable:
|
||||
return ret;
|
||||
}
|
||||
|
||||
static int __devexit picoxcell_trng_remove(struct platform_device *pdev)
|
||||
static int picoxcell_trng_remove(struct platform_device *pdev)
|
||||
{
|
||||
hwrng_unregister(&picoxcell_trng);
|
||||
clk_disable(rng_clk);
|
||||
|
@ -111,7 +111,7 @@ static int __devinit ppc4xx_rng_probe(struct platform_device *dev)
|
||||
return err;
|
||||
}
|
||||
|
||||
static int __devexit ppc4xx_rng_remove(struct platform_device *dev)
|
||||
static int ppc4xx_rng_remove(struct platform_device *dev)
|
||||
{
|
||||
void __iomem *rng_regs = (void __iomem *) ppc4xx_rng.priv;
|
||||
|
||||
|
@ -130,7 +130,7 @@ failed:
|
||||
return ret;
|
||||
}
|
||||
|
||||
static int __devexit timeriomem_rng_remove(struct platform_device *pdev)
|
||||
static int timeriomem_rng_remove(struct platform_device *pdev)
|
||||
{
|
||||
del_timer_sync(&timeriomem_rng_timer);
|
||||
hwrng_unregister(&timeriomem_rng_ops);
|
||||
|
@ -119,7 +119,7 @@ static int virtrng_probe(struct virtio_device *vdev)
|
||||
return probe_common(vdev);
|
||||
}
|
||||
|
||||
static void __devexit virtrng_remove(struct virtio_device *vdev)
|
||||
static void virtrng_remove(struct virtio_device *vdev)
|
||||
{
|
||||
remove_common(vdev);
|
||||
}
|
||||
|
@ -2228,7 +2228,7 @@ err_free:
|
||||
return -EINVAL;
|
||||
}
|
||||
|
||||
static void __devexit ipmi_pnp_remove(struct pnp_dev *dev)
|
||||
static void ipmi_pnp_remove(struct pnp_dev *dev)
|
||||
{
|
||||
struct smi_info *info = pnp_get_drvdata(dev);
|
||||
|
||||
@ -2529,7 +2529,7 @@ static int ipmi_pci_probe(struct pci_dev *pdev,
|
||||
return 0;
|
||||
}
|
||||
|
||||
static void __devexit ipmi_pci_remove(struct pci_dev *pdev)
|
||||
static void ipmi_pci_remove(struct pci_dev *pdev)
|
||||
{
|
||||
struct smi_info *info = pci_get_drvdata(pdev);
|
||||
cleanup_one_si(info);
|
||||
@ -2635,7 +2635,7 @@ static int ipmi_probe(struct platform_device *dev)
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int __devexit ipmi_remove(struct platform_device *dev)
|
||||
static int ipmi_remove(struct platform_device *dev)
|
||||
{
|
||||
#ifdef CONFIG_OF
|
||||
cleanup_one_si(dev_get_drvdata(&dev->dev));
|
||||
|
@ -1428,7 +1428,7 @@ static int sonypi_probe(struct platform_device *dev)
|
||||
return error;
|
||||
}
|
||||
|
||||
static int __devexit sonypi_remove(struct platform_device *dev)
|
||||
static int sonypi_remove(struct platform_device *dev)
|
||||
{
|
||||
sonypi_disable();
|
||||
|
||||
|
@ -318,7 +318,7 @@ static int tb0219_probe(struct platform_device *dev)
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int __devexit tb0219_remove(struct platform_device *dev)
|
||||
static int tb0219_remove(struct platform_device *dev)
|
||||
{
|
||||
_machine_restart = old_machine_restart;
|
||||
|
||||
|
@ -656,7 +656,7 @@ static int __devinit tpm_tis_i2c_probe(struct i2c_client *client,
|
||||
return rc;
|
||||
}
|
||||
|
||||
static int __devexit tpm_tis_i2c_remove(struct i2c_client *client)
|
||||
static int tpm_tis_i2c_remove(struct i2c_client *client)
|
||||
{
|
||||
struct tpm_chip *chip = tpm_dev.chip;
|
||||
release_locality(chip, chip->vendor.locality, 1);
|
||||
|
@ -267,7 +267,7 @@ static int ibmvtpm_crq_send_init(struct ibmvtpm_dev *ibmvtpm)
|
||||
* Return value:
|
||||
* 0
|
||||
*/
|
||||
static int __devexit tpm_ibmvtpm_remove(struct vio_dev *vdev)
|
||||
static int tpm_ibmvtpm_remove(struct vio_dev *vdev)
|
||||
{
|
||||
struct ibmvtpm_dev *ibmvtpm = ibmvtpm_get_data(&vdev->dev);
|
||||
int rc = 0;
|
||||
|
@ -594,7 +594,7 @@ err_last:
|
||||
return rc;
|
||||
}
|
||||
|
||||
static __devexit void tpm_inf_pnp_remove(struct pnp_dev *dev)
|
||||
static void tpm_inf_pnp_remove(struct pnp_dev *dev)
|
||||
{
|
||||
struct tpm_chip *chip = pnp_get_drvdata(dev);
|
||||
|
||||
|
@ -783,7 +783,7 @@ static struct pnp_device_id tpm_pnp_tbl[] = {
|
||||
};
|
||||
MODULE_DEVICE_TABLE(pnp, tpm_pnp_tbl);
|
||||
|
||||
static __devexit void tpm_tis_pnp_remove(struct pnp_dev *dev)
|
||||
static void tpm_tis_pnp_remove(struct pnp_dev *dev)
|
||||
{
|
||||
struct tpm_chip *chip = pnp_get_drvdata(dev);
|
||||
|
||||
|
@ -717,7 +717,7 @@ static struct hwicap_driver_config fifo_icap_config = {
|
||||
.reset = fifo_icap_reset,
|
||||
};
|
||||
|
||||
static int __devexit hwicap_remove(struct device *dev)
|
||||
static int hwicap_remove(struct device *dev)
|
||||
{
|
||||
struct hwicap_drvdata *drvdata;
|
||||
|
||||
@ -822,7 +822,7 @@ static int hwicap_drv_probe(struct platform_device *pdev)
|
||||
&buffer_icap_config, regs);
|
||||
}
|
||||
|
||||
static int __devexit hwicap_drv_remove(struct platform_device *pdev)
|
||||
static int hwicap_drv_remove(struct platform_device *pdev)
|
||||
{
|
||||
return hwicap_remove(&pdev->dev);
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user