Commit 2fbafb82 authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'static-inlines' 



Jakub Kicinski says:

====================
net: get rid of unused static inlines

I noticed a couple of unused static inline functions reviewing
net/sched patches so I run a grep thru all of include/ and net/
to catch other cases. This set removes the cases which look like
obvious dead code.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents d9f393f4 5e4eca5d

drivers/nfc/st-nci/vendor_cmds.c

+1 −1
Original line number Diff line number Diff line
@@ -456,7 +456,7 @@ static const struct nfc_vendor_cmd st_nci_vendor_cmds[] = { 


int st_nci_vendor_cmds_init(struct nci_dev *ndev)

{

	return nfc_set_vendor_cmds(ndev->nfc_dev, st_nci_vendor_cmds,

	return nci_set_vendor_cmds(ndev, st_nci_vendor_cmds,

				   sizeof(st_nci_vendor_cmds));

}

EXPORT_SYMBOL(st_nci_vendor_cmds_init);

drivers/nfc/st21nfca/vendor_cmds.c

+2 −2
Original line number Diff line number Diff line
@@ -358,7 +358,7 @@ int st21nfca_vendor_cmds_init(struct nfc_hci_dev *hdev) 
	struct st21nfca_hci_info *info = nfc_hci_get_clientdata(hdev);



	init_completion(&info->vendor_info.req_completion);

	return nfc_set_vendor_cmds(hdev->ndev, st21nfca_vendor_cmds,

	return nfc_hci_set_vendor_cmds(hdev, st21nfca_vendor_cmds,

				       sizeof(st21nfca_vendor_cmds));

}

EXPORT_SYMBOL(st21nfca_vendor_cmds_init);

include/linux/ipv6.h

+0 −7
Original line number Diff line number Diff line
@@ -371,19 +371,12 @@ static inline struct ipv6_pinfo * inet6_sk(const struct sock *__sk) 
	return NULL;

}



static inline struct inet6_request_sock *

			inet6_rsk(const struct request_sock *rsk)

{

	return NULL;

}



static inline struct raw6_sock *raw6_sk(const struct sock *sk)

{

	return NULL;

}



#define inet6_rcv_saddr(__sk)	NULL

#define tcp_twsk_ipv6only(__sk)		0

#define inet_v6_ipv6only(__sk)		0

#endif /* IS_ENABLED(CONFIG_IPV6) */

#endif /* _IPV6_H */

include/linux/linkmode.h

+0 −5
Original line number Diff line number Diff line
@@ -66,11 +66,6 @@ static inline void linkmode_mod_bit(int nr, volatile unsigned long *addr, 
		linkmode_clear_bit(nr, addr);

}



static inline void linkmode_change_bit(int nr, volatile unsigned long *addr)

{

	__change_bit(nr, addr);

}



static inline int linkmode_test_bit(int nr, const volatile unsigned long *addr)

{

	return test_bit(nr, addr);

include/linux/mii.h

+0 −17
Original line number Diff line number Diff line
@@ -387,23 +387,6 @@ mii_lpa_mod_linkmode_lpa_sgmii(unsigned long *lp_advertising, u32 lpa) 
			 speed_duplex == LPA_SGMII_10FULL);

}



/**

 * mii_lpa_to_linkmode_adv_sgmii

 * @advertising: pointer to destination link mode.

 * @lpa: value of the MII_LPA register

 *

 * A small helper function that translates MII_ADVERTISE bits

 * to linkmode advertisement settings when in SGMII mode.

 * Clears the old value of advertising.

 */

static inline void mii_lpa_to_linkmode_lpa_sgmii(unsigned long *lp_advertising,

						 u32 lpa)

{

	linkmode_zero(lp_advertising);



	mii_lpa_mod_linkmode_lpa_sgmii(lp_advertising, lpa);

}



/**

 * mii_adv_mod_linkmode_adv_t

 * @advertising:pointer to destination link mode.