[PATCH 09/10] net/farady: Match driver according to compatible property

Joel Stanley joel at jms.id.au
Fri Jul 1 00:06:02 AEST 2016


On Thu, Jun 30, 2016 at 7:57 PM, Gavin Shan <gwshan at linux.vnet.ibm.com> wrote:
> This matches the driver with devices compatible with "faraday,ftgmac100"
> declared in the device tree. Originally, device's name from device
> tree for it.
>
> Signed-off-by: Gavin Shan <gwshan at linux.vnet.ibm.com>
> ---
>  drivers/net/ethernet/faraday/ftgmac100.c | 16 +++++++++++-----
>  1 file changed, 11 insertions(+), 5 deletions(-)
>
> diff --git a/drivers/net/ethernet/faraday/ftgmac100.c b/drivers/net/ethernet/faraday/ftgmac100.c
> index f2205ae..23e27f1 100644
> --- a/drivers/net/ethernet/faraday/ftgmac100.c
> +++ b/drivers/net/ethernet/faraday/ftgmac100.c
> @@ -1422,14 +1422,20 @@ static int __exit ftgmac100_remove(struct platform_device *pdev)
>         return 0;
>  }
>
> +static const struct of_device_id ftgmac100_of_match[] = {
> +       { .compatible = "faraday,ftgmac100" },
> +       { }
> +};
> +MODULE_DEVICE_TABLE(of, ftgmac100_of_match);
> +
>  static struct platform_driver ftgmac100_driver = {
> -       .probe          = ftgmac100_probe,
> -       .remove         = __exit_p(ftgmac100_remove),
> -       .driver         = {
> -               .name   = DRV_NAME,
> +       .probe  = ftgmac100_probe,
> +       .remove = ftgmac100_remove,

You dropped the __exit_p annotation that was here.

> +       .driver = {
> +               .name           = DRV_NAME,
> +               .of_match_table = ftgmac100_of_match,
>         },
>  };
> -
>  module_platform_driver(ftgmac100_driver);
>
>  MODULE_AUTHOR("Po-Yu Chuang <ratbert at faraday-tech.com>");
> --
> 2.1.0
>


More information about the openbmc mailing list