Author: marius
Date: Sun Jun 9 12:39:21 2013
New Revision: 251567
URL: http://svnweb.freebsd.org/changeset/base/251567
Log:
MFC: r249213 (partial)
- Remove unused headers from the SRCS of some modules.
- Use __FBSDID.
- Use DEVMETHOD_END.
- Use NULL instead of 0 for pointers.
Modified:
stable/9/sys/dev/ata/ata-cbus.c
stable/9/sys/dev/ata/ata-isa.c
stable/9/sys/modules/usb/umass/Makefile
stable/9/sys/modules/usb/urio/Makefile
stable/9/sys/modules/usb/usfs/Makefile
stable/9/sys/powerpc/powermac/ata_dbdma.c
stable/9/sys/powerpc/powermac/ata_kauai.c
stable/9/sys/powerpc/powermac/ata_macio.c
stable/9/sys/powerpc/psim/ata_iobus.c
Directory Properties:
stable/9/sys/ (props changed)
stable/9/sys/dev/ (props changed)
stable/9/sys/modules/ (props changed)
Modified: stable/9/sys/dev/ata/ata-cbus.c
==============================================================================
--- stable/9/sys/dev/ata/ata-cbus.c Sun Jun 9 08:28:23 2013
(r251566)
+++ stable/9/sys/dev/ata/ata-cbus.c Sun Jun 9 12:39:21 2013
(r251567)
@@ -273,7 +273,7 @@ static driver_t ata_cbus_driver = {
static devclass_t ata_cbus_devclass;
-DRIVER_MODULE(atacbus, isa, ata_cbus_driver, ata_cbus_devclass, 0, 0);
+DRIVER_MODULE(atacbus, isa, ata_cbus_driver, ata_cbus_devclass, NULL, NULL);
static int
ata_cbuschannel_probe(device_t dev)
Modified: stable/9/sys/dev/ata/ata-isa.c
==============================================================================
--- stable/9/sys/dev/ata/ata-isa.c Sun Jun 9 08:28:23 2013
(r251566)
+++ stable/9/sys/dev/ata/ata-isa.c Sun Jun 9 12:39:21 2013
(r251567)
@@ -195,7 +195,7 @@ static device_method_t ata_isa_methods[]
DEVMETHOD(device_suspend, ata_isa_suspend),
DEVMETHOD(device_resume, ata_isa_resume),
- { 0, 0 }
+ DEVMETHOD_END
};
static driver_t ata_isa_driver = {
@@ -204,5 +204,5 @@ static driver_t ata_isa_driver = {
sizeof(struct ata_channel),
};
-DRIVER_MODULE(ata, isa, ata_isa_driver, ata_devclass, 0, 0);
+DRIVER_MODULE(ata, isa, ata_isa_driver, ata_devclass, NULL, NULL);
MODULE_DEPEND(ata, ata, 1, 1, 1);
Modified: stable/9/sys/modules/usb/umass/Makefile
==============================================================================
--- stable/9/sys/modules/usb/umass/Makefile Sun Jun 9 08:28:23 2013
(r251566)
+++ stable/9/sys/modules/usb/umass/Makefile Sun Jun 9 12:39:21 2013
(r251567)
@@ -30,8 +30,7 @@ S= ${.CURDIR}/../../..
.PATH: $S/dev/usb/storage
KMOD= umass
-SRCS= ata_if.h bus_if.h device_if.h usb_if.h vnode_if.h \
- opt_usb.h opt_bus.h opt_cam.h opt_ata.h ata_if.h usbdevs.h \
- umass.c
+SRCS= bus_if.h device_if.h opt_bus.h opt_cam.h opt_usb.h umass.c usb_if.h \
+ usbdevs.h vnode_if.h
.include <bsd.kmod.mk>
Modified: stable/9/sys/modules/usb/urio/Makefile
==============================================================================
--- stable/9/sys/modules/usb/urio/Makefile Sun Jun 9 08:28:23 2013
(r251566)
+++ stable/9/sys/modules/usb/urio/Makefile Sun Jun 9 12:39:21 2013
(r251567)
@@ -30,8 +30,6 @@ S= ${.CURDIR}/../../..
.PATH: $S/dev/usb/storage
KMOD= urio
-SRCS= ata_if.h bus_if.h device_if.h usb_if.h vnode_if.h \
- opt_usb.h opt_bus.h opt_cam.h opt_ata.h ata_if.h usbdevs.h \
- urio.c
+SRCS= bus_if.h device_if.h opt_bus.h opt_usb.h usb_if.h usbdevs.h urio.c
.include <bsd.kmod.mk>
Modified: stable/9/sys/modules/usb/usfs/Makefile
==============================================================================
--- stable/9/sys/modules/usb/usfs/Makefile Sun Jun 9 08:28:23 2013
(r251566)
+++ stable/9/sys/modules/usb/usfs/Makefile Sun Jun 9 12:39:21 2013
(r251567)
@@ -30,8 +30,7 @@ S= ${.CURDIR}/../../..
.PATH: $S/dev/usb/storage
KMOD= usfs
-SRCS= ata_if.h bus_if.h device_if.h usb_if.h vnode_if.h \
- opt_usb.h opt_bus.h opt_cam.h opt_ata.h ata_if.h usbdevs.h \
+SRCS= bus_if.h device_if.h opt_bus.h opt_usb.h usb_if.h usbdevs.h \
ustorage_fs.c
.include <bsd.kmod.mk>
Modified: stable/9/sys/powerpc/powermac/ata_dbdma.c
==============================================================================
--- stable/9/sys/powerpc/powermac/ata_dbdma.c Sun Jun 9 08:28:23 2013
(r251566)
+++ stable/9/sys/powerpc/powermac/ata_dbdma.c Sun Jun 9 12:39:21 2013
(r251567)
@@ -23,10 +23,11 @@
* OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
- *
- * $FreeBSD$
*/
+#include <sys/cdefs.h>
+__FBSDID("* $FreeBSD$");
+
/*
* Common routines for the DMA engine on both the Apple Kauai and MacIO
* ATA controllers.
Modified: stable/9/sys/powerpc/powermac/ata_kauai.c
==============================================================================
--- stable/9/sys/powerpc/powermac/ata_kauai.c Sun Jun 9 08:28:23 2013
(r251566)
+++ stable/9/sys/powerpc/powermac/ata_kauai.c Sun Jun 9 12:39:21 2013
(r251567)
@@ -99,7 +99,7 @@ static device_method_t ata_kauai_methods
/* ATA interface */
DEVMETHOD(ata_setmode, ata_kauai_setmode),
- { 0, 0 }
+ DEVMETHOD_END
};
struct ata_kauai_softc {
@@ -120,15 +120,15 @@ static driver_t ata_kauai_driver = {
sizeof(struct ata_kauai_softc),
};
-DRIVER_MODULE(ata, pci, ata_kauai_driver, ata_devclass, 0, 0);
+DRIVER_MODULE(ata, pci, ata_kauai_driver, ata_devclass, NULL, NULL);
MODULE_DEPEND(ata, ata, 1, 1, 1);
/*
* PCI ID search table
*/
-static struct kauai_pci_dev {
- u_int32_t kpd_devid;
- char *kpd_desc;
+static const struct kauai_pci_dev {
+ u_int32_t kpd_devid;
+ const char *kpd_desc;
} kauai_pci_devlist[] = {
{ 0x0033106b, "Uninorth2 Kauai ATA Controller" },
{ 0x003b106b, "Intrepid Kauai ATA Controller" },
@@ -152,6 +152,7 @@ static const u_int pio_timing_kauai[] =
0x05000249, /* PIO3 */
0x04000148 /* PIO4 */
};
+
static const u_int pio_timing_shasta[] = {
0x0a000c97, /* PIO0 */
0x07000712, /* PIO1 */
@@ -165,6 +166,7 @@ static const u_int dma_timing_kauai[] =
0x00209000, /* WDMA1 */
0x00148000 /* WDMA2 */
};
+
static const u_int dma_timing_shasta[] = {
0x00820800, /* WDMA0 */
0x0028b000, /* WDMA1 */
@@ -179,6 +181,7 @@ static const u_int udma_timing_kauai[] =
0x00002a31, /* UDMA4 */
0x00002921 /* UDMA5 */
};
+
static const u_int udma_timing_shasta[] = {
0x00035901, /* UDMA0 */
0x000348b1, /* UDMA1 */
@@ -368,4 +371,3 @@ ata_kauai_begin_transaction(struct ata_r
return ata_begin_transaction(request);
}
-
Modified: stable/9/sys/powerpc/powermac/ata_macio.c
==============================================================================
--- stable/9/sys/powerpc/powermac/ata_macio.c Sun Jun 9 08:28:23 2013
(r251566)
+++ stable/9/sys/powerpc/powermac/ata_macio.c Sun Jun 9 12:39:21 2013
(r251567)
@@ -23,10 +23,11 @@
* OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
- *
- * $FreeBSD$
*/
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
/*
* Mac-io ATA controller
*/
@@ -85,7 +86,7 @@ struct ide_timings {
int active; /* minimum command active time [ns] */
};
-struct ide_timings pio_timings[5] = {
+static const struct ide_timings pio_timings[5] = {
{ 600, 180 }, /* PIO 0 */
{ 390, 150 }, /* PIO 1 */
{ 240, 105 }, /* PIO 2 */
@@ -122,7 +123,7 @@ static device_method_t ata_macio_methods
/* ATA interface */
DEVMETHOD(ata_setmode, ata_macio_setmode),
- { 0, 0 }
+ DEVMETHOD_END
};
struct ata_macio_softc {
@@ -143,7 +144,7 @@ static driver_t ata_macio_driver = {
sizeof(struct ata_macio_softc),
};
-DRIVER_MODULE(ata, macio, ata_macio_driver, ata_devclass, 0, 0);
+DRIVER_MODULE(ata, macio, ata_macio_driver, ata_devclass, NULL, NULL);
MODULE_DEPEND(ata, ata, 1, 1, 1);
static int
@@ -332,4 +333,3 @@ ata_macio_begin_transaction(struct ata_r
return ata_begin_transaction(request);
}
-
Modified: stable/9/sys/powerpc/psim/ata_iobus.c
==============================================================================
--- stable/9/sys/powerpc/psim/ata_iobus.c Sun Jun 9 08:28:23 2013
(r251566)
+++ stable/9/sys/powerpc/psim/ata_iobus.c Sun Jun 9 12:39:21 2013
(r251567)
@@ -23,10 +23,11 @@
* OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
- *
- * $FreeBSD$
*/
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
/*
* PSIM local bus ATA controller
*/
@@ -80,7 +81,7 @@ static device_method_t ata_iobus_methods
DEVMETHOD(bus_setup_intr, bus_generic_setup_intr),
DEVMETHOD(bus_teardown_intr, bus_generic_teardown_intr),
- { 0, 0 }
+ DEVMETHOD_END
};
static driver_t ata_iobus_driver = {
@@ -91,7 +92,8 @@ static driver_t ata_iobus_driver = {
static devclass_t ata_iobus_devclass;
-DRIVER_MODULE(ataiobus, iobus, ata_iobus_driver, ata_iobus_devclass, 0, 0);
+DRIVER_MODULE(ataiobus, iobus, ata_iobus_driver, ata_iobus_devclass, NULL,
+ NULL);
MODULE_DEPEND(ata, ata, 1, 1, 1);
static int
@@ -221,7 +223,7 @@ static device_method_t ata_iobus_sub_met
/* ATA interface */
DEVMETHOD(ata_setmode, ata_iobus_sub_setmode),
- { 0, 0 }
+ DEVMETHOD_END
};
static driver_t ata_iobus_sub_driver = {
@@ -230,7 +232,7 @@ static driver_t ata_iobus_sub_driver = {
sizeof(struct ata_channel),
};
-DRIVER_MODULE(ata, ataiobus, ata_iobus_sub_driver, ata_devclass, 0, 0);
+DRIVER_MODULE(ata, ataiobus, ata_iobus_sub_driver, ata_devclass, NULL, NULL);
static int
ata_iobus_sub_probe(device_t dev)
_______________________________________________
[email protected] mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "[email protected]"
