[PATCH 09/14] drm/mgag200: Prefix global names in mgag200_drv.c with mgag200_

Thomas Zimmermann tzimmermann at suse.de
Mon Jun 8 13:06:35 UTC 2020


Hi

Am 05.06.20 um 16:42 schrieb Sam Ravnborg:
> On Fri, Jun 05, 2020 at 03:57:58PM +0200, Thomas Zimmermann wrote:
>> The naming of global symbols in mgag200_drv.c is inconsistent. Fix
>> that by prefixing all names with mgag200_.
> 
> Hmm, static symbols are hardly global symbols.
> Patch is fine, but changelog seems a litte off.

OK, I'll try to clarify this.

Best regards
Thomas

> 
> 	Sam
> 
>>
>> Signed-off-by: Thomas Zimmermann <tzimmermann at suse.de>
>> ---
>>  drivers/gpu/drm/mgag200/mgag200_drv.c | 20 ++++++++++----------
>>  1 file changed, 10 insertions(+), 10 deletions(-)
>>
>> diff --git a/drivers/gpu/drm/mgag200/mgag200_drv.c b/drivers/gpu/drm/mgag200/mgag200_drv.c
>> index 670e12d57dea8..ad74e02d8f251 100644
>> --- a/drivers/gpu/drm/mgag200/mgag200_drv.c
>> +++ b/drivers/gpu/drm/mgag200/mgag200_drv.c
>> @@ -27,7 +27,7 @@ module_param_named(modeset, mgag200_modeset, int, 0400);
>>  
>>  DEFINE_DRM_GEM_FOPS(mgag200_driver_fops);
>>  
>> -static struct drm_driver driver = {
>> +static struct drm_driver mgag200_driver = {
>>  	.driver_features = DRIVER_ATOMIC | DRIVER_GEM | DRIVER_MODESET,
>>  	.fops = &mgag200_driver_fops,
>>  	.name = DRIVER_NAME,
>> @@ -43,7 +43,7 @@ static struct drm_driver driver = {
>>   * PCI driver
>>   */
>>  
>> -static const struct pci_device_id pciidlist[] = {
>> +static const struct pci_device_id mgag200_pciidlist[] = {
>>  	{ PCI_VENDOR_ID_MATROX, 0x522, PCI_ANY_ID, PCI_ANY_ID, 0, 0,
>>  		G200_SE_A | MGAG200_FLAG_HW_BUG_NO_STARTADD},
>>  	{ PCI_VENDOR_ID_MATROX, 0x524, PCI_ANY_ID, PCI_ANY_ID, 0, 0, G200_SE_B },
>> @@ -56,10 +56,10 @@ static const struct pci_device_id pciidlist[] = {
>>  	{0,}
>>  };
>>  
>> -MODULE_DEVICE_TABLE(pci, pciidlist);
>> +MODULE_DEVICE_TABLE(pci, mgag200_pciidlist);
>>  
>> -
>> -static int mga_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
>> +static int
>> +mgag200_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
>>  {
>>  	struct drm_device *dev;
>>  	int ret;
>> @@ -70,7 +70,7 @@ static int mga_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
>>  	if (ret)
>>  		return ret;
>>  
>> -	dev = drm_dev_alloc(&driver, &pdev->dev);
>> +	dev = drm_dev_alloc(&mgag200_driver, &pdev->dev);
>>  	if (IS_ERR(dev))
>>  		return PTR_ERR(dev);
>>  
>> @@ -96,7 +96,7 @@ static int mga_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
>>  	return ret;
>>  }
>>  
>> -static void mga_pci_remove(struct pci_dev *pdev)
>> +static void mgag200_pci_remove(struct pci_dev *pdev)
>>  {
>>  	struct drm_device *dev = pci_get_drvdata(pdev);
>>  
>> @@ -107,9 +107,9 @@ static void mga_pci_remove(struct pci_dev *pdev)
>>  
>>  static struct pci_driver mgag200_pci_driver = {
>>  	.name = DRIVER_NAME,
>> -	.id_table = pciidlist,
>> -	.probe = mga_pci_probe,
>> -	.remove = mga_pci_remove,
>> +	.id_table = mgag200_pciidlist,
>> +	.probe = mgag200_pci_probe,
>> +	.remove = mgag200_pci_remove,
>>  };
>>  
>>  static int __init mgag200_init(void)
>> -- 
>> 2.26.2

-- 
Thomas Zimmermann
Graphics Driver Developer
SUSE Software Solutions Germany GmbH
Maxfeldstr. 5, 90409 Nürnberg, Germany
(HRB 36809, AG Nürnberg)
Geschäftsführer: Felix Imendörffer

-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 488 bytes
Desc: OpenPGP digital signature
URL: <https://lists.freedesktop.org/archives/dri-devel/attachments/20200608/8fd1618f/attachment.sig>


More information about the dri-devel mailing list