[PATCH v2 2/4] phy: phy-can-transceiver: Move OF ID table closer to their user

[Vinod Koul]

On 17-03-26, 21:27, Andy Shevchenko wrote:
> There is no code that uses ID table directly, except the
> struct device_driver at the end of the file. Hence, move
> table closer to its user. It's always possible to access
> them via a pointer.
> 
> Signed-off-by: Andy Shevchenko <andriy.shevchenko at linux.intel.com>
> ---
>  drivers/phy/phy-can-transceiver.c | 59 +++++++++++++++----------------
>  1 file changed, 29 insertions(+), 30 deletions(-)
> 
> diff --git a/drivers/phy/phy-can-transceiver.c b/drivers/phy/phy-can-transceiver.c
> index 80eece74f77d..aaed8d08fcf0 100644
> --- a/drivers/phy/phy-can-transceiver.c
> +++ b/drivers/phy/phy-can-transceiver.c
> @@ -97,35 +97,6 @@ static const struct can_transceiver_data tja1057_drvdata = {
>  	.flags = CAN_TRANSCEIVER_SILENT_PRESENT,
>  };
>  
> -static const struct of_device_id can_transceiver_phy_ids[] = {
> -	{
> -		.compatible = "ti,tcan1042",
> -		.data = &tcan1042_drvdata
> -	},
> -	{
> -		.compatible = "ti,tcan1043",
> -		.data = &tcan1043_drvdata
> -	},
> -	{
> -		.compatible = "nxp,tja1048",
> -		.data = &tja1048_drvdata
> -	},
> -	{
> -		.compatible = "nxp,tja1051",
> -		.data = &tja1051_drvdata
> -	},
> -	{
> -		.compatible = "nxp,tja1057",
> -		.data = &tja1057_drvdata
> -	},
> -	{
> -		.compatible = "nxp,tjr1443",
> -		.data = &tcan1043_drvdata
> -	},
> -	{ }
> -};
> -MODULE_DEVICE_TABLE(of, can_transceiver_phy_ids);
> -
>  static struct phy *can_transceiver_phy_xlate(struct device *dev,
>  					     const struct of_phandle_args *args)
>  {
> @@ -229,6 +200,35 @@ static int can_transceiver_phy_probe(struct platform_device *pdev)
>  	return PTR_ERR_OR_ZERO(phy_provider);
>  }
>  
> +static const struct of_device_id can_transceiver_phy_ids[] = {
> +	{
> +		.compatible = "ti,tcan1042",
> +		.data = &tcan1042_drvdata
> +	},
> +	{
> +		.compatible = "ti,tcan1043",
> +		.data = &tcan1043_drvdata
> +	},
> +	{
> +		.compatible = "nxp,tja1048",
> +		.data = &tja1048_drvdata
> +	},
> +	{
> +		.compatible = "nxp,tja1051",
> +		.data = &tja1051_drvdata
> +	},
> +	{
> +		.compatible = "nxp,tja1057",
> +		.data = &tja1057_drvdata
> +	},
> +	{
> +		.compatible = "nxp,tjr1443",
> +		.data = &tcan1043_drvdata
> +	},
> +	{ }
> +};
> +MODULE_DEVICE_TABLE(of, can_transceiver_phy_ids);
> +
>  static struct platform_driver can_transceiver_phy_driver = {
>  	.probe = can_transceiver_phy_probe,
>  	.driver = {
> @@ -236,7 +236,6 @@ static struct platform_driver can_transceiver_phy_driver = {
>  		.of_match_table = can_transceiver_phy_ids,
>  	},
>  };
> -

This looks like a stray delete?

>  module_platform_driver(can_transceiver_phy_driver);
>  
>  MODULE_AUTHOR("Faiz Abbas <faiz_abbas at ti.com>");
> -- 
> 2.50.1

-- 
~Vinod