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

Commit 4bb64fb9 authored by Alan Cox's avatar Alan Cox Committed by Jeff Garzik
Browse files

SiS warning fixes 



Somehow the sis_info133 external definition ended up in libata.h and that
was included by both drivers.  However libata.h contains libata-* specific
internals and clashing defines like DRV_NAME so this makes a mess.  Move
the extern into the C file and remove the warnings

[akpm@linux-foundation.org: create sis.h to avoid extern-decl-in-C]
Signed-off-by: default avatarAlan Cox <alan@redhat.com>
Cc: Jeff Garzik <jeff@garzik.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarJeff Garzik <jeff@garzik.org>
parent 2b067191

drivers/ata/libata.h

+0 −2
Original line number Diff line number Diff line
@@ -159,7 +159,5 @@ extern void ata_qc_schedule_eh(struct ata_queued_cmd *qc); 
/* libata-sff.c */

extern u8 ata_irq_on(struct ata_port *ap);



/* pata_sis.c */

extern struct ata_port_info sis_info133;



#endif /* __LIBATA_H__ */

drivers/ata/pata_sis.c

+1 −2
Original line number Diff line number Diff line
@@ -32,9 +32,8 @@ 
#include <scsi/scsi_host.h>

#include <linux/libata.h>

#include <linux/ata.h>

#include "libata.h"

#include "sis.h"



#undef DRV_NAME		/* already defined in libata.h, for libata-core */

#define DRV_NAME	"pata_sis"

#define DRV_VERSION	"0.4.5"

drivers/ata/sata_sis.c

+1 −2
Original line number Diff line number Diff line
@@ -40,9 +40,8 @@ 
#include <linux/device.h>

#include <scsi/scsi_host.h>

#include <linux/libata.h>

#include "libata.h"

#include "sis.h"



#undef DRV_NAME		/* already defined in libata.h, for libata-core */

#define DRV_NAME	"sata_sis"

#define DRV_VERSION	"0.7"

drivers/ata/sis.h

0 → 100644
+5 −0
Original line number Diff line number Diff line 


struct ata_port_info;



/* pata_sis.c */

extern struct ata_port_info sis_info133;