Menu
▾
▴
Re: [tpmdd-devel] [PATCH 327/493] char: remove use of __devinitdata
|
From: Kent Y. <ke...@li...> - 2012-11-26 20:33:50
|
On Mon, Nov 19, 2012 at 01:24:36PM -0500, Bill Pemberton wrote:
> CONFIG_HOTPLUG is going away as an option so __devinitdata is no
> longer needed.
>
> Signed-off-by: Bill Pemberton <wf...@vi...>
> Cc: David Airlie <ai...@li...>
> Cc: Kent Yoder <ke...@li...>
> Cc: Rajiv Andrade <ma...@sr...>
> Cc: Marcel Selhorst <tp...@se...>
> Cc: Sirrix AG <tp...@si...>
> Cc: ope...@li...
> Cc: tpm...@li...
Acked-by: Kent Yoder <ke...@li...>
> ---
> drivers/char/agp/ali-agp.c | 2 +-
> drivers/char/agp/amd-k7-agp.c | 2 +-
> drivers/char/agp/ati-agp.c | 2 +-
> drivers/char/agp/sis-agp.c | 6 +++---
> drivers/char/agp/uninorth-agp.c | 2 +-
> drivers/char/agp/via-agp.c | 2 +-
> drivers/char/hw_random/n2-drv.c | 2 +-
> drivers/char/ipmi/ipmi_si_intf.c | 2 +-
> drivers/char/tpm/tpm_ibmvtpm.c | 2 +-
> drivers/char/tpm/tpm_tis.c | 2 +-
> 10 files changed, 12 insertions(+), 12 deletions(-)
>
> diff --git a/drivers/char/agp/ali-agp.c b/drivers/char/agp/ali-agp.c
> index 77e45f9..9eb629b 100644
> --- a/drivers/char/agp/ali-agp.c
> +++ b/drivers/char/agp/ali-agp.c
> @@ -249,7 +249,7 @@ static const struct agp_bridge_driver ali_m1541_bridge = {
> };
>
>
> -static struct agp_device_ids ali_agp_device_ids[] __devinitdata =
> +static struct agp_device_ids ali_agp_device_ids[] =
> {
> {
> .device_id = PCI_DEVICE_ID_AL_M1541,
> diff --git a/drivers/char/agp/amd-k7-agp.c b/drivers/char/agp/amd-k7-agp.c
> index 3a60ec1..2e1efa9 100644
> --- a/drivers/char/agp/amd-k7-agp.c
> +++ b/drivers/char/agp/amd-k7-agp.c
> @@ -388,7 +388,7 @@ static const struct agp_bridge_driver amd_irongate_driver = {
> .agp_type_to_mask_type = agp_generic_type_to_mask_type,
> };
>
> -static struct agp_device_ids amd_agp_device_ids[] __devinitdata =
> +static struct agp_device_ids amd_agp_device_ids[] =
> {
> {
> .device_id = PCI_DEVICE_ID_AMD_FE_GATE_7006,
> diff --git a/drivers/char/agp/ati-agp.c b/drivers/char/agp/ati-agp.c
> index d95851d..6aeb624 100644
> --- a/drivers/char/agp/ati-agp.c
> +++ b/drivers/char/agp/ati-agp.c
> @@ -445,7 +445,7 @@ static const struct agp_bridge_driver ati_generic_bridge = {
> };
>
>
> -static struct agp_device_ids ati_agp_device_ids[] __devinitdata =
> +static struct agp_device_ids ati_agp_device_ids[] =
> {
> {
> .device_id = PCI_DEVICE_ID_ATI_RS100,
> diff --git a/drivers/char/agp/sis-agp.c b/drivers/char/agp/sis-agp.c
> index 2f17d04..7d6f3c6 100644
> --- a/drivers/char/agp/sis-agp.c
> +++ b/drivers/char/agp/sis-agp.c
> @@ -17,8 +17,8 @@
> #define PCI_DEVICE_ID_SI_662 0x0662
> #define PCI_DEVICE_ID_SI_671 0x0671
>
> -static bool __devinitdata agp_sis_force_delay = 0;
> -static int __devinitdata agp_sis_agp_spec = -1;
> +static bool agp_sis_force_delay = 0;
> +static int agp_sis_agp_spec = -1;
>
> static int sis_fetch_size(void)
> {
> @@ -148,7 +148,7 @@ static struct agp_bridge_driver sis_driver = {
> };
>
> // chipsets that require the 'delay hack'
> -static int sis_broken_chipsets[] __devinitdata = {
> +static int sis_broken_chipsets[] = {
> PCI_DEVICE_ID_SI_648,
> PCI_DEVICE_ID_SI_746,
> 0 // terminator
> diff --git a/drivers/char/agp/uninorth-agp.c b/drivers/char/agp/uninorth-agp.c
> index 29eeba1..d7168ca 100644
> --- a/drivers/char/agp/uninorth-agp.c
> +++ b/drivers/char/agp/uninorth-agp.c
> @@ -557,7 +557,7 @@ const struct agp_bridge_driver u3_agp_driver = {
> .needs_scratch_page = true,
> };
>
> -static struct agp_device_ids uninorth_agp_device_ids[] __devinitdata = {
> +static struct agp_device_ids uninorth_agp_device_ids[] = {
> {
> .device_id = PCI_DEVICE_ID_APPLE_UNI_N_AGP,
> .chipset_name = "UniNorth",
> diff --git a/drivers/char/agp/via-agp.c b/drivers/char/agp/via-agp.c
> index 6ae5e50..774fe1e 100644
> --- a/drivers/char/agp/via-agp.c
> +++ b/drivers/char/agp/via-agp.c
> @@ -224,7 +224,7 @@ static const struct agp_bridge_driver via_driver = {
> .agp_type_to_mask_type = agp_generic_type_to_mask_type,
> };
>
> -static struct agp_device_ids via_agp_device_ids[] __devinitdata =
> +static struct agp_device_ids via_agp_device_ids[] =
> {
> {
> .device_id = PCI_DEVICE_ID_VIA_82C597_0,
> diff --git a/drivers/char/hw_random/n2-drv.c b/drivers/char/hw_random/n2-drv.c
> index 432235b..5819c7b 100644
> --- a/drivers/char/hw_random/n2-drv.c
> +++ b/drivers/char/hw_random/n2-drv.c
> @@ -25,7 +25,7 @@
> #define DRV_MODULE_VERSION "0.2"
> #define DRV_MODULE_RELDATE "July 27, 2011"
>
> -static char version[] __devinitdata =
> +static char version[] =
> DRV_MODULE_NAME ".c:v" DRV_MODULE_VERSION " (" DRV_MODULE_RELDATE ")\n";
>
> MODULE_AUTHOR("David S. Miller (da...@da...)");
> diff --git a/drivers/char/ipmi/ipmi_si_intf.c b/drivers/char/ipmi/ipmi_si_intf.c
> index 29b6bad..94c5b88 100644
> --- a/drivers/char/ipmi/ipmi_si_intf.c
> +++ b/drivers/char/ipmi/ipmi_si_intf.c
> @@ -3047,7 +3047,7 @@ static inline void wait_for_timer_and_thread(struct smi_info *smi_info)
> }
> }
>
> -static __devinitdata struct ipmi_default_vals
> +static struct ipmi_default_vals
> {
> int type;
> int port;
> diff --git a/drivers/char/tpm/tpm_ibmvtpm.c b/drivers/char/tpm/tpm_ibmvtpm.c
> index 5f1a0b5..a027bd8 100644
> --- a/drivers/char/tpm/tpm_ibmvtpm.c
> +++ b/drivers/char/tpm/tpm_ibmvtpm.c
> @@ -32,7 +32,7 @@
>
> static const char tpm_ibmvtpm_driver_name[] = "tpm_ibmvtpm";
>
> -static struct vio_device_id tpm_ibmvtpm_device_table[] __devinitdata = {
> +static struct vio_device_id tpm_ibmvtpm_device_table[] = {
> { "IBM,vtpm", "IBM,vtpm"},
> { "", "" }
> };
> diff --git a/drivers/char/tpm/tpm_tis.c b/drivers/char/tpm/tpm_tis.c
> index 253161c..419a7e0 100644
> --- a/drivers/char/tpm/tpm_tis.c
> +++ b/drivers/char/tpm/tpm_tis.c
> @@ -769,7 +769,7 @@ static int tpm_tis_pnp_resume(struct pnp_dev *dev)
> return ret;
> }
>
> -static struct pnp_device_id tpm_pnp_tbl[] __devinitdata = {
> +static struct pnp_device_id tpm_pnp_tbl[] = {
> {"PNP0C31", 0}, /* TPM */
> {"ATM1200", 0}, /* Atmel */
> {"IFX0102", 0}, /* Infineon */
> --
> 1.8.0
>
|