Re: [PATCH v1 1/3] pvpanic: Keep single style across modules

[Mihai Carabas]

La 29.08.2021 15:43, Andy Shevchenko a scris:
> We have different style on where we place module_*() and MODULE_*() macros.
> Inherit the style from the original module (now pvpanic-mmio.c).
>
> Signed-off-by: Andy Shevchenko <andriy.shevchenko@xxxxxxxxxxxxxxx>
Reviewed-by: Mihai Carabas <mihai.carabas@xxxxxxxxxx
> ---
>   drivers/misc/pvpanic/pvpanic-pci.c | 14 ++++++--------
>   drivers/misc/pvpanic/pvpanic.c     |  3 +--
>   2 files changed, 7 insertions(+), 10 deletions(-)
>
> diff --git a/drivers/misc/pvpanic/pvpanic-pci.c b/drivers/misc/pvpanic/pvpanic-pci.c
> index 741116b3d995..7d1220f4c95b 100644
> --- a/drivers/misc/pvpanic/pvpanic-pci.c
> +++ b/drivers/misc/pvpanic/pvpanic-pci.c
> @@ -22,11 +22,6 @@ MODULE_AUTHOR("Mihai Carabas <mihai.carabas@xxxxxxxxxx>");
>   MODULE_DESCRIPTION("pvpanic device driver ");
>   MODULE_LICENSE("GPL");
>   
> -static const struct pci_device_id pvpanic_pci_id_tbl[]  = {
> -	{ PCI_DEVICE(PCI_VENDOR_ID_REDHAT, PCI_DEVICE_ID_REDHAT_PVPANIC)},
> -	{}
> -};
> -
>   static ssize_t capability_show(struct device *dev,
>   			       struct device_attribute *attr, char *buf)
>   {
> @@ -99,6 +94,12 @@ static int pvpanic_pci_probe(struct pci_dev *pdev,
>   	return devm_pvpanic_probe(&pdev->dev, pi);
>   }
>   
> +static const struct pci_device_id pvpanic_pci_id_tbl[]  = {
> +	{ PCI_DEVICE(PCI_VENDOR_ID_REDHAT, PCI_DEVICE_ID_REDHAT_PVPANIC)},
> +	{}
> +};
> +MODULE_DEVICE_TABLE(pci, pvpanic_pci_id_tbl);
> +
>   static struct pci_driver pvpanic_pci_driver = {
>   	.name =         "pvpanic-pci",
>   	.id_table =     pvpanic_pci_id_tbl,
> @@ -107,7 +108,4 @@ static struct pci_driver pvpanic_pci_driver = {
>   		.dev_groups = pvpanic_pci_dev_groups,
>   	},
>   };
> -
> -MODULE_DEVICE_TABLE(pci, pvpanic_pci_id_tbl);
> -
>   module_pci_driver(pvpanic_pci_driver);
> diff --git a/drivers/misc/pvpanic/pvpanic.c b/drivers/misc/pvpanic/pvpanic.c
> index 02b807c788c9..fb5411dfd614 100644
> --- a/drivers/misc/pvpanic/pvpanic.c
> +++ b/drivers/misc/pvpanic/pvpanic.c
> @@ -99,6 +99,7 @@ static int pvpanic_init(void)
>   
>   	return 0;
>   }
> +module_init(pvpanic_init);
>   
>   static void pvpanic_exit(void)
>   {
> @@ -106,6 +107,4 @@ static void pvpanic_exit(void)
>   					 &pvpanic_panic_nb);
>   
>   }
> -
> -module_init(pvpanic_init);
>   module_exit(pvpanic_exit);