diff mbox series

fpga: xilinx-pr-decoupler: remove unused xlnx_pr_decouple_read function

Message ID 20230317230617.1673923-1-trix@redhat.com
State New
Headers
Series fpga: xilinx-pr-decoupler: remove unused xlnx_pr_decouple_read function |

Commit Message

Tom Rix March 17, 2023, 11:06 p.m. UTC 
  clang with W=1 reports
drivers/fpga/xilinx-pr-decoupler.c:37:19: error: unused function 'xlnx_pr_decouple_read' [-Werror,-Wunused-function]
static inline u32 xlnx_pr_decouple_read(const struct xlnx_pr_decoupler_data *d,
                  ^
This static function is not used, so remove it.

Signed-off-by: Tom Rix <trix@redhat.com>
---
 drivers/fpga/xilinx-pr-decoupler.c | 6 ------
 1 file changed, 6 deletions(-)

Comments

Xu Yilun March 18, 2023, 9:59 a.m. UTC | #1 
On 2023-03-17 at 19:06:17 -0400, Tom Rix wrote:
> clang with W=1 reports
> drivers/fpga/xilinx-pr-decoupler.c:37:19: error: unused function 'xlnx_pr_decouple_read' [-Werror,-Wunused-function]
> static inline u32 xlnx_pr_decouple_read(const struct xlnx_pr_decoupler_data *d,
>                   ^
> This static function is not used, so remove it.

I prefer to move the description as the first section. If you agree, I
could do it before apply.

Acked-by: Xu Yilun <yilun.xu@intel.com>

> 
> Signed-off-by: Tom Rix <trix@redhat.com>
> ---
>  drivers/fpga/xilinx-pr-decoupler.c | 6 ------
>  1 file changed, 6 deletions(-)
> 
> diff --git a/drivers/fpga/xilinx-pr-decoupler.c b/drivers/fpga/xilinx-pr-decoupler.c
> index 2d9c491f7be9..b6f18c07c752 100644
> --- a/drivers/fpga/xilinx-pr-decoupler.c
> +++ b/drivers/fpga/xilinx-pr-decoupler.c
> @@ -34,12 +34,6 @@ static inline void xlnx_pr_decoupler_write(struct xlnx_pr_decoupler_data *d,
>  	writel(val, d->io_base + offset);
>  }
>  
> -static inline u32 xlnx_pr_decouple_read(const struct xlnx_pr_decoupler_data *d,
> -					u32 offset)
> -{
> -	return readl(d->io_base + offset);
> -}
> -
>  static int xlnx_pr_decoupler_enable_set(struct fpga_bridge *bridge, bool enable)
>  {
>  	int err;
> -- 
> 2.27.0
>
Tom Rix March 18, 2023, 12:59 p.m. UTC | #2 
On 3/18/23 2:59 AM, Xu Yilun wrote:
> On 2023-03-17 at 19:06:17 -0400, Tom Rix wrote:
>> clang with W=1 reports
>> drivers/fpga/xilinx-pr-decoupler.c:37:19: error: unused function 'xlnx_pr_decouple_read' [-Werror,-Wunused-function]
>> static inline u32 xlnx_pr_decouple_read(const struct xlnx_pr_decoupler_data *d,
>>                    ^
>> This static function is not used, so remove it.
> I prefer to move the description as the first section. If you agree, I
> could do it before apply.

I have no preference, that is fine.

Tom

>
> Acked-by: Xu Yilun <yilun.xu@intel.com>
>
>> Signed-off-by: Tom Rix <trix@redhat.com>
>> ---
>>   drivers/fpga/xilinx-pr-decoupler.c | 6 ------
>>   1 file changed, 6 deletions(-)
>>
>> diff --git a/drivers/fpga/xilinx-pr-decoupler.c b/drivers/fpga/xilinx-pr-decoupler.c
>> index 2d9c491f7be9..b6f18c07c752 100644
>> --- a/drivers/fpga/xilinx-pr-decoupler.c
>> +++ b/drivers/fpga/xilinx-pr-decoupler.c
>> @@ -34,12 +34,6 @@ static inline void xlnx_pr_decoupler_write(struct xlnx_pr_decoupler_data *d,
>>   	writel(val, d->io_base + offset);
>>   }
>>   
>> -static inline u32 xlnx_pr_decouple_read(const struct xlnx_pr_decoupler_data *d,
>> -					u32 offset)
>> -{
>> -	return readl(d->io_base + offset);
>> -}
>> -
>>   static int xlnx_pr_decoupler_enable_set(struct fpga_bridge *bridge, bool enable)
>>   {
>>   	int err;
>> -- 
>> 2.27.0
>>
Xu Yilun March 20, 2023, 1:32 a.m. UTC | #3 
On 2023-03-18 at 05:59:28 -0700, Tom Rix wrote:
> 
> On 3/18/23 2:59 AM, Xu Yilun wrote:
> > On 2023-03-17 at 19:06:17 -0400, Tom Rix wrote:
> > > clang with W=1 reports
> > > drivers/fpga/xilinx-pr-decoupler.c:37:19: error: unused function 'xlnx_pr_decouple_read' [-Werror,-Wunused-function]
> > > static inline u32 xlnx_pr_decouple_read(const struct xlnx_pr_decoupler_data *d,
> > >                    ^
> > > This static function is not used, so remove it.
> > I prefer to move the description as the first section. If you agree, I
> > could do it before apply.
> 
> I have no preference, that is fine.

Applied, thanks.

> 
> Tom
> 
> > 
> > Acked-by: Xu Yilun <yilun.xu@intel.com>
> > 
> > > Signed-off-by: Tom Rix <trix@redhat.com>
> > > ---
> > >   drivers/fpga/xilinx-pr-decoupler.c | 6 ------
> > >   1 file changed, 6 deletions(-)
> > > 
> > > diff --git a/drivers/fpga/xilinx-pr-decoupler.c b/drivers/fpga/xilinx-pr-decoupler.c
> > > index 2d9c491f7be9..b6f18c07c752 100644
> > > --- a/drivers/fpga/xilinx-pr-decoupler.c
> > > +++ b/drivers/fpga/xilinx-pr-decoupler.c
> > > @@ -34,12 +34,6 @@ static inline void xlnx_pr_decoupler_write(struct xlnx_pr_decoupler_data *d,
> > >   	writel(val, d->io_base + offset);
> > >   }
> > > -static inline u32 xlnx_pr_decouple_read(const struct xlnx_pr_decoupler_data *d,
> > > -					u32 offset)
> > > -{
> > > -	return readl(d->io_base + offset);
> > > -}
> > > -
> > >   static int xlnx_pr_decoupler_enable_set(struct fpga_bridge *bridge, bool enable)
> > >   {
> > >   	int err;
> > > -- 
> > > 2.27.0
> > > 
>
Michal Simek March 20, 2023, 7:40 a.m. UTC | #4 
On 3/18/23 00:06, Tom Rix wrote:
> CAUTION: This message has originated from an External Source. Please use proper judgment and caution when opening attachments, clicking links, or responding to this email.
> 
> 
> clang with W=1 reports
> drivers/fpga/xilinx-pr-decoupler.c:37:19: error: unused function 'xlnx_pr_decouple_read' [-Werror,-Wunused-function]
> static inline u32 xlnx_pr_decouple_read(const struct xlnx_pr_decoupler_data *d,
>                    ^
> This static function is not used, so remove it.
> 
> Signed-off-by: Tom Rix <trix@redhat.com>
> ---
>   drivers/fpga/xilinx-pr-decoupler.c | 6 ------
>   1 file changed, 6 deletions(-)
> 
> diff --git a/drivers/fpga/xilinx-pr-decoupler.c b/drivers/fpga/xilinx-pr-decoupler.c
> index 2d9c491f7be9..b6f18c07c752 100644
> --- a/drivers/fpga/xilinx-pr-decoupler.c
> +++ b/drivers/fpga/xilinx-pr-decoupler.c
> @@ -34,12 +34,6 @@ static inline void xlnx_pr_decoupler_write(struct xlnx_pr_decoupler_data *d,
>          writel(val, d->io_base + offset);
>   }
> 
> -static inline u32 xlnx_pr_decouple_read(const struct xlnx_pr_decoupler_data *d,
> -                                       u32 offset)
> -{
> -       return readl(d->io_base + offset);
> -}
> -
>   static int xlnx_pr_decoupler_enable_set(struct fpga_bridge *bridge, bool enable)
>   {
>          int err;
> --
> 2.27.0
> 

It should be fixed like this instead.

Thanks,
Michal

diff --git a/drivers/fpga/xilinx-pr-decoupler.c b/drivers/fpga/xilinx-pr-decoupler.c
index 2d9c491f7be9..58508f44cd49 100644
--- a/drivers/fpga/xilinx-pr-decoupler.c
+++ b/drivers/fpga/xilinx-pr-decoupler.c
@@ -69,7 +69,7 @@ static int xlnx_pr_decoupler_enable_show(struct fpga_bridge 
*bridge)
         if (err)
                 return err;

-       status = readl(priv->io_base);
+       status = xlnx_pr_decouple_read(priv);

         clk_disable(priv->clk);
Xu Yilun March 20, 2023, 2:16 p.m. UTC | #5 
On 2023-03-20 at 08:40:22 +0100, Michal Simek wrote:
> 
> 
> On 3/18/23 00:06, Tom Rix wrote:
> > CAUTION: This message has originated from an External Source. Please use proper judgment and caution when opening attachments, clicking links, or responding to this email.
> > 
> > 
> > clang with W=1 reports
> > drivers/fpga/xilinx-pr-decoupler.c:37:19: error: unused function 'xlnx_pr_decouple_read' [-Werror,-Wunused-function]
> > static inline u32 xlnx_pr_decouple_read(const struct xlnx_pr_decoupler_data *d,
> >                    ^
> > This static function is not used, so remove it.
> > 
> > Signed-off-by: Tom Rix <trix@redhat.com>
> > ---
> >   drivers/fpga/xilinx-pr-decoupler.c | 6 ------
> >   1 file changed, 6 deletions(-)
> > 
> > diff --git a/drivers/fpga/xilinx-pr-decoupler.c b/drivers/fpga/xilinx-pr-decoupler.c
> > index 2d9c491f7be9..b6f18c07c752 100644
> > --- a/drivers/fpga/xilinx-pr-decoupler.c
> > +++ b/drivers/fpga/xilinx-pr-decoupler.c
> > @@ -34,12 +34,6 @@ static inline void xlnx_pr_decoupler_write(struct xlnx_pr_decoupler_data *d,
> >          writel(val, d->io_base + offset);
> >   }
> > 
> > -static inline u32 xlnx_pr_decouple_read(const struct xlnx_pr_decoupler_data *d,
> > -                                       u32 offset)
> > -{
> > -       return readl(d->io_base + offset);
> > -}
> > -
> >   static int xlnx_pr_decoupler_enable_set(struct fpga_bridge *bridge, bool enable)
> >   {
> >          int err;
> > --
> > 2.27.0
> > 
> 
> It should be fixed like this instead.
> 
> Thanks,
> Michal
> 
> diff --git a/drivers/fpga/xilinx-pr-decoupler.c b/drivers/fpga/xilinx-pr-decoupler.c
> index 2d9c491f7be9..58508f44cd49 100644
> --- a/drivers/fpga/xilinx-pr-decoupler.c
> +++ b/drivers/fpga/xilinx-pr-decoupler.c
> @@ -69,7 +69,7 @@ static int xlnx_pr_decoupler_enable_show(struct
> fpga_bridge *bridge)
>         if (err)
>                 return err;
> 
> -       status = readl(priv->io_base);
> +       status = xlnx_pr_decouple_read(priv);

OK, I'll drop the previous fix, and waiting for the new one.

Thanks,
Yilun

> 
>         clk_disable(priv->clk);
>
Tom Rix March 20, 2023, 4:24 p.m. UTC | #6 
On 3/20/23 7:16 AM, Xu Yilun wrote:
> On 2023-03-20 at 08:40:22 +0100, Michal Simek wrote:
>>
>> On 3/18/23 00:06, Tom Rix wrote:
>>> CAUTION: This message has originated from an External Source. Please use proper judgment and caution when opening attachments, clicking links, or responding to this email.
>>>
>>>
>>> clang with W=1 reports
>>> drivers/fpga/xilinx-pr-decoupler.c:37:19: error: unused function 'xlnx_pr_decouple_read' [-Werror,-Wunused-function]
>>> static inline u32 xlnx_pr_decouple_read(const struct xlnx_pr_decoupler_data *d,
>>>                     ^
>>> This static function is not used, so remove it.
>>>
>>> Signed-off-by: Tom Rix <trix@redhat.com>
>>> ---
>>>    drivers/fpga/xilinx-pr-decoupler.c | 6 ------
>>>    1 file changed, 6 deletions(-)
>>>
>>> diff --git a/drivers/fpga/xilinx-pr-decoupler.c b/drivers/fpga/xilinx-pr-decoupler.c
>>> index 2d9c491f7be9..b6f18c07c752 100644
>>> --- a/drivers/fpga/xilinx-pr-decoupler.c
>>> +++ b/drivers/fpga/xilinx-pr-decoupler.c
>>> @@ -34,12 +34,6 @@ static inline void xlnx_pr_decoupler_write(struct xlnx_pr_decoupler_data *d,
>>>           writel(val, d->io_base + offset);
>>>    }
>>>
>>> -static inline u32 xlnx_pr_decouple_read(const struct xlnx_pr_decoupler_data *d,
>>> -                                       u32 offset)
>>> -{
>>> -       return readl(d->io_base + offset);
>>> -}
>>> -
>>>    static int xlnx_pr_decoupler_enable_set(struct fpga_bridge *bridge, bool enable)
>>>    {
>>>           int err;
>>> --
>>> 2.27.0
>>>
>> It should be fixed like this instead.
>>
>> Thanks,
>> Michal
>>
>> diff --git a/drivers/fpga/xilinx-pr-decoupler.c b/drivers/fpga/xilinx-pr-decoupler.c
>> index 2d9c491f7be9..58508f44cd49 100644
>> --- a/drivers/fpga/xilinx-pr-decoupler.c
>> +++ b/drivers/fpga/xilinx-pr-decoupler.c
>> @@ -69,7 +69,7 @@ static int xlnx_pr_decoupler_enable_show(struct
>> fpga_bridge *bridge)
>>          if (err)
>>                  return err;
>>
>> -       status = readl(priv->io_base);
>> +       status = xlnx_pr_decouple_read(priv);
> OK, I'll drop the previous fix, and waiting for the new one.

Michal,

Will you make this change ?

Tom

>
> Thanks,
> Yilun
>
>>          clk_disable(priv->clk);
>>
Tom Rix March 20, 2023, 8:05 p.m. UTC | #7 
On 3/20/23 9:24 AM, Tom Rix wrote:
>
> On 3/20/23 7:16 AM, Xu Yilun wrote:
>> On 2023-03-20 at 08:40:22 +0100, Michal Simek wrote:
>>>
>>> On 3/18/23 00:06, Tom Rix wrote:
>>>> CAUTION: This message has originated from an External Source. 
>>>> Please use proper judgment and caution when opening attachments, 
>>>> clicking links, or responding to this email.
>>>>
>>>>
>>>> clang with W=1 reports
>>>> drivers/fpga/xilinx-pr-decoupler.c:37:19: error: unused function 
>>>> 'xlnx_pr_decouple_read' [-Werror,-Wunused-function]
>>>> static inline u32 xlnx_pr_decouple_read(const struct 
>>>> xlnx_pr_decoupler_data *d,
>>>>                     ^
>>>> This static function is not used, so remove it.
>>>>
>>>> Signed-off-by: Tom Rix <trix@redhat.com>
>>>> ---
>>>>    drivers/fpga/xilinx-pr-decoupler.c | 6 ------
>>>>    1 file changed, 6 deletions(-)
>>>>
>>>> diff --git a/drivers/fpga/xilinx-pr-decoupler.c 
>>>> b/drivers/fpga/xilinx-pr-decoupler.c
>>>> index 2d9c491f7be9..b6f18c07c752 100644
>>>> --- a/drivers/fpga/xilinx-pr-decoupler.c
>>>> +++ b/drivers/fpga/xilinx-pr-decoupler.c
>>>> @@ -34,12 +34,6 @@ static inline void 
>>>> xlnx_pr_decoupler_write(struct xlnx_pr_decoupler_data *d,
>>>>           writel(val, d->io_base + offset);
>>>>    }
>>>>
>>>> -static inline u32 xlnx_pr_decouple_read(const struct 
>>>> xlnx_pr_decoupler_data *d,
>>>> -                                       u32 offset)
>>>> -{
>>>> -       return readl(d->io_base + offset);
>>>> -}
>>>> -
>>>>    static int xlnx_pr_decoupler_enable_set(struct fpga_bridge 
>>>> *bridge, bool enable)
>>>>    {
>>>>           int err;
>>>> -- 
>>>> 2.27.0
>>>>
>>> It should be fixed like this instead.
>>>
>>> Thanks,
>>> Michal
>>>
>>> diff --git a/drivers/fpga/xilinx-pr-decoupler.c 
>>> b/drivers/fpga/xilinx-pr-decoupler.c
>>> index 2d9c491f7be9..58508f44cd49 100644
>>> --- a/drivers/fpga/xilinx-pr-decoupler.c
>>> +++ b/drivers/fpga/xilinx-pr-decoupler.c
>>> @@ -69,7 +69,7 @@ static int xlnx_pr_decoupler_enable_show(struct
>>> fpga_bridge *bridge)
>>>          if (err)
>>>                  return err;
>>>
>>> -       status = readl(priv->io_base);
>>> +       status = xlnx_pr_decouple_read(priv);
>> OK, I'll drop the previous fix, and waiting for the new one.
>
> Michal,
>
> Will you make this change ?

Let me provide some context.

I am cleaning up about 70 similar unused functions all over the tree.

I have removed a lot of one liner wrappers that look like this.

My opinion, to be useful the wrapper needs to be used multiple places 
and/or do something non trival otherwise we will bloat the codebase with 
with 5x lines of code to do a simple readl.

But this is subjection. If you want this change, you should make it.

Tom

>
> Tom
>
>>
>> Thanks,
>> Yilun
>>
>>>          clk_disable(priv->clk);
>>>
Michal Simek March 21, 2023, 3:35 p.m. UTC | #8 
On 3/20/23 21:05, Tom Rix wrote:
> 
> On 3/20/23 9:24 AM, Tom Rix wrote:
>>
>> On 3/20/23 7:16 AM, Xu Yilun wrote:
>>> On 2023-03-20 at 08:40:22 +0100, Michal Simek wrote:
>>>>
>>>> On 3/18/23 00:06, Tom Rix wrote:
>>>>> CAUTION: This message has originated from an External Source. Please use 
>>>>> proper judgment and caution when opening attachments, clicking links, or 
>>>>> responding to this email.
>>>>>
>>>>>
>>>>> clang with W=1 reports
>>>>> drivers/fpga/xilinx-pr-decoupler.c:37:19: error: unused function 
>>>>> 'xlnx_pr_decouple_read' [-Werror,-Wunused-function]
>>>>> static inline u32 xlnx_pr_decouple_read(const struct xlnx_pr_decoupler_data 
>>>>> *d,
>>>>>                     ^
>>>>> This static function is not used, so remove it.
>>>>>
>>>>> Signed-off-by: Tom Rix <trix@redhat.com>
>>>>> ---
>>>>>    drivers/fpga/xilinx-pr-decoupler.c | 6 ------
>>>>>    1 file changed, 6 deletions(-)
>>>>>
>>>>> diff --git a/drivers/fpga/xilinx-pr-decoupler.c 
>>>>> b/drivers/fpga/xilinx-pr-decoupler.c
>>>>> index 2d9c491f7be9..b6f18c07c752 100644
>>>>> --- a/drivers/fpga/xilinx-pr-decoupler.c
>>>>> +++ b/drivers/fpga/xilinx-pr-decoupler.c
>>>>> @@ -34,12 +34,6 @@ static inline void xlnx_pr_decoupler_write(struct 
>>>>> xlnx_pr_decoupler_data *d,
>>>>>           writel(val, d->io_base + offset);
>>>>>    }
>>>>>
>>>>> -static inline u32 xlnx_pr_decouple_read(const struct 
>>>>> xlnx_pr_decoupler_data *d,
>>>>> -                                       u32 offset)
>>>>> -{
>>>>> -       return readl(d->io_base + offset);
>>>>> -}
>>>>> -
>>>>>    static int xlnx_pr_decoupler_enable_set(struct fpga_bridge *bridge, bool 
>>>>> enable)
>>>>>    {
>>>>>           int err;
>>>>> -- 
>>>>> 2.27.0
>>>>>
>>>> It should be fixed like this instead.
>>>>
>>>> Thanks,
>>>> Michal
>>>>
>>>> diff --git a/drivers/fpga/xilinx-pr-decoupler.c 
>>>> b/drivers/fpga/xilinx-pr-decoupler.c
>>>> index 2d9c491f7be9..58508f44cd49 100644
>>>> --- a/drivers/fpga/xilinx-pr-decoupler.c
>>>> +++ b/drivers/fpga/xilinx-pr-decoupler.c
>>>> @@ -69,7 +69,7 @@ static int xlnx_pr_decoupler_enable_show(struct
>>>> fpga_bridge *bridge)
>>>>          if (err)
>>>>                  return err;
>>>>
>>>> -       status = readl(priv->io_base);
>>>> +       status = xlnx_pr_decouple_read(priv);
>>> OK, I'll drop the previous fix, and waiting for the new one.
>>
>> Michal,
>>
>> Will you make this change ?
> 
> Let me provide some context.
> 
> I am cleaning up about 70 similar unused functions all over the tree.
> 
> I have removed a lot of one liner wrappers that look like this.
> 
> My opinion, to be useful the wrapper needs to be used multiple places and/or do 
> something non trival otherwise we will bloat the codebase with with 5x lines of 
> code to do a simple readl.
> 
> But this is subjection. If you want this change, you should make it.

I understand your position. From my perspective when drivers use these wrappers 
around io functions they are pretty much prepared to be easily extended for 
other access method. And also it helps with debugging.

I sent the patch here.
https://lore.kernel.org/r/0381e4e8061c2fee182a104768e84feff3a82d25.1679412800.git.michal.simek@amd.com

Thanks,
Michal
diff mbox series

Patch

diff --git a/drivers/fpga/xilinx-pr-decoupler.c b/drivers/fpga/xilinx-pr-decoupler.c
index 2d9c491f7be9..b6f18c07c752 100644
--- a/drivers/fpga/xilinx-pr-decoupler.c
+++ b/drivers/fpga/xilinx-pr-decoupler.c
@@ -34,12 +34,6 @@  static inline void xlnx_pr_decoupler_write(struct xlnx_pr_decoupler_data *d,
 	writel(val, d->io_base + offset);
 }
 
-static inline u32 xlnx_pr_decouple_read(const struct xlnx_pr_decoupler_data *d,
-					u32 offset)
-{
-	return readl(d->io_base + offset);
-}
-
 static int xlnx_pr_decoupler_enable_set(struct fpga_bridge *bridge, bool enable)
 {
 	int err;