1. 30 Mar, 2010 1 commit
    • Tejun Heo's avatar
      include cleanup: Update gfp.h and slab.h includes to prepare for breaking... · 5a0e3ad6
      Tejun Heo authored
      include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h
      
      percpu.h is included by sched.h and module.h and thus ends up being
      included when building most .c files.  percpu.h includes slab.h which
      in turn includes gfp.h making everything defined by the two files
      universally available and complicating inclusion dependencies.
      
      percpu.h -> slab.h dependency is about to be removed.  Prepare for
      this change by updating users of gfp and slab facilities include those
      headers directly instead of assuming availability.  As this conversion
      needs to touch large number of source files, the following script is
      used as the basis of conversion.
      
        http://userweb.kernel.org/~tj/misc/slabh-sweep.py
      
      
      
      The script does the followings.
      
      * Scan files for gfp and slab usages and update includes such that
        only the necessary includes are there.  ie. if only gfp is used,
        gfp.h, if slab is used, slab.h.
      
      * When the script inserts a new include, it looks at the include
        blocks and try to put the new include such that its order conforms
        to its surrounding.  It's put in the include block which contains
        core kernel includes, in the same order that the rest are ordered -
        alphabetical, Christmas tree, rev-Xmas-tree or at the end if there
        doesn't seem to be any matching order.
      
      * If the script can't find a place to put a new include (mostly
        because the file doesn't have fitting include block), it prints out
        an error message indicating which .h file needs to be added to the
        file.
      
      The conversion was done in the following steps.
      
      1. The initial automatic conversion of all .c files updated slightly
         over 4000 files, deleting around 700 includes and adding ~480 gfp.h
         and ~3000 slab.h inclusions.  The script emitted errors for ~400
         files.
      
      2. Each error was manually checked.  Some didn't need the inclusion,
         some needed manual addition while adding it to implementation .h or
         embedding .c file was more appropriate for others.  This step added
         inclusions to around 150 files.
      
      3. The script was run again and the output was compared to the edits
         from #2 to make sure no file was left behind.
      
      4. Several build tests were done and a couple of problems were fixed.
         e.g. lib/decompress_*.c used malloc/free() wrappers around slab
         APIs requiring slab.h to be added manually.
      
      5. The script was run on all .h files but without automatically
         editing them as sprinkling gfp.h and slab.h inclusions around .h
         files could easily lead to inclusion dependency hell.  Most gfp.h
         inclusion directives were ignored as stuff from gfp.h was usually
         wildly available and often used in preprocessor macros.  Each
         slab.h inclusion directive was examined and added manually as
         necessary.
      
      6. percpu.h was updated not to include slab.h.
      
      7. Build test were done on the following configurations and failures
         were fixed.  CONFIG_GCOV_KERNEL was turned off for all tests (as my
         distributed build env didn't work with gcov compiles) and a few
         more options had to be turned off depending on archs to make things
         build (like ipr on powerpc/64 which failed due to missing writeq).
      
         * x86 and x86_64 UP and SMP allmodconfig and a custom test config.
         * powerpc and powerpc64 SMP allmodconfig
         * sparc and sparc64 SMP allmodconfig
         * ia64 SMP allmodconfig
         * s390 SMP allmodconfig
         * alpha SMP allmodconfig
         * um on x86_64 SMP allmodconfig
      
      8. percpu.h modifications were reverted so that it could be applied as
         a separate patch and serve as bisection point.
      
      Given the fact that I had only a couple of failures from tests on step
      6, I'm fairly confident about the coverage of this conversion patch.
      If there is a breakage, it's likely to be something in one of the arch
      headers which should be easily discoverable easily on most builds of
      the specific arch.
      Signed-off-by: default avatarTejun Heo <tj@kernel.org>
      Guess-its-ok-by: default avatarChristoph Lameter <cl@linux-foundation.org>
      Cc: Ingo Molnar <mingo@redhat.com>
      Cc: Lee Schermerhorn <Lee.Schermerhorn@hp.com>
      5a0e3ad6
  2. 22 Sep, 2009 1 commit
  3. 02 Sep, 2009 1 commit
  4. 07 Aug, 2009 1 commit
  5. 08 Apr, 2009 1 commit
  6. 27 Mar, 2009 1 commit
    • Bartlomiej Zolnierkiewicz's avatar
      ide: remove ide_task_t typedef · 22aa4b32
      Bartlomiej Zolnierkiewicz authored
      
      
      While at it:
      - rename struct ide_task_s to struct ide_cmd
      - remove stale comments from idedisk_{read_native,set}_max_address()
      - drop unused 'cmd' argument from ide_{cmd,task}_ioctl()
      - drop unused 'task' argument from tx4939ide_tf_load_fixup()
      - rename ide_complete_task() to ide_complete_cmd()
      - use consistent naming for struct ide_cmd variables
      
      There should be no functional changes caused by this patch.
      Signed-off-by: default avatarBartlomiej Zolnierkiewicz <bzolnier@gmail.com>
      22aa4b32
  7. 24 Mar, 2009 1 commit
  8. 05 Mar, 2009 1 commit
    • Hannes Eder's avatar
      ide: NULL noise: drivers/ide/ide-*.c · 71bfc7a7
      Hannes Eder authored
      
      
      Fix this sparse warnings:
        drivers/ide/ide-disk_proc.c:130:11: warning: Using plain integer as NULL pointer
        drivers/ide/ide-floppy_proc.c:32:11: warning: Using plain integer as NULL pointer
        drivers/ide/ide-proc.c:234:11: warning: Using plain integer as NULL pointer
        drivers/ide/ide-tape.c:2141:11: warning: Using plain integer as NULL pointer
      Signed-off-by: default avatarHannes Eder <hannes@hanneseder.net>
      Cc: trivial@kernel.org
      Cc: kernel-janitors@vger.kernel.org
      Cc: Al Viro <viro@ZenIV.linux.org.uk>
      Signed-off-by: default avatarBartlomiej Zolnierkiewicz <bzolnier@gmail.com>
      71bfc7a7
  9. 06 Jan, 2009 3 commits
    • Bartlomiej Zolnierkiewicz's avatar
      ide: add port and host iterators · 2bd24a1c
      Bartlomiej Zolnierkiewicz authored
      
      
      Add ide_port_for_each_dev() / ide_host_for_each_port() iterators
      and update IDE code to use them.
      
      While at it:
      - s/unit/i/ variable in ide_port_wait_ready(), ide_probe_port(),
        ide_port_tune_devices(), ide_port_init_devices_data(), do_reset1(),
        ide_acpi_set_state() and scc_dma_end()
      - s/d/i/ variable in ide_proc_port_register_devices()
      
      There should be no functional changes caused by this patch.
      Signed-off-by: default avatarBartlomiej Zolnierkiewicz <bzolnier@gmail.com>
      2bd24a1c
    • Bartlomiej Zolnierkiewicz's avatar
      ide: dynamic allocation of device structures · 5e7f3a46
      Bartlomiej Zolnierkiewicz authored
      
      
      Allocate device structures dynamically instead of having them embedded
      in ide_hwif_t:
      
      * Remove needless zeroing of port structure from ide_init_port_data().
      
      * Add ide_hwif_t.devices[MAX_DRIVES] (table of pointers to the devices).
      
      * Add ide_port_{alloc,free}_devices() helpers and use them respectively
        in ide_{host,free}_alloc().
      
      * Convert all users of ->drives[] to use ->devices[] instead.
      
      While at it:
      
      * Use drive->dn for the slave device check in scc_pata.c.
      
      As a nice side-effect this patch cuts ~1kB (x86-32) from the resulting
      code size:
      
         text    data     bss     dec     hex filename
        53963    1244     237   55444    d894 drivers/ide/ide-core.o.before
        52981    1244     237   54462    d4be drivers/ide/ide-core.o.after
      Signed-off-by: default avatarBartlomiej Zolnierkiewicz <bzolnier@gmail.com>
      5e7f3a46
    • Bartlomiej Zolnierkiewicz's avatar
      ide: remove ide_driver_t typedef · 7f3c868b
      Bartlomiej Zolnierkiewicz authored
      
      
      While at it:
      - s/struct ide_driver_s/struct ide_driver/
      - use to_ide_driver() macro in ide-proc.c
      Signed-off-by: default avatarBartlomiej Zolnierkiewicz <bzolnier@gmail.com>
      7f3c868b
  10. 29 Dec, 2008 5 commits
  11. 02 Nov, 2008 1 commit
  12. 17 Oct, 2008 1 commit
  13. 13 Oct, 2008 1 commit
  14. 10 Oct, 2008 7 commits
    • Elias Oltmanns's avatar
      ide: Remove ide_spin_wait_hwgroup() and use special requests instead · 92f1f8fd
      Elias Oltmanns authored
      
      
      Use a special request for serialisation purposes and get rid of the
      awkward ide_spin_wait_hwgroup(). This also involves converting the
      ide_devset structure so it can be shared by the /proc and the ioctl code.
      Signed-off-by: default avatarElias Oltmanns <eo@nebensachen.de>
      [bart: use rq->cmd[] directly]
      Signed-off-by: default avatarBartlomiej Zolnierkiewicz <bzolnier@gmail.com>
      92f1f8fd
    • Bartlomiej Zolnierkiewicz's avatar
      ide: remove SECTOR_WORDS define · 151a6701
      Bartlomiej Zolnierkiewicz authored
      
      
      Just use SECTOR_SIZE instead.
      Signed-off-by: default avatarBartlomiej Zolnierkiewicz <bzolnier@gmail.com>
      151a6701
    • Bartlomiej Zolnierkiewicz's avatar
      ide: /proc/ide/hd*/settings rework · 8185d5aa
      Bartlomiej Zolnierkiewicz authored
      
      
      * Add struct ide_devset, S_* flags, *DEVSET() & ide*_devset_*() macros.
      
      * Add 'const struct ide_devset **settings' to ide_driver_t.
      
      * Use 'const struct ide_devset **settings' in ide_drive_t instead of
        'struct ide_settings_s *settings'.  Then convert core code and device
        drivers to use struct ide_devset and co.:
      
        - device settings are no longer allocated dynamically for each device
          but instead there is an unique struct ide_devset instance per setting
      
        - device driver keeps the pointer to the table of pointers to its
          settings in ide_driver_t.settings
      
        - generic settings are kept in ide_generic_setting[]
      
        - ide_proc_[un]register_driver(), ide_find_setting_by_name(),
          ide_{read,write}_setting() and proc_ide_{read,write}_settings()
          are updated accordingly
      
        - ide*_add_settings() are removed
      
      * Remove no longer used __ide_add_setting(), ide_add_setting(),
        __ide_remove_setting() and auto_remove_settings().
      
      * Remove no longer used TYPE_*, SETTING_*, ide_procset_t
        and ide_settings_t.
      
      * ->keep_settings, ->using_dma, ->unmask, ->noflush, ->dsc_overlap,
        ->nice1, ->addressing, ->wcache and ->nowerr ide_drive_t fields
        can now be bitfield flags.
      
      While at it:
      
      * Rename ide_find_setting_by_name() to ide_find_setting().
      
      * Rename write_wcache() to set_wcache().
      
      There should be no functional changes caused by this patch.
      Signed-off-by: default avatarBartlomiej Zolnierkiewicz <bzolnier@gmail.com>
      8185d5aa
    • Bartlomiej Zolnierkiewicz's avatar
      ide: preparations for /proc/ide/hd*/settings rework · 263138a0
      Bartlomiej Zolnierkiewicz authored
      
      
      After rework settings will be no longer created dynamically
      for each device so we need to make some fixups first.
      
      * Use set_[ksettings,unmaskirq]() as a set function for
        ["keepsettings","unmaskirq"] setting.
      
      * Allow writes to ["io_32bit","unmaskirq"] settings also when
        drive->no_[io_32bit,unmask] is set (this is checked later inside
        set_[io_32bit,unmaskirq]() anywyay and keeps consistency with
        the corresponding HDIO_SET_[32BIT,UNMASKINTR] ioctls).
      
      * Use max possible multi sectors value (16) as an allowed max for
        "multcount" setting.  set_multcount() set function checks against
        device's max possbile value anyway and it makes the proc setting
        consistent with the corresponding HDIO_SET_MULTCOUNT ioctl.
      Signed-off-by: default avatarBartlomiej Zolnierkiewicz <bzolnier@gmail.com>
      263138a0
    • Bartlomiej Zolnierkiewicz's avatar
      ide: include <linux/hdreg.h> only when needed · 3ceca727
      Bartlomiej Zolnierkiewicz authored
      
      
      * Include <linux/ata.h> directly in <linux/ide.h>
        instead of through <linux/hdreg.h>.
      
      * Include <linux/hdreg.h> only when needed.
      
      Cc: Christoph Hellwig <hch@infradead.org>
      Signed-off-by: default avatarBartlomiej Zolnierkiewicz <bzolnier@gmail.com>
      3ceca727
    • Bartlomiej Zolnierkiewicz's avatar
      ide: WIN_* -> ATA_CMD_* · aaaade3f
      Bartlomiej Zolnierkiewicz authored
      
      
      * Use ATA_CMD_* defines instead of WIN_* ones.
      
      While at it:
      
      * EXABYTE_ENABLE_NEXT -> ATA_EXABYTE_ENABLE_NEST
      
      * SETFEATURES_{EN,DIS}_WCACHE -> SETFEATURES_WC_{ON,OFF}
      
      * SETFEATURES_{EN,DIS}_AAM -> SETFEATURES_AAM_{ON,OFF}
      
      * SMART_* -> ATA_SMART_*
      
      * Remove stale comment from ide-proc.c.
      
      Partially based on earlier work by Chris Wedgwood.
      Acked-by: default avatarChris Wedgwood <cw@f00f.org>
      Signed-off-by: default avatarBartlomiej Zolnierkiewicz <bzolnier@gmail.com>
      aaaade3f
    • Bartlomiej Zolnierkiewicz's avatar
      ide: make drive->id an union (take 2) · 4dde4492
      Bartlomiej Zolnierkiewicz authored
      
      
      Make drive->id an unnamed union so id can be accessed either by using
      'u16 *id' or 'struct hd_driveid *driveid'.  Then convert all existing
      drive->id users accordingly (using 'u16 *id' when possible).
      
      This is an intermediate step to make ide 'struct hd_driveid'-free.
      
      While at it:
      
      - Add missing KERN_CONTs in it821x.c.
      
      - Use ATA_ID_WORDS and ATA_ID_*_LEN defines.
      
      - Remove unnecessary checks for drive->id.
      
      - s/drive_table/table/ in ide_in_drive_list().
      
      - Cleanup ide_config_drive_speed() a bit.
      
      - s/drive1/dev1/ & s/drive0/dev0/ in ide_undecoded_slave().
      
      v2:
      Fix typo in drivers/ide/ppc/pmac.c. (From Stephen Rothwell)
      
      There should be no functional changes caused by this patch.
      Signed-off-by: default avatarBartlomiej Zolnierkiewicz <bzolnier@gmail.com>
      4dde4492
  15. 24 Jul, 2008 1 commit
  16. 23 Jul, 2008 2 commits
    • Bartlomiej Zolnierkiewicz's avatar
      ide: filter out "default" transfer mode values in set_xfer_rate() · 3b2a5c71
      Bartlomiej Zolnierkiewicz authored
      
      
      * Filter out "default" transfer mode values (0x00 - default PIO mode,
        0x01 - default PIO mode w/ IORDY disabled) in write handler for obsoleted
        /proc/ide/hd?/settings:current_speed setting.
      
        Allowing "default" transfer mode values is a dangerous thing to do as
        we don't support programming controller to the "default" transfer mode
        and devices often use different values for the default and maximum PIO
        mode (i.e. PIO2 default and PIO4 maximum) so the controller will stay
        programmed for higher PIO mode while device will use the lower PIO mode.
      
        There is no functionality loss as by using special IOCTLs device can
        still be programmed to "default" transfer modes (it is only useful for
        debugging/testing purposes anyway).
      
      * Remove no longer needed IDE_HFLAG_ABUSE_SET_DMA_MODE host flag, it was
        previously used by few host drivers to program the controller to PIO0
        timings for "default" transfer mode == 0x01 (although some host drivers
        would program invalid PIO timings instead).
      
      * Cleanup ide_set_xfer_rate() and add BUG_ON().
      Suggested-by: default avatarSergei Shtylyov <sshtylyov@ru.mvista.com>
      Signed-off-by: default avatarBartlomiej Zolnierkiewicz <bzolnier@gmail.com>
      3b2a5c71
    • Bartlomiej Zolnierkiewicz's avatar
      ide: filter out invalid transfer mode values in set_xfer_rate() · c30daac1
      Bartlomiej Zolnierkiewicz authored
      
      
      Filter out invalid transfer mode values (0x02-0x07) in write handler
      for obsoleted /proc/ide/hd?/settings:current_speed setting.
      
      While at it:
      
      * Use XFER_UDMA_6 define.
      Suggested-by: default avatarSergei Shtylyov <sshtylyov@ru.mvista.com>
      Signed-off-by: default avatarBartlomiej Zolnierkiewicz <bzolnier@gmail.com>
      c30daac1
  17. 30 Jun, 2008 1 commit
  18. 10 Jun, 2008 1 commit
  19. 29 Apr, 2008 1 commit
  20. 27 Apr, 2008 1 commit
  21. 26 Apr, 2008 2 commits
  22. 17 Apr, 2008 2 commits
  23. 06 Feb, 2008 1 commit
  24. 02 Feb, 2008 2 commits