Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1254856c authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'dsa-phy-include' 



Florian Fainelli says:

====================
net: dsa: remove unnecessary phy.h include

Including phy.h and phy_fixed.h into net/dsa.h causes phy*.h to be an
unnecessary dependency for quite a large amount of the kernel.  There's
very little which actually requires definitions from phy.h in net/dsa.h
- the include itself only wants the declaration of a couple of
structures and IFNAMSIZ.

Add linux/if.h for IFNAMSIZ, declarations for the structures, phy.h to
mv88e6xxx.h as it needs it for phy_interface_t, and remove both phy.h
and phy_fixed.h from net/dsa.h.

This patch reduces from around 800 files rebuilt to around 40 - even
with ccache, the time difference is noticable.

In order to make this change, several drivers need to be updated to
include necessary headers that they were picking up through this
include.  This has resulted in a much larger patch series.

I'm assuming the 0-day builder has had 24 hours with this series, and
hasn't reported any further issues with it - the last issue was two
weeks ago (before I became ill) which I fixed over the last weekend.

I'm hoping this doesn't conflict with what's already in net-next...

David, this should probably go via your tree considering the diffstat.

Changes in v2:

- took Russell's patch series
- removed Qualcomm EMAC patch
- rebased against net-next/master
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents e3f29c48 4d56a29f

arch/mips/cavium-octeon/octeon-platform.c

+0 −4
Original line number Diff line number Diff line
@@ -1060,7 +1060,3 @@ static int __init octeon_publish_devices(void) 
	return of_platform_bus_probe(NULL, octeon_ids, NULL);

}

arch_initcall(octeon_publish_devices);
 


MODULE_AUTHOR("David Daney <ddaney@caviumnetworks.com>");

MODULE_LICENSE("GPL");

MODULE_DESCRIPTION("Platform driver for Octeon SOC");

drivers/net/dsa/mv88e6xxx/mv88e6xxx.h

+1 −0
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@ 
#include <linux/if_vlan.h>

#include <linux/irq.h>

#include <linux/gpio/consumer.h>

#include <linux/phy.h>



#ifndef UINT64_MAX

#define UINT64_MAX		(u64)(~((u64)0))

drivers/net/ethernet/broadcom/bgmac.c

+2 −0
Original line number Diff line number Diff line
@@ -12,6 +12,8 @@ 
#include <linux/bcma/bcma.h>

#include <linux/etherdevice.h>

#include <linux/bcm47xx_nvram.h>

#include <linux/phy.h>

#include <linux/phy_fixed.h>

#include "bgmac.h"



static bool bgmac_wait_value(struct bgmac *bgmac, u16 reg, u32 mask,

drivers/net/ethernet/cadence/macb.h

+2 −0
Original line number Diff line number Diff line
@@ -10,6 +10,8 @@ 
#ifndef _MACB_H

#define _MACB_H



#include <linux/phy.h>



#define MACB_GREGS_NBR 16

#define MACB_GREGS_VERSION 2

#define MACB_MAX_QUEUES 8

drivers/net/ethernet/cavium/liquidio/lio_main.c

+1 −0
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@ 
 * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE, TITLE, or

 * NONINFRINGEMENT.  See the GNU General Public License for more details.

 ***********************************************************************/

#include <linux/module.h>

#include <linux/pci.h>

#include <linux/firmware.h>

#include <net/vxlan.h>