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

Commit 4d5f2ba7 authored by Vivien Didelot's avatar Vivien Didelot Committed by David S. Miller
Browse files

net: dsa: mv88e6xxx: rename chip header 



The mv88e6xxx.h is meant to contains the chip structures and data.
Rename it to chip.h, as for other source/header pairs of the driver.

At the same time, ensure that relative header inclusions are separated
by a newline and sorted alphabetically.

Signed-off-by: default avatarVivien Didelot <vivien.didelot@savoirfairelinux.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 2d9888c5

drivers/net/dsa/mv88e6xxx/chip.c

+1 −1
Original line number Diff line number Diff line
@@ -33,7 +33,7 @@ 
#include <linux/phy.h>

#include <net/dsa.h>



#include "mv88e6xxx.h"

#include "chip.h"

#include "global1.h"

#include "global2.h"

#include "phy.h"

drivers/net/dsa/mv88e6xxx/mv88e6xxx.h→drivers/net/dsa/mv88e6xxx/chip.h

+5 −4
Original line number Diff line number Diff line 
/*

 * Marvell 88e6xxx common definitions

 * Marvell 88E6xxx Ethernet switch single-chip definition

 *

 * Copyright (c) 2008 Marvell Semiconductor

 *
@@ -9,8 +9,8 @@ 
 * (at your option) any later version.

 */



#ifndef __MV88E6XXX_H

#define __MV88E6XXX_H

#ifndef _MV88E6XXX_CHIP_H

#define _MV88E6XXX_CHIP_H



#include <linux/if_vlan.h>

#include <linux/irq.h>
@@ -924,4 +924,5 @@ int mv88e6xxx_update(struct mv88e6xxx_chip *chip, int addr, int reg, 
		     u16 update);

int mv88e6xxx_wait(struct mv88e6xxx_chip *chip, int addr, int reg, u16 mask);

struct mii_bus *mv88e6xxx_default_mdio_bus(struct mv88e6xxx_chip *chip);

#endif
 


#endif /* _MV88E6XXX_CHIP_H */

drivers/net/dsa/mv88e6xxx/global1.c

+1 −1
Original line number Diff line number Diff line
@@ -12,7 +12,7 @@ 
 * (at your option) any later version.

 */



#include "mv88e6xxx.h"

#include "chip.h"

#include "global1.h"



int mv88e6xxx_g1_read(struct mv88e6xxx_chip *chip, int reg, u16 *val)

drivers/net/dsa/mv88e6xxx/global1.h

+1 −1
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ 
#ifndef _MV88E6XXX_GLOBAL1_H

#define _MV88E6XXX_GLOBAL1_H



#include "mv88e6xxx.h"

#include "chip.h"



int mv88e6xxx_g1_read(struct mv88e6xxx_chip *chip, int reg, u16 *val);

int mv88e6xxx_g1_write(struct mv88e6xxx_chip *chip, int reg, u16 val);

drivers/net/dsa/mv88e6xxx/global1_atu.c

+1 −1
Original line number Diff line number Diff line
@@ -10,7 +10,7 @@ 
 * (at your option) any later version.

 */



#include "mv88e6xxx.h"

#include "chip.h"

#include "global1.h"



/* Offset 0x01: ATU FID Register */