diff mbox series

[RESEND,net] net: phy: aquantia: add missing include guards

Message ID 20240627105846.22951-1-brgl@bgdev.pl (mailing list archive)
State Superseded
Delegated to: Netdev Maintainers
Headers show
Series [RESEND,net] net: phy: aquantia: add missing include guards | expand

Checks

Context Check Description
netdev/tree_selection success Clearly marked for net
netdev/apply fail Patch does not apply to net-0

Commit Message

Bartosz Golaszewski June 27, 2024, 10:58 a.m. UTC 
From: Bartosz Golaszewski <bartosz.golaszewski@linaro.org>

The header is missing the include guards so add them.

Reviewed-by: Andrew Lunn <andrew@lunn.ch>
Fixes: fb470f70fea7 ("net: phy: aquantia: add hwmon support")
Signed-off-by: Bartosz Golaszewski <bartosz.golaszewski@linaro.org>
---
Added the Fixes: tag and resending separately as a backportable fix.

 drivers/net/phy/aquantia/aquantia.h | 5 +++++
 1 file changed, 5 insertions(+)

Comments

Jakub Kicinski June 27, 2024, 9:59 p.m. UTC | #1 
On Thu, 27 Jun 2024 12:58:45 +0200 Bartosz Golaszewski wrote:
> From: Bartosz Golaszewski <bartosz.golaszewski@linaro.org>
> 
> The header is missing the include guards so add them.
> 
> Reviewed-by: Andrew Lunn <andrew@lunn.ch>
> Fixes: fb470f70fea7 ("net: phy: aquantia: add hwmon support")
> Signed-off-by: Bartosz Golaszewski <bartosz.golaszewski@linaro.org>

You say net but it doesn't apply:

Applying: net: phy: aquantia: add missing include guards
error: patch failed: drivers/net/phy/aquantia/aquantia.h:198
error: drivers/net/phy/aquantia/aquantia.h: patch does not apply
Patch failed at 0001 net: phy: aquantia: add missing include guards
Bartosz Golaszewski June 28, 2024, 7:56 a.m. UTC | #2 
On Thu, Jun 27, 2024 at 11:59 PM Jakub Kicinski <kuba@kernel.org> wrote:
>
> On Thu, 27 Jun 2024 12:58:45 +0200 Bartosz Golaszewski wrote:
> > From: Bartosz Golaszewski <bartosz.golaszewski@linaro.org>
> >
> > The header is missing the include guards so add them.
> >
> > Reviewed-by: Andrew Lunn <andrew@lunn.ch>
> > Fixes: fb470f70fea7 ("net: phy: aquantia: add hwmon support")
> > Signed-off-by: Bartosz Golaszewski <bartosz.golaszewski@linaro.org>
>
> You say net but it doesn't apply:
>
> Applying: net: phy: aquantia: add missing include guards
> error: patch failed: drivers/net/phy/aquantia/aquantia.h:198
> error: drivers/net/phy/aquantia/aquantia.h: patch does not apply
> Patch failed at 0001 net: phy: aquantia: add missing include guards
> --
> pw-bot: cr

I resent a rebased version. However I noticed I forgot the 'net'
prefix as I split it out of the previous series. Sorry, I hope it can
still be applied without resending again.

Bart
Jakub Kicinski June 28, 2024, 11:59 p.m. UTC | #3 
On Fri, 28 Jun 2024 09:56:31 +0200 Bartosz Golaszewski wrote:
> > You say net but it doesn't apply:
> >
> > Applying: net: phy: aquantia: add missing include guards
> > error: patch failed: drivers/net/phy/aquantia/aquantia.h:198
> > error: drivers/net/phy/aquantia/aquantia.h: patch does not apply
> > Patch failed at 0001 net: phy: aquantia: add missing include guards
> > --
> > pw-bot: cr  
> 
> I resent a rebased version. However I noticed I forgot the 'net'
> prefix as I split it out of the previous series. Sorry, I hope it can
> still be applied without resending again.

The bot wasn't clever enough, sorry :( Third time is the charm..
diff mbox series

Patch

diff --git a/drivers/net/phy/aquantia/aquantia.h b/drivers/net/phy/aquantia/aquantia.h
index c0e1fd9d7152..b8502793962e 100644
--- a/drivers/net/phy/aquantia/aquantia.h
+++ b/drivers/net/phy/aquantia/aquantia.h
@@ -6,6 +6,9 @@ 
  * Author: Heiner Kallweit <hkallweit1@gmail.com>
  */
 
+#ifndef AQUANTIA_H
+#define AQUANTIA_H
+
 #include <linux/device.h>
 #include <linux/phy.h>
 
@@ -198,3 +201,5 @@  int aqr_phy_led_hw_control_set(struct phy_device *phydev, u8 index,
 int aqr_phy_led_active_low_set(struct phy_device *phydev, int index, bool enable);
 int aqr_phy_led_polarity_set(struct phy_device *phydev, int index,
 			     unsigned long modes);
+
+#endif /* AQUANTIA_H */